1148 files changed, 88247 insertions, 81012 deletions

diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 1808e02c4cd..db93de62e3c 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -102,15 +102,18 @@ A. After tlnet freeze:
 
 A.0. Specifics for tlperl update:
   cd $pg
-  find tlperl -type f | sort >/tmp/now
+  find tlperl -type f | \grep -v README.TEXLIVE | sort >/tmp/now
   tar tf newperl.tgz | \grep -v /\$ | sort >/tmp/new
+    # or zipinfo -1 newperl.zip
+  tar xf ..., or unzip -q ...
   comm -13 /tmp/now /tmp/new >/tmp/c2
   comm -23 /tmp/now /tmp/new >/tmp/c1
   svn rm `cat /tmp/c1`
   svn add --parents --no-auto-props `cat /tmp/c2`
   svn status | fgrep \? # shouldn't be any
   find tlperl -name \*.dll | xargs svn propset svn:executable 1
-  find . -type d -empty | xargs svn rm  # repeat until no output
+  find tlperl -type d -empty | xargs svn rm  # repeat until no output
+  update tlperl/README.TEXLIVE
   svn commit when ready ...
 
 B. Build a test ISO image for initial TeX Collection testing:
diff --git a/Master/tlpkg/tlperl/README.TEXLIVE b/Master/tlpkg/tlperl/README.TEXLIVE
index ad0cf990892..839a4f4f6b0 100644
--- a/Master/tlpkg/tlperl/README.TEXLIVE
+++ b/Master/tlpkg/tlperl/README.TEXLIVE
@@ -1,6 +1,6 @@
 (This file public domain.)
 
-This directory contains Perl 5.22.1 compiled for Windows.
+This directory contains Perl 5.24.1 compiled for Windows.
 
 The only purpose of this Perl is to provide support on Windows for
 Perl scripts shipped with TeX Live.  It's not intended for general use.
diff --git a/Master/tlpkg/tlperl/bin/libgcc_s_dw2-1.dll b/Master/tlpkg/tlperl/bin/libgcc_s_dw2-1.dll
new file mode 100755
index 00000000000..5bd25247974
--- /dev/null
+++ b/Master/tlpkg/tlperl/bin/libgcc_s_dw2-1.dll
diff --git a/Master/tlpkg/tlperl/bin/libgcc_s_sjlj-1.dll b/Master/tlpkg/tlperl/bin/libgcc_s_sjlj-1.dll
deleted file mode 100755
index 78b455d6629..00000000000
--- a/Master/tlpkg/tlperl/bin/libgcc_s_sjlj-1.dll
+++ /dev/null
diff --git a/Master/tlpkg/tlperl/bin/libstdc++-6.dll b/Master/tlpkg/tlperl/bin/libstdc++-6.dll
index ef86d810ed8..a61bee528c4 100755
--- a/Master/tlpkg/tlperl/bin/libstdc++-6.dll
+++ b/Master/tlpkg/tlperl/bin/libstdc++-6.dll
diff --git a/Master/tlpkg/tlperl/bin/libwinpthread-1.dll b/Master/tlpkg/tlperl/bin/libwinpthread-1.dll
index 8c970289b87..000b5c0c7fa 100755
--- a/Master/tlpkg/tlperl/bin/libwinpthread-1.dll
+++ b/Master/tlpkg/tlperl/bin/libwinpthread-1.dll
diff --git a/Master/tlpkg/tlperl/bin/perl.exe b/Master/tlpkg/tlperl/bin/perl.exe
index 351d4449fed..28e9a9a9b58 100755
--- a/Master/tlpkg/tlperl/bin/perl.exe
+++ b/Master/tlpkg/tlperl/bin/perl.exe
diff --git a/Master/tlpkg/tlperl/bin/perl5.22.1.exe b/Master/tlpkg/tlperl/bin/perl5.22.1.exe
deleted file mode 100755
index 351d4449fed..00000000000
--- a/Master/tlpkg/tlperl/bin/perl5.22.1.exe
+++ /dev/null
diff --git a/Master/tlpkg/tlperl/bin/perl5.24.1.exe b/Master/tlpkg/tlperl/bin/perl5.24.1.exe
new file mode 100644
index 00000000000..28e9a9a9b58
--- /dev/null
+++ b/Master/tlpkg/tlperl/bin/perl5.24.1.exe
diff --git a/Master/tlpkg/tlperl/bin/perl522.dll b/Master/tlpkg/tlperl/bin/perl522.dll
deleted file mode 100755
index 1b28845bb49..00000000000
--- a/Master/tlpkg/tlperl/bin/perl522.dll
+++ /dev/null
diff --git a/Master/tlpkg/tlperl/bin/perl524.dll b/Master/tlpkg/tlperl/bin/perl524.dll
new file mode 100755
index 00000000000..26c46061b79
--- /dev/null
+++ b/Master/tlpkg/tlperl/bin/perl524.dll
diff --git a/Master/tlpkg/tlperl/bin/perlglob.exe b/Master/tlpkg/tlperl/bin/perlglob.exe
index db0d20767d3..9dace028ac9 100755
--- a/Master/tlpkg/tlperl/bin/perlglob.exe
+++ b/Master/tlpkg/tlperl/bin/perlglob.exe
diff --git a/Master/tlpkg/tlperl/bin/wperl.exe b/Master/tlpkg/tlperl/bin/wperl.exe
index f17d839b32e..7d8fe01aa76 100755
--- a/Master/tlpkg/tlperl/bin/wperl.exe
+++ b/Master/tlpkg/tlperl/bin/wperl.exe
diff --git a/Master/tlpkg/tlperl/lib/.packlist b/Master/tlpkg/tlperl/lib/.packlist
index 9fef71a9853..9c53cd6c824 100644
--- a/Master/tlpkg/tlperl/lib/.packlist
+++ b/Master/tlpkg/tlperl/lib/.packlist
@@ -8,9 +8,9 @@ c:\tlperl\bin/h2xs.bat type=file
 c:\tlperl\bin/instmodsh.bat type=file

 c:\tlperl\bin/json_pp.bat type=file

 c:\tlperl\bin/libnetcfg.bat type=file

-c:\tlperl\bin/perl.exe from=c:\tlperl\bin/perl5.22.1.exe type=link

-c:\tlperl\bin/perl5.22.1.exe type=file

-c:\tlperl\bin/perl522.dll type=file

+c:\tlperl\bin/perl.exe from=c:\tlperl\bin/perl5.24.1.exe type=link

+c:\tlperl\bin/perl5.24.1.exe type=file

+c:\tlperl\bin/perl524.dll type=file

 c:\tlperl\bin/perlbug.bat type=file

 c:\tlperl\bin/perldoc.bat type=file

 c:\tlperl\bin/perlivp.bat type=file

@@ -66,6 +66,7 @@ c:\tlperl\lib/CORE/cop.h type=file
 c:\tlperl\lib/CORE/cv.h type=file

 c:\tlperl\lib/CORE/dirent.h type=file

 c:\tlperl\lib/CORE/dosish.h type=file

+c:\tlperl\lib/CORE/dquote_inline.h type=file

 c:\tlperl\lib/CORE/ebcdic_tables.h type=file

 c:\tlperl\lib/CORE/embed.h type=file

 c:\tlperl\lib/CORE/embedvar.h type=file

@@ -79,10 +80,11 @@ c:\tlperl\lib/CORE/hv.h type=file
 c:\tlperl\lib/CORE/hv_func.h type=file

 c:\tlperl\lib/CORE/inline.h type=file

 c:\tlperl\lib/CORE/intrpvar.h type=file

+c:\tlperl\lib/CORE/invlist_inline.h type=file

 c:\tlperl\lib/CORE/iperlsys.h type=file

 c:\tlperl\lib/CORE/keywords.h type=file

 c:\tlperl\lib/CORE/l1_char_class_tab.h type=file

-c:\tlperl\lib/CORE/libperl522.a type=file

+c:\tlperl\lib/CORE/libperl524.a type=file

 c:\tlperl\lib/CORE/malloc_ctl.h type=file

 c:\tlperl\lib/CORE/metaconfig.h type=file

 c:\tlperl\lib/CORE/mg.h type=file

@@ -110,6 +112,7 @@ c:\tlperl\lib/CORE/perlvars.h type=file
 c:\tlperl\lib/CORE/perly.h type=file

 c:\tlperl\lib/CORE/pp.h type=file

 c:\tlperl\lib/CORE/pp_proto.h type=file

+c:\tlperl\lib/CORE/ppport.h type=file

 c:\tlperl\lib/CORE/proto.h type=file

 c:\tlperl\lib/CORE/reentr.h type=file

 c:\tlperl\lib/CORE/regcharclass.h type=file

@@ -313,8 +316,6 @@ c:\tlperl\lib/ExtUtils/MakeMaker/FAQ.pod type=file
 c:\tlperl\lib/ExtUtils/MakeMaker/Locale.pm type=file

 c:\tlperl\lib/ExtUtils/MakeMaker/Tutorial.pod type=file

 c:\tlperl\lib/ExtUtils/MakeMaker/version.pm type=file

-c:\tlperl\lib/ExtUtils/MakeMaker/version/regex.pm type=file

-c:\tlperl\lib/ExtUtils/MakeMaker/version/vpp.pm type=file

 c:\tlperl\lib/ExtUtils/Manifest.pm type=file

 c:\tlperl\lib/ExtUtils/Miniperl.pm type=file

 c:\tlperl\lib/ExtUtils/Mkbootstrap.pm type=file

@@ -346,6 +347,7 @@ c:\tlperl\lib/File/Glob.pm type=file
 c:\tlperl\lib/File/GlobMapper.pm type=file

 c:\tlperl\lib/File/Path.pm type=file

 c:\tlperl\lib/File/Spec.pm type=file

+c:\tlperl\lib/File/Spec/AmigaOS.pm type=file

 c:\tlperl\lib/File/Spec/Cygwin.pm type=file

 c:\tlperl\lib/File/Spec/Epoc.pm type=file

 c:\tlperl\lib/File/Spec/Functions.pm type=file

@@ -421,7 +423,6 @@ c:\tlperl\lib/Locale/Codes.pod type=file
 c:\tlperl\lib/Locale/Codes/API.pod type=file

 c:\tlperl\lib/Locale/Codes/Changes.pod type=file

 c:\tlperl\lib/Locale/Codes/Constants.pm type=file

-c:\tlperl\lib/Locale/Codes/Constants.pod type=file

 c:\tlperl\lib/Locale/Codes/Country.pm type=file

 c:\tlperl\lib/Locale/Codes/Country.pod type=file

 c:\tlperl\lib/Locale/Codes/Country_Codes.pm type=file

@@ -797,7 +798,6 @@ c:\tlperl\lib/auto/Compress/Raw/Bzip2/Bzip2.dll type=file
 c:\tlperl\lib/auto/Compress/Raw/Zlib/Zlib.dll type=file

 c:\tlperl\lib/auto/Cwd/Cwd.dll type=file

 c:\tlperl\lib/auto/Data/Dumper/Dumper.dll type=file

-c:\tlperl\lib/auto/Devel/PPPort/PPPort.dll type=file

 c:\tlperl\lib/auto/Devel/Peek/Peek.dll type=file

 c:\tlperl\lib/auto/Digest/MD5/MD5.dll type=file

 c:\tlperl\lib/auto/Digest/SHA/SHA.dll type=file

@@ -834,6 +834,7 @@ c:\tlperl\lib/auto/Tie/Hash/NamedCapture/NamedCapture.dll type=file
 c:\tlperl\lib/auto/Time/HiRes/HiRes.dll type=file

 c:\tlperl\lib/auto/Time/Piece/Piece.dll type=file

 c:\tlperl\lib/auto/Unicode/Collate/Collate.dll type=file

+c:\tlperl\lib/auto/Unicode/Normalize/Normalize.dll type=file

 c:\tlperl\lib/auto/Win32/Win32.dll type=file

 c:\tlperl\lib/auto/Win32API/File/File.dll type=file

 c:\tlperl\lib/auto/Win32CORE/extralibs.ld type=file

@@ -846,7 +847,7 @@ c:\tlperl\lib/auto/threads/threads.dll type=file
 c:\tlperl\lib/autodie.pm type=file

 c:\tlperl\lib/autodie/Scope/Guard.pm type=file

 c:\tlperl\lib/autodie/Scope/GuardStack.pm type=file

-c:\tlperl\lib/autodie/ScopeUtil.pm type=file

+c:\tlperl\lib/autodie/Util.pm type=file

 c:\tlperl\lib/autodie/exception.pm type=file

 c:\tlperl\lib/autodie/exception/system.pm type=file

 c:\tlperl\lib/autodie/hints.pm type=file

@@ -916,6 +917,9 @@ c:\tlperl\lib/pods/perl5202delta.pod type=file
 c:\tlperl\lib/pods/perl5203delta.pod type=file

 c:\tlperl\lib/pods/perl5220delta.pod type=file

 c:\tlperl\lib/pods/perl5221delta.pod type=file

+c:\tlperl\lib/pods/perl5222delta.pod type=file

+c:\tlperl\lib/pods/perl5240delta.pod type=file

+c:\tlperl\lib/pods/perl5241delta.pod type=file

 c:\tlperl\lib/pods/perl561delta.pod type=file

 c:\tlperl\lib/pods/perl56delta.pod type=file

 c:\tlperl\lib/pods/perl581delta.pod type=file

@@ -1096,6 +1100,8 @@ c:\tlperl\lib/unicore/To/Fold.pl type=file
 c:\tlperl\lib/unicore/To/GCB.pl type=file

 c:\tlperl\lib/unicore/To/Gc.pl type=file

 c:\tlperl\lib/unicore/To/Hst.pl type=file

+c:\tlperl\lib/unicore/To/InPC.pl type=file

+c:\tlperl\lib/unicore/To/InSC.pl type=file

 c:\tlperl\lib/unicore/To/Isc.pl type=file

 c:\tlperl\lib/unicore/To/Jg.pl type=file

 c:\tlperl\lib/unicore/To/Jt.pl type=file

@@ -1120,6 +1126,8 @@ c:\tlperl\lib/unicore/To/Title.pl type=file
 c:\tlperl\lib/unicore/To/Uc.pl type=file

 c:\tlperl\lib/unicore/To/Upper.pl type=file

 c:\tlperl\lib/unicore/To/WB.pl type=file

+c:\tlperl\lib/unicore/To/_PerlLB.pl type=file

+c:\tlperl\lib/unicore/To/_PerlWB.pl type=file

 c:\tlperl\lib/unicore/UCD.pl type=file

 c:\tlperl\lib/unicore/lib/Age/NA.pl type=file

 c:\tlperl\lib/unicore/lib/Age/V11.pl type=file

@@ -1135,6 +1143,7 @@ c:\tlperl\lib/unicore/lib/Age/V52.pl type=file
 c:\tlperl\lib/unicore/lib/Age/V60.pl type=file

 c:\tlperl\lib/unicore/lib/Age/V61.pl type=file

 c:\tlperl\lib/unicore/lib/Age/V70.pl type=file

+c:\tlperl\lib/unicore/lib/Age/V80.pl type=file

 c:\tlperl\lib/unicore/lib/Alpha/Y.pl type=file

 c:\tlperl\lib/unicore/lib/Bc/AL.pl type=file

 c:\tlperl\lib/unicore/lib/Bc/AN.pl type=file

@@ -1239,7 +1248,7 @@ c:\tlperl\lib/unicore/lib/Gc/Zs.pl type=file
 c:\tlperl\lib/unicore/lib/GrBase/Y.pl type=file

 c:\tlperl\lib/unicore/lib/Hex/Y.pl type=file

 c:\tlperl\lib/unicore/lib/Hst/NA.pl type=file

-c:\tlperl\lib/unicore/lib/Hyphen/Y.pl type=file

+c:\tlperl\lib/unicore/lib/Hyphen/T.pl type=file

 c:\tlperl\lib/unicore/lib/IDC/Y.pl type=file

 c:\tlperl\lib/unicore/lib/IDS/Y.pl type=file

 c:\tlperl\lib/unicore/lib/Ideo/Y.pl type=file

@@ -1258,6 +1267,40 @@ c:\tlperl\lib/unicore/lib/In/6_1.pl type=file
 c:\tlperl\lib/unicore/lib/In/6_2.pl type=file

 c:\tlperl\lib/unicore/lib/In/6_3.pl type=file

 c:\tlperl\lib/unicore/lib/In/7_0.pl type=file

+c:\tlperl\lib/unicore/lib/In/8_0.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/Bottom.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/Left.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/LeftAndR.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/NA.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/Overstru.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/Right.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/Top.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/TopAndBo.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/TopAndL2.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/TopAndLe.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/TopAndRi.pl type=file

+c:\tlperl\lib/unicore/lib/InPC/VisualOr.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Avagraha.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Bindu.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Cantilla.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Consona2.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Consona3.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Consona4.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Consona5.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Consona6.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Consonan.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Invisibl.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Nukta.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Number.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Other.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/PureKill.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Syllable.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/ToneMark.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Virama.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Visarga.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/Vowel.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/VowelDep.pl type=file

+c:\tlperl\lib/unicore/lib/InSC/VowelInd.pl type=file

 c:\tlperl\lib/unicore/lib/Jg/Ain.pl type=file

 c:\tlperl\lib/unicore/lib/Jg/Alef.pl type=file

 c:\tlperl\lib/unicore/lib/Jg/Beh.pl type=file

@@ -1266,6 +1309,7 @@ c:\tlperl\lib/unicore/lib/Jg/FarsiYeh.pl type=file
 c:\tlperl\lib/unicore/lib/Jg/Feh.pl type=file

 c:\tlperl\lib/unicore/lib/Jg/Gaf.pl type=file

 c:\tlperl\lib/unicore/lib/Jg/Hah.pl type=file

+c:\tlperl\lib/unicore/lib/Jg/Kaf.pl type=file

 c:\tlperl\lib/unicore/lib/Jg/Lam.pl type=file

 c:\tlperl\lib/unicore/lib/Jg/NoJoinin.pl type=file

 c:\tlperl\lib/unicore/lib/Jg/Qaf.pl type=file

@@ -1279,7 +1323,6 @@ c:\tlperl\lib/unicore/lib/Jt/D.pl type=file
 c:\tlperl\lib/unicore/lib/Jt/R.pl type=file

 c:\tlperl\lib/unicore/lib/Jt/T.pl type=file

 c:\tlperl\lib/unicore/lib/Jt/U.pl type=file

-c:\tlperl\lib/unicore/lib/LOE/Y.pl type=file

 c:\tlperl\lib/unicore/lib/Lb/AI.pl type=file

 c:\tlperl\lib/unicore/lib/Lb/AL.pl type=file

 c:\tlperl\lib/unicore/lib/Lb/BA.pl type=file

@@ -1290,6 +1333,7 @@ c:\tlperl\lib/unicore/lib/Lb/CM.pl type=file
 c:\tlperl\lib/unicore/lib/Lb/EX.pl type=file

 c:\tlperl\lib/unicore/lib/Lb/GL.pl type=file

 c:\tlperl\lib/unicore/lib/Lb/ID.pl type=file

+c:\tlperl\lib/unicore/lib/Lb/IN.pl type=file

 c:\tlperl\lib/unicore/lib/Lb/IS.pl type=file

 c:\tlperl\lib/unicore/lib/Lb/NS.pl type=file

 c:\tlperl\lib/unicore/lib/Lb/OP.pl type=file

@@ -1300,7 +1344,6 @@ c:\tlperl\lib/unicore/lib/Lb/SA.pl type=file
 c:\tlperl\lib/unicore/lib/Lb/XX.pl type=file

 c:\tlperl\lib/unicore/lib/Lower/Y.pl type=file

 c:\tlperl\lib/unicore/lib/Math/Y.pl type=file

-c:\tlperl\lib/unicore/lib/NChar/Y.pl type=file

 c:\tlperl\lib/unicore/lib/NFCQC/M.pl type=file

 c:\tlperl\lib/unicore/lib/NFCQC/Y.pl type=file

 c:\tlperl\lib/unicore/lib/NFDQC/N.pl type=file

@@ -1333,6 +1376,7 @@ c:\tlperl\lib/unicore/lib/Nv/1_4.pl type=file
 c:\tlperl\lib/unicore/lib/Nv/1_8.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/2.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/20.pl type=file

+c:\tlperl\lib/unicore/lib/Nv/200.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/2_3.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/3.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/30.pl type=file

@@ -1340,6 +1384,7 @@ c:\tlperl\lib/unicore/lib/Nv/300.pl type=file
 c:\tlperl\lib/unicore/lib/Nv/3_4.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/4.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/40.pl type=file

+c:\tlperl\lib/unicore/lib/Nv/400.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/5.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/50.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/500.pl type=file

@@ -1347,15 +1392,17 @@ c:\tlperl\lib/unicore/lib/Nv/5000.pl type=file
 c:\tlperl\lib/unicore/lib/Nv/50000.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/6.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/60.pl type=file

+c:\tlperl\lib/unicore/lib/Nv/600.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/7.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/70.pl type=file

+c:\tlperl\lib/unicore/lib/Nv/700.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/8.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/80.pl type=file

+c:\tlperl\lib/unicore/lib/Nv/800.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/9.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/90.pl type=file

 c:\tlperl\lib/unicore/lib/Nv/900.pl type=file

 c:\tlperl\lib/unicore/lib/PatSyn/Y.pl type=file

-c:\tlperl\lib/unicore/lib/PatWS/Y.pl type=file

 c:\tlperl\lib/unicore/lib/Perl/Alnum.pl type=file

 c:\tlperl\lib/unicore/lib/Perl/Assigned.pl type=file

 c:\tlperl\lib/unicore/lib/Perl/Blank.pl type=file

@@ -1373,6 +1420,8 @@ c:\tlperl\lib/unicore/lib/Perl/_PerlCha.pl type=file
 c:\tlperl\lib/unicore/lib/Perl/_PerlFol.pl type=file

 c:\tlperl\lib/unicore/lib/Perl/_PerlIDC.pl type=file

 c:\tlperl\lib/unicore/lib/Perl/_PerlIDS.pl type=file

+c:\tlperl\lib/unicore/lib/Perl/_PerlNch.pl type=file

+c:\tlperl\lib/unicore/lib/Perl/_PerlPat.pl type=file

 c:\tlperl\lib/unicore/lib/Perl/_PerlPr2.pl type=file

 c:\tlperl\lib/unicore/lib/Perl/_PerlPro.pl type=file

 c:\tlperl\lib/unicore/lib/Perl/_PerlQuo.pl type=file

@@ -1421,12 +1470,14 @@ c:\tlperl\lib/unicore/lib/Sc/Limb.pl type=file
 c:\tlperl\lib/unicore/lib/Sc/Linb.pl type=file

 c:\tlperl\lib/unicore/lib/Sc/Mlym.pl type=file

 c:\tlperl\lib/unicore/lib/Sc/Mong.pl type=file

+c:\tlperl\lib/unicore/lib/Sc/Mult.pl type=file

 c:\tlperl\lib/unicore/lib/Sc/Orya.pl type=file

 c:\tlperl\lib/unicore/lib/Sc/Sinh.pl type=file

 c:\tlperl\lib/unicore/lib/Sc/Talu.pl type=file

 c:\tlperl\lib/unicore/lib/Sc/Taml.pl type=file

 c:\tlperl\lib/unicore/lib/Sc/Telu.pl type=file

 c:\tlperl\lib/unicore/lib/Sc/Tibt.pl type=file

+c:\tlperl\lib/unicore/lib/Sc/Xsux.pl type=file

 c:\tlperl\lib/unicore/lib/Sc/Zinh.pl type=file

 c:\tlperl\lib/unicore/lib/Sc/Zyyy.pl type=file

 c:\tlperl\lib/unicore/lib/Sc/Zzzz.pl type=file

@@ -1441,6 +1492,7 @@ c:\tlperl\lib/unicore/lib/Scx/Cyrl.pl type=file
 c:\tlperl\lib/unicore/lib/Scx/Deva.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Dupl.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Geor.pl type=file

+c:\tlperl\lib/unicore/lib/Scx/Glag.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Gran.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Grek.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Gujr.pl type=file

@@ -1455,9 +1507,11 @@ c:\tlperl\lib/unicore/lib/Scx/Limb.pl type=file
 c:\tlperl\lib/unicore/lib/Scx/Linb.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Mlym.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Mong.pl type=file

+c:\tlperl\lib/unicore/lib/Scx/Mult.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Mymr.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Orya.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Phlp.pl type=file

+c:\tlperl\lib/unicore/lib/Scx/Shrd.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Sind.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Sinh.pl type=file

 c:\tlperl\lib/unicore/lib/Scx/Syrc.pl type=file

@@ -1493,7 +1547,6 @@ c:\tlperl\lib/version.pm type=file
 c:\tlperl\lib/version.pod type=file

 c:\tlperl\lib/version/Internals.pod type=file

 c:\tlperl\lib/version/regex.pm type=file

-c:\tlperl\lib/version/vpp.pm type=file

 c:\tlperl\lib/vmsish.pm type=file

 c:\tlperl\lib/warnings.pm type=file

 c:\tlperl\lib/warnings/register.pm type=file

diff --git a/Master/tlpkg/tlperl/lib/App/Cpan.pm b/Master/tlpkg/tlperl/lib/App/Cpan.pm
index e8c9bb78eea..94607d9b0f2 100644
--- a/Master/tlpkg/tlperl/lib/App/Cpan.pm
+++ b/Master/tlpkg/tlperl/lib/App/Cpan.pm
@@ -6,7 +6,7 @@ use vars qw($VERSION);
 
 use if $] < 5.008 => 'IO::Scalar';
 
-$VERSION = '1.63';
+$VERSION = '1.63_01';
 
 =head1 NAME
 
@@ -530,9 +530,20 @@ sub AUTOLOAD { 1 }
 sub DESTROY { 1 }
 }
 
+# load a module without searching the default entry for the current
+# directory
+sub _safe_load_module {
+  my $name = shift;
+
+  local @INC = @INC;
+  pop @INC if $INC[-1] eq '.';
+
+  eval "require $name; 1";
+}
+
 sub _init_logger
 	{
-	my $log4perl_loaded = eval "require Log::Log4perl; 1";
+	my $log4perl_loaded = _safe_load_module("Log::Log4perl");
 
     unless( $log4perl_loaded )
         {
@@ -993,7 +1004,7 @@ sub _load_local_lib # -I
 	{
 	$logger->debug( "Loading local::lib" );
 
-	my $rc = eval { require local::lib; 1; };
+	my $rc = _safe_load_module("local::lib");
 	unless( $rc ) {
 		$logger->die( "Could not load local::lib" );
 		}
@@ -1121,7 +1132,7 @@ sub _get_file
 	{
 	my $path = shift;
 
-	my $loaded = eval "require LWP::Simple; 1;";
+	my $loaded = _safe_load_module("LWP::Simple");
 	croak "You need LWP::Simple to use features that fetch files from CPAN\n"
 		unless $loaded;
 
@@ -1143,7 +1154,7 @@ sub _gitify
 	{
 	my $args = shift;
 
-	my $loaded = eval "require Archive::Extract; 1;";
+	my $loaded = _safe_load_module("Archive::Extract");
 	croak "You need Archive::Extract to use features that gitify distributions\n"
 		unless $loaded;
 
@@ -1207,7 +1218,7 @@ sub _show_Changes
 sub _get_changes_file
 	{
 	croak "Reading Changes files requires LWP::Simple and URI\n"
-		unless eval "require LWP::Simple; require URI; 1";
+		unless _safe_load_module("LWP::Simple") && _safe_load_module("URI");
 
     my $url = shift;
 
diff --git a/Master/tlpkg/tlperl/lib/App/Prove.pm b/Master/tlpkg/tlperl/lib/App/Prove.pm
index 46089782869..32eb59c2a5c 100644
--- a/Master/tlpkg/tlperl/lib/App/Prove.pm
+++ b/Master/tlpkg/tlperl/lib/App/Prove.pm
@@ -18,11 +18,11 @@ App::Prove - Implements the C<prove> command.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/App/Prove/State.pm b/Master/tlpkg/tlperl/lib/App/Prove/State.pm
index 0e237d5fa4d..e352fb3f4a5 100644
--- a/Master/tlpkg/tlperl/lib/App/Prove/State.pm
+++ b/Master/tlpkg/tlperl/lib/App/Prove/State.pm
@@ -25,11 +25,11 @@ App::Prove::State - State storage for the C<prove> command.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/App/Prove/State/Result.pm b/Master/tlpkg/tlperl/lib/App/Prove/State/Result.pm
index 6725c5a38a5..931e52b1d95 100644
--- a/Master/tlpkg/tlperl/lib/App/Prove/State/Result.pm
+++ b/Master/tlpkg/tlperl/lib/App/Prove/State/Result.pm
@@ -14,11 +14,11 @@ App::Prove::State::Result - Individual test suite results.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/App/Prove/State/Result/Test.pm b/Master/tlpkg/tlperl/lib/App/Prove/State/Result/Test.pm
index a776f8ffef0..4819ed82183 100644
--- a/Master/tlpkg/tlperl/lib/App/Prove/State/Result/Test.pm
+++ b/Master/tlpkg/tlperl/lib/App/Prove/State/Result/Test.pm
@@ -9,11 +9,11 @@ App::Prove::State::Result::Test - Individual test results.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/Archive/Tar.pm b/Master/tlpkg/tlperl/lib/Archive/Tar.pm
index 1b792df8024..6a047a32d6c 100644
--- a/Master/tlpkg/tlperl/lib/Archive/Tar.pm
+++ b/Master/tlpkg/tlperl/lib/Archive/Tar.pm
@@ -31,7 +31,7 @@ use vars qw[$DEBUG $error $VERSION $WARN $FOLLOW_SYMLINK $CHOWN $CHMOD
 $DEBUG                  = 0;
 $WARN                   = 1;
 $FOLLOW_SYMLINK         = 0;
-$VERSION                = "2.04";
+$VERSION                = "2.04_01";
 $CHOWN                  = 1;
 $CHMOD                  = 1;
 $SAME_PERMISSIONS       = $> == 0 ? 1 : 0;
diff --git a/Master/tlpkg/tlperl/lib/Archive/Tar/Constant.pm b/Master/tlpkg/tlperl/lib/Archive/Tar/Constant.pm
index 399aaf69707..f9557e90197 100644
--- a/Master/tlpkg/tlperl/lib/Archive/Tar/Constant.pm
+++ b/Master/tlpkg/tlperl/lib/Archive/Tar/Constant.pm
@@ -3,7 +3,7 @@ package Archive::Tar::Constant;
 BEGIN {
     require Exporter;
 
-    $VERSION    = '2.04';
+    $VERSION    = '2.04_01';
     @ISA        = qw[Exporter];
 
     require Time::Local if $^O eq "MacOS";
diff --git a/Master/tlpkg/tlperl/lib/Archive/Tar/File.pm b/Master/tlpkg/tlperl/lib/Archive/Tar/File.pm
index 3aa1b3cd9ae..3ecad56fab2 100644
--- a/Master/tlpkg/tlperl/lib/Archive/Tar/File.pm
+++ b/Master/tlpkg/tlperl/lib/Archive/Tar/File.pm
@@ -13,7 +13,7 @@ use Archive::Tar::Constant;
 
 use vars qw[@ISA $VERSION];
 #@ISA        = qw[Archive::Tar];
-$VERSION    = '2.04';
+$VERSION    = '2.04_01';
 
 ### set value to 1 to oct() it during the unpack ###
 
diff --git a/Master/tlpkg/tlperl/lib/Attribute/Handlers.pm b/Master/tlpkg/tlperl/lib/Attribute/Handlers.pm
index 17c4bb78fc2..7c049d48e6f 100644
--- a/Master/tlpkg/tlperl/lib/Attribute/Handlers.pm
+++ b/Master/tlpkg/tlperl/lib/Attribute/Handlers.pm
@@ -4,7 +4,7 @@ use Carp;
 use warnings;
 use strict;
 use vars qw($VERSION $AUTOLOAD);
-$VERSION = '0.97'; # remember to update version in POD!
+$VERSION = '0.99'; # remember to update version in POD!
 # $DB::single=1;
 
 my %symcache;
@@ -270,7 +270,7 @@ Attribute::Handlers - Simpler definition of attribute handlers
 
 =head1 VERSION
 
-This document describes version 0.97 of Attribute::Handlers.
+This document describes version 0.99 of Attribute::Handlers.
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/B.pm b/Master/tlpkg/tlperl/lib/B.pm
index 0a7727cec0f..5c1e5997b83 100644
--- a/Master/tlpkg/tlperl/lib/B.pm
+++ b/Master/tlpkg/tlperl/lib/B.pm
@@ -15,7 +15,7 @@ require Exporter;
 # walkoptree comes from B.xs
 
 BEGIN {
-    $B::VERSION = '1.58';
+    $B::VERSION = '1.62';
     @B::EXPORT_OK = ();
 
     # Our BOOT code needs $VERSION set, and will append to @EXPORT_OK.
@@ -274,72 +274,6 @@ sub walksymtable {
     }
 }
 
-{
-    package B::Section;
-    my $output_fh;
-    my %sections;
-
-    sub new {
-	my ($class, $section, $symtable, $default) = @_;
-	$output_fh ||= FileHandle->new_tmpfile;
-	my $obj = bless [-1, $section, $symtable, $default], $class;
-	$sections{$section} = $obj;
-	return $obj;
-    }
-
-    sub get {
-	my ($class, $section) = @_;
-	return $sections{$section};
-    }
-
-    sub add {
-	my $section = shift;
-	while (defined($_ = shift)) {
-	    print $output_fh "$section->[1]\t$_\n";
-	    $section->[0]++;
-	}
-    }
-
-    sub index {
-	my $section = shift;
-	return $section->[0];
-    }
-
-    sub name {
-	my $section = shift;
-	return $section->[1];
-    }
-
-    sub symtable {
-	my $section = shift;
-	return $section->[2];
-    }
-
-    sub default {
-	my $section = shift;
-	return $section->[3];
-    }
-
-    sub output {
-	my ($section, $fh, $format) = @_;
-	my $name = $section->name;
-	my $sym = $section->symtable || {};
-	my $default = $section->default;
-
-	seek($output_fh, 0, 0);
-	while (<$output_fh>) {
-	    chomp;
-	    s/^(.*?)\t//;
-	    if ($1 eq $name) {
-		s{(s\\_[0-9a-f]+)} {
-		    exists($sym->{$1}) ? $sym->{$1} : $default;
-		}ge;
-		printf $fh $format, $_;
-	    }
-	}
-    }
-}
-
 1;
 
 __END__
diff --git a/Master/tlpkg/tlperl/lib/B/Deparse.pm b/Master/tlpkg/tlperl/lib/B/Deparse.pm
index d4c6f6061ac..9879d678b17 100644
--- a/Master/tlpkg/tlperl/lib/B/Deparse.pm
+++ b/Master/tlpkg/tlperl/lib/B/Deparse.pm
@@ -46,7 +46,7 @@ use B qw(class main_root main_start main_cv svref_2object opnumber perlstring
         MDEREF_SHIFT
     );
 
-$VERSION = '1.35';
+$VERSION = '1.37';
 use strict;
 use vars qw/$AUTOLOAD/;
 use warnings ();
@@ -58,12 +58,12 @@ BEGIN {
     # be to fake up a dummy constant that will never actually be true.
     foreach (qw(OPpSORT_INPLACE OPpSORT_DESCEND OPpITER_REVERSED OPpCONST_NOVER
 		OPpPAD_STATE PMf_SKIPWHITE RXf_SKIPWHITE
-		RXf_PMf_CHARSET RXf_PMf_KEEPCOPY CVf_ANONCONST
+		PMf_CHARSET PMf_KEEPCOPY PMf_NOCAPTURE CVf_ANONCONST
 		CVf_LOCKED OPpREVERSE_INPLACE OPpSUBSTR_REPL_FIRST
 		PMf_NONDESTRUCT OPpCONST_ARYBASE OPpEVAL_BYTES
 		OPpLVREF_TYPE OPpLVREF_SV OPpLVREF_AV OPpLVREF_HV
 		OPpLVREF_CV OPpLVREF_ELEM SVpad_STATE)) {
-	eval { import B $_ };
+	eval { B->import($_) };
 	no strict 'refs';
 	*{$_} = sub () {0} unless *{$_}{CODE};
     }
@@ -2642,10 +2642,11 @@ sub pp_readline {
     my $self = shift;
     my($op, $cx) = @_;
     my $kid = $op->first;
-    if (is_scalar($kid)) {
-        my $kid_deparsed = $self->deparse($kid, 1);
-        return '<<>>' if $op->flags & OPf_SPECIAL and $kid_deparsed eq 'ARGV';
-        return "<$kid_deparsed>";
+    if (is_scalar($kid)
+        and $op->flags & OPf_SPECIAL
+        and $self->deparse($kid, 1) eq 'ARGV')
+    {
+        return '<<>>';
     }
     return $self->unop($op, $cx, "readline");
 }
@@ -3221,19 +3222,10 @@ sub pp_glob {
     my $kid = $op->first->sibling;  # skip pushmark
     my $keyword =
 	$op->flags & OPf_SPECIAL ? 'glob' : $self->keyword('glob');
-    my $text;
-    if ($keyword =~ /^CORE::/
-	or $kid->name ne 'const'
-	or ($text = $self->dq($kid))
-	     =~ /^\$?(\w|::|\`)+$/ # could look like a readline
-        or $text =~ /[<>]/) {
-	$text = $self->deparse($kid);
-	return $cx >= 5 || $self->{'parens'}
-	    ? "$keyword($text)"
-	    : "$keyword $text";
-    } else {
-	return '<' . $text . '>';
-    }
+    my $text = $self->deparse($kid);
+    return $cx >= 5 || $self->{'parens'}
+	? "$keyword($text)"
+	: "$keyword $text";
 }
 
 # Truncate is special because OPf_SPECIAL makes a bareword first arg
@@ -5437,8 +5429,9 @@ sub re_flags {
     $flags .= "s" if $pmflags & PMf_SINGLELINE;
     $flags .= "x" if $pmflags & PMf_EXTENDED;
     $flags .= "x" if $pmflags & PMf_EXTENDED_MORE;
-    $flags .= "p" if $pmflags & RXf_PMf_KEEPCOPY;
-    if (my $charset = $pmflags & RXf_PMf_CHARSET) {
+    $flags .= "p" if $pmflags & PMf_KEEPCOPY;
+    $flags .= "n" if $pmflags & PMf_NOCAPTURE;
+    if (my $charset = $pmflags & PMf_CHARSET) {
 	# Hardcoding this is fragile, but B does not yet export the
 	# constants we need.
 	$flags .= qw(d l u a aa)[$charset >> 7]
@@ -5450,10 +5443,8 @@ sub re_flags {
 	or $self->{hints} & $feature::hint_mask
 	  && ($self->{hints} & $feature::hint_mask)
 	       != $feature::hint_mask
-	  && do {
-		$self->{hints} & $feature::hint_uni8bit;
-	     }
-  ) {
+	  && $self->{hints} & $feature::hint_uni8bit
+    ) {
 	$flags .= 'd';
     }
     $flags;
diff --git a/Master/tlpkg/tlperl/lib/B/Op_private.pm b/Master/tlpkg/tlperl/lib/B/Op_private.pm
index 20b598eaaa5..c6c8906c442 100644
--- a/Master/tlpkg/tlperl/lib/B/Op_private.pm
+++ b/Master/tlpkg/tlperl/lib/B/Op_private.pm
@@ -118,7 +118,7 @@ package B::Op_private;
 our %bits;
 
 
-our $VERSION = "5.022001";
+our $VERSION = "5.024001";
 
 $bits{$_}{3} = 'OPpENTERSUB_AMPER' for qw(entersub rv2cv);
 $bits{$_}{6} = 'OPpENTERSUB_DB' for qw(entersub rv2cv);
@@ -128,16 +128,15 @@ $bits{$_}{1} = 'OPpFT_ACCESS' for qw(fteexec fteread ftewrite ftrexec ftrread ft
 $bits{$_}{4} = 'OPpFT_AFTER_t' for qw(ftatime ftbinary ftblk ftchr ftctime ftdir fteexec fteowned fteread ftewrite ftfile ftis ftlink ftmtime ftpipe ftrexec ftrowned ftrread ftrwrite ftsgid ftsize ftsock ftsuid ftsvtx fttext fttty ftzero);
 $bits{$_}{2} = 'OPpFT_STACKED' for qw(ftatime ftbinary ftblk ftchr ftctime ftdir fteexec fteowned fteread ftewrite ftfile ftis ftlink ftmtime ftpipe ftrexec ftrowned ftrread ftrwrite ftsgid ftsize ftsock ftsuid ftsvtx fttext fttty ftzero);
 $bits{$_}{3} = 'OPpFT_STACKING' for qw(ftatime ftbinary ftblk ftchr ftctime ftdir fteexec fteowned fteread ftewrite ftfile ftis ftlink ftmtime ftpipe ftrexec ftrowned ftrread ftrwrite ftsgid ftsize ftsock ftsuid ftsvtx fttext fttty ftzero);
-$bits{$_}{1} = 'OPpGREP_LEX' for qw(grepstart grepwhile mapstart mapwhile);
 $bits{$_}{1} = 'OPpHINT_STRICT_REFS' for qw(entersub multideref rv2av rv2cv rv2gv rv2hv rv2sv);
 $bits{$_}{5} = 'OPpHUSH_VMSISH' for qw(dbstate nextstate);
-$bits{$_}{2} = 'OPpITER_REVERSED' for qw(enteriter iter);
+$bits{$_}{1} = 'OPpITER_REVERSED' for qw(enteriter iter);
 $bits{$_}{7} = 'OPpLVALUE' for qw(leave leaveloop);
 $bits{$_}{6} = 'OPpLVAL_DEFER' for qw(aelem helem multideref);
 $bits{$_}{7} = 'OPpLVAL_INTRO' for qw(aelem aslice cond_expr delete enteriter entersub gvsv helem hslice list lvavref lvref lvrefslice multideref padav padhv padrange padsv pushmark refassign rv2av rv2gv rv2hv rv2sv);
 $bits{$_}{2} = 'OPpLVREF_ELEM' for qw(lvref refassign);
 $bits{$_}{3} = 'OPpLVREF_ITER' for qw(lvref refassign);
-$bits{$_}{3} = 'OPpMAYBE_LVSUB' for qw(aassign aelem aslice av2arylen helem hslice keys kvaslice kvhslice multideref padav padhv pos rkeys rv2av rv2gv rv2hv substr vec);
+$bits{$_}{3} = 'OPpMAYBE_LVSUB' for qw(aassign aelem aslice av2arylen helem hslice keys kvaslice kvhslice multideref padav padhv pos rv2av rv2gv rv2hv substr vec);
 $bits{$_}{4} = 'OPpMAYBE_TRUEBOOL' for qw(padhv rv2hv);
 $bits{$_}{7} = 'OPpOFFBYONE' for qw(caller runcv wantarray);
 $bits{$_}{5} = 'OPpOPEN_IN_CRLF' for qw(backtick open);
@@ -150,7 +149,7 @@ $bits{$_}{7} = 'OPpPV_IS_UTF8' for qw(dump goto last next redo);
 $bits{$_}{6} = 'OPpREFCOUNTED' for qw(leave leaveeval leavesub leavesublv leavewrite);
 $bits{$_}{6} = 'OPpRUNTIME' for qw(match pushre qr subst substcont);
 $bits{$_}{2} = 'OPpSLICEWARNING' for qw(aslice hslice padav padhv rv2av rv2hv);
-$bits{$_}{4} = 'OPpTARGET_MY' for qw(abs add atan2 chdir chmod chomp chown chr chroot concat cos crypt divide exec exp flock getpgrp getppid getpriority hex i_add i_divide i_modulo i_multiply i_subtract index int kill left_shift length link log match mkdir modulo multiply nbit_and nbit_or nbit_xor ncomplement oct ord pow push pushre qr rand rename right_shift rindex rmdir schomp scomplement setpgrp setpriority sin sleep sqrt srand stringify subst subtract symlink system time trans transr unlink unshift utime wait waitpid);
+$bits{$_}{4} = 'OPpTARGET_MY' for qw(abs add atan2 chdir chmod chomp chown chr chroot concat cos crypt divide exec exp flock getpgrp getppid getpriority hex i_add i_divide i_modulo i_multiply i_subtract index int kill left_shift length link log mkdir modulo multiply nbit_and nbit_or nbit_xor ncomplement oct ord pow push rand rename right_shift rindex rmdir schomp scomplement setpgrp setpriority sin sleep sqrt srand stringify subtract symlink system time unlink unshift utime wait waitpid);
 $bits{$_}{5} = 'OPpTRANS_COMPLEMENT' for qw(trans transr);
 $bits{$_}{7} = 'OPpTRANS_DELETE' for qw(trans transr);
 $bits{$_}{0} = 'OPpTRANS_FROM_UTF' for qw(trans transr);
@@ -228,7 +227,7 @@ my @bf = (
     },
 );
 
-@{$bits{aassign}}{6,1,0} = ('OPpASSIGN_COMMON', $bf[1], $bf[1]);
+@{$bits{aassign}}{6,5,4,1,0} = ('OPpASSIGN_COMMON_SCALAR', 'OPpASSIGN_COMMON_RC1', 'OPpASSIGN_COMMON_AGG', $bf[1], $bf[1]);
 $bits{abs}{0} = $bf[0];
 @{$bits{accept}}{3,2,1,0} = ($bf[3], $bf[3], $bf[3], $bf[3]);
 @{$bits{add}}{1,0} = ($bf[1], $bf[1]);
@@ -452,7 +451,6 @@ $bits{prototype}{0} = $bf[0];
 $bits{quotemeta}{0} = $bf[0];
 @{$bits{rand}}{3,2,1,0} = ($bf[3], $bf[3], $bf[3], $bf[3]);
 $bits{range}{0} = $bf[0];
-$bits{reach}{0} = $bf[0];
 @{$bits{read}}{3,2,1,0} = ($bf[3], $bf[3], $bf[3], $bf[3]);
 $bits{readdir}{0} = $bf[0];
 $bits{readline}{0} = $bf[0];
@@ -473,14 +471,12 @@ $bits{require}{0} = $bf[0];
 $bits{rewinddir}{0} = $bf[0];
 @{$bits{right_shift}}{1,0} = ($bf[1], $bf[1]);
 @{$bits{rindex}}{3,2,1,0} = ($bf[3], $bf[3], $bf[3], $bf[3]);
-$bits{rkeys}{0} = $bf[0];
 $bits{rmdir}{0} = $bf[0];
 $bits{rv2av}{0} = $bf[0];
 @{$bits{rv2cv}}{7,5,0} = ('OPpENTERSUB_NOPAREN', 'OPpMAY_RETURN_CONSTANT', $bf[0]);
 @{$bits{rv2gv}}{6,5,4,2,0} = ('OPpALLOW_FAKE', $bf[6], $bf[6], 'OPpDONT_INIT_GV', $bf[0]);
 $bits{rv2hv}{0} = $bf[0];
 @{$bits{rv2sv}}{5,4,0} = ($bf[6], $bf[6], $bf[0]);
-$bits{rvalues}{0} = $bf[0];
 @{$bits{sassign}}{7,6,1,0} = ('OPpASSIGN_CV_TO_GV', 'OPpASSIGN_BACKWARDS', $bf[1], $bf[1]);
 @{$bits{sbit_and}}{1,0} = ($bf[1], $bf[1]);
 @{$bits{sbit_or}}{1,0} = ($bf[1], $bf[1]);
@@ -570,7 +566,9 @@ our %defines = (
     OPpARG3_MASK             =>   7,
     OPpARG4_MASK             =>  15,
     OPpASSIGN_BACKWARDS      =>  64,
-    OPpASSIGN_COMMON         =>  64,
+    OPpASSIGN_COMMON_AGG     =>  16,
+    OPpASSIGN_COMMON_RC1     =>  32,
+    OPpASSIGN_COMMON_SCALAR  =>  64,
     OPpASSIGN_CV_TO_GV       => 128,
     OPpCONST_BARE            =>  64,
     OPpCONST_ENTERED         =>  16,
@@ -603,11 +601,10 @@ our %defines = (
     OPpFT_AFTER_t            =>  16,
     OPpFT_STACKED            =>   4,
     OPpFT_STACKING           =>   8,
-    OPpGREP_LEX              =>   2,
     OPpHINT_STRICT_REFS      =>   2,
     OPpHUSH_VMSISH           =>  32,
     OPpITER_DEF              =>   8,
-    OPpITER_REVERSED         =>   4,
+    OPpITER_REVERSED         =>   2,
     OPpLIST_GUESSED          =>  64,
     OPpLVALUE                => 128,
     OPpLVAL_DEFER            =>  64,
@@ -663,7 +660,9 @@ our %defines = (
 our %labels = (
     OPpALLOW_FAKE            => 'FAKE',
     OPpASSIGN_BACKWARDS      => 'BKWARD',
-    OPpASSIGN_COMMON         => 'COMMON',
+    OPpASSIGN_COMMON_AGG     => 'COM_AGG',
+    OPpASSIGN_COMMON_RC1     => 'COM_RC1',
+    OPpASSIGN_COMMON_SCALAR  => 'COM_SCALAR',
     OPpASSIGN_CV_TO_GV       => 'CV2GV',
     OPpCONST_BARE            => 'BARE',
     OPpCONST_ENTERED         => 'ENTERED',
@@ -695,7 +694,6 @@ our %labels = (
     OPpFT_AFTER_t            => 'FTAFTERt',
     OPpFT_STACKED            => 'FTSTACKED',
     OPpFT_STACKING           => 'FTSTACKING',
-    OPpGREP_LEX              => 'GREPLEX',
     OPpHINT_STRICT_REFS      => 'STRICT',
     OPpHUSH_VMSISH           => 'HUSH',
     OPpITER_DEF              => 'DEF',
@@ -753,7 +751,7 @@ our %labels = (
 our %ops_using = (
     OPpALLOW_FAKE            => [qw(rv2gv)],
     OPpASSIGN_BACKWARDS      => [qw(sassign)],
-    OPpASSIGN_COMMON         => [qw(aassign)],
+    OPpASSIGN_COMMON_AGG     => [qw(aassign)],
     OPpCONST_BARE            => [qw(const)],
     OPpCOREARGS_DEREF1       => [qw(coreargs)],
     OPpEARLY_CV              => [qw(gv)],
@@ -765,7 +763,6 @@ our %ops_using = (
     OPpFLIP_LINENUM          => [qw(flip flop)],
     OPpFT_ACCESS             => [qw(fteexec fteread ftewrite ftrexec ftrread ftrwrite)],
     OPpFT_AFTER_t            => [qw(ftatime ftbinary ftblk ftchr ftctime ftdir fteexec fteowned fteread ftewrite ftfile ftis ftlink ftmtime ftpipe ftrexec ftrowned ftrread ftrwrite ftsgid ftsize ftsock ftsuid ftsvtx fttext fttty ftzero)],
-    OPpGREP_LEX              => [qw(grepstart grepwhile mapstart mapwhile)],
     OPpHINT_STRICT_REFS      => [qw(entersub multideref rv2av rv2cv rv2gv rv2hv rv2sv)],
     OPpHUSH_VMSISH           => [qw(dbstate nextstate)],
     OPpITER_DEF              => [qw(enteriter)],
@@ -775,7 +772,7 @@ our %ops_using = (
     OPpLVAL_DEFER            => [qw(aelem helem multideref)],
     OPpLVAL_INTRO            => [qw(aelem aslice cond_expr delete enteriter entersub gvsv helem hslice list lvavref lvref lvrefslice multideref padav padhv padrange padsv pushmark refassign rv2av rv2gv rv2hv rv2sv)],
     OPpLVREF_ELEM            => [qw(lvref refassign)],
-    OPpMAYBE_LVSUB           => [qw(aassign aelem aslice av2arylen helem hslice keys kvaslice kvhslice multideref padav padhv pos rkeys rv2av rv2gv rv2hv substr vec)],
+    OPpMAYBE_LVSUB           => [qw(aassign aelem aslice av2arylen helem hslice keys kvaslice kvhslice multideref padav padhv pos rv2av rv2gv rv2hv substr vec)],
     OPpMAYBE_TRUEBOOL        => [qw(padhv rv2hv)],
     OPpMULTIDEREF_DELETE     => [qw(multideref)],
     OPpOFFBYONE              => [qw(caller runcv wantarray)],
@@ -792,10 +789,12 @@ our %ops_using = (
     OPpSORT_DESCEND          => [qw(sort)],
     OPpSPLIT_IMPLIM          => [qw(split)],
     OPpSUBSTR_REPL_FIRST     => [qw(substr)],
-    OPpTARGET_MY             => [qw(abs add atan2 chdir chmod chomp chown chr chroot concat cos crypt divide exec exp flock getpgrp getppid getpriority hex i_add i_divide i_modulo i_multiply i_subtract index int kill left_shift length link log match mkdir modulo multiply nbit_and nbit_or nbit_xor ncomplement oct ord pow push pushre qr rand rename right_shift rindex rmdir schomp scomplement setpgrp setpriority sin sleep sqrt srand stringify subst subtract symlink system time trans transr unlink unshift utime wait waitpid)],
+    OPpTARGET_MY             => [qw(abs add atan2 chdir chmod chomp chown chr chroot concat cos crypt divide exec exp flock getpgrp getppid getpriority hex i_add i_divide i_modulo i_multiply i_subtract index int kill left_shift length link log mkdir modulo multiply nbit_and nbit_or nbit_xor ncomplement oct ord pow push rand rename right_shift rindex rmdir schomp scomplement setpgrp setpriority sin sleep sqrt srand stringify subtract symlink system time unlink unshift utime wait waitpid)],
     OPpTRANS_COMPLEMENT      => [qw(trans transr)],
 );
 
+$ops_using{OPpASSIGN_COMMON_RC1} = $ops_using{OPpASSIGN_COMMON_AGG};
+$ops_using{OPpASSIGN_COMMON_SCALAR} = $ops_using{OPpASSIGN_COMMON_AGG};
 $ops_using{OPpASSIGN_CV_TO_GV} = $ops_using{OPpASSIGN_BACKWARDS};
 $ops_using{OPpCONST_ENTERED} = $ops_using{OPpCONST_BARE};
 $ops_using{OPpCONST_NOVER} = $ops_using{OPpCONST_BARE};
diff --git a/Master/tlpkg/tlperl/lib/Benchmark.pm b/Master/tlpkg/tlperl/lib/Benchmark.pm
index b3016788080..253716214fa 100644
--- a/Master/tlpkg/tlperl/lib/Benchmark.pm
+++ b/Master/tlpkg/tlperl/lib/Benchmark.pm
@@ -482,7 +482,7 @@ our(@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $VERSION);
 	      clearcache clearallcache disablecache enablecache);
 %EXPORT_TAGS=( all => [ @EXPORT, @EXPORT_OK ] ) ;
 
-$VERSION = 1.20;
+$VERSION = 1.22;
 
 # --- ':hireswallclock' special handling
 
@@ -585,6 +585,17 @@ sub cpu_a { my($r,$pu,$ps,$cu,$cs) = @{$_[0]}; $pu+$ps+$cu+$cs ; }
 sub real  { my($r,$pu,$ps,$cu,$cs) = @{$_[0]}; $r              ; }
 sub iters { $_[0]->[5] ; }
 
+# return the sum of various times: which ones depending on $style
+
+sub elapsed {
+    my ($self, $style) = @_;
+    $style = "" unless defined $style;
+
+    return $self->cpu_c if $style eq 'nop';
+    return $self->cpu_p if $style eq 'noc';
+    return $self->cpu_a;
+}
+
 
 $_Usage{timediff} = <<'USAGE';
 usage: $result_diff = timediff($result1, $result2);
@@ -647,11 +658,7 @@ sub timestr {
 			    $r,$pu,$ps,$pt) if $style eq 'noc';
     $s = sprintf("$w wallclock secs (%$f cusr + %$f csys = %$f CPU)",
 			    $r,$cu,$cs,$ct) if $style eq 'nop';
-    my $elapsed = do {
-	if ($style eq 'nop') {$cu+$cs}
-	elsif ($style eq 'noc') {$pu+$ps}
-	else {$cu+$cs+$pu+$ps}
-    };
+    my $elapsed = $tr->elapsed($style);
     $s .= sprintf(" @ %$f/s (n=$n)",$n/($elapsed)) if $n && $elapsed;
     $s;
 }
@@ -897,6 +904,16 @@ sub timethis{
 
     $n = $forn if defined $forn;
 
+    if ($t->elapsed($style) < 0) {
+        # due to clock granularity and variable CPU speed and load,
+        # on quick code with a small number of loops, it's possible for
+        # the empty loop to appear to take longer than the real loop
+        # (e.g. 1 tick versus 0 ticks). This leads to a negative elapsed
+        # time. In this case, floor it at zero, to stop bizarre results.
+        print "            (warning: too few iterations for a reliable count)\n";
+        $t->[$_] = 0 for 1..4;
+    }
+
     # A conservative warning to spot very silly tests.
     # Don't assume that your benchmark is ok simply because
     # you don't get this warning!
@@ -973,13 +990,11 @@ sub cmpthese{
     my @vals = map{ [ $_, @{$results->{$_}} ] } keys %$results;
 
     for (@vals) {
+        # recreate the pre-flattened Benchmark object
+        my $tmp_bm = bless [ @{$_}[1..$#$_] ];
+	my $elapsed = $tmp_bm->elapsed($style);
 	# The epsilon fudge here is to prevent div by 0.  Since clock
 	# resolutions are much larger, it's below the noise floor.
-	my $elapsed = do {
-	    if ($style eq 'nop') {$_->[4]+$_->[5]}
-	    elsif ($style eq 'noc') {$_->[2]+$_->[3]}
-	    else {$_->[2]+$_->[3]+$_->[4]+$_->[5]}
-	};
 	my $rate = $_->[6]/(($elapsed)+0.000000000000001);
 	$_->[7] = $rate;
     }
diff --git a/Master/tlpkg/tlperl/lib/CORE/EXTERN.h b/Master/tlpkg/tlperl/lib/CORE/EXTERN.h
index 4e4f1addcc4..db8db2b24f0 100644
--- a/Master/tlpkg/tlperl/lib/CORE/EXTERN.h
+++ b/Master/tlpkg/tlperl/lib/CORE/EXTERN.h
@@ -28,14 +28,14 @@
 #      define dEXTCONST const
 #    else
 #      if defined(PERLDLL) || defined(__SYMBIAN32__)
-#        define EXT extern __declspec(dllexport)
+#        define EXT EXTERN_C __declspec(dllexport)
 #        define dEXT 
-#        define EXTCONST extern __declspec(dllexport) const
+#        define EXTCONST EXTERN_C __declspec(dllexport) const
 #        define dEXTCONST const
 #      else
-#        define EXT extern __declspec(dllimport)
+#        define EXT EXTERN_C __declspec(dllimport)
 #        define dEXT 
-#        define EXTCONST extern __declspec(dllimport) const
+#        define EXTCONST EXTERN_C __declspec(dllimport) const
 #        define dEXTCONST const
 #      endif
 #    endif
diff --git a/Master/tlpkg/tlperl/lib/CORE/INTERN.h b/Master/tlpkg/tlperl/lib/CORE/INTERN.h
index e6e06026576..eaaf6b2c641 100644
--- a/Master/tlpkg/tlperl/lib/CORE/INTERN.h
+++ b/Master/tlpkg/tlperl/lib/CORE/INTERN.h
@@ -35,7 +35,7 @@
 #    ifdef __cplusplus
 #      define EXT
 #      define dEXT
-#      define EXTCONST extern const
+#      define EXTCONST EXTERN_C const
 #      define dEXTCONST const
 #    else
 #      define EXT
diff --git a/Master/tlpkg/tlperl/lib/CORE/XSUB.h b/Master/tlpkg/tlperl/lib/CORE/XSUB.h
index 49c15f744e7..e64bc83b929 100644
--- a/Master/tlpkg/tlperl/lib/CORE/XSUB.h
+++ b/Master/tlpkg/tlperl/lib/CORE/XSUB.h
@@ -18,7 +18,8 @@
 
 =for apidoc Amn|char*|CLASS
 Variable which is setup by C<xsubpp> to indicate the 
-class name for a C++ XS constructor.  This is always a C<char*>.  See C<THIS>.
+class name for a C++ XS constructor.  This is always a C<char*>.  See
+C<L</THIS>>.
 
 =for apidoc Amn|(whatever)|RETVAL
 Variable which is setup by C<xsubpp> to hold the return value for an 
@@ -27,7 +28,7 @@ L<perlxs/"The RETVAL Variable">.
 
 =for apidoc Amn|(whatever)|THIS
 Variable which is setup by C<xsubpp> to designate the object in a C++ 
-XSUB.  This is always the proper type for the C++ object.  See C<CLASS> and 
+XSUB.  This is always the proper type for the C++ object.  See C<L</CLASS>> and
 L<perlxs/"Using XS With C++">.
 
 =for apidoc Amn|I32|ax
@@ -48,7 +49,7 @@ Used to access elements on the XSUB's stack.
 
 =for apidoc AmU||XS
 Macro to declare an XSUB and its C parameter list.  This is handled by
-C<xsubpp>.  It is the same as using the more explicit XS_EXTERNAL macro.
+C<xsubpp>.  It is the same as using the more explicit C<XS_EXTERNAL> macro.
 
 =for apidoc AmU||XS_INTERNAL
 Macro to declare an XSUB and its C parameter list without exporting the symbols.
@@ -71,7 +72,7 @@ Sets up the C<items> variable.
 This is usually handled automatically by C<xsubpp> by calling C<dXSARGS>.
 
 =for apidoc Ams||dXSARGS
-Sets up stack and mark pointers for an XSUB, calling dSP and dMARK.
+Sets up stack and mark pointers for an XSUB, calling C<dSP> and C<dMARK>.
 Sets up the C<ax> and C<items> variables by calling C<dAX> and C<dITEMS>.
 This is usually handled automatically by C<xsubpp>.
 
@@ -85,8 +86,8 @@ C<padoff_du>, but it is currently a noop.  However, it is strongly advised
 to still use it for ensuring past and future compatibility.
 
 =for apidoc AmU||UNDERBAR
-The SV* corresponding to the $_ variable.  Works even if there
-is a lexical $_ in scope.
+The SV* corresponding to the C<$_> variable.  Works even if there
+is a lexical C<$_> in scope.
 
 =cut
 */
@@ -281,10 +282,11 @@ the subs.
 
 =for apidoc AmU||XS_VERSION
 The version identifier for an XS module.  This is usually
-handled automatically by C<ExtUtils::MakeMaker>.  See C<XS_VERSION_BOOTCHECK>.
+handled automatically by C<ExtUtils::MakeMaker>.  See
+C<L</XS_VERSION_BOOTCHECK>>.
 
 =for apidoc Ams||XS_VERSION_BOOTCHECK
-Macro to verify that a PM module's $VERSION variable matches the XS
+Macro to verify that a PM module's C<$VERSION> variable matches the XS
 module's C<XS_VERSION> variable.  This is usually handled automatically by
 C<xsubpp>.  See L<perlxs/"The VERSIONCHECK: Keyword">.
 
@@ -325,6 +327,7 @@ Rethrows a previously caught exception.  See L<perlguts/"Exception Handling">.
 #define XSRETURN(off)					\
     STMT_START {					\
 	const IV tmpXSoff = (off);			\
+	assert(tmpXSoff >= 0);\
 	PL_stack_sp = PL_stack_base + ax + (tmpXSoff - 1);	\
 	return;						\
     } STMT_END
diff --git a/Master/tlpkg/tlperl/lib/CORE/av.h b/Master/tlpkg/tlperl/lib/CORE/av.h
index 30b8e52f30e..d6d21378e4c 100644
--- a/Master/tlpkg/tlperl/lib/CORE/av.h
+++ b/Master/tlpkg/tlperl/lib/CORE/av.h
@@ -81,6 +81,15 @@ Same as C<av_top_index()>.
 			 ? mg_size(MUTABLE_SV(av)) : AvFILLp(av))
 #define av_tindex(av)   av_top_index(av)
 
+#if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || defined(PERL_IN_UTF8_C)
+/* Note that it doesn't make sense to do this:
+ *      SvGETMAGIC(av); IV x = av_tindex_nomg(av);
+ * This name is controversial, and so is restricted by the #ifdef to the places
+ * it already occurs
+ */
+#   define av_tindex_nomg(av)  (__ASSERT_(SvTYPE(av) == SVt_PVAV) AvFILLp(av))
+#endif
+
 #define NEGATIVE_INDICES_VAR "NEGATIVE_INDICES"
 
 /*
diff --git a/Master/tlpkg/tlperl/lib/CORE/charclass_invlists.h b/Master/tlpkg/tlperl/lib/CORE/charclass_invlists.h
index 90517660bc4..6abd325442f 100644
--- a/Master/tlpkg/tlperl/lib/CORE/charclass_invlists.h
+++ b/Master/tlpkg/tlperl/lib/CORE/charclass_invlists.h
@@ -43,7 +43,7 @@ static const UV ASCII_invlist[] = { /* for ASCII/Latin1 */
 };
 
 static const UV Cased_invlist[] = { /* for ASCII/Latin1 */
-	255,	/* Number of elements */
+	263,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -108,6 +108,10 @@ static const UV Cased_invlist[] = { /* for ASCII/Latin1 */
 	0x10C8,
 	0x10CD,
 	0x10CE,
+	0x13A0,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1D00,
 	0x1DC0,
 	0x1E00,
@@ -215,15 +219,15 @@ static const UV Cased_invlist[] = { /* for ASCII/Latin1 */
 	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F8,
 	0xA7FB,
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
+	0xAB70,
+	0xABC0,
 	0xFB00,
 	0xFB07,
 	0xFB13,
@@ -234,6 +238,10 @@ static const UV Cased_invlist[] = { /* for ASCII/Latin1 */
 	0xFF5B,
 	0x10400,
 	0x10450,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x118A0,
 	0x118E0,
 	0x1D400,
@@ -304,8 +312,388 @@ static const UV Cased_invlist[] = { /* for ASCII/Latin1 */
 	0x1F18A
 };
 
-static const UV Grapheme_Cluster_Break_invlist[] = { /* for ASCII/Latin1 */
-	1484,	/* Number of elements */
+#endif	/* defined(PERL_IN_PERL_C) */
+
+#if defined(PERL_IN_REGCOMP_C)
+
+static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for ASCII/Latin1 */
+	45,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x2BC,
+	0x2BD,
+	0x308,
+	0x309,
+	0x313,
+	0x314,
+	0x342,
+	0x343,
+	0x3AC,
+	0x3AD,
+	0x3AE,
+	0x3AF,
+	0x3B1,
+	0x3B2,
+	0x3B7,
+	0x3B8,
+	0x3B9,
+	0x3BA,
+	0x3C1,
+	0x3C2,
+	0x3C5,
+	0x3C6,
+	0x3C9,
+	0x3CA,
+	0x3CE,
+	0x3CF,
+	0x565,
+	0x566,
+	0x574,
+	0x575,
+	0x57E,
+	0x57F,
+	0x1F00,
+	0x1F08,
+	0x1F20,
+	0x1F28,
+	0x1F60,
+	0x1F68,
+	0x1F70,
+	0x1F71,
+	0x1F74,
+	0x1F75,
+	0x1F7C,
+	0x1F7D
+};
+
+static const UV _Perl_Any_Folds_invlist[] = { /* for ASCII/Latin1 */
+	247,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x41,
+	0x5B,
+	0x61,
+	0x7B,
+	0xB5,
+	0xB6,
+	0xC0,
+	0xD7,
+	0xD8,
+	0xF7,
+	0xF8,
+	0x131,
+	0x132,
+	0x138,
+	0x139,
+	0x18D,
+	0x18E,
+	0x19B,
+	0x19C,
+	0x1AA,
+	0x1AC,
+	0x1BA,
+	0x1BC,
+	0x1BE,
+	0x1BF,
+	0x1C0,
+	0x1C4,
+	0x221,
+	0x222,
+	0x234,
+	0x23A,
+	0x255,
+	0x256,
+	0x258,
+	0x259,
+	0x25A,
+	0x25B,
+	0x25D,
+	0x260,
+	0x262,
+	0x263,
+	0x264,
+	0x265,
+	0x267,
+	0x268,
+	0x26A,
+	0x26B,
+	0x26D,
+	0x26F,
+	0x270,
+	0x271,
+	0x273,
+	0x275,
+	0x276,
+	0x27D,
+	0x27E,
+	0x280,
+	0x281,
+	0x283,
+	0x284,
+	0x287,
+	0x28D,
+	0x292,
+	0x293,
+	0x29D,
+	0x29F,
+	0x2BC,
+	0x2BD,
+	0x2BE,
+	0x2BF,
+	0x300,
+	0x302,
+	0x307,
+	0x309,
+	0x30A,
+	0x30B,
+	0x30C,
+	0x30D,
+	0x313,
+	0x314,
+	0x331,
+	0x332,
+	0x342,
+	0x343,
+	0x345,
+	0x346,
+	0x370,
+	0x374,
+	0x376,
+	0x378,
+	0x37B,
+	0x37E,
+	0x37F,
+	0x380,
+	0x386,
+	0x387,
+	0x388,
+	0x38B,
+	0x38C,
+	0x38D,
+	0x38E,
+	0x3A2,
+	0x3A3,
+	0x3D2,
+	0x3D5,
+	0x3F6,
+	0x3F7,
+	0x3FC,
+	0x3FD,
+	0x482,
+	0x48A,
+	0x530,
+	0x531,
+	0x557,
+	0x561,
+	0x588,
+	0x10A0,
+	0x10C6,
+	0x10C7,
+	0x10C8,
+	0x10CD,
+	0x10CE,
+	0x13A0,
+	0x13F6,
+	0x13F8,
+	0x13FE,
+	0x1D79,
+	0x1D7A,
+	0x1D7D,
+	0x1D7E,
+	0x1E00,
+	0x1E9C,
+	0x1E9E,
+	0x1E9F,
+	0x1EA0,
+	0x1F16,
+	0x1F18,
+	0x1F1E,
+	0x1F20,
+	0x1F46,
+	0x1F48,
+	0x1F4E,
+	0x1F50,
+	0x1F58,
+	0x1F59,
+	0x1F5A,
+	0x1F5B,
+	0x1F5C,
+	0x1F5D,
+	0x1F5E,
+	0x1F5F,
+	0x1F7E,
+	0x1F80,
+	0x1FB5,
+	0x1FB6,
+	0x1FBD,
+	0x1FBE,
+	0x1FBF,
+	0x1FC2,
+	0x1FC5,
+	0x1FC6,
+	0x1FCD,
+	0x1FD0,
+	0x1FD4,
+	0x1FD6,
+	0x1FDC,
+	0x1FE0,
+	0x1FED,
+	0x1FF2,
+	0x1FF5,
+	0x1FF6,
+	0x1FFD,
+	0x2126,
+	0x2127,
+	0x212A,
+	0x212C,
+	0x2132,
+	0x2133,
+	0x214E,
+	0x214F,
+	0x2160,
+	0x2180,
+	0x2183,
+	0x2185,
+	0x24B6,
+	0x24EA,
+	0x2C00,
+	0x2C2F,
+	0x2C30,
+	0x2C5F,
+	0x2C60,
+	0x2C71,
+	0x2C72,
+	0x2C74,
+	0x2C75,
+	0x2C77,
+	0x2C7E,
+	0x2CE4,
+	0x2CEB,
+	0x2CEF,
+	0x2CF2,
+	0x2CF4,
+	0x2D00,
+	0x2D26,
+	0x2D27,
+	0x2D28,
+	0x2D2D,
+	0x2D2E,
+	0xA640,
+	0xA66E,
+	0xA680,
+	0xA69C,
+	0xA722,
+	0xA730,
+	0xA732,
+	0xA770,
+	0xA779,
+	0xA788,
+	0xA78B,
+	0xA78E,
+	0xA790,
+	0xA794,
+	0xA796,
+	0xA7AE,
+	0xA7B0,
+	0xA7B8,
+	0xAB53,
+	0xAB54,
+	0xAB70,
+	0xABC0,
+	0xFB00,
+	0xFB07,
+	0xFB13,
+	0xFB18,
+	0xFF21,
+	0xFF3B,
+	0xFF41,
+	0xFF5B,
+	0x10400,
+	0x10450,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
+	0x118A0,
+	0x118E0
+};
+
+static const UV _Perl_Folds_To_Multi_Char_invlist[] = { /* for ASCII/Latin1 */
+	59,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0xDF,
+	0xE0,
+	0x130,
+	0x131,
+	0x149,
+	0x14A,
+	0x1F0,
+	0x1F1,
+	0x390,
+	0x391,
+	0x3B0,
+	0x3B1,
+	0x587,
+	0x588,
+	0x1E96,
+	0x1E9B,
+	0x1E9E,
+	0x1E9F,
+	0x1F50,
+	0x1F51,
+	0x1F52,
+	0x1F53,
+	0x1F54,
+	0x1F55,
+	0x1F56,
+	0x1F57,
+	0x1F80,
+	0x1FB0,
+	0x1FB2,
+	0x1FB5,
+	0x1FB6,
+	0x1FB8,
+	0x1FBC,
+	0x1FBD,
+	0x1FC2,
+	0x1FC5,
+	0x1FC6,
+	0x1FC8,
+	0x1FCC,
+	0x1FCD,
+	0x1FD2,
+	0x1FD4,
+	0x1FD6,
+	0x1FD8,
+	0x1FE2,
+	0x1FE5,
+	0x1FE6,
+	0x1FE8,
+	0x1FF2,
+	0x1FF5,
+	0x1FF6,
+	0x1FF8,
+	0x1FFC,
+	0x1FFD,
+	0xFB00,
+	0xFB07,
+	0xFB13,
+	0xFB18
+};
+
+#endif	/* defined(PERL_IN_REGCOMP_C) */
+
+#if defined(PERL_IN_PERL_C)
+
+static const UV _Perl_GCB_invlist[] = { /* for ASCII/Latin1 */
+	1502,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -372,7 +760,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x82E,
 	0x859,
 	0x85C,
-	0x8E4,
+	0x8E3,
 	0x903,
 	0x904,
 	0x93A,
@@ -640,10 +1028,6 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x1933,
 	0x1939,
 	0x193C,
-	0x19B5,
-	0x19B8,
-	0x19BA,
-	0x19BB,
 	0x1A17,
 	0x1A19,
 	0x1A1B,
@@ -744,7 +1128,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xA673,
 	0xA674,
 	0xA67E,
-	0xA69F,
+	0xA69E,
 	0xA6A0,
 	0xA6F0,
 	0xA6F2,
@@ -1633,7 +2017,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xFE00,
 	0xFE10,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFEFF,
 	0xFF00,
 	0xFF9E,
@@ -1689,6 +2073,8 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x111B6,
 	0x111BF,
 	0x111C1,
+	0x111CA,
+	0x111CD,
 	0x1122C,
 	0x1122F,
 	0x11232,
@@ -1700,7 +2086,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x112E0,
 	0x112E3,
 	0x112EB,
-	0x11301,
+	0x11300,
 	0x11302,
 	0x11304,
 	0x1133C,
@@ -1743,6 +2129,8 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x115BE,
 	0x115BF,
 	0x115C1,
+	0x115DC,
+	0x115DE,
 	0x11630,
 	0x11633,
 	0x1163B,
@@ -1758,6 +2146,12 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x116B6,
 	0x116B7,
 	0x116B8,
+	0x1171D,
+	0x11720,
+	0x11722,
+	0x11726,
+	0x11727,
+	0x1172C,
 	0x16AF0,
 	0x16AF5,
 	0x16B30,
@@ -1785,6 +2179,18 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x1D1AE,
 	0x1D242,
 	0x1D245,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E8D0,
 	0x1E8D7,
 	0x1F1E6,
@@ -1805,20 +2211,20 @@ typedef enum {
 	GCB_Other = 0,
 	GCB_CR = 1,
 	GCB_Control = 2,
-	GCB_EDGE = 3,
-	GCB_Extend = 4,
-	GCB_L = 5,
-	GCB_LF = 6,
-	GCB_LV = 7,
-	GCB_LVT = 8,
-	GCB_Prepend = 9,
-	GCB_Regional_Indicator = 10,
-	GCB_SpacingMark = 11,
-	GCB_T = 12,
-	GCB_V = 13
+	GCB_Extend = 3,
+	GCB_L = 4,
+	GCB_LF = 5,
+	GCB_LV = 6,
+	GCB_LVT = 7,
+	GCB_Prepend = 8,
+	GCB_Regional_Indicator = 9,
+	GCB_SpacingMark = 10,
+	GCB_T = 11,
+	GCB_V = 12,
+	GCB_EDGE = 13
 } GCB_enum;
 
-static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for ASCII/Latin1 */
+static const GCB_enum _Perl_GCB_invmap[] = { /* for ASCII/Latin1 */
 	GCB_Control,
 	GCB_LF,
 	GCB_Control,
@@ -2150,10 +2556,6 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for ASCII/Latin1 */
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
 	GCB_Extend,
 	GCB_SpacingMark,
 	GCB_Extend,
@@ -3199,6 +3601,8 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for ASCII/Latin1 */
 	GCB_Extend,
 	GCB_SpacingMark,
 	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_SpacingMark,
@@ -3253,6 +3657,8 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for ASCII/Latin1 */
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_SpacingMark,
@@ -3269,6 +3675,12 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for ASCII/Latin1 */
 	GCB_Extend,
 	GCB_Other,
 	GCB_Extend,
+	GCB_SpacingMark,
+	GCB_Extend,
+	GCB_SpacingMark,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
 	GCB_Other,
 	GCB_Extend,
 	GCB_Other,
@@ -3297,6 +3709,18 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for ASCII/Latin1 */
 	GCB_Other,
 	GCB_Extend,
 	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
 	GCB_Regional_Indicator,
 	GCB_Other,
 	GCB_Control,
@@ -3307,374 +3731,10 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for ASCII/Latin1 */
 
 #endif	/* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_REGCOMP_C)
-
-static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for ASCII/Latin1 */
-	45,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x2BC,
-	0x2BD,
-	0x308,
-	0x309,
-	0x313,
-	0x314,
-	0x342,
-	0x343,
-	0x3AC,
-	0x3AD,
-	0x3AE,
-	0x3AF,
-	0x3B1,
-	0x3B2,
-	0x3B7,
-	0x3B8,
-	0x3B9,
-	0x3BA,
-	0x3C1,
-	0x3C2,
-	0x3C5,
-	0x3C6,
-	0x3C9,
-	0x3CA,
-	0x3CE,
-	0x3CF,
-	0x565,
-	0x566,
-	0x574,
-	0x575,
-	0x57E,
-	0x57F,
-	0x1F00,
-	0x1F08,
-	0x1F20,
-	0x1F28,
-	0x1F60,
-	0x1F68,
-	0x1F70,
-	0x1F71,
-	0x1F74,
-	0x1F75,
-	0x1F7C,
-	0x1F7D
-};
-
-static const UV _Perl_Any_Folds_invlist[] = { /* for ASCII/Latin1 */
-	235,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x41,
-	0x5B,
-	0x61,
-	0x7B,
-	0xB5,
-	0xB6,
-	0xC0,
-	0xD7,
-	0xD8,
-	0xF7,
-	0xF8,
-	0x131,
-	0x132,
-	0x138,
-	0x139,
-	0x18D,
-	0x18E,
-	0x19B,
-	0x19C,
-	0x1AA,
-	0x1AC,
-	0x1BA,
-	0x1BC,
-	0x1BE,
-	0x1BF,
-	0x1C0,
-	0x1C4,
-	0x221,
-	0x222,
-	0x234,
-	0x23A,
-	0x255,
-	0x256,
-	0x258,
-	0x259,
-	0x25A,
-	0x25B,
-	0x25D,
-	0x260,
-	0x262,
-	0x263,
-	0x264,
-	0x265,
-	0x267,
-	0x268,
-	0x26A,
-	0x26B,
-	0x26D,
-	0x26F,
-	0x270,
-	0x271,
-	0x273,
-	0x275,
-	0x276,
-	0x27D,
-	0x27E,
-	0x280,
-	0x281,
-	0x283,
-	0x284,
-	0x287,
-	0x28D,
-	0x292,
-	0x293,
-	0x29E,
-	0x29F,
-	0x2BC,
-	0x2BD,
-	0x2BE,
-	0x2BF,
-	0x300,
-	0x302,
-	0x307,
-	0x309,
-	0x30A,
-	0x30B,
-	0x30C,
-	0x30D,
-	0x313,
-	0x314,
-	0x331,
-	0x332,
-	0x342,
-	0x343,
-	0x345,
-	0x346,
-	0x370,
-	0x374,
-	0x376,
-	0x378,
-	0x37B,
-	0x37E,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x3D2,
-	0x3D5,
-	0x3F6,
-	0x3F7,
-	0x3FC,
-	0x3FD,
-	0x482,
-	0x48A,
-	0x530,
-	0x531,
-	0x557,
-	0x561,
-	0x588,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x1D79,
-	0x1D7A,
-	0x1D7D,
-	0x1D7E,
-	0x1E00,
-	0x1E9C,
-	0x1E9E,
-	0x1E9F,
-	0x1EA0,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FE0,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFD,
-	0x2126,
-	0x2127,
-	0x212A,
-	0x212C,
-	0x2132,
-	0x2133,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2180,
-	0x2183,
-	0x2185,
-	0x24B6,
-	0x24EA,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2C71,
-	0x2C72,
-	0x2C74,
-	0x2C75,
-	0x2C77,
-	0x2C7E,
-	0x2CE4,
-	0x2CEB,
-	0x2CEF,
-	0x2CF2,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0xA640,
-	0xA66E,
-	0xA680,
-	0xA69C,
-	0xA722,
-	0xA730,
-	0xA732,
-	0xA770,
-	0xA779,
-	0xA788,
-	0xA78B,
-	0xA78E,
-	0xA790,
-	0xA794,
-	0xA796,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFF21,
-	0xFF3B,
-	0xFF41,
-	0xFF5B,
-	0x10400,
-	0x10450,
-	0x118A0,
-	0x118E0
-};
-
-static const UV _Perl_Folds_To_Multi_Char_invlist[] = { /* for ASCII/Latin1 */
-	59,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0xDF,
-	0xE0,
-	0x130,
-	0x131,
-	0x149,
-	0x14A,
-	0x1F0,
-	0x1F1,
-	0x390,
-	0x391,
-	0x3B0,
-	0x3B1,
-	0x587,
-	0x588,
-	0x1E96,
-	0x1E9B,
-	0x1E9E,
-	0x1E9F,
-	0x1F50,
-	0x1F51,
-	0x1F52,
-	0x1F53,
-	0x1F54,
-	0x1F55,
-	0x1F56,
-	0x1F57,
-	0x1F80,
-	0x1FB0,
-	0x1FB2,
-	0x1FB5,
-	0x1FB6,
-	0x1FB8,
-	0x1FBC,
-	0x1FBD,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FC8,
-	0x1FCC,
-	0x1FCD,
-	0x1FD2,
-	0x1FD4,
-	0x1FD6,
-	0x1FD8,
-	0x1FE2,
-	0x1FE5,
-	0x1FE6,
-	0x1FE8,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FF8,
-	0x1FFC,
-	0x1FFD,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18
-};
-
-#endif	/* defined(PERL_IN_REGCOMP_C) */
-
 #if defined(PERL_IN_UTF8_C)
 
 static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
-	1267,	/* Number of elements */
+	1317,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -3778,8 +3838,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x840,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x964,
 	0x966,
 	0x970,
@@ -3869,6 +3929,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -3950,7 +4012,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -3999,7 +4061,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD70,
@@ -4144,7 +4206,9 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -4388,7 +4452,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -4402,19 +4466,15 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0xA674,
 	0xA67E,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F2,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA828,
 	0xA840,
@@ -4427,6 +4487,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA92E,
 	0xA930,
@@ -4468,10 +4530,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xABEC,
 	0xABEE,
@@ -4518,7 +4578,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0xFE00,
 	0xFE10,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE33,
 	0xFE35,
 	0xFE4D,
@@ -4623,6 +4683,10 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -4663,6 +4727,10 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11047,
 	0x11066,
@@ -4683,17 +4751,31 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x11177,
 	0x11180,
 	0x111C5,
+	0x111CA,
+	0x111CD,
 	0x111D0,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -4713,6 +4795,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -4731,6 +4815,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x115B6,
 	0x115B8,
 	0x115C1,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x11641,
 	0x11644,
@@ -4741,6 +4827,12 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118EA,
 	0x118FF,
@@ -4748,11 +4840,15 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -4865,6 +4961,18 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -4941,6 +5049,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0100,
@@ -4948,7 +5058,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for ASCII/Latin1 */
 };
 
 static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
-	1095,	/* Number of elements */
+	1129,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -5052,7 +5162,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0x840,
 	0x859,
 	0x8A0,
-	0x8B3,
+	0x8B5,
 	0x904,
 	0x93A,
 	0x93D,
@@ -5123,6 +5233,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0xAD1,
 	0xAE0,
 	0xAE2,
+	0xAF9,
+	0xAFA,
 	0xB05,
 	0xB0D,
 	0xB0F,
@@ -5176,7 +5288,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0xC3D,
 	0xC3E,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC62,
 	0xC85,
@@ -5207,7 +5319,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0xD3E,
 	0xD4E,
 	0xD4F,
-	0xD60,
+	0xD5F,
 	0xD62,
 	0xD7A,
 	0xD80,
@@ -5330,7 +5442,9 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -5375,8 +5489,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0x1975,
 	0x1980,
 	0x19AC,
-	0x19C1,
-	0x19C8,
+	0x19B0,
+	0x19CA,
 	0x1A00,
 	0x1A17,
 	0x1A20,
@@ -5544,7 +5658,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -5566,11 +5680,9 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -5587,6 +5699,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA90A,
 	0xA926,
 	0xA930,
@@ -5644,10 +5758,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABE3,
 	0xAC00,
 	0xD7A4,
@@ -5781,6 +5893,10 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -5815,6 +5931,10 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11003,
 	0x11038,
 	0x11083,
@@ -5833,10 +5953,22 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0x111C5,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1122C,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112DF,
 	0x11305,
@@ -5853,6 +5985,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0x1133A,
 	0x1133D,
 	0x1133E,
+	0x11350,
+	0x11351,
 	0x1135D,
 	0x11362,
 	0x11480,
@@ -5863,12 +5997,16 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0x114C8,
 	0x11580,
 	0x115AF,
+	0x115D8,
+	0x115DC,
 	0x11600,
 	0x11630,
 	0x11644,
 	0x11645,
 	0x11680,
 	0x116AB,
+	0x11700,
+	0x1171A,
 	0x118A0,
 	0x118E0,
 	0x118FF,
@@ -5876,11 +6014,15 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -6045,6 +6187,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E
 };
@@ -6053,8 +6197,4379 @@ static const UV _Perl_IDStart_invlist[] = { /* for ASCII/Latin1 */
 
 #if defined(PERL_IN_PERL_C)
 
-static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
-	2835,	/* Number of elements */
+static const UV _Perl_LB_invlist[] = { /* for ASCII/Latin1 */
+	2156,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	0,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x9,
+	0xA,
+	0xB,
+	0xD,
+	0xE,
+	0x20,
+	0x21,
+	0x22,
+	0x23,
+	0x24,
+	0x25,
+	0x26,
+	0x27,
+	0x28,
+	0x29,
+	0x2A,
+	0x2B,
+	0x2C,
+	0x2D,
+	0x2E,
+	0x2F,
+	0x30,
+	0x3A,
+	0x3C,
+	0x3F,
+	0x40,
+	0x5B,
+	0x5C,
+	0x5D,
+	0x5E,
+	0x7B,
+	0x7C,
+	0x7D,
+	0x7E,
+	0x7F,
+	0x85,
+	0x86,
+	0xA0,
+	0xA1,
+	0xA2,
+	0xA3,
+	0xA6,
+	0xAB,
+	0xAC,
+	0xAD,
+	0xAE,
+	0xB0,
+	0xB1,
+	0xB2,
+	0xB4,
+	0xB5,
+	0xBB,
+	0xBC,
+	0xBF,
+	0xC0,
+	0x2C8,
+	0x2C9,
+	0x2CC,
+	0x2CD,
+	0x2DF,
+	0x2E0,
+	0x300,
+	0x34F,
+	0x350,
+	0x35C,
+	0x363,
+	0x370,
+	0x37E,
+	0x37F,
+	0x483,
+	0x48A,
+	0x589,
+	0x58A,
+	0x58B,
+	0x58F,
+	0x590,
+	0x591,
+	0x5BE,
+	0x5BF,
+	0x5C0,
+	0x5C1,
+	0x5C3,
+	0x5C4,
+	0x5C6,
+	0x5C7,
+	0x5C8,
+	0x5D0,
+	0x5EB,
+	0x5F0,
+	0x5F3,
+	0x609,
+	0x60C,
+	0x60E,
+	0x610,
+	0x61B,
+	0x61C,
+	0x61D,
+	0x61E,
+	0x620,
+	0x64B,
+	0x660,
+	0x66A,
+	0x66B,
+	0x66D,
+	0x670,
+	0x671,
+	0x6D4,
+	0x6D5,
+	0x6D6,
+	0x6DD,
+	0x6DF,
+	0x6E5,
+	0x6E7,
+	0x6E9,
+	0x6EA,
+	0x6EE,
+	0x6F0,
+	0x6FA,
+	0x711,
+	0x712,
+	0x730,
+	0x74B,
+	0x7A6,
+	0x7B1,
+	0x7C0,
+	0x7CA,
+	0x7EB,
+	0x7F4,
+	0x7F8,
+	0x7F9,
+	0x7FA,
+	0x816,
+	0x81A,
+	0x81B,
+	0x824,
+	0x825,
+	0x828,
+	0x829,
+	0x82E,
+	0x859,
+	0x85C,
+	0x8E3,
+	0x904,
+	0x93A,
+	0x93D,
+	0x93E,
+	0x950,
+	0x951,
+	0x958,
+	0x962,
+	0x964,
+	0x966,
+	0x970,
+	0x981,
+	0x984,
+	0x9BC,
+	0x9BD,
+	0x9BE,
+	0x9C5,
+	0x9C7,
+	0x9C9,
+	0x9CB,
+	0x9CE,
+	0x9D7,
+	0x9D8,
+	0x9E2,
+	0x9E4,
+	0x9E6,
+	0x9F0,
+	0x9F2,
+	0x9F4,
+	0x9F9,
+	0x9FA,
+	0x9FB,
+	0x9FC,
+	0xA01,
+	0xA04,
+	0xA3C,
+	0xA3D,
+	0xA3E,
+	0xA43,
+	0xA47,
+	0xA49,
+	0xA4B,
+	0xA4E,
+	0xA51,
+	0xA52,
+	0xA66,
+	0xA70,
+	0xA72,
+	0xA75,
+	0xA76,
+	0xA81,
+	0xA84,
+	0xABC,
+	0xABD,
+	0xABE,
+	0xAC6,
+	0xAC7,
+	0xACA,
+	0xACB,
+	0xACE,
+	0xAE2,
+	0xAE4,
+	0xAE6,
+	0xAF0,
+	0xAF1,
+	0xAF2,
+	0xB01,
+	0xB04,
+	0xB3C,
+	0xB3D,
+	0xB3E,
+	0xB45,
+	0xB47,
+	0xB49,
+	0xB4B,
+	0xB4E,
+	0xB56,
+	0xB58,
+	0xB62,
+	0xB64,
+	0xB66,
+	0xB70,
+	0xB82,
+	0xB83,
+	0xBBE,
+	0xBC3,
+	0xBC6,
+	0xBC9,
+	0xBCA,
+	0xBCE,
+	0xBD7,
+	0xBD8,
+	0xBE6,
+	0xBF0,
+	0xBF9,
+	0xBFA,
+	0xC00,
+	0xC04,
+	0xC3E,
+	0xC45,
+	0xC46,
+	0xC49,
+	0xC4A,
+	0xC4E,
+	0xC55,
+	0xC57,
+	0xC62,
+	0xC64,
+	0xC66,
+	0xC70,
+	0xC81,
+	0xC84,
+	0xCBC,
+	0xCBD,
+	0xCBE,
+	0xCC5,
+	0xCC6,
+	0xCC9,
+	0xCCA,
+	0xCCE,
+	0xCD5,
+	0xCD7,
+	0xCE2,
+	0xCE4,
+	0xCE6,
+	0xCF0,
+	0xD01,
+	0xD04,
+	0xD3E,
+	0xD45,
+	0xD46,
+	0xD49,
+	0xD4A,
+	0xD4E,
+	0xD57,
+	0xD58,
+	0xD62,
+	0xD64,
+	0xD66,
+	0xD70,
+	0xD79,
+	0xD7A,
+	0xD82,
+	0xD84,
+	0xDCA,
+	0xDCB,
+	0xDCF,
+	0xDD5,
+	0xDD6,
+	0xDD7,
+	0xDD8,
+	0xDE0,
+	0xDE6,
+	0xDF0,
+	0xDF2,
+	0xDF4,
+	0xE31,
+	0xE32,
+	0xE34,
+	0xE3B,
+	0xE3F,
+	0xE40,
+	0xE47,
+	0xE4F,
+	0xE50,
+	0xE5A,
+	0xE5C,
+	0xEB1,
+	0xEB2,
+	0xEB4,
+	0xEBA,
+	0xEBB,
+	0xEBD,
+	0xEC8,
+	0xECE,
+	0xED0,
+	0xEDA,
+	0xF01,
+	0xF05,
+	0xF06,
+	0xF08,
+	0xF09,
+	0xF0B,
+	0xF0C,
+	0xF0D,
+	0xF12,
+	0xF13,
+	0xF14,
+	0xF15,
+	0xF18,
+	0xF1A,
+	0xF20,
+	0xF2A,
+	0xF34,
+	0xF35,
+	0xF36,
+	0xF37,
+	0xF38,
+	0xF39,
+	0xF3A,
+	0xF3B,
+	0xF3C,
+	0xF3D,
+	0xF3E,
+	0xF40,
+	0xF71,
+	0xF7F,
+	0xF80,
+	0xF85,
+	0xF86,
+	0xF88,
+	0xF8D,
+	0xF98,
+	0xF99,
+	0xFBD,
+	0xFBE,
+	0xFC0,
+	0xFC6,
+	0xFC7,
+	0xFD0,
+	0xFD2,
+	0xFD3,
+	0xFD4,
+	0xFD9,
+	0xFDB,
+	0x102B,
+	0x103F,
+	0x1040,
+	0x104A,
+	0x104C,
+	0x1056,
+	0x105A,
+	0x105E,
+	0x1061,
+	0x1062,
+	0x1065,
+	0x1067,
+	0x106E,
+	0x1071,
+	0x1075,
+	0x1082,
+	0x108E,
+	0x108F,
+	0x1090,
+	0x109A,
+	0x109E,
+	0x1100,
+	0x1160,
+	0x11A8,
+	0x1200,
+	0x135D,
+	0x1360,
+	0x1361,
+	0x1362,
+	0x1400,
+	0x1401,
+	0x1680,
+	0x1681,
+	0x169B,
+	0x169C,
+	0x169D,
+	0x16EB,
+	0x16EE,
+	0x1712,
+	0x1715,
+	0x1732,
+	0x1735,
+	0x1737,
+	0x1752,
+	0x1754,
+	0x1772,
+	0x1774,
+	0x17B4,
+	0x17D4,
+	0x17D6,
+	0x17D7,
+	0x17D8,
+	0x17D9,
+	0x17DA,
+	0x17DB,
+	0x17DC,
+	0x17DD,
+	0x17DE,
+	0x17E0,
+	0x17EA,
+	0x1802,
+	0x1804,
+	0x1806,
+	0x1807,
+	0x1808,
+	0x180A,
+	0x180B,
+	0x180E,
+	0x180F,
+	0x1810,
+	0x181A,
+	0x18A9,
+	0x18AA,
+	0x1920,
+	0x192C,
+	0x1930,
+	0x193C,
+	0x1944,
+	0x1946,
+	0x1950,
+	0x19D0,
+	0x19DA,
+	0x1A17,
+	0x1A1C,
+	0x1A55,
+	0x1A5F,
+	0x1A60,
+	0x1A7D,
+	0x1A7F,
+	0x1A80,
+	0x1A8A,
+	0x1A90,
+	0x1A9A,
+	0x1AB0,
+	0x1ABF,
+	0x1B00,
+	0x1B05,
+	0x1B34,
+	0x1B45,
+	0x1B50,
+	0x1B5A,
+	0x1B5C,
+	0x1B5D,
+	0x1B61,
+	0x1B6B,
+	0x1B74,
+	0x1B80,
+	0x1B83,
+	0x1BA1,
+	0x1BAE,
+	0x1BB0,
+	0x1BBA,
+	0x1BE6,
+	0x1BF4,
+	0x1C24,
+	0x1C38,
+	0x1C3B,
+	0x1C40,
+	0x1C4A,
+	0x1C50,
+	0x1C5A,
+	0x1C7E,
+	0x1C80,
+	0x1CD0,
+	0x1CD3,
+	0x1CD4,
+	0x1CE9,
+	0x1CED,
+	0x1CEE,
+	0x1CF2,
+	0x1CF5,
+	0x1CF8,
+	0x1CFA,
+	0x1DC0,
+	0x1DF6,
+	0x1DFC,
+	0x1E00,
+	0x1FFD,
+	0x1FFE,
+	0x2000,
+	0x2007,
+	0x2008,
+	0x200B,
+	0x200C,
+	0x2010,
+	0x2011,
+	0x2012,
+	0x2014,
+	0x2015,
+	0x2018,
+	0x201A,
+	0x201B,
+	0x201E,
+	0x201F,
+	0x2020,
+	0x2024,
+	0x2027,
+	0x2028,
+	0x202A,
+	0x202F,
+	0x2030,
+	0x2038,
+	0x2039,
+	0x203B,
+	0x203C,
+	0x203E,
+	0x2044,
+	0x2045,
+	0x2046,
+	0x2047,
+	0x204A,
+	0x2056,
+	0x2057,
+	0x2058,
+	0x205C,
+	0x205D,
+	0x2060,
+	0x2061,
+	0x2066,
+	0x2070,
+	0x207D,
+	0x207E,
+	0x207F,
+	0x208D,
+	0x208E,
+	0x208F,
+	0x20A0,
+	0x20A7,
+	0x20A8,
+	0x20B6,
+	0x20B7,
+	0x20BB,
+	0x20BC,
+	0x20BE,
+	0x20BF,
+	0x20D0,
+	0x20F1,
+	0x2103,
+	0x2104,
+	0x2109,
+	0x210A,
+	0x2116,
+	0x2117,
+	0x2212,
+	0x2214,
+	0x22EF,
+	0x22F0,
+	0x2308,
+	0x2309,
+	0x230A,
+	0x230B,
+	0x230C,
+	0x231A,
+	0x231C,
+	0x2329,
+	0x232A,
+	0x232B,
+	0x23F0,
+	0x23F4,
+	0x2600,
+	0x2604,
+	0x2614,
+	0x2616,
+	0x2618,
+	0x2619,
+	0x261A,
+	0x2620,
+	0x2639,
+	0x263C,
+	0x2668,
+	0x2669,
+	0x267F,
+	0x2680,
+	0x26BD,
+	0x26C9,
+	0x26CD,
+	0x26CE,
+	0x26CF,
+	0x26D2,
+	0x26D3,
+	0x26D5,
+	0x26D8,
+	0x26DA,
+	0x26DC,
+	0x26DD,
+	0x26DF,
+	0x26E2,
+	0x26EA,
+	0x26EB,
+	0x26F1,
+	0x26F6,
+	0x26F7,
+	0x26FB,
+	0x26FD,
+	0x2705,
+	0x2708,
+	0x270E,
+	0x275B,
+	0x2761,
+	0x2762,
+	0x2764,
+	0x2768,
+	0x2769,
+	0x276A,
+	0x276B,
+	0x276C,
+	0x276D,
+	0x276E,
+	0x276F,
+	0x2770,
+	0x2771,
+	0x2772,
+	0x2773,
+	0x2774,
+	0x2775,
+	0x2776,
+	0x27C5,
+	0x27C6,
+	0x27C7,
+	0x27E6,
+	0x27E7,
+	0x27E8,
+	0x27E9,
+	0x27EA,
+	0x27EB,
+	0x27EC,
+	0x27ED,
+	0x27EE,
+	0x27EF,
+	0x27F0,
+	0x2983,
+	0x2984,
+	0x2985,
+	0x2986,
+	0x2987,
+	0x2988,
+	0x2989,
+	0x298A,
+	0x298B,
+	0x298C,
+	0x298D,
+	0x298E,
+	0x298F,
+	0x2990,
+	0x2991,
+	0x2992,
+	0x2993,
+	0x2994,
+	0x2995,
+	0x2996,
+	0x2997,
+	0x2998,
+	0x2999,
+	0x29D8,
+	0x29D9,
+	0x29DA,
+	0x29DB,
+	0x29DC,
+	0x29FC,
+	0x29FD,
+	0x29FE,
+	0x2CEF,
+	0x2CF2,
+	0x2CF9,
+	0x2CFA,
+	0x2CFD,
+	0x2CFE,
+	0x2CFF,
+	0x2D00,
+	0x2D70,
+	0x2D71,
+	0x2D7F,
+	0x2D80,
+	0x2DE0,
+	0x2E00,
+	0x2E0E,
+	0x2E16,
+	0x2E17,
+	0x2E18,
+	0x2E19,
+	0x2E1A,
+	0x2E1C,
+	0x2E1E,
+	0x2E20,
+	0x2E22,
+	0x2E23,
+	0x2E24,
+	0x2E25,
+	0x2E26,
+	0x2E27,
+	0x2E28,
+	0x2E29,
+	0x2E2A,
+	0x2E2E,
+	0x2E2F,
+	0x2E30,
+	0x2E32,
+	0x2E33,
+	0x2E35,
+	0x2E3A,
+	0x2E3C,
+	0x2E3F,
+	0x2E40,
+	0x2E42,
+	0x2E43,
+	0x2E80,
+	0x2E9A,
+	0x2E9B,
+	0x2EF4,
+	0x2F00,
+	0x2FD6,
+	0x2FF0,
+	0x2FFC,
+	0x3000,
+	0x3001,
+	0x3003,
+	0x3005,
+	0x3006,
+	0x3008,
+	0x3009,
+	0x300A,
+	0x300B,
+	0x300C,
+	0x300D,
+	0x300E,
+	0x300F,
+	0x3010,
+	0x3011,
+	0x3012,
+	0x3014,
+	0x3015,
+	0x3016,
+	0x3017,
+	0x3018,
+	0x3019,
+	0x301A,
+	0x301B,
+	0x301C,
+	0x301D,
+	0x301E,
+	0x3020,
+	0x302A,
+	0x3030,
+	0x3035,
+	0x3036,
+	0x303B,
+	0x303D,
+	0x3040,
+	0x3041,
+	0x3042,
+	0x3043,
+	0x3044,
+	0x3045,
+	0x3046,
+	0x3047,
+	0x3048,
+	0x3049,
+	0x304A,
+	0x3063,
+	0x3064,
+	0x3083,
+	0x3084,
+	0x3085,
+	0x3086,
+	0x3087,
+	0x3088,
+	0x308E,
+	0x308F,
+	0x3095,
+	0x3097,
+	0x3099,
+	0x309B,
+	0x309F,
+	0x30A0,
+	0x30A2,
+	0x30A3,
+	0x30A4,
+	0x30A5,
+	0x30A6,
+	0x30A7,
+	0x30A8,
+	0x30A9,
+	0x30AA,
+	0x30C3,
+	0x30C4,
+	0x30E3,
+	0x30E4,
+	0x30E5,
+	0x30E6,
+	0x30E7,
+	0x30E8,
+	0x30EE,
+	0x30EF,
+	0x30F5,
+	0x30F7,
+	0x30FB,
+	0x30FF,
+	0x3100,
+	0x3105,
+	0x312E,
+	0x3131,
+	0x318F,
+	0x3190,
+	0x31BB,
+	0x31C0,
+	0x31E4,
+	0x31F0,
+	0x3200,
+	0x321F,
+	0x3220,
+	0x3248,
+	0x3250,
+	0x32FF,
+	0x3300,
+	0x4DC0,
+	0x4E00,
+	0xA015,
+	0xA016,
+	0xA48D,
+	0xA490,
+	0xA4C7,
+	0xA4FE,
+	0xA500,
+	0xA60D,
+	0xA60E,
+	0xA60F,
+	0xA610,
+	0xA620,
+	0xA62A,
+	0xA66F,
+	0xA673,
+	0xA674,
+	0xA67E,
+	0xA69E,
+	0xA6A0,
+	0xA6F0,
+	0xA6F2,
+	0xA6F3,
+	0xA6F8,
+	0xA802,
+	0xA803,
+	0xA806,
+	0xA807,
+	0xA80B,
+	0xA80C,
+	0xA823,
+	0xA828,
+	0xA838,
+	0xA839,
+	0xA874,
+	0xA876,
+	0xA878,
+	0xA880,
+	0xA882,
+	0xA8B4,
+	0xA8C5,
+	0xA8CE,
+	0xA8D0,
+	0xA8DA,
+	0xA8E0,
+	0xA8F2,
+	0xA8FC,
+	0xA8FD,
+	0xA900,
+	0xA90A,
+	0xA926,
+	0xA92E,
+	0xA930,
+	0xA947,
+	0xA954,
+	0xA960,
+	0xA97D,
+	0xA980,
+	0xA984,
+	0xA9B3,
+	0xA9C1,
+	0xA9C7,
+	0xA9CA,
+	0xA9D0,
+	0xA9DA,
+	0xA9E5,
+	0xA9E6,
+	0xA9F0,
+	0xA9FA,
+	0xAA29,
+	0xAA37,
+	0xAA43,
+	0xAA44,
+	0xAA4C,
+	0xAA4E,
+	0xAA50,
+	0xAA5A,
+	0xAA5D,
+	0xAA60,
+	0xAA7B,
+	0xAA7E,
+	0xAAB0,
+	0xAAB1,
+	0xAAB2,
+	0xAAB5,
+	0xAAB7,
+	0xAAB9,
+	0xAABE,
+	0xAAC0,
+	0xAAC1,
+	0xAAC2,
+	0xAAEB,
+	0xAAF0,
+	0xAAF2,
+	0xAAF5,
+	0xAAF7,
+	0xABE3,
+	0xABEB,
+	0xABEC,
+	0xABEE,
+	0xABF0,
+	0xABFA,
+	0xAC00,
+	0xAC01,
+	0xAC1C,
+	0xAC1D,
+	0xAC38,
+	0xAC39,
+	0xAC54,
+	0xAC55,
+	0xAC70,
+	0xAC71,
+	0xAC8C,
+	0xAC8D,
+	0xACA8,
+	0xACA9,
+	0xACC4,
+	0xACC5,
+	0xACE0,
+	0xACE1,
+	0xACFC,
+	0xACFD,
+	0xAD18,
+	0xAD19,
+	0xAD34,
+	0xAD35,
+	0xAD50,
+	0xAD51,
+	0xAD6C,
+	0xAD6D,
+	0xAD88,
+	0xAD89,
+	0xADA4,
+	0xADA5,
+	0xADC0,
+	0xADC1,
+	0xADDC,
+	0xADDD,
+	0xADF8,
+	0xADF9,
+	0xAE14,
+	0xAE15,
+	0xAE30,
+	0xAE31,
+	0xAE4C,
+	0xAE4D,
+	0xAE68,
+	0xAE69,
+	0xAE84,
+	0xAE85,
+	0xAEA0,
+	0xAEA1,
+	0xAEBC,
+	0xAEBD,
+	0xAED8,
+	0xAED9,
+	0xAEF4,
+	0xAEF5,
+	0xAF10,
+	0xAF11,
+	0xAF2C,
+	0xAF2D,
+	0xAF48,
+	0xAF49,
+	0xAF64,
+	0xAF65,
+	0xAF80,
+	0xAF81,
+	0xAF9C,
+	0xAF9D,
+	0xAFB8,
+	0xAFB9,
+	0xAFD4,
+	0xAFD5,
+	0xAFF0,
+	0xAFF1,
+	0xB00C,
+	0xB00D,
+	0xB028,
+	0xB029,
+	0xB044,
+	0xB045,
+	0xB060,
+	0xB061,
+	0xB07C,
+	0xB07D,
+	0xB098,
+	0xB099,
+	0xB0B4,
+	0xB0B5,
+	0xB0D0,
+	0xB0D1,
+	0xB0EC,
+	0xB0ED,
+	0xB108,
+	0xB109,
+	0xB124,
+	0xB125,
+	0xB140,
+	0xB141,
+	0xB15C,
+	0xB15D,
+	0xB178,
+	0xB179,
+	0xB194,
+	0xB195,
+	0xB1B0,
+	0xB1B1,
+	0xB1CC,
+	0xB1CD,
+	0xB1E8,
+	0xB1E9,
+	0xB204,
+	0xB205,
+	0xB220,
+	0xB221,
+	0xB23C,
+	0xB23D,
+	0xB258,
+	0xB259,
+	0xB274,
+	0xB275,
+	0xB290,
+	0xB291,
+	0xB2AC,
+	0xB2AD,
+	0xB2C8,
+	0xB2C9,
+	0xB2E4,
+	0xB2E5,
+	0xB300,
+	0xB301,
+	0xB31C,
+	0xB31D,
+	0xB338,
+	0xB339,
+	0xB354,
+	0xB355,
+	0xB370,
+	0xB371,
+	0xB38C,
+	0xB38D,
+	0xB3A8,
+	0xB3A9,
+	0xB3C4,
+	0xB3C5,
+	0xB3E0,
+	0xB3E1,
+	0xB3FC,
+	0xB3FD,
+	0xB418,
+	0xB419,
+	0xB434,
+	0xB435,
+	0xB450,
+	0xB451,
+	0xB46C,
+	0xB46D,
+	0xB488,
+	0xB489,
+	0xB4A4,
+	0xB4A5,
+	0xB4C0,
+	0xB4C1,
+	0xB4DC,
+	0xB4DD,
+	0xB4F8,
+	0xB4F9,
+	0xB514,
+	0xB515,
+	0xB530,
+	0xB531,
+	0xB54C,
+	0xB54D,
+	0xB568,
+	0xB569,
+	0xB584,
+	0xB585,
+	0xB5A0,
+	0xB5A1,
+	0xB5BC,
+	0xB5BD,
+	0xB5D8,
+	0xB5D9,
+	0xB5F4,
+	0xB5F5,
+	0xB610,
+	0xB611,
+	0xB62C,
+	0xB62D,
+	0xB648,
+	0xB649,
+	0xB664,
+	0xB665,
+	0xB680,
+	0xB681,
+	0xB69C,
+	0xB69D,
+	0xB6B8,
+	0xB6B9,
+	0xB6D4,
+	0xB6D5,
+	0xB6F0,
+	0xB6F1,
+	0xB70C,
+	0xB70D,
+	0xB728,
+	0xB729,
+	0xB744,
+	0xB745,
+	0xB760,
+	0xB761,
+	0xB77C,
+	0xB77D,
+	0xB798,
+	0xB799,
+	0xB7B4,
+	0xB7B5,
+	0xB7D0,
+	0xB7D1,
+	0xB7EC,
+	0xB7ED,
+	0xB808,
+	0xB809,
+	0xB824,
+	0xB825,
+	0xB840,
+	0xB841,
+	0xB85C,
+	0xB85D,
+	0xB878,
+	0xB879,
+	0xB894,
+	0xB895,
+	0xB8B0,
+	0xB8B1,
+	0xB8CC,
+	0xB8CD,
+	0xB8E8,
+	0xB8E9,
+	0xB904,
+	0xB905,
+	0xB920,
+	0xB921,
+	0xB93C,
+	0xB93D,
+	0xB958,
+	0xB959,
+	0xB974,
+	0xB975,
+	0xB990,
+	0xB991,
+	0xB9AC,
+	0xB9AD,
+	0xB9C8,
+	0xB9C9,
+	0xB9E4,
+	0xB9E5,
+	0xBA00,
+	0xBA01,
+	0xBA1C,
+	0xBA1D,
+	0xBA38,
+	0xBA39,
+	0xBA54,
+	0xBA55,
+	0xBA70,
+	0xBA71,
+	0xBA8C,
+	0xBA8D,
+	0xBAA8,
+	0xBAA9,
+	0xBAC4,
+	0xBAC5,
+	0xBAE0,
+	0xBAE1,
+	0xBAFC,
+	0xBAFD,
+	0xBB18,
+	0xBB19,
+	0xBB34,
+	0xBB35,
+	0xBB50,
+	0xBB51,
+	0xBB6C,
+	0xBB6D,
+	0xBB88,
+	0xBB89,
+	0xBBA4,
+	0xBBA5,
+	0xBBC0,
+	0xBBC1,
+	0xBBDC,
+	0xBBDD,
+	0xBBF8,
+	0xBBF9,
+	0xBC14,
+	0xBC15,
+	0xBC30,
+	0xBC31,
+	0xBC4C,
+	0xBC4D,
+	0xBC68,
+	0xBC69,
+	0xBC84,
+	0xBC85,
+	0xBCA0,
+	0xBCA1,
+	0xBCBC,
+	0xBCBD,
+	0xBCD8,
+	0xBCD9,
+	0xBCF4,
+	0xBCF5,
+	0xBD10,
+	0xBD11,
+	0xBD2C,
+	0xBD2D,
+	0xBD48,
+	0xBD49,
+	0xBD64,
+	0xBD65,
+	0xBD80,
+	0xBD81,
+	0xBD9C,
+	0xBD9D,
+	0xBDB8,
+	0xBDB9,
+	0xBDD4,
+	0xBDD5,
+	0xBDF0,
+	0xBDF1,
+	0xBE0C,
+	0xBE0D,
+	0xBE28,
+	0xBE29,
+	0xBE44,
+	0xBE45,
+	0xBE60,
+	0xBE61,
+	0xBE7C,
+	0xBE7D,
+	0xBE98,
+	0xBE99,
+	0xBEB4,
+	0xBEB5,
+	0xBED0,
+	0xBED1,
+	0xBEEC,
+	0xBEED,
+	0xBF08,
+	0xBF09,
+	0xBF24,
+	0xBF25,
+	0xBF40,
+	0xBF41,
+	0xBF5C,
+	0xBF5D,
+	0xBF78,
+	0xBF79,
+	0xBF94,
+	0xBF95,
+	0xBFB0,
+	0xBFB1,
+	0xBFCC,
+	0xBFCD,
+	0xBFE8,
+	0xBFE9,
+	0xC004,
+	0xC005,
+	0xC020,
+	0xC021,
+	0xC03C,
+	0xC03D,
+	0xC058,
+	0xC059,
+	0xC074,
+	0xC075,
+	0xC090,
+	0xC091,
+	0xC0AC,
+	0xC0AD,
+	0xC0C8,
+	0xC0C9,
+	0xC0E4,
+	0xC0E5,
+	0xC100,
+	0xC101,
+	0xC11C,
+	0xC11D,
+	0xC138,
+	0xC139,
+	0xC154,
+	0xC155,
+	0xC170,
+	0xC171,
+	0xC18C,
+	0xC18D,
+	0xC1A8,
+	0xC1A9,
+	0xC1C4,
+	0xC1C5,
+	0xC1E0,
+	0xC1E1,
+	0xC1FC,
+	0xC1FD,
+	0xC218,
+	0xC219,
+	0xC234,
+	0xC235,
+	0xC250,
+	0xC251,
+	0xC26C,
+	0xC26D,
+	0xC288,
+	0xC289,
+	0xC2A4,
+	0xC2A5,
+	0xC2C0,
+	0xC2C1,
+	0xC2DC,
+	0xC2DD,
+	0xC2F8,
+	0xC2F9,
+	0xC314,
+	0xC315,
+	0xC330,
+	0xC331,
+	0xC34C,
+	0xC34D,
+	0xC368,
+	0xC369,
+	0xC384,
+	0xC385,
+	0xC3A0,
+	0xC3A1,
+	0xC3BC,
+	0xC3BD,
+	0xC3D8,
+	0xC3D9,
+	0xC3F4,
+	0xC3F5,
+	0xC410,
+	0xC411,
+	0xC42C,
+	0xC42D,
+	0xC448,
+	0xC449,
+	0xC464,
+	0xC465,
+	0xC480,
+	0xC481,
+	0xC49C,
+	0xC49D,
+	0xC4B8,
+	0xC4B9,
+	0xC4D4,
+	0xC4D5,
+	0xC4F0,
+	0xC4F1,
+	0xC50C,
+	0xC50D,
+	0xC528,
+	0xC529,
+	0xC544,
+	0xC545,
+	0xC560,
+	0xC561,
+	0xC57C,
+	0xC57D,
+	0xC598,
+	0xC599,
+	0xC5B4,
+	0xC5B5,
+	0xC5D0,
+	0xC5D1,
+	0xC5EC,
+	0xC5ED,
+	0xC608,
+	0xC609,
+	0xC624,
+	0xC625,
+	0xC640,
+	0xC641,
+	0xC65C,
+	0xC65D,
+	0xC678,
+	0xC679,
+	0xC694,
+	0xC695,
+	0xC6B0,
+	0xC6B1,
+	0xC6CC,
+	0xC6CD,
+	0xC6E8,
+	0xC6E9,
+	0xC704,
+	0xC705,
+	0xC720,
+	0xC721,
+	0xC73C,
+	0xC73D,
+	0xC758,
+	0xC759,
+	0xC774,
+	0xC775,
+	0xC790,
+	0xC791,
+	0xC7AC,
+	0xC7AD,
+	0xC7C8,
+	0xC7C9,
+	0xC7E4,
+	0xC7E5,
+	0xC800,
+	0xC801,
+	0xC81C,
+	0xC81D,
+	0xC838,
+	0xC839,
+	0xC854,
+	0xC855,
+	0xC870,
+	0xC871,
+	0xC88C,
+	0xC88D,
+	0xC8A8,
+	0xC8A9,
+	0xC8C4,
+	0xC8C5,
+	0xC8E0,
+	0xC8E1,
+	0xC8FC,
+	0xC8FD,
+	0xC918,
+	0xC919,
+	0xC934,
+	0xC935,
+	0xC950,
+	0xC951,
+	0xC96C,
+	0xC96D,
+	0xC988,
+	0xC989,
+	0xC9A4,
+	0xC9A5,
+	0xC9C0,
+	0xC9C1,
+	0xC9DC,
+	0xC9DD,
+	0xC9F8,
+	0xC9F9,
+	0xCA14,
+	0xCA15,
+	0xCA30,
+	0xCA31,
+	0xCA4C,
+	0xCA4D,
+	0xCA68,
+	0xCA69,
+	0xCA84,
+	0xCA85,
+	0xCAA0,
+	0xCAA1,
+	0xCABC,
+	0xCABD,
+	0xCAD8,
+	0xCAD9,
+	0xCAF4,
+	0xCAF5,
+	0xCB10,
+	0xCB11,
+	0xCB2C,
+	0xCB2D,
+	0xCB48,
+	0xCB49,
+	0xCB64,
+	0xCB65,
+	0xCB80,
+	0xCB81,
+	0xCB9C,
+	0xCB9D,
+	0xCBB8,
+	0xCBB9,
+	0xCBD4,
+	0xCBD5,
+	0xCBF0,
+	0xCBF1,
+	0xCC0C,
+	0xCC0D,
+	0xCC28,
+	0xCC29,
+	0xCC44,
+	0xCC45,
+	0xCC60,
+	0xCC61,
+	0xCC7C,
+	0xCC7D,
+	0xCC98,
+	0xCC99,
+	0xCCB4,
+	0xCCB5,
+	0xCCD0,
+	0xCCD1,
+	0xCCEC,
+	0xCCED,
+	0xCD08,
+	0xCD09,
+	0xCD24,
+	0xCD25,
+	0xCD40,
+	0xCD41,
+	0xCD5C,
+	0xCD5D,
+	0xCD78,
+	0xCD79,
+	0xCD94,
+	0xCD95,
+	0xCDB0,
+	0xCDB1,
+	0xCDCC,
+	0xCDCD,
+	0xCDE8,
+	0xCDE9,
+	0xCE04,
+	0xCE05,
+	0xCE20,
+	0xCE21,
+	0xCE3C,
+	0xCE3D,
+	0xCE58,
+	0xCE59,
+	0xCE74,
+	0xCE75,
+	0xCE90,
+	0xCE91,
+	0xCEAC,
+	0xCEAD,
+	0xCEC8,
+	0xCEC9,
+	0xCEE4,
+	0xCEE5,
+	0xCF00,
+	0xCF01,
+	0xCF1C,
+	0xCF1D,
+	0xCF38,
+	0xCF39,
+	0xCF54,
+	0xCF55,
+	0xCF70,
+	0xCF71,
+	0xCF8C,
+	0xCF8D,
+	0xCFA8,
+	0xCFA9,
+	0xCFC4,
+	0xCFC5,
+	0xCFE0,
+	0xCFE1,
+	0xCFFC,
+	0xCFFD,
+	0xD018,
+	0xD019,
+	0xD034,
+	0xD035,
+	0xD050,
+	0xD051,
+	0xD06C,
+	0xD06D,
+	0xD088,
+	0xD089,
+	0xD0A4,
+	0xD0A5,
+	0xD0C0,
+	0xD0C1,
+	0xD0DC,
+	0xD0DD,
+	0xD0F8,
+	0xD0F9,
+	0xD114,
+	0xD115,
+	0xD130,
+	0xD131,
+	0xD14C,
+	0xD14D,
+	0xD168,
+	0xD169,
+	0xD184,
+	0xD185,
+	0xD1A0,
+	0xD1A1,
+	0xD1BC,
+	0xD1BD,
+	0xD1D8,
+	0xD1D9,
+	0xD1F4,
+	0xD1F5,
+	0xD210,
+	0xD211,
+	0xD22C,
+	0xD22D,
+	0xD248,
+	0xD249,
+	0xD264,
+	0xD265,
+	0xD280,
+	0xD281,
+	0xD29C,
+	0xD29D,
+	0xD2B8,
+	0xD2B9,
+	0xD2D4,
+	0xD2D5,
+	0xD2F0,
+	0xD2F1,
+	0xD30C,
+	0xD30D,
+	0xD328,
+	0xD329,
+	0xD344,
+	0xD345,
+	0xD360,
+	0xD361,
+	0xD37C,
+	0xD37D,
+	0xD398,
+	0xD399,
+	0xD3B4,
+	0xD3B5,
+	0xD3D0,
+	0xD3D1,
+	0xD3EC,
+	0xD3ED,
+	0xD408,
+	0xD409,
+	0xD424,
+	0xD425,
+	0xD440,
+	0xD441,
+	0xD45C,
+	0xD45D,
+	0xD478,
+	0xD479,
+	0xD494,
+	0xD495,
+	0xD4B0,
+	0xD4B1,
+	0xD4CC,
+	0xD4CD,
+	0xD4E8,
+	0xD4E9,
+	0xD504,
+	0xD505,
+	0xD520,
+	0xD521,
+	0xD53C,
+	0xD53D,
+	0xD558,
+	0xD559,
+	0xD574,
+	0xD575,
+	0xD590,
+	0xD591,
+	0xD5AC,
+	0xD5AD,
+	0xD5C8,
+	0xD5C9,
+	0xD5E4,
+	0xD5E5,
+	0xD600,
+	0xD601,
+	0xD61C,
+	0xD61D,
+	0xD638,
+	0xD639,
+	0xD654,
+	0xD655,
+	0xD670,
+	0xD671,
+	0xD68C,
+	0xD68D,
+	0xD6A8,
+	0xD6A9,
+	0xD6C4,
+	0xD6C5,
+	0xD6E0,
+	0xD6E1,
+	0xD6FC,
+	0xD6FD,
+	0xD718,
+	0xD719,
+	0xD734,
+	0xD735,
+	0xD750,
+	0xD751,
+	0xD76C,
+	0xD76D,
+	0xD788,
+	0xD789,
+	0xD7A4,
+	0xD7B0,
+	0xD7C7,
+	0xD7CB,
+	0xD7FC,
+	0xF900,
+	0xFB00,
+	0xFB1D,
+	0xFB1E,
+	0xFB1F,
+	0xFB29,
+	0xFB2A,
+	0xFB37,
+	0xFB38,
+	0xFB3D,
+	0xFB3E,
+	0xFB3F,
+	0xFB40,
+	0xFB42,
+	0xFB43,
+	0xFB45,
+	0xFB46,
+	0xFB50,
+	0xFD3E,
+	0xFD3F,
+	0xFD40,
+	0xFDFC,
+	0xFDFD,
+	0xFE00,
+	0xFE10,
+	0xFE11,
+	0xFE13,
+	0xFE15,
+	0xFE17,
+	0xFE18,
+	0xFE19,
+	0xFE1A,
+	0xFE20,
+	0xFE30,
+	0xFE35,
+	0xFE36,
+	0xFE37,
+	0xFE38,
+	0xFE39,
+	0xFE3A,
+	0xFE3B,
+	0xFE3C,
+	0xFE3D,
+	0xFE3E,
+	0xFE3F,
+	0xFE40,
+	0xFE41,
+	0xFE42,
+	0xFE43,
+	0xFE44,
+	0xFE45,
+	0xFE47,
+	0xFE48,
+	0xFE49,
+	0xFE50,
+	0xFE51,
+	0xFE52,
+	0xFE53,
+	0xFE54,
+	0xFE56,
+	0xFE58,
+	0xFE59,
+	0xFE5A,
+	0xFE5B,
+	0xFE5C,
+	0xFE5D,
+	0xFE5E,
+	0xFE5F,
+	0xFE67,
+	0xFE68,
+	0xFE69,
+	0xFE6A,
+	0xFE6B,
+	0xFE6C,
+	0xFEFF,
+	0xFF00,
+	0xFF01,
+	0xFF02,
+	0xFF04,
+	0xFF05,
+	0xFF06,
+	0xFF08,
+	0xFF09,
+	0xFF0A,
+	0xFF0C,
+	0xFF0D,
+	0xFF0E,
+	0xFF0F,
+	0xFF1A,
+	0xFF1C,
+	0xFF1F,
+	0xFF20,
+	0xFF3B,
+	0xFF3C,
+	0xFF3D,
+	0xFF3E,
+	0xFF5B,
+	0xFF5C,
+	0xFF5D,
+	0xFF5E,
+	0xFF5F,
+	0xFF60,
+	0xFF62,
+	0xFF63,
+	0xFF65,
+	0xFF66,
+	0xFF67,
+	0xFF71,
+	0xFF9E,
+	0xFFA0,
+	0xFFE0,
+	0xFFE1,
+	0xFFE2,
+	0xFFE5,
+	0xFFE7,
+	0xFFF9,
+	0xFFFC,
+	0xFFFD,
+	0x10100,
+	0x10103,
+	0x101FD,
+	0x101FE,
+	0x102E0,
+	0x102E1,
+	0x10376,
+	0x1037B,
+	0x1039F,
+	0x103A0,
+	0x103D0,
+	0x103D1,
+	0x104A0,
+	0x104AA,
+	0x10857,
+	0x10858,
+	0x1091F,
+	0x10920,
+	0x10A01,
+	0x10A04,
+	0x10A05,
+	0x10A07,
+	0x10A0C,
+	0x10A10,
+	0x10A38,
+	0x10A3B,
+	0x10A3F,
+	0x10A40,
+	0x10A50,
+	0x10A58,
+	0x10AE5,
+	0x10AE7,
+	0x10AF0,
+	0x10AF6,
+	0x10AF7,
+	0x10B39,
+	0x10B40,
+	0x11000,
+	0x11003,
+	0x11038,
+	0x11047,
+	0x11049,
+	0x11066,
+	0x11070,
+	0x1107F,
+	0x11083,
+	0x110B0,
+	0x110BB,
+	0x110BE,
+	0x110C2,
+	0x110F0,
+	0x110FA,
+	0x11100,
+	0x11103,
+	0x11127,
+	0x11135,
+	0x11136,
+	0x11140,
+	0x11144,
+	0x11173,
+	0x11174,
+	0x11175,
+	0x11176,
+	0x11180,
+	0x11183,
+	0x111B3,
+	0x111C1,
+	0x111C5,
+	0x111C7,
+	0x111C8,
+	0x111C9,
+	0x111CA,
+	0x111CD,
+	0x111D0,
+	0x111DA,
+	0x111DB,
+	0x111DC,
+	0x111DD,
+	0x111E0,
+	0x1122C,
+	0x11238,
+	0x1123A,
+	0x1123B,
+	0x1123D,
+	0x112A9,
+	0x112AA,
+	0x112DF,
+	0x112EB,
+	0x112F0,
+	0x112FA,
+	0x11300,
+	0x11304,
+	0x1133C,
+	0x1133D,
+	0x1133E,
+	0x11345,
+	0x11347,
+	0x11349,
+	0x1134B,
+	0x1134E,
+	0x11357,
+	0x11358,
+	0x11362,
+	0x11364,
+	0x11366,
+	0x1136D,
+	0x11370,
+	0x11375,
+	0x114B0,
+	0x114C4,
+	0x114D0,
+	0x114DA,
+	0x115AF,
+	0x115B6,
+	0x115B8,
+	0x115C1,
+	0x115C2,
+	0x115C4,
+	0x115C6,
+	0x115C9,
+	0x115D8,
+	0x115DC,
+	0x115DE,
+	0x11630,
+	0x11641,
+	0x11643,
+	0x11650,
+	0x1165A,
+	0x116AB,
+	0x116B8,
+	0x116C0,
+	0x116CA,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
+	0x1173C,
+	0x1173F,
+	0x118E0,
+	0x118EA,
+	0x12470,
+	0x12475,
+	0x13258,
+	0x1325B,
+	0x1325E,
+	0x13282,
+	0x13283,
+	0x13286,
+	0x13287,
+	0x13288,
+	0x13289,
+	0x1328A,
+	0x13379,
+	0x1337A,
+	0x1337C,
+	0x145CE,
+	0x145CF,
+	0x145D0,
+	0x16A60,
+	0x16A6A,
+	0x16A6E,
+	0x16A70,
+	0x16AF0,
+	0x16AF5,
+	0x16AF6,
+	0x16B30,
+	0x16B37,
+	0x16B3A,
+	0x16B44,
+	0x16B45,
+	0x16B50,
+	0x16B5A,
+	0x16F51,
+	0x16F7F,
+	0x16F8F,
+	0x16F93,
+	0x1B000,
+	0x1B002,
+	0x1BC9D,
+	0x1BC9F,
+	0x1BCA0,
+	0x1BCA4,
+	0x1D165,
+	0x1D16A,
+	0x1D16D,
+	0x1D183,
+	0x1D185,
+	0x1D18C,
+	0x1D1AA,
+	0x1D1AE,
+	0x1D242,
+	0x1D245,
+	0x1D7CE,
+	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA87,
+	0x1DA8B,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
+	0x1E8D0,
+	0x1E8D7,
+	0x1F000,
+	0x1F02C,
+	0x1F030,
+	0x1F094,
+	0x1F0A0,
+	0x1F0AF,
+	0x1F0B1,
+	0x1F0C0,
+	0x1F0C1,
+	0x1F0D0,
+	0x1F0D1,
+	0x1F0F6,
+	0x1F1E6,
+	0x1F200,
+	0x1F203,
+	0x1F210,
+	0x1F23B,
+	0x1F240,
+	0x1F249,
+	0x1F250,
+	0x1F252,
+	0x1F300,
+	0x1F39C,
+	0x1F39E,
+	0x1F3B5,
+	0x1F3B7,
+	0x1F3BC,
+	0x1F3BD,
+	0x1F3FB,
+	0x1F400,
+	0x1F4A0,
+	0x1F4A1,
+	0x1F4A2,
+	0x1F4A3,
+	0x1F4A4,
+	0x1F4A5,
+	0x1F4AF,
+	0x1F4B0,
+	0x1F4B1,
+	0x1F4B3,
+	0x1F500,
+	0x1F507,
+	0x1F517,
+	0x1F525,
+	0x1F532,
+	0x1F54A,
+	0x1F57A,
+	0x1F57B,
+	0x1F5A4,
+	0x1F5A5,
+	0x1F5D4,
+	0x1F5DC,
+	0x1F5F4,
+	0x1F5FA,
+	0x1F650,
+	0x1F676,
+	0x1F679,
+	0x1F67C,
+	0x1F680,
+	0x1F6D1,
+	0x1F6E0,
+	0x1F6ED,
+	0x1F6F0,
+	0x1F6F4,
+	0x1F910,
+	0x1F919,
+	0x1F980,
+	0x1F985,
+	0x1F9C0,
+	0x1F9C1,
+	0x20000,
+	0x2FFFE,
+	0x30000,
+	0x3FFFE,
+	0xE0001,
+	0xE0002,
+	0xE0020,
+	0xE0080,
+	0xE0100,
+	0xE01F0
+};
+
+#endif	/* defined(PERL_IN_PERL_C) */
+
+#if defined(PERL_IN_REGEXEC_C)
+
+#define LB_ENUM_COUNT 36
+
+typedef enum {
+	LB_Alphabetic = 0,
+	LB_Break_After = 1,
+	LB_Break_Before = 2,
+	LB_Break_Both = 3,
+	LB_Break_Symbols = 4,
+	LB_Carriage_Return = 5,
+	LB_Close_Parenthesis = 6,
+	LB_Close_Punctuation = 7,
+	LB_Combining_Mark = 8,
+	LB_Contingent_Break = 9,
+	LB_Exclamation = 10,
+	LB_Glue = 11,
+	LB_H2 = 12,
+	LB_H3 = 13,
+	LB_Hebrew_Letter = 14,
+	LB_Hyphen = 15,
+	LB_Ideographic = 16,
+	LB_Infix_Numeric = 17,
+	LB_Inseparable = 18,
+	LB_JL = 19,
+	LB_JT = 20,
+	LB_JV = 21,
+	LB_Line_Feed = 22,
+	LB_Mandatory_Break = 23,
+	LB_Next_Line = 24,
+	LB_Nonstarter = 25,
+	LB_Numeric = 26,
+	LB_Open_Punctuation = 27,
+	LB_Postfix_Numeric = 28,
+	LB_Prefix_Numeric = 29,
+	LB_Quotation = 30,
+	LB_Regional_Indicator = 31,
+	LB_Space = 32,
+	LB_Word_Joiner = 33,
+	LB_ZWSpace = 34,
+	LB_EDGE = 35
+} LB_enum;
+
+static const LB_enum _Perl_LB_invmap[] = { /* for ASCII/Latin1 */
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Line_Feed,
+	LB_Mandatory_Break,
+	LB_Carriage_Return,
+	LB_Combining_Mark,
+	LB_Space,
+	LB_Exclamation,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Open_Punctuation,
+	LB_Close_Parenthesis,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Infix_Numeric,
+	LB_Hyphen,
+	LB_Infix_Numeric,
+	LB_Break_Symbols,
+	LB_Numeric,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Prefix_Numeric,
+	LB_Close_Parenthesis,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Break_After,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Next_Line,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Open_Punctuation,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Exclamation,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Exclamation,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Numeric,
+	LB_Postfix_Numeric,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Glue,
+	LB_Break_Before,
+	LB_Break_After,
+	LB_Glue,
+	LB_Exclamation,
+	LB_Glue,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Break_After,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Glue,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Numeric,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_JL,
+	LB_JV,
+	LB_JT,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Glue,
+	LB_Break_After,
+	LB_ZWSpace,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Glue,
+	LB_Break_After,
+	LB_Break_Both,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Open_Punctuation,
+	LB_Quotation,
+	LB_Open_Punctuation,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Inseparable,
+	LB_Break_After,
+	LB_Mandatory_Break,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Word_Joiner,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Inseparable,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Quotation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Open_Punctuation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Break_After,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_Both,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Nonstarter,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Combining_Mark,
+	LB_Ideographic,
+	LB_Combining_Mark,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_JL,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_Alphabetic,
+	LB_JV,
+	LB_Alphabetic,
+	LB_JT,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Combining_Mark,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Infix_Numeric,
+	LB_Close_Punctuation,
+	LB_Infix_Numeric,
+	LB_Exclamation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Inseparable,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Exclamation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Word_Joiner,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Ideographic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Exclamation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Ideographic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Contingent_Break,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Inseparable,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_Before,
+	LB_Break_After,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Regional_Indicator,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic
+};
+
+#endif	/* defined(PERL_IN_REGEXEC_C) */
+
+#if defined(PERL_IN_PERL_C)
+
+static const UV _Perl_SB_invlist[] = { /* for ASCII/Latin1 */
+	2896,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -6760,8 +11275,8 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x859,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x904,
 	0x93A,
 	0x93D,
@@ -6871,6 +11386,8 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -6957,7 +11474,7 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC62,
 	0xC64,
@@ -7012,7 +11529,7 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD62,
 	0xD64,
 	0xD66,
@@ -7192,7 +11709,9 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166E,
@@ -7267,8 +11786,6 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x1980,
 	0x19AC,
 	0x19B0,
-	0x19C1,
-	0x19C8,
 	0x19CA,
 	0x19D0,
 	0x19DA,
@@ -7955,7 +12472,7 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -8049,7 +12566,6 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xA69A,
 	0xA69B,
 	0xA69E,
-	0xA69F,
 	0xA6A0,
 	0xA6F0,
 	0xA6F2,
@@ -8183,7 +12699,10 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xA7AA,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B5,
+	0xA7B6,
+	0xA7B7,
+	0xA7B8,
 	0xA7F7,
 	0xA7F8,
 	0xA7FB,
@@ -8211,6 +12730,8 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA90A,
 	0xA926,
@@ -8284,9 +12805,8 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
+	0xAB70,
 	0xABC0,
 	0xABE3,
 	0xABEB,
@@ -8341,7 +12861,7 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xFE17,
 	0xFE19,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE31,
 	0xFE33,
 	0xFE35,
@@ -8475,6 +12995,10 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -8520,6 +13044,10 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11003,
 	0x11038,
@@ -8557,11 +13085,16 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x111C1,
 	0x111C5,
 	0x111C7,
+	0x111CA,
 	0x111CD,
 	0x111CE,
 	0x111D0,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
+	0x111DE,
+	0x111E0,
 	0x11200,
 	0x11212,
 	0x11213,
@@ -8570,12 +13103,23 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x1123A,
 	0x1123B,
 	0x1123D,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
+	0x112AA,
 	0x112B0,
 	0x112DF,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -8597,6 +13141,8 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -8622,7 +13168,9 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x115C2,
 	0x115C4,
 	0x115C9,
-	0x115CA,
+	0x115D8,
+	0x115DC,
+	0x115DE,
 	0x11600,
 	0x11630,
 	0x11641,
@@ -8636,6 +13184,14 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
+	0x1173C,
+	0x1173F,
 	0x118A0,
 	0x118C0,
 	0x118E0,
@@ -8645,11 +13201,15 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -8801,6 +13361,20 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA88,
+	0x1DA89,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -8885,6 +13459,8 @@ static const UV Sentence_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0001,
@@ -8906,21 +13482,21 @@ typedef enum {
 	SB_ATerm = 1,
 	SB_CR = 2,
 	SB_Close = 3,
-	SB_EDGE = 4,
-	SB_Extend = 5,
-	SB_Format = 6,
-	SB_LF = 7,
-	SB_Lower = 8,
-	SB_Numeric = 9,
-	SB_OLetter = 10,
-	SB_SContinue = 11,
-	SB_STerm = 12,
-	SB_Sep = 13,
-	SB_Sp = 14,
-	SB_Upper = 15
+	SB_Extend = 4,
+	SB_Format = 5,
+	SB_LF = 6,
+	SB_Lower = 7,
+	SB_Numeric = 8,
+	SB_OLetter = 9,
+	SB_SContinue = 10,
+	SB_STerm = 11,
+	SB_Sep = 12,
+	SB_Sp = 13,
+	SB_Upper = 14,
+	SB_EDGE = 15
 } SB_enum;
 
-static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
+static const SB_enum _Perl_SB_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_Sp,
 	SB_LF,
@@ -9734,6 +14310,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Extend,
 	SB_Other,
 	SB_OLetter,
@@ -10054,7 +14632,9 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
-	SB_OLetter,
+	SB_Upper,
+	SB_Other,
+	SB_Lower,
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
@@ -10129,9 +14709,7 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
-	SB_Extend,
 	SB_OLetter,
-	SB_Extend,
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
@@ -10911,7 +15489,6 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Lower,
 	SB_Upper,
 	SB_Lower,
-	SB_Other,
 	SB_Extend,
 	SB_OLetter,
 	SB_Extend,
@@ -11018,7 +15595,7 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Lower,
 	SB_Upper,
 	SB_Lower,
-	SB_Other,
+	SB_OLetter,
 	SB_Upper,
 	SB_Lower,
 	SB_Upper,
@@ -11046,6 +15623,9 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Upper,
 	SB_Other,
 	SB_Upper,
+	SB_Lower,
+	SB_Upper,
+	SB_Lower,
 	SB_Other,
 	SB_OLetter,
 	SB_Lower,
@@ -11074,6 +15654,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Numeric,
 	SB_OLetter,
 	SB_Extend,
@@ -11149,7 +15731,6 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Lower,
 	SB_Other,
 	SB_Lower,
-	SB_Other,
 	SB_OLetter,
 	SB_Extend,
 	SB_STerm,
@@ -11347,6 +15928,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_OLetter,
 	SB_Other,
 	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
 	SB_Extend,
 	SB_Other,
 	SB_Extend,
@@ -11383,6 +15968,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_Upper,
+	SB_Other,
+	SB_Lower,
+	SB_Other,
 	SB_Extend,
 	SB_OLetter,
 	SB_Extend,
@@ -11420,6 +16009,7 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_OLetter,
 	SB_STerm,
 	SB_Other,
+	SB_Extend,
 	SB_STerm,
 	SB_Other,
 	SB_Numeric,
@@ -11427,6 +16017,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_STerm,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_OLetter,
 	SB_Extend,
 	SB_STerm,
@@ -11434,6 +16028,17 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_STerm,
 	SB_Other,
 	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_STerm,
+	SB_Other,
+	SB_OLetter,
 	SB_Extend,
 	SB_Other,
 	SB_Numeric,
@@ -11460,6 +16065,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_Extend,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Extend,
 	SB_Other,
 	SB_OLetter,
@@ -11485,6 +16092,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_STerm,
 	SB_Other,
 	SB_STerm,
+	SB_OLetter,
+	SB_Extend,
 	SB_Other,
 	SB_OLetter,
 	SB_Extend,
@@ -11499,6 +16108,14 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Numeric,
+	SB_Other,
+	SB_STerm,
+	SB_Other,
 	SB_Upper,
 	SB_Lower,
 	SB_Numeric,
@@ -11517,6 +16134,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Numeric,
 	SB_Other,
 	SB_STerm,
@@ -11664,6 +16285,20 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_STerm,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
 	SB_OLetter,
 	SB_Other,
 	SB_Extend,
@@ -11750,6 +16385,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Format,
 	SB_Other,
 	SB_Format,
@@ -11760,46 +16397,21 @@ static const SB_enum Sentence_Break_invmap[] = { /* for ASCII/Latin1 */
 
 #endif	/* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_REGCOMP_C)
-
-static const UV UpperLatin1_invlist[] = { /* for ASCII/Latin1 */
-	3,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x80,
-	0x100
-};
-
-#endif	/* defined(PERL_IN_REGCOMP_C) */
-
 #if defined(PERL_IN_PERL_C)
 
-static const UV VertSpace_invlist[] = { /* for ASCII/Latin1 */
-	7,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0xA,
-	0xE,
-	0x85,
-	0x86,
-	0x2028,
-	0x202A
-};
-
-static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
-	1480,	/* Number of elements */
+static const UV _Perl_WB_invlist[] = { /* for ASCII/Latin1 */
+	1535,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0x0,
+	0x9,
 	0xA,
 	0xB,
 	0xD,
 	0xE,
+	0x20,
+	0x21,
 	0x22,
 	0x23,
 	0x27,
@@ -11820,6 +16432,8 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x7B,
 	0x85,
 	0x86,
+	0xA0,
+	0xA1,
 	0xAA,
 	0xAB,
 	0xAD,
@@ -11960,8 +16574,8 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x859,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x904,
 	0x93A,
 	0x93D,
@@ -12071,6 +16685,8 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -12157,7 +16773,7 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC62,
 	0xC64,
@@ -12212,7 +16828,7 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD62,
 	0xD64,
 	0xD66,
@@ -12353,7 +16969,9 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -12408,10 +17026,6 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x193C,
 	0x1946,
 	0x1950,
-	0x19B0,
-	0x19C1,
-	0x19C8,
-	0x19CA,
 	0x19D0,
 	0x19DA,
 	0x1A00,
@@ -12507,6 +17121,8 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x1FF5,
 	0x1FF6,
 	0x1FFD,
+	0x2000,
+	0x200B,
 	0x200C,
 	0x200E,
 	0x2010,
@@ -12518,12 +17134,14 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x2028,
 	0x202A,
 	0x202F,
+	0x2030,
 	0x203F,
 	0x2041,
 	0x2044,
 	0x2045,
 	0x2054,
 	0x2055,
+	0x205F,
 	0x2060,
 	0x2065,
 	0x2066,
@@ -12609,6 +17227,8 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x2E00,
 	0x2E2F,
 	0x2E30,
+	0x3000,
+	0x3001,
 	0x3005,
 	0x3006,
 	0x302A,
@@ -12653,7 +17273,6 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xA67E,
 	0xA67F,
 	0xA69E,
-	0xA69F,
 	0xA6A0,
 	0xA6F0,
 	0xA6F2,
@@ -12662,11 +17281,9 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -12689,6 +17306,8 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA90A,
 	0xA926,
@@ -12750,10 +17369,8 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABE3,
 	0xABEB,
 	0xABEC,
@@ -12802,7 +17419,7 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0xFE14,
 	0xFE15,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE33,
 	0xFE35,
 	0xFE4D,
@@ -12917,6 +17534,10 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -12960,6 +17581,10 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11003,
 	0x11038,
@@ -12992,20 +17617,34 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x111B3,
 	0x111C1,
 	0x111C5,
+	0x111CA,
+	0x111CD,
 	0x111D0,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1122C,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112DF,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -13027,6 +17666,8 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -13049,6 +17690,9 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x115B6,
 	0x115B8,
 	0x115C1,
+	0x115D8,
+	0x115DC,
+	0x115DE,
 	0x11600,
 	0x11630,
 	0x11641,
@@ -13061,6 +17705,10 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118E0,
 	0x118EA,
@@ -13069,11 +17717,15 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -13191,6 +17843,18 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -13281,36 +17945,40 @@ static const UV Word_Break_invlist[] = { /* for ASCII/Latin1 */
 
 #if defined(PERL_IN_REGEXEC_C)
 
-#define WB_ENUM_COUNT 19
+#define WB_ENUM_COUNT 20
 
 typedef enum {
 	WB_Other = 0,
 	WB_ALetter = 1,
 	WB_CR = 2,
 	WB_Double_Quote = 3,
-	WB_EDGE = 4,
-	WB_Extend = 5,
-	WB_ExtendNumLet = 6,
-	WB_Format = 7,
-	WB_Hebrew_Letter = 8,
-	WB_Katakana = 9,
-	WB_LF = 10,
-	WB_MidLetter = 11,
-	WB_MidNum = 12,
-	WB_MidNumLet = 13,
-	WB_Newline = 14,
-	WB_Numeric = 15,
+	WB_Extend = 4,
+	WB_ExtendNumLet = 5,
+	WB_Format = 6,
+	WB_Hebrew_Letter = 7,
+	WB_Katakana = 8,
+	WB_LF = 9,
+	WB_MidLetter = 10,
+	WB_MidNum = 11,
+	WB_MidNumLet = 12,
+	WB_Newline = 13,
+	WB_Numeric = 14,
+	WB_Perl_Tailored_HSpace = 15,
 	WB_Regional_Indicator = 16,
 	WB_Single_Quote = 17,
-	WB_UNKNOWN = 18
+	WB_EDGE = 18,
+	WB_UNKNOWN = 19
 } WB_enum;
 
-static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
+static const WB_enum _Perl_WB_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
 	WB_LF,
 	WB_Newline,
 	WB_CR,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
+	WB_Other,
 	WB_Double_Quote,
 	WB_Other,
 	WB_Single_Quote,
@@ -13331,6 +17999,8 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_Newline,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
+	WB_Other,
 	WB_ALetter,
 	WB_Other,
 	WB_Format,
@@ -13582,6 +18252,8 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
@@ -13870,6 +18542,8 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
+	WB_Perl_Tailored_HSpace,
+	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
@@ -13919,10 +18593,6 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
 	WB_Numeric,
 	WB_Other,
 	WB_ALetter,
@@ -14018,6 +18688,8 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
+	WB_Other,
 	WB_Extend,
 	WB_Format,
 	WB_Other,
@@ -14028,6 +18700,7 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_MidLetter,
 	WB_Newline,
 	WB_Format,
+	WB_Perl_Tailored_HSpace,
 	WB_Other,
 	WB_ExtendNumLet,
 	WB_Other,
@@ -14035,6 +18708,7 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_ExtendNumLet,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
 	WB_Format,
 	WB_Other,
 	WB_Format,
@@ -14120,6 +18794,8 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
+	WB_Other,
 	WB_ALetter,
 	WB_Other,
 	WB_Extend,
@@ -14163,7 +18839,6 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
-	WB_Other,
 	WB_Extend,
 	WB_ALetter,
 	WB_Extend,
@@ -14177,8 +18852,6 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
 	WB_Extend,
 	WB_ALetter,
 	WB_Extend,
@@ -14200,6 +18873,8 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Numeric,
 	WB_ALetter,
 	WB_Extend,
@@ -14263,8 +18938,6 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_Extend,
@@ -14437,6 +19110,10 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_Extend,
@@ -14471,6 +19148,10 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Extend,
 	WB_ALetter,
 	WB_Extend,
@@ -14503,15 +19184,29 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Extend,
 	WB_ALetter,
 	WB_Other,
+	WB_Extend,
+	WB_Other,
 	WB_Numeric,
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_Numeric,
@@ -14538,6 +19233,8 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_Extend,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
@@ -14564,6 +19261,9 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
+	WB_Extend,
+	WB_Other,
+	WB_ALetter,
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
@@ -14572,6 +19272,10 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Numeric,
+	WB_Other,
 	WB_ALetter,
 	WB_Numeric,
 	WB_Other,
@@ -14589,6 +19293,10 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Numeric,
 	WB_Other,
 	WB_ALetter,
@@ -14702,6 +19410,18 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
 	WB_ALetter,
 	WB_Other,
 	WB_Extend,
@@ -14790,8 +19510,36 @@ static const WB_enum Word_Break_invmap[] = { /* for ASCII/Latin1 */
 
 #endif	/* defined(PERL_IN_REGEXEC_C) */
 
+#if defined(PERL_IN_REGCOMP_C)
+
+static const UV UpperLatin1_invlist[] = { /* for ASCII/Latin1 */
+	3,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x80,
+	0x100
+};
+
+#endif	/* defined(PERL_IN_REGCOMP_C) */
+
 #if defined(PERL_IN_PERL_C)
 
+static const UV VertSpace_invlist[] = { /* for ASCII/Latin1 */
+	7,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0xA,
+	0xE,
+	0x85,
+	0x86,
+	0x2028,
+	0x202A
+};
+
 static const UV XPerlSpace_invlist[] = { /* for ASCII/Latin1 */
 	21,	/* Number of elements */
 	148565664, /* Version and data structure type */
@@ -14821,7 +19569,7 @@ static const UV XPerlSpace_invlist[] = { /* for ASCII/Latin1 */
 };
 
 static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
-	1261,	/* Number of elements */
+	1297,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -14929,8 +19677,8 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0x840,
 	0x859,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x8EA,
 	0x8F0,
 	0x93C,
@@ -15028,6 +19776,8 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -15109,7 +19859,7 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -15160,7 +19910,7 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD70,
@@ -15309,7 +20059,9 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -15553,7 +20305,7 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -15567,19 +20319,15 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0xA674,
 	0xA67C,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F0,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -15598,6 +20346,8 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA92B,
 	0xA930,
@@ -15649,10 +20399,8 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xABF0,
 	0xABFA,
@@ -15776,6 +20524,10 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -15812,6 +20564,10 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11046,
 	0x11066,
@@ -15836,17 +20592,29 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0x111C5,
 	0x111D0,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11235,
 	0x11237,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112E9,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -15866,6 +20634,8 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0x11349,
 	0x1134B,
 	0x1134D,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -15882,6 +20652,8 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0x115B6,
 	0x115B8,
 	0x115BF,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x1163F,
 	0x11640,
@@ -15894,6 +20666,12 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0x116B6,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172B,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118EA,
 	0x118FF,
@@ -15901,11 +20679,15 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -16084,12 +20866,14 @@ static const UV XPosixAlnum_invlist[] = { /* for ASCII/Latin1 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E
 };
 
 static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
-	1201,	/* Number of elements */
+	1235,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -16197,8 +20981,8 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0x840,
 	0x859,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x8EA,
 	0x8F0,
 	0x93C,
@@ -16292,6 +21076,8 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0xAD1,
 	0xAE0,
 	0xAE4,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -16369,7 +21155,7 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC81,
@@ -16416,7 +21202,7 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD7A,
 	0xD80,
@@ -16553,7 +21339,9 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -16787,7 +21575,7 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -16803,19 +21591,15 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0xA674,
 	0xA67C,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F0,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -16832,6 +21616,8 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA90A,
 	0xA92B,
 	0xA930,
@@ -16883,10 +21669,8 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xAC00,
 	0xD7A4,
@@ -17004,6 +21788,10 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -17040,6 +21828,10 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11046,
 	0x11082,
@@ -17058,15 +21850,27 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0x111C5,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11235,
 	0x11237,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112E9,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -17086,6 +21890,8 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0x11349,
 	0x1134B,
 	0x1134D,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -17100,6 +21906,8 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0x115B6,
 	0x115B8,
 	0x115BF,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x1163F,
 	0x11640,
@@ -17108,6 +21916,10 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0x11645,
 	0x11680,
 	0x116B6,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172B,
 	0x118A0,
 	0x118E0,
 	0x118FF,
@@ -17115,11 +21927,15 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -17292,6 +22108,8 @@ static const UV XPosixAlpha_invlist[] = { /* for ASCII/Latin1 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E
 };
@@ -17332,7 +22150,7 @@ static const UV XPosixCntrl_invlist[] = { /* for ASCII/Latin1 */
 };
 
 static const UV XPosixDigit_invlist[] = { /* for ASCII/Latin1 */
-	101,	/* Number of elements */
+	103,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -17429,6 +22247,8 @@ static const UV XPosixDigit_invlist[] = { /* for ASCII/Latin1 */
 	0x1165A,
 	0x116C0,
 	0x116CA,
+	0x11730,
+	0x1173A,
 	0x118E0,
 	0x118EA,
 	0x16A60,
@@ -17440,7 +22260,7 @@ static const UV XPosixDigit_invlist[] = { /* for ASCII/Latin1 */
 };
 
 static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
-	1211,	/* Number of elements */
+	1237,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -17494,8 +22314,8 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x85E,
 	0x85F,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x984,
 	0x985,
 	0x98D,
@@ -17581,6 +22401,8 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0xAE4,
 	0xAE6,
 	0xAF2,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -17660,7 +22482,7 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -17711,7 +22533,7 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD76,
@@ -17836,7 +22658,9 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x1380,
 	0x139A,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1400,
 	0x1680,
 	0x1681,
@@ -17972,11 +22796,11 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x2090,
 	0x209D,
 	0x20A0,
-	0x20BE,
+	0x20BF,
 	0x20D0,
 	0x20F1,
 	0x2100,
-	0x218A,
+	0x218C,
 	0x2190,
 	0x23FB,
 	0x2400,
@@ -17993,6 +22817,8 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x2BC9,
 	0x2BCA,
 	0x2BD2,
+	0x2BEC,
+	0x2BF0,
 	0x2C00,
 	0x2C2F,
 	0x2C30,
@@ -18058,7 +22884,7 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x3300,
 	0x4DB6,
 	0x4DC0,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA490,
@@ -18066,15 +22892,11 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0xA4D0,
 	0xA62C,
 	0xA640,
-	0xA69E,
-	0xA69F,
 	0xA6F8,
 	0xA700,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA82C,
 	0xA830,
@@ -18086,7 +22908,7 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0xA8CE,
 	0xA8DA,
 	0xA8E0,
-	0xA8FC,
+	0xA8FE,
 	0xA900,
 	0xA954,
 	0xA95F,
@@ -18118,10 +22940,8 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0xAB28,
 	0xAB2F,
 	0xAB30,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEE,
 	0xABF0,
 	0xABFA,
@@ -18162,8 +22982,6 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0xFE00,
 	0xFE1A,
 	0xFE20,
-	0xFE2E,
-	0xFE30,
 	0xFE53,
 	0xFE54,
 	0xFE67,
@@ -18267,7 +23085,11 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x1089F,
 	0x108A7,
 	0x108B0,
-	0x10900,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
+	0x108FB,
 	0x1091C,
 	0x1091F,
 	0x1093A,
@@ -18275,9 +23097,9 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x10940,
 	0x10980,
 	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
+	0x109BC,
+	0x109D0,
+	0x109D2,
 	0x10A04,
 	0x10A05,
 	0x10A07,
@@ -18313,6 +23135,12 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x10BB0,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
+	0x10CFA,
+	0x10D00,
 	0x10E60,
 	0x10E7F,
 	0x11000,
@@ -18332,22 +23160,30 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x11150,
 	0x11177,
 	0x11180,
-	0x111C9,
-	0x111CD,
 	0x111CE,
 	0x111D0,
-	0x111DB,
+	0x111E0,
 	0x111E1,
 	0x111F5,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1123E,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112AA,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -18367,6 +23203,8 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -18382,7 +23220,7 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x11580,
 	0x115B6,
 	0x115B8,
-	0x115CA,
+	0x115DE,
 	0x11600,
 	0x11645,
 	0x11650,
@@ -18391,6 +23229,12 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x11740,
 	0x118A0,
 	0x118F3,
 	0x118FF,
@@ -18398,13 +23242,17 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
 	0x12470,
 	0x12475,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -18450,7 +23298,7 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x1D100,
 	0x1D127,
 	0x1D129,
-	0x1D1DE,
+	0x1D1E9,
 	0x1D200,
 	0x1D246,
 	0x1D300,
@@ -18498,7 +23346,11 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x1D6A8,
 	0x1D7CC,
 	0x1D7CE,
-	0x1D800,
+	0x1DA8C,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8C7,
@@ -18600,25 +23452,11 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x1F250,
 	0x1F252,
 	0x1F300,
-	0x1F32D,
-	0x1F330,
-	0x1F37E,
-	0x1F380,
-	0x1F3CF,
-	0x1F3D4,
-	0x1F3F8,
-	0x1F400,
-	0x1F4FF,
-	0x1F500,
-	0x1F54B,
-	0x1F550,
 	0x1F57A,
 	0x1F57B,
 	0x1F5A4,
 	0x1F5A5,
-	0x1F643,
-	0x1F645,
-	0x1F6D0,
+	0x1F6D1,
 	0x1F6E0,
 	0x1F6ED,
 	0x1F6F0,
@@ -18637,12 +23475,20 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 	0x1F888,
 	0x1F890,
 	0x1F8AE,
+	0x1F910,
+	0x1F919,
+	0x1F980,
+	0x1F985,
+	0x1F9C0,
+	0x1F9C1,
 	0x20000,
 	0x2A6D7,
 	0x2A700,
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0001,
@@ -18658,7 +23504,7 @@ static const UV XPosixGraph_invlist[] = { /* for ASCII/Latin1 */
 };
 
 static const UV XPosixLower_invlist[] = { /* for ASCII/Latin1 */
-	1267,	/* Number of elements */
+	1275,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -19213,6 +24059,8 @@ static const UV XPosixLower_invlist[] = { /* for ASCII/Latin1 */
 	0x530,
 	0x561,
 	0x588,
+	0x13F8,
+	0x13FE,
 	0x1D00,
 	0x1DC0,
 	0x1E01,
@@ -19855,14 +24703,18 @@ static const UV XPosixLower_invlist[] = { /* for ASCII/Latin1 */
 	0xA7A8,
 	0xA7A9,
 	0xA7AA,
+	0xA7B5,
+	0xA7B6,
+	0xA7B7,
+	0xA7B8,
 	0xA7F8,
 	0xA7FB,
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
+	0xAB70,
+	0xABC0,
 	0xFB00,
 	0xFB07,
 	0xFB13,
@@ -19871,6 +24723,8 @@ static const UV XPosixLower_invlist[] = { /* for ASCII/Latin1 */
 	0xFF5B,
 	0x10428,
 	0x10450,
+	0x10CC0,
+	0x10CF3,
 	0x118C0,
 	0x118E0,
 	0x1D41A,
@@ -19932,7 +24786,7 @@ static const UV XPosixLower_invlist[] = { /* for ASCII/Latin1 */
 };
 
 static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
-	1205,	/* Number of elements */
+	1231,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -19986,8 +24840,8 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x85E,
 	0x85F,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x984,
 	0x985,
 	0x98D,
@@ -20073,6 +24927,8 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0xAE4,
 	0xAE6,
 	0xAF2,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -20152,7 +25008,7 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -20203,7 +25059,7 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD76,
@@ -20328,7 +25184,9 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x1380,
 	0x139A,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1400,
 	0x169D,
 	0x16A0,
@@ -20458,11 +25316,11 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x2090,
 	0x209D,
 	0x20A0,
-	0x20BE,
+	0x20BF,
 	0x20D0,
 	0x20F1,
 	0x2100,
-	0x218A,
+	0x218C,
 	0x2190,
 	0x23FB,
 	0x2400,
@@ -20479,6 +25337,8 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x2BC9,
 	0x2BCA,
 	0x2BD2,
+	0x2BEC,
+	0x2BF0,
 	0x2C00,
 	0x2C2F,
 	0x2C30,
@@ -20544,7 +25404,7 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x3300,
 	0x4DB6,
 	0x4DC0,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA490,
@@ -20552,15 +25412,11 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0xA4D0,
 	0xA62C,
 	0xA640,
-	0xA69E,
-	0xA69F,
 	0xA6F8,
 	0xA700,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA82C,
 	0xA830,
@@ -20572,7 +25428,7 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0xA8CE,
 	0xA8DA,
 	0xA8E0,
-	0xA8FC,
+	0xA8FE,
 	0xA900,
 	0xA954,
 	0xA95F,
@@ -20604,10 +25460,8 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0xAB28,
 	0xAB2F,
 	0xAB30,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEE,
 	0xABF0,
 	0xABFA,
@@ -20648,8 +25502,6 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0xFE00,
 	0xFE1A,
 	0xFE20,
-	0xFE2E,
-	0xFE30,
 	0xFE53,
 	0xFE54,
 	0xFE67,
@@ -20753,7 +25605,11 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x1089F,
 	0x108A7,
 	0x108B0,
-	0x10900,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
+	0x108FB,
 	0x1091C,
 	0x1091F,
 	0x1093A,
@@ -20761,9 +25617,9 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x10940,
 	0x10980,
 	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
+	0x109BC,
+	0x109D0,
+	0x109D2,
 	0x10A04,
 	0x10A05,
 	0x10A07,
@@ -20799,6 +25655,12 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x10BB0,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
+	0x10CFA,
+	0x10D00,
 	0x10E60,
 	0x10E7F,
 	0x11000,
@@ -20818,22 +25680,30 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x11150,
 	0x11177,
 	0x11180,
-	0x111C9,
-	0x111CD,
 	0x111CE,
 	0x111D0,
-	0x111DB,
+	0x111E0,
 	0x111E1,
 	0x111F5,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1123E,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112AA,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -20853,6 +25723,8 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -20868,7 +25740,7 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x11580,
 	0x115B6,
 	0x115B8,
-	0x115CA,
+	0x115DE,
 	0x11600,
 	0x11645,
 	0x11650,
@@ -20877,6 +25749,12 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x11740,
 	0x118A0,
 	0x118F3,
 	0x118FF,
@@ -20884,13 +25762,17 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
 	0x12470,
 	0x12475,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -20936,7 +25818,7 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x1D100,
 	0x1D127,
 	0x1D129,
-	0x1D1DE,
+	0x1D1E9,
 	0x1D200,
 	0x1D246,
 	0x1D300,
@@ -20984,7 +25866,11 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x1D6A8,
 	0x1D7CC,
 	0x1D7CE,
-	0x1D800,
+	0x1DA8C,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8C7,
@@ -21086,25 +25972,11 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x1F250,
 	0x1F252,
 	0x1F300,
-	0x1F32D,
-	0x1F330,
-	0x1F37E,
-	0x1F380,
-	0x1F3CF,
-	0x1F3D4,
-	0x1F3F8,
-	0x1F400,
-	0x1F4FF,
-	0x1F500,
-	0x1F54B,
-	0x1F550,
 	0x1F57A,
 	0x1F57B,
 	0x1F5A4,
 	0x1F5A5,
-	0x1F643,
-	0x1F645,
-	0x1F6D0,
+	0x1F6D1,
 	0x1F6E0,
 	0x1F6ED,
 	0x1F6F0,
@@ -21123,12 +25995,20 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 	0x1F888,
 	0x1F890,
 	0x1F8AE,
+	0x1F910,
+	0x1F919,
+	0x1F980,
+	0x1F985,
+	0x1F9C0,
+	0x1F9C1,
 	0x20000,
 	0x2A6D7,
 	0x2A700,
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0001,
@@ -21144,7 +26024,7 @@ static const UV XPosixPrint_invlist[] = { /* for ASCII/Latin1 */
 };
 
 static const UV XPosixPunct_invlist[] = { /* for ASCII/Latin1 */
-	301,	/* Number of elements */
+	313,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -21341,6 +26221,8 @@ static const UV XPosixPunct_invlist[] = { /* for ASCII/Latin1 */
 	0xA8D0,
 	0xA8F8,
 	0xA8FB,
+	0xA8FC,
+	0xA8FD,
 	0xA92E,
 	0xA930,
 	0xA95F,
@@ -21426,17 +26308,25 @@ static const UV XPosixPunct_invlist[] = { /* for ASCII/Latin1 */
 	0x11174,
 	0x11176,
 	0x111C5,
-	0x111C9,
+	0x111CA,
 	0x111CD,
 	0x111CE,
+	0x111DB,
+	0x111DC,
+	0x111DD,
+	0x111E0,
 	0x11238,
 	0x1123E,
+	0x112A9,
+	0x112AA,
 	0x114C6,
 	0x114C7,
 	0x115C1,
-	0x115CA,
+	0x115D8,
 	0x11641,
 	0x11644,
+	0x1173C,
+	0x1173F,
 	0x12470,
 	0x12475,
 	0x16A6E,
@@ -21448,7 +26338,9 @@ static const UV XPosixPunct_invlist[] = { /* for ASCII/Latin1 */
 	0x16B44,
 	0x16B45,
 	0x1BC9F,
-	0x1BCA0
+	0x1BCA0,
+	0x1DA87,
+	0x1DA8C
 };
 
 static const UV XPosixSpace_invlist[] = { /* for ASCII/Latin1 */
@@ -21480,7 +26372,7 @@ static const UV XPosixSpace_invlist[] = { /* for ASCII/Latin1 */
 };
 
 static const UV XPosixUpper_invlist[] = { /* for ASCII/Latin1 */
-	1255,	/* Number of elements */
+	1261,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -22035,6 +26927,8 @@ static const UV XPosixUpper_invlist[] = { /* for ASCII/Latin1 */
 	0x10C8,
 	0x10CD,
 	0x10CE,
+	0x13A0,
+	0x13F6,
 	0x1E00,
 	0x1E01,
 	0x1E02,
@@ -22664,11 +27558,15 @@ static const UV XPosixUpper_invlist[] = { /* for ASCII/Latin1 */
 	0xA7AA,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B5,
+	0xA7B6,
+	0xA7B7,
 	0xFF21,
 	0xFF3B,
 	0x10400,
 	0x10428,
+	0x10C80,
+	0x10CB3,
 	0x118A0,
 	0x118C0,
 	0x1D400,
@@ -22742,7 +27640,7 @@ static const UV XPosixUpper_invlist[] = { /* for ASCII/Latin1 */
 };
 
 static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
-	1261,	/* Number of elements */
+	1311,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -22844,8 +27742,8 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x840,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x964,
 	0x966,
 	0x970,
@@ -22935,6 +27833,8 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -23016,7 +27916,7 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -23065,7 +27965,7 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD70,
@@ -23210,7 +28110,9 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -23456,7 +28358,7 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -23470,19 +28372,15 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0xA674,
 	0xA67E,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F2,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA828,
 	0xA840,
@@ -23495,6 +28393,8 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA92E,
 	0xA930,
@@ -23536,10 +28436,8 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xABEC,
 	0xABEE,
@@ -23584,7 +28482,7 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0xFE00,
 	0xFE10,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE33,
 	0xFE35,
 	0xFE4D,
@@ -23679,6 +28577,10 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -23719,6 +28621,10 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11047,
 	0x11066,
@@ -23739,17 +28645,31 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x11177,
 	0x11180,
 	0x111C5,
+	0x111CA,
+	0x111CD,
 	0x111D0,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -23769,6 +28689,8 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -23787,6 +28709,8 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x115B6,
 	0x115B8,
 	0x115C1,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x11641,
 	0x11644,
@@ -23797,6 +28721,12 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118EA,
 	0x118FF,
@@ -23804,11 +28734,15 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -23921,6 +28855,18 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -24003,6 +28949,8 @@ static const UV XPosixWord_invlist[] = { /* for ASCII/Latin1 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0100,
@@ -24102,7 +29050,7 @@ static const UV ASCII_invlist[] = { /* for EBCDIC 1047 */
 };
 
 static const UV Cased_invlist[] = { /* for EBCDIC 1047 */
-	281,	/* Number of elements */
+	289,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -24193,6 +29141,10 @@ static const UV Cased_invlist[] = { /* for EBCDIC 1047 */
 	0x10C8,
 	0x10CD,
 	0x10CE,
+	0x13A0,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1D00,
 	0x1DC0,
 	0x1E00,
@@ -24300,15 +29252,15 @@ static const UV Cased_invlist[] = { /* for EBCDIC 1047 */
 	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F8,
 	0xA7FB,
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
+	0xAB70,
+	0xABC0,
 	0xFB00,
 	0xFB07,
 	0xFB13,
@@ -24319,6 +29271,10 @@ static const UV Cased_invlist[] = { /* for EBCDIC 1047 */
 	0xFF5B,
 	0x10400,
 	0x10450,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x118A0,
 	0x118E0,
 	0x1D400,
@@ -24389,8 +29345,420 @@ static const UV Cased_invlist[] = { /* for EBCDIC 1047 */
 	0x1F18A
 };
 
-static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 1047 */
-	1484,	/* Number of elements */
+#endif	/* defined(PERL_IN_PERL_C) */
+
+#if defined(PERL_IN_REGCOMP_C)
+
+static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for EBCDIC 1047 */
+	45,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x2BC,
+	0x2BD,
+	0x308,
+	0x309,
+	0x313,
+	0x314,
+	0x342,
+	0x343,
+	0x3AC,
+	0x3AD,
+	0x3AE,
+	0x3AF,
+	0x3B1,
+	0x3B2,
+	0x3B7,
+	0x3B8,
+	0x3B9,
+	0x3BA,
+	0x3C1,
+	0x3C2,
+	0x3C5,
+	0x3C6,
+	0x3C9,
+	0x3CA,
+	0x3CE,
+	0x3CF,
+	0x565,
+	0x566,
+	0x574,
+	0x575,
+	0x57E,
+	0x57F,
+	0x1F00,
+	0x1F08,
+	0x1F20,
+	0x1F28,
+	0x1F60,
+	0x1F68,
+	0x1F70,
+	0x1F71,
+	0x1F74,
+	0x1F75,
+	0x1F7C,
+	0x1F7D
+};
+
+static const UV _Perl_Any_Folds_invlist[] = { /* for EBCDIC 1047 */
+	279,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x42,
+	0x4A,
+	0x51,
+	0x5A,
+	0x62,
+	0x6A,
+	0x70,
+	0x79,
+	0x80,
+	0x8A,
+	0x8C,
+	0x8F,
+	0x91,
+	0x9A,
+	0x9C,
+	0x9D,
+	0x9E,
+	0x9F,
+	0xA0,
+	0xA1,
+	0xA2,
+	0xAA,
+	0xAC,
+	0xAD,
+	0xAE,
+	0xAF,
+	0xBA,
+	0xBB,
+	0xC1,
+	0xCA,
+	0xCB,
+	0xD0,
+	0xD1,
+	0xDA,
+	0xDB,
+	0xE0,
+	0xE2,
+	0xEA,
+	0xEB,
+	0xF0,
+	0xFB,
+	0xFF,
+	0x100,
+	0x131,
+	0x132,
+	0x138,
+	0x139,
+	0x18D,
+	0x18E,
+	0x19B,
+	0x19C,
+	0x1AA,
+	0x1AC,
+	0x1BA,
+	0x1BC,
+	0x1BE,
+	0x1BF,
+	0x1C0,
+	0x1C4,
+	0x221,
+	0x222,
+	0x234,
+	0x23A,
+	0x255,
+	0x256,
+	0x258,
+	0x259,
+	0x25A,
+	0x25B,
+	0x25D,
+	0x260,
+	0x262,
+	0x263,
+	0x264,
+	0x265,
+	0x267,
+	0x268,
+	0x26A,
+	0x26B,
+	0x26D,
+	0x26F,
+	0x270,
+	0x271,
+	0x273,
+	0x275,
+	0x276,
+	0x27D,
+	0x27E,
+	0x280,
+	0x281,
+	0x283,
+	0x284,
+	0x287,
+	0x28D,
+	0x292,
+	0x293,
+	0x29D,
+	0x29F,
+	0x2BC,
+	0x2BD,
+	0x2BE,
+	0x2BF,
+	0x300,
+	0x302,
+	0x307,
+	0x309,
+	0x30A,
+	0x30B,
+	0x30C,
+	0x30D,
+	0x313,
+	0x314,
+	0x331,
+	0x332,
+	0x342,
+	0x343,
+	0x345,
+	0x346,
+	0x370,
+	0x374,
+	0x376,
+	0x378,
+	0x37B,
+	0x37E,
+	0x37F,
+	0x380,
+	0x386,
+	0x387,
+	0x388,
+	0x38B,
+	0x38C,
+	0x38D,
+	0x38E,
+	0x3A2,
+	0x3A3,
+	0x3D2,
+	0x3D5,
+	0x3F6,
+	0x3F7,
+	0x3FC,
+	0x3FD,
+	0x482,
+	0x48A,
+	0x530,
+	0x531,
+	0x557,
+	0x561,
+	0x588,
+	0x10A0,
+	0x10C6,
+	0x10C7,
+	0x10C8,
+	0x10CD,
+	0x10CE,
+	0x13A0,
+	0x13F6,
+	0x13F8,
+	0x13FE,
+	0x1D79,
+	0x1D7A,
+	0x1D7D,
+	0x1D7E,
+	0x1E00,
+	0x1E9C,
+	0x1E9E,
+	0x1E9F,
+	0x1EA0,
+	0x1F16,
+	0x1F18,
+	0x1F1E,
+	0x1F20,
+	0x1F46,
+	0x1F48,
+	0x1F4E,
+	0x1F50,
+	0x1F58,
+	0x1F59,
+	0x1F5A,
+	0x1F5B,
+	0x1F5C,
+	0x1F5D,
+	0x1F5E,
+	0x1F5F,
+	0x1F7E,
+	0x1F80,
+	0x1FB5,
+	0x1FB6,
+	0x1FBD,
+	0x1FBE,
+	0x1FBF,
+	0x1FC2,
+	0x1FC5,
+	0x1FC6,
+	0x1FCD,
+	0x1FD0,
+	0x1FD4,
+	0x1FD6,
+	0x1FDC,
+	0x1FE0,
+	0x1FED,
+	0x1FF2,
+	0x1FF5,
+	0x1FF6,
+	0x1FFD,
+	0x2126,
+	0x2127,
+	0x212A,
+	0x212C,
+	0x2132,
+	0x2133,
+	0x214E,
+	0x214F,
+	0x2160,
+	0x2180,
+	0x2183,
+	0x2185,
+	0x24B6,
+	0x24EA,
+	0x2C00,
+	0x2C2F,
+	0x2C30,
+	0x2C5F,
+	0x2C60,
+	0x2C71,
+	0x2C72,
+	0x2C74,
+	0x2C75,
+	0x2C77,
+	0x2C7E,
+	0x2CE4,
+	0x2CEB,
+	0x2CEF,
+	0x2CF2,
+	0x2CF4,
+	0x2D00,
+	0x2D26,
+	0x2D27,
+	0x2D28,
+	0x2D2D,
+	0x2D2E,
+	0xA640,
+	0xA66E,
+	0xA680,
+	0xA69C,
+	0xA722,
+	0xA730,
+	0xA732,
+	0xA770,
+	0xA779,
+	0xA788,
+	0xA78B,
+	0xA78E,
+	0xA790,
+	0xA794,
+	0xA796,
+	0xA7AE,
+	0xA7B0,
+	0xA7B8,
+	0xAB53,
+	0xAB54,
+	0xAB70,
+	0xABC0,
+	0xFB00,
+	0xFB07,
+	0xFB13,
+	0xFB18,
+	0xFF21,
+	0xFF3B,
+	0xFF41,
+	0xFF5B,
+	0x10400,
+	0x10450,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
+	0x118A0,
+	0x118E0
+};
+
+static const UV _Perl_Folds_To_Multi_Char_invlist[] = { /* for EBCDIC 1047 */
+	59,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x59,
+	0x5A,
+	0x130,
+	0x131,
+	0x149,
+	0x14A,
+	0x1F0,
+	0x1F1,
+	0x390,
+	0x391,
+	0x3B0,
+	0x3B1,
+	0x587,
+	0x588,
+	0x1E96,
+	0x1E9B,
+	0x1E9E,
+	0x1E9F,
+	0x1F50,
+	0x1F51,
+	0x1F52,
+	0x1F53,
+	0x1F54,
+	0x1F55,
+	0x1F56,
+	0x1F57,
+	0x1F80,
+	0x1FB0,
+	0x1FB2,
+	0x1FB5,
+	0x1FB6,
+	0x1FB8,
+	0x1FBC,
+	0x1FBD,
+	0x1FC2,
+	0x1FC5,
+	0x1FC6,
+	0x1FC8,
+	0x1FCC,
+	0x1FCD,
+	0x1FD2,
+	0x1FD4,
+	0x1FD6,
+	0x1FD8,
+	0x1FE2,
+	0x1FE5,
+	0x1FE6,
+	0x1FE8,
+	0x1FF2,
+	0x1FF5,
+	0x1FF6,
+	0x1FF8,
+	0x1FFC,
+	0x1FFD,
+	0xFB00,
+	0xFB07,
+	0xFB13,
+	0xFB18
+};
+
+#endif	/* defined(PERL_IN_REGCOMP_C) */
+
+#if defined(PERL_IN_PERL_C)
+
+static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 1047 */
+	1502,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -24457,7 +29825,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x82E,
 	0x859,
 	0x85C,
-	0x8E4,
+	0x8E3,
 	0x903,
 	0x904,
 	0x93A,
@@ -24725,10 +30093,6 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x1933,
 	0x1939,
 	0x193C,
-	0x19B5,
-	0x19B8,
-	0x19BA,
-	0x19BB,
 	0x1A17,
 	0x1A19,
 	0x1A1B,
@@ -24829,7 +30193,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xA673,
 	0xA674,
 	0xA67E,
-	0xA69F,
+	0xA69E,
 	0xA6A0,
 	0xA6F0,
 	0xA6F2,
@@ -25718,7 +31082,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xFE00,
 	0xFE10,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFEFF,
 	0xFF00,
 	0xFF9E,
@@ -25774,6 +31138,8 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x111B6,
 	0x111BF,
 	0x111C1,
+	0x111CA,
+	0x111CD,
 	0x1122C,
 	0x1122F,
 	0x11232,
@@ -25785,7 +31151,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x112E0,
 	0x112E3,
 	0x112EB,
-	0x11301,
+	0x11300,
 	0x11302,
 	0x11304,
 	0x1133C,
@@ -25828,6 +31194,8 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x115BE,
 	0x115BF,
 	0x115C1,
+	0x115DC,
+	0x115DE,
 	0x11630,
 	0x11633,
 	0x1163B,
@@ -25843,6 +31211,12 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x116B6,
 	0x116B7,
 	0x116B8,
+	0x1171D,
+	0x11720,
+	0x11722,
+	0x11726,
+	0x11727,
+	0x1172C,
 	0x16AF0,
 	0x16AF5,
 	0x16B30,
@@ -25870,6 +31244,18 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x1D1AE,
 	0x1D242,
 	0x1D245,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E8D0,
 	0x1E8D7,
 	0x1F1E6,
@@ -25890,20 +31276,20 @@ typedef enum {
 	GCB_Other = 0,
 	GCB_CR = 1,
 	GCB_Control = 2,
-	GCB_EDGE = 3,
-	GCB_Extend = 4,
-	GCB_L = 5,
-	GCB_LF = 6,
-	GCB_LV = 7,
-	GCB_LVT = 8,
-	GCB_Prepend = 9,
-	GCB_Regional_Indicator = 10,
-	GCB_SpacingMark = 11,
-	GCB_T = 12,
-	GCB_V = 13
+	GCB_Extend = 3,
+	GCB_L = 4,
+	GCB_LF = 5,
+	GCB_LV = 6,
+	GCB_LVT = 7,
+	GCB_Prepend = 8,
+	GCB_Regional_Indicator = 9,
+	GCB_SpacingMark = 10,
+	GCB_T = 11,
+	GCB_V = 12,
+	GCB_EDGE = 13
 } GCB_enum;
 
-static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 1047 */
+static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 1047 */
 	GCB_Control,
 	GCB_CR,
 	GCB_Control,
@@ -26235,10 +31621,6 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 1047 */
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
 	GCB_Extend,
 	GCB_SpacingMark,
 	GCB_Extend,
@@ -27284,6 +32666,8 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 1047 */
 	GCB_Extend,
 	GCB_SpacingMark,
 	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_SpacingMark,
@@ -27338,6 +32722,8 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 1047 */
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_SpacingMark,
@@ -27354,6 +32740,12 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 1047 */
 	GCB_Extend,
 	GCB_Other,
 	GCB_Extend,
+	GCB_SpacingMark,
+	GCB_Extend,
+	GCB_SpacingMark,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
 	GCB_Other,
 	GCB_Extend,
 	GCB_Other,
@@ -27382,6 +32774,18 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 1047 */
 	GCB_Other,
 	GCB_Extend,
 	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
 	GCB_Regional_Indicator,
 	GCB_Other,
 	GCB_Control,
@@ -27392,406 +32796,10 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 1047 */
 
 #endif	/* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_REGCOMP_C)
-
-static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for EBCDIC 1047 */
-	45,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x2BC,
-	0x2BD,
-	0x308,
-	0x309,
-	0x313,
-	0x314,
-	0x342,
-	0x343,
-	0x3AC,
-	0x3AD,
-	0x3AE,
-	0x3AF,
-	0x3B1,
-	0x3B2,
-	0x3B7,
-	0x3B8,
-	0x3B9,
-	0x3BA,
-	0x3C1,
-	0x3C2,
-	0x3C5,
-	0x3C6,
-	0x3C9,
-	0x3CA,
-	0x3CE,
-	0x3CF,
-	0x565,
-	0x566,
-	0x574,
-	0x575,
-	0x57E,
-	0x57F,
-	0x1F00,
-	0x1F08,
-	0x1F20,
-	0x1F28,
-	0x1F60,
-	0x1F68,
-	0x1F70,
-	0x1F71,
-	0x1F74,
-	0x1F75,
-	0x1F7C,
-	0x1F7D
-};
-
-static const UV _Perl_Any_Folds_invlist[] = { /* for EBCDIC 1047 */
-	267,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x42,
-	0x4A,
-	0x51,
-	0x5A,
-	0x62,
-	0x6A,
-	0x70,
-	0x79,
-	0x80,
-	0x8A,
-	0x8C,
-	0x8F,
-	0x91,
-	0x9A,
-	0x9C,
-	0x9D,
-	0x9E,
-	0x9F,
-	0xA0,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xAC,
-	0xAD,
-	0xAE,
-	0xAF,
-	0xBA,
-	0xBB,
-	0xC1,
-	0xCA,
-	0xCB,
-	0xD0,
-	0xD1,
-	0xDA,
-	0xDB,
-	0xE0,
-	0xE2,
-	0xEA,
-	0xEB,
-	0xF0,
-	0xFB,
-	0xFF,
-	0x100,
-	0x131,
-	0x132,
-	0x138,
-	0x139,
-	0x18D,
-	0x18E,
-	0x19B,
-	0x19C,
-	0x1AA,
-	0x1AC,
-	0x1BA,
-	0x1BC,
-	0x1BE,
-	0x1BF,
-	0x1C0,
-	0x1C4,
-	0x221,
-	0x222,
-	0x234,
-	0x23A,
-	0x255,
-	0x256,
-	0x258,
-	0x259,
-	0x25A,
-	0x25B,
-	0x25D,
-	0x260,
-	0x262,
-	0x263,
-	0x264,
-	0x265,
-	0x267,
-	0x268,
-	0x26A,
-	0x26B,
-	0x26D,
-	0x26F,
-	0x270,
-	0x271,
-	0x273,
-	0x275,
-	0x276,
-	0x27D,
-	0x27E,
-	0x280,
-	0x281,
-	0x283,
-	0x284,
-	0x287,
-	0x28D,
-	0x292,
-	0x293,
-	0x29E,
-	0x29F,
-	0x2BC,
-	0x2BD,
-	0x2BE,
-	0x2BF,
-	0x300,
-	0x302,
-	0x307,
-	0x309,
-	0x30A,
-	0x30B,
-	0x30C,
-	0x30D,
-	0x313,
-	0x314,
-	0x331,
-	0x332,
-	0x342,
-	0x343,
-	0x345,
-	0x346,
-	0x370,
-	0x374,
-	0x376,
-	0x378,
-	0x37B,
-	0x37E,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x3D2,
-	0x3D5,
-	0x3F6,
-	0x3F7,
-	0x3FC,
-	0x3FD,
-	0x482,
-	0x48A,
-	0x530,
-	0x531,
-	0x557,
-	0x561,
-	0x588,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x1D79,
-	0x1D7A,
-	0x1D7D,
-	0x1D7E,
-	0x1E00,
-	0x1E9C,
-	0x1E9E,
-	0x1E9F,
-	0x1EA0,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FE0,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFD,
-	0x2126,
-	0x2127,
-	0x212A,
-	0x212C,
-	0x2132,
-	0x2133,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2180,
-	0x2183,
-	0x2185,
-	0x24B6,
-	0x24EA,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2C71,
-	0x2C72,
-	0x2C74,
-	0x2C75,
-	0x2C77,
-	0x2C7E,
-	0x2CE4,
-	0x2CEB,
-	0x2CEF,
-	0x2CF2,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0xA640,
-	0xA66E,
-	0xA680,
-	0xA69C,
-	0xA722,
-	0xA730,
-	0xA732,
-	0xA770,
-	0xA779,
-	0xA788,
-	0xA78B,
-	0xA78E,
-	0xA790,
-	0xA794,
-	0xA796,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFF21,
-	0xFF3B,
-	0xFF41,
-	0xFF5B,
-	0x10400,
-	0x10450,
-	0x118A0,
-	0x118E0
-};
-
-static const UV _Perl_Folds_To_Multi_Char_invlist[] = { /* for EBCDIC 1047 */
-	59,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x59,
-	0x5A,
-	0x130,
-	0x131,
-	0x149,
-	0x14A,
-	0x1F0,
-	0x1F1,
-	0x390,
-	0x391,
-	0x3B0,
-	0x3B1,
-	0x587,
-	0x588,
-	0x1E96,
-	0x1E9B,
-	0x1E9E,
-	0x1E9F,
-	0x1F50,
-	0x1F51,
-	0x1F52,
-	0x1F53,
-	0x1F54,
-	0x1F55,
-	0x1F56,
-	0x1F57,
-	0x1F80,
-	0x1FB0,
-	0x1FB2,
-	0x1FB5,
-	0x1FB6,
-	0x1FB8,
-	0x1FBC,
-	0x1FBD,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FC8,
-	0x1FCC,
-	0x1FCD,
-	0x1FD2,
-	0x1FD4,
-	0x1FD6,
-	0x1FD8,
-	0x1FE2,
-	0x1FE5,
-	0x1FE6,
-	0x1FE8,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FF8,
-	0x1FFC,
-	0x1FFD,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18
-};
-
-#endif	/* defined(PERL_IN_REGCOMP_C) */
-
 #if defined(PERL_IN_UTF8_C)
 
 static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
-	1291,	/* Number of elements */
+	1341,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -27919,8 +32927,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x840,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x964,
 	0x966,
 	0x970,
@@ -28010,6 +33018,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -28091,7 +33101,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -28140,7 +33150,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD70,
@@ -28285,7 +33295,9 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -28529,7 +33541,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -28543,19 +33555,15 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0xA674,
 	0xA67E,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F2,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA828,
 	0xA840,
@@ -28568,6 +33576,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA92E,
 	0xA930,
@@ -28609,10 +33619,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xABEC,
 	0xABEE,
@@ -28659,7 +33667,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0xFE00,
 	0xFE10,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE33,
 	0xFE35,
 	0xFE4D,
@@ -28764,6 +33772,10 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -28804,6 +33816,10 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11047,
 	0x11066,
@@ -28824,17 +33840,31 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x11177,
 	0x11180,
 	0x111C5,
+	0x111CA,
+	0x111CD,
 	0x111D0,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -28854,6 +33884,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -28872,6 +33904,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x115B6,
 	0x115B8,
 	0x115C1,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x11641,
 	0x11644,
@@ -28882,6 +33916,12 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118EA,
 	0x118FF,
@@ -28889,11 +33929,15 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -29006,6 +34050,18 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -29082,6 +34138,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0100,
@@ -29089,7 +34147,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 1047 */
 };
 
 static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
-	1121,	/* Number of elements */
+	1155,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -29219,7 +34277,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0x840,
 	0x859,
 	0x8A0,
-	0x8B3,
+	0x8B5,
 	0x904,
 	0x93A,
 	0x93D,
@@ -29290,6 +34348,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0xAD1,
 	0xAE0,
 	0xAE2,
+	0xAF9,
+	0xAFA,
 	0xB05,
 	0xB0D,
 	0xB0F,
@@ -29343,7 +34403,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0xC3D,
 	0xC3E,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC62,
 	0xC85,
@@ -29374,7 +34434,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0xD3E,
 	0xD4E,
 	0xD4F,
-	0xD60,
+	0xD5F,
 	0xD62,
 	0xD7A,
 	0xD80,
@@ -29497,7 +34557,9 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -29542,8 +34604,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0x1975,
 	0x1980,
 	0x19AC,
-	0x19C1,
-	0x19C8,
+	0x19B0,
+	0x19CA,
 	0x1A00,
 	0x1A17,
 	0x1A20,
@@ -29711,7 +34773,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -29733,11 +34795,9 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -29754,6 +34814,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA90A,
 	0xA926,
 	0xA930,
@@ -29811,10 +34873,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABE3,
 	0xAC00,
 	0xD7A4,
@@ -29948,6 +35008,10 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -29982,6 +35046,10 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11003,
 	0x11038,
 	0x11083,
@@ -30000,10 +35068,22 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0x111C5,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1122C,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112DF,
 	0x11305,
@@ -30020,6 +35100,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0x1133A,
 	0x1133D,
 	0x1133E,
+	0x11350,
+	0x11351,
 	0x1135D,
 	0x11362,
 	0x11480,
@@ -30030,12 +35112,16 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0x114C8,
 	0x11580,
 	0x115AF,
+	0x115D8,
+	0x115DC,
 	0x11600,
 	0x11630,
 	0x11644,
 	0x11645,
 	0x11680,
 	0x116AB,
+	0x11700,
+	0x1171A,
 	0x118A0,
 	0x118E0,
 	0x118FF,
@@ -30043,11 +35129,15 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -30212,6 +35302,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E
 };
@@ -30220,8 +35312,4403 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 1047 */
 
 #if defined(PERL_IN_PERL_C)
 
-static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
-	2859,	/* Number of elements */
+static const UV _Perl_LB_invlist[] = { /* for EBCDIC 1047 */
+	2168,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	0,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x5,
+	0x6,
+	0xB,
+	0xD,
+	0xE,
+	0x15,
+	0x16,
+	0x25,
+	0x26,
+	0x40,
+	0x41,
+	0x42,
+	0x4A,
+	0x4B,
+	0x4C,
+	0x4D,
+	0x4E,
+	0x4F,
+	0x50,
+	0x5A,
+	0x5B,
+	0x5C,
+	0x5D,
+	0x5E,
+	0x5F,
+	0x60,
+	0x61,
+	0x62,
+	0x6B,
+	0x6C,
+	0x6D,
+	0x6F,
+	0x70,
+	0x7A,
+	0x7B,
+	0x7D,
+	0x7E,
+	0x7F,
+	0x80,
+	0x8A,
+	0x8C,
+	0x8F,
+	0x90,
+	0x91,
+	0x9F,
+	0xA0,
+	0xAA,
+	0xAC,
+	0xAD,
+	0xAE,
+	0xB1,
+	0xB3,
+	0xBD,
+	0xBE,
+	0xBF,
+	0xC0,
+	0xC1,
+	0xCA,
+	0xCB,
+	0xD0,
+	0xD1,
+	0xE0,
+	0xE1,
+	0xF0,
+	0xFA,
+	0xFF,
+	0x100,
+	0x2C8,
+	0x2C9,
+	0x2CC,
+	0x2CD,
+	0x2DF,
+	0x2E0,
+	0x300,
+	0x34F,
+	0x350,
+	0x35C,
+	0x363,
+	0x370,
+	0x37E,
+	0x37F,
+	0x483,
+	0x48A,
+	0x589,
+	0x58A,
+	0x58B,
+	0x58F,
+	0x590,
+	0x591,
+	0x5BE,
+	0x5BF,
+	0x5C0,
+	0x5C1,
+	0x5C3,
+	0x5C4,
+	0x5C6,
+	0x5C7,
+	0x5C8,
+	0x5D0,
+	0x5EB,
+	0x5F0,
+	0x5F3,
+	0x609,
+	0x60C,
+	0x60E,
+	0x610,
+	0x61B,
+	0x61C,
+	0x61D,
+	0x61E,
+	0x620,
+	0x64B,
+	0x660,
+	0x66A,
+	0x66B,
+	0x66D,
+	0x670,
+	0x671,
+	0x6D4,
+	0x6D5,
+	0x6D6,
+	0x6DD,
+	0x6DF,
+	0x6E5,
+	0x6E7,
+	0x6E9,
+	0x6EA,
+	0x6EE,
+	0x6F0,
+	0x6FA,
+	0x711,
+	0x712,
+	0x730,
+	0x74B,
+	0x7A6,
+	0x7B1,
+	0x7C0,
+	0x7CA,
+	0x7EB,
+	0x7F4,
+	0x7F8,
+	0x7F9,
+	0x7FA,
+	0x816,
+	0x81A,
+	0x81B,
+	0x824,
+	0x825,
+	0x828,
+	0x829,
+	0x82E,
+	0x859,
+	0x85C,
+	0x8E3,
+	0x904,
+	0x93A,
+	0x93D,
+	0x93E,
+	0x950,
+	0x951,
+	0x958,
+	0x962,
+	0x964,
+	0x966,
+	0x970,
+	0x981,
+	0x984,
+	0x9BC,
+	0x9BD,
+	0x9BE,
+	0x9C5,
+	0x9C7,
+	0x9C9,
+	0x9CB,
+	0x9CE,
+	0x9D7,
+	0x9D8,
+	0x9E2,
+	0x9E4,
+	0x9E6,
+	0x9F0,
+	0x9F2,
+	0x9F4,
+	0x9F9,
+	0x9FA,
+	0x9FB,
+	0x9FC,
+	0xA01,
+	0xA04,
+	0xA3C,
+	0xA3D,
+	0xA3E,
+	0xA43,
+	0xA47,
+	0xA49,
+	0xA4B,
+	0xA4E,
+	0xA51,
+	0xA52,
+	0xA66,
+	0xA70,
+	0xA72,
+	0xA75,
+	0xA76,
+	0xA81,
+	0xA84,
+	0xABC,
+	0xABD,
+	0xABE,
+	0xAC6,
+	0xAC7,
+	0xACA,
+	0xACB,
+	0xACE,
+	0xAE2,
+	0xAE4,
+	0xAE6,
+	0xAF0,
+	0xAF1,
+	0xAF2,
+	0xB01,
+	0xB04,
+	0xB3C,
+	0xB3D,
+	0xB3E,
+	0xB45,
+	0xB47,
+	0xB49,
+	0xB4B,
+	0xB4E,
+	0xB56,
+	0xB58,
+	0xB62,
+	0xB64,
+	0xB66,
+	0xB70,
+	0xB82,
+	0xB83,
+	0xBBE,
+	0xBC3,
+	0xBC6,
+	0xBC9,
+	0xBCA,
+	0xBCE,
+	0xBD7,
+	0xBD8,
+	0xBE6,
+	0xBF0,
+	0xBF9,
+	0xBFA,
+	0xC00,
+	0xC04,
+	0xC3E,
+	0xC45,
+	0xC46,
+	0xC49,
+	0xC4A,
+	0xC4E,
+	0xC55,
+	0xC57,
+	0xC62,
+	0xC64,
+	0xC66,
+	0xC70,
+	0xC81,
+	0xC84,
+	0xCBC,
+	0xCBD,
+	0xCBE,
+	0xCC5,
+	0xCC6,
+	0xCC9,
+	0xCCA,
+	0xCCE,
+	0xCD5,
+	0xCD7,
+	0xCE2,
+	0xCE4,
+	0xCE6,
+	0xCF0,
+	0xD01,
+	0xD04,
+	0xD3E,
+	0xD45,
+	0xD46,
+	0xD49,
+	0xD4A,
+	0xD4E,
+	0xD57,
+	0xD58,
+	0xD62,
+	0xD64,
+	0xD66,
+	0xD70,
+	0xD79,
+	0xD7A,
+	0xD82,
+	0xD84,
+	0xDCA,
+	0xDCB,
+	0xDCF,
+	0xDD5,
+	0xDD6,
+	0xDD7,
+	0xDD8,
+	0xDE0,
+	0xDE6,
+	0xDF0,
+	0xDF2,
+	0xDF4,
+	0xE31,
+	0xE32,
+	0xE34,
+	0xE3B,
+	0xE3F,
+	0xE40,
+	0xE47,
+	0xE4F,
+	0xE50,
+	0xE5A,
+	0xE5C,
+	0xEB1,
+	0xEB2,
+	0xEB4,
+	0xEBA,
+	0xEBB,
+	0xEBD,
+	0xEC8,
+	0xECE,
+	0xED0,
+	0xEDA,
+	0xF01,
+	0xF05,
+	0xF06,
+	0xF08,
+	0xF09,
+	0xF0B,
+	0xF0C,
+	0xF0D,
+	0xF12,
+	0xF13,
+	0xF14,
+	0xF15,
+	0xF18,
+	0xF1A,
+	0xF20,
+	0xF2A,
+	0xF34,
+	0xF35,
+	0xF36,
+	0xF37,
+	0xF38,
+	0xF39,
+	0xF3A,
+	0xF3B,
+	0xF3C,
+	0xF3D,
+	0xF3E,
+	0xF40,
+	0xF71,
+	0xF7F,
+	0xF80,
+	0xF85,
+	0xF86,
+	0xF88,
+	0xF8D,
+	0xF98,
+	0xF99,
+	0xFBD,
+	0xFBE,
+	0xFC0,
+	0xFC6,
+	0xFC7,
+	0xFD0,
+	0xFD2,
+	0xFD3,
+	0xFD4,
+	0xFD9,
+	0xFDB,
+	0x102B,
+	0x103F,
+	0x1040,
+	0x104A,
+	0x104C,
+	0x1056,
+	0x105A,
+	0x105E,
+	0x1061,
+	0x1062,
+	0x1065,
+	0x1067,
+	0x106E,
+	0x1071,
+	0x1075,
+	0x1082,
+	0x108E,
+	0x108F,
+	0x1090,
+	0x109A,
+	0x109E,
+	0x1100,
+	0x1160,
+	0x11A8,
+	0x1200,
+	0x135D,
+	0x1360,
+	0x1361,
+	0x1362,
+	0x1400,
+	0x1401,
+	0x1680,
+	0x1681,
+	0x169B,
+	0x169C,
+	0x169D,
+	0x16EB,
+	0x16EE,
+	0x1712,
+	0x1715,
+	0x1732,
+	0x1735,
+	0x1737,
+	0x1752,
+	0x1754,
+	0x1772,
+	0x1774,
+	0x17B4,
+	0x17D4,
+	0x17D6,
+	0x17D7,
+	0x17D8,
+	0x17D9,
+	0x17DA,
+	0x17DB,
+	0x17DC,
+	0x17DD,
+	0x17DE,
+	0x17E0,
+	0x17EA,
+	0x1802,
+	0x1804,
+	0x1806,
+	0x1807,
+	0x1808,
+	0x180A,
+	0x180B,
+	0x180E,
+	0x180F,
+	0x1810,
+	0x181A,
+	0x18A9,
+	0x18AA,
+	0x1920,
+	0x192C,
+	0x1930,
+	0x193C,
+	0x1944,
+	0x1946,
+	0x1950,
+	0x19D0,
+	0x19DA,
+	0x1A17,
+	0x1A1C,
+	0x1A55,
+	0x1A5F,
+	0x1A60,
+	0x1A7D,
+	0x1A7F,
+	0x1A80,
+	0x1A8A,
+	0x1A90,
+	0x1A9A,
+	0x1AB0,
+	0x1ABF,
+	0x1B00,
+	0x1B05,
+	0x1B34,
+	0x1B45,
+	0x1B50,
+	0x1B5A,
+	0x1B5C,
+	0x1B5D,
+	0x1B61,
+	0x1B6B,
+	0x1B74,
+	0x1B80,
+	0x1B83,
+	0x1BA1,
+	0x1BAE,
+	0x1BB0,
+	0x1BBA,
+	0x1BE6,
+	0x1BF4,
+	0x1C24,
+	0x1C38,
+	0x1C3B,
+	0x1C40,
+	0x1C4A,
+	0x1C50,
+	0x1C5A,
+	0x1C7E,
+	0x1C80,
+	0x1CD0,
+	0x1CD3,
+	0x1CD4,
+	0x1CE9,
+	0x1CED,
+	0x1CEE,
+	0x1CF2,
+	0x1CF5,
+	0x1CF8,
+	0x1CFA,
+	0x1DC0,
+	0x1DF6,
+	0x1DFC,
+	0x1E00,
+	0x1FFD,
+	0x1FFE,
+	0x2000,
+	0x2007,
+	0x2008,
+	0x200B,
+	0x200C,
+	0x2010,
+	0x2011,
+	0x2012,
+	0x2014,
+	0x2015,
+	0x2018,
+	0x201A,
+	0x201B,
+	0x201E,
+	0x201F,
+	0x2020,
+	0x2024,
+	0x2027,
+	0x2028,
+	0x202A,
+	0x202F,
+	0x2030,
+	0x2038,
+	0x2039,
+	0x203B,
+	0x203C,
+	0x203E,
+	0x2044,
+	0x2045,
+	0x2046,
+	0x2047,
+	0x204A,
+	0x2056,
+	0x2057,
+	0x2058,
+	0x205C,
+	0x205D,
+	0x2060,
+	0x2061,
+	0x2066,
+	0x2070,
+	0x207D,
+	0x207E,
+	0x207F,
+	0x208D,
+	0x208E,
+	0x208F,
+	0x20A0,
+	0x20A7,
+	0x20A8,
+	0x20B6,
+	0x20B7,
+	0x20BB,
+	0x20BC,
+	0x20BE,
+	0x20BF,
+	0x20D0,
+	0x20F1,
+	0x2103,
+	0x2104,
+	0x2109,
+	0x210A,
+	0x2116,
+	0x2117,
+	0x2212,
+	0x2214,
+	0x22EF,
+	0x22F0,
+	0x2308,
+	0x2309,
+	0x230A,
+	0x230B,
+	0x230C,
+	0x231A,
+	0x231C,
+	0x2329,
+	0x232A,
+	0x232B,
+	0x23F0,
+	0x23F4,
+	0x2600,
+	0x2604,
+	0x2614,
+	0x2616,
+	0x2618,
+	0x2619,
+	0x261A,
+	0x2620,
+	0x2639,
+	0x263C,
+	0x2668,
+	0x2669,
+	0x267F,
+	0x2680,
+	0x26BD,
+	0x26C9,
+	0x26CD,
+	0x26CE,
+	0x26CF,
+	0x26D2,
+	0x26D3,
+	0x26D5,
+	0x26D8,
+	0x26DA,
+	0x26DC,
+	0x26DD,
+	0x26DF,
+	0x26E2,
+	0x26EA,
+	0x26EB,
+	0x26F1,
+	0x26F6,
+	0x26F7,
+	0x26FB,
+	0x26FD,
+	0x2705,
+	0x2708,
+	0x270E,
+	0x275B,
+	0x2761,
+	0x2762,
+	0x2764,
+	0x2768,
+	0x2769,
+	0x276A,
+	0x276B,
+	0x276C,
+	0x276D,
+	0x276E,
+	0x276F,
+	0x2770,
+	0x2771,
+	0x2772,
+	0x2773,
+	0x2774,
+	0x2775,
+	0x2776,
+	0x27C5,
+	0x27C6,
+	0x27C7,
+	0x27E6,
+	0x27E7,
+	0x27E8,
+	0x27E9,
+	0x27EA,
+	0x27EB,
+	0x27EC,
+	0x27ED,
+	0x27EE,
+	0x27EF,
+	0x27F0,
+	0x2983,
+	0x2984,
+	0x2985,
+	0x2986,
+	0x2987,
+	0x2988,
+	0x2989,
+	0x298A,
+	0x298B,
+	0x298C,
+	0x298D,
+	0x298E,
+	0x298F,
+	0x2990,
+	0x2991,
+	0x2992,
+	0x2993,
+	0x2994,
+	0x2995,
+	0x2996,
+	0x2997,
+	0x2998,
+	0x2999,
+	0x29D8,
+	0x29D9,
+	0x29DA,
+	0x29DB,
+	0x29DC,
+	0x29FC,
+	0x29FD,
+	0x29FE,
+	0x2CEF,
+	0x2CF2,
+	0x2CF9,
+	0x2CFA,
+	0x2CFD,
+	0x2CFE,
+	0x2CFF,
+	0x2D00,
+	0x2D70,
+	0x2D71,
+	0x2D7F,
+	0x2D80,
+	0x2DE0,
+	0x2E00,
+	0x2E0E,
+	0x2E16,
+	0x2E17,
+	0x2E18,
+	0x2E19,
+	0x2E1A,
+	0x2E1C,
+	0x2E1E,
+	0x2E20,
+	0x2E22,
+	0x2E23,
+	0x2E24,
+	0x2E25,
+	0x2E26,
+	0x2E27,
+	0x2E28,
+	0x2E29,
+	0x2E2A,
+	0x2E2E,
+	0x2E2F,
+	0x2E30,
+	0x2E32,
+	0x2E33,
+	0x2E35,
+	0x2E3A,
+	0x2E3C,
+	0x2E3F,
+	0x2E40,
+	0x2E42,
+	0x2E43,
+	0x2E80,
+	0x2E9A,
+	0x2E9B,
+	0x2EF4,
+	0x2F00,
+	0x2FD6,
+	0x2FF0,
+	0x2FFC,
+	0x3000,
+	0x3001,
+	0x3003,
+	0x3005,
+	0x3006,
+	0x3008,
+	0x3009,
+	0x300A,
+	0x300B,
+	0x300C,
+	0x300D,
+	0x300E,
+	0x300F,
+	0x3010,
+	0x3011,
+	0x3012,
+	0x3014,
+	0x3015,
+	0x3016,
+	0x3017,
+	0x3018,
+	0x3019,
+	0x301A,
+	0x301B,
+	0x301C,
+	0x301D,
+	0x301E,
+	0x3020,
+	0x302A,
+	0x3030,
+	0x3035,
+	0x3036,
+	0x303B,
+	0x303D,
+	0x3040,
+	0x3041,
+	0x3042,
+	0x3043,
+	0x3044,
+	0x3045,
+	0x3046,
+	0x3047,
+	0x3048,
+	0x3049,
+	0x304A,
+	0x3063,
+	0x3064,
+	0x3083,
+	0x3084,
+	0x3085,
+	0x3086,
+	0x3087,
+	0x3088,
+	0x308E,
+	0x308F,
+	0x3095,
+	0x3097,
+	0x3099,
+	0x309B,
+	0x309F,
+	0x30A0,
+	0x30A2,
+	0x30A3,
+	0x30A4,
+	0x30A5,
+	0x30A6,
+	0x30A7,
+	0x30A8,
+	0x30A9,
+	0x30AA,
+	0x30C3,
+	0x30C4,
+	0x30E3,
+	0x30E4,
+	0x30E5,
+	0x30E6,
+	0x30E7,
+	0x30E8,
+	0x30EE,
+	0x30EF,
+	0x30F5,
+	0x30F7,
+	0x30FB,
+	0x30FF,
+	0x3100,
+	0x3105,
+	0x312E,
+	0x3131,
+	0x318F,
+	0x3190,
+	0x31BB,
+	0x31C0,
+	0x31E4,
+	0x31F0,
+	0x3200,
+	0x321F,
+	0x3220,
+	0x3248,
+	0x3250,
+	0x32FF,
+	0x3300,
+	0x4DC0,
+	0x4E00,
+	0xA015,
+	0xA016,
+	0xA48D,
+	0xA490,
+	0xA4C7,
+	0xA4FE,
+	0xA500,
+	0xA60D,
+	0xA60E,
+	0xA60F,
+	0xA610,
+	0xA620,
+	0xA62A,
+	0xA66F,
+	0xA673,
+	0xA674,
+	0xA67E,
+	0xA69E,
+	0xA6A0,
+	0xA6F0,
+	0xA6F2,
+	0xA6F3,
+	0xA6F8,
+	0xA802,
+	0xA803,
+	0xA806,
+	0xA807,
+	0xA80B,
+	0xA80C,
+	0xA823,
+	0xA828,
+	0xA838,
+	0xA839,
+	0xA874,
+	0xA876,
+	0xA878,
+	0xA880,
+	0xA882,
+	0xA8B4,
+	0xA8C5,
+	0xA8CE,
+	0xA8D0,
+	0xA8DA,
+	0xA8E0,
+	0xA8F2,
+	0xA8FC,
+	0xA8FD,
+	0xA900,
+	0xA90A,
+	0xA926,
+	0xA92E,
+	0xA930,
+	0xA947,
+	0xA954,
+	0xA960,
+	0xA97D,
+	0xA980,
+	0xA984,
+	0xA9B3,
+	0xA9C1,
+	0xA9C7,
+	0xA9CA,
+	0xA9D0,
+	0xA9DA,
+	0xA9E5,
+	0xA9E6,
+	0xA9F0,
+	0xA9FA,
+	0xAA29,
+	0xAA37,
+	0xAA43,
+	0xAA44,
+	0xAA4C,
+	0xAA4E,
+	0xAA50,
+	0xAA5A,
+	0xAA5D,
+	0xAA60,
+	0xAA7B,
+	0xAA7E,
+	0xAAB0,
+	0xAAB1,
+	0xAAB2,
+	0xAAB5,
+	0xAAB7,
+	0xAAB9,
+	0xAABE,
+	0xAAC0,
+	0xAAC1,
+	0xAAC2,
+	0xAAEB,
+	0xAAF0,
+	0xAAF2,
+	0xAAF5,
+	0xAAF7,
+	0xABE3,
+	0xABEB,
+	0xABEC,
+	0xABEE,
+	0xABF0,
+	0xABFA,
+	0xAC00,
+	0xAC01,
+	0xAC1C,
+	0xAC1D,
+	0xAC38,
+	0xAC39,
+	0xAC54,
+	0xAC55,
+	0xAC70,
+	0xAC71,
+	0xAC8C,
+	0xAC8D,
+	0xACA8,
+	0xACA9,
+	0xACC4,
+	0xACC5,
+	0xACE0,
+	0xACE1,
+	0xACFC,
+	0xACFD,
+	0xAD18,
+	0xAD19,
+	0xAD34,
+	0xAD35,
+	0xAD50,
+	0xAD51,
+	0xAD6C,
+	0xAD6D,
+	0xAD88,
+	0xAD89,
+	0xADA4,
+	0xADA5,
+	0xADC0,
+	0xADC1,
+	0xADDC,
+	0xADDD,
+	0xADF8,
+	0xADF9,
+	0xAE14,
+	0xAE15,
+	0xAE30,
+	0xAE31,
+	0xAE4C,
+	0xAE4D,
+	0xAE68,
+	0xAE69,
+	0xAE84,
+	0xAE85,
+	0xAEA0,
+	0xAEA1,
+	0xAEBC,
+	0xAEBD,
+	0xAED8,
+	0xAED9,
+	0xAEF4,
+	0xAEF5,
+	0xAF10,
+	0xAF11,
+	0xAF2C,
+	0xAF2D,
+	0xAF48,
+	0xAF49,
+	0xAF64,
+	0xAF65,
+	0xAF80,
+	0xAF81,
+	0xAF9C,
+	0xAF9D,
+	0xAFB8,
+	0xAFB9,
+	0xAFD4,
+	0xAFD5,
+	0xAFF0,
+	0xAFF1,
+	0xB00C,
+	0xB00D,
+	0xB028,
+	0xB029,
+	0xB044,
+	0xB045,
+	0xB060,
+	0xB061,
+	0xB07C,
+	0xB07D,
+	0xB098,
+	0xB099,
+	0xB0B4,
+	0xB0B5,
+	0xB0D0,
+	0xB0D1,
+	0xB0EC,
+	0xB0ED,
+	0xB108,
+	0xB109,
+	0xB124,
+	0xB125,
+	0xB140,
+	0xB141,
+	0xB15C,
+	0xB15D,
+	0xB178,
+	0xB179,
+	0xB194,
+	0xB195,
+	0xB1B0,
+	0xB1B1,
+	0xB1CC,
+	0xB1CD,
+	0xB1E8,
+	0xB1E9,
+	0xB204,
+	0xB205,
+	0xB220,
+	0xB221,
+	0xB23C,
+	0xB23D,
+	0xB258,
+	0xB259,
+	0xB274,
+	0xB275,
+	0xB290,
+	0xB291,
+	0xB2AC,
+	0xB2AD,
+	0xB2C8,
+	0xB2C9,
+	0xB2E4,
+	0xB2E5,
+	0xB300,
+	0xB301,
+	0xB31C,
+	0xB31D,
+	0xB338,
+	0xB339,
+	0xB354,
+	0xB355,
+	0xB370,
+	0xB371,
+	0xB38C,
+	0xB38D,
+	0xB3A8,
+	0xB3A9,
+	0xB3C4,
+	0xB3C5,
+	0xB3E0,
+	0xB3E1,
+	0xB3FC,
+	0xB3FD,
+	0xB418,
+	0xB419,
+	0xB434,
+	0xB435,
+	0xB450,
+	0xB451,
+	0xB46C,
+	0xB46D,
+	0xB488,
+	0xB489,
+	0xB4A4,
+	0xB4A5,
+	0xB4C0,
+	0xB4C1,
+	0xB4DC,
+	0xB4DD,
+	0xB4F8,
+	0xB4F9,
+	0xB514,
+	0xB515,
+	0xB530,
+	0xB531,
+	0xB54C,
+	0xB54D,
+	0xB568,
+	0xB569,
+	0xB584,
+	0xB585,
+	0xB5A0,
+	0xB5A1,
+	0xB5BC,
+	0xB5BD,
+	0xB5D8,
+	0xB5D9,
+	0xB5F4,
+	0xB5F5,
+	0xB610,
+	0xB611,
+	0xB62C,
+	0xB62D,
+	0xB648,
+	0xB649,
+	0xB664,
+	0xB665,
+	0xB680,
+	0xB681,
+	0xB69C,
+	0xB69D,
+	0xB6B8,
+	0xB6B9,
+	0xB6D4,
+	0xB6D5,
+	0xB6F0,
+	0xB6F1,
+	0xB70C,
+	0xB70D,
+	0xB728,
+	0xB729,
+	0xB744,
+	0xB745,
+	0xB760,
+	0xB761,
+	0xB77C,
+	0xB77D,
+	0xB798,
+	0xB799,
+	0xB7B4,
+	0xB7B5,
+	0xB7D0,
+	0xB7D1,
+	0xB7EC,
+	0xB7ED,
+	0xB808,
+	0xB809,
+	0xB824,
+	0xB825,
+	0xB840,
+	0xB841,
+	0xB85C,
+	0xB85D,
+	0xB878,
+	0xB879,
+	0xB894,
+	0xB895,
+	0xB8B0,
+	0xB8B1,
+	0xB8CC,
+	0xB8CD,
+	0xB8E8,
+	0xB8E9,
+	0xB904,
+	0xB905,
+	0xB920,
+	0xB921,
+	0xB93C,
+	0xB93D,
+	0xB958,
+	0xB959,
+	0xB974,
+	0xB975,
+	0xB990,
+	0xB991,
+	0xB9AC,
+	0xB9AD,
+	0xB9C8,
+	0xB9C9,
+	0xB9E4,
+	0xB9E5,
+	0xBA00,
+	0xBA01,
+	0xBA1C,
+	0xBA1D,
+	0xBA38,
+	0xBA39,
+	0xBA54,
+	0xBA55,
+	0xBA70,
+	0xBA71,
+	0xBA8C,
+	0xBA8D,
+	0xBAA8,
+	0xBAA9,
+	0xBAC4,
+	0xBAC5,
+	0xBAE0,
+	0xBAE1,
+	0xBAFC,
+	0xBAFD,
+	0xBB18,
+	0xBB19,
+	0xBB34,
+	0xBB35,
+	0xBB50,
+	0xBB51,
+	0xBB6C,
+	0xBB6D,
+	0xBB88,
+	0xBB89,
+	0xBBA4,
+	0xBBA5,
+	0xBBC0,
+	0xBBC1,
+	0xBBDC,
+	0xBBDD,
+	0xBBF8,
+	0xBBF9,
+	0xBC14,
+	0xBC15,
+	0xBC30,
+	0xBC31,
+	0xBC4C,
+	0xBC4D,
+	0xBC68,
+	0xBC69,
+	0xBC84,
+	0xBC85,
+	0xBCA0,
+	0xBCA1,
+	0xBCBC,
+	0xBCBD,
+	0xBCD8,
+	0xBCD9,
+	0xBCF4,
+	0xBCF5,
+	0xBD10,
+	0xBD11,
+	0xBD2C,
+	0xBD2D,
+	0xBD48,
+	0xBD49,
+	0xBD64,
+	0xBD65,
+	0xBD80,
+	0xBD81,
+	0xBD9C,
+	0xBD9D,
+	0xBDB8,
+	0xBDB9,
+	0xBDD4,
+	0xBDD5,
+	0xBDF0,
+	0xBDF1,
+	0xBE0C,
+	0xBE0D,
+	0xBE28,
+	0xBE29,
+	0xBE44,
+	0xBE45,
+	0xBE60,
+	0xBE61,
+	0xBE7C,
+	0xBE7D,
+	0xBE98,
+	0xBE99,
+	0xBEB4,
+	0xBEB5,
+	0xBED0,
+	0xBED1,
+	0xBEEC,
+	0xBEED,
+	0xBF08,
+	0xBF09,
+	0xBF24,
+	0xBF25,
+	0xBF40,
+	0xBF41,
+	0xBF5C,
+	0xBF5D,
+	0xBF78,
+	0xBF79,
+	0xBF94,
+	0xBF95,
+	0xBFB0,
+	0xBFB1,
+	0xBFCC,
+	0xBFCD,
+	0xBFE8,
+	0xBFE9,
+	0xC004,
+	0xC005,
+	0xC020,
+	0xC021,
+	0xC03C,
+	0xC03D,
+	0xC058,
+	0xC059,
+	0xC074,
+	0xC075,
+	0xC090,
+	0xC091,
+	0xC0AC,
+	0xC0AD,
+	0xC0C8,
+	0xC0C9,
+	0xC0E4,
+	0xC0E5,
+	0xC100,
+	0xC101,
+	0xC11C,
+	0xC11D,
+	0xC138,
+	0xC139,
+	0xC154,
+	0xC155,
+	0xC170,
+	0xC171,
+	0xC18C,
+	0xC18D,
+	0xC1A8,
+	0xC1A9,
+	0xC1C4,
+	0xC1C5,
+	0xC1E0,
+	0xC1E1,
+	0xC1FC,
+	0xC1FD,
+	0xC218,
+	0xC219,
+	0xC234,
+	0xC235,
+	0xC250,
+	0xC251,
+	0xC26C,
+	0xC26D,
+	0xC288,
+	0xC289,
+	0xC2A4,
+	0xC2A5,
+	0xC2C0,
+	0xC2C1,
+	0xC2DC,
+	0xC2DD,
+	0xC2F8,
+	0xC2F9,
+	0xC314,
+	0xC315,
+	0xC330,
+	0xC331,
+	0xC34C,
+	0xC34D,
+	0xC368,
+	0xC369,
+	0xC384,
+	0xC385,
+	0xC3A0,
+	0xC3A1,
+	0xC3BC,
+	0xC3BD,
+	0xC3D8,
+	0xC3D9,
+	0xC3F4,
+	0xC3F5,
+	0xC410,
+	0xC411,
+	0xC42C,
+	0xC42D,
+	0xC448,
+	0xC449,
+	0xC464,
+	0xC465,
+	0xC480,
+	0xC481,
+	0xC49C,
+	0xC49D,
+	0xC4B8,
+	0xC4B9,
+	0xC4D4,
+	0xC4D5,
+	0xC4F0,
+	0xC4F1,
+	0xC50C,
+	0xC50D,
+	0xC528,
+	0xC529,
+	0xC544,
+	0xC545,
+	0xC560,
+	0xC561,
+	0xC57C,
+	0xC57D,
+	0xC598,
+	0xC599,
+	0xC5B4,
+	0xC5B5,
+	0xC5D0,
+	0xC5D1,
+	0xC5EC,
+	0xC5ED,
+	0xC608,
+	0xC609,
+	0xC624,
+	0xC625,
+	0xC640,
+	0xC641,
+	0xC65C,
+	0xC65D,
+	0xC678,
+	0xC679,
+	0xC694,
+	0xC695,
+	0xC6B0,
+	0xC6B1,
+	0xC6CC,
+	0xC6CD,
+	0xC6E8,
+	0xC6E9,
+	0xC704,
+	0xC705,
+	0xC720,
+	0xC721,
+	0xC73C,
+	0xC73D,
+	0xC758,
+	0xC759,
+	0xC774,
+	0xC775,
+	0xC790,
+	0xC791,
+	0xC7AC,
+	0xC7AD,
+	0xC7C8,
+	0xC7C9,
+	0xC7E4,
+	0xC7E5,
+	0xC800,
+	0xC801,
+	0xC81C,
+	0xC81D,
+	0xC838,
+	0xC839,
+	0xC854,
+	0xC855,
+	0xC870,
+	0xC871,
+	0xC88C,
+	0xC88D,
+	0xC8A8,
+	0xC8A9,
+	0xC8C4,
+	0xC8C5,
+	0xC8E0,
+	0xC8E1,
+	0xC8FC,
+	0xC8FD,
+	0xC918,
+	0xC919,
+	0xC934,
+	0xC935,
+	0xC950,
+	0xC951,
+	0xC96C,
+	0xC96D,
+	0xC988,
+	0xC989,
+	0xC9A4,
+	0xC9A5,
+	0xC9C0,
+	0xC9C1,
+	0xC9DC,
+	0xC9DD,
+	0xC9F8,
+	0xC9F9,
+	0xCA14,
+	0xCA15,
+	0xCA30,
+	0xCA31,
+	0xCA4C,
+	0xCA4D,
+	0xCA68,
+	0xCA69,
+	0xCA84,
+	0xCA85,
+	0xCAA0,
+	0xCAA1,
+	0xCABC,
+	0xCABD,
+	0xCAD8,
+	0xCAD9,
+	0xCAF4,
+	0xCAF5,
+	0xCB10,
+	0xCB11,
+	0xCB2C,
+	0xCB2D,
+	0xCB48,
+	0xCB49,
+	0xCB64,
+	0xCB65,
+	0xCB80,
+	0xCB81,
+	0xCB9C,
+	0xCB9D,
+	0xCBB8,
+	0xCBB9,
+	0xCBD4,
+	0xCBD5,
+	0xCBF0,
+	0xCBF1,
+	0xCC0C,
+	0xCC0D,
+	0xCC28,
+	0xCC29,
+	0xCC44,
+	0xCC45,
+	0xCC60,
+	0xCC61,
+	0xCC7C,
+	0xCC7D,
+	0xCC98,
+	0xCC99,
+	0xCCB4,
+	0xCCB5,
+	0xCCD0,
+	0xCCD1,
+	0xCCEC,
+	0xCCED,
+	0xCD08,
+	0xCD09,
+	0xCD24,
+	0xCD25,
+	0xCD40,
+	0xCD41,
+	0xCD5C,
+	0xCD5D,
+	0xCD78,
+	0xCD79,
+	0xCD94,
+	0xCD95,
+	0xCDB0,
+	0xCDB1,
+	0xCDCC,
+	0xCDCD,
+	0xCDE8,
+	0xCDE9,
+	0xCE04,
+	0xCE05,
+	0xCE20,
+	0xCE21,
+	0xCE3C,
+	0xCE3D,
+	0xCE58,
+	0xCE59,
+	0xCE74,
+	0xCE75,
+	0xCE90,
+	0xCE91,
+	0xCEAC,
+	0xCEAD,
+	0xCEC8,
+	0xCEC9,
+	0xCEE4,
+	0xCEE5,
+	0xCF00,
+	0xCF01,
+	0xCF1C,
+	0xCF1D,
+	0xCF38,
+	0xCF39,
+	0xCF54,
+	0xCF55,
+	0xCF70,
+	0xCF71,
+	0xCF8C,
+	0xCF8D,
+	0xCFA8,
+	0xCFA9,
+	0xCFC4,
+	0xCFC5,
+	0xCFE0,
+	0xCFE1,
+	0xCFFC,
+	0xCFFD,
+	0xD018,
+	0xD019,
+	0xD034,
+	0xD035,
+	0xD050,
+	0xD051,
+	0xD06C,
+	0xD06D,
+	0xD088,
+	0xD089,
+	0xD0A4,
+	0xD0A5,
+	0xD0C0,
+	0xD0C1,
+	0xD0DC,
+	0xD0DD,
+	0xD0F8,
+	0xD0F9,
+	0xD114,
+	0xD115,
+	0xD130,
+	0xD131,
+	0xD14C,
+	0xD14D,
+	0xD168,
+	0xD169,
+	0xD184,
+	0xD185,
+	0xD1A0,
+	0xD1A1,
+	0xD1BC,
+	0xD1BD,
+	0xD1D8,
+	0xD1D9,
+	0xD1F4,
+	0xD1F5,
+	0xD210,
+	0xD211,
+	0xD22C,
+	0xD22D,
+	0xD248,
+	0xD249,
+	0xD264,
+	0xD265,
+	0xD280,
+	0xD281,
+	0xD29C,
+	0xD29D,
+	0xD2B8,
+	0xD2B9,
+	0xD2D4,
+	0xD2D5,
+	0xD2F0,
+	0xD2F1,
+	0xD30C,
+	0xD30D,
+	0xD328,
+	0xD329,
+	0xD344,
+	0xD345,
+	0xD360,
+	0xD361,
+	0xD37C,
+	0xD37D,
+	0xD398,
+	0xD399,
+	0xD3B4,
+	0xD3B5,
+	0xD3D0,
+	0xD3D1,
+	0xD3EC,
+	0xD3ED,
+	0xD408,
+	0xD409,
+	0xD424,
+	0xD425,
+	0xD440,
+	0xD441,
+	0xD45C,
+	0xD45D,
+	0xD478,
+	0xD479,
+	0xD494,
+	0xD495,
+	0xD4B0,
+	0xD4B1,
+	0xD4CC,
+	0xD4CD,
+	0xD4E8,
+	0xD4E9,
+	0xD504,
+	0xD505,
+	0xD520,
+	0xD521,
+	0xD53C,
+	0xD53D,
+	0xD558,
+	0xD559,
+	0xD574,
+	0xD575,
+	0xD590,
+	0xD591,
+	0xD5AC,
+	0xD5AD,
+	0xD5C8,
+	0xD5C9,
+	0xD5E4,
+	0xD5E5,
+	0xD600,
+	0xD601,
+	0xD61C,
+	0xD61D,
+	0xD638,
+	0xD639,
+	0xD654,
+	0xD655,
+	0xD670,
+	0xD671,
+	0xD68C,
+	0xD68D,
+	0xD6A8,
+	0xD6A9,
+	0xD6C4,
+	0xD6C5,
+	0xD6E0,
+	0xD6E1,
+	0xD6FC,
+	0xD6FD,
+	0xD718,
+	0xD719,
+	0xD734,
+	0xD735,
+	0xD750,
+	0xD751,
+	0xD76C,
+	0xD76D,
+	0xD788,
+	0xD789,
+	0xD7A4,
+	0xD7B0,
+	0xD7C7,
+	0xD7CB,
+	0xD7FC,
+	0xF900,
+	0xFB00,
+	0xFB1D,
+	0xFB1E,
+	0xFB1F,
+	0xFB29,
+	0xFB2A,
+	0xFB37,
+	0xFB38,
+	0xFB3D,
+	0xFB3E,
+	0xFB3F,
+	0xFB40,
+	0xFB42,
+	0xFB43,
+	0xFB45,
+	0xFB46,
+	0xFB50,
+	0xFD3E,
+	0xFD3F,
+	0xFD40,
+	0xFDFC,
+	0xFDFD,
+	0xFE00,
+	0xFE10,
+	0xFE11,
+	0xFE13,
+	0xFE15,
+	0xFE17,
+	0xFE18,
+	0xFE19,
+	0xFE1A,
+	0xFE20,
+	0xFE30,
+	0xFE35,
+	0xFE36,
+	0xFE37,
+	0xFE38,
+	0xFE39,
+	0xFE3A,
+	0xFE3B,
+	0xFE3C,
+	0xFE3D,
+	0xFE3E,
+	0xFE3F,
+	0xFE40,
+	0xFE41,
+	0xFE42,
+	0xFE43,
+	0xFE44,
+	0xFE45,
+	0xFE47,
+	0xFE48,
+	0xFE49,
+	0xFE50,
+	0xFE51,
+	0xFE52,
+	0xFE53,
+	0xFE54,
+	0xFE56,
+	0xFE58,
+	0xFE59,
+	0xFE5A,
+	0xFE5B,
+	0xFE5C,
+	0xFE5D,
+	0xFE5E,
+	0xFE5F,
+	0xFE67,
+	0xFE68,
+	0xFE69,
+	0xFE6A,
+	0xFE6B,
+	0xFE6C,
+	0xFEFF,
+	0xFF00,
+	0xFF01,
+	0xFF02,
+	0xFF04,
+	0xFF05,
+	0xFF06,
+	0xFF08,
+	0xFF09,
+	0xFF0A,
+	0xFF0C,
+	0xFF0D,
+	0xFF0E,
+	0xFF0F,
+	0xFF1A,
+	0xFF1C,
+	0xFF1F,
+	0xFF20,
+	0xFF3B,
+	0xFF3C,
+	0xFF3D,
+	0xFF3E,
+	0xFF5B,
+	0xFF5C,
+	0xFF5D,
+	0xFF5E,
+	0xFF5F,
+	0xFF60,
+	0xFF62,
+	0xFF63,
+	0xFF65,
+	0xFF66,
+	0xFF67,
+	0xFF71,
+	0xFF9E,
+	0xFFA0,
+	0xFFE0,
+	0xFFE1,
+	0xFFE2,
+	0xFFE5,
+	0xFFE7,
+	0xFFF9,
+	0xFFFC,
+	0xFFFD,
+	0x10100,
+	0x10103,
+	0x101FD,
+	0x101FE,
+	0x102E0,
+	0x102E1,
+	0x10376,
+	0x1037B,
+	0x1039F,
+	0x103A0,
+	0x103D0,
+	0x103D1,
+	0x104A0,
+	0x104AA,
+	0x10857,
+	0x10858,
+	0x1091F,
+	0x10920,
+	0x10A01,
+	0x10A04,
+	0x10A05,
+	0x10A07,
+	0x10A0C,
+	0x10A10,
+	0x10A38,
+	0x10A3B,
+	0x10A3F,
+	0x10A40,
+	0x10A50,
+	0x10A58,
+	0x10AE5,
+	0x10AE7,
+	0x10AF0,
+	0x10AF6,
+	0x10AF7,
+	0x10B39,
+	0x10B40,
+	0x11000,
+	0x11003,
+	0x11038,
+	0x11047,
+	0x11049,
+	0x11066,
+	0x11070,
+	0x1107F,
+	0x11083,
+	0x110B0,
+	0x110BB,
+	0x110BE,
+	0x110C2,
+	0x110F0,
+	0x110FA,
+	0x11100,
+	0x11103,
+	0x11127,
+	0x11135,
+	0x11136,
+	0x11140,
+	0x11144,
+	0x11173,
+	0x11174,
+	0x11175,
+	0x11176,
+	0x11180,
+	0x11183,
+	0x111B3,
+	0x111C1,
+	0x111C5,
+	0x111C7,
+	0x111C8,
+	0x111C9,
+	0x111CA,
+	0x111CD,
+	0x111D0,
+	0x111DA,
+	0x111DB,
+	0x111DC,
+	0x111DD,
+	0x111E0,
+	0x1122C,
+	0x11238,
+	0x1123A,
+	0x1123B,
+	0x1123D,
+	0x112A9,
+	0x112AA,
+	0x112DF,
+	0x112EB,
+	0x112F0,
+	0x112FA,
+	0x11300,
+	0x11304,
+	0x1133C,
+	0x1133D,
+	0x1133E,
+	0x11345,
+	0x11347,
+	0x11349,
+	0x1134B,
+	0x1134E,
+	0x11357,
+	0x11358,
+	0x11362,
+	0x11364,
+	0x11366,
+	0x1136D,
+	0x11370,
+	0x11375,
+	0x114B0,
+	0x114C4,
+	0x114D0,
+	0x114DA,
+	0x115AF,
+	0x115B6,
+	0x115B8,
+	0x115C1,
+	0x115C2,
+	0x115C4,
+	0x115C6,
+	0x115C9,
+	0x115D8,
+	0x115DC,
+	0x115DE,
+	0x11630,
+	0x11641,
+	0x11643,
+	0x11650,
+	0x1165A,
+	0x116AB,
+	0x116B8,
+	0x116C0,
+	0x116CA,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
+	0x1173C,
+	0x1173F,
+	0x118E0,
+	0x118EA,
+	0x12470,
+	0x12475,
+	0x13258,
+	0x1325B,
+	0x1325E,
+	0x13282,
+	0x13283,
+	0x13286,
+	0x13287,
+	0x13288,
+	0x13289,
+	0x1328A,
+	0x13379,
+	0x1337A,
+	0x1337C,
+	0x145CE,
+	0x145CF,
+	0x145D0,
+	0x16A60,
+	0x16A6A,
+	0x16A6E,
+	0x16A70,
+	0x16AF0,
+	0x16AF5,
+	0x16AF6,
+	0x16B30,
+	0x16B37,
+	0x16B3A,
+	0x16B44,
+	0x16B45,
+	0x16B50,
+	0x16B5A,
+	0x16F51,
+	0x16F7F,
+	0x16F8F,
+	0x16F93,
+	0x1B000,
+	0x1B002,
+	0x1BC9D,
+	0x1BC9F,
+	0x1BCA0,
+	0x1BCA4,
+	0x1D165,
+	0x1D16A,
+	0x1D16D,
+	0x1D183,
+	0x1D185,
+	0x1D18C,
+	0x1D1AA,
+	0x1D1AE,
+	0x1D242,
+	0x1D245,
+	0x1D7CE,
+	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA87,
+	0x1DA8B,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
+	0x1E8D0,
+	0x1E8D7,
+	0x1F000,
+	0x1F02C,
+	0x1F030,
+	0x1F094,
+	0x1F0A0,
+	0x1F0AF,
+	0x1F0B1,
+	0x1F0C0,
+	0x1F0C1,
+	0x1F0D0,
+	0x1F0D1,
+	0x1F0F6,
+	0x1F1E6,
+	0x1F200,
+	0x1F203,
+	0x1F210,
+	0x1F23B,
+	0x1F240,
+	0x1F249,
+	0x1F250,
+	0x1F252,
+	0x1F300,
+	0x1F39C,
+	0x1F39E,
+	0x1F3B5,
+	0x1F3B7,
+	0x1F3BC,
+	0x1F3BD,
+	0x1F3FB,
+	0x1F400,
+	0x1F4A0,
+	0x1F4A1,
+	0x1F4A2,
+	0x1F4A3,
+	0x1F4A4,
+	0x1F4A5,
+	0x1F4AF,
+	0x1F4B0,
+	0x1F4B1,
+	0x1F4B3,
+	0x1F500,
+	0x1F507,
+	0x1F517,
+	0x1F525,
+	0x1F532,
+	0x1F54A,
+	0x1F57A,
+	0x1F57B,
+	0x1F5A4,
+	0x1F5A5,
+	0x1F5D4,
+	0x1F5DC,
+	0x1F5F4,
+	0x1F5FA,
+	0x1F650,
+	0x1F676,
+	0x1F679,
+	0x1F67C,
+	0x1F680,
+	0x1F6D1,
+	0x1F6E0,
+	0x1F6ED,
+	0x1F6F0,
+	0x1F6F4,
+	0x1F910,
+	0x1F919,
+	0x1F980,
+	0x1F985,
+	0x1F9C0,
+	0x1F9C1,
+	0x20000,
+	0x2FFFE,
+	0x30000,
+	0x3FFFE,
+	0xE0001,
+	0xE0002,
+	0xE0020,
+	0xE0080,
+	0xE0100,
+	0xE01F0
+};
+
+#endif	/* defined(PERL_IN_PERL_C) */
+
+#if defined(PERL_IN_REGEXEC_C)
+
+#define LB_ENUM_COUNT 36
+
+typedef enum {
+	LB_Alphabetic = 0,
+	LB_Break_After = 1,
+	LB_Break_Before = 2,
+	LB_Break_Both = 3,
+	LB_Break_Symbols = 4,
+	LB_Carriage_Return = 5,
+	LB_Close_Parenthesis = 6,
+	LB_Close_Punctuation = 7,
+	LB_Combining_Mark = 8,
+	LB_Contingent_Break = 9,
+	LB_Exclamation = 10,
+	LB_Glue = 11,
+	LB_H2 = 12,
+	LB_H3 = 13,
+	LB_Hebrew_Letter = 14,
+	LB_Hyphen = 15,
+	LB_Ideographic = 16,
+	LB_Infix_Numeric = 17,
+	LB_Inseparable = 18,
+	LB_JL = 19,
+	LB_JT = 20,
+	LB_JV = 21,
+	LB_Line_Feed = 22,
+	LB_Mandatory_Break = 23,
+	LB_Next_Line = 24,
+	LB_Nonstarter = 25,
+	LB_Numeric = 26,
+	LB_Open_Punctuation = 27,
+	LB_Postfix_Numeric = 28,
+	LB_Prefix_Numeric = 29,
+	LB_Quotation = 30,
+	LB_Regional_Indicator = 31,
+	LB_Space = 32,
+	LB_Word_Joiner = 33,
+	LB_ZWSpace = 34,
+	LB_EDGE = 35
+} LB_enum;
+
+static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 1047 */
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Mandatory_Break,
+	LB_Carriage_Return,
+	LB_Combining_Mark,
+	LB_Line_Feed,
+	LB_Combining_Mark,
+	LB_Next_Line,
+	LB_Combining_Mark,
+	LB_Space,
+	LB_Glue,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Prefix_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Close_Parenthesis,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Hyphen,
+	LB_Break_Symbols,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Close_Parenthesis,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Exclamation,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Exclamation,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Numeric,
+	LB_Postfix_Numeric,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Glue,
+	LB_Break_Before,
+	LB_Break_After,
+	LB_Glue,
+	LB_Exclamation,
+	LB_Glue,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Break_After,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Glue,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Numeric,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_JL,
+	LB_JV,
+	LB_JT,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Glue,
+	LB_Break_After,
+	LB_ZWSpace,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Glue,
+	LB_Break_After,
+	LB_Break_Both,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Open_Punctuation,
+	LB_Quotation,
+	LB_Open_Punctuation,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Inseparable,
+	LB_Break_After,
+	LB_Mandatory_Break,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Word_Joiner,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Inseparable,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Quotation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Open_Punctuation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Break_After,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_Both,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Nonstarter,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Combining_Mark,
+	LB_Ideographic,
+	LB_Combining_Mark,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_JL,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_Alphabetic,
+	LB_JV,
+	LB_Alphabetic,
+	LB_JT,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Combining_Mark,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Infix_Numeric,
+	LB_Close_Punctuation,
+	LB_Infix_Numeric,
+	LB_Exclamation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Inseparable,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Exclamation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Word_Joiner,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Ideographic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Exclamation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Ideographic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Contingent_Break,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Inseparable,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_Before,
+	LB_Break_After,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Regional_Indicator,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic
+};
+
+#endif	/* defined(PERL_IN_REGEXEC_C) */
+
+#if defined(PERL_IN_PERL_C)
+
+static const UV _Perl_SB_invlist[] = { /* for EBCDIC 1047 */
+	2920,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -30951,8 +40438,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x859,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x904,
 	0x93A,
 	0x93D,
@@ -31062,6 +40549,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -31148,7 +40637,7 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC62,
 	0xC64,
@@ -31203,7 +40692,7 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD62,
 	0xD64,
 	0xD66,
@@ -31383,7 +40872,9 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166E,
@@ -31458,8 +40949,6 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x1980,
 	0x19AC,
 	0x19B0,
-	0x19C1,
-	0x19C8,
 	0x19CA,
 	0x19D0,
 	0x19DA,
@@ -32146,7 +41635,7 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -32240,7 +41729,6 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xA69A,
 	0xA69B,
 	0xA69E,
-	0xA69F,
 	0xA6A0,
 	0xA6F0,
 	0xA6F2,
@@ -32374,7 +41862,10 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xA7AA,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B5,
+	0xA7B6,
+	0xA7B7,
+	0xA7B8,
 	0xA7F7,
 	0xA7F8,
 	0xA7FB,
@@ -32402,6 +41893,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA90A,
 	0xA926,
@@ -32475,9 +41968,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
+	0xAB70,
 	0xABC0,
 	0xABE3,
 	0xABEB,
@@ -32532,7 +42024,7 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xFE17,
 	0xFE19,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE31,
 	0xFE33,
 	0xFE35,
@@ -32666,6 +42158,10 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -32711,6 +42207,10 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11003,
 	0x11038,
@@ -32748,11 +42248,16 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x111C1,
 	0x111C5,
 	0x111C7,
+	0x111CA,
 	0x111CD,
 	0x111CE,
 	0x111D0,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
+	0x111DE,
+	0x111E0,
 	0x11200,
 	0x11212,
 	0x11213,
@@ -32761,12 +42266,23 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x1123A,
 	0x1123B,
 	0x1123D,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
+	0x112AA,
 	0x112B0,
 	0x112DF,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -32788,6 +42304,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -32813,7 +42331,9 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x115C2,
 	0x115C4,
 	0x115C9,
-	0x115CA,
+	0x115D8,
+	0x115DC,
+	0x115DE,
 	0x11600,
 	0x11630,
 	0x11641,
@@ -32827,6 +42347,14 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
+	0x1173C,
+	0x1173F,
 	0x118A0,
 	0x118C0,
 	0x118E0,
@@ -32836,11 +42364,15 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -32992,6 +42524,20 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA88,
+	0x1DA89,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -33076,6 +42622,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0001,
@@ -33097,21 +42645,21 @@ typedef enum {
 	SB_ATerm = 1,
 	SB_CR = 2,
 	SB_Close = 3,
-	SB_EDGE = 4,
-	SB_Extend = 5,
-	SB_Format = 6,
-	SB_LF = 7,
-	SB_Lower = 8,
-	SB_Numeric = 9,
-	SB_OLetter = 10,
-	SB_SContinue = 11,
-	SB_STerm = 12,
-	SB_Sep = 13,
-	SB_Sp = 14,
-	SB_Upper = 15
+	SB_Extend = 4,
+	SB_Format = 5,
+	SB_LF = 6,
+	SB_Lower = 7,
+	SB_Numeric = 8,
+	SB_OLetter = 9,
+	SB_SContinue = 10,
+	SB_STerm = 11,
+	SB_Sep = 12,
+	SB_Sp = 13,
+	SB_Upper = 14,
+	SB_EDGE = 15
 } SB_enum;
 
-static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
+static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_Sp,
 	SB_Other,
@@ -33949,6 +43497,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Extend,
 	SB_Other,
 	SB_OLetter,
@@ -34269,7 +43819,9 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
-	SB_OLetter,
+	SB_Upper,
+	SB_Other,
+	SB_Lower,
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
@@ -34344,9 +43896,7 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
-	SB_Extend,
 	SB_OLetter,
-	SB_Extend,
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
@@ -35126,7 +44676,6 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Lower,
 	SB_Upper,
 	SB_Lower,
-	SB_Other,
 	SB_Extend,
 	SB_OLetter,
 	SB_Extend,
@@ -35233,7 +44782,7 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Lower,
 	SB_Upper,
 	SB_Lower,
-	SB_Other,
+	SB_OLetter,
 	SB_Upper,
 	SB_Lower,
 	SB_Upper,
@@ -35261,6 +44810,9 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Upper,
 	SB_Other,
 	SB_Upper,
+	SB_Lower,
+	SB_Upper,
+	SB_Lower,
 	SB_Other,
 	SB_OLetter,
 	SB_Lower,
@@ -35289,6 +44841,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Numeric,
 	SB_OLetter,
 	SB_Extend,
@@ -35364,7 +44918,6 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Lower,
 	SB_Other,
 	SB_Lower,
-	SB_Other,
 	SB_OLetter,
 	SB_Extend,
 	SB_STerm,
@@ -35562,6 +45115,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_OLetter,
 	SB_Other,
 	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
 	SB_Extend,
 	SB_Other,
 	SB_Extend,
@@ -35598,6 +45155,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_Upper,
+	SB_Other,
+	SB_Lower,
+	SB_Other,
 	SB_Extend,
 	SB_OLetter,
 	SB_Extend,
@@ -35635,6 +45196,7 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_OLetter,
 	SB_STerm,
 	SB_Other,
+	SB_Extend,
 	SB_STerm,
 	SB_Other,
 	SB_Numeric,
@@ -35642,6 +45204,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_STerm,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_OLetter,
 	SB_Extend,
 	SB_STerm,
@@ -35649,6 +45215,17 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_STerm,
 	SB_Other,
 	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_STerm,
+	SB_Other,
+	SB_OLetter,
 	SB_Extend,
 	SB_Other,
 	SB_Numeric,
@@ -35675,6 +45252,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_Extend,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Extend,
 	SB_Other,
 	SB_OLetter,
@@ -35700,6 +45279,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_STerm,
 	SB_Other,
 	SB_STerm,
+	SB_OLetter,
+	SB_Extend,
 	SB_Other,
 	SB_OLetter,
 	SB_Extend,
@@ -35714,6 +45295,14 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Numeric,
+	SB_Other,
+	SB_STerm,
+	SB_Other,
 	SB_Upper,
 	SB_Lower,
 	SB_Numeric,
@@ -35732,6 +45321,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Numeric,
 	SB_Other,
 	SB_STerm,
@@ -35879,6 +45472,20 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_STerm,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
 	SB_OLetter,
 	SB_Other,
 	SB_Extend,
@@ -35965,6 +45572,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Format,
 	SB_Other,
 	SB_Format,
@@ -35975,96 +45584,16 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 1047 */
 
 #endif	/* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_REGCOMP_C)
-
-static const UV UpperLatin1_invlist[] = { /* for EBCDIC 1047 */
-	55,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x4,
-	0x5,
-	0x6,
-	0x7,
-	0x8,
-	0xB,
-	0x14,
-	0x15,
-	0x17,
-	0x18,
-	0x1A,
-	0x1C,
-	0x20,
-	0x26,
-	0x28,
-	0x2D,
-	0x30,
-	0x32,
-	0x33,
-	0x37,
-	0x38,
-	0x3C,
-	0x3E,
-	0x3F,
-	0x41,
-	0x4B,
-	0x51,
-	0x5A,
-	0x62,
-	0x6B,
-	0x70,
-	0x79,
-	0x80,
-	0x81,
-	0x8A,
-	0x91,
-	0x9A,
-	0xA1,
-	0xAA,
-	0xAD,
-	0xAE,
-	0xBD,
-	0xBE,
-	0xC0,
-	0xCA,
-	0xD0,
-	0xDA,
-	0xE0,
-	0xE1,
-	0xE2,
-	0xEA,
-	0xF0,
-	0xFA,
-	0x100
-};
-
-#endif	/* defined(PERL_IN_REGCOMP_C) */
-
 #if defined(PERL_IN_PERL_C)
 
-static const UV VertSpace_invlist[] = { /* for EBCDIC 1047 */
-	9,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0xB,
-	0xE,
-	0x15,
-	0x16,
-	0x25,
-	0x26,
-	0x2028,
-	0x202A
-};
-
-static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
-	1505,	/* Number of elements */
+static const UV _Perl_WB_invlist[] = { /* for EBCDIC 1047 */
+	1558,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0x0,
+	0x5,
+	0x6,
 	0xB,
 	0xD,
 	0xE,
@@ -36072,6 +45601,7 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x16,
 	0x25,
 	0x26,
+	0x40,
 	0x42,
 	0x4A,
 	0x4B,
@@ -36254,8 +45784,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x859,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x904,
 	0x93A,
 	0x93D,
@@ -36365,6 +45895,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -36451,7 +45983,7 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC62,
 	0xC64,
@@ -36506,7 +46038,7 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD62,
 	0xD64,
 	0xD66,
@@ -36647,7 +46179,9 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -36702,10 +46236,6 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x193C,
 	0x1946,
 	0x1950,
-	0x19B0,
-	0x19C1,
-	0x19C8,
-	0x19CA,
 	0x19D0,
 	0x19DA,
 	0x1A00,
@@ -36801,6 +46331,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x1FF5,
 	0x1FF6,
 	0x1FFD,
+	0x2000,
+	0x200B,
 	0x200C,
 	0x200E,
 	0x2010,
@@ -36812,12 +46344,14 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x2028,
 	0x202A,
 	0x202F,
+	0x2030,
 	0x203F,
 	0x2041,
 	0x2044,
 	0x2045,
 	0x2054,
 	0x2055,
+	0x205F,
 	0x2060,
 	0x2065,
 	0x2066,
@@ -36903,6 +46437,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x2E00,
 	0x2E2F,
 	0x2E30,
+	0x3000,
+	0x3001,
 	0x3005,
 	0x3006,
 	0x302A,
@@ -36947,7 +46483,6 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xA67E,
 	0xA67F,
 	0xA69E,
-	0xA69F,
 	0xA6A0,
 	0xA6F0,
 	0xA6F2,
@@ -36956,11 +46491,9 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -36983,6 +46516,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA90A,
 	0xA926,
@@ -37044,10 +46579,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABE3,
 	0xABEB,
 	0xABEC,
@@ -37096,7 +46629,7 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0xFE14,
 	0xFE15,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE33,
 	0xFE35,
 	0xFE4D,
@@ -37211,6 +46744,10 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -37254,6 +46791,10 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11003,
 	0x11038,
@@ -37286,20 +46827,34 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x111B3,
 	0x111C1,
 	0x111C5,
+	0x111CA,
+	0x111CD,
 	0x111D0,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1122C,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112DF,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -37321,6 +46876,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -37343,6 +46900,9 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x115B6,
 	0x115B8,
 	0x115C1,
+	0x115D8,
+	0x115DC,
+	0x115DE,
 	0x11600,
 	0x11630,
 	0x11641,
@@ -37355,6 +46915,10 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118E0,
 	0x118EA,
@@ -37363,11 +46927,15 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -37485,6 +47053,18 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -37575,31 +47155,34 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 1047 */
 
 #if defined(PERL_IN_REGEXEC_C)
 
-#define WB_ENUM_COUNT 19
+#define WB_ENUM_COUNT 20
 
 typedef enum {
 	WB_Other = 0,
 	WB_ALetter = 1,
 	WB_CR = 2,
 	WB_Double_Quote = 3,
-	WB_EDGE = 4,
-	WB_Extend = 5,
-	WB_ExtendNumLet = 6,
-	WB_Format = 7,
-	WB_Hebrew_Letter = 8,
-	WB_Katakana = 9,
-	WB_LF = 10,
-	WB_MidLetter = 11,
-	WB_MidNum = 12,
-	WB_MidNumLet = 13,
-	WB_Newline = 14,
-	WB_Numeric = 15,
+	WB_Extend = 4,
+	WB_ExtendNumLet = 5,
+	WB_Format = 6,
+	WB_Hebrew_Letter = 7,
+	WB_Katakana = 8,
+	WB_LF = 9,
+	WB_MidLetter = 10,
+	WB_MidNum = 11,
+	WB_MidNumLet = 12,
+	WB_Newline = 13,
+	WB_Numeric = 14,
+	WB_Perl_Tailored_HSpace = 15,
 	WB_Regional_Indicator = 16,
 	WB_Single_Quote = 17,
-	WB_UNKNOWN = 18
+	WB_EDGE = 18,
+	WB_UNKNOWN = 19
 } WB_enum;
 
-static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
+static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 1047 */
+	WB_Other,
+	WB_Perl_Tailored_HSpace,
 	WB_Other,
 	WB_Newline,
 	WB_CR,
@@ -37608,6 +47191,7 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_Newline,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
 	WB_ALetter,
 	WB_Other,
 	WB_MidNumLet,
@@ -37901,6 +47485,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
@@ -38189,6 +47775,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
+	WB_Perl_Tailored_HSpace,
+	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
@@ -38238,10 +47826,6 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
 	WB_Numeric,
 	WB_Other,
 	WB_ALetter,
@@ -38337,6 +47921,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
+	WB_Other,
 	WB_Extend,
 	WB_Format,
 	WB_Other,
@@ -38347,6 +47933,7 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_MidLetter,
 	WB_Newline,
 	WB_Format,
+	WB_Perl_Tailored_HSpace,
 	WB_Other,
 	WB_ExtendNumLet,
 	WB_Other,
@@ -38354,6 +47941,7 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_ExtendNumLet,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
 	WB_Format,
 	WB_Other,
 	WB_Format,
@@ -38439,6 +48027,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
+	WB_Other,
 	WB_ALetter,
 	WB_Other,
 	WB_Extend,
@@ -38482,7 +48072,6 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
-	WB_Other,
 	WB_Extend,
 	WB_ALetter,
 	WB_Extend,
@@ -38496,8 +48085,6 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
 	WB_Extend,
 	WB_ALetter,
 	WB_Extend,
@@ -38519,6 +48106,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Numeric,
 	WB_ALetter,
 	WB_Extend,
@@ -38582,8 +48171,6 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_Extend,
@@ -38756,6 +48343,10 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_Extend,
@@ -38790,6 +48381,10 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Extend,
 	WB_ALetter,
 	WB_Extend,
@@ -38822,15 +48417,29 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Extend,
 	WB_ALetter,
 	WB_Other,
+	WB_Extend,
+	WB_Other,
 	WB_Numeric,
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_Numeric,
@@ -38857,6 +48466,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_Extend,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
@@ -38883,6 +48494,9 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
+	WB_Extend,
+	WB_Other,
+	WB_ALetter,
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
@@ -38891,6 +48505,10 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Numeric,
+	WB_Other,
 	WB_ALetter,
 	WB_Numeric,
 	WB_Other,
@@ -38908,6 +48526,10 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Numeric,
 	WB_Other,
 	WB_ALetter,
@@ -39021,6 +48643,18 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
 	WB_ALetter,
 	WB_Other,
 	WB_Extend,
@@ -39109,8 +48743,90 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 1047 */
 
 #endif	/* defined(PERL_IN_REGEXEC_C) */
 
+#if defined(PERL_IN_REGCOMP_C)
+
+static const UV UpperLatin1_invlist[] = { /* for EBCDIC 1047 */
+	55,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x4,
+	0x5,
+	0x6,
+	0x7,
+	0x8,
+	0xB,
+	0x14,
+	0x15,
+	0x17,
+	0x18,
+	0x1A,
+	0x1C,
+	0x20,
+	0x26,
+	0x28,
+	0x2D,
+	0x30,
+	0x32,
+	0x33,
+	0x37,
+	0x38,
+	0x3C,
+	0x3E,
+	0x3F,
+	0x41,
+	0x4B,
+	0x51,
+	0x5A,
+	0x62,
+	0x6B,
+	0x70,
+	0x79,
+	0x80,
+	0x81,
+	0x8A,
+	0x91,
+	0x9A,
+	0xA1,
+	0xAA,
+	0xAD,
+	0xAE,
+	0xBD,
+	0xBE,
+	0xC0,
+	0xCA,
+	0xD0,
+	0xDA,
+	0xE0,
+	0xE1,
+	0xE2,
+	0xEA,
+	0xF0,
+	0xFA,
+	0x100
+};
+
+#endif	/* defined(PERL_IN_REGCOMP_C) */
+
 #if defined(PERL_IN_PERL_C)
 
+static const UV VertSpace_invlist[] = { /* for EBCDIC 1047 */
+	9,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0xB,
+	0xE,
+	0x15,
+	0x16,
+	0x25,
+	0x26,
+	0x2028,
+	0x202A
+};
+
 static const UV XPerlSpace_invlist[] = { /* for EBCDIC 1047 */
 	23,	/* Number of elements */
 	148565664, /* Version and data structure type */
@@ -39142,7 +48858,7 @@ static const UV XPerlSpace_invlist[] = { /* for EBCDIC 1047 */
 };
 
 static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
-	1285,	/* Number of elements */
+	1321,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -39274,8 +48990,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0x840,
 	0x859,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x8EA,
 	0x8F0,
 	0x93C,
@@ -39373,6 +49089,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -39454,7 +49172,7 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -39505,7 +49223,7 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD70,
@@ -39654,7 +49372,9 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -39898,7 +49618,7 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -39912,19 +49632,15 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0xA674,
 	0xA67C,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F0,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -39943,6 +49659,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA92B,
 	0xA930,
@@ -39994,10 +49712,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xABF0,
 	0xABFA,
@@ -40121,6 +49837,10 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -40157,6 +49877,10 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11046,
 	0x11066,
@@ -40181,17 +49905,29 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0x111C5,
 	0x111D0,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11235,
 	0x11237,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112E9,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -40211,6 +49947,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0x11349,
 	0x1134B,
 	0x1134D,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -40227,6 +49965,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0x115B6,
 	0x115B8,
 	0x115BF,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x1163F,
 	0x11640,
@@ -40239,6 +49979,12 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0x116B6,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172B,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118EA,
 	0x118FF,
@@ -40246,11 +49992,15 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -40429,12 +50179,14 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 1047 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E
 };
 
 static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
-	1227,	/* Number of elements */
+	1261,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -40568,8 +50320,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0x840,
 	0x859,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x8EA,
 	0x8F0,
 	0x93C,
@@ -40663,6 +50415,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0xAD1,
 	0xAE0,
 	0xAE4,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -40740,7 +50494,7 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC81,
@@ -40787,7 +50541,7 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD7A,
 	0xD80,
@@ -40924,7 +50678,9 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -41158,7 +50914,7 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -41174,19 +50930,15 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0xA674,
 	0xA67C,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F0,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -41203,6 +50955,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA90A,
 	0xA92B,
 	0xA930,
@@ -41254,10 +51008,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xAC00,
 	0xD7A4,
@@ -41375,6 +51127,10 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -41411,6 +51167,10 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11046,
 	0x11082,
@@ -41429,15 +51189,27 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0x111C5,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11235,
 	0x11237,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112E9,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -41457,6 +51229,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0x11349,
 	0x1134B,
 	0x1134D,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -41471,6 +51245,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0x115B6,
 	0x115B8,
 	0x115BF,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x1163F,
 	0x11640,
@@ -41479,6 +51255,10 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0x11645,
 	0x11680,
 	0x116B6,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172B,
 	0x118A0,
 	0x118E0,
 	0x118FF,
@@ -41486,11 +51266,15 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -41663,6 +51447,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 1047 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E
 };
@@ -41701,7 +51487,7 @@ static const UV XPosixCntrl_invlist[] = { /* for EBCDIC 1047 */
 };
 
 static const UV XPosixDigit_invlist[] = { /* for EBCDIC 1047 */
-	101,	/* Number of elements */
+	103,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -41798,6 +51584,8 @@ static const UV XPosixDigit_invlist[] = { /* for EBCDIC 1047 */
 	0x1165A,
 	0x116C0,
 	0x116CA,
+	0x11730,
+	0x1173A,
 	0x118E0,
 	0x118EA,
 	0x16A60,
@@ -41809,7 +51597,7 @@ static const UV XPosixDigit_invlist[] = { /* for EBCDIC 1047 */
 };
 
 static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
-	1211,	/* Number of elements */
+	1237,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -41863,8 +51651,8 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x85E,
 	0x85F,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x984,
 	0x985,
 	0x98D,
@@ -41950,6 +51738,8 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0xAE4,
 	0xAE6,
 	0xAF2,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -42029,7 +51819,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -42080,7 +51870,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD76,
@@ -42205,7 +51995,9 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x1380,
 	0x139A,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1400,
 	0x1680,
 	0x1681,
@@ -42341,11 +52133,11 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x2090,
 	0x209D,
 	0x20A0,
-	0x20BE,
+	0x20BF,
 	0x20D0,
 	0x20F1,
 	0x2100,
-	0x218A,
+	0x218C,
 	0x2190,
 	0x23FB,
 	0x2400,
@@ -42362,6 +52154,8 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x2BC9,
 	0x2BCA,
 	0x2BD2,
+	0x2BEC,
+	0x2BF0,
 	0x2C00,
 	0x2C2F,
 	0x2C30,
@@ -42427,7 +52221,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x3300,
 	0x4DB6,
 	0x4DC0,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA490,
@@ -42435,15 +52229,11 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0xA4D0,
 	0xA62C,
 	0xA640,
-	0xA69E,
-	0xA69F,
 	0xA6F8,
 	0xA700,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA82C,
 	0xA830,
@@ -42455,7 +52245,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0xA8CE,
 	0xA8DA,
 	0xA8E0,
-	0xA8FC,
+	0xA8FE,
 	0xA900,
 	0xA954,
 	0xA95F,
@@ -42487,10 +52277,8 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0xAB28,
 	0xAB2F,
 	0xAB30,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEE,
 	0xABF0,
 	0xABFA,
@@ -42531,8 +52319,6 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0xFE00,
 	0xFE1A,
 	0xFE20,
-	0xFE2E,
-	0xFE30,
 	0xFE53,
 	0xFE54,
 	0xFE67,
@@ -42636,7 +52422,11 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x1089F,
 	0x108A7,
 	0x108B0,
-	0x10900,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
+	0x108FB,
 	0x1091C,
 	0x1091F,
 	0x1093A,
@@ -42644,9 +52434,9 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x10940,
 	0x10980,
 	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
+	0x109BC,
+	0x109D0,
+	0x109D2,
 	0x10A04,
 	0x10A05,
 	0x10A07,
@@ -42682,6 +52472,12 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x10BB0,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
+	0x10CFA,
+	0x10D00,
 	0x10E60,
 	0x10E7F,
 	0x11000,
@@ -42701,22 +52497,30 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x11150,
 	0x11177,
 	0x11180,
-	0x111C9,
-	0x111CD,
 	0x111CE,
 	0x111D0,
-	0x111DB,
+	0x111E0,
 	0x111E1,
 	0x111F5,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1123E,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112AA,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -42736,6 +52540,8 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -42751,7 +52557,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x11580,
 	0x115B6,
 	0x115B8,
-	0x115CA,
+	0x115DE,
 	0x11600,
 	0x11645,
 	0x11650,
@@ -42760,6 +52566,12 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x11740,
 	0x118A0,
 	0x118F3,
 	0x118FF,
@@ -42767,13 +52579,17 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
 	0x12470,
 	0x12475,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -42819,7 +52635,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x1D100,
 	0x1D127,
 	0x1D129,
-	0x1D1DE,
+	0x1D1E9,
 	0x1D200,
 	0x1D246,
 	0x1D300,
@@ -42867,7 +52683,11 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x1D6A8,
 	0x1D7CC,
 	0x1D7CE,
-	0x1D800,
+	0x1DA8C,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8C7,
@@ -42969,25 +52789,11 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x1F250,
 	0x1F252,
 	0x1F300,
-	0x1F32D,
-	0x1F330,
-	0x1F37E,
-	0x1F380,
-	0x1F3CF,
-	0x1F3D4,
-	0x1F3F8,
-	0x1F400,
-	0x1F4FF,
-	0x1F500,
-	0x1F54B,
-	0x1F550,
 	0x1F57A,
 	0x1F57B,
 	0x1F5A4,
 	0x1F5A5,
-	0x1F643,
-	0x1F645,
-	0x1F6D0,
+	0x1F6D1,
 	0x1F6E0,
 	0x1F6ED,
 	0x1F6F0,
@@ -43006,12 +52812,20 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 	0x1F888,
 	0x1F890,
 	0x1F8AE,
+	0x1F910,
+	0x1F919,
+	0x1F980,
+	0x1F985,
+	0x1F9C0,
+	0x1F9C1,
 	0x20000,
 	0x2A6D7,
 	0x2A700,
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0001,
@@ -43027,7 +52841,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC 1047 */
 };
 
 static const UV XPosixLower_invlist[] = { /* for EBCDIC 1047 */
-	1275,	/* Number of elements */
+	1283,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -43590,6 +53404,8 @@ static const UV XPosixLower_invlist[] = { /* for EBCDIC 1047 */
 	0x530,
 	0x561,
 	0x588,
+	0x13F8,
+	0x13FE,
 	0x1D00,
 	0x1DC0,
 	0x1E01,
@@ -44232,14 +54048,18 @@ static const UV XPosixLower_invlist[] = { /* for EBCDIC 1047 */
 	0xA7A8,
 	0xA7A9,
 	0xA7AA,
+	0xA7B5,
+	0xA7B6,
+	0xA7B7,
+	0xA7B8,
 	0xA7F8,
 	0xA7FB,
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
+	0xAB70,
+	0xABC0,
 	0xFB00,
 	0xFB07,
 	0xFB13,
@@ -44248,6 +54068,8 @@ static const UV XPosixLower_invlist[] = { /* for EBCDIC 1047 */
 	0xFF5B,
 	0x10428,
 	0x10450,
+	0x10CC0,
+	0x10CF3,
 	0x118C0,
 	0x118E0,
 	0x1D41A,
@@ -44309,7 +54131,7 @@ static const UV XPosixLower_invlist[] = { /* for EBCDIC 1047 */
 };
 
 static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
-	1205,	/* Number of elements */
+	1231,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -44363,8 +54185,8 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x85E,
 	0x85F,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x984,
 	0x985,
 	0x98D,
@@ -44450,6 +54272,8 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0xAE4,
 	0xAE6,
 	0xAF2,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -44529,7 +54353,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -44580,7 +54404,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD76,
@@ -44705,7 +54529,9 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x1380,
 	0x139A,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1400,
 	0x169D,
 	0x16A0,
@@ -44835,11 +54661,11 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x2090,
 	0x209D,
 	0x20A0,
-	0x20BE,
+	0x20BF,
 	0x20D0,
 	0x20F1,
 	0x2100,
-	0x218A,
+	0x218C,
 	0x2190,
 	0x23FB,
 	0x2400,
@@ -44856,6 +54682,8 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x2BC9,
 	0x2BCA,
 	0x2BD2,
+	0x2BEC,
+	0x2BF0,
 	0x2C00,
 	0x2C2F,
 	0x2C30,
@@ -44921,7 +54749,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x3300,
 	0x4DB6,
 	0x4DC0,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA490,
@@ -44929,15 +54757,11 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0xA4D0,
 	0xA62C,
 	0xA640,
-	0xA69E,
-	0xA69F,
 	0xA6F8,
 	0xA700,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA82C,
 	0xA830,
@@ -44949,7 +54773,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0xA8CE,
 	0xA8DA,
 	0xA8E0,
-	0xA8FC,
+	0xA8FE,
 	0xA900,
 	0xA954,
 	0xA95F,
@@ -44981,10 +54805,8 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0xAB28,
 	0xAB2F,
 	0xAB30,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEE,
 	0xABF0,
 	0xABFA,
@@ -45025,8 +54847,6 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0xFE00,
 	0xFE1A,
 	0xFE20,
-	0xFE2E,
-	0xFE30,
 	0xFE53,
 	0xFE54,
 	0xFE67,
@@ -45130,7 +54950,11 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x1089F,
 	0x108A7,
 	0x108B0,
-	0x10900,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
+	0x108FB,
 	0x1091C,
 	0x1091F,
 	0x1093A,
@@ -45138,9 +54962,9 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x10940,
 	0x10980,
 	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
+	0x109BC,
+	0x109D0,
+	0x109D2,
 	0x10A04,
 	0x10A05,
 	0x10A07,
@@ -45176,6 +55000,12 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x10BB0,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
+	0x10CFA,
+	0x10D00,
 	0x10E60,
 	0x10E7F,
 	0x11000,
@@ -45195,22 +55025,30 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x11150,
 	0x11177,
 	0x11180,
-	0x111C9,
-	0x111CD,
 	0x111CE,
 	0x111D0,
-	0x111DB,
+	0x111E0,
 	0x111E1,
 	0x111F5,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1123E,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112AA,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -45230,6 +55068,8 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -45245,7 +55085,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x11580,
 	0x115B6,
 	0x115B8,
-	0x115CA,
+	0x115DE,
 	0x11600,
 	0x11645,
 	0x11650,
@@ -45254,6 +55094,12 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x11740,
 	0x118A0,
 	0x118F3,
 	0x118FF,
@@ -45261,13 +55107,17 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
 	0x12470,
 	0x12475,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -45313,7 +55163,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x1D100,
 	0x1D127,
 	0x1D129,
-	0x1D1DE,
+	0x1D1E9,
 	0x1D200,
 	0x1D246,
 	0x1D300,
@@ -45361,7 +55211,11 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x1D6A8,
 	0x1D7CC,
 	0x1D7CE,
-	0x1D800,
+	0x1DA8C,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8C7,
@@ -45463,25 +55317,11 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x1F250,
 	0x1F252,
 	0x1F300,
-	0x1F32D,
-	0x1F330,
-	0x1F37E,
-	0x1F380,
-	0x1F3CF,
-	0x1F3D4,
-	0x1F3F8,
-	0x1F400,
-	0x1F4FF,
-	0x1F500,
-	0x1F54B,
-	0x1F550,
 	0x1F57A,
 	0x1F57B,
 	0x1F5A4,
 	0x1F5A5,
-	0x1F643,
-	0x1F645,
-	0x1F6D0,
+	0x1F6D1,
 	0x1F6E0,
 	0x1F6ED,
 	0x1F6F0,
@@ -45500,12 +55340,20 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 	0x1F888,
 	0x1F890,
 	0x1F8AE,
+	0x1F910,
+	0x1F919,
+	0x1F980,
+	0x1F985,
+	0x1F9C0,
+	0x1F9C1,
 	0x20000,
 	0x2A6D7,
 	0x2A700,
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0001,
@@ -45521,7 +55369,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC 1047 */
 };
 
 static const UV XPosixPunct_invlist[] = { /* for EBCDIC 1047 */
-	309,	/* Number of elements */
+	321,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -45726,6 +55574,8 @@ static const UV XPosixPunct_invlist[] = { /* for EBCDIC 1047 */
 	0xA8D0,
 	0xA8F8,
 	0xA8FB,
+	0xA8FC,
+	0xA8FD,
 	0xA92E,
 	0xA930,
 	0xA95F,
@@ -45811,17 +55661,25 @@ static const UV XPosixPunct_invlist[] = { /* for EBCDIC 1047 */
 	0x11174,
 	0x11176,
 	0x111C5,
-	0x111C9,
+	0x111CA,
 	0x111CD,
 	0x111CE,
+	0x111DB,
+	0x111DC,
+	0x111DD,
+	0x111E0,
 	0x11238,
 	0x1123E,
+	0x112A9,
+	0x112AA,
 	0x114C6,
 	0x114C7,
 	0x115C1,
-	0x115CA,
+	0x115D8,
 	0x11641,
 	0x11644,
+	0x1173C,
+	0x1173F,
 	0x12470,
 	0x12475,
 	0x16A6E,
@@ -45833,7 +55691,9 @@ static const UV XPosixPunct_invlist[] = { /* for EBCDIC 1047 */
 	0x16B44,
 	0x16B45,
 	0x1BC9F,
-	0x1BCA0
+	0x1BCA0,
+	0x1DA87,
+	0x1DA8C
 };
 
 static const UV XPosixSpace_invlist[] = { /* for EBCDIC 1047 */
@@ -45867,7 +55727,7 @@ static const UV XPosixSpace_invlist[] = { /* for EBCDIC 1047 */
 };
 
 static const UV XPosixUpper_invlist[] = { /* for EBCDIC 1047 */
-	1273,	/* Number of elements */
+	1279,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -46440,6 +56300,8 @@ static const UV XPosixUpper_invlist[] = { /* for EBCDIC 1047 */
 	0x10C8,
 	0x10CD,
 	0x10CE,
+	0x13A0,
+	0x13F6,
 	0x1E00,
 	0x1E01,
 	0x1E02,
@@ -47069,11 +56931,15 @@ static const UV XPosixUpper_invlist[] = { /* for EBCDIC 1047 */
 	0xA7AA,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B5,
+	0xA7B6,
+	0xA7B7,
 	0xFF21,
 	0xFF3B,
 	0x10400,
 	0x10428,
+	0x10C80,
+	0x10CB3,
 	0x118A0,
 	0x118C0,
 	0x1D400,
@@ -47147,7 +57013,7 @@ static const UV XPosixUpper_invlist[] = { /* for EBCDIC 1047 */
 };
 
 static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
-	1285,	/* Number of elements */
+	1335,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -47273,8 +57139,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x840,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x964,
 	0x966,
 	0x970,
@@ -47364,6 +57230,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -47445,7 +57313,7 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -47494,7 +57362,7 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD70,
@@ -47639,7 +57507,9 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -47885,7 +57755,7 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -47899,19 +57769,15 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0xA674,
 	0xA67E,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F2,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA828,
 	0xA840,
@@ -47924,6 +57790,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA92E,
 	0xA930,
@@ -47965,10 +57833,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xABEC,
 	0xABEE,
@@ -48013,7 +57879,7 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0xFE00,
 	0xFE10,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE33,
 	0xFE35,
 	0xFE4D,
@@ -48108,6 +57974,10 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -48148,6 +58018,10 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11047,
 	0x11066,
@@ -48168,17 +58042,31 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x11177,
 	0x11180,
 	0x111C5,
+	0x111CA,
+	0x111CD,
 	0x111D0,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -48198,6 +58086,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -48216,6 +58106,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x115B6,
 	0x115B8,
 	0x115C1,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x11641,
 	0x11644,
@@ -48226,6 +58118,12 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118EA,
 	0x118FF,
@@ -48233,11 +58131,15 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -48350,6 +58252,18 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -48432,6 +58346,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC 1047 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0100,
@@ -48533,7 +58449,7 @@ static const UV ASCII_invlist[] = { /* for EBCDIC 037 */
 };
 
 static const UV Cased_invlist[] = { /* for EBCDIC 037 */
-	277,	/* Number of elements */
+	285,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -48620,6 +58536,10 @@ static const UV Cased_invlist[] = { /* for EBCDIC 037 */
 	0x10C8,
 	0x10CD,
 	0x10CE,
+	0x13A0,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1D00,
 	0x1DC0,
 	0x1E00,
@@ -48727,15 +58647,15 @@ static const UV Cased_invlist[] = { /* for EBCDIC 037 */
 	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F8,
 	0xA7FB,
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
+	0xAB70,
+	0xABC0,
 	0xFB00,
 	0xFB07,
 	0xFB13,
@@ -48746,6 +58666,10 @@ static const UV Cased_invlist[] = { /* for EBCDIC 037 */
 	0xFF5B,
 	0x10400,
 	0x10450,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x118A0,
 	0x118E0,
 	0x1D400,
@@ -48816,8 +58740,416 @@ static const UV Cased_invlist[] = { /* for EBCDIC 037 */
 	0x1F18A
 };
 
-static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 037 */
-	1484,	/* Number of elements */
+#endif	/* defined(PERL_IN_PERL_C) */
+
+#if defined(PERL_IN_REGCOMP_C)
+
+static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for EBCDIC 037 */
+	45,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x2BC,
+	0x2BD,
+	0x308,
+	0x309,
+	0x313,
+	0x314,
+	0x342,
+	0x343,
+	0x3AC,
+	0x3AD,
+	0x3AE,
+	0x3AF,
+	0x3B1,
+	0x3B2,
+	0x3B7,
+	0x3B8,
+	0x3B9,
+	0x3BA,
+	0x3C1,
+	0x3C2,
+	0x3C5,
+	0x3C6,
+	0x3C9,
+	0x3CA,
+	0x3CE,
+	0x3CF,
+	0x565,
+	0x566,
+	0x574,
+	0x575,
+	0x57E,
+	0x57F,
+	0x1F00,
+	0x1F08,
+	0x1F20,
+	0x1F28,
+	0x1F60,
+	0x1F68,
+	0x1F70,
+	0x1F71,
+	0x1F74,
+	0x1F75,
+	0x1F7C,
+	0x1F7D
+};
+
+static const UV _Perl_Any_Folds_invlist[] = { /* for EBCDIC 037 */
+	275,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x42,
+	0x4A,
+	0x51,
+	0x5A,
+	0x62,
+	0x6A,
+	0x70,
+	0x79,
+	0x80,
+	0x8A,
+	0x8C,
+	0x8F,
+	0x91,
+	0x9A,
+	0x9C,
+	0x9D,
+	0x9E,
+	0x9F,
+	0xA0,
+	0xA1,
+	0xA2,
+	0xAA,
+	0xAC,
+	0xAF,
+	0xC1,
+	0xCA,
+	0xCB,
+	0xD0,
+	0xD1,
+	0xDA,
+	0xDB,
+	0xE0,
+	0xE2,
+	0xEA,
+	0xEB,
+	0xF0,
+	0xFB,
+	0xFF,
+	0x100,
+	0x131,
+	0x132,
+	0x138,
+	0x139,
+	0x18D,
+	0x18E,
+	0x19B,
+	0x19C,
+	0x1AA,
+	0x1AC,
+	0x1BA,
+	0x1BC,
+	0x1BE,
+	0x1BF,
+	0x1C0,
+	0x1C4,
+	0x221,
+	0x222,
+	0x234,
+	0x23A,
+	0x255,
+	0x256,
+	0x258,
+	0x259,
+	0x25A,
+	0x25B,
+	0x25D,
+	0x260,
+	0x262,
+	0x263,
+	0x264,
+	0x265,
+	0x267,
+	0x268,
+	0x26A,
+	0x26B,
+	0x26D,
+	0x26F,
+	0x270,
+	0x271,
+	0x273,
+	0x275,
+	0x276,
+	0x27D,
+	0x27E,
+	0x280,
+	0x281,
+	0x283,
+	0x284,
+	0x287,
+	0x28D,
+	0x292,
+	0x293,
+	0x29D,
+	0x29F,
+	0x2BC,
+	0x2BD,
+	0x2BE,
+	0x2BF,
+	0x300,
+	0x302,
+	0x307,
+	0x309,
+	0x30A,
+	0x30B,
+	0x30C,
+	0x30D,
+	0x313,
+	0x314,
+	0x331,
+	0x332,
+	0x342,
+	0x343,
+	0x345,
+	0x346,
+	0x370,
+	0x374,
+	0x376,
+	0x378,
+	0x37B,
+	0x37E,
+	0x37F,
+	0x380,
+	0x386,
+	0x387,
+	0x388,
+	0x38B,
+	0x38C,
+	0x38D,
+	0x38E,
+	0x3A2,
+	0x3A3,
+	0x3D2,
+	0x3D5,
+	0x3F6,
+	0x3F7,
+	0x3FC,
+	0x3FD,
+	0x482,
+	0x48A,
+	0x530,
+	0x531,
+	0x557,
+	0x561,
+	0x588,
+	0x10A0,
+	0x10C6,
+	0x10C7,
+	0x10C8,
+	0x10CD,
+	0x10CE,
+	0x13A0,
+	0x13F6,
+	0x13F8,
+	0x13FE,
+	0x1D79,
+	0x1D7A,
+	0x1D7D,
+	0x1D7E,
+	0x1E00,
+	0x1E9C,
+	0x1E9E,
+	0x1E9F,
+	0x1EA0,
+	0x1F16,
+	0x1F18,
+	0x1F1E,
+	0x1F20,
+	0x1F46,
+	0x1F48,
+	0x1F4E,
+	0x1F50,
+	0x1F58,
+	0x1F59,
+	0x1F5A,
+	0x1F5B,
+	0x1F5C,
+	0x1F5D,
+	0x1F5E,
+	0x1F5F,
+	0x1F7E,
+	0x1F80,
+	0x1FB5,
+	0x1FB6,
+	0x1FBD,
+	0x1FBE,
+	0x1FBF,
+	0x1FC2,
+	0x1FC5,
+	0x1FC6,
+	0x1FCD,
+	0x1FD0,
+	0x1FD4,
+	0x1FD6,
+	0x1FDC,
+	0x1FE0,
+	0x1FED,
+	0x1FF2,
+	0x1FF5,
+	0x1FF6,
+	0x1FFD,
+	0x2126,
+	0x2127,
+	0x212A,
+	0x212C,
+	0x2132,
+	0x2133,
+	0x214E,
+	0x214F,
+	0x2160,
+	0x2180,
+	0x2183,
+	0x2185,
+	0x24B6,
+	0x24EA,
+	0x2C00,
+	0x2C2F,
+	0x2C30,
+	0x2C5F,
+	0x2C60,
+	0x2C71,
+	0x2C72,
+	0x2C74,
+	0x2C75,
+	0x2C77,
+	0x2C7E,
+	0x2CE4,
+	0x2CEB,
+	0x2CEF,
+	0x2CF2,
+	0x2CF4,
+	0x2D00,
+	0x2D26,
+	0x2D27,
+	0x2D28,
+	0x2D2D,
+	0x2D2E,
+	0xA640,
+	0xA66E,
+	0xA680,
+	0xA69C,
+	0xA722,
+	0xA730,
+	0xA732,
+	0xA770,
+	0xA779,
+	0xA788,
+	0xA78B,
+	0xA78E,
+	0xA790,
+	0xA794,
+	0xA796,
+	0xA7AE,
+	0xA7B0,
+	0xA7B8,
+	0xAB53,
+	0xAB54,
+	0xAB70,
+	0xABC0,
+	0xFB00,
+	0xFB07,
+	0xFB13,
+	0xFB18,
+	0xFF21,
+	0xFF3B,
+	0xFF41,
+	0xFF5B,
+	0x10400,
+	0x10450,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
+	0x118A0,
+	0x118E0
+};
+
+static const UV _Perl_Folds_To_Multi_Char_invlist[] = { /* for EBCDIC 037 */
+	59,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x59,
+	0x5A,
+	0x130,
+	0x131,
+	0x149,
+	0x14A,
+	0x1F0,
+	0x1F1,
+	0x390,
+	0x391,
+	0x3B0,
+	0x3B1,
+	0x587,
+	0x588,
+	0x1E96,
+	0x1E9B,
+	0x1E9E,
+	0x1E9F,
+	0x1F50,
+	0x1F51,
+	0x1F52,
+	0x1F53,
+	0x1F54,
+	0x1F55,
+	0x1F56,
+	0x1F57,
+	0x1F80,
+	0x1FB0,
+	0x1FB2,
+	0x1FB5,
+	0x1FB6,
+	0x1FB8,
+	0x1FBC,
+	0x1FBD,
+	0x1FC2,
+	0x1FC5,
+	0x1FC6,
+	0x1FC8,
+	0x1FCC,
+	0x1FCD,
+	0x1FD2,
+	0x1FD4,
+	0x1FD6,
+	0x1FD8,
+	0x1FE2,
+	0x1FE5,
+	0x1FE6,
+	0x1FE8,
+	0x1FF2,
+	0x1FF5,
+	0x1FF6,
+	0x1FF8,
+	0x1FFC,
+	0x1FFD,
+	0xFB00,
+	0xFB07,
+	0xFB13,
+	0xFB18
+};
+
+#endif	/* defined(PERL_IN_REGCOMP_C) */
+
+#if defined(PERL_IN_PERL_C)
+
+static const UV _Perl_GCB_invlist[] = { /* for EBCDIC 037 */
+	1502,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -48884,7 +59216,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 037 */
 	0x82E,
 	0x859,
 	0x85C,
-	0x8E4,
+	0x8E3,
 	0x903,
 	0x904,
 	0x93A,
@@ -49152,10 +59484,6 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 037 */
 	0x1933,
 	0x1939,
 	0x193C,
-	0x19B5,
-	0x19B8,
-	0x19BA,
-	0x19BB,
 	0x1A17,
 	0x1A19,
 	0x1A1B,
@@ -49256,7 +59584,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 037 */
 	0xA673,
 	0xA674,
 	0xA67E,
-	0xA69F,
+	0xA69E,
 	0xA6A0,
 	0xA6F0,
 	0xA6F2,
@@ -50145,7 +60473,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 037 */
 	0xFE00,
 	0xFE10,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFEFF,
 	0xFF00,
 	0xFF9E,
@@ -50201,6 +60529,8 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 037 */
 	0x111B6,
 	0x111BF,
 	0x111C1,
+	0x111CA,
+	0x111CD,
 	0x1122C,
 	0x1122F,
 	0x11232,
@@ -50212,7 +60542,7 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 037 */
 	0x112E0,
 	0x112E3,
 	0x112EB,
-	0x11301,
+	0x11300,
 	0x11302,
 	0x11304,
 	0x1133C,
@@ -50255,6 +60585,8 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 037 */
 	0x115BE,
 	0x115BF,
 	0x115C1,
+	0x115DC,
+	0x115DE,
 	0x11630,
 	0x11633,
 	0x1163B,
@@ -50270,6 +60602,12 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 037 */
 	0x116B6,
 	0x116B7,
 	0x116B8,
+	0x1171D,
+	0x11720,
+	0x11722,
+	0x11726,
+	0x11727,
+	0x1172C,
 	0x16AF0,
 	0x16AF5,
 	0x16B30,
@@ -50297,6 +60635,18 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC 037 */
 	0x1D1AE,
 	0x1D242,
 	0x1D245,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E8D0,
 	0x1E8D7,
 	0x1F1E6,
@@ -50317,20 +60667,20 @@ typedef enum {
 	GCB_Other = 0,
 	GCB_CR = 1,
 	GCB_Control = 2,
-	GCB_EDGE = 3,
-	GCB_Extend = 4,
-	GCB_L = 5,
-	GCB_LF = 6,
-	GCB_LV = 7,
-	GCB_LVT = 8,
-	GCB_Prepend = 9,
-	GCB_Regional_Indicator = 10,
-	GCB_SpacingMark = 11,
-	GCB_T = 12,
-	GCB_V = 13
+	GCB_Extend = 3,
+	GCB_L = 4,
+	GCB_LF = 5,
+	GCB_LV = 6,
+	GCB_LVT = 7,
+	GCB_Prepend = 8,
+	GCB_Regional_Indicator = 9,
+	GCB_SpacingMark = 10,
+	GCB_T = 11,
+	GCB_V = 12,
+	GCB_EDGE = 13
 } GCB_enum;
 
-static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 037 */
+static const GCB_enum _Perl_GCB_invmap[] = { /* for EBCDIC 037 */
 	GCB_Control,
 	GCB_CR,
 	GCB_Control,
@@ -50662,10 +61012,6 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 037 */
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
 	GCB_Extend,
 	GCB_SpacingMark,
 	GCB_Extend,
@@ -51711,6 +62057,8 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 037 */
 	GCB_Extend,
 	GCB_SpacingMark,
 	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_SpacingMark,
@@ -51765,6 +62113,8 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 037 */
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
 	GCB_SpacingMark,
 	GCB_Extend,
 	GCB_SpacingMark,
@@ -51781,6 +62131,12 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 037 */
 	GCB_Extend,
 	GCB_Other,
 	GCB_Extend,
+	GCB_SpacingMark,
+	GCB_Extend,
+	GCB_SpacingMark,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
 	GCB_Other,
 	GCB_Extend,
 	GCB_Other,
@@ -51809,6 +62165,18 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 037 */
 	GCB_Other,
 	GCB_Extend,
 	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
+	GCB_Extend,
+	GCB_Other,
 	GCB_Regional_Indicator,
 	GCB_Other,
 	GCB_Control,
@@ -51819,402 +62187,10 @@ static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC 037 */
 
 #endif	/* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_REGCOMP_C)
-
-static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for EBCDIC 037 */
-	45,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x2BC,
-	0x2BD,
-	0x308,
-	0x309,
-	0x313,
-	0x314,
-	0x342,
-	0x343,
-	0x3AC,
-	0x3AD,
-	0x3AE,
-	0x3AF,
-	0x3B1,
-	0x3B2,
-	0x3B7,
-	0x3B8,
-	0x3B9,
-	0x3BA,
-	0x3C1,
-	0x3C2,
-	0x3C5,
-	0x3C6,
-	0x3C9,
-	0x3CA,
-	0x3CE,
-	0x3CF,
-	0x565,
-	0x566,
-	0x574,
-	0x575,
-	0x57E,
-	0x57F,
-	0x1F00,
-	0x1F08,
-	0x1F20,
-	0x1F28,
-	0x1F60,
-	0x1F68,
-	0x1F70,
-	0x1F71,
-	0x1F74,
-	0x1F75,
-	0x1F7C,
-	0x1F7D
-};
-
-static const UV _Perl_Any_Folds_invlist[] = { /* for EBCDIC 037 */
-	263,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x42,
-	0x4A,
-	0x51,
-	0x5A,
-	0x62,
-	0x6A,
-	0x70,
-	0x79,
-	0x80,
-	0x8A,
-	0x8C,
-	0x8F,
-	0x91,
-	0x9A,
-	0x9C,
-	0x9D,
-	0x9E,
-	0x9F,
-	0xA0,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xAC,
-	0xAF,
-	0xC1,
-	0xCA,
-	0xCB,
-	0xD0,
-	0xD1,
-	0xDA,
-	0xDB,
-	0xE0,
-	0xE2,
-	0xEA,
-	0xEB,
-	0xF0,
-	0xFB,
-	0xFF,
-	0x100,
-	0x131,
-	0x132,
-	0x138,
-	0x139,
-	0x18D,
-	0x18E,
-	0x19B,
-	0x19C,
-	0x1AA,
-	0x1AC,
-	0x1BA,
-	0x1BC,
-	0x1BE,
-	0x1BF,
-	0x1C0,
-	0x1C4,
-	0x221,
-	0x222,
-	0x234,
-	0x23A,
-	0x255,
-	0x256,
-	0x258,
-	0x259,
-	0x25A,
-	0x25B,
-	0x25D,
-	0x260,
-	0x262,
-	0x263,
-	0x264,
-	0x265,
-	0x267,
-	0x268,
-	0x26A,
-	0x26B,
-	0x26D,
-	0x26F,
-	0x270,
-	0x271,
-	0x273,
-	0x275,
-	0x276,
-	0x27D,
-	0x27E,
-	0x280,
-	0x281,
-	0x283,
-	0x284,
-	0x287,
-	0x28D,
-	0x292,
-	0x293,
-	0x29E,
-	0x29F,
-	0x2BC,
-	0x2BD,
-	0x2BE,
-	0x2BF,
-	0x300,
-	0x302,
-	0x307,
-	0x309,
-	0x30A,
-	0x30B,
-	0x30C,
-	0x30D,
-	0x313,
-	0x314,
-	0x331,
-	0x332,
-	0x342,
-	0x343,
-	0x345,
-	0x346,
-	0x370,
-	0x374,
-	0x376,
-	0x378,
-	0x37B,
-	0x37E,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x3D2,
-	0x3D5,
-	0x3F6,
-	0x3F7,
-	0x3FC,
-	0x3FD,
-	0x482,
-	0x48A,
-	0x530,
-	0x531,
-	0x557,
-	0x561,
-	0x588,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x1D79,
-	0x1D7A,
-	0x1D7D,
-	0x1D7E,
-	0x1E00,
-	0x1E9C,
-	0x1E9E,
-	0x1E9F,
-	0x1EA0,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FE0,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFD,
-	0x2126,
-	0x2127,
-	0x212A,
-	0x212C,
-	0x2132,
-	0x2133,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2180,
-	0x2183,
-	0x2185,
-	0x24B6,
-	0x24EA,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2C71,
-	0x2C72,
-	0x2C74,
-	0x2C75,
-	0x2C77,
-	0x2C7E,
-	0x2CE4,
-	0x2CEB,
-	0x2CEF,
-	0x2CF2,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0xA640,
-	0xA66E,
-	0xA680,
-	0xA69C,
-	0xA722,
-	0xA730,
-	0xA732,
-	0xA770,
-	0xA779,
-	0xA788,
-	0xA78B,
-	0xA78E,
-	0xA790,
-	0xA794,
-	0xA796,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFF21,
-	0xFF3B,
-	0xFF41,
-	0xFF5B,
-	0x10400,
-	0x10450,
-	0x118A0,
-	0x118E0
-};
-
-static const UV _Perl_Folds_To_Multi_Char_invlist[] = { /* for EBCDIC 037 */
-	59,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x59,
-	0x5A,
-	0x130,
-	0x131,
-	0x149,
-	0x14A,
-	0x1F0,
-	0x1F1,
-	0x390,
-	0x391,
-	0x3B0,
-	0x3B1,
-	0x587,
-	0x588,
-	0x1E96,
-	0x1E9B,
-	0x1E9E,
-	0x1E9F,
-	0x1F50,
-	0x1F51,
-	0x1F52,
-	0x1F53,
-	0x1F54,
-	0x1F55,
-	0x1F56,
-	0x1F57,
-	0x1F80,
-	0x1FB0,
-	0x1FB2,
-	0x1FB5,
-	0x1FB6,
-	0x1FB8,
-	0x1FBC,
-	0x1FBD,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FC8,
-	0x1FCC,
-	0x1FCD,
-	0x1FD2,
-	0x1FD4,
-	0x1FD6,
-	0x1FD8,
-	0x1FE2,
-	0x1FE5,
-	0x1FE6,
-	0x1FE8,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FF8,
-	0x1FFC,
-	0x1FFD,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18
-};
-
-#endif	/* defined(PERL_IN_REGCOMP_C) */
-
 #if defined(PERL_IN_UTF8_C)
 
 static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
-	1287,	/* Number of elements */
+	1337,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -52338,8 +62314,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x840,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x964,
 	0x966,
 	0x970,
@@ -52429,6 +62405,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -52510,7 +62488,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -52559,7 +62537,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD70,
@@ -52704,7 +62682,9 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -52948,7 +62928,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -52962,19 +62942,15 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0xA674,
 	0xA67E,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F2,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA828,
 	0xA840,
@@ -52987,6 +62963,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA92E,
 	0xA930,
@@ -53028,10 +63006,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xABEC,
 	0xABEE,
@@ -53078,7 +63054,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0xFE00,
 	0xFE10,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE33,
 	0xFE35,
 	0xFE4D,
@@ -53183,6 +63159,10 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -53223,6 +63203,10 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11047,
 	0x11066,
@@ -53243,17 +63227,31 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x11177,
 	0x11180,
 	0x111C5,
+	0x111CA,
+	0x111CD,
 	0x111D0,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -53273,6 +63271,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -53291,6 +63291,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x115B6,
 	0x115B8,
 	0x115C1,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x11641,
 	0x11644,
@@ -53301,6 +63303,12 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118EA,
 	0x118FF,
@@ -53308,11 +63316,15 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -53425,6 +63437,18 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -53501,6 +63525,8 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0100,
@@ -53508,7 +63534,7 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC 037 */
 };
 
 static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
-	1117,	/* Number of elements */
+	1151,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -53634,7 +63660,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0x840,
 	0x859,
 	0x8A0,
-	0x8B3,
+	0x8B5,
 	0x904,
 	0x93A,
 	0x93D,
@@ -53705,6 +63731,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0xAD1,
 	0xAE0,
 	0xAE2,
+	0xAF9,
+	0xAFA,
 	0xB05,
 	0xB0D,
 	0xB0F,
@@ -53758,7 +63786,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0xC3D,
 	0xC3E,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC62,
 	0xC85,
@@ -53789,7 +63817,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0xD3E,
 	0xD4E,
 	0xD4F,
-	0xD60,
+	0xD5F,
 	0xD62,
 	0xD7A,
 	0xD80,
@@ -53912,7 +63940,9 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -53957,8 +63987,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0x1975,
 	0x1980,
 	0x19AC,
-	0x19C1,
-	0x19C8,
+	0x19B0,
+	0x19CA,
 	0x1A00,
 	0x1A17,
 	0x1A20,
@@ -54126,7 +64156,7 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -54148,11 +64178,9 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -54169,6 +64197,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA90A,
 	0xA926,
 	0xA930,
@@ -54226,10 +64256,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABE3,
 	0xAC00,
 	0xD7A4,
@@ -54363,6 +64391,10 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -54397,6 +64429,10 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11003,
 	0x11038,
 	0x11083,
@@ -54415,10 +64451,22 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0x111C5,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1122C,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112DF,
 	0x11305,
@@ -54435,6 +64483,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0x1133A,
 	0x1133D,
 	0x1133E,
+	0x11350,
+	0x11351,
 	0x1135D,
 	0x11362,
 	0x11480,
@@ -54445,12 +64495,16 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0x114C8,
 	0x11580,
 	0x115AF,
+	0x115D8,
+	0x115DC,
 	0x11600,
 	0x11630,
 	0x11644,
 	0x11645,
 	0x11680,
 	0x116AB,
+	0x11700,
+	0x1171A,
 	0x118A0,
 	0x118E0,
 	0x118FF,
@@ -54458,11 +64512,15 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -54627,6 +64685,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E
 };
@@ -54635,8 +64695,8 @@ static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC 037 */
 
 #if defined(PERL_IN_PERL_C)
 
-static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
-	2855,	/* Number of elements */
+static const UV _Perl_LB_invlist[] = { /* for EBCDIC 037 */
+	2168,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -54651,636 +64711,84 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0x25,
 	0x26,
 	0x40,
+	0x41,
 	0x42,
 	0x4A,
 	0x4B,
 	0x4C,
 	0x4D,
 	0x4E,
-	0x51,
+	0x4F,
+	0x50,
 	0x5A,
 	0x5B,
+	0x5C,
 	0x5D,
 	0x5E,
+	0x5F,
 	0x60,
 	0x61,
 	0x62,
-	0x6A,
 	0x6B,
 	0x6C,
+	0x6D,
 	0x6F,
 	0x70,
-	0x71,
-	0x79,
 	0x7A,
 	0x7B,
 	0x7D,
 	0x7E,
 	0x7F,
 	0x80,
-	0x81,
 	0x8A,
 	0x8C,
 	0x8F,
+	0x90,
 	0x91,
-	0x9D,
-	0x9E,
 	0x9F,
 	0xA0,
-	0xA1,
-	0xA2,
 	0xAA,
 	0xAC,
-	0xAF,
+	0xB1,
+	0xB3,
 	0xBA,
+	0xBB,
 	0xBC,
+	0xBE,
+	0xBF,
 	0xC0,
 	0xC1,
 	0xCA,
 	0xCB,
 	0xD0,
 	0xD1,
-	0xDA,
-	0xDB,
 	0xE0,
-	0xE2,
-	0xEA,
-	0xEB,
+	0xE1,
 	0xF0,
 	0xFA,
-	0xFB,
 	0xFF,
 	0x100,
-	0x101,
-	0x102,
-	0x103,
-	0x104,
-	0x105,
-	0x106,
-	0x107,
-	0x108,
-	0x109,
-	0x10A,
-	0x10B,
-	0x10C,
-	0x10D,
-	0x10E,
-	0x10F,
-	0x110,
-	0x111,
-	0x112,
-	0x113,
-	0x114,
-	0x115,
-	0x116,
-	0x117,
-	0x118,
-	0x119,
-	0x11A,
-	0x11B,
-	0x11C,
-	0x11D,
-	0x11E,
-	0x11F,
-	0x120,
-	0x121,
-	0x122,
-	0x123,
-	0x124,
-	0x125,
-	0x126,
-	0x127,
-	0x128,
-	0x129,
-	0x12A,
-	0x12B,
-	0x12C,
-	0x12D,
-	0x12E,
-	0x12F,
-	0x130,
-	0x131,
-	0x132,
-	0x133,
-	0x134,
-	0x135,
-	0x136,
-	0x137,
-	0x139,
-	0x13A,
-	0x13B,
-	0x13C,
-	0x13D,
-	0x13E,
-	0x13F,
-	0x140,
-	0x141,
-	0x142,
-	0x143,
-	0x144,
-	0x145,
-	0x146,
-	0x147,
-	0x148,
-	0x14A,
-	0x14B,
-	0x14C,
-	0x14D,
-	0x14E,
-	0x14F,
-	0x150,
-	0x151,
-	0x152,
-	0x153,
-	0x154,
-	0x155,
-	0x156,
-	0x157,
-	0x158,
-	0x159,
-	0x15A,
-	0x15B,
-	0x15C,
-	0x15D,
-	0x15E,
-	0x15F,
-	0x160,
-	0x161,
-	0x162,
-	0x163,
-	0x164,
-	0x165,
-	0x166,
-	0x167,
-	0x168,
-	0x169,
-	0x16A,
-	0x16B,
-	0x16C,
-	0x16D,
-	0x16E,
-	0x16F,
-	0x170,
-	0x171,
-	0x172,
-	0x173,
-	0x174,
-	0x175,
-	0x176,
-	0x177,
-	0x178,
-	0x17A,
-	0x17B,
-	0x17C,
-	0x17D,
-	0x17E,
-	0x181,
-	0x183,
-	0x184,
-	0x185,
-	0x186,
-	0x188,
-	0x189,
-	0x18C,
-	0x18E,
-	0x192,
-	0x193,
-	0x195,
-	0x196,
-	0x199,
-	0x19C,
-	0x19E,
-	0x19F,
-	0x1A1,
-	0x1A2,
-	0x1A3,
-	0x1A4,
-	0x1A5,
-	0x1A6,
-	0x1A8,
-	0x1A9,
-	0x1AA,
-	0x1AC,
-	0x1AD,
-	0x1AE,
-	0x1B0,
-	0x1B1,
-	0x1B4,
-	0x1B5,
-	0x1B6,
-	0x1B7,
-	0x1B9,
-	0x1BB,
-	0x1BC,
-	0x1BD,
-	0x1C0,
-	0x1C4,
-	0x1C6,
-	0x1C7,
-	0x1C9,
-	0x1CA,
-	0x1CC,
-	0x1CD,
-	0x1CE,
-	0x1CF,
-	0x1D0,
-	0x1D1,
-	0x1D2,
-	0x1D3,
-	0x1D4,
-	0x1D5,
-	0x1D6,
-	0x1D7,
-	0x1D8,
-	0x1D9,
-	0x1DA,
-	0x1DB,
-	0x1DC,
-	0x1DE,
-	0x1DF,
-	0x1E0,
-	0x1E1,
-	0x1E2,
-	0x1E3,
-	0x1E4,
-	0x1E5,
-	0x1E6,
-	0x1E7,
-	0x1E8,
-	0x1E9,
-	0x1EA,
-	0x1EB,
-	0x1EC,
-	0x1ED,
-	0x1EE,
-	0x1EF,
-	0x1F1,
-	0x1F3,
-	0x1F4,
-	0x1F5,
-	0x1F6,
-	0x1F9,
-	0x1FA,
-	0x1FB,
-	0x1FC,
-	0x1FD,
-	0x1FE,
-	0x1FF,
-	0x200,
-	0x201,
-	0x202,
-	0x203,
-	0x204,
-	0x205,
-	0x206,
-	0x207,
-	0x208,
-	0x209,
-	0x20A,
-	0x20B,
-	0x20C,
-	0x20D,
-	0x20E,
-	0x20F,
-	0x210,
-	0x211,
-	0x212,
-	0x213,
-	0x214,
-	0x215,
-	0x216,
-	0x217,
-	0x218,
-	0x219,
-	0x21A,
-	0x21B,
-	0x21C,
-	0x21D,
-	0x21E,
-	0x21F,
-	0x220,
-	0x221,
-	0x222,
-	0x223,
-	0x224,
-	0x225,
-	0x226,
-	0x227,
-	0x228,
-	0x229,
-	0x22A,
-	0x22B,
-	0x22C,
-	0x22D,
-	0x22E,
-	0x22F,
-	0x230,
-	0x231,
-	0x232,
-	0x233,
-	0x23A,
-	0x23C,
-	0x23D,
-	0x23F,
-	0x241,
-	0x242,
-	0x243,
-	0x247,
-	0x248,
-	0x249,
-	0x24A,
-	0x24B,
-	0x24C,
-	0x24D,
-	0x24E,
-	0x24F,
-	0x294,
-	0x295,
-	0x2B9,
-	0x2C0,
-	0x2C2,
-	0x2C6,
-	0x2D2,
+	0x2C8,
+	0x2C9,
+	0x2CC,
+	0x2CD,
+	0x2DF,
 	0x2E0,
-	0x2E5,
-	0x2EC,
-	0x2ED,
-	0x2EE,
-	0x2EF,
 	0x300,
+	0x34F,
+	0x350,
+	0x35C,
+	0x363,
 	0x370,
-	0x371,
-	0x372,
-	0x373,
-	0x374,
-	0x375,
-	0x376,
-	0x377,
-	0x378,
-	0x37A,
 	0x37E,
 	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x390,
-	0x391,
-	0x3A2,
-	0x3A3,
-	0x3AC,
-	0x3CF,
-	0x3D0,
-	0x3D2,
-	0x3D5,
-	0x3D8,
-	0x3D9,
-	0x3DA,
-	0x3DB,
-	0x3DC,
-	0x3DD,
-	0x3DE,
-	0x3DF,
-	0x3E0,
-	0x3E1,
-	0x3E2,
-	0x3E3,
-	0x3E4,
-	0x3E5,
-	0x3E6,
-	0x3E7,
-	0x3E8,
-	0x3E9,
-	0x3EA,
-	0x3EB,
-	0x3EC,
-	0x3ED,
-	0x3EE,
-	0x3EF,
-	0x3F4,
-	0x3F5,
-	0x3F6,
-	0x3F7,
-	0x3F8,
-	0x3F9,
-	0x3FB,
-	0x3FD,
-	0x430,
-	0x460,
-	0x461,
-	0x462,
-	0x463,
-	0x464,
-	0x465,
-	0x466,
-	0x467,
-	0x468,
-	0x469,
-	0x46A,
-	0x46B,
-	0x46C,
-	0x46D,
-	0x46E,
-	0x46F,
-	0x470,
-	0x471,
-	0x472,
-	0x473,
-	0x474,
-	0x475,
-	0x476,
-	0x477,
-	0x478,
-	0x479,
-	0x47A,
-	0x47B,
-	0x47C,
-	0x47D,
-	0x47E,
-	0x47F,
-	0x480,
-	0x481,
-	0x482,
 	0x483,
 	0x48A,
-	0x48B,
-	0x48C,
-	0x48D,
-	0x48E,
-	0x48F,
-	0x490,
-	0x491,
-	0x492,
-	0x493,
-	0x494,
-	0x495,
-	0x496,
-	0x497,
-	0x498,
-	0x499,
-	0x49A,
-	0x49B,
-	0x49C,
-	0x49D,
-	0x49E,
-	0x49F,
-	0x4A0,
-	0x4A1,
-	0x4A2,
-	0x4A3,
-	0x4A4,
-	0x4A5,
-	0x4A6,
-	0x4A7,
-	0x4A8,
-	0x4A9,
-	0x4AA,
-	0x4AB,
-	0x4AC,
-	0x4AD,
-	0x4AE,
-	0x4AF,
-	0x4B0,
-	0x4B1,
-	0x4B2,
-	0x4B3,
-	0x4B4,
-	0x4B5,
-	0x4B6,
-	0x4B7,
-	0x4B8,
-	0x4B9,
-	0x4BA,
-	0x4BB,
-	0x4BC,
-	0x4BD,
-	0x4BE,
-	0x4BF,
-	0x4C0,
-	0x4C2,
-	0x4C3,
-	0x4C4,
-	0x4C5,
-	0x4C6,
-	0x4C7,
-	0x4C8,
-	0x4C9,
-	0x4CA,
-	0x4CB,
-	0x4CC,
-	0x4CD,
-	0x4CE,
-	0x4D0,
-	0x4D1,
-	0x4D2,
-	0x4D3,
-	0x4D4,
-	0x4D5,
-	0x4D6,
-	0x4D7,
-	0x4D8,
-	0x4D9,
-	0x4DA,
-	0x4DB,
-	0x4DC,
-	0x4DD,
-	0x4DE,
-	0x4DF,
-	0x4E0,
-	0x4E1,
-	0x4E2,
-	0x4E3,
-	0x4E4,
-	0x4E5,
-	0x4E6,
-	0x4E7,
-	0x4E8,
-	0x4E9,
-	0x4EA,
-	0x4EB,
-	0x4EC,
-	0x4ED,
-	0x4EE,
-	0x4EF,
-	0x4F0,
-	0x4F1,
-	0x4F2,
-	0x4F3,
-	0x4F4,
-	0x4F5,
-	0x4F6,
-	0x4F7,
-	0x4F8,
-	0x4F9,
-	0x4FA,
-	0x4FB,
-	0x4FC,
-	0x4FD,
-	0x4FE,
-	0x4FF,
-	0x500,
-	0x501,
-	0x502,
-	0x503,
-	0x504,
-	0x505,
-	0x506,
-	0x507,
-	0x508,
-	0x509,
-	0x50A,
-	0x50B,
-	0x50C,
-	0x50D,
-	0x50E,
-	0x50F,
-	0x510,
-	0x511,
-	0x512,
-	0x513,
-	0x514,
-	0x515,
-	0x516,
-	0x517,
-	0x518,
-	0x519,
-	0x51A,
-	0x51B,
-	0x51C,
-	0x51D,
-	0x51E,
-	0x51F,
-	0x520,
-	0x521,
-	0x522,
-	0x523,
-	0x524,
-	0x525,
-	0x526,
-	0x527,
-	0x528,
-	0x529,
-	0x52A,
-	0x52B,
-	0x52C,
-	0x52D,
-	0x52E,
-	0x52F,
-	0x530,
-	0x531,
-	0x557,
-	0x559,
-	0x55A,
-	0x55D,
-	0x55E,
-	0x561,
-	0x588,
 	0x589,
 	0x58A,
+	0x58B,
+	0x58F,
+	0x590,
 	0x591,
 	0x5BE,
 	0x5BF,
@@ -55294,30 +64802,27 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0x5D0,
 	0x5EB,
 	0x5F0,
-	0x5F4,
-	0x600,
-	0x606,
+	0x5F3,
+	0x609,
 	0x60C,
 	0x60E,
 	0x610,
 	0x61B,
 	0x61C,
 	0x61D,
-	0x61F,
+	0x61E,
 	0x620,
 	0x64B,
 	0x660,
 	0x66A,
 	0x66B,
 	0x66D,
-	0x66E,
 	0x670,
 	0x671,
 	0x6D4,
 	0x6D5,
 	0x6D6,
 	0x6DD,
-	0x6DE,
 	0x6DF,
 	0x6E5,
 	0x6E7,
@@ -55326,30 +64831,19 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0x6EE,
 	0x6F0,
 	0x6FA,
-	0x6FD,
-	0x6FF,
-	0x700,
-	0x703,
-	0x70F,
-	0x710,
 	0x711,
 	0x712,
 	0x730,
 	0x74B,
-	0x74D,
 	0x7A6,
 	0x7B1,
-	0x7B2,
 	0x7C0,
 	0x7CA,
 	0x7EB,
 	0x7F4,
-	0x7F6,
 	0x7F8,
 	0x7F9,
 	0x7FA,
-	0x7FB,
-	0x800,
 	0x816,
 	0x81A,
 	0x81B,
@@ -55358,12 +64852,9 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0x828,
 	0x829,
 	0x82E,
-	0x840,
 	0x859,
 	0x85C,
-	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8E3,
 	0x904,
 	0x93A,
 	0x93D,
@@ -55375,21 +64866,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0x964,
 	0x966,
 	0x970,
-	0x971,
 	0x981,
 	0x984,
-	0x985,
-	0x98D,
-	0x98F,
-	0x991,
-	0x993,
-	0x9A9,
-	0x9AA,
-	0x9B1,
-	0x9B2,
-	0x9B3,
-	0x9B6,
-	0x9BA,
 	0x9BC,
 	0x9BD,
 	0x9BE,
@@ -55398,33 +64876,20 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0x9C9,
 	0x9CB,
 	0x9CE,
-	0x9CF,
 	0x9D7,
 	0x9D8,
-	0x9DC,
-	0x9DE,
-	0x9DF,
 	0x9E2,
 	0x9E4,
 	0x9E6,
 	0x9F0,
 	0x9F2,
+	0x9F4,
+	0x9F9,
+	0x9FA,
+	0x9FB,
+	0x9FC,
 	0xA01,
 	0xA04,
-	0xA05,
-	0xA0B,
-	0xA0F,
-	0xA11,
-	0xA13,
-	0xA29,
-	0xA2A,
-	0xA31,
-	0xA32,
-	0xA34,
-	0xA35,
-	0xA37,
-	0xA38,
-	0xA3A,
 	0xA3C,
 	0xA3D,
 	0xA3E,
@@ -55435,10 +64900,6 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xA4E,
 	0xA51,
 	0xA52,
-	0xA59,
-	0xA5D,
-	0xA5E,
-	0xA5F,
 	0xA66,
 	0xA70,
 	0xA72,
@@ -55446,18 +64907,6 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xA76,
 	0xA81,
 	0xA84,
-	0xA85,
-	0xA8E,
-	0xA8F,
-	0xA92,
-	0xA93,
-	0xAA9,
-	0xAAA,
-	0xAB1,
-	0xAB2,
-	0xAB4,
-	0xAB5,
-	0xABA,
 	0xABC,
 	0xABD,
 	0xABE,
@@ -55466,27 +64915,14 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xACA,
 	0xACB,
 	0xACE,
-	0xAD0,
-	0xAD1,
-	0xAE0,
 	0xAE2,
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF1,
+	0xAF2,
 	0xB01,
 	0xB04,
-	0xB05,
-	0xB0D,
-	0xB0F,
-	0xB11,
-	0xB13,
-	0xB29,
-	0xB2A,
-	0xB31,
-	0xB32,
-	0xB34,
-	0xB35,
-	0xB3A,
 	0xB3C,
 	0xB3D,
 	0xB3E,
@@ -55497,59 +64933,26 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xB4E,
 	0xB56,
 	0xB58,
-	0xB5C,
-	0xB5E,
-	0xB5F,
 	0xB62,
 	0xB64,
 	0xB66,
 	0xB70,
-	0xB71,
-	0xB72,
 	0xB82,
 	0xB83,
-	0xB84,
-	0xB85,
-	0xB8B,
-	0xB8E,
-	0xB91,
-	0xB92,
-	0xB96,
-	0xB99,
-	0xB9B,
-	0xB9C,
-	0xB9D,
-	0xB9E,
-	0xBA0,
-	0xBA3,
-	0xBA5,
-	0xBA8,
-	0xBAB,
-	0xBAE,
-	0xBBA,
 	0xBBE,
 	0xBC3,
 	0xBC6,
 	0xBC9,
 	0xBCA,
 	0xBCE,
-	0xBD0,
-	0xBD1,
 	0xBD7,
 	0xBD8,
 	0xBE6,
 	0xBF0,
+	0xBF9,
+	0xBFA,
 	0xC00,
 	0xC04,
-	0xC05,
-	0xC0D,
-	0xC0E,
-	0xC11,
-	0xC12,
-	0xC29,
-	0xC2A,
-	0xC3A,
-	0xC3D,
 	0xC3E,
 	0xC45,
 	0xC46,
@@ -55558,25 +64961,12 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xC4E,
 	0xC55,
 	0xC57,
-	0xC58,
-	0xC5A,
-	0xC60,
 	0xC62,
 	0xC64,
 	0xC66,
 	0xC70,
 	0xC81,
 	0xC84,
-	0xC85,
-	0xC8D,
-	0xC8E,
-	0xC91,
-	0xC92,
-	0xCA9,
-	0xCAA,
-	0xCB4,
-	0xCB5,
-	0xCBA,
 	0xCBC,
 	0xCBD,
 	0xCBE,
@@ -55587,52 +64977,28 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xCCE,
 	0xCD5,
 	0xCD7,
-	0xCDE,
-	0xCDF,
-	0xCE0,
 	0xCE2,
 	0xCE4,
 	0xCE6,
 	0xCF0,
-	0xCF1,
-	0xCF3,
 	0xD01,
 	0xD04,
-	0xD05,
-	0xD0D,
-	0xD0E,
-	0xD11,
-	0xD12,
-	0xD3B,
-	0xD3D,
 	0xD3E,
 	0xD45,
 	0xD46,
 	0xD49,
 	0xD4A,
 	0xD4E,
-	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
 	0xD62,
 	0xD64,
 	0xD66,
 	0xD70,
+	0xD79,
 	0xD7A,
-	0xD80,
 	0xD82,
 	0xD84,
-	0xD85,
-	0xD97,
-	0xD9A,
-	0xDB2,
-	0xDB3,
-	0xDBC,
-	0xDBD,
-	0xDBE,
-	0xDC0,
-	0xDC7,
 	0xDCA,
 	0xDCB,
 	0xDCF,
@@ -55645,74 +65011,58 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xDF0,
 	0xDF2,
 	0xDF4,
-	0xE01,
 	0xE31,
 	0xE32,
 	0xE34,
 	0xE3B,
+	0xE3F,
 	0xE40,
 	0xE47,
 	0xE4F,
 	0xE50,
 	0xE5A,
-	0xE81,
-	0xE83,
-	0xE84,
-	0xE85,
-	0xE87,
-	0xE89,
-	0xE8A,
-	0xE8B,
-	0xE8D,
-	0xE8E,
-	0xE94,
-	0xE98,
-	0xE99,
-	0xEA0,
-	0xEA1,
-	0xEA4,
-	0xEA5,
-	0xEA6,
-	0xEA7,
-	0xEA8,
-	0xEAA,
-	0xEAC,
-	0xEAD,
+	0xE5C,
 	0xEB1,
 	0xEB2,
 	0xEB4,
 	0xEBA,
 	0xEBB,
 	0xEBD,
-	0xEBE,
-	0xEC0,
-	0xEC5,
-	0xEC6,
-	0xEC7,
 	0xEC8,
 	0xECE,
 	0xED0,
 	0xEDA,
-	0xEDC,
-	0xEE0,
-	0xF00,
 	0xF01,
+	0xF05,
+	0xF06,
+	0xF08,
+	0xF09,
+	0xF0B,
+	0xF0C,
+	0xF0D,
+	0xF12,
+	0xF13,
+	0xF14,
+	0xF15,
 	0xF18,
 	0xF1A,
 	0xF20,
 	0xF2A,
+	0xF34,
 	0xF35,
 	0xF36,
 	0xF37,
 	0xF38,
 	0xF39,
 	0xF3A,
+	0xF3B,
+	0xF3C,
+	0xF3D,
 	0xF3E,
 	0xF40,
-	0xF48,
-	0xF49,
-	0xF6D,
 	0xF71,
+	0xF7F,
+	0xF80,
 	0xF85,
 	0xF86,
 	0xF88,
@@ -55720,15 +65070,21 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xF98,
 	0xF99,
 	0xFBD,
+	0xFBE,
+	0xFC0,
 	0xFC6,
 	0xFC7,
-	0x1000,
+	0xFD0,
+	0xFD2,
+	0xFD3,
+	0xFD4,
+	0xFD9,
+	0xFDB,
 	0x102B,
 	0x103F,
 	0x1040,
 	0x104A,
 	0x104C,
-	0x1050,
 	0x1056,
 	0x105A,
 	0x105E,
@@ -55745,117 +65101,58 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0x1090,
 	0x109A,
 	0x109E,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x10D0,
-	0x10FB,
-	0x10FC,
-	0x1249,
-	0x124A,
-	0x124E,
-	0x1250,
-	0x1257,
-	0x1258,
-	0x1259,
-	0x125A,
-	0x125E,
-	0x1260,
-	0x1289,
-	0x128A,
-	0x128E,
-	0x1290,
-	0x12B1,
-	0x12B2,
-	0x12B6,
-	0x12B8,
-	0x12BF,
-	0x12C0,
-	0x12C1,
-	0x12C2,
-	0x12C6,
-	0x12C8,
-	0x12D7,
-	0x12D8,
-	0x1311,
-	0x1312,
-	0x1316,
-	0x1318,
-	0x135B,
+	0x1100,
+	0x1160,
+	0x11A8,
+	0x1200,
 	0x135D,
 	0x1360,
+	0x1361,
 	0x1362,
-	0x1363,
-	0x1367,
-	0x1369,
-	0x1380,
-	0x1390,
-	0x13A0,
-	0x13F5,
+	0x1400,
 	0x1401,
-	0x166D,
-	0x166E,
-	0x166F,
 	0x1680,
 	0x1681,
 	0x169B,
+	0x169C,
 	0x169D,
-	0x16A0,
 	0x16EB,
 	0x16EE,
-	0x16F9,
-	0x1700,
-	0x170D,
-	0x170E,
 	0x1712,
 	0x1715,
-	0x1720,
 	0x1732,
 	0x1735,
 	0x1737,
-	0x1740,
 	0x1752,
 	0x1754,
-	0x1760,
-	0x176D,
-	0x176E,
-	0x1771,
 	0x1772,
 	0x1774,
-	0x1780,
 	0x17B4,
 	0x17D4,
+	0x17D6,
 	0x17D7,
 	0x17D8,
+	0x17D9,
+	0x17DA,
+	0x17DB,
 	0x17DC,
 	0x17DD,
 	0x17DE,
 	0x17E0,
 	0x17EA,
 	0x1802,
-	0x1803,
 	0x1804,
+	0x1806,
+	0x1807,
 	0x1808,
-	0x1809,
 	0x180A,
 	0x180B,
 	0x180E,
 	0x180F,
 	0x1810,
 	0x181A,
-	0x1820,
-	0x1878,
-	0x1880,
 	0x18A9,
 	0x18AA,
-	0x18AB,
-	0x18B0,
-	0x18F6,
-	0x1900,
-	0x191F,
 	0x1920,
 	0x192C,
 	0x1930,
@@ -55863,21 +65160,10 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0x1944,
 	0x1946,
 	0x1950,
-	0x196E,
-	0x1970,
-	0x1975,
-	0x1980,
-	0x19AC,
-	0x19B0,
-	0x19C1,
-	0x19C8,
-	0x19CA,
 	0x19D0,
 	0x19DA,
-	0x1A00,
 	0x1A17,
 	0x1A1C,
-	0x1A20,
 	0x1A55,
 	0x1A5F,
 	0x1A60,
@@ -55887,21 +65173,17 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0x1A8A,
 	0x1A90,
 	0x1A9A,
-	0x1AA7,
-	0x1AA8,
-	0x1AAC,
 	0x1AB0,
 	0x1ABF,
 	0x1B00,
 	0x1B05,
 	0x1B34,
 	0x1B45,
-	0x1B4C,
 	0x1B50,
 	0x1B5A,
 	0x1B5C,
-	0x1B5E,
-	0x1B60,
+	0x1B5D,
+	0x1B61,
 	0x1B6B,
 	0x1B74,
 	0x1B80,
@@ -55912,14 +65194,11 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0x1BBA,
 	0x1BE6,
 	0x1BF4,
-	0x1C00,
 	0x1C24,
 	0x1C38,
 	0x1C3B,
-	0x1C3D,
 	0x1C40,
 	0x1C4A,
-	0x1C4D,
 	0x1C50,
 	0x1C5A,
 	0x1C7E,
@@ -55932,863 +65211,374 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0x1CEE,
 	0x1CF2,
 	0x1CF5,
-	0x1CF7,
 	0x1CF8,
 	0x1CFA,
-	0x1D00,
 	0x1DC0,
 	0x1DF6,
 	0x1DFC,
 	0x1E00,
-	0x1E01,
-	0x1E02,
-	0x1E03,
-	0x1E04,
-	0x1E05,
-	0x1E06,
-	0x1E07,
-	0x1E08,
-	0x1E09,
-	0x1E0A,
-	0x1E0B,
-	0x1E0C,
-	0x1E0D,
-	0x1E0E,
-	0x1E0F,
-	0x1E10,
-	0x1E11,
-	0x1E12,
-	0x1E13,
-	0x1E14,
-	0x1E15,
-	0x1E16,
-	0x1E17,
-	0x1E18,
-	0x1E19,
-	0x1E1A,
-	0x1E1B,
-	0x1E1C,
-	0x1E1D,
-	0x1E1E,
-	0x1E1F,
-	0x1E20,
-	0x1E21,
-	0x1E22,
-	0x1E23,
-	0x1E24,
-	0x1E25,
-	0x1E26,
-	0x1E27,
-	0x1E28,
-	0x1E29,
-	0x1E2A,
-	0x1E2B,
-	0x1E2C,
-	0x1E2D,
-	0x1E2E,
-	0x1E2F,
-	0x1E30,
-	0x1E31,
-	0x1E32,
-	0x1E33,
-	0x1E34,
-	0x1E35,
-	0x1E36,
-	0x1E37,
-	0x1E38,
-	0x1E39,
-	0x1E3A,
-	0x1E3B,
-	0x1E3C,
-	0x1E3D,
-	0x1E3E,
-	0x1E3F,
-	0x1E40,
-	0x1E41,
-	0x1E42,
-	0x1E43,
-	0x1E44,
-	0x1E45,
-	0x1E46,
-	0x1E47,
-	0x1E48,
-	0x1E49,
-	0x1E4A,
-	0x1E4B,
-	0x1E4C,
-	0x1E4D,
-	0x1E4E,
-	0x1E4F,
-	0x1E50,
-	0x1E51,
-	0x1E52,
-	0x1E53,
-	0x1E54,
-	0x1E55,
-	0x1E56,
-	0x1E57,
-	0x1E58,
-	0x1E59,
-	0x1E5A,
-	0x1E5B,
-	0x1E5C,
-	0x1E5D,
-	0x1E5E,
-	0x1E5F,
-	0x1E60,
-	0x1E61,
-	0x1E62,
-	0x1E63,
-	0x1E64,
-	0x1E65,
-	0x1E66,
-	0x1E67,
-	0x1E68,
-	0x1E69,
-	0x1E6A,
-	0x1E6B,
-	0x1E6C,
-	0x1E6D,
-	0x1E6E,
-	0x1E6F,
-	0x1E70,
-	0x1E71,
-	0x1E72,
-	0x1E73,
-	0x1E74,
-	0x1E75,
-	0x1E76,
-	0x1E77,
-	0x1E78,
-	0x1E79,
-	0x1E7A,
-	0x1E7B,
-	0x1E7C,
-	0x1E7D,
-	0x1E7E,
-	0x1E7F,
-	0x1E80,
-	0x1E81,
-	0x1E82,
-	0x1E83,
-	0x1E84,
-	0x1E85,
-	0x1E86,
-	0x1E87,
-	0x1E88,
-	0x1E89,
-	0x1E8A,
-	0x1E8B,
-	0x1E8C,
-	0x1E8D,
-	0x1E8E,
-	0x1E8F,
-	0x1E90,
-	0x1E91,
-	0x1E92,
-	0x1E93,
-	0x1E94,
-	0x1E95,
-	0x1E9E,
-	0x1E9F,
-	0x1EA0,
-	0x1EA1,
-	0x1EA2,
-	0x1EA3,
-	0x1EA4,
-	0x1EA5,
-	0x1EA6,
-	0x1EA7,
-	0x1EA8,
-	0x1EA9,
-	0x1EAA,
-	0x1EAB,
-	0x1EAC,
-	0x1EAD,
-	0x1EAE,
-	0x1EAF,
-	0x1EB0,
-	0x1EB1,
-	0x1EB2,
-	0x1EB3,
-	0x1EB4,
-	0x1EB5,
-	0x1EB6,
-	0x1EB7,
-	0x1EB8,
-	0x1EB9,
-	0x1EBA,
-	0x1EBB,
-	0x1EBC,
-	0x1EBD,
-	0x1EBE,
-	0x1EBF,
-	0x1EC0,
-	0x1EC1,
-	0x1EC2,
-	0x1EC3,
-	0x1EC4,
-	0x1EC5,
-	0x1EC6,
-	0x1EC7,
-	0x1EC8,
-	0x1EC9,
-	0x1ECA,
-	0x1ECB,
-	0x1ECC,
-	0x1ECD,
-	0x1ECE,
-	0x1ECF,
-	0x1ED0,
-	0x1ED1,
-	0x1ED2,
-	0x1ED3,
-	0x1ED4,
-	0x1ED5,
-	0x1ED6,
-	0x1ED7,
-	0x1ED8,
-	0x1ED9,
-	0x1EDA,
-	0x1EDB,
-	0x1EDC,
-	0x1EDD,
-	0x1EDE,
-	0x1EDF,
-	0x1EE0,
-	0x1EE1,
-	0x1EE2,
-	0x1EE3,
-	0x1EE4,
-	0x1EE5,
-	0x1EE6,
-	0x1EE7,
-	0x1EE8,
-	0x1EE9,
-	0x1EEA,
-	0x1EEB,
-	0x1EEC,
-	0x1EED,
-	0x1EEE,
-	0x1EEF,
-	0x1EF0,
-	0x1EF1,
-	0x1EF2,
-	0x1EF3,
-	0x1EF4,
-	0x1EF5,
-	0x1EF6,
-	0x1EF7,
-	0x1EF8,
-	0x1EF9,
-	0x1EFA,
-	0x1EFB,
-	0x1EFC,
-	0x1EFD,
-	0x1EFE,
-	0x1EFF,
-	0x1F08,
-	0x1F10,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F28,
-	0x1F30,
-	0x1F38,
-	0x1F40,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F60,
-	0x1F68,
-	0x1F70,
-	0x1F7E,
-	0x1F80,
-	0x1F88,
-	0x1F90,
-	0x1F98,
-	0x1FA0,
-	0x1FA8,
-	0x1FB0,
-	0x1FB5,
-	0x1FB6,
-	0x1FB8,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FC8,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FD8,
-	0x1FDC,
-	0x1FE0,
-	0x1FE8,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FF8,
 	0x1FFD,
+	0x1FFE,
 	0x2000,
+	0x2007,
+	0x2008,
 	0x200B,
 	0x200C,
-	0x200E,
 	0x2010,
-	0x2013,
+	0x2011,
+	0x2012,
+	0x2014,
 	0x2015,
 	0x2018,
+	0x201A,
+	0x201B,
+	0x201E,
+	0x201F,
 	0x2020,
 	0x2024,
-	0x2025,
+	0x2027,
 	0x2028,
 	0x202A,
 	0x202F,
 	0x2030,
+	0x2038,
 	0x2039,
 	0x203B,
 	0x203C,
 	0x203E,
+	0x2044,
 	0x2045,
+	0x2046,
 	0x2047,
 	0x204A,
-	0x205F,
+	0x2056,
+	0x2057,
+	0x2058,
+	0x205C,
+	0x205D,
 	0x2060,
-	0x2065,
+	0x2061,
 	0x2066,
 	0x2070,
-	0x2071,
-	0x2072,
 	0x207D,
+	0x207E,
 	0x207F,
-	0x2080,
 	0x208D,
+	0x208E,
 	0x208F,
-	0x2090,
-	0x209D,
+	0x20A0,
+	0x20A7,
+	0x20A8,
+	0x20B6,
+	0x20B7,
+	0x20BB,
+	0x20BC,
+	0x20BE,
+	0x20BF,
 	0x20D0,
 	0x20F1,
-	0x2102,
 	0x2103,
-	0x2107,
-	0x2108,
+	0x2104,
+	0x2109,
 	0x210A,
-	0x210B,
-	0x210E,
-	0x2110,
-	0x2113,
-	0x2114,
-	0x2115,
 	0x2116,
-	0x2119,
-	0x211E,
-	0x2124,
-	0x2125,
-	0x2126,
-	0x2127,
-	0x2128,
-	0x2129,
-	0x212A,
-	0x212E,
-	0x212F,
-	0x2130,
-	0x2134,
-	0x2135,
-	0x2139,
-	0x213A,
-	0x213C,
-	0x213E,
-	0x2140,
-	0x2145,
-	0x2146,
-	0x214A,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2170,
-	0x2180,
-	0x2183,
-	0x2184,
-	0x2185,
-	0x2189,
+	0x2117,
+	0x2212,
+	0x2214,
+	0x22EF,
+	0x22F0,
 	0x2308,
+	0x2309,
+	0x230A,
+	0x230B,
 	0x230C,
+	0x231A,
+	0x231C,
 	0x2329,
+	0x232A,
 	0x232B,
-	0x24B6,
-	0x24D0,
-	0x24EA,
+	0x23F0,
+	0x23F4,
+	0x2600,
+	0x2604,
+	0x2614,
+	0x2616,
+	0x2618,
+	0x2619,
+	0x261A,
+	0x2620,
+	0x2639,
+	0x263C,
+	0x2668,
+	0x2669,
+	0x267F,
+	0x2680,
+	0x26BD,
+	0x26C9,
+	0x26CD,
+	0x26CE,
+	0x26CF,
+	0x26D2,
+	0x26D3,
+	0x26D5,
+	0x26D8,
+	0x26DA,
+	0x26DC,
+	0x26DD,
+	0x26DF,
+	0x26E2,
+	0x26EA,
+	0x26EB,
+	0x26F1,
+	0x26F6,
+	0x26F7,
+	0x26FB,
+	0x26FD,
+	0x2705,
+	0x2708,
+	0x270E,
 	0x275B,
 	0x2761,
+	0x2762,
+	0x2764,
 	0x2768,
+	0x2769,
+	0x276A,
+	0x276B,
+	0x276C,
+	0x276D,
+	0x276E,
+	0x276F,
+	0x2770,
+	0x2771,
+	0x2772,
+	0x2773,
+	0x2774,
+	0x2775,
 	0x2776,
 	0x27C5,
+	0x27C6,
 	0x27C7,
 	0x27E6,
+	0x27E7,
+	0x27E8,
+	0x27E9,
+	0x27EA,
+	0x27EB,
+	0x27EC,
+	0x27ED,
+	0x27EE,
+	0x27EF,
 	0x27F0,
 	0x2983,
+	0x2984,
+	0x2985,
+	0x2986,
+	0x2987,
+	0x2988,
+	0x2989,
+	0x298A,
+	0x298B,
+	0x298C,
+	0x298D,
+	0x298E,
+	0x298F,
+	0x2990,
+	0x2991,
+	0x2992,
+	0x2993,
+	0x2994,
+	0x2995,
+	0x2996,
+	0x2997,
+	0x2998,
 	0x2999,
 	0x29D8,
+	0x29D9,
+	0x29DA,
+	0x29DB,
 	0x29DC,
 	0x29FC,
+	0x29FD,
 	0x29FE,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2C61,
-	0x2C62,
-	0x2C65,
-	0x2C67,
-	0x2C68,
-	0x2C69,
-	0x2C6A,
-	0x2C6B,
-	0x2C6C,
-	0x2C6D,
-	0x2C71,
-	0x2C72,
-	0x2C73,
-	0x2C75,
-	0x2C76,
-	0x2C7E,
-	0x2C81,
-	0x2C82,
-	0x2C83,
-	0x2C84,
-	0x2C85,
-	0x2C86,
-	0x2C87,
-	0x2C88,
-	0x2C89,
-	0x2C8A,
-	0x2C8B,
-	0x2C8C,
-	0x2C8D,
-	0x2C8E,
-	0x2C8F,
-	0x2C90,
-	0x2C91,
-	0x2C92,
-	0x2C93,
-	0x2C94,
-	0x2C95,
-	0x2C96,
-	0x2C97,
-	0x2C98,
-	0x2C99,
-	0x2C9A,
-	0x2C9B,
-	0x2C9C,
-	0x2C9D,
-	0x2C9E,
-	0x2C9F,
-	0x2CA0,
-	0x2CA1,
-	0x2CA2,
-	0x2CA3,
-	0x2CA4,
-	0x2CA5,
-	0x2CA6,
-	0x2CA7,
-	0x2CA8,
-	0x2CA9,
-	0x2CAA,
-	0x2CAB,
-	0x2CAC,
-	0x2CAD,
-	0x2CAE,
-	0x2CAF,
-	0x2CB0,
-	0x2CB1,
-	0x2CB2,
-	0x2CB3,
-	0x2CB4,
-	0x2CB5,
-	0x2CB6,
-	0x2CB7,
-	0x2CB8,
-	0x2CB9,
-	0x2CBA,
-	0x2CBB,
-	0x2CBC,
-	0x2CBD,
-	0x2CBE,
-	0x2CBF,
-	0x2CC0,
-	0x2CC1,
-	0x2CC2,
-	0x2CC3,
-	0x2CC4,
-	0x2CC5,
-	0x2CC6,
-	0x2CC7,
-	0x2CC8,
-	0x2CC9,
-	0x2CCA,
-	0x2CCB,
-	0x2CCC,
-	0x2CCD,
-	0x2CCE,
-	0x2CCF,
-	0x2CD0,
-	0x2CD1,
-	0x2CD2,
-	0x2CD3,
-	0x2CD4,
-	0x2CD5,
-	0x2CD6,
-	0x2CD7,
-	0x2CD8,
-	0x2CD9,
-	0x2CDA,
-	0x2CDB,
-	0x2CDC,
-	0x2CDD,
-	0x2CDE,
-	0x2CDF,
-	0x2CE0,
-	0x2CE1,
-	0x2CE2,
-	0x2CE3,
-	0x2CE5,
-	0x2CEB,
-	0x2CEC,
-	0x2CED,
-	0x2CEE,
 	0x2CEF,
 	0x2CF2,
-	0x2CF3,
-	0x2CF4,
+	0x2CF9,
+	0x2CFA,
+	0x2CFD,
+	0x2CFE,
+	0x2CFF,
 	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0x2D30,
-	0x2D68,
-	0x2D6F,
 	0x2D70,
+	0x2D71,
 	0x2D7F,
 	0x2D80,
-	0x2D97,
-	0x2DA0,
-	0x2DA7,
-	0x2DA8,
-	0x2DAF,
-	0x2DB0,
-	0x2DB7,
-	0x2DB8,
-	0x2DBF,
-	0x2DC0,
-	0x2DC7,
-	0x2DC8,
-	0x2DCF,
-	0x2DD0,
-	0x2DD7,
-	0x2DD8,
-	0x2DDF,
 	0x2DE0,
 	0x2E00,
 	0x2E0E,
+	0x2E16,
+	0x2E17,
+	0x2E18,
+	0x2E19,
+	0x2E1A,
 	0x2E1C,
 	0x2E1E,
 	0x2E20,
+	0x2E22,
+	0x2E23,
+	0x2E24,
+	0x2E25,
+	0x2E26,
+	0x2E27,
+	0x2E28,
+	0x2E29,
 	0x2E2A,
 	0x2E2E,
 	0x2E2F,
 	0x2E30,
+	0x2E32,
+	0x2E33,
+	0x2E35,
+	0x2E3A,
 	0x2E3C,
-	0x2E3D,
+	0x2E3F,
+	0x2E40,
 	0x2E42,
 	0x2E43,
+	0x2E80,
+	0x2E9A,
+	0x2E9B,
+	0x2EF4,
+	0x2F00,
+	0x2FD6,
+	0x2FF0,
+	0x2FFC,
 	0x3000,
 	0x3001,
-	0x3002,
 	0x3003,
 	0x3005,
+	0x3006,
 	0x3008,
+	0x3009,
+	0x300A,
+	0x300B,
+	0x300C,
+	0x300D,
+	0x300E,
+	0x300F,
+	0x3010,
+	0x3011,
 	0x3012,
 	0x3014,
+	0x3015,
+	0x3016,
+	0x3017,
+	0x3018,
+	0x3019,
+	0x301A,
+	0x301B,
 	0x301C,
 	0x301D,
+	0x301E,
 	0x3020,
-	0x3021,
 	0x302A,
 	0x3030,
-	0x3031,
+	0x3035,
 	0x3036,
-	0x3038,
+	0x303B,
 	0x303D,
+	0x3040,
 	0x3041,
+	0x3042,
+	0x3043,
+	0x3044,
+	0x3045,
+	0x3046,
+	0x3047,
+	0x3048,
+	0x3049,
+	0x304A,
+	0x3063,
+	0x3064,
+	0x3083,
+	0x3084,
+	0x3085,
+	0x3086,
+	0x3087,
+	0x3088,
+	0x308E,
+	0x308F,
+	0x3095,
 	0x3097,
 	0x3099,
 	0x309B,
-	0x309D,
+	0x309F,
 	0x30A0,
-	0x30A1,
+	0x30A2,
+	0x30A3,
+	0x30A4,
+	0x30A5,
+	0x30A6,
+	0x30A7,
+	0x30A8,
+	0x30A9,
+	0x30AA,
+	0x30C3,
+	0x30C4,
+	0x30E3,
+	0x30E4,
+	0x30E5,
+	0x30E6,
+	0x30E7,
+	0x30E8,
+	0x30EE,
+	0x30EF,
+	0x30F5,
+	0x30F7,
 	0x30FB,
-	0x30FC,
+	0x30FF,
 	0x3100,
 	0x3105,
 	0x312E,
 	0x3131,
 	0x318F,
-	0x31A0,
+	0x3190,
 	0x31BB,
+	0x31C0,
+	0x31E4,
 	0x31F0,
 	0x3200,
-	0x3400,
-	0x4DB6,
+	0x321F,
+	0x3220,
+	0x3248,
+	0x3250,
+	0x32FF,
+	0x3300,
+	0x4DC0,
 	0x4E00,
-	0x9FCD,
-	0xA000,
+	0xA015,
+	0xA016,
 	0xA48D,
-	0xA4D0,
+	0xA490,
+	0xA4C7,
 	0xA4FE,
-	0xA4FF,
 	0xA500,
 	0xA60D,
 	0xA60E,
+	0xA60F,
 	0xA610,
 	0xA620,
 	0xA62A,
-	0xA62C,
-	0xA640,
-	0xA641,
-	0xA642,
-	0xA643,
-	0xA644,
-	0xA645,
-	0xA646,
-	0xA647,
-	0xA648,
-	0xA649,
-	0xA64A,
-	0xA64B,
-	0xA64C,
-	0xA64D,
-	0xA64E,
-	0xA64F,
-	0xA650,
-	0xA651,
-	0xA652,
-	0xA653,
-	0xA654,
-	0xA655,
-	0xA656,
-	0xA657,
-	0xA658,
-	0xA659,
-	0xA65A,
-	0xA65B,
-	0xA65C,
-	0xA65D,
-	0xA65E,
-	0xA65F,
-	0xA660,
-	0xA661,
-	0xA662,
-	0xA663,
-	0xA664,
-	0xA665,
-	0xA666,
-	0xA667,
-	0xA668,
-	0xA669,
-	0xA66A,
-	0xA66B,
-	0xA66C,
-	0xA66D,
-	0xA66E,
 	0xA66F,
 	0xA673,
 	0xA674,
 	0xA67E,
-	0xA67F,
-	0xA680,
-	0xA681,
-	0xA682,
-	0xA683,
-	0xA684,
-	0xA685,
-	0xA686,
-	0xA687,
-	0xA688,
-	0xA689,
-	0xA68A,
-	0xA68B,
-	0xA68C,
-	0xA68D,
-	0xA68E,
-	0xA68F,
-	0xA690,
-	0xA691,
-	0xA692,
-	0xA693,
-	0xA694,
-	0xA695,
-	0xA696,
-	0xA697,
-	0xA698,
-	0xA699,
-	0xA69A,
-	0xA69B,
 	0xA69E,
-	0xA69F,
 	0xA6A0,
 	0xA6F0,
 	0xA6F2,
 	0xA6F3,
-	0xA6F4,
-	0xA6F7,
 	0xA6F8,
-	0xA717,
-	0xA720,
-	0xA722,
-	0xA723,
-	0xA724,
-	0xA725,
-	0xA726,
-	0xA727,
-	0xA728,
-	0xA729,
-	0xA72A,
-	0xA72B,
-	0xA72C,
-	0xA72D,
-	0xA72E,
-	0xA72F,
-	0xA732,
-	0xA733,
-	0xA734,
-	0xA735,
-	0xA736,
-	0xA737,
-	0xA738,
-	0xA739,
-	0xA73A,
-	0xA73B,
-	0xA73C,
-	0xA73D,
-	0xA73E,
-	0xA73F,
-	0xA740,
-	0xA741,
-	0xA742,
-	0xA743,
-	0xA744,
-	0xA745,
-	0xA746,
-	0xA747,
-	0xA748,
-	0xA749,
-	0xA74A,
-	0xA74B,
-	0xA74C,
-	0xA74D,
-	0xA74E,
-	0xA74F,
-	0xA750,
-	0xA751,
-	0xA752,
-	0xA753,
-	0xA754,
-	0xA755,
-	0xA756,
-	0xA757,
-	0xA758,
-	0xA759,
-	0xA75A,
-	0xA75B,
-	0xA75C,
-	0xA75D,
-	0xA75E,
-	0xA75F,
-	0xA760,
-	0xA761,
-	0xA762,
-	0xA763,
-	0xA764,
-	0xA765,
-	0xA766,
-	0xA767,
-	0xA768,
-	0xA769,
-	0xA76A,
-	0xA76B,
-	0xA76C,
-	0xA76D,
-	0xA76E,
-	0xA76F,
-	0xA779,
-	0xA77A,
-	0xA77B,
-	0xA77C,
-	0xA77D,
-	0xA77F,
-	0xA780,
-	0xA781,
-	0xA782,
-	0xA783,
-	0xA784,
-	0xA785,
-	0xA786,
-	0xA787,
-	0xA788,
-	0xA789,
-	0xA78B,
-	0xA78C,
-	0xA78D,
-	0xA78E,
-	0xA78F,
-	0xA790,
-	0xA791,
-	0xA792,
-	0xA793,
-	0xA796,
-	0xA797,
-	0xA798,
-	0xA799,
-	0xA79A,
-	0xA79B,
-	0xA79C,
-	0xA79D,
-	0xA79E,
-	0xA79F,
-	0xA7A0,
-	0xA7A1,
-	0xA7A2,
-	0xA7A3,
-	0xA7A4,
-	0xA7A5,
-	0xA7A6,
-	0xA7A7,
-	0xA7A8,
-	0xA7A9,
-	0xA7AA,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xA7F7,
-	0xA7F8,
-	0xA7FB,
 	0xA802,
 	0xA803,
 	0xA806,
@@ -56797,7 +65587,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xA80C,
 	0xA823,
 	0xA828,
-	0xA840,
+	0xA838,
+	0xA839,
 	0xA874,
 	0xA876,
 	0xA878,
@@ -56810,14 +65601,12 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xA8DA,
 	0xA8E0,
 	0xA8F2,
-	0xA8F8,
-	0xA8FB,
 	0xA8FC,
+	0xA8FD,
 	0xA900,
 	0xA90A,
 	0xA926,
 	0xA92E,
-	0xA92F,
 	0xA930,
 	0xA947,
 	0xA954,
@@ -56827,21 +65616,16 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xA984,
 	0xA9B3,
 	0xA9C1,
-	0xA9C8,
+	0xA9C7,
 	0xA9CA,
-	0xA9CF,
 	0xA9D0,
 	0xA9DA,
-	0xA9E0,
 	0xA9E5,
 	0xA9E6,
 	0xA9F0,
 	0xA9FA,
-	0xA9FF,
-	0xAA00,
 	0xAA29,
 	0xAA37,
-	0xAA40,
 	0xAA43,
 	0xAA44,
 	0xAA4C,
@@ -56850,4574 +65634,6 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC 037 */
 	0xAA5A,
 	0xAA5D,
 	0xAA60,
-	0xAA77,
-	0xAA7A,
-	0xAA7B,
-	0xAA7E,
-	0xAAB0,
-	0xAAB1,
-	0xAAB2,
-	0xAAB5,
-	0xAAB7,
-	0xAAB9,
-	0xAABE,
-	0xAAC0,
-	0xAAC1,
-	0xAAC2,
-	0xAAC3,
-	0xAADB,
-	0xAADE,
-	0xAAE0,
-	0xAAEB,
-	0xAAF0,
-	0xAAF2,
-	0xAAF5,
-	0xAAF7,
-	0xAB01,
-	0xAB07,
-	0xAB09,
-	0xAB0F,
-	0xAB11,
-	0xAB17,
-	0xAB20,
-	0xAB27,
-	0xAB28,
-	0xAB2F,
-	0xAB30,
-	0xAB5B,
-	0xAB5C,
-	0xAB60,
-	0xAB64,
-	0xAB66,
-	0xABC0,
-	0xABE3,
-	0xABEB,
-	0xABEC,
-	0xABEE,
-	0xABF0,
-	0xABFA,
-	0xAC00,
-	0xD7A4,
-	0xD7B0,
-	0xD7C7,
-	0xD7CB,
-	0xD7FC,
-	0xF900,
-	0xFA6E,
-	0xFA70,
-	0xFADA,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFB1D,
-	0xFB1E,
-	0xFB1F,
-	0xFB29,
-	0xFB2A,
-	0xFB37,
-	0xFB38,
-	0xFB3D,
-	0xFB3E,
-	0xFB3F,
-	0xFB40,
-	0xFB42,
-	0xFB43,
-	0xFB45,
-	0xFB46,
-	0xFBB2,
-	0xFBD3,
-	0xFD3E,
-	0xFD40,
-	0xFD50,
-	0xFD90,
-	0xFD92,
-	0xFDC8,
-	0xFDF0,
-	0xFDFC,
-	0xFE00,
-	0xFE10,
-	0xFE12,
-	0xFE13,
-	0xFE14,
-	0xFE17,
-	0xFE19,
-	0xFE20,
-	0xFE2E,
-	0xFE31,
-	0xFE33,
-	0xFE35,
-	0xFE45,
-	0xFE47,
-	0xFE49,
-	0xFE50,
-	0xFE52,
-	0xFE53,
-	0xFE55,
-	0xFE56,
-	0xFE58,
-	0xFE59,
-	0xFE5F,
-	0xFE63,
-	0xFE64,
-	0xFE70,
-	0xFE75,
-	0xFE76,
-	0xFEFD,
-	0xFEFF,
-	0xFF00,
-	0xFF01,
-	0xFF02,
-	0xFF08,
-	0xFF0A,
-	0xFF0C,
-	0xFF0E,
-	0xFF0F,
-	0xFF1A,
-	0xFF1B,
-	0xFF1F,
-	0xFF20,
-	0xFF21,
-	0xFF3B,
-	0xFF3C,
-	0xFF3D,
-	0xFF3E,
-	0xFF41,
-	0xFF5B,
-	0xFF5C,
-	0xFF5D,
-	0xFF5E,
-	0xFF5F,
-	0xFF61,
-	0xFF62,
-	0xFF64,
-	0xFF65,
-	0xFF66,
-	0xFF9E,
-	0xFFA0,
-	0xFFBF,
-	0xFFC2,
-	0xFFC8,
-	0xFFCA,
-	0xFFD0,
-	0xFFD2,
-	0xFFD8,
-	0xFFDA,
-	0xFFDD,
-	0xFFF9,
-	0xFFFC,
-	0x10000,
-	0x1000C,
-	0x1000D,
-	0x10027,
-	0x10028,
-	0x1003B,
-	0x1003C,
-	0x1003E,
-	0x1003F,
-	0x1004E,
-	0x10050,
-	0x1005E,
-	0x10080,
-	0x100FB,
-	0x10140,
-	0x10175,
-	0x101FD,
-	0x101FE,
-	0x10280,
-	0x1029D,
-	0x102A0,
-	0x102D1,
-	0x102E0,
-	0x102E1,
-	0x10300,
-	0x10320,
-	0x10330,
-	0x1034B,
-	0x10350,
-	0x10376,
-	0x1037B,
-	0x10380,
-	0x1039E,
-	0x103A0,
-	0x103C4,
-	0x103C8,
-	0x103D0,
-	0x103D1,
-	0x103D6,
-	0x10400,
-	0x10428,
-	0x10450,
-	0x1049E,
-	0x104A0,
-	0x104AA,
-	0x10500,
-	0x10528,
-	0x10530,
-	0x10564,
-	0x10600,
-	0x10737,
-	0x10740,
-	0x10756,
-	0x10760,
-	0x10768,
-	0x10800,
-	0x10806,
-	0x10808,
-	0x10809,
-	0x1080A,
-	0x10836,
-	0x10837,
-	0x10839,
-	0x1083C,
-	0x1083D,
-	0x1083F,
-	0x10856,
-	0x10860,
-	0x10877,
-	0x10880,
-	0x1089F,
-	0x10900,
-	0x10916,
-	0x10920,
-	0x1093A,
-	0x10980,
-	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
-	0x10A01,
-	0x10A04,
-	0x10A05,
-	0x10A07,
-	0x10A0C,
-	0x10A10,
-	0x10A14,
-	0x10A15,
-	0x10A18,
-	0x10A19,
-	0x10A34,
-	0x10A38,
-	0x10A3B,
-	0x10A3F,
-	0x10A40,
-	0x10A56,
-	0x10A58,
-	0x10A60,
-	0x10A7D,
-	0x10A80,
-	0x10A9D,
-	0x10AC0,
-	0x10AC8,
-	0x10AC9,
-	0x10AE5,
-	0x10AE7,
-	0x10B00,
-	0x10B36,
-	0x10B40,
-	0x10B56,
-	0x10B60,
-	0x10B73,
-	0x10B80,
-	0x10B92,
-	0x10C00,
-	0x10C49,
-	0x11000,
-	0x11003,
-	0x11038,
-	0x11047,
-	0x11049,
-	0x11066,
-	0x11070,
-	0x1107F,
-	0x11083,
-	0x110B0,
-	0x110BB,
-	0x110BD,
-	0x110BE,
-	0x110C2,
-	0x110D0,
-	0x110E9,
-	0x110F0,
-	0x110FA,
-	0x11100,
-	0x11103,
-	0x11127,
-	0x11135,
-	0x11136,
-	0x11140,
-	0x11141,
-	0x11144,
-	0x11150,
-	0x11173,
-	0x11174,
-	0x11176,
-	0x11177,
-	0x11180,
-	0x11183,
-	0x111B3,
-	0x111C1,
-	0x111C5,
-	0x111C7,
-	0x111CD,
-	0x111CE,
-	0x111D0,
-	0x111DA,
-	0x111DB,
-	0x11200,
-	0x11212,
-	0x11213,
-	0x1122C,
-	0x11238,
-	0x1123A,
-	0x1123B,
-	0x1123D,
-	0x112B0,
-	0x112DF,
-	0x112EB,
-	0x112F0,
-	0x112FA,
-	0x11301,
-	0x11304,
-	0x11305,
-	0x1130D,
-	0x1130F,
-	0x11311,
-	0x11313,
-	0x11329,
-	0x1132A,
-	0x11331,
-	0x11332,
-	0x11334,
-	0x11335,
-	0x1133A,
-	0x1133C,
-	0x1133D,
-	0x1133E,
-	0x11345,
-	0x11347,
-	0x11349,
-	0x1134B,
-	0x1134E,
-	0x11357,
-	0x11358,
-	0x1135D,
-	0x11362,
-	0x11364,
-	0x11366,
-	0x1136D,
-	0x11370,
-	0x11375,
-	0x11480,
-	0x114B0,
-	0x114C4,
-	0x114C6,
-	0x114C7,
-	0x114C8,
-	0x114D0,
-	0x114DA,
-	0x11580,
-	0x115AF,
-	0x115B6,
-	0x115B8,
-	0x115C1,
-	0x115C2,
-	0x115C4,
-	0x115C9,
-	0x115CA,
-	0x11600,
-	0x11630,
-	0x11641,
-	0x11643,
-	0x11644,
-	0x11645,
-	0x11650,
-	0x1165A,
-	0x11680,
-	0x116AB,
-	0x116B8,
-	0x116C0,
-	0x116CA,
-	0x118A0,
-	0x118C0,
-	0x118E0,
-	0x118EA,
-	0x118FF,
-	0x11900,
-	0x11AC0,
-	0x11AF9,
-	0x12000,
-	0x12399,
-	0x12400,
-	0x1246F,
-	0x13000,
-	0x1342F,
-	0x16800,
-	0x16A39,
-	0x16A40,
-	0x16A5F,
-	0x16A60,
-	0x16A6A,
-	0x16A6E,
-	0x16A70,
-	0x16AD0,
-	0x16AEE,
-	0x16AF0,
-	0x16AF5,
-	0x16AF6,
-	0x16B00,
-	0x16B30,
-	0x16B37,
-	0x16B39,
-	0x16B40,
-	0x16B44,
-	0x16B45,
-	0x16B50,
-	0x16B5A,
-	0x16B63,
-	0x16B78,
-	0x16B7D,
-	0x16B90,
-	0x16F00,
-	0x16F45,
-	0x16F50,
-	0x16F51,
-	0x16F7F,
-	0x16F8F,
-	0x16F93,
-	0x16FA0,
-	0x1B000,
-	0x1B002,
-	0x1BC00,
-	0x1BC6B,
-	0x1BC70,
-	0x1BC7D,
-	0x1BC80,
-	0x1BC89,
-	0x1BC90,
-	0x1BC9A,
-	0x1BC9D,
-	0x1BC9F,
-	0x1BCA0,
-	0x1BCA4,
-	0x1D165,
-	0x1D16A,
-	0x1D16D,
-	0x1D173,
-	0x1D17B,
-	0x1D183,
-	0x1D185,
-	0x1D18C,
-	0x1D1AA,
-	0x1D1AE,
-	0x1D242,
-	0x1D245,
-	0x1D400,
-	0x1D41A,
-	0x1D434,
-	0x1D44E,
-	0x1D455,
-	0x1D456,
-	0x1D468,
-	0x1D482,
-	0x1D49C,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4B6,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D4D0,
-	0x1D4EA,
-	0x1D504,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D51E,
-	0x1D538,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D552,
-	0x1D56C,
-	0x1D586,
-	0x1D5A0,
-	0x1D5BA,
-	0x1D5D4,
-	0x1D5EE,
-	0x1D608,
-	0x1D622,
-	0x1D63C,
-	0x1D656,
-	0x1D670,
-	0x1D68A,
-	0x1D6A6,
-	0x1D6A8,
-	0x1D6C1,
-	0x1D6C2,
-	0x1D6DB,
-	0x1D6DC,
-	0x1D6E2,
-	0x1D6FB,
-	0x1D6FC,
-	0x1D715,
-	0x1D716,
-	0x1D71C,
-	0x1D735,
-	0x1D736,
-	0x1D74F,
-	0x1D750,
-	0x1D756,
-	0x1D76F,
-	0x1D770,
-	0x1D789,
-	0x1D78A,
-	0x1D790,
-	0x1D7A9,
-	0x1D7AA,
-	0x1D7C3,
-	0x1D7C4,
-	0x1D7CA,
-	0x1D7CB,
-	0x1D7CC,
-	0x1D7CE,
-	0x1D800,
-	0x1E800,
-	0x1E8C5,
-	0x1E8D0,
-	0x1E8D7,
-	0x1EE00,
-	0x1EE04,
-	0x1EE05,
-	0x1EE20,
-	0x1EE21,
-	0x1EE23,
-	0x1EE24,
-	0x1EE25,
-	0x1EE27,
-	0x1EE28,
-	0x1EE29,
-	0x1EE33,
-	0x1EE34,
-	0x1EE38,
-	0x1EE39,
-	0x1EE3A,
-	0x1EE3B,
-	0x1EE3C,
-	0x1EE42,
-	0x1EE43,
-	0x1EE47,
-	0x1EE48,
-	0x1EE49,
-	0x1EE4A,
-	0x1EE4B,
-	0x1EE4C,
-	0x1EE4D,
-	0x1EE50,
-	0x1EE51,
-	0x1EE53,
-	0x1EE54,
-	0x1EE55,
-	0x1EE57,
-	0x1EE58,
-	0x1EE59,
-	0x1EE5A,
-	0x1EE5B,
-	0x1EE5C,
-	0x1EE5D,
-	0x1EE5E,
-	0x1EE5F,
-	0x1EE60,
-	0x1EE61,
-	0x1EE63,
-	0x1EE64,
-	0x1EE65,
-	0x1EE67,
-	0x1EE6B,
-	0x1EE6C,
-	0x1EE73,
-	0x1EE74,
-	0x1EE78,
-	0x1EE79,
-	0x1EE7D,
-	0x1EE7E,
-	0x1EE7F,
-	0x1EE80,
-	0x1EE8A,
-	0x1EE8B,
-	0x1EE9C,
-	0x1EEA1,
-	0x1EEA4,
-	0x1EEA5,
-	0x1EEAA,
-	0x1EEAB,
-	0x1EEBC,
-	0x1F130,
-	0x1F14A,
-	0x1F150,
-	0x1F16A,
-	0x1F170,
-	0x1F18A,
-	0x1F676,
-	0x1F679,
-	0x20000,
-	0x2A6D7,
-	0x2A700,
-	0x2B735,
-	0x2B740,
-	0x2B81E,
-	0x2F800,
-	0x2FA1E,
-	0xE0001,
-	0xE0002,
-	0xE0020,
-	0xE0080,
-	0xE0100,
-	0xE01F0
-};
-
-#endif	/* defined(PERL_IN_PERL_C) */
-
-#if defined(PERL_IN_REGEXEC_C)
-
-#define SB_ENUM_COUNT 16
-
-typedef enum {
-	SB_Other = 0,
-	SB_ATerm = 1,
-	SB_CR = 2,
-	SB_Close = 3,
-	SB_EDGE = 4,
-	SB_Extend = 5,
-	SB_Format = 6,
-	SB_LF = 7,
-	SB_Lower = 8,
-	SB_Numeric = 9,
-	SB_OLetter = 10,
-	SB_SContinue = 11,
-	SB_STerm = 12,
-	SB_Sep = 13,
-	SB_Sp = 14,
-	SB_Upper = 15
-} SB_enum;
-
-static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC 037 */
-	SB_Other,
-	SB_Sp,
-	SB_Other,
-	SB_Sp,
-	SB_CR,
-	SB_Other,
-	SB_Sep,
-	SB_Other,
-	SB_LF,
-	SB_Other,
-	SB_Sp,
-	SB_Lower,
-	SB_Other,
-	SB_ATerm,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Lower,
-	SB_STerm,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_SContinue,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_SContinue,
-	SB_Other,
-	SB_STerm,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_SContinue,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Upper,
-	SB_Lower,
-	SB_Close,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Upper,
-	SB_Format,
-	SB_Lower,
-	SB_Close,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Numeric,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_OLetter,
-	SB_Upper,
-	SB_Lower,
-	SB_OLetter,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_OLetter,
-	SB_Lower,
-	SB_OLetter,
-	SB_Lower,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_OLetter,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Extend,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_SContinue,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Format,
-	SB_Other,
-	SB_SContinue,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Format,
-	SB_Other,
-	SB_STerm,
-	SB_OLetter,
-	SB_Extend,
-	SB_Numeric,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_STerm,
-	SB_OLetter,
-	SB_Extend,
-	SB_Format,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Numeric,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_STerm,
-	SB_Other,
-	SB_Format,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_Numeric,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_SContinue,
-	SB_STerm,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_STerm,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Numeric,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Close,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Numeric,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Numeric,
-	SB_Extend,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_STerm,
-	SB_OLetter,
-	SB_Sp,
-	SB_OLetter,
-	SB_Close,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_SContinue,
-	SB_STerm,
-	SB_Other,
-	SB_SContinue,
-	SB_STerm,
-	SB_Other,
-	SB_Extend,
-	SB_Format,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_STerm,
-	SB_Numeric,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Numeric,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_STerm,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_Numeric,
-	SB_STerm,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Numeric,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Numeric,
-	SB_OLetter,
-	SB_STerm,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Lower,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Sp,
-	SB_Format,
-	SB_Extend,
-	SB_Format,
-	SB_Other,
-	SB_SContinue,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_ATerm,
-	SB_Other,
-	SB_Sep,
-	SB_Format,
-	SB_Sp,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_Close,
-	SB_STerm,
-	SB_Other,
-	SB_Sp,
-	SB_Format,
-	SB_Other,
-	SB_Format,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Close,
-	SB_Lower,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_OLetter,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_OLetter,
-	SB_Upper,
-	SB_Lower,
-	SB_OLetter,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Extend,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_STerm,
-	SB_OLetter,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Sp,
-	SB_SContinue,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_STerm,
-	SB_OLetter,
-	SB_Other,
-	SB_STerm,
-	SB_OLetter,
-	SB_Numeric,
-	SB_OLetter,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_OLetter,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_OLetter,
-	SB_Lower,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_STerm,
-	SB_Numeric,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Numeric,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_STerm,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Numeric,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_STerm,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_STerm,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_STerm,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Close,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_SContinue,
-	SB_Other,
-	SB_SContinue,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_SContinue,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_SContinue,
-	SB_ATerm,
-	SB_Other,
-	SB_SContinue,
-	SB_STerm,
-	SB_SContinue,
-	SB_Close,
-	SB_Other,
-	SB_SContinue,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Format,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_SContinue,
-	SB_ATerm,
-	SB_Other,
-	SB_SContinue,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_Upper,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Lower,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_Close,
-	SB_STerm,
-	SB_Close,
-	SB_SContinue,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Format,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_OLetter,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_STerm,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Format,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_STerm,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_Numeric,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_STerm,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_STerm,
-	SB_Other,
-	SB_OLetter,
-	SB_STerm,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_STerm,
-	SB_Format,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Format,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Other,
-	SB_Lower,
-	SB_Other,
-	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Other,
-	SB_Numeric,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Extend,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Upper,
-	SB_Other,
-	SB_Close,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_OLetter,
-	SB_Other,
-	SB_Format,
-	SB_Other,
-	SB_Format,
-	SB_Other,
-	SB_Extend,
-	SB_Other
-};
-
-#endif	/* defined(PERL_IN_REGEXEC_C) */
-
-#if defined(PERL_IN_REGCOMP_C)
-
-static const UV UpperLatin1_invlist[] = { /* for EBCDIC 037 */
-	57,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x4,
-	0x5,
-	0x6,
-	0x7,
-	0x8,
-	0xB,
-	0x14,
-	0x16,
-	0x17,
-	0x18,
-	0x1A,
-	0x1C,
-	0x20,
-	0x25,
-	0x28,
-	0x2D,
-	0x30,
-	0x32,
-	0x33,
-	0x37,
-	0x38,
-	0x3C,
-	0x3E,
-	0x3F,
-	0x41,
-	0x4B,
-	0x51,
-	0x5A,
-	0x5F,
-	0x60,
-	0x62,
-	0x6B,
-	0x70,
-	0x79,
-	0x80,
-	0x81,
-	0x8A,
-	0x91,
-	0x9A,
-	0xA1,
-	0xAA,
-	0xB0,
-	0xB1,
-	0xBA,
-	0xBC,
-	0xC0,
-	0xCA,
-	0xD0,
-	0xDA,
-	0xE0,
-	0xE1,
-	0xE2,
-	0xEA,
-	0xF0,
-	0xFA,
-	0x100
-};
-
-#endif	/* defined(PERL_IN_REGCOMP_C) */
-
-#if defined(PERL_IN_PERL_C)
-
-static const UV VertSpace_invlist[] = { /* for EBCDIC 037 */
-	9,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0xB,
-	0xE,
-	0x15,
-	0x16,
-	0x25,
-	0x26,
-	0x2028,
-	0x202A
-};
-
-static const UV Word_Break_invlist[] = { /* for EBCDIC 037 */
-	1501,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	0,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0xB,
-	0xD,
-	0xE,
-	0x15,
-	0x16,
-	0x25,
-	0x26,
-	0x42,
-	0x4A,
-	0x4B,
-	0x4C,
-	0x51,
-	0x5A,
-	0x5E,
-	0x5F,
-	0x62,
-	0x6A,
-	0x6B,
-	0x6C,
-	0x6D,
-	0x6E,
-	0x70,
-	0x79,
-	0x7A,
-	0x7B,
-	0x7D,
-	0x7E,
-	0x7F,
-	0x80,
-	0x8A,
-	0x8C,
-	0x8F,
-	0x91,
-	0x9D,
-	0x9E,
-	0x9F,
-	0xA0,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xAC,
-	0xAF,
-	0xB3,
-	0xB4,
-	0xC1,
-	0xCA,
-	0xCB,
-	0xD0,
-	0xD1,
-	0xDA,
-	0xDB,
-	0xE0,
-	0xE2,
-	0xEA,
-	0xEB,
-	0xF0,
-	0xFA,
-	0xFB,
-	0xFF,
-	0x100,
-	0x2C2,
-	0x2C6,
-	0x2D2,
-	0x2D7,
-	0x2D8,
-	0x2E0,
-	0x2E5,
-	0x2EC,
-	0x2ED,
-	0x2EE,
-	0x2EF,
-	0x300,
-	0x370,
-	0x375,
-	0x376,
-	0x378,
-	0x37A,
-	0x37E,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x3F6,
-	0x3F7,
-	0x482,
-	0x483,
-	0x48A,
-	0x530,
-	0x531,
-	0x557,
-	0x559,
-	0x55A,
-	0x561,
-	0x588,
-	0x589,
-	0x58A,
-	0x591,
-	0x5BE,
-	0x5BF,
-	0x5C0,
-	0x5C1,
-	0x5C3,
-	0x5C4,
-	0x5C6,
-	0x5C7,
-	0x5C8,
-	0x5D0,
-	0x5EB,
-	0x5F0,
-	0x5F3,
-	0x5F4,
-	0x5F5,
-	0x600,
-	0x606,
-	0x60C,
-	0x60E,
-	0x610,
-	0x61B,
-	0x61C,
-	0x61D,
-	0x620,
-	0x64B,
-	0x660,
-	0x66A,
-	0x66B,
-	0x66C,
-	0x66D,
-	0x66E,
-	0x670,
-	0x671,
-	0x6D4,
-	0x6D5,
-	0x6D6,
-	0x6DD,
-	0x6DE,
-	0x6DF,
-	0x6E5,
-	0x6E7,
-	0x6E9,
-	0x6EA,
-	0x6EE,
-	0x6F0,
-	0x6FA,
-	0x6FD,
-	0x6FF,
-	0x700,
-	0x70F,
-	0x710,
-	0x711,
-	0x712,
-	0x730,
-	0x74B,
-	0x74D,
-	0x7A6,
-	0x7B1,
-	0x7B2,
-	0x7C0,
-	0x7CA,
-	0x7EB,
-	0x7F4,
-	0x7F6,
-	0x7F8,
-	0x7F9,
-	0x7FA,
-	0x7FB,
-	0x800,
-	0x816,
-	0x81A,
-	0x81B,
-	0x824,
-	0x825,
-	0x828,
-	0x829,
-	0x82E,
-	0x840,
-	0x859,
-	0x85C,
-	0x8A0,
-	0x8B3,
-	0x8E4,
-	0x904,
-	0x93A,
-	0x93D,
-	0x93E,
-	0x950,
-	0x951,
-	0x958,
-	0x962,
-	0x964,
-	0x966,
-	0x970,
-	0x971,
-	0x981,
-	0x984,
-	0x985,
-	0x98D,
-	0x98F,
-	0x991,
-	0x993,
-	0x9A9,
-	0x9AA,
-	0x9B1,
-	0x9B2,
-	0x9B3,
-	0x9B6,
-	0x9BA,
-	0x9BC,
-	0x9BD,
-	0x9BE,
-	0x9C5,
-	0x9C7,
-	0x9C9,
-	0x9CB,
-	0x9CE,
-	0x9CF,
-	0x9D7,
-	0x9D8,
-	0x9DC,
-	0x9DE,
-	0x9DF,
-	0x9E2,
-	0x9E4,
-	0x9E6,
-	0x9F0,
-	0x9F2,
-	0xA01,
-	0xA04,
-	0xA05,
-	0xA0B,
-	0xA0F,
-	0xA11,
-	0xA13,
-	0xA29,
-	0xA2A,
-	0xA31,
-	0xA32,
-	0xA34,
-	0xA35,
-	0xA37,
-	0xA38,
-	0xA3A,
-	0xA3C,
-	0xA3D,
-	0xA3E,
-	0xA43,
-	0xA47,
-	0xA49,
-	0xA4B,
-	0xA4E,
-	0xA51,
-	0xA52,
-	0xA59,
-	0xA5D,
-	0xA5E,
-	0xA5F,
-	0xA66,
-	0xA70,
-	0xA72,
-	0xA75,
-	0xA76,
-	0xA81,
-	0xA84,
-	0xA85,
-	0xA8E,
-	0xA8F,
-	0xA92,
-	0xA93,
-	0xAA9,
-	0xAAA,
-	0xAB1,
-	0xAB2,
-	0xAB4,
-	0xAB5,
-	0xABA,
-	0xABC,
-	0xABD,
-	0xABE,
-	0xAC6,
-	0xAC7,
-	0xACA,
-	0xACB,
-	0xACE,
-	0xAD0,
-	0xAD1,
-	0xAE0,
-	0xAE2,
-	0xAE4,
-	0xAE6,
-	0xAF0,
-	0xB01,
-	0xB04,
-	0xB05,
-	0xB0D,
-	0xB0F,
-	0xB11,
-	0xB13,
-	0xB29,
-	0xB2A,
-	0xB31,
-	0xB32,
-	0xB34,
-	0xB35,
-	0xB3A,
-	0xB3C,
-	0xB3D,
-	0xB3E,
-	0xB45,
-	0xB47,
-	0xB49,
-	0xB4B,
-	0xB4E,
-	0xB56,
-	0xB58,
-	0xB5C,
-	0xB5E,
-	0xB5F,
-	0xB62,
-	0xB64,
-	0xB66,
-	0xB70,
-	0xB71,
-	0xB72,
-	0xB82,
-	0xB83,
-	0xB84,
-	0xB85,
-	0xB8B,
-	0xB8E,
-	0xB91,
-	0xB92,
-	0xB96,
-	0xB99,
-	0xB9B,
-	0xB9C,
-	0xB9D,
-	0xB9E,
-	0xBA0,
-	0xBA3,
-	0xBA5,
-	0xBA8,
-	0xBAB,
-	0xBAE,
-	0xBBA,
-	0xBBE,
-	0xBC3,
-	0xBC6,
-	0xBC9,
-	0xBCA,
-	0xBCE,
-	0xBD0,
-	0xBD1,
-	0xBD7,
-	0xBD8,
-	0xBE6,
-	0xBF0,
-	0xC00,
-	0xC04,
-	0xC05,
-	0xC0D,
-	0xC0E,
-	0xC11,
-	0xC12,
-	0xC29,
-	0xC2A,
-	0xC3A,
-	0xC3D,
-	0xC3E,
-	0xC45,
-	0xC46,
-	0xC49,
-	0xC4A,
-	0xC4E,
-	0xC55,
-	0xC57,
-	0xC58,
-	0xC5A,
-	0xC60,
-	0xC62,
-	0xC64,
-	0xC66,
-	0xC70,
-	0xC81,
-	0xC84,
-	0xC85,
-	0xC8D,
-	0xC8E,
-	0xC91,
-	0xC92,
-	0xCA9,
-	0xCAA,
-	0xCB4,
-	0xCB5,
-	0xCBA,
-	0xCBC,
-	0xCBD,
-	0xCBE,
-	0xCC5,
-	0xCC6,
-	0xCC9,
-	0xCCA,
-	0xCCE,
-	0xCD5,
-	0xCD7,
-	0xCDE,
-	0xCDF,
-	0xCE0,
-	0xCE2,
-	0xCE4,
-	0xCE6,
-	0xCF0,
-	0xCF1,
-	0xCF3,
-	0xD01,
-	0xD04,
-	0xD05,
-	0xD0D,
-	0xD0E,
-	0xD11,
-	0xD12,
-	0xD3B,
-	0xD3D,
-	0xD3E,
-	0xD45,
-	0xD46,
-	0xD49,
-	0xD4A,
-	0xD4E,
-	0xD4F,
-	0xD57,
-	0xD58,
-	0xD60,
-	0xD62,
-	0xD64,
-	0xD66,
-	0xD70,
-	0xD7A,
-	0xD80,
-	0xD82,
-	0xD84,
-	0xD85,
-	0xD97,
-	0xD9A,
-	0xDB2,
-	0xDB3,
-	0xDBC,
-	0xDBD,
-	0xDBE,
-	0xDC0,
-	0xDC7,
-	0xDCA,
-	0xDCB,
-	0xDCF,
-	0xDD5,
-	0xDD6,
-	0xDD7,
-	0xDD8,
-	0xDE0,
-	0xDE6,
-	0xDF0,
-	0xDF2,
-	0xDF4,
-	0xE31,
-	0xE32,
-	0xE34,
-	0xE3B,
-	0xE47,
-	0xE4F,
-	0xE50,
-	0xE5A,
-	0xEB1,
-	0xEB2,
-	0xEB4,
-	0xEBA,
-	0xEBB,
-	0xEBD,
-	0xEC8,
-	0xECE,
-	0xED0,
-	0xEDA,
-	0xF00,
-	0xF01,
-	0xF18,
-	0xF1A,
-	0xF20,
-	0xF2A,
-	0xF35,
-	0xF36,
-	0xF37,
-	0xF38,
-	0xF39,
-	0xF3A,
-	0xF3E,
-	0xF40,
-	0xF48,
-	0xF49,
-	0xF6D,
-	0xF71,
-	0xF85,
-	0xF86,
-	0xF88,
-	0xF8D,
-	0xF98,
-	0xF99,
-	0xFBD,
-	0xFC6,
-	0xFC7,
-	0x102B,
-	0x103F,
-	0x1040,
-	0x104A,
-	0x1056,
-	0x105A,
-	0x105E,
-	0x1061,
-	0x1062,
-	0x1065,
-	0x1067,
-	0x106E,
-	0x1071,
-	0x1075,
-	0x1082,
-	0x108E,
-	0x108F,
-	0x1090,
-	0x109A,
-	0x109E,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x10D0,
-	0x10FB,
-	0x10FC,
-	0x1249,
-	0x124A,
-	0x124E,
-	0x1250,
-	0x1257,
-	0x1258,
-	0x1259,
-	0x125A,
-	0x125E,
-	0x1260,
-	0x1289,
-	0x128A,
-	0x128E,
-	0x1290,
-	0x12B1,
-	0x12B2,
-	0x12B6,
-	0x12B8,
-	0x12BF,
-	0x12C0,
-	0x12C1,
-	0x12C2,
-	0x12C6,
-	0x12C8,
-	0x12D7,
-	0x12D8,
-	0x1311,
-	0x1312,
-	0x1316,
-	0x1318,
-	0x135B,
-	0x135D,
-	0x1360,
-	0x1380,
-	0x1390,
-	0x13A0,
-	0x13F5,
-	0x1401,
-	0x166D,
-	0x166F,
-	0x1680,
-	0x1681,
-	0x169B,
-	0x16A0,
-	0x16EB,
-	0x16EE,
-	0x16F9,
-	0x1700,
-	0x170D,
-	0x170E,
-	0x1712,
-	0x1715,
-	0x1720,
-	0x1732,
-	0x1735,
-	0x1740,
-	0x1752,
-	0x1754,
-	0x1760,
-	0x176D,
-	0x176E,
-	0x1771,
-	0x1772,
-	0x1774,
-	0x17B4,
-	0x17D4,
-	0x17DD,
-	0x17DE,
-	0x17E0,
-	0x17EA,
-	0x180B,
-	0x180E,
-	0x180F,
-	0x1810,
-	0x181A,
-	0x1820,
-	0x1878,
-	0x1880,
-	0x18A9,
-	0x18AA,
-	0x18AB,
-	0x18B0,
-	0x18F6,
-	0x1900,
-	0x191F,
-	0x1920,
-	0x192C,
-	0x1930,
-	0x193C,
-	0x1946,
-	0x1950,
-	0x19B0,
-	0x19C1,
-	0x19C8,
-	0x19CA,
-	0x19D0,
-	0x19DA,
-	0x1A00,
-	0x1A17,
-	0x1A1C,
-	0x1A55,
-	0x1A5F,
-	0x1A60,
-	0x1A7D,
-	0x1A7F,
-	0x1A80,
-	0x1A8A,
-	0x1A90,
-	0x1A9A,
-	0x1AB0,
-	0x1ABF,
-	0x1B00,
-	0x1B05,
-	0x1B34,
-	0x1B45,
-	0x1B4C,
-	0x1B50,
-	0x1B5A,
-	0x1B6B,
-	0x1B74,
-	0x1B80,
-	0x1B83,
-	0x1BA1,
-	0x1BAE,
-	0x1BB0,
-	0x1BBA,
-	0x1BE6,
-	0x1BF4,
-	0x1C00,
-	0x1C24,
-	0x1C38,
-	0x1C40,
-	0x1C4A,
-	0x1C4D,
-	0x1C50,
-	0x1C5A,
-	0x1C7E,
-	0x1CD0,
-	0x1CD3,
-	0x1CD4,
-	0x1CE9,
-	0x1CED,
-	0x1CEE,
-	0x1CF2,
-	0x1CF5,
-	0x1CF7,
-	0x1CF8,
-	0x1CFA,
-	0x1D00,
-	0x1DC0,
-	0x1DF6,
-	0x1DFC,
-	0x1E00,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FE0,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFD,
-	0x200C,
-	0x200E,
-	0x2010,
-	0x2018,
-	0x201A,
-	0x2024,
-	0x2025,
-	0x2027,
-	0x2028,
-	0x202A,
-	0x202F,
-	0x203F,
-	0x2041,
-	0x2044,
-	0x2045,
-	0x2054,
-	0x2055,
-	0x2060,
-	0x2065,
-	0x2066,
-	0x2070,
-	0x2071,
-	0x2072,
-	0x207F,
-	0x2080,
-	0x2090,
-	0x209D,
-	0x20D0,
-	0x20F1,
-	0x2102,
-	0x2103,
-	0x2107,
-	0x2108,
-	0x210A,
-	0x2114,
-	0x2115,
-	0x2116,
-	0x2119,
-	0x211E,
-	0x2124,
-	0x2125,
-	0x2126,
-	0x2127,
-	0x2128,
-	0x2129,
-	0x212A,
-	0x212E,
-	0x212F,
-	0x213A,
-	0x213C,
-	0x2140,
-	0x2145,
-	0x214A,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2189,
-	0x24B6,
-	0x24EA,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2CE5,
-	0x2CEB,
-	0x2CEF,
-	0x2CF2,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0x2D30,
-	0x2D68,
-	0x2D6F,
-	0x2D70,
-	0x2D7F,
-	0x2D80,
-	0x2D97,
-	0x2DA0,
-	0x2DA7,
-	0x2DA8,
-	0x2DAF,
-	0x2DB0,
-	0x2DB7,
-	0x2DB8,
-	0x2DBF,
-	0x2DC0,
-	0x2DC7,
-	0x2DC8,
-	0x2DCF,
-	0x2DD0,
-	0x2DD7,
-	0x2DD8,
-	0x2DDF,
-	0x2DE0,
-	0x2E00,
-	0x2E2F,
-	0x2E30,
-	0x3005,
-	0x3006,
-	0x302A,
-	0x3030,
-	0x3031,
-	0x3036,
-	0x303B,
-	0x303D,
-	0x3099,
-	0x309B,
-	0x309D,
-	0x30A0,
-	0x30FB,
-	0x30FC,
-	0x3100,
-	0x3105,
-	0x312E,
-	0x3131,
-	0x318F,
-	0x31A0,
-	0x31BB,
-	0x31F0,
-	0x3200,
-	0x32D0,
-	0x32FF,
-	0x3300,
-	0x3358,
-	0xA000,
-	0xA48D,
-	0xA4D0,
-	0xA4FE,
-	0xA500,
-	0xA60D,
-	0xA610,
-	0xA620,
-	0xA62A,
-	0xA62C,
-	0xA640,
-	0xA66F,
-	0xA673,
-	0xA674,
-	0xA67E,
-	0xA67F,
-	0xA69E,
-	0xA69F,
-	0xA6A0,
-	0xA6F0,
-	0xA6F2,
-	0xA717,
-	0xA720,
-	0xA722,
-	0xA789,
-	0xA78B,
-	0xA78F,
-	0xA790,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xA7F7,
-	0xA802,
-	0xA803,
-	0xA806,
-	0xA807,
-	0xA80B,
-	0xA80C,
-	0xA823,
-	0xA828,
-	0xA840,
-	0xA874,
-	0xA880,
-	0xA882,
-	0xA8B4,
-	0xA8C5,
-	0xA8D0,
-	0xA8DA,
-	0xA8E0,
-	0xA8F2,
-	0xA8F8,
-	0xA8FB,
-	0xA8FC,
-	0xA900,
-	0xA90A,
-	0xA926,
-	0xA92E,
-	0xA930,
-	0xA947,
-	0xA954,
-	0xA960,
-	0xA97D,
-	0xA980,
-	0xA984,
-	0xA9B3,
-	0xA9C1,
-	0xA9CF,
-	0xA9D0,
-	0xA9DA,
-	0xA9E5,
-	0xA9E6,
-	0xA9F0,
-	0xA9FA,
-	0xAA00,
-	0xAA29,
-	0xAA37,
-	0xAA40,
-	0xAA43,
-	0xAA44,
-	0xAA4C,
-	0xAA4E,
-	0xAA50,
-	0xAA5A,
 	0xAA7B,
 	0xAA7E,
 	0xAAB0,
@@ -61430,29 +65646,11 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 037 */
 	0xAAC0,
 	0xAAC1,
 	0xAAC2,
-	0xAAE0,
 	0xAAEB,
 	0xAAF0,
 	0xAAF2,
 	0xAAF5,
 	0xAAF7,
-	0xAB01,
-	0xAB07,
-	0xAB09,
-	0xAB0F,
-	0xAB11,
-	0xAB17,
-	0xAB20,
-	0xAB27,
-	0xAB28,
-	0xAB2F,
-	0xAB30,
-	0xAB5B,
-	0xAB5C,
-	0xAB60,
-	0xAB64,
-	0xAB66,
-	0xABC0,
 	0xABE3,
 	0xABEB,
 	0xABEC,
@@ -61460,12273 +65658,6 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC 037 */
 	0xABF0,
 	0xABFA,
 	0xAC00,
-	0xD7A4,
-	0xD7B0,
-	0xD7C7,
-	0xD7CB,
-	0xD7FC,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFB1D,
-	0xFB1E,
-	0xFB1F,
-	0xFB29,
-	0xFB2A,
-	0xFB37,
-	0xFB38,
-	0xFB3D,
-	0xFB3E,
-	0xFB3F,
-	0xFB40,
-	0xFB42,
-	0xFB43,
-	0xFB45,
-	0xFB46,
-	0xFB50,
-	0xFBB2,
-	0xFBD3,
-	0xFD3E,
-	0xFD50,
-	0xFD90,
-	0xFD92,
-	0xFDC8,
-	0xFDF0,
-	0xFDFC,
-	0xFE00,
-	0xFE10,
-	0xFE11,
-	0xFE13,
-	0xFE14,
-	0xFE15,
-	0xFE20,
-	0xFE2E,
-	0xFE33,
-	0xFE35,
-	0xFE4D,
-	0xFE50,
-	0xFE51,
-	0xFE52,
-	0xFE53,
-	0xFE54,
-	0xFE55,
-	0xFE56,
-	0xFE70,
-	0xFE75,
-	0xFE76,
-	0xFEFD,
-	0xFEFF,
-	0xFF00,
-	0xFF07,
-	0xFF08,
-	0xFF0C,
-	0xFF0D,
-	0xFF0E,
-	0xFF0F,
-	0xFF1A,
-	0xFF1B,
-	0xFF1C,
-	0xFF21,
-	0xFF3B,
-	0xFF3F,
-	0xFF40,
-	0xFF41,
-	0xFF5B,
-	0xFF66,
-	0xFF9E,
-	0xFFA0,
-	0xFFBF,
-	0xFFC2,
-	0xFFC8,
-	0xFFCA,
-	0xFFD0,
-	0xFFD2,
-	0xFFD8,
-	0xFFDA,
-	0xFFDD,
-	0xFFF9,
-	0xFFFC,
-	0x10000,
-	0x1000C,
-	0x1000D,
-	0x10027,
-	0x10028,
-	0x1003B,
-	0x1003C,
-	0x1003E,
-	0x1003F,
-	0x1004E,
-	0x10050,
-	0x1005E,
-	0x10080,
-	0x100FB,
-	0x10140,
-	0x10175,
-	0x101FD,
-	0x101FE,
-	0x10280,
-	0x1029D,
-	0x102A0,
-	0x102D1,
-	0x102E0,
-	0x102E1,
-	0x10300,
-	0x10320,
-	0x10330,
-	0x1034B,
-	0x10350,
-	0x10376,
-	0x1037B,
-	0x10380,
-	0x1039E,
-	0x103A0,
-	0x103C4,
-	0x103C8,
-	0x103D0,
-	0x103D1,
-	0x103D6,
-	0x10400,
-	0x1049E,
-	0x104A0,
-	0x104AA,
-	0x10500,
-	0x10528,
-	0x10530,
-	0x10564,
-	0x10600,
-	0x10737,
-	0x10740,
-	0x10756,
-	0x10760,
-	0x10768,
-	0x10800,
-	0x10806,
-	0x10808,
-	0x10809,
-	0x1080A,
-	0x10836,
-	0x10837,
-	0x10839,
-	0x1083C,
-	0x1083D,
-	0x1083F,
-	0x10856,
-	0x10860,
-	0x10877,
-	0x10880,
-	0x1089F,
-	0x10900,
-	0x10916,
-	0x10920,
-	0x1093A,
-	0x10980,
-	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
-	0x10A01,
-	0x10A04,
-	0x10A05,
-	0x10A07,
-	0x10A0C,
-	0x10A10,
-	0x10A14,
-	0x10A15,
-	0x10A18,
-	0x10A19,
-	0x10A34,
-	0x10A38,
-	0x10A3B,
-	0x10A3F,
-	0x10A40,
-	0x10A60,
-	0x10A7D,
-	0x10A80,
-	0x10A9D,
-	0x10AC0,
-	0x10AC8,
-	0x10AC9,
-	0x10AE5,
-	0x10AE7,
-	0x10B00,
-	0x10B36,
-	0x10B40,
-	0x10B56,
-	0x10B60,
-	0x10B73,
-	0x10B80,
-	0x10B92,
-	0x10C00,
-	0x10C49,
-	0x11000,
-	0x11003,
-	0x11038,
-	0x11047,
-	0x11066,
-	0x11070,
-	0x1107F,
-	0x11083,
-	0x110B0,
-	0x110BB,
-	0x110BD,
-	0x110BE,
-	0x110D0,
-	0x110E9,
-	0x110F0,
-	0x110FA,
-	0x11100,
-	0x11103,
-	0x11127,
-	0x11135,
-	0x11136,
-	0x11140,
-	0x11150,
-	0x11173,
-	0x11174,
-	0x11176,
-	0x11177,
-	0x11180,
-	0x11183,
-	0x111B3,
-	0x111C1,
-	0x111C5,
-	0x111D0,
-	0x111DA,
-	0x111DB,
-	0x11200,
-	0x11212,
-	0x11213,
-	0x1122C,
-	0x11238,
-	0x112B0,
-	0x112DF,
-	0x112EB,
-	0x112F0,
-	0x112FA,
-	0x11301,
-	0x11304,
-	0x11305,
-	0x1130D,
-	0x1130F,
-	0x11311,
-	0x11313,
-	0x11329,
-	0x1132A,
-	0x11331,
-	0x11332,
-	0x11334,
-	0x11335,
-	0x1133A,
-	0x1133C,
-	0x1133D,
-	0x1133E,
-	0x11345,
-	0x11347,
-	0x11349,
-	0x1134B,
-	0x1134E,
-	0x11357,
-	0x11358,
-	0x1135D,
-	0x11362,
-	0x11364,
-	0x11366,
-	0x1136D,
-	0x11370,
-	0x11375,
-	0x11480,
-	0x114B0,
-	0x114C4,
-	0x114C6,
-	0x114C7,
-	0x114C8,
-	0x114D0,
-	0x114DA,
-	0x11580,
-	0x115AF,
-	0x115B6,
-	0x115B8,
-	0x115C1,
-	0x11600,
-	0x11630,
-	0x11641,
-	0x11644,
-	0x11645,
-	0x11650,
-	0x1165A,
-	0x11680,
-	0x116AB,
-	0x116B8,
-	0x116C0,
-	0x116CA,
-	0x118A0,
-	0x118E0,
-	0x118EA,
-	0x118FF,
-	0x11900,
-	0x11AC0,
-	0x11AF9,
-	0x12000,
-	0x12399,
-	0x12400,
-	0x1246F,
-	0x13000,
-	0x1342F,
-	0x16800,
-	0x16A39,
-	0x16A40,
-	0x16A5F,
-	0x16A60,
-	0x16A6A,
-	0x16AD0,
-	0x16AEE,
-	0x16AF0,
-	0x16AF5,
-	0x16B00,
-	0x16B30,
-	0x16B37,
-	0x16B40,
-	0x16B44,
-	0x16B50,
-	0x16B5A,
-	0x16B63,
-	0x16B78,
-	0x16B7D,
-	0x16B90,
-	0x16F00,
-	0x16F45,
-	0x16F50,
-	0x16F51,
-	0x16F7F,
-	0x16F8F,
-	0x16F93,
-	0x16FA0,
-	0x1B000,
-	0x1B001,
-	0x1BC00,
-	0x1BC6B,
-	0x1BC70,
-	0x1BC7D,
-	0x1BC80,
-	0x1BC89,
-	0x1BC90,
-	0x1BC9A,
-	0x1BC9D,
-	0x1BC9F,
-	0x1BCA0,
-	0x1BCA4,
-	0x1D165,
-	0x1D16A,
-	0x1D16D,
-	0x1D173,
-	0x1D17B,
-	0x1D183,
-	0x1D185,
-	0x1D18C,
-	0x1D1AA,
-	0x1D1AE,
-	0x1D242,
-	0x1D245,
-	0x1D400,
-	0x1D455,
-	0x1D456,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D51E,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D552,
-	0x1D6A6,
-	0x1D6A8,
-	0x1D6C1,
-	0x1D6C2,
-	0x1D6DB,
-	0x1D6DC,
-	0x1D6FB,
-	0x1D6FC,
-	0x1D715,
-	0x1D716,
-	0x1D735,
-	0x1D736,
-	0x1D74F,
-	0x1D750,
-	0x1D76F,
-	0x1D770,
-	0x1D789,
-	0x1D78A,
-	0x1D7A9,
-	0x1D7AA,
-	0x1D7C3,
-	0x1D7C4,
-	0x1D7CC,
-	0x1D7CE,
-	0x1D800,
-	0x1E800,
-	0x1E8C5,
-	0x1E8D0,
-	0x1E8D7,
-	0x1EE00,
-	0x1EE04,
-	0x1EE05,
-	0x1EE20,
-	0x1EE21,
-	0x1EE23,
-	0x1EE24,
-	0x1EE25,
-	0x1EE27,
-	0x1EE28,
-	0x1EE29,
-	0x1EE33,
-	0x1EE34,
-	0x1EE38,
-	0x1EE39,
-	0x1EE3A,
-	0x1EE3B,
-	0x1EE3C,
-	0x1EE42,
-	0x1EE43,
-	0x1EE47,
-	0x1EE48,
-	0x1EE49,
-	0x1EE4A,
-	0x1EE4B,
-	0x1EE4C,
-	0x1EE4D,
-	0x1EE50,
-	0x1EE51,
-	0x1EE53,
-	0x1EE54,
-	0x1EE55,
-	0x1EE57,
-	0x1EE58,
-	0x1EE59,
-	0x1EE5A,
-	0x1EE5B,
-	0x1EE5C,
-	0x1EE5D,
-	0x1EE5E,
-	0x1EE5F,
-	0x1EE60,
-	0x1EE61,
-	0x1EE63,
-	0x1EE64,
-	0x1EE65,
-	0x1EE67,
-	0x1EE6B,
-	0x1EE6C,
-	0x1EE73,
-	0x1EE74,
-	0x1EE78,
-	0x1EE79,
-	0x1EE7D,
-	0x1EE7E,
-	0x1EE7F,
-	0x1EE80,
-	0x1EE8A,
-	0x1EE8B,
-	0x1EE9C,
-	0x1EEA1,
-	0x1EEA4,
-	0x1EEA5,
-	0x1EEAA,
-	0x1EEAB,
-	0x1EEBC,
-	0x1F130,
-	0x1F14A,
-	0x1F150,
-	0x1F16A,
-	0x1F170,
-	0x1F18A,
-	0x1F1E6,
-	0x1F200,
-	0xE0001,
-	0xE0002,
-	0xE0020,
-	0xE0080,
-	0xE0100,
-	0xE01F0
-};
-
-#endif	/* defined(PERL_IN_PERL_C) */
-
-#if defined(PERL_IN_REGEXEC_C)
-
-#define WB_ENUM_COUNT 19
-
-typedef enum {
-	WB_Other = 0,
-	WB_ALetter = 1,
-	WB_CR = 2,
-	WB_Double_Quote = 3,
-	WB_EDGE = 4,
-	WB_Extend = 5,
-	WB_ExtendNumLet = 6,
-	WB_Format = 7,
-	WB_Hebrew_Letter = 8,
-	WB_Katakana = 9,
-	WB_LF = 10,
-	WB_MidLetter = 11,
-	WB_MidNum = 12,
-	WB_MidNumLet = 13,
-	WB_Newline = 14,
-	WB_Numeric = 15,
-	WB_Regional_Indicator = 16,
-	WB_Single_Quote = 17,
-	WB_UNKNOWN = 18
-} WB_enum;
-
-static const WB_enum Word_Break_invmap[] = { /* for EBCDIC 037 */
-	WB_Other,
-	WB_Newline,
-	WB_CR,
-	WB_Other,
-	WB_Newline,
-	WB_Other,
-	WB_LF,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_MidNumLet,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_MidNum,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_MidNum,
-	WB_Other,
-	WB_ExtendNumLet,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_MidLetter,
-	WB_Other,
-	WB_Single_Quote,
-	WB_Other,
-	WB_Double_Quote,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_MidLetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Format,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_MidLetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_MidNum,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_MidLetter,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_MidNum,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Hebrew_Letter,
-	WB_Other,
-	WB_Hebrew_Letter,
-	WB_ALetter,
-	WB_MidLetter,
-	WB_Other,
-	WB_Format,
-	WB_Other,
-	WB_MidNum,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Format,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Numeric,
-	WB_Other,
-	WB_Numeric,
-	WB_MidNum,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Format,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Numeric,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Format,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_MidNum,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Numeric,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Format,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Numeric,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Numeric,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Numeric,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Format,
-	WB_Other,
-	WB_MidNumLet,
-	WB_Other,
-	WB_MidNumLet,
-	WB_Other,
-	WB_MidLetter,
-	WB_Newline,
-	WB_Format,
-	WB_Other,
-	WB_ExtendNumLet,
-	WB_Other,
-	WB_MidNum,
-	WB_Other,
-	WB_ExtendNumLet,
-	WB_Other,
-	WB_Format,
-	WB_Other,
-	WB_Format,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Katakana,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Katakana,
-	WB_Other,
-	WB_Katakana,
-	WB_Other,
-	WB_Katakana,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Katakana,
-	WB_Other,
-	WB_Katakana,
-	WB_Other,
-	WB_Katakana,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Numeric,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Hebrew_Letter,
-	WB_Extend,
-	WB_Hebrew_Letter,
-	WB_Other,
-	WB_Hebrew_Letter,
-	WB_Other,
-	WB_Hebrew_Letter,
-	WB_Other,
-	WB_Hebrew_Letter,
-	WB_Other,
-	WB_Hebrew_Letter,
-	WB_Other,
-	WB_Hebrew_Letter,
-	WB_Other,
-	WB_Hebrew_Letter,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_MidNum,
-	WB_Other,
-	WB_MidLetter,
-	WB_MidNum,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ExtendNumLet,
-	WB_Other,
-	WB_ExtendNumLet,
-	WB_MidNum,
-	WB_Other,
-	WB_MidNumLet,
-	WB_Other,
-	WB_MidNum,
-	WB_MidLetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Format,
-	WB_Other,
-	WB_MidNumLet,
-	WB_Other,
-	WB_MidNum,
-	WB_Other,
-	WB_MidNumLet,
-	WB_Other,
-	WB_MidLetter,
-	WB_MidNum,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ExtendNumLet,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Katakana,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Format,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Format,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_ALetter,
-	WB_Other,
-	WB_Katakana,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Format,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Format,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Numeric,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
-	WB_Other,
-	WB_Regional_Indicator,
-	WB_Other,
-	WB_Format,
-	WB_Other,
-	WB_Format,
-	WB_Other,
-	WB_Extend,
-	WB_Other
-};
-
-#endif	/* defined(PERL_IN_REGEXEC_C) */
-
-#if defined(PERL_IN_PERL_C)
-
-static const UV XPerlSpace_invlist[] = { /* for EBCDIC 037 */
-	23,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x5,
-	0x6,
-	0xB,
-	0xE,
-	0x15,
-	0x16,
-	0x25,
-	0x26,
-	0x40,
-	0x42,
-	0x1680,
-	0x1681,
-	0x2000,
-	0x200B,
-	0x2028,
-	0x202A,
-	0x202F,
-	0x2030,
-	0x205F,
-	0x2060,
-	0x3000,
-	0x3001
-};
-
-static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 037 */
-	1281,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x42,
-	0x4A,
-	0x51,
-	0x5A,
-	0x62,
-	0x6A,
-	0x70,
-	0x79,
-	0x80,
-	0x8A,
-	0x8C,
-	0x8F,
-	0x91,
-	0x9D,
-	0x9E,
-	0x9F,
-	0xA0,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xAC,
-	0xAF,
-	0xC1,
-	0xCA,
-	0xCB,
-	0xD0,
-	0xD1,
-	0xDA,
-	0xDB,
-	0xE0,
-	0xE2,
-	0xEA,
-	0xEB,
-	0xFA,
-	0xFB,
-	0xFF,
-	0x100,
-	0x2C2,
-	0x2C6,
-	0x2D2,
-	0x2E0,
-	0x2E5,
-	0x2EC,
-	0x2ED,
-	0x2EE,
-	0x2EF,
-	0x345,
-	0x346,
-	0x370,
-	0x375,
-	0x376,
-	0x378,
-	0x37A,
-	0x37E,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x3F6,
-	0x3F7,
-	0x482,
-	0x48A,
-	0x530,
-	0x531,
-	0x557,
-	0x559,
-	0x55A,
-	0x561,
-	0x588,
-	0x5B0,
-	0x5BE,
-	0x5BF,
-	0x5C0,
-	0x5C1,
-	0x5C3,
-	0x5C4,
-	0x5C6,
-	0x5C7,
-	0x5C8,
-	0x5D0,
-	0x5EB,
-	0x5F0,
-	0x5F3,
-	0x610,
-	0x61B,
-	0x620,
-	0x658,
-	0x659,
-	0x66A,
-	0x66E,
-	0x6D4,
-	0x6D5,
-	0x6DD,
-	0x6E1,
-	0x6E9,
-	0x6ED,
-	0x6FD,
-	0x6FF,
-	0x700,
-	0x710,
-	0x740,
-	0x74D,
-	0x7B2,
-	0x7C0,
-	0x7EB,
-	0x7F4,
-	0x7F6,
-	0x7FA,
-	0x7FB,
-	0x800,
-	0x818,
-	0x81A,
-	0x82D,
-	0x840,
-	0x859,
-	0x8A0,
-	0x8B3,
-	0x8E4,
-	0x8EA,
-	0x8F0,
-	0x93C,
-	0x93D,
-	0x94D,
-	0x94E,
-	0x951,
-	0x955,
-	0x964,
-	0x966,
-	0x970,
-	0x971,
-	0x984,
-	0x985,
-	0x98D,
-	0x98F,
-	0x991,
-	0x993,
-	0x9A9,
-	0x9AA,
-	0x9B1,
-	0x9B2,
-	0x9B3,
-	0x9B6,
-	0x9BA,
-	0x9BD,
-	0x9C5,
-	0x9C7,
-	0x9C9,
-	0x9CB,
-	0x9CD,
-	0x9CE,
-	0x9CF,
-	0x9D7,
-	0x9D8,
-	0x9DC,
-	0x9DE,
-	0x9DF,
-	0x9E4,
-	0x9E6,
-	0x9F2,
-	0xA01,
-	0xA04,
-	0xA05,
-	0xA0B,
-	0xA0F,
-	0xA11,
-	0xA13,
-	0xA29,
-	0xA2A,
-	0xA31,
-	0xA32,
-	0xA34,
-	0xA35,
-	0xA37,
-	0xA38,
-	0xA3A,
-	0xA3E,
-	0xA43,
-	0xA47,
-	0xA49,
-	0xA4B,
-	0xA4D,
-	0xA51,
-	0xA52,
-	0xA59,
-	0xA5D,
-	0xA5E,
-	0xA5F,
-	0xA66,
-	0xA76,
-	0xA81,
-	0xA84,
-	0xA85,
-	0xA8E,
-	0xA8F,
-	0xA92,
-	0xA93,
-	0xAA9,
-	0xAAA,
-	0xAB1,
-	0xAB2,
-	0xAB4,
-	0xAB5,
-	0xABA,
-	0xABD,
-	0xAC6,
-	0xAC7,
-	0xACA,
-	0xACB,
-	0xACD,
-	0xAD0,
-	0xAD1,
-	0xAE0,
-	0xAE4,
-	0xAE6,
-	0xAF0,
-	0xB01,
-	0xB04,
-	0xB05,
-	0xB0D,
-	0xB0F,
-	0xB11,
-	0xB13,
-	0xB29,
-	0xB2A,
-	0xB31,
-	0xB32,
-	0xB34,
-	0xB35,
-	0xB3A,
-	0xB3D,
-	0xB45,
-	0xB47,
-	0xB49,
-	0xB4B,
-	0xB4D,
-	0xB56,
-	0xB58,
-	0xB5C,
-	0xB5E,
-	0xB5F,
-	0xB64,
-	0xB66,
-	0xB70,
-	0xB71,
-	0xB72,
-	0xB82,
-	0xB84,
-	0xB85,
-	0xB8B,
-	0xB8E,
-	0xB91,
-	0xB92,
-	0xB96,
-	0xB99,
-	0xB9B,
-	0xB9C,
-	0xB9D,
-	0xB9E,
-	0xBA0,
-	0xBA3,
-	0xBA5,
-	0xBA8,
-	0xBAB,
-	0xBAE,
-	0xBBA,
-	0xBBE,
-	0xBC3,
-	0xBC6,
-	0xBC9,
-	0xBCA,
-	0xBCD,
-	0xBD0,
-	0xBD1,
-	0xBD7,
-	0xBD8,
-	0xBE6,
-	0xBF0,
-	0xC00,
-	0xC04,
-	0xC05,
-	0xC0D,
-	0xC0E,
-	0xC11,
-	0xC12,
-	0xC29,
-	0xC2A,
-	0xC3A,
-	0xC3D,
-	0xC45,
-	0xC46,
-	0xC49,
-	0xC4A,
-	0xC4D,
-	0xC55,
-	0xC57,
-	0xC58,
-	0xC5A,
-	0xC60,
-	0xC64,
-	0xC66,
-	0xC70,
-	0xC81,
-	0xC84,
-	0xC85,
-	0xC8D,
-	0xC8E,
-	0xC91,
-	0xC92,
-	0xCA9,
-	0xCAA,
-	0xCB4,
-	0xCB5,
-	0xCBA,
-	0xCBD,
-	0xCC5,
-	0xCC6,
-	0xCC9,
-	0xCCA,
-	0xCCD,
-	0xCD5,
-	0xCD7,
-	0xCDE,
-	0xCDF,
-	0xCE0,
-	0xCE4,
-	0xCE6,
-	0xCF0,
-	0xCF1,
-	0xCF3,
-	0xD01,
-	0xD04,
-	0xD05,
-	0xD0D,
-	0xD0E,
-	0xD11,
-	0xD12,
-	0xD3B,
-	0xD3D,
-	0xD45,
-	0xD46,
-	0xD49,
-	0xD4A,
-	0xD4D,
-	0xD4E,
-	0xD4F,
-	0xD57,
-	0xD58,
-	0xD60,
-	0xD64,
-	0xD66,
-	0xD70,
-	0xD7A,
-	0xD80,
-	0xD82,
-	0xD84,
-	0xD85,
-	0xD97,
-	0xD9A,
-	0xDB2,
-	0xDB3,
-	0xDBC,
-	0xDBD,
-	0xDBE,
-	0xDC0,
-	0xDC7,
-	0xDCF,
-	0xDD5,
-	0xDD6,
-	0xDD7,
-	0xDD8,
-	0xDE0,
-	0xDE6,
-	0xDF0,
-	0xDF2,
-	0xDF4,
-	0xE01,
-	0xE3B,
-	0xE40,
-	0xE47,
-	0xE4D,
-	0xE4E,
-	0xE50,
-	0xE5A,
-	0xE81,
-	0xE83,
-	0xE84,
-	0xE85,
-	0xE87,
-	0xE89,
-	0xE8A,
-	0xE8B,
-	0xE8D,
-	0xE8E,
-	0xE94,
-	0xE98,
-	0xE99,
-	0xEA0,
-	0xEA1,
-	0xEA4,
-	0xEA5,
-	0xEA6,
-	0xEA7,
-	0xEA8,
-	0xEAA,
-	0xEAC,
-	0xEAD,
-	0xEBA,
-	0xEBB,
-	0xEBE,
-	0xEC0,
-	0xEC5,
-	0xEC6,
-	0xEC7,
-	0xECD,
-	0xECE,
-	0xED0,
-	0xEDA,
-	0xEDC,
-	0xEE0,
-	0xF00,
-	0xF01,
-	0xF20,
-	0xF2A,
-	0xF40,
-	0xF48,
-	0xF49,
-	0xF6D,
-	0xF71,
-	0xF82,
-	0xF88,
-	0xF98,
-	0xF99,
-	0xFBD,
-	0x1000,
-	0x1037,
-	0x1038,
-	0x1039,
-	0x103B,
-	0x104A,
-	0x1050,
-	0x1063,
-	0x1065,
-	0x1069,
-	0x106E,
-	0x1087,
-	0x108E,
-	0x108F,
-	0x1090,
-	0x109A,
-	0x109C,
-	0x109E,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x10D0,
-	0x10FB,
-	0x10FC,
-	0x1249,
-	0x124A,
-	0x124E,
-	0x1250,
-	0x1257,
-	0x1258,
-	0x1259,
-	0x125A,
-	0x125E,
-	0x1260,
-	0x1289,
-	0x128A,
-	0x128E,
-	0x1290,
-	0x12B1,
-	0x12B2,
-	0x12B6,
-	0x12B8,
-	0x12BF,
-	0x12C0,
-	0x12C1,
-	0x12C2,
-	0x12C6,
-	0x12C8,
-	0x12D7,
-	0x12D8,
-	0x1311,
-	0x1312,
-	0x1316,
-	0x1318,
-	0x135B,
-	0x135F,
-	0x1360,
-	0x1380,
-	0x1390,
-	0x13A0,
-	0x13F5,
-	0x1401,
-	0x166D,
-	0x166F,
-	0x1680,
-	0x1681,
-	0x169B,
-	0x16A0,
-	0x16EB,
-	0x16EE,
-	0x16F9,
-	0x1700,
-	0x170D,
-	0x170E,
-	0x1714,
-	0x1720,
-	0x1734,
-	0x1740,
-	0x1754,
-	0x1760,
-	0x176D,
-	0x176E,
-	0x1771,
-	0x1772,
-	0x1774,
-	0x1780,
-	0x17B4,
-	0x17B6,
-	0x17C9,
-	0x17D7,
-	0x17D8,
-	0x17DC,
-	0x17DD,
-	0x17E0,
-	0x17EA,
-	0x1810,
-	0x181A,
-	0x1820,
-	0x1878,
-	0x1880,
-	0x18AB,
-	0x18B0,
-	0x18F6,
-	0x1900,
-	0x191F,
-	0x1920,
-	0x192C,
-	0x1930,
-	0x1939,
-	0x1946,
-	0x196E,
-	0x1970,
-	0x1975,
-	0x1980,
-	0x19AC,
-	0x19B0,
-	0x19CA,
-	0x19D0,
-	0x19DA,
-	0x1A00,
-	0x1A1C,
-	0x1A20,
-	0x1A5F,
-	0x1A61,
-	0x1A75,
-	0x1A80,
-	0x1A8A,
-	0x1A90,
-	0x1A9A,
-	0x1AA7,
-	0x1AA8,
-	0x1B00,
-	0x1B34,
-	0x1B35,
-	0x1B44,
-	0x1B45,
-	0x1B4C,
-	0x1B50,
-	0x1B5A,
-	0x1B80,
-	0x1BAA,
-	0x1BAC,
-	0x1BE6,
-	0x1BE7,
-	0x1BF2,
-	0x1C00,
-	0x1C36,
-	0x1C40,
-	0x1C4A,
-	0x1C4D,
-	0x1C7E,
-	0x1CE9,
-	0x1CED,
-	0x1CEE,
-	0x1CF4,
-	0x1CF5,
-	0x1CF7,
-	0x1D00,
-	0x1DC0,
-	0x1DE7,
-	0x1DF5,
-	0x1E00,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FE0,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFD,
-	0x2071,
-	0x2072,
-	0x207F,
-	0x2080,
-	0x2090,
-	0x209D,
-	0x2102,
-	0x2103,
-	0x2107,
-	0x2108,
-	0x210A,
-	0x2114,
-	0x2115,
-	0x2116,
-	0x2119,
-	0x211E,
-	0x2124,
-	0x2125,
-	0x2126,
-	0x2127,
-	0x2128,
-	0x2129,
-	0x212A,
-	0x212E,
-	0x212F,
-	0x213A,
-	0x213C,
-	0x2140,
-	0x2145,
-	0x214A,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2189,
-	0x24B6,
-	0x24EA,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2CE5,
-	0x2CEB,
-	0x2CEF,
-	0x2CF2,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0x2D30,
-	0x2D68,
-	0x2D6F,
-	0x2D70,
-	0x2D80,
-	0x2D97,
-	0x2DA0,
-	0x2DA7,
-	0x2DA8,
-	0x2DAF,
-	0x2DB0,
-	0x2DB7,
-	0x2DB8,
-	0x2DBF,
-	0x2DC0,
-	0x2DC7,
-	0x2DC8,
-	0x2DCF,
-	0x2DD0,
-	0x2DD7,
-	0x2DD8,
-	0x2DDF,
-	0x2DE0,
-	0x2E00,
-	0x2E2F,
-	0x2E30,
-	0x3005,
-	0x3008,
-	0x3021,
-	0x302A,
-	0x3031,
-	0x3036,
-	0x3038,
-	0x303D,
-	0x3041,
-	0x3097,
-	0x309D,
-	0x30A0,
-	0x30A1,
-	0x30FB,
-	0x30FC,
-	0x3100,
-	0x3105,
-	0x312E,
-	0x3131,
-	0x318F,
-	0x31A0,
-	0x31BB,
-	0x31F0,
-	0x3200,
-	0x3400,
-	0x4DB6,
-	0x4E00,
-	0x9FCD,
-	0xA000,
-	0xA48D,
-	0xA4D0,
-	0xA4FE,
-	0xA500,
-	0xA60D,
-	0xA610,
-	0xA62C,
-	0xA640,
-	0xA66F,
-	0xA674,
-	0xA67C,
-	0xA67F,
-	0xA69E,
-	0xA69F,
-	0xA6F0,
-	0xA717,
-	0xA720,
-	0xA722,
-	0xA789,
-	0xA78B,
-	0xA78F,
-	0xA790,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xA7F7,
-	0xA802,
-	0xA803,
-	0xA806,
-	0xA807,
-	0xA80B,
-	0xA80C,
-	0xA828,
-	0xA840,
-	0xA874,
-	0xA880,
-	0xA8C4,
-	0xA8D0,
-	0xA8DA,
-	0xA8F2,
-	0xA8F8,
-	0xA8FB,
-	0xA8FC,
-	0xA900,
-	0xA92B,
-	0xA930,
-	0xA953,
-	0xA960,
-	0xA97D,
-	0xA980,
-	0xA9B3,
-	0xA9B4,
-	0xA9C0,
-	0xA9CF,
-	0xA9DA,
-	0xA9E0,
-	0xA9E5,
-	0xA9E6,
-	0xA9FF,
-	0xAA00,
-	0xAA37,
-	0xAA40,
-	0xAA4E,
-	0xAA50,
-	0xAA5A,
-	0xAA60,
-	0xAA77,
-	0xAA7A,
-	0xAA7B,
-	0xAA7E,
-	0xAABF,
-	0xAAC0,
-	0xAAC1,
-	0xAAC2,
-	0xAAC3,
-	0xAADB,
-	0xAADE,
-	0xAAE0,
-	0xAAF0,
-	0xAAF2,
-	0xAAF6,
-	0xAB01,
-	0xAB07,
-	0xAB09,
-	0xAB0F,
-	0xAB11,
-	0xAB17,
-	0xAB20,
-	0xAB27,
-	0xAB28,
-	0xAB2F,
-	0xAB30,
-	0xAB5B,
-	0xAB5C,
-	0xAB60,
-	0xAB64,
-	0xAB66,
-	0xABC0,
-	0xABEB,
-	0xABF0,
-	0xABFA,
-	0xAC00,
-	0xD7A4,
-	0xD7B0,
-	0xD7C7,
-	0xD7CB,
-	0xD7FC,
-	0xF900,
-	0xFA6E,
-	0xFA70,
-	0xFADA,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFB1D,
-	0xFB29,
-	0xFB2A,
-	0xFB37,
-	0xFB38,
-	0xFB3D,
-	0xFB3E,
-	0xFB3F,
-	0xFB40,
-	0xFB42,
-	0xFB43,
-	0xFB45,
-	0xFB46,
-	0xFBB2,
-	0xFBD3,
-	0xFD3E,
-	0xFD50,
-	0xFD90,
-	0xFD92,
-	0xFDC8,
-	0xFDF0,
-	0xFDFC,
-	0xFE70,
-	0xFE75,
-	0xFE76,
-	0xFEFD,
-	0xFF10,
-	0xFF1A,
-	0xFF21,
-	0xFF3B,
-	0xFF41,
-	0xFF5B,
-	0xFF66,
-	0xFFBF,
-	0xFFC2,
-	0xFFC8,
-	0xFFCA,
-	0xFFD0,
-	0xFFD2,
-	0xFFD8,
-	0xFFDA,
-	0xFFDD,
-	0x10000,
-	0x1000C,
-	0x1000D,
-	0x10027,
-	0x10028,
-	0x1003B,
-	0x1003C,
-	0x1003E,
-	0x1003F,
-	0x1004E,
-	0x10050,
-	0x1005E,
-	0x10080,
-	0x100FB,
-	0x10140,
-	0x10175,
-	0x10280,
-	0x1029D,
-	0x102A0,
-	0x102D1,
-	0x10300,
-	0x10320,
-	0x10330,
-	0x1034B,
-	0x10350,
-	0x1037B,
-	0x10380,
-	0x1039E,
-	0x103A0,
-	0x103C4,
-	0x103C8,
-	0x103D0,
-	0x103D1,
-	0x103D6,
-	0x10400,
-	0x1049E,
-	0x104A0,
-	0x104AA,
-	0x10500,
-	0x10528,
-	0x10530,
-	0x10564,
-	0x10600,
-	0x10737,
-	0x10740,
-	0x10756,
-	0x10760,
-	0x10768,
-	0x10800,
-	0x10806,
-	0x10808,
-	0x10809,
-	0x1080A,
-	0x10836,
-	0x10837,
-	0x10839,
-	0x1083C,
-	0x1083D,
-	0x1083F,
-	0x10856,
-	0x10860,
-	0x10877,
-	0x10880,
-	0x1089F,
-	0x10900,
-	0x10916,
-	0x10920,
-	0x1093A,
-	0x10980,
-	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
-	0x10A04,
-	0x10A05,
-	0x10A07,
-	0x10A0C,
-	0x10A14,
-	0x10A15,
-	0x10A18,
-	0x10A19,
-	0x10A34,
-	0x10A60,
-	0x10A7D,
-	0x10A80,
-	0x10A9D,
-	0x10AC0,
-	0x10AC8,
-	0x10AC9,
-	0x10AE5,
-	0x10B00,
-	0x10B36,
-	0x10B40,
-	0x10B56,
-	0x10B60,
-	0x10B73,
-	0x10B80,
-	0x10B92,
-	0x10C00,
-	0x10C49,
-	0x11000,
-	0x11046,
-	0x11066,
-	0x11070,
-	0x11082,
-	0x110B9,
-	0x110D0,
-	0x110E9,
-	0x110F0,
-	0x110FA,
-	0x11100,
-	0x11133,
-	0x11136,
-	0x11140,
-	0x11150,
-	0x11173,
-	0x11176,
-	0x11177,
-	0x11180,
-	0x111C0,
-	0x111C1,
-	0x111C5,
-	0x111D0,
-	0x111DB,
-	0x11200,
-	0x11212,
-	0x11213,
-	0x11235,
-	0x11237,
-	0x11238,
-	0x112B0,
-	0x112E9,
-	0x112F0,
-	0x112FA,
-	0x11301,
-	0x11304,
-	0x11305,
-	0x1130D,
-	0x1130F,
-	0x11311,
-	0x11313,
-	0x11329,
-	0x1132A,
-	0x11331,
-	0x11332,
-	0x11334,
-	0x11335,
-	0x1133A,
-	0x1133D,
-	0x11345,
-	0x11347,
-	0x11349,
-	0x1134B,
-	0x1134D,
-	0x11357,
-	0x11358,
-	0x1135D,
-	0x11364,
-	0x11480,
-	0x114C2,
-	0x114C4,
-	0x114C6,
-	0x114C7,
-	0x114C8,
-	0x114D0,
-	0x114DA,
-	0x11580,
-	0x115B6,
-	0x115B8,
-	0x115BF,
-	0x11600,
-	0x1163F,
-	0x11640,
-	0x11641,
-	0x11644,
-	0x11645,
-	0x11650,
-	0x1165A,
-	0x11680,
-	0x116B6,
-	0x116C0,
-	0x116CA,
-	0x118A0,
-	0x118EA,
-	0x118FF,
-	0x11900,
-	0x11AC0,
-	0x11AF9,
-	0x12000,
-	0x12399,
-	0x12400,
-	0x1246F,
-	0x13000,
-	0x1342F,
-	0x16800,
-	0x16A39,
-	0x16A40,
-	0x16A5F,
-	0x16A60,
-	0x16A6A,
-	0x16AD0,
-	0x16AEE,
-	0x16B00,
-	0x16B37,
-	0x16B40,
-	0x16B44,
-	0x16B50,
-	0x16B5A,
-	0x16B63,
-	0x16B78,
-	0x16B7D,
-	0x16B90,
-	0x16F00,
-	0x16F45,
-	0x16F50,
-	0x16F7F,
-	0x16F93,
-	0x16FA0,
-	0x1B000,
-	0x1B002,
-	0x1BC00,
-	0x1BC6B,
-	0x1BC70,
-	0x1BC7D,
-	0x1BC80,
-	0x1BC89,
-	0x1BC90,
-	0x1BC9A,
-	0x1BC9E,
-	0x1BC9F,
-	0x1D400,
-	0x1D455,
-	0x1D456,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D51E,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D552,
-	0x1D6A6,
-	0x1D6A8,
-	0x1D6C1,
-	0x1D6C2,
-	0x1D6DB,
-	0x1D6DC,
-	0x1D6FB,
-	0x1D6FC,
-	0x1D715,
-	0x1D716,
-	0x1D735,
-	0x1D736,
-	0x1D74F,
-	0x1D750,
-	0x1D76F,
-	0x1D770,
-	0x1D789,
-	0x1D78A,
-	0x1D7A9,
-	0x1D7AA,
-	0x1D7C3,
-	0x1D7C4,
-	0x1D7CC,
-	0x1D7CE,
-	0x1D800,
-	0x1E800,
-	0x1E8C5,
-	0x1EE00,
-	0x1EE04,
-	0x1EE05,
-	0x1EE20,
-	0x1EE21,
-	0x1EE23,
-	0x1EE24,
-	0x1EE25,
-	0x1EE27,
-	0x1EE28,
-	0x1EE29,
-	0x1EE33,
-	0x1EE34,
-	0x1EE38,
-	0x1EE39,
-	0x1EE3A,
-	0x1EE3B,
-	0x1EE3C,
-	0x1EE42,
-	0x1EE43,
-	0x1EE47,
-	0x1EE48,
-	0x1EE49,
-	0x1EE4A,
-	0x1EE4B,
-	0x1EE4C,
-	0x1EE4D,
-	0x1EE50,
-	0x1EE51,
-	0x1EE53,
-	0x1EE54,
-	0x1EE55,
-	0x1EE57,
-	0x1EE58,
-	0x1EE59,
-	0x1EE5A,
-	0x1EE5B,
-	0x1EE5C,
-	0x1EE5D,
-	0x1EE5E,
-	0x1EE5F,
-	0x1EE60,
-	0x1EE61,
-	0x1EE63,
-	0x1EE64,
-	0x1EE65,
-	0x1EE67,
-	0x1EE6B,
-	0x1EE6C,
-	0x1EE73,
-	0x1EE74,
-	0x1EE78,
-	0x1EE79,
-	0x1EE7D,
-	0x1EE7E,
-	0x1EE7F,
-	0x1EE80,
-	0x1EE8A,
-	0x1EE8B,
-	0x1EE9C,
-	0x1EEA1,
-	0x1EEA4,
-	0x1EEA5,
-	0x1EEAA,
-	0x1EEAB,
-	0x1EEBC,
-	0x1F130,
-	0x1F14A,
-	0x1F150,
-	0x1F16A,
-	0x1F170,
-	0x1F18A,
-	0x20000,
-	0x2A6D7,
-	0x2A700,
-	0x2B735,
-	0x2B740,
-	0x2B81E,
-	0x2F800,
-	0x2FA1E
-};
-
-static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 037 */
-	1223,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x42,
-	0x4A,
-	0x51,
-	0x5A,
-	0x62,
-	0x6A,
-	0x70,
-	0x79,
-	0x80,
-	0x8A,
-	0x8C,
-	0x8F,
-	0x91,
-	0x9D,
-	0x9E,
-	0x9F,
-	0xA0,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xAC,
-	0xAF,
-	0xC1,
-	0xCA,
-	0xCB,
-	0xD0,
-	0xD1,
-	0xDA,
-	0xDB,
-	0xE0,
-	0xE2,
-	0xEA,
-	0xEB,
-	0xF0,
-	0xFB,
-	0xFF,
-	0x100,
-	0x2C2,
-	0x2C6,
-	0x2D2,
-	0x2E0,
-	0x2E5,
-	0x2EC,
-	0x2ED,
-	0x2EE,
-	0x2EF,
-	0x345,
-	0x346,
-	0x370,
-	0x375,
-	0x376,
-	0x378,
-	0x37A,
-	0x37E,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x3F6,
-	0x3F7,
-	0x482,
-	0x48A,
-	0x530,
-	0x531,
-	0x557,
-	0x559,
-	0x55A,
-	0x561,
-	0x588,
-	0x5B0,
-	0x5BE,
-	0x5BF,
-	0x5C0,
-	0x5C1,
-	0x5C3,
-	0x5C4,
-	0x5C6,
-	0x5C7,
-	0x5C8,
-	0x5D0,
-	0x5EB,
-	0x5F0,
-	0x5F3,
-	0x610,
-	0x61B,
-	0x620,
-	0x658,
-	0x659,
-	0x660,
-	0x66E,
-	0x6D4,
-	0x6D5,
-	0x6DD,
-	0x6E1,
-	0x6E9,
-	0x6ED,
-	0x6F0,
-	0x6FA,
-	0x6FD,
-	0x6FF,
-	0x700,
-	0x710,
-	0x740,
-	0x74D,
-	0x7B2,
-	0x7CA,
-	0x7EB,
-	0x7F4,
-	0x7F6,
-	0x7FA,
-	0x7FB,
-	0x800,
-	0x818,
-	0x81A,
-	0x82D,
-	0x840,
-	0x859,
-	0x8A0,
-	0x8B3,
-	0x8E4,
-	0x8EA,
-	0x8F0,
-	0x93C,
-	0x93D,
-	0x94D,
-	0x94E,
-	0x951,
-	0x955,
-	0x964,
-	0x971,
-	0x984,
-	0x985,
-	0x98D,
-	0x98F,
-	0x991,
-	0x993,
-	0x9A9,
-	0x9AA,
-	0x9B1,
-	0x9B2,
-	0x9B3,
-	0x9B6,
-	0x9BA,
-	0x9BD,
-	0x9C5,
-	0x9C7,
-	0x9C9,
-	0x9CB,
-	0x9CD,
-	0x9CE,
-	0x9CF,
-	0x9D7,
-	0x9D8,
-	0x9DC,
-	0x9DE,
-	0x9DF,
-	0x9E4,
-	0x9F0,
-	0x9F2,
-	0xA01,
-	0xA04,
-	0xA05,
-	0xA0B,
-	0xA0F,
-	0xA11,
-	0xA13,
-	0xA29,
-	0xA2A,
-	0xA31,
-	0xA32,
-	0xA34,
-	0xA35,
-	0xA37,
-	0xA38,
-	0xA3A,
-	0xA3E,
-	0xA43,
-	0xA47,
-	0xA49,
-	0xA4B,
-	0xA4D,
-	0xA51,
-	0xA52,
-	0xA59,
-	0xA5D,
-	0xA5E,
-	0xA5F,
-	0xA70,
-	0xA76,
-	0xA81,
-	0xA84,
-	0xA85,
-	0xA8E,
-	0xA8F,
-	0xA92,
-	0xA93,
-	0xAA9,
-	0xAAA,
-	0xAB1,
-	0xAB2,
-	0xAB4,
-	0xAB5,
-	0xABA,
-	0xABD,
-	0xAC6,
-	0xAC7,
-	0xACA,
-	0xACB,
-	0xACD,
-	0xAD0,
-	0xAD1,
-	0xAE0,
-	0xAE4,
-	0xB01,
-	0xB04,
-	0xB05,
-	0xB0D,
-	0xB0F,
-	0xB11,
-	0xB13,
-	0xB29,
-	0xB2A,
-	0xB31,
-	0xB32,
-	0xB34,
-	0xB35,
-	0xB3A,
-	0xB3D,
-	0xB45,
-	0xB47,
-	0xB49,
-	0xB4B,
-	0xB4D,
-	0xB56,
-	0xB58,
-	0xB5C,
-	0xB5E,
-	0xB5F,
-	0xB64,
-	0xB71,
-	0xB72,
-	0xB82,
-	0xB84,
-	0xB85,
-	0xB8B,
-	0xB8E,
-	0xB91,
-	0xB92,
-	0xB96,
-	0xB99,
-	0xB9B,
-	0xB9C,
-	0xB9D,
-	0xB9E,
-	0xBA0,
-	0xBA3,
-	0xBA5,
-	0xBA8,
-	0xBAB,
-	0xBAE,
-	0xBBA,
-	0xBBE,
-	0xBC3,
-	0xBC6,
-	0xBC9,
-	0xBCA,
-	0xBCD,
-	0xBD0,
-	0xBD1,
-	0xBD7,
-	0xBD8,
-	0xC00,
-	0xC04,
-	0xC05,
-	0xC0D,
-	0xC0E,
-	0xC11,
-	0xC12,
-	0xC29,
-	0xC2A,
-	0xC3A,
-	0xC3D,
-	0xC45,
-	0xC46,
-	0xC49,
-	0xC4A,
-	0xC4D,
-	0xC55,
-	0xC57,
-	0xC58,
-	0xC5A,
-	0xC60,
-	0xC64,
-	0xC81,
-	0xC84,
-	0xC85,
-	0xC8D,
-	0xC8E,
-	0xC91,
-	0xC92,
-	0xCA9,
-	0xCAA,
-	0xCB4,
-	0xCB5,
-	0xCBA,
-	0xCBD,
-	0xCC5,
-	0xCC6,
-	0xCC9,
-	0xCCA,
-	0xCCD,
-	0xCD5,
-	0xCD7,
-	0xCDE,
-	0xCDF,
-	0xCE0,
-	0xCE4,
-	0xCF1,
-	0xCF3,
-	0xD01,
-	0xD04,
-	0xD05,
-	0xD0D,
-	0xD0E,
-	0xD11,
-	0xD12,
-	0xD3B,
-	0xD3D,
-	0xD45,
-	0xD46,
-	0xD49,
-	0xD4A,
-	0xD4D,
-	0xD4E,
-	0xD4F,
-	0xD57,
-	0xD58,
-	0xD60,
-	0xD64,
-	0xD7A,
-	0xD80,
-	0xD82,
-	0xD84,
-	0xD85,
-	0xD97,
-	0xD9A,
-	0xDB2,
-	0xDB3,
-	0xDBC,
-	0xDBD,
-	0xDBE,
-	0xDC0,
-	0xDC7,
-	0xDCF,
-	0xDD5,
-	0xDD6,
-	0xDD7,
-	0xDD8,
-	0xDE0,
-	0xDF2,
-	0xDF4,
-	0xE01,
-	0xE3B,
-	0xE40,
-	0xE47,
-	0xE4D,
-	0xE4E,
-	0xE81,
-	0xE83,
-	0xE84,
-	0xE85,
-	0xE87,
-	0xE89,
-	0xE8A,
-	0xE8B,
-	0xE8D,
-	0xE8E,
-	0xE94,
-	0xE98,
-	0xE99,
-	0xEA0,
-	0xEA1,
-	0xEA4,
-	0xEA5,
-	0xEA6,
-	0xEA7,
-	0xEA8,
-	0xEAA,
-	0xEAC,
-	0xEAD,
-	0xEBA,
-	0xEBB,
-	0xEBE,
-	0xEC0,
-	0xEC5,
-	0xEC6,
-	0xEC7,
-	0xECD,
-	0xECE,
-	0xEDC,
-	0xEE0,
-	0xF00,
-	0xF01,
-	0xF40,
-	0xF48,
-	0xF49,
-	0xF6D,
-	0xF71,
-	0xF82,
-	0xF88,
-	0xF98,
-	0xF99,
-	0xFBD,
-	0x1000,
-	0x1037,
-	0x1038,
-	0x1039,
-	0x103B,
-	0x1040,
-	0x1050,
-	0x1063,
-	0x1065,
-	0x1069,
-	0x106E,
-	0x1087,
-	0x108E,
-	0x108F,
-	0x109C,
-	0x109E,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x10D0,
-	0x10FB,
-	0x10FC,
-	0x1249,
-	0x124A,
-	0x124E,
-	0x1250,
-	0x1257,
-	0x1258,
-	0x1259,
-	0x125A,
-	0x125E,
-	0x1260,
-	0x1289,
-	0x128A,
-	0x128E,
-	0x1290,
-	0x12B1,
-	0x12B2,
-	0x12B6,
-	0x12B8,
-	0x12BF,
-	0x12C0,
-	0x12C1,
-	0x12C2,
-	0x12C6,
-	0x12C8,
-	0x12D7,
-	0x12D8,
-	0x1311,
-	0x1312,
-	0x1316,
-	0x1318,
-	0x135B,
-	0x135F,
-	0x1360,
-	0x1380,
-	0x1390,
-	0x13A0,
-	0x13F5,
-	0x1401,
-	0x166D,
-	0x166F,
-	0x1680,
-	0x1681,
-	0x169B,
-	0x16A0,
-	0x16EB,
-	0x16EE,
-	0x16F9,
-	0x1700,
-	0x170D,
-	0x170E,
-	0x1714,
-	0x1720,
-	0x1734,
-	0x1740,
-	0x1754,
-	0x1760,
-	0x176D,
-	0x176E,
-	0x1771,
-	0x1772,
-	0x1774,
-	0x1780,
-	0x17B4,
-	0x17B6,
-	0x17C9,
-	0x17D7,
-	0x17D8,
-	0x17DC,
-	0x17DD,
-	0x1820,
-	0x1878,
-	0x1880,
-	0x18AB,
-	0x18B0,
-	0x18F6,
-	0x1900,
-	0x191F,
-	0x1920,
-	0x192C,
-	0x1930,
-	0x1939,
-	0x1950,
-	0x196E,
-	0x1970,
-	0x1975,
-	0x1980,
-	0x19AC,
-	0x19B0,
-	0x19CA,
-	0x1A00,
-	0x1A1C,
-	0x1A20,
-	0x1A5F,
-	0x1A61,
-	0x1A75,
-	0x1AA7,
-	0x1AA8,
-	0x1B00,
-	0x1B34,
-	0x1B35,
-	0x1B44,
-	0x1B45,
-	0x1B4C,
-	0x1B80,
-	0x1BAA,
-	0x1BAC,
-	0x1BB0,
-	0x1BBA,
-	0x1BE6,
-	0x1BE7,
-	0x1BF2,
-	0x1C00,
-	0x1C36,
-	0x1C4D,
-	0x1C50,
-	0x1C5A,
-	0x1C7E,
-	0x1CE9,
-	0x1CED,
-	0x1CEE,
-	0x1CF4,
-	0x1CF5,
-	0x1CF7,
-	0x1D00,
-	0x1DC0,
-	0x1DE7,
-	0x1DF5,
-	0x1E00,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FE0,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFD,
-	0x2071,
-	0x2072,
-	0x207F,
-	0x2080,
-	0x2090,
-	0x209D,
-	0x2102,
-	0x2103,
-	0x2107,
-	0x2108,
-	0x210A,
-	0x2114,
-	0x2115,
-	0x2116,
-	0x2119,
-	0x211E,
-	0x2124,
-	0x2125,
-	0x2126,
-	0x2127,
-	0x2128,
-	0x2129,
-	0x212A,
-	0x212E,
-	0x212F,
-	0x213A,
-	0x213C,
-	0x2140,
-	0x2145,
-	0x214A,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2189,
-	0x24B6,
-	0x24EA,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2CE5,
-	0x2CEB,
-	0x2CEF,
-	0x2CF2,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0x2D30,
-	0x2D68,
-	0x2D6F,
-	0x2D70,
-	0x2D80,
-	0x2D97,
-	0x2DA0,
-	0x2DA7,
-	0x2DA8,
-	0x2DAF,
-	0x2DB0,
-	0x2DB7,
-	0x2DB8,
-	0x2DBF,
-	0x2DC0,
-	0x2DC7,
-	0x2DC8,
-	0x2DCF,
-	0x2DD0,
-	0x2DD7,
-	0x2DD8,
-	0x2DDF,
-	0x2DE0,
-	0x2E00,
-	0x2E2F,
-	0x2E30,
-	0x3005,
-	0x3008,
-	0x3021,
-	0x302A,
-	0x3031,
-	0x3036,
-	0x3038,
-	0x303D,
-	0x3041,
-	0x3097,
-	0x309D,
-	0x30A0,
-	0x30A1,
-	0x30FB,
-	0x30FC,
-	0x3100,
-	0x3105,
-	0x312E,
-	0x3131,
-	0x318F,
-	0x31A0,
-	0x31BB,
-	0x31F0,
-	0x3200,
-	0x3400,
-	0x4DB6,
-	0x4E00,
-	0x9FCD,
-	0xA000,
-	0xA48D,
-	0xA4D0,
-	0xA4FE,
-	0xA500,
-	0xA60D,
-	0xA610,
-	0xA620,
-	0xA62A,
-	0xA62C,
-	0xA640,
-	0xA66F,
-	0xA674,
-	0xA67C,
-	0xA67F,
-	0xA69E,
-	0xA69F,
-	0xA6F0,
-	0xA717,
-	0xA720,
-	0xA722,
-	0xA789,
-	0xA78B,
-	0xA78F,
-	0xA790,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xA7F7,
-	0xA802,
-	0xA803,
-	0xA806,
-	0xA807,
-	0xA80B,
-	0xA80C,
-	0xA828,
-	0xA840,
-	0xA874,
-	0xA880,
-	0xA8C4,
-	0xA8F2,
-	0xA8F8,
-	0xA8FB,
-	0xA8FC,
-	0xA90A,
-	0xA92B,
-	0xA930,
-	0xA953,
-	0xA960,
-	0xA97D,
-	0xA980,
-	0xA9B3,
-	0xA9B4,
-	0xA9C0,
-	0xA9CF,
-	0xA9D0,
-	0xA9E0,
-	0xA9E5,
-	0xA9E6,
-	0xA9F0,
-	0xA9FA,
-	0xA9FF,
-	0xAA00,
-	0xAA37,
-	0xAA40,
-	0xAA4E,
-	0xAA60,
-	0xAA77,
-	0xAA7A,
-	0xAA7B,
-	0xAA7E,
-	0xAABF,
-	0xAAC0,
-	0xAAC1,
-	0xAAC2,
-	0xAAC3,
-	0xAADB,
-	0xAADE,
-	0xAAE0,
-	0xAAF0,
-	0xAAF2,
-	0xAAF6,
-	0xAB01,
-	0xAB07,
-	0xAB09,
-	0xAB0F,
-	0xAB11,
-	0xAB17,
-	0xAB20,
-	0xAB27,
-	0xAB28,
-	0xAB2F,
-	0xAB30,
-	0xAB5B,
-	0xAB5C,
-	0xAB60,
-	0xAB64,
-	0xAB66,
-	0xABC0,
-	0xABEB,
-	0xAC00,
-	0xD7A4,
-	0xD7B0,
-	0xD7C7,
-	0xD7CB,
-	0xD7FC,
-	0xF900,
-	0xFA6E,
-	0xFA70,
-	0xFADA,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFB1D,
-	0xFB29,
-	0xFB2A,
-	0xFB37,
-	0xFB38,
-	0xFB3D,
-	0xFB3E,
-	0xFB3F,
-	0xFB40,
-	0xFB42,
-	0xFB43,
-	0xFB45,
-	0xFB46,
-	0xFBB2,
-	0xFBD3,
-	0xFD3E,
-	0xFD50,
-	0xFD90,
-	0xFD92,
-	0xFDC8,
-	0xFDF0,
-	0xFDFC,
-	0xFE70,
-	0xFE75,
-	0xFE76,
-	0xFEFD,
-	0xFF21,
-	0xFF3B,
-	0xFF41,
-	0xFF5B,
-	0xFF66,
-	0xFFBF,
-	0xFFC2,
-	0xFFC8,
-	0xFFCA,
-	0xFFD0,
-	0xFFD2,
-	0xFFD8,
-	0xFFDA,
-	0xFFDD,
-	0x10000,
-	0x1000C,
-	0x1000D,
-	0x10027,
-	0x10028,
-	0x1003B,
-	0x1003C,
-	0x1003E,
-	0x1003F,
-	0x1004E,
-	0x10050,
-	0x1005E,
-	0x10080,
-	0x100FB,
-	0x10140,
-	0x10175,
-	0x10280,
-	0x1029D,
-	0x102A0,
-	0x102D1,
-	0x10300,
-	0x10320,
-	0x10330,
-	0x1034B,
-	0x10350,
-	0x1037B,
-	0x10380,
-	0x1039E,
-	0x103A0,
-	0x103C4,
-	0x103C8,
-	0x103D0,
-	0x103D1,
-	0x103D6,
-	0x10400,
-	0x1049E,
-	0x10500,
-	0x10528,
-	0x10530,
-	0x10564,
-	0x10600,
-	0x10737,
-	0x10740,
-	0x10756,
-	0x10760,
-	0x10768,
-	0x10800,
-	0x10806,
-	0x10808,
-	0x10809,
-	0x1080A,
-	0x10836,
-	0x10837,
-	0x10839,
-	0x1083C,
-	0x1083D,
-	0x1083F,
-	0x10856,
-	0x10860,
-	0x10877,
-	0x10880,
-	0x1089F,
-	0x10900,
-	0x10916,
-	0x10920,
-	0x1093A,
-	0x10980,
-	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
-	0x10A04,
-	0x10A05,
-	0x10A07,
-	0x10A0C,
-	0x10A14,
-	0x10A15,
-	0x10A18,
-	0x10A19,
-	0x10A34,
-	0x10A60,
-	0x10A7D,
-	0x10A80,
-	0x10A9D,
-	0x10AC0,
-	0x10AC8,
-	0x10AC9,
-	0x10AE5,
-	0x10B00,
-	0x10B36,
-	0x10B40,
-	0x10B56,
-	0x10B60,
-	0x10B73,
-	0x10B80,
-	0x10B92,
-	0x10C00,
-	0x10C49,
-	0x11000,
-	0x11046,
-	0x11082,
-	0x110B9,
-	0x110D0,
-	0x110E9,
-	0x11100,
-	0x11133,
-	0x11150,
-	0x11173,
-	0x11176,
-	0x11177,
-	0x11180,
-	0x111C0,
-	0x111C1,
-	0x111C5,
-	0x111DA,
-	0x111DB,
-	0x11200,
-	0x11212,
-	0x11213,
-	0x11235,
-	0x11237,
-	0x11238,
-	0x112B0,
-	0x112E9,
-	0x11301,
-	0x11304,
-	0x11305,
-	0x1130D,
-	0x1130F,
-	0x11311,
-	0x11313,
-	0x11329,
-	0x1132A,
-	0x11331,
-	0x11332,
-	0x11334,
-	0x11335,
-	0x1133A,
-	0x1133D,
-	0x11345,
-	0x11347,
-	0x11349,
-	0x1134B,
-	0x1134D,
-	0x11357,
-	0x11358,
-	0x1135D,
-	0x11364,
-	0x11480,
-	0x114C2,
-	0x114C4,
-	0x114C6,
-	0x114C7,
-	0x114C8,
-	0x11580,
-	0x115B6,
-	0x115B8,
-	0x115BF,
-	0x11600,
-	0x1163F,
-	0x11640,
-	0x11641,
-	0x11644,
-	0x11645,
-	0x11680,
-	0x116B6,
-	0x118A0,
-	0x118E0,
-	0x118FF,
-	0x11900,
-	0x11AC0,
-	0x11AF9,
-	0x12000,
-	0x12399,
-	0x12400,
-	0x1246F,
-	0x13000,
-	0x1342F,
-	0x16800,
-	0x16A39,
-	0x16A40,
-	0x16A5F,
-	0x16AD0,
-	0x16AEE,
-	0x16B00,
-	0x16B37,
-	0x16B40,
-	0x16B44,
-	0x16B63,
-	0x16B78,
-	0x16B7D,
-	0x16B90,
-	0x16F00,
-	0x16F45,
-	0x16F50,
-	0x16F7F,
-	0x16F93,
-	0x16FA0,
-	0x1B000,
-	0x1B002,
-	0x1BC00,
-	0x1BC6B,
-	0x1BC70,
-	0x1BC7D,
-	0x1BC80,
-	0x1BC89,
-	0x1BC90,
-	0x1BC9A,
-	0x1BC9E,
-	0x1BC9F,
-	0x1D400,
-	0x1D455,
-	0x1D456,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D51E,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D552,
-	0x1D6A6,
-	0x1D6A8,
-	0x1D6C1,
-	0x1D6C2,
-	0x1D6DB,
-	0x1D6DC,
-	0x1D6FB,
-	0x1D6FC,
-	0x1D715,
-	0x1D716,
-	0x1D735,
-	0x1D736,
-	0x1D74F,
-	0x1D750,
-	0x1D76F,
-	0x1D770,
-	0x1D789,
-	0x1D78A,
-	0x1D7A9,
-	0x1D7AA,
-	0x1D7C3,
-	0x1D7C4,
-	0x1D7CC,
-	0x1E800,
-	0x1E8C5,
-	0x1EE00,
-	0x1EE04,
-	0x1EE05,
-	0x1EE20,
-	0x1EE21,
-	0x1EE23,
-	0x1EE24,
-	0x1EE25,
-	0x1EE27,
-	0x1EE28,
-	0x1EE29,
-	0x1EE33,
-	0x1EE34,
-	0x1EE38,
-	0x1EE39,
-	0x1EE3A,
-	0x1EE3B,
-	0x1EE3C,
-	0x1EE42,
-	0x1EE43,
-	0x1EE47,
-	0x1EE48,
-	0x1EE49,
-	0x1EE4A,
-	0x1EE4B,
-	0x1EE4C,
-	0x1EE4D,
-	0x1EE50,
-	0x1EE51,
-	0x1EE53,
-	0x1EE54,
-	0x1EE55,
-	0x1EE57,
-	0x1EE58,
-	0x1EE59,
-	0x1EE5A,
-	0x1EE5B,
-	0x1EE5C,
-	0x1EE5D,
-	0x1EE5E,
-	0x1EE5F,
-	0x1EE60,
-	0x1EE61,
-	0x1EE63,
-	0x1EE64,
-	0x1EE65,
-	0x1EE67,
-	0x1EE6B,
-	0x1EE6C,
-	0x1EE73,
-	0x1EE74,
-	0x1EE78,
-	0x1EE79,
-	0x1EE7D,
-	0x1EE7E,
-	0x1EE7F,
-	0x1EE80,
-	0x1EE8A,
-	0x1EE8B,
-	0x1EE9C,
-	0x1EEA1,
-	0x1EEA4,
-	0x1EEA5,
-	0x1EEAA,
-	0x1EEAB,
-	0x1EEBC,
-	0x1F130,
-	0x1F14A,
-	0x1F150,
-	0x1F16A,
-	0x1F170,
-	0x1F18A,
-	0x20000,
-	0x2A6D7,
-	0x2A700,
-	0x2B735,
-	0x2B740,
-	0x2B81E,
-	0x2F800,
-	0x2FA1E
-};
-
-static const UV XPosixBlank_invlist[] = { /* for EBCDIC 037 */
-	15,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x5,
-	0x6,
-	0x40,
-	0x42,
-	0x1680,
-	0x1681,
-	0x2000,
-	0x200B,
-	0x202F,
-	0x2030,
-	0x205F,
-	0x2060,
-	0x3000,
-	0x3001
-};
-
-static const UV XPosixCntrl_invlist[] = { /* for EBCDIC 037 */
-	4,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	0,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x40,
-	0xFF,
-	0x100
-};
-
-static const UV XPosixDigit_invlist[] = { /* for EBCDIC 037 */
-	101,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0xF0,
-	0xFA,
-	0x660,
-	0x66A,
-	0x6F0,
-	0x6FA,
-	0x7C0,
-	0x7CA,
-	0x966,
-	0x970,
-	0x9E6,
-	0x9F0,
-	0xA66,
-	0xA70,
-	0xAE6,
-	0xAF0,
-	0xB66,
-	0xB70,
-	0xBE6,
-	0xBF0,
-	0xC66,
-	0xC70,
-	0xCE6,
-	0xCF0,
-	0xD66,
-	0xD70,
-	0xDE6,
-	0xDF0,
-	0xE50,
-	0xE5A,
-	0xED0,
-	0xEDA,
-	0xF20,
-	0xF2A,
-	0x1040,
-	0x104A,
-	0x1090,
-	0x109A,
-	0x17E0,
-	0x17EA,
-	0x1810,
-	0x181A,
-	0x1946,
-	0x1950,
-	0x19D0,
-	0x19DA,
-	0x1A80,
-	0x1A8A,
-	0x1A90,
-	0x1A9A,
-	0x1B50,
-	0x1B5A,
-	0x1BB0,
-	0x1BBA,
-	0x1C40,
-	0x1C4A,
-	0x1C50,
-	0x1C5A,
-	0xA620,
-	0xA62A,
-	0xA8D0,
-	0xA8DA,
-	0xA900,
-	0xA90A,
-	0xA9D0,
-	0xA9DA,
-	0xA9F0,
-	0xA9FA,
-	0xAA50,
-	0xAA5A,
-	0xABF0,
-	0xABFA,
-	0xFF10,
-	0xFF1A,
-	0x104A0,
-	0x104AA,
-	0x11066,
-	0x11070,
-	0x110F0,
-	0x110FA,
-	0x11136,
-	0x11140,
-	0x111D0,
-	0x111DA,
-	0x112F0,
-	0x112FA,
-	0x114D0,
-	0x114DA,
-	0x11650,
-	0x1165A,
-	0x116C0,
-	0x116CA,
-	0x118E0,
-	0x118EA,
-	0x16A60,
-	0x16A6A,
-	0x16B50,
-	0x16B5A,
-	0x1D7CE,
-	0x1D800
-};
-
-static const UV XPosixGraph_invlist[] = { /* for EBCDIC 037 */
-	1211,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x42,
-	0xFF,
-	0x100,
-	0x378,
-	0x37A,
-	0x380,
-	0x384,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x530,
-	0x531,
-	0x557,
-	0x559,
-	0x560,
-	0x561,
-	0x588,
-	0x589,
-	0x58B,
-	0x58D,
-	0x590,
-	0x591,
-	0x5C8,
-	0x5D0,
-	0x5EB,
-	0x5F0,
-	0x5F5,
-	0x600,
-	0x61D,
-	0x61E,
-	0x70E,
-	0x70F,
-	0x74B,
-	0x74D,
-	0x7B2,
-	0x7C0,
-	0x7FB,
-	0x800,
-	0x82E,
-	0x830,
-	0x83F,
-	0x840,
-	0x85C,
-	0x85E,
-	0x85F,
-	0x8A0,
-	0x8B3,
-	0x8E4,
-	0x984,
-	0x985,
-	0x98D,
-	0x98F,
-	0x991,
-	0x993,
-	0x9A9,
-	0x9AA,
-	0x9B1,
-	0x9B2,
-	0x9B3,
-	0x9B6,
-	0x9BA,
-	0x9BC,
-	0x9C5,
-	0x9C7,
-	0x9C9,
-	0x9CB,
-	0x9CF,
-	0x9D7,
-	0x9D8,
-	0x9DC,
-	0x9DE,
-	0x9DF,
-	0x9E4,
-	0x9E6,
-	0x9FC,
-	0xA01,
-	0xA04,
-	0xA05,
-	0xA0B,
-	0xA0F,
-	0xA11,
-	0xA13,
-	0xA29,
-	0xA2A,
-	0xA31,
-	0xA32,
-	0xA34,
-	0xA35,
-	0xA37,
-	0xA38,
-	0xA3A,
-	0xA3C,
-	0xA3D,
-	0xA3E,
-	0xA43,
-	0xA47,
-	0xA49,
-	0xA4B,
-	0xA4E,
-	0xA51,
-	0xA52,
-	0xA59,
-	0xA5D,
-	0xA5E,
-	0xA5F,
-	0xA66,
-	0xA76,
-	0xA81,
-	0xA84,
-	0xA85,
-	0xA8E,
-	0xA8F,
-	0xA92,
-	0xA93,
-	0xAA9,
-	0xAAA,
-	0xAB1,
-	0xAB2,
-	0xAB4,
-	0xAB5,
-	0xABA,
-	0xABC,
-	0xAC6,
-	0xAC7,
-	0xACA,
-	0xACB,
-	0xACE,
-	0xAD0,
-	0xAD1,
-	0xAE0,
-	0xAE4,
-	0xAE6,
-	0xAF2,
-	0xB01,
-	0xB04,
-	0xB05,
-	0xB0D,
-	0xB0F,
-	0xB11,
-	0xB13,
-	0xB29,
-	0xB2A,
-	0xB31,
-	0xB32,
-	0xB34,
-	0xB35,
-	0xB3A,
-	0xB3C,
-	0xB45,
-	0xB47,
-	0xB49,
-	0xB4B,
-	0xB4E,
-	0xB56,
-	0xB58,
-	0xB5C,
-	0xB5E,
-	0xB5F,
-	0xB64,
-	0xB66,
-	0xB78,
-	0xB82,
-	0xB84,
-	0xB85,
-	0xB8B,
-	0xB8E,
-	0xB91,
-	0xB92,
-	0xB96,
-	0xB99,
-	0xB9B,
-	0xB9C,
-	0xB9D,
-	0xB9E,
-	0xBA0,
-	0xBA3,
-	0xBA5,
-	0xBA8,
-	0xBAB,
-	0xBAE,
-	0xBBA,
-	0xBBE,
-	0xBC3,
-	0xBC6,
-	0xBC9,
-	0xBCA,
-	0xBCE,
-	0xBD0,
-	0xBD1,
-	0xBD7,
-	0xBD8,
-	0xBE6,
-	0xBFB,
-	0xC00,
-	0xC04,
-	0xC05,
-	0xC0D,
-	0xC0E,
-	0xC11,
-	0xC12,
-	0xC29,
-	0xC2A,
-	0xC3A,
-	0xC3D,
-	0xC45,
-	0xC46,
-	0xC49,
-	0xC4A,
-	0xC4E,
-	0xC55,
-	0xC57,
-	0xC58,
-	0xC5A,
-	0xC60,
-	0xC64,
-	0xC66,
-	0xC70,
-	0xC78,
-	0xC80,
-	0xC81,
-	0xC84,
-	0xC85,
-	0xC8D,
-	0xC8E,
-	0xC91,
-	0xC92,
-	0xCA9,
-	0xCAA,
-	0xCB4,
-	0xCB5,
-	0xCBA,
-	0xCBC,
-	0xCC5,
-	0xCC6,
-	0xCC9,
-	0xCCA,
-	0xCCE,
-	0xCD5,
-	0xCD7,
-	0xCDE,
-	0xCDF,
-	0xCE0,
-	0xCE4,
-	0xCE6,
-	0xCF0,
-	0xCF1,
-	0xCF3,
-	0xD01,
-	0xD04,
-	0xD05,
-	0xD0D,
-	0xD0E,
-	0xD11,
-	0xD12,
-	0xD3B,
-	0xD3D,
-	0xD45,
-	0xD46,
-	0xD49,
-	0xD4A,
-	0xD4F,
-	0xD57,
-	0xD58,
-	0xD60,
-	0xD64,
-	0xD66,
-	0xD76,
-	0xD79,
-	0xD80,
-	0xD82,
-	0xD84,
-	0xD85,
-	0xD97,
-	0xD9A,
-	0xDB2,
-	0xDB3,
-	0xDBC,
-	0xDBD,
-	0xDBE,
-	0xDC0,
-	0xDC7,
-	0xDCA,
-	0xDCB,
-	0xDCF,
-	0xDD5,
-	0xDD6,
-	0xDD7,
-	0xDD8,
-	0xDE0,
-	0xDE6,
-	0xDF0,
-	0xDF2,
-	0xDF5,
-	0xE01,
-	0xE3B,
-	0xE3F,
-	0xE5C,
-	0xE81,
-	0xE83,
-	0xE84,
-	0xE85,
-	0xE87,
-	0xE89,
-	0xE8A,
-	0xE8B,
-	0xE8D,
-	0xE8E,
-	0xE94,
-	0xE98,
-	0xE99,
-	0xEA0,
-	0xEA1,
-	0xEA4,
-	0xEA5,
-	0xEA6,
-	0xEA7,
-	0xEA8,
-	0xEAA,
-	0xEAC,
-	0xEAD,
-	0xEBA,
-	0xEBB,
-	0xEBE,
-	0xEC0,
-	0xEC5,
-	0xEC6,
-	0xEC7,
-	0xEC8,
-	0xECE,
-	0xED0,
-	0xEDA,
-	0xEDC,
-	0xEE0,
-	0xF00,
-	0xF48,
-	0xF49,
-	0xF6D,
-	0xF71,
-	0xF98,
-	0xF99,
-	0xFBD,
-	0xFBE,
-	0xFCD,
-	0xFCE,
-	0xFDB,
-	0x1000,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x10D0,
-	0x1249,
-	0x124A,
-	0x124E,
-	0x1250,
-	0x1257,
-	0x1258,
-	0x1259,
-	0x125A,
-	0x125E,
-	0x1260,
-	0x1289,
-	0x128A,
-	0x128E,
-	0x1290,
-	0x12B1,
-	0x12B2,
-	0x12B6,
-	0x12B8,
-	0x12BF,
-	0x12C0,
-	0x12C1,
-	0x12C2,
-	0x12C6,
-	0x12C8,
-	0x12D7,
-	0x12D8,
-	0x1311,
-	0x1312,
-	0x1316,
-	0x1318,
-	0x135B,
-	0x135D,
-	0x137D,
-	0x1380,
-	0x139A,
-	0x13A0,
-	0x13F5,
-	0x1400,
-	0x1680,
-	0x1681,
-	0x169D,
-	0x16A0,
-	0x16F9,
-	0x1700,
-	0x170D,
-	0x170E,
-	0x1715,
-	0x1720,
-	0x1737,
-	0x1740,
-	0x1754,
-	0x1760,
-	0x176D,
-	0x176E,
-	0x1771,
-	0x1772,
-	0x1774,
-	0x1780,
-	0x17DE,
-	0x17E0,
-	0x17EA,
-	0x17F0,
-	0x17FA,
-	0x1800,
-	0x180F,
-	0x1810,
-	0x181A,
-	0x1820,
-	0x1878,
-	0x1880,
-	0x18AB,
-	0x18B0,
-	0x18F6,
-	0x1900,
-	0x191F,
-	0x1920,
-	0x192C,
-	0x1930,
-	0x193C,
-	0x1940,
-	0x1941,
-	0x1944,
-	0x196E,
-	0x1970,
-	0x1975,
-	0x1980,
-	0x19AC,
-	0x19B0,
-	0x19CA,
-	0x19D0,
-	0x19DB,
-	0x19DE,
-	0x1A1C,
-	0x1A1E,
-	0x1A5F,
-	0x1A60,
-	0x1A7D,
-	0x1A7F,
-	0x1A8A,
-	0x1A90,
-	0x1A9A,
-	0x1AA0,
-	0x1AAE,
-	0x1AB0,
-	0x1ABF,
-	0x1B00,
-	0x1B4C,
-	0x1B50,
-	0x1B7D,
-	0x1B80,
-	0x1BF4,
-	0x1BFC,
-	0x1C38,
-	0x1C3B,
-	0x1C4A,
-	0x1C4D,
-	0x1C80,
-	0x1CC0,
-	0x1CC8,
-	0x1CD0,
-	0x1CF7,
-	0x1CF8,
-	0x1CFA,
-	0x1D00,
-	0x1DF6,
-	0x1DFC,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FC5,
-	0x1FC6,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FDD,
-	0x1FF0,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFF,
-	0x200B,
-	0x2028,
-	0x202A,
-	0x202F,
-	0x2030,
-	0x205F,
-	0x2060,
-	0x2065,
-	0x2066,
-	0x2072,
-	0x2074,
-	0x208F,
-	0x2090,
-	0x209D,
-	0x20A0,
-	0x20BE,
-	0x20D0,
-	0x20F1,
-	0x2100,
-	0x218A,
-	0x2190,
-	0x23FB,
-	0x2400,
-	0x2427,
-	0x2440,
-	0x244B,
-	0x2460,
-	0x2B74,
-	0x2B76,
-	0x2B96,
-	0x2B98,
-	0x2BBA,
-	0x2BBD,
-	0x2BC9,
-	0x2BCA,
-	0x2BD2,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2CF4,
-	0x2CF9,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0x2D30,
-	0x2D68,
-	0x2D6F,
-	0x2D71,
-	0x2D7F,
-	0x2D97,
-	0x2DA0,
-	0x2DA7,
-	0x2DA8,
-	0x2DAF,
-	0x2DB0,
-	0x2DB7,
-	0x2DB8,
-	0x2DBF,
-	0x2DC0,
-	0x2DC7,
-	0x2DC8,
-	0x2DCF,
-	0x2DD0,
-	0x2DD7,
-	0x2DD8,
-	0x2DDF,
-	0x2DE0,
-	0x2E43,
-	0x2E80,
-	0x2E9A,
-	0x2E9B,
-	0x2EF4,
-	0x2F00,
-	0x2FD6,
-	0x2FF0,
-	0x2FFC,
-	0x3001,
-	0x3040,
-	0x3041,
-	0x3097,
-	0x3099,
-	0x3100,
-	0x3105,
-	0x312E,
-	0x3131,
-	0x318F,
-	0x3190,
-	0x31BB,
-	0x31C0,
-	0x31E4,
-	0x31F0,
-	0x321F,
-	0x3220,
-	0x32FF,
-	0x3300,
-	0x4DB6,
-	0x4DC0,
-	0x9FCD,
-	0xA000,
-	0xA48D,
-	0xA490,
-	0xA4C7,
-	0xA4D0,
-	0xA62C,
-	0xA640,
-	0xA69E,
-	0xA69F,
-	0xA6F8,
-	0xA700,
-	0xA78F,
-	0xA790,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xA7F7,
-	0xA82C,
-	0xA830,
-	0xA83A,
-	0xA840,
-	0xA878,
-	0xA880,
-	0xA8C5,
-	0xA8CE,
-	0xA8DA,
-	0xA8E0,
-	0xA8FC,
-	0xA900,
-	0xA954,
-	0xA95F,
-	0xA97D,
-	0xA980,
-	0xA9CE,
-	0xA9CF,
-	0xA9DA,
-	0xA9DE,
-	0xA9FF,
-	0xAA00,
-	0xAA37,
-	0xAA40,
-	0xAA4E,
-	0xAA50,
-	0xAA5A,
-	0xAA5C,
-	0xAAC3,
-	0xAADB,
-	0xAAF7,
-	0xAB01,
-	0xAB07,
-	0xAB09,
-	0xAB0F,
-	0xAB11,
-	0xAB17,
-	0xAB20,
-	0xAB27,
-	0xAB28,
-	0xAB2F,
-	0xAB30,
-	0xAB60,
-	0xAB64,
-	0xAB66,
-	0xABC0,
-	0xABEE,
-	0xABF0,
-	0xABFA,
-	0xAC00,
-	0xD7A4,
-	0xD7B0,
-	0xD7C7,
-	0xD7CB,
-	0xD7FC,
-	0xE000,
-	0xFA6E,
-	0xFA70,
-	0xFADA,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFB1D,
-	0xFB37,
-	0xFB38,
-	0xFB3D,
-	0xFB3E,
-	0xFB3F,
-	0xFB40,
-	0xFB42,
-	0xFB43,
-	0xFB45,
-	0xFB46,
-	0xFBC2,
-	0xFBD3,
-	0xFD40,
-	0xFD50,
-	0xFD90,
-	0xFD92,
-	0xFDC8,
-	0xFDF0,
-	0xFDFE,
-	0xFE00,
-	0xFE1A,
-	0xFE20,
-	0xFE2E,
-	0xFE30,
-	0xFE53,
-	0xFE54,
-	0xFE67,
-	0xFE68,
-	0xFE6C,
-	0xFE70,
-	0xFE75,
-	0xFE76,
-	0xFEFD,
-	0xFEFF,
-	0xFF00,
-	0xFF01,
-	0xFFBF,
-	0xFFC2,
-	0xFFC8,
-	0xFFCA,
-	0xFFD0,
-	0xFFD2,
-	0xFFD8,
-	0xFFDA,
-	0xFFDD,
-	0xFFE0,
-	0xFFE7,
-	0xFFE8,
-	0xFFEF,
-	0xFFF9,
-	0xFFFE,
-	0x10000,
-	0x1000C,
-	0x1000D,
-	0x10027,
-	0x10028,
-	0x1003B,
-	0x1003C,
-	0x1003E,
-	0x1003F,
-	0x1004E,
-	0x10050,
-	0x1005E,
-	0x10080,
-	0x100FB,
-	0x10100,
-	0x10103,
-	0x10107,
-	0x10134,
-	0x10137,
-	0x1018D,
-	0x10190,
-	0x1019C,
-	0x101A0,
-	0x101A1,
-	0x101D0,
-	0x101FE,
-	0x10280,
-	0x1029D,
-	0x102A0,
-	0x102D1,
-	0x102E0,
-	0x102FC,
-	0x10300,
-	0x10324,
-	0x10330,
-	0x1034B,
-	0x10350,
-	0x1037B,
-	0x10380,
-	0x1039E,
-	0x1039F,
-	0x103C4,
-	0x103C8,
-	0x103D6,
-	0x10400,
-	0x1049E,
-	0x104A0,
-	0x104AA,
-	0x10500,
-	0x10528,
-	0x10530,
-	0x10564,
-	0x1056F,
-	0x10570,
-	0x10600,
-	0x10737,
-	0x10740,
-	0x10756,
-	0x10760,
-	0x10768,
-	0x10800,
-	0x10806,
-	0x10808,
-	0x10809,
-	0x1080A,
-	0x10836,
-	0x10837,
-	0x10839,
-	0x1083C,
-	0x1083D,
-	0x1083F,
-	0x10856,
-	0x10857,
-	0x1089F,
-	0x108A7,
-	0x108B0,
-	0x10900,
-	0x1091C,
-	0x1091F,
-	0x1093A,
-	0x1093F,
-	0x10940,
-	0x10980,
-	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
-	0x10A04,
-	0x10A05,
-	0x10A07,
-	0x10A0C,
-	0x10A14,
-	0x10A15,
-	0x10A18,
-	0x10A19,
-	0x10A34,
-	0x10A38,
-	0x10A3B,
-	0x10A3F,
-	0x10A48,
-	0x10A50,
-	0x10A59,
-	0x10A60,
-	0x10AA0,
-	0x10AC0,
-	0x10AE7,
-	0x10AEB,
-	0x10AF7,
-	0x10B00,
-	0x10B36,
-	0x10B39,
-	0x10B56,
-	0x10B58,
-	0x10B73,
-	0x10B78,
-	0x10B92,
-	0x10B99,
-	0x10B9D,
-	0x10BA9,
-	0x10BB0,
-	0x10C00,
-	0x10C49,
-	0x10E60,
-	0x10E7F,
-	0x11000,
-	0x1104E,
-	0x11052,
-	0x11070,
-	0x1107F,
-	0x110C2,
-	0x110D0,
-	0x110E9,
-	0x110F0,
-	0x110FA,
-	0x11100,
-	0x11135,
-	0x11136,
-	0x11144,
-	0x11150,
-	0x11177,
-	0x11180,
-	0x111C9,
-	0x111CD,
-	0x111CE,
-	0x111D0,
-	0x111DB,
-	0x111E1,
-	0x111F5,
-	0x11200,
-	0x11212,
-	0x11213,
-	0x1123E,
-	0x112B0,
-	0x112EB,
-	0x112F0,
-	0x112FA,
-	0x11301,
-	0x11304,
-	0x11305,
-	0x1130D,
-	0x1130F,
-	0x11311,
-	0x11313,
-	0x11329,
-	0x1132A,
-	0x11331,
-	0x11332,
-	0x11334,
-	0x11335,
-	0x1133A,
-	0x1133C,
-	0x11345,
-	0x11347,
-	0x11349,
-	0x1134B,
-	0x1134E,
-	0x11357,
-	0x11358,
-	0x1135D,
-	0x11364,
-	0x11366,
-	0x1136D,
-	0x11370,
-	0x11375,
-	0x11480,
-	0x114C8,
-	0x114D0,
-	0x114DA,
-	0x11580,
-	0x115B6,
-	0x115B8,
-	0x115CA,
-	0x11600,
-	0x11645,
-	0x11650,
-	0x1165A,
-	0x11680,
-	0x116B8,
-	0x116C0,
-	0x116CA,
-	0x118A0,
-	0x118F3,
-	0x118FF,
-	0x11900,
-	0x11AC0,
-	0x11AF9,
-	0x12000,
-	0x12399,
-	0x12400,
-	0x1246F,
-	0x12470,
-	0x12475,
-	0x13000,
-	0x1342F,
-	0x16800,
-	0x16A39,
-	0x16A40,
-	0x16A5F,
-	0x16A60,
-	0x16A6A,
-	0x16A6E,
-	0x16A70,
-	0x16AD0,
-	0x16AEE,
-	0x16AF0,
-	0x16AF6,
-	0x16B00,
-	0x16B46,
-	0x16B50,
-	0x16B5A,
-	0x16B5B,
-	0x16B62,
-	0x16B63,
-	0x16B78,
-	0x16B7D,
-	0x16B90,
-	0x16F00,
-	0x16F45,
-	0x16F50,
-	0x16F7F,
-	0x16F8F,
-	0x16FA0,
-	0x1B000,
-	0x1B002,
-	0x1BC00,
-	0x1BC6B,
-	0x1BC70,
-	0x1BC7D,
-	0x1BC80,
-	0x1BC89,
-	0x1BC90,
-	0x1BC9A,
-	0x1BC9C,
-	0x1BCA4,
-	0x1D000,
-	0x1D0F6,
-	0x1D100,
-	0x1D127,
-	0x1D129,
-	0x1D1DE,
-	0x1D200,
-	0x1D246,
-	0x1D300,
-	0x1D357,
-	0x1D360,
-	0x1D372,
-	0x1D400,
-	0x1D455,
-	0x1D456,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D51E,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D552,
-	0x1D6A6,
-	0x1D6A8,
-	0x1D7CC,
-	0x1D7CE,
-	0x1D800,
-	0x1E800,
-	0x1E8C5,
-	0x1E8C7,
-	0x1E8D7,
-	0x1EE00,
-	0x1EE04,
-	0x1EE05,
-	0x1EE20,
-	0x1EE21,
-	0x1EE23,
-	0x1EE24,
-	0x1EE25,
-	0x1EE27,
-	0x1EE28,
-	0x1EE29,
-	0x1EE33,
-	0x1EE34,
-	0x1EE38,
-	0x1EE39,
-	0x1EE3A,
-	0x1EE3B,
-	0x1EE3C,
-	0x1EE42,
-	0x1EE43,
-	0x1EE47,
-	0x1EE48,
-	0x1EE49,
-	0x1EE4A,
-	0x1EE4B,
-	0x1EE4C,
-	0x1EE4D,
-	0x1EE50,
-	0x1EE51,
-	0x1EE53,
-	0x1EE54,
-	0x1EE55,
-	0x1EE57,
-	0x1EE58,
-	0x1EE59,
-	0x1EE5A,
-	0x1EE5B,
-	0x1EE5C,
-	0x1EE5D,
-	0x1EE5E,
-	0x1EE5F,
-	0x1EE60,
-	0x1EE61,
-	0x1EE63,
-	0x1EE64,
-	0x1EE65,
-	0x1EE67,
-	0x1EE6B,
-	0x1EE6C,
-	0x1EE73,
-	0x1EE74,
-	0x1EE78,
-	0x1EE79,
-	0x1EE7D,
-	0x1EE7E,
-	0x1EE7F,
-	0x1EE80,
-	0x1EE8A,
-	0x1EE8B,
-	0x1EE9C,
-	0x1EEA1,
-	0x1EEA4,
-	0x1EEA5,
-	0x1EEAA,
-	0x1EEAB,
-	0x1EEBC,
-	0x1EEF0,
-	0x1EEF2,
-	0x1F000,
-	0x1F02C,
-	0x1F030,
-	0x1F094,
-	0x1F0A0,
-	0x1F0AF,
-	0x1F0B1,
-	0x1F0C0,
-	0x1F0C1,
-	0x1F0D0,
-	0x1F0D1,
-	0x1F0F6,
-	0x1F100,
-	0x1F10D,
-	0x1F110,
-	0x1F12F,
-	0x1F130,
-	0x1F16C,
-	0x1F170,
-	0x1F19B,
-	0x1F1E6,
-	0x1F203,
-	0x1F210,
-	0x1F23B,
-	0x1F240,
-	0x1F249,
-	0x1F250,
-	0x1F252,
-	0x1F300,
-	0x1F32D,
-	0x1F330,
-	0x1F37E,
-	0x1F380,
-	0x1F3CF,
-	0x1F3D4,
-	0x1F3F8,
-	0x1F400,
-	0x1F4FF,
-	0x1F500,
-	0x1F54B,
-	0x1F550,
-	0x1F57A,
-	0x1F57B,
-	0x1F5A4,
-	0x1F5A5,
-	0x1F643,
-	0x1F645,
-	0x1F6D0,
-	0x1F6E0,
-	0x1F6ED,
-	0x1F6F0,
-	0x1F6F4,
-	0x1F700,
-	0x1F774,
-	0x1F780,
-	0x1F7D5,
-	0x1F800,
-	0x1F80C,
-	0x1F810,
-	0x1F848,
-	0x1F850,
-	0x1F85A,
-	0x1F860,
-	0x1F888,
-	0x1F890,
-	0x1F8AE,
-	0x20000,
-	0x2A6D7,
-	0x2A700,
-	0x2B735,
-	0x2B740,
-	0x2B81E,
-	0x2F800,
-	0x2FA1E,
-	0xE0001,
-	0xE0002,
-	0xE0020,
-	0xE0080,
-	0xE0100,
-	0xE01F0,
-	0xF0000,
-	0xFFFFE,
-	0x100000,
-	0x10FFFE
-};
-
-static const UV XPosixLower_invlist[] = { /* for EBCDIC 037 */
-	1275,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x42,
-	0x4A,
-	0x51,
-	0x5A,
-	0x70,
-	0x71,
-	0x81,
-	0x8A,
-	0x8C,
-	0x8F,
-	0x91,
-	0x9D,
-	0xA0,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xCB,
-	0xD0,
-	0xDB,
-	0xE0,
-	0x101,
-	0x102,
-	0x103,
-	0x104,
-	0x105,
-	0x106,
-	0x107,
-	0x108,
-	0x109,
-	0x10A,
-	0x10B,
-	0x10C,
-	0x10D,
-	0x10E,
-	0x10F,
-	0x110,
-	0x111,
-	0x112,
-	0x113,
-	0x114,
-	0x115,
-	0x116,
-	0x117,
-	0x118,
-	0x119,
-	0x11A,
-	0x11B,
-	0x11C,
-	0x11D,
-	0x11E,
-	0x11F,
-	0x120,
-	0x121,
-	0x122,
-	0x123,
-	0x124,
-	0x125,
-	0x126,
-	0x127,
-	0x128,
-	0x129,
-	0x12A,
-	0x12B,
-	0x12C,
-	0x12D,
-	0x12E,
-	0x12F,
-	0x130,
-	0x131,
-	0x132,
-	0x133,
-	0x134,
-	0x135,
-	0x136,
-	0x137,
-	0x139,
-	0x13A,
-	0x13B,
-	0x13C,
-	0x13D,
-	0x13E,
-	0x13F,
-	0x140,
-	0x141,
-	0x142,
-	0x143,
-	0x144,
-	0x145,
-	0x146,
-	0x147,
-	0x148,
-	0x14A,
-	0x14B,
-	0x14C,
-	0x14D,
-	0x14E,
-	0x14F,
-	0x150,
-	0x151,
-	0x152,
-	0x153,
-	0x154,
-	0x155,
-	0x156,
-	0x157,
-	0x158,
-	0x159,
-	0x15A,
-	0x15B,
-	0x15C,
-	0x15D,
-	0x15E,
-	0x15F,
-	0x160,
-	0x161,
-	0x162,
-	0x163,
-	0x164,
-	0x165,
-	0x166,
-	0x167,
-	0x168,
-	0x169,
-	0x16A,
-	0x16B,
-	0x16C,
-	0x16D,
-	0x16E,
-	0x16F,
-	0x170,
-	0x171,
-	0x172,
-	0x173,
-	0x174,
-	0x175,
-	0x176,
-	0x177,
-	0x178,
-	0x17A,
-	0x17B,
-	0x17C,
-	0x17D,
-	0x17E,
-	0x181,
-	0x183,
-	0x184,
-	0x185,
-	0x186,
-	0x188,
-	0x189,
-	0x18C,
-	0x18E,
-	0x192,
-	0x193,
-	0x195,
-	0x196,
-	0x199,
-	0x19C,
-	0x19E,
-	0x19F,
-	0x1A1,
-	0x1A2,
-	0x1A3,
-	0x1A4,
-	0x1A5,
-	0x1A6,
-	0x1A8,
-	0x1A9,
-	0x1AA,
-	0x1AC,
-	0x1AD,
-	0x1AE,
-	0x1B0,
-	0x1B1,
-	0x1B4,
-	0x1B5,
-	0x1B6,
-	0x1B7,
-	0x1B9,
-	0x1BB,
-	0x1BD,
-	0x1C0,
-	0x1C6,
-	0x1C7,
-	0x1C9,
-	0x1CA,
-	0x1CC,
-	0x1CD,
-	0x1CE,
-	0x1CF,
-	0x1D0,
-	0x1D1,
-	0x1D2,
-	0x1D3,
-	0x1D4,
-	0x1D5,
-	0x1D6,
-	0x1D7,
-	0x1D8,
-	0x1D9,
-	0x1DA,
-	0x1DB,
-	0x1DC,
-	0x1DE,
-	0x1DF,
-	0x1E0,
-	0x1E1,
-	0x1E2,
-	0x1E3,
-	0x1E4,
-	0x1E5,
-	0x1E6,
-	0x1E7,
-	0x1E8,
-	0x1E9,
-	0x1EA,
-	0x1EB,
-	0x1EC,
-	0x1ED,
-	0x1EE,
-	0x1EF,
-	0x1F1,
-	0x1F3,
-	0x1F4,
-	0x1F5,
-	0x1F6,
-	0x1F9,
-	0x1FA,
-	0x1FB,
-	0x1FC,
-	0x1FD,
-	0x1FE,
-	0x1FF,
-	0x200,
-	0x201,
-	0x202,
-	0x203,
-	0x204,
-	0x205,
-	0x206,
-	0x207,
-	0x208,
-	0x209,
-	0x20A,
-	0x20B,
-	0x20C,
-	0x20D,
-	0x20E,
-	0x20F,
-	0x210,
-	0x211,
-	0x212,
-	0x213,
-	0x214,
-	0x215,
-	0x216,
-	0x217,
-	0x218,
-	0x219,
-	0x21A,
-	0x21B,
-	0x21C,
-	0x21D,
-	0x21E,
-	0x21F,
-	0x220,
-	0x221,
-	0x222,
-	0x223,
-	0x224,
-	0x225,
-	0x226,
-	0x227,
-	0x228,
-	0x229,
-	0x22A,
-	0x22B,
-	0x22C,
-	0x22D,
-	0x22E,
-	0x22F,
-	0x230,
-	0x231,
-	0x232,
-	0x233,
-	0x23A,
-	0x23C,
-	0x23D,
-	0x23F,
-	0x241,
-	0x242,
-	0x243,
-	0x247,
-	0x248,
-	0x249,
-	0x24A,
-	0x24B,
-	0x24C,
-	0x24D,
-	0x24E,
-	0x24F,
-	0x294,
-	0x295,
-	0x2B9,
-	0x2C0,
-	0x2C2,
-	0x2E0,
-	0x2E5,
-	0x345,
-	0x346,
-	0x371,
-	0x372,
-	0x373,
-	0x374,
-	0x377,
-	0x378,
-	0x37A,
-	0x37E,
-	0x390,
-	0x391,
-	0x3AC,
-	0x3CF,
-	0x3D0,
-	0x3D2,
-	0x3D5,
-	0x3D8,
-	0x3D9,
-	0x3DA,
-	0x3DB,
-	0x3DC,
-	0x3DD,
-	0x3DE,
-	0x3DF,
-	0x3E0,
-	0x3E1,
-	0x3E2,
-	0x3E3,
-	0x3E4,
-	0x3E5,
-	0x3E6,
-	0x3E7,
-	0x3E8,
-	0x3E9,
-	0x3EA,
-	0x3EB,
-	0x3EC,
-	0x3ED,
-	0x3EE,
-	0x3EF,
-	0x3F4,
-	0x3F5,
-	0x3F6,
-	0x3F8,
-	0x3F9,
-	0x3FB,
-	0x3FD,
-	0x430,
-	0x460,
-	0x461,
-	0x462,
-	0x463,
-	0x464,
-	0x465,
-	0x466,
-	0x467,
-	0x468,
-	0x469,
-	0x46A,
-	0x46B,
-	0x46C,
-	0x46D,
-	0x46E,
-	0x46F,
-	0x470,
-	0x471,
-	0x472,
-	0x473,
-	0x474,
-	0x475,
-	0x476,
-	0x477,
-	0x478,
-	0x479,
-	0x47A,
-	0x47B,
-	0x47C,
-	0x47D,
-	0x47E,
-	0x47F,
-	0x480,
-	0x481,
-	0x482,
-	0x48B,
-	0x48C,
-	0x48D,
-	0x48E,
-	0x48F,
-	0x490,
-	0x491,
-	0x492,
-	0x493,
-	0x494,
-	0x495,
-	0x496,
-	0x497,
-	0x498,
-	0x499,
-	0x49A,
-	0x49B,
-	0x49C,
-	0x49D,
-	0x49E,
-	0x49F,
-	0x4A0,
-	0x4A1,
-	0x4A2,
-	0x4A3,
-	0x4A4,
-	0x4A5,
-	0x4A6,
-	0x4A7,
-	0x4A8,
-	0x4A9,
-	0x4AA,
-	0x4AB,
-	0x4AC,
-	0x4AD,
-	0x4AE,
-	0x4AF,
-	0x4B0,
-	0x4B1,
-	0x4B2,
-	0x4B3,
-	0x4B4,
-	0x4B5,
-	0x4B6,
-	0x4B7,
-	0x4B8,
-	0x4B9,
-	0x4BA,
-	0x4BB,
-	0x4BC,
-	0x4BD,
-	0x4BE,
-	0x4BF,
-	0x4C0,
-	0x4C2,
-	0x4C3,
-	0x4C4,
-	0x4C5,
-	0x4C6,
-	0x4C7,
-	0x4C8,
-	0x4C9,
-	0x4CA,
-	0x4CB,
-	0x4CC,
-	0x4CD,
-	0x4CE,
-	0x4D0,
-	0x4D1,
-	0x4D2,
-	0x4D3,
-	0x4D4,
-	0x4D5,
-	0x4D6,
-	0x4D7,
-	0x4D8,
-	0x4D9,
-	0x4DA,
-	0x4DB,
-	0x4DC,
-	0x4DD,
-	0x4DE,
-	0x4DF,
-	0x4E0,
-	0x4E1,
-	0x4E2,
-	0x4E3,
-	0x4E4,
-	0x4E5,
-	0x4E6,
-	0x4E7,
-	0x4E8,
-	0x4E9,
-	0x4EA,
-	0x4EB,
-	0x4EC,
-	0x4ED,
-	0x4EE,
-	0x4EF,
-	0x4F0,
-	0x4F1,
-	0x4F2,
-	0x4F3,
-	0x4F4,
-	0x4F5,
-	0x4F6,
-	0x4F7,
-	0x4F8,
-	0x4F9,
-	0x4FA,
-	0x4FB,
-	0x4FC,
-	0x4FD,
-	0x4FE,
-	0x4FF,
-	0x500,
-	0x501,
-	0x502,
-	0x503,
-	0x504,
-	0x505,
-	0x506,
-	0x507,
-	0x508,
-	0x509,
-	0x50A,
-	0x50B,
-	0x50C,
-	0x50D,
-	0x50E,
-	0x50F,
-	0x510,
-	0x511,
-	0x512,
-	0x513,
-	0x514,
-	0x515,
-	0x516,
-	0x517,
-	0x518,
-	0x519,
-	0x51A,
-	0x51B,
-	0x51C,
-	0x51D,
-	0x51E,
-	0x51F,
-	0x520,
-	0x521,
-	0x522,
-	0x523,
-	0x524,
-	0x525,
-	0x526,
-	0x527,
-	0x528,
-	0x529,
-	0x52A,
-	0x52B,
-	0x52C,
-	0x52D,
-	0x52E,
-	0x52F,
-	0x530,
-	0x561,
-	0x588,
-	0x1D00,
-	0x1DC0,
-	0x1E01,
-	0x1E02,
-	0x1E03,
-	0x1E04,
-	0x1E05,
-	0x1E06,
-	0x1E07,
-	0x1E08,
-	0x1E09,
-	0x1E0A,
-	0x1E0B,
-	0x1E0C,
-	0x1E0D,
-	0x1E0E,
-	0x1E0F,
-	0x1E10,
-	0x1E11,
-	0x1E12,
-	0x1E13,
-	0x1E14,
-	0x1E15,
-	0x1E16,
-	0x1E17,
-	0x1E18,
-	0x1E19,
-	0x1E1A,
-	0x1E1B,
-	0x1E1C,
-	0x1E1D,
-	0x1E1E,
-	0x1E1F,
-	0x1E20,
-	0x1E21,
-	0x1E22,
-	0x1E23,
-	0x1E24,
-	0x1E25,
-	0x1E26,
-	0x1E27,
-	0x1E28,
-	0x1E29,
-	0x1E2A,
-	0x1E2B,
-	0x1E2C,
-	0x1E2D,
-	0x1E2E,
-	0x1E2F,
-	0x1E30,
-	0x1E31,
-	0x1E32,
-	0x1E33,
-	0x1E34,
-	0x1E35,
-	0x1E36,
-	0x1E37,
-	0x1E38,
-	0x1E39,
-	0x1E3A,
-	0x1E3B,
-	0x1E3C,
-	0x1E3D,
-	0x1E3E,
-	0x1E3F,
-	0x1E40,
-	0x1E41,
-	0x1E42,
-	0x1E43,
-	0x1E44,
-	0x1E45,
-	0x1E46,
-	0x1E47,
-	0x1E48,
-	0x1E49,
-	0x1E4A,
-	0x1E4B,
-	0x1E4C,
-	0x1E4D,
-	0x1E4E,
-	0x1E4F,
-	0x1E50,
-	0x1E51,
-	0x1E52,
-	0x1E53,
-	0x1E54,
-	0x1E55,
-	0x1E56,
-	0x1E57,
-	0x1E58,
-	0x1E59,
-	0x1E5A,
-	0x1E5B,
-	0x1E5C,
-	0x1E5D,
-	0x1E5E,
-	0x1E5F,
-	0x1E60,
-	0x1E61,
-	0x1E62,
-	0x1E63,
-	0x1E64,
-	0x1E65,
-	0x1E66,
-	0x1E67,
-	0x1E68,
-	0x1E69,
-	0x1E6A,
-	0x1E6B,
-	0x1E6C,
-	0x1E6D,
-	0x1E6E,
-	0x1E6F,
-	0x1E70,
-	0x1E71,
-	0x1E72,
-	0x1E73,
-	0x1E74,
-	0x1E75,
-	0x1E76,
-	0x1E77,
-	0x1E78,
-	0x1E79,
-	0x1E7A,
-	0x1E7B,
-	0x1E7C,
-	0x1E7D,
-	0x1E7E,
-	0x1E7F,
-	0x1E80,
-	0x1E81,
-	0x1E82,
-	0x1E83,
-	0x1E84,
-	0x1E85,
-	0x1E86,
-	0x1E87,
-	0x1E88,
-	0x1E89,
-	0x1E8A,
-	0x1E8B,
-	0x1E8C,
-	0x1E8D,
-	0x1E8E,
-	0x1E8F,
-	0x1E90,
-	0x1E91,
-	0x1E92,
-	0x1E93,
-	0x1E94,
-	0x1E95,
-	0x1E9E,
-	0x1E9F,
-	0x1EA0,
-	0x1EA1,
-	0x1EA2,
-	0x1EA3,
-	0x1EA4,
-	0x1EA5,
-	0x1EA6,
-	0x1EA7,
-	0x1EA8,
-	0x1EA9,
-	0x1EAA,
-	0x1EAB,
-	0x1EAC,
-	0x1EAD,
-	0x1EAE,
-	0x1EAF,
-	0x1EB0,
-	0x1EB1,
-	0x1EB2,
-	0x1EB3,
-	0x1EB4,
-	0x1EB5,
-	0x1EB6,
-	0x1EB7,
-	0x1EB8,
-	0x1EB9,
-	0x1EBA,
-	0x1EBB,
-	0x1EBC,
-	0x1EBD,
-	0x1EBE,
-	0x1EBF,
-	0x1EC0,
-	0x1EC1,
-	0x1EC2,
-	0x1EC3,
-	0x1EC4,
-	0x1EC5,
-	0x1EC6,
-	0x1EC7,
-	0x1EC8,
-	0x1EC9,
-	0x1ECA,
-	0x1ECB,
-	0x1ECC,
-	0x1ECD,
-	0x1ECE,
-	0x1ECF,
-	0x1ED0,
-	0x1ED1,
-	0x1ED2,
-	0x1ED3,
-	0x1ED4,
-	0x1ED5,
-	0x1ED6,
-	0x1ED7,
-	0x1ED8,
-	0x1ED9,
-	0x1EDA,
-	0x1EDB,
-	0x1EDC,
-	0x1EDD,
-	0x1EDE,
-	0x1EDF,
-	0x1EE0,
-	0x1EE1,
-	0x1EE2,
-	0x1EE3,
-	0x1EE4,
-	0x1EE5,
-	0x1EE6,
-	0x1EE7,
-	0x1EE8,
-	0x1EE9,
-	0x1EEA,
-	0x1EEB,
-	0x1EEC,
-	0x1EED,
-	0x1EEE,
-	0x1EEF,
-	0x1EF0,
-	0x1EF1,
-	0x1EF2,
-	0x1EF3,
-	0x1EF4,
-	0x1EF5,
-	0x1EF6,
-	0x1EF7,
-	0x1EF8,
-	0x1EF9,
-	0x1EFA,
-	0x1EFB,
-	0x1EFC,
-	0x1EFD,
-	0x1EFE,
-	0x1EFF,
-	0x1F08,
-	0x1F10,
-	0x1F16,
-	0x1F20,
-	0x1F28,
-	0x1F30,
-	0x1F38,
-	0x1F40,
-	0x1F46,
-	0x1F50,
-	0x1F58,
-	0x1F60,
-	0x1F68,
-	0x1F70,
-	0x1F7E,
-	0x1F80,
-	0x1F88,
-	0x1F90,
-	0x1F98,
-	0x1FA0,
-	0x1FA8,
-	0x1FB0,
-	0x1FB5,
-	0x1FB6,
-	0x1FB8,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FC8,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FD8,
-	0x1FE0,
-	0x1FE8,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FF8,
-	0x2071,
-	0x2072,
-	0x207F,
-	0x2080,
-	0x2090,
-	0x209D,
-	0x210A,
-	0x210B,
-	0x210E,
-	0x2110,
-	0x2113,
-	0x2114,
-	0x212F,
-	0x2130,
-	0x2134,
-	0x2135,
-	0x2139,
-	0x213A,
-	0x213C,
-	0x213E,
-	0x2146,
-	0x214A,
-	0x214E,
-	0x214F,
-	0x2170,
-	0x2180,
-	0x2184,
-	0x2185,
-	0x24D0,
-	0x24EA,
-	0x2C30,
-	0x2C5F,
-	0x2C61,
-	0x2C62,
-	0x2C65,
-	0x2C67,
-	0x2C68,
-	0x2C69,
-	0x2C6A,
-	0x2C6B,
-	0x2C6C,
-	0x2C6D,
-	0x2C71,
-	0x2C72,
-	0x2C73,
-	0x2C75,
-	0x2C76,
-	0x2C7E,
-	0x2C81,
-	0x2C82,
-	0x2C83,
-	0x2C84,
-	0x2C85,
-	0x2C86,
-	0x2C87,
-	0x2C88,
-	0x2C89,
-	0x2C8A,
-	0x2C8B,
-	0x2C8C,
-	0x2C8D,
-	0x2C8E,
-	0x2C8F,
-	0x2C90,
-	0x2C91,
-	0x2C92,
-	0x2C93,
-	0x2C94,
-	0x2C95,
-	0x2C96,
-	0x2C97,
-	0x2C98,
-	0x2C99,
-	0x2C9A,
-	0x2C9B,
-	0x2C9C,
-	0x2C9D,
-	0x2C9E,
-	0x2C9F,
-	0x2CA0,
-	0x2CA1,
-	0x2CA2,
-	0x2CA3,
-	0x2CA4,
-	0x2CA5,
-	0x2CA6,
-	0x2CA7,
-	0x2CA8,
-	0x2CA9,
-	0x2CAA,
-	0x2CAB,
-	0x2CAC,
-	0x2CAD,
-	0x2CAE,
-	0x2CAF,
-	0x2CB0,
-	0x2CB1,
-	0x2CB2,
-	0x2CB3,
-	0x2CB4,
-	0x2CB5,
-	0x2CB6,
-	0x2CB7,
-	0x2CB8,
-	0x2CB9,
-	0x2CBA,
-	0x2CBB,
-	0x2CBC,
-	0x2CBD,
-	0x2CBE,
-	0x2CBF,
-	0x2CC0,
-	0x2CC1,
-	0x2CC2,
-	0x2CC3,
-	0x2CC4,
-	0x2CC5,
-	0x2CC6,
-	0x2CC7,
-	0x2CC8,
-	0x2CC9,
-	0x2CCA,
-	0x2CCB,
-	0x2CCC,
-	0x2CCD,
-	0x2CCE,
-	0x2CCF,
-	0x2CD0,
-	0x2CD1,
-	0x2CD2,
-	0x2CD3,
-	0x2CD4,
-	0x2CD5,
-	0x2CD6,
-	0x2CD7,
-	0x2CD8,
-	0x2CD9,
-	0x2CDA,
-	0x2CDB,
-	0x2CDC,
-	0x2CDD,
-	0x2CDE,
-	0x2CDF,
-	0x2CE0,
-	0x2CE1,
-	0x2CE2,
-	0x2CE3,
-	0x2CE5,
-	0x2CEC,
-	0x2CED,
-	0x2CEE,
-	0x2CEF,
-	0x2CF3,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0xA641,
-	0xA642,
-	0xA643,
-	0xA644,
-	0xA645,
-	0xA646,
-	0xA647,
-	0xA648,
-	0xA649,
-	0xA64A,
-	0xA64B,
-	0xA64C,
-	0xA64D,
-	0xA64E,
-	0xA64F,
-	0xA650,
-	0xA651,
-	0xA652,
-	0xA653,
-	0xA654,
-	0xA655,
-	0xA656,
-	0xA657,
-	0xA658,
-	0xA659,
-	0xA65A,
-	0xA65B,
-	0xA65C,
-	0xA65D,
-	0xA65E,
-	0xA65F,
-	0xA660,
-	0xA661,
-	0xA662,
-	0xA663,
-	0xA664,
-	0xA665,
-	0xA666,
-	0xA667,
-	0xA668,
-	0xA669,
-	0xA66A,
-	0xA66B,
-	0xA66C,
-	0xA66D,
-	0xA66E,
-	0xA681,
-	0xA682,
-	0xA683,
-	0xA684,
-	0xA685,
-	0xA686,
-	0xA687,
-	0xA688,
-	0xA689,
-	0xA68A,
-	0xA68B,
-	0xA68C,
-	0xA68D,
-	0xA68E,
-	0xA68F,
-	0xA690,
-	0xA691,
-	0xA692,
-	0xA693,
-	0xA694,
-	0xA695,
-	0xA696,
-	0xA697,
-	0xA698,
-	0xA699,
-	0xA69A,
-	0xA69B,
-	0xA69E,
-	0xA723,
-	0xA724,
-	0xA725,
-	0xA726,
-	0xA727,
-	0xA728,
-	0xA729,
-	0xA72A,
-	0xA72B,
-	0xA72C,
-	0xA72D,
-	0xA72E,
-	0xA72F,
-	0xA732,
-	0xA733,
-	0xA734,
-	0xA735,
-	0xA736,
-	0xA737,
-	0xA738,
-	0xA739,
-	0xA73A,
-	0xA73B,
-	0xA73C,
-	0xA73D,
-	0xA73E,
-	0xA73F,
-	0xA740,
-	0xA741,
-	0xA742,
-	0xA743,
-	0xA744,
-	0xA745,
-	0xA746,
-	0xA747,
-	0xA748,
-	0xA749,
-	0xA74A,
-	0xA74B,
-	0xA74C,
-	0xA74D,
-	0xA74E,
-	0xA74F,
-	0xA750,
-	0xA751,
-	0xA752,
-	0xA753,
-	0xA754,
-	0xA755,
-	0xA756,
-	0xA757,
-	0xA758,
-	0xA759,
-	0xA75A,
-	0xA75B,
-	0xA75C,
-	0xA75D,
-	0xA75E,
-	0xA75F,
-	0xA760,
-	0xA761,
-	0xA762,
-	0xA763,
-	0xA764,
-	0xA765,
-	0xA766,
-	0xA767,
-	0xA768,
-	0xA769,
-	0xA76A,
-	0xA76B,
-	0xA76C,
-	0xA76D,
-	0xA76E,
-	0xA76F,
-	0xA779,
-	0xA77A,
-	0xA77B,
-	0xA77C,
-	0xA77D,
-	0xA77F,
-	0xA780,
-	0xA781,
-	0xA782,
-	0xA783,
-	0xA784,
-	0xA785,
-	0xA786,
-	0xA787,
-	0xA788,
-	0xA78C,
-	0xA78D,
-	0xA78E,
-	0xA78F,
-	0xA791,
-	0xA792,
-	0xA793,
-	0xA796,
-	0xA797,
-	0xA798,
-	0xA799,
-	0xA79A,
-	0xA79B,
-	0xA79C,
-	0xA79D,
-	0xA79E,
-	0xA79F,
-	0xA7A0,
-	0xA7A1,
-	0xA7A2,
-	0xA7A3,
-	0xA7A4,
-	0xA7A5,
-	0xA7A6,
-	0xA7A7,
-	0xA7A8,
-	0xA7A9,
-	0xA7AA,
-	0xA7F8,
-	0xA7FB,
-	0xAB30,
-	0xAB5B,
-	0xAB5C,
-	0xAB60,
-	0xAB64,
-	0xAB66,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFF41,
-	0xFF5B,
-	0x10428,
-	0x10450,
-	0x118C0,
-	0x118E0,
-	0x1D41A,
-	0x1D434,
-	0x1D44E,
-	0x1D455,
-	0x1D456,
-	0x1D468,
-	0x1D482,
-	0x1D49C,
-	0x1D4B6,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D4D0,
-	0x1D4EA,
-	0x1D504,
-	0x1D51E,
-	0x1D538,
-	0x1D552,
-	0x1D56C,
-	0x1D586,
-	0x1D5A0,
-	0x1D5BA,
-	0x1D5D4,
-	0x1D5EE,
-	0x1D608,
-	0x1D622,
-	0x1D63C,
-	0x1D656,
-	0x1D670,
-	0x1D68A,
-	0x1D6A6,
-	0x1D6C2,
-	0x1D6DB,
-	0x1D6DC,
-	0x1D6E2,
-	0x1D6FC,
-	0x1D715,
-	0x1D716,
-	0x1D71C,
-	0x1D736,
-	0x1D74F,
-	0x1D750,
-	0x1D756,
-	0x1D770,
-	0x1D789,
-	0x1D78A,
-	0x1D790,
-	0x1D7AA,
-	0x1D7C3,
-	0x1D7C4,
-	0x1D7CA,
-	0x1D7CB,
-	0x1D7CC
-};
-
-static const UV XPosixPrint_invlist[] = { /* for EBCDIC 037 */
-	1205,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x40,
-	0xFF,
-	0x100,
-	0x378,
-	0x37A,
-	0x380,
-	0x384,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x530,
-	0x531,
-	0x557,
-	0x559,
-	0x560,
-	0x561,
-	0x588,
-	0x589,
-	0x58B,
-	0x58D,
-	0x590,
-	0x591,
-	0x5C8,
-	0x5D0,
-	0x5EB,
-	0x5F0,
-	0x5F5,
-	0x600,
-	0x61D,
-	0x61E,
-	0x70E,
-	0x70F,
-	0x74B,
-	0x74D,
-	0x7B2,
-	0x7C0,
-	0x7FB,
-	0x800,
-	0x82E,
-	0x830,
-	0x83F,
-	0x840,
-	0x85C,
-	0x85E,
-	0x85F,
-	0x8A0,
-	0x8B3,
-	0x8E4,
-	0x984,
-	0x985,
-	0x98D,
-	0x98F,
-	0x991,
-	0x993,
-	0x9A9,
-	0x9AA,
-	0x9B1,
-	0x9B2,
-	0x9B3,
-	0x9B6,
-	0x9BA,
-	0x9BC,
-	0x9C5,
-	0x9C7,
-	0x9C9,
-	0x9CB,
-	0x9CF,
-	0x9D7,
-	0x9D8,
-	0x9DC,
-	0x9DE,
-	0x9DF,
-	0x9E4,
-	0x9E6,
-	0x9FC,
-	0xA01,
-	0xA04,
-	0xA05,
-	0xA0B,
-	0xA0F,
-	0xA11,
-	0xA13,
-	0xA29,
-	0xA2A,
-	0xA31,
-	0xA32,
-	0xA34,
-	0xA35,
-	0xA37,
-	0xA38,
-	0xA3A,
-	0xA3C,
-	0xA3D,
-	0xA3E,
-	0xA43,
-	0xA47,
-	0xA49,
-	0xA4B,
-	0xA4E,
-	0xA51,
-	0xA52,
-	0xA59,
-	0xA5D,
-	0xA5E,
-	0xA5F,
-	0xA66,
-	0xA76,
-	0xA81,
-	0xA84,
-	0xA85,
-	0xA8E,
-	0xA8F,
-	0xA92,
-	0xA93,
-	0xAA9,
-	0xAAA,
-	0xAB1,
-	0xAB2,
-	0xAB4,
-	0xAB5,
-	0xABA,
-	0xABC,
-	0xAC6,
-	0xAC7,
-	0xACA,
-	0xACB,
-	0xACE,
-	0xAD0,
-	0xAD1,
-	0xAE0,
-	0xAE4,
-	0xAE6,
-	0xAF2,
-	0xB01,
-	0xB04,
-	0xB05,
-	0xB0D,
-	0xB0F,
-	0xB11,
-	0xB13,
-	0xB29,
-	0xB2A,
-	0xB31,
-	0xB32,
-	0xB34,
-	0xB35,
-	0xB3A,
-	0xB3C,
-	0xB45,
-	0xB47,
-	0xB49,
-	0xB4B,
-	0xB4E,
-	0xB56,
-	0xB58,
-	0xB5C,
-	0xB5E,
-	0xB5F,
-	0xB64,
-	0xB66,
-	0xB78,
-	0xB82,
-	0xB84,
-	0xB85,
-	0xB8B,
-	0xB8E,
-	0xB91,
-	0xB92,
-	0xB96,
-	0xB99,
-	0xB9B,
-	0xB9C,
-	0xB9D,
-	0xB9E,
-	0xBA0,
-	0xBA3,
-	0xBA5,
-	0xBA8,
-	0xBAB,
-	0xBAE,
-	0xBBA,
-	0xBBE,
-	0xBC3,
-	0xBC6,
-	0xBC9,
-	0xBCA,
-	0xBCE,
-	0xBD0,
-	0xBD1,
-	0xBD7,
-	0xBD8,
-	0xBE6,
-	0xBFB,
-	0xC00,
-	0xC04,
-	0xC05,
-	0xC0D,
-	0xC0E,
-	0xC11,
-	0xC12,
-	0xC29,
-	0xC2A,
-	0xC3A,
-	0xC3D,
-	0xC45,
-	0xC46,
-	0xC49,
-	0xC4A,
-	0xC4E,
-	0xC55,
-	0xC57,
-	0xC58,
-	0xC5A,
-	0xC60,
-	0xC64,
-	0xC66,
-	0xC70,
-	0xC78,
-	0xC80,
-	0xC81,
-	0xC84,
-	0xC85,
-	0xC8D,
-	0xC8E,
-	0xC91,
-	0xC92,
-	0xCA9,
-	0xCAA,
-	0xCB4,
-	0xCB5,
-	0xCBA,
-	0xCBC,
-	0xCC5,
-	0xCC6,
-	0xCC9,
-	0xCCA,
-	0xCCE,
-	0xCD5,
-	0xCD7,
-	0xCDE,
-	0xCDF,
-	0xCE0,
-	0xCE4,
-	0xCE6,
-	0xCF0,
-	0xCF1,
-	0xCF3,
-	0xD01,
-	0xD04,
-	0xD05,
-	0xD0D,
-	0xD0E,
-	0xD11,
-	0xD12,
-	0xD3B,
-	0xD3D,
-	0xD45,
-	0xD46,
-	0xD49,
-	0xD4A,
-	0xD4F,
-	0xD57,
-	0xD58,
-	0xD60,
-	0xD64,
-	0xD66,
-	0xD76,
-	0xD79,
-	0xD80,
-	0xD82,
-	0xD84,
-	0xD85,
-	0xD97,
-	0xD9A,
-	0xDB2,
-	0xDB3,
-	0xDBC,
-	0xDBD,
-	0xDBE,
-	0xDC0,
-	0xDC7,
-	0xDCA,
-	0xDCB,
-	0xDCF,
-	0xDD5,
-	0xDD6,
-	0xDD7,
-	0xDD8,
-	0xDE0,
-	0xDE6,
-	0xDF0,
-	0xDF2,
-	0xDF5,
-	0xE01,
-	0xE3B,
-	0xE3F,
-	0xE5C,
-	0xE81,
-	0xE83,
-	0xE84,
-	0xE85,
-	0xE87,
-	0xE89,
-	0xE8A,
-	0xE8B,
-	0xE8D,
-	0xE8E,
-	0xE94,
-	0xE98,
-	0xE99,
-	0xEA0,
-	0xEA1,
-	0xEA4,
-	0xEA5,
-	0xEA6,
-	0xEA7,
-	0xEA8,
-	0xEAA,
-	0xEAC,
-	0xEAD,
-	0xEBA,
-	0xEBB,
-	0xEBE,
-	0xEC0,
-	0xEC5,
-	0xEC6,
-	0xEC7,
-	0xEC8,
-	0xECE,
-	0xED0,
-	0xEDA,
-	0xEDC,
-	0xEE0,
-	0xF00,
-	0xF48,
-	0xF49,
-	0xF6D,
-	0xF71,
-	0xF98,
-	0xF99,
-	0xFBD,
-	0xFBE,
-	0xFCD,
-	0xFCE,
-	0xFDB,
-	0x1000,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x10D0,
-	0x1249,
-	0x124A,
-	0x124E,
-	0x1250,
-	0x1257,
-	0x1258,
-	0x1259,
-	0x125A,
-	0x125E,
-	0x1260,
-	0x1289,
-	0x128A,
-	0x128E,
-	0x1290,
-	0x12B1,
-	0x12B2,
-	0x12B6,
-	0x12B8,
-	0x12BF,
-	0x12C0,
-	0x12C1,
-	0x12C2,
-	0x12C6,
-	0x12C8,
-	0x12D7,
-	0x12D8,
-	0x1311,
-	0x1312,
-	0x1316,
-	0x1318,
-	0x135B,
-	0x135D,
-	0x137D,
-	0x1380,
-	0x139A,
-	0x13A0,
-	0x13F5,
-	0x1400,
-	0x169D,
-	0x16A0,
-	0x16F9,
-	0x1700,
-	0x170D,
-	0x170E,
-	0x1715,
-	0x1720,
-	0x1737,
-	0x1740,
-	0x1754,
-	0x1760,
-	0x176D,
-	0x176E,
-	0x1771,
-	0x1772,
-	0x1774,
-	0x1780,
-	0x17DE,
-	0x17E0,
-	0x17EA,
-	0x17F0,
-	0x17FA,
-	0x1800,
-	0x180F,
-	0x1810,
-	0x181A,
-	0x1820,
-	0x1878,
-	0x1880,
-	0x18AB,
-	0x18B0,
-	0x18F6,
-	0x1900,
-	0x191F,
-	0x1920,
-	0x192C,
-	0x1930,
-	0x193C,
-	0x1940,
-	0x1941,
-	0x1944,
-	0x196E,
-	0x1970,
-	0x1975,
-	0x1980,
-	0x19AC,
-	0x19B0,
-	0x19CA,
-	0x19D0,
-	0x19DB,
-	0x19DE,
-	0x1A1C,
-	0x1A1E,
-	0x1A5F,
-	0x1A60,
-	0x1A7D,
-	0x1A7F,
-	0x1A8A,
-	0x1A90,
-	0x1A9A,
-	0x1AA0,
-	0x1AAE,
-	0x1AB0,
-	0x1ABF,
-	0x1B00,
-	0x1B4C,
-	0x1B50,
-	0x1B7D,
-	0x1B80,
-	0x1BF4,
-	0x1BFC,
-	0x1C38,
-	0x1C3B,
-	0x1C4A,
-	0x1C4D,
-	0x1C80,
-	0x1CC0,
-	0x1CC8,
-	0x1CD0,
-	0x1CF7,
-	0x1CF8,
-	0x1CFA,
-	0x1D00,
-	0x1DF6,
-	0x1DFC,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FC5,
-	0x1FC6,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FDD,
-	0x1FF0,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFF,
-	0x2000,
-	0x2028,
-	0x202A,
-	0x2065,
-	0x2066,
-	0x2072,
-	0x2074,
-	0x208F,
-	0x2090,
-	0x209D,
-	0x20A0,
-	0x20BE,
-	0x20D0,
-	0x20F1,
-	0x2100,
-	0x218A,
-	0x2190,
-	0x23FB,
-	0x2400,
-	0x2427,
-	0x2440,
-	0x244B,
-	0x2460,
-	0x2B74,
-	0x2B76,
-	0x2B96,
-	0x2B98,
-	0x2BBA,
-	0x2BBD,
-	0x2BC9,
-	0x2BCA,
-	0x2BD2,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2CF4,
-	0x2CF9,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0x2D30,
-	0x2D68,
-	0x2D6F,
-	0x2D71,
-	0x2D7F,
-	0x2D97,
-	0x2DA0,
-	0x2DA7,
-	0x2DA8,
-	0x2DAF,
-	0x2DB0,
-	0x2DB7,
-	0x2DB8,
-	0x2DBF,
-	0x2DC0,
-	0x2DC7,
-	0x2DC8,
-	0x2DCF,
-	0x2DD0,
-	0x2DD7,
-	0x2DD8,
-	0x2DDF,
-	0x2DE0,
-	0x2E43,
-	0x2E80,
-	0x2E9A,
-	0x2E9B,
-	0x2EF4,
-	0x2F00,
-	0x2FD6,
-	0x2FF0,
-	0x2FFC,
-	0x3000,
-	0x3040,
-	0x3041,
-	0x3097,
-	0x3099,
-	0x3100,
-	0x3105,
-	0x312E,
-	0x3131,
-	0x318F,
-	0x3190,
-	0x31BB,
-	0x31C0,
-	0x31E4,
-	0x31F0,
-	0x321F,
-	0x3220,
-	0x32FF,
-	0x3300,
-	0x4DB6,
-	0x4DC0,
-	0x9FCD,
-	0xA000,
-	0xA48D,
-	0xA490,
-	0xA4C7,
-	0xA4D0,
-	0xA62C,
-	0xA640,
-	0xA69E,
-	0xA69F,
-	0xA6F8,
-	0xA700,
-	0xA78F,
-	0xA790,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xA7F7,
-	0xA82C,
-	0xA830,
-	0xA83A,
-	0xA840,
-	0xA878,
-	0xA880,
-	0xA8C5,
-	0xA8CE,
-	0xA8DA,
-	0xA8E0,
-	0xA8FC,
-	0xA900,
-	0xA954,
-	0xA95F,
-	0xA97D,
-	0xA980,
-	0xA9CE,
-	0xA9CF,
-	0xA9DA,
-	0xA9DE,
-	0xA9FF,
-	0xAA00,
-	0xAA37,
-	0xAA40,
-	0xAA4E,
-	0xAA50,
-	0xAA5A,
-	0xAA5C,
-	0xAAC3,
-	0xAADB,
-	0xAAF7,
-	0xAB01,
-	0xAB07,
-	0xAB09,
-	0xAB0F,
-	0xAB11,
-	0xAB17,
-	0xAB20,
-	0xAB27,
-	0xAB28,
-	0xAB2F,
-	0xAB30,
-	0xAB60,
-	0xAB64,
-	0xAB66,
-	0xABC0,
-	0xABEE,
-	0xABF0,
-	0xABFA,
-	0xAC00,
-	0xD7A4,
-	0xD7B0,
-	0xD7C7,
-	0xD7CB,
-	0xD7FC,
-	0xE000,
-	0xFA6E,
-	0xFA70,
-	0xFADA,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFB1D,
-	0xFB37,
-	0xFB38,
-	0xFB3D,
-	0xFB3E,
-	0xFB3F,
-	0xFB40,
-	0xFB42,
-	0xFB43,
-	0xFB45,
-	0xFB46,
-	0xFBC2,
-	0xFBD3,
-	0xFD40,
-	0xFD50,
-	0xFD90,
-	0xFD92,
-	0xFDC8,
-	0xFDF0,
-	0xFDFE,
-	0xFE00,
-	0xFE1A,
-	0xFE20,
-	0xFE2E,
-	0xFE30,
-	0xFE53,
-	0xFE54,
-	0xFE67,
-	0xFE68,
-	0xFE6C,
-	0xFE70,
-	0xFE75,
-	0xFE76,
-	0xFEFD,
-	0xFEFF,
-	0xFF00,
-	0xFF01,
-	0xFFBF,
-	0xFFC2,
-	0xFFC8,
-	0xFFCA,
-	0xFFD0,
-	0xFFD2,
-	0xFFD8,
-	0xFFDA,
-	0xFFDD,
-	0xFFE0,
-	0xFFE7,
-	0xFFE8,
-	0xFFEF,
-	0xFFF9,
-	0xFFFE,
-	0x10000,
-	0x1000C,
-	0x1000D,
-	0x10027,
-	0x10028,
-	0x1003B,
-	0x1003C,
-	0x1003E,
-	0x1003F,
-	0x1004E,
-	0x10050,
-	0x1005E,
-	0x10080,
-	0x100FB,
-	0x10100,
-	0x10103,
-	0x10107,
-	0x10134,
-	0x10137,
-	0x1018D,
-	0x10190,
-	0x1019C,
-	0x101A0,
-	0x101A1,
-	0x101D0,
-	0x101FE,
-	0x10280,
-	0x1029D,
-	0x102A0,
-	0x102D1,
-	0x102E0,
-	0x102FC,
-	0x10300,
-	0x10324,
-	0x10330,
-	0x1034B,
-	0x10350,
-	0x1037B,
-	0x10380,
-	0x1039E,
-	0x1039F,
-	0x103C4,
-	0x103C8,
-	0x103D6,
-	0x10400,
-	0x1049E,
-	0x104A0,
-	0x104AA,
-	0x10500,
-	0x10528,
-	0x10530,
-	0x10564,
-	0x1056F,
-	0x10570,
-	0x10600,
-	0x10737,
-	0x10740,
-	0x10756,
-	0x10760,
-	0x10768,
-	0x10800,
-	0x10806,
-	0x10808,
-	0x10809,
-	0x1080A,
-	0x10836,
-	0x10837,
-	0x10839,
-	0x1083C,
-	0x1083D,
-	0x1083F,
-	0x10856,
-	0x10857,
-	0x1089F,
-	0x108A7,
-	0x108B0,
-	0x10900,
-	0x1091C,
-	0x1091F,
-	0x1093A,
-	0x1093F,
-	0x10940,
-	0x10980,
-	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
-	0x10A04,
-	0x10A05,
-	0x10A07,
-	0x10A0C,
-	0x10A14,
-	0x10A15,
-	0x10A18,
-	0x10A19,
-	0x10A34,
-	0x10A38,
-	0x10A3B,
-	0x10A3F,
-	0x10A48,
-	0x10A50,
-	0x10A59,
-	0x10A60,
-	0x10AA0,
-	0x10AC0,
-	0x10AE7,
-	0x10AEB,
-	0x10AF7,
-	0x10B00,
-	0x10B36,
-	0x10B39,
-	0x10B56,
-	0x10B58,
-	0x10B73,
-	0x10B78,
-	0x10B92,
-	0x10B99,
-	0x10B9D,
-	0x10BA9,
-	0x10BB0,
-	0x10C00,
-	0x10C49,
-	0x10E60,
-	0x10E7F,
-	0x11000,
-	0x1104E,
-	0x11052,
-	0x11070,
-	0x1107F,
-	0x110C2,
-	0x110D0,
-	0x110E9,
-	0x110F0,
-	0x110FA,
-	0x11100,
-	0x11135,
-	0x11136,
-	0x11144,
-	0x11150,
-	0x11177,
-	0x11180,
-	0x111C9,
-	0x111CD,
-	0x111CE,
-	0x111D0,
-	0x111DB,
-	0x111E1,
-	0x111F5,
-	0x11200,
-	0x11212,
-	0x11213,
-	0x1123E,
-	0x112B0,
-	0x112EB,
-	0x112F0,
-	0x112FA,
-	0x11301,
-	0x11304,
-	0x11305,
-	0x1130D,
-	0x1130F,
-	0x11311,
-	0x11313,
-	0x11329,
-	0x1132A,
-	0x11331,
-	0x11332,
-	0x11334,
-	0x11335,
-	0x1133A,
-	0x1133C,
-	0x11345,
-	0x11347,
-	0x11349,
-	0x1134B,
-	0x1134E,
-	0x11357,
-	0x11358,
-	0x1135D,
-	0x11364,
-	0x11366,
-	0x1136D,
-	0x11370,
-	0x11375,
-	0x11480,
-	0x114C8,
-	0x114D0,
-	0x114DA,
-	0x11580,
-	0x115B6,
-	0x115B8,
-	0x115CA,
-	0x11600,
-	0x11645,
-	0x11650,
-	0x1165A,
-	0x11680,
-	0x116B8,
-	0x116C0,
-	0x116CA,
-	0x118A0,
-	0x118F3,
-	0x118FF,
-	0x11900,
-	0x11AC0,
-	0x11AF9,
-	0x12000,
-	0x12399,
-	0x12400,
-	0x1246F,
-	0x12470,
-	0x12475,
-	0x13000,
-	0x1342F,
-	0x16800,
-	0x16A39,
-	0x16A40,
-	0x16A5F,
-	0x16A60,
-	0x16A6A,
-	0x16A6E,
-	0x16A70,
-	0x16AD0,
-	0x16AEE,
-	0x16AF0,
-	0x16AF6,
-	0x16B00,
-	0x16B46,
-	0x16B50,
-	0x16B5A,
-	0x16B5B,
-	0x16B62,
-	0x16B63,
-	0x16B78,
-	0x16B7D,
-	0x16B90,
-	0x16F00,
-	0x16F45,
-	0x16F50,
-	0x16F7F,
-	0x16F8F,
-	0x16FA0,
-	0x1B000,
-	0x1B002,
-	0x1BC00,
-	0x1BC6B,
-	0x1BC70,
-	0x1BC7D,
-	0x1BC80,
-	0x1BC89,
-	0x1BC90,
-	0x1BC9A,
-	0x1BC9C,
-	0x1BCA4,
-	0x1D000,
-	0x1D0F6,
-	0x1D100,
-	0x1D127,
-	0x1D129,
-	0x1D1DE,
-	0x1D200,
-	0x1D246,
-	0x1D300,
-	0x1D357,
-	0x1D360,
-	0x1D372,
-	0x1D400,
-	0x1D455,
-	0x1D456,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D51E,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D552,
-	0x1D6A6,
-	0x1D6A8,
-	0x1D7CC,
-	0x1D7CE,
-	0x1D800,
-	0x1E800,
-	0x1E8C5,
-	0x1E8C7,
-	0x1E8D7,
-	0x1EE00,
-	0x1EE04,
-	0x1EE05,
-	0x1EE20,
-	0x1EE21,
-	0x1EE23,
-	0x1EE24,
-	0x1EE25,
-	0x1EE27,
-	0x1EE28,
-	0x1EE29,
-	0x1EE33,
-	0x1EE34,
-	0x1EE38,
-	0x1EE39,
-	0x1EE3A,
-	0x1EE3B,
-	0x1EE3C,
-	0x1EE42,
-	0x1EE43,
-	0x1EE47,
-	0x1EE48,
-	0x1EE49,
-	0x1EE4A,
-	0x1EE4B,
-	0x1EE4C,
-	0x1EE4D,
-	0x1EE50,
-	0x1EE51,
-	0x1EE53,
-	0x1EE54,
-	0x1EE55,
-	0x1EE57,
-	0x1EE58,
-	0x1EE59,
-	0x1EE5A,
-	0x1EE5B,
-	0x1EE5C,
-	0x1EE5D,
-	0x1EE5E,
-	0x1EE5F,
-	0x1EE60,
-	0x1EE61,
-	0x1EE63,
-	0x1EE64,
-	0x1EE65,
-	0x1EE67,
-	0x1EE6B,
-	0x1EE6C,
-	0x1EE73,
-	0x1EE74,
-	0x1EE78,
-	0x1EE79,
-	0x1EE7D,
-	0x1EE7E,
-	0x1EE7F,
-	0x1EE80,
-	0x1EE8A,
-	0x1EE8B,
-	0x1EE9C,
-	0x1EEA1,
-	0x1EEA4,
-	0x1EEA5,
-	0x1EEAA,
-	0x1EEAB,
-	0x1EEBC,
-	0x1EEF0,
-	0x1EEF2,
-	0x1F000,
-	0x1F02C,
-	0x1F030,
-	0x1F094,
-	0x1F0A0,
-	0x1F0AF,
-	0x1F0B1,
-	0x1F0C0,
-	0x1F0C1,
-	0x1F0D0,
-	0x1F0D1,
-	0x1F0F6,
-	0x1F100,
-	0x1F10D,
-	0x1F110,
-	0x1F12F,
-	0x1F130,
-	0x1F16C,
-	0x1F170,
-	0x1F19B,
-	0x1F1E6,
-	0x1F203,
-	0x1F210,
-	0x1F23B,
-	0x1F240,
-	0x1F249,
-	0x1F250,
-	0x1F252,
-	0x1F300,
-	0x1F32D,
-	0x1F330,
-	0x1F37E,
-	0x1F380,
-	0x1F3CF,
-	0x1F3D4,
-	0x1F3F8,
-	0x1F400,
-	0x1F4FF,
-	0x1F500,
-	0x1F54B,
-	0x1F550,
-	0x1F57A,
-	0x1F57B,
-	0x1F5A4,
-	0x1F5A5,
-	0x1F643,
-	0x1F645,
-	0x1F6D0,
-	0x1F6E0,
-	0x1F6ED,
-	0x1F6F0,
-	0x1F6F4,
-	0x1F700,
-	0x1F774,
-	0x1F780,
-	0x1F7D5,
-	0x1F800,
-	0x1F80C,
-	0x1F810,
-	0x1F848,
-	0x1F850,
-	0x1F85A,
-	0x1F860,
-	0x1F888,
-	0x1F890,
-	0x1F8AE,
-	0x20000,
-	0x2A6D7,
-	0x2A700,
-	0x2B735,
-	0x2B740,
-	0x2B81E,
-	0x2F800,
-	0x2FA1E,
-	0xE0001,
-	0xE0002,
-	0xE0020,
-	0xE0080,
-	0xE0100,
-	0xE01F0,
-	0xF0000,
-	0xFFFFE,
-	0x100000,
-	0x10FFFE
-};
-
-static const UV XPosixPunct_invlist[] = { /* for EBCDIC 037 */
-	311,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x4B,
-	0x51,
-	0x5A,
-	0x5F,
-	0x60,
-	0x62,
-	0x6B,
-	0x70,
-	0x79,
-	0x80,
-	0x8A,
-	0x8C,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xAC,
-	0xB0,
-	0xB1,
-	0xB3,
-	0xB4,
-	0xB5,
-	0xB7,
-	0xBA,
-	0xBC,
-	0xC0,
-	0xC1,
-	0xD0,
-	0xD1,
-	0xE0,
-	0xE1,
-	0x37E,
-	0x37F,
-	0x387,
-	0x388,
-	0x55A,
-	0x560,
-	0x589,
-	0x58B,
-	0x5BE,
-	0x5BF,
-	0x5C0,
-	0x5C1,
-	0x5C3,
-	0x5C4,
-	0x5C6,
-	0x5C7,
-	0x5F3,
-	0x5F5,
-	0x609,
-	0x60B,
-	0x60C,
-	0x60E,
-	0x61B,
-	0x61C,
-	0x61E,
-	0x620,
-	0x66A,
-	0x66E,
-	0x6D4,
-	0x6D5,
-	0x700,
-	0x70E,
-	0x7F7,
-	0x7FA,
-	0x830,
-	0x83F,
-	0x85E,
-	0x85F,
-	0x964,
-	0x966,
-	0x970,
-	0x971,
-	0xAF0,
-	0xAF1,
-	0xDF4,
-	0xDF5,
-	0xE4F,
-	0xE50,
-	0xE5A,
-	0xE5C,
-	0xF04,
-	0xF13,
-	0xF14,
-	0xF15,
-	0xF3A,
-	0xF3E,
-	0xF85,
-	0xF86,
-	0xFD0,
-	0xFD5,
-	0xFD9,
-	0xFDB,
-	0x104A,
-	0x1050,
-	0x10FB,
-	0x10FC,
-	0x1360,
-	0x1369,
-	0x1400,
-	0x1401,
-	0x166D,
-	0x166F,
-	0x169B,
-	0x169D,
-	0x16EB,
-	0x16EE,
-	0x1735,
-	0x1737,
-	0x17D4,
-	0x17D7,
-	0x17D8,
-	0x17DB,
-	0x1800,
-	0x180B,
-	0x1944,
-	0x1946,
-	0x1A1E,
-	0x1A20,
-	0x1AA0,
-	0x1AA7,
-	0x1AA8,
-	0x1AAE,
-	0x1B5A,
-	0x1B61,
-	0x1BFC,
-	0x1C00,
-	0x1C3B,
-	0x1C40,
-	0x1C7E,
-	0x1C80,
-	0x1CC0,
-	0x1CC8,
-	0x1CD3,
-	0x1CD4,
-	0x2010,
-	0x2028,
-	0x2030,
-	0x2044,
-	0x2045,
-	0x2052,
-	0x2053,
-	0x205F,
-	0x207D,
-	0x207F,
-	0x208D,
-	0x208F,
-	0x2308,
-	0x230C,
-	0x2329,
-	0x232B,
-	0x2768,
-	0x2776,
-	0x27C5,
-	0x27C7,
-	0x27E6,
-	0x27F0,
-	0x2983,
-	0x2999,
-	0x29D8,
-	0x29DC,
-	0x29FC,
-	0x29FE,
-	0x2CF9,
-	0x2CFD,
-	0x2CFE,
-	0x2D00,
-	0x2D70,
-	0x2D71,
-	0x2E00,
-	0x2E2F,
-	0x2E30,
-	0x2E43,
-	0x3001,
-	0x3004,
-	0x3008,
-	0x3012,
-	0x3014,
-	0x3020,
-	0x3030,
-	0x3031,
-	0x303D,
-	0x303E,
-	0x30A0,
-	0x30A1,
-	0x30FB,
-	0x30FC,
-	0xA4FE,
-	0xA500,
-	0xA60D,
-	0xA610,
-	0xA673,
-	0xA674,
-	0xA67E,
-	0xA67F,
-	0xA6F2,
-	0xA6F8,
-	0xA874,
-	0xA878,
-	0xA8CE,
-	0xA8D0,
-	0xA8F8,
-	0xA8FB,
-	0xA92E,
-	0xA930,
-	0xA95F,
-	0xA960,
-	0xA9C1,
-	0xA9CE,
-	0xA9DE,
-	0xA9E0,
-	0xAA5C,
-	0xAA60,
-	0xAADE,
-	0xAAE0,
-	0xAAF0,
-	0xAAF2,
-	0xABEB,
-	0xABEC,
-	0xFD3E,
-	0xFD40,
-	0xFE10,
-	0xFE1A,
-	0xFE30,
-	0xFE53,
-	0xFE54,
-	0xFE62,
-	0xFE63,
-	0xFE64,
-	0xFE68,
-	0xFE69,
-	0xFE6A,
-	0xFE6C,
-	0xFF01,
-	0xFF04,
-	0xFF05,
-	0xFF0B,
-	0xFF0C,
-	0xFF10,
-	0xFF1A,
-	0xFF1C,
-	0xFF1F,
-	0xFF21,
-	0xFF3B,
-	0xFF3E,
-	0xFF3F,
-	0xFF40,
-	0xFF5B,
-	0xFF5C,
-	0xFF5D,
-	0xFF5E,
-	0xFF5F,
-	0xFF66,
-	0x10100,
-	0x10103,
-	0x1039F,
-	0x103A0,
-	0x103D0,
-	0x103D1,
-	0x1056F,
-	0x10570,
-	0x10857,
-	0x10858,
-	0x1091F,
-	0x10920,
-	0x1093F,
-	0x10940,
-	0x10A50,
-	0x10A59,
-	0x10A7F,
-	0x10A80,
-	0x10AF0,
-	0x10AF7,
-	0x10B39,
-	0x10B40,
-	0x10B99,
-	0x10B9D,
-	0x11047,
-	0x1104E,
-	0x110BB,
-	0x110BD,
-	0x110BE,
-	0x110C2,
-	0x11140,
-	0x11144,
-	0x11174,
-	0x11176,
-	0x111C5,
-	0x111C9,
-	0x111CD,
-	0x111CE,
-	0x11238,
-	0x1123E,
-	0x114C6,
-	0x114C7,
-	0x115C1,
-	0x115CA,
-	0x11641,
-	0x11644,
-	0x12470,
-	0x12475,
-	0x16A6E,
-	0x16A70,
-	0x16AF5,
-	0x16AF6,
-	0x16B37,
-	0x16B3C,
-	0x16B44,
-	0x16B45,
-	0x1BC9F,
-	0x1BCA0
-};
-
-static const UV XPosixSpace_invlist[] = { /* for EBCDIC 037 */
-	23,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x5,
-	0x6,
-	0xB,
-	0xE,
-	0x15,
-	0x16,
-	0x25,
-	0x26,
-	0x40,
-	0x42,
-	0x1680,
-	0x1681,
-	0x2000,
-	0x200B,
-	0x2028,
-	0x202A,
-	0x202F,
-	0x2030,
-	0x205F,
-	0x2060,
-	0x3000,
-	0x3001
-};
-
-static const UV XPosixUpper_invlist[] = { /* for EBCDIC 037 */
-	1269,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x62,
-	0x6A,
-	0x71,
-	0x79,
-	0x80,
-	0x81,
-	0x9E,
-	0x9F,
-	0xAC,
-	0xAF,
-	0xC1,
-	0xCA,
-	0xD1,
-	0xDA,
-	0xE2,
-	0xEA,
-	0xEB,
-	0xF0,
-	0xFB,
-	0xFF,
-	0x100,
-	0x101,
-	0x102,
-	0x103,
-	0x104,
-	0x105,
-	0x106,
-	0x107,
-	0x108,
-	0x109,
-	0x10A,
-	0x10B,
-	0x10C,
-	0x10D,
-	0x10E,
-	0x10F,
-	0x110,
-	0x111,
-	0x112,
-	0x113,
-	0x114,
-	0x115,
-	0x116,
-	0x117,
-	0x118,
-	0x119,
-	0x11A,
-	0x11B,
-	0x11C,
-	0x11D,
-	0x11E,
-	0x11F,
-	0x120,
-	0x121,
-	0x122,
-	0x123,
-	0x124,
-	0x125,
-	0x126,
-	0x127,
-	0x128,
-	0x129,
-	0x12A,
-	0x12B,
-	0x12C,
-	0x12D,
-	0x12E,
-	0x12F,
-	0x130,
-	0x131,
-	0x132,
-	0x133,
-	0x134,
-	0x135,
-	0x136,
-	0x137,
-	0x139,
-	0x13A,
-	0x13B,
-	0x13C,
-	0x13D,
-	0x13E,
-	0x13F,
-	0x140,
-	0x141,
-	0x142,
-	0x143,
-	0x144,
-	0x145,
-	0x146,
-	0x147,
-	0x148,
-	0x14A,
-	0x14B,
-	0x14C,
-	0x14D,
-	0x14E,
-	0x14F,
-	0x150,
-	0x151,
-	0x152,
-	0x153,
-	0x154,
-	0x155,
-	0x156,
-	0x157,
-	0x158,
-	0x159,
-	0x15A,
-	0x15B,
-	0x15C,
-	0x15D,
-	0x15E,
-	0x15F,
-	0x160,
-	0x161,
-	0x162,
-	0x163,
-	0x164,
-	0x165,
-	0x166,
-	0x167,
-	0x168,
-	0x169,
-	0x16A,
-	0x16B,
-	0x16C,
-	0x16D,
-	0x16E,
-	0x16F,
-	0x170,
-	0x171,
-	0x172,
-	0x173,
-	0x174,
-	0x175,
-	0x176,
-	0x177,
-	0x178,
-	0x17A,
-	0x17B,
-	0x17C,
-	0x17D,
-	0x17E,
-	0x181,
-	0x183,
-	0x184,
-	0x185,
-	0x186,
-	0x188,
-	0x189,
-	0x18C,
-	0x18E,
-	0x192,
-	0x193,
-	0x195,
-	0x196,
-	0x199,
-	0x19C,
-	0x19E,
-	0x19F,
-	0x1A1,
-	0x1A2,
-	0x1A3,
-	0x1A4,
-	0x1A5,
-	0x1A6,
-	0x1A8,
-	0x1A9,
-	0x1AA,
-	0x1AC,
-	0x1AD,
-	0x1AE,
-	0x1B0,
-	0x1B1,
-	0x1B4,
-	0x1B5,
-	0x1B6,
-	0x1B7,
-	0x1B9,
-	0x1BC,
-	0x1BD,
-	0x1C4,
-	0x1C5,
-	0x1C7,
-	0x1C8,
-	0x1CA,
-	0x1CB,
-	0x1CD,
-	0x1CE,
-	0x1CF,
-	0x1D0,
-	0x1D1,
-	0x1D2,
-	0x1D3,
-	0x1D4,
-	0x1D5,
-	0x1D6,
-	0x1D7,
-	0x1D8,
-	0x1D9,
-	0x1DA,
-	0x1DB,
-	0x1DC,
-	0x1DE,
-	0x1DF,
-	0x1E0,
-	0x1E1,
-	0x1E2,
-	0x1E3,
-	0x1E4,
-	0x1E5,
-	0x1E6,
-	0x1E7,
-	0x1E8,
-	0x1E9,
-	0x1EA,
-	0x1EB,
-	0x1EC,
-	0x1ED,
-	0x1EE,
-	0x1EF,
-	0x1F1,
-	0x1F2,
-	0x1F4,
-	0x1F5,
-	0x1F6,
-	0x1F9,
-	0x1FA,
-	0x1FB,
-	0x1FC,
-	0x1FD,
-	0x1FE,
-	0x1FF,
-	0x200,
-	0x201,
-	0x202,
-	0x203,
-	0x204,
-	0x205,
-	0x206,
-	0x207,
-	0x208,
-	0x209,
-	0x20A,
-	0x20B,
-	0x20C,
-	0x20D,
-	0x20E,
-	0x20F,
-	0x210,
-	0x211,
-	0x212,
-	0x213,
-	0x214,
-	0x215,
-	0x216,
-	0x217,
-	0x218,
-	0x219,
-	0x21A,
-	0x21B,
-	0x21C,
-	0x21D,
-	0x21E,
-	0x21F,
-	0x220,
-	0x221,
-	0x222,
-	0x223,
-	0x224,
-	0x225,
-	0x226,
-	0x227,
-	0x228,
-	0x229,
-	0x22A,
-	0x22B,
-	0x22C,
-	0x22D,
-	0x22E,
-	0x22F,
-	0x230,
-	0x231,
-	0x232,
-	0x233,
-	0x23A,
-	0x23C,
-	0x23D,
-	0x23F,
-	0x241,
-	0x242,
-	0x243,
-	0x247,
-	0x248,
-	0x249,
-	0x24A,
-	0x24B,
-	0x24C,
-	0x24D,
-	0x24E,
-	0x24F,
-	0x370,
-	0x371,
-	0x372,
-	0x373,
-	0x376,
-	0x377,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x390,
-	0x391,
-	0x3A2,
-	0x3A3,
-	0x3AC,
-	0x3CF,
-	0x3D0,
-	0x3D2,
-	0x3D5,
-	0x3D8,
-	0x3D9,
-	0x3DA,
-	0x3DB,
-	0x3DC,
-	0x3DD,
-	0x3DE,
-	0x3DF,
-	0x3E0,
-	0x3E1,
-	0x3E2,
-	0x3E3,
-	0x3E4,
-	0x3E5,
-	0x3E6,
-	0x3E7,
-	0x3E8,
-	0x3E9,
-	0x3EA,
-	0x3EB,
-	0x3EC,
-	0x3ED,
-	0x3EE,
-	0x3EF,
-	0x3F4,
-	0x3F5,
-	0x3F7,
-	0x3F8,
-	0x3F9,
-	0x3FB,
-	0x3FD,
-	0x430,
-	0x460,
-	0x461,
-	0x462,
-	0x463,
-	0x464,
-	0x465,
-	0x466,
-	0x467,
-	0x468,
-	0x469,
-	0x46A,
-	0x46B,
-	0x46C,
-	0x46D,
-	0x46E,
-	0x46F,
-	0x470,
-	0x471,
-	0x472,
-	0x473,
-	0x474,
-	0x475,
-	0x476,
-	0x477,
-	0x478,
-	0x479,
-	0x47A,
-	0x47B,
-	0x47C,
-	0x47D,
-	0x47E,
-	0x47F,
-	0x480,
-	0x481,
-	0x48A,
-	0x48B,
-	0x48C,
-	0x48D,
-	0x48E,
-	0x48F,
-	0x490,
-	0x491,
-	0x492,
-	0x493,
-	0x494,
-	0x495,
-	0x496,
-	0x497,
-	0x498,
-	0x499,
-	0x49A,
-	0x49B,
-	0x49C,
-	0x49D,
-	0x49E,
-	0x49F,
-	0x4A0,
-	0x4A1,
-	0x4A2,
-	0x4A3,
-	0x4A4,
-	0x4A5,
-	0x4A6,
-	0x4A7,
-	0x4A8,
-	0x4A9,
-	0x4AA,
-	0x4AB,
-	0x4AC,
-	0x4AD,
-	0x4AE,
-	0x4AF,
-	0x4B0,
-	0x4B1,
-	0x4B2,
-	0x4B3,
-	0x4B4,
-	0x4B5,
-	0x4B6,
-	0x4B7,
-	0x4B8,
-	0x4B9,
-	0x4BA,
-	0x4BB,
-	0x4BC,
-	0x4BD,
-	0x4BE,
-	0x4BF,
-	0x4C0,
-	0x4C2,
-	0x4C3,
-	0x4C4,
-	0x4C5,
-	0x4C6,
-	0x4C7,
-	0x4C8,
-	0x4C9,
-	0x4CA,
-	0x4CB,
-	0x4CC,
-	0x4CD,
-	0x4CE,
-	0x4D0,
-	0x4D1,
-	0x4D2,
-	0x4D3,
-	0x4D4,
-	0x4D5,
-	0x4D6,
-	0x4D7,
-	0x4D8,
-	0x4D9,
-	0x4DA,
-	0x4DB,
-	0x4DC,
-	0x4DD,
-	0x4DE,
-	0x4DF,
-	0x4E0,
-	0x4E1,
-	0x4E2,
-	0x4E3,
-	0x4E4,
-	0x4E5,
-	0x4E6,
-	0x4E7,
-	0x4E8,
-	0x4E9,
-	0x4EA,
-	0x4EB,
-	0x4EC,
-	0x4ED,
-	0x4EE,
-	0x4EF,
-	0x4F0,
-	0x4F1,
-	0x4F2,
-	0x4F3,
-	0x4F4,
-	0x4F5,
-	0x4F6,
-	0x4F7,
-	0x4F8,
-	0x4F9,
-	0x4FA,
-	0x4FB,
-	0x4FC,
-	0x4FD,
-	0x4FE,
-	0x4FF,
-	0x500,
-	0x501,
-	0x502,
-	0x503,
-	0x504,
-	0x505,
-	0x506,
-	0x507,
-	0x508,
-	0x509,
-	0x50A,
-	0x50B,
-	0x50C,
-	0x50D,
-	0x50E,
-	0x50F,
-	0x510,
-	0x511,
-	0x512,
-	0x513,
-	0x514,
-	0x515,
-	0x516,
-	0x517,
-	0x518,
-	0x519,
-	0x51A,
-	0x51B,
-	0x51C,
-	0x51D,
-	0x51E,
-	0x51F,
-	0x520,
-	0x521,
-	0x522,
-	0x523,
-	0x524,
-	0x525,
-	0x526,
-	0x527,
-	0x528,
-	0x529,
-	0x52A,
-	0x52B,
-	0x52C,
-	0x52D,
-	0x52E,
-	0x52F,
-	0x531,
-	0x557,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x1E00,
-	0x1E01,
-	0x1E02,
-	0x1E03,
-	0x1E04,
-	0x1E05,
-	0x1E06,
-	0x1E07,
-	0x1E08,
-	0x1E09,
-	0x1E0A,
-	0x1E0B,
-	0x1E0C,
-	0x1E0D,
-	0x1E0E,
-	0x1E0F,
-	0x1E10,
-	0x1E11,
-	0x1E12,
-	0x1E13,
-	0x1E14,
-	0x1E15,
-	0x1E16,
-	0x1E17,
-	0x1E18,
-	0x1E19,
-	0x1E1A,
-	0x1E1B,
-	0x1E1C,
-	0x1E1D,
-	0x1E1E,
-	0x1E1F,
-	0x1E20,
-	0x1E21,
-	0x1E22,
-	0x1E23,
-	0x1E24,
-	0x1E25,
-	0x1E26,
-	0x1E27,
-	0x1E28,
-	0x1E29,
-	0x1E2A,
-	0x1E2B,
-	0x1E2C,
-	0x1E2D,
-	0x1E2E,
-	0x1E2F,
-	0x1E30,
-	0x1E31,
-	0x1E32,
-	0x1E33,
-	0x1E34,
-	0x1E35,
-	0x1E36,
-	0x1E37,
-	0x1E38,
-	0x1E39,
-	0x1E3A,
-	0x1E3B,
-	0x1E3C,
-	0x1E3D,
-	0x1E3E,
-	0x1E3F,
-	0x1E40,
-	0x1E41,
-	0x1E42,
-	0x1E43,
-	0x1E44,
-	0x1E45,
-	0x1E46,
-	0x1E47,
-	0x1E48,
-	0x1E49,
-	0x1E4A,
-	0x1E4B,
-	0x1E4C,
-	0x1E4D,
-	0x1E4E,
-	0x1E4F,
-	0x1E50,
-	0x1E51,
-	0x1E52,
-	0x1E53,
-	0x1E54,
-	0x1E55,
-	0x1E56,
-	0x1E57,
-	0x1E58,
-	0x1E59,
-	0x1E5A,
-	0x1E5B,
-	0x1E5C,
-	0x1E5D,
-	0x1E5E,
-	0x1E5F,
-	0x1E60,
-	0x1E61,
-	0x1E62,
-	0x1E63,
-	0x1E64,
-	0x1E65,
-	0x1E66,
-	0x1E67,
-	0x1E68,
-	0x1E69,
-	0x1E6A,
-	0x1E6B,
-	0x1E6C,
-	0x1E6D,
-	0x1E6E,
-	0x1E6F,
-	0x1E70,
-	0x1E71,
-	0x1E72,
-	0x1E73,
-	0x1E74,
-	0x1E75,
-	0x1E76,
-	0x1E77,
-	0x1E78,
-	0x1E79,
-	0x1E7A,
-	0x1E7B,
-	0x1E7C,
-	0x1E7D,
-	0x1E7E,
-	0x1E7F,
-	0x1E80,
-	0x1E81,
-	0x1E82,
-	0x1E83,
-	0x1E84,
-	0x1E85,
-	0x1E86,
-	0x1E87,
-	0x1E88,
-	0x1E89,
-	0x1E8A,
-	0x1E8B,
-	0x1E8C,
-	0x1E8D,
-	0x1E8E,
-	0x1E8F,
-	0x1E90,
-	0x1E91,
-	0x1E92,
-	0x1E93,
-	0x1E94,
-	0x1E95,
-	0x1E9E,
-	0x1E9F,
-	0x1EA0,
-	0x1EA1,
-	0x1EA2,
-	0x1EA3,
-	0x1EA4,
-	0x1EA5,
-	0x1EA6,
-	0x1EA7,
-	0x1EA8,
-	0x1EA9,
-	0x1EAA,
-	0x1EAB,
-	0x1EAC,
-	0x1EAD,
-	0x1EAE,
-	0x1EAF,
-	0x1EB0,
-	0x1EB1,
-	0x1EB2,
-	0x1EB3,
-	0x1EB4,
-	0x1EB5,
-	0x1EB6,
-	0x1EB7,
-	0x1EB8,
-	0x1EB9,
-	0x1EBA,
-	0x1EBB,
-	0x1EBC,
-	0x1EBD,
-	0x1EBE,
-	0x1EBF,
-	0x1EC0,
-	0x1EC1,
-	0x1EC2,
-	0x1EC3,
-	0x1EC4,
-	0x1EC5,
-	0x1EC6,
-	0x1EC7,
-	0x1EC8,
-	0x1EC9,
-	0x1ECA,
-	0x1ECB,
-	0x1ECC,
-	0x1ECD,
-	0x1ECE,
-	0x1ECF,
-	0x1ED0,
-	0x1ED1,
-	0x1ED2,
-	0x1ED3,
-	0x1ED4,
-	0x1ED5,
-	0x1ED6,
-	0x1ED7,
-	0x1ED8,
-	0x1ED9,
-	0x1EDA,
-	0x1EDB,
-	0x1EDC,
-	0x1EDD,
-	0x1EDE,
-	0x1EDF,
-	0x1EE0,
-	0x1EE1,
-	0x1EE2,
-	0x1EE3,
-	0x1EE4,
-	0x1EE5,
-	0x1EE6,
-	0x1EE7,
-	0x1EE8,
-	0x1EE9,
-	0x1EEA,
-	0x1EEB,
-	0x1EEC,
-	0x1EED,
-	0x1EEE,
-	0x1EEF,
-	0x1EF0,
-	0x1EF1,
-	0x1EF2,
-	0x1EF3,
-	0x1EF4,
-	0x1EF5,
-	0x1EF6,
-	0x1EF7,
-	0x1EF8,
-	0x1EF9,
-	0x1EFA,
-	0x1EFB,
-	0x1EFC,
-	0x1EFD,
-	0x1EFE,
-	0x1EFF,
-	0x1F08,
-	0x1F10,
-	0x1F18,
-	0x1F1E,
-	0x1F28,
-	0x1F30,
-	0x1F38,
-	0x1F40,
-	0x1F48,
-	0x1F4E,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F60,
-	0x1F68,
-	0x1F70,
-	0x1FB8,
-	0x1FBC,
-	0x1FC8,
-	0x1FCC,
-	0x1FD8,
-	0x1FDC,
-	0x1FE8,
-	0x1FED,
-	0x1FF8,
-	0x1FFC,
-	0x2102,
-	0x2103,
-	0x2107,
-	0x2108,
-	0x210B,
-	0x210E,
-	0x2110,
-	0x2113,
-	0x2115,
-	0x2116,
-	0x2119,
-	0x211E,
-	0x2124,
-	0x2125,
-	0x2126,
-	0x2127,
-	0x2128,
-	0x2129,
-	0x212A,
-	0x212E,
-	0x2130,
-	0x2134,
-	0x213E,
-	0x2140,
-	0x2145,
-	0x2146,
-	0x2160,
-	0x2170,
-	0x2183,
-	0x2184,
-	0x24B6,
-	0x24D0,
-	0x2C00,
-	0x2C2F,
-	0x2C60,
-	0x2C61,
-	0x2C62,
-	0x2C65,
-	0x2C67,
-	0x2C68,
-	0x2C69,
-	0x2C6A,
-	0x2C6B,
-	0x2C6C,
-	0x2C6D,
-	0x2C71,
-	0x2C72,
-	0x2C73,
-	0x2C75,
-	0x2C76,
-	0x2C7E,
-	0x2C81,
-	0x2C82,
-	0x2C83,
-	0x2C84,
-	0x2C85,
-	0x2C86,
-	0x2C87,
-	0x2C88,
-	0x2C89,
-	0x2C8A,
-	0x2C8B,
-	0x2C8C,
-	0x2C8D,
-	0x2C8E,
-	0x2C8F,
-	0x2C90,
-	0x2C91,
-	0x2C92,
-	0x2C93,
-	0x2C94,
-	0x2C95,
-	0x2C96,
-	0x2C97,
-	0x2C98,
-	0x2C99,
-	0x2C9A,
-	0x2C9B,
-	0x2C9C,
-	0x2C9D,
-	0x2C9E,
-	0x2C9F,
-	0x2CA0,
-	0x2CA1,
-	0x2CA2,
-	0x2CA3,
-	0x2CA4,
-	0x2CA5,
-	0x2CA6,
-	0x2CA7,
-	0x2CA8,
-	0x2CA9,
-	0x2CAA,
-	0x2CAB,
-	0x2CAC,
-	0x2CAD,
-	0x2CAE,
-	0x2CAF,
-	0x2CB0,
-	0x2CB1,
-	0x2CB2,
-	0x2CB3,
-	0x2CB4,
-	0x2CB5,
-	0x2CB6,
-	0x2CB7,
-	0x2CB8,
-	0x2CB9,
-	0x2CBA,
-	0x2CBB,
-	0x2CBC,
-	0x2CBD,
-	0x2CBE,
-	0x2CBF,
-	0x2CC0,
-	0x2CC1,
-	0x2CC2,
-	0x2CC3,
-	0x2CC4,
-	0x2CC5,
-	0x2CC6,
-	0x2CC7,
-	0x2CC8,
-	0x2CC9,
-	0x2CCA,
-	0x2CCB,
-	0x2CCC,
-	0x2CCD,
-	0x2CCE,
-	0x2CCF,
-	0x2CD0,
-	0x2CD1,
-	0x2CD2,
-	0x2CD3,
-	0x2CD4,
-	0x2CD5,
-	0x2CD6,
-	0x2CD7,
-	0x2CD8,
-	0x2CD9,
-	0x2CDA,
-	0x2CDB,
-	0x2CDC,
-	0x2CDD,
-	0x2CDE,
-	0x2CDF,
-	0x2CE0,
-	0x2CE1,
-	0x2CE2,
-	0x2CE3,
-	0x2CEB,
-	0x2CEC,
-	0x2CED,
-	0x2CEE,
-	0x2CF2,
-	0x2CF3,
-	0xA640,
-	0xA641,
-	0xA642,
-	0xA643,
-	0xA644,
-	0xA645,
-	0xA646,
-	0xA647,
-	0xA648,
-	0xA649,
-	0xA64A,
-	0xA64B,
-	0xA64C,
-	0xA64D,
-	0xA64E,
-	0xA64F,
-	0xA650,
-	0xA651,
-	0xA652,
-	0xA653,
-	0xA654,
-	0xA655,
-	0xA656,
-	0xA657,
-	0xA658,
-	0xA659,
-	0xA65A,
-	0xA65B,
-	0xA65C,
-	0xA65D,
-	0xA65E,
-	0xA65F,
-	0xA660,
-	0xA661,
-	0xA662,
-	0xA663,
-	0xA664,
-	0xA665,
-	0xA666,
-	0xA667,
-	0xA668,
-	0xA669,
-	0xA66A,
-	0xA66B,
-	0xA66C,
-	0xA66D,
-	0xA680,
-	0xA681,
-	0xA682,
-	0xA683,
-	0xA684,
-	0xA685,
-	0xA686,
-	0xA687,
-	0xA688,
-	0xA689,
-	0xA68A,
-	0xA68B,
-	0xA68C,
-	0xA68D,
-	0xA68E,
-	0xA68F,
-	0xA690,
-	0xA691,
-	0xA692,
-	0xA693,
-	0xA694,
-	0xA695,
-	0xA696,
-	0xA697,
-	0xA698,
-	0xA699,
-	0xA69A,
-	0xA69B,
-	0xA722,
-	0xA723,
-	0xA724,
-	0xA725,
-	0xA726,
-	0xA727,
-	0xA728,
-	0xA729,
-	0xA72A,
-	0xA72B,
-	0xA72C,
-	0xA72D,
-	0xA72E,
-	0xA72F,
-	0xA732,
-	0xA733,
-	0xA734,
-	0xA735,
-	0xA736,
-	0xA737,
-	0xA738,
-	0xA739,
-	0xA73A,
-	0xA73B,
-	0xA73C,
-	0xA73D,
-	0xA73E,
-	0xA73F,
-	0xA740,
-	0xA741,
-	0xA742,
-	0xA743,
-	0xA744,
-	0xA745,
-	0xA746,
-	0xA747,
-	0xA748,
-	0xA749,
-	0xA74A,
-	0xA74B,
-	0xA74C,
-	0xA74D,
-	0xA74E,
-	0xA74F,
-	0xA750,
-	0xA751,
-	0xA752,
-	0xA753,
-	0xA754,
-	0xA755,
-	0xA756,
-	0xA757,
-	0xA758,
-	0xA759,
-	0xA75A,
-	0xA75B,
-	0xA75C,
-	0xA75D,
-	0xA75E,
-	0xA75F,
-	0xA760,
-	0xA761,
-	0xA762,
-	0xA763,
-	0xA764,
-	0xA765,
-	0xA766,
-	0xA767,
-	0xA768,
-	0xA769,
-	0xA76A,
-	0xA76B,
-	0xA76C,
-	0xA76D,
-	0xA76E,
-	0xA76F,
-	0xA779,
-	0xA77A,
-	0xA77B,
-	0xA77C,
-	0xA77D,
-	0xA77F,
-	0xA780,
-	0xA781,
-	0xA782,
-	0xA783,
-	0xA784,
-	0xA785,
-	0xA786,
-	0xA787,
-	0xA78B,
-	0xA78C,
-	0xA78D,
-	0xA78E,
-	0xA790,
-	0xA791,
-	0xA792,
-	0xA793,
-	0xA796,
-	0xA797,
-	0xA798,
-	0xA799,
-	0xA79A,
-	0xA79B,
-	0xA79C,
-	0xA79D,
-	0xA79E,
-	0xA79F,
-	0xA7A0,
-	0xA7A1,
-	0xA7A2,
-	0xA7A3,
-	0xA7A4,
-	0xA7A5,
-	0xA7A6,
-	0xA7A7,
-	0xA7A8,
-	0xA7A9,
-	0xA7AA,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xFF21,
-	0xFF3B,
-	0x10400,
-	0x10428,
-	0x118A0,
-	0x118C0,
-	0x1D400,
-	0x1D41A,
-	0x1D434,
-	0x1D44E,
-	0x1D468,
-	0x1D482,
-	0x1D49C,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4B6,
-	0x1D4D0,
-	0x1D4EA,
-	0x1D504,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D538,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D56C,
-	0x1D586,
-	0x1D5A0,
-	0x1D5BA,
-	0x1D5D4,
-	0x1D5EE,
-	0x1D608,
-	0x1D622,
-	0x1D63C,
-	0x1D656,
-	0x1D670,
-	0x1D68A,
-	0x1D6A8,
-	0x1D6C1,
-	0x1D6E2,
-	0x1D6FB,
-	0x1D71C,
-	0x1D735,
-	0x1D756,
-	0x1D76F,
-	0x1D790,
-	0x1D7A9,
-	0x1D7CA,
-	0x1D7CB,
-	0x1F130,
-	0x1F14A,
-	0x1F150,
-	0x1F16A,
-	0x1F170,
-	0x1F18A
-};
-
-static const UV XPosixWord_invlist[] = { /* for EBCDIC 037 */
-	1281,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x42,
-	0x4A,
-	0x51,
-	0x5A,
-	0x62,
-	0x6A,
-	0x6D,
-	0x6E,
-	0x70,
-	0x79,
-	0x80,
-	0x8A,
-	0x8C,
-	0x8F,
-	0x91,
-	0x9D,
-	0x9E,
-	0x9F,
-	0xA0,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xAC,
-	0xAF,
-	0xC1,
-	0xCA,
-	0xCB,
-	0xD0,
-	0xD1,
-	0xDA,
-	0xDB,
-	0xE0,
-	0xE2,
-	0xEA,
-	0xEB,
-	0xFA,
-	0xFB,
-	0xFF,
-	0x100,
-	0x2C2,
-	0x2C6,
-	0x2D2,
-	0x2E0,
-	0x2E5,
-	0x2EC,
-	0x2ED,
-	0x2EE,
-	0x2EF,
-	0x300,
-	0x375,
-	0x376,
-	0x378,
-	0x37A,
-	0x37E,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x3F6,
-	0x3F7,
-	0x482,
-	0x483,
-	0x530,
-	0x531,
-	0x557,
-	0x559,
-	0x55A,
-	0x561,
-	0x588,
-	0x591,
-	0x5BE,
-	0x5BF,
-	0x5C0,
-	0x5C1,
-	0x5C3,
-	0x5C4,
-	0x5C6,
-	0x5C7,
-	0x5C8,
-	0x5D0,
-	0x5EB,
-	0x5F0,
-	0x5F3,
-	0x610,
-	0x61B,
-	0x620,
-	0x66A,
-	0x66E,
-	0x6D4,
-	0x6D5,
-	0x6DD,
-	0x6DF,
-	0x6E9,
-	0x6EA,
-	0x6FD,
-	0x6FF,
-	0x700,
-	0x710,
-	0x74B,
-	0x74D,
-	0x7B2,
-	0x7C0,
-	0x7F6,
-	0x7FA,
-	0x7FB,
-	0x800,
-	0x82E,
-	0x840,
-	0x85C,
-	0x8A0,
-	0x8B3,
-	0x8E4,
-	0x964,
-	0x966,
-	0x970,
-	0x971,
-	0x984,
-	0x985,
-	0x98D,
-	0x98F,
-	0x991,
-	0x993,
-	0x9A9,
-	0x9AA,
-	0x9B1,
-	0x9B2,
-	0x9B3,
-	0x9B6,
-	0x9BA,
-	0x9BC,
-	0x9C5,
-	0x9C7,
-	0x9C9,
-	0x9CB,
-	0x9CF,
-	0x9D7,
-	0x9D8,
-	0x9DC,
-	0x9DE,
-	0x9DF,
-	0x9E4,
-	0x9E6,
-	0x9F2,
-	0xA01,
-	0xA04,
-	0xA05,
-	0xA0B,
-	0xA0F,
-	0xA11,
-	0xA13,
-	0xA29,
-	0xA2A,
-	0xA31,
-	0xA32,
-	0xA34,
-	0xA35,
-	0xA37,
-	0xA38,
-	0xA3A,
-	0xA3C,
-	0xA3D,
-	0xA3E,
-	0xA43,
-	0xA47,
-	0xA49,
-	0xA4B,
-	0xA4E,
-	0xA51,
-	0xA52,
-	0xA59,
-	0xA5D,
-	0xA5E,
-	0xA5F,
-	0xA66,
-	0xA76,
-	0xA81,
-	0xA84,
-	0xA85,
-	0xA8E,
-	0xA8F,
-	0xA92,
-	0xA93,
-	0xAA9,
-	0xAAA,
-	0xAB1,
-	0xAB2,
-	0xAB4,
-	0xAB5,
-	0xABA,
-	0xABC,
-	0xAC6,
-	0xAC7,
-	0xACA,
-	0xACB,
-	0xACE,
-	0xAD0,
-	0xAD1,
-	0xAE0,
-	0xAE4,
-	0xAE6,
-	0xAF0,
-	0xB01,
-	0xB04,
-	0xB05,
-	0xB0D,
-	0xB0F,
-	0xB11,
-	0xB13,
-	0xB29,
-	0xB2A,
-	0xB31,
-	0xB32,
-	0xB34,
-	0xB35,
-	0xB3A,
-	0xB3C,
-	0xB45,
-	0xB47,
-	0xB49,
-	0xB4B,
-	0xB4E,
-	0xB56,
-	0xB58,
-	0xB5C,
-	0xB5E,
-	0xB5F,
-	0xB64,
-	0xB66,
-	0xB70,
-	0xB71,
-	0xB72,
-	0xB82,
-	0xB84,
-	0xB85,
-	0xB8B,
-	0xB8E,
-	0xB91,
-	0xB92,
-	0xB96,
-	0xB99,
-	0xB9B,
-	0xB9C,
-	0xB9D,
-	0xB9E,
-	0xBA0,
-	0xBA3,
-	0xBA5,
-	0xBA8,
-	0xBAB,
-	0xBAE,
-	0xBBA,
-	0xBBE,
-	0xBC3,
-	0xBC6,
-	0xBC9,
-	0xBCA,
-	0xBCE,
-	0xBD0,
-	0xBD1,
-	0xBD7,
-	0xBD8,
-	0xBE6,
-	0xBF0,
-	0xC00,
-	0xC04,
-	0xC05,
-	0xC0D,
-	0xC0E,
-	0xC11,
-	0xC12,
-	0xC29,
-	0xC2A,
-	0xC3A,
-	0xC3D,
-	0xC45,
-	0xC46,
-	0xC49,
-	0xC4A,
-	0xC4E,
-	0xC55,
-	0xC57,
-	0xC58,
-	0xC5A,
-	0xC60,
-	0xC64,
-	0xC66,
-	0xC70,
-	0xC81,
-	0xC84,
-	0xC85,
-	0xC8D,
-	0xC8E,
-	0xC91,
-	0xC92,
-	0xCA9,
-	0xCAA,
-	0xCB4,
-	0xCB5,
-	0xCBA,
-	0xCBC,
-	0xCC5,
-	0xCC6,
-	0xCC9,
-	0xCCA,
-	0xCCE,
-	0xCD5,
-	0xCD7,
-	0xCDE,
-	0xCDF,
-	0xCE0,
-	0xCE4,
-	0xCE6,
-	0xCF0,
-	0xCF1,
-	0xCF3,
-	0xD01,
-	0xD04,
-	0xD05,
-	0xD0D,
-	0xD0E,
-	0xD11,
-	0xD12,
-	0xD3B,
-	0xD3D,
-	0xD45,
-	0xD46,
-	0xD49,
-	0xD4A,
-	0xD4F,
-	0xD57,
-	0xD58,
-	0xD60,
-	0xD64,
-	0xD66,
-	0xD70,
-	0xD7A,
-	0xD80,
-	0xD82,
-	0xD84,
-	0xD85,
-	0xD97,
-	0xD9A,
-	0xDB2,
-	0xDB3,
-	0xDBC,
-	0xDBD,
-	0xDBE,
-	0xDC0,
-	0xDC7,
-	0xDCA,
-	0xDCB,
-	0xDCF,
-	0xDD5,
-	0xDD6,
-	0xDD7,
-	0xDD8,
-	0xDE0,
-	0xDE6,
-	0xDF0,
-	0xDF2,
-	0xDF4,
-	0xE01,
-	0xE3B,
-	0xE40,
-	0xE4F,
-	0xE50,
-	0xE5A,
-	0xE81,
-	0xE83,
-	0xE84,
-	0xE85,
-	0xE87,
-	0xE89,
-	0xE8A,
-	0xE8B,
-	0xE8D,
-	0xE8E,
-	0xE94,
-	0xE98,
-	0xE99,
-	0xEA0,
-	0xEA1,
-	0xEA4,
-	0xEA5,
-	0xEA6,
-	0xEA7,
-	0xEA8,
-	0xEAA,
-	0xEAC,
-	0xEAD,
-	0xEBA,
-	0xEBB,
-	0xEBE,
-	0xEC0,
-	0xEC5,
-	0xEC6,
-	0xEC7,
-	0xEC8,
-	0xECE,
-	0xED0,
-	0xEDA,
-	0xEDC,
-	0xEE0,
-	0xF00,
-	0xF01,
-	0xF18,
-	0xF1A,
-	0xF20,
-	0xF2A,
-	0xF35,
-	0xF36,
-	0xF37,
-	0xF38,
-	0xF39,
-	0xF3A,
-	0xF3E,
-	0xF48,
-	0xF49,
-	0xF6D,
-	0xF71,
-	0xF85,
-	0xF86,
-	0xF98,
-	0xF99,
-	0xFBD,
-	0xFC6,
-	0xFC7,
-	0x1000,
-	0x104A,
-	0x1050,
-	0x109E,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x10D0,
-	0x10FB,
-	0x10FC,
-	0x1249,
-	0x124A,
-	0x124E,
-	0x1250,
-	0x1257,
-	0x1258,
-	0x1259,
-	0x125A,
-	0x125E,
-	0x1260,
-	0x1289,
-	0x128A,
-	0x128E,
-	0x1290,
-	0x12B1,
-	0x12B2,
-	0x12B6,
-	0x12B8,
-	0x12BF,
-	0x12C0,
-	0x12C1,
-	0x12C2,
-	0x12C6,
-	0x12C8,
-	0x12D7,
-	0x12D8,
-	0x1311,
-	0x1312,
-	0x1316,
-	0x1318,
-	0x135B,
-	0x135D,
-	0x1360,
-	0x1380,
-	0x1390,
-	0x13A0,
-	0x13F5,
-	0x1401,
-	0x166D,
-	0x166F,
-	0x1680,
-	0x1681,
-	0x169B,
-	0x16A0,
-	0x16EB,
-	0x16EE,
-	0x16F9,
-	0x1700,
-	0x170D,
-	0x170E,
-	0x1715,
-	0x1720,
-	0x1735,
-	0x1740,
-	0x1754,
-	0x1760,
-	0x176D,
-	0x176E,
-	0x1771,
-	0x1772,
-	0x1774,
-	0x1780,
-	0x17D4,
-	0x17D7,
-	0x17D8,
-	0x17DC,
-	0x17DE,
-	0x17E0,
-	0x17EA,
-	0x180B,
-	0x180E,
-	0x1810,
-	0x181A,
-	0x1820,
-	0x1878,
-	0x1880,
-	0x18AB,
-	0x18B0,
-	0x18F6,
-	0x1900,
-	0x191F,
-	0x1920,
-	0x192C,
-	0x1930,
-	0x193C,
-	0x1946,
-	0x196E,
-	0x1970,
-	0x1975,
-	0x1980,
-	0x19AC,
-	0x19B0,
-	0x19CA,
-	0x19D0,
-	0x19DA,
-	0x1A00,
-	0x1A1C,
-	0x1A20,
-	0x1A5F,
-	0x1A60,
-	0x1A7D,
-	0x1A7F,
-	0x1A8A,
-	0x1A90,
-	0x1A9A,
-	0x1AA7,
-	0x1AA8,
-	0x1AB0,
-	0x1ABF,
-	0x1B00,
-	0x1B4C,
-	0x1B50,
-	0x1B5A,
-	0x1B6B,
-	0x1B74,
-	0x1B80,
-	0x1BF4,
-	0x1C00,
-	0x1C38,
-	0x1C40,
-	0x1C4A,
-	0x1C4D,
-	0x1C7E,
-	0x1CD0,
-	0x1CD3,
-	0x1CD4,
-	0x1CF7,
-	0x1CF8,
-	0x1CFA,
-	0x1D00,
-	0x1DF6,
-	0x1DFC,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FE0,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFD,
-	0x200C,
-	0x200E,
-	0x203F,
-	0x2041,
-	0x2054,
-	0x2055,
-	0x2071,
-	0x2072,
-	0x207F,
-	0x2080,
-	0x2090,
-	0x209D,
-	0x20D0,
-	0x20F1,
-	0x2102,
-	0x2103,
-	0x2107,
-	0x2108,
-	0x210A,
-	0x2114,
-	0x2115,
-	0x2116,
-	0x2119,
-	0x211E,
-	0x2124,
-	0x2125,
-	0x2126,
-	0x2127,
-	0x2128,
-	0x2129,
-	0x212A,
-	0x212E,
-	0x212F,
-	0x213A,
-	0x213C,
-	0x2140,
-	0x2145,
-	0x214A,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2189,
-	0x24B6,
-	0x24EA,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2CE5,
-	0x2CEB,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0x2D30,
-	0x2D68,
-	0x2D6F,
-	0x2D70,
-	0x2D7F,
-	0x2D97,
-	0x2DA0,
-	0x2DA7,
-	0x2DA8,
-	0x2DAF,
-	0x2DB0,
-	0x2DB7,
-	0x2DB8,
-	0x2DBF,
-	0x2DC0,
-	0x2DC7,
-	0x2DC8,
-	0x2DCF,
-	0x2DD0,
-	0x2DD7,
-	0x2DD8,
-	0x2DDF,
-	0x2DE0,
-	0x2E00,
-	0x2E2F,
-	0x2E30,
-	0x3005,
-	0x3008,
-	0x3021,
-	0x3030,
-	0x3031,
-	0x3036,
-	0x3038,
-	0x303D,
-	0x3041,
-	0x3097,
-	0x3099,
-	0x309B,
-	0x309D,
-	0x30A0,
-	0x30A1,
-	0x30FB,
-	0x30FC,
-	0x3100,
-	0x3105,
-	0x312E,
-	0x3131,
-	0x318F,
-	0x31A0,
-	0x31BB,
-	0x31F0,
-	0x3200,
-	0x3400,
-	0x4DB6,
-	0x4E00,
-	0x9FCD,
-	0xA000,
-	0xA48D,
-	0xA4D0,
-	0xA4FE,
-	0xA500,
-	0xA60D,
-	0xA610,
-	0xA62C,
-	0xA640,
-	0xA673,
-	0xA674,
-	0xA67E,
-	0xA67F,
-	0xA69E,
-	0xA69F,
-	0xA6F2,
-	0xA717,
-	0xA720,
-	0xA722,
-	0xA789,
-	0xA78B,
-	0xA78F,
-	0xA790,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xA7F7,
-	0xA828,
-	0xA840,
-	0xA874,
-	0xA880,
-	0xA8C5,
-	0xA8D0,
-	0xA8DA,
-	0xA8E0,
-	0xA8F8,
-	0xA8FB,
-	0xA8FC,
-	0xA900,
-	0xA92E,
-	0xA930,
-	0xA954,
-	0xA960,
-	0xA97D,
-	0xA980,
-	0xA9C1,
-	0xA9CF,
-	0xA9DA,
-	0xA9E0,
-	0xA9FF,
-	0xAA00,
-	0xAA37,
-	0xAA40,
-	0xAA4E,
-	0xAA50,
-	0xAA5A,
-	0xAA60,
-	0xAA77,
-	0xAA7A,
-	0xAAC3,
-	0xAADB,
-	0xAADE,
-	0xAAE0,
-	0xAAF0,
-	0xAAF2,
-	0xAAF7,
-	0xAB01,
-	0xAB07,
-	0xAB09,
-	0xAB0F,
-	0xAB11,
-	0xAB17,
-	0xAB20,
-	0xAB27,
-	0xAB28,
-	0xAB2F,
-	0xAB30,
-	0xAB5B,
-	0xAB5C,
-	0xAB60,
-	0xAB64,
-	0xAB66,
-	0xABC0,
-	0xABEB,
-	0xABEC,
-	0xABEE,
-	0xABF0,
-	0xABFA,
-	0xAC00,
-	0xD7A4,
-	0xD7B0,
-	0xD7C7,
-	0xD7CB,
-	0xD7FC,
-	0xF900,
-	0xFA6E,
-	0xFA70,
-	0xFADA,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFB1D,
-	0xFB29,
-	0xFB2A,
-	0xFB37,
-	0xFB38,
-	0xFB3D,
-	0xFB3E,
-	0xFB3F,
-	0xFB40,
-	0xFB42,
-	0xFB43,
-	0xFB45,
-	0xFB46,
-	0xFBB2,
-	0xFBD3,
-	0xFD3E,
-	0xFD50,
-	0xFD90,
-	0xFD92,
-	0xFDC8,
-	0xFDF0,
-	0xFDFC,
-	0xFE00,
-	0xFE10,
-	0xFE20,
-	0xFE2E,
-	0xFE33,
-	0xFE35,
-	0xFE4D,
-	0xFE50,
-	0xFE70,
-	0xFE75,
-	0xFE76,
-	0xFEFD,
-	0xFF10,
-	0xFF1A,
-	0xFF21,
-	0xFF3B,
-	0xFF3F,
-	0xFF40,
-	0xFF41,
-	0xFF5B,
-	0xFF66,
-	0xFFBF,
-	0xFFC2,
-	0xFFC8,
-	0xFFCA,
-	0xFFD0,
-	0xFFD2,
-	0xFFD8,
-	0xFFDA,
-	0xFFDD,
-	0x10000,
-	0x1000C,
-	0x1000D,
-	0x10027,
-	0x10028,
-	0x1003B,
-	0x1003C,
-	0x1003E,
-	0x1003F,
-	0x1004E,
-	0x10050,
-	0x1005E,
-	0x10080,
-	0x100FB,
-	0x10140,
-	0x10175,
-	0x101FD,
-	0x101FE,
-	0x10280,
-	0x1029D,
-	0x102A0,
-	0x102D1,
-	0x102E0,
-	0x102E1,
-	0x10300,
-	0x10320,
-	0x10330,
-	0x1034B,
-	0x10350,
-	0x1037B,
-	0x10380,
-	0x1039E,
-	0x103A0,
-	0x103C4,
-	0x103C8,
-	0x103D0,
-	0x103D1,
-	0x103D6,
-	0x10400,
-	0x1049E,
-	0x104A0,
-	0x104AA,
-	0x10500,
-	0x10528,
-	0x10530,
-	0x10564,
-	0x10600,
-	0x10737,
-	0x10740,
-	0x10756,
-	0x10760,
-	0x10768,
-	0x10800,
-	0x10806,
-	0x10808,
-	0x10809,
-	0x1080A,
-	0x10836,
-	0x10837,
-	0x10839,
-	0x1083C,
-	0x1083D,
-	0x1083F,
-	0x10856,
-	0x10860,
-	0x10877,
-	0x10880,
-	0x1089F,
-	0x10900,
-	0x10916,
-	0x10920,
-	0x1093A,
-	0x10980,
-	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
-	0x10A04,
-	0x10A05,
-	0x10A07,
-	0x10A0C,
-	0x10A14,
-	0x10A15,
-	0x10A18,
-	0x10A19,
-	0x10A34,
-	0x10A38,
-	0x10A3B,
-	0x10A3F,
-	0x10A40,
-	0x10A60,
-	0x10A7D,
-	0x10A80,
-	0x10A9D,
-	0x10AC0,
-	0x10AC8,
-	0x10AC9,
-	0x10AE7,
-	0x10B00,
-	0x10B36,
-	0x10B40,
-	0x10B56,
-	0x10B60,
-	0x10B73,
-	0x10B80,
-	0x10B92,
-	0x10C00,
-	0x10C49,
-	0x11000,
-	0x11047,
-	0x11066,
-	0x11070,
-	0x1107F,
-	0x110BB,
-	0x110D0,
-	0x110E9,
-	0x110F0,
-	0x110FA,
-	0x11100,
-	0x11135,
-	0x11136,
-	0x11140,
-	0x11150,
-	0x11174,
-	0x11176,
-	0x11177,
-	0x11180,
-	0x111C5,
-	0x111D0,
-	0x111DB,
-	0x11200,
-	0x11212,
-	0x11213,
-	0x11238,
-	0x112B0,
-	0x112EB,
-	0x112F0,
-	0x112FA,
-	0x11301,
-	0x11304,
-	0x11305,
-	0x1130D,
-	0x1130F,
-	0x11311,
-	0x11313,
-	0x11329,
-	0x1132A,
-	0x11331,
-	0x11332,
-	0x11334,
-	0x11335,
-	0x1133A,
-	0x1133C,
-	0x11345,
-	0x11347,
-	0x11349,
-	0x1134B,
-	0x1134E,
-	0x11357,
-	0x11358,
-	0x1135D,
-	0x11364,
-	0x11366,
-	0x1136D,
-	0x11370,
-	0x11375,
-	0x11480,
-	0x114C6,
-	0x114C7,
-	0x114C8,
-	0x114D0,
-	0x114DA,
-	0x11580,
-	0x115B6,
-	0x115B8,
-	0x115C1,
-	0x11600,
-	0x11641,
-	0x11644,
-	0x11645,
-	0x11650,
-	0x1165A,
-	0x11680,
-	0x116B8,
-	0x116C0,
-	0x116CA,
-	0x118A0,
-	0x118EA,
-	0x118FF,
-	0x11900,
-	0x11AC0,
-	0x11AF9,
-	0x12000,
-	0x12399,
-	0x12400,
-	0x1246F,
-	0x13000,
-	0x1342F,
-	0x16800,
-	0x16A39,
-	0x16A40,
-	0x16A5F,
-	0x16A60,
-	0x16A6A,
-	0x16AD0,
-	0x16AEE,
-	0x16AF0,
-	0x16AF5,
-	0x16B00,
-	0x16B37,
-	0x16B40,
-	0x16B44,
-	0x16B50,
-	0x16B5A,
-	0x16B63,
-	0x16B78,
-	0x16B7D,
-	0x16B90,
-	0x16F00,
-	0x16F45,
-	0x16F50,
-	0x16F7F,
-	0x16F8F,
-	0x16FA0,
-	0x1B000,
-	0x1B002,
-	0x1BC00,
-	0x1BC6B,
-	0x1BC70,
-	0x1BC7D,
-	0x1BC80,
-	0x1BC89,
-	0x1BC90,
-	0x1BC9A,
-	0x1BC9D,
-	0x1BC9F,
-	0x1D165,
-	0x1D16A,
-	0x1D16D,
-	0x1D173,
-	0x1D17B,
-	0x1D183,
-	0x1D185,
-	0x1D18C,
-	0x1D1AA,
-	0x1D1AE,
-	0x1D242,
-	0x1D245,
-	0x1D400,
-	0x1D455,
-	0x1D456,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D51E,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D552,
-	0x1D6A6,
-	0x1D6A8,
-	0x1D6C1,
-	0x1D6C2,
-	0x1D6DB,
-	0x1D6DC,
-	0x1D6FB,
-	0x1D6FC,
-	0x1D715,
-	0x1D716,
-	0x1D735,
-	0x1D736,
-	0x1D74F,
-	0x1D750,
-	0x1D76F,
-	0x1D770,
-	0x1D789,
-	0x1D78A,
-	0x1D7A9,
-	0x1D7AA,
-	0x1D7C3,
-	0x1D7C4,
-	0x1D7CC,
-	0x1D7CE,
-	0x1D800,
-	0x1E800,
-	0x1E8C5,
-	0x1E8D0,
-	0x1E8D7,
-	0x1EE00,
-	0x1EE04,
-	0x1EE05,
-	0x1EE20,
-	0x1EE21,
-	0x1EE23,
-	0x1EE24,
-	0x1EE25,
-	0x1EE27,
-	0x1EE28,
-	0x1EE29,
-	0x1EE33,
-	0x1EE34,
-	0x1EE38,
-	0x1EE39,
-	0x1EE3A,
-	0x1EE3B,
-	0x1EE3C,
-	0x1EE42,
-	0x1EE43,
-	0x1EE47,
-	0x1EE48,
-	0x1EE49,
-	0x1EE4A,
-	0x1EE4B,
-	0x1EE4C,
-	0x1EE4D,
-	0x1EE50,
-	0x1EE51,
-	0x1EE53,
-	0x1EE54,
-	0x1EE55,
-	0x1EE57,
-	0x1EE58,
-	0x1EE59,
-	0x1EE5A,
-	0x1EE5B,
-	0x1EE5C,
-	0x1EE5D,
-	0x1EE5E,
-	0x1EE5F,
-	0x1EE60,
-	0x1EE61,
-	0x1EE63,
-	0x1EE64,
-	0x1EE65,
-	0x1EE67,
-	0x1EE6B,
-	0x1EE6C,
-	0x1EE73,
-	0x1EE74,
-	0x1EE78,
-	0x1EE79,
-	0x1EE7D,
-	0x1EE7E,
-	0x1EE7F,
-	0x1EE80,
-	0x1EE8A,
-	0x1EE8B,
-	0x1EE9C,
-	0x1EEA1,
-	0x1EEA4,
-	0x1EEA5,
-	0x1EEAA,
-	0x1EEAB,
-	0x1EEBC,
-	0x1F130,
-	0x1F14A,
-	0x1F150,
-	0x1F16A,
-	0x1F170,
-	0x1F18A,
-	0x20000,
-	0x2A6D7,
-	0x2A700,
-	0x2B735,
-	0x2B740,
-	0x2B81E,
-	0x2F800,
-	0x2FA1E,
-	0xE0100,
-	0xE01F0
-};
-
-static const UV XPosixXDigit_invlist[] = { /* for EBCDIC 037 */
-	13,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x81,
-	0x87,
-	0xC1,
-	0xC7,
-	0xF0,
-	0xFA,
-	0xFF10,
-	0xFF1A,
-	0xFF21,
-	0xFF27,
-	0xFF41,
-	0xFF47
-};
-
-#endif	/* defined(PERL_IN_PERL_C) */
-
-#endif	/* EBCDIC 037 */
-
-#if 'A' == 193 /* EBCDIC POSIX-BC */ \
-     && '\\' == 188 && '[' == 187 && ']' == 189 && '{' == 251 && '}' == 253 \
-     && '^' == 106 && '~' == 255 && '!' == 90 && '#' == 123 && '|' == 79 \
-     && '$' == 91 && '@' == 124 && '`' == 74
-
-#if defined(PERL_IN_PERL_C)
-
-static const UV ASCII_invlist[] = { /* for EBCDIC POSIX-BC */
-	58,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	0,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x4,
-	0x5,
-	0x6,
-	0x7,
-	0x8,
-	0xB,
-	0x14,
-	0x15,
-	0x17,
-	0x18,
-	0x1A,
-	0x1C,
-	0x20,
-	0x26,
-	0x28,
-	0x2D,
-	0x30,
-	0x32,
-	0x33,
-	0x37,
-	0x38,
-	0x3C,
-	0x3E,
-	0x3F,
-	0x41,
-	0x4A,
-	0x51,
-	0x5A,
-	0x5F,
-	0x60,
-	0x62,
-	0x6A,
-	0x70,
-	0x7A,
-	0x80,
-	0x81,
-	0x8A,
-	0x91,
-	0x9A,
-	0xA2,
-	0xAA,
-	0xBB,
-	0xBE,
-	0xC1,
-	0xCA,
-	0xD1,
-	0xDA,
-	0xE2,
-	0xEA,
-	0xF0,
-	0xFA,
-	0xFB,
-	0xFC,
-	0xFD,
-	0xFE,
-	0xFF,
-	0x100
-};
-
-static const UV Cased_invlist[] = { /* for EBCDIC POSIX-BC */
-	279,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x42,
-	0x4A,
-	0x51,
-	0x5A,
-	0x62,
-	0x6A,
-	0x70,
-	0x79,
-	0x80,
-	0x8A,
-	0x8C,
-	0x8F,
-	0x91,
-	0x9D,
-	0x9E,
-	0x9F,
-	0xA0,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xAC,
-	0xAF,
-	0xC0,
-	0xCA,
-	0xCB,
-	0xD0,
-	0xD1,
-	0xDA,
-	0xDB,
-	0xE1,
-	0xE2,
-	0xEA,
-	0xEB,
-	0xF0,
-	0xFC,
-	0xFD,
-	0xFE,
-	0xFF,
-	0x100,
-	0x1BB,
-	0x1BC,
-	0x1C0,
-	0x1C4,
-	0x294,
-	0x295,
-	0x2B9,
-	0x2C0,
-	0x2C2,
-	0x2E0,
-	0x2E5,
-	0x345,
-	0x346,
-	0x370,
-	0x374,
-	0x376,
-	0x378,
-	0x37A,
-	0x37E,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x3F6,
-	0x3F7,
-	0x482,
-	0x48A,
-	0x530,
-	0x531,
-	0x557,
-	0x561,
-	0x588,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x1D00,
-	0x1DC0,
-	0x1E00,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FE0,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFD,
-	0x2071,
-	0x2072,
-	0x207F,
-	0x2080,
-	0x2090,
-	0x209D,
-	0x2102,
-	0x2103,
-	0x2107,
-	0x2108,
-	0x210A,
-	0x2114,
-	0x2115,
-	0x2116,
-	0x2119,
-	0x211E,
-	0x2124,
-	0x2125,
-	0x2126,
-	0x2127,
-	0x2128,
-	0x2129,
-	0x212A,
-	0x212E,
-	0x212F,
-	0x2135,
-	0x2139,
-	0x213A,
-	0x213C,
-	0x2140,
-	0x2145,
-	0x214A,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2180,
-	0x2183,
-	0x2185,
-	0x24B6,
-	0x24EA,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2CE5,
-	0x2CEB,
-	0x2CEF,
-	0x2CF2,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0xA640,
-	0xA66E,
-	0xA680,
-	0xA69E,
-	0xA722,
-	0xA788,
-	0xA78B,
-	0xA78F,
-	0xA790,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xA7F8,
-	0xA7FB,
-	0xAB30,
-	0xAB5B,
-	0xAB5C,
-	0xAB60,
-	0xAB64,
-	0xAB66,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFF21,
-	0xFF3B,
-	0xFF41,
-	0xFF5B,
-	0x10400,
-	0x10450,
-	0x118A0,
-	0x118E0,
-	0x1D400,
-	0x1D455,
-	0x1D456,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D51E,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D552,
-	0x1D6A6,
-	0x1D6A8,
-	0x1D6C1,
-	0x1D6C2,
-	0x1D6DB,
-	0x1D6DC,
-	0x1D6FB,
-	0x1D6FC,
-	0x1D715,
-	0x1D716,
-	0x1D735,
-	0x1D736,
-	0x1D74F,
-	0x1D750,
-	0x1D76F,
-	0x1D770,
-	0x1D789,
-	0x1D78A,
-	0x1D7A9,
-	0x1D7AA,
-	0x1D7C3,
-	0x1D7C4,
-	0x1D7CC,
-	0x1F130,
-	0x1F14A,
-	0x1F150,
-	0x1F16A,
-	0x1F170,
-	0x1F18A
-};
-
-static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC POSIX-BC */
-	1484,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	0,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0xD,
-	0xE,
-	0x15,
-	0x16,
-	0x40,
-	0x5F,
-	0x60,
-	0xCA,
-	0xCB,
-	0x300,
-	0x370,
-	0x483,
-	0x48A,
-	0x591,
-	0x5BE,
-	0x5BF,
-	0x5C0,
-	0x5C1,
-	0x5C3,
-	0x5C4,
-	0x5C6,
-	0x5C7,
-	0x5C8,
-	0x600,
-	0x606,
-	0x610,
-	0x61B,
-	0x61C,
-	0x61D,
-	0x64B,
-	0x660,
-	0x670,
-	0x671,
-	0x6D6,
-	0x6DD,
-	0x6DE,
-	0x6DF,
-	0x6E5,
-	0x6E7,
-	0x6E9,
-	0x6EA,
-	0x6EE,
-	0x70F,
-	0x710,
-	0x711,
-	0x712,
-	0x730,
-	0x74B,
-	0x7A6,
-	0x7B1,
-	0x7EB,
-	0x7F4,
-	0x816,
-	0x81A,
-	0x81B,
-	0x824,
-	0x825,
-	0x828,
-	0x829,
-	0x82E,
-	0x859,
-	0x85C,
-	0x8E4,
-	0x903,
-	0x904,
-	0x93A,
-	0x93B,
-	0x93C,
-	0x93D,
-	0x93E,
-	0x941,
-	0x949,
-	0x94D,
-	0x94E,
-	0x950,
-	0x951,
-	0x958,
-	0x962,
-	0x964,
-	0x981,
-	0x982,
-	0x984,
-	0x9BC,
-	0x9BD,
-	0x9BE,
-	0x9BF,
-	0x9C1,
-	0x9C5,
-	0x9C7,
-	0x9C9,
-	0x9CB,
-	0x9CD,
-	0x9CE,
-	0x9D7,
-	0x9D8,
-	0x9E2,
-	0x9E4,
-	0xA01,
-	0xA03,
-	0xA04,
-	0xA3C,
-	0xA3D,
-	0xA3E,
-	0xA41,
-	0xA43,
-	0xA47,
-	0xA49,
-	0xA4B,
-	0xA4E,
-	0xA51,
-	0xA52,
-	0xA70,
-	0xA72,
-	0xA75,
-	0xA76,
-	0xA81,
-	0xA83,
-	0xA84,
-	0xABC,
-	0xABD,
-	0xABE,
-	0xAC1,
-	0xAC6,
-	0xAC7,
-	0xAC9,
-	0xACA,
-	0xACB,
-	0xACD,
-	0xACE,
-	0xAE2,
-	0xAE4,
-	0xB01,
-	0xB02,
-	0xB04,
-	0xB3C,
-	0xB3D,
-	0xB3E,
-	0xB40,
-	0xB41,
-	0xB45,
-	0xB47,
-	0xB49,
-	0xB4B,
-	0xB4D,
-	0xB4E,
-	0xB56,
-	0xB58,
-	0xB62,
-	0xB64,
-	0xB82,
-	0xB83,
-	0xBBE,
-	0xBBF,
-	0xBC0,
-	0xBC1,
-	0xBC3,
-	0xBC6,
-	0xBC9,
-	0xBCA,
-	0xBCD,
-	0xBCE,
-	0xBD7,
-	0xBD8,
-	0xC00,
-	0xC01,
-	0xC04,
-	0xC3E,
-	0xC41,
-	0xC45,
-	0xC46,
-	0xC49,
-	0xC4A,
-	0xC4E,
-	0xC55,
-	0xC57,
-	0xC62,
-	0xC64,
-	0xC81,
-	0xC82,
-	0xC84,
-	0xCBC,
-	0xCBD,
-	0xCBE,
-	0xCBF,
-	0xCC0,
-	0xCC2,
-	0xCC3,
-	0xCC5,
-	0xCC6,
-	0xCC7,
-	0xCC9,
-	0xCCA,
-	0xCCC,
-	0xCCE,
-	0xCD5,
-	0xCD7,
-	0xCE2,
-	0xCE4,
-	0xD01,
-	0xD02,
-	0xD04,
-	0xD3E,
-	0xD3F,
-	0xD41,
-	0xD45,
-	0xD46,
-	0xD49,
-	0xD4A,
-	0xD4D,
-	0xD4E,
-	0xD57,
-	0xD58,
-	0xD62,
-	0xD64,
-	0xD82,
-	0xD84,
-	0xDCA,
-	0xDCB,
-	0xDCF,
-	0xDD0,
-	0xDD2,
-	0xDD5,
-	0xDD6,
-	0xDD7,
-	0xDD8,
-	0xDDF,
-	0xDE0,
-	0xDF2,
-	0xDF4,
-	0xE31,
-	0xE32,
-	0xE33,
-	0xE34,
-	0xE3B,
-	0xE47,
-	0xE4F,
-	0xEB1,
-	0xEB2,
-	0xEB3,
-	0xEB4,
-	0xEBA,
-	0xEBB,
-	0xEBD,
-	0xEC8,
-	0xECE,
-	0xF18,
-	0xF1A,
-	0xF35,
-	0xF36,
-	0xF37,
-	0xF38,
-	0xF39,
-	0xF3A,
-	0xF3E,
-	0xF40,
-	0xF71,
-	0xF7F,
-	0xF80,
-	0xF85,
-	0xF86,
-	0xF88,
-	0xF8D,
-	0xF98,
-	0xF99,
-	0xFBD,
-	0xFC6,
-	0xFC7,
-	0x102D,
-	0x1031,
-	0x1032,
-	0x1038,
-	0x1039,
-	0x103B,
-	0x103D,
-	0x103F,
-	0x1056,
-	0x1058,
-	0x105A,
-	0x105E,
-	0x1061,
-	0x1071,
-	0x1075,
-	0x1082,
-	0x1083,
-	0x1084,
-	0x1085,
-	0x1087,
-	0x108D,
-	0x108E,
-	0x109D,
-	0x109E,
-	0x1100,
-	0x1160,
-	0x11A8,
-	0x1200,
-	0x135D,
-	0x1360,
-	0x1712,
-	0x1715,
-	0x1732,
-	0x1735,
-	0x1752,
-	0x1754,
-	0x1772,
-	0x1774,
-	0x17B4,
-	0x17B6,
-	0x17B7,
-	0x17BE,
-	0x17C6,
-	0x17C7,
-	0x17C9,
-	0x17D4,
-	0x17DD,
-	0x17DE,
-	0x180B,
-	0x180E,
-	0x180F,
-	0x18A9,
-	0x18AA,
-	0x1920,
-	0x1923,
-	0x1927,
-	0x1929,
-	0x192C,
-	0x1930,
-	0x1932,
-	0x1933,
-	0x1939,
-	0x193C,
-	0x19B5,
-	0x19B8,
-	0x19BA,
-	0x19BB,
-	0x1A17,
-	0x1A19,
-	0x1A1B,
-	0x1A1C,
-	0x1A55,
-	0x1A56,
-	0x1A57,
-	0x1A58,
-	0x1A5F,
-	0x1A60,
-	0x1A61,
-	0x1A62,
-	0x1A63,
-	0x1A65,
-	0x1A6D,
-	0x1A73,
-	0x1A7D,
-	0x1A7F,
-	0x1A80,
-	0x1AB0,
-	0x1ABF,
-	0x1B00,
-	0x1B04,
-	0x1B05,
-	0x1B34,
-	0x1B35,
-	0x1B36,
-	0x1B3B,
-	0x1B3C,
-	0x1B3D,
-	0x1B42,
-	0x1B43,
-	0x1B45,
-	0x1B6B,
-	0x1B74,
-	0x1B80,
-	0x1B82,
-	0x1B83,
-	0x1BA1,
-	0x1BA2,
-	0x1BA6,
-	0x1BA8,
-	0x1BAA,
-	0x1BAB,
-	0x1BAE,
-	0x1BE6,
-	0x1BE7,
-	0x1BE8,
-	0x1BEA,
-	0x1BED,
-	0x1BEE,
-	0x1BEF,
-	0x1BF2,
-	0x1BF4,
-	0x1C24,
-	0x1C2C,
-	0x1C34,
-	0x1C36,
-	0x1C38,
-	0x1CD0,
-	0x1CD3,
-	0x1CD4,
-	0x1CE1,
-	0x1CE2,
-	0x1CE9,
-	0x1CED,
-	0x1CEE,
-	0x1CF2,
-	0x1CF4,
-	0x1CF5,
-	0x1CF8,
-	0x1CFA,
-	0x1DC0,
-	0x1DF6,
-	0x1DFC,
-	0x1E00,
-	0x200B,
-	0x200C,
-	0x200E,
-	0x2010,
-	0x2028,
-	0x202F,
-	0x2060,
-	0x2070,
-	0x20D0,
-	0x20F1,
-	0x2CEF,
-	0x2CF2,
-	0x2D7F,
-	0x2D80,
-	0x2DE0,
-	0x2E00,
-	0x302A,
-	0x3030,
-	0x3099,
-	0x309B,
-	0xA66F,
-	0xA673,
-	0xA674,
-	0xA67E,
-	0xA69F,
-	0xA6A0,
-	0xA6F0,
-	0xA6F2,
-	0xA802,
-	0xA803,
-	0xA806,
-	0xA807,
-	0xA80B,
-	0xA80C,
-	0xA823,
-	0xA825,
-	0xA827,
-	0xA828,
-	0xA880,
-	0xA882,
-	0xA8B4,
-	0xA8C4,
-	0xA8C5,
-	0xA8E0,
-	0xA8F2,
-	0xA926,
-	0xA92E,
-	0xA947,
-	0xA952,
-	0xA954,
-	0xA960,
-	0xA97D,
-	0xA980,
-	0xA983,
-	0xA984,
-	0xA9B3,
-	0xA9B4,
-	0xA9B6,
-	0xA9BA,
-	0xA9BC,
-	0xA9BD,
-	0xA9C1,
-	0xA9E5,
-	0xA9E6,
-	0xAA29,
-	0xAA2F,
-	0xAA31,
-	0xAA33,
-	0xAA35,
-	0xAA37,
-	0xAA43,
-	0xAA44,
-	0xAA4C,
-	0xAA4D,
-	0xAA4E,
-	0xAA7C,
-	0xAA7D,
-	0xAAB0,
-	0xAAB1,
-	0xAAB2,
-	0xAAB5,
-	0xAAB7,
-	0xAAB9,
-	0xAABE,
-	0xAAC0,
-	0xAAC1,
-	0xAAC2,
-	0xAAEB,
-	0xAAEC,
-	0xAAEE,
-	0xAAF0,
-	0xAAF5,
-	0xAAF6,
-	0xAAF7,
-	0xABE3,
-	0xABE5,
-	0xABE6,
-	0xABE8,
-	0xABE9,
-	0xABEB,
-	0xABEC,
-	0xABED,
-	0xABEE,
-	0xAC00,
 	0xAC01,
 	0xAC1C,
 	0xAC1D,
@@ -74529,2924 +66460,11 @@ static const UV Grapheme_Cluster_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xD7C7,
 	0xD7CB,
 	0xD7FC,
-	0xD800,
-	0xE000,
-	0xFB1E,
-	0xFB1F,
-	0xFE00,
-	0xFE10,
-	0xFE20,
-	0xFE2E,
-	0xFEFF,
-	0xFF00,
-	0xFF9E,
-	0xFFA0,
-	0xFFF0,
-	0xFFFC,
-	0x101FD,
-	0x101FE,
-	0x102E0,
-	0x102E1,
-	0x10376,
-	0x1037B,
-	0x10A01,
-	0x10A04,
-	0x10A05,
-	0x10A07,
-	0x10A0C,
-	0x10A10,
-	0x10A38,
-	0x10A3B,
-	0x10A3F,
-	0x10A40,
-	0x10AE5,
-	0x10AE7,
-	0x11000,
-	0x11001,
-	0x11002,
-	0x11003,
-	0x11038,
-	0x11047,
-	0x1107F,
-	0x11082,
-	0x11083,
-	0x110B0,
-	0x110B3,
-	0x110B7,
-	0x110B9,
-	0x110BB,
-	0x110BD,
-	0x110BE,
-	0x11100,
-	0x11103,
-	0x11127,
-	0x1112C,
-	0x1112D,
-	0x11135,
-	0x11173,
-	0x11174,
-	0x11180,
-	0x11182,
-	0x11183,
-	0x111B3,
-	0x111B6,
-	0x111BF,
-	0x111C1,
-	0x1122C,
-	0x1122F,
-	0x11232,
-	0x11234,
-	0x11235,
-	0x11236,
-	0x11238,
-	0x112DF,
-	0x112E0,
-	0x112E3,
-	0x112EB,
-	0x11301,
-	0x11302,
-	0x11304,
-	0x1133C,
-	0x1133D,
-	0x1133E,
-	0x1133F,
-	0x11340,
-	0x11341,
-	0x11345,
-	0x11347,
-	0x11349,
-	0x1134B,
-	0x1134E,
-	0x11357,
-	0x11358,
-	0x11362,
-	0x11364,
-	0x11366,
-	0x1136D,
-	0x11370,
-	0x11375,
-	0x114B0,
-	0x114B1,
-	0x114B3,
-	0x114B9,
-	0x114BA,
-	0x114BB,
-	0x114BD,
-	0x114BE,
-	0x114BF,
-	0x114C1,
-	0x114C2,
-	0x114C4,
-	0x115AF,
-	0x115B0,
-	0x115B2,
-	0x115B6,
-	0x115B8,
-	0x115BC,
-	0x115BE,
-	0x115BF,
-	0x115C1,
-	0x11630,
-	0x11633,
-	0x1163B,
-	0x1163D,
-	0x1163E,
-	0x1163F,
-	0x11641,
-	0x116AB,
-	0x116AC,
-	0x116AD,
-	0x116AE,
-	0x116B0,
-	0x116B6,
-	0x116B7,
-	0x116B8,
-	0x16AF0,
-	0x16AF5,
-	0x16B30,
-	0x16B37,
-	0x16F51,
-	0x16F7F,
-	0x16F8F,
-	0x16F93,
-	0x1BC9D,
-	0x1BC9F,
-	0x1BCA0,
-	0x1BCA4,
-	0x1D165,
-	0x1D166,
-	0x1D167,
-	0x1D16A,
-	0x1D16D,
-	0x1D16E,
-	0x1D173,
-	0x1D17B,
-	0x1D183,
-	0x1D185,
-	0x1D18C,
-	0x1D1AA,
-	0x1D1AE,
-	0x1D242,
-	0x1D245,
-	0x1E8D0,
-	0x1E8D7,
-	0x1F1E6,
-	0x1F200,
-	0xE0000,
-	0xE0100,
-	0xE01F0,
-	0xE1000
-};
-
-#endif	/* defined(PERL_IN_PERL_C) */
-
-#if defined(PERL_IN_REGEXEC_C)
-
-#define GCB_ENUM_COUNT 14
-
-typedef enum {
-	GCB_Other = 0,
-	GCB_CR = 1,
-	GCB_Control = 2,
-	GCB_EDGE = 3,
-	GCB_Extend = 4,
-	GCB_L = 5,
-	GCB_LF = 6,
-	GCB_LV = 7,
-	GCB_LVT = 8,
-	GCB_Prepend = 9,
-	GCB_Regional_Indicator = 10,
-	GCB_SpacingMark = 11,
-	GCB_T = 12,
-	GCB_V = 13
-} GCB_enum;
-
-static const GCB_enum Grapheme_Cluster_Break_invmap[] = { /* for EBCDIC POSIX-BC */
-	GCB_Control,
-	GCB_CR,
-	GCB_Control,
-	GCB_LF,
-	GCB_Control,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_L,
-	GCB_V,
-	GCB_T,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Control,
-	GCB_Extend,
-	GCB_Control,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_L,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_LV,
-	GCB_LVT,
-	GCB_Other,
-	GCB_V,
-	GCB_Other,
-	GCB_T,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Control,
-	GCB_Other,
-	GCB_Extend,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Other,
-	GCB_SpacingMark,
-	GCB_Extend,
-	GCB_Control,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Extend,
-	GCB_Other,
-	GCB_Regional_Indicator,
-	GCB_Other,
-	GCB_Control,
-	GCB_Extend,
-	GCB_Control,
-	GCB_Other
-};
-
-#endif	/* defined(PERL_IN_REGEXEC_C) */
-
-#if defined(PERL_IN_REGCOMP_C)
-
-static const UV NonL1_Perl_Non_Final_Folds_invlist[] = { /* for EBCDIC POSIX-BC */
-	45,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x2BC,
-	0x2BD,
-	0x308,
-	0x309,
-	0x313,
-	0x314,
-	0x342,
-	0x343,
-	0x3AC,
-	0x3AD,
-	0x3AE,
-	0x3AF,
-	0x3B1,
-	0x3B2,
-	0x3B7,
-	0x3B8,
-	0x3B9,
-	0x3BA,
-	0x3C1,
-	0x3C2,
-	0x3C5,
-	0x3C6,
-	0x3C9,
-	0x3CA,
-	0x3CE,
-	0x3CF,
-	0x565,
-	0x566,
-	0x574,
-	0x575,
-	0x57E,
-	0x57F,
-	0x1F00,
-	0x1F08,
-	0x1F20,
-	0x1F28,
-	0x1F60,
-	0x1F68,
-	0x1F70,
-	0x1F71,
-	0x1F74,
-	0x1F75,
-	0x1F7C,
-	0x1F7D
-};
-
-static const UV _Perl_Any_Folds_invlist[] = { /* for EBCDIC POSIX-BC */
-	265,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x42,
-	0x4A,
-	0x51,
-	0x5A,
-	0x62,
-	0x6A,
-	0x70,
-	0x79,
-	0x80,
-	0x8A,
-	0x8C,
-	0x8F,
-	0x91,
-	0x9A,
-	0x9C,
-	0x9D,
-	0x9E,
-	0x9F,
-	0xA0,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xAC,
-	0xAF,
-	0xC0,
-	0xCA,
-	0xCB,
-	0xD0,
-	0xD1,
-	0xDA,
-	0xDB,
-	0xE1,
-	0xE2,
-	0xEA,
-	0xEB,
-	0xF0,
-	0xFC,
-	0xFD,
-	0xFE,
-	0xFF,
-	0x100,
-	0x131,
-	0x132,
-	0x138,
-	0x139,
-	0x18D,
-	0x18E,
-	0x19B,
-	0x19C,
-	0x1AA,
-	0x1AC,
-	0x1BA,
-	0x1BC,
-	0x1BE,
-	0x1BF,
-	0x1C0,
-	0x1C4,
-	0x221,
-	0x222,
-	0x234,
-	0x23A,
-	0x255,
-	0x256,
-	0x258,
-	0x259,
-	0x25A,
-	0x25B,
-	0x25D,
-	0x260,
-	0x262,
-	0x263,
-	0x264,
-	0x265,
-	0x267,
-	0x268,
-	0x26A,
-	0x26B,
-	0x26D,
-	0x26F,
-	0x270,
-	0x271,
-	0x273,
-	0x275,
-	0x276,
-	0x27D,
-	0x27E,
-	0x280,
-	0x281,
-	0x283,
-	0x284,
-	0x287,
-	0x28D,
-	0x292,
-	0x293,
-	0x29E,
-	0x29F,
-	0x2BC,
-	0x2BD,
-	0x2BE,
-	0x2BF,
-	0x300,
-	0x302,
-	0x307,
-	0x309,
-	0x30A,
-	0x30B,
-	0x30C,
-	0x30D,
-	0x313,
-	0x314,
-	0x331,
-	0x332,
-	0x342,
-	0x343,
-	0x345,
-	0x346,
-	0x370,
-	0x374,
-	0x376,
-	0x378,
-	0x37B,
-	0x37E,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x3D2,
-	0x3D5,
-	0x3F6,
-	0x3F7,
-	0x3FC,
-	0x3FD,
-	0x482,
-	0x48A,
-	0x530,
-	0x531,
-	0x557,
-	0x561,
-	0x588,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x1D79,
-	0x1D7A,
-	0x1D7D,
-	0x1D7E,
-	0x1E00,
-	0x1E9C,
-	0x1E9E,
-	0x1E9F,
-	0x1EA0,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FE0,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFD,
-	0x2126,
-	0x2127,
-	0x212A,
-	0x212C,
-	0x2132,
-	0x2133,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2180,
-	0x2183,
-	0x2185,
-	0x24B6,
-	0x24EA,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2C71,
-	0x2C72,
-	0x2C74,
-	0x2C75,
-	0x2C77,
-	0x2C7E,
-	0x2CE4,
-	0x2CEB,
-	0x2CEF,
-	0x2CF2,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0xA640,
-	0xA66E,
-	0xA680,
-	0xA69C,
-	0xA722,
-	0xA730,
-	0xA732,
-	0xA770,
-	0xA779,
-	0xA788,
-	0xA78B,
-	0xA78E,
-	0xA790,
-	0xA794,
-	0xA796,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFF21,
-	0xFF3B,
-	0xFF41,
-	0xFF5B,
-	0x10400,
-	0x10450,
-	0x118A0,
-	0x118E0
-};
-
-static const UV _Perl_Folds_To_Multi_Char_invlist[] = { /* for EBCDIC POSIX-BC */
-	59,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x59,
-	0x5A,
-	0x130,
-	0x131,
-	0x149,
-	0x14A,
-	0x1F0,
-	0x1F1,
-	0x390,
-	0x391,
-	0x3B0,
-	0x3B1,
-	0x587,
-	0x588,
-	0x1E96,
-	0x1E9B,
-	0x1E9E,
-	0x1E9F,
-	0x1F50,
-	0x1F51,
-	0x1F52,
-	0x1F53,
-	0x1F54,
-	0x1F55,
-	0x1F56,
-	0x1F57,
-	0x1F80,
-	0x1FB0,
-	0x1FB2,
-	0x1FB5,
-	0x1FB6,
-	0x1FB8,
-	0x1FBC,
-	0x1FBD,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FC8,
-	0x1FCC,
-	0x1FCD,
-	0x1FD2,
-	0x1FD4,
-	0x1FD6,
-	0x1FD8,
-	0x1FE2,
-	0x1FE5,
-	0x1FE6,
-	0x1FE8,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FF8,
-	0x1FFC,
-	0x1FFD,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18
-};
-
-#endif	/* defined(PERL_IN_REGCOMP_C) */
-
-#if defined(PERL_IN_UTF8_C)
-
-static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC POSIX-BC */
-	1289,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x42,
-	0x4A,
-	0x51,
-	0x5A,
-	0x62,
-	0x6A,
-	0x6D,
-	0x6E,
-	0x70,
-	0x79,
-	0x80,
-	0x8A,
-	0x8C,
-	0x8F,
-	0x91,
-	0x9D,
-	0x9E,
-	0x9F,
-	0xA0,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xAC,
-	0xAF,
-	0xC0,
-	0xCA,
-	0xCB,
-	0xD0,
-	0xD1,
-	0xDA,
-	0xDB,
-	0xE1,
-	0xE2,
-	0xEA,
-	0xEB,
-	0xFA,
-	0xFC,
-	0xFD,
-	0xFE,
-	0xFF,
-	0x100,
-	0x2C2,
-	0x2C6,
-	0x2D2,
-	0x2E0,
-	0x2E5,
-	0x2EC,
-	0x2ED,
-	0x2EE,
-	0x2EF,
-	0x300,
-	0x375,
-	0x376,
-	0x378,
-	0x37B,
-	0x37E,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x3F6,
-	0x3F7,
-	0x482,
-	0x483,
-	0x488,
-	0x48A,
-	0x530,
-	0x531,
-	0x557,
-	0x559,
-	0x55A,
-	0x561,
-	0x588,
-	0x591,
-	0x5BE,
-	0x5BF,
-	0x5C0,
-	0x5C1,
-	0x5C3,
-	0x5C4,
-	0x5C6,
-	0x5C7,
-	0x5C8,
-	0x5D0,
-	0x5EB,
-	0x5F0,
-	0x5F3,
-	0x610,
-	0x61B,
-	0x620,
-	0x66A,
-	0x66E,
-	0x6D4,
-	0x6D5,
-	0x6DD,
-	0x6DF,
-	0x6E9,
-	0x6EA,
-	0x6FD,
-	0x6FF,
-	0x700,
-	0x710,
-	0x74B,
-	0x74D,
-	0x7B2,
-	0x7C0,
-	0x7F6,
-	0x7FA,
-	0x7FB,
-	0x800,
-	0x82E,
-	0x840,
-	0x85C,
-	0x8A0,
-	0x8B3,
-	0x8E4,
-	0x964,
-	0x966,
-	0x970,
-	0x971,
-	0x984,
-	0x985,
-	0x98D,
-	0x98F,
-	0x991,
-	0x993,
-	0x9A9,
-	0x9AA,
-	0x9B1,
-	0x9B2,
-	0x9B3,
-	0x9B6,
-	0x9BA,
-	0x9BC,
-	0x9C5,
-	0x9C7,
-	0x9C9,
-	0x9CB,
-	0x9CF,
-	0x9D7,
-	0x9D8,
-	0x9DC,
-	0x9DE,
-	0x9DF,
-	0x9E4,
-	0x9E6,
-	0x9F2,
-	0xA01,
-	0xA04,
-	0xA05,
-	0xA0B,
-	0xA0F,
-	0xA11,
-	0xA13,
-	0xA29,
-	0xA2A,
-	0xA31,
-	0xA32,
-	0xA34,
-	0xA35,
-	0xA37,
-	0xA38,
-	0xA3A,
-	0xA3C,
-	0xA3D,
-	0xA3E,
-	0xA43,
-	0xA47,
-	0xA49,
-	0xA4B,
-	0xA4E,
-	0xA51,
-	0xA52,
-	0xA59,
-	0xA5D,
-	0xA5E,
-	0xA5F,
-	0xA66,
-	0xA76,
-	0xA81,
-	0xA84,
-	0xA85,
-	0xA8E,
-	0xA8F,
-	0xA92,
-	0xA93,
-	0xAA9,
-	0xAAA,
-	0xAB1,
-	0xAB2,
-	0xAB4,
-	0xAB5,
-	0xABA,
-	0xABC,
-	0xAC6,
-	0xAC7,
-	0xACA,
-	0xACB,
-	0xACE,
-	0xAD0,
-	0xAD1,
-	0xAE0,
-	0xAE4,
-	0xAE6,
-	0xAF0,
-	0xB01,
-	0xB04,
-	0xB05,
-	0xB0D,
-	0xB0F,
-	0xB11,
-	0xB13,
-	0xB29,
-	0xB2A,
-	0xB31,
-	0xB32,
-	0xB34,
-	0xB35,
-	0xB3A,
-	0xB3C,
-	0xB45,
-	0xB47,
-	0xB49,
-	0xB4B,
-	0xB4E,
-	0xB56,
-	0xB58,
-	0xB5C,
-	0xB5E,
-	0xB5F,
-	0xB64,
-	0xB66,
-	0xB70,
-	0xB71,
-	0xB72,
-	0xB82,
-	0xB84,
-	0xB85,
-	0xB8B,
-	0xB8E,
-	0xB91,
-	0xB92,
-	0xB96,
-	0xB99,
-	0xB9B,
-	0xB9C,
-	0xB9D,
-	0xB9E,
-	0xBA0,
-	0xBA3,
-	0xBA5,
-	0xBA8,
-	0xBAB,
-	0xBAE,
-	0xBBA,
-	0xBBE,
-	0xBC3,
-	0xBC6,
-	0xBC9,
-	0xBCA,
-	0xBCE,
-	0xBD0,
-	0xBD1,
-	0xBD7,
-	0xBD8,
-	0xBE6,
-	0xBF0,
-	0xC00,
-	0xC04,
-	0xC05,
-	0xC0D,
-	0xC0E,
-	0xC11,
-	0xC12,
-	0xC29,
-	0xC2A,
-	0xC3A,
-	0xC3D,
-	0xC45,
-	0xC46,
-	0xC49,
-	0xC4A,
-	0xC4E,
-	0xC55,
-	0xC57,
-	0xC58,
-	0xC5A,
-	0xC60,
-	0xC64,
-	0xC66,
-	0xC70,
-	0xC81,
-	0xC84,
-	0xC85,
-	0xC8D,
-	0xC8E,
-	0xC91,
-	0xC92,
-	0xCA9,
-	0xCAA,
-	0xCB4,
-	0xCB5,
-	0xCBA,
-	0xCBC,
-	0xCC5,
-	0xCC6,
-	0xCC9,
-	0xCCA,
-	0xCCE,
-	0xCD5,
-	0xCD7,
-	0xCDE,
-	0xCDF,
-	0xCE0,
-	0xCE4,
-	0xCE6,
-	0xCF0,
-	0xCF1,
-	0xCF3,
-	0xD01,
-	0xD04,
-	0xD05,
-	0xD0D,
-	0xD0E,
-	0xD11,
-	0xD12,
-	0xD3B,
-	0xD3D,
-	0xD45,
-	0xD46,
-	0xD49,
-	0xD4A,
-	0xD4F,
-	0xD57,
-	0xD58,
-	0xD60,
-	0xD64,
-	0xD66,
-	0xD70,
-	0xD7A,
-	0xD80,
-	0xD82,
-	0xD84,
-	0xD85,
-	0xD97,
-	0xD9A,
-	0xDB2,
-	0xDB3,
-	0xDBC,
-	0xDBD,
-	0xDBE,
-	0xDC0,
-	0xDC7,
-	0xDCA,
-	0xDCB,
-	0xDCF,
-	0xDD5,
-	0xDD6,
-	0xDD7,
-	0xDD8,
-	0xDE0,
-	0xDE6,
-	0xDF0,
-	0xDF2,
-	0xDF4,
-	0xE01,
-	0xE3B,
-	0xE40,
-	0xE4F,
-	0xE50,
-	0xE5A,
-	0xE81,
-	0xE83,
-	0xE84,
-	0xE85,
-	0xE87,
-	0xE89,
-	0xE8A,
-	0xE8B,
-	0xE8D,
-	0xE8E,
-	0xE94,
-	0xE98,
-	0xE99,
-	0xEA0,
-	0xEA1,
-	0xEA4,
-	0xEA5,
-	0xEA6,
-	0xEA7,
-	0xEA8,
-	0xEAA,
-	0xEAC,
-	0xEAD,
-	0xEBA,
-	0xEBB,
-	0xEBE,
-	0xEC0,
-	0xEC5,
-	0xEC6,
-	0xEC7,
-	0xEC8,
-	0xECE,
-	0xED0,
-	0xEDA,
-	0xEDC,
-	0xEE0,
-	0xF00,
-	0xF01,
-	0xF18,
-	0xF1A,
-	0xF20,
-	0xF2A,
-	0xF35,
-	0xF36,
-	0xF37,
-	0xF38,
-	0xF39,
-	0xF3A,
-	0xF3E,
-	0xF48,
-	0xF49,
-	0xF6D,
-	0xF71,
-	0xF85,
-	0xF86,
-	0xF98,
-	0xF99,
-	0xFBD,
-	0xFC6,
-	0xFC7,
-	0x1000,
-	0x104A,
-	0x1050,
-	0x109E,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x10D0,
-	0x10FB,
-	0x10FC,
-	0x1249,
-	0x124A,
-	0x124E,
-	0x1250,
-	0x1257,
-	0x1258,
-	0x1259,
-	0x125A,
-	0x125E,
-	0x1260,
-	0x1289,
-	0x128A,
-	0x128E,
-	0x1290,
-	0x12B1,
-	0x12B2,
-	0x12B6,
-	0x12B8,
-	0x12BF,
-	0x12C0,
-	0x12C1,
-	0x12C2,
-	0x12C6,
-	0x12C8,
-	0x12D7,
-	0x12D8,
-	0x1311,
-	0x1312,
-	0x1316,
-	0x1318,
-	0x135B,
-	0x135D,
-	0x1360,
-	0x1380,
-	0x1390,
-	0x13A0,
-	0x13F5,
-	0x1401,
-	0x166D,
-	0x166F,
-	0x1680,
-	0x1681,
-	0x169B,
-	0x16A0,
-	0x16EB,
-	0x16EE,
-	0x16F9,
-	0x1700,
-	0x170D,
-	0x170E,
-	0x1715,
-	0x1720,
-	0x1735,
-	0x1740,
-	0x1754,
-	0x1760,
-	0x176D,
-	0x176E,
-	0x1771,
-	0x1772,
-	0x1774,
-	0x1780,
-	0x17D4,
-	0x17D7,
-	0x17D8,
-	0x17DC,
-	0x17DE,
-	0x17E0,
-	0x17EA,
-	0x180B,
-	0x180E,
-	0x1810,
-	0x181A,
-	0x1820,
-	0x1878,
-	0x1880,
-	0x18AB,
-	0x18B0,
-	0x18F6,
-	0x1900,
-	0x191F,
-	0x1920,
-	0x192C,
-	0x1930,
-	0x193C,
-	0x1946,
-	0x196E,
-	0x1970,
-	0x1975,
-	0x1980,
-	0x19AC,
-	0x19B0,
-	0x19CA,
-	0x19D0,
-	0x19DA,
-	0x1A00,
-	0x1A1C,
-	0x1A20,
-	0x1A5F,
-	0x1A60,
-	0x1A7D,
-	0x1A7F,
-	0x1A8A,
-	0x1A90,
-	0x1A9A,
-	0x1AA7,
-	0x1AA8,
-	0x1AB0,
-	0x1ABE,
-	0x1B00,
-	0x1B4C,
-	0x1B50,
-	0x1B5A,
-	0x1B6B,
-	0x1B74,
-	0x1B80,
-	0x1BF4,
-	0x1C00,
-	0x1C38,
-	0x1C40,
-	0x1C4A,
-	0x1C4D,
-	0x1C7E,
-	0x1CD0,
-	0x1CD3,
-	0x1CD4,
-	0x1CF7,
-	0x1CF8,
-	0x1CFA,
-	0x1D00,
-	0x1DF6,
-	0x1DFC,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FE0,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFD,
-	0x203F,
-	0x2041,
-	0x2054,
-	0x2055,
-	0x2071,
-	0x2072,
-	0x207F,
-	0x2080,
-	0x2090,
-	0x209D,
-	0x20D0,
-	0x20DD,
-	0x20E1,
-	0x20E2,
-	0x20E5,
-	0x20F1,
-	0x2102,
-	0x2103,
-	0x2107,
-	0x2108,
-	0x210A,
-	0x2114,
-	0x2115,
-	0x2116,
-	0x2119,
-	0x211E,
-	0x2124,
-	0x2125,
-	0x2126,
-	0x2127,
-	0x2128,
-	0x2129,
-	0x212A,
-	0x212E,
-	0x212F,
-	0x213A,
-	0x213C,
-	0x2140,
-	0x2145,
-	0x214A,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2189,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2CE5,
-	0x2CEB,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0x2D30,
-	0x2D68,
-	0x2D6F,
-	0x2D70,
-	0x2D7F,
-	0x2D97,
-	0x2DA0,
-	0x2DA7,
-	0x2DA8,
-	0x2DAF,
-	0x2DB0,
-	0x2DB7,
-	0x2DB8,
-	0x2DBF,
-	0x2DC0,
-	0x2DC7,
-	0x2DC8,
-	0x2DCF,
-	0x2DD0,
-	0x2DD7,
-	0x2DD8,
-	0x2DDF,
-	0x2DE0,
-	0x2E00,
-	0x3005,
-	0x3008,
-	0x3021,
-	0x3030,
-	0x3031,
-	0x3036,
-	0x3038,
-	0x303D,
-	0x3041,
-	0x3097,
-	0x3099,
-	0x309B,
-	0x309D,
-	0x30A0,
-	0x30A1,
-	0x30FB,
-	0x30FC,
-	0x3100,
-	0x3105,
-	0x312E,
-	0x3131,
-	0x318F,
-	0x31A0,
-	0x31BB,
-	0x31F0,
-	0x3200,
-	0x3400,
-	0x4DB6,
-	0x4E00,
-	0x9FCD,
-	0xA000,
-	0xA48D,
-	0xA4D0,
-	0xA4FE,
-	0xA500,
-	0xA60D,
-	0xA610,
-	0xA62C,
-	0xA640,
-	0xA670,
-	0xA674,
-	0xA67E,
-	0xA67F,
-	0xA69E,
-	0xA69F,
-	0xA6F2,
-	0xA717,
-	0xA720,
-	0xA722,
-	0xA789,
-	0xA78B,
-	0xA78F,
-	0xA790,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xA7F7,
-	0xA828,
-	0xA840,
-	0xA874,
-	0xA880,
-	0xA8C5,
-	0xA8D0,
-	0xA8DA,
-	0xA8E0,
-	0xA8F8,
-	0xA8FB,
-	0xA8FC,
-	0xA900,
-	0xA92E,
-	0xA930,
-	0xA954,
-	0xA960,
-	0xA97D,
-	0xA980,
-	0xA9C1,
-	0xA9CF,
-	0xA9DA,
-	0xA9E0,
-	0xA9FF,
-	0xAA00,
-	0xAA37,
-	0xAA40,
-	0xAA4E,
-	0xAA50,
-	0xAA5A,
-	0xAA60,
-	0xAA77,
-	0xAA7A,
-	0xAAC3,
-	0xAADB,
-	0xAADE,
-	0xAAE0,
-	0xAAF0,
-	0xAAF2,
-	0xAAF7,
-	0xAB01,
-	0xAB07,
-	0xAB09,
-	0xAB0F,
-	0xAB11,
-	0xAB17,
-	0xAB20,
-	0xAB27,
-	0xAB28,
-	0xAB2F,
-	0xAB30,
-	0xAB5B,
-	0xAB5C,
-	0xAB60,
-	0xAB64,
-	0xAB66,
-	0xABC0,
-	0xABEB,
-	0xABEC,
-	0xABEE,
-	0xABF0,
-	0xABFA,
-	0xAC00,
-	0xD7A4,
-	0xD7B0,
-	0xD7C7,
-	0xD7CB,
-	0xD7FC,
 	0xF900,
-	0xFA6E,
-	0xFA70,
-	0xFADA,
 	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
 	0xFB1D,
+	0xFB1E,
+	0xFB1F,
 	0xFB29,
 	0xFB2A,
 	0xFB37,
@@ -77459,210 +66477,202 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xFB43,
 	0xFB45,
 	0xFB46,
-	0xFBB2,
-	0xFBD3,
-	0xFC5E,
-	0xFC64,
+	0xFB50,
 	0xFD3E,
-	0xFD50,
-	0xFD90,
-	0xFD92,
-	0xFDC8,
-	0xFDF0,
-	0xFDFA,
+	0xFD3F,
+	0xFD40,
+	0xFDFC,
+	0xFDFD,
 	0xFE00,
 	0xFE10,
+	0xFE11,
+	0xFE13,
+	0xFE15,
+	0xFE17,
+	0xFE18,
+	0xFE19,
+	0xFE1A,
 	0xFE20,
-	0xFE2E,
-	0xFE33,
+	0xFE30,
 	0xFE35,
-	0xFE4D,
+	0xFE36,
+	0xFE37,
+	0xFE38,
+	0xFE39,
+	0xFE3A,
+	0xFE3B,
+	0xFE3C,
+	0xFE3D,
+	0xFE3E,
+	0xFE3F,
+	0xFE40,
+	0xFE41,
+	0xFE42,
+	0xFE43,
+	0xFE44,
+	0xFE45,
+	0xFE47,
+	0xFE48,
+	0xFE49,
 	0xFE50,
-	0xFE71,
-	0xFE72,
-	0xFE73,
-	0xFE74,
-	0xFE77,
-	0xFE78,
-	0xFE79,
-	0xFE7A,
-	0xFE7B,
-	0xFE7C,
-	0xFE7D,
-	0xFE7E,
-	0xFE7F,
-	0xFEFD,
-	0xFF10,
+	0xFE51,
+	0xFE52,
+	0xFE53,
+	0xFE54,
+	0xFE56,
+	0xFE58,
+	0xFE59,
+	0xFE5A,
+	0xFE5B,
+	0xFE5C,
+	0xFE5D,
+	0xFE5E,
+	0xFE5F,
+	0xFE67,
+	0xFE68,
+	0xFE69,
+	0xFE6A,
+	0xFE6B,
+	0xFE6C,
+	0xFEFF,
+	0xFF00,
+	0xFF01,
+	0xFF02,
+	0xFF04,
+	0xFF05,
+	0xFF06,
+	0xFF08,
+	0xFF09,
+	0xFF0A,
+	0xFF0C,
+	0xFF0D,
+	0xFF0E,
+	0xFF0F,
 	0xFF1A,
-	0xFF21,
+	0xFF1C,
+	0xFF1F,
+	0xFF20,
 	0xFF3B,
-	0xFF3F,
-	0xFF40,
-	0xFF41,
+	0xFF3C,
+	0xFF3D,
+	0xFF3E,
 	0xFF5B,
+	0xFF5C,
+	0xFF5D,
+	0xFF5E,
+	0xFF5F,
+	0xFF60,
+	0xFF62,
+	0xFF63,
+	0xFF65,
 	0xFF66,
-	0xFFBF,
-	0xFFC2,
-	0xFFC8,
-	0xFFCA,
-	0xFFD0,
-	0xFFD2,
-	0xFFD8,
-	0xFFDA,
-	0xFFDD,
-	0x10000,
-	0x1000C,
-	0x1000D,
-	0x10027,
-	0x10028,
-	0x1003B,
-	0x1003C,
-	0x1003E,
-	0x1003F,
-	0x1004E,
-	0x10050,
-	0x1005E,
-	0x10080,
-	0x100FB,
-	0x10140,
-	0x10175,
+	0xFF67,
+	0xFF71,
+	0xFF9E,
+	0xFFA0,
+	0xFFE0,
+	0xFFE1,
+	0xFFE2,
+	0xFFE5,
+	0xFFE7,
+	0xFFF9,
+	0xFFFC,
+	0xFFFD,
+	0x10100,
+	0x10103,
 	0x101FD,
 	0x101FE,
-	0x10280,
-	0x1029D,
-	0x102A0,
-	0x102D1,
 	0x102E0,
 	0x102E1,
-	0x10300,
-	0x10320,
-	0x10330,
-	0x1034B,
-	0x10350,
+	0x10376,
 	0x1037B,
-	0x10380,
-	0x1039E,
+	0x1039F,
 	0x103A0,
-	0x103C4,
-	0x103C8,
 	0x103D0,
 	0x103D1,
-	0x103D6,
-	0x10400,
-	0x1049E,
 	0x104A0,
 	0x104AA,
-	0x10500,
-	0x10528,
-	0x10530,
-	0x10564,
-	0x10600,
-	0x10737,
-	0x10740,
-	0x10756,
-	0x10760,
-	0x10768,
-	0x10800,
-	0x10806,
-	0x10808,
-	0x10809,
-	0x1080A,
-	0x10836,
-	0x10837,
-	0x10839,
-	0x1083C,
-	0x1083D,
-	0x1083F,
-	0x10856,
-	0x10860,
-	0x10877,
-	0x10880,
-	0x1089F,
-	0x10900,
-	0x10916,
+	0x10857,
+	0x10858,
+	0x1091F,
 	0x10920,
-	0x1093A,
-	0x10980,
-	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
+	0x10A01,
 	0x10A04,
 	0x10A05,
 	0x10A07,
 	0x10A0C,
-	0x10A14,
-	0x10A15,
-	0x10A18,
-	0x10A19,
-	0x10A34,
+	0x10A10,
 	0x10A38,
 	0x10A3B,
 	0x10A3F,
 	0x10A40,
-	0x10A60,
-	0x10A7D,
-	0x10A80,
-	0x10A9D,
-	0x10AC0,
-	0x10AC8,
-	0x10AC9,
+	0x10A50,
+	0x10A58,
+	0x10AE5,
 	0x10AE7,
-	0x10B00,
-	0x10B36,
+	0x10AF0,
+	0x10AF6,
+	0x10AF7,
+	0x10B39,
 	0x10B40,
-	0x10B56,
-	0x10B60,
-	0x10B73,
-	0x10B80,
-	0x10B92,
-	0x10C00,
-	0x10C49,
 	0x11000,
+	0x11003,
+	0x11038,
 	0x11047,
+	0x11049,
 	0x11066,
 	0x11070,
 	0x1107F,
+	0x11083,
+	0x110B0,
 	0x110BB,
-	0x110D0,
-	0x110E9,
+	0x110BE,
+	0x110C2,
 	0x110F0,
 	0x110FA,
 	0x11100,
+	0x11103,
+	0x11127,
 	0x11135,
 	0x11136,
 	0x11140,
-	0x11150,
+	0x11144,
+	0x11173,
 	0x11174,
+	0x11175,
 	0x11176,
-	0x11177,
 	0x11180,
+	0x11183,
+	0x111B3,
+	0x111C1,
 	0x111C5,
+	0x111C7,
+	0x111C8,
+	0x111C9,
+	0x111CA,
+	0x111CD,
 	0x111D0,
+	0x111DA,
 	0x111DB,
-	0x11200,
-	0x11212,
-	0x11213,
+	0x111DC,
+	0x111DD,
+	0x111E0,
+	0x1122C,
 	0x11238,
-	0x112B0,
+	0x1123A,
+	0x1123B,
+	0x1123D,
+	0x112A9,
+	0x112AA,
+	0x112DF,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
-	0x11305,
-	0x1130D,
-	0x1130F,
-	0x11311,
-	0x11313,
-	0x11329,
-	0x1132A,
-	0x11331,
-	0x11332,
-	0x11334,
-	0x11335,
-	0x1133A,
 	0x1133C,
+	0x1133D,
+	0x1133E,
 	0x11345,
 	0x11347,
 	0x11349,
@@ -77670,87 +66680,89 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1134E,
 	0x11357,
 	0x11358,
-	0x1135D,
+	0x11362,
 	0x11364,
 	0x11366,
 	0x1136D,
 	0x11370,
 	0x11375,
-	0x11480,
-	0x114C6,
-	0x114C7,
-	0x114C8,
+	0x114B0,
+	0x114C4,
 	0x114D0,
 	0x114DA,
-	0x11580,
+	0x115AF,
 	0x115B6,
 	0x115B8,
 	0x115C1,
-	0x11600,
+	0x115C2,
+	0x115C4,
+	0x115C6,
+	0x115C9,
+	0x115D8,
+	0x115DC,
+	0x115DE,
+	0x11630,
 	0x11641,
-	0x11644,
-	0x11645,
+	0x11643,
 	0x11650,
 	0x1165A,
-	0x11680,
+	0x116AB,
 	0x116B8,
 	0x116C0,
 	0x116CA,
-	0x118A0,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
+	0x1173C,
+	0x1173F,
+	0x118E0,
 	0x118EA,
-	0x118FF,
-	0x11900,
-	0x11AC0,
-	0x11AF9,
-	0x12000,
-	0x12399,
-	0x12400,
-	0x1246F,
-	0x13000,
-	0x1342F,
-	0x16800,
-	0x16A39,
-	0x16A40,
-	0x16A5F,
+	0x12470,
+	0x12475,
+	0x13258,
+	0x1325B,
+	0x1325E,
+	0x13282,
+	0x13283,
+	0x13286,
+	0x13287,
+	0x13288,
+	0x13289,
+	0x1328A,
+	0x13379,
+	0x1337A,
+	0x1337C,
+	0x145CE,
+	0x145CF,
+	0x145D0,
 	0x16A60,
 	0x16A6A,
-	0x16AD0,
-	0x16AEE,
+	0x16A6E,
+	0x16A70,
 	0x16AF0,
 	0x16AF5,
-	0x16B00,
+	0x16AF6,
+	0x16B30,
 	0x16B37,
-	0x16B40,
+	0x16B3A,
 	0x16B44,
+	0x16B45,
 	0x16B50,
 	0x16B5A,
-	0x16B63,
-	0x16B78,
-	0x16B7D,
-	0x16B90,
-	0x16F00,
-	0x16F45,
-	0x16F50,
+	0x16F51,
 	0x16F7F,
 	0x16F8F,
-	0x16FA0,
+	0x16F93,
 	0x1B000,
 	0x1B002,
-	0x1BC00,
-	0x1BC6B,
-	0x1BC70,
-	0x1BC7D,
-	0x1BC80,
-	0x1BC89,
-	0x1BC90,
-	0x1BC9A,
 	0x1BC9D,
 	0x1BC9F,
+	0x1BCA0,
+	0x1BCA4,
 	0x1D165,
 	0x1D16A,
 	0x1D16D,
-	0x1D173,
-	0x1D17B,
 	0x1D183,
 	0x1D185,
 	0x1D18C,
@@ -77758,1282 +66770,2328 @@ static const UV _Perl_IDCont_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1D1AE,
 	0x1D242,
 	0x1D245,
-	0x1D400,
-	0x1D455,
-	0x1D456,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D51E,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D552,
-	0x1D6A6,
-	0x1D6A8,
-	0x1D6C1,
-	0x1D6C2,
-	0x1D6DB,
-	0x1D6DC,
-	0x1D6FB,
-	0x1D6FC,
-	0x1D715,
-	0x1D716,
-	0x1D735,
-	0x1D736,
-	0x1D74F,
-	0x1D750,
-	0x1D76F,
-	0x1D770,
-	0x1D789,
-	0x1D78A,
-	0x1D7A9,
-	0x1D7AA,
-	0x1D7C3,
-	0x1D7C4,
-	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
-	0x1E800,
-	0x1E8C5,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA87,
+	0x1DA8B,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E8D0,
 	0x1E8D7,
-	0x1EE00,
-	0x1EE04,
-	0x1EE05,
-	0x1EE20,
-	0x1EE21,
-	0x1EE23,
-	0x1EE24,
-	0x1EE25,
-	0x1EE27,
-	0x1EE28,
-	0x1EE29,
-	0x1EE33,
-	0x1EE34,
-	0x1EE38,
-	0x1EE39,
-	0x1EE3A,
-	0x1EE3B,
-	0x1EE3C,
-	0x1EE42,
-	0x1EE43,
-	0x1EE47,
-	0x1EE48,
-	0x1EE49,
-	0x1EE4A,
-	0x1EE4B,
-	0x1EE4C,
-	0x1EE4D,
-	0x1EE50,
-	0x1EE51,
-	0x1EE53,
-	0x1EE54,
-	0x1EE55,
-	0x1EE57,
-	0x1EE58,
-	0x1EE59,
-	0x1EE5A,
-	0x1EE5B,
-	0x1EE5C,
-	0x1EE5D,
-	0x1EE5E,
-	0x1EE5F,
-	0x1EE60,
-	0x1EE61,
-	0x1EE63,
-	0x1EE64,
-	0x1EE65,
-	0x1EE67,
-	0x1EE6B,
-	0x1EE6C,
-	0x1EE73,
-	0x1EE74,
-	0x1EE78,
-	0x1EE79,
-	0x1EE7D,
-	0x1EE7E,
-	0x1EE7F,
-	0x1EE80,
-	0x1EE8A,
-	0x1EE8B,
-	0x1EE9C,
-	0x1EEA1,
-	0x1EEA4,
-	0x1EEA5,
-	0x1EEAA,
-	0x1EEAB,
-	0x1EEBC,
+	0x1F000,
+	0x1F02C,
+	0x1F030,
+	0x1F094,
+	0x1F0A0,
+	0x1F0AF,
+	0x1F0B1,
+	0x1F0C0,
+	0x1F0C1,
+	0x1F0D0,
+	0x1F0D1,
+	0x1F0F6,
+	0x1F1E6,
+	0x1F200,
+	0x1F203,
+	0x1F210,
+	0x1F23B,
+	0x1F240,
+	0x1F249,
+	0x1F250,
+	0x1F252,
+	0x1F300,
+	0x1F39C,
+	0x1F39E,
+	0x1F3B5,
+	0x1F3B7,
+	0x1F3BC,
+	0x1F3BD,
+	0x1F3FB,
+	0x1F400,
+	0x1F4A0,
+	0x1F4A1,
+	0x1F4A2,
+	0x1F4A3,
+	0x1F4A4,
+	0x1F4A5,
+	0x1F4AF,
+	0x1F4B0,
+	0x1F4B1,
+	0x1F4B3,
+	0x1F500,
+	0x1F507,
+	0x1F517,
+	0x1F525,
+	0x1F532,
+	0x1F54A,
+	0x1F57A,
+	0x1F57B,
+	0x1F5A4,
+	0x1F5A5,
+	0x1F5D4,
+	0x1F5DC,
+	0x1F5F4,
+	0x1F5FA,
+	0x1F650,
+	0x1F676,
+	0x1F679,
+	0x1F67C,
+	0x1F680,
+	0x1F6D1,
+	0x1F6E0,
+	0x1F6ED,
+	0x1F6F0,
+	0x1F6F4,
+	0x1F910,
+	0x1F919,
+	0x1F980,
+	0x1F985,
+	0x1F9C0,
+	0x1F9C1,
 	0x20000,
-	0x2A6D7,
-	0x2A700,
-	0x2B735,
-	0x2B740,
-	0x2B81E,
-	0x2F800,
-	0x2FA1E,
+	0x2FFFE,
+	0x30000,
+	0x3FFFE,
+	0xE0001,
+	0xE0002,
+	0xE0020,
+	0xE0080,
 	0xE0100,
 	0xE01F0
 };
 
-static const UV _Perl_IDStart_invlist[] = { /* for EBCDIC POSIX-BC */
-	1119,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x42,
-	0x4A,
-	0x51,
-	0x5A,
-	0x62,
-	0x6A,
-	0x6D,
-	0x6E,
-	0x70,
-	0x79,
-	0x80,
-	0x8A,
-	0x8C,
-	0x8F,
-	0x91,
-	0x9D,
-	0x9E,
-	0x9F,
-	0xA0,
-	0xA1,
-	0xA2,
-	0xAA,
-	0xAC,
-	0xAF,
-	0xC0,
-	0xCA,
-	0xCB,
-	0xD0,
-	0xD1,
-	0xDA,
-	0xDB,
-	0xE1,
-	0xE2,
-	0xEA,
-	0xEB,
-	0xF0,
-	0xFC,
-	0xFD,
-	0xFE,
-	0xFF,
-	0x100,
-	0x2C2,
-	0x2C6,
-	0x2D2,
-	0x2E0,
-	0x2E5,
-	0x2EC,
-	0x2ED,
-	0x2EE,
-	0x2EF,
-	0x370,
-	0x375,
-	0x376,
-	0x378,
-	0x37B,
-	0x37E,
-	0x37F,
-	0x380,
-	0x386,
-	0x387,
-	0x388,
-	0x38B,
-	0x38C,
-	0x38D,
-	0x38E,
-	0x3A2,
-	0x3A3,
-	0x3F6,
-	0x3F7,
-	0x482,
-	0x48A,
-	0x530,
-	0x531,
-	0x557,
-	0x559,
-	0x55A,
-	0x561,
-	0x588,
-	0x5D0,
-	0x5EB,
-	0x5F0,
-	0x5F3,
-	0x620,
-	0x64B,
-	0x66E,
-	0x670,
-	0x671,
-	0x6D4,
-	0x6D5,
-	0x6D6,
-	0x6E5,
-	0x6E7,
-	0x6EE,
-	0x6F0,
-	0x6FA,
-	0x6FD,
-	0x6FF,
-	0x700,
-	0x710,
-	0x711,
-	0x712,
-	0x730,
-	0x74D,
-	0x7A6,
-	0x7B1,
-	0x7B2,
-	0x7CA,
-	0x7EB,
-	0x7F4,
-	0x7F6,
-	0x7FA,
-	0x7FB,
-	0x800,
-	0x816,
-	0x81A,
-	0x81B,
-	0x824,
-	0x825,
-	0x828,
-	0x829,
-	0x840,
-	0x859,
-	0x8A0,
-	0x8B3,
-	0x904,
-	0x93A,
-	0x93D,
-	0x93E,
-	0x950,
-	0x951,
-	0x958,
-	0x962,
-	0x971,
-	0x981,
-	0x985,
-	0x98D,
-	0x98F,
-	0x991,
-	0x993,
-	0x9A9,
-	0x9AA,
-	0x9B1,
-	0x9B2,
-	0x9B3,
-	0x9B6,
-	0x9BA,
-	0x9BD,
-	0x9BE,
-	0x9CE,
-	0x9CF,
-	0x9DC,
-	0x9DE,
-	0x9DF,
-	0x9E2,
-	0x9F0,
-	0x9F2,
-	0xA05,
-	0xA0B,
-	0xA0F,
-	0xA11,
-	0xA13,
-	0xA29,
-	0xA2A,
-	0xA31,
-	0xA32,
-	0xA34,
-	0xA35,
-	0xA37,
-	0xA38,
-	0xA3A,
-	0xA59,
-	0xA5D,
-	0xA5E,
-	0xA5F,
-	0xA72,
-	0xA75,
-	0xA85,
-	0xA8E,
-	0xA8F,
-	0xA92,
-	0xA93,
-	0xAA9,
-	0xAAA,
-	0xAB1,
-	0xAB2,
-	0xAB4,
-	0xAB5,
-	0xABA,
-	0xABD,
-	0xABE,
-	0xAD0,
-	0xAD1,
-	0xAE0,
-	0xAE2,
-	0xB05,
-	0xB0D,
-	0xB0F,
-	0xB11,
-	0xB13,
-	0xB29,
-	0xB2A,
-	0xB31,
-	0xB32,
-	0xB34,
-	0xB35,
-	0xB3A,
-	0xB3D,
-	0xB3E,
-	0xB5C,
-	0xB5E,
-	0xB5F,
-	0xB62,
-	0xB71,
-	0xB72,
-	0xB83,
-	0xB84,
-	0xB85,
-	0xB8B,
-	0xB8E,
-	0xB91,
-	0xB92,
-	0xB96,
-	0xB99,
-	0xB9B,
-	0xB9C,
-	0xB9D,
-	0xB9E,
-	0xBA0,
-	0xBA3,
-	0xBA5,
-	0xBA8,
-	0xBAB,
-	0xBAE,
-	0xBBA,
-	0xBD0,
-	0xBD1,
-	0xC05,
-	0xC0D,
-	0xC0E,
-	0xC11,
-	0xC12,
-	0xC29,
-	0xC2A,
-	0xC3A,
-	0xC3D,
-	0xC3E,
-	0xC58,
-	0xC5A,
-	0xC60,
-	0xC62,
-	0xC85,
-	0xC8D,
-	0xC8E,
-	0xC91,
-	0xC92,
-	0xCA9,
-	0xCAA,
-	0xCB4,
-	0xCB5,
-	0xCBA,
-	0xCBD,
-	0xCBE,
-	0xCDE,
-	0xCDF,
-	0xCE0,
-	0xCE2,
-	0xCF1,
-	0xCF3,
-	0xD05,
-	0xD0D,
-	0xD0E,
-	0xD11,
-	0xD12,
-	0xD3B,
-	0xD3D,
-	0xD3E,
-	0xD4E,
-	0xD4F,
-	0xD60,
-	0xD62,
-	0xD7A,
-	0xD80,
-	0xD85,
-	0xD97,
-	0xD9A,
-	0xDB2,
-	0xDB3,
-	0xDBC,
-	0xDBD,
-	0xDBE,
-	0xDC0,
-	0xDC7,
-	0xE01,
-	0xE31,
-	0xE32,
-	0xE33,
-	0xE40,
-	0xE47,
-	0xE81,
-	0xE83,
-	0xE84,
-	0xE85,
-	0xE87,
-	0xE89,
-	0xE8A,
-	0xE8B,
-	0xE8D,
-	0xE8E,
-	0xE94,
-	0xE98,
-	0xE99,
-	0xEA0,
-	0xEA1,
-	0xEA4,
-	0xEA5,
-	0xEA6,
-	0xEA7,
-	0xEA8,
-	0xEAA,
-	0xEAC,
-	0xEAD,
-	0xEB1,
-	0xEB2,
-	0xEB3,
-	0xEBD,
-	0xEBE,
-	0xEC0,
-	0xEC5,
-	0xEC6,
-	0xEC7,
-	0xEDC,
-	0xEE0,
-	0xF00,
-	0xF01,
-	0xF40,
-	0xF48,
-	0xF49,
-	0xF6D,
-	0xF88,
-	0xF8D,
-	0x1000,
-	0x102B,
-	0x103F,
-	0x1040,
-	0x1050,
-	0x1056,
-	0x105A,
-	0x105E,
-	0x1061,
-	0x1062,
-	0x1065,
-	0x1067,
-	0x106E,
-	0x1071,
-	0x1075,
-	0x1082,
-	0x108E,
-	0x108F,
-	0x10A0,
-	0x10C6,
-	0x10C7,
-	0x10C8,
-	0x10CD,
-	0x10CE,
-	0x10D0,
-	0x10FB,
-	0x10FC,
-	0x1249,
-	0x124A,
-	0x124E,
-	0x1250,
-	0x1257,
-	0x1258,
-	0x1259,
-	0x125A,
-	0x125E,
-	0x1260,
-	0x1289,
-	0x128A,
-	0x128E,
-	0x1290,
-	0x12B1,
-	0x12B2,
-	0x12B6,
-	0x12B8,
-	0x12BF,
-	0x12C0,
-	0x12C1,
-	0x12C2,
-	0x12C6,
-	0x12C8,
-	0x12D7,
-	0x12D8,
-	0x1311,
-	0x1312,
-	0x1316,
-	0x1318,
-	0x135B,
-	0x1380,
-	0x1390,
-	0x13A0,
-	0x13F5,
-	0x1401,
-	0x166D,
-	0x166F,
-	0x1680,
-	0x1681,
-	0x169B,
-	0x16A0,
-	0x16EB,
-	0x16EE,
-	0x16F9,
-	0x1700,
-	0x170D,
-	0x170E,
-	0x1712,
-	0x1720,
-	0x1732,
-	0x1740,
-	0x1752,
-	0x1760,
-	0x176D,
-	0x176E,
-	0x1771,
-	0x1780,
-	0x17B4,
-	0x17D7,
-	0x17D8,
-	0x17DC,
-	0x17DD,
-	0x1820,
-	0x1878,
-	0x1880,
-	0x18A9,
-	0x18AA,
-	0x18AB,
-	0x18B0,
-	0x18F6,
-	0x1900,
-	0x191F,
-	0x1950,
-	0x196E,
-	0x1970,
-	0x1975,
-	0x1980,
-	0x19AC,
-	0x19C1,
-	0x19C8,
-	0x1A00,
-	0x1A17,
-	0x1A20,
-	0x1A55,
-	0x1AA7,
-	0x1AA8,
-	0x1B05,
-	0x1B34,
-	0x1B45,
-	0x1B4C,
-	0x1B83,
-	0x1BA1,
-	0x1BAE,
-	0x1BB0,
-	0x1BBA,
-	0x1BE6,
-	0x1C00,
-	0x1C24,
-	0x1C4D,
-	0x1C50,
-	0x1C5A,
-	0x1C7E,
-	0x1CE9,
-	0x1CED,
-	0x1CEE,
-	0x1CF2,
-	0x1CF5,
-	0x1CF7,
-	0x1D00,
-	0x1DC0,
-	0x1E00,
-	0x1F16,
-	0x1F18,
-	0x1F1E,
-	0x1F20,
-	0x1F46,
-	0x1F48,
-	0x1F4E,
-	0x1F50,
-	0x1F58,
-	0x1F59,
-	0x1F5A,
-	0x1F5B,
-	0x1F5C,
-	0x1F5D,
-	0x1F5E,
-	0x1F5F,
-	0x1F7E,
-	0x1F80,
-	0x1FB5,
-	0x1FB6,
-	0x1FBD,
-	0x1FBE,
-	0x1FBF,
-	0x1FC2,
-	0x1FC5,
-	0x1FC6,
-	0x1FCD,
-	0x1FD0,
-	0x1FD4,
-	0x1FD6,
-	0x1FDC,
-	0x1FE0,
-	0x1FED,
-	0x1FF2,
-	0x1FF5,
-	0x1FF6,
-	0x1FFD,
-	0x2071,
-	0x2072,
-	0x207F,
-	0x2080,
-	0x2090,
-	0x209D,
-	0x2102,
-	0x2103,
-	0x2107,
-	0x2108,
-	0x210A,
-	0x2114,
-	0x2115,
-	0x2116,
-	0x2119,
-	0x211E,
-	0x2124,
-	0x2125,
-	0x2126,
-	0x2127,
-	0x2128,
-	0x2129,
-	0x212A,
-	0x212E,
-	0x212F,
-	0x213A,
-	0x213C,
-	0x2140,
-	0x2145,
-	0x214A,
-	0x214E,
-	0x214F,
-	0x2160,
-	0x2189,
-	0x2C00,
-	0x2C2F,
-	0x2C30,
-	0x2C5F,
-	0x2C60,
-	0x2CE5,
-	0x2CEB,
-	0x2CEF,
-	0x2CF2,
-	0x2CF4,
-	0x2D00,
-	0x2D26,
-	0x2D27,
-	0x2D28,
-	0x2D2D,
-	0x2D2E,
-	0x2D30,
-	0x2D68,
-	0x2D6F,
-	0x2D70,
-	0x2D80,
-	0x2D97,
-	0x2DA0,
-	0x2DA7,
-	0x2DA8,
-	0x2DAF,
-	0x2DB0,
-	0x2DB7,
-	0x2DB8,
-	0x2DBF,
-	0x2DC0,
-	0x2DC7,
-	0x2DC8,
-	0x2DCF,
-	0x2DD0,
-	0x2DD7,
-	0x2DD8,
-	0x2DDF,
-	0x3005,
-	0x3008,
-	0x3021,
-	0x302A,
-	0x3031,
-	0x3036,
-	0x3038,
-	0x303D,
-	0x3041,
-	0x3097,
-	0x309D,
-	0x30A0,
-	0x30A1,
-	0x30FB,
-	0x30FC,
-	0x3100,
-	0x3105,
-	0x312E,
-	0x3131,
-	0x318F,
-	0x31A0,
-	0x31BB,
-	0x31F0,
-	0x3200,
-	0x3400,
-	0x4DB6,
-	0x4E00,
-	0x9FCD,
-	0xA000,
-	0xA48D,
-	0xA4D0,
-	0xA4FE,
-	0xA500,
-	0xA60D,
-	0xA610,
-	0xA620,
-	0xA62A,
-	0xA62C,
-	0xA640,
-	0xA66F,
-	0xA67F,
-	0xA69E,
-	0xA6A0,
-	0xA6F0,
-	0xA717,
-	0xA720,
-	0xA722,
-	0xA789,
-	0xA78B,
-	0xA78F,
-	0xA790,
-	0xA7AE,
-	0xA7B0,
-	0xA7B2,
-	0xA7F7,
-	0xA802,
-	0xA803,
-	0xA806,
-	0xA807,
-	0xA80B,
-	0xA80C,
-	0xA823,
-	0xA840,
-	0xA874,
-	0xA882,
-	0xA8B4,
-	0xA8F2,
-	0xA8F8,
-	0xA8FB,
-	0xA8FC,
-	0xA90A,
-	0xA926,
-	0xA930,
-	0xA947,
-	0xA960,
-	0xA97D,
-	0xA984,
-	0xA9B3,
-	0xA9CF,
-	0xA9D0,
-	0xA9E0,
-	0xA9E5,
-	0xA9E6,
-	0xA9F0,
-	0xA9FA,
-	0xA9FF,
-	0xAA00,
-	0xAA29,
-	0xAA40,
-	0xAA43,
-	0xAA44,
-	0xAA4C,
-	0xAA60,
-	0xAA77,
-	0xAA7A,
-	0xAA7B,
-	0xAA7E,
-	0xAAB0,
-	0xAAB1,
-	0xAAB2,
-	0xAAB5,
-	0xAAB7,
-	0xAAB9,
-	0xAABE,
-	0xAAC0,
-	0xAAC1,
-	0xAAC2,
-	0xAAC3,
-	0xAADB,
-	0xAADE,
-	0xAAE0,
-	0xAAEB,
-	0xAAF2,
-	0xAAF5,
-	0xAB01,
-	0xAB07,
-	0xAB09,
-	0xAB0F,
-	0xAB11,
-	0xAB17,
-	0xAB20,
-	0xAB27,
-	0xAB28,
-	0xAB2F,
-	0xAB30,
-	0xAB5B,
-	0xAB5C,
-	0xAB60,
-	0xAB64,
-	0xAB66,
-	0xABC0,
-	0xABE3,
-	0xAC00,
-	0xD7A4,
-	0xD7B0,
-	0xD7C7,
-	0xD7CB,
-	0xD7FC,
-	0xF900,
-	0xFA6E,
-	0xFA70,
-	0xFADA,
-	0xFB00,
-	0xFB07,
-	0xFB13,
-	0xFB18,
-	0xFB1D,
-	0xFB1E,
-	0xFB1F,
-	0xFB29,
-	0xFB2A,
-	0xFB37,
-	0xFB38,
-	0xFB3D,
-	0xFB3E,
-	0xFB3F,
-	0xFB40,
-	0xFB42,
-	0xFB43,
-	0xFB45,
-	0xFB46,
-	0xFBB2,
-	0xFBD3,
-	0xFC5E,
-	0xFC64,
-	0xFD3E,
-	0xFD50,
-	0xFD90,
-	0xFD92,
-	0xFDC8,
-	0xFDF0,
-	0xFDFA,
-	0xFE71,
-	0xFE72,
-	0xFE73,
-	0xFE74,
-	0xFE77,
-	0xFE78,
-	0xFE79,
-	0xFE7A,
-	0xFE7B,
-	0xFE7C,
-	0xFE7D,
-	0xFE7E,
-	0xFE7F,
-	0xFEFD,
-	0xFF21,
-	0xFF3B,
-	0xFF41,
-	0xFF5B,
-	0xFF66,
-	0xFF9E,
-	0xFFA0,
-	0xFFBF,
-	0xFFC2,
-	0xFFC8,
-	0xFFCA,
-	0xFFD0,
-	0xFFD2,
-	0xFFD8,
-	0xFFDA,
-	0xFFDD,
-	0x10000,
-	0x1000C,
-	0x1000D,
-	0x10027,
-	0x10028,
-	0x1003B,
-	0x1003C,
-	0x1003E,
-	0x1003F,
-	0x1004E,
-	0x10050,
-	0x1005E,
-	0x10080,
-	0x100FB,
-	0x10140,
-	0x10175,
-	0x10280,
-	0x1029D,
-	0x102A0,
-	0x102D1,
-	0x10300,
-	0x10320,
-	0x10330,
-	0x1034B,
-	0x10350,
-	0x10376,
-	0x10380,
-	0x1039E,
-	0x103A0,
-	0x103C4,
-	0x103C8,
-	0x103D0,
-	0x103D1,
-	0x103D6,
-	0x10400,
-	0x1049E,
-	0x10500,
-	0x10528,
-	0x10530,
-	0x10564,
-	0x10600,
-	0x10737,
-	0x10740,
-	0x10756,
-	0x10760,
-	0x10768,
-	0x10800,
-	0x10806,
-	0x10808,
-	0x10809,
-	0x1080A,
-	0x10836,
-	0x10837,
-	0x10839,
-	0x1083C,
-	0x1083D,
-	0x1083F,
-	0x10856,
-	0x10860,
-	0x10877,
-	0x10880,
-	0x1089F,
-	0x10900,
-	0x10916,
-	0x10920,
-	0x1093A,
-	0x10980,
-	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
-	0x10A01,
-	0x10A10,
-	0x10A14,
-	0x10A15,
-	0x10A18,
-	0x10A19,
-	0x10A34,
-	0x10A60,
-	0x10A7D,
-	0x10A80,
-	0x10A9D,
-	0x10AC0,
-	0x10AC8,
-	0x10AC9,
-	0x10AE5,
-	0x10B00,
-	0x10B36,
-	0x10B40,
-	0x10B56,
-	0x10B60,
-	0x10B73,
-	0x10B80,
-	0x10B92,
-	0x10C00,
-	0x10C49,
-	0x11003,
-	0x11038,
-	0x11083,
-	0x110B0,
-	0x110D0,
-	0x110E9,
-	0x11103,
-	0x11127,
-	0x11150,
-	0x11173,
-	0x11176,
-	0x11177,
-	0x11183,
-	0x111B3,
-	0x111C1,
-	0x111C5,
-	0x111DA,
-	0x111DB,
-	0x11200,
-	0x11212,
-	0x11213,
-	0x1122C,
-	0x112B0,
-	0x112DF,
-	0x11305,
-	0x1130D,
-	0x1130F,
-	0x11311,
-	0x11313,
-	0x11329,
-	0x1132A,
-	0x11331,
-	0x11332,
-	0x11334,
-	0x11335,
-	0x1133A,
-	0x1133D,
-	0x1133E,
-	0x1135D,
-	0x11362,
-	0x11480,
-	0x114B0,
-	0x114C4,
-	0x114C6,
-	0x114C7,
-	0x114C8,
-	0x11580,
-	0x115AF,
-	0x11600,
-	0x11630,
-	0x11644,
-	0x11645,
-	0x11680,
-	0x116AB,
-	0x118A0,
-	0x118E0,
-	0x118FF,
-	0x11900,
-	0x11AC0,
-	0x11AF9,
-	0x12000,
-	0x12399,
-	0x12400,
-	0x1246F,
-	0x13000,
-	0x1342F,
-	0x16800,
-	0x16A39,
-	0x16A40,
-	0x16A5F,
-	0x16AD0,
-	0x16AEE,
-	0x16B00,
-	0x16B30,
-	0x16B40,
-	0x16B44,
-	0x16B63,
-	0x16B78,
-	0x16B7D,
-	0x16B90,
-	0x16F00,
-	0x16F45,
-	0x16F50,
-	0x16F51,
-	0x16F93,
-	0x16FA0,
-	0x1B000,
-	0x1B002,
-	0x1BC00,
-	0x1BC6B,
-	0x1BC70,
-	0x1BC7D,
-	0x1BC80,
-	0x1BC89,
-	0x1BC90,
-	0x1BC9A,
-	0x1D400,
-	0x1D455,
-	0x1D456,
-	0x1D49D,
-	0x1D49E,
-	0x1D4A0,
-	0x1D4A2,
-	0x1D4A3,
-	0x1D4A5,
-	0x1D4A7,
-	0x1D4A9,
-	0x1D4AD,
-	0x1D4AE,
-	0x1D4BA,
-	0x1D4BB,
-	0x1D4BC,
-	0x1D4BD,
-	0x1D4C4,
-	0x1D4C5,
-	0x1D506,
-	0x1D507,
-	0x1D50B,
-	0x1D50D,
-	0x1D515,
-	0x1D516,
-	0x1D51D,
-	0x1D51E,
-	0x1D53A,
-	0x1D53B,
-	0x1D53F,
-	0x1D540,
-	0x1D545,
-	0x1D546,
-	0x1D547,
-	0x1D54A,
-	0x1D551,
-	0x1D552,
-	0x1D6A6,
-	0x1D6A8,
-	0x1D6C1,
-	0x1D6C2,
-	0x1D6DB,
-	0x1D6DC,
-	0x1D6FB,
-	0x1D6FC,
-	0x1D715,
-	0x1D716,
-	0x1D735,
-	0x1D736,
-	0x1D74F,
-	0x1D750,
-	0x1D76F,
-	0x1D770,
-	0x1D789,
-	0x1D78A,
-	0x1D7A9,
-	0x1D7AA,
-	0x1D7C3,
-	0x1D7C4,
-	0x1D7CC,
-	0x1E800,
-	0x1E8C5,
-	0x1EE00,
-	0x1EE04,
-	0x1EE05,
-	0x1EE20,
-	0x1EE21,
-	0x1EE23,
-	0x1EE24,
-	0x1EE25,
-	0x1EE27,
-	0x1EE28,
-	0x1EE29,
-	0x1EE33,
-	0x1EE34,
-	0x1EE38,
-	0x1EE39,
-	0x1EE3A,
-	0x1EE3B,
-	0x1EE3C,
-	0x1EE42,
-	0x1EE43,
-	0x1EE47,
-	0x1EE48,
-	0x1EE49,
-	0x1EE4A,
-	0x1EE4B,
-	0x1EE4C,
-	0x1EE4D,
-	0x1EE50,
-	0x1EE51,
-	0x1EE53,
-	0x1EE54,
-	0x1EE55,
-	0x1EE57,
-	0x1EE58,
-	0x1EE59,
-	0x1EE5A,
-	0x1EE5B,
-	0x1EE5C,
-	0x1EE5D,
-	0x1EE5E,
-	0x1EE5F,
-	0x1EE60,
-	0x1EE61,
-	0x1EE63,
-	0x1EE64,
-	0x1EE65,
-	0x1EE67,
-	0x1EE6B,
-	0x1EE6C,
-	0x1EE73,
-	0x1EE74,
-	0x1EE78,
-	0x1EE79,
-	0x1EE7D,
-	0x1EE7E,
-	0x1EE7F,
-	0x1EE80,
-	0x1EE8A,
-	0x1EE8B,
-	0x1EE9C,
-	0x1EEA1,
-	0x1EEA4,
-	0x1EEA5,
-	0x1EEAA,
-	0x1EEAB,
-	0x1EEBC,
-	0x20000,
-	0x2A6D7,
-	0x2A700,
-	0x2B735,
-	0x2B740,
-	0x2B81E,
-	0x2F800,
-	0x2FA1E
+#endif	/* defined(PERL_IN_PERL_C) */
+
+#if defined(PERL_IN_REGEXEC_C)
+
+#define LB_ENUM_COUNT 36
+
+typedef enum {
+	LB_Alphabetic = 0,
+	LB_Break_After = 1,
+	LB_Break_Before = 2,
+	LB_Break_Both = 3,
+	LB_Break_Symbols = 4,
+	LB_Carriage_Return = 5,
+	LB_Close_Parenthesis = 6,
+	LB_Close_Punctuation = 7,
+	LB_Combining_Mark = 8,
+	LB_Contingent_Break = 9,
+	LB_Exclamation = 10,
+	LB_Glue = 11,
+	LB_H2 = 12,
+	LB_H3 = 13,
+	LB_Hebrew_Letter = 14,
+	LB_Hyphen = 15,
+	LB_Ideographic = 16,
+	LB_Infix_Numeric = 17,
+	LB_Inseparable = 18,
+	LB_JL = 19,
+	LB_JT = 20,
+	LB_JV = 21,
+	LB_Line_Feed = 22,
+	LB_Mandatory_Break = 23,
+	LB_Next_Line = 24,
+	LB_Nonstarter = 25,
+	LB_Numeric = 26,
+	LB_Open_Punctuation = 27,
+	LB_Postfix_Numeric = 28,
+	LB_Prefix_Numeric = 29,
+	LB_Quotation = 30,
+	LB_Regional_Indicator = 31,
+	LB_Space = 32,
+	LB_Word_Joiner = 33,
+	LB_ZWSpace = 34,
+	LB_EDGE = 35
+} LB_enum;
+
+static const LB_enum _Perl_LB_invmap[] = { /* for EBCDIC 037 */
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Mandatory_Break,
+	LB_Carriage_Return,
+	LB_Combining_Mark,
+	LB_Next_Line,
+	LB_Combining_Mark,
+	LB_Line_Feed,
+	LB_Combining_Mark,
+	LB_Space,
+	LB_Glue,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Prefix_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Close_Parenthesis,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Hyphen,
+	LB_Break_Symbols,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Parenthesis,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Exclamation,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Infix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Exclamation,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Numeric,
+	LB_Postfix_Numeric,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Glue,
+	LB_Break_Before,
+	LB_Break_After,
+	LB_Glue,
+	LB_Exclamation,
+	LB_Glue,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Break_After,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Glue,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Numeric,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_JL,
+	LB_JV,
+	LB_JT,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Glue,
+	LB_Break_After,
+	LB_ZWSpace,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Glue,
+	LB_Break_After,
+	LB_Break_Both,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Open_Punctuation,
+	LB_Quotation,
+	LB_Open_Punctuation,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Inseparable,
+	LB_Break_After,
+	LB_Mandatory_Break,
+	LB_Combining_Mark,
+	LB_Glue,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Infix_Numeric,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Word_Joiner,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Inseparable,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Quotation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Open_Punctuation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Break_After,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_Both,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Nonstarter,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Combining_Mark,
+	LB_Ideographic,
+	LB_Combining_Mark,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Exclamation,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_JL,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_H2,
+	LB_H3,
+	LB_Alphabetic,
+	LB_JV,
+	LB_Alphabetic,
+	LB_JT,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Combining_Mark,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Hebrew_Letter,
+	LB_Alphabetic,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Infix_Numeric,
+	LB_Close_Punctuation,
+	LB_Infix_Numeric,
+	LB_Exclamation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Inseparable,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Exclamation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Word_Joiner,
+	LB_Alphabetic,
+	LB_Exclamation,
+	LB_Ideographic,
+	LB_Prefix_Numeric,
+	LB_Postfix_Numeric,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Nonstarter,
+	LB_Ideographic,
+	LB_Exclamation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Ideographic,
+	LB_Close_Punctuation,
+	LB_Ideographic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Postfix_Numeric,
+	LB_Prefix_Numeric,
+	LB_Ideographic,
+	LB_Prefix_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Contingent_Break,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Inseparable,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_Before,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_Before,
+	LB_Break_After,
+	LB_Exclamation,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Open_Punctuation,
+	LB_Close_Punctuation,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Break_After,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Numeric,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Break_After,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Regional_Indicator,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Quotation,
+	LB_Nonstarter,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Ideographic,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic,
+	LB_Combining_Mark,
+	LB_Alphabetic
 };
 
-#endif	/* defined(PERL_IN_UTF8_C) */
+#endif	/* defined(PERL_IN_REGEXEC_C) */
 
 #if defined(PERL_IN_PERL_C)
 
-static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
-	2863,	/* Number of elements */
+static const UV _Perl_SB_invlist[] = { /* for EBCDIC 037 */
+	2916,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -79089,10 +69147,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAA,
 	0xAC,
 	0xAF,
-	0xBB,
+	0xBA,
 	0xBC,
-	0xBD,
-	0xBE,
 	0xC0,
 	0xC1,
 	0xCA,
@@ -79101,19 +69157,13 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xD1,
 	0xDA,
 	0xDB,
-	0xDD,
-	0xDE,
 	0xE0,
-	0xE1,
 	0xE2,
 	0xEA,
 	0xEB,
 	0xF0,
 	0xFA,
 	0xFB,
-	0xFC,
-	0xFD,
-	0xFE,
 	0xFF,
 	0x100,
 	0x101,
@@ -79767,8 +69817,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x859,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x904,
 	0x93A,
 	0x93D,
@@ -79878,6 +69928,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -79964,7 +70016,7 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC62,
 	0xC64,
@@ -80019,7 +70071,7 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD62,
 	0xD64,
 	0xD66,
@@ -80199,7 +70251,9 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166E,
@@ -80274,8 +70328,6 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1980,
 	0x19AC,
 	0x19B0,
-	0x19C1,
-	0x19C8,
 	0x19CA,
 	0x19D0,
 	0x19DA,
@@ -80962,7 +71014,7 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -81056,7 +71108,6 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA69A,
 	0xA69B,
 	0xA69E,
-	0xA69F,
 	0xA6A0,
 	0xA6F0,
 	0xA6F2,
@@ -81190,7 +71241,10 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA7AA,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B5,
+	0xA7B6,
+	0xA7B7,
+	0xA7B8,
 	0xA7F7,
 	0xA7F8,
 	0xA7FB,
@@ -81218,6 +71272,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA90A,
 	0xA926,
@@ -81291,9 +71347,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
+	0xAB70,
 	0xABC0,
 	0xABE3,
 	0xABEB,
@@ -81348,7 +71403,7 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xFE17,
 	0xFE19,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE31,
 	0xFE33,
 	0xFE35,
@@ -81482,6 +71537,10 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -81527,6 +71586,10 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11003,
 	0x11038,
@@ -81564,11 +71627,16 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x111C1,
 	0x111C5,
 	0x111C7,
+	0x111CA,
 	0x111CD,
 	0x111CE,
 	0x111D0,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
+	0x111DE,
+	0x111E0,
 	0x11200,
 	0x11212,
 	0x11213,
@@ -81577,12 +71645,23 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1123A,
 	0x1123B,
 	0x1123D,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
+	0x112AA,
 	0x112B0,
 	0x112DF,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -81604,6 +71683,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -81629,7 +71710,9 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x115C2,
 	0x115C4,
 	0x115C9,
-	0x115CA,
+	0x115D8,
+	0x115DC,
+	0x115DE,
 	0x11600,
 	0x11630,
 	0x11641,
@@ -81643,6 +71726,14 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
+	0x1173C,
+	0x1173F,
 	0x118A0,
 	0x118C0,
 	0x118E0,
@@ -81652,11 +71743,15 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -81808,6 +71903,20 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA88,
+	0x1DA89,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -81892,6 +72001,8 @@ static const UV Sentence_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0001,
@@ -81913,31 +72024,31 @@ typedef enum {
 	SB_ATerm = 1,
 	SB_CR = 2,
 	SB_Close = 3,
-	SB_EDGE = 4,
-	SB_Extend = 5,
-	SB_Format = 6,
-	SB_LF = 7,
-	SB_Lower = 8,
-	SB_Numeric = 9,
-	SB_OLetter = 10,
-	SB_SContinue = 11,
-	SB_STerm = 12,
-	SB_Sep = 13,
-	SB_Sp = 14,
-	SB_Upper = 15
+	SB_Extend = 4,
+	SB_Format = 5,
+	SB_LF = 6,
+	SB_Lower = 7,
+	SB_Numeric = 8,
+	SB_OLetter = 9,
+	SB_SContinue = 10,
+	SB_STerm = 11,
+	SB_Sep = 12,
+	SB_Sp = 13,
+	SB_Upper = 14,
+	SB_EDGE = 15
 } SB_enum;
 
-static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
+static const SB_enum _Perl_SB_invmap[] = { /* for EBCDIC 037 */
 	SB_Other,
 	SB_Sp,
 	SB_Other,
 	SB_Sp,
 	SB_CR,
 	SB_Other,
-	SB_LF,
-	SB_Other,
 	SB_Sep,
 	SB_Other,
+	SB_LF,
+	SB_Other,
 	SB_Sp,
 	SB_Lower,
 	SB_Other,
@@ -81983,27 +72094,19 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Close,
 	SB_Other,
 	SB_Close,
-	SB_Other,
-	SB_Lower,
 	SB_Upper,
 	SB_Format,
 	SB_Lower,
-	SB_Other,
+	SB_Close,
 	SB_Upper,
 	SB_Other,
 	SB_Lower,
-	SB_Upper,
-	SB_Lower,
-	SB_Upper,
 	SB_Other,
 	SB_Upper,
 	SB_Other,
 	SB_Upper,
 	SB_Numeric,
 	SB_Other,
-	SB_Close,
-	SB_Upper,
-	SB_Close,
 	SB_Upper,
 	SB_Other,
 	SB_Upper,
@@ -82769,6 +72872,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Extend,
 	SB_Other,
 	SB_OLetter,
@@ -83089,7 +73194,9 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
-	SB_OLetter,
+	SB_Upper,
+	SB_Other,
+	SB_Lower,
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
@@ -83164,9 +73271,7 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
-	SB_Extend,
 	SB_OLetter,
-	SB_Extend,
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
@@ -83946,7 +74051,6 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Lower,
 	SB_Upper,
 	SB_Lower,
-	SB_Other,
 	SB_Extend,
 	SB_OLetter,
 	SB_Extend,
@@ -84053,7 +74157,7 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Lower,
 	SB_Upper,
 	SB_Lower,
-	SB_Other,
+	SB_OLetter,
 	SB_Upper,
 	SB_Lower,
 	SB_Upper,
@@ -84081,6 +74185,9 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Upper,
 	SB_Other,
 	SB_Upper,
+	SB_Lower,
+	SB_Upper,
+	SB_Lower,
 	SB_Other,
 	SB_OLetter,
 	SB_Lower,
@@ -84109,6 +74216,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Numeric,
 	SB_OLetter,
 	SB_Extend,
@@ -84184,7 +74293,6 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Lower,
 	SB_Other,
 	SB_Lower,
-	SB_Other,
 	SB_OLetter,
 	SB_Extend,
 	SB_STerm,
@@ -84382,6 +74490,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_OLetter,
 	SB_Other,
 	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
 	SB_Extend,
 	SB_Other,
 	SB_Extend,
@@ -84418,6 +74530,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_Upper,
+	SB_Other,
+	SB_Lower,
+	SB_Other,
 	SB_Extend,
 	SB_OLetter,
 	SB_Extend,
@@ -84455,6 +74571,7 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_OLetter,
 	SB_STerm,
 	SB_Other,
+	SB_Extend,
 	SB_STerm,
 	SB_Other,
 	SB_Numeric,
@@ -84462,6 +74579,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_STerm,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_OLetter,
 	SB_Extend,
 	SB_STerm,
@@ -84469,6 +74590,17 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_STerm,
 	SB_Other,
 	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_STerm,
+	SB_Other,
+	SB_OLetter,
 	SB_Extend,
 	SB_Other,
 	SB_Numeric,
@@ -84495,6 +74627,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Other,
 	SB_Extend,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Extend,
 	SB_Other,
 	SB_OLetter,
@@ -84520,6 +74654,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_STerm,
 	SB_Other,
 	SB_STerm,
+	SB_OLetter,
+	SB_Extend,
 	SB_Other,
 	SB_OLetter,
 	SB_Extend,
@@ -84534,6 +74670,14 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Numeric,
+	SB_Other,
+	SB_STerm,
+	SB_Other,
 	SB_Upper,
 	SB_Lower,
 	SB_Numeric,
@@ -84552,6 +74696,10 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Numeric,
 	SB_Other,
 	SB_STerm,
@@ -84699,6 +74847,20 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Other,
 	SB_Numeric,
 	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_STerm,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
+	SB_Extend,
+	SB_Other,
 	SB_OLetter,
 	SB_Other,
 	SB_Extend,
@@ -84785,6 +74947,8 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	SB_Other,
 	SB_OLetter,
 	SB_Other,
+	SB_OLetter,
+	SB_Other,
 	SB_Format,
 	SB_Other,
 	SB_Format,
@@ -84795,98 +74959,16 @@ static const SB_enum Sentence_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 
 #endif	/* defined(PERL_IN_REGEXEC_C) */
 
-#if defined(PERL_IN_REGCOMP_C)
-
-static const UV UpperLatin1_invlist[] = { /* for EBCDIC POSIX-BC */
-	57,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0x4,
-	0x5,
-	0x6,
-	0x7,
-	0x8,
-	0xB,
-	0x14,
-	0x15,
-	0x17,
-	0x18,
-	0x1A,
-	0x1C,
-	0x20,
-	0x26,
-	0x28,
-	0x2D,
-	0x30,
-	0x32,
-	0x33,
-	0x37,
-	0x38,
-	0x3C,
-	0x3E,
-	0x3F,
-	0x41,
-	0x4A,
-	0x51,
-	0x5A,
-	0x5F,
-	0x60,
-	0x62,
-	0x6A,
-	0x70,
-	0x7A,
-	0x80,
-	0x81,
-	0x8A,
-	0x91,
-	0x9A,
-	0xA2,
-	0xAA,
-	0xBB,
-	0xBE,
-	0xC1,
-	0xCA,
-	0xD1,
-	0xDA,
-	0xE2,
-	0xEA,
-	0xF0,
-	0xFA,
-	0xFB,
-	0xFC,
-	0xFD,
-	0xFE,
-	0xFF
-};
-
-#endif	/* defined(PERL_IN_REGCOMP_C) */
-
 #if defined(PERL_IN_PERL_C)
 
-static const UV VertSpace_invlist[] = { /* for EBCDIC POSIX-BC */
-	9,	/* Number of elements */
-	148565664, /* Version and data structure type */
-	1,	/* 0 if the list starts at 0;
-		   1 if it starts at the element beyond 0 */
-	0x0,
-	0xB,
-	0xE,
-	0x15,
-	0x16,
-	0x25,
-	0x26,
-	0x2028,
-	0x202A
-};
-
-static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
-	1503,	/* Number of elements */
+static const UV _Perl_WB_invlist[] = { /* for EBCDIC 037 */
+	1554,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0x0,
+	0x5,
+	0x6,
 	0xB,
 	0xD,
 	0xE,
@@ -84894,6 +74976,7 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x16,
 	0x25,
 	0x26,
+	0x40,
 	0x42,
 	0x4A,
 	0x4B,
@@ -84931,22 +75014,20 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAF,
 	0xB3,
 	0xB4,
-	0xC0,
+	0xC1,
 	0xCA,
 	0xCB,
 	0xD0,
 	0xD1,
 	0xDA,
 	0xDB,
-	0xE1,
+	0xE0,
 	0xE2,
 	0xEA,
 	0xEB,
 	0xF0,
 	0xFA,
-	0xFC,
-	0xFD,
-	0xFE,
+	0xFB,
 	0xFF,
 	0x100,
 	0x2C2,
@@ -85074,8 +75155,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x859,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x904,
 	0x93A,
 	0x93D,
@@ -85185,6 +75266,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -85271,7 +75354,7 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC62,
 	0xC64,
@@ -85326,7 +75409,7 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD62,
 	0xD64,
 	0xD66,
@@ -85467,7 +75550,9 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -85522,10 +75607,6 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x193C,
 	0x1946,
 	0x1950,
-	0x19B0,
-	0x19C1,
-	0x19C8,
-	0x19CA,
 	0x19D0,
 	0x19DA,
 	0x1A00,
@@ -85621,6 +75702,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1FF5,
 	0x1FF6,
 	0x1FFD,
+	0x2000,
+	0x200B,
 	0x200C,
 	0x200E,
 	0x2010,
@@ -85632,12 +75715,14 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x2028,
 	0x202A,
 	0x202F,
+	0x2030,
 	0x203F,
 	0x2041,
 	0x2044,
 	0x2045,
 	0x2054,
 	0x2055,
+	0x205F,
 	0x2060,
 	0x2065,
 	0x2066,
@@ -85723,6 +75808,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x2E00,
 	0x2E2F,
 	0x2E30,
+	0x3000,
+	0x3001,
 	0x3005,
 	0x3006,
 	0x302A,
@@ -85767,7 +75854,6 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA67E,
 	0xA67F,
 	0xA69E,
-	0xA69F,
 	0xA6A0,
 	0xA6F0,
 	0xA6F2,
@@ -85776,11 +75862,9 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -85803,6 +75887,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA90A,
 	0xA926,
@@ -85864,10 +75950,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABE3,
 	0xABEB,
 	0xABEC,
@@ -85916,7 +76000,7 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xFE14,
 	0xFE15,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE33,
 	0xFE35,
 	0xFE4D,
@@ -86031,6 +76115,10 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -86074,6 +76162,10 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11003,
 	0x11038,
@@ -86106,20 +76198,34 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x111B3,
 	0x111C1,
 	0x111C5,
+	0x111CA,
+	0x111CD,
 	0x111D0,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1122C,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112DF,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -86141,6 +76247,8 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -86163,6 +76271,9 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x115B6,
 	0x115B8,
 	0x115C1,
+	0x115D8,
+	0x115DC,
+	0x115DE,
 	0x11600,
 	0x11630,
 	0x11641,
@@ -86175,6 +76286,10 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118E0,
 	0x118EA,
@@ -86183,11 +76298,15 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -86305,6 +76424,18 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -86395,39 +76526,43 @@ static const UV Word_Break_invlist[] = { /* for EBCDIC POSIX-BC */
 
 #if defined(PERL_IN_REGEXEC_C)
 
-#define WB_ENUM_COUNT 19
+#define WB_ENUM_COUNT 20
 
 typedef enum {
 	WB_Other = 0,
 	WB_ALetter = 1,
 	WB_CR = 2,
 	WB_Double_Quote = 3,
-	WB_EDGE = 4,
-	WB_Extend = 5,
-	WB_ExtendNumLet = 6,
-	WB_Format = 7,
-	WB_Hebrew_Letter = 8,
-	WB_Katakana = 9,
-	WB_LF = 10,
-	WB_MidLetter = 11,
-	WB_MidNum = 12,
-	WB_MidNumLet = 13,
-	WB_Newline = 14,
-	WB_Numeric = 15,
+	WB_Extend = 4,
+	WB_ExtendNumLet = 5,
+	WB_Format = 6,
+	WB_Hebrew_Letter = 7,
+	WB_Katakana = 8,
+	WB_LF = 9,
+	WB_MidLetter = 10,
+	WB_MidNum = 11,
+	WB_MidNumLet = 12,
+	WB_Newline = 13,
+	WB_Numeric = 14,
+	WB_Perl_Tailored_HSpace = 15,
 	WB_Regional_Indicator = 16,
 	WB_Single_Quote = 17,
-	WB_UNKNOWN = 18
+	WB_EDGE = 18,
+	WB_UNKNOWN = 19
 } WB_enum;
 
-static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
+static const WB_enum _Perl_WB_invmap[] = { /* for EBCDIC 037 */
+	WB_Other,
+	WB_Perl_Tailored_HSpace,
 	WB_Other,
 	WB_Newline,
 	WB_CR,
 	WB_Other,
-	WB_LF,
-	WB_Other,
 	WB_Newline,
 	WB_Other,
+	WB_LF,
+	WB_Other,
+	WB_Perl_Tailored_HSpace,
 	WB_ALetter,
 	WB_Other,
 	WB_MidNumLet,
@@ -86484,8 +76619,6 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
-	WB_ALetter,
-	WB_Other,
 	WB_MidLetter,
 	WB_Other,
 	WB_ALetter,
@@ -86719,6 +76852,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
@@ -87007,6 +77142,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
+	WB_Perl_Tailored_HSpace,
+	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
@@ -87056,10 +77193,6 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
-	WB_Extend,
-	WB_Other,
-	WB_Extend,
-	WB_Other,
 	WB_Numeric,
 	WB_Other,
 	WB_ALetter,
@@ -87155,6 +77288,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
+	WB_Other,
 	WB_Extend,
 	WB_Format,
 	WB_Other,
@@ -87165,6 +77300,7 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_MidLetter,
 	WB_Newline,
 	WB_Format,
+	WB_Perl_Tailored_HSpace,
 	WB_Other,
 	WB_ExtendNumLet,
 	WB_Other,
@@ -87172,6 +77308,7 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_ExtendNumLet,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
 	WB_Format,
 	WB_Other,
 	WB_Format,
@@ -87257,6 +77394,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_Perl_Tailored_HSpace,
+	WB_Other,
 	WB_ALetter,
 	WB_Other,
 	WB_Extend,
@@ -87300,7 +77439,6 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
-	WB_Other,
 	WB_Extend,
 	WB_ALetter,
 	WB_Extend,
@@ -87314,8 +77452,6 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
 	WB_Extend,
 	WB_ALetter,
 	WB_Extend,
@@ -87337,6 +77473,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Numeric,
 	WB_ALetter,
 	WB_Extend,
@@ -87400,8 +77538,6 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
-	WB_Other,
-	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_Extend,
@@ -87574,6 +77710,10 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_Extend,
@@ -87608,6 +77748,10 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Extend,
 	WB_ALetter,
 	WB_Extend,
@@ -87640,15 +77784,29 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Extend,
 	WB_ALetter,
 	WB_Other,
+	WB_Extend,
+	WB_Other,
 	WB_Numeric,
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
 	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
 	WB_Extend,
 	WB_Other,
 	WB_Numeric,
@@ -87675,6 +77833,8 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_Extend,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
@@ -87701,6 +77861,9 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Extend,
 	WB_Other,
 	WB_ALetter,
+	WB_Extend,
+	WB_Other,
+	WB_ALetter,
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
@@ -87709,6 +77872,10 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Numeric,
+	WB_Other,
 	WB_ALetter,
 	WB_Numeric,
 	WB_Other,
@@ -87726,6 +77893,10 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_ALetter,
 	WB_Other,
+	WB_ALetter,
+	WB_Other,
+	WB_ALetter,
+	WB_Other,
 	WB_Numeric,
 	WB_Other,
 	WB_ALetter,
@@ -87839,6 +78010,18 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 	WB_Other,
 	WB_Numeric,
 	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
+	WB_Extend,
+	WB_Other,
 	WB_ALetter,
 	WB_Other,
 	WB_Extend,
@@ -87927,9 +78110,93 @@ static const WB_enum Word_Break_invmap[] = { /* for EBCDIC POSIX-BC */
 
 #endif	/* defined(PERL_IN_REGEXEC_C) */
 
+#if defined(PERL_IN_REGCOMP_C)
+
+static const UV UpperLatin1_invlist[] = { /* for EBCDIC 037 */
+	57,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0x4,
+	0x5,
+	0x6,
+	0x7,
+	0x8,
+	0xB,
+	0x14,
+	0x16,
+	0x17,
+	0x18,
+	0x1A,
+	0x1C,
+	0x20,
+	0x25,
+	0x28,
+	0x2D,
+	0x30,
+	0x32,
+	0x33,
+	0x37,
+	0x38,
+	0x3C,
+	0x3E,
+	0x3F,
+	0x41,
+	0x4B,
+	0x51,
+	0x5A,
+	0x5F,
+	0x60,
+	0x62,
+	0x6B,
+	0x70,
+	0x79,
+	0x80,
+	0x81,
+	0x8A,
+	0x91,
+	0x9A,
+	0xA1,
+	0xAA,
+	0xB0,
+	0xB1,
+	0xBA,
+	0xBC,
+	0xC0,
+	0xCA,
+	0xD0,
+	0xDA,
+	0xE0,
+	0xE1,
+	0xE2,
+	0xEA,
+	0xF0,
+	0xFA,
+	0x100
+};
+
+#endif	/* defined(PERL_IN_REGCOMP_C) */
+
 #if defined(PERL_IN_PERL_C)
 
-static const UV XPerlSpace_invlist[] = { /* for EBCDIC POSIX-BC */
+static const UV VertSpace_invlist[] = { /* for EBCDIC 037 */
+	9,	/* Number of elements */
+	148565664, /* Version and data structure type */
+	1,	/* 0 if the list starts at 0;
+		   1 if it starts at the element beyond 0 */
+	0x0,
+	0xB,
+	0xE,
+	0x15,
+	0x16,
+	0x25,
+	0x26,
+	0x2028,
+	0x202A
+};
+
+static const UV XPerlSpace_invlist[] = { /* for EBCDIC 037 */
 	23,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
@@ -87959,8 +78226,8 @@ static const UV XPerlSpace_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x3001
 };
 
-static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
-	1283,	/* Number of elements */
+static const UV XPosixAlnum_invlist[] = { /* for EBCDIC 037 */
+	1317,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -87987,21 +78254,19 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAA,
 	0xAC,
 	0xAF,
-	0xC0,
+	0xC1,
 	0xCA,
 	0xCB,
 	0xD0,
 	0xD1,
 	0xDA,
 	0xDB,
-	0xE1,
+	0xE0,
 	0xE2,
 	0xEA,
 	0xEB,
 	0xFA,
-	0xFC,
-	0xFD,
-	0xFE,
+	0xFB,
 	0xFF,
 	0x100,
 	0x2C2,
@@ -88090,8 +78355,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x840,
 	0x859,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x8EA,
 	0x8F0,
 	0x93C,
@@ -88189,6 +78454,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -88270,7 +78537,7 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -88321,7 +78588,7 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD70,
@@ -88470,7 +78737,9 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -88714,7 +78983,7 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -88728,19 +78997,15 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA674,
 	0xA67C,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F0,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -88759,6 +79024,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA92B,
 	0xA930,
@@ -88810,10 +79077,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xABF0,
 	0xABFA,
@@ -88937,6 +79202,10 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -88973,6 +79242,10 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11046,
 	0x11066,
@@ -88997,17 +79270,29 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x111C5,
 	0x111D0,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11235,
 	0x11237,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112E9,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -89027,6 +79312,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11349,
 	0x1134B,
 	0x1134D,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -89043,6 +79330,8 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x115B6,
 	0x115B8,
 	0x115BF,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x1163F,
 	0x11640,
@@ -89055,6 +79344,12 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x116B6,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172B,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118EA,
 	0x118FF,
@@ -89062,11 +79357,15 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -89245,12 +79544,14 @@ static const UV XPosixAlnum_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E
 };
 
-static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
-	1225,	/* Number of elements */
+static const UV XPosixAlpha_invlist[] = { /* for EBCDIC 037 */
+	1257,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -89277,21 +79578,19 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAA,
 	0xAC,
 	0xAF,
-	0xC0,
+	0xC1,
 	0xCA,
 	0xCB,
 	0xD0,
 	0xD1,
 	0xDA,
 	0xDB,
-	0xE1,
+	0xE0,
 	0xE2,
 	0xEA,
 	0xEB,
 	0xF0,
-	0xFC,
-	0xFD,
-	0xFE,
+	0xFB,
 	0xFF,
 	0x100,
 	0x2C2,
@@ -89382,8 +79681,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x840,
 	0x859,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x8EA,
 	0x8F0,
 	0x93C,
@@ -89477,6 +79776,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAD1,
 	0xAE0,
 	0xAE4,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -89554,7 +79855,7 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC81,
@@ -89601,7 +79902,7 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD7A,
 	0xD80,
@@ -89738,7 +80039,9 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -89972,7 +80275,7 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -89988,19 +80291,15 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA674,
 	0xA67C,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F0,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA802,
 	0xA803,
@@ -90017,6 +80316,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA90A,
 	0xA92B,
 	0xA930,
@@ -90068,10 +80369,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xAC00,
 	0xD7A4,
@@ -90189,6 +80488,10 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -90225,6 +80528,10 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11046,
 	0x11082,
@@ -90243,15 +80550,27 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x111C5,
 	0x111DA,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11235,
 	0x11237,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112E9,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -90271,6 +80590,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11349,
 	0x1134B,
 	0x1134D,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -90285,6 +80606,8 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x115B6,
 	0x115B8,
 	0x115BF,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x1163F,
 	0x11640,
@@ -90293,6 +80616,10 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11645,
 	0x11680,
 	0x116B6,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172B,
 	0x118A0,
 	0x118E0,
 	0x118FF,
@@ -90300,11 +80627,15 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -90477,11 +80808,13 @@ static const UV XPosixAlpha_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E
 };
 
-static const UV XPosixBlank_invlist[] = { /* for EBCDIC POSIX-BC */
+static const UV XPosixBlank_invlist[] = { /* for EBCDIC 037 */
 	15,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
@@ -90503,19 +80836,19 @@ static const UV XPosixBlank_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x3001
 };
 
-static const UV XPosixCntrl_invlist[] = { /* for EBCDIC POSIX-BC */
+static const UV XPosixCntrl_invlist[] = { /* for EBCDIC 037 */
 	4,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	0,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0x0,
 	0x40,
-	0x5F,
-	0x60
+	0xFF,
+	0x100
 };
 
-static const UV XPosixDigit_invlist[] = { /* for EBCDIC POSIX-BC */
-	101,	/* Number of elements */
+static const UV XPosixDigit_invlist[] = { /* for EBCDIC 037 */
+	103,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -90612,6 +80945,8 @@ static const UV XPosixDigit_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1165A,
 	0x116C0,
 	0x116CA,
+	0x11730,
+	0x1173A,
 	0x118E0,
 	0x118EA,
 	0x16A60,
@@ -90622,15 +80957,15 @@ static const UV XPosixDigit_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1D800
 };
 
-static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
-	1211,	/* Number of elements */
+static const UV XPosixGraph_invlist[] = { /* for EBCDIC 037 */
+	1237,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0x0,
 	0x42,
-	0x5F,
-	0x60,
+	0xFF,
+	0x100,
 	0x378,
 	0x37A,
 	0x380,
@@ -90677,8 +81012,8 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x85E,
 	0x85F,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x984,
 	0x985,
 	0x98D,
@@ -90764,6 +81099,8 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAE4,
 	0xAE6,
 	0xAF2,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -90843,7 +81180,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -90894,7 +81231,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD76,
@@ -91019,7 +81356,9 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1380,
 	0x139A,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1400,
 	0x1680,
 	0x1681,
@@ -91155,11 +81494,11 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x2090,
 	0x209D,
 	0x20A0,
-	0x20BE,
+	0x20BF,
 	0x20D0,
 	0x20F1,
 	0x2100,
-	0x218A,
+	0x218C,
 	0x2190,
 	0x23FB,
 	0x2400,
@@ -91176,6 +81515,8 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x2BC9,
 	0x2BCA,
 	0x2BD2,
+	0x2BEC,
+	0x2BF0,
 	0x2C00,
 	0x2C2F,
 	0x2C30,
@@ -91241,7 +81582,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x3300,
 	0x4DB6,
 	0x4DC0,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA490,
@@ -91249,15 +81590,11 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA4D0,
 	0xA62C,
 	0xA640,
-	0xA69E,
-	0xA69F,
 	0xA6F8,
 	0xA700,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA82C,
 	0xA830,
@@ -91269,7 +81606,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA8CE,
 	0xA8DA,
 	0xA8E0,
-	0xA8FC,
+	0xA8FE,
 	0xA900,
 	0xA954,
 	0xA95F,
@@ -91301,10 +81638,8 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAB28,
 	0xAB2F,
 	0xAB30,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEE,
 	0xABF0,
 	0xABFA,
@@ -91345,8 +81680,6 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xFE00,
 	0xFE1A,
 	0xFE20,
-	0xFE2E,
-	0xFE30,
 	0xFE53,
 	0xFE54,
 	0xFE67,
@@ -91450,7 +81783,11 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1089F,
 	0x108A7,
 	0x108B0,
-	0x10900,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
+	0x108FB,
 	0x1091C,
 	0x1091F,
 	0x1093A,
@@ -91458,9 +81795,9 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10940,
 	0x10980,
 	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
+	0x109BC,
+	0x109D0,
+	0x109D2,
 	0x10A04,
 	0x10A05,
 	0x10A07,
@@ -91496,6 +81833,12 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10BB0,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
+	0x10CFA,
+	0x10D00,
 	0x10E60,
 	0x10E7F,
 	0x11000,
@@ -91515,22 +81858,30 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11150,
 	0x11177,
 	0x11180,
-	0x111C9,
-	0x111CD,
 	0x111CE,
 	0x111D0,
-	0x111DB,
+	0x111E0,
 	0x111E1,
 	0x111F5,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1123E,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112AA,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -91550,6 +81901,8 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -91565,7 +81918,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11580,
 	0x115B6,
 	0x115B8,
-	0x115CA,
+	0x115DE,
 	0x11600,
 	0x11645,
 	0x11650,
@@ -91574,6 +81927,12 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x11740,
 	0x118A0,
 	0x118F3,
 	0x118FF,
@@ -91581,13 +81940,17 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
 	0x12470,
 	0x12475,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -91633,7 +81996,7 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1D100,
 	0x1D127,
 	0x1D129,
-	0x1D1DE,
+	0x1D1E9,
 	0x1D200,
 	0x1D246,
 	0x1D300,
@@ -91681,7 +82044,11 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1D6A8,
 	0x1D7CC,
 	0x1D7CE,
-	0x1D800,
+	0x1DA8C,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8C7,
@@ -91783,25 +82150,11 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1F250,
 	0x1F252,
 	0x1F300,
-	0x1F32D,
-	0x1F330,
-	0x1F37E,
-	0x1F380,
-	0x1F3CF,
-	0x1F3D4,
-	0x1F3F8,
-	0x1F400,
-	0x1F4FF,
-	0x1F500,
-	0x1F54B,
-	0x1F550,
 	0x1F57A,
 	0x1F57B,
 	0x1F5A4,
 	0x1F5A5,
-	0x1F643,
-	0x1F645,
-	0x1F6D0,
+	0x1F6D1,
 	0x1F6E0,
 	0x1F6ED,
 	0x1F6F0,
@@ -91820,12 +82173,20 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1F888,
 	0x1F890,
 	0x1F8AE,
+	0x1F910,
+	0x1F919,
+	0x1F980,
+	0x1F985,
+	0x1F9C0,
+	0x1F9C1,
 	0x20000,
 	0x2A6D7,
 	0x2A700,
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0001,
@@ -91840,8 +82201,8 @@ static const UV XPosixGraph_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10FFFE
 };
 
-static const UV XPosixLower_invlist[] = { /* for EBCDIC POSIX-BC */
-	1279,	/* Number of elements */
+static const UV XPosixLower_invlist[] = { /* for EBCDIC 037 */
+	1283,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -91862,13 +82223,9 @@ static const UV XPosixLower_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA1,
 	0xA2,
 	0xAA,
-	0xC0,
-	0xC1,
 	0xCB,
 	0xD0,
 	0xDB,
-	0xDD,
-	0xDE,
 	0xE0,
 	0x101,
 	0x102,
@@ -92408,6 +82765,8 @@ static const UV XPosixLower_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x530,
 	0x561,
 	0x588,
+	0x13F8,
+	0x13FE,
 	0x1D00,
 	0x1DC0,
 	0x1E01,
@@ -93050,14 +83409,18 @@ static const UV XPosixLower_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA7A8,
 	0xA7A9,
 	0xA7AA,
+	0xA7B5,
+	0xA7B6,
+	0xA7B7,
+	0xA7B8,
 	0xA7F8,
 	0xA7FB,
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
+	0xAB70,
+	0xABC0,
 	0xFB00,
 	0xFB07,
 	0xFB13,
@@ -93066,6 +83429,8 @@ static const UV XPosixLower_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xFF5B,
 	0x10428,
 	0x10450,
+	0x10CC0,
+	0x10CF3,
 	0x118C0,
 	0x118E0,
 	0x1D41A,
@@ -93126,15 +83491,15 @@ static const UV XPosixLower_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1D7CC
 };
 
-static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
-	1205,	/* Number of elements */
+static const UV XPosixPrint_invlist[] = { /* for EBCDIC 037 */
+	1231,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0x0,
 	0x40,
-	0x5F,
-	0x60,
+	0xFF,
+	0x100,
 	0x378,
 	0x37A,
 	0x380,
@@ -93181,8 +83546,8 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x85E,
 	0x85F,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x984,
 	0x985,
 	0x98D,
@@ -93268,6 +83633,8 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAE4,
 	0xAE6,
 	0xAF2,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -93347,7 +83714,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -93398,7 +83765,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD76,
@@ -93523,7 +83890,9 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1380,
 	0x139A,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1400,
 	0x169D,
 	0x16A0,
@@ -93653,11 +84022,11 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x2090,
 	0x209D,
 	0x20A0,
-	0x20BE,
+	0x20BF,
 	0x20D0,
 	0x20F1,
 	0x2100,
-	0x218A,
+	0x218C,
 	0x2190,
 	0x23FB,
 	0x2400,
@@ -93674,6 +84043,8 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x2BC9,
 	0x2BCA,
 	0x2BD2,
+	0x2BEC,
+	0x2BF0,
 	0x2C00,
 	0x2C2F,
 	0x2C30,
@@ -93739,7 +84110,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x3300,
 	0x4DB6,
 	0x4DC0,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA490,
@@ -93747,15 +84118,11 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA4D0,
 	0xA62C,
 	0xA640,
-	0xA69E,
-	0xA69F,
 	0xA6F8,
 	0xA700,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA82C,
 	0xA830,
@@ -93767,7 +84134,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA8CE,
 	0xA8DA,
 	0xA8E0,
-	0xA8FC,
+	0xA8FE,
 	0xA900,
 	0xA954,
 	0xA95F,
@@ -93799,10 +84166,8 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAB28,
 	0xAB2F,
 	0xAB30,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEE,
 	0xABF0,
 	0xABFA,
@@ -93843,8 +84208,6 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xFE00,
 	0xFE1A,
 	0xFE20,
-	0xFE2E,
-	0xFE30,
 	0xFE53,
 	0xFE54,
 	0xFE67,
@@ -93948,7 +84311,11 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1089F,
 	0x108A7,
 	0x108B0,
-	0x10900,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
+	0x108FB,
 	0x1091C,
 	0x1091F,
 	0x1093A,
@@ -93956,9 +84323,9 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10940,
 	0x10980,
 	0x109B8,
-	0x109BE,
-	0x109C0,
-	0x10A00,
+	0x109BC,
+	0x109D0,
+	0x109D2,
 	0x10A04,
 	0x10A05,
 	0x10A07,
@@ -93994,6 +84361,12 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10BB0,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
+	0x10CFA,
+	0x10D00,
 	0x10E60,
 	0x10E7F,
 	0x11000,
@@ -94013,22 +84386,30 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11150,
 	0x11177,
 	0x11180,
-	0x111C9,
-	0x111CD,
 	0x111CE,
 	0x111D0,
-	0x111DB,
+	0x111E0,
 	0x111E1,
 	0x111F5,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x1123E,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112AA,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -94048,6 +84429,8 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -94063,7 +84446,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11580,
 	0x115B6,
 	0x115B8,
-	0x115CA,
+	0x115DE,
 	0x11600,
 	0x11645,
 	0x11650,
@@ -94072,6 +84455,12 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x11740,
 	0x118A0,
 	0x118F3,
 	0x118FF,
@@ -94079,13 +84468,17 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
 	0x12470,
 	0x12475,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -94131,7 +84524,7 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1D100,
 	0x1D127,
 	0x1D129,
-	0x1D1DE,
+	0x1D1E9,
 	0x1D200,
 	0x1D246,
 	0x1D300,
@@ -94179,7 +84572,11 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1D6A8,
 	0x1D7CC,
 	0x1D7CE,
-	0x1D800,
+	0x1DA8C,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8C7,
@@ -94281,25 +84678,11 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1F250,
 	0x1F252,
 	0x1F300,
-	0x1F32D,
-	0x1F330,
-	0x1F37E,
-	0x1F380,
-	0x1F3CF,
-	0x1F3D4,
-	0x1F3F8,
-	0x1F400,
-	0x1F4FF,
-	0x1F500,
-	0x1F54B,
-	0x1F550,
 	0x1F57A,
 	0x1F57B,
 	0x1F5A4,
 	0x1F5A5,
-	0x1F643,
-	0x1F645,
-	0x1F6D0,
+	0x1F6D1,
 	0x1F6E0,
 	0x1F6ED,
 	0x1F6F0,
@@ -94318,12 +84701,20 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1F888,
 	0x1F890,
 	0x1F8AE,
+	0x1F910,
+	0x1F919,
+	0x1F980,
+	0x1F985,
+	0x1F9C0,
+	0x1F9C1,
 	0x20000,
 	0x2A6D7,
 	0x2A700,
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0001,
@@ -94338,38 +84729,42 @@ static const UV XPosixPrint_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10FFFE
 };
 
-static const UV XPosixPunct_invlist[] = { /* for EBCDIC POSIX-BC */
-	307,	/* Number of elements */
+static const UV XPosixPunct_invlist[] = { /* for EBCDIC 037 */
+	323,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
 	0x0,
-	0x4A,
+	0x4B,
 	0x51,
 	0x5A,
 	0x5F,
 	0x60,
 	0x62,
-	0x6A,
+	0x6B,
 	0x70,
-	0x7A,
+	0x79,
 	0x80,
 	0x8A,
 	0x8C,
+	0xA1,
+	0xA2,
 	0xAA,
 	0xAC,
+	0xB0,
+	0xB1,
 	0xB3,
 	0xB4,
 	0xB5,
 	0xB7,
-	0xBB,
-	0xBE,
-	0xFB,
-	0xFC,
-	0xFD,
-	0xFE,
-	0xFF,
-	0x100,
+	0xBA,
+	0xBC,
+	0xC0,
+	0xC1,
+	0xD0,
+	0xD1,
+	0xE0,
+	0xE1,
 	0x37E,
 	0x37F,
 	0x387,
@@ -94542,6 +84937,8 @@ static const UV XPosixPunct_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA8D0,
 	0xA8F8,
 	0xA8FB,
+	0xA8FC,
+	0xA8FD,
 	0xA92E,
 	0xA930,
 	0xA95F,
@@ -94627,17 +85024,25 @@ static const UV XPosixPunct_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11174,
 	0x11176,
 	0x111C5,
-	0x111C9,
+	0x111CA,
 	0x111CD,
 	0x111CE,
+	0x111DB,
+	0x111DC,
+	0x111DD,
+	0x111E0,
 	0x11238,
 	0x1123E,
+	0x112A9,
+	0x112AA,
 	0x114C6,
 	0x114C7,
 	0x115C1,
-	0x115CA,
+	0x115D8,
 	0x11641,
 	0x11644,
+	0x1173C,
+	0x1173F,
 	0x12470,
 	0x12475,
 	0x16A6E,
@@ -94649,10 +85054,12 @@ static const UV XPosixPunct_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x16B44,
 	0x16B45,
 	0x1BC9F,
-	0x1BCA0
+	0x1BCA0,
+	0x1DA87,
+	0x1DA8C
 };
 
-static const UV XPosixSpace_invlist[] = { /* for EBCDIC POSIX-BC */
+static const UV XPosixSpace_invlist[] = { /* for EBCDIC 037 */
 	23,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
@@ -94682,7 +85089,7 @@ static const UV XPosixSpace_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x3001
 };
 
-static const UV XPosixUpper_invlist[] = { /* for EBCDIC POSIX-BC */
+static const UV XPosixUpper_invlist[] = { /* for EBCDIC 037 */
 	1275,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
@@ -94702,17 +85109,11 @@ static const UV XPosixUpper_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xCA,
 	0xD1,
 	0xDA,
-	0xDD,
-	0xDE,
-	0xE0,
-	0xE1,
 	0xE2,
 	0xEA,
 	0xEB,
 	0xF0,
-	0xFC,
-	0xFD,
-	0xFE,
+	0xFB,
 	0xFF,
 	0x100,
 	0x101,
@@ -95258,6 +85659,8 @@ static const UV XPosixUpper_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10C8,
 	0x10CD,
 	0x10CE,
+	0x13A0,
+	0x13F6,
 	0x1E00,
 	0x1E01,
 	0x1E02,
@@ -95887,11 +86290,15 @@ static const UV XPosixUpper_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA7AA,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B5,
+	0xA7B6,
+	0xA7B7,
 	0xFF21,
 	0xFF3B,
 	0x10400,
 	0x10428,
+	0x10C80,
+	0x10CB3,
 	0x118A0,
 	0x118C0,
 	0x1D400,
@@ -95964,8 +86371,8 @@ static const UV XPosixUpper_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1F18A
 };
 
-static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
-	1283,	/* Number of elements */
+static const UV XPosixWord_invlist[] = { /* for EBCDIC 037 */
+	1331,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
 		   1 if it starts at the element beyond 0 */
@@ -95994,21 +86401,19 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAA,
 	0xAC,
 	0xAF,
-	0xC0,
+	0xC1,
 	0xCA,
 	0xCB,
 	0xD0,
 	0xD1,
 	0xDA,
 	0xDB,
-	0xE1,
+	0xE0,
 	0xE2,
 	0xEA,
 	0xEB,
 	0xFA,
-	0xFC,
-	0xFD,
-	0xFE,
+	0xFB,
 	0xFF,
 	0x100,
 	0x2C2,
@@ -96089,8 +86494,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x840,
 	0x85C,
 	0x8A0,
-	0x8B3,
-	0x8E4,
+	0x8B5,
+	0x8E3,
 	0x964,
 	0x966,
 	0x970,
@@ -96180,6 +86585,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAE4,
 	0xAE6,
 	0xAF0,
+	0xAF9,
+	0xAFA,
 	0xB01,
 	0xB04,
 	0xB05,
@@ -96261,7 +86668,7 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xC55,
 	0xC57,
 	0xC58,
-	0xC5A,
+	0xC5B,
 	0xC60,
 	0xC64,
 	0xC66,
@@ -96310,7 +86717,7 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xD4F,
 	0xD57,
 	0xD58,
-	0xD60,
+	0xD5F,
 	0xD64,
 	0xD66,
 	0xD70,
@@ -96455,7 +86862,9 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1380,
 	0x1390,
 	0x13A0,
-	0x13F5,
+	0x13F6,
+	0x13F8,
+	0x13FE,
 	0x1401,
 	0x166D,
 	0x166F,
@@ -96701,7 +87110,7 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x3400,
 	0x4DB6,
 	0x4E00,
-	0x9FCD,
+	0x9FD6,
 	0xA000,
 	0xA48D,
 	0xA4D0,
@@ -96715,19 +87124,15 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA674,
 	0xA67E,
 	0xA67F,
-	0xA69E,
-	0xA69F,
 	0xA6F2,
 	0xA717,
 	0xA720,
 	0xA722,
 	0xA789,
 	0xA78B,
-	0xA78F,
-	0xA790,
 	0xA7AE,
 	0xA7B0,
-	0xA7B2,
+	0xA7B8,
 	0xA7F7,
 	0xA828,
 	0xA840,
@@ -96740,6 +87145,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xA8F8,
 	0xA8FB,
 	0xA8FC,
+	0xA8FD,
+	0xA8FE,
 	0xA900,
 	0xA92E,
 	0xA930,
@@ -96781,10 +87188,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xAB30,
 	0xAB5B,
 	0xAB5C,
-	0xAB60,
-	0xAB64,
 	0xAB66,
-	0xABC0,
+	0xAB70,
 	0xABEB,
 	0xABEC,
 	0xABEE,
@@ -96829,7 +87234,7 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0xFE00,
 	0xFE10,
 	0xFE20,
-	0xFE2E,
+	0xFE30,
 	0xFE33,
 	0xFE35,
 	0xFE4D,
@@ -96924,6 +87329,10 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10877,
 	0x10880,
 	0x1089F,
+	0x108E0,
+	0x108F3,
+	0x108F4,
+	0x108F6,
 	0x10900,
 	0x10916,
 	0x10920,
@@ -96964,6 +87373,10 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x10B92,
 	0x10C00,
 	0x10C49,
+	0x10C80,
+	0x10CB3,
+	0x10CC0,
+	0x10CF3,
 	0x11000,
 	0x11047,
 	0x11066,
@@ -96984,17 +87397,31 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11177,
 	0x11180,
 	0x111C5,
+	0x111CA,
+	0x111CD,
 	0x111D0,
 	0x111DB,
+	0x111DC,
+	0x111DD,
 	0x11200,
 	0x11212,
 	0x11213,
 	0x11238,
+	0x11280,
+	0x11287,
+	0x11288,
+	0x11289,
+	0x1128A,
+	0x1128E,
+	0x1128F,
+	0x1129E,
+	0x1129F,
+	0x112A9,
 	0x112B0,
 	0x112EB,
 	0x112F0,
 	0x112FA,
-	0x11301,
+	0x11300,
 	0x11304,
 	0x11305,
 	0x1130D,
@@ -97014,6 +87441,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11349,
 	0x1134B,
 	0x1134E,
+	0x11350,
+	0x11351,
 	0x11357,
 	0x11358,
 	0x1135D,
@@ -97032,6 +87461,8 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x115B6,
 	0x115B8,
 	0x115C1,
+	0x115D8,
+	0x115DE,
 	0x11600,
 	0x11641,
 	0x11644,
@@ -97042,6 +87473,12 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x116B8,
 	0x116C0,
 	0x116CA,
+	0x11700,
+	0x1171A,
+	0x1171D,
+	0x1172C,
+	0x11730,
+	0x1173A,
 	0x118A0,
 	0x118EA,
 	0x118FF,
@@ -97049,11 +87486,15 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x11AC0,
 	0x11AF9,
 	0x12000,
-	0x12399,
+	0x1239A,
 	0x12400,
 	0x1246F,
+	0x12480,
+	0x12544,
 	0x13000,
 	0x1342F,
+	0x14400,
+	0x14647,
 	0x16800,
 	0x16A39,
 	0x16A40,
@@ -97166,6 +87607,18 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x1D7CC,
 	0x1D7CE,
 	0x1D800,
+	0x1DA00,
+	0x1DA37,
+	0x1DA3B,
+	0x1DA6D,
+	0x1DA75,
+	0x1DA76,
+	0x1DA84,
+	0x1DA85,
+	0x1DA9B,
+	0x1DAA0,
+	0x1DAA1,
+	0x1DAB0,
 	0x1E800,
 	0x1E8C5,
 	0x1E8D0,
@@ -97248,13 +87701,15 @@ static const UV XPosixWord_invlist[] = { /* for EBCDIC POSIX-BC */
 	0x2B735,
 	0x2B740,
 	0x2B81E,
+	0x2B820,
+	0x2CEA2,
 	0x2F800,
 	0x2FA1E,
 	0xE0100,
 	0xE01F0
 };
 
-static const UV XPosixXDigit_invlist[] = { /* for EBCDIC POSIX-BC */
+static const UV XPosixXDigit_invlist[] = { /* for EBCDIC 037 */
 	13,	/* Number of elements */
 	148565664, /* Version and data structure type */
 	1,	/* 0 if the list starts at 0;
@@ -97276,52 +87731,164 @@ static const UV XPosixXDigit_invlist[] = { /* for EBCDIC POSIX-BC */
 
 #endif	/* defined(PERL_IN_PERL_C) */
 
-#endif	/* EBCDIC POSIX-BC */
+#endif	/* EBCDIC 037 */
+
+#if defined(PERL_IN_REGEXEC_C)
+
+static const bool GCB_table[14][14] = {
+   /* 'edg' stands for 'EDGE' */
+/*        XX CR CN EX  L LF LV LVT PP RI SM  T  V edg */
+/* XX */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1 },
+/* CR */ { 1, 1, 1, 1, 1, 0, 1,  1, 1, 1, 1, 1, 1,  1 },
+/* CN */ { 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1 },
+/* EX */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1 },
+/* L  */ { 1, 1, 1, 0, 0, 1, 0,  0, 1, 1, 0, 1, 0,  1 },
+/* LF */ { 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  1 },
+/* LV */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 0,  1 },
+/* LVT*/ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 1,  1 },
+/* PP */ { 0, 1, 1, 0, 0, 1, 0,  0, 0, 0, 0, 0, 0,  1 },
+/* RI */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 0, 0, 1, 1,  1 },
+/* SM */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 1, 1,  1 },
+/* T  */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 1,  1 },
+/* V  */ { 1, 1, 1, 0, 1, 1, 1,  1, 1, 1, 0, 0, 0,  1 },
+/* edg*/ { 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1,  0 }
+};
+
+#define LB_NOBREAK                        0
+#define LB_BREAKABLE                      1
+#define LB_NOBREAK_EVEN_WITH_SP_BETWEEN   2
+#define LB_CM_foo                         3
+#define LB_SP_foo                         6
+#define LB_PR_or_PO_then_OP_or_HY         9
+#define LB_SY_or_IS_then_various         11
+#define LB_HY_or_BA_then_foo             13
+#define LB_various_then_PO_or_PR         16
+
+static const U8 LB_table[36][36] = {
+   /* 'edg' stands for 'EDGE' */
+/*        AL BA BB B2 SY CR CP CL CM CB EX GL H2 H3 HL HY ID IS IN JL JT JV LF BK NL NS NU OP PO PR QU RI SP WJ ZW edg */
+/* AL */ { 0, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 0, 0, 1, 2, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0,  1 },
+/* BA */ {14, 0,14,14, 2, 0, 2, 2, 0, 1, 2,14,14,14,14, 0,14, 2,14,14,14,14, 0, 0, 0, 0,14,14,14,14, 0,14, 0, 0, 0,  1 },
+/* BB */ { 0, 0, 0, 0, 2, 0, 2, 2, 0, 1, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  1 },
+/* B2 */ { 1, 0, 1, 2, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0,  1 },
+/* SY */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 0, 0, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0,12, 1,17,17, 0, 1, 0, 0, 0,  1 },
+/* CR */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1 },
+/* CP */ { 0, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 0, 0, 1, 2, 1, 1, 1, 1, 0, 0, 0, 2, 0, 1,17,17, 0, 1, 0, 0, 0,  1 },
+/* CL */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 2, 1, 1, 1, 1, 0, 0, 0, 2, 1, 1,17,17, 0, 1, 0, 0, 0,  1 },
+/* CM */ { 3, 3, 3, 3, 3, 0, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0, 3, 0,  1 },
+/* CB */ { 1, 1, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0,  1 },
+/* EX */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 2, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0,  1 },
+/* GL */ { 0, 0, 0, 0, 2, 0, 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  1 },
+/* H2 */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 2, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0,  1 },
+/* H3 */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 2, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0,  1 },
+/* HL */ { 0, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 0, 0, 1, 2, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0,  1 },
+/* HY */ {14, 0,14,14, 2, 0, 2, 2, 0, 1, 2,14,14,14,14, 0,14, 2,14,14,14,14, 0, 0, 0, 0,13,14,14,14, 0,14, 0, 0, 0,  1 },
+/* ID */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 2, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0,  1 },
+/* IS */ { 0, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 0, 0, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0,12, 1,17,17, 0, 1, 0, 0, 0,  1 },
+/* IN */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 2, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0,  1 },
+/* JL */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 0, 0, 1, 0, 1, 2, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0,  1 },
+/* JT */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 2, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0,  1 },
+/* JV */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 2, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 0,  1 },
+/* LF */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1 },
+/* BK */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1 },
+/* NL */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1 },
+/* NS */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0,  1 },
+/* NU */ { 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 2, 0, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  1 },
+/* OP */ { 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0, 2, 0,  1 },
+/* PO */ { 0, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 0, 0, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0,10, 1, 1, 0, 1, 0, 0, 0,  1 },
+/* PR */ { 0, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0,10, 1, 1, 0, 1, 0, 0, 0,  1 },
+/* QU */ { 0, 0, 0, 0, 2, 0, 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,  1 },
+/* RI */ { 1, 0, 1, 1, 2, 0, 2, 2, 0, 1, 2, 0, 1, 1, 1, 0, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0,  1 },
+/* SP */ { 7, 7, 7, 7, 8, 0, 8, 8, 7, 7, 8, 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 7, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 0, 8, 0,  1 },
+/* WJ */ { 0, 0, 0, 0, 2, 0, 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  1 },
+/* ZW */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0,  1 },
+/* edg*/ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0 }
+};
+
+#define WB_NOBREAK                        0
+#define WB_BREAKABLE                      1
+#define WB_hs_then_hs                     2
+#define WB_Ex_or_FO_then_foo              3
+#define WB_DQ_then_HL                     4
+#define WB_HL_then_DQ                     6
+#define WB_LE_or_HL_then_MB_or_ML_or_SQ   8
+#define WB_MB_or_ML_or_SQ_then_LE_or_HL  10
+#define WB_MB_or_MN_or_SQ_then_NU        12
+#define WB_NU_then_MB_or_MN_or_SQ        14
+
+static const U8 WB_table[19][19] = {
+   /* 'Ext' stands for 'Extend'; 'edg' stands for 'EDGE'; 'hs' stands
+    * for 'Perl_Tailored_HSpace'; 'unk' stands for 'UNKNOWN' */
+/*        XX LE CR DQ Ext EX FO HL KA LF ML MN MB NL NU hs RI SQ edg */
+/* XX */ { 1, 1, 1, 1,  0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1 },
+/* LE */ { 1, 0, 1, 1,  0, 0, 0, 0, 1, 1, 9, 1, 9, 1, 0, 1, 1, 9,  1 },
+/* CR */ { 1, 1, 0, 1,  1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1,  1 },
+/* DQ */ { 1, 1, 1, 1,  0, 1, 0, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1 },
+/* Ext*/ { 3, 3, 1, 3,  0, 3, 0, 3, 3, 1, 3, 3, 3, 1, 3, 1, 3, 3,  1 },
+/* EX */ { 1, 0, 1, 1,  0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1,  1 },
+/* FO */ { 3, 3, 1, 3,  0, 3, 0, 3, 3, 1, 3, 3, 3, 1, 3, 1, 3, 3,  1 },
+/* HL */ { 1, 0, 1, 7,  0, 0, 0, 0, 1, 1, 9, 1, 9, 1, 0, 1, 1, 8,  1 },
+/* KA */ { 1, 1, 1, 1,  0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1 },
+/* LF */ { 1, 1, 0, 1,  1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1,  1 },
+/* ML */ { 1,11, 1, 1,  0, 1, 0,11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1 },
+/* MN */ { 1, 1, 1, 1,  0, 1, 0, 1, 1, 1, 1, 1, 1, 1,13, 1, 1, 1,  1 },
+/* MB */ { 1,11, 1, 1,  0, 1, 0,11, 1, 1, 1, 1, 1, 1,13, 1, 1, 1,  1 },
+/* NL */ { 1, 1, 0, 1,  1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1,  1 },
+/* NU */ { 1, 0, 1, 1,  0, 0, 0, 0, 1, 1, 1,15,15, 1, 0, 1, 1,15,  1 },
+/* hs */ { 1, 1, 0, 1,  0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 2, 1, 1,  1 },
+/* RI */ { 1, 1, 1, 1,  0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1,  1 },
+/* SQ */ { 1,11, 1, 1,  0, 1, 0,11, 1, 1, 1, 1, 1, 1,13, 1, 1, 1,  1 },
+/* edg*/ { 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0 }
+};
+
+#endif	/* defined(PERL_IN_REGEXEC_C) */
 
 /* Generated from:
- * 083180df694deb1fc173361406c1a75619fb8376403db3a76dc585c1e3951eca lib/Unicode/UCD.pm
- * 827aa7ee45ca9fe09f3e0969a5a27a69ce58a6c7134548125266210018d27b49 lib/unicore/ArabicShaping.txt
- * 3748fbbe9d280a9da700bfd0c28beaaf6f32a67ec263a124fcb0a4095a30fae5 lib/unicore/BidiBrackets.txt
- * 3925329c2432fa7248b2e180cddcedb9a4f9eafbbb10ab9e105eaf833043b2fb lib/unicore/BidiMirroring.txt
- * 7f5a1b4a346c6cdbe948d3baf50fc31fff29c26bcd4ad422dc1fbcc1c23b0bde lib/unicore/Blocks.txt
- * 82f3cc8217455f22d294d7df767a62906baf31456ea8902336ae7fee943a2538 lib/unicore/CaseFolding.txt
- * 8be553529f7dd22e3e0ffa25eb3f1743f5243bbfe868559be73bf3a163c21913 lib/unicore/CompositionExclusions.txt
- * ab64278818411762311b9d5974438ac5cf14e98c79b44a6373022f0780de38a7 lib/unicore/DAge.txt
- * f2ff892add5e6624cee8300c297373216df7f1a596c6e74510afe5e8b96c8d91 lib/unicore/DCoreProperties.txt
- * 656aa2c6996a049e84c6d38676bc73c3245c808869d64073b812690ae475d534 lib/unicore/DNormalizationProps.txt
- * e064b066e555cbace95951fcba9b5336a4d04c88c5949a1ff7615190eaa67682 lib/unicore/EastAsianWidth.txt
- * 2aa574984e9cea6980eddd6e36044168d543b7f0449266fa3248aca28790cf06 lib/unicore/HangulSyllableType.txt
- * e7122c4d4d598854b5fbefeb2b1ee9f05aef6a8d6e718b5f56c2a8ea31145f12 lib/unicore/IndicMatraCategory.txt
- * 478ca00ea86b47209f0b27eb3959ad83cb2b76f5159213d242390d07d5af2b8d lib/unicore/IndicSyllabicCategory.txt
- * 0aa8af5cbb4d0570b1006aefffc021c6ef637dffb15572a5a85e7f7e7778fe22 lib/unicore/Jamo.txt
- * 3b359eeff325f7e773ea9d5feb8af053b94c579844f0db7ce648f418c9d136d8 lib/unicore/LineBreak.txt
- * af85d961d0ed6055271ca6e0174451a8dc1822e31de9e07e1246535318b9341a lib/unicore/NameAliases.txt
- * 1c379b9c1b0f6cd14208b766f74fc92ff5a9528aee66083db307f1fc9a615729 lib/unicore/NamedSequences.txt
- * 0df343d93293f14e9ff0b0a721d8b8e6c23c86dbad7be18d362d6bf1281590d9 lib/unicore/PropList.txt
- * 6c14f474761b8db46f95cf2d1e235ce40abf3382226c5b1a2210df83775fe6fa lib/unicore/PropValueAliases.txt
- * 3f3dd77644faa905ce02de7c0e3167fdc4afdf94748f074192bd70821c8341ea lib/unicore/PropertyAliases.txt
- * 2767531dec8c525a317ab488b95eed73461fe9c6fbb8088594f3886964724475 lib/unicore/ScriptExtensions.txt
- * a638f9f0eb3c521ed6c7755fce93c04bf6e4ba89f23ac3d1bd4c4e486c400118 lib/unicore/Scripts.txt
- * 35496d45fc8babd8deb866491ea82ff7b3d2d49ad4c9c656685cd14833101e25 lib/unicore/SpecialCasing.txt
- * bfa3da58ea982199829e1107ac5a9a544b83100470a2d0cc28fb50ec234cb840 lib/unicore/UnicodeData.txt
- * 916289f471c4a337fb1e0715985a11e6bc8bb205736e84164849d601d265d9e0 lib/unicore/auxiliary/GCBTest.txt
- * 3d7ffae56e506d595f3e0e5d36978bc6721d53470e5ca9666ad7cdfc4a46cb3d lib/unicore/auxiliary/GraphemeBreakProperty.txt
- * 370ddf3ba9b337819cf21795c2bd7cda578ac5ff4700d1a3ac923e8be988b57e lib/unicore/auxiliary/SBTest.txt
- * 28356f6912113a9fe8244d9396e9786115dbc10b3ffb5e31b08969122e91d3f3 lib/unicore/auxiliary/SentenceBreakProperty.txt
- * 3f56d3ccfc35c6dac44d143a4d6087af4e4ee9f1bdbae482c12f6149b60dec3b lib/unicore/auxiliary/WBTest.txt
- * 82f7304030e6866ef8e02cdfb0485c52c18a661282bfce9c259cc6300abd79ad lib/unicore/auxiliary/WordBreakProperty.txt
- * b88801b4a469207892a0401697c6b1c5fd64042ae0ef867f4ad0ec04942b415c lib/unicore/extracted/DBidiClass.txt
- * 074d33ea6c7349eab840d690369dffb3568e2f7b039552b7c10480274d321545 lib/unicore/extracted/DBinaryProperties.txt
- * 8ad457aef3525aedce823b9177dad33e0088df536dff11e3df405ecefc92ba08 lib/unicore/extracted/DCombiningClass.txt
- * 59ec46c1e30458ffff50d41196fd45e3bbaf3172a8111117af1b930199be2d96 lib/unicore/extracted/DDecompositionType.txt
- * cf7c07557ae915a7508c6c7fc8c2e8c900782364ec62e8a5d2813f3b97449ee0 lib/unicore/extracted/DEastAsianWidth.txt
- * 56a5b47331a7ec784e848bcaae1ddc08cbf72aab583ca82dcc98ecf2851a3d43 lib/unicore/extracted/DGeneralCategory.txt
- * c14e83161e56eb15d78b1589352d6c0bd8feb7889a5d17f70a2ebb2a43cab86d lib/unicore/extracted/DJoinGroup.txt
- * 8c9405c54d8b1dd3fe2f2d691b30c0816ca15481995152ed07fc9b844dfd0ad4 lib/unicore/extracted/DJoinType.txt
- * a9791f08281d7b0a417e4ad882cf64463f6815db8156932acd85228ac717fd94 lib/unicore/extracted/DLineBreak.txt
- * a17a0330e57d774343a53c019f1bc69827c2676982a1bf48e0898a76710e8877 lib/unicore/extracted/DNumType.txt
- * c2cb810a67cc5fb4a8d236b6c1bc6dd4d89733d8603881997e8aae2c816a3db1 lib/unicore/extracted/DNumValues.txt
- * 808d76136d9952faf581347e9bc040dbab5158f143f243a6de455a4af39b7401 lib/unicore/mktables
- * 746472de66b936ac885ca6d6e68058242b4e909e3260c6317f3ec719f78f76cc lib/unicore/version
- * 4360c31f23eb368e0f3bfd045a44d3bc37ff0889e216f686ebea02543ac188d9 regen/mk_invlists.pl
+ * cb3170dd603ad12ba0299440e99e8f50a8afde60ade2ffcbf1ff4a8a53854b90 lib/Unicode/UCD.pm
+ * ae98bec7e4f0564758eed81eca5015481ba32581f8a735a825b71b3bba714450 lib/unicore/ArabicShaping.txt
+ * 1687fe5994eb7e5c0dab8503fc2a1b3b479d91af9d3b8055941c9bd791f7d0b5 lib/unicore/BidiBrackets.txt
+ * 350d1302116194b0b21def287434b55c5088098fbc726e879f7420a391965643 lib/unicore/BidiMirroring.txt
+ * 288fc7b85c76bda296e296c8465f1f4baeb456cb814430dfaa0f546bfbe86b4a lib/unicore/Blocks.txt
+ * 86e075f2ede997b3fa5965516c75190b5a88bb82d302272d9c3179b7a57af03f lib/unicore/CaseFolding.txt
+ * 2fafee5be73bf2817ee669c53c504a6c4aa02ac7344194af18511aea2e05d750 lib/unicore/CompositionExclusions.txt
+ * 302f6d6171dc9c6165db86d0226b7923a64cea06c493d339d35436bf137606a3 lib/unicore/DAge.txt
+ * ff666dece87dfdbdbf04a2e26a0bfb52c4ba98db1f8965b0b01ddb9e15f97476 lib/unicore/DCoreProperties.txt
+ * 6cc76100d402d7dd12bd769ac61158b91e71aad58c8333abb848f1b9c9fdde2d lib/unicore/DNormalizationProps.txt
+ * ccc571829b384b8a2c24b7a62f8aa6a891a6e8c48f08513ef84fd6da26dba4bb lib/unicore/EastAsianWidth.txt
+ * 2320db06cf88c755ec7b9cfec96dd9e1d774173521dbc3ee7985377c2ab90d32 lib/unicore/HangulSyllableType.txt
+ * e52216b5fdb04910e06e94f01cabdf70656b0077c92b756c7b38822626d572f2 lib/unicore/IndicPositionalCategory.txt
+ * 4db71a39102e173095cb8bda8b4c35e78fe6b365e443c584b19f081d8c4894fc lib/unicore/IndicSyllabicCategory.txt
+ * eeb30346bb545bb45ff16486d9234397bfe1a195bb12b54fc1d9f48f87e8aa5e lib/unicore/Jamo.txt
+ * 13e2b7087bcca3163272e64e34e480534bd2f8353a0245c26e6642566f59a60d lib/unicore/LineBreak.txt
+ * 9bb54cd7b5509779f269fa60341bcbfca8da8f17d3c4999e44a5a51671d3c402 lib/unicore/NameAliases.txt
+ * e4c29d9ceefbe2382af819ac7646265a9e4ea599ce04a90d31bec97cfaa2848f lib/unicore/NamedSequences.txt
+ * 70d40297f1bf91397fbdab5a770c12100733e67c5c3398446c5e950715d5e535 lib/unicore/PropList.txt
+ * 03a440f2a4b9151043a6bb53d4a4e528b73238079f9d686dc2a5846e6895588a lib/unicore/PropValueAliases.txt
+ * 8e8b48c2080d31aa6713f5535aad94a1f7bc9a65cc52563724e5e69b0a3b4196 lib/unicore/PropertyAliases.txt
+ * 45d42b1ecbac2263c1c63c95104e63ea64313eb99be94542e040aea11c449f6c lib/unicore/ScriptExtensions.txt
+ * 79fbd73ad82c30fdb67d36a349d12667bd58d3e9da6a8ce7dd26383b637ba85f lib/unicore/Scripts.txt
+ * fb2025dae3b9b17649b6e379c1cdbddf50641267ca6d2446caeccf4a141fe167 lib/unicore/SpecialCasing.txt
+ * 38b17e1118206489a7e0ab5d29d7932212d38838df7d3ec025ecb58e8798ec20 lib/unicore/UnicodeData.txt
+ * 0cedd6e0f5cadf57ce9cfc96beccfd083b0faa0809a631a777cd25f0316bfabb lib/unicore/auxiliary/GCBTest.txt
+ * 230005412f9a47128e37bc52330766aaa0b5522a53737a89cff66e891e14527a lib/unicore/auxiliary/GraphemeBreakProperty.txt
+ * 149b14ab93b06c887a958fb16d0ad01193063ef69cc14f10338ae4d0accd6c28 lib/unicore/auxiliary/LBTest.txt
+ * 41bf82452d71ce15eda8c9bb1bb0c20b72205acaaf503e3cb84734ed8e85d33a lib/unicore/auxiliary/SBTest.txt
+ * d3b45cdb0a73eeb9d25158336583dfc1e6f64da59537acb0008988b40e6b3b63 lib/unicore/auxiliary/SentenceBreakProperty.txt
+ * a661f42a54f7cc4dded72a61c508be2b482f912d4b6cf140335010f0c684dbb9 lib/unicore/auxiliary/WBTest.txt
+ * c255bd2e1f163373510679bf4b272eee97b635bfce2a6550d6c10fe5c917f01a lib/unicore/auxiliary/WordBreakProperty.txt
+ * 16dac6f1c164a4f52741b71221a8aafb6acb52cd8a436af139da6e93d86efdfb lib/unicore/extracted/DBidiClass.txt
+ * c4e78efc041668548117f7462af03b28dfbb2caca5d46a1ae78ae0ce0bb26c4a lib/unicore/extracted/DBinaryProperties.txt
+ * 5886bb44aae8f2821663f742793cb91d4ed0923c6840f3bfb73530e37030abf8 lib/unicore/extracted/DCombiningClass.txt
+ * 9edba3785ed0e6e46e10f67e2dd0ec3cb0799b7f75f526fe918429576060352e lib/unicore/extracted/DDecompositionType.txt
+ * b774387f79b27ae4268ae89450f971408dc9bbbb523426482ab4375c962bd922 lib/unicore/extracted/DEastAsianWidth.txt
+ * ba4207d2464077e807b20caf063041142afc0a8a38c328c5c23b3417c9f2da33 lib/unicore/extracted/DGeneralCategory.txt
+ * 29fdd151266595eb1b37715937afe0727bb632a2bc1130f0d2314040175df82e lib/unicore/extracted/DJoinGroup.txt
+ * 7725fe247da06986e43e89fd316b8b22a0619546d0c1ed499a94b25e9164c150 lib/unicore/extracted/DJoinType.txt
+ * 1a0687fb9c6c4567e853913549df0944fe40821279a3e9cdaa6ab8679bc286fd lib/unicore/extracted/DLineBreak.txt
+ * 40bcfed3ca727c19e1331f6c33806231d5f7eeeabd2e6a9e06a3740c85d0c250 lib/unicore/extracted/DNumType.txt
+ * a18d502bad39d527ac5586d7bc93e29f565859e3bcc24ada627eff606d6f5fed lib/unicore/extracted/DNumValues.txt
+ * 285aef7ed2bf69724b1fa9bba177640636f666e1a5dd0ba5e538d4790129bbfe lib/unicore/mktables
+ * 462c9aaa608fb2014cd9649af1c5c009485c60b9c8b15b89401fdc10cf6161c6 lib/unicore/version
+ * 913d2f93f3cb6cdf1664db888bf840bc4eb074eef824e082fceda24a9445e60c regen/charset_translations.pl
+ * 12bd58cb9d5a99f631ca95e269f7f9c90dacaf81020efa5d95a995f3cdc19200 regen/mk_invlists.pl
  * ex: set ro: */
diff --git a/Master/tlpkg/tlperl/lib/CORE/config.h b/Master/tlpkg/tlperl/lib/CORE/config.h
index ba6573ac7b8..6e242f71fa1 100644
--- a/Master/tlpkg/tlperl/lib/CORE/config.h
+++ b/Master/tlpkg/tlperl/lib/CORE/config.h
@@ -9,7 +9,7 @@
 
 /* Package name      : perl5
  * Source directory  : 
- * Configuration time: Sun Mar 13 16:28:51 2016
+ * Configuration time: Tue Apr 11 15:40:25 2017
  * Configured by     : siepo
  * Target system     : 
  */
@@ -850,6 +850,12 @@
  */
 /*#define I_VFORK	/ **/
 
+/* STDCHAR:
+ *	This symbol is defined to be the type of char used in stdio.h.
+ *	It has the values "unsigned char" or "char".
+ */
+#define STDCHAR char	/**/
+
 /* CAN_VAPROTO:
  *	This variable is defined on systems supporting prototype declaration
  *	of functions with a variable number of arguments.
@@ -872,18 +878,21 @@
 #define	_V(args) ()
 #endif
 
-/* OSNAME:
- *	This symbol contains the name of the operating system, as determined
- *	by Configure.  You shouldn't rely on it too much; the specific
- *	feature tests from Configure are generally more reliable.
+/* INTSIZE:
+ *	This symbol contains the value of sizeof(int) so that the C
+ *	preprocessor can make decisions based on it.
  */
-/* OSVERS:
- *	This symbol contains the version of the operating system, as determined
- *	by Configure.  You shouldn't rely on it too much; the specific
- *	feature tests from Configure are generally more reliable.
+/* LONGSIZE:
+ *	This symbol contains the value of sizeof(long) so that the C
+ *	preprocessor can make decisions based on it.
  */
-#define OSNAME "MSWin32"		/**/
-#define OSVERS "6.1"		/**/
+/* SHORTSIZE:
+ *	This symbol contains the value of sizeof(short) so that the C
+ *	preprocessor can make decisions based on it.
+ */
+#define INTSIZE 4		/**/
+#define LONGSIZE 4		/**/
+#define SHORTSIZE 2		/**/
 
 /* MULTIARCH:
  *	This symbol, if defined, signifies that the build
@@ -894,69 +903,55 @@
  */
 /*#define MULTIARCH		/ **/
 
-/* MEM_ALIGNBYTES:
- *	This symbol contains the number of bytes required to align a
- *	double, or a long double when applicable. Usual values are 2,
- *	4 and 8. The default is eight, for safety.  For cross-compiling
- *  	or multiarch support, Configure will set a minimum of 8.
+/* HAS_QUAD:
+ *	This symbol, if defined, tells that there's a 64-bit integer type,
+ *	Quad_t, and its unsigned counterpart, Uquad_t. QUADKIND will be one
+ *	of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, QUAD_IS_INT64_T,
+ *	or QUAD_IS___INT64.
  */
-#define MEM_ALIGNBYTES 8
+#define HAS_QUAD	/**/
+#ifdef HAS_QUAD
+#   define Quad_t long long	/**/
+#   define Uquad_t unsigned long long	/**/
+#   define QUADKIND 3	/**/
+#   define QUAD_IS_INT	1
+#   define QUAD_IS_LONG	2
+#   define QUAD_IS_LONG_LONG	3
+#   define QUAD_IS_INT64_T	4
+#   define QUAD_IS___INT64	5
+#endif
 
-/* ARCHLIB:
- *	This variable, if defined, holds the name of the directory in
- *	which the user wants to put architecture-dependent public
- *	library files for perl5.  It is most often a local directory
- *	such as /usr/local/lib.  Programs using this variable must be
- *	prepared to deal with filename expansion.  If ARCHLIB is the
- *	same as PRIVLIB, it is not defined, since presumably the
- *	program already searches PRIVLIB.
- */
-/* ARCHLIB_EXP:
- *	This symbol contains the ~name expanded version of ARCHLIB, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
+/* HAS_ACCESSX:
+ *	This symbol, if defined, indicates that the accessx routine is
+ *	available to do extended access checks.
  */
-#define ARCHLIB "c:\\tlperl\\lib"		/**/
-/*#define ARCHLIB_EXP ""	/ **/
+/*#define HAS_ACCESSX		/ **/
 
-/* ARCHNAME:
- *	This symbol holds a string representing the architecture name.
- *	It may be used to construct an architecture-dependant pathname
- *	where library files may be held under a private library, for
- *	instance.
+/* HAS_EACCESS:
+ *	This symbol, if defined, indicates that the eaccess routine is
+ *	available to do extended access checks.
  */
-#define ARCHNAME "MSWin32-x86-multi-thread"		/**/
+/*#define HAS_EACCESS		/ **/
 
-/* BIN:
- *	This symbol holds the path of the bin directory where the package will
- *	be installed. Program must be prepared to deal with ~name substitution.
- */
-/* BIN_EXP:
- *	This symbol is the filename expanded version of the BIN symbol, for
- *	programs that do not want to deal with that at run-time.
- */
-/* PERL_RELOCATABLE_INC:
- *	This symbol, if defined, indicates that we'd like to relocate entries
- *	in @INC at run time based on the location of the perl binary.
+/* I_SYS_ACCESS:
+ *     This symbol, if defined, indicates to the C program that it should
+ *     include <sys/access.h>.
  */
-#define BIN "c:\\tlperl\\bin"	/**/
-#define BIN_EXP "c:\\tlperl\\bin"	/**/
-#define PERL_RELOCATABLE_INC "undef" 		/**/
+/*#define   I_SYS_ACCESS                / **/
 
-/* INTSIZE:
- *	This symbol contains the value of sizeof(int) so that the C
- *	preprocessor can make decisions based on it.
- */
-/* LONGSIZE:
- *	This symbol contains the value of sizeof(long) so that the C
- *	preprocessor can make decisions based on it.
+/* I_SYS_SECURITY:
+ *     This symbol, if defined, indicates to the C program that it should
+ *     include <sys/security.h>.
  */
-/* SHORTSIZE:
- *	This symbol contains the value of sizeof(short) so that the C
- *	preprocessor can make decisions based on it.
+/*#define   I_SYS_SECURITY	/ **/
+
+/* MEM_ALIGNBYTES:
+ *	This symbol contains the number of bytes required to align a
+ *	double, or a long double when applicable. Usual values are 2,
+ *	4 and 8. The default is eight, for safety.  For cross-compiling
+ *  	or multiarch support, Configure will set a minimum of 8.
  */
-#define INTSIZE 4		/**/
-#define LONGSIZE 4		/**/
-#define SHORTSIZE 2		/**/
+#define MEM_ALIGNBYTES 8
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
@@ -995,6 +990,556 @@
  */
 #define CHARBITS 8		/**/
 
+/* CASTI32:
+ *	This symbol is defined if the C compiler can cast negative
+ *	or large floating point numbers to 32-bit ints.
+ */
+#define	CASTI32		/**/
+
+/* CASTNEGFLOAT:
+ *	This symbol is defined if the C compiler can cast negative
+ *	numbers to unsigned longs, ints and shorts.
+ */
+/* CASTFLAGS:
+ *	This symbol contains flags that say what difficulties the compiler
+ *	has casting odd floating values to unsigned long:
+ *		0 = ok
+ *		1 = couldn't cast < 0
+ *		2 = couldn't cast >= 0x80000000
+ *		4 = couldn't cast in argument expression list
+ */
+#define	CASTNEGFLOAT		/**/
+#define CASTFLAGS 0		/**/
+
+/* VOID_CLOSEDIR:
+ *	This symbol, if defined, indicates that the closedir() routine
+ *	does not return a value.
+ */
+/*#define VOID_CLOSEDIR		/ **/
+
+/* HAS_FD_SET:
+ *	This symbol, when defined, indicates presence of the fd_set typedef
+ *	in <sys/types.h>
+ */
+#define HAS_FD_SET	/**/
+
+/* Gconvert:
+ *	This preprocessor macro is defined to convert a floating point
+ *	number to a string without a trailing decimal point.  This
+ *	emulates the behavior of sprintf("%g"), but is sometimes much more
+ *	efficient.  If gconvert() is not available, but gcvt() drops the
+ *	trailing decimal point, then gcvt() is used.  If all else fails,
+ *	a macro using sprintf("%g") is used. Arguments for the Gconvert
+ *	macro are: value, number of digits, whether trailing zeros should
+ *	be retained, and the output buffer.
+ *	The usual values are:
+ *		d_Gconvert='gconvert((x),(n),(t),(b))'
+ *		d_Gconvert='gcvt((x),(n),(b))'
+ *		d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+ *	The last two assume trailing zeros should not be kept.
+ */
+#define Gconvert(x,n,t,b) sprintf((b),"%.*g",(n),(x))
+
+/* HAS_GETPAGESIZE:
+ *	This symbol, if defined, indicates that the getpagesize system call
+ *	is available to get system page size, which is the granularity of
+ *	many memory management calls.
+ */
+/*#define HAS_GETPAGESIZE		/ **/
+
+/* HAS_GNULIBC:
+ *	This symbol, if defined, indicates to the C program that
+ *	the GNU C library is being used.  A better check is to use
+ *	the __GLIBC__ and __GLIBC_MINOR__ symbols supplied with glibc.
+ */
+/*#define HAS_GNULIBC  	/ **/
+#if defined(HAS_GNULIBC) && !defined(_GNU_SOURCE)
+#   define _GNU_SOURCE
+#endif
+
+/* HAS_ISASCII:
+ *	This manifest constant lets the C program know that isascii
+ *	is available.
+ */
+#define HAS_ISASCII		/**/
+
+/* HAS_LCHOWN:
+ *	This symbol, if defined, indicates that the lchown routine is
+ *	available to operate on a symbolic link (instead of following the
+ *	link).
+ */
+/*#define HAS_LCHOWN		/ **/
+
+/* HAS_OPEN3:
+ *	This manifest constant lets the C program know that the three
+ *	argument form of open(2) is available.
+ */
+/*#define HAS_OPEN3		/ **/
+
+/* HAS_SAFE_BCOPY:
+ *	This symbol, if defined, indicates that the bcopy routine is available
+ *	to copy potentially overlapping memory blocks. Normally, you should
+ *	probably use memmove() or memcpy(). If neither is defined, roll your
+ *	own version.
+ */
+/*#define HAS_SAFE_BCOPY	/ **/
+
+/* HAS_SAFE_MEMCPY:
+ *	This symbol, if defined, indicates that the memcpy routine is available
+ *	to copy potentially overlapping memory blocks.  If you need to
+ *	copy overlapping memory blocks, you should check HAS_MEMMOVE and
+ *	use memmove() instead, if available.
+ */
+/*#define HAS_SAFE_MEMCPY	/ **/
+
+/* HAS_SANE_MEMCMP:
+ *	This symbol, if defined, indicates that the memcmp routine is available
+ *	and can be used to compare relative magnitudes of chars with their high
+ *	bits set.  If it is not defined, roll your own version.
+ */
+#define HAS_SANE_MEMCMP	/**/
+
+/* HAS_SIGACTION:
+ *	This symbol, if defined, indicates that Vr4's sigaction() routine
+ *	is available.
+ */
+/*#define HAS_SIGACTION	/ **/
+
+/* HAS_SIGINFO_SI_ERRNO:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_errno member
+ */
+/* HAS_SIGINFO_SI_PID:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_pid member
+ */
+/* HAS_SIGINFO_SI_UID:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_uid member
+ */
+/* HAS_SIGINFO_SI_ADDR:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_addr member
+ */
+/* HAS_SIGINFO_SI_STATUS:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_status member
+ */
+/* HAS_SIGINFO_SI_BAND:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_band member
+ */
+/* HAS_SIGINFO_SI_VALUE:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_value member
+ */
+/*#define	HAS_SIGINFO_SI_ERRNO	/ **/
+/*#define	HAS_SIGINFO_SI_PID	/ **/
+/*#define	HAS_SIGINFO_SI_UID	/ **/
+/*#define	HAS_SIGINFO_SI_ADDR	/ **/
+/*#define	HAS_SIGINFO_SI_STATUS	/ **/
+/*#define	HAS_SIGINFO_SI_BAND	/ **/
+/*#define	HAS_SIGINFO_SI_VALUE	/ **/
+
+/* HAS_SIGSETJMP:
+ *	This variable indicates to the C program that the sigsetjmp()
+ *	routine is available to save the calling process's registers
+ *	and stack environment for later use by siglongjmp(), and
+ *	to optionally save the process's signal mask.  See
+ *	Sigjmp_buf, Sigsetjmp, and Siglongjmp.
+ */
+/* Sigjmp_buf:
+ *	This is the buffer type to be used with Sigsetjmp and Siglongjmp.
+ */
+/* Sigsetjmp:
+ *	This macro is used in the same way as sigsetjmp(), but will invoke
+ *	traditional setjmp() if sigsetjmp isn't available.
+ *	See HAS_SIGSETJMP.
+ */
+/* Siglongjmp:
+ *	This macro is used in the same way as siglongjmp(), but will invoke
+ *	traditional longjmp() if siglongjmp isn't available.
+ *	See HAS_SIGSETJMP.
+ */
+/*#define HAS_SIGSETJMP	/ **/
+#ifdef HAS_SIGSETJMP
+#define Sigjmp_buf sigjmp_buf
+#define Sigsetjmp(buf,save_mask) sigsetjmp((buf),(save_mask))
+#define Siglongjmp(buf,retval) siglongjmp((buf),(retval))
+#else
+#define Sigjmp_buf jmp_buf
+#define Sigsetjmp(buf,save_mask) setjmp((buf))
+#define Siglongjmp(buf,retval) longjmp((buf),(retval))
+#endif
+
+/* HAS_STATIC_INLINE:
+ *	This symbol, if defined, indicates that the C compiler supports
+ *	C99-style static inline.  That is, the function can't be called
+ *	from another translation unit.
+ */
+/* PERL_STATIC_INLINE:
+ *	This symbol gives the best-guess incantation to use for static
+ *	inline functions.  If HAS_STATIC_INLINE is defined, this will
+ *	give C99-style inline.  If HAS_STATIC_INLINE is not defined,
+ *	this will give a plain 'static'.  It will always be defined
+ *	to something that gives static linkage.
+ *	Possibilities include
+ *		static inline       (c99)
+ *		static __inline__   (gcc -ansi)
+ *		static __inline     (MSVC)
+ *		static _inline      (older MSVC)
+ *		static              (c89 compilers)
+ */
+#define HAS_STATIC_INLINE				/**/
+#define PERL_STATIC_INLINE static __inline__	/**/
+
+/* USE_STDIO_PTR:
+ *	This symbol is defined if the _ptr and _cnt fields (or similar)
+ *	of the stdio FILE structure can be used to access the stdio buffer
+ *	for a file handle.  If this is defined, then the FILE_ptr(fp)
+ *	and FILE_cnt(fp) macros will also be defined and should be used
+ *	to access these fields.
+ */
+/* FILE_ptr:
+ *	This macro is used to access the _ptr field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_PTR is defined.
+ */
+/* STDIO_PTR_LVALUE:
+ *	This symbol is defined if the FILE_ptr macro can be used as an
+ *	lvalue.
+ */
+/* FILE_cnt:
+ *	This macro is used to access the _cnt field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_PTR is defined.
+ */
+/* STDIO_CNT_LVALUE:
+ *	This symbol is defined if the FILE_cnt macro can be used as an
+ *	lvalue.
+ */
+/* STDIO_PTR_LVAL_SETS_CNT:
+ *	This symbol is defined if using the FILE_ptr macro as an lvalue
+ *	to increase the pointer by n has the side effect of decreasing the
+ *	value of File_cnt(fp) by n.
+ */
+/* STDIO_PTR_LVAL_NOCHANGE_CNT:
+ *	This symbol is defined if using the FILE_ptr macro as an lvalue
+ *	to increase the pointer by n leaves File_cnt(fp) unchanged.
+ */
+#define USE_STDIO_PTR 	/**/
+#ifdef USE_STDIO_PTR
+#define FILE_ptr(fp)	((fp)->_ptr)
+#define STDIO_PTR_LVALUE 		/**/
+#define FILE_cnt(fp)	((fp)->_cnt)
+#define STDIO_CNT_LVALUE 		/**/
+/*#define STDIO_PTR_LVAL_SETS_CNT	/ **/
+#define STDIO_PTR_LVAL_NOCHANGE_CNT	/**/
+#endif
+
+/* USE_STDIO_BASE:
+ *	This symbol is defined if the _base field (or similar) of the
+ *	stdio FILE structure can be used to access the stdio buffer for
+ *	a file handle.  If this is defined, then the FILE_base(fp) macro
+ *	will also be defined and should be used to access this field.
+ *	Also, the FILE_bufsiz(fp) macro will be defined and should be used
+ *	to determine the number of bytes in the buffer.  USE_STDIO_BASE
+ *	will never be defined unless USE_STDIO_PTR is.
+ */
+/* FILE_base:
+ *	This macro is used to access the _base field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_BASE is defined.
+ */
+/* FILE_bufsiz:
+ *	This macro is used to determine the number of bytes in the I/O
+ *	buffer pointed to by _base field (or equivalent) of the FILE
+ *	structure pointed to its argument. This macro will always be defined
+ *	if USE_STDIO_BASE is defined.
+ */
+#define USE_STDIO_BASE 	/**/
+#ifdef USE_STDIO_BASE
+#define FILE_base(fp)	((fp)->_base)
+#define FILE_bufsiz(fp)	((fp)->_cnt + (fp)->_ptr - (fp)->_base)
+#endif
+
+/* HAS_VPRINTF:
+ *	This symbol, if defined, indicates that the vprintf routine is available
+ *	to printf with a pointer to an argument list.  If unavailable, you
+ *	may need to write your own, probably in terms of _doprnt().
+ */
+/* USE_CHAR_VSPRINTF:
+ *	This symbol is defined if this system has vsprintf() returning type
+ *	(char*).  The trend seems to be to declare it as "int vsprintf()".  It
+ *	is up to the package author to declare vsprintf correctly based on the
+ *	symbol.
+ */
+#define HAS_VPRINTF	/**/
+/*#define USE_CHAR_VSPRINTF 	/ **/
+
+/* DOUBLESIZE:
+ *	This symbol contains the size of a double, so that the C preprocessor
+ *	can make decisions based on it.
+ */
+#define DOUBLESIZE 8		/**/
+
+/* I_TIME:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <time.h>.
+ */
+/* I_SYS_TIME:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <sys/time.h>.
+ */
+/* I_SYS_TIME_KERNEL:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <sys/time.h> with KERNEL defined.
+ */
+/* HAS_TM_TM_ZONE:
+ *	This symbol, if defined, indicates to the C program that
+ *	the struct tm has a tm_zone field.
+ */
+/* HAS_TM_TM_GMTOFF:
+ *	This symbol, if defined, indicates to the C program that
+ *	the struct tm has a tm_gmtoff field.
+ */
+#define I_TIME		/**/
+/*#define I_SYS_TIME		/ **/
+/*#define I_SYS_TIME_KERNEL		/ **/
+/*#define HAS_TM_TM_ZONE		/ **/
+/*#define HAS_TM_TM_GMTOFF		/ **/
+
+/* VAL_O_NONBLOCK:
+ *	This symbol is to be used during open() or fcntl(F_SETFL) to turn on
+ *	non-blocking I/O for the file descriptor. Note that there is no way
+ *	back, i.e. you cannot turn it blocking again this way. If you wish to
+ *	alternatively switch between blocking and non-blocking, use the
+ *	ioctl(FIOSNBIO) call instead, but that is not supported by all devices.
+ */
+/* VAL_EAGAIN:
+ *	This symbol holds the errno error code set by read() when no data was
+ *	present on the non-blocking file descriptor.
+ */
+/* RD_NODATA:
+ *	This symbol holds the return code from read() when no data is present
+ *	on the non-blocking file descriptor. Be careful! If EOF_NONBLOCK is
+ *	not defined, then you can't distinguish between no data and EOF by
+ *	issuing a read(). You'll have to find another way to tell for sure!
+ */
+/* EOF_NONBLOCK:
+ *	This symbol, if defined, indicates to the C program that a read() on
+ *	a non-blocking file descriptor will return 0 on EOF, and not the value
+ *	held in RD_NODATA (-1 usually, in that case!).
+ */
+#define VAL_O_NONBLOCK O_NONBLOCK
+#define VAL_EAGAIN EAGAIN
+#define RD_NODATA -1
+#define EOF_NONBLOCK
+
+/* PTRSIZE:
+ *	This symbol contains the size of a pointer, so that the C preprocessor
+ *	can make decisions based on it.  It will be sizeof(void *) if
+ *	the compiler supports (void *); otherwise it will be
+ *	sizeof(char *).
+ */
+#define PTRSIZE 4		/**/
+
+/* Drand01:
+ *	This macro is to be used to generate uniformly distributed
+ *	random numbers over the range [0., 1.[.  You may have to supply
+ *	an 'extern double drand48();' in your program since SunOS 4.1.3
+ *	doesn't provide you with anything relevant in its headers.
+ *	See HAS_DRAND48_PROTO.
+ */
+/* Rand_seed_t:
+ *	This symbol defines the type of the argument of the
+ *	random seed function.
+ */
+/* seedDrand01:
+ *	This symbol defines the macro to be used in seeding the
+ *	random number generator (see Drand01).
+ */
+/* RANDBITS:
+ *	This symbol indicates how many bits are produced by the
+ *	function used to generate normalized random numbers.
+ *	Values include 15, 16, 31, and 48.
+ */
+#define Drand01()		Perl_drand48()		/**/
+#define Rand_seed_t		U32		/**/
+#define seedDrand01(x)	Perl_drand48_init((Rand_seed_t)x)	/**/
+#define RANDBITS		48		/**/
+
+/* SSize_t:
+ *	This symbol holds the type used by functions that return
+ *	a count of bytes or an error condition.  It must be a signed type.
+ *	It is usually ssize_t, but may be long or int, etc.
+ *	It may be necessary to include <sys/types.h> or <unistd.h>
+ *	to get any typedef'ed information.
+ *	We will pick a type such that sizeof(SSize_t) == sizeof(Size_t).
+ */
+#define SSize_t int	 /* signed count of bytes */
+
+/* EBCDIC:
+ *	This symbol, if defined, indicates that this system uses
+ *	EBCDIC encoding.
+ */
+/*#define	EBCDIC 		/ **/
+
+/* ARCHLIB:
+ *	This variable, if defined, holds the name of the directory in
+ *	which the user wants to put architecture-dependent public
+ *	library files for perl5.  It is most often a local directory
+ *	such as /usr/local/lib.  Programs using this variable must be
+ *	prepared to deal with filename expansion.  If ARCHLIB is the
+ *	same as PRIVLIB, it is not defined, since presumably the
+ *	program already searches PRIVLIB.
+ */
+/* ARCHLIB_EXP:
+ *	This symbol contains the ~name expanded version of ARCHLIB, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+#define ARCHLIB "c:\\tlperl\\lib"		/**/
+/*#define ARCHLIB_EXP ""	/ **/
+
+/* BIN:
+ *	This symbol holds the path of the bin directory where the package will
+ *	be installed. Program must be prepared to deal with ~name substitution.
+ */
+/* BIN_EXP:
+ *	This symbol is the filename expanded version of the BIN symbol, for
+ *	programs that do not want to deal with that at run-time.
+ */
+/* PERL_RELOCATABLE_INC:
+ *	This symbol, if defined, indicates that we'd like to relocate entries
+ *	in @INC at run time based on the location of the perl binary.
+ */
+#define BIN "c:\\tlperl\\bin"	/**/
+#define BIN_EXP "c:\\tlperl\\bin"	/**/
+#define PERL_RELOCATABLE_INC "undef" 		/**/
+
+/* PERL_INC_VERSION_LIST:
+ *	This variable specifies the list of subdirectories in over
+ *	which perl.c:incpush() and lib/lib.pm will automatically
+ *	search when adding directories to @INC, in a format suitable
+ *	for a C initialization string.  See the inc_version_list entry
+ *	in Porting/Glossary for more details.
+ */
+/*#define PERL_INC_VERSION_LIST 0		/ **/
+
+/* INSTALL_USR_BIN_PERL:
+ *	This symbol, if defined, indicates that Perl is to be installed
+ * 	also as /usr/bin/perl.
+ */
+/*#define INSTALL_USR_BIN_PERL	/ **/
+
+/* PERL_OTHERLIBDIRS:
+ *	This variable contains a colon-separated set of paths for the perl
+ *	binary to search for additional library files or modules.
+ *	These directories will be tacked to the end of @INC.
+ *	Perl will automatically search below each path for version-
+ *	and architecture-specific directories.  See PERL_INC_VERSION_LIST
+ *	for more details.
+ */
+/*#define PERL_OTHERLIBDIRS ""		/ **/
+
+/* PRIVLIB:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ */
+/* PRIVLIB_EXP:
+ *	This symbol contains the ~name expanded version of PRIVLIB, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+#define PRIVLIB "c:\\tlperl\\lib"		/**/
+#define PRIVLIB_EXP (PerlEnv_lib_path(PERL_VERSION_STRING, NULL))	/**/
+
+/* SITEARCH:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ *	The standard distribution will put nothing in this directory.
+ *	After perl has been installed, users may install their own local
+ *	architecture-dependent modules in this directory with
+ *		MakeMaker Makefile.PL
+ *	or equivalent.  See INSTALL for details.
+ */
+/* SITEARCH_EXP:
+ *	This symbol contains the ~name expanded version of SITEARCH, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+#define SITEARCH "c:\\tlperl\\site\\lib"		/**/
+/*#define SITEARCH_EXP ""	/ **/
+
+/* SITELIB:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ *	The standard distribution will put nothing in this directory.
+ *	After perl has been installed, users may install their own local
+ *	architecture-independent modules in this directory with
+ *		MakeMaker Makefile.PL
+ *	or equivalent.  See INSTALL for details.
+ */
+/* SITELIB_EXP:
+ *	This symbol contains the ~name expanded version of SITELIB, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+/* SITELIB_STEM:
+ *	This define is SITELIB_EXP with any trailing version-specific component
+ *	removed.  The elements in inc_version_list (inc_version_list.U) can
+ *	be tacked onto this variable to generate a list of directories to search.
+ */
+#define SITELIB "c:\\tlperl\\site\\lib"		/**/
+#define SITELIB_EXP (PerlEnv_sitelib_path(PERL_VERSION_STRING, NULL))	/**/
+#define SITELIB_STEM ""		/**/
+
+/* PERL_VENDORARCH:
+ *	If defined, this symbol contains the name of a private library.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.
+ *	It may have a ~ on the front.
+ *	The standard distribution will put nothing in this directory.
+ *	Vendors who distribute perl may wish to place their own
+ *	architecture-dependent modules and extensions in this directory with
+ *		MakeMaker Makefile.PL INSTALLDIRS=vendor
+ *	or equivalent.  See INSTALL for details.
+ */
+/* PERL_VENDORARCH_EXP:
+ *	This symbol contains the ~name expanded version of PERL_VENDORARCH, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+/*#define PERL_VENDORARCH ""		/ **/
+/*#define PERL_VENDORARCH_EXP ""		/ **/
+
+/* PERL_VENDORLIB_EXP:
+ *	This symbol contains the ~name expanded version of VENDORLIB, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+/* PERL_VENDORLIB_STEM:
+ *	This define is PERL_VENDORLIB_EXP with any trailing version-specific component
+ *	removed.  The elements in inc_version_list (inc_version_list.U) can
+ *	be tacked onto this variable to generate a list of directories to search.
+ */
+/*#define PERL_VENDORLIB_EXP ""		/ **/
+/*#define PERL_VENDORLIB_STEM ""		/ **/
+
+/* OSNAME:
+ *	This symbol contains the name of the operating system, as determined
+ *	by Configure.  You shouldn't rely on it too much; the specific
+ *	feature tests from Configure are generally more reliable.
+ */
+/* OSVERS:
+ *	This symbol contains the version of the operating system, as determined
+ *	by Configure.  You shouldn't rely on it too much; the specific
+ *	feature tests from Configure are generally more reliable.
+ */
+#define OSNAME "MSWin32"		/**/
+#define OSVERS "6.1"		/**/
+
 /* CAT2:
  *	This macro concatenates 2 tokens together.
  */
@@ -1053,25 +1598,6 @@
  */
 #define HAS_ACCESS		/**/
 
-/* HAS_ACCESSX:
- *	This symbol, if defined, indicates that the accessx routine is
- *	available to do extended access checks.
- */
-/*#define HAS_ACCESSX		/ **/
-
-/* HAS_ASCTIME_R:
- *	This symbol, if defined, indicates that the asctime_r routine
- *	is available to asctime re-entrantly.
- */
-/* ASCTIME_R_PROTO:
- *	This symbol encodes the prototype of asctime_r.
- *	It is zero if d_asctime_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_asctime_r
- *	is defined.
- */
-/*#define HAS_ASCTIME_R	   / **/
-#define ASCTIME_R_PROTO 0	   /**/
-
 /* HASATTRIBUTE_FORMAT:
  *	Can we handle GCC attribute for checking printf-style formats
  */
@@ -1116,33 +1642,6 @@
  */
 /*#define HAS_BACKTRACE	/ **/
 
-/* CASTI32:
- *	This symbol is defined if the C compiler can cast negative
- *	or large floating point numbers to 32-bit ints.
- */
-#define	CASTI32		/**/
-
-/* CASTNEGFLOAT:
- *	This symbol is defined if the C compiler can cast negative
- *	numbers to unsigned longs, ints and shorts.
- */
-/* CASTFLAGS:
- *	This symbol contains flags that say what difficulties the compiler
- *	has casting odd floating values to unsigned long:
- *		0 = ok
- *		1 = couldn't cast < 0
- *		2 = couldn't cast >= 0x80000000
- *		4 = couldn't cast in argument expression list
- */
-#define	CASTNEGFLOAT		/**/
-#define CASTFLAGS 0		/**/
-
-/* VOID_CLOSEDIR:
- *	This symbol, if defined, indicates that the closedir() routine
- *	does not return a value.
- */
-/*#define VOID_CLOSEDIR		/ **/
-
 /* HASCONST:
  *	This symbol, if defined, indicates that this C compiler knows about
  *	the const type. There is no need to actually test for that symbol
@@ -1154,19 +1653,6 @@
 #define const
 #endif
 
-/* HAS_CRYPT_R:
- *	This symbol, if defined, indicates that the crypt_r routine
- *	is available to crypt re-entrantly.
- */
-/* CRYPT_R_PROTO:
- *	This symbol encodes the prototype of crypt_r.
- *	It is zero if d_crypt_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_crypt_r
- *	is defined.
- */
-/*#define HAS_CRYPT_R	   / **/
-#define CRYPT_R_PROTO 0	   /**/
-
 /* HAS_CSH:
  *	This symbol, if defined, indicates that the C-shell exists.
  */
@@ -1178,32 +1664,6 @@
 #define CSH ""	/**/
 #endif
 
-/* HAS_CTERMID_R:
- *	This symbol, if defined, indicates that the ctermid_r routine
- *	is available to ctermid re-entrantly.
- */
-/* CTERMID_R_PROTO:
- *	This symbol encodes the prototype of ctermid_r.
- *	It is zero if d_ctermid_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctermid_r
- *	is defined.
- */
-/*#define HAS_CTERMID_R	   / **/
-#define CTERMID_R_PROTO 0	   /**/
-
-/* HAS_CTIME_R:
- *	This symbol, if defined, indicates that the ctime_r routine
- *	is available to ctime re-entrantly.
- */
-/* CTIME_R_PROTO:
- *	This symbol encodes the prototype of ctime_r.
- *	It is zero if d_ctime_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctime_r
- *	is defined.
- */
-/*#define HAS_CTIME_R	   / **/
-#define CTIME_R_PROTO 0	   /**/
-
 /* HAS_DLADDR:
  *	This symbol, if defined, indicates that the dladdr() routine is
  *	available to query dynamic linker information for an address.
@@ -1231,221 +1691,54 @@
 /*#define SETUID_SCRIPTS_ARE_SECURE_NOW	/ **/
 /*#define DOSUID		/ **/
 
-/* HAS_DRAND48_R:
- *	This symbol, if defined, indicates that the drand48_r routine
- *	is available to drand48 re-entrantly.
- */
-/* DRAND48_R_PROTO:
- *	This symbol encodes the prototype of drand48_r.
- *	It is zero if d_drand48_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_drand48_r
- *	is defined.
- */
-/*#define HAS_DRAND48_R	   / **/
-#define DRAND48_R_PROTO 0	   /**/
-
-/* HAS_DRAND48_PROTO:
- *	This symbol, if defined, indicates that the system provides
- *	a prototype for the drand48() function.  Otherwise, it is up
- *	to the program to supply one.  A good guess is
- *		extern double drand48(void);
- */
-/*#define	HAS_DRAND48_PROTO	/ **/
-
-/* HAS_EACCESS:
- *	This symbol, if defined, indicates that the eaccess routine is
- *	available to do extended access checks.
- */
-/*#define HAS_EACCESS		/ **/
-
 /* HAS_ENDGRENT:
  *	This symbol, if defined, indicates that the getgrent routine is
  *	available for finalizing sequential access of the group database.
  */
 /*#define HAS_ENDGRENT		/ **/
 
-/* HAS_ENDGRENT_R:
- *	This symbol, if defined, indicates that the endgrent_r routine
- *	is available to endgrent re-entrantly.
- */
-/* ENDGRENT_R_PROTO:
- *	This symbol encodes the prototype of endgrent_r.
- *	It is zero if d_endgrent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endgrent_r
- *	is defined.
- */
-/*#define HAS_ENDGRENT_R	   / **/
-#define ENDGRENT_R_PROTO 0	   /**/
-
 /* HAS_ENDHOSTENT:
  *	This symbol, if defined, indicates that the endhostent() routine is
  *	available to close whatever was being used for host queries.
  */
 /*#define HAS_ENDHOSTENT		/ **/
 
-/* HAS_ENDHOSTENT_R:
- *	This symbol, if defined, indicates that the endhostent_r routine
- *	is available to endhostent re-entrantly.
- */
-/* ENDHOSTENT_R_PROTO:
- *	This symbol encodes the prototype of endhostent_r.
- *	It is zero if d_endhostent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endhostent_r
- *	is defined.
- */
-/*#define HAS_ENDHOSTENT_R	   / **/
-#define ENDHOSTENT_R_PROTO 0	   /**/
-
 /* HAS_ENDNETENT:
  *	This symbol, if defined, indicates that the endnetent() routine is
  *	available to close whatever was being used for network queries.
  */
 /*#define HAS_ENDNETENT		/ **/
 
-/* HAS_ENDNETENT_R:
- *	This symbol, if defined, indicates that the endnetent_r routine
- *	is available to endnetent re-entrantly.
- */
-/* ENDNETENT_R_PROTO:
- *	This symbol encodes the prototype of endnetent_r.
- *	It is zero if d_endnetent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endnetent_r
- *	is defined.
- */
-/*#define HAS_ENDNETENT_R	   / **/
-#define ENDNETENT_R_PROTO 0	   /**/
-
 /* HAS_ENDPROTOENT:
  *	This symbol, if defined, indicates that the endprotoent() routine is
  *	available to close whatever was being used for protocol queries.
  */
 /*#define HAS_ENDPROTOENT		/ **/
 
-/* HAS_ENDPROTOENT_R:
- *	This symbol, if defined, indicates that the endprotoent_r routine
- *	is available to endprotoent re-entrantly.
- */
-/* ENDPROTOENT_R_PROTO:
- *	This symbol encodes the prototype of endprotoent_r.
- *	It is zero if d_endprotoent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endprotoent_r
- *	is defined.
- */
-/*#define HAS_ENDPROTOENT_R	   / **/
-#define ENDPROTOENT_R_PROTO 0	   /**/
-
 /* HAS_ENDPWENT:
  *	This symbol, if defined, indicates that the getgrent routine is
  *	available for finalizing sequential access of the passwd database.
  */
 /*#define HAS_ENDPWENT		/ **/
 
-/* HAS_ENDPWENT_R:
- *	This symbol, if defined, indicates that the endpwent_r routine
- *	is available to endpwent re-entrantly.
- */
-/* ENDPWENT_R_PROTO:
- *	This symbol encodes the prototype of endpwent_r.
- *	It is zero if d_endpwent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endpwent_r
- *	is defined.
- */
-/*#define HAS_ENDPWENT_R	   / **/
-#define ENDPWENT_R_PROTO 0	   /**/
-
 /* HAS_ENDSERVENT:
  *	This symbol, if defined, indicates that the endservent() routine is
  *	available to close whatever was being used for service queries.
  */
 /*#define HAS_ENDSERVENT		/ **/
 
-/* HAS_ENDSERVENT_R:
- *	This symbol, if defined, indicates that the endservent_r routine
- *	is available to endservent re-entrantly.
- */
-/* ENDSERVENT_R_PROTO:
- *	This symbol encodes the prototype of endservent_r.
- *	It is zero if d_endservent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endservent_r
- *	is defined.
- */
-/*#define HAS_ENDSERVENT_R	   / **/
-#define ENDSERVENT_R_PROTO 0	   /**/
-
-/* HAS_FD_SET:
- *	This symbol, when defined, indicates presence of the fd_set typedef
- *	in <sys/types.h>
- */
-#define HAS_FD_SET	/**/
-
 /* FLEXFILENAMES:
  *	This symbol, if defined, indicates that the system supports filenames
  *	longer than 14 characters.
  */
 #define	FLEXFILENAMES		/**/
 
-/* Gconvert:
- *	This preprocessor macro is defined to convert a floating point
- *	number to a string without a trailing decimal point.  This
- *	emulates the behavior of sprintf("%g"), but is sometimes much more
- *	efficient.  If gconvert() is not available, but gcvt() drops the
- *	trailing decimal point, then gcvt() is used.  If all else fails,
- *	a macro using sprintf("%g") is used. Arguments for the Gconvert
- *	macro are: value, number of digits, whether trailing zeros should
- *	be retained, and the output buffer.
- *	The usual values are:
- *		d_Gconvert='gconvert((x),(n),(t),(b))'
- *		d_Gconvert='gcvt((x),(n),(b))'
- *		d_Gconvert='sprintf((b),"%.*g",(n),(x))'
- *	The last two assume trailing zeros should not be kept.
- */
-#define Gconvert(x,n,t,b) sprintf((b),"%.*g",(n),(x))
-
 /* HAS_GETGRENT:
  *	This symbol, if defined, indicates that the getgrent routine is
  *	available for sequential access of the group database.
  */
 /*#define HAS_GETGRENT		/ **/
 
-/* HAS_GETGRENT_R:
- *	This symbol, if defined, indicates that the getgrent_r routine
- *	is available to getgrent re-entrantly.
- */
-/* GETGRENT_R_PROTO:
- *	This symbol encodes the prototype of getgrent_r.
- *	It is zero if d_getgrent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrent_r
- *	is defined.
- */
-/*#define HAS_GETGRENT_R	   / **/
-#define GETGRENT_R_PROTO 0	   /**/
-
-/* HAS_GETGRGID_R:
- *	This symbol, if defined, indicates that the getgrgid_r routine
- *	is available to getgrgid re-entrantly.
- */
-/* GETGRGID_R_PROTO:
- *	This symbol encodes the prototype of getgrgid_r.
- *	It is zero if d_getgrgid_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrgid_r
- *	is defined.
- */
-/*#define HAS_GETGRGID_R	   / **/
-#define GETGRGID_R_PROTO 0	   /**/
-
-/* HAS_GETGRNAM_R:
- *	This symbol, if defined, indicates that the getgrnam_r routine
- *	is available to getgrnam re-entrantly.
- */
-/* GETGRNAM_R_PROTO:
- *	This symbol encodes the prototype of getgrnam_r.
- *	It is zero if d_getgrnam_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrnam_r
- *	is defined.
- */
-/*#define HAS_GETGRNAM_R	   / **/
-#define GETGRNAM_R_PROTO 0	   /**/
-
 /* HAS_GETHOSTBYADDR:
  *	This symbol, if defined, indicates that the gethostbyaddr() routine is
  *	available to look up hosts by their IP addresses.
@@ -1493,66 +1786,6 @@
 #define PHOSTNAME ""	/* How to get the host name */
 #endif
 
-/* HAS_GETHOSTBYADDR_R:
- *	This symbol, if defined, indicates that the gethostbyaddr_r routine
- *	is available to gethostbyaddr re-entrantly.
- */
-/* GETHOSTBYADDR_R_PROTO:
- *	This symbol encodes the prototype of gethostbyaddr_r.
- *	It is zero if d_gethostbyaddr_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyaddr_r
- *	is defined.
- */
-/*#define HAS_GETHOSTBYADDR_R	   / **/
-#define GETHOSTBYADDR_R_PROTO 0	   /**/
-
-/* HAS_GETHOSTBYNAME_R:
- *	This symbol, if defined, indicates that the gethostbyname_r routine
- *	is available to gethostbyname re-entrantly.
- */
-/* GETHOSTBYNAME_R_PROTO:
- *	This symbol encodes the prototype of gethostbyname_r.
- *	It is zero if d_gethostbyname_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyname_r
- *	is defined.
- */
-/*#define HAS_GETHOSTBYNAME_R	   / **/
-#define GETHOSTBYNAME_R_PROTO 0	   /**/
-
-/* HAS_GETHOSTENT_R:
- *	This symbol, if defined, indicates that the gethostent_r routine
- *	is available to gethostent re-entrantly.
- */
-/* GETHOSTENT_R_PROTO:
- *	This symbol encodes the prototype of gethostent_r.
- *	It is zero if d_gethostent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostent_r
- *	is defined.
- */
-/*#define HAS_GETHOSTENT_R	   / **/
-#define GETHOSTENT_R_PROTO 0	   /**/
-
-/* HAS_GETHOST_PROTOS:
- *	This symbol, if defined, indicates that <netdb.h> includes
- *	prototypes for gethostent(), gethostbyname(), and
- *	gethostbyaddr().  Otherwise, it is up to the program to guess
- *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
- */
-#define	HAS_GETHOST_PROTOS	/**/
-
-/* HAS_GETLOGIN_R:
- *	This symbol, if defined, indicates that the getlogin_r routine
- *	is available to getlogin re-entrantly.
- */
-/* GETLOGIN_R_PROTO:
- *	This symbol encodes the prototype of getlogin_r.
- *	It is zero if d_getlogin_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getlogin_r
- *	is defined.
- */
-/*#define HAS_GETLOGIN_R	   / **/
-#define GETLOGIN_R_PROTO 0	   /**/
-
 /* HAS_GETNETBYADDR:
  *	This symbol, if defined, indicates that the getnetbyaddr() routine is
  *	available to look up networks by their IP addresses.
@@ -1571,60 +1804,6 @@
  */
 /*#define HAS_GETNETENT		/ **/
 
-/* HAS_GETNETBYADDR_R:
- *	This symbol, if defined, indicates that the getnetbyaddr_r routine
- *	is available to getnetbyaddr re-entrantly.
- */
-/* GETNETBYADDR_R_PROTO:
- *	This symbol encodes the prototype of getnetbyaddr_r.
- *	It is zero if d_getnetbyaddr_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyaddr_r
- *	is defined.
- */
-/*#define HAS_GETNETBYADDR_R	   / **/
-#define GETNETBYADDR_R_PROTO 0	   /**/
-
-/* HAS_GETNETBYNAME_R:
- *	This symbol, if defined, indicates that the getnetbyname_r routine
- *	is available to getnetbyname re-entrantly.
- */
-/* GETNETBYNAME_R_PROTO:
- *	This symbol encodes the prototype of getnetbyname_r.
- *	It is zero if d_getnetbyname_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyname_r
- *	is defined.
- */
-/*#define HAS_GETNETBYNAME_R	   / **/
-#define GETNETBYNAME_R_PROTO 0	   /**/
-
-/* HAS_GETNETENT_R:
- *	This symbol, if defined, indicates that the getnetent_r routine
- *	is available to getnetent re-entrantly.
- */
-/* GETNETENT_R_PROTO:
- *	This symbol encodes the prototype of getnetent_r.
- *	It is zero if d_getnetent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetent_r
- *	is defined.
- */
-/*#define HAS_GETNETENT_R	   / **/
-#define GETNETENT_R_PROTO 0	   /**/
-
-/* HAS_GETNET_PROTOS:
- *	This symbol, if defined, indicates that <netdb.h> includes
- *	prototypes for getnetent(), getnetbyname(), and
- *	getnetbyaddr().  Otherwise, it is up to the program to guess
- *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
- */
-/*#define	HAS_GETNET_PROTOS	/ **/
-
-/* HAS_GETPAGESIZE:
- *	This symbol, if defined, indicates that the getpagesize system call
- *	is available to get system page size, which is the granularity of
- *	many memory management calls.
- */
-/*#define HAS_GETPAGESIZE		/ **/
-
 /* HAS_GETPROTOENT:
  *	This symbol, if defined, indicates that the getprotoent() routine is
  *	available to look up protocols in some data base or another.
@@ -1653,53 +1832,6 @@
 #define HAS_GETPROTOBYNAME		/**/
 #define HAS_GETPROTOBYNUMBER		/**/
 
-/* HAS_GETPROTOBYNAME_R:
- *	This symbol, if defined, indicates that the getprotobyname_r routine
- *	is available to getprotobyname re-entrantly.
- */
-/* GETPROTOBYNAME_R_PROTO:
- *	This symbol encodes the prototype of getprotobyname_r.
- *	It is zero if d_getprotobyname_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobyname_r
- *	is defined.
- */
-/*#define HAS_GETPROTOBYNAME_R	   / **/
-#define GETPROTOBYNAME_R_PROTO 0	   /**/
-
-/* HAS_GETPROTOBYNUMBER_R:
- *	This symbol, if defined, indicates that the getprotobynumber_r routine
- *	is available to getprotobynumber re-entrantly.
- */
-/* GETPROTOBYNUMBER_R_PROTO:
- *	This symbol encodes the prototype of getprotobynumber_r.
- *	It is zero if d_getprotobynumber_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobynumber_r
- *	is defined.
- */
-/*#define HAS_GETPROTOBYNUMBER_R	   / **/
-#define GETPROTOBYNUMBER_R_PROTO 0	   /**/
-
-/* HAS_GETPROTOENT_R:
- *	This symbol, if defined, indicates that the getprotoent_r routine
- *	is available to getprotoent re-entrantly.
- */
-/* GETPROTOENT_R_PROTO:
- *	This symbol encodes the prototype of getprotoent_r.
- *	It is zero if d_getprotoent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotoent_r
- *	is defined.
- */
-/*#define HAS_GETPROTOENT_R	   / **/
-#define GETPROTOENT_R_PROTO 0	   /**/
-
-/* HAS_GETPROTO_PROTOS:
- *	This symbol, if defined, indicates that <netdb.h> includes
- *	prototypes for getprotoent(), getprotobyname(), and
- *	getprotobyaddr().  Otherwise, it is up to the program to guess
- *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
- */
-#define	HAS_GETPROTO_PROTOS	/**/
-
 /* HAS_GETPWENT:
  *	This symbol, if defined, indicates that the getpwent routine is
  *	available for sequential access of the passwd database.
@@ -1707,111 +1839,12 @@
  */
 /*#define HAS_GETPWENT		/ **/
 
-/* HAS_GETPWENT_R:
- *	This symbol, if defined, indicates that the getpwent_r routine
- *	is available to getpwent re-entrantly.
- */
-/* GETPWENT_R_PROTO:
- *	This symbol encodes the prototype of getpwent_r.
- *	It is zero if d_getpwent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwent_r
- *	is defined.
- */
-/*#define HAS_GETPWENT_R	   / **/
-#define GETPWENT_R_PROTO 0	   /**/
-
-/* HAS_GETPWNAM_R:
- *	This symbol, if defined, indicates that the getpwnam_r routine
- *	is available to getpwnam re-entrantly.
- */
-/* GETPWNAM_R_PROTO:
- *	This symbol encodes the prototype of getpwnam_r.
- *	It is zero if d_getpwnam_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwnam_r
- *	is defined.
- */
-/*#define HAS_GETPWNAM_R	   / **/
-#define GETPWNAM_R_PROTO 0	   /**/
-
-/* HAS_GETPWUID_R:
- *	This symbol, if defined, indicates that the getpwuid_r routine
- *	is available to getpwuid re-entrantly.
- */
-/* GETPWUID_R_PROTO:
- *	This symbol encodes the prototype of getpwuid_r.
- *	It is zero if d_getpwuid_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwuid_r
- *	is defined.
- */
-/*#define HAS_GETPWUID_R	   / **/
-#define GETPWUID_R_PROTO 0	   /**/
-
 /* HAS_GETSERVENT:
  *	This symbol, if defined, indicates that the getservent() routine is
  *	available to look up network services in some data base or another.
  */
 /*#define HAS_GETSERVENT		/ **/
 
-/* HAS_GETSERVBYNAME_R:
- *	This symbol, if defined, indicates that the getservbyname_r routine
- *	is available to getservbyname re-entrantly.
- */
-/* GETSERVBYNAME_R_PROTO:
- *	This symbol encodes the prototype of getservbyname_r.
- *	It is zero if d_getservbyname_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyname_r
- *	is defined.
- */
-/*#define HAS_GETSERVBYNAME_R	   / **/
-#define GETSERVBYNAME_R_PROTO 0	   /**/
-
-/* HAS_GETSERVBYPORT_R:
- *	This symbol, if defined, indicates that the getservbyport_r routine
- *	is available to getservbyport re-entrantly.
- */
-/* GETSERVBYPORT_R_PROTO:
- *	This symbol encodes the prototype of getservbyport_r.
- *	It is zero if d_getservbyport_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyport_r
- *	is defined.
- */
-/*#define HAS_GETSERVBYPORT_R	   / **/
-#define GETSERVBYPORT_R_PROTO 0	   /**/
-
-/* HAS_GETSERVENT_R:
- *	This symbol, if defined, indicates that the getservent_r routine
- *	is available to getservent re-entrantly.
- */
-/* GETSERVENT_R_PROTO:
- *	This symbol encodes the prototype of getservent_r.
- *	It is zero if d_getservent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservent_r
- *	is defined.
- */
-/*#define HAS_GETSERVENT_R	   / **/
-#define GETSERVENT_R_PROTO 0	   /**/
-
-/* HAS_GETSERV_PROTOS:
- *	This symbol, if defined, indicates that <netdb.h> includes
- *	prototypes for getservent(), getservbyname(), and
- *	getservbyaddr().  Otherwise, it is up to the program to guess
- *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
- */
-#define	HAS_GETSERV_PROTOS	/**/
-
-/* HAS_GETSPNAM_R:
- *	This symbol, if defined, indicates that the getspnam_r routine
- *	is available to getspnam re-entrantly.
- */
-/* GETSPNAM_R_PROTO:
- *	This symbol encodes the prototype of getspnam_r.
- *	It is zero if d_getspnam_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getspnam_r
- *	is defined.
- */
-/*#define HAS_GETSPNAM_R	   / **/
-#define GETSPNAM_R_PROTO 0	   /**/
-
 /* HAS_GETSERVBYNAME:
  *	This symbol, if defined, indicates that the getservbyname()
  *	routine is available to look up services by their name.
@@ -1823,29 +1856,6 @@
 #define HAS_GETSERVBYNAME		/**/
 #define HAS_GETSERVBYPORT		/**/
 
-/* HAS_GMTIME_R:
- *	This symbol, if defined, indicates that the gmtime_r routine
- *	is available to gmtime re-entrantly.
- */
-/* GMTIME_R_PROTO:
- *	This symbol encodes the prototype of gmtime_r.
- *	It is zero if d_gmtime_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gmtime_r
- *	is defined.
- */
-/*#define HAS_GMTIME_R	   / **/
-#define GMTIME_R_PROTO 0	   /**/
-
-/* HAS_GNULIBC:
- *	This symbol, if defined, indicates to the C program that
- *	the GNU C library is being used.  A better check is to use
- *	the __GLIBC__ and __GLIBC_MINOR__ symbols supplied with glibc.
- */
-/*#define HAS_GNULIBC  	/ **/
-#if defined(HAS_GNULIBC) && !defined(_GNU_SOURCE)
-#   define _GNU_SOURCE
-#endif
-
 /* HAS_HTONL:
  *	This symbol, if defined, indicates that the htonl() routine (and
  *	friends htons() ntohl() ntohs()) are available to do network
@@ -1871,45 +1881,6 @@
 #define HAS_NTOHL		/**/
 #define HAS_NTOHS		/**/
 
-/* HAS_ISASCII:
- *	This manifest constant lets the C program know that isascii
- *	is available.
- */
-#define HAS_ISASCII		/**/
-
-/* HAS_LCHOWN:
- *	This symbol, if defined, indicates that the lchown routine is
- *	available to operate on a symbolic link (instead of following the
- *	link).
- */
-/*#define HAS_LCHOWN		/ **/
-
-/* HAS_LOCALTIME_R:
- *	This symbol, if defined, indicates that the localtime_r routine
- *	is available to localtime re-entrantly.
- */
-/* LOCALTIME_R_NEEDS_TZSET:
- *	Many libc's localtime_r implementations do not call tzset,
- *	making them differ from localtime(), and making timezone
- *	changes using \undef{TZ} without explicitly calling tzset
- *	impossible. This symbol makes us call tzset before localtime_r
- */
-/*#define LOCALTIME_R_NEEDS_TZSET / **/
-#ifdef LOCALTIME_R_NEEDS_TZSET
-#define L_R_TZSET tzset(),
-#else
-#define L_R_TZSET
-#endif
-
-/* LOCALTIME_R_PROTO:
- *	This symbol encodes the prototype of localtime_r.
- *	It is zero if d_localtime_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_localtime_r
- *	is defined.
- */
-/*#define HAS_LOCALTIME_R	   / **/
-#define LOCALTIME_R_PROTO 0	   /**/
-
 /* HAS_LONG_DOUBLE:
  *	This symbol will be defined if the C compiler supports long
  *	doubles.
@@ -1917,7 +1888,7 @@
 /* LONG_DOUBLESIZE:
  *	This symbol contains the size of a long double, so that the
  *	C preprocessor can make decisions based on it.  It is only
- *	defined if the system supports long doubles.   Note that this
+ *	defined if the system supports long doubles.  Note that this
  *	is sizeof(long double), which may include unused bytes.
  */
 /* HAS_LDEXPL:
@@ -1932,8 +1903,10 @@
  *	LONG_DOUBLE_IS_IEEE_754_128_BIT_BIG_ENDIAN
  *	LONG_DOUBLE_IS_X86_80_BIT_LITTLE_ENDIAN
  *	LONG_DOUBLE_IS_X86_80_BIT_BIG_ENDIAN
- *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN
- *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN
+ *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE
+ *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE
+ *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_BE
+ *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_LE
  *	LONG_DOUBLE_IS_UNKNOWN_FORMAT
  *	It is only defined if the system supports long doubles.
  */
@@ -1947,9 +1920,13 @@
 #define LONG_DOUBLE_IS_IEEE_754_128_BIT_BIG_ENDIAN	2
 #define LONG_DOUBLE_IS_X86_80_BIT_LITTLE_ENDIAN		3
 #define LONG_DOUBLE_IS_X86_80_BIT_BIG_ENDIAN		4
-#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN	5
-#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN	6
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE	5
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE	6
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_BE	7
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_LE	8
 #define LONG_DOUBLE_IS_UNKNOWN_FORMAT			-1
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE /* back-compat */
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE /* back-compat */
 #endif
 
 /* HAS_LONG_LONG:
@@ -1965,14 +1942,6 @@
 #define LONGLONGSIZE 8		/**/
 #endif
 
-/* HAS_LSEEK_PROTO:
- *	This symbol, if defined, indicates that the system provides
- *	a prototype for the lseek() function.  Otherwise, it is up
- *	to the program to supply one.  A good guess is
- *		extern off_t lseek(int, off_t, int);
- */
-#define	HAS_LSEEK_PROTO	/**/
-
 /* HAS_MEMCHR:
  *	This symbol, if defined, indicates that the memchr routine is available
  *	to locate characters within a C string.
@@ -2004,109 +1973,6 @@
  */
 /*#define HAS_MSG		/ **/
 
-/* HAS_OPEN3:
- *	This manifest constant lets the C program know that the three
- *	argument form of open(2) is available.
- */
-/*#define HAS_OPEN3		/ **/
-
-/* OLD_PTHREAD_CREATE_JOINABLE:
- *	This symbol, if defined, indicates how to create pthread
- *	in joinable (aka undetached) state.  NOTE: not defined
- *	if pthread.h already has defined PTHREAD_CREATE_JOINABLE
- *	(the new version of the constant).
- *	If defined, known values are PTHREAD_CREATE_UNDETACHED
- *	and __UNDETACHED.
- */
-/*#define OLD_PTHREAD_CREATE_JOINABLE  / **/
-
-/* HAS_PTHREAD_ATFORK:
- *	This symbol, if defined, indicates that the pthread_atfork routine
- *	is available to setup fork handlers.
- */
-/*#define HAS_PTHREAD_ATFORK		/ **/
-
-/* HAS_PTHREAD_YIELD:
- *	This symbol, if defined, indicates that the pthread_yield
- *	routine is available to yield the execution of the current
- *	thread.	 sched_yield is preferable to pthread_yield.
- */
-/* SCHED_YIELD:
- *	This symbol defines the way to yield the execution of
- *	the current thread.  Known ways are sched_yield,
- *	pthread_yield, and pthread_yield with NULL.
- */
-/* HAS_SCHED_YIELD:
- *	This symbol, if defined, indicates that the sched_yield
- *	routine is available to yield the execution of the current
- *	thread.	 sched_yield is preferable to pthread_yield.
- */
-/*#define HAS_PTHREAD_YIELD	/ **/
-#define SCHED_YIELD		/**/
-/*#define HAS_SCHED_YIELD	/ **/
-
-/* HAS_RANDOM_R:
- *	This symbol, if defined, indicates that the random_r routine
- *	is available to random re-entrantly.
- */
-/* RANDOM_R_PROTO:
- *	This symbol encodes the prototype of random_r.
- *	It is zero if d_random_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_random_r
- *	is defined.
- */
-/*#define HAS_RANDOM_R	   / **/
-#define RANDOM_R_PROTO 0	   /**/
-
-/* HAS_READDIR64_R:
- *	This symbol, if defined, indicates that the readdir64_r routine
- *	is available to readdir64 re-entrantly.
- */
-/* READDIR64_R_PROTO:
- *	This symbol encodes the prototype of readdir64_r.
- *	It is zero if d_readdir64_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir64_r
- *	is defined.
- */
-/*#define HAS_READDIR64_R	   / **/
-#define READDIR64_R_PROTO 0	   /**/
-
-/* HAS_READDIR_R:
- *	This symbol, if defined, indicates that the readdir_r routine
- *	is available to readdir re-entrantly.
- */
-/* READDIR_R_PROTO:
- *	This symbol encodes the prototype of readdir_r.
- *	It is zero if d_readdir_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir_r
- *	is defined.
- */
-/*#define HAS_READDIR_R	   / **/
-#define READDIR_R_PROTO 0	   /**/
-
-/* HAS_SAFE_BCOPY:
- *	This symbol, if defined, indicates that the bcopy routine is available
- *	to copy potentially overlapping memory blocks. Normally, you should
- *	probably use memmove() or memcpy(). If neither is defined, roll your
- *	own version.
- */
-/*#define HAS_SAFE_BCOPY	/ **/
-
-/* HAS_SAFE_MEMCPY:
- *	This symbol, if defined, indicates that the memcpy routine is available
- *	to copy potentially overlapping memory blocks.  If you need to
- *	copy overlapping memory blocks, you should check HAS_MEMMOVE and
- *	use memmove() instead, if available.
- */
-/*#define HAS_SAFE_MEMCPY	/ **/
-
-/* HAS_SANE_MEMCMP:
- *	This symbol, if defined, indicates that the memcmp routine is available
- *	and can be used to compare relative magnitudes of chars with their high
- *	bits set.  If it is not defined, roll your own version.
- */
-#define HAS_SANE_MEMCMP	/**/
-
 /* HAS_SEM:
  *	This symbol, if defined, indicates that the entire sem*(2) library is
  *	supported.
@@ -2119,70 +1985,18 @@
  */
 /*#define HAS_SETGRENT		/ **/
 
-/* HAS_SETGRENT_R:
- *	This symbol, if defined, indicates that the setgrent_r routine
- *	is available to setgrent re-entrantly.
- */
-/* SETGRENT_R_PROTO:
- *	This symbol encodes the prototype of setgrent_r.
- *	It is zero if d_setgrent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setgrent_r
- *	is defined.
- */
-/*#define HAS_SETGRENT_R	   / **/
-#define SETGRENT_R_PROTO 0	   /**/
-
 /* HAS_SETHOSTENT:
  *	This symbol, if defined, indicates that the sethostent() routine is
  *	available.
  */
 /*#define HAS_SETHOSTENT		/ **/
 
-/* HAS_SETHOSTENT_R:
- *	This symbol, if defined, indicates that the sethostent_r routine
- *	is available to sethostent re-entrantly.
- */
-/* SETHOSTENT_R_PROTO:
- *	This symbol encodes the prototype of sethostent_r.
- *	It is zero if d_sethostent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_sethostent_r
- *	is defined.
- */
-/*#define HAS_SETHOSTENT_R	   / **/
-#define SETHOSTENT_R_PROTO 0	   /**/
-
-/* HAS_SETLOCALE_R:
- *	This symbol, if defined, indicates that the setlocale_r routine
- *	is available to setlocale re-entrantly.
- */
-/* SETLOCALE_R_PROTO:
- *	This symbol encodes the prototype of setlocale_r.
- *	It is zero if d_setlocale_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setlocale_r
- *	is defined.
- */
-/*#define HAS_SETLOCALE_R	   / **/
-#define SETLOCALE_R_PROTO 0	   /**/
-
 /* HAS_SETNETENT:
  *	This symbol, if defined, indicates that the setnetent() routine is
  *	available.
  */
 /*#define HAS_SETNETENT		/ **/
 
-/* HAS_SETNETENT_R:
- *	This symbol, if defined, indicates that the setnetent_r routine
- *	is available to setnetent re-entrantly.
- */
-/* SETNETENT_R_PROTO:
- *	This symbol encodes the prototype of setnetent_r.
- *	It is zero if d_setnetent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setnetent_r
- *	is defined.
- */
-/*#define HAS_SETNETENT_R	   / **/
-#define SETNETENT_R_PROTO 0	   /**/
-
 /* HAS_SETPROTOENT:
  *	This symbol, if defined, indicates that the setprotoent() routine is
  *	available.
@@ -2201,57 +2015,18 @@
 /*#define HAS_SETPGRP		/ **/
 /*#define USE_BSD_SETPGRP	/ **/
 
-/* HAS_SETPROTOENT_R:
- *	This symbol, if defined, indicates that the setprotoent_r routine
- *	is available to setprotoent re-entrantly.
- */
-/* SETPROTOENT_R_PROTO:
- *	This symbol encodes the prototype of setprotoent_r.
- *	It is zero if d_setprotoent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setprotoent_r
- *	is defined.
- */
-/*#define HAS_SETPROTOENT_R	   / **/
-#define SETPROTOENT_R_PROTO 0	   /**/
-
 /* HAS_SETPWENT:
  *	This symbol, if defined, indicates that the setpwent routine is
  *	available for initializing sequential access of the passwd database.
  */
 /*#define HAS_SETPWENT		/ **/
 
-/* HAS_SETPWENT_R:
- *	This symbol, if defined, indicates that the setpwent_r routine
- *	is available to setpwent re-entrantly.
- */
-/* SETPWENT_R_PROTO:
- *	This symbol encodes the prototype of setpwent_r.
- *	It is zero if d_setpwent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setpwent_r
- *	is defined.
- */
-/*#define HAS_SETPWENT_R	   / **/
-#define SETPWENT_R_PROTO 0	   /**/
-
 /* HAS_SETSERVENT:
  *	This symbol, if defined, indicates that the setservent() routine is
  *	available.
  */
 /*#define HAS_SETSERVENT		/ **/
 
-/* HAS_SETSERVENT_R:
- *	This symbol, if defined, indicates that the setservent_r routine
- *	is available to setservent re-entrantly.
- */
-/* SETSERVENT_R_PROTO:
- *	This symbol encodes the prototype of setservent_r.
- *	It is zero if d_setservent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setservent_r
- *	is defined.
- */
-/*#define HAS_SETSERVENT_R	   / **/
-#define SETSERVENT_R_PROTO 0	   /**/
-
 /* HAS_SETVBUF:
  *	This symbol, if defined, indicates that the setvbuf routine is
  *	available to change buffering on an open stdio stream.
@@ -2279,43 +2054,6 @@
 #define Shmat_t void *	/**/
 /*#define HAS_SHMAT_PROTOTYPE	/ **/
 
-/* HAS_SIGACTION:
- *	This symbol, if defined, indicates that Vr4's sigaction() routine
- *	is available.
- */
-/*#define HAS_SIGACTION	/ **/
-
-/* HAS_SIGSETJMP:
- *	This variable indicates to the C program that the sigsetjmp()
- *	routine is available to save the calling process's registers
- *	and stack environment for later use by siglongjmp(), and
- *	to optionally save the process's signal mask.  See
- *	Sigjmp_buf, Sigsetjmp, and Siglongjmp.
- */
-/* Sigjmp_buf:
- *	This is the buffer type to be used with Sigsetjmp and Siglongjmp.
- */
-/* Sigsetjmp:
- *	This macro is used in the same way as sigsetjmp(), but will invoke
- *	traditional setjmp() if sigsetjmp isn't available.
- *	See HAS_SIGSETJMP.
- */
-/* Siglongjmp:
- *	This macro is used in the same way as siglongjmp(), but will invoke
- *	traditional longjmp() if siglongjmp isn't available.
- *	See HAS_SIGSETJMP.
- */
-/*#define HAS_SIGSETJMP	/ **/
-#ifdef HAS_SIGSETJMP
-#define Sigjmp_buf sigjmp_buf
-#define Sigsetjmp(buf,save_mask) sigsetjmp((buf),(save_mask))
-#define Siglongjmp(buf,retval) siglongjmp((buf),(retval))
-#else
-#define Sigjmp_buf jmp_buf
-#define Sigsetjmp(buf,save_mask) setjmp((buf))
-#define Siglongjmp(buf,retval) longjmp((buf),(retval))
-#endif
-
 /* HAS_SOCKET:
  *	This symbol, if defined, indicates that the BSD socket interface is
  *	supported.
@@ -2324,36 +2062,6 @@
  *	This symbol, if defined, indicates that the BSD socketpair() call is
  *	supported.
  */
-/* HAS_MSG_CTRUNC:
- *	This symbol, if defined, indicates that the MSG_CTRUNC is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
-/* HAS_MSG_DONTROUTE:
- *	This symbol, if defined, indicates that the MSG_DONTROUTE is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
-/* HAS_MSG_OOB:
- *	This symbol, if defined, indicates that the MSG_OOB is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
-/* HAS_MSG_PEEK:
- *	This symbol, if defined, indicates that the MSG_PEEK is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
-/* HAS_MSG_PROXY:
- *	This symbol, if defined, indicates that the MSG_PROXY is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
-/* HAS_SCM_RIGHTS:
- *	This symbol, if defined, indicates that the SCM_RIGHTS is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
 /* HAS_SOCKADDR_SA_LEN:
  *	This symbol, if defined, indicates that the struct sockaddr
  *	structure has a member called sa_len, indicating the length of
@@ -2386,12 +2094,6 @@
 #define	HAS_SOCKET		/**/
 /*#define	HAS_SOCKETPAIR	/ **/
 /*#define	HAS_SOCKADDR_SA_LEN	/ **/
-/*#define	HAS_MSG_CTRUNC	/ **/
-/*#define	HAS_MSG_DONTROUTE	/ **/
-/*#define	HAS_MSG_OOB	/ **/
-/*#define	HAS_MSG_PEEK	/ **/
-/*#define	HAS_MSG_PROXY	/ **/
-/*#define	HAS_SCM_RIGHTS	/ **/
 /*#define	HAS_SOCKADDR_IN6	/ **/
 #define	HAS_SIN6_SCOPE_ID	/**/
 /*#define	HAS_IP_MREQ	/ **/
@@ -2399,32 +2101,6 @@
 /*#define	HAS_IPV6_MREQ	/ **/
 /*#define	HAS_IPV6_MREQ_SOURCE	/ **/
 
-/* HAS_SRAND48_R:
- *	This symbol, if defined, indicates that the srand48_r routine
- *	is available to srand48 re-entrantly.
- */
-/* SRAND48_R_PROTO:
- *	This symbol encodes the prototype of srand48_r.
- *	It is zero if d_srand48_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srand48_r
- *	is defined.
- */
-/*#define HAS_SRAND48_R	   / **/
-#define SRAND48_R_PROTO 0	   /**/
-
-/* HAS_SRANDOM_R:
- *	This symbol, if defined, indicates that the srandom_r routine
- *	is available to srandom re-entrantly.
- */
-/* SRANDOM_R_PROTO:
- *	This symbol encodes the prototype of srandom_r.
- *	It is zero if d_srandom_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srandom_r
- *	is defined.
- */
-/*#define HAS_SRANDOM_R	   / **/
-#define SRANDOM_R_PROTO 0	   /**/
-
 /* USE_STAT_BLOCKS:
  *	This symbol is defined if this system has a stat structure declaring
  *	st_blksize and st_blocks.
@@ -2433,97 +2109,6 @@
 /*#define USE_STAT_BLOCKS 	/ **/
 #endif
 
-/* HAS_STATIC_INLINE:
- *	This symbol, if defined, indicates that the C compiler supports
- *	C99-style static inline.  That is, the function can't be called
- *	from another translation unit.
- */
-/* PERL_STATIC_INLINE:
- *	This symbol gives the best-guess incantation to use for static
- *	inline functions.  If HAS_STATIC_INLINE is defined, this will
- *	give C99-style inline.  If HAS_STATIC_INLINE is not defined,
- *	this will give a plain 'static'.  It will always be defined
- *	to something that gives static linkage.
- *	Possibilities include
- *		static inline       (c99)
- *		static __inline__   (gcc -ansi)
- *		static __inline     (MSVC)
- *		static _inline      (older MSVC)
- *		static              (c89 compilers)
- */
-#define HAS_STATIC_INLINE				/**/
-#define PERL_STATIC_INLINE static __inline__	/**/
-
-/* USE_STDIO_PTR:
- *	This symbol is defined if the _ptr and _cnt fields (or similar)
- *	of the stdio FILE structure can be used to access the stdio buffer
- *	for a file handle.  If this is defined, then the FILE_ptr(fp)
- *	and FILE_cnt(fp) macros will also be defined and should be used
- *	to access these fields.
- */
-/* FILE_ptr:
- *	This macro is used to access the _ptr field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_PTR is defined.
- */
-/* STDIO_PTR_LVALUE:
- *	This symbol is defined if the FILE_ptr macro can be used as an
- *	lvalue.
- */
-/* FILE_cnt:
- *	This macro is used to access the _cnt field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_PTR is defined.
- */
-/* STDIO_CNT_LVALUE:
- *	This symbol is defined if the FILE_cnt macro can be used as an
- *	lvalue.
- */
-/* STDIO_PTR_LVAL_SETS_CNT:
- *	This symbol is defined if using the FILE_ptr macro as an lvalue
- *	to increase the pointer by n has the side effect of decreasing the
- *	value of File_cnt(fp) by n.
- */
-/* STDIO_PTR_LVAL_NOCHANGE_CNT:
- *	This symbol is defined if using the FILE_ptr macro as an lvalue
- *	to increase the pointer by n leaves File_cnt(fp) unchanged.
- */
-#define USE_STDIO_PTR 	/**/
-#ifdef USE_STDIO_PTR
-#define FILE_ptr(fp)	((fp)->_ptr)
-#define STDIO_PTR_LVALUE 		/**/
-#define FILE_cnt(fp)	((fp)->_cnt)
-#define STDIO_CNT_LVALUE 		/**/
-/*#define STDIO_PTR_LVAL_SETS_CNT	/ **/
-#define STDIO_PTR_LVAL_NOCHANGE_CNT	/**/
-#endif
-
-/* USE_STDIO_BASE:
- *	This symbol is defined if the _base field (or similar) of the
- *	stdio FILE structure can be used to access the stdio buffer for
- *	a file handle.  If this is defined, then the FILE_base(fp) macro
- *	will also be defined and should be used to access this field.
- *	Also, the FILE_bufsiz(fp) macro will be defined and should be used
- *	to determine the number of bytes in the buffer.  USE_STDIO_BASE
- *	will never be defined unless USE_STDIO_PTR is.
- */
-/* FILE_base:
- *	This macro is used to access the _base field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_BASE is defined.
- */
-/* FILE_bufsiz:
- *	This macro is used to determine the number of bytes in the I/O
- *	buffer pointed to by _base field (or equivalent) of the FILE
- *	structure pointed to its argument. This macro will always be defined
- *	if USE_STDIO_BASE is defined.
- */
-#define USE_STDIO_BASE 	/**/
-#ifdef USE_STDIO_BASE
-#define FILE_base(fp)	((fp)->_base)
-#define FILE_bufsiz(fp)	((fp)->_cnt + (fp)->_ptr - (fp)->_base)
-#endif
-
 /* USE_STRUCT_COPY:
  *	This symbol, if defined, indicates that this C compiler knows how
  *	to copy structures.  If undefined, you'll need to use a block copy
@@ -2550,69 +2135,12 @@
 #define HAS_SYS_ERRLIST	/**/
 #define Strerror(e) strerror(e)
 
-/* HAS_STRERROR_R:
- *	This symbol, if defined, indicates that the strerror_r routine
- *	is available to strerror re-entrantly.
- */
-/* STRERROR_R_PROTO:
- *	This symbol encodes the prototype of strerror_r.
- *	It is zero if d_strerror_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_strerror_r
- *	is defined.
- */
-/*#define HAS_STRERROR_R	   / **/
-#define STRERROR_R_PROTO 0	   /**/
-
 /* HAS_STRTOUL:
  *	This symbol, if defined, indicates that the strtoul routine is
  *	available to provide conversion of strings to unsigned long.
  */
 #define HAS_STRTOUL	/**/
 
-/* HAS_TIME:
- *	This symbol, if defined, indicates that the time() routine exists.
- */
-/* Time_t:
- *	This symbol holds the type returned by time(). It can be long,
- *	or time_t on BSD sites (in which case <sys/types.h> should be
- *	included).
- */
-#define HAS_TIME		/**/
-#define Time_t time_t		/* Time type */
-
-/* HAS_TIMES:
- *	This symbol, if defined, indicates that the times() routine exists.
- *	Note that this became obsolete on some systems (SUNOS), which now
- * use getrusage(). It may be necessary to include <sys/times.h>.
- */
-#define HAS_TIMES		/**/
-
-/* HAS_TMPNAM_R:
- *	This symbol, if defined, indicates that the tmpnam_r routine
- *	is available to tmpnam re-entrantly.
- */
-/* TMPNAM_R_PROTO:
- *	This symbol encodes the prototype of tmpnam_r.
- *	It is zero if d_tmpnam_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_tmpnam_r
- *	is defined.
- */
-/*#define HAS_TMPNAM_R	   / **/
-#define TMPNAM_R_PROTO 0	   /**/
-
-/* HAS_TTYNAME_R:
- *	This symbol, if defined, indicates that the ttyname_r routine
- *	is available to ttyname re-entrantly.
- */
-/* TTYNAME_R_PROTO:
- *	This symbol encodes the prototype of ttyname_r.
- *	It is zero if d_ttyname_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ttyname_r
- *	is defined.
- */
-/*#define HAS_TTYNAME_R	   / **/
-#define TTYNAME_R_PROTO 0	   /**/
-
 /* HAS_UNION_SEMUN:
  *	This symbol, if defined, indicates that the union semun is
  *	defined by including <sys/sem.h>.  If not, the user code
@@ -2663,64 +2191,6 @@
 #define volatile
 #endif
 
-/* HAS_VPRINTF:
- *	This symbol, if defined, indicates that the vprintf routine is available
- *	to printf with a pointer to an argument list.  If unavailable, you
- *	may need to write your own, probably in terms of _doprnt().
- */
-/* USE_CHAR_VSPRINTF:
- *	This symbol is defined if this system has vsprintf() returning type
- *	(char*).  The trend seems to be to declare it as "int vsprintf()".  It
- *	is up to the package author to declare vsprintf correctly based on the
- *	symbol.
- */
-#define HAS_VPRINTF	/**/
-/*#define USE_CHAR_VSPRINTF 	/ **/
-
-/* DOUBLESIZE:
- *	This symbol contains the size of a double, so that the C preprocessor
- *	can make decisions based on it.
- */
-#define DOUBLESIZE 8		/**/
-
-/* EBCDIC:
- *	This symbol, if defined, indicates that this system uses
- *	EBCDIC encoding.
- */
-/*#define	EBCDIC 		/ **/
-
-/* Fpos_t:
- *	This symbol holds the type used to declare file positions in libc.
- *	It can be fpos_t, long, uint, etc... It may be necessary to include
- *	<sys/types.h> to get any typedef'ed information.
- */
-#define Fpos_t fpos_t		/* File position type */
-
-/* Gid_t_f:
- *	This symbol defines the format string used for printing a Gid_t.
- */
-#define	Gid_t_f		"ld"		/**/
-
-/* Gid_t_sign:
- *	This symbol holds the signedness of a Gid_t.
- *	1 for unsigned, -1 for signed.
- */
-#define Gid_t_sign	-1		/* GID sign */
-
-/* Gid_t_size:
- *	This symbol holds the size of a Gid_t in bytes.
- */
-#define Gid_t_size 4		/* GID size */
-
-/* Gid_t:
- *	This symbol holds the return type of getgid() and the type of
- *	argument to setrgid() and related functions.  Typically,
- *	it is the type of group ids in the kernel. It can be int, ushort,
- *	gid_t, etc... It may be necessary to include <sys/types.h> to get
- *	any typedef'ed information.
- */
-#define Gid_t gid_t		/* Type for getgid(), etc... */
-
 /* I_DIRENT:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <dirent.h>. Using this symbol also triggers the definition
@@ -2758,12 +2228,6 @@
 /*#define I_GRP		/ **/
 /*#define GRPASSWD	/ **/
 
-/* I_MACH_CTHREADS:
- *     This symbol, if defined, indicates to the C program that it should
- *     include <mach/cthreads.h>.
- */
-/*#define   I_MACH_CTHREADS	/ **/
-
 /* I_NDBM:
  *	This symbol, if defined, indicates that <ndbm.h> exists and should
  *	be included.
@@ -2815,12 +2279,6 @@
  */
 /*#define I_NET_ERRNO		/ **/
 
-/* I_PTHREAD:
- *     This symbol, if defined, indicates to the C program that it should
- *     include <pthread.h>.
- */
-/*#define   I_PTHREAD	/ **/
-
 /* I_PWD:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <pwd.h>.
@@ -2867,18 +2325,6 @@
 /*#define PWGECOS	/ **/
 /*#define PWPASSWD	/ **/
 
-/* I_SYS_ACCESS:
- *     This symbol, if defined, indicates to the C program that it should
- *     include <sys/access.h>.
- */
-/*#define   I_SYS_ACCESS                / **/
-
-/* I_SYS_SECURITY:
- *     This symbol, if defined, indicates to the C program that it should
- *     include <sys/security.h>.
- */
-/*#define   I_SYS_SECURITY	/ **/
-
 /* I_SYSUIO:
  *	This symbol, if defined, indicates that <sys/uio.h> exists and
  *	should be included.
@@ -2905,32 +2351,6 @@
 /*#define I_TERMIOS		/ **/
 /*#define I_SGTTY		/ **/
 
-/* I_TIME:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <time.h>.
- */
-/* I_SYS_TIME:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sys/time.h>.
- */
-/* I_SYS_TIME_KERNEL:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sys/time.h> with KERNEL defined.
- */
-/* HAS_TM_TM_ZONE:
- *	This symbol, if defined, indicates to the C program that
- *	the struct tm has a tm_zone field.
- */
-/* HAS_TM_TM_GMTOFF:
- *	This symbol, if defined, indicates to the C program that
- *	the struct tm has a tm_gmtoff field.
- */
-#define I_TIME		/**/
-/*#define I_SYS_TIME		/ **/
-/*#define I_SYS_TIME_KERNEL		/ **/
-/*#define HAS_TM_TM_ZONE		/ **/
-/*#define HAS_TM_TM_GMTOFF		/ **/
-
 /* I_STDARG:
  *	This symbol, if defined, indicates that <stdarg.h> exists and should
  *	be included.
@@ -2942,36 +2362,6 @@
 #define I_STDARG		/**/
 /*#define I_VARARGS	/ **/
 
-/* PERL_INC_VERSION_LIST:
- *	This variable specifies the list of subdirectories in over
- *	which perl.c:incpush() and lib/lib.pm will automatically
- *	search when adding directories to @INC, in a format suitable
- *	for a C initialization string.  See the inc_version_list entry
- *	in Porting/Glossary for more details.
- */
-/*#define PERL_INC_VERSION_LIST 0		/ **/
-
-/* INSTALL_USR_BIN_PERL:
- *	This symbol, if defined, indicates that Perl is to be installed
- * 	also as /usr/bin/perl.
- */
-/*#define INSTALL_USR_BIN_PERL	/ **/
-
-/* Off_t:
- *	This symbol holds the type used to declare offsets in the kernel.
- *	It can be int, long, off_t, etc... It may be necessary to include
- *	<sys/types.h> to get any typedef'ed information.
- */
-/* LSEEKSIZE:
- *	This symbol holds the number of bytes used by the Off_t.
- */
-/* Off_t_size:
- *	This symbol holds the number of bytes used by the Off_t.
- */
-#define Off_t long long		/* <offset> type */
-#define LSEEKSIZE 8		/* <offset> size */
-#define Off_t_size 8	/* <offset> size */
-
 /* Free_t:
  *	This variable contains the return type of free().  It is usually
  * void, but occasionally int.
@@ -2992,92 +2382,6 @@
  */
 /*#define MYMALLOC			/ **/
 
-/* Mode_t:
- *	This symbol holds the type used to declare file modes
- *	for systems calls.  It is usually mode_t, but may be
- *	int or unsigned short.  It may be necessary to include <sys/types.h>
- *	to get any typedef'ed information.
- */
-#define Mode_t mode_t	 /* file mode parameter for system calls */
-
-/* VAL_O_NONBLOCK:
- *	This symbol is to be used during open() or fcntl(F_SETFL) to turn on
- *	non-blocking I/O for the file descriptor. Note that there is no way
- *	back, i.e. you cannot turn it blocking again this way. If you wish to
- *	alternatively switch between blocking and non-blocking, use the
- *	ioctl(FIOSNBIO) call instead, but that is not supported by all devices.
- */
-/* VAL_EAGAIN:
- *	This symbol holds the errno error code set by read() when no data was
- *	present on the non-blocking file descriptor.
- */
-/* RD_NODATA:
- *	This symbol holds the return code from read() when no data is present
- *	on the non-blocking file descriptor. Be careful! If EOF_NONBLOCK is
- *	not defined, then you can't distinguish between no data and EOF by
- *	issuing a read(). You'll have to find another way to tell for sure!
- */
-/* EOF_NONBLOCK:
- *	This symbol, if defined, indicates to the C program that a read() on
- *	a non-blocking file descriptor will return 0 on EOF, and not the value
- *	held in RD_NODATA (-1 usually, in that case!).
- */
-#define VAL_O_NONBLOCK O_NONBLOCK
-#define VAL_EAGAIN EAGAIN
-#define RD_NODATA -1
-#define EOF_NONBLOCK
-
-/* Netdb_host_t:
- *	This symbol holds the type used for the 1st argument
- *	to gethostbyaddr().
- */
-/* Netdb_hlen_t:
- *	This symbol holds the type used for the 2nd argument
- *	to gethostbyaddr().
- */
-/* Netdb_name_t:
- *	This symbol holds the type used for the argument to
- *	gethostbyname().
- */
-/* Netdb_net_t:
- *	This symbol holds the type used for the 1st argument to
- *	getnetbyaddr().
- */
-#define Netdb_host_t		char * /**/
-#define Netdb_hlen_t		int /**/
-#define Netdb_name_t		char * /**/
-#define Netdb_net_t		long /**/
-
-/* PERL_OTHERLIBDIRS:
- *	This variable contains a colon-separated set of paths for the perl
- *	binary to search for additional library files or modules.
- *	These directories will be tacked to the end of @INC.
- *	Perl will automatically search below each path for version-
- *	and architecture-specific directories.  See PERL_INC_VERSION_LIST
- *	for more details.
- */
-/*#define PERL_OTHERLIBDIRS ""		/ **/
-
-/* Pid_t:
- *	This symbol holds the type used to declare process ids in the kernel.
- *	It can be int, uint, pid_t, etc... It may be necessary to include
- *	<sys/types.h> to get any typedef'ed information.
- */
-#define Pid_t int		/* PID type */
-
-/* PRIVLIB:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
- */
-/* PRIVLIB_EXP:
- *	This symbol contains the ~name expanded version of PRIVLIB, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
- */
-#define PRIVLIB "c:\\tlperl\\lib"		/**/
-#define PRIVLIB_EXP (win32_get_privlib(PERL_VERSION_STRING, NULL))	/**/
-
 /* CAN_PROTOTYPE:
  *	If defined, this macro indicates that the C compiler can handle
  *	function prototypes.
@@ -3096,65 +2400,6 @@
 #define	_(args) ()
 #endif
 
-/* PTRSIZE:
- *	This symbol contains the size of a pointer, so that the C preprocessor
- *	can make decisions based on it.  It will be sizeof(void *) if
- *	the compiler supports (void *); otherwise it will be
- *	sizeof(char *).
- */
-#define PTRSIZE 4		/**/
-
-/* HAS_QUAD:
- *	This symbol, if defined, tells that there's a 64-bit integer type,
- *	Quad_t, and its unsigned counterpart, Uquad_t. QUADKIND will be one
- *	of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, QUAD_IS_INT64_T,
- *	or QUAD_IS___INT64.
- */
-#define HAS_QUAD	/**/
-#ifdef HAS_QUAD
-#   define Quad_t long long	/**/
-#   define Uquad_t unsigned long long	/**/
-#   define QUADKIND 3	/**/
-#   define QUAD_IS_INT	1
-#   define QUAD_IS_LONG	2
-#   define QUAD_IS_LONG_LONG	3
-#   define QUAD_IS_INT64_T	4
-#   define QUAD_IS___INT64	5
-#endif
-
-/* Drand01:
- *	This macro is to be used to generate uniformly distributed
- *	random numbers over the range [0., 1.[.  You may have to supply
- *	an 'extern double drand48();' in your program since SunOS 4.1.3
- *	doesn't provide you with anything relevant in its headers.
- *	See HAS_DRAND48_PROTO.
- */
-/* Rand_seed_t:
- *	This symbol defines the type of the argument of the
- *	random seed function.
- */
-/* seedDrand01:
- *	This symbol defines the macro to be used in seeding the
- *	random number generator (see Drand01).
- */
-/* RANDBITS:
- *	This symbol indicates how many bits are produced by the
- *	function used to generate normalized random numbers.
- *	Values include 15, 16, 31, and 48.
- */
-#define Drand01()		Perl_drand48()		/**/
-#define Rand_seed_t		U32		/**/
-#define seedDrand01(x)	Perl_drand48_init((Rand_seed_t)x)	/**/
-#define RANDBITS		48		/**/
-
-/* Select_fd_set_t:
- *	This symbol holds the type used for the 2nd, 3rd, and 4th
- *	arguments to select.  Usually, this is 'fd_set *', if HAS_FD_SET
- *	is defined, and 'int *' otherwise.  This is only useful if you
- *	have select(), of course.
- */
-#define Select_fd_set_t 	Perl_fd_set *	/**/
-
 /* SH_PATH:
  *	This symbol contains the full pathname to the shell used on this
  *	on this system to execute Bourne shell scripts.  Usually, this will be
@@ -3204,162 +2449,6 @@
 #define SIG_NUM  0, 1, 2, 21, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 20, 0		/**/
 #define SIG_SIZE 27			/**/
 
-/* SITEARCH:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
- *	The standard distribution will put nothing in this directory.
- *	After perl has been installed, users may install their own local
- *	architecture-dependent modules in this directory with
- *		MakeMaker Makefile.PL
- *	or equivalent.  See INSTALL for details.
- */
-/* SITEARCH_EXP:
- *	This symbol contains the ~name expanded version of SITEARCH, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
- */
-#define SITEARCH "c:\\tlperl\\site\\lib"		/**/
-/*#define SITEARCH_EXP ""	/ **/
-
-/* SITELIB:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
- *	The standard distribution will put nothing in this directory.
- *	After perl has been installed, users may install their own local
- *	architecture-independent modules in this directory with
- *		MakeMaker Makefile.PL
- *	or equivalent.  See INSTALL for details.
- */
-/* SITELIB_EXP:
- *	This symbol contains the ~name expanded version of SITELIB, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
- */
-/* SITELIB_STEM:
- *	This define is SITELIB_EXP with any trailing version-specific component
- *	removed.  The elements in inc_version_list (inc_version_list.U) can
- *	be tacked onto this variable to generate a list of directories to search.
- */
-#define SITELIB "c:\\tlperl\\site\\lib"		/**/
-#define SITELIB_EXP (win32_get_sitelib(PERL_VERSION_STRING, NULL))	/**/
-#define SITELIB_STEM ""		/**/
-
-/* Size_t_size:
- *	This symbol holds the size of a Size_t in bytes.
- */
-#define Size_t_size 4		/**/
-
-/* Size_t:
- *	This symbol holds the type used to declare length parameters
- *	for string functions.  It is usually size_t, but may be
- *	unsigned long, int, etc.  It may be necessary to include
- *	<sys/types.h> to get any typedef'ed information.
- */
-#define Size_t size_t	 /* length parameter for string functions */
-
-/* Sock_size_t:
- *	This symbol holds the type used for the size argument of
- *	various socket calls (just the base type, not the pointer-to).
- */
-#define Sock_size_t		int /**/
-
-/* SSize_t:
- *	This symbol holds the type used by functions that return
- *	a count of bytes or an error condition.  It must be a signed type.
- *	It is usually ssize_t, but may be long or int, etc.
- *	It may be necessary to include <sys/types.h> or <unistd.h>
- *	to get any typedef'ed information.
- *	We will pick a type such that sizeof(SSize_t) == sizeof(Size_t).
- */
-#define SSize_t int	 /* signed count of bytes */
-
-/* STDCHAR:
- *	This symbol is defined to be the type of char used in stdio.h.
- *	It has the values "unsigned char" or "char".
- */
-#define STDCHAR char	/**/
-
-/* Uid_t_f:
- *	This symbol defines the format string used for printing a Uid_t.
- */
-#define	Uid_t_f		"ld"		/**/
-
-/* Uid_t_sign:
- *	This symbol holds the signedness of a Uid_t.
- *	1 for unsigned, -1 for signed.
- */
-#define Uid_t_sign	-1		/* UID sign */
-
-/* Uid_t_size:
- *	This symbol holds the size of a Uid_t in bytes.
- */
-#define Uid_t_size 4		/* UID size */
-
-/* Uid_t:
- *	This symbol holds the type used to declare user ids in the kernel.
- *	It can be int, ushort, uid_t, etc... It may be necessary to include
- *	<sys/types.h> to get any typedef'ed information.
- */
-#define Uid_t uid_t		/* UID type */
-
-/* USE_ITHREADS:
- *	This symbol, if defined, indicates that Perl should be built to
- *	use the interpreter-based threading implementation.
- */
-/* USE_5005THREADS:
- *	This symbol, if defined, indicates that Perl should be built to
- *	use the 5.005-based threading implementation.
- *	Only valid up to 5.8.x.
- */
-/* OLD_PTHREADS_API:
- *	This symbol, if defined, indicates that Perl should
- *	be built to use the old draft POSIX threads API.
- */
-/* USE_REENTRANT_API:
- *	This symbol, if defined, indicates that Perl should
- *	try to use the various _r versions of library functions.
- *	This is extremely experimental.
- */
-/*#define	USE_5005THREADS		/ **/
-#define	USE_ITHREADS		/**/
-#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define		USE_THREADS		/* until src is revised*/
-#endif
-/*#define	OLD_PTHREADS_API		/ **/
-/*#define	USE_REENTRANT_API	/ **/
-
-/* PERL_VENDORARCH:
- *	If defined, this symbol contains the name of a private library.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.
- *	It may have a ~ on the front.
- *	The standard distribution will put nothing in this directory.
- *	Vendors who distribute perl may wish to place their own
- *	architecture-dependent modules and extensions in this directory with
- *		MakeMaker Makefile.PL INSTALLDIRS=vendor
- *	or equivalent.  See INSTALL for details.
- */
-/* PERL_VENDORARCH_EXP:
- *	This symbol contains the ~name expanded version of PERL_VENDORARCH, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
- */
-/*#define PERL_VENDORARCH ""		/ **/
-/*#define PERL_VENDORARCH_EXP ""		/ **/
-
-/* PERL_VENDORLIB_EXP:
- *	This symbol contains the ~name expanded version of VENDORLIB, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
- */
-/* PERL_VENDORLIB_STEM:
- *	This define is PERL_VENDORLIB_EXP with any trailing version-specific component
- *	removed.  The elements in inc_version_list (inc_version_list.U) can
- *	be tacked onto this variable to generate a list of directories to search.
- */
-/*#define PERL_VENDORLIB_EXP ""		/ **/
-/*#define PERL_VENDORLIB_STEM ""		/ **/
-
 /* USE_CROSS_COMPILE:
  *	This symbol, if defined, indicates that Perl is being cross-compiled.
  */
@@ -3555,6 +2644,13 @@
  */
 /*#define FCNTL_CAN_LOCK		/ **/
 
+/* HAS_FDCLOSE:
+ *	This symbol, if defined, indicates that the fdclose routine is
+ *	available to free a FILE structure without closing the underlying
+ *	file descriptor.  This function appeared in FreeBSD 10.2.
+ */
+/*#define HAS_FDCLOSE		/ **/
+
 /* HAS_FDIM:
  *	This symbol, if defined, indicates that the fdim routine is
  *	available to do the positive difference function.
@@ -3956,15 +3052,15 @@
 
 /* HAS_LLRINT:
  *	This symbol, if defined, indicates that the llrint routine is
- *	available to return the closest long long value according to
- *	the current rounding mode.
+ *	available to return the long long value closest to a double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LLRINT		/ **/
 
 /* HAS_LLRINTL:
  *	This symbol, if defined, indicates that the llrintl routine is
- *	available to return the closest long long value of the long double
- *	argument according to the current rounding mode.
+ *	available to return the long long value closest to a long double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LLRINTL		/ **/
 
@@ -4001,15 +3097,15 @@
 
 /* HAS_LRINT:
  *	This symbol, if defined, indicates that the lrint routine is
- *	available to return the closest integral value according to
- *	the current rounding mode.
+ *	available to return the integral value closest to a double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LRINT		/ **/
 
 /* HAS_LRINTL:
  *	This symbol, if defined, indicates that the lrintl routine is
- *	available to return the closest integral value of the long double
- *	argument according to the current rounding mode.
+ *	available to return the integral value closest to a long double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LRINTL		/ **/
 
@@ -4044,6 +3140,13 @@
  */
 /*#define HAS_MALLOC_GOOD_SIZE	/ **/
 
+/* HAS_MEMMEM:
+ *	This symbol, if defined, indicates that the memmem routine is
+ *	available to return a pointer to the start of the first occurance
+ *	of a substring in a memory area (or NULL if not found).
+ */
+/*#define HAS_MEMMEM		/ **/
+
 /* HAS_MKDTEMP:
  *	This symbol, if defined, indicates that the mkdtemp routine is
  *	available to exclusively create a uniquely named temporary directory.
@@ -4067,16 +3170,8 @@
  *	a prototype for the modfl() function.  Otherwise, it is up
  *	to the program to supply one.
  */
-/* HAS_MODFL_POW32_BUG:
- *	This symbol, if defined, indicates that the modfl routine is
- *	broken for long doubles >= pow(2, 32).
- *	For example from 4294967303.150000 one would get 4294967302.000000
- *	and 1.150000.  The bug has been seen in certain versions of glibc,
- *	release 2.2.2 is known to be okay.
- */
 /*#define HAS_MODFL		/ **/
 /*#define HAS_MODFL_PROTO		/ **/
-/*#define HAS_MODFL_POW32_BUG		/ **/
 
 /* HAS_MPROTECT:
  *	This symbol, if defined, indicates that the mprotect system call is
@@ -4103,6 +3198,23 @@
  */
 /*#define HAS_NEARBYINT		/ **/
 
+/* HAS_NEWLOCALE:
+ *	This symbol, if defined, indicates that the newlocale routine is
+ *	available to return a new locale object or modify an existing
+ *	locale object.
+ */
+/* HAS_FREELOCALE:
+ *	This symbol, if defined, indicates that the freelocale routine is
+ *	available to deallocates the resources associated with a locale object.
+ */
+/* HAS_USELOCALE:
+ *	This symbol, if defined, indicates that the uselocale routine is
+ *	available to set the current locale for the calling thread.
+ */
+/*#define	HAS_NEWLOCALE	/ **/
+/*#define	HAS_FREELOCALE	/ **/
+/*#define	HAS_USELOCALE	/ **/
+
 /* HAS_NEXTAFTER:
  *	This symbol, if defined, indicates that the nextafter routine is
  *	available to return the next machine representable double from
@@ -4759,6 +3871,27 @@
  */
 /*#define	I_USTAT		/ **/
 
+/* DOUBLEINFBYTES:
+ *	This symbol, if defined, is a comma-separated list of
+ *	hexadecimal bytes for the double precision infinity.
+ */
+/* DOUBLENANBYTES:
+ *	This symbol, if defined, is a comma-separated list of
+ *	hexadecimal bytes (0xHH) for the double precision not-a-number.
+ */
+/* LONGDBLINFBYTES:
+ *	This symbol, if defined, is a comma-separated list of
+ *	hexadecimal bytes for the long double precision infinity.
+ */
+/* LONGDBLNANBYTES:
+ *	This symbol, if defined, is a comma-separated list of
+ *	hexadecimal bytes (0xHH) for the long double precision not-a-number.
+ */
+#define DOUBLEINFBYTES  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x7f		/**/
+#define DOUBLENANBYTES  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x7f		/**/
+#define LONGDBLINFBYTES 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x7f, 0x00, 0x00		/**/
+#define LONGDBLNANBYTES 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x00, 0x00		/**/
+
 /* PERL_PRIfldbl:
  *	This symbol, if defined, contains the string used by stdio to
  *	format long doubles (format 'f') for output.
@@ -4802,6 +3935,30 @@
 /*#define PERL_PRIeldbl	"Le"	/ **/
 /*#define PERL_SCNfldbl	"Lf"	/ **/
 
+/* DOUBLEMANTBITS:
+ *	This symbol, if defined, tells how many mantissa bits
+ *	there are in double precision floating point format.
+ *	Note that this is usually DBL_MANT_DIG minus one, since
+ *	with the standard IEEE 754 formats DBL_MANT_DIG includes
+ *	the implicit bit, which doesn't really exist.
+ */
+/* LONGDBLMANTBITS:
+ *	This symbol, if defined, tells how many mantissa bits
+ *	there are in long double precision floating point format.
+ *	Note that this can be LDBL_MANT_DIG minus one,
+ *	since LDBL_MANT_DIG can include the IEEE 754 implicit bit.
+ *	The common x86-style 80-bit long double does not have
+ *	an implicit bit.
+ */
+/* NVMANTBITS:
+ *	This symbol, if defined, tells how many mantissa bits
+ *	(not including implicit bit) there are in a Perl NV.
+ *	This depends on which floating point type was chosen.
+ */
+#define DOUBLEMANTBITS  52
+#define LONGDBLMANTBITS 64
+#define NVMANTBITS      52
+
 /* NEED_VA_COPY:
  *	This symbol, if defined, indicates that the system stores
  *	the variable argument list datatype, va_list, in a format
@@ -5164,4 +4321,921 @@
 /*#define	USE_SOCKS		/ **/
 #endif
 
+/* HAS_DRAND48_PROTO:
+ *	This symbol, if defined, indicates that the system provides
+ *	a prototype for the drand48() function.  Otherwise, it is up
+ *	to the program to supply one.  A good guess is
+ *		extern double drand48(void);
+ */
+/*#define	HAS_DRAND48_PROTO	/ **/
+
+/* HAS_GETHOST_PROTOS:
+ *	This symbol, if defined, indicates that <netdb.h> includes
+ *	prototypes for gethostent(), gethostbyname(), and
+ *	gethostbyaddr().  Otherwise, it is up to the program to guess
+ *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
+ */
+#define	HAS_GETHOST_PROTOS	/**/
+
+/* HAS_GETNET_PROTOS:
+ *	This symbol, if defined, indicates that <netdb.h> includes
+ *	prototypes for getnetent(), getnetbyname(), and
+ *	getnetbyaddr().  Otherwise, it is up to the program to guess
+ *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
+ */
+/*#define	HAS_GETNET_PROTOS	/ **/
+
+/* HAS_GETPROTO_PROTOS:
+ *	This symbol, if defined, indicates that <netdb.h> includes
+ *	prototypes for getprotoent(), getprotobyname(), and
+ *	getprotobyaddr().  Otherwise, it is up to the program to guess
+ *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
+ */
+#define	HAS_GETPROTO_PROTOS	/**/
+
+/* HAS_GETSERV_PROTOS:
+ *	This symbol, if defined, indicates that <netdb.h> includes
+ *	prototypes for getservent(), getservbyname(), and
+ *	getservbyaddr().  Otherwise, it is up to the program to guess
+ *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
+ */
+#define	HAS_GETSERV_PROTOS	/**/
+
+/* HAS_LSEEK_PROTO:
+ *	This symbol, if defined, indicates that the system provides
+ *	a prototype for the lseek() function.  Otherwise, it is up
+ *	to the program to supply one.  A good guess is
+ *		extern off_t lseek(int, off_t, int);
+ */
+#define	HAS_LSEEK_PROTO	/**/
+
+/* Netdb_host_t:
+ *	This symbol holds the type used for the 1st argument
+ *	to gethostbyaddr().
+ */
+/* Netdb_hlen_t:
+ *	This symbol holds the type used for the 2nd argument
+ *	to gethostbyaddr().
+ */
+/* Netdb_name_t:
+ *	This symbol holds the type used for the argument to
+ *	gethostbyname().
+ */
+/* Netdb_net_t:
+ *	This symbol holds the type used for the 1st argument to
+ *	getnetbyaddr().
+ */
+#define Netdb_host_t		char * /**/
+#define Netdb_hlen_t		int /**/
+#define Netdb_name_t		char * /**/
+#define Netdb_net_t		long /**/
+
+/* Select_fd_set_t:
+ *	This symbol holds the type used for the 2nd, 3rd, and 4th
+ *	arguments to select.  Usually, this is 'fd_set *', if HAS_FD_SET
+ *	is defined, and 'int *' otherwise.  This is only useful if you
+ *	have select(), of course.
+ */
+#define Select_fd_set_t 	Perl_fd_set *	/**/
+
+/* Sock_size_t:
+ *	This symbol holds the type used for the size argument of
+ *	various socket calls (just the base type, not the pointer-to).
+ */
+#define Sock_size_t		int /**/
+
+/* ARCHNAME:
+ *	This symbol holds a string representing the architecture name.
+ *	It may be used to construct an architecture-dependant pathname
+ *	where library files may be held under a private library, for
+ *	instance.
+ */
+#define ARCHNAME "MSWin32-x86-multi-thread"		/**/
+
+/* HAS_ASCTIME_R:
+ *	This symbol, if defined, indicates that the asctime_r routine
+ *	is available to asctime re-entrantly.
+ */
+/* ASCTIME_R_PROTO:
+ *	This symbol encodes the prototype of asctime_r.
+ *	It is zero if d_asctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_asctime_r
+ *	is defined.
+ */
+/*#define HAS_ASCTIME_R	   / **/
+#define ASCTIME_R_PROTO 0	   /**/
+
+/* HAS_CRYPT_R:
+ *	This symbol, if defined, indicates that the crypt_r routine
+ *	is available to crypt re-entrantly.
+ */
+/* CRYPT_R_PROTO:
+ *	This symbol encodes the prototype of crypt_r.
+ *	It is zero if d_crypt_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_crypt_r
+ *	is defined.
+ */
+/*#define HAS_CRYPT_R	   / **/
+#define CRYPT_R_PROTO 0	   /**/
+
+/* HAS_CTERMID_R:
+ *	This symbol, if defined, indicates that the ctermid_r routine
+ *	is available to ctermid re-entrantly.
+ */
+/* CTERMID_R_PROTO:
+ *	This symbol encodes the prototype of ctermid_r.
+ *	It is zero if d_ctermid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctermid_r
+ *	is defined.
+ */
+/*#define HAS_CTERMID_R	   / **/
+#define CTERMID_R_PROTO 0	   /**/
+
+/* HAS_CTIME_R:
+ *	This symbol, if defined, indicates that the ctime_r routine
+ *	is available to ctime re-entrantly.
+ */
+/* CTIME_R_PROTO:
+ *	This symbol encodes the prototype of ctime_r.
+ *	It is zero if d_ctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctime_r
+ *	is defined.
+ */
+/*#define HAS_CTIME_R	   / **/
+#define CTIME_R_PROTO 0	   /**/
+
+/* HAS_DRAND48_R:
+ *	This symbol, if defined, indicates that the drand48_r routine
+ *	is available to drand48 re-entrantly.
+ */
+/* DRAND48_R_PROTO:
+ *	This symbol encodes the prototype of drand48_r.
+ *	It is zero if d_drand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_drand48_r
+ *	is defined.
+ */
+/*#define HAS_DRAND48_R	   / **/
+#define DRAND48_R_PROTO 0	   /**/
+
+/* HAS_ENDGRENT_R:
+ *	This symbol, if defined, indicates that the endgrent_r routine
+ *	is available to endgrent re-entrantly.
+ */
+/* ENDGRENT_R_PROTO:
+ *	This symbol encodes the prototype of endgrent_r.
+ *	It is zero if d_endgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endgrent_r
+ *	is defined.
+ */
+/*#define HAS_ENDGRENT_R	   / **/
+#define ENDGRENT_R_PROTO 0	   /**/
+
+/* HAS_ENDHOSTENT_R:
+ *	This symbol, if defined, indicates that the endhostent_r routine
+ *	is available to endhostent re-entrantly.
+ */
+/* ENDHOSTENT_R_PROTO:
+ *	This symbol encodes the prototype of endhostent_r.
+ *	It is zero if d_endhostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endhostent_r
+ *	is defined.
+ */
+/*#define HAS_ENDHOSTENT_R	   / **/
+#define ENDHOSTENT_R_PROTO 0	   /**/
+
+/* HAS_ENDNETENT_R:
+ *	This symbol, if defined, indicates that the endnetent_r routine
+ *	is available to endnetent re-entrantly.
+ */
+/* ENDNETENT_R_PROTO:
+ *	This symbol encodes the prototype of endnetent_r.
+ *	It is zero if d_endnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endnetent_r
+ *	is defined.
+ */
+/*#define HAS_ENDNETENT_R	   / **/
+#define ENDNETENT_R_PROTO 0	   /**/
+
+/* HAS_ENDPROTOENT_R:
+ *	This symbol, if defined, indicates that the endprotoent_r routine
+ *	is available to endprotoent re-entrantly.
+ */
+/* ENDPROTOENT_R_PROTO:
+ *	This symbol encodes the prototype of endprotoent_r.
+ *	It is zero if d_endprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endprotoent_r
+ *	is defined.
+ */
+/*#define HAS_ENDPROTOENT_R	   / **/
+#define ENDPROTOENT_R_PROTO 0	   /**/
+
+/* HAS_ENDPWENT_R:
+ *	This symbol, if defined, indicates that the endpwent_r routine
+ *	is available to endpwent re-entrantly.
+ */
+/* ENDPWENT_R_PROTO:
+ *	This symbol encodes the prototype of endpwent_r.
+ *	It is zero if d_endpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endpwent_r
+ *	is defined.
+ */
+/*#define HAS_ENDPWENT_R	   / **/
+#define ENDPWENT_R_PROTO 0	   /**/
+
+/* HAS_ENDSERVENT_R:
+ *	This symbol, if defined, indicates that the endservent_r routine
+ *	is available to endservent re-entrantly.
+ */
+/* ENDSERVENT_R_PROTO:
+ *	This symbol encodes the prototype of endservent_r.
+ *	It is zero if d_endservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endservent_r
+ *	is defined.
+ */
+/*#define HAS_ENDSERVENT_R	   / **/
+#define ENDSERVENT_R_PROTO 0	   /**/
+
+/* HAS_GETGRENT_R:
+ *	This symbol, if defined, indicates that the getgrent_r routine
+ *	is available to getgrent re-entrantly.
+ */
+/* GETGRENT_R_PROTO:
+ *	This symbol encodes the prototype of getgrent_r.
+ *	It is zero if d_getgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrent_r
+ *	is defined.
+ */
+/*#define HAS_GETGRENT_R	   / **/
+#define GETGRENT_R_PROTO 0	   /**/
+
+/* HAS_GETGRGID_R:
+ *	This symbol, if defined, indicates that the getgrgid_r routine
+ *	is available to getgrgid re-entrantly.
+ */
+/* GETGRGID_R_PROTO:
+ *	This symbol encodes the prototype of getgrgid_r.
+ *	It is zero if d_getgrgid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrgid_r
+ *	is defined.
+ */
+/*#define HAS_GETGRGID_R	   / **/
+#define GETGRGID_R_PROTO 0	   /**/
+
+/* HAS_GETGRNAM_R:
+ *	This symbol, if defined, indicates that the getgrnam_r routine
+ *	is available to getgrnam re-entrantly.
+ */
+/* GETGRNAM_R_PROTO:
+ *	This symbol encodes the prototype of getgrnam_r.
+ *	It is zero if d_getgrnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrnam_r
+ *	is defined.
+ */
+/*#define HAS_GETGRNAM_R	   / **/
+#define GETGRNAM_R_PROTO 0	   /**/
+
+/* HAS_GETHOSTBYADDR_R:
+ *	This symbol, if defined, indicates that the gethostbyaddr_r routine
+ *	is available to gethostbyaddr re-entrantly.
+ */
+/* GETHOSTBYADDR_R_PROTO:
+ *	This symbol encodes the prototype of gethostbyaddr_r.
+ *	It is zero if d_gethostbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyaddr_r
+ *	is defined.
+ */
+/*#define HAS_GETHOSTBYADDR_R	   / **/
+#define GETHOSTBYADDR_R_PROTO 0	   /**/
+
+/* HAS_GETHOSTBYNAME_R:
+ *	This symbol, if defined, indicates that the gethostbyname_r routine
+ *	is available to gethostbyname re-entrantly.
+ */
+/* GETHOSTBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of gethostbyname_r.
+ *	It is zero if d_gethostbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyname_r
+ *	is defined.
+ */
+/*#define HAS_GETHOSTBYNAME_R	   / **/
+#define GETHOSTBYNAME_R_PROTO 0	   /**/
+
+/* HAS_GETHOSTENT_R:
+ *	This symbol, if defined, indicates that the gethostent_r routine
+ *	is available to gethostent re-entrantly.
+ */
+/* GETHOSTENT_R_PROTO:
+ *	This symbol encodes the prototype of gethostent_r.
+ *	It is zero if d_gethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostent_r
+ *	is defined.
+ */
+/*#define HAS_GETHOSTENT_R	   / **/
+#define GETHOSTENT_R_PROTO 0	   /**/
+
+/* HAS_GETLOGIN_R:
+ *	This symbol, if defined, indicates that the getlogin_r routine
+ *	is available to getlogin re-entrantly.
+ */
+/* GETLOGIN_R_PROTO:
+ *	This symbol encodes the prototype of getlogin_r.
+ *	It is zero if d_getlogin_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getlogin_r
+ *	is defined.
+ */
+/*#define HAS_GETLOGIN_R	   / **/
+#define GETLOGIN_R_PROTO 0	   /**/
+
+/* HAS_GETNETBYADDR_R:
+ *	This symbol, if defined, indicates that the getnetbyaddr_r routine
+ *	is available to getnetbyaddr re-entrantly.
+ */
+/* GETNETBYADDR_R_PROTO:
+ *	This symbol encodes the prototype of getnetbyaddr_r.
+ *	It is zero if d_getnetbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyaddr_r
+ *	is defined.
+ */
+/*#define HAS_GETNETBYADDR_R	   / **/
+#define GETNETBYADDR_R_PROTO 0	   /**/
+
+/* HAS_GETNETBYNAME_R:
+ *	This symbol, if defined, indicates that the getnetbyname_r routine
+ *	is available to getnetbyname re-entrantly.
+ */
+/* GETNETBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of getnetbyname_r.
+ *	It is zero if d_getnetbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyname_r
+ *	is defined.
+ */
+/*#define HAS_GETNETBYNAME_R	   / **/
+#define GETNETBYNAME_R_PROTO 0	   /**/
+
+/* HAS_GETNETENT_R:
+ *	This symbol, if defined, indicates that the getnetent_r routine
+ *	is available to getnetent re-entrantly.
+ */
+/* GETNETENT_R_PROTO:
+ *	This symbol encodes the prototype of getnetent_r.
+ *	It is zero if d_getnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetent_r
+ *	is defined.
+ */
+/*#define HAS_GETNETENT_R	   / **/
+#define GETNETENT_R_PROTO 0	   /**/
+
+/* HAS_GETPROTOBYNAME_R:
+ *	This symbol, if defined, indicates that the getprotobyname_r routine
+ *	is available to getprotobyname re-entrantly.
+ */
+/* GETPROTOBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of getprotobyname_r.
+ *	It is zero if d_getprotobyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobyname_r
+ *	is defined.
+ */
+/*#define HAS_GETPROTOBYNAME_R	   / **/
+#define GETPROTOBYNAME_R_PROTO 0	   /**/
+
+/* HAS_GETPROTOBYNUMBER_R:
+ *	This symbol, if defined, indicates that the getprotobynumber_r routine
+ *	is available to getprotobynumber re-entrantly.
+ */
+/* GETPROTOBYNUMBER_R_PROTO:
+ *	This symbol encodes the prototype of getprotobynumber_r.
+ *	It is zero if d_getprotobynumber_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobynumber_r
+ *	is defined.
+ */
+/*#define HAS_GETPROTOBYNUMBER_R	   / **/
+#define GETPROTOBYNUMBER_R_PROTO 0	   /**/
+
+/* HAS_GETPROTOENT_R:
+ *	This symbol, if defined, indicates that the getprotoent_r routine
+ *	is available to getprotoent re-entrantly.
+ */
+/* GETPROTOENT_R_PROTO:
+ *	This symbol encodes the prototype of getprotoent_r.
+ *	It is zero if d_getprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotoent_r
+ *	is defined.
+ */
+/*#define HAS_GETPROTOENT_R	   / **/
+#define GETPROTOENT_R_PROTO 0	   /**/
+
+/* HAS_GETPWENT_R:
+ *	This symbol, if defined, indicates that the getpwent_r routine
+ *	is available to getpwent re-entrantly.
+ */
+/* GETPWENT_R_PROTO:
+ *	This symbol encodes the prototype of getpwent_r.
+ *	It is zero if d_getpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwent_r
+ *	is defined.
+ */
+/*#define HAS_GETPWENT_R	   / **/
+#define GETPWENT_R_PROTO 0	   /**/
+
+/* HAS_GETPWNAM_R:
+ *	This symbol, if defined, indicates that the getpwnam_r routine
+ *	is available to getpwnam re-entrantly.
+ */
+/* GETPWNAM_R_PROTO:
+ *	This symbol encodes the prototype of getpwnam_r.
+ *	It is zero if d_getpwnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwnam_r
+ *	is defined.
+ */
+/*#define HAS_GETPWNAM_R	   / **/
+#define GETPWNAM_R_PROTO 0	   /**/
+
+/* HAS_GETPWUID_R:
+ *	This symbol, if defined, indicates that the getpwuid_r routine
+ *	is available to getpwuid re-entrantly.
+ */
+/* GETPWUID_R_PROTO:
+ *	This symbol encodes the prototype of getpwuid_r.
+ *	It is zero if d_getpwuid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwuid_r
+ *	is defined.
+ */
+/*#define HAS_GETPWUID_R	   / **/
+#define GETPWUID_R_PROTO 0	   /**/
+
+/* HAS_GETSERVBYNAME_R:
+ *	This symbol, if defined, indicates that the getservbyname_r routine
+ *	is available to getservbyname re-entrantly.
+ */
+/* GETSERVBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of getservbyname_r.
+ *	It is zero if d_getservbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyname_r
+ *	is defined.
+ */
+/*#define HAS_GETSERVBYNAME_R	   / **/
+#define GETSERVBYNAME_R_PROTO 0	   /**/
+
+/* HAS_GETSERVBYPORT_R:
+ *	This symbol, if defined, indicates that the getservbyport_r routine
+ *	is available to getservbyport re-entrantly.
+ */
+/* GETSERVBYPORT_R_PROTO:
+ *	This symbol encodes the prototype of getservbyport_r.
+ *	It is zero if d_getservbyport_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyport_r
+ *	is defined.
+ */
+/*#define HAS_GETSERVBYPORT_R	   / **/
+#define GETSERVBYPORT_R_PROTO 0	   /**/
+
+/* HAS_GETSERVENT_R:
+ *	This symbol, if defined, indicates that the getservent_r routine
+ *	is available to getservent re-entrantly.
+ */
+/* GETSERVENT_R_PROTO:
+ *	This symbol encodes the prototype of getservent_r.
+ *	It is zero if d_getservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservent_r
+ *	is defined.
+ */
+/*#define HAS_GETSERVENT_R	   / **/
+#define GETSERVENT_R_PROTO 0	   /**/
+
+/* HAS_GETSPNAM_R:
+ *	This symbol, if defined, indicates that the getspnam_r routine
+ *	is available to getspnam re-entrantly.
+ */
+/* GETSPNAM_R_PROTO:
+ *	This symbol encodes the prototype of getspnam_r.
+ *	It is zero if d_getspnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getspnam_r
+ *	is defined.
+ */
+/*#define HAS_GETSPNAM_R	   / **/
+#define GETSPNAM_R_PROTO 0	   /**/
+
+/* HAS_GMTIME_R:
+ *	This symbol, if defined, indicates that the gmtime_r routine
+ *	is available to gmtime re-entrantly.
+ */
+/* GMTIME_R_PROTO:
+ *	This symbol encodes the prototype of gmtime_r.
+ *	It is zero if d_gmtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gmtime_r
+ *	is defined.
+ */
+/*#define HAS_GMTIME_R	   / **/
+#define GMTIME_R_PROTO 0	   /**/
+
+/* HAS_LOCALTIME_R:
+ *	This symbol, if defined, indicates that the localtime_r routine
+ *	is available to localtime re-entrantly.
+ */
+/* LOCALTIME_R_NEEDS_TZSET:
+ *	Many libc's localtime_r implementations do not call tzset,
+ *	making them differ from localtime(), and making timezone
+ *	changes using \undef{TZ} without explicitly calling tzset
+ *	impossible. This symbol makes us call tzset before localtime_r
+ */
+/*#define LOCALTIME_R_NEEDS_TZSET / **/
+#ifdef LOCALTIME_R_NEEDS_TZSET
+#define L_R_TZSET tzset(),
+#else
+#define L_R_TZSET
+#endif
+
+/* LOCALTIME_R_PROTO:
+ *	This symbol encodes the prototype of localtime_r.
+ *	It is zero if d_localtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_localtime_r
+ *	is defined.
+ */
+/*#define HAS_LOCALTIME_R	   / **/
+#define LOCALTIME_R_PROTO 0	   /**/
+
+/* OLD_PTHREAD_CREATE_JOINABLE:
+ *	This symbol, if defined, indicates how to create pthread
+ *	in joinable (aka undetached) state.  NOTE: not defined
+ *	if pthread.h already has defined PTHREAD_CREATE_JOINABLE
+ *	(the new version of the constant).
+ *	If defined, known values are PTHREAD_CREATE_UNDETACHED
+ *	and __UNDETACHED.
+ */
+/*#define OLD_PTHREAD_CREATE_JOINABLE  / **/
+
+/* HAS_PTHREAD_ATFORK:
+ *	This symbol, if defined, indicates that the pthread_atfork routine
+ *	is available to setup fork handlers.
+ */
+/*#define HAS_PTHREAD_ATFORK		/ **/
+
+/* HAS_PTHREAD_YIELD:
+ *	This symbol, if defined, indicates that the pthread_yield
+ *	routine is available to yield the execution of the current
+ *	thread.	 sched_yield is preferable to pthread_yield.
+ */
+/* SCHED_YIELD:
+ *	This symbol defines the way to yield the execution of
+ *	the current thread.  Known ways are sched_yield,
+ *	pthread_yield, and pthread_yield with NULL.
+ */
+/* HAS_SCHED_YIELD:
+ *	This symbol, if defined, indicates that the sched_yield
+ *	routine is available to yield the execution of the current
+ *	thread.	 sched_yield is preferable to pthread_yield.
+ */
+/*#define HAS_PTHREAD_YIELD	/ **/
+#define SCHED_YIELD		/**/
+/*#define HAS_SCHED_YIELD	/ **/
+
+/* HAS_RANDOM_R:
+ *	This symbol, if defined, indicates that the random_r routine
+ *	is available to random re-entrantly.
+ */
+/* RANDOM_R_PROTO:
+ *	This symbol encodes the prototype of random_r.
+ *	It is zero if d_random_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_random_r
+ *	is defined.
+ */
+/*#define HAS_RANDOM_R	   / **/
+#define RANDOM_R_PROTO 0	   /**/
+
+/* HAS_READDIR64_R:
+ *	This symbol, if defined, indicates that the readdir64_r routine
+ *	is available to readdir64 re-entrantly.
+ */
+/* READDIR64_R_PROTO:
+ *	This symbol encodes the prototype of readdir64_r.
+ *	It is zero if d_readdir64_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir64_r
+ *	is defined.
+ */
+/*#define HAS_READDIR64_R	   / **/
+#define READDIR64_R_PROTO 0	   /**/
+
+/* HAS_READDIR_R:
+ *	This symbol, if defined, indicates that the readdir_r routine
+ *	is available to readdir re-entrantly.
+ */
+/* READDIR_R_PROTO:
+ *	This symbol encodes the prototype of readdir_r.
+ *	It is zero if d_readdir_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir_r
+ *	is defined.
+ */
+/*#define HAS_READDIR_R	   / **/
+#define READDIR_R_PROTO 0	   /**/
+
+/* HAS_SETGRENT_R:
+ *	This symbol, if defined, indicates that the setgrent_r routine
+ *	is available to setgrent re-entrantly.
+ */
+/* SETGRENT_R_PROTO:
+ *	This symbol encodes the prototype of setgrent_r.
+ *	It is zero if d_setgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setgrent_r
+ *	is defined.
+ */
+/*#define HAS_SETGRENT_R	   / **/
+#define SETGRENT_R_PROTO 0	   /**/
+
+/* HAS_SETHOSTENT_R:
+ *	This symbol, if defined, indicates that the sethostent_r routine
+ *	is available to sethostent re-entrantly.
+ */
+/* SETHOSTENT_R_PROTO:
+ *	This symbol encodes the prototype of sethostent_r.
+ *	It is zero if d_sethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_sethostent_r
+ *	is defined.
+ */
+/*#define HAS_SETHOSTENT_R	   / **/
+#define SETHOSTENT_R_PROTO 0	   /**/
+
+/* HAS_SETLOCALE_R:
+ *	This symbol, if defined, indicates that the setlocale_r routine
+ *	is available to setlocale re-entrantly.
+ */
+/* SETLOCALE_R_PROTO:
+ *	This symbol encodes the prototype of setlocale_r.
+ *	It is zero if d_setlocale_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setlocale_r
+ *	is defined.
+ */
+/*#define HAS_SETLOCALE_R	   / **/
+#define SETLOCALE_R_PROTO 0	   /**/
+
+/* HAS_SETNETENT_R:
+ *	This symbol, if defined, indicates that the setnetent_r routine
+ *	is available to setnetent re-entrantly.
+ */
+/* SETNETENT_R_PROTO:
+ *	This symbol encodes the prototype of setnetent_r.
+ *	It is zero if d_setnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setnetent_r
+ *	is defined.
+ */
+/*#define HAS_SETNETENT_R	   / **/
+#define SETNETENT_R_PROTO 0	   /**/
+
+/* HAS_SETPROTOENT_R:
+ *	This symbol, if defined, indicates that the setprotoent_r routine
+ *	is available to setprotoent re-entrantly.
+ */
+/* SETPROTOENT_R_PROTO:
+ *	This symbol encodes the prototype of setprotoent_r.
+ *	It is zero if d_setprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setprotoent_r
+ *	is defined.
+ */
+/*#define HAS_SETPROTOENT_R	   / **/
+#define SETPROTOENT_R_PROTO 0	   /**/
+
+/* HAS_SETPWENT_R:
+ *	This symbol, if defined, indicates that the setpwent_r routine
+ *	is available to setpwent re-entrantly.
+ */
+/* SETPWENT_R_PROTO:
+ *	This symbol encodes the prototype of setpwent_r.
+ *	It is zero if d_setpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setpwent_r
+ *	is defined.
+ */
+/*#define HAS_SETPWENT_R	   / **/
+#define SETPWENT_R_PROTO 0	   /**/
+
+/* HAS_SETSERVENT_R:
+ *	This symbol, if defined, indicates that the setservent_r routine
+ *	is available to setservent re-entrantly.
+ */
+/* SETSERVENT_R_PROTO:
+ *	This symbol encodes the prototype of setservent_r.
+ *	It is zero if d_setservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setservent_r
+ *	is defined.
+ */
+/*#define HAS_SETSERVENT_R	   / **/
+#define SETSERVENT_R_PROTO 0	   /**/
+
+/* HAS_SRAND48_R:
+ *	This symbol, if defined, indicates that the srand48_r routine
+ *	is available to srand48 re-entrantly.
+ */
+/* SRAND48_R_PROTO:
+ *	This symbol encodes the prototype of srand48_r.
+ *	It is zero if d_srand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srand48_r
+ *	is defined.
+ */
+/*#define HAS_SRAND48_R	   / **/
+#define SRAND48_R_PROTO 0	   /**/
+
+/* HAS_SRANDOM_R:
+ *	This symbol, if defined, indicates that the srandom_r routine
+ *	is available to srandom re-entrantly.
+ */
+/* SRANDOM_R_PROTO:
+ *	This symbol encodes the prototype of srandom_r.
+ *	It is zero if d_srandom_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srandom_r
+ *	is defined.
+ */
+/*#define HAS_SRANDOM_R	   / **/
+#define SRANDOM_R_PROTO 0	   /**/
+
+/* HAS_STRERROR_R:
+ *	This symbol, if defined, indicates that the strerror_r routine
+ *	is available to strerror re-entrantly.
+ */
+/* STRERROR_R_PROTO:
+ *	This symbol encodes the prototype of strerror_r.
+ *	It is zero if d_strerror_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_strerror_r
+ *	is defined.
+ */
+/*#define HAS_STRERROR_R	   / **/
+#define STRERROR_R_PROTO 0	   /**/
+
+/* HAS_TMPNAM_R:
+ *	This symbol, if defined, indicates that the tmpnam_r routine
+ *	is available to tmpnam re-entrantly.
+ */
+/* TMPNAM_R_PROTO:
+ *	This symbol encodes the prototype of tmpnam_r.
+ *	It is zero if d_tmpnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_tmpnam_r
+ *	is defined.
+ */
+/*#define HAS_TMPNAM_R	   / **/
+#define TMPNAM_R_PROTO 0	   /**/
+
+/* HAS_TTYNAME_R:
+ *	This symbol, if defined, indicates that the ttyname_r routine
+ *	is available to ttyname re-entrantly.
+ */
+/* TTYNAME_R_PROTO:
+ *	This symbol encodes the prototype of ttyname_r.
+ *	It is zero if d_ttyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ttyname_r
+ *	is defined.
+ */
+/*#define HAS_TTYNAME_R	   / **/
+#define TTYNAME_R_PROTO 0	   /**/
+
+/* I_MACH_CTHREADS:
+ *     This symbol, if defined, indicates to the C program that it should
+ *     include <mach/cthreads.h>.
+ */
+/*#define   I_MACH_CTHREADS	/ **/
+
+/* I_PTHREAD:
+ *     This symbol, if defined, indicates to the C program that it should
+ *     include <pthread.h>.
+ */
+/*#define   I_PTHREAD	/ **/
+
+/* USE_ITHREADS:
+ *	This symbol, if defined, indicates that Perl should be built to
+ *	use the interpreter-based threading implementation.
+ */
+/* USE_5005THREADS:
+ *	This symbol, if defined, indicates that Perl should be built to
+ *	use the 5.005-based threading implementation.
+ *	Only valid up to 5.8.x.
+ */
+/* OLD_PTHREADS_API:
+ *	This symbol, if defined, indicates that Perl should
+ *	be built to use the old draft POSIX threads API.
+ */
+/* USE_REENTRANT_API:
+ *	This symbol, if defined, indicates that Perl should
+ *	try to use the various _r versions of library functions.
+ *	This is extremely experimental.
+ */
+/*#define	USE_5005THREADS		/ **/
+#define	USE_ITHREADS		/**/
+#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
+#define		USE_THREADS		/* until src is revised*/
+#endif
+/*#define	OLD_PTHREADS_API		/ **/
+/*#define	USE_REENTRANT_API	/ **/
+
+/* HAS_TIME:
+ *	This symbol, if defined, indicates that the time() routine exists.
+ */
+/* Time_t:
+ *	This symbol holds the type returned by time(). It can be long,
+ *	or time_t on BSD sites (in which case <sys/types.h> should be
+ *	included).
+ */
+#define HAS_TIME		/**/
+#define Time_t time_t		/* Time type */
+
+/* HAS_TIMES:
+ *	This symbol, if defined, indicates that the times() routine exists.
+ *	Note that this became obsolete on some systems (SUNOS), which now
+ * use getrusage(). It may be necessary to include <sys/times.h>.
+ */
+#define HAS_TIMES		/**/
+
+/* Fpos_t:
+ *	This symbol holds the type used to declare file positions in libc.
+ *	It can be fpos_t, long, uint, etc... It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
+ */
+#define Fpos_t fpos_t		/* File position type */
+
+/* Gid_t_f:
+ *	This symbol defines the format string used for printing a Gid_t.
+ */
+#define	Gid_t_f		"ld"		/**/
+
+/* Gid_t_sign:
+ *	This symbol holds the signedness of a Gid_t.
+ *	1 for unsigned, -1 for signed.
+ */
+#define Gid_t_sign	-1		/* GID sign */
+
+/* Gid_t_size:
+ *	This symbol holds the size of a Gid_t in bytes.
+ */
+#define Gid_t_size 4		/* GID size */
+
+/* Gid_t:
+ *	This symbol holds the return type of getgid() and the type of
+ *	argument to setrgid() and related functions.  Typically,
+ *	it is the type of group ids in the kernel. It can be int, ushort,
+ *	gid_t, etc... It may be necessary to include <sys/types.h> to get
+ *	any typedef'ed information.
+ */
+#define Gid_t gid_t		/* Type for getgid(), etc... */
+
+/* Off_t:
+ *	This symbol holds the type used to declare offsets in the kernel.
+ *	It can be int, long, off_t, etc... It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
+ */
+/* LSEEKSIZE:
+ *	This symbol holds the number of bytes used by the Off_t.
+ */
+/* Off_t_size:
+ *	This symbol holds the number of bytes used by the Off_t.
+ */
+#define Off_t long long		/* <offset> type */
+#define LSEEKSIZE 8		/* <offset> size */
+#define Off_t_size 8	/* <offset> size */
+
+/* Mode_t:
+ *	This symbol holds the type used to declare file modes
+ *	for systems calls.  It is usually mode_t, but may be
+ *	int or unsigned short.  It may be necessary to include <sys/types.h>
+ *	to get any typedef'ed information.
+ */
+#define Mode_t mode_t	 /* file mode parameter for system calls */
+
+/* Pid_t:
+ *	This symbol holds the type used to declare process ids in the kernel.
+ *	It can be int, uint, pid_t, etc... It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
+ */
+#define Pid_t int		/* PID type */
+
+/* Size_t_size:
+ *	This symbol holds the size of a Size_t in bytes.
+ */
+#define Size_t_size 4		/**/
+
+/* Size_t:
+ *	This symbol holds the type used to declare length parameters
+ *	for string functions.  It is usually size_t, but may be
+ *	unsigned long, int, etc.  It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
+ */
+#define Size_t size_t	 /* length parameter for string functions */
+
+/* Uid_t_f:
+ *	This symbol defines the format string used for printing a Uid_t.
+ */
+#define	Uid_t_f		"ld"		/**/
+
+/* Uid_t_sign:
+ *	This symbol holds the signedness of a Uid_t.
+ *	1 for unsigned, -1 for signed.
+ */
+#define Uid_t_sign	-1		/* UID sign */
+
+/* Uid_t_size:
+ *	This symbol holds the size of a Uid_t in bytes.
+ */
+#define Uid_t_size 4		/* UID size */
+
+/* Uid_t:
+ *	This symbol holds the type used to declare user ids in the kernel.
+ *	It can be int, ushort, uid_t, etc... It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
+ */
+#define Uid_t uid_t		/* UID type */
+
 #endif
diff --git a/Master/tlpkg/tlperl/lib/CORE/cop.h b/Master/tlpkg/tlperl/lib/CORE/cop.h
index 8a96331de33..da295722c6d 100644
--- a/Master/tlpkg/tlperl/lib/CORE/cop.h
+++ b/Master/tlpkg/tlperl/lib/CORE/cop.h
@@ -34,6 +34,7 @@ struct jmpenv {
     Sigjmp_buf		je_buf;		/* uninit if je_prev is NULL */
     int			je_ret;		/* last exception thrown */
     bool		je_mustcatch;	/* need to call longjmp()? */
+    U16                 je_old_delaymagic; /* saved PL_delaymagic */
 };
 
 typedef struct jmpenv JMPENV;
@@ -55,6 +56,7 @@ typedef struct jmpenv JMPENV;
 	PL_start_env.je_prev = NULL;		\
 	PL_start_env.je_ret = -1;		\
 	PL_start_env.je_mustcatch = TRUE;	\
+	PL_start_env.je_old_delaymagic = 0;	\
     } STMT_END
 
 /*
@@ -103,6 +105,7 @@ typedef struct jmpenv JMPENV;
 	cur_env.je_ret = PerlProc_setjmp(cur_env.je_buf, SCOPE_SAVES_SIGNAL_MASK);		\
 	PL_top_env = &cur_env;						\
 	cur_env.je_mustcatch = FALSE;					\
+	cur_env.je_old_delaymagic = PL_delaymagic;			\
 	(v) = cur_env.je_ret;						\
     } STMT_END
 
@@ -114,6 +117,7 @@ typedef struct jmpenv JMPENV;
 	    Perl_deb(aTHX_ "JUMPENV_POP level=%d at %s:%d\n",		\
 		         i, __FILE__, __LINE__);})			\
 	assert(PL_top_env == &cur_env);					\
+	PL_delaymagic = cur_env.je_old_delaymagic;			\
 	PL_top_env = cur_env.je_prev;					\
     } STMT_END
 
@@ -154,10 +158,10 @@ typedef struct refcounted_he COPHH;
 /*
 =for apidoc Amx|SV *|cophh_fetch_pvn|const COPHH *cophh|const char *keypv|STRLEN keylen|U32 hash|U32 flags
 
-Look up the entry in the cop hints hash I<cophh> with the key specified by
-I<keypv> and I<keylen>.  If I<flags> has the C<COPHH_KEY_UTF8> bit set,
+Look up the entry in the cop hints hash C<cophh> with the key specified by
+C<keypv> and C<keylen>.  If C<flags> has the C<COPHH_KEY_UTF8> bit set,
 the key octets are interpreted as UTF-8, otherwise they are interpreted
-as Latin-1.  I<hash> is a precomputed hash of the key string, or zero if
+as Latin-1.  C<hash> is a precomputed hash of the key string, or zero if
 it has not been precomputed.  Returns a mortal scalar copy of the value
 associated with the key, or C<&PL_sv_placeholder> if there is no value
 associated with the key.
@@ -171,8 +175,8 @@ associated with the key.
 /*
 =for apidoc Amx|SV *|cophh_fetch_pvs|const COPHH *cophh|const char *key|U32 flags
 
-Like L</cophh_fetch_pvn>, but takes a literal string instead of a
-string/length pair, and no precomputed hash.
+Like L</cophh_fetch_pvn>, but takes a C<NUL>-terminated literal string instead
+of a string/length pair, and no precomputed hash.
 
 =cut
 */
@@ -208,7 +212,7 @@ string/length pair.
 =for apidoc Amx|HV *|cophh_2hv|const COPHH *cophh|U32 flags
 
 Generates and returns a standard Perl hash representing the full set of
-key/value pairs in the cop hints hash I<cophh>.  I<flags> is currently
+key/value pairs in the cop hints hash C<cophh>.  C<flags> is currently
 unused and must be zero.
 
 =cut
@@ -220,7 +224,7 @@ unused and must be zero.
 /*
 =for apidoc Amx|COPHH *|cophh_copy|COPHH *cophh
 
-Make and return a complete copy of the cop hints hash I<cophh>.
+Make and return a complete copy of the cop hints hash C<cophh>.
 
 =cut
 */
@@ -230,7 +234,7 @@ Make and return a complete copy of the cop hints hash I<cophh>.
 /*
 =for apidoc Amx|void|cophh_free|COPHH *cophh
 
-Discard the cop hints hash I<cophh>, freeing all resources associated
+Discard the cop hints hash C<cophh>, freeing all resources associated
 with it.
 
 =cut
@@ -251,18 +255,18 @@ Generate and return a fresh cop hints hash containing no entries.
 /*
 =for apidoc Amx|COPHH *|cophh_store_pvn|COPHH *cophh|const char *keypv|STRLEN keylen|U32 hash|SV *value|U32 flags
 
-Stores a value, associated with a key, in the cop hints hash I<cophh>,
+Stores a value, associated with a key, in the cop hints hash C<cophh>,
 and returns the modified hash.  The returned hash pointer is in general
 not the same as the hash pointer that was passed in.  The input hash is
 consumed by the function, and the pointer to it must not be subsequently
 used.  Use L</cophh_copy> if you need both hashes.
 
-The key is specified by I<keypv> and I<keylen>.  If I<flags> has the
+The key is specified by C<keypv> and C<keylen>.  If C<flags> has the
 C<COPHH_KEY_UTF8> bit set, the key octets are interpreted as UTF-8,
-otherwise they are interpreted as Latin-1.  I<hash> is a precomputed
+otherwise they are interpreted as Latin-1.  C<hash> is a precomputed
 hash of the key string, or zero if it has not been precomputed.
 
-I<value> is the scalar value to store for this key.  I<value> is copied
+C<value> is the scalar value to store for this key.  C<value> is copied
 by this function, which thus does not take ownership of any reference
 to it, and later changes to the scalar will not be reflected in the
 value visible in the cop hints hash.  Complex types of scalar will not
@@ -277,8 +281,8 @@ be stored with referential integrity, but will be coerced to strings.
 /*
 =for apidoc Amx|COPHH *|cophh_store_pvs|const COPHH *cophh|const char *key|SV *value|U32 flags
 
-Like L</cophh_store_pvn>, but takes a literal string instead of a
-string/length pair, and no precomputed hash.
+Like L</cophh_store_pvn>, but takes a C<NUL>-terminated literal string instead
+of a string/length pair, and no precomputed hash.
 
 =cut
 */
@@ -313,15 +317,15 @@ string/length pair.
 /*
 =for apidoc Amx|COPHH *|cophh_delete_pvn|COPHH *cophh|const char *keypv|STRLEN keylen|U32 hash|U32 flags
 
-Delete a key and its associated value from the cop hints hash I<cophh>,
+Delete a key and its associated value from the cop hints hash C<cophh>,
 and returns the modified hash.  The returned hash pointer is in general
 not the same as the hash pointer that was passed in.  The input hash is
 consumed by the function, and the pointer to it must not be subsequently
 used.  Use L</cophh_copy> if you need both hashes.
 
-The key is specified by I<keypv> and I<keylen>.  If I<flags> has the
+The key is specified by C<keypv> and C<keylen>.  If C<flags> has the
 C<COPHH_KEY_UTF8> bit set, the key octets are interpreted as UTF-8,
-otherwise they are interpreted as Latin-1.  I<hash> is a precomputed
+otherwise they are interpreted as Latin-1.  C<hash> is a precomputed
 hash of the key string, or zero if it has not been precomputed.
 
 =cut
@@ -334,8 +338,8 @@ hash of the key string, or zero if it has not been precomputed.
 /*
 =for apidoc Amx|COPHH *|cophh_delete_pvs|const COPHH *cophh|const char *key|U32 flags
 
-Like L</cophh_delete_pvn>, but takes a literal string instead of a
-string/length pair, and no precomputed hash.
+Like L</cophh_delete_pvn>, but takes a C<NUL>-terminated literal string instead
+of a string/length pair, and no precomputed hash.
 
 =cut
 */
@@ -457,10 +461,10 @@ struct cop {
 /*
 =for apidoc Am|SV *|cop_hints_fetch_pvn|const COP *cop|const char *keypv|STRLEN keylen|U32 hash|U32 flags
 
-Look up the hint entry in the cop I<cop> with the key specified by
-I<keypv> and I<keylen>.  If I<flags> has the C<COPHH_KEY_UTF8> bit set,
+Look up the hint entry in the cop C<cop> with the key specified by
+C<keypv> and C<keylen>.  If C<flags> has the C<COPHH_KEY_UTF8> bit set,
 the key octets are interpreted as UTF-8, otherwise they are interpreted
-as Latin-1.  I<hash> is a precomputed hash of the key string, or zero if
+as Latin-1.  C<hash> is a precomputed hash of the key string, or zero if
 it has not been precomputed.  Returns a mortal scalar copy of the value
 associated with the key, or C<&PL_sv_placeholder> if there is no value
 associated with the key.
@@ -474,8 +478,8 @@ associated with the key.
 /*
 =for apidoc Am|SV *|cop_hints_fetch_pvs|const COP *cop|const char *key|U32 flags
 
-Like L</cop_hints_fetch_pvn>, but takes a literal string instead of a
-string/length pair, and no precomputed hash.
+Like L</cop_hints_fetch_pvn>, but takes a C<NUL>-terminated literal string
+instead of a string/length pair, and no precomputed hash.
 
 =cut
 */
@@ -511,7 +515,7 @@ string/length pair.
 =for apidoc Am|HV *|cop_hints_2hv|const COP *cop|U32 flags
 
 Generates and returns a standard Perl hash representing the full set of
-hint entries in the cop I<cop>.  I<flags> is currently unused and must
+hint entries in the cop C<cop>.  C<flags> is currently unused and must
 be zero.
 
 =cut
@@ -547,12 +551,11 @@ be zero.
 struct block_sub {
     OP *	retop;	/* op to execute on exit from sub */
     /* Above here is the same for sub, format and eval.  */
+    PAD		*prevcomppad; /* the caller's PL_comppad */
     CV *	cv;
     /* Above here is the same for sub and format.  */
-    AV *	savearray;
-    AV *	argarray;
     I32		olddepth;
-    PAD		*oldcomppad;
+    AV  	*savearray;
 };
 
 
@@ -560,35 +563,40 @@ struct block_sub {
 struct block_format {
     OP *	retop;	/* op to execute on exit from sub */
     /* Above here is the same for sub, format and eval.  */
+    PAD		*prevcomppad; /* the caller's PL_comppad */
     CV *	cv;
     /* Above here is the same for sub and format.  */
     GV *	gv;
     GV *	dfoutgv;
 };
 
+/* return a pointer to the current context */
+
+#define CX_CUR() (&cxstack[cxstack_ix])
+
+/* free all savestack items back to the watermark of the specified context */
+
+#define CX_LEAVE_SCOPE(cx) LEAVE_SCOPE(cx->blk_oldsaveix)
+
+#ifdef DEBUGGING
+/* on debugging builds, poison cx afterwards so we know no code
+ * uses it - because after doing cxstack_ix--, any ties, exceptions etc
+ * may overwrite the current stack frame */
+#  define CX_POP(cx)                                                   \
+        assert(CX_CUR() == cx);                                        \
+        cxstack_ix--;                                                  \
+        cx = NULL;
+#else
+#  define CX_POP(cx) cxstack_ix--;
+#endif
+
+
 /* base for the next two macros. Don't use directly.
- * Note that the refcnt of the cv is incremented twice;  The CX one is
- * decremented by LEAVESUB, the other by LEAVE. */
-
-#define PUSHSUB_BASE(cx)						\
-	ENTRY_PROBE(CvNAMED(cv)						\
-			? HEK_KEY(CvNAME_HEK(cv))			\
-			: GvENAME(CvGV(cv)),	       			\
-		CopFILE((const COP *)CvSTART(cv)),			\
-		CopLINE((const COP *)CvSTART(cv)),			\
-		CopSTASHPV((const COP *)CvSTART(cv)));			\
-									\
-	cx->blk_sub.cv = cv;						\
-	cx->blk_sub.olddepth = CvDEPTH(cv);				\
-	cx->cx_type |= (hasargs) ? CXp_HASARGS : 0;			\
-	cx->blk_sub.retop = NULL;					\
-	if (!CvDEPTH(cv)) {						\
-	    SvREFCNT_inc_simple_void_NN(cv);				\
-	    SvREFCNT_inc_simple_void_NN(cv);				\
-	    SAVEFREESV(cv);						\
-	}
-
-#define PUSHSUB_GET_LVALUE_MASK(func) \
+ * The context frame holds a reference to the CV so that it can't be
+ * freed while we're executing it */
+
+
+#define CX_PUSHSUB_GET_LVALUE_MASK(func) \
 	/* If the context is indeterminate, then only the lvalue */	\
 	/* flags that the caller also has are applicable.        */	\
 	(								\
@@ -598,34 +606,13 @@ struct block_format {
 	           ? 0 : (U8)func(aTHX)					\
 	)
 
-#define PUSHSUB(cx)							\
-    {									\
-	U8 phlags = PUSHSUB_GET_LVALUE_MASK(Perl_was_lvalue_sub);	\
-	PUSHSUB_BASE(cx)						\
-	cx->blk_u16 = PL_op->op_private &				\
-	                  (phlags|OPpDEREF);				\
-    }
-
-/* variant for use by OP_DBSTATE, where op_private holds hint bits */
-#define PUSHSUB_DB(cx)							\
-	PUSHSUB_BASE(cx)						\
-	cx->blk_u16 = 0;
-
-
-#define PUSHFORMAT(cx, retop)						\
-	cx->blk_format.cv = cv;						\
-	cx->blk_format.gv = gv;						\
-	cx->blk_format.retop = (retop);					\
-	cx->blk_format.dfoutgv = PL_defoutgv;				\
-	cx->blk_u16 = 0;                                                \
-	if (!CvDEPTH(cv)) SvREFCNT_inc_simple_void_NN(cv);		\
-	CvDEPTH(cv)++;							\
-	SvREFCNT_inc_void(cx->blk_format.dfoutgv)
-
-#define POP_SAVEARRAY()						\
+/* Restore old @_ */
+#define CX_POP_SAVEARRAY(cx)						\
     STMT_START {							\
-	SvREFCNT_dec(GvAV(PL_defgv));					\
+        AV *av = GvAV(PL_defgv);                                        \
 	GvAV(PL_defgv) = cx->blk_sub.savearray;				\
+        cx->blk_sub.savearray = NULL;                                   \
+        SvREFCNT_dec(av);	        				\
     } STMT_END
 
 /* junk in @_ spells trouble when cloning CVs and in pp_caller(), so don't
@@ -637,58 +624,6 @@ struct block_format {
 	AvFILLp(ary) = -1;						\
     } STMT_END
 
-#define POPSUB(cx,sv)							\
-    STMT_START {							\
-	const I32 olddepth = cx->blk_sub.olddepth;			\
-        if (!(cx->blk_u16 & CxPOPSUB_DONE)) {                           \
-        cx->blk_u16 |= CxPOPSUB_DONE;                                   \
-	RETURN_PROBE(CvNAMED(cx->blk_sub.cv)				\
-			? HEK_KEY(CvNAME_HEK(cx->blk_sub.cv))		\
-			: GvENAME(CvGV(cx->blk_sub.cv)),		\
-		CopFILE((COP*)CvSTART((const CV*)cx->blk_sub.cv)),	\
-		CopLINE((COP*)CvSTART((const CV*)cx->blk_sub.cv)),	\
-		CopSTASHPV((COP*)CvSTART((const CV*)cx->blk_sub.cv)));	\
-									\
-	if (CxHASARGS(cx)) {						\
-	    POP_SAVEARRAY();						\
-	    /* abandon @_ if it got reified */				\
-	    if (AvREAL(cx->blk_sub.argarray)) {				\
-		const SSize_t fill = AvFILLp(cx->blk_sub.argarray);	\
-		SvREFCNT_dec_NN(cx->blk_sub.argarray);			\
-		cx->blk_sub.argarray = newAV();				\
-		av_extend(cx->blk_sub.argarray, fill);			\
-		AvREIFY_only(cx->blk_sub.argarray);			\
-		CX_CURPAD_SV(cx->blk_sub, 0) = MUTABLE_SV(cx->blk_sub.argarray); \
-	    }								\
-	    else {							\
-		CLEAR_ARGARRAY(cx->blk_sub.argarray);			\
-	    }								\
-	}								\
-        }                                                               \
-	sv = MUTABLE_SV(cx->blk_sub.cv);				\
-	LEAVE_SCOPE(PL_scopestack[cx->blk_oldscopesp-1]);		\
-	if (sv && (CvDEPTH((const CV*)sv) = olddepth))			\
-	    sv = NULL;						\
-    } STMT_END
-
-#define LEAVESUB(sv)							\
-    STMT_START {							\
-	SvREFCNT_dec(sv);						\
-    } STMT_END
-
-#define POPFORMAT(cx)							\
-    STMT_START {							\
-        if (!(cx->blk_u16 & CxPOPSUB_DONE)) {                           \
-	CV * const cv = cx->blk_format.cv;				\
-	GV * const dfuot = cx->blk_format.dfoutgv;			\
-        cx->blk_u16 |= CxPOPSUB_DONE;                                   \
-	setdefout(dfuot);						\
-	LEAVE_SCOPE(PL_scopestack[cx->blk_oldscopesp-1]);		\
-	if (!--CvDEPTH(cv))						\
-	    SvREFCNT_dec_NN(cx->blk_format.cv);				\
-	SvREFCNT_dec_NN(dfuot);						\
-        }                                                               \
-    } STMT_END
 
 /* eval context */
 struct block_eval {
@@ -708,122 +643,85 @@ struct block_eval {
 #define CxOLD_IN_EVAL(cx)	(((cx)->blk_u16) & 0x7F)
 #define CxOLD_OP_TYPE(cx)	(((cx)->blk_u16) >> 7)
 
-#define PUSHEVAL(cx,n)							\
-    STMT_START {							\
-	assert(!(PL_in_eval & ~0x7F));					\
-	assert(!(PL_op->op_type & ~0x1FF));				\
-	cx->blk_u16 = (PL_in_eval & 0x7F) | ((U16)PL_op->op_type << 7);	\
-	cx->blk_eval.old_namesv = (n ? newSVpv(n,0) : NULL);		\
-	cx->blk_eval.old_eval_root = PL_eval_root;			\
-	cx->blk_eval.cur_text = PL_parser ? PL_parser->linestr : NULL;	\
-	cx->blk_eval.cv = NULL; /* set by doeval(), as applicable */	\
-	cx->blk_eval.retop = NULL;					\
-	cx->blk_eval.cur_top_env = PL_top_env; 				\
-    } STMT_END
-
-#define POPEVAL(cx)							\
-    STMT_START {							\
-	PL_in_eval = CxOLD_IN_EVAL(cx);					\
-	optype = CxOLD_OP_TYPE(cx);					\
-	PL_eval_root = cx->blk_eval.old_eval_root;			\
-	if (cx->blk_eval.cur_text && SvSCREAM(cx->blk_eval.cur_text))	\
-	    SvREFCNT_dec_NN(cx->blk_eval.cur_text);			\
-	if (cx->blk_eval.old_namesv)					\
-	    sv_2mortal(cx->blk_eval.old_namesv);			\
-    } STMT_END
-
 /* loop context */
 struct block_loop {
-    I32		resetsp;
     LOOP *	my_op;	/* My op, that contains redo, next and last ops.  */
     union {	/* different ways of locating the iteration variable */
-	SV      **svp;
-	GV      *gv;
-	PAD     *oldcomppad; /* only used in ITHREADS */
+	SV      **svp; /* for lexicals: address of pad slot */
+	GV      *gv;   /* for package vars */
     } itervar_u;
+    SV          *itersave; /* the original iteration var */
     union {
-	struct { /* valid if type is LOOP_FOR or LOOP_PLAIN (but {NULL,0})*/
-	    AV * ary; /* use the stack if this is NULL */
-	    IV ix;
+	struct { /* CXt_LOOP_ARY, C<for (@ary)>  */
+	    AV *ary; /* array being iterated over */
+	    IV  ix;   /* index relative to base of array */
 	} ary;
-	struct { /* valid if type is LOOP_LAZYIV */
+	struct { /* CXt_LOOP_LIST, C<for (list)> */
+	    I32 basesp; /* first element of list on stack */
+	    IV  ix;      /* index relative to basesp */
+	} stack;
+	struct { /* CXt_LOOP_LAZYIV, C<for (1..9)> */
 	    IV cur;
 	    IV end;
 	} lazyiv;
-	struct { /* valid if type if LOOP_LAZYSV */
+	struct { /* CXt_LOOP_LAZYSV C<for ('a'..'z')> */
 	    SV * cur;
 	    SV * end; /* maxiumum value (or minimum in reverse) */
 	} lazysv;
     } state_u;
-};
-
 #ifdef USE_ITHREADS
-#  define CxITERVAR_PADSV(c) \
-	&CX_CURPAD_SV( (c)->blk_loop.itervar_u, (c)->blk_loop.my_op->op_targ)
-#else
-#  define CxITERVAR_PADSV(c) ((c)->blk_loop.itervar_u.svp)
+    PAD *oldcomppad; /* needed to map itervar_u.svp during thread clone */
 #endif
+};
 
-#define CxITERVAR(c)							\
-	((c)->blk_loop.itervar_u.oldcomppad				\
-	 ? (CxPADLOOP(c) 						\
-	    ? CxITERVAR_PADSV(c)					\
-	    : isGV((c)->blk_loop.itervar_u.gv)				\
-		? &GvSV((c)->blk_loop.itervar_u.gv)			\
-		: (SV **)&(c)->blk_loop.itervar_u.gv)			\
-	 : (SV**)NULL)
+#define CxITERVAR(c)                                    \
+        (CxPADLOOP(c)                                   \
+            ? (c)->blk_loop.itervar_u.svp               \
+            : ((c)->cx_type & CXp_FOR_GV)               \
+                ? &GvSV((c)->blk_loop.itervar_u.gv)     \
+                : (SV **)&(c)->blk_loop.itervar_u.gv)
 
 #define CxLABEL(c)	(0 + CopLABEL((c)->blk_oldcop))
 #define CxLABEL_len(c,len)	(0 + CopLABEL_len((c)->blk_oldcop, len))
 #define CxLABEL_len_flags(c,len,flags)	(0 + CopLABEL_len_flags((c)->blk_oldcop, len, flags))
 #define CxHASARGS(c)	(((c)->cx_type & CXp_HASARGS) == CXp_HASARGS)
+
+/* CxLVAL(): the lval flags of the call site: the relevant flag bits from
+ * the op_private field of the calling pp_entersub (or its caller's caller
+ * if the caller's lvalue context isn't known):
+ *  OPpLVAL_INTRO:  sub used in lvalue context, e.g. f() = 1;
+ *  OPpENTERSUB_INARGS (in conjunction with OPpLVAL_INTRO): the
+ *      function is being used as a sub arg or as a referent, e.g.
+ *      g(...,f(),...)  or $r = \f()
+ *  OPpDEREF: 2-bit mask indicating e.g. f()->[0].
+ *  Note the contrast with CvLVALUE(), which is a property of the sub
+ *  rather than the call site.
+ */
 #define CxLVAL(c)	(0 + ((c)->blk_u16 & 0xff))
-/* POPSUB has already been performed on this context frame */
-#define CxPOPSUB_DONE 0x100
-
-
-#define PUSHLOOP_PLAIN(cx, s)						\
-	cx->blk_loop.resetsp = s - PL_stack_base;			\
-	cx->blk_loop.my_op = cLOOP;					\
-	cx->blk_loop.state_u.ary.ary = NULL;				\
-	cx->blk_loop.state_u.ary.ix = 0;				\
-	cx->blk_loop.itervar_u.svp = NULL;
-
-#define PUSHLOOP_FOR(cx, ivar, s)					\
-	cx->blk_loop.resetsp = s - PL_stack_base;			\
-	cx->blk_loop.my_op = cLOOP;					\
-	cx->blk_loop.state_u.ary.ary = NULL;				\
-	cx->blk_loop.state_u.ary.ix = 0;				\
-	cx->blk_loop.itervar_u.svp = (SV**)(ivar);
-
-#define POPLOOP(cx)							\
-	if (CxTYPE(cx) == CXt_LOOP_LAZYSV) {				\
-	    SvREFCNT_dec_NN(cx->blk_loop.state_u.lazysv.cur);		\
-	    SvREFCNT_dec_NN(cx->blk_loop.state_u.lazysv.end);		\
-	}								\
-	if (CxTYPE(cx) == CXt_LOOP_FOR)					\
-	    SvREFCNT_dec(cx->blk_loop.state_u.ary.ary);
+
+
 
 /* given/when context */
 struct block_givwhen {
 	OP *leave_op;
+        SV *defsv_save; /* the original $_ */
 };
 
-#define PUSHGIVEN(cx)							\
-	cx->blk_givwhen.leave_op = cLOGOP->op_other;
 
-#define PUSHWHEN PUSHGIVEN
 
 /* context common to subroutines, evals and loops */
 struct block {
     U8		blku_type;	/* what kind of context this is */
     U8		blku_gimme;	/* is this block running in list context? */
     U16		blku_u16;	/* used by block_sub and block_eval (so far) */
-    I32		blku_oldsp;	/* stack pointer to copy stuff down to */
-    COP *	blku_oldcop;	/* old curcop pointer */
+    I32		blku_oldsaveix; /* saved PL_savestack_ix */
+    /* all the fields above must be aligned with same-sized fields as sbu */
+    I32		blku_oldsp;	/* current sp floor: where nextstate pops to */
     I32		blku_oldmarksp;	/* mark stack index */
-    I32		blku_oldscopesp;	/* scope stack index */
+    COP *	blku_oldcop;	/* old curcop pointer */
     PMOP *	blku_oldpm;	/* values of pattern match vars */
+    SSize_t     blku_old_tmpsfloor;     /* saved PL_tmps_floor */
+    I32		blku_oldscopesp;	/* scope stack index */
 
     union {
 	struct block_sub	blku_sub;
@@ -840,59 +738,35 @@ struct block {
 #define blk_oldpm	cx_u.cx_blk.blku_oldpm
 #define blk_gimme	cx_u.cx_blk.blku_gimme
 #define blk_u16		cx_u.cx_blk.blku_u16
+#define blk_oldsaveix   cx_u.cx_blk.blku_oldsaveix
+#define blk_old_tmpsfloor cx_u.cx_blk.blku_old_tmpsfloor
 #define blk_sub		cx_u.cx_blk.blk_u.blku_sub
 #define blk_format	cx_u.cx_blk.blk_u.blku_format
 #define blk_eval	cx_u.cx_blk.blk_u.blku_eval
 #define blk_loop	cx_u.cx_blk.blk_u.blku_loop
 #define blk_givwhen	cx_u.cx_blk.blk_u.blku_givwhen
 
-#define DEBUG_CX(action)						\
+#define CX_DEBUG(cx, action)						\
     DEBUG_l(								\
-	Perl_deb(aTHX_ "CX %ld %s %s (scope %ld,%ld) at %s:%d\n",	\
+	Perl_deb(aTHX_ "CX %ld %s %s (scope %ld,%ld) (save %ld,%ld) at %s:%d\n",\
 		    (long)cxstack_ix,					\
 		    action,						\
-		    PL_block_type[CxTYPE(&cxstack[cxstack_ix])],	\
+		    PL_block_type[CxTYPE(cx)],	                        \
 		    (long)PL_scopestack_ix,				\
-		    (long)(cxstack[cxstack_ix].blk_oldscopesp),		\
+		    (long)(cx->blk_oldscopesp),		                \
+		    (long)PL_savestack_ix,				\
+		    (long)(cx->blk_oldsaveix),                          \
 		    __FILE__, __LINE__));
 
-/* Enter a block. */
-#define PUSHBLOCK(cx,t,sp) CXINC, cx = &cxstack[cxstack_ix],		\
-	cx->cx_type		= t,					\
-	cx->blk_oldsp		= sp - PL_stack_base,			\
-	cx->blk_oldcop		= PL_curcop,				\
-	cx->blk_oldmarksp	= PL_markstack_ptr - PL_markstack,	\
-	cx->blk_oldscopesp	= PL_scopestack_ix,			\
-	cx->blk_oldpm		= PL_curpm,				\
-	cx->blk_gimme		= (U8)gimme;				\
-	DEBUG_CX("PUSH");
-
-/* Exit a block (RETURN and LAST). */
-#define POPBLOCK(cx,pm)							\
-	DEBUG_CX("POP");						\
-	cx = &cxstack[cxstack_ix--],					\
-	newsp		 = PL_stack_base + cx->blk_oldsp,		\
-	PL_curcop	 = cx->blk_oldcop,				\
-	PL_markstack_ptr = PL_markstack + cx->blk_oldmarksp,		\
-	PL_scopestack_ix = cx->blk_oldscopesp,				\
-	pm		 = cx->blk_oldpm,				\
-	gimme		 = cx->blk_gimme;
-
-/* Continue a block elsewhere (NEXT and REDO). */
-#define TOPBLOCK(cx)							\
-	DEBUG_CX("TOP");						\
-	cx  = &cxstack[cxstack_ix],					\
-	PL_stack_sp	 = PL_stack_base + cx->blk_oldsp,		\
-	PL_markstack_ptr = PL_markstack + cx->blk_oldmarksp,		\
-	PL_scopestack_ix = cx->blk_oldscopesp,				\
-	PL_curpm         = cx->blk_oldpm;
+
 
 /* substitution context */
 struct subst {
-    U8		sbu_type;	/* what kind of context this is */
+    U8		sbu_type;	/* same as blku_type */
     U8		sbu_rflags;
-    U16		sbu_rxtainted;	/* matches struct block */
-    I32		sbu_oldsave;
+    U16		sbu_rxtainted;
+    I32		sbu_oldsaveix; /* same as blku_oldsaveix */
+    /* all the fields above must be aligned with same-sized fields as blk_u */
     SSize_t	sbu_iters;
     SSize_t	sbu_maxiters;
     char *	sbu_orig;
@@ -907,7 +781,6 @@ struct subst {
 #define sb_iters	cx_u.cx_subst.sbu_iters
 #define sb_maxiters	cx_u.cx_subst.sbu_maxiters
 #define sb_rflags	cx_u.cx_subst.sbu_rflags
-#define sb_oldsave	cx_u.cx_subst.sbu_oldsave
 #define sb_rxtainted	cx_u.cx_subst.sbu_rxtainted
 #define sb_orig		cx_u.cx_subst.sbu_orig
 #define sb_dstr		cx_u.cx_subst.sbu_dstr
@@ -919,11 +792,11 @@ struct subst {
 #define sb_rx		cx_u.cx_subst.sbu_rx
 
 #ifdef PERL_CORE
-#  define PUSHSUBST(cx) CXINC, cx = &cxstack[cxstack_ix],		\
+#  define CX_PUSHSUBST(cx) CXINC, cx = CX_CUR(),		        \
+	cx->blk_oldsaveix = oldsave,				        \
 	cx->sb_iters		= iters,				\
 	cx->sb_maxiters		= maxiters,				\
 	cx->sb_rflags		= r_flags,				\
-	cx->sb_oldsave		= oldsave,				\
 	cx->sb_rxtainted	= rxtainted,				\
 	cx->sb_orig		= orig,					\
 	cx->sb_dstr		= dstr,					\
@@ -935,11 +808,19 @@ struct subst {
 	cx->sb_rx		= rx,					\
 	cx->cx_type		= CXt_SUBST | (once ? CXp_ONCE : 0);	\
 	rxres_save(&cx->sb_rxres, rx);					\
-	(void)ReREFCNT_inc(rx)
+	(void)ReREFCNT_inc(rx);						\
+        SvREFCNT_inc_void_NN(targ)
 
-#  define POPSUBST(cx) cx = &cxstack[cxstack_ix--];			\
+#  define CX_POPSUBST(cx) \
+    STMT_START {							\
+        REGEXP *re;                                                     \
+        assert(CxTYPE(cx) == CXt_SUBST);                                \
 	rxres_free(&cx->sb_rxres);					\
-	ReREFCNT_dec(cx->sb_rx)
+	re = cx->sb_rx;                                                 \
+	cx->sb_rx = NULL;                                               \
+	ReREFCNT_dec(re);                                               \
+        SvREFCNT_dec_NN(cx->sb_targ);                                   \
+    } STMT_END
 #endif
 
 #define CxONCE(cx)		((cx)->cx_type & CXp_ONCE)
@@ -955,7 +836,7 @@ struct context {
 /* If you re-order these, there is also an array of uppercase names in perl.h
    and a static array of context names in pp_ctl.c  */
 #define CXTYPEMASK	0xf
-#define CXt_NULL	0
+#define CXt_NULL	0 /* currently only used for sort BLOCK */
 #define CXt_WHEN	1
 #define CXt_BLOCK	2
 /* When micro-optimising :-) keep GIVEN next to the LOOPs, as these 5 share a
@@ -963,25 +844,24 @@ struct context {
    The first 4 don't have a 'case' in at least one switch statement in pp_ctl.c
 */
 #define CXt_GIVEN	3
-/* This is first so that CXt_LOOP_FOR|CXt_LOOP_LAZYIV is CXt_LOOP_LAZYIV */
-#define CXt_LOOP_FOR	4
-#define CXt_LOOP_PLAIN	5
-#define CXt_LOOP_LAZYSV	6
-#define CXt_LOOP_LAZYIV	7
-#define CXt_SUB		8
-#define CXt_FORMAT      9
-#define CXt_EVAL       10
-#define CXt_SUBST      11
-/* SUBST doesn't feature in all switch statements.  */
 
-/* private flags for CXt_SUB and CXt_NULL
-   However, this is checked in many places which do not check the type, so
-   this bit needs to be kept clear for most everything else. For reasons I
-   haven't investigated, it can coexist with CXp_FOR_DEF */
-#define CXp_MULTICALL	0x10	/* part of a multicall (so don't
-				   tear down context on exit). */ 
+/* be careful of the ordering of these five. Macros like CxTYPE_is_LOOP,
+ * CxFOREACH compare ranges */
+#define CXt_LOOP_ARY	4 /* for (@ary)     { ...; } */
+#define CXt_LOOP_LAZYSV	5 /* for ('a'..'z') { ...; } */
+#define CXt_LOOP_LAZYIV	6 /* for (1..9)     { ...; } */
+#define CXt_LOOP_LIST	7 /* for (1,2,3)    { ...; } */
+#define CXt_LOOP_PLAIN	8 /* while (...)    { ...; }
+                             or plain block { ...; } */
+#define CXt_SUB		9
+#define CXt_FORMAT     10
+#define CXt_EVAL       11
+#define CXt_SUBST      12
+/* SUBST doesn't feature in all switch statements.  */
 
 /* private flags for CXt_SUB and CXt_FORMAT */
+#define CXp_MULTICALL	0x10	/* part of a multicall (so don't tear down
+                                   context on exit). (not CXt_FORMAT) */
 #define CXp_HASARGS	0x20
 #define CXp_SUB_RE	0x40    /* code called within regex, i.e. (?{}) */
 #define CXp_SUB_RE_FAKE	0x80    /* fake sub CX for (?{}) in current scope */
@@ -991,24 +871,29 @@ struct context {
 #define CXp_TRYBLOCK	0x40	/* eval{}, not eval'' or similar */
 
 /* private flags for CXt_LOOP */
+
+/* this is only set in conjunction with CXp_FOR_GV */
 #define CXp_FOR_DEF	0x10	/* foreach using $_ */
+/* these 3 are mutually exclusive */
 #define CXp_FOR_LVREF	0x20	/* foreach using \$var */
-#define CxPADLOOP(c)	((c)->blk_loop.my_op->op_targ)
+#define CXp_FOR_GV	0x40	/* foreach using package var */
+#define CXp_FOR_PAD	0x80	/* foreach using lexical var */
+
+#define CxPADLOOP(c)	((c)->cx_type & CXp_FOR_PAD)
 
 /* private flags for CXt_SUBST */
 #define CXp_ONCE	0x10	/* What was sbu_once in struct subst */
 
 #define CxTYPE(c)	((c)->cx_type & CXTYPEMASK)
-#define CxTYPE_is_LOOP(c)	(((c)->cx_type & 0xC) == 0x4)
-#define CxMULTICALL(c)	(((c)->cx_type & CXp_MULTICALL)			\
-			 == CXp_MULTICALL)
+#define CxTYPE_is_LOOP(c) (   CxTYPE(cx) >= CXt_LOOP_ARY                \
+                           && CxTYPE(cx) <= CXt_LOOP_PLAIN)
+#define CxMULTICALL(c)	((c)->cx_type & CXp_MULTICALL)
 #define CxREALEVAL(c)	(((c)->cx_type & (CXTYPEMASK|CXp_REAL))		\
 			 == (CXt_EVAL|CXp_REAL))
 #define CxTRYBLOCK(c)	(((c)->cx_type & (CXTYPEMASK|CXp_TRYBLOCK))	\
 			 == (CXt_EVAL|CXp_TRYBLOCK))
-#define CxFOREACH(c)	(CxTYPE_is_LOOP(c) && CxTYPE(c) != CXt_LOOP_PLAIN)
-#define CxFOREACHDEF(c)	((CxTYPE_is_LOOP(c) && CxTYPE(c) != CXt_LOOP_PLAIN) \
-			 && ((c)->cx_type & CXp_FOR_DEF))
+#define CxFOREACH(c)	(   CxTYPE(cx) >= CXt_LOOP_ARY                  \
+                         && CxTYPE(cx) <= CXt_LOOP_LIST)
 
 #define CXINC (cxstack_ix < cxstack_max ? ++cxstack_ix : (cxstack_ix = cxinc()))
 
@@ -1018,15 +903,15 @@ struct context {
 
 /*
 =for apidoc AmU||G_SCALAR
-Used to indicate scalar context.  See C<GIMME_V>, C<GIMME>, and
+Used to indicate scalar context.  See C<L</GIMME_V>>, C<L</GIMME>>, and
 L<perlcall>.
 
 =for apidoc AmU||G_ARRAY
-Used to indicate list context.  See C<GIMME_V>, C<GIMME> and
+Used to indicate list context.  See C<L</GIMME_V>>, C<L</GIMME>> and
 L<perlcall>.
 
 =for apidoc AmU||G_VOID
-Used to indicate void context.  See C<GIMME_V> and L<perlcall>.
+Used to indicate void context.  See C<L</GIMME_V>> and L<perlcall>.
 
 =for apidoc AmU||G_DISCARD
 Indicates that arguments returned from a callback should be discarded.  See
@@ -1092,6 +977,7 @@ L<perlcall>.
 #define PERLSI_WARNHOOK		7
 #define PERLSI_DIEHOOK		8
 #define PERLSI_REQUIRE		9
+#define PERLSI_MULTICALL       10
 
 struct stackinfo {
     AV *		si_stack;	/* stack for current runlevel */
@@ -1169,8 +1055,11 @@ typedef struct stackinfo PERL_SI;
 	}								\
     } STMT_END
 
-#define IN_PERL_COMPILETIME	(PL_curcop == &PL_compiling)
-#define IN_PERL_RUNTIME		(PL_curcop != &PL_compiling)
+#define IN_PERL_COMPILETIME	cBOOL(PL_curcop == &PL_compiling)
+#define IN_PERL_RUNTIME		cBOOL(PL_curcop != &PL_compiling)
+
+
+
 
 /*
 =head1 Multicall Functions
@@ -1193,12 +1082,8 @@ See L<perlcall/LIGHTWEIGHT CALLBACKS>.
 */
 
 #define dMULTICALL \
-    SV **newsp;			/* set by POPBLOCK */			\
-    PERL_CONTEXT *cx;							\
-    CV *multicall_cv;							\
-    OP *multicall_cop;							\
-    bool multicall_oldcatch; 						\
-    U8 hasargs = 0		/* used by PUSHSUB */
+    OP  *multicall_cop;							\
+    bool multicall_oldcatch
 
 #define PUSH_MULTICALL(the_cv) \
     PUSH_MULTICALL_FLAGS(the_cv, 0)
@@ -1208,25 +1093,22 @@ See L<perlcall/LIGHTWEIGHT CALLBACKS>.
 
 #define PUSH_MULTICALL_FLAGS(the_cv, flags) \
     STMT_START {							\
+        PERL_CONTEXT *cx;						\
 	CV * const _nOnclAshIngNamE_ = the_cv;				\
 	CV * const cv = _nOnclAshIngNamE_;				\
 	PADLIST * const padlist = CvPADLIST(cv);			\
-	ENTER;								\
  	multicall_oldcatch = CATCH_GET;					\
-	SAVETMPS; SAVEVPTR(PL_op);					\
 	CATCH_SET(TRUE);						\
-	PUSHSTACKi(PERLSI_SORT);					\
-	PUSHBLOCK(cx, (CXt_SUB|CXp_MULTICALL|flags), PL_stack_sp);	\
-	PUSHSUB(cx);							\
+	PUSHSTACKi(PERLSI_MULTICALL);					\
+	cx = cx_pushblock((CXt_SUB|CXp_MULTICALL|flags), (U8)gimme,     \
+                  PL_stack_sp, PL_savestack_ix);	                \
+        cx_pushsub(cx, cv, NULL, 0);                                    \
+	SAVEOP();					                \
         if (!(flags & CXp_SUB_RE_FAKE))                                 \
             CvDEPTH(cv)++;						\
-	if (CvDEPTH(cv) >= 2) {						\
-	    PERL_STACK_OVERFLOW_CHECK();				\
+	if (CvDEPTH(cv) >= 2)  						\
 	    Perl_pad_push(aTHX_ padlist, CvDEPTH(cv));			\
-	}								\
-	SAVECOMPPAD();							\
 	PAD_SET_CUR_NOSAVE(padlist, CvDEPTH(cv));			\
-	multicall_cv = cv;						\
 	multicall_cop = CvSTART(cv);					\
     } STMT_END
 
@@ -1238,14 +1120,16 @@ See L<perlcall/LIGHTWEIGHT CALLBACKS>.
 
 #define POP_MULTICALL \
     STMT_START {							\
-	cx = &cxstack[cxstack_ix];					\
-        if (! ((CvDEPTH(multicall_cv) = cx->blk_sub.olddepth)) ) {	\
-		LEAVESUB(multicall_cv);					\
-	}								\
-	POPBLOCK(cx,PL_curpm);						\
+        PERL_CONTEXT *cx;						\
+	cx = CX_CUR();					                \
+	CX_LEAVE_SCOPE(cx);                                             \
+        cx_popsub_common(cx);                                           \
+        gimme = cx->blk_gimme;                                          \
+        PERL_UNUSED_VAR(gimme); /* for API */                           \
+	cx_popblock(cx);				   		\
+	CX_POP(cx);                                                     \
 	POPSTACK;							\
 	CATCH_SET(multicall_oldcatch);					\
-	LEAVE;								\
 	SPAGAIN;							\
     } STMT_END
 
@@ -1257,22 +1141,16 @@ See L<perlcall/LIGHTWEIGHT CALLBACKS>.
 	CV * const _nOnclAshIngNamE_ = the_cv;				\
 	CV * const cv = _nOnclAshIngNamE_;				\
 	PADLIST * const padlist = CvPADLIST(cv);			\
-	cx = &cxstack[cxstack_ix];					\
-	assert(cx->cx_type & CXp_MULTICALL);				\
-	if (! ((CvDEPTH(multicall_cv) = cx->blk_sub.olddepth)) ) {	\
-		LEAVESUB(multicall_cv);					\
-	}								\
+        PERL_CONTEXT *cx = CX_CUR();					\
+	assert(CxMULTICALL(cx));                                        \
+        cx_popsub_common(cx);                                           \
 	cx->cx_type = (CXt_SUB|CXp_MULTICALL|flags);                    \
-	PUSHSUB(cx);							\
+        cx_pushsub(cx, cv, NULL, 0);			                \
         if (!(flags & CXp_SUB_RE_FAKE))                                 \
             CvDEPTH(cv)++;						\
-	if (CvDEPTH(cv) >= 2) {						\
-	    PERL_STACK_OVERFLOW_CHECK();				\
+	if (CvDEPTH(cv) >= 2)  						\
 	    Perl_pad_push(aTHX_ padlist, CvDEPTH(cv));			\
-	}								\
-	SAVECOMPPAD();							\
 	PAD_SET_CUR_NOSAVE(padlist, CvDEPTH(cv));			\
-	multicall_cv = cv;						\
 	multicall_cop = CvSTART(cv);					\
     } STMT_END
 /*
diff --git a/Master/tlpkg/tlperl/lib/CORE/cv.h b/Master/tlpkg/tlperl/lib/CORE/cv.h
index d4dfd2d3f9a..ebbdd360f33 100644
--- a/Master/tlpkg/tlperl/lib/CORE/cv.h
+++ b/Master/tlpkg/tlperl/lib/CORE/cv.h
@@ -264,7 +264,7 @@ There is a further complication with non-closure anonymous subs (i.e. those
 that do not refer to any lexicals outside that sub).  In this case, the
 anonymous prototype is shared rather than being cloned.  This has the
 consequence that the parent may be freed while there are still active
-children, eg
+children, I<e.g.>,
 
     BEGIN { $a = sub { eval '$x' } }
 
diff --git a/Master/tlpkg/tlperl/lib/CORE/dosish.h b/Master/tlpkg/tlperl/lib/CORE/dosish.h
index 2e4e7451769..c1305cdc408 100644
--- a/Master/tlpkg/tlperl/lib/CORE/dosish.h
+++ b/Master/tlpkg/tlperl/lib/CORE/dosish.h
@@ -52,9 +52,9 @@
 #endif	/* DJGPP */
 
 #ifndef PERL_SYS_TERM_BODY
-#  define PERL_SYS_TERM_BODY() \
-    HINTS_REFCNT_TERM; OP_CHECK_MUTEX_TERM; \
-    OP_REFCNT_TERM; PERLIO_TERM; MALLOC_TERM
+#  define PERL_SYS_TERM_BODY()                              \
+    HINTS_REFCNT_TERM; OP_CHECK_MUTEX_TERM;                 \
+    OP_REFCNT_TERM; PERLIO_TERM; MALLOC_TERM; LOCALE_TERM;
 #endif
 #define dXSUB_SYS
 
diff --git a/Master/tlpkg/tlperl/lib/CORE/dquote_inline.h b/Master/tlpkg/tlperl/lib/CORE/dquote_inline.h
new file mode 100644
index 00000000000..1c7694d89f3
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/CORE/dquote_inline.h
@@ -0,0 +1,67 @@
+/*    dquote_inline.h
+ *
+ *    Copyright (C) 2015 by Larry Wall and others
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ */
+
+#ifndef DQUOTE_INLINE_H /* Guard against nested #inclusion */
+#define DQUOTE_INLINE_H
+
+/*
+ - regcurly - a little FSA that accepts {\d+,?\d*}
+    Pulled from reg.c.
+ */
+PERL_STATIC_INLINE I32
+S_regcurly(const char *s)
+{
+    PERL_ARGS_ASSERT_REGCURLY;
+
+    if (*s++ != '{')
+	return FALSE;
+    if (!isDIGIT(*s))
+	return FALSE;
+    while (isDIGIT(*s))
+	s++;
+    if (*s == ',') {
+	s++;
+	while (isDIGIT(*s))
+	    s++;
+    }
+
+    return *s == '}';
+}
+
+/* This is inline not for speed, but because it is so tiny */
+
+PERL_STATIC_INLINE char*
+S_form_short_octal_warning(pTHX_
+                           const char * const s, /* Points to first non-octal */
+                           const STRLEN len      /* Length of octals string, so
+                                                    (s-len) points to first
+                                                    octal */
+)
+{
+    /* Return a character string consisting of a warning message for when a
+     * string constant in octal is weird, like "\078".  */
+
+    const char * sans_leading_zeros = s - len;
+
+    PERL_ARGS_ASSERT_FORM_SHORT_OCTAL_WARNING;
+
+    assert(*s == '8' || *s == '9');
+
+    /* Remove the leading zeros, retaining one zero so won't be zero length */
+    while (*sans_leading_zeros == '0') sans_leading_zeros++;
+    if (sans_leading_zeros == s) {
+        sans_leading_zeros--;
+    }
+
+    return Perl_form(aTHX_
+                     "'%.*s' resolved to '\\o{%.*s}%c'",
+                     (int) (len + 2), s - len - 1,
+                     (int) (s - sans_leading_zeros), sans_leading_zeros,
+                     *s);
+}
+#endif  /* DQUOTE_INLINE_H */
diff --git a/Master/tlpkg/tlperl/lib/CORE/ebcdic_tables.h b/Master/tlpkg/tlperl/lib/CORE/ebcdic_tables.h
index 344a99048d5..c36ab961f0b 100644
--- a/Master/tlpkg/tlperl/lib/CORE/ebcdic_tables.h
+++ b/Master/tlpkg/tlperl/lib/CORE/ebcdic_tables.h
@@ -18,84 +18,92 @@
 
 /* Index is ASCII platform code point; value is EBCDIC 1047 equivalent */
 EXTCONST U8 PL_a2e[] = {
-   0,   1,   2,   3,  55,  45,  46,  47,  22,   5,  21,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  60,  61,  50,  38,  24,  25,  63,  39,  28,  29,  30,  31,
-  64,  90, 127, 123,  91, 108,  80, 125,  77,  93,  92,  78, 107,  96,  75,  97,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 122,  94,  76, 126, 110, 111,
- 124, 193, 194, 195, 196, 197, 198, 199, 200, 201, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 226, 227, 228, 229, 230, 231, 232, 233, 173, 224, 189,  95, 109,
- 121, 129, 130, 131, 132, 133, 134, 135, 136, 137, 145, 146, 147, 148, 149, 150,
- 151, 152, 153, 162, 163, 164, 165, 166, 167, 168, 169, 192,  79, 208, 161,   7,
-  32,  33,  34,  35,  36,  37,   6,  23,  40,  41,  42,  43,  44,   9,  10,  27,
-  48,  49,  26,  51,  52,  53,  54,   8,  56,  57,  58,  59,   4,  20,  62, 255,
-  65, 170,  74, 177, 159, 178, 106, 181, 187, 180, 154, 138, 176, 202, 175, 188,
- 144, 143, 234, 250, 190, 160, 182, 179, 157, 218, 155, 139, 183, 184, 185, 171,
- 100, 101,  98, 102,  99, 103, 158, 104, 116, 113, 114, 115, 120, 117, 118, 119,
- 172, 105, 237, 238, 235, 239, 236, 191, 128, 253, 254, 251, 252, 186, 174,  89,
-  68,  69,  66,  70,  67,  71, 156,  72,  84,  81,  82,  83,  88,  85,  86,  87,
- 140,  73, 205, 206, 203, 207, 204, 225, 112, 221, 222, 219, 220, 141, 142, 223
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x15,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x3C,0x3D,0x32,0x26,0x18,0x19,0x3F,0x27,0x1C,0x1D,0x1E,0x1F,
+0x40,0x5A,0x7F,0x7B,0x5B,0x6C,0x50,0x7D,0x4D,0x5D,0x5C,0x4E,0x6B,0x60,0x4B,0x61,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0x7A,0x5E,0x4C,0x7E,0x6E,0x6F,
+0x7C,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,
+0xD7,0xD8,0xD9,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xAD,0xE0,0xBD,0x5F,0x6D,
+0x79,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x91,0x92,0x93,0x94,0x95,0x96,
+0x97,0x98,0x99,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xC0,0x4F,0xD0,0xA1,0x07,
+0x20,0x21,0x22,0x23,0x24,0x25,0x06,0x17,0x28,0x29,0x2A,0x2B,0x2C,0x09,0x0A,0x1B,
+0x30,0x31,0x1A,0x33,0x34,0x35,0x36,0x08,0x38,0x39,0x3A,0x3B,0x04,0x14,0x3E,0xFF,
+0x41,0xAA,0x4A,0xB1,0x9F,0xB2,0x6A,0xB5,0xBB,0xB4,0x9A,0x8A,0xB0,0xCA,0xAF,0xBC,
+0x90,0x8F,0xEA,0xFA,0xBE,0xA0,0xB6,0xB3,0x9D,0xDA,0x9B,0x8B,0xB7,0xB8,0xB9,0xAB,
+0x64,0x65,0x62,0x66,0x63,0x67,0x9E,0x68,0x74,0x71,0x72,0x73,0x78,0x75,0x76,0x77,
+0xAC,0x69,0xED,0xEE,0xEB,0xEF,0xEC,0xBF,0x80,0xFD,0xFE,0xFB,0xFC,0xBA,0xAE,0x59,
+0x44,0x45,0x42,0x46,0x43,0x47,0x9C,0x48,0x54,0x51,0x52,0x53,0x58,0x55,0x56,0x57,
+0x8C,0x49,0xCD,0xCE,0xCB,0xCF,0xCC,0xE1,0x70,0xDD,0xDE,0xDB,0xDC,0x8D,0x8E,0xDF
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* Index is EBCDIC 1047 code point; value is ASCII platform equivalent */
 EXTCONST U8 PL_e2a[] = {
-   0,   1,   2,   3, 156,   9, 134, 127, 151, 141, 142,  11,  12,  13,  14,  15,
-  16,  17,  18,  19, 157,  10,   8, 135,  24,  25, 146, 143,  28,  29,  30,  31,
- 128, 129, 130, 131, 132, 133,  23,  27, 136, 137, 138, 139, 140,   5,   6,   7,
- 144, 145,  22, 147, 148, 149, 150,   4, 152, 153, 154, 155,  20,  21, 158,  26,
-  32, 160, 226, 228, 224, 225, 227, 229, 231, 241, 162,  46,  60,  40,  43, 124,
-  38, 233, 234, 235, 232, 237, 238, 239, 236, 223,  33,  36,  42,  41,  59,  94,
-  45,  47, 194, 196, 192, 193, 195, 197, 199, 209, 166,  44,  37,  95,  62,  63,
- 248, 201, 202, 203, 200, 205, 206, 207, 204,  96,  58,  35,  64,  39,  61,  34,
- 216,  97,  98,  99, 100, 101, 102, 103, 104, 105, 171, 187, 240, 253, 254, 177,
- 176, 106, 107, 108, 109, 110, 111, 112, 113, 114, 170, 186, 230, 184, 198, 164,
- 181, 126, 115, 116, 117, 118, 119, 120, 121, 122, 161, 191, 208,  91, 222, 174,
- 172, 163, 165, 183, 169, 167, 182, 188, 189, 190, 221, 168, 175,  93, 180, 215,
- 123,  65,  66,  67,  68,  69,  70,  71,  72,  73, 173, 244, 246, 242, 243, 245,
- 125,  74,  75,  76,  77,  78,  79,  80,  81,  82, 185, 251, 252, 249, 250, 255,
-  92, 247,  83,  84,  85,  86,  87,  88,  89,  90, 178, 212, 214, 210, 211, 213,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57, 179, 219, 220, 217, 218, 159
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x9C,0x09,0x86,0x7F,0x97,0x8D,0x8E,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x9D,0x0A,0x08,0x87,0x18,0x19,0x92,0x8F,0x1C,0x1D,0x1E,0x1F,
+0x80,0x81,0x82,0x83,0x84,0x85,0x17,0x1B,0x88,0x89,0x8A,0x8B,0x8C,0x05,0x06,0x07,
+0x90,0x91,0x16,0x93,0x94,0x95,0x96,0x04,0x98,0x99,0x9A,0x9B,0x14,0x15,0x9E,0x1A,
+0x20,0xA0,0xE2,0xE4,0xE0,0xE1,0xE3,0xE5,0xE7,0xF1,0xA2,0x2E,0x3C,0x28,0x2B,0x7C,
+0x26,0xE9,0xEA,0xEB,0xE8,0xED,0xEE,0xEF,0xEC,0xDF,0x21,0x24,0x2A,0x29,0x3B,0x5E,
+0x2D,0x2F,0xC2,0xC4,0xC0,0xC1,0xC3,0xC5,0xC7,0xD1,0xA6,0x2C,0x25,0x5F,0x3E,0x3F,
+0xF8,0xC9,0xCA,0xCB,0xC8,0xCD,0xCE,0xCF,0xCC,0x60,0x3A,0x23,0x40,0x27,0x3D,0x22,
+0xD8,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0xAB,0xBB,0xF0,0xFD,0xFE,0xB1,
+0xB0,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,0xAA,0xBA,0xE6,0xB8,0xC6,0xA4,
+0xB5,0x7E,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0xA1,0xBF,0xD0,0x5B,0xDE,0xAE,
+0xAC,0xA3,0xA5,0xB7,0xA9,0xA7,0xB6,0xBC,0xBD,0xBE,0xDD,0xA8,0xAF,0x5D,0xB4,0xD7,
+0x7B,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0xAD,0xF4,0xF6,0xF2,0xF3,0xF5,
+0x7D,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,0x50,0x51,0x52,0xB9,0xFB,0xFC,0xF9,0xFA,0xFF,
+0x5C,0xF7,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0xB2,0xD4,0xD6,0xD2,0xD3,0xD5,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0xB3,0xDB,0xDC,0xD9,0xDA,0x9F
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* (Confusingly named) Index is EBCDIC 1047 I8 byte; value is
  * EBCDIC 1047 UTF-EBCDIC equivalent */
 EXTCONST U8 PL_utf2e[] = {
-   0,   1,   2,   3,  55,  45,  46,  47,  22,   5,  21,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  60,  61,  50,  38,  24,  25,  63,  39,  28,  29,  30,  31,
-  64,  90, 127, 123,  91, 108,  80, 125,  77,  93,  92,  78, 107,  96,  75,  97,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 122,  94,  76, 126, 110, 111,
- 124, 193, 194, 195, 196, 197, 198, 199, 200, 201, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 226, 227, 228, 229, 230, 231, 232, 233, 173, 224, 189,  95, 109,
- 121, 129, 130, 131, 132, 133, 134, 135, 136, 137, 145, 146, 147, 148, 149, 150,
- 151, 152, 153, 162, 163, 164, 165, 166, 167, 168, 169, 192,  79, 208, 161,   7,
-  32,  33,  34,  35,  36,  37,   6,  23,  40,  41,  42,  43,  44,   9,  10,  27,
-  48,  49,  26,  51,  52,  53,  54,   8,  56,  57,  58,  59,   4,  20,  62, 255,
-  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  81,  82,  83,  84,  85,  86,
-  87,  88,  89,  98,  99, 100, 101, 102, 103, 104, 105, 106, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 128, 138, 139, 140, 141, 142, 143, 144, 154, 155, 156,
- 157, 158, 159, 160, 170, 171, 172, 174, 175, 176, 177, 178, 179, 180, 181, 182,
- 183, 184, 185, 186, 187, 188, 190, 191, 202, 203, 204, 205, 206, 207, 218, 219,
- 220, 221, 222, 223, 225, 234, 235, 236, 237, 238, 239, 250, 251, 252, 253, 254
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x15,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x3C,0x3D,0x32,0x26,0x18,0x19,0x3F,0x27,0x1C,0x1D,0x1E,0x1F,
+0x40,0x5A,0x7F,0x7B,0x5B,0x6C,0x50,0x7D,0x4D,0x5D,0x5C,0x4E,0x6B,0x60,0x4B,0x61,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0x7A,0x5E,0x4C,0x7E,0x6E,0x6F,
+0x7C,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,
+0xD7,0xD8,0xD9,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xAD,0xE0,0xBD,0x5F,0x6D,
+0x79,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x91,0x92,0x93,0x94,0x95,0x96,
+0x97,0x98,0x99,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xC0,0x4F,0xD0,0xA1,0x07,
+0x20,0x21,0x22,0x23,0x24,0x25,0x06,0x17,0x28,0x29,0x2A,0x2B,0x2C,0x09,0x0A,0x1B,
+0x30,0x31,0x1A,0x33,0x34,0x35,0x36,0x08,0x38,0x39,0x3A,0x3B,0x04,0x14,0x3E,0xFF,
+0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x51,0x52,0x53,0x54,0x55,0x56,
+0x57,0x58,0x59,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x70,0x71,0x72,0x73,
+0x74,0x75,0x76,0x77,0x78,0x80,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x9A,0x9B,0x9C,
+0x9D,0x9E,0x9F,0xA0,0xAA,0xAB,0xAC,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,
+0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBF,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xDA,0xDB,
+0xDC,0xDD,0xDE,0xDF,0xE1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xFA,0xFB,0xFC,0xFD,0xFE
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* (Confusingly named) Index is EBCDIC 1047 UTF-EBCDIC byte; value is
  * EBCDIC 1047 I8 equivalent */
 EXTCONST U8 PL_e2utf[] = {
-   0,   1,   2,   3, 156,   9, 134, 127, 151, 141, 142,  11,  12,  13,  14,  15,
-  16,  17,  18,  19, 157,  10,   8, 135,  24,  25, 146, 143,  28,  29,  30,  31,
- 128, 129, 130, 131, 132, 133,  23,  27, 136, 137, 138, 139, 140,   5,   6,   7,
- 144, 145,  22, 147, 148, 149, 150,   4, 152, 153, 154, 155,  20,  21, 158,  26,
-  32, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,  46,  60,  40,  43, 124,
-  38, 170, 171, 172, 173, 174, 175, 176, 177, 178,  33,  36,  42,  41,  59,  94,
-  45,  47, 179, 180, 181, 182, 183, 184, 185, 186, 187,  44,  37,  95,  62,  63,
- 188, 189, 190, 191, 192, 193, 194, 195, 196,  96,  58,  35,  64,  39,  61,  34,
- 197,  97,  98,  99, 100, 101, 102, 103, 104, 105, 198, 199, 200, 201, 202, 203,
- 204, 106, 107, 108, 109, 110, 111, 112, 113, 114, 205, 206, 207, 208, 209, 210,
- 211, 126, 115, 116, 117, 118, 119, 120, 121, 122, 212, 213, 214,  91, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,  93, 230, 231,
- 123,  65,  66,  67,  68,  69,  70,  71,  72,  73, 232, 233, 234, 235, 236, 237,
- 125,  74,  75,  76,  77,  78,  79,  80,  81,  82, 238, 239, 240, 241, 242, 243,
-  92, 244,  83,  84,  85,  86,  87,  88,  89,  90, 245, 246, 247, 248, 249, 250,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57, 251, 252, 253, 254, 255, 159
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x9C,0x09,0x86,0x7F,0x97,0x8D,0x8E,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x9D,0x0A,0x08,0x87,0x18,0x19,0x92,0x8F,0x1C,0x1D,0x1E,0x1F,
+0x80,0x81,0x82,0x83,0x84,0x85,0x17,0x1B,0x88,0x89,0x8A,0x8B,0x8C,0x05,0x06,0x07,
+0x90,0x91,0x16,0x93,0x94,0x95,0x96,0x04,0x98,0x99,0x9A,0x9B,0x14,0x15,0x9E,0x1A,
+0x20,0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0x2E,0x3C,0x28,0x2B,0x7C,
+0x26,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0x21,0x24,0x2A,0x29,0x3B,0x5E,
+0x2D,0x2F,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0x2C,0x25,0x5F,0x3E,0x3F,
+0xBC,0xBD,0xBE,0xBF,0xC0,0xC1,0xC2,0xC3,0xC4,0x60,0x3A,0x23,0x40,0x27,0x3D,0x22,
+0xC5,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,
+0xCC,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,
+0xD3,0x7E,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0xD4,0xD5,0xD6,0x5B,0xD7,0xD8,
+0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0x5D,0xE6,0xE7,
+0x7B,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,
+0x7D,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,0x50,0x51,0x52,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,
+0x5C,0xF4,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0xFB,0xFC,0xFD,0xFE,0xFF,0x9F
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* Index is EBCDIC 1047 UTF-EBCDIC byte; value is UTF8SKIP for start bytes;
@@ -118,92 +126,100 @@ EXTCONST U8 PL_utf8skip[] = {
    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   3,   3,   3,   3,   3,   3,
    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   3,   3,   4,   4,   4,   4,
    1,   4,   1,   1,   1,   1,   1,   1,   1,   1,   4,   4,   4,   5,   5,   5,
-   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   5,   6,   6,   7,   7,   1
+   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   5,   6,   6,   7,  14,   1
 };
 
 /* Index is EBCDIC 1047 code point; value is its lowercase equivalent */
 EXTCONST U8 PL_latin1_lc[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,
-  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,
-  96,  97,  66,  67,  68,  69,  70,  71,  72,  73, 106, 107, 108, 109, 110, 111,
- 112,  81,  82,  83,  84,  85,  86,  87,  88, 121, 122, 123, 124, 125, 126, 127,
- 112, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 156, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 140, 173, 142, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 141, 187, 188, 189, 190, 191,
- 192, 129, 130, 131, 132, 133, 134, 135, 136, 137, 202, 203, 204, 205, 206, 207,
- 208, 145, 146, 147, 148, 149, 150, 151, 152, 153, 218, 219, 220, 221, 222, 223,
- 224, 225, 162, 163, 164, 165, 166, 167, 168, 169, 234, 203, 204, 205, 206, 207,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 219, 220, 221, 222, 255
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+0x60,0x61,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+0x70,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+0x70,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9C,0x9F,
+0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0x8C,0xAD,0x8E,0xAF,
+0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0x8D,0xBB,0xBC,0xBD,0xBE,0xBF,
+0xC0,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+0xD0,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xCB,0xCC,0xCD,0xCE,0xCF,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xDB,0xDC,0xDD,0xDE,0xFF
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* Index is EBCDIC 1047 code point; value is its uppercase equivalent.
  * The 'mod' in the name means that codepoints whose uppercase is above 255 or
  * longer than 1 character map to LATIN SMALL LETTER Y WITH DIARESIS */
 EXTCONST U8 PL_mod_latin1_uc[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  98,  99, 100, 101, 102, 103, 104, 105,  74,  75,  76,  77,  78,  79,
-  80, 113, 114, 115, 116, 117, 118, 119, 120, 223,  90,  91,  92,  93,  94,  95,
-  96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 128, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 193, 194, 195, 196, 197, 198, 199, 200, 201, 138, 139, 172, 186, 174, 143,
- 144, 209, 210, 211, 212, 213, 214, 215, 216, 217, 154, 155, 158, 157, 158, 159,
- 223, 161, 226, 227, 228, 229, 230, 231, 232, 233, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 235, 236, 237, 238, 239,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 251, 252, 253, 254, 223,
- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+0x40,0x41,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+0x50,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0xDF,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+0x80,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+0x80,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0x8A,0x8B,0xAC,0xBA,0xAE,0x8F,
+0x90,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0x9A,0x9B,0x9E,0x9D,0x9E,0x9F,
+0xDF,0xA1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
+0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xEB,0xEC,0xED,0xEE,0xEF,
+0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xFB,0xFC,0xFD,0xFE,0xDF,
+0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* Index is EBCDIC 1047 code point; For A-Z, value is a-z; for a-z, value
  * is A-Z; all other code points map to themselves */
 EXTCONST U8 PL_fold[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,
-  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,
-  96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 193, 194, 195, 196, 197, 198, 199, 200, 201, 138, 139, 140, 141, 142, 143,
- 144, 209, 210, 211, 212, 213, 214, 215, 216, 217, 154, 155, 156, 157, 158, 159,
- 160, 161, 226, 227, 228, 229, 230, 231, 232, 233, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 129, 130, 131, 132, 133, 134, 135, 136, 137, 202, 203, 204, 205, 206, 207,
- 208, 145, 146, 147, 148, 149, 150, 151, 152, 153, 218, 219, 220, 221, 222, 223,
- 224, 225, 162, 163, 164, 165, 166, 167, 168, 169, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+0x80,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+0x90,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+0xA0,0xA1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
+0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+0xC0,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+0xD0,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* Index is EBCDIC 1047 code point; value is its other fold-pair equivalent
  * (A => a; a => A, etc) in the 0-255 range.  If no such equivalent, value is
  * the code point itself */
 EXTCONST U8 PL_fold_latin1[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  98,  99, 100, 101, 102, 103, 104, 105,  74,  75,  76,  77,  78,  79,
-  80, 113, 114, 115, 116, 117, 118, 119, 120,  89,  90,  91,  92,  93,  94,  95,
-  96,  97,  66,  67,  68,  69,  70,  71,  72,  73, 106, 107, 108, 109, 110, 111,
- 128,  81,  82,  83,  84,  85,  86,  87,  88, 121, 122, 123, 124, 125, 126, 127,
- 112, 193, 194, 195, 196, 197, 198, 199, 200, 201, 138, 139, 172, 186, 174, 143,
- 144, 209, 210, 211, 212, 213, 214, 215, 216, 217, 154, 155, 158, 157, 156, 159,
- 160, 161, 226, 227, 228, 229, 230, 231, 232, 233, 170, 171, 140, 173, 142, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 141, 187, 188, 189, 190, 191,
- 192, 129, 130, 131, 132, 133, 134, 135, 136, 137, 202, 235, 236, 237, 238, 239,
- 208, 145, 146, 147, 148, 149, 150, 151, 152, 153, 218, 251, 252, 253, 254, 223,
- 224, 225, 162, 163, 164, 165, 166, 167, 168, 169, 234, 203, 204, 205, 206, 207,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 219, 220, 221, 222, 255
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+0x40,0x41,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+0x50,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+0x60,0x61,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+0x80,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+0x70,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0x8A,0x8B,0xAC,0xBA,0xAE,0x8F,
+0x90,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0x9A,0x9B,0x9E,0x9D,0x9C,0x9F,
+0xA0,0xA1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xAA,0xAB,0x8C,0xAD,0x8E,0xAF,
+0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0x8D,0xBB,0xBC,0xBD,0xBE,0xBF,
+0xC0,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0xCA,0xEB,0xEC,0xED,0xEE,0xEF,
+0xD0,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xDA,0xFB,0xFC,0xFD,0xFE,0xDF,
+0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xCB,0xCC,0xCD,0xCE,0xCF,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xDB,0xDC,0xDD,0xDE,0xFF
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 #endif	/* EBCDIC 1047 */
@@ -215,84 +231,92 @@ EXTCONST U8 PL_fold_latin1[] = {
 
 /* Index is ASCII platform code point; value is EBCDIC 037 equivalent */
 EXTCONST U8 PL_a2e[] = {
-   0,   1,   2,   3,  55,  45,  46,  47,  22,   5,  37,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  60,  61,  50,  38,  24,  25,  63,  39,  28,  29,  30,  31,
-  64,  90, 127, 123,  91, 108,  80, 125,  77,  93,  92,  78, 107,  96,  75,  97,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 122,  94,  76, 126, 110, 111,
- 124, 193, 194, 195, 196, 197, 198, 199, 200, 201, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 226, 227, 228, 229, 230, 231, 232, 233, 186, 224, 187, 176, 109,
- 121, 129, 130, 131, 132, 133, 134, 135, 136, 137, 145, 146, 147, 148, 149, 150,
- 151, 152, 153, 162, 163, 164, 165, 166, 167, 168, 169, 192,  79, 208, 161,   7,
-  32,  33,  34,  35,  36,  21,   6,  23,  40,  41,  42,  43,  44,   9,  10,  27,
-  48,  49,  26,  51,  52,  53,  54,   8,  56,  57,  58,  59,   4,  20,  62, 255,
-  65, 170,  74, 177, 159, 178, 106, 181, 189, 180, 154, 138,  95, 202, 175, 188,
- 144, 143, 234, 250, 190, 160, 182, 179, 157, 218, 155, 139, 183, 184, 185, 171,
- 100, 101,  98, 102,  99, 103, 158, 104, 116, 113, 114, 115, 120, 117, 118, 119,
- 172, 105, 237, 238, 235, 239, 236, 191, 128, 253, 254, 251, 252, 173, 174,  89,
-  68,  69,  66,  70,  67,  71, 156,  72,  84,  81,  82,  83,  88,  85,  86,  87,
- 140,  73, 205, 206, 203, 207, 204, 225, 112, 221, 222, 219, 220, 141, 142, 223
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x25,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x3C,0x3D,0x32,0x26,0x18,0x19,0x3F,0x27,0x1C,0x1D,0x1E,0x1F,
+0x40,0x5A,0x7F,0x7B,0x5B,0x6C,0x50,0x7D,0x4D,0x5D,0x5C,0x4E,0x6B,0x60,0x4B,0x61,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0x7A,0x5E,0x4C,0x7E,0x6E,0x6F,
+0x7C,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,
+0xD7,0xD8,0xD9,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xBA,0xE0,0xBB,0xB0,0x6D,
+0x79,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x91,0x92,0x93,0x94,0x95,0x96,
+0x97,0x98,0x99,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xC0,0x4F,0xD0,0xA1,0x07,
+0x20,0x21,0x22,0x23,0x24,0x15,0x06,0x17,0x28,0x29,0x2A,0x2B,0x2C,0x09,0x0A,0x1B,
+0x30,0x31,0x1A,0x33,0x34,0x35,0x36,0x08,0x38,0x39,0x3A,0x3B,0x04,0x14,0x3E,0xFF,
+0x41,0xAA,0x4A,0xB1,0x9F,0xB2,0x6A,0xB5,0xBD,0xB4,0x9A,0x8A,0x5F,0xCA,0xAF,0xBC,
+0x90,0x8F,0xEA,0xFA,0xBE,0xA0,0xB6,0xB3,0x9D,0xDA,0x9B,0x8B,0xB7,0xB8,0xB9,0xAB,
+0x64,0x65,0x62,0x66,0x63,0x67,0x9E,0x68,0x74,0x71,0x72,0x73,0x78,0x75,0x76,0x77,
+0xAC,0x69,0xED,0xEE,0xEB,0xEF,0xEC,0xBF,0x80,0xFD,0xFE,0xFB,0xFC,0xAD,0xAE,0x59,
+0x44,0x45,0x42,0x46,0x43,0x47,0x9C,0x48,0x54,0x51,0x52,0x53,0x58,0x55,0x56,0x57,
+0x8C,0x49,0xCD,0xCE,0xCB,0xCF,0xCC,0xE1,0x70,0xDD,0xDE,0xDB,0xDC,0x8D,0x8E,0xDF
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* Index is EBCDIC 037 code point; value is ASCII platform equivalent */
 EXTCONST U8 PL_e2a[] = {
-   0,   1,   2,   3, 156,   9, 134, 127, 151, 141, 142,  11,  12,  13,  14,  15,
-  16,  17,  18,  19, 157, 133,   8, 135,  24,  25, 146, 143,  28,  29,  30,  31,
- 128, 129, 130, 131, 132,  10,  23,  27, 136, 137, 138, 139, 140,   5,   6,   7,
- 144, 145,  22, 147, 148, 149, 150,   4, 152, 153, 154, 155,  20,  21, 158,  26,
-  32, 160, 226, 228, 224, 225, 227, 229, 231, 241, 162,  46,  60,  40,  43, 124,
-  38, 233, 234, 235, 232, 237, 238, 239, 236, 223,  33,  36,  42,  41,  59, 172,
-  45,  47, 194, 196, 192, 193, 195, 197, 199, 209, 166,  44,  37,  95,  62,  63,
- 248, 201, 202, 203, 200, 205, 206, 207, 204,  96,  58,  35,  64,  39,  61,  34,
- 216,  97,  98,  99, 100, 101, 102, 103, 104, 105, 171, 187, 240, 253, 254, 177,
- 176, 106, 107, 108, 109, 110, 111, 112, 113, 114, 170, 186, 230, 184, 198, 164,
- 181, 126, 115, 116, 117, 118, 119, 120, 121, 122, 161, 191, 208, 221, 222, 174,
-  94, 163, 165, 183, 169, 167, 182, 188, 189, 190,  91,  93, 175, 168, 180, 215,
- 123,  65,  66,  67,  68,  69,  70,  71,  72,  73, 173, 244, 246, 242, 243, 245,
- 125,  74,  75,  76,  77,  78,  79,  80,  81,  82, 185, 251, 252, 249, 250, 255,
-  92, 247,  83,  84,  85,  86,  87,  88,  89,  90, 178, 212, 214, 210, 211, 213,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57, 179, 219, 220, 217, 218, 159
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x9C,0x09,0x86,0x7F,0x97,0x8D,0x8E,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x9D,0x85,0x08,0x87,0x18,0x19,0x92,0x8F,0x1C,0x1D,0x1E,0x1F,
+0x80,0x81,0x82,0x83,0x84,0x0A,0x17,0x1B,0x88,0x89,0x8A,0x8B,0x8C,0x05,0x06,0x07,
+0x90,0x91,0x16,0x93,0x94,0x95,0x96,0x04,0x98,0x99,0x9A,0x9B,0x14,0x15,0x9E,0x1A,
+0x20,0xA0,0xE2,0xE4,0xE0,0xE1,0xE3,0xE5,0xE7,0xF1,0xA2,0x2E,0x3C,0x28,0x2B,0x7C,
+0x26,0xE9,0xEA,0xEB,0xE8,0xED,0xEE,0xEF,0xEC,0xDF,0x21,0x24,0x2A,0x29,0x3B,0xAC,
+0x2D,0x2F,0xC2,0xC4,0xC0,0xC1,0xC3,0xC5,0xC7,0xD1,0xA6,0x2C,0x25,0x5F,0x3E,0x3F,
+0xF8,0xC9,0xCA,0xCB,0xC8,0xCD,0xCE,0xCF,0xCC,0x60,0x3A,0x23,0x40,0x27,0x3D,0x22,
+0xD8,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0xAB,0xBB,0xF0,0xFD,0xFE,0xB1,
+0xB0,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,0xAA,0xBA,0xE6,0xB8,0xC6,0xA4,
+0xB5,0x7E,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0xA1,0xBF,0xD0,0xDD,0xDE,0xAE,
+0x5E,0xA3,0xA5,0xB7,0xA9,0xA7,0xB6,0xBC,0xBD,0xBE,0x5B,0x5D,0xAF,0xA8,0xB4,0xD7,
+0x7B,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0xAD,0xF4,0xF6,0xF2,0xF3,0xF5,
+0x7D,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,0x50,0x51,0x52,0xB9,0xFB,0xFC,0xF9,0xFA,0xFF,
+0x5C,0xF7,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0xB2,0xD4,0xD6,0xD2,0xD3,0xD5,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0xB3,0xDB,0xDC,0xD9,0xDA,0x9F
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* (Confusingly named) Index is EBCDIC 037 I8 byte; value is
  * EBCDIC 037 UTF-EBCDIC equivalent */
 EXTCONST U8 PL_utf2e[] = {
-   0,   1,   2,   3,  55,  45,  46,  47,  22,   5,  37,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  60,  61,  50,  38,  24,  25,  63,  39,  28,  29,  30,  31,
-  64,  90, 127, 123,  91, 108,  80, 125,  77,  93,  92,  78, 107,  96,  75,  97,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 122,  94,  76, 126, 110, 111,
- 124, 193, 194, 195, 196, 197, 198, 199, 200, 201, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 226, 227, 228, 229, 230, 231, 232, 233, 186, 224, 187, 176, 109,
- 121, 129, 130, 131, 132, 133, 134, 135, 136, 137, 145, 146, 147, 148, 149, 150,
- 151, 152, 153, 162, 163, 164, 165, 166, 167, 168, 169, 192,  79, 208, 161,   7,
-  32,  33,  34,  35,  36,  21,   6,  23,  40,  41,  42,  43,  44,   9,  10,  27,
-  48,  49,  26,  51,  52,  53,  54,   8,  56,  57,  58,  59,   4,  20,  62, 255,
-  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  81,  82,  83,  84,  85,  86,
-  87,  88,  89,  95,  98,  99, 100, 101, 102, 103, 104, 105, 106, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 128, 138, 139, 140, 141, 142, 143, 144, 154, 155,
- 156, 157, 158, 159, 160, 170, 171, 172, 173, 174, 175, 177, 178, 179, 180, 181,
- 182, 183, 184, 185, 188, 189, 190, 191, 202, 203, 204, 205, 206, 207, 218, 219,
- 220, 221, 222, 223, 225, 234, 235, 236, 237, 238, 239, 250, 251, 252, 253, 254
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x37,0x2D,0x2E,0x2F,0x16,0x05,0x25,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x3C,0x3D,0x32,0x26,0x18,0x19,0x3F,0x27,0x1C,0x1D,0x1E,0x1F,
+0x40,0x5A,0x7F,0x7B,0x5B,0x6C,0x50,0x7D,0x4D,0x5D,0x5C,0x4E,0x6B,0x60,0x4B,0x61,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0x7A,0x5E,0x4C,0x7E,0x6E,0x6F,
+0x7C,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,
+0xD7,0xD8,0xD9,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xBA,0xE0,0xBB,0xB0,0x6D,
+0x79,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x91,0x92,0x93,0x94,0x95,0x96,
+0x97,0x98,0x99,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xC0,0x4F,0xD0,0xA1,0x07,
+0x20,0x21,0x22,0x23,0x24,0x15,0x06,0x17,0x28,0x29,0x2A,0x2B,0x2C,0x09,0x0A,0x1B,
+0x30,0x31,0x1A,0x33,0x34,0x35,0x36,0x08,0x38,0x39,0x3A,0x3B,0x04,0x14,0x3E,0xFF,
+0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x51,0x52,0x53,0x54,0x55,0x56,
+0x57,0x58,0x59,0x5F,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x70,0x71,0x72,
+0x73,0x74,0x75,0x76,0x77,0x78,0x80,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x9A,0x9B,
+0x9C,0x9D,0x9E,0x9F,0xA0,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB1,0xB2,0xB3,0xB4,0xB5,
+0xB6,0xB7,0xB8,0xB9,0xBC,0xBD,0xBE,0xBF,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xDA,0xDB,
+0xDC,0xDD,0xDE,0xDF,0xE1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xFA,0xFB,0xFC,0xFD,0xFE
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* (Confusingly named) Index is EBCDIC 037 UTF-EBCDIC byte; value is
  * EBCDIC 037 I8 equivalent */
 EXTCONST U8 PL_e2utf[] = {
-   0,   1,   2,   3, 156,   9, 134, 127, 151, 141, 142,  11,  12,  13,  14,  15,
-  16,  17,  18,  19, 157, 133,   8, 135,  24,  25, 146, 143,  28,  29,  30,  31,
- 128, 129, 130, 131, 132,  10,  23,  27, 136, 137, 138, 139, 140,   5,   6,   7,
- 144, 145,  22, 147, 148, 149, 150,   4, 152, 153, 154, 155,  20,  21, 158,  26,
-  32, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,  46,  60,  40,  43, 124,
-  38, 170, 171, 172, 173, 174, 175, 176, 177, 178,  33,  36,  42,  41,  59, 179,
-  45,  47, 180, 181, 182, 183, 184, 185, 186, 187, 188,  44,  37,  95,  62,  63,
- 189, 190, 191, 192, 193, 194, 195, 196, 197,  96,  58,  35,  64,  39,  61,  34,
- 198,  97,  98,  99, 100, 101, 102, 103, 104, 105, 199, 200, 201, 202, 203, 204,
- 205, 106, 107, 108, 109, 110, 111, 112, 113, 114, 206, 207, 208, 209, 210, 211,
- 212, 126, 115, 116, 117, 118, 119, 120, 121, 122, 213, 214, 215, 216, 217, 218,
-  94, 219, 220, 221, 222, 223, 224, 225, 226, 227,  91,  93, 228, 229, 230, 231,
- 123,  65,  66,  67,  68,  69,  70,  71,  72,  73, 232, 233, 234, 235, 236, 237,
- 125,  74,  75,  76,  77,  78,  79,  80,  81,  82, 238, 239, 240, 241, 242, 243,
-  92, 244,  83,  84,  85,  86,  87,  88,  89,  90, 245, 246, 247, 248, 249, 250,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57, 251, 252, 253, 254, 255, 159
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x9C,0x09,0x86,0x7F,0x97,0x8D,0x8E,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x9D,0x85,0x08,0x87,0x18,0x19,0x92,0x8F,0x1C,0x1D,0x1E,0x1F,
+0x80,0x81,0x82,0x83,0x84,0x0A,0x17,0x1B,0x88,0x89,0x8A,0x8B,0x8C,0x05,0x06,0x07,
+0x90,0x91,0x16,0x93,0x94,0x95,0x96,0x04,0x98,0x99,0x9A,0x9B,0x14,0x15,0x9E,0x1A,
+0x20,0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0x2E,0x3C,0x28,0x2B,0x7C,
+0x26,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0x21,0x24,0x2A,0x29,0x3B,0xB3,
+0x2D,0x2F,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0x2C,0x25,0x5F,0x3E,0x3F,
+0xBD,0xBE,0xBF,0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0x60,0x3A,0x23,0x40,0x27,0x3D,0x22,
+0xC6,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,
+0xCD,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,
+0xD4,0x7E,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,
+0x5E,0xDB,0xDC,0xDD,0xDE,0xDF,0xE0,0xE1,0xE2,0xE3,0x5B,0x5D,0xE4,0xE5,0xE6,0xE7,
+0x7B,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,
+0x7D,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,0x50,0x51,0x52,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,
+0x5C,0xF4,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0xFB,0xFC,0xFD,0xFE,0xFF,0x9F
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* Index is EBCDIC 037 UTF-EBCDIC byte; value is UTF8SKIP for start bytes;
@@ -315,293 +339,104 @@ EXTCONST U8 PL_utf8skip[] = {
    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   3,   3,   3,   3,   3,   3,
    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   3,   3,   4,   4,   4,   4,
    1,   4,   1,   1,   1,   1,   1,   1,   1,   1,   4,   4,   4,   5,   5,   5,
-   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   5,   6,   6,   7,   7,   1
+   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   5,   6,   6,   7,  14,   1
 };
 
 /* Index is EBCDIC 037 code point; value is its lowercase equivalent */
 EXTCONST U8 PL_latin1_lc[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,
-  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,
-  96,  97,  66,  67,  68,  69,  70,  71,  72,  73, 106, 107, 108, 109, 110, 111,
- 112,  81,  82,  83,  84,  85,  86,  87,  88, 121, 122, 123, 124, 125, 126, 127,
- 112, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 156, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 140, 141, 142, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 129, 130, 131, 132, 133, 134, 135, 136, 137, 202, 203, 204, 205, 206, 207,
- 208, 145, 146, 147, 148, 149, 150, 151, 152, 153, 218, 219, 220, 221, 222, 223,
- 224, 225, 162, 163, 164, 165, 166, 167, 168, 169, 234, 203, 204, 205, 206, 207,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 219, 220, 221, 222, 255
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+0x60,0x61,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+0x70,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+0x70,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9C,0x9F,
+0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0x8C,0x8D,0x8E,0xAF,
+0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+0xC0,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+0xD0,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xCB,0xCC,0xCD,0xCE,0xCF,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xDB,0xDC,0xDD,0xDE,0xFF
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* Index is EBCDIC 037 code point; value is its uppercase equivalent.
  * The 'mod' in the name means that codepoints whose uppercase is above 255 or
  * longer than 1 character map to LATIN SMALL LETTER Y WITH DIARESIS */
 EXTCONST U8 PL_mod_latin1_uc[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  98,  99, 100, 101, 102, 103, 104, 105,  74,  75,  76,  77,  78,  79,
-  80, 113, 114, 115, 116, 117, 118, 119, 120, 223,  90,  91,  92,  93,  94,  95,
-  96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 128, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 193, 194, 195, 196, 197, 198, 199, 200, 201, 138, 139, 172, 173, 174, 143,
- 144, 209, 210, 211, 212, 213, 214, 215, 216, 217, 154, 155, 158, 157, 158, 159,
- 223, 161, 226, 227, 228, 229, 230, 231, 232, 233, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 235, 236, 237, 238, 239,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 251, 252, 253, 254, 223,
- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+0x40,0x41,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+0x50,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0xDF,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+0x80,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+0x80,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0x8A,0x8B,0xAC,0xAD,0xAE,0x8F,
+0x90,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0x9A,0x9B,0x9E,0x9D,0x9E,0x9F,
+0xDF,0xA1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
+0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xEB,0xEC,0xED,0xEE,0xEF,
+0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xFB,0xFC,0xFD,0xFE,0xDF,
+0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* Index is EBCDIC 037 code point; For A-Z, value is a-z; for a-z, value
  * is A-Z; all other code points map to themselves */
 EXTCONST U8 PL_fold[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,
-  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,
-  96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 193, 194, 195, 196, 197, 198, 199, 200, 201, 138, 139, 140, 141, 142, 143,
- 144, 209, 210, 211, 212, 213, 214, 215, 216, 217, 154, 155, 156, 157, 158, 159,
- 160, 161, 226, 227, 228, 229, 230, 231, 232, 233, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 129, 130, 131, 132, 133, 134, 135, 136, 137, 202, 203, 204, 205, 206, 207,
- 208, 145, 146, 147, 148, 149, 150, 151, 152, 153, 218, 219, 220, 221, 222, 223,
- 224, 225, 162, 163, 164, 165, 166, 167, 168, 169, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+0x80,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
+0x90,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
+0xA0,0xA1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
+0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+0xC0,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
+0xD0,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
+0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 /* Index is EBCDIC 037 code point; value is its other fold-pair equivalent
  * (A => a; a => A, etc) in the 0-255 range.  If no such equivalent, value is
  * the code point itself */
 EXTCONST U8 PL_fold_latin1[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  98,  99, 100, 101, 102, 103, 104, 105,  74,  75,  76,  77,  78,  79,
-  80, 113, 114, 115, 116, 117, 118, 119, 120,  89,  90,  91,  92,  93,  94,  95,
-  96,  97,  66,  67,  68,  69,  70,  71,  72,  73, 106, 107, 108, 109, 110, 111,
- 128,  81,  82,  83,  84,  85,  86,  87,  88, 121, 122, 123, 124, 125, 126, 127,
- 112, 193, 194, 195, 196, 197, 198, 199, 200, 201, 138, 139, 172, 173, 174, 143,
- 144, 209, 210, 211, 212, 213, 214, 215, 216, 217, 154, 155, 158, 157, 156, 159,
- 160, 161, 226, 227, 228, 229, 230, 231, 232, 233, 170, 171, 140, 141, 142, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 129, 130, 131, 132, 133, 134, 135, 136, 137, 202, 235, 236, 237, 238, 239,
- 208, 145, 146, 147, 148, 149, 150, 151, 152, 153, 218, 251, 252, 253, 254, 223,
- 224, 225, 162, 163, 164, 165, 166, 167, 168, 169, 234, 203, 204, 205, 206, 207,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 219, 220, 221, 222, 255
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
+0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
+0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
+0x40,0x41,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
+0x50,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
+0x60,0x61,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
+0x80,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
+0x70,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0x8A,0x8B,0xAC,0xAD,0xAE,0x8F,
+0x90,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0x9A,0x9B,0x9E,0x9D,0x9C,0x9F,
+0xA0,0xA1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xAA,0xAB,0x8C,0x8D,0x8E,0xAF,
+0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
+0xC0,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0xCA,0xEB,0xEC,0xED,0xEE,0xEF,
+0xD0,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xDA,0xFB,0xFC,0xFD,0xFE,0xDF,
+0xE0,0xE1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xEA,0xCB,0xCC,0xCD,0xCE,0xCF,
+0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xDB,0xDC,0xDD,0xDE,0xFF
+/*_0   _1   _2   _3   _4   _5   _6   _7   _8   _9   _A   _B   _C   _D   _E  _F*/
 };
 
 #endif	/* EBCDIC 037 */
 
-#if 'A' == 193 /* EBCDIC POSIX-BC */ \
-     && '\\' == 188 && '[' == 187 && ']' == 189 && '{' == 251 && '}' == 253 \
-     && '^' == 106 && '~' == 255 && '!' == 90 && '#' == 123 && '|' == 79 \
-     && '$' == 91 && '@' == 124 && '`' == 74
-
-/* Index is ASCII platform code point; value is EBCDIC POSIX-BC equivalent */
-EXTCONST U8 PL_a2e[] = {
-   0,   1,   2,   3,  55,  45,  46,  47,  22,   5,  21,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  60,  61,  50,  38,  24,  25,  63,  39,  28,  29,  30,  31,
-  64,  90, 127, 123,  91, 108,  80, 125,  77,  93,  92,  78, 107,  96,  75,  97,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 122,  94,  76, 126, 110, 111,
- 124, 193, 194, 195, 196, 197, 198, 199, 200, 201, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 226, 227, 228, 229, 230, 231, 232, 233, 187, 188, 189, 106, 109,
-  74, 129, 130, 131, 132, 133, 134, 135, 136, 137, 145, 146, 147, 148, 149, 150,
- 151, 152, 153, 162, 163, 164, 165, 166, 167, 168, 169, 251,  79, 253, 255,   7,
-  32,  33,  34,  35,  36,  37,   6,  23,  40,  41,  42,  43,  44,   9,  10,  27,
-  48,  49,  26,  51,  52,  53,  54,   8,  56,  57,  58,  59,   4,  20,  62,  95,
-  65, 170, 176, 177, 159, 178, 208, 181, 121, 180, 154, 138, 186, 202, 175, 161,
- 144, 143, 234, 250, 190, 160, 182, 179, 157, 218, 155, 139, 183, 184, 185, 171,
- 100, 101,  98, 102,  99, 103, 158, 104, 116, 113, 114, 115, 120, 117, 118, 119,
- 172, 105, 237, 238, 235, 239, 236, 191, 128, 224, 254, 221, 252, 173, 174,  89,
-  68,  69,  66,  70,  67,  71, 156,  72,  84,  81,  82,  83,  88,  85,  86,  87,
- 140,  73, 205, 206, 203, 207, 204, 225, 112, 192, 222, 219, 220, 141, 142, 223
-};
-
-/* Index is EBCDIC POSIX-BC code point; value is ASCII platform equivalent */
-EXTCONST U8 PL_e2a[] = {
-   0,   1,   2,   3, 156,   9, 134, 127, 151, 141, 142,  11,  12,  13,  14,  15,
-  16,  17,  18,  19, 157,  10,   8, 135,  24,  25, 146, 143,  28,  29,  30,  31,
- 128, 129, 130, 131, 132, 133,  23,  27, 136, 137, 138, 139, 140,   5,   6,   7,
- 144, 145,  22, 147, 148, 149, 150,   4, 152, 153, 154, 155,  20,  21, 158,  26,
-  32, 160, 226, 228, 224, 225, 227, 229, 231, 241,  96,  46,  60,  40,  43, 124,
-  38, 233, 234, 235, 232, 237, 238, 239, 236, 223,  33,  36,  42,  41,  59, 159,
-  45,  47, 194, 196, 192, 193, 195, 197, 199, 209,  94,  44,  37,  95,  62,  63,
- 248, 201, 202, 203, 200, 205, 206, 207, 204, 168,  58,  35,  64,  39,  61,  34,
- 216,  97,  98,  99, 100, 101, 102, 103, 104, 105, 171, 187, 240, 253, 254, 177,
- 176, 106, 107, 108, 109, 110, 111, 112, 113, 114, 170, 186, 230, 184, 198, 164,
- 181, 175, 115, 116, 117, 118, 119, 120, 121, 122, 161, 191, 208, 221, 222, 174,
- 162, 163, 165, 183, 169, 167, 182, 188, 189, 190, 172,  91,  92,  93, 180, 215,
- 249,  65,  66,  67,  68,  69,  70,  71,  72,  73, 173, 244, 246, 242, 243, 245,
- 166,  74,  75,  76,  77,  78,  79,  80,  81,  82, 185, 251, 252, 219, 250, 255,
- 217, 247,  83,  84,  85,  86,  87,  88,  89,  90, 178, 212, 214, 210, 211, 213,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57, 179, 123, 220, 125, 218, 126
-};
-
-/* (Confusingly named) Index is EBCDIC POSIX-BC I8 byte; value is
- * EBCDIC POSIX-BC UTF-EBCDIC equivalent */
-EXTCONST U8 PL_utf2e[] = {
-   0,   1,   2,   3,  55,  45,  46,  47,  22,   5,  21,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  60,  61,  50,  38,  24,  25,  63,  39,  28,  29,  30,  31,
-  64,  90, 127, 123,  91, 108,  80, 125,  77,  93,  92,  78, 107,  96,  75,  97,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 122,  94,  76, 126, 110, 111,
- 124, 193, 194, 195, 196, 197, 198, 199, 200, 201, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 226, 227, 228, 229, 230, 231, 232, 233, 187, 188, 189, 106, 109,
-  74, 129, 130, 131, 132, 133, 134, 135, 136, 137, 145, 146, 147, 148, 149, 150,
- 151, 152, 153, 162, 163, 164, 165, 166, 167, 168, 169, 251,  79, 253, 255,   7,
-  32,  33,  34,  35,  36,  37,   6,  23,  40,  41,  42,  43,  44,   9,  10,  27,
-  48,  49,  26,  51,  52,  53,  54,   8,  56,  57,  58,  59,   4,  20,  62,  95,
-  65,  66,  67,  68,  69,  70,  71,  72,  73,  81,  82,  83,  84,  85,  86,  87,
-  88,  89,  98,  99, 100, 101, 102, 103, 104, 105, 112, 113, 114, 115, 116, 117,
- 118, 119, 120, 121, 128, 138, 139, 140, 141, 142, 143, 144, 154, 155, 156, 157,
- 158, 159, 160, 161, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
- 182, 183, 184, 185, 186, 190, 191, 192, 202, 203, 204, 205, 206, 207, 208, 218,
- 219, 220, 221, 222, 223, 224, 225, 234, 235, 236, 237, 238, 239, 250, 252, 254
-};
-
-/* (Confusingly named) Index is EBCDIC POSIX-BC UTF-EBCDIC byte; value is
- * EBCDIC POSIX-BC I8 equivalent */
-EXTCONST U8 PL_e2utf[] = {
-   0,   1,   2,   3, 156,   9, 134, 127, 151, 141, 142,  11,  12,  13,  14,  15,
-  16,  17,  18,  19, 157,  10,   8, 135,  24,  25, 146, 143,  28,  29,  30,  31,
- 128, 129, 130, 131, 132, 133,  23,  27, 136, 137, 138, 139, 140,   5,   6,   7,
- 144, 145,  22, 147, 148, 149, 150,   4, 152, 153, 154, 155,  20,  21, 158,  26,
-  32, 160, 161, 162, 163, 164, 165, 166, 167, 168,  96,  46,  60,  40,  43, 124,
-  38, 169, 170, 171, 172, 173, 174, 175, 176, 177,  33,  36,  42,  41,  59, 159,
-  45,  47, 178, 179, 180, 181, 182, 183, 184, 185,  94,  44,  37,  95,  62,  63,
- 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,  58,  35,  64,  39,  61,  34,
- 196,  97,  98,  99, 100, 101, 102, 103, 104, 105, 197, 198, 199, 200, 201, 202,
- 203, 106, 107, 108, 109, 110, 111, 112, 113, 114, 204, 205, 206, 207, 208, 209,
- 210, 211, 115, 116, 117, 118, 119, 120, 121, 122, 212, 213, 214, 215, 216, 217,
- 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,  91,  92,  93, 229, 230,
- 231,  65,  66,  67,  68,  69,  70,  71,  72,  73, 232, 233, 234, 235, 236, 237,
- 238,  74,  75,  76,  77,  78,  79,  80,  81,  82, 239, 240, 241, 242, 243, 244,
- 245, 246,  83,  84,  85,  86,  87,  88,  89,  90, 247, 248, 249, 250, 251, 252,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57, 253, 123, 254, 125, 255, 126
-};
-
-/* Index is EBCDIC POSIX-BC UTF-EBCDIC byte; value is UTF8SKIP for start bytes;
- * 1 for continuation.  Adapted from the shadow flags table in tr16.  The
- * entries marked 9 in tr16 are continuation bytes and are marked as length 1
- * here so that we can recover. */
-EXTCONST U8 PL_utf8skip[] = {
-   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
-   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
-   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
-   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
-   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
-   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
-   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
-   1,   1,   1,   1,   1,   1,   2,   2,   2,   2,   1,   1,   1,   1,   1,   1,
-   2,   1,   1,   1,   1,   1,   1,   1,   1,   1,   2,   2,   2,   2,   2,   2,
-   2,   1,   1,   1,   1,   1,   1,   1,   1,   1,   2,   2,   2,   2,   2,   2,
-   2,   2,   1,   1,   1,   1,   1,   1,   1,   1,   2,   2,   2,   2,   2,   2,
-   2,   2,   2,   2,   2,   2,   3,   3,   3,   3,   3,   1,   1,   1,   3,   3,
-   3,   1,   1,   1,   1,   1,   1,   1,   1,   1,   3,   3,   3,   3,   3,   3,
-   3,   1,   1,   1,   1,   1,   1,   1,   1,   1,   3,   4,   4,   4,   4,   4,
-   4,   4,   1,   1,   1,   1,   1,   1,   1,   1,   4,   5,   5,   5,   5,   6,
-   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   6,   1,   7,   1,   7,   1
-};
-
-/* Index is EBCDIC POSIX-BC code point; value is its lowercase equivalent */
-EXTCONST U8 PL_latin1_lc[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,
-  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,
-  96,  97,  66,  67,  68,  69,  70,  71,  72,  73, 106, 107, 108, 109, 110, 111,
- 112,  81,  82,  83,  84,  85,  86,  87,  88, 121, 122, 123, 124, 125, 126, 127,
- 112, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 156, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 140, 141, 142, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 129, 130, 131, 132, 133, 134, 135, 136, 137, 202, 203, 204, 205, 206, 207,
- 208, 145, 146, 147, 148, 149, 150, 151, 152, 153, 218, 219, 220, 219, 222, 223,
- 192, 225, 162, 163, 164, 165, 166, 167, 168, 169, 234, 203, 204, 205, 206, 207,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 220, 253, 222, 255
-};
-
-/* Index is EBCDIC POSIX-BC code point; value is its uppercase equivalent.
- * The 'mod' in the name means that codepoints whose uppercase is above 255 or
- * longer than 1 character map to LATIN SMALL LETTER Y WITH DIARESIS */
-EXTCONST U8 PL_mod_latin1_uc[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  98,  99, 100, 101, 102, 103, 104, 105,  74,  75,  76,  77,  78,  79,
-  80, 113, 114, 115, 116, 117, 118, 119, 120, 223,  90,  91,  92,  93,  94,  95,
-  96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 128, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 193, 194, 195, 196, 197, 198, 199, 200, 201, 138, 139, 172, 173, 174, 143,
- 144, 209, 210, 211, 212, 213, 214, 215, 216, 217, 154, 155, 158, 157, 158, 159,
- 223, 161, 226, 227, 228, 229, 230, 231, 232, 233, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 224, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 235, 236, 237, 238, 239,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 221, 252, 221, 254, 223,
- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
-};
-
-/* Index is EBCDIC POSIX-BC code point; For A-Z, value is a-z; for a-z, value
- * is A-Z; all other code points map to themselves */
-EXTCONST U8 PL_fold[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,  79,
-  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,  92,  93,  94,  95,
-  96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 193, 194, 195, 196, 197, 198, 199, 200, 201, 138, 139, 140, 141, 142, 143,
- 144, 209, 210, 211, 212, 213, 214, 215, 216, 217, 154, 155, 156, 157, 158, 159,
- 160, 161, 226, 227, 228, 229, 230, 231, 232, 233, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 129, 130, 131, 132, 133, 134, 135, 136, 137, 202, 203, 204, 205, 206, 207,
- 208, 145, 146, 147, 148, 149, 150, 151, 152, 153, 218, 219, 220, 221, 222, 223,
- 224, 225, 162, 163, 164, 165, 166, 167, 168, 169, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
-};
-
-/* Index is EBCDIC POSIX-BC code point; value is its other fold-pair equivalent
- * (A => a; a => A, etc) in the 0-255 range.  If no such equivalent, value is
- * the code point itself */
-EXTCONST U8 PL_fold_latin1[] = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,
-  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,  63,
-  64,  65,  98,  99, 100, 101, 102, 103, 104, 105,  74,  75,  76,  77,  78,  79,
-  80, 113, 114, 115, 116, 117, 118, 119, 120,  89,  90,  91,  92,  93,  94,  95,
-  96,  97,  66,  67,  68,  69,  70,  71,  72,  73, 106, 107, 108, 109, 110, 111,
- 128,  81,  82,  83,  84,  85,  86,  87,  88, 121, 122, 123, 124, 125, 126, 127,
- 112, 193, 194, 195, 196, 197, 198, 199, 200, 201, 138, 139, 172, 173, 174, 143,
- 144, 209, 210, 211, 212, 213, 214, 215, 216, 217, 154, 155, 158, 157, 156, 159,
- 160, 161, 226, 227, 228, 229, 230, 231, 232, 233, 170, 171, 140, 141, 142, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 224, 129, 130, 131, 132, 133, 134, 135, 136, 137, 202, 235, 236, 237, 238, 239,
- 208, 145, 146, 147, 148, 149, 150, 151, 152, 153, 218, 221, 252, 219, 254, 223,
- 192, 225, 162, 163, 164, 165, 166, 167, 168, 169, 234, 203, 204, 205, 206, 207,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 220, 253, 222, 255
-};
-
-#endif	/* EBCDIC POSIX-BC */
-
 #endif /* H_EBCDIC_TABLES */
 
 /* ex: set ro: */
diff --git a/Master/tlpkg/tlperl/lib/CORE/embed.h b/Master/tlpkg/tlperl/lib/CORE/embed.h
index 687819c64e4..42c65b2eb04 100644
--- a/Master/tlpkg/tlperl/lib/CORE/embed.h
+++ b/Master/tlpkg/tlperl/lib/CORE/embed.h
@@ -32,7 +32,6 @@
 #define _is_uni_perl_idcont(a)	Perl__is_uni_perl_idcont(aTHX_ a)
 #define _is_uni_perl_idstart(a)	Perl__is_uni_perl_idstart(aTHX_ a)
 #define _is_utf8_FOO(a,b)	Perl__is_utf8_FOO(aTHX_ a,b)
-#define _is_utf8_char_slow	S__is_utf8_char_slow
 #define _is_utf8_idcont(a)	Perl__is_utf8_idcont(aTHX_ a)
 #define _is_utf8_idstart(a)	Perl__is_utf8_idstart(aTHX_ a)
 #define _is_utf8_mark(a)	Perl__is_utf8_mark(aTHX_ a)
@@ -47,7 +46,6 @@
 #define _to_utf8_upper_flags(a,b,c,d)	Perl__to_utf8_upper_flags(aTHX_ a,b,c,d)
 #define amagic_call(a,b,c,d)	Perl_amagic_call(aTHX_ a,b,c,d)
 #define amagic_deref_call(a,b)	Perl_amagic_deref_call(aTHX_ a,b)
-#define append_utf8_from_native_byte	S_append_utf8_from_native_byte
 #define apply_attrs_string(a,b,c,d)	Perl_apply_attrs_string(aTHX_ a,b,c,d)
 #define atfork_lock		Perl_atfork_lock
 #define atfork_unlock		Perl_atfork_unlock
@@ -63,7 +61,6 @@
 #define av_push(a,b)		Perl_av_push(aTHX_ a,b)
 #define av_shift(a)		Perl_av_shift(aTHX_ a)
 #define av_store(a,b,c)		Perl_av_store(aTHX_ a,b,c)
-#define av_top_index(a)		S_av_top_index(aTHX_ a)
 #define av_undef(a)		Perl_av_undef(aTHX_ a)
 #define av_unshift(a,b)		Perl_av_unshift(aTHX_ a,b)
 #define block_end(a,b)		Perl_block_end(aTHX_ a,b)
@@ -90,6 +87,7 @@
 #define ck_warner		Perl_ck_warner
 #define ck_warner_d		Perl_ck_warner_d
 #endif
+#define clear_defarray(a,b)	Perl_clear_defarray(aTHX_ a,b)
 #ifndef PERL_IMPLICIT_CONTEXT
 #define croak			Perl_croak
 #endif
@@ -246,7 +244,6 @@
 #define isIDFIRST_lazy(a)	Perl_isIDFIRST_lazy(aTHX_ a)
 #define is_invariant_string	Perl_is_invariant_string
 #define is_lvalue_sub()		Perl_is_lvalue_sub(aTHX)
-#define is_safe_syscall(a,b,c,d)	S_is_safe_syscall(aTHX_ a,b,c,d)
 #define is_uni_alnum(a)		Perl_is_uni_alnum(aTHX_ a)
 #define is_uni_alnum_lc(a)	Perl_is_uni_alnum_lc(aTHX_ a)
 #define is_uni_alnumc(a)	Perl_is_uni_alnumc(aTHX_ a)
@@ -303,6 +300,7 @@
 #define is_utf8_xidcont(a)	Perl_is_utf8_xidcont(aTHX_ a)
 #define is_utf8_xidfirst(a)	Perl_is_utf8_xidfirst(aTHX_ a)
 #define isinfnan		Perl_isinfnan
+#define leave_adjust_stacks(a,b,c,d)	Perl_leave_adjust_stacks(aTHX_ a,b,c,d)
 #define leave_scope(a)		Perl_leave_scope(aTHX_ a)
 #define lex_bufutf8()		Perl_lex_bufutf8(aTHX)
 #define lex_discard_to(a)	Perl_lex_discard_to(aTHX_ a)
@@ -648,6 +646,7 @@
 #define sv_pvutf8n(a,b)		Perl_sv_pvutf8n(aTHX_ a,b)
 #define sv_pvutf8n_force(a,b)	Perl_sv_pvutf8n_force(aTHX_ a,b)
 #define sv_recode_to_utf8(a,b)	Perl_sv_recode_to_utf8(aTHX_ a,b)
+#define sv_ref(a,b,c)		Perl_sv_ref(aTHX_ a,b,c)
 #define sv_reftype(a,b)		Perl_sv_reftype(aTHX_ a,b)
 #define sv_replace(a,b)		Perl_sv_replace(aTHX_ a,b)
 #define sv_report_used()	Perl_sv_report_used(aTHX)
@@ -765,6 +764,9 @@
 #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
 #define my_memcmp		Perl_my_memcmp
 #endif
+#if !defined(HAS_MEMCPY) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY))
+#define my_bcopy		Perl_my_bcopy
+#endif
 #if !defined(HAS_MEMSET)
 #define my_memset		Perl_my_memset
 #endif
@@ -775,12 +777,36 @@
 #define my_pclose(a)		Perl_my_pclose(aTHX_ a)
 #define my_popen(a,b)		Perl_my_popen(aTHX_ a,b)
 #endif
-#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
-#define my_bcopy		Perl_my_bcopy
+#if !defined(PERL_NO_INLINE_FUNCTIONS)
+#define _is_utf8_char_slow	S__is_utf8_char_slow
+#define append_utf8_from_native_byte	S_append_utf8_from_native_byte
+#define av_top_index(a)		S_av_top_index(aTHX_ a)
+#define cx_popblock(a)		S_cx_popblock(aTHX_ a)
+#define cx_popeval(a)		S_cx_popeval(aTHX_ a)
+#define cx_popformat(a)		S_cx_popformat(aTHX_ a)
+#define cx_popgiven(a)		S_cx_popgiven(aTHX_ a)
+#define cx_poploop(a)		S_cx_poploop(aTHX_ a)
+#define cx_popsub(a)		S_cx_popsub(aTHX_ a)
+#define cx_popsub_args(a)	S_cx_popsub_args(aTHX_ a)
+#define cx_popsub_common(a)	S_cx_popsub_common(aTHX_ a)
+#define cx_popwhen(a)		S_cx_popwhen(aTHX_ a)
+#define cx_pushblock(a,b,c,d)	S_cx_pushblock(aTHX_ a,b,c,d)
+#define cx_pusheval(a,b,c)	S_cx_pusheval(aTHX_ a,b,c)
+#define cx_pushformat(a,b,c,d)	S_cx_pushformat(aTHX_ a,b,c,d)
+#define cx_pushgiven(a,b)	S_cx_pushgiven(aTHX_ a,b)
+#define cx_pushloop_for(a,b,c)	S_cx_pushloop_for(aTHX_ a,b,c)
+#define cx_pushloop_plain(a)	S_cx_pushloop_plain(aTHX_ a)
+#define cx_pushsub(a,b,c,d)	S_cx_pushsub(aTHX_ a,b,c,d)
+#define cx_pushwhen(a)		S_cx_pushwhen(aTHX_ a)
+#define cx_topblock(a)		S_cx_topblock(aTHX_ a)
+#define is_safe_syscall(a,b,c,d)	S_is_safe_syscall(aTHX_ a,b,c,d)
 #endif
 #if defined(DEBUGGING)
 #define pad_setsv(a,b)		Perl_pad_setsv(aTHX_ a,b)
 #define pad_sv(a)		Perl_pad_sv(aTHX_ a)
+#  if defined(USE_LOCALE)     && (defined(PERL_IN_LOCALE_C) || defined (PERL_EXT_POSIX))
+#define _setlocale_debug_string	Perl__setlocale_debug_string
+#  endif
 #endif
 #if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
 #define csighandler		Perl_csighandler
@@ -916,35 +942,46 @@
 #define reg_temp_copy(a,b)	Perl_reg_temp_copy(aTHX_ a,b)
 #define report_uninit(a)	Perl_report_uninit(aTHX_ a)
 #define sv_magicext_mglob(a)	Perl_sv_magicext_mglob(aTHX_ a)
-#define sv_only_taint_gmagic	S_sv_only_taint_gmagic
 #define validate_proto(a,b,c)	Perl_validate_proto(aTHX_ a,b,c)
 #define vivify_defelem(a)	Perl_vivify_defelem(aTHX_ a)
 #define yylex()			Perl_yylex(aTHX)
 #  if !defined(PERL_EXT_RE_BUILD)
 #    if defined(PERL_IN_REGCOMP_C)
 #define get_invlist_previous_index_addr	S_get_invlist_previous_index_addr
-#define invlist_is_iterating	S_invlist_is_iterating
+#define invlist_clear(a)	S_invlist_clear(aTHX_ a)
 #define invlist_previous_index	S_invlist_previous_index
+#define invlist_replace_list_destroys_src(a,b)	S_invlist_replace_list_destroys_src(aTHX_ a,b)
 #define invlist_set_previous_index	S_invlist_set_previous_index
 #define invlist_trim		S_invlist_trim
 #    endif
 #  endif
+#  if !defined(PERL_NO_INLINE_FUNCTIONS)
+#define sv_only_taint_gmagic	S_sv_only_taint_gmagic
+#  endif
 #  if defined(DEBUGGING)
 #    if defined(PERL_IN_REGCOMP_C)
 #define dump_trie(a,b,c,d)	S_dump_trie(aTHX_ a,b,c,d)
 #define dump_trie_interim_list(a,b,c,d,e)	S_dump_trie_interim_list(aTHX_ a,b,c,d,e)
 #define dump_trie_interim_table(a,b,c,d,e)	S_dump_trie_interim_table(aTHX_ a,b,c,d,e)
 #define dumpuntil(a,b,c,d,e,f,g,h)	S_dumpuntil(aTHX_ a,b,c,d,e,f,g,h)
-#define put_charclass_bitmap_innards(a,b,c)	S_put_charclass_bitmap_innards(aTHX_ a,b,c)
+#define put_charclass_bitmap_innards(a,b,c,d,e)	S_put_charclass_bitmap_innards(aTHX_ a,b,c,d,e)
+#define put_charclass_bitmap_innards_common(a,b,c,d,e,f)	S_put_charclass_bitmap_innards_common(aTHX_ a,b,c,d,e,f)
+#define put_charclass_bitmap_innards_invlist(a,b)	S_put_charclass_bitmap_innards_invlist(aTHX_ a,b)
 #define put_code_point(a,b)	S_put_code_point(aTHX_ a,b)
 #define put_range(a,b,c,d)	S_put_range(aTHX_ a,b,c,d)
+#ifndef PERL_IMPLICIT_CONTEXT
+#define re_indentf		Perl_re_indentf
+#endif
 #define regdump_extflags(a,b)	S_regdump_extflags(aTHX_ a,b)
 #define regdump_intflags(a,b)	S_regdump_intflags(aTHX_ a,b)
 #define regtail_study(a,b,c,d)	S_regtail_study(aTHX_ a,b,c,d)
 #    endif
 #    if defined(PERL_IN_REGEXEC_C)
 #define debug_start_match(a,b,c,d,e)	S_debug_start_match(aTHX_ a,b,c,d,e)
-#define dump_exec_pos(a,b,c,d,e,f)	S_dump_exec_pos(aTHX_ a,b,c,d,e,f)
+#define dump_exec_pos(a,b,c,d,e,f,g)	S_dump_exec_pos(aTHX_ a,b,c,d,e,f,g)
+#ifndef PERL_IMPLICIT_CONTEXT
+#define re_exec_indentf		Perl_re_exec_indentf
+#endif
 #    endif
 #  endif
 #  if defined(PERL_ANY_COW)
@@ -965,14 +1002,18 @@
 #define cntrl_to_mnemonic	S_cntrl_to_mnemonic
 #define compute_EXACTish	S_compute_EXACTish
 #define construct_ahocorasick_from_trie(a,b,c)	S_construct_ahocorasick_from_trie(aTHX_ a,b,c)
-#define could_it_be_a_POSIX_class	S_could_it_be_a_POSIX_class
+#define edit_distance		S_edit_distance
 #define get_ANYOF_cp_list_for_ssc(a,b)	S_get_ANYOF_cp_list_for_ssc(aTHX_ a,b)
 #define get_invlist_iter_addr	S_get_invlist_iter_addr
-#define grok_bslash_N(a,b,c,d,e,f)	S_grok_bslash_N(aTHX_ a,b,c,d,e,f)
+#define grok_bslash_N(a,b,c,d,e,f,g)	S_grok_bslash_N(aTHX_ a,b,c,d,e,f,g)
+#define handle_named_backref(a,b,c,d)	S_handle_named_backref(aTHX_ a,b,c,d)
+#define handle_possible_posix(a,b,c,d,e)	S_handle_possible_posix(aTHX_ a,b,c,d,e)
 #define handle_regex_sets(a,b,c,d,e)	S_handle_regex_sets(aTHX_ a,b,c,d,e)
 #define invlist_clone(a)	S_invlist_clone(aTHX_ a)
+#define invlist_contents(a,b)	S_invlist_contents(aTHX_ a,b)
 #define invlist_extend(a,b)	S_invlist_extend(aTHX_ a,b)
 #define invlist_highest		S_invlist_highest
+#define invlist_is_iterating	S_invlist_is_iterating
 #define invlist_iterfinish	S_invlist_iterfinish
 #define invlist_iterinit	S_invlist_iterinit
 #define invlist_iternext	S_invlist_iternext
@@ -982,6 +1023,7 @@
 #define join_exact(a,b,c,d,e,f,g)	S_join_exact(aTHX_ a,b,c,d,e,f,g)
 #define make_trie(a,b,c,d,e,f,g,h)	S_make_trie(aTHX_ a,b,c,d,e,f,g,h)
 #define nextchar(a)		S_nextchar(aTHX_ a)
+#define output_or_return_posix_warnings(a,b,c)	S_output_or_return_posix_warnings(aTHX_ a,b,c)
 #define parse_lparen_question_flags(a)	S_parse_lparen_question_flags(aTHX_ a)
 #define populate_ANYOF_from_invlist(a,b)	S_populate_ANYOF_from_invlist(aTHX_ a,b)
 #define reg(a,b,c,d)		S_reg(aTHX_ a,b,c,d)
@@ -993,16 +1035,15 @@
 #define reganode(a,b,c)		S_reganode(aTHX_ a,b,c)
 #define regatom(a,b,c)		S_regatom(aTHX_ a,b,c)
 #define regbranch(a,b,c,d)	S_regbranch(aTHX_ a,b,c,d)
-#define regclass(a,b,c,d,e,f,g,h)	S_regclass(aTHX_ a,b,c,d,e,f,g,h)
+#define regclass(a,b,c,d,e,f,g,h,i,j)	S_regclass(aTHX_ a,b,c,d,e,f,g,h,i,j)
 #define regex_set_precedence	S_regex_set_precedence
 #define reginsert(a,b,c,d)	S_reginsert(aTHX_ a,b,c,d)
 #define regnode_guts(a,b,c,d)	S_regnode_guts(aTHX_ a,b,c,d)
-#define regpatws		S_regpatws
 #define regpiece(a,b,c)		S_regpiece(aTHX_ a,b,c)
-#define regpposixcc(a,b,c)	S_regpposixcc(aTHX_ a,b,c)
 #define regtail(a,b,c,d)	S_regtail(aTHX_ a,b,c,d)
 #define scan_commit(a,b,c,d)	S_scan_commit(aTHX_ a,b,c,d)
 #define set_ANYOF_arg(a,b,c,d,e,f,g)	S_set_ANYOF_arg(aTHX_ a,b,c,d,e,f,g)
+#define skip_to_be_ignored_text(a,b,c)	S_skip_to_be_ignored_text(aTHX_ a,b,c)
 #define ssc_add_range(a,b,c)	S_ssc_add_range(aTHX_ a,b,c)
 #define ssc_and(a,b,c)		S_ssc_and(aTHX_ a,b,c)
 #define ssc_anything(a)		S_ssc_anything(aTHX_ a)
@@ -1020,14 +1061,19 @@
 #  if defined(PERL_IN_REGCOMP_C) || defined (PERL_IN_DUMP_C)
 #define _invlist_dump(a,b,c,d)	Perl__invlist_dump(aTHX_ a,b,c,d)
 #  endif
+#  if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_PERL_C) || defined(PERL_IN_UTF8_C)
+#define _invlistEQ(a,b,c)	Perl__invlistEQ(aTHX_ a,b,c)
+#  endif
 #  if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C)
 #define _load_PL_utf8_foldclosures()	Perl__load_PL_utf8_foldclosures(aTHX)
+#ifndef PERL_IMPLICIT_CONTEXT
+#define re_printf		Perl_re_printf
+#endif
 #define regprop(a,b,c,d,e)	Perl_regprop(aTHX_ a,b,c,d,e)
 #  endif
 #  if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || defined(PERL_IN_UTF8_C)
 #define _get_swash_invlist(a)	Perl__get_swash_invlist(aTHX_ a)
 #define _invlist_contains_cp	S__invlist_contains_cp
-#define _invlist_contents(a)	Perl__invlist_contents(aTHX_ a)
 #define _invlist_len		S__invlist_len
 #define _invlist_search		Perl__invlist_search
 #define _swash_inversion_hash(a)	Perl__swash_inversion_hash(aTHX_ a)
@@ -1037,11 +1083,11 @@
 #  if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || defined(PERL_IN_UTF8_C) || defined(PERL_IN_TOKE_C)
 #define _core_swash_init(a,b,c,d,e,f,g)	Perl__core_swash_init(aTHX_ a,b,c,d,e,f,g)
 #  endif
-#  if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_TOKE_C)
+#  if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_TOKE_C) || defined(PERL_IN_DQUOTE_C)
 #define form_short_octal_warning(a,b)	S_form_short_octal_warning(aTHX_ a,b)
-#define grok_bslash_c(a,b)	S_grok_bslash_c(aTHX_ a,b)
-#define grok_bslash_o(a,b,c,d,e,f,g)	S_grok_bslash_o(aTHX_ a,b,c,d,e,f,g)
-#define grok_bslash_x(a,b,c,d,e,f,g)	S_grok_bslash_x(aTHX_ a,b,c,d,e,f,g)
+#define grok_bslash_c(a,b)	Perl_grok_bslash_c(aTHX_ a,b)
+#define grok_bslash_o(a,b,c,d,e,f,g)	Perl_grok_bslash_o(aTHX_ a,b,c,d,e,f,g)
+#define grok_bslash_x(a,b,c,d,e,f,g)	Perl_grok_bslash_x(aTHX_ a,b,c,d,e,f,g)
 #define regcurly		S_regcurly
 #  endif
 #  if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_UTF8_C)
@@ -1055,14 +1101,17 @@
 #define _swash_to_invlist(a)	Perl__swash_to_invlist(aTHX_ a)
 #  endif
 #  if defined(PERL_IN_REGEXEC_C)
+#define advance_one_LB(a,b,c)	S_advance_one_LB(aTHX_ a,b,c)
 #define advance_one_SB(a,b,c)	S_advance_one_SB(aTHX_ a,b,c)
-#define advance_one_WB(a,b,c)	S_advance_one_WB(aTHX_ a,b,c)
+#define advance_one_WB(a,b,c,d)	S_advance_one_WB(aTHX_ a,b,c,d)
+#define backup_one_LB(a,b,c)	S_backup_one_LB(aTHX_ a,b,c)
 #define backup_one_SB(a,b,c)	S_backup_one_SB(aTHX_ a,b,c)
 #define backup_one_WB(a,b,c,d)	S_backup_one_WB(aTHX_ a,b,c,d)
 #define find_byclass(a,b,c,d,e)	S_find_byclass(aTHX_ a,b,c,d,e)
 #define isFOO_lc(a,b)		S_isFOO_lc(aTHX_ a,b)
 #define isFOO_utf8_lc(a,b)	S_isFOO_utf8_lc(aTHX_ a,b)
 #define isGCB			S_isGCB
+#define isLB(a,b,c,d,e,f)	S_isLB(aTHX_ a,b,c,d,e,f)
 #define isSB(a,b,c,d,e,f)	S_isSB(aTHX_ a,b,c,d,e,f)
 #define isWB(a,b,c,d,e,f,g)	S_isWB(aTHX_ a,b,c,d,e,f,g)
 #define reg_check_named_buff_matched	S_reg_check_named_buff_matched
@@ -1144,7 +1193,7 @@
 #define closest_cop(a,b,c,d)	Perl_closest_cop(aTHX_ a,b,c,d)
 #define core_prototype(a,b,c,d)	Perl_core_prototype(aTHX_ a,b,c,d)
 #define coresub_op(a,b,c)	Perl_coresub_op(aTHX_ a,b,c)
-#define create_eval_scope(a)	Perl_create_eval_scope(aTHX_ a)
+#define create_eval_scope(a,b)	Perl_create_eval_scope(aTHX_ a,b)
 #define croak_no_mem		Perl_croak_no_mem
 #define croak_popstack		Perl_croak_popstack
 #define custom_op_get_field(a,b)	Perl_custom_op_get_field(aTHX_ a,b)
@@ -1181,7 +1230,6 @@
 #define finalize_optree(a)	Perl_finalize_optree(aTHX_ a)
 #define find_lexical_cv(a)	Perl_find_lexical_cv(aTHX_ a)
 #define find_runcv_where(a,b,c)	Perl_find_runcv_where(aTHX_ a,b,c)
-#define find_rundefsv2(a,b)	Perl_find_rundefsv2(aTHX_ a,b)
 #define find_script(a,b,c,d)	Perl_find_script(aTHX_ a,b,c,d)
 #define free_tied_hv_pool()	Perl_free_tied_hv_pool(aTHX)
 #define get_hash_seed(a)	Perl_get_hash_seed(aTHX_ a)
@@ -1304,7 +1352,6 @@
 #define rsignal_restore(a,b)	Perl_rsignal_restore(aTHX_ a,b)
 #define rsignal_save(a,b,c)	Perl_rsignal_save(aTHX_ a,b,c)
 #define rxres_save(a,b)		Perl_rxres_save(aTHX_ a,b)
-#define save_aliased_sv(a)	Perl_save_aliased_sv(aTHX_ a)
 #define save_strlen(a)		Perl_save_strlen(aTHX_ a)
 #define sawparens(a)		Perl_sawparens(aTHX_ a)
 #define scalar(a)		Perl_scalar(aTHX_ a)
@@ -1318,7 +1365,6 @@
 #define sv_free_arenas()	Perl_sv_free_arenas(aTHX)
 #define sv_len_utf8_nomg(a)	Perl_sv_len_utf8_nomg(aTHX_ a)
 #define sv_mortalcopy_flags(a,b)	Perl_sv_mortalcopy_flags(aTHX_ a,b)
-#define sv_ref(a,b,c)		Perl_sv_ref(aTHX_ a,b,c)
 #define sv_resetpvn(a,b,c)	Perl_sv_resetpvn(aTHX_ a,b,c)
 #define sv_sethek(a,b)		Perl_sv_sethek(aTHX_ a,b)
 #ifndef PERL_IMPLICIT_CONTEXT
@@ -1526,7 +1572,6 @@
 #define mro_get_linear_isa_dfs(a,b)	S_mro_get_linear_isa_dfs(aTHX_ a,b)
 #  endif
 #  if defined(PERL_IN_OP_C)
-#define aassign_common_vars(a)	S_aassign_common_vars(aTHX_ a)
 #define apply_attrs(a,b,c)	S_apply_attrs(aTHX_ a,b,c)
 #define apply_attrs_my(a,b,c,d)	S_apply_attrs_my(aTHX_ a,b,c,d)
 #define assignment_type(a)	S_assignment_type(aTHX_ a)
@@ -1610,16 +1655,15 @@
 #define destroy_matcher(a)	S_destroy_matcher(aTHX_ a)
 #define do_smartmatch(a,b,c)	S_do_smartmatch(aTHX_ a,b,c)
 #define docatch(a)		S_docatch(aTHX_ a)
-#define doeval(a,b,c,d)		S_doeval(aTHX_ a,b,c,d)
+#define doeval_compile(a,b,c,d)	S_doeval_compile(aTHX_ a,b,c,d)
 #define dofindlabel(a,b,c,d,e,f)	S_dofindlabel(aTHX_ a,b,c,d,e,f)
 #define doparseform(a)		S_doparseform(aTHX_ a)
 #define dopoptoeval(a)		S_dopoptoeval(aTHX_ a)
-#define dopoptogiven(a)		S_dopoptogiven(aTHX_ a)
+#define dopoptogivenfor(a)	S_dopoptogivenfor(aTHX_ a)
 #define dopoptolabel(a,b,c)	S_dopoptolabel(aTHX_ a,b,c)
 #define dopoptoloop(a)		S_dopoptoloop(aTHX_ a)
 #define dopoptosub_at(a,b)	S_dopoptosub_at(aTHX_ a,b)
 #define dopoptowhen(a)		S_dopoptowhen(aTHX_ a)
-#define leave_common(a,b,c,d,e,f)	S_leave_common(aTHX_ a,b,c,d,e,f)
 #define make_matcher(a)		S_make_matcher(aTHX_ a)
 #define matcher_matches_sv(a,b)	S_matcher_matches_sv(aTHX_ a,b)
 #define num_overflow		S_num_overflow
@@ -1697,9 +1741,6 @@
 #define utf8_mg_len_cache_update(a,b,c)	S_utf8_mg_len_cache_update(aTHX_ a,b,c)
 #define utf8_mg_pos_cache_update(a,b,c,d,e)	S_utf8_mg_pos_cache_update(aTHX_ a,b,c,d,e)
 #define visit(a,b,c)		S_visit(aTHX_ a,b,c)
-#    if defined(PERL_OLD_COPY_ON_WRITE)
-#define sv_release_COW(a,b,c)	S_sv_release_COW(aTHX_ a,b,c)
-#    endif
 #    if defined(USE_ITHREADS)
 #define sv_dup_common(a,b)	S_sv_dup_common(aTHX_ a,b)
 #define sv_dup_inc_multiple(a,b,c,d)	S_sv_dup_inc_multiple(aTHX_ a,b,c,d)
@@ -1755,6 +1796,7 @@
 #define isa_lookup(a,b,c,d)	S_isa_lookup(aTHX_ a,b,c,d)
 #  endif
 #  if defined(PERL_IN_UTF8_C)
+#define _to_utf8_case(a,b,c,d,e,f,g)	S__to_utf8_case(aTHX_ a,b,c,d,e,f,g)
 #define check_locale_boundary_crossing(a,b,c,d)	S_check_locale_boundary_crossing(aTHX_ a,b,c,d)
 #define is_utf8_common(a,b,c,d)	S_is_utf8_common(aTHX_ a,b,c,d)
 #define swash_scan_list_line(a,b,c,d,e,f,g)	S_swash_scan_list_line(aTHX_ a,b,c,d,e,f,g)
@@ -1773,6 +1815,11 @@
 #define mem_log_common		S_mem_log_common
 #    endif
 #  endif
+#  if defined(PERL_MEM_LOG)
+#define mem_log_alloc		Perl_mem_log_alloc
+#define mem_log_free		Perl_mem_log_free
+#define mem_log_realloc		Perl_mem_log_realloc
+#  endif
 #  if defined(PERL_USES_PL_PIDSTATUS) && defined(PERL_IN_UTIL_C)
 #define pidgone(a,b)		S_pidgone(aTHX_ a,b)
 #  endif
diff --git a/Master/tlpkg/tlperl/lib/CORE/embedvar.h b/Master/tlpkg/tlperl/lib/CORE/embedvar.h
index 9ed30e02dfa..7e551be0215 100644
--- a/Master/tlpkg/tlperl/lib/CORE/embedvar.h
+++ b/Master/tlpkg/tlperl/lib/CORE/embedvar.h
@@ -56,6 +56,7 @@
 #define PL_GCB_invlist		(vTHX->IGCB_invlist)
 #define PL_HasMultiCharFold	(vTHX->IHasMultiCharFold)
 #define PL_InBitmap		(vTHX->IInBitmap)
+#define PL_LB_invlist		(vTHX->ILB_invlist)
 #define PL_LIO			(vTHX->ILIO)
 #define PL_Latin1		(vTHX->ILatin1)
 #define PL_Mem			(vTHX->IMem)
@@ -133,6 +134,7 @@
 #define PL_diehook		(vTHX->Idiehook)
 #define PL_doswitches		(vTHX->Idoswitches)
 #define PL_dowarn		(vTHX->Idowarn)
+#define PL_dump_re_max_len	(vTHX->Idump_re_max_len)
 #define PL_dumper_fd		(vTHX->Idumper_fd)
 #define PL_dumpindent		(vTHX->Idumpindent)
 #define PL_e_script		(vTHX->Ie_script)
@@ -270,7 +272,6 @@
 #define PL_savestack		(vTHX->Isavestack)
 #define PL_savestack_ix		(vTHX->Isavestack_ix)
 #define PL_savestack_max	(vTHX->Isavestack_max)
-#define PL_sawalias		(vTHX->Isawalias)
 #ifndef PL_sawampersand
 #define PL_sawampersand		(vTHX->Isawampersand)
 #endif
@@ -323,7 +324,6 @@
 #define PL_tainted		(vTHX->Itainted)
 #define PL_tainting		(vTHX->Itainting)
 #define PL_threadhook		(vTHX->Ithreadhook)
-#define PL_timesbuf		(vTHX->Itimesbuf)
 #define PL_tmps_floor		(vTHX->Itmps_floor)
 #define PL_tmps_ix		(vTHX->Itmps_ix)
 #define PL_tmps_max		(vTHX->Itmps_max)
@@ -387,6 +387,8 @@
 #define PL_Ghints_mutex		(my_vars->Ghints_mutex)
 #define PL_keyword_plugin	(my_vars->Gkeyword_plugin)
 #define PL_Gkeyword_plugin	(my_vars->Gkeyword_plugin)
+#define PL_locale_mutex		(my_vars->Glocale_mutex)
+#define PL_Glocale_mutex	(my_vars->Glocale_mutex)
 #define PL_malloc_mutex		(my_vars->Gmalloc_mutex)
 #define PL_Gmalloc_mutex	(my_vars->Gmalloc_mutex)
 #define PL_mmap_page_size	(my_vars->Gmmap_page_size)
diff --git a/Master/tlpkg/tlperl/lib/CORE/feature.h b/Master/tlpkg/tlperl/lib/CORE/feature.h
index ba796eb8bdf..a527e06e841 100644
--- a/Master/tlpkg/tlperl/lib/CORE/feature.h
+++ b/Master/tlpkg/tlperl/lib/CORE/feature.h
@@ -13,6 +13,7 @@
 #define FEATURE_BUNDLE_510	1
 #define FEATURE_BUNDLE_511	2
 #define FEATURE_BUNDLE_515	3
+#define FEATURE_BUNDLE_523	4
 #define FEATURE_BUNDLE_CUSTOM	(HINT_FEATURE_MASK >> HINT_FEATURE_SHIFT)
 
 #define CURRENT_HINTS \
@@ -31,7 +32,8 @@
 
 #define FEATURE_FC_IS_ENABLED \
     ( \
-	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("fc")) \
     )
@@ -39,7 +41,7 @@
 #define FEATURE_SAY_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
-	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_515) \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("say")) \
     )
@@ -47,7 +49,7 @@
 #define FEATURE_STATE_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
-	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_515) \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("state")) \
     )
@@ -55,7 +57,7 @@
 #define FEATURE_SWITCH_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_510 && \
-	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_515) \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("switch")) \
     )
@@ -68,7 +70,8 @@
 
 #define FEATURE_EVALBYTES_IS_ENABLED \
     ( \
-	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("evalbytes")) \
     )
@@ -94,7 +97,8 @@
 
 #define FEATURE___SUB___IS_ENABLED \
     ( \
-	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("__SUB__")) \
     )
@@ -113,13 +117,15 @@
 
 #define FEATURE_POSTDEREF_QQ_IS_ENABLED \
     ( \
-	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
-	 FEATURE_IS_ENABLED("postderef_qq") \
+	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_523 \
+     || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
+	 FEATURE_IS_ENABLED("postderef_qq")) \
     )
 
 #define FEATURE_UNIEVAL_IS_ENABLED \
     ( \
-	CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_515 \
+	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_515 && \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("unieval")) \
     )
@@ -127,7 +133,7 @@
 #define FEATURE_UNICODE_IS_ENABLED \
     ( \
 	(CURRENT_FEATURE_BUNDLE >= FEATURE_BUNDLE_511 && \
-	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_515) \
+	 CURRENT_FEATURE_BUNDLE <= FEATURE_BUNDLE_523) \
      || (CURRENT_FEATURE_BUNDLE == FEATURE_BUNDLE_CUSTOM && \
 	 FEATURE_IS_ENABLED("unicode")) \
     )
@@ -142,6 +148,9 @@ S_enable_feature_bundle(pTHX_ SV *ver)
     SV *comp_ver = sv_newmortal();
     PL_hints = (PL_hints &~ HINT_FEATURE_MASK)
 	     | (
+		  (sv_setnv(comp_ver, 5.023),
+		   vcmp(ver, upg_version(comp_ver, FALSE)) >= 0)
+			? FEATURE_BUNDLE_523 :
 		  (sv_setnv(comp_ver, 5.015),
 		   vcmp(ver, upg_version(comp_ver, FALSE)) >= 0)
 			? FEATURE_BUNDLE_515 :
diff --git a/Master/tlpkg/tlperl/lib/CORE/gv.h b/Master/tlpkg/tlperl/lib/CORE/gv.h
index a6bb7494433..e3357bc4de6 100644
--- a/Master/tlpkg/tlperl/lib/CORE/gv.h
+++ b/Master/tlpkg/tlperl/lib/CORE/gv.h
@@ -72,11 +72,6 @@ struct gp {
 #define GvNAME(gv)	GvNAME_get(gv)
 #define GvNAMELEN(gv)	GvNAMELEN_get(gv)
 
-#define	GvASSIGN_GENERATION(gv)		(0 + ((XPV*) SvANY(gv))->xpv_len)
-#define	GvASSIGN_GENERATION_set(gv,val)			\
-	STMT_START { assert(SvTYPE(gv) == SVt_PVGV);	\
-		(((XPV*) SvANY(gv))->xpv_len = (val)); } STMT_END
-
 /*
 =head1 GV Functions
 
@@ -156,6 +151,10 @@ Return the CV from the GV.
 #define GvENAME_HEK(gv) GvNAME_HEK(GvEGV(gv) ? GvEGV(gv) : gv)
 #define GvESTASH(gv)	GvSTASH(GvEGV(gv) ? GvEGV(gv) : gv)
 
+/* GVf_INTRO is one-shot flag which indicates that the next assignment
+   of a reference to the glob is to be localised; it distinguishes
+   'local *g = $ref' from '*g = $ref'.
+*/
 #define GVf_INTRO	0x01
 #define GVf_MULTI	0x02
 #define GVf_ASSUMECV	0x04
@@ -198,12 +197,6 @@ Return the CV from the GV.
 #define GvIMPORTED_CV_on(gv)	(GvFLAGS(gv) |= GVf_IMPORTED_CV)
 #define GvIMPORTED_CV_off(gv)	(GvFLAGS(gv) &= ~GVf_IMPORTED_CV)
 
-#define GPf_ALIASED_SV	1
-
-#define GvALIASED_SV(gv)	(GvGPFLAGS(gv) & GPf_ALIASED_SV)
-#define GvALIASED_SV_on(gv)	(GvGPFLAGS(gv) |= GPf_ALIASED_SV)
-#define GvALIASED_SV_off(gv)	(GvGPFLAGS(gv) &= ~GPf_ALIASED_SV)
-
 #ifndef PERL_CORE
 #  define GvIN_PAD(gv)		0
 #  define GvIN_PAD_on(gv)	NOOP
diff --git a/Master/tlpkg/tlperl/lib/CORE/handy.h b/Master/tlpkg/tlperl/lib/CORE/handy.h
index 3e6fd525290..932a874c260 100644
--- a/Master/tlpkg/tlperl/lib/CORE/handy.h
+++ b/Master/tlpkg/tlperl/lib/CORE/handy.h
@@ -173,12 +173,11 @@ typedef I16TYPE I16;
 typedef U16TYPE U16;
 typedef I32TYPE I32;
 typedef U32TYPE U32;
-#ifdef PERL_CORE
-#   ifdef HAS_QUAD
+
+#ifdef HAS_QUAD
 typedef I64TYPE I64;
 typedef U64TYPE U64;
-#   endif
-#endif /* PERL_CORE */
+#endif
 
 /* INT64_C/UINT64_C are C99 from <stdint.h> (so they will not be
  * available in strict C89 mode), but they are nice, so let's define
@@ -205,8 +204,8 @@ typedef U64TYPE U64;
 #    define PeRl_UINT64_C(c)	CAT2(c,UI64)
 #  endif
 #  ifndef PeRl_INT64_C
-#    define PeRl_INT64_C(c)	((I64TYPE)(c)) /* last resort */
-#    define PeRl_UINT64_C(c)	((U64TYPE)(c))
+#    define PeRl_INT64_C(c)	((I64)(c)) /* last resort */
+#    define PeRl_UINT64_C(c)	((U64)(c))
 #  endif
 /* In OS X the INT64_C/UINT64_C are defined with LL/ULL, which will
  * not fly with C89-pedantic gcc, so let's undefine them first so that
@@ -281,8 +280,13 @@ typedef U64TYPE U64;
 /* This is a helper macro to avoid preprocessor issues, replaced by nothing
  * unless under DEBUGGING, where it expands to an assert of its argument,
  * followed by a comma (hence the comma operator).  If we just used a straight
- * assert(), we would get a comma with nothing before it when not DEBUGGING */
-#ifdef DEBUGGING
+ * assert(), we would get a comma with nothing before it when not DEBUGGING.
+ *
+ * We also use empty definition under Coverity since the __ASSERT__
+ * checks often check for things that Really Cannot Happen, and Coverity
+ * detects that and gets all excited. */
+
+#if defined(DEBUGGING) && !defined(__COVERITY__)
 #   define __ASSERT_(statement)  assert(statement),
 #else
 #   define __ASSERT_(statement)
@@ -292,47 +296,49 @@ typedef U64TYPE U64;
 =head1 SV-Body Allocation
 
 =for apidoc Ama|SV*|newSVpvs|const char* s
-Like C<newSVpvn>, but takes a literal C<NUL>-terminated string instead of a
+Like C<newSVpvn>, but takes a C<NUL>-terminated literal string instead of a
 string/length pair.
 
 =for apidoc Ama|SV*|newSVpvs_flags|const char* s|U32 flags
-Like C<newSVpvn_flags>, but takes a literal C<NUL>-terminated string instead of
+Like C<newSVpvn_flags>, but takes a C<NUL>-terminated literal string instead of
 a string/length pair.
 
 =for apidoc Ama|SV*|newSVpvs_share|const char* s
-Like C<newSVpvn_share>, but takes a literal C<NUL>-terminated string instead of
+Like C<newSVpvn_share>, but takes a C<NUL>-terminated literal string instead of
 a string/length pair and omits the hash parameter.
 
 =for apidoc Am|void|sv_catpvs_flags|SV* sv|const char* s|I32 flags
-Like C<sv_catpvn_flags>, but takes a literal C<NUL>-terminated string instead
+Like C<sv_catpvn_flags>, but takes a C<NUL>-terminated literal string instead
 of a string/length pair.
 
 =for apidoc Am|void|sv_catpvs_nomg|SV* sv|const char* s
-Like C<sv_catpvn_nomg>, but takes a literal string instead of a
-string/length pair.
+Like C<sv_catpvn_nomg>, but takes a C<NUL>-terminated literal string instead of
+a string/length pair.
 
 =for apidoc Am|void|sv_catpvs|SV* sv|const char* s
-Like C<sv_catpvn>, but takes a literal string instead of a string/length pair.
+Like C<sv_catpvn>, but takes a C<NUL>-terminated literal string instead of a
+string/length pair.
 
 =for apidoc Am|void|sv_catpvs_mg|SV* sv|const char* s
-Like C<sv_catpvn_mg>, but takes a literal string instead of a
+Like C<sv_catpvn_mg>, but takes a C<NUL>-terminated literal string instead of a
 string/length pair.
 
 =for apidoc Am|void|sv_setpvs|SV* sv|const char* s
-Like C<sv_setpvn>, but takes a literal string instead of a string/length pair.
+Like C<sv_setpvn>, but takes a C<NUL>-terminated literal string instead of a
+string/length pair.
 
 =for apidoc Am|void|sv_setpvs_mg|SV* sv|const char* s
-Like C<sv_setpvn_mg>, but takes a literal string instead of a
+Like C<sv_setpvn_mg>, but takes a C<NUL>-terminated literal string instead of a
 string/length pair.
 
 =for apidoc Am|SV *|sv_setref_pvs|const char* s
-Like C<sv_setref_pvn>, but takes a literal string instead of a
-string/length pair.
+Like C<sv_setref_pvn>, but takes a C<NUL>-terminated literal string instead of
+a string/length pair.
 
 =head1 Memory Management
 
 =for apidoc Ama|char*|savepvs|const char* s
-Like C<savepvn>, but takes a literal C<NUL>-terminated string instead of a
+Like C<savepvn>, but takes a C<NUL>-terminated literal string instead of a
 string/length pair.
 
 =for apidoc Ama|char*|savesharedpvs|const char* s
@@ -342,23 +348,26 @@ which is shared between threads.
 =head1 GV Functions
 
 =for apidoc Am|HV*|gv_stashpvs|const char* name|I32 create
-Like C<gv_stashpvn>, but takes a literal string instead of a string/length pair.
+Like C<gv_stashpvn>, but takes a C<NUL>-terminated literal string instead of a
+string/length pair.
 
 =head1 Hash Manipulation Functions
 
 =for apidoc Am|SV**|hv_fetchs|HV* tb|const char* key|I32 lval
-Like C<hv_fetch>, but takes a literal string instead of a string/length pair.
+Like C<hv_fetch>, but takes a C<NUL>-terminated literal string instead of a
+string/length pair.
 
 =for apidoc Am|SV**|hv_stores|HV* tb|const char* key|NULLOK SV* val
-Like C<hv_store>, but takes a literal string instead of a string/length pair
+Like C<hv_store>, but takes a C<NUL>-terminated literal string instead of a
+string/length pair
 and omits the hash parameter.
 
 =head1 Lexer interface
 
 =for apidoc Amx|void|lex_stuff_pvs|const char *pv|U32 flags
 
-Like L</lex_stuff_pvn>, but takes a literal string instead of a
-string/length pair.
+Like L</lex_stuff_pvn>, but takes a C<NUL>-terminated literal string instead of
+a string/length pair.
 
 =cut
 */
@@ -417,37 +426,38 @@ string/length pair.
 =head1 Miscellaneous Functions
 
 =for apidoc Am|bool|strNE|char* s1|char* s2
-Test two strings to see if they are different.  Returns true or
-false.
+Test two C<NUL>-terminated strings to see if they are different.  Returns true
+or false.
 
 =for apidoc Am|bool|strEQ|char* s1|char* s2
-Test two strings to see if they are equal.  Returns true or false.
+Test two C<NUL>-terminated strings to see if they are equal.  Returns true or
+false.
 
 =for apidoc Am|bool|strLT|char* s1|char* s2
-Test two strings to see if the first, C<s1>, is less than the second,
-C<s2>.  Returns true or false.
+Test two C<NUL>-terminated strings to see if the first, C<s1>, is less than the
+second, C<s2>.  Returns true or false.
 
 =for apidoc Am|bool|strLE|char* s1|char* s2
-Test two strings to see if the first, C<s1>, is less than or equal to the
-second, C<s2>.  Returns true or false.
+Test two C<NUL>-terminated strings to see if the first, C<s1>, is less than or
+equal to the second, C<s2>.  Returns true or false.
 
 =for apidoc Am|bool|strGT|char* s1|char* s2
-Test two strings to see if the first, C<s1>, is greater than the second,
-C<s2>.  Returns true or false.
+Test two C<NUL>-terminated strings to see if the first, C<s1>, is greater than
+the second, C<s2>.  Returns true or false.
 
 =for apidoc Am|bool|strGE|char* s1|char* s2
-Test two strings to see if the first, C<s1>, is greater than or equal to
-the second, C<s2>.  Returns true or false.
+Test two C<NUL>-terminated strings to see if the first, C<s1>, is greater than
+or equal to the second, C<s2>.  Returns true or false.
 
 =for apidoc Am|bool|strnNE|char* s1|char* s2|STRLEN len
-Test two strings to see if they are different.  The C<len> parameter
-indicates the number of bytes to compare.  Returns true or false.  (A
+Test two C<NUL>-terminated strings to see if they are different.  The C<len>
+parameter indicates the number of bytes to compare.  Returns true or false.  (A
 wrapper for C<strncmp>).
 
 =for apidoc Am|bool|strnEQ|char* s1|char* s2|STRLEN len
-Test two strings to see if they are equal.  The C<len> parameter indicates
-the number of bytes to compare.  Returns true or false.  (A wrapper for
-C<strncmp>).
+Test two C<NUL>-terminated strings to see if they are equal.  The C<len>
+parameter indicates the number of bytes to compare.  Returns true or false.  (A
+wrapper for C<strncmp>).
 
 =for apidoc Am|bool|memEQ|char* s1|char* s2|STRLEN len
 Test two buffers (which may contain embedded C<NUL> characters, to see if they
@@ -529,16 +539,16 @@ as if they are Latin-1 characters.  For example, C<isWORDCHAR_L1()> will return
 true when called with the code point 0xDF, which is a word character in both
 ASCII and EBCDIC (though it represents different characters in each).
 
-Variant C<isFOO_uni> is like the C<isFOO_L1> variant, but accepts any UV code
+Variant C<isFOO_uvchr> is like the C<isFOO_L1> variant, but accepts any UV code
 point as input.  If the code point is larger than 255, Unicode rules are used
 to determine if it is in the character class.  For example,
-C<isWORDCHAR_uni(0x100)> returns TRUE, since 0x100 is LATIN CAPITAL LETTER A
+C<isWORDCHAR_uvchr(0x100)> returns TRUE, since 0x100 is LATIN CAPITAL LETTER A
 WITH MACRON in Unicode, and is a word character.
 
-Variant C<isFOO_utf8> is like C<isFOO_uni>, but the input is a pointer to a
-(known to be well-formed) UTF-8 encoded string (C<U8*> or C<char*>).  The
-classification of just the first (possibly multi-byte) character in the string
-is tested.
+Variant C<isFOO_utf8> is like C<isFOO_uvchr>, but the input is a pointer to a
+(known to be well-formed) UTF-8 encoded string (C<U8*> or C<char*>, and
+possibly containing embedded C<NUL> characters).  The classification of just
+the first (possibly multi-byte) character in the string is tested.
 
 Variant C<isFOO_LC> is like the C<isFOO_A> and C<isFOO_L1> variants, but the
 result is based on the current locale, which is what C<LC> in the name stands
@@ -554,17 +564,17 @@ Variant C<isFOO_LC_uvchr> is like C<isFOO_LC>, but is defined on any UV.  It
 returns the same as C<isFOO_LC> for input code points less than 256, and
 returns the hard-coded, not-affected-by-locale, Unicode results for larger ones.
 
-Variant C<isFOO_LC_utf8> is like C<isFOO_LC_uvchr>, but the input is a pointer to a
-(known to be well-formed) UTF-8 encoded string (C<U8*> or C<char*>).  The
-classification of just the first (possibly multi-byte) character in the string
-is tested.
+Variant C<isFOO_LC_utf8> is like C<isFOO_LC_uvchr>, but the input is a pointer
+to a (known to be well-formed) UTF-8 encoded string (C<U8*> or C<char*>, and
+possibly containing embedded C<NUL> characters).  The classification of just
+the first (possibly multi-byte) character in the string is tested.
 
 =for apidoc Am|bool|isALPHA|char ch
 Returns a boolean indicating whether the specified character is an
 alphabetic character, analogous to C<m/[[:alpha:]]/>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isALPHA_A>, C<isALPHA_L1>, C<isALPHA_uni>, C<isALPHA_utf8>, C<isALPHA_LC>,
+C<isALPHA_A>, C<isALPHA_L1>, C<isALPHA_uvchr>, C<isALPHA_utf8>, C<isALPHA_LC>,
 C<isALPHA_LC_uvchr>, and C<isALPHA_LC_utf8>.
 
 =for apidoc Am|bool|isALPHANUMERIC|char ch
@@ -572,7 +582,7 @@ Returns a boolean indicating whether the specified character is a either an
 alphabetic character or decimal digit, analogous to C<m/[[:alnum:]]/>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isALPHANUMERIC_A>, C<isALPHANUMERIC_L1>, C<isALPHANUMERIC_uni>,
+C<isALPHANUMERIC_A>, C<isALPHANUMERIC_L1>, C<isALPHANUMERIC_uvchr>,
 C<isALPHANUMERIC_utf8>, C<isALPHANUMERIC_LC>, C<isALPHANUMERIC_LC_uvchr>, and
 C<isALPHANUMERIC_LC_utf8>.
 
@@ -584,7 +594,7 @@ character corresponds to an ASCII character.  Variants C<isASCII_A()> and
 C<isASCII_L1()> are identical to C<isASCII()>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isASCII_uni>, C<isASCII_utf8>, C<isASCII_LC>, C<isASCII_LC_uvchr>, and
+C<isASCII_uvchr>, C<isASCII_utf8>, C<isASCII_LC>, C<isASCII_LC_uvchr>, and
 C<isASCII_LC_utf8>.  Note, however, that some platforms do not have the C
 library routine C<isascii()>.  In these cases, the variants whose names contain
 C<LC> are the same as the corresponding ones without.
@@ -600,7 +610,7 @@ Returns a boolean indicating whether the specified character is a
 character considered to be a blank, analogous to C<m/[[:blank:]]/>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isBLANK_A>, C<isBLANK_L1>, C<isBLANK_uni>, C<isBLANK_utf8>, C<isBLANK_LC>,
+C<isBLANK_A>, C<isBLANK_L1>, C<isBLANK_uvchr>, C<isBLANK_utf8>, C<isBLANK_LC>,
 C<isBLANK_LC_uvchr>, and C<isBLANK_LC_utf8>.  Note, however, that some
 platforms do not have the C library routine C<isblank()>.  In these cases, the
 variants whose names contain C<LC> are the same as the corresponding ones
@@ -611,7 +621,7 @@ Returns a boolean indicating whether the specified character is a
 control character, analogous to C<m/[[:cntrl:]]/>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isCNTRL_A>, C<isCNTRL_L1>, C<isCNTRL_uni>, C<isCNTRL_utf8>, C<isCNTRL_LC>,
+C<isCNTRL_A>, C<isCNTRL_L1>, C<isCNTRL_uvchr>, C<isCNTRL_utf8>, C<isCNTRL_LC>,
 C<isCNTRL_LC_uvchr>, and C<isCNTRL_LC_utf8>
 On EBCDIC platforms, you almost always want to use the C<isCNTRL_L1> variant.
 
@@ -621,7 +631,7 @@ digit, analogous to C<m/[[:digit:]]/>.
 Variants C<isDIGIT_A> and C<isDIGIT_L1> are identical to C<isDIGIT>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isDIGIT_uni>, C<isDIGIT_utf8>, C<isDIGIT_LC>, C<isDIGIT_LC_uvchr>, and
+C<isDIGIT_uvchr>, C<isDIGIT_utf8>, C<isDIGIT_LC>, C<isDIGIT_LC_uvchr>, and
 C<isDIGIT_LC_utf8>.
 
 =for apidoc Am|bool|isGRAPH|char ch
@@ -629,7 +639,7 @@ Returns a boolean indicating whether the specified character is a
 graphic character, analogous to C<m/[[:graph:]]/>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isGRAPH_A>, C<isGRAPH_L1>, C<isGRAPH_uni>, C<isGRAPH_utf8>, C<isGRAPH_LC>,
+C<isGRAPH_A>, C<isGRAPH_L1>, C<isGRAPH_uvchr>, C<isGRAPH_utf8>, C<isGRAPH_LC>,
 C<isGRAPH_LC_uvchr>, and C<isGRAPH_LC_utf8>.
 
 =for apidoc Am|bool|isLOWER|char ch
@@ -637,7 +647,7 @@ Returns a boolean indicating whether the specified character is a
 lowercase character, analogous to C<m/[[:lower:]]/>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isLOWER_A>, C<isLOWER_L1>, C<isLOWER_uni>, C<isLOWER_utf8>, C<isLOWER_LC>,
+C<isLOWER_A>, C<isLOWER_L1>, C<isLOWER_uvchr>, C<isLOWER_utf8>, C<isLOWER_LC>,
 C<isLOWER_LC_uvchr>, and C<isLOWER_LC_utf8>.
 
 =for apidoc Am|bool|isOCTAL|char ch
@@ -654,7 +664,7 @@ straightforward as one might desire.  See L<perlrecharclass/POSIX Character
 Classes> for details.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isPUNCT_A>, C<isPUNCT_L1>, C<isPUNCT_uni>, C<isPUNCT_utf8>, C<isPUNCT_LC>,
+C<isPUNCT_A>, C<isPUNCT_L1>, C<isPUNCT_uvchr>, C<isPUNCT_utf8>, C<isPUNCT_LC>,
 C<isPUNCT_LC_uvchr>, and C<isPUNCT_LC_utf8>.
 
 =for apidoc Am|bool|isSPACE|char ch
@@ -668,7 +678,7 @@ in the non-locale variants, was that C<isSPACE()> did not match a vertical tab.
 (See L</isPSXSPC> for a macro that matches a vertical tab in all releases.)
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isSPACE_A>, C<isSPACE_L1>, C<isSPACE_uni>, C<isSPACE_utf8>, C<isSPACE_LC>,
+C<isSPACE_A>, C<isSPACE_L1>, C<isSPACE_uvchr>, C<isSPACE_utf8>, C<isSPACE_LC>,
 C<isSPACE_LC_uvchr>, and C<isSPACE_LC_utf8>.
 
 =for apidoc Am|bool|isPSXSPC|char ch
@@ -682,16 +692,15 @@ C<isSPACE()> forms don't match a Vertical Tab, and the C<isPSXSPC()> forms do.
 Otherwise they are identical.  Thus this macro is analogous to what
 C<m/[[:space:]]/> matches in a regular expression.
 See the L<top of this section|/Character classification> for an explanation of
-variants
-C<isPSXSPC_A>, C<isPSXSPC_L1>, C<isPSXSPC_uni>, C<isPSXSPC_utf8>, C<isPSXSPC_LC>,
-C<isPSXSPC_LC_uvchr>, and C<isPSXSPC_LC_utf8>.
+variants C<isPSXSPC_A>, C<isPSXSPC_L1>, C<isPSXSPC_uvchr>, C<isPSXSPC_utf8>,
+C<isPSXSPC_LC>, C<isPSXSPC_LC_uvchr>, and C<isPSXSPC_LC_utf8>.
 
 =for apidoc Am|bool|isUPPER|char ch
 Returns a boolean indicating whether the specified character is an
 uppercase character, analogous to C<m/[[:upper:]]/>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isUPPER_A>, C<isUPPER_L1>, C<isUPPER_uni>, C<isUPPER_utf8>, C<isUPPER_LC>,
+C<isUPPER_A>, C<isUPPER_L1>, C<isUPPER_uvchr>, C<isUPPER_utf8>, C<isUPPER_LC>,
 C<isUPPER_LC_uvchr>, and C<isUPPER_LC_utf8>.
 
 =for apidoc Am|bool|isPRINT|char ch
@@ -699,7 +708,7 @@ Returns a boolean indicating whether the specified character is a
 printable character, analogous to C<m/[[:print:]]/>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isPRINT_A>, C<isPRINT_L1>, C<isPRINT_uni>, C<isPRINT_utf8>, C<isPRINT_LC>,
+C<isPRINT_A>, C<isPRINT_L1>, C<isPRINT_uvchr>, C<isPRINT_utf8>, C<isPRINT_LC>,
 C<isPRINT_LC_uvchr>, and C<isPRINT_LC_utf8>.
 
 =for apidoc Am|bool|isWORDCHAR|char ch
@@ -713,7 +722,7 @@ word character includes more than the standard C language meaning of
 alphanumeric.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isWORDCHAR_A>, C<isWORDCHAR_L1>, C<isWORDCHAR_uni>, and C<isWORDCHAR_utf8>.
+C<isWORDCHAR_A>, C<isWORDCHAR_L1>, C<isWORDCHAR_uvchr>, and C<isWORDCHAR_utf8>.
 C<isWORDCHAR_LC>, C<isWORDCHAR_LC_uvchr>, and C<isWORDCHAR_LC_utf8> are also as
 described there, but additionally include the platform's native underscore.
 
@@ -723,7 +732,7 @@ digit.  In the ASCII range these are C<[0-9A-Fa-f]>.  Variants C<isXDIGIT_A()>
 and C<isXDIGIT_L1()> are identical to C<isXDIGIT()>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isXDIGIT_uni>, C<isXDIGIT_utf8>, C<isXDIGIT_LC>, C<isXDIGIT_LC_uvchr>, and
+C<isXDIGIT_uvchr>, C<isXDIGIT_utf8>, C<isXDIGIT_LC>, C<isXDIGIT_LC_uvchr>, and
 C<isXDIGIT_LC_utf8>.
 
 =for apidoc Am|bool|isIDFIRST|char ch
@@ -733,7 +742,7 @@ the official Unicode property C<XID_Start>.  The difference is that this
 returns true only if the input character also matches L</isWORDCHAR>.
 See the L<top of this section|/Character classification> for an explanation of
 variants
-C<isIDFIRST_A>, C<isIDFIRST_L1>, C<isIDFIRST_uni>, C<isIDFIRST_utf8>,
+C<isIDFIRST_A>, C<isIDFIRST_L1>, C<isIDFIRST_uvchr>, C<isIDFIRST_utf8>,
 C<isIDFIRST_LC>, C<isIDFIRST_LC_uvchr>, and C<isIDFIRST_LC_utf8>.
 
 =for apidoc Am|bool|isIDCONT|char ch
@@ -743,7 +752,7 @@ not quite the same as the official Unicode property C<XID_Continue>.  The
 difference is that this returns true only if the input character also matches
 L</isWORDCHAR>.  See the L<top of this section|/Character classification> for
 an
-explanation of variants C<isIDCONT_A>, C<isIDCONT_L1>, C<isIDCONT_uni>,
+explanation of variants C<isIDCONT_A>, C<isIDCONT_L1>, C<isIDCONT_uvchr>,
 C<isIDCONT_utf8>, C<isIDCONT_LC>, C<isIDCONT_LC_uvchr>, and
 C<isIDCONT_LC_utf8>.
 
@@ -760,9 +769,10 @@ Converts the specified character to uppercase.  If the input is anything but an
 ASCII lowercase character, that input character itself is returned.  Variant
 C<toUPPER_A> is equivalent.
 
-=for apidoc Am|UV|toUPPER_uni|UV cp|U8* s|STRLEN* lenp
-Converts the Unicode code point C<cp> to its uppercase version, and
-stores that in UTF-8 in C<s>, and its length in bytes in C<lenp>.  Note
+=for apidoc Am|UV|toUPPER_uvchr|UV cp|U8* s|STRLEN* lenp
+Converts the code point C<cp> to its uppercase version, and
+stores that in UTF-8 in C<s>, and its length in bytes in C<lenp>.  The code
+point is interpreted as native if less than 256; otherwise as Unicode.  Note
 that the buffer pointed to by C<s> needs to be at least C<UTF8_MAXBYTES_CASE+1>
 bytes since the uppercase version may be longer than the original character.
 
@@ -784,11 +794,12 @@ The input character at C<p> is assumed to be well-formed.
 Converts the specified character to foldcase.  If the input is anything but an
 ASCII uppercase character, that input character itself is returned.  Variant
 C<toFOLD_A> is equivalent.  (There is no equivalent C<to_FOLD_L1> for the full
-Latin1 range, as the full generality of L</toFOLD_uni> is needed there.)
+Latin1 range, as the full generality of L</toFOLD_uvchr> is needed there.)
 
-=for apidoc Am|UV|toFOLD_uni|UV cp|U8* s|STRLEN* lenp
-Converts the Unicode code point C<cp> to its foldcase version, and
-stores that in UTF-8 in C<s>, and its length in bytes in C<lenp>.  Note
+=for apidoc Am|UV|toFOLD_uvchr|UV cp|U8* s|STRLEN* lenp
+Converts the code point C<cp> to its foldcase version, and
+stores that in UTF-8 in C<s>, and its length in bytes in C<lenp>.  The code
+point is interpreted as native if less than 256; otherwise as Unicode.  Note
 that the buffer pointed to by C<s> needs to be at least C<UTF8_MAXBYTES_CASE+1>
 bytes since the foldcase version may be longer than the original character.
 
@@ -812,16 +823,17 @@ ASCII uppercase character, that input character itself is returned.  Variant
 C<toLOWER_A> is equivalent.
 
 =for apidoc Am|U8|toLOWER_L1|U8 ch
-Converts the specified Latin1 character to lowercase.  The results are undefined if
-the input doesn't fit in a byte.
+Converts the specified Latin1 character to lowercase.  The results are
+undefined if the input doesn't fit in a byte.
 
 =for apidoc Am|U8|toLOWER_LC|U8 ch
 Converts the specified character to lowercase using the current locale's rules,
 if possible; otherwise returns the input character itself.
 
-=for apidoc Am|UV|toLOWER_uni|UV cp|U8* s|STRLEN* lenp
-Converts the Unicode code point C<cp> to its lowercase version, and
-stores that in UTF-8 in C<s>, and its length in bytes in C<lenp>.  Note
+=for apidoc Am|UV|toLOWER_uvchr|UV cp|U8* s|STRLEN* lenp
+Converts the code point C<cp> to its lowercase version, and
+stores that in UTF-8 in C<s>, and its length in bytes in C<lenp>.  The code
+point is interpreted as native if less than 256; otherwise as Unicode.  Note
 that the buffer pointed to by C<s> needs to be at least C<UTF8_MAXBYTES_CASE+1>
 bytes since the lowercase version may be longer than the original character.
 
@@ -842,13 +854,14 @@ The input character at C<p> is assumed to be well-formed.
 =for apidoc Am|U8|toTITLE|U8 ch
 Converts the specified character to titlecase.  If the input is anything but an
 ASCII lowercase character, that input character itself is returned.  Variant
-C<toTITLE_A> is equivalent.  (There is no C<toTITLE_L1> for the full Latin1 range,
-as the full generality of L</toTITLE_uni> is needed there.  Titlecase is not a
-concept used in locale handling, so there is no functionality for that.)
-
-=for apidoc Am|UV|toTITLE_uni|UV cp|U8* s|STRLEN* lenp
-Converts the Unicode code point C<cp> to its titlecase version, and
-stores that in UTF-8 in C<s>, and its length in bytes in C<lenp>.  Note
+C<toTITLE_A> is equivalent.  (There is no C<toTITLE_L1> for the full Latin1
+range, as the full generality of L</toTITLE_uvchr> is needed there.  Titlecase is
+not a concept used in locale handling, so there is no functionality for that.)
+
+=for apidoc Am|UV|toTITLE_uvchr|UV cp|U8* s|STRLEN* lenp
+Converts the code point C<cp> to its titlecase version, and
+stores that in UTF-8 in C<s>, and its length in bytes in C<lenp>.  The code
+point is interpreted as native if less than 256; otherwise as Unicode.  Note
 that the buffer pointed to by C<s> needs to be at least C<UTF8_MAXBYTES_CASE+1>
 bytes since the titlecase version may be longer than the original character.
 
@@ -868,7 +881,7 @@ The input character at C<p> is assumed to be well-formed.
 
 =cut
 
-XXX Still undocumented isVERTWS_uni and _utf8; it's unclear what their names
+XXX Still undocumented isVERTWS_uvchr and _utf8; it's unclear what their names
 really should be.  Also toUPPER_LC and toFOLD_LC, which are subject to change.
 
 Note that these macros are repeated in Devel::PPPort, so should also be
@@ -891,8 +904,16 @@ patched there.  The file as of this writing is cpan/Devel-PPPort/parts/inc/misc
  * compiler to optimize it out if possible.  This is because Configure makes
  * sure that the machine has an 8-bit byte, so if c is stored in a byte, the
  * sizeof() guarantees that this evaluates to a constant true at compile time.
+ *
+ * For Coverity, be always true, because otherwise Coverity thinks
+ * it finds several expressions that are always true, independent
+ * of operands.  Well, they are, but that is kind of the point.
  */
+#ifndef __COVERITY__
 #define FITS_IN_8_BITS(c) ((sizeof(c) == 1) || !(((WIDEST_UTYPE)(c)) & ~0xFF))
+#else
+#define FITS_IN_8_BITS(c) (1)
+#endif
 
 #ifdef EBCDIC
 #   ifndef _ALL_SOURCE
@@ -903,8 +924,9 @@ patched there.  The file as of this writing is cpan/Devel-PPPort/parts/inc/misc
 #else
     /* There is a simple definition of ASCII for ASCII platforms.  But the
      * EBCDIC one isn't so simple, so is defined using table look-up like the
-     * other macros below */
-#   define isASCII(c)    ((WIDEST_UTYPE)(c) < 128)
+     * other macros below.
+     * The '| 0' part ensures that c is an integer (and not e.g. a pointer) */
+#   define isASCII(c)    ((WIDEST_UTYPE)((c) | 0) < 128)
 #endif
 
 /* The lower 3 bits in both the ASCII and EBCDIC representations of '0' are 0,
@@ -964,14 +986,23 @@ patched there.  The file as of this writing is cpan/Devel-PPPort/parts/inc/misc
 #  define _CC_NON_FINAL_FOLD           21
 #  define _CC_IS_IN_SOME_FOLD          22
 #  define _CC_MNEMONIC_CNTRL           23
-/* Unused: 24-31
+
+/* This next group is only used on EBCDIC platforms, so theoretically could be
+ * shared with something entirely different that's only on ASCII platforms */
+#  define _CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE 28
+#  define _CC_UTF8_IS_START                             29
+#  define _CC_UTF8_IS_DOWNGRADEABLE_START               30
+#  define _CC_UTF8_IS_CONTINUATION                      31
+/* Unused: 24-27
  * If more bits are needed, one could add a second word for non-64bit
  * QUAD_IS_INT systems, using some #ifdefs to distinguish between having a 2nd
  * word or not.  The IS_IN_SOME_FOLD bit is the most easily expendable, as it
  * is used only for optimization (as of this writing), and differs in the
  * Latin1 range from the ALPHA bit only in two relatively unimportant
  * characters: the masculine and feminine ordinal indicators, so removing it
- * would just cause /i regexes which match them to run less efficiently */
+ * would just cause /i regexes which match them to run less efficiently.
+ * Similarly the EBCDIC-only bits are used just for speed, and could be
+ * replaced by other means */
 
 #if defined(PERL_CORE) || defined(PERL_EXT)
 /* An enum version of the character class numbers, to help compilers
@@ -999,7 +1030,9 @@ typedef enum {
 #define POSIX_SWASH_COUNT _FIRST_NON_SWASH_CC
 #define POSIX_CC_COUNT    (_HIGHEST_REGCOMP_DOT_H_SYNC + 1)
 
-#if defined(PERL_IN_UTF8_C) || defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C)
+#if defined(PERL_IN_UTF8_C)                         \
+ || defined(PERL_IN_REGCOMP_C)                      \
+ || defined(PERL_IN_REGEXEC_C)
 #   if _CC_WORDCHAR != 0 || _CC_DIGIT != 1 || _CC_ALPHA != 2 || _CC_LOWER != 3 \
        || _CC_UPPER != 4 || _CC_PUNCT != 5 || _CC_PRINT != 6                   \
        || _CC_ALPHANUMERIC != 7 || _CC_GRAPH != 8 || _CC_CASED != 9
@@ -1050,9 +1083,9 @@ END_EXTERN_C
     /* For internal core Perl use only: the base macro for defining macros like
      * isALPHA_A.  The foo_A version makes sure that both the desired bit and
      * the ASCII bit are present */
-#   define _generic_isCC_A(c, classnum) (FITS_IN_8_BITS(c)  \
-        && ((PL_charclass[(U8) (c)] & _CC_mask_A(classnum)) \
-                                == _CC_mask_A(classnum)))
+#   define _generic_isCC_A(c, classnum) (FITS_IN_8_BITS(c)      \
+        && ((PL_charclass[(U8) (c)] & _CC_mask_A(classnum))     \
+                                   == _CC_mask_A(classnum)))
 
 #   define isALPHA_A(c)  _generic_isCC_A(c, _CC_ALPHA)
 #   define isALPHANUMERIC_A(c) _generic_isCC_A(c, _CC_ALPHANUMERIC)
@@ -1066,7 +1099,8 @@ END_EXTERN_C
 #   define isSPACE_A(c)  _generic_isCC_A(c, _CC_SPACE)
 #   define isUPPER_A(c)  _generic_isCC_A(c, _CC_UPPER)
 #   define isWORDCHAR_A(c) _generic_isCC_A(c, _CC_WORDCHAR)
-#   define isXDIGIT_A(c)  _generic_isCC(c, _CC_XDIGIT) /* No non-ASCII xdigits */
+#   define isXDIGIT_A(c)  _generic_isCC(c, _CC_XDIGIT) /* No non-ASCII xdigits
+                                                        */
 #   define isIDFIRST_A(c) _generic_isCC_A(c, _CC_IDFIRST)
 #   define isALPHA_L1(c)  _generic_isCC(c, _CC_ALPHA)
 #   define isALPHANUMERIC_L1(c) _generic_isCC(c, _CC_ALPHANUMERIC)
@@ -1079,7 +1113,7 @@ END_EXTERN_C
 #   define isGRAPH_L1(c)  _generic_isCC(c, _CC_GRAPH)
 #   define isLOWER_L1(c)  _generic_isCC(c, _CC_LOWER)
 #   define isPRINT_L1(c)  _generic_isCC(c, _CC_PRINT)
-#   define isPSXSPC_L1(c) isSPACE_L1(c)
+#   define isPSXSPC_L1(c)  isSPACE_L1(c)
 #   define isPUNCT_L1(c)  _generic_isCC(c, _CC_PUNCT)
 #   define isSPACE_L1(c)  _generic_isCC(c, _CC_SPACE)
 #   define isUPPER_L1(c)  _generic_isCC(c, _CC_UPPER)
@@ -1098,9 +1132,9 @@ END_EXTERN_C
 
 #   define _isQUOTEMETA(c) _generic_isCC(c, _CC_QUOTEMETA)
 #   define _IS_NON_FINAL_FOLD_ONLY_FOR_USE_BY_REGCOMP_DOT_C(c) \
-                                            _generic_isCC(c, _CC_NON_FINAL_FOLD)
+                                           _generic_isCC(c, _CC_NON_FINAL_FOLD)
 #   define _IS_IN_SOME_FOLD_ONLY_FOR_USE_BY_REGCOMP_DOT_C(c) \
-                                            _generic_isCC(c, _CC_IS_IN_SOME_FOLD)
+                                           _generic_isCC(c, _CC_IS_IN_SOME_FOLD)
 #   define _IS_MNEMONIC_CNTRL_ONLY_FOR_USE_BY_REGCOMP_DOT_C(c) \
                                             _generic_isCC(c, _CC_MNEMONIC_CNTRL)
 #else   /* else we don't have perl.h H_PERL */
@@ -1363,7 +1397,7 @@ END_EXTERN_C
                     (! FITS_IN_8_BITS(c)                                       \
                     ? (c)                                                      \
                     : ((! IN_UTF8_CTYPE_LOCALE)                                \
-                      ? (cast)function((cast)(c))                                    \
+                      ? (cast)function((cast)(c))                              \
                       : ((((U8)(c)) == MICRO_SIGN)                             \
                         ? GREEK_CAPITAL_LETTER_MU                              \
                         : ((((U8)(c)) == LATIN_SMALL_LETTER_Y_WITH_DIAERESIS)  \
@@ -1410,20 +1444,25 @@ END_EXTERN_C
      * Not all possible weirdnesses are checked for, just the ones that were
      * detected on actual Microsoft code pages */
 
-#  define isCNTRL_LC(c)    _generic_LC(c, _CC_CNTRL, iscntrl)
-#  define isSPACE_LC(c)    _generic_LC(c, _CC_SPACE, isspace)
-
-#  define isALPHA_LC(c)    (_generic_LC(c, _CC_ALPHA, isalpha) && isALPHANUMERIC_LC(c))
-#  define isALPHANUMERIC_LC(c)  (_generic_LC(c, _CC_ALPHANUMERIC, isalnum) && ! isPUNCT_LC(c))
-#  define isDIGIT_LC(c)    (_generic_LC(c, _CC_DIGIT, isdigit) && isALPHANUMERIC_LC(c))
-#  define isGRAPH_LC(c)    (_generic_LC(c, _CC_GRAPH, isgraph) && isPRINT_LC(c))
-#  define isIDFIRST_LC(c)  (((c) == '_') || (_generic_LC(c, _CC_IDFIRST, isalpha) && ! isPUNCT_LC(c)))
-#  define isLOWER_LC(c)    (_generic_LC(c, _CC_LOWER, islower) && isALPHA_LC(c))
-#  define isPRINT_LC(c)    (_generic_LC(c, _CC_PRINT, isprint) && ! isCNTRL_LC(c))
-#  define isPUNCT_LC(c)    (_generic_LC(c, _CC_PUNCT, ispunct) && ! isCNTRL_LC(c))
-#  define isUPPER_LC(c)    (_generic_LC(c, _CC_UPPER, isupper) && isALPHA_LC(c))
+#  define isCNTRL_LC(c)  _generic_LC(c, _CC_CNTRL, iscntrl)
+#  define isSPACE_LC(c)  _generic_LC(c, _CC_SPACE, isspace)
+
+#  define isALPHA_LC(c)  (_generic_LC(c, _CC_ALPHA, isalpha)                  \
+                                                    && isALPHANUMERIC_LC(c))
+#  define isALPHANUMERIC_LC(c)  (_generic_LC(c, _CC_ALPHANUMERIC, isalnum) && \
+                                                              ! isPUNCT_LC(c))
+#  define isDIGIT_LC(c)  (_generic_LC(c, _CC_DIGIT, isdigit) &&               \
+                                                         isALPHANUMERIC_LC(c))
+#  define isGRAPH_LC(c)  (_generic_LC(c, _CC_GRAPH, isgraph) && isPRINT_LC(c))
+#  define isIDFIRST_LC(c) (((c) == '_')                                       \
+                 || (_generic_LC(c, _CC_IDFIRST, isalpha) && ! isPUNCT_LC(c)))
+#  define isLOWER_LC(c)  (_generic_LC(c, _CC_LOWER, islower) && isALPHA_LC(c))
+#  define isPRINT_LC(c)  (_generic_LC(c, _CC_PRINT, isprint) && ! isCNTRL_LC(c))
+#  define isPUNCT_LC(c)  (_generic_LC(c, _CC_PUNCT, ispunct) && ! isCNTRL_LC(c))
+#  define isUPPER_LC(c)  (_generic_LC(c, _CC_UPPER, isupper) && isALPHA_LC(c))
 #  define isWORDCHAR_LC(c) (((c) == '_') || isALPHANUMERIC_LC(c))
-#  define isXDIGIT_LC(c)   (_generic_LC(c, _CC_XDIGIT, isxdigit) && isALPHANUMERIC_LC(c))
+#  define isXDIGIT_LC(c) (_generic_LC(c, _CC_XDIGIT, isxdigit)                \
+                                                    && isALPHANUMERIC_LC(c))
 
 #  define toLOWER_LC(c) _generic_toLOWER_LC((c), tolower, U8)
 #  define toUPPER_LC(c) _generic_toUPPER_LC((c), toupper, U8)
@@ -1453,19 +1492,19 @@ END_EXTERN_C
 
 #else  /* The final fallback position */
 
-#  define isALPHA_LC(c)	(isascii(c) && isalpha(c))
-#  define isALPHANUMERIC_LC(c) (isascii(c) && isalnum(c))
-#  define isCNTRL_LC(c)	(isascii(c) && iscntrl(c))
-#  define isDIGIT_LC(c)	(isascii(c) && isdigit(c))
-#  define isGRAPH_LC(c)	(isascii(c) && isgraph(c))
+#  define isALPHA_LC(c)	        (isascii(c) && isalpha(c))
+#  define isALPHANUMERIC_LC(c)  (isascii(c) && isalnum(c))
+#  define isCNTRL_LC(c)	        (isascii(c) && iscntrl(c))
+#  define isDIGIT_LC(c)	        (isascii(c) && isdigit(c))
+#  define isGRAPH_LC(c)	        (isascii(c) && isgraph(c))
 #  define isIDFIRST_LC(c)	(isascii(c) && (isalpha(c) || (c) == '_'))
-#  define isLOWER_LC(c)	(isascii(c) && islower(c))
-#  define isPRINT_LC(c)	(isascii(c) && isprint(c))
-#  define isPUNCT_LC(c)	(isascii(c) && ispunct(c))
-#  define isSPACE_LC(c)	(isascii(c) && isspace(c))
-#  define isUPPER_LC(c)	(isascii(c) && isupper(c))
+#  define isLOWER_LC(c)	        (isascii(c) && islower(c))
+#  define isPRINT_LC(c)	        (isascii(c) && isprint(c))
+#  define isPUNCT_LC(c)	        (isascii(c) && ispunct(c))
+#  define isSPACE_LC(c)	        (isascii(c) && isspace(c))
+#  define isUPPER_LC(c)	        (isascii(c) && isupper(c))
 #  define isWORDCHAR_LC(c)	(isascii(c) && (isalnum(c) || (c) == '_'))
-#  define isXDIGIT_LC(c)      (isascii(c) && isxdigit(c))
+#  define isXDIGIT_LC(c)        (isascii(c) && isxdigit(c))
 
 #  define toLOWER_LC(c)	(isascii(c) ? tolower(c) : (c))
 #  define toUPPER_LC(c)	(isascii(c) ? toupper(c) : (c))
@@ -1480,56 +1519,81 @@ END_EXTERN_C
 #define isPSXSPC_LC(c)		isSPACE_LC(c)
 
 /* For internal core Perl use only: the base macros for defining macros like
- * isALPHA_uni.  'c' is the code point to check.  'classnum' is the POSIX class
- * number defined earlier in this file.  _generic_uni() is used for POSIX
+ * isALPHA_uvchr.  'c' is the code point to check.  'classnum' is the POSIX class
+ * number defined earlier in this file.  _generic_uvchr() is used for POSIX
  * classes where there is a macro or function 'above_latin1' that takes the
  * single argument 'c' and returns the desired value.  These exist for those
  * classes which have simple definitions, avoiding the overhead of a hash
- * lookup or inversion list binary search.  _generic_swash_uni() can be used
+ * lookup or inversion list binary search.  _generic_swash_uvchr() can be used
  * for classes where that overhead is faster than a direct lookup.
- * _generic_uni() won't compile if 'c' isn't unsigned, as it won't match the
+ * _generic_uvchr() won't compile if 'c' isn't unsigned, as it won't match the
  * 'above_latin1' prototype. _generic_isCC() macro does bounds checking, so
  * have duplicate checks here, so could create versions of the macros that
  * don't, but experiments show that gcc optimizes them out anyway. */
 
 /* Note that all ignore 'use bytes' */
-#define _generic_uni(classnum, above_latin1, c) ((c) < 256                    \
+#define _generic_uvchr(classnum, above_latin1, c) ((c) < 256                    \
                                              ? _generic_isCC(c, classnum)     \
                                              : above_latin1(c))
-#define _generic_swash_uni(classnum, c) ((c) < 256                            \
+#define _generic_swash_uvchr(classnum, c) ((c) < 256                            \
                                              ? _generic_isCC(c, classnum)     \
                                              : _is_uni_FOO(classnum, c))
-#define isALPHA_uni(c)      _generic_swash_uni(_CC_ALPHA, c)
-#define isALPHANUMERIC_uni(c) _generic_swash_uni(_CC_ALPHANUMERIC, c)
-#define isASCII_uni(c)      isASCII(c)
-#define isBLANK_uni(c)      _generic_uni(_CC_BLANK, is_HORIZWS_cp_high, c)
-#define isCNTRL_uni(c)      isCNTRL_L1(c) /* All controls are in Latin1 */
-#define isDIGIT_uni(c)      _generic_swash_uni(_CC_DIGIT, c)
-#define isGRAPH_uni(c)      _generic_swash_uni(_CC_GRAPH, c)
-#define isIDCONT_uni(c)     _generic_uni(_CC_WORDCHAR, _is_uni_perl_idcont, c)
-#define isIDFIRST_uni(c)    _generic_uni(_CC_IDFIRST, _is_uni_perl_idstart, c)
-#define isLOWER_uni(c)      _generic_swash_uni(_CC_LOWER, c)
-#define isPRINT_uni(c)      _generic_swash_uni(_CC_PRINT, c)
-
-#define isPUNCT_uni(c)      _generic_swash_uni(_CC_PUNCT, c)
-#define isSPACE_uni(c)      _generic_uni(_CC_SPACE, is_XPERLSPACE_cp_high, c)
-#define isPSXSPC_uni(c)     isSPACE_uni(c)
-
-#define isUPPER_uni(c)      _generic_swash_uni(_CC_UPPER, c)
-#define isVERTWS_uni(c)     _generic_uni(_CC_VERTSPACE, is_VERTWS_cp_high, c)
-#define isWORDCHAR_uni(c)   _generic_swash_uni(_CC_WORDCHAR, c)
-#define isXDIGIT_uni(c)     _generic_uni(_CC_XDIGIT, is_XDIGIT_cp_high, c)
-
-#define toFOLD_uni(c,s,l)	to_uni_fold(c,s,l)
-#define toLOWER_uni(c,s,l)	to_uni_lower(c,s,l)
-#define toTITLE_uni(c,s,l)	to_uni_title(c,s,l)
-#define toUPPER_uni(c,s,l)	to_uni_upper(c,s,l)
+#define isALPHA_uvchr(c)      _generic_swash_uvchr(_CC_ALPHA, c)
+#define isALPHANUMERIC_uvchr(c) _generic_swash_uvchr(_CC_ALPHANUMERIC, c)
+#define isASCII_uvchr(c)      isASCII(c)
+#define isBLANK_uvchr(c)      _generic_uvchr(_CC_BLANK, is_HORIZWS_cp_high, c)
+#define isCNTRL_uvchr(c)      isCNTRL_L1(c) /* All controls are in Latin1 */
+#define isDIGIT_uvchr(c)      _generic_swash_uvchr(_CC_DIGIT, c)
+#define isGRAPH_uvchr(c)      _generic_swash_uvchr(_CC_GRAPH, c)
+#define isIDCONT_uvchr(c)     _generic_uvchr(_CC_WORDCHAR, _is_uni_perl_idcont, c)
+#define isIDFIRST_uvchr(c)    _generic_uvchr(_CC_IDFIRST, _is_uni_perl_idstart, c)
+#define isLOWER_uvchr(c)      _generic_swash_uvchr(_CC_LOWER, c)
+#define isPRINT_uvchr(c)      _generic_swash_uvchr(_CC_PRINT, c)
+
+#define isPUNCT_uvchr(c)      _generic_swash_uvchr(_CC_PUNCT, c)
+#define isSPACE_uvchr(c)      _generic_uvchr(_CC_SPACE, is_XPERLSPACE_cp_high, c)
+#define isPSXSPC_uvchr(c)     isSPACE_uvchr(c)
+
+#define isUPPER_uvchr(c)      _generic_swash_uvchr(_CC_UPPER, c)
+#define isVERTWS_uvchr(c)     _generic_uvchr(_CC_VERTSPACE, is_VERTWS_cp_high, c)
+#define isWORDCHAR_uvchr(c)   _generic_swash_uvchr(_CC_WORDCHAR, c)
+#define isXDIGIT_uvchr(c)     _generic_uvchr(_CC_XDIGIT, is_XDIGIT_cp_high, c)
+
+#define toFOLD_uvchr(c,s,l)	to_uni_fold(c,s,l)
+#define toLOWER_uvchr(c,s,l)	to_uni_lower(c,s,l)
+#define toTITLE_uvchr(c,s,l)	to_uni_title(c,s,l)
+#define toUPPER_uvchr(c,s,l)	to_uni_upper(c,s,l)
+
+/* For backwards compatibility, even though '_uni' should mean official Unicode
+ * code points, in Perl it means native for those below 256 */
+#define isALPHA_uni(c)          isALPHA_uvchr(c)
+#define isALPHANUMERIC_uni(c)   isALPHANUMERIC_uvchr(c)
+#define isASCII_uni(c)          isASCII_uvchr(c)
+#define isBLANK_uni(c)          isBLANK_uvchr(c)
+#define isCNTRL_uni(c)          isCNTRL_uvchr(c)
+#define isDIGIT_uni(c)          isDIGIT_uvchr(c)
+#define isGRAPH_uni(c)          isGRAPH_uvchr(c)
+#define isIDCONT_uni(c)         isIDCONT_uvchr(c)
+#define isIDFIRST_uni(c)        isIDFIRST_uvchr(c)
+#define isLOWER_uni(c)          isLOWER_uvchr(c)
+#define isPRINT_uni(c)          isPRINT_uvchr(c)
+#define isPUNCT_uni(c)          isPUNCT_uvchr(c)
+#define isSPACE_uni(c)          isSPACE_uvchr(c)
+#define isPSXSPC_uni(c)         isPSXSPC_uvchr(c)
+#define isUPPER_uni(c)          isUPPER_uvchr(c)
+#define isVERTWS_uni(c)         isVERTWS_uvchr(c)
+#define isWORDCHAR_uni(c)       isWORDCHAR_uvchr(c)
+#define isXDIGIT_uni(c)         isXDIGIT_uvchr(c)
+#define toFOLD_uni(c,s,l)       toFOLD_uvchr(c,s,l)
+#define toLOWER_uni(c,s,l)      toLOWER_uvchr(c,s,l)
+#define toTITLE_uni(c,s,l)      toTITLE_uvchr(c,s,l)
+#define toUPPER_uni(c,s,l)      toUPPER_uvchr(c,s,l)
 
 /* For internal core Perl use only: the base macros for defining macros like
  * isALPHA_LC_uvchr.  These are like isALPHA_LC, but the input can be any code
- * point, not just 0-255.  Like _generic_uni, there are two versions, one for
+ * point, not just 0-255.  Like _generic_uvchr, there are two versions, one for
  * simple class definitions; the other for more complex.  These are like
- * _generic_uni, so see it for more info. */
+ * _generic_uvchr, so see it for more info. */
 #define _generic_LC_uvchr(latin1, above_latin1, c)                            \
                                     (c < 256 ? latin1(c) : above_latin1(c))
 #define _generic_LC_swash_uvchr(latin1, classnum, c)                          \
@@ -1538,27 +1602,29 @@ END_EXTERN_C
 #define isALPHA_LC_uvchr(c)  _generic_LC_swash_uvchr(isALPHA_LC, _CC_ALPHA, c)
 #define isALPHANUMERIC_LC_uvchr(c)  _generic_LC_swash_uvchr(isALPHANUMERIC_LC, \
                                                          _CC_ALPHANUMERIC, c)
-#define isASCII_LC_uvchr(c)  isASCII_LC(c)
-#define isBLANK_LC_uvchr(c)  _generic_LC_uvchr(isBLANK_LC, is_HORIZWS_cp_high, c)
+#define isASCII_LC_uvchr(c)   isASCII_LC(c)
+#define isBLANK_LC_uvchr(c)  _generic_LC_uvchr(isBLANK_LC,                    \
+                                                        is_HORIZWS_cp_high, c)
 #define isCNTRL_LC_uvchr(c)  (c < 256 ? isCNTRL_LC(c) : 0)
 #define isDIGIT_LC_uvchr(c)  _generic_LC_swash_uvchr(isDIGIT_LC, _CC_DIGIT, c)
 #define isGRAPH_LC_uvchr(c)  _generic_LC_swash_uvchr(isGRAPH_LC, _CC_GRAPH, c)
-#define isIDCONT_LC_uvchr(c)  _generic_LC_uvchr(isIDCONT_LC,                  \
+#define isIDCONT_LC_uvchr(c) _generic_LC_uvchr(isIDCONT_LC,                   \
                                                   _is_uni_perl_idcont, c)
-#define isIDFIRST_LC_uvchr(c)  _generic_LC_uvchr(isIDFIRST_LC,                 \
+#define isIDFIRST_LC_uvchr(c) _generic_LC_uvchr(isIDFIRST_LC,                 \
                                                   _is_uni_perl_idstart, c)
 #define isLOWER_LC_uvchr(c)  _generic_LC_swash_uvchr(isLOWER_LC, _CC_LOWER, c)
 #define isPRINT_LC_uvchr(c)  _generic_LC_swash_uvchr(isPRINT_LC, _CC_PRINT, c)
-#define isPSXSPC_LC_uvchr(c) isSPACE_LC_uvchr(c)
+#define isPSXSPC_LC_uvchr(c)  isSPACE_LC_uvchr(c)
 #define isPUNCT_LC_uvchr(c)  _generic_LC_swash_uvchr(isPUNCT_LC, _CC_PUNCT, c)
-#define isSPACE_LC_uvchr(c)  _generic_LC_uvchr(isSPACE_LC,                     \
+#define isSPACE_LC_uvchr(c)  _generic_LC_uvchr(isSPACE_LC,                    \
                                                     is_XPERLSPACE_cp_high, c)
 #define isUPPER_LC_uvchr(c)  _generic_LC_swash_uvchr(isUPPER_LC, _CC_UPPER, c)
-#define isWORDCHAR_LC_uvchr(c)  _generic_LC_swash_uvchr(isWORDCHAR_LC,              \
+#define isWORDCHAR_LC_uvchr(c) _generic_LC_swash_uvchr(isWORDCHAR_LC,         \
                                                            _CC_WORDCHAR, c)
-#define isXDIGIT_LC_uvchr(c) _generic_LC_uvchr(isXDIGIT_LC, is_XDIGIT_cp_high, c)
+#define isXDIGIT_LC_uvchr(c) _generic_LC_uvchr(isXDIGIT_LC,                  \
+                                                       is_XDIGIT_cp_high, c)
 
-#define isBLANK_LC_uni(c)	isBLANK_LC_uvchr(UNI_TO_NATIVE(c))
+#define isBLANK_LC_uni(c)    isBLANK_LC_uvchr(UNI_TO_NATIVE(c))
 
 /* For internal core Perl use only: the base macros for defining macros like
  * isALPHA_utf8.  These are like the earlier defined macros, but take an input
@@ -1571,12 +1637,12 @@ END_EXTERN_C
                                          ? _generic_isCC(*(p), classnum)       \
                                          : (UTF8_IS_DOWNGRADEABLE_START(*(p))) \
                                            ? _generic_isCC(                    \
-                                                TWO_BYTE_UTF8_TO_NATIVE(*(p),  \
+                                                EIGHT_BIT_UTF8_TO_NATIVE(*(p), \
                                                                    *((p)+1 )), \
                                                 classnum)                      \
                                            : utf8)
-/* Like the above, but calls 'above_latin1(p)' to get the utf8 value.  'above_latin1'
- * can be a macro */
+/* Like the above, but calls 'above_latin1(p)' to get the utf8 value.
+ * 'above_latin1' can be a macro */
 #define _generic_func_utf8(classnum, above_latin1, p)  \
                                     _generic_utf8(classnum, p, above_latin1(p))
 /* Like the above, but passes classnum to _isFOO_utf8(), instead of having an
@@ -1603,12 +1669,12 @@ END_EXTERN_C
  * points; the regcharclass.h ones are implemented as a series of
  * "if-else-if-else ..." */
 
-#define isALPHA_utf8(p)         _generic_swash_utf8(_CC_ALPHA, p)
-#define isALPHANUMERIC_utf8(p)  _generic_swash_utf8(_CC_ALPHANUMERIC, p)
-#define isASCII_utf8(p)         isASCII(*p) /* Because ASCII is invariant under
+#define isALPHA_utf8(p)        _generic_swash_utf8(_CC_ALPHA, p)
+#define isALPHANUMERIC_utf8(p) _generic_swash_utf8(_CC_ALPHANUMERIC, p)
+#define isASCII_utf8(p)        isASCII(*p) /* Because ASCII is invariant under
                                                utf8, the non-utf8 macro works
                                              */
-#define isBLANK_utf8(p)         _generic_func_utf8(_CC_BLANK, is_HORIZWS_high, p)
+#define isBLANK_utf8(p)        _generic_func_utf8(_CC_BLANK, is_HORIZWS_high, p)
 
 #ifdef EBCDIC
     /* Because all controls are UTF-8 invariants in EBCDIC, we can use this
@@ -1630,18 +1696,18 @@ END_EXTERN_C
  * ever wanted to know about.  (In the ASCII range, there isn't a difference.)
  * This used to be not the XID version, but we decided to go with the more
  * modern Unicode definition */
-#define isIDFIRST_utf8(p)       _generic_func_utf8(_CC_IDFIRST,               \
+#define isIDFIRST_utf8(p)   _generic_func_utf8(_CC_IDFIRST,                  \
                                                 _is_utf8_perl_idstart, p)
 
-#define isLOWER_utf8(p)         _generic_swash_utf8(_CC_LOWER, p)
-#define isPRINT_utf8(p)         _generic_swash_utf8(_CC_PRINT, p)
-#define isPSXSPC_utf8(p)        isSPACE_utf8(p)
-#define isPUNCT_utf8(p)         _generic_swash_utf8(_CC_PUNCT, p)
-#define isSPACE_utf8(p)         _generic_func_utf8(_CC_SPACE, is_XPERLSPACE_high, p)
-#define isUPPER_utf8(p)         _generic_swash_utf8(_CC_UPPER, p)
-#define isVERTWS_utf8(p)        _generic_func_utf8(_CC_VERTSPACE, is_VERTWS_high, p)
-#define isWORDCHAR_utf8(p)      _generic_swash_utf8(_CC_WORDCHAR, p)
-#define isXDIGIT_utf8(p)        _generic_utf8_no_upper_latin1(_CC_XDIGIT, p,   \
+#define isLOWER_utf8(p)     _generic_swash_utf8(_CC_LOWER, p)
+#define isPRINT_utf8(p)     _generic_swash_utf8(_CC_PRINT, p)
+#define isPSXSPC_utf8(p)    isSPACE_utf8(p)
+#define isPUNCT_utf8(p)     _generic_swash_utf8(_CC_PUNCT, p)
+#define isSPACE_utf8(p)     _generic_func_utf8(_CC_SPACE, is_XPERLSPACE_high, p)
+#define isUPPER_utf8(p)     _generic_swash_utf8(_CC_UPPER, p)
+#define isVERTWS_utf8(p)    _generic_func_utf8(_CC_VERTSPACE, is_VERTWS_high, p)
+#define isWORDCHAR_utf8(p)  _generic_swash_utf8(_CC_WORDCHAR, p)
+#define isXDIGIT_utf8(p)    _generic_utf8_no_upper_latin1(_CC_XDIGIT, p,     \
                                                           is_XDIGIT_high(p))
 
 #define toFOLD_utf8(p,s,l)	to_utf8_fold(p,s,l)
@@ -1657,7 +1723,7 @@ END_EXTERN_C
                          (UTF8_IS_INVARIANT(*(p))                           \
                          ? macro(*(p))                                      \
                          : (UTF8_IS_DOWNGRADEABLE_START(*(p)))              \
-                           ? macro(TWO_BYTE_UTF8_TO_NATIVE(*(p), *((p)+1))) \
+                           ? macro(EIGHT_BIT_UTF8_TO_NATIVE(*(p), *((p)+1)))\
                            : utf8)
 
 #define _generic_LC_swash_utf8(macro, classnum, p)                         \
@@ -1665,47 +1731,52 @@ END_EXTERN_C
 #define _generic_LC_func_utf8(macro, above_latin1, p)                         \
                               _generic_LC_utf8(macro, p, above_latin1(p))
 
-#define isALPHANUMERIC_LC_utf8(p)  _generic_LC_swash_utf8(isALPHANUMERIC_LC,  \
+#define isALPHANUMERIC_LC_utf8(p) _generic_LC_swash_utf8(isALPHANUMERIC_LC,   \
                                                       _CC_ALPHANUMERIC, p)
-#define isALPHA_LC_utf8(p)   _generic_LC_swash_utf8(isALPHA_LC, _CC_ALPHA, p)
-#define isASCII_LC_utf8(p)   isASCII_LC(*p)
-#define isBLANK_LC_utf8(p)   _generic_LC_func_utf8(isBLANK_LC, is_HORIZWS_high, p)
-#define isCNTRL_LC_utf8(p)   _generic_LC_utf8(isCNTRL_LC, p, 0)
-#define isDIGIT_LC_utf8(p)   _generic_LC_swash_utf8(isDIGIT_LC, _CC_DIGIT, p)
-#define isGRAPH_LC_utf8(p)   _generic_LC_swash_utf8(isGRAPH_LC, _CC_GRAPH, p)
-#define isIDCONT_LC_utf8(p) _generic_LC_func_utf8(isIDCONT_LC, _is_utf8_perl_idcont, p)
-#define isIDFIRST_LC_utf8(p) _generic_LC_func_utf8(isIDFIRST_LC, _is_utf8_perl_idstart, p)
-#define isLOWER_LC_utf8(p)   _generic_LC_swash_utf8(isLOWER_LC, _CC_LOWER, p)
-#define isPRINT_LC_utf8(p)   _generic_LC_swash_utf8(isPRINT_LC, _CC_PRINT, p)
-#define isPSXSPC_LC_utf8(p)  isSPACE_LC_utf8(p)
-#define isPUNCT_LC_utf8(p)   _generic_LC_swash_utf8(isPUNCT_LC, _CC_PUNCT, p)
-#define isSPACE_LC_utf8(p)   _generic_LC_func_utf8(isSPACE_LC, is_XPERLSPACE_high, p)
-#define isUPPER_LC_utf8(p)   _generic_LC_swash_utf8(isUPPER_LC, _CC_UPPER, p)
+#define isALPHA_LC_utf8(p)    _generic_LC_swash_utf8(isALPHA_LC, _CC_ALPHA, p)
+#define isASCII_LC_utf8(p)     isASCII_LC(*p)
+#define isBLANK_LC_utf8(p)    _generic_LC_func_utf8(isBLANK_LC,               \
+                                                         is_HORIZWS_high, p)
+#define isCNTRL_LC_utf8(p)    _generic_LC_utf8(isCNTRL_LC, p, 0)
+#define isDIGIT_LC_utf8(p)    _generic_LC_swash_utf8(isDIGIT_LC, _CC_DIGIT, p)
+#define isGRAPH_LC_utf8(p)    _generic_LC_swash_utf8(isGRAPH_LC, _CC_GRAPH, p)
+#define isIDCONT_LC_utf8(p)   _generic_LC_func_utf8(isIDCONT_LC,              \
+                                                    _is_utf8_perl_idcont, p)
+#define isIDFIRST_LC_utf8(p)  _generic_LC_func_utf8(isIDFIRST_LC,             \
+                                                    _is_utf8_perl_idstart, p)
+#define isLOWER_LC_utf8(p)    _generic_LC_swash_utf8(isLOWER_LC, _CC_LOWER, p)
+#define isPRINT_LC_utf8(p)    _generic_LC_swash_utf8(isPRINT_LC, _CC_PRINT, p)
+#define isPSXSPC_LC_utf8(p)    isSPACE_LC_utf8(p)
+#define isPUNCT_LC_utf8(p)    _generic_LC_swash_utf8(isPUNCT_LC, _CC_PUNCT, p)
+#define isSPACE_LC_utf8(p)    _generic_LC_func_utf8(isSPACE_LC,               \
+                                                        is_XPERLSPACE_high, p)
+#define isUPPER_LC_utf8(p)    _generic_LC_swash_utf8(isUPPER_LC, _CC_UPPER, p)
 #define isWORDCHAR_LC_utf8(p) _generic_LC_swash_utf8(isWORDCHAR_LC,           \
                                                             _CC_WORDCHAR, p)
-#define isXDIGIT_LC_utf8(p)  _generic_LC_func_utf8(isXDIGIT_LC, is_XDIGIT_high, p)
+#define isXDIGIT_LC_utf8(p)   _generic_LC_func_utf8(isXDIGIT_LC,              \
+                                                            is_XDIGIT_high, p)
 
 /* Macros for backwards compatibility and for completeness when the ASCII and
  * Latin1 values are identical */
-#define isALPHAU(c)     isALPHA_L1(c)
-#define isDIGIT_L1(c)   isDIGIT_A(c)
-#define isOCTAL(c)      isOCTAL_A(c)
-#define isOCTAL_L1(c)   isOCTAL_A(c)
-#define isXDIGIT_L1(c)  isXDIGIT_A(c)
-#define isALNUM(c)      isWORDCHAR(c)
-#define isALNUMU(c)     isWORDCHAR_L1(c)
-#define isALNUM_LC(c)   isWORDCHAR_LC(c)
-#define isALNUM_uni(c)  isWORDCHAR_uni(c)
+#define isALPHAU(c)         isALPHA_L1(c)
+#define isDIGIT_L1(c)       isDIGIT_A(c)
+#define isOCTAL(c)          isOCTAL_A(c)
+#define isOCTAL_L1(c)       isOCTAL_A(c)
+#define isXDIGIT_L1(c)      isXDIGIT_A(c)
+#define isALNUM(c)          isWORDCHAR(c)
+#define isALNUMU(c)         isWORDCHAR_L1(c)
+#define isALNUM_LC(c)       isWORDCHAR_LC(c)
+#define isALNUM_uni(c)      isWORDCHAR_uni(c)
 #define isALNUM_LC_uvchr(c) isWORDCHAR_LC_uvchr(c)
-#define isALNUM_utf8(p) isWORDCHAR_utf8(p)
-#define isALNUM_LC_utf8(p) isWORDCHAR_LC_utf8(p)
-#define isALNUMC_A(c)   isALPHANUMERIC_A(c)      /* Mnemonic: "C's alnum" */
-#define isALNUMC_L1(c)  isALPHANUMERIC_L1(c)
-#define isALNUMC(c)	isALPHANUMERIC(c)
-#define isALNUMC_LC(c)	isALPHANUMERIC_LC(c)
-#define isALNUMC_uni(c) isALPHANUMERIC_uni(c)
+#define isALNUM_utf8(p)     isWORDCHAR_utf8(p)
+#define isALNUM_LC_utf8(p)  isWORDCHAR_LC_utf8(p)
+#define isALNUMC_A(c)       isALPHANUMERIC_A(c)      /* Mnemonic: "C's alnum" */
+#define isALNUMC_L1(c)      isALPHANUMERIC_L1(c)
+#define isALNUMC(c)	    isALPHANUMERIC(c)
+#define isALNUMC_LC(c)	    isALPHANUMERIC_LC(c)
+#define isALNUMC_uni(c)     isALPHANUMERIC_uni(c)
 #define isALNUMC_LC_uvchr(c) isALPHANUMERIC_LC_uvchr(c)
-#define isALNUMC_utf8(p) isALPHANUMERIC_utf8(p)
+#define isALNUMC_utf8(p)    isALPHANUMERIC_utf8(p)
 #define isALNUMC_LC_utf8(p) isALPHANUMERIC_LC_utf8(p)
 
 /* On EBCDIC platforms, CTRL-@ is 0, CTRL-A is 1, etc, just like on ASCII,
@@ -1799,13 +1870,13 @@ there for use in XS modules supporting older perls.
 
 =for apidoc Am|void|Newxc|void* ptr|int nitems|type|cast
 The XSUB-writer's interface to the C C<malloc> function, with
-cast.  See also C<Newx>.
+cast.  See also C<L</Newx>>.
 
 Memory obtained by this should B<ONLY> be freed with L<"Safefree">.
 
 =for apidoc Am|void|Newxz|void* ptr|int nitems|type
 The XSUB-writer's interface to the C C<malloc> function.  The allocated
-memory is zeroed with C<memzero>.  See also C<Newx>.
+memory is zeroed with C<memzero>.  See also C<L</Newx>>.
 
 Memory obtained by this should B<ONLY> be freed with L<"Safefree">.
 
@@ -1828,21 +1899,21 @@ This should B<ONLY> be used on memory obtained using L<"Newx"> and friends.
 =for apidoc Am|void|Move|void* src|void* dest|int nitems|type
 The XSUB-writer's interface to the C C<memmove> function.  The C<src> is the
 source, C<dest> is the destination, C<nitems> is the number of items, and
-C<type> is the type.  Can do overlapping moves.  See also C<Copy>.
+C<type> is the type.  Can do overlapping moves.  See also C<L</Copy>>.
 
 =for apidoc Am|void *|MoveD|void* src|void* dest|int nitems|type
-Like C<Move> but returns dest.  Useful
+Like C<Move> but returns C<dest>.  Useful
 for encouraging compilers to tail-call
 optimise.
 
 =for apidoc Am|void|Copy|void* src|void* dest|int nitems|type
 The XSUB-writer's interface to the C C<memcpy> function.  The C<src> is the
 source, C<dest> is the destination, C<nitems> is the number of items, and
-C<type> is the type.  May fail on overlapping copies.  See also C<Move>.
+C<type> is the type.  May fail on overlapping copies.  See also C<L</Move>>.
 
 =for apidoc Am|void *|CopyD|void* src|void* dest|int nitems|type
 
-Like C<Copy> but returns dest.  Useful
+Like C<Copy> but returns C<dest>.  Useful
 for encouraging compilers to tail-call
 optimise.
 
@@ -1895,10 +1966,12 @@ PoisonWith(0xEF) for catching access to freed memory.
  * As well as avoiding the need for a run-time check in some cases, it's
  * designed to avoid compiler warnings like:
  *     comparison is always false due to limited range of data type
+ * It's mathematically equivalent to
+ *    max(n) * sizeof(t) > MEM_SIZE_MAX
  */
 
 #  define _MEM_WRAP_NEEDS_RUNTIME_CHECK(n,t) \
-    (sizeof(t) > ((MEM_SIZE)1 << 8*(sizeof(MEM_SIZE) - sizeof(n))))
+    (8 * sizeof(n) + sizeof(t) > sizeof(MEM_SIZE))
 
 /* This is written in a slightly odd way to avoid various spurious
  * compiler warnings. We *want* to write the expression as
@@ -1976,12 +2049,6 @@ PoisonWith(0xEF) for catching access to freed memory.
  * - lots of ENV reads
  */
 
-PERL_EXPORT_C Malloc_t Perl_mem_log_alloc(const UV n, const UV typesize, const char *type_name, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname);
-
-PERL_EXPORT_C Malloc_t Perl_mem_log_realloc(const UV n, const UV typesize, const char *type_name, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname);
-
-PERL_EXPORT_C Malloc_t Perl_mem_log_free(Malloc_t oldalloc, const char *filename, const int linenumber, const char *funcname);
-
 # ifdef PERL_CORE
 #  ifndef PERL_MEM_LOG_NOIMPL
 enum mem_log_type {
@@ -2110,7 +2177,8 @@ void Perl_mem_log_del_sv(const SV *sv, const char *filename, const int linenumbe
    shortcut macro defined without -DPERL_CORE. Neither codesearch.google.com nor
    CPAN::Unpack show any users outside the core.  */
 #ifdef PERL_CORE
-#  define deprecate(s) Perl_ck_warner_d(aTHX_ packWARN(WARN_DEPRECATED), "Use of " s " is deprecated")
+#  define deprecate(s) Perl_ck_warner_d(aTHX_ packWARN(WARN_DEPRECATED),    \
+                                            "Use of " s " is deprecated")
 #endif
 
 /* Internal macros to deal with gids and uids */
diff --git a/Master/tlpkg/tlperl/lib/CORE/hv.h b/Master/tlpkg/tlperl/lib/CORE/hv.h
index 9533af58f2a..b97b22425e9 100644
--- a/Master/tlpkg/tlperl/lib/CORE/hv.h
+++ b/Master/tlpkg/tlperl/lib/CORE/hv.h
@@ -82,6 +82,7 @@ struct mro_meta {
     const struct mro_alg *mro_which; /* which mro alg is in use? */
     HV      *isa;            /* Everything this class @ISA */
     HV      *super;          /* SUPER method cache */
+    CV      *destroy;        /* DESTROY method if destroy_gen non-zero */
     U32     destroy_gen;     /* Generation number of DESTROY cache */
 };
 
@@ -152,14 +153,14 @@ Null HV pointer.
 =head1 Hash Manipulation Functions
 
 =for apidoc Am|char*|HvNAME|HV* stash
-Returns the package name of a stash, or NULL if C<stash> isn't a stash.
-See C<SvSTASH>, C<CvSTASH>.
+Returns the package name of a stash, or C<NULL> if C<stash> isn't a stash.
+See C<L</SvSTASH>>, C<L</CvSTASH>>.
 
 =for apidoc Am|STRLEN|HvNAMELEN|HV *stash
 Returns the length of the stash's name.
 
 =for apidoc Am|unsigned char|HvNAMEUTF8|HV *stash
-Returns true if the name is in UTF8 encoding.
+Returns true if the name is in UTF-8 encoding.
 
 =for apidoc Am|char*|HvENAME|HV* stash
 Returns the effective name of a stash, or NULL if there is none.  The
@@ -173,7 +174,7 @@ caches.
 Returns the length of the stash's effective name.
 
 =for apidoc Am|unsigned char|HvENAMEUTF8|HV *stash
-Returns true if the effective name is in UTF8 encoding.
+Returns true if the effective name is in UTF-8 encoding.
 
 =for apidoc Am|void*|HeKEY|HE* he
 Returns the actual pointer stored in the key slot of the hash entry.  The
@@ -208,7 +209,7 @@ variable C<PL_na>, though this is rather less efficient than using a local
 variable.  Remember though, that hash keys in perl are free to contain
 embedded nulls, so using C<strlen()> or similar is not a good way to find
 the length of hash keys.  This is very similar to the C<SvPV()> macro
-described elsewhere in this document.  See also C<HeUTF8>.
+described elsewhere in this document.  See also C<L</HeUTF8>>.
 
 If you are using C<HePV> to get values to pass to C<newSVpvn()> to create a
 new SV, you should consider using C<newSVhek(HeKEY_hek(he))> as it is more
@@ -402,7 +403,8 @@ C<SV*>.
 #define HVhek_UTF8	0x01 /* Key is utf8 encoded. */
 #define HVhek_WASUTF8	0x02 /* Key is bytes here, but was supplied as utf8. */
 #define HVhek_UNSHARED	0x08 /* This key isn't a shared hash key. */
-#define HVhek_FREEKEY	0x100 /* Internal flag to say key is malloc()ed.  */
+/* the following flags are options for functions, they are not stored in heks */
+#define HVhek_FREEKEY	0x100 /* Internal flag to say key is Newx()ed.  */
 #define HVhek_PLACEHOLD	0x200 /* Internal flag to create placeholder.
                                * (may change, but Storable is a core module) */
 #define HVhek_KEYCANONICAL 0x400 /* Internal flag - key is in canonical form.
@@ -543,8 +545,8 @@ struct refcounted_he {
 /*
 =for apidoc m|SV *|refcounted_he_fetch_pvs|const struct refcounted_he *chain|const char *key|U32 flags
 
-Like L</refcounted_he_fetch_pvn>, but takes a literal string instead of
-a string/length pair, and no precomputed hash.
+Like L</refcounted_he_fetch_pvn>, but takes a C<NUL>-terminated literal string
+instead of a string/length pair, and no precomputed hash.
 
 =cut
 */
@@ -555,8 +557,8 @@ a string/length pair, and no precomputed hash.
 /*
 =for apidoc m|struct refcounted_he *|refcounted_he_new_pvs|struct refcounted_he *parent|const char *key|SV *value|U32 flags
 
-Like L</refcounted_he_new_pvn>, but takes a literal string instead of
-a string/length pair, and no precomputed hash.
+Like L</refcounted_he_new_pvn>, but takes a C<NUL>-terminated literal string
+instead of a string/length pair, and no precomputed hash.
 
 =cut
 */
diff --git a/Master/tlpkg/tlperl/lib/CORE/hv_func.h b/Master/tlpkg/tlperl/lib/CORE/hv_func.h
index 49a677eb33f..8866db909f3 100755
--- a/Master/tlpkg/tlperl/lib/CORE/hv_func.h
+++ b/Master/tlpkg/tlperl/lib/CORE/hv_func.h
@@ -139,7 +139,7 @@
 #ifndef U64TYPE
 /* This probably isn't going to work, but failing with a compiler error due to
    lack of uint64_t is no worse than failing right now with an #error.  */
-#define U64TYPE uint64_t
+#define U64 uint64_t
 #endif
 #endif
 
@@ -154,7 +154,7 @@
   /* gcc recognises this code and generates a rotate instruction for CPUs with one */
   #define ROTL32(x,r)  (((U32)x << r) | ((U32)x >> (32 - r)))
   #ifdef HAS_QUAD
-    #define ROTL64(x,r)  (((U64TYPE)x << r) | ((U64TYPE)x >> (64 - r)))
+    #define ROTL64(x,r)  (((U64)x << r) | ((U64)x >> (64 - r)))
   #endif
 #endif
 
@@ -182,14 +182,14 @@
 #ifdef HAS_QUAD
 
 #define U8TO64_LE(p) \
-  (((U64TYPE)((p)[0])      ) | \
-   ((U64TYPE)((p)[1]) <<  8) | \
-   ((U64TYPE)((p)[2]) << 16) | \
-   ((U64TYPE)((p)[3]) << 24) | \
-   ((U64TYPE)((p)[4]) << 32) | \
-   ((U64TYPE)((p)[5]) << 40) | \
-   ((U64TYPE)((p)[6]) << 48) | \
-   ((U64TYPE)((p)[7]) << 56))
+  (((U64)((p)[0])      ) | \
+   ((U64)((p)[1]) <<  8) | \
+   ((U64)((p)[2]) << 16) | \
+   ((U64)((p)[3]) << 24) | \
+   ((U64)((p)[4]) << 32) | \
+   ((U64)((p)[5]) << 40) | \
+   ((U64)((p)[6]) << 48) | \
+   ((U64)((p)[7]) << 56))
 
 #define SIPROUND            \
   do {              \
@@ -204,19 +204,19 @@
 PERL_STATIC_INLINE U32
 S_perl_hash_siphash_2_4(const unsigned char * const seed, const unsigned char *in, const STRLEN inlen) {
   /* "somepseudorandomlygeneratedbytes" */
-  U64TYPE v0 = UINT64_C(0x736f6d6570736575);
-  U64TYPE v1 = UINT64_C(0x646f72616e646f6d);
-  U64TYPE v2 = UINT64_C(0x6c7967656e657261);
-  U64TYPE v3 = UINT64_C(0x7465646279746573);
-
-  U64TYPE b;
-  U64TYPE k0 = ((U64TYPE*)seed)[0];
-  U64TYPE k1 = ((U64TYPE*)seed)[1];
-  U64TYPE m;
+  U64 v0 = UINT64_C(0x736f6d6570736575);
+  U64 v1 = UINT64_C(0x646f72616e646f6d);
+  U64 v2 = UINT64_C(0x6c7967656e657261);
+  U64 v3 = UINT64_C(0x7465646279746573);
+
+  U64 b;
+  U64 k0 = ((U64*)seed)[0];
+  U64 k1 = ((U64*)seed)[1];
+  U64 m;
   const int left = inlen & 7;
   const U8 *end = in + inlen - left;
 
-  b = ( ( U64TYPE )(inlen) ) << 56;
+  b = ( ( U64 )(inlen) ) << 56;
   v3 ^= k1;
   v2 ^= k0;
   v1 ^= k1;
@@ -233,13 +233,13 @@ S_perl_hash_siphash_2_4(const unsigned char * const seed, const unsigned char *i
 
   switch( left )
   {
-  case 7: b |= ( ( U64TYPE )in[ 6] )  << 48;
-  case 6: b |= ( ( U64TYPE )in[ 5] )  << 40;
-  case 5: b |= ( ( U64TYPE )in[ 4] )  << 32;
-  case 4: b |= ( ( U64TYPE )in[ 3] )  << 24;
-  case 3: b |= ( ( U64TYPE )in[ 2] )  << 16;
-  case 2: b |= ( ( U64TYPE )in[ 1] )  <<  8;
-  case 1: b |= ( ( U64TYPE )in[ 0] ); break;
+  case 7: b |= ( ( U64 )in[ 6] )  << 48;
+  case 6: b |= ( ( U64 )in[ 5] )  << 40;
+  case 5: b |= ( ( U64 )in[ 4] )  << 32;
+  case 4: b |= ( ( U64 )in[ 3] )  << 24;
+  case 3: b |= ( ( U64 )in[ 2] )  << 16;
+  case 2: b |= ( ( U64 )in[ 1] )  <<  8;
+  case 1: b |= ( ( U64 )in[ 0] ); break;
   case 0: break;
   }
 
@@ -579,16 +579,16 @@ S_perl_hash_old_one_at_a_time(const unsigned char * const seed, const unsigned c
 PERL_STATIC_INLINE U32
 S_perl_hash_murmur_hash_64a (const unsigned char * const seed, const unsigned char *str, const STRLEN len)
 {
-        const U64TYPE m = 0xc6a4a7935bd1e995;
+        const U64 m = UINT64_C(0xc6a4a7935bd1e995);
         const int r = 47;
-        U64TYPE h = *((U64TYPE*)seed) ^ len;
-        const U64TYPE * data = (const U64TYPE *)str;
-        const U64TYPE * end = data + (len/8);
+        U64 h = *((U64*)seed) ^ len;
+        const U64 * data = (const U64 *)str;
+        const U64 * end = data + (len/8);
         const unsigned char * data2;
 
         while(data != end)
         {
-            U64TYPE k = *data++;
+            U64 k = *data++;
 
             k *= m;
             k ^= k >> r;
@@ -602,13 +602,13 @@ S_perl_hash_murmur_hash_64a (const unsigned char * const seed, const unsigned ch
 
         switch(len & 7)
         {
-            case 7: h ^= (U64TYPE)(data2[6]) << 48; /* fallthrough */
-            case 6: h ^= (U64TYPE)(data2[5]) << 40; /* fallthrough */
-            case 5: h ^= (U64TYPE)(data2[4]) << 32; /* fallthrough */
-            case 4: h ^= (U64TYPE)(data2[3]) << 24; /* fallthrough */
-            case 3: h ^= (U64TYPE)(data2[2]) << 16; /* fallthrough */
-            case 2: h ^= (U64TYPE)(data2[1]) << 8;  /* fallthrough */
-            case 1: h ^= (U64TYPE)(data2[0]);       /* fallthrough */
+            case 7: h ^= (U64)(data2[6]) << 48; /* fallthrough */
+            case 6: h ^= (U64)(data2[5]) << 40; /* fallthrough */
+            case 5: h ^= (U64)(data2[4]) << 32; /* fallthrough */
+            case 4: h ^= (U64)(data2[3]) << 24; /* fallthrough */
+            case 3: h ^= (U64)(data2[2]) << 16; /* fallthrough */
+            case 2: h ^= (U64)(data2[1]) << 8;  /* fallthrough */
+            case 1: h ^= (U64)(data2[0]);       /* fallthrough */
                     h *= m;
         };
 
@@ -683,7 +683,7 @@ S_perl_hash_murmur_hash_64b (const unsigned char * const seed, const unsigned ch
 
         h1 ^= h2 >> 17; h1 *= m;
 
-        U64TYPE h = h1;
+        U64 h = h1;
 
         h = (h << 32) | h2;
         */
diff --git a/Master/tlpkg/tlperl/lib/CORE/inline.h b/Master/tlpkg/tlperl/lib/CORE/inline.h
index 46a8cb6d342..35983d8caeb 100755
--- a/Master/tlpkg/tlperl/lib/CORE/inline.h
+++ b/Master/tlpkg/tlperl/lib/CORE/inline.h
@@ -287,11 +287,11 @@ S__is_utf8_char_slow(const U8 *s, const U8 *e)
 =for apidoc AiR|bool|is_safe_syscall|const char *pv|STRLEN len|const char *what|const char *op_name
 
 Test that the given C<pv> doesn't contain any internal C<NUL> characters.
-If it does, set C<errno> to ENOENT, optionally warn, and return FALSE.
+If it does, set C<errno> to C<ENOENT>, optionally warn, and return FALSE.
 
 Return TRUE if the name is safe.
 
-Used by the IS_SAFE_SYSCALL() macro.
+Used by the C<IS_SAFE_SYSCALL()> macro.
 
 =cut
 */
@@ -321,7 +321,7 @@ S_is_safe_syscall(pTHX_ const char *pv, STRLEN len, const char *what, const char
 /*
 
 Return true if the supplied filename has a newline character
-immediately before the final NUL.
+immediately before the first (hopefully only) NUL.
 
 My original look at this incorrectly used the len from SvPV(), but
 that's incorrect, since we allow for a NUL in pv[len-1].
@@ -401,6 +401,351 @@ S_sv_only_taint_gmagic(SV *sv) {
     return TRUE;
 }
 
+/* ------------------ cop.h ------------------------------------------- */
+
+
+/* Enter a block. Push a new base context and return its address. */
+
+PERL_STATIC_INLINE PERL_CONTEXT *
+S_cx_pushblock(pTHX_ U8 type, U8 gimme, SV** sp, I32 saveix)
+{
+    PERL_CONTEXT * cx;
+
+    PERL_ARGS_ASSERT_CX_PUSHBLOCK;
+
+    CXINC;
+    cx = CX_CUR();
+    cx->cx_type        = type;
+    cx->blk_gimme      = gimme;
+    cx->blk_oldsaveix  = saveix;
+    cx->blk_oldsp      = (I32)(sp - PL_stack_base);
+    cx->blk_oldcop     = PL_curcop;
+    cx->blk_oldmarksp  = (I32)(PL_markstack_ptr - PL_markstack);
+    cx->blk_oldscopesp = PL_scopestack_ix;
+    cx->blk_oldpm      = PL_curpm;
+    cx->blk_old_tmpsfloor = PL_tmps_floor;
+
+    PL_tmps_floor        = PL_tmps_ix;
+    CX_DEBUG(cx, "PUSH");
+    return cx;
+}
+
+
+/* Exit a block (RETURN and LAST). */
+
+PERL_STATIC_INLINE void
+S_cx_popblock(pTHX_ PERL_CONTEXT *cx)
+{
+    PERL_ARGS_ASSERT_CX_POPBLOCK;
+
+    CX_DEBUG(cx, "POP");
+    /* these 3 are common to cx_popblock and cx_topblock */
+    PL_markstack_ptr = PL_markstack + cx->blk_oldmarksp;
+    PL_scopestack_ix = cx->blk_oldscopesp;
+    PL_curpm         = cx->blk_oldpm;
+
+    /* LEAVE_SCOPE() should have made this true. /(?{})/ cheats
+     * and leaves a CX entry lying around for repeated use, so
+     * skip for multicall */                  \
+    assert(   (CxTYPE(cx) == CXt_SUB && CxMULTICALL(cx))
+            || PL_savestack_ix == cx->blk_oldsaveix);
+    PL_curcop     = cx->blk_oldcop;
+    PL_tmps_floor = cx->blk_old_tmpsfloor;
+}
+
+/* Continue a block elsewhere (e.g. NEXT, REDO, GOTO).
+ * Whereas cx_popblock() restores the state to the point just before
+ * cx_pushblock() was called,  cx_topblock() restores it to the point just
+ * *after* cx_pushblock() was called. */
+
+PERL_STATIC_INLINE void
+S_cx_topblock(pTHX_ PERL_CONTEXT *cx)
+{
+    PERL_ARGS_ASSERT_CX_TOPBLOCK;
+
+    CX_DEBUG(cx, "TOP");
+    /* these 3 are common to cx_popblock and cx_topblock */
+    PL_markstack_ptr = PL_markstack + cx->blk_oldmarksp;
+    PL_scopestack_ix = cx->blk_oldscopesp;
+    PL_curpm         = cx->blk_oldpm;
+
+    PL_stack_sp      = PL_stack_base + cx->blk_oldsp;
+}
+
+
+PERL_STATIC_INLINE void
+S_cx_pushsub(pTHX_ PERL_CONTEXT *cx, CV *cv, OP *retop, bool hasargs)
+{
+    U8 phlags = CX_PUSHSUB_GET_LVALUE_MASK(Perl_was_lvalue_sub);
+
+    PERL_ARGS_ASSERT_CX_PUSHSUB;
+
+    PERL_DTRACE_PROBE_ENTRY(cv);
+    cx->blk_sub.cv = cv;
+    cx->blk_sub.olddepth = CvDEPTH(cv);
+    cx->blk_sub.prevcomppad = PL_comppad;
+    cx->cx_type |= (hasargs) ? CXp_HASARGS : 0;
+    cx->blk_sub.retop = retop;
+    SvREFCNT_inc_simple_void_NN(cv);
+    cx->blk_u16 = PL_op->op_private & (phlags|OPpDEREF);
+}
+
+
+/* subsets of cx_popsub() */
+
+PERL_STATIC_INLINE void
+S_cx_popsub_common(pTHX_ PERL_CONTEXT *cx)
+{
+    CV *cv;
+
+    PERL_ARGS_ASSERT_CX_POPSUB_COMMON;
+    assert(CxTYPE(cx) == CXt_SUB);
+
+    PL_comppad = cx->blk_sub.prevcomppad;
+    PL_curpad = LIKELY(PL_comppad) ? AvARRAY(PL_comppad) : NULL;
+    cv = cx->blk_sub.cv;
+    CvDEPTH(cv) = cx->blk_sub.olddepth;
+    cx->blk_sub.cv = NULL;
+    SvREFCNT_dec(cv);
+}
+
+
+/* handle the @_ part of leaving a sub */
+
+PERL_STATIC_INLINE void
+S_cx_popsub_args(pTHX_ PERL_CONTEXT *cx)
+{
+    AV *av;
+
+    PERL_ARGS_ASSERT_CX_POPSUB_ARGS;
+    assert(CxTYPE(cx) == CXt_SUB);
+    assert(AvARRAY(MUTABLE_AV(
+        PadlistARRAY(CvPADLIST(cx->blk_sub.cv))[
+                CvDEPTH(cx->blk_sub.cv)])) == PL_curpad);
+
+    CX_POP_SAVEARRAY(cx);
+    av = MUTABLE_AV(PAD_SVl(0));
+    if (UNLIKELY(AvREAL(av)))
+        /* abandon @_ if it got reified */
+        clear_defarray(av, 0);
+    else {
+        CLEAR_ARGARRAY(av);
+    }
+}
+
+
+PERL_STATIC_INLINE void
+S_cx_popsub(pTHX_ PERL_CONTEXT *cx)
+{
+    PERL_ARGS_ASSERT_CX_POPSUB;
+    assert(CxTYPE(cx) == CXt_SUB);
+
+    PERL_DTRACE_PROBE_RETURN(cx->blk_sub.cv);
+
+    if (CxHASARGS(cx))
+        cx_popsub_args(cx);
+    cx_popsub_common(cx);
+}
+
+
+PERL_STATIC_INLINE void
+S_cx_pushformat(pTHX_ PERL_CONTEXT *cx, CV *cv, OP *retop, GV *gv)
+{
+    PERL_ARGS_ASSERT_CX_PUSHFORMAT;
+
+    cx->blk_format.cv          = cv;
+    cx->blk_format.retop       = retop;
+    cx->blk_format.gv          = gv;
+    cx->blk_format.dfoutgv     = PL_defoutgv;
+    cx->blk_format.prevcomppad = PL_comppad;
+    cx->blk_u16                = 0;
+
+    SvREFCNT_inc_simple_void_NN(cv);
+    CvDEPTH(cv)++;
+    SvREFCNT_inc_void(cx->blk_format.dfoutgv);
+}
+
+
+PERL_STATIC_INLINE void
+S_cx_popformat(pTHX_ PERL_CONTEXT *cx)
+{
+    CV *cv;
+    GV *dfout;
+
+    PERL_ARGS_ASSERT_CX_POPFORMAT;
+    assert(CxTYPE(cx) == CXt_FORMAT);
+
+    dfout = cx->blk_format.dfoutgv;
+    setdefout(dfout);
+    cx->blk_format.dfoutgv = NULL;
+    SvREFCNT_dec_NN(dfout);
+
+    PL_comppad = cx->blk_format.prevcomppad;
+    PL_curpad = LIKELY(PL_comppad) ? AvARRAY(PL_comppad) : NULL;
+    cv = cx->blk_format.cv;
+    cx->blk_format.cv = NULL;
+    --CvDEPTH(cv);
+    SvREFCNT_dec_NN(cv);
+}
+
+
+PERL_STATIC_INLINE void
+S_cx_pusheval(pTHX_ PERL_CONTEXT *cx, OP *retop, SV *namesv)
+{
+    PERL_ARGS_ASSERT_CX_PUSHEVAL;
+
+    cx->blk_eval.retop         = retop;
+    cx->blk_eval.old_namesv    = namesv;
+    cx->blk_eval.old_eval_root = PL_eval_root;
+    cx->blk_eval.cur_text      = PL_parser ? PL_parser->linestr : NULL;
+    cx->blk_eval.cv            = NULL; /* later set by doeval_compile() */
+    cx->blk_eval.cur_top_env   = PL_top_env;
+
+    assert(!(PL_in_eval     & ~ 0x7F));
+    assert(!(PL_op->op_type & ~0x1FF));
+    cx->blk_u16 = (PL_in_eval & 0x7F) | ((U16)PL_op->op_type << 7);
+}
+
+
+PERL_STATIC_INLINE void
+S_cx_popeval(pTHX_ PERL_CONTEXT *cx)
+{
+    SV *sv;
+
+    PERL_ARGS_ASSERT_CX_POPEVAL;
+    assert(CxTYPE(cx) == CXt_EVAL);
+
+    PL_in_eval = CxOLD_IN_EVAL(cx);
+    PL_eval_root = cx->blk_eval.old_eval_root;
+    sv = cx->blk_eval.cur_text;
+    if (sv && SvSCREAM(sv)) {
+        cx->blk_eval.cur_text = NULL;
+        SvREFCNT_dec_NN(sv);
+    }
+
+    sv = cx->blk_eval.old_namesv;
+    if (sv && !SvTEMP(sv))/* TEMP implies cx_popeval() re-entrantly called */
+        sv_2mortal(sv);
+}
+
+
+/* push a plain loop, i.e.
+ *     { block }
+ *     while (cond) { block }
+ *     for (init;cond;continue) { block }
+ * This loop can be last/redo'ed etc.
+ */
+
+PERL_STATIC_INLINE void
+S_cx_pushloop_plain(pTHX_ PERL_CONTEXT *cx)
+{
+    PERL_ARGS_ASSERT_CX_PUSHLOOP_PLAIN;
+    cx->blk_loop.my_op = cLOOP;
+}
+
+
+/* push a true for loop, i.e.
+ *     for var (list) { block }
+ */
+
+PERL_STATIC_INLINE void
+S_cx_pushloop_for(pTHX_ PERL_CONTEXT *cx, void *itervarp, SV* itersave)
+{
+    PERL_ARGS_ASSERT_CX_PUSHLOOP_FOR;
+
+    /* this one line is common with cx_pushloop_plain */
+    cx->blk_loop.my_op = cLOOP;
+
+    cx->blk_loop.itervar_u.svp = (SV**)itervarp;
+    cx->blk_loop.itersave      = itersave;
+#ifdef USE_ITHREADS
+    cx->blk_loop.oldcomppad = PL_comppad;
+#endif
+}
+
+
+/* pop all loop types, including plain */
+
+PERL_STATIC_INLINE void
+S_cx_poploop(pTHX_ PERL_CONTEXT *cx)
+{
+    PERL_ARGS_ASSERT_CX_POPLOOP;
+
+    assert(CxTYPE_is_LOOP(cx));
+    if (  CxTYPE(cx) == CXt_LOOP_ARY
+       || CxTYPE(cx) == CXt_LOOP_LAZYSV)
+    {
+        /* Free ary or cur. This assumes that state_u.ary.ary
+         * aligns with state_u.lazysv.cur. See cx_dup() */
+        SV *sv = cx->blk_loop.state_u.lazysv.cur;
+        cx->blk_loop.state_u.lazysv.cur = NULL;
+        SvREFCNT_dec_NN(sv);
+        if (CxTYPE(cx) == CXt_LOOP_LAZYSV) {
+            sv = cx->blk_loop.state_u.lazysv.end;
+            cx->blk_loop.state_u.lazysv.end = NULL;
+            SvREFCNT_dec_NN(sv);
+        }
+    }
+    if (cx->cx_type & (CXp_FOR_PAD|CXp_FOR_GV)) {
+        SV *cursv;
+        SV **svp = (cx)->blk_loop.itervar_u.svp;
+        if ((cx->cx_type & CXp_FOR_GV))
+            svp = &GvSV((GV*)svp);
+        cursv = *svp;
+        *svp = cx->blk_loop.itersave;
+        cx->blk_loop.itersave = NULL;
+        SvREFCNT_dec(cursv);
+    }
+}
+
+
+PERL_STATIC_INLINE void
+S_cx_pushwhen(pTHX_ PERL_CONTEXT *cx)
+{
+    PERL_ARGS_ASSERT_CX_PUSHWHEN;
+
+    cx->blk_givwhen.leave_op = cLOGOP->op_other;
+}
+
+
+PERL_STATIC_INLINE void
+S_cx_popwhen(pTHX_ PERL_CONTEXT *cx)
+{
+    PERL_ARGS_ASSERT_CX_POPWHEN;
+    assert(CxTYPE(cx) == CXt_WHEN);
+
+    PERL_UNUSED_ARG(cx);
+    /* currently NOOP */
+}
+
+
+PERL_STATIC_INLINE void
+S_cx_pushgiven(pTHX_ PERL_CONTEXT *cx, SV *orig_defsv)
+{
+    PERL_ARGS_ASSERT_CX_PUSHGIVEN;
+
+    cx->blk_givwhen.leave_op = cLOGOP->op_other;
+    cx->blk_givwhen.defsv_save = orig_defsv;
+}
+
+
+PERL_STATIC_INLINE void
+S_cx_popgiven(pTHX_ PERL_CONTEXT *cx)
+{
+    SV *sv;
+
+    PERL_ARGS_ASSERT_CX_POPGIVEN;
+    assert(CxTYPE(cx) == CXt_GIVEN);
+
+    sv = GvSV(PL_defgv);
+    GvSV(PL_defgv) = cx->blk_givwhen.defsv_save;
+    cx->blk_givwhen.defsv_save = NULL;
+    SvREFCNT_dec(sv);
+}
+
+
+
+
 /*
  * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/Master/tlpkg/tlperl/lib/CORE/intrpvar.h b/Master/tlpkg/tlperl/lib/CORE/intrpvar.h
index 96336358b2c..50a9ee0a9eb 100644
--- a/Master/tlpkg/tlperl/lib/CORE/intrpvar.h
+++ b/Master/tlpkg/tlperl/lib/CORE/intrpvar.h
@@ -51,7 +51,7 @@ PERLVAR(I, scopestack_max, I32)
 PERLVAR(I, tmps_stack,	SV **)		/* mortals we've made */
 PERLVARI(I, tmps_ix,	SSize_t,	-1)
 PERLVARI(I, tmps_floor,	SSize_t,	-1)
-PERLVAR(I, tmps_max,	SSize_t)
+PERLVAR(I, tmps_max,	SSize_t)        /* first unalloced slot in tmps stack */
 
 PERLVARI(I, sub_generation, U32, 1)	/* incr to invalidate method cache */
 
@@ -60,9 +60,6 @@ PERLVAR(I, markstack,	I32 *)		/* stack_sp locations we're
 PERLVAR(I, markstack_ptr, I32 *)
 PERLVAR(I, markstack_max, I32 *)
 
-PERLVARI(I, sawalias,	bool,	FALSE)	/* must enable common-vars
-					   pessimisation */
-
 #ifdef PERL_HASH_RANDOMIZE_KEYS
 #ifdef USE_PERL_PERTURB_KEYS
 PERLVARI(I, hash_rand_bits_enabled, U8, 1) /* used to randomize hash stuff 0 == no-random, 1 == random, 2 == determinsitic */
@@ -78,8 +75,23 @@ PERLVAR(I, multideref_pc, UNOP_AUX_item *)
 PERLVAR(I, curpm,	PMOP *)		/* what to do \ interps in REs from */
 
 PERLVAR(I, tainting,	bool)		/* doing taint checks */
-PERLVAR(I, tainted,	bool)		/* using variables controlled by $< */
+PERLVARI(I, tainted,	bool, FALSE)	/* using variables controlled by $< */
+
+/* PL_delaymagic is currently used for two purposes: to assure simultaneous
+ * updates in ($<,$>) = ..., and to assure atomic update in push/unshift
+ * @ISA, It works like this: a few places such as pp_push set the DM_DELAY
+ * flag; then various places such as av_store() skip mg_set(ary) if this
+ * flag is set, and various magic vtable methods set flags like
+ * DM_ARRAY_ISA if they've seen something of that ilk. Finally when
+ * control returns to pp_push or whatever, it sees if any of those flags
+ * have been set, and if so finally calls mg_set().
+ *
+ * NB: PL_delaymagic is automatically saved and restored by JUMPENV_PUSH
+ * / POP. This removes the need to do ENTER/SAVEI16(PL_delaymagic)/LEAVE
+ * in hot code like pp_push.
+ */
 PERLVAR(I, delaymagic,	U16)		/* ($<,$>) = ... */
+
 PERLVAR(I, localizing,	U8)		/* are we processing a local() list? */
 PERLVAR(I, in_eval,	U8)		/* trap "fatal" errors? */
 PERLVAR(I, defgv,	GV *)           /* the *_ glob */
@@ -87,7 +99,7 @@ PERLVAR(I, defgv,	GV *)           /* the *_ glob */
 
 =for apidoc mn|bool|PL_dowarn
 
-The C variable which corresponds to Perl's $^W warning variable.
+The C variable which corresponds to Perl's C<$^W> warning variable.
 
 =cut
 */
@@ -136,11 +148,11 @@ PERLVAR(I, comppad,	PAD *)		/* storage for lexically scoped temporaries */
 This is the C<undef> SV.  Always refer to this as C<&PL_sv_undef>.
 
 =for apidoc Amn|SV|PL_sv_no
-This is the C<false> SV.  See C<PL_sv_yes>.  Always refer to this as
+This is the C<false> SV.  See C<L</PL_sv_yes>>.  Always refer to this as
 C<&PL_sv_no>.
 
 =for apidoc Amn|SV|PL_sv_yes
-This is the C<true> SV.  See C<PL_sv_no>.  Always refer to this as
+This is the C<true> SV.  See C<L</PL_sv_no>>.  Always refer to this as
 C<&PL_sv_yes>.
 
 =cut
@@ -178,11 +190,6 @@ PERLVAR(I, statcache,	Stat_t)		/* _ */
 PERLVAR(I, statgv,	GV *)
 PERLVARI(I, statname,	SV *,	NULL)
 
-#ifdef HAS_TIMES
-/* Will be removed soon after v5.22.1. See RT #121351 */
-PERLVAR(I, timesbuf,	struct tms)
-#endif
-
 /*
 =for apidoc mn|SV*|PL_rs
 
@@ -378,19 +385,19 @@ PERLVAR(I, DBline,	GV *)		/*  *DB::line   */
 When Perl is run in debugging mode, with the B<-d> switch, this GV contains
 the SV which holds the name of the sub being debugged.  This is the C
 variable which corresponds to Perl's $DB::sub variable.  See
-C<PL_DBsingle>.
+C<L</PL_DBsingle>>.
 
 =for apidoc mn|SV *|PL_DBsingle
 When Perl is run in debugging mode, with the B<-d> switch, this SV is a
 boolean which indicates whether subs are being single-stepped.
 Single-stepping is automatically turned on after every step.  This is the C
 variable which corresponds to Perl's $DB::single variable.  See
-C<PL_DBsub>.
+C<L</PL_DBsub>>.
 
 =for apidoc mn|SV *|PL_DBtrace
 Trace variable used when Perl is run in debugging mode, with the B<-d>
 switch.  This is the C variable which corresponds to Perl's $DB::trace
-variable.  See C<PL_DBsingle>.
+variable.  See C<L</PL_DBsingle>>.
 
 =cut
 */
@@ -492,7 +499,8 @@ PERLVAR(I, sys_intern,	struct interp_intern)
 
 /* more statics moved here */
 PERLVAR(I, DBcv,	CV *)		/* from perl.c */
-PERLVARI(I, generation,	int,	100)	/* from op.c */
+PERLVARI(I, generation,	int,	100)	/* scan sequence# for OP_AASSIGN
+                                           compile-time common elem detection */
 
 PERLVAR(I, unicode, U32)	/* Unicode features: $ENV{PERL_UNICODE} or -C */
 
@@ -611,6 +619,7 @@ PERLVARA(I, utf8_swash_ptrs, POSIX_SWASH_COUNT, SV *)
 PERLVARA(I, Posix_ptrs, POSIX_CC_COUNT, SV *)
 PERLVARA(I, XPosix_ptrs, POSIX_CC_COUNT, SV *)
 PERLVAR(I, GCB_invlist, SV *)
+PERLVAR(I, LB_invlist, SV *)
 PERLVAR(I, SB_invlist, SV *)
 PERLVAR(I, WB_invlist, SV *)
 
@@ -753,7 +762,7 @@ PERLVARI(I, globhook,	globhook_t, NULL)
 
 PERLVARI(I, padlist_generation, U32, 1)	/* id to identify padlist clones */
 
-/* The last unconditional member of the interpreter structure when 5.22.1 was
+/* The last unconditional member of the interpreter structure when 5.18.0 was
    released. The offset of the end of this is baked into a global variable in 
    any shared perl library which will allow a sanity test in future perl
    releases.  */
@@ -767,8 +776,11 @@ PERLVARI(I, my_cxt_keys, const char **, NULL) /* per-module array of pointers to
 #  endif
 #endif
 
-#ifdef PERL_TRACK_MEMPOOL
-/* For use with the memory debugging code in util.c  */
+#if defined(PERL_IMPLICIT_CONTEXT) || defined(PERL_DEBUG_READONLY_COW)
+/* For use with the memory debugging code in util.c. This is used only in
+ * DEBUGGING builds (as long as the relevant structure is defined), but
+ * defining it in non-debug builds too means that we retain binary
+ * compatibility between otherwise-compatible plain and debug builds. */
 PERLVAR(I, memory_debug_header, struct perl_memory_debug_header)
 #endif
 
@@ -795,6 +807,8 @@ PERLVARA(I, op_exec_cnt, OP_max+2, UV)	/* Counts of executed OPs of the given ty
 
 PERLVAR(I, random_state, PL_RANDOM_STATE_TYPE)
 
+PERLVARI(I, dump_re_max_len, STRLEN, 0)
+
 /* If you are adding a U8 or U16, check to see if there are 'Space' comments
  * above on where there are gaps which currently will be structure padding.  */
 
diff --git a/Master/tlpkg/tlperl/lib/CORE/invlist_inline.h b/Master/tlpkg/tlperl/lib/CORE/invlist_inline.h
new file mode 100644
index 00000000000..4ce04f90873
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/CORE/invlist_inline.h
@@ -0,0 +1,87 @@
+/*    invlist_inline.h
+ *
+ *    Copyright (C) 2012 by Larry Wall and others
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ */
+
+#if defined(PERL_IN_UTF8_C) || defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C)
+
+/* An element is in an inversion list iff its index is even numbered: 0, 2, 4,
+ * etc */
+#define ELEMENT_RANGE_MATCHES_INVLIST(i) (! ((i) & 1))
+#define PREV_RANGE_MATCHES_INVLIST(i) (! ELEMENT_RANGE_MATCHES_INVLIST(i))
+
+/* This converts to/from our UVs to what the SV code is expecting: bytes. */
+#define TO_INTERNAL_SIZE(x) ((x) * sizeof(UV))
+#define FROM_INTERNAL_SIZE(x) ((x)/ sizeof(UV))
+
+PERL_STATIC_INLINE bool*
+S_get_invlist_offset_addr(SV* invlist)
+{
+    /* Return the address of the field that says whether the inversion list is
+     * offset (it contains 1) or not (contains 0) */
+    PERL_ARGS_ASSERT_GET_INVLIST_OFFSET_ADDR;
+
+    assert(SvTYPE(invlist) == SVt_INVLIST);
+
+    return &(((XINVLIST*) SvANY(invlist))->is_offset);
+}
+
+PERL_STATIC_INLINE UV
+S__invlist_len(SV* const invlist)
+{
+    /* Returns the current number of elements stored in the inversion list's
+     * array */
+
+    PERL_ARGS_ASSERT__INVLIST_LEN;
+
+    assert(SvTYPE(invlist) == SVt_INVLIST);
+
+    return (SvCUR(invlist) == 0)
+           ? 0
+           : FROM_INTERNAL_SIZE(SvCUR(invlist)) - *get_invlist_offset_addr(invlist);
+}
+
+PERL_STATIC_INLINE bool
+S__invlist_contains_cp(SV* const invlist, const UV cp)
+{
+    /* Does <invlist> contain code point <cp> as part of the set? */
+
+    IV index = _invlist_search(invlist, cp);
+
+    PERL_ARGS_ASSERT__INVLIST_CONTAINS_CP;
+
+    return index >= 0 && ELEMENT_RANGE_MATCHES_INVLIST(index);
+}
+
+PERL_STATIC_INLINE UV*
+S_invlist_array(SV* const invlist)
+{
+    /* Returns the pointer to the inversion list's array.  Every time the
+     * length changes, this needs to be called in case malloc or realloc moved
+     * it */
+
+    PERL_ARGS_ASSERT_INVLIST_ARRAY;
+
+    /* Must not be empty.  If these fail, you probably didn't check for <len>
+     * being non-zero before trying to get the array */
+    assert(_invlist_len(invlist));
+
+    /* The very first element always contains zero, The array begins either
+     * there, or if the inversion list is offset, at the element after it.
+     * The offset header field determines which; it contains 0 or 1 to indicate
+     * how much additionally to add */
+    assert(0 == *(SvPVX(invlist)));
+    return ((UV *) SvPVX(invlist) + *get_invlist_offset_addr(invlist));
+}
+
+#   if defined(PERL_IN_UTF8_C) || defined(PERL_IN_REGEXEC_C)
+
+/* These symbols are only needed later in regcomp.c */
+#       undef TO_INTERNAL_SIZE
+#       undef FROM_INTERNAL_SIZE
+#   endif
+
+#endif
diff --git a/Master/tlpkg/tlperl/lib/CORE/iperlsys.h b/Master/tlpkg/tlperl/lib/CORE/iperlsys.h
index 57160e0804f..86ab687fce9 100644
--- a/Master/tlpkg/tlperl/lib/CORE/iperlsys.h
+++ b/Master/tlpkg/tlperl/lib/CORE/iperlsys.h
@@ -478,7 +478,7 @@ typedef char*		(*LPENVGetenv_len)(struct IPerlEnv*,
 #endif
 #ifdef WIN32
 typedef unsigned long	(*LPEnvOsID)(struct IPerlEnv*);
-typedef char*		(*LPEnvLibPath)(struct IPerlEnv*, const char*,
+typedef char*		(*LPEnvLibPath)(struct IPerlEnv*, WIN32_NO_REGISTRY_M_(const char*)
 					STRLEN *const len);
 typedef char*		(*LPEnvSiteLibPath)(struct IPerlEnv*, const char*,
 					    STRLEN *const len);
@@ -550,7 +550,7 @@ struct IPerlEnvInfo
 #define PerlEnv_os_id()						\
 	(*PL_Env->pEnvOsID)(PL_Env)
 #define PerlEnv_lib_path(str, lenp)				\
-	(*PL_Env->pLibPath)(PL_Env,(str),(lenp))
+	(*PL_Env->pLibPath)(PL_Env,WIN32_NO_REGISTRY_M_(str)(lenp))
 #define PerlEnv_sitelib_path(str, lenp)				\
 	(*PL_Env->pSiteLibPath)(PL_Env,(str),(lenp))
 #define PerlEnv_vendorlib_path(str, lenp)			\
@@ -575,7 +575,7 @@ struct IPerlEnvInfo
 
 #ifdef WIN32
 #define PerlEnv_os_id()			win32_os_id()
-#define PerlEnv_lib_path(str, lenp)	win32_get_privlib(str, lenp)
+#define PerlEnv_lib_path(str, lenp)	win32_get_privlib(WIN32_NO_REGISTRY_M_(str) lenp)
 #define PerlEnv_sitelib_path(str, lenp)	win32_get_sitelib(str, lenp)
 #define PerlEnv_vendorlib_path(str, lenp)	win32_get_vendorlib(str, lenp)
 #define PerlEnv_get_child_IO(ptr)	win32_get_child_IO(ptr)
@@ -600,6 +600,8 @@ struct IPerlEnvInfo
 
 #if defined(PERL_IMPLICIT_SYS)
 
+struct utimbuf; /* prevent gcc warning about the use below */
+
 /* IPerlLIO		*/
 struct IPerlLIO;
 struct IPerlLIOInfo;
diff --git a/Master/tlpkg/tlperl/lib/CORE/keywords.h b/Master/tlpkg/tlperl/lib/CORE/keywords.h
index faf1125ec61..eaa41209df4 100644
--- a/Master/tlpkg/tlperl/lib/CORE/keywords.h
+++ b/Master/tlpkg/tlperl/lib/CORE/keywords.h
@@ -270,5 +270,5 @@
 #define KEY_y			254
 
 /* Generated from:
- * 963511f90d23994583c88b07c3cf2258473567702972e94b59a635727c4aa944 regen/keywords.pl
+ * 7e3d76a333c5f9b77d47dd7d423450356b63853a1c2313d3e805042caaa4bc2c regen/keywords.pl
  * ex: set ro: */
diff --git a/Master/tlpkg/tlperl/lib/CORE/l1_char_class_tab.h b/Master/tlpkg/tlperl/lib/CORE/l1_char_class_tab.h
index bdab9890094..7602a781b71 100644
--- a/Master/tlpkg/tlperl/lib/CORE/l1_char_class_tab.h
+++ b/Master/tlpkg/tlperl/lib/CORE/l1_char_class_tab.h
@@ -263,7 +263,7 @@
 /* U+FC u with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* U+FD y with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* U+FE thorn */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* U+FF y with diaeresis */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* U+FF y with diaeresis */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)
 
 #endif	/* ASCII/Latin1 */
 
@@ -336,31 +336,31 @@
 /* 0x3E U+9E PM */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
 /* 0x3F U+1A SUB */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
 /* 0x40 U+20 SP */ (1U<<_CC_ASCII)|(1U<<_CC_BLANK)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE),
-/* 0x41 U+A0 NBSP */ (1U<<_CC_BLANK)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE),
-/* 0x42 U+E2 a with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x43 U+E4 a with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x44 U+E0 a with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x45 U+E1 a with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x46 U+E3 a with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x47 U+E5 a with ring */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x48 U+E7 c with cedilla */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x49 U+F1 n with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x4A U+A2 CENT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0x41 U+A0 NBSP */ (1U<<_CC_BLANK)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x42 U+E2 I8=A1 a with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x43 U+E4 I8=A2 a with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x44 U+E0 I8=A3 a with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x45 U+E1 I8=A4 a with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x46 U+E3 I8=A5 a with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x47 U+E5 I8=A6 a with ring */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x48 U+E7 I8=A7 c with cedilla */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x49 U+F1 I8=A8 n with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x4A U+A2 I8=A9 CENT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_CONTINUATION),
 /* 0x4B U+2E '.' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x4C U+3C '<' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x4D U+28 '(' */ (1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x4E U+2B '+' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x4F U+7C '|' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x50 U+26 '&' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x51 U+E9 e with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x52 U+EA e with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x53 U+EB e with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x54 U+E8 e with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x55 U+ED i with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x56 U+EE i with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x57 U+EF i with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x58 U+EC i with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x59 U+DF sharp s */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x51 U+E9 I8=AA e with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x52 U+EA I8=AB e with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x53 U+EB I8=AC e with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x54 U+E8 I8=AD e with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x55 U+ED I8=AE i with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x56 U+EE I8=AF i with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x57 U+EF I8=B0 i with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x58 U+EC I8=B1 i with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x59 U+DF I8=B2 sharp s */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
 /* 0x5A U+21 '!' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x5B U+24 '$' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x5C U+2A '*' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
@@ -369,29 +369,29 @@
 /* 0x5F U+5E '^' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x60 U+2D '-' */ (1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x61 U+2F '/' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x62 U+C2 A with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x63 U+C4 A with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x64 U+C0 A with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x65 U+C1 A with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x66 U+C3 A with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x67 U+C5 A with RING */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x68 U+C7 C with CEDILLA */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x69 U+D1 N with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x6A U+A6 BROKEN BAR */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0x62 U+C2 I8=B3 A with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x63 U+C4 I8=B4 A with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x64 U+C0 I8=B5 A with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x65 U+C1 I8=B6 A with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x66 U+C3 I8=B7 A with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x67 U+C5 I8=B8 A with RING */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x68 U+C7 I8=B9 C with CEDILLA */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x69 U+D1 I8=BA N with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x6A U+A6 I8=BB BROKEN BAR */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_CONTINUATION),
 /* 0x6B U+2C ',' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x6C U+25 '%' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x6D U+5F '_' */ (1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_WORDCHAR),
 /* 0x6E U+3E '>' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x6F U+3F '?' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x70 U+F8 o with '/' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x71 U+C9 E with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x72 U+CA E with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x73 U+CB E with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x74 U+C8 E with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x75 U+CD I with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x76 U+CE I with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x77 U+CF I with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x78 U+CC I with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x70 U+F8 I8=BC o with '/' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x71 U+C9 I8=BD E with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x72 U+CA I8=BE E with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x73 U+CB I8=BF E with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x74 U+C8 I8=C0 E with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x75 U+CD I8=C1 I with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x76 U+CE I8=C2 I with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x77 U+CF I8=C3 I with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x78 U+CC I8=C4 I with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x79 U+60 '`' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x7A U+3A ':' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x7B U+23 '#' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
@@ -399,7 +399,7 @@
 /* 0x7D U+27 "'" */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x7E U+3D '=' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x7F U+22 '"' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x80 U+D8 O with '/' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x80 U+D8 I8=C5 O with '/' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_IS_DOWNGRADEABLE_START),
 /* 0x81 U+61 'a' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x82 U+62 'b' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x83 U+63 'c' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -409,13 +409,13 @@
 /* 0x87 U+67 'g' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x88 U+68 'h' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x89 U+69 'i' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8A U+AB LEFT-POINTING DOUBLE ANGLE QUOTE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x8B U+BB RIGHT-POINTING DOUBLE ANGLE QUOTE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x8C U+F0 eth */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8D U+FD y with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8E U+FE thorn */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8F U+B1 PLUS-MINUS */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0x90 U+B0 DEGREE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0x8A U+AB I8=C6 LEFT-POINTING DOUBLE ANGLE QUOTE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_IS_DOWNGRADEABLE_START),
+/* 0x8B U+BB I8=C7 RIGHT-POINTING DOUBLE ANGLE QUOTE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_IS_DOWNGRADEABLE_START),
+/* 0x8C U+F0 I8=C8 eth */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0x8D U+FD I8=C9 y with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0x8E U+FE I8=CA thorn */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0x8F U+B1 I8=CB PLUS-MINUS */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0x90 U+B0 I8=CC DEGREE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
 /* 0x91 U+6A 'j' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x92 U+6B 'k' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x93 U+6C 'l' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -425,13 +425,13 @@
 /* 0x97 U+70 'p' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x98 U+71 'q' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x99 U+72 'r' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x9A U+AA FEMININE ORDINAL */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR),
-/* 0x9B U+BA MASCULINE ORDINAL */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR),
-/* 0x9C U+E6 ae */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x9D U+B8 CEDILLA */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0x9E U+C6 AE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x9F U+A4 CURRENCY */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xA0 U+B5 MICRO */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x9A U+AA I8=CD FEMININE ORDINAL */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_UTF8_IS_START),
+/* 0x9B U+BA I8=CE MASCULINE ORDINAL */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_UTF8_IS_START),
+/* 0x9C U+E6 I8=CF ae */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0x9D U+B8 I8=D0 CEDILLA */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0x9E U+C6 I8=D1 AE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0x9F U+A4 I8=D2 CURRENCY */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xA0 U+B5 I8=D3 MICRO */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
 /* 0xA1 U+7E '~' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0xA2 U+73 's' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xA3 U+74 't' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -441,28 +441,28 @@
 /* 0xA7 U+78 'x' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xA8 U+79 'y' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xA9 U+7A 'z' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xAA U+A1 INVERTED '!' */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xAB U+BF INVERTED '?' */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xAC U+D0 ETH */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0xAA U+A1 I8=D4 INVERTED '!' */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xAB U+BF I8=D5 INVERTED '?' */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xAC U+D0 I8=D6 ETH */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
 /* 0xAD U+5B '[' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xAE U+DE THORN */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xAF U+AE REGISTERED */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB0 U+AC NOT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB1 U+A3 POUND */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB2 U+A5 YEN */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB3 U+B7 MIDDLE DOT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT),
-/* 0xB4 U+A9 COPYRIGHT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB5 U+A7 SECTION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* U+B6 PILCROW */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xB7 U+BC 1/4 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xB8 U+BD 1/2 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xB9 U+BE 3/4 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xBA U+DD Y with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xBB U+A8 DIAERESIS */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xBC U+AF MACRON */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
+/* 0xAE U+DE I8=D7 THORN */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xAF U+AE I8=D8 REGISTERED */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xB0 U+AC I8=D9 NOT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xB1 U+A3 I8=DA POUND */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xB2 U+A5 I8=DB YEN */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xB3 U+B7 I8=DC MIDDLE DOT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_UTF8_IS_START),
+/* 0xB4 U+A9 I8=DD COPYRIGHT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xB5 U+A7 I8=DE SECTION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* U+B6 I8=DF PILCROW */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xB7 U+BC I8=E0 1/4 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
+/* 0xB8 U+BD I8=E1 1/2 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0xB9 U+BE I8=E2 3/4 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0xBA U+DD I8=E3 Y with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xBB U+A8 I8=E4 DIAERESIS */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0xBC U+AF I8=E5 MACRON */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
 /* 0xBD U+5D ']' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xBE U+B4 ACUTE ACCENT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xBF U+D7 MULTIPLICATION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0xBE U+B4 I8=E6 ACUTE ACCENT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0xBF U+D7 I8=E7 MULTIPLICATION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
 /* 0xC0 U+7B '{' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0xC1 U+41 'A' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xC2 U+42 'B' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -473,12 +473,12 @@
 /* 0xC7 U+47 'G' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xC8 U+48 'H' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xC9 U+49 'I' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCA U+AD SOFT HYPHEN */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xCB U+F4 o with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCC U+F6 o with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCD U+F2 o with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCE U+F3 o with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCF U+F5 o with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0xCA U+AD I8=E8 SOFT HYPHEN */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xCB U+F4 I8=E9 o with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xCC U+F6 I8=EA o with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xCD U+F2 I8=EB o with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xCE U+F3 I8=EC o with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xCF U+F5 I8=ED o with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
 /* 0xD0 U+7D '}' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0xD1 U+4A 'J' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xD2 U+4B 'K' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -489,14 +489,14 @@
 /* 0xD7 U+50 'P' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xD8 U+51 'Q' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xD9 U+52 'R' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDA U+B9 SUPERSCRIPT 1 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xDB U+FB u with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDC U+FC u with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDD U+F9 u with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDE U+FA u with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDF U+FF y with diaeresis */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0xDA U+B9 I8=EE SUPERSCRIPT 1 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0xDB U+FB I8=EF u with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xDC U+FC I8=F0 u with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xDD U+F9 I8=F1 u with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xDE U+FA I8=F2 u with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xDF U+FF I8=F3 y with diaeresis */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
 /* 0xE0 U+5C '\' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xE1 U+F7 DIVISION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0xE1 U+F7 I8=F4 DIVISION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
 /* 0xE2 U+53 'S' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xE3 U+54 'T' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xE4 U+55 'U' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -505,12 +505,12 @@
 /* 0xE7 U+58 'X' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xE8 U+59 'Y' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xE9 U+5A 'Z' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEA U+B2 SUPERSCRIPT 2 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xEB U+D4 O with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEC U+D6 O with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xED U+D2 O with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEE U+D3 O with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEF U+D5 O with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0xEA U+B2 I8=F5 SUPERSCRIPT 2 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xEB U+D4 I8=F6 O with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xEC U+D6 I8=F7 O with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xED U+D2 I8=F8 O with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xEE U+D3 I8=F9 O with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xEF U+D5 I8=FA O with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
 /* 0xF0 U+30 '0' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
 /* 0xF1 U+31 '1' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
 /* 0xF2 U+32 '2' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
@@ -521,12 +521,12 @@
 /* 0xF7 U+37 '7' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
 /* 0xF8 U+38 '8' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
 /* 0xF9 U+39 '9' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xFA U+B3 SUPERSCRIPT 3 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xFB U+DB U with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xFC U+DC U with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xFD U+D9 U with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xFE U+DA U with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xFF U+9F APC */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
+/* 0xFA U+B3 I8=FB SUPERSCRIPT 3 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xFB U+DB I8=FC U with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xFC U+DC I8=FD U with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xFD U+D9 I8=FE U with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xFE U+DA I8=FF U with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xFF U+9F APC */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA)
 
 #endif	/* EBCDIC 1047 */
 
@@ -599,62 +599,62 @@
 /* 0x3E U+9E PM */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
 /* 0x3F U+1A SUB */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
 /* 0x40 U+20 SP */ (1U<<_CC_ASCII)|(1U<<_CC_BLANK)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE),
-/* 0x41 U+A0 NBSP */ (1U<<_CC_BLANK)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE),
-/* 0x42 U+E2 a with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x43 U+E4 a with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x44 U+E0 a with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x45 U+E1 a with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x46 U+E3 a with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x47 U+E5 a with ring */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x48 U+E7 c with cedilla */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x49 U+F1 n with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x4A U+A2 CENT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0x41 U+A0 NBSP */ (1U<<_CC_BLANK)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x42 U+E2 I8=A1 a with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x43 U+E4 I8=A2 a with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x44 U+E0 I8=A3 a with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x45 U+E1 I8=A4 a with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x46 U+E3 I8=A5 a with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x47 U+E5 I8=A6 a with ring */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x48 U+E7 I8=A7 c with cedilla */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x49 U+F1 I8=A8 n with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x4A U+A2 I8=A9 CENT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_CONTINUATION),
 /* 0x4B U+2E '.' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x4C U+3C '<' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x4D U+28 '(' */ (1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x4E U+2B '+' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x4F U+7C '|' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x50 U+26 '&' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x51 U+E9 e with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x52 U+EA e with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x53 U+EB e with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x54 U+E8 e with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x55 U+ED i with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x56 U+EE i with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x57 U+EF i with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x58 U+EC i with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x59 U+DF sharp s */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x51 U+E9 I8=AA e with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x52 U+EA I8=AB e with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x53 U+EB I8=AC e with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x54 U+E8 I8=AD e with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x55 U+ED I8=AE i with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x56 U+EE I8=AF i with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x57 U+EF I8=B0 i with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x58 U+EC I8=B1 i with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x59 U+DF I8=B2 sharp s */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
 /* 0x5A U+21 '!' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x5B U+24 '$' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x5C U+2A '*' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x5D U+29 ')' */ (1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x5E U+3B ';' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x5F U+AC NOT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0x5F U+AC I8=B3 NOT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_CONTINUATION),
 /* 0x60 U+2D '-' */ (1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x61 U+2F '/' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x62 U+C2 A with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x63 U+C4 A with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x64 U+C0 A with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x65 U+C1 A with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x66 U+C3 A with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x67 U+C5 A with RING */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x68 U+C7 C with CEDILLA */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x69 U+D1 N with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x6A U+A6 BROKEN BAR */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0x62 U+C2 I8=B4 A with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x63 U+C4 I8=B5 A with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x64 U+C0 I8=B6 A with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x65 U+C1 I8=B7 A with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x66 U+C3 I8=B8 A with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x67 U+C5 I8=B9 A with RING */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x68 U+C7 I8=BA C with CEDILLA */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x69 U+D1 I8=BB N with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x6A U+A6 I8=BC BROKEN BAR */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_CONTINUATION),
 /* 0x6B U+2C ',' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x6C U+25 '%' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x6D U+5F '_' */ (1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_WORDCHAR),
 /* 0x6E U+3E '>' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x6F U+3F '?' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x70 U+F8 o with '/' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x71 U+C9 E with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x72 U+CA E with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x73 U+CB E with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x74 U+C8 E with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x75 U+CD I with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x76 U+CE I with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x77 U+CF I with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x78 U+CC I with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x70 U+F8 I8=BD o with '/' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x71 U+C9 I8=BE E with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x72 U+CA I8=BF E with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_CONTINUATION),
+/* 0x73 U+CB I8=C0 E with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x74 U+C8 I8=C1 E with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x75 U+CD I8=C2 I with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x76 U+CE I8=C3 I with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x77 U+CF I8=C4 I with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x78 U+CC I8=C5 I with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_IS_DOWNGRADEABLE_START),
 /* 0x79 U+60 '`' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x7A U+3A ':' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x7B U+23 '#' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
@@ -662,7 +662,7 @@
 /* 0x7D U+27 "'" */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x7E U+3D '=' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0x7F U+22 '"' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x80 U+D8 O with '/' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x80 U+D8 I8=C6 O with '/' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_IS_DOWNGRADEABLE_START),
 /* 0x81 U+61 'a' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x82 U+62 'b' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x83 U+63 'c' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -672,13 +672,13 @@
 /* 0x87 U+67 'g' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x88 U+68 'h' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x89 U+69 'i' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8A U+AB LEFT-POINTING DOUBLE ANGLE QUOTE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x8B U+BB RIGHT-POINTING DOUBLE ANGLE QUOTE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x8C U+F0 eth */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8D U+FD y with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8E U+FE thorn */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8F U+B1 PLUS-MINUS */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0x90 U+B0 DEGREE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0x8A U+AB I8=C7 LEFT-POINTING DOUBLE ANGLE QUOTE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_IS_DOWNGRADEABLE_START),
+/* 0x8B U+BB I8=C8 RIGHT-POINTING DOUBLE ANGLE QUOTE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0x8C U+F0 I8=C9 eth */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0x8D U+FD I8=CA y with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0x8E U+FE I8=CB thorn */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0x8F U+B1 I8=CC PLUS-MINUS */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0x90 U+B0 I8=CD DEGREE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
 /* 0x91 U+6A 'j' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x92 U+6B 'k' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x93 U+6C 'l' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -688,13 +688,13 @@
 /* 0x97 U+70 'p' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x98 U+71 'q' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0x99 U+72 'r' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x9A U+AA FEMININE ORDINAL */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR),
-/* 0x9B U+BA MASCULINE ORDINAL */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR),
-/* 0x9C U+E6 ae */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x9D U+B8 CEDILLA */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0x9E U+C6 AE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x9F U+A4 CURRENCY */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xA0 U+B5 MICRO */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0x9A U+AA I8=CE FEMININE ORDINAL */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_UTF8_IS_START),
+/* 0x9B U+BA I8=CF MASCULINE ORDINAL */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_UTF8_IS_START),
+/* 0x9C U+E6 I8=D0 ae */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0x9D U+B8 I8=D1 CEDILLA */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0x9E U+C6 I8=D2 AE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0x9F U+A4 I8=D3 CURRENCY */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xA0 U+B5 I8=D4 MICRO */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
 /* 0xA1 U+7E '~' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0xA2 U+73 's' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xA3 U+74 't' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -704,28 +704,28 @@
 /* 0xA7 U+78 'x' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xA8 U+79 'y' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xA9 U+7A 'z' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xAA U+A1 INVERTED '!' */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xAB U+BF INVERTED '?' */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xAC U+D0 ETH */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xAD U+DD Y with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xAE U+DE THORN */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xAF U+AE REGISTERED */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0xAA U+A1 I8=D5 INVERTED '!' */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xAB U+BF I8=D6 INVERTED '?' */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xAC U+D0 I8=D7 ETH */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xAD U+DD I8=D8 Y with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xAE U+DE I8=D9 THORN */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xAF U+AE I8=DA REGISTERED */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
 /* 0xB0 U+5E '^' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xB1 U+A3 POUND */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB2 U+A5 YEN */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB3 U+B7 MIDDLE DOT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT),
-/* 0xB4 U+A9 COPYRIGHT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB5 U+A7 SECTION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* U+B6 PILCROW */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xB7 U+BC 1/4 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xB8 U+BD 1/2 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xB9 U+BE 3/4 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
+/* 0xB1 U+A3 I8=DB POUND */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xB2 U+A5 I8=DC YEN */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xB3 U+B7 I8=DD MIDDLE DOT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_UTF8_IS_START),
+/* 0xB4 U+A9 I8=DE COPYRIGHT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xB5 U+A7 I8=DF SECTION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* U+B6 I8=E0 PILCROW */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
+/* 0xB7 U+BC I8=E1 1/4 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0xB8 U+BD I8=E2 1/2 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0xB9 U+BE I8=E3 3/4 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
 /* 0xBA U+5B '[' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0xBB U+5D ']' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xBC U+AF MACRON */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xBD U+A8 DIAERESIS */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xBE U+B4 ACUTE ACCENT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xBF U+D7 MULTIPLICATION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0xBC U+AF I8=E4 MACRON */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0xBD U+A8 I8=E5 DIAERESIS */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0xBE U+B4 I8=E6 ACUTE ACCENT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0xBF U+D7 I8=E7 MULTIPLICATION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
 /* 0xC0 U+7B '{' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0xC1 U+41 'A' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xC2 U+42 'B' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -736,12 +736,12 @@
 /* 0xC7 U+47 'G' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xC8 U+48 'H' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xC9 U+49 'I' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCA U+AD SOFT HYPHEN */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xCB U+F4 o with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCC U+F6 o with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCD U+F2 o with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCE U+F3 o with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCF U+F5 o with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0xCA U+AD I8=E8 SOFT HYPHEN */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START),
+/* 0xCB U+F4 I8=E9 o with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xCC U+F6 I8=EA o with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xCD U+F2 I8=EB o with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xCE U+F3 I8=EC o with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xCF U+F5 I8=ED o with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
 /* 0xD0 U+7D '}' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
 /* 0xD1 U+4A 'J' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xD2 U+4B 'K' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -752,14 +752,14 @@
 /* 0xD7 U+50 'P' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xD8 U+51 'Q' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xD9 U+52 'R' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDA U+B9 SUPERSCRIPT 1 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xDB U+FB u with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDC U+FC u with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDD U+F9 u with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDE U+FA u with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDF U+FF y with diaeresis */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0xDA U+B9 I8=EE SUPERSCRIPT 1 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START),
+/* 0xDB U+FB I8=EF u with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xDC U+FC I8=F0 u with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START),
+/* 0xDD U+F9 I8=F1 u with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xDE U+FA I8=F2 u with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xDF U+FF I8=F3 y with diaeresis */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
 /* 0xE0 U+5C '\' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xE1 U+F7 DIVISION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
+/* 0xE1 U+F7 I8=F4 DIVISION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
 /* 0xE2 U+53 'S' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xE3 U+54 'T' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xE4 U+55 'U' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
@@ -768,12 +768,12 @@
 /* 0xE7 U+58 'X' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xE8 U+59 'Y' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
 /* 0xE9 U+5A 'Z' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEA U+B2 SUPERSCRIPT 2 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xEB U+D4 O with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEC U+D6 O with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xED U+D2 O with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEE U+D3 O with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEF U+D5 O with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
+/* 0xEA U+B2 I8=F5 SUPERSCRIPT 2 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xEB U+D4 I8=F6 O with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xEC U+D6 I8=F7 O with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xED U+D2 I8=F8 O with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xEE U+D3 I8=F9 O with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xEF U+D5 I8=FA O with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
 /* 0xF0 U+30 '0' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
 /* 0xF1 U+31 '1' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
 /* 0xF2 U+32 '2' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
@@ -784,276 +784,13 @@
 /* 0xF7 U+37 '7' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
 /* 0xF8 U+38 '8' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
 /* 0xF9 U+39 '9' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xFA U+B3 SUPERSCRIPT 3 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xFB U+DB U with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xFC U+DC U with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xFD U+D9 U with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xFE U+DA U with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xFF U+9F APC */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
+/* 0xFA U+B3 I8=FB SUPERSCRIPT 3 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xFB U+DB I8=FC U with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xFC U+DC I8=FD U with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xFD U+D9 I8=FE U with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xFE U+DA I8=FF U with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD)|(1U<<_CC_UTF8_IS_START)|(1U<<_CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE),
+/* 0xFF U+9F APC */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA)
 
 #endif	/* EBCDIC 037 */
 
-#if 'A' == 193 /* EBCDIC POSIX-BC */ \
-     && '\\' == 188 && '[' == 187 && ']' == 189 && '{' == 251 && '}' == 253 \
-     && '^' == 106 && '~' == 255 && '!' == 90 && '#' == 123 && '|' == 79 \
-     && '$' == 91 && '@' == 124 && '`' == 74
-/* U+00 NUL */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+01 SOH */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+02 STX */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+03 ETX */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x04 U+9C ST */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x05 U+09 HT */ (1U<<_CC_ASCII)|(1U<<_CC_BLANK)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE)|(1U<<_CC_MNEMONIC_CNTRL),
-/* 0x06 U+86 SSA */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x07 U+7F DEL */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x08 U+97 EPA */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x09 U+8D RI */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x0A U+8E SS2 */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+0B VT */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE)|(1U<<_CC_VERTSPACE),
-/* U+0C FF */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE)|(1U<<_CC_VERTSPACE)|(1U<<_CC_MNEMONIC_CNTRL),
-/* U+0D CR */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE)|(1U<<_CC_VERTSPACE)|(1U<<_CC_MNEMONIC_CNTRL),
-/* U+0E SO */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+0F SI */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+10 DLE */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+11 DC1 */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+12 DC2 */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+13 DC3 */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x14 U+9D OSC */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x15 U+0A LF */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE)|(1U<<_CC_VERTSPACE)|(1U<<_CC_MNEMONIC_CNTRL),
-/* 0x16 U+08 BS */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_MNEMONIC_CNTRL),
-/* 0x17 U+87 ESA */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+18 CAN */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+19 EOM */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x1A U+92 PU2 */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x1B U+8F SS3 */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+1C FS */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+1D GS */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+1E RS */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* U+1F US */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x20 U+80 PAD */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x21 U+81 HOP */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x22 U+82 BPH */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x23 U+83 NBH */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x24 U+84 IND */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x25 U+85 NEL */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE)|(1U<<_CC_VERTSPACE),
-/* 0x26 U+17 ETB */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x27 U+1B ESC */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_MNEMONIC_CNTRL),
-/* 0x28 U+88 HTS */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x29 U+89 HTJ */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x2A U+8A VTS */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x2B U+8B PLD */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x2C U+8C PLU */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x2D U+05 ENQ */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x2E U+06 ACK */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x2F U+07 BEL */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_MNEMONIC_CNTRL),
-/* 0x30 U+90 DCS */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x31 U+91 PU1 */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x32 U+16 SYN */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x33 U+93 STS */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x34 U+94 CCH */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x35 U+95 MW */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x36 U+96 SPA */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x37 U+04 EOT */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x38 U+98 SOS */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x39 U+99 SGC */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x3A U+9A SCI */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x3B U+9B CSI */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x3C U+14 DC4 */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x3D U+15 NAK */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x3E U+9E PM */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x3F U+1A SUB */ (1U<<_CC_ASCII)|(1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x40 U+20 SP */ (1U<<_CC_ASCII)|(1U<<_CC_BLANK)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE),
-/* 0x41 U+A0 NBSP */ (1U<<_CC_BLANK)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA)|(1U<<_CC_SPACE),
-/* 0x42 U+E2 a with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x43 U+E4 a with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x44 U+E0 a with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x45 U+E1 a with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x46 U+E3 a with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x47 U+E5 a with ring */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x48 U+E7 c with cedilla */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x49 U+F1 n with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x4A U+60 '`' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x4B U+2E '.' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x4C U+3C '<' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x4D U+28 '(' */ (1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x4E U+2B '+' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x4F U+7C '|' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x50 U+26 '&' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x51 U+E9 e with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x52 U+EA e with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x53 U+EB e with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x54 U+E8 e with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x55 U+ED i with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x56 U+EE i with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x57 U+EF i with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x58 U+EC i with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x59 U+DF sharp s */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x5A U+21 '!' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x5B U+24 '$' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x5C U+2A '*' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x5D U+29 ')' */ (1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x5E U+3B ';' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x5F U+9F APC */ (1U<<_CC_CNTRL)|(1U<<_CC_QUOTEMETA),
-/* 0x60 U+2D '-' */ (1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x61 U+2F '/' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x62 U+C2 A with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x63 U+C4 A with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x64 U+C0 A with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x65 U+C1 A with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x66 U+C3 A with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x67 U+C5 A with RING */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x68 U+C7 C with CEDILLA */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x69 U+D1 N with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x6A U+5E '^' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x6B U+2C ',' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x6C U+25 '%' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x6D U+5F '_' */ (1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_WORDCHAR),
-/* 0x6E U+3E '>' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x6F U+3F '?' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x70 U+F8 o with '/' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x71 U+C9 E with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x72 U+CA E with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x73 U+CB E with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x74 U+C8 E with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x75 U+CD I with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x76 U+CE I with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x77 U+CF I with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x78 U+CC I with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x79 U+A8 DIAERESIS */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0x7A U+3A ':' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x7B U+23 '#' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x7C U+40 '@' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x7D U+27 "'" */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x7E U+3D '=' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x7F U+22 '"' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x80 U+D8 O with '/' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x81 U+61 'a' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x82 U+62 'b' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x83 U+63 'c' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x84 U+64 'd' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x85 U+65 'e' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x86 U+66 'f' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x87 U+67 'g' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x88 U+68 'h' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x89 U+69 'i' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8A U+AB LEFT-POINTING DOUBLE ANGLE QUOTE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x8B U+BB RIGHT-POINTING DOUBLE ANGLE QUOTE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0x8C U+F0 eth */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8D U+FD y with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8E U+FE thorn */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x8F U+B1 PLUS-MINUS */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0x90 U+B0 DEGREE */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0x91 U+6A 'j' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x92 U+6B 'k' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x93 U+6C 'l' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x94 U+6D 'm' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x95 U+6E 'n' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x96 U+6F 'o' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x97 U+70 'p' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x98 U+71 'q' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x99 U+72 'r' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x9A U+AA FEMININE ORDINAL */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR),
-/* 0x9B U+BA MASCULINE ORDINAL */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR),
-/* 0x9C U+E6 ae */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x9D U+B8 CEDILLA */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0x9E U+C6 AE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0x9F U+A4 CURRENCY */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xA0 U+B5 MICRO */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xA1 U+AF MACRON */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xA2 U+73 's' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xA3 U+74 't' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xA4 U+75 'u' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xA5 U+76 'v' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xA6 U+77 'w' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xA7 U+78 'x' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xA8 U+79 'y' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xA9 U+7A 'z' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xAA U+A1 INVERTED '!' */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xAB U+BF INVERTED '?' */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xAC U+D0 ETH */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xAD U+DD Y with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xAE U+DE THORN */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xAF U+AE REGISTERED */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB0 U+A2 CENT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB1 U+A3 POUND */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB2 U+A5 YEN */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB3 U+B7 MIDDLE DOT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT),
-/* 0xB4 U+A9 COPYRIGHT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xB5 U+A7 SECTION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* U+B6 PILCROW */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xB7 U+BC 1/4 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xB8 U+BD 1/2 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xB9 U+BE 3/4 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xBA U+AC NOT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xBB U+5B '[' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xBC U+5C '\' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xBD U+5D ']' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xBE U+B4 ACUTE ACCENT */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xBF U+D7 MULTIPLICATION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xC0 U+F9 u with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xC1 U+41 'A' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xC2 U+42 'B' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xC3 U+43 'C' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xC4 U+44 'D' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xC5 U+45 'E' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xC6 U+46 'F' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xC7 U+47 'G' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xC8 U+48 'H' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xC9 U+49 'I' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCA U+AD SOFT HYPHEN */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xCB U+F4 o with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCC U+F6 o with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCD U+F2 o with grave */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCE U+F3 o with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xCF U+F5 o with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xD0 U+A6 BROKEN BAR */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xD1 U+4A 'J' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xD2 U+4B 'K' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xD3 U+4C 'L' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xD4 U+4D 'M' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xD5 U+4E 'N' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xD6 U+4F 'O' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xD7 U+50 'P' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xD8 U+51 'Q' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xD9 U+52 'R' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDA U+B9 SUPERSCRIPT 1 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xDB U+FB u with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDC U+FC u with diaeresis */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDD U+DB U with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDE U+FA u with acute */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xDF U+FF y with diaeresis */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_LOWER)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xE0 U+D9 U with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xE1 U+F7 DIVISION */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_QUOTEMETA),
-/* 0xE2 U+53 'S' */ (1U<<_CC_NONLATIN1_SIMPLE_FOLD)|(1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xE3 U+54 'T' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xE4 U+55 'U' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xE5 U+56 'V' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xE6 U+57 'W' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xE7 U+58 'X' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xE8 U+59 'Y' */ (1U<<_CC_NONLATIN1_FOLD)|(1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_NON_FINAL_FOLD)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xE9 U+5A 'Z' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_ASCII)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEA U+B2 SUPERSCRIPT 2 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xEB U+D4 O with '^' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEC U+D6 O with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xED U+D2 O with GRAVE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEE U+D3 O with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xEF U+D5 O with '~' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xF0 U+30 '0' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xF1 U+31 '1' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xF2 U+32 '2' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xF3 U+33 '3' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xF4 U+34 '4' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xF5 U+35 '5' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xF6 U+36 '6' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xF7 U+37 '7' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xF8 U+38 '8' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xF9 U+39 '9' */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ASCII)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_DIGIT)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_WORDCHAR)|(1U<<_CC_XDIGIT),
-/* 0xFA U+B3 SUPERSCRIPT 3 */ (1U<<_CC_GRAPH)|(1U<<_CC_PRINT),
-/* 0xFB U+7B '{' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xFC U+DC U with DIAERESIS */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xFD U+7D '}' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-/* 0xFE U+DA U with ACUTE */ (1U<<_CC_ALPHANUMERIC)|(1U<<_CC_ALPHA)|(1U<<_CC_CASED)|(1U<<_CC_CHARNAME_CONT)|(1U<<_CC_GRAPH)|(1U<<_CC_IDFIRST)|(1U<<_CC_PRINT)|(1U<<_CC_UPPER)|(1U<<_CC_WORDCHAR)|(1U<<_CC_IS_IN_SOME_FOLD),
-/* 0xFF U+7E '~' */ (1U<<_CC_ASCII)|(1U<<_CC_GRAPH)|(1U<<_CC_PRINT)|(1U<<_CC_PUNCT)|(1U<<_CC_QUOTEMETA),
-
-#endif	/* EBCDIC POSIX-BC */
-
 /* ex: set ro: */
diff --git a/Master/tlpkg/tlperl/lib/CORE/libperl522.a b/Master/tlpkg/tlperl/lib/CORE/libperl524.a
index c0d5a88f513..772447f261d 100644
--- a/Master/tlpkg/tlperl/lib/CORE/libperl522.a
+++ b/Master/tlpkg/tlperl/lib/CORE/libperl524.a
diff --git a/Master/tlpkg/tlperl/lib/CORE/metaconfig.h b/Master/tlpkg/tlperl/lib/CORE/metaconfig.h
index fef2e4ba947..84580f59f0a 100644
--- a/Master/tlpkg/tlperl/lib/CORE/metaconfig.h
+++ b/Master/tlpkg/tlperl/lib/CORE/metaconfig.h
@@ -19,16 +19,20 @@
  * HAS_DLADDR
  * HAS_FEGETROUND
  * HAS_FPCLASSIFY
+ * HAS_FREELOCALE
  * HAS_GMTIME64
  * HAS_ISFINITEL
  * HAS_ISINFL
  * HAS_ISLESS
  * HAS_J0
  * HAS_LOCALTIME64
+ * HAS_MEMMEM
  * HAS_MKTIME64
+ * HAS_NEWLOCALE
  * HAS_PRCTL
  * HAS_PSEUDOFORK
  * HAS_TIMEGM
+ * HAS_USELOCALE
  * I16SIZE
  * I64SIZE
  * I8SIZE
diff --git a/Master/tlpkg/tlperl/lib/CORE/mydtrace.h b/Master/tlpkg/tlperl/lib/CORE/mydtrace.h
index 6e797676fa8..6c66a085098 100644
--- a/Master/tlpkg/tlperl/lib/CORE/mydtrace.h
+++ b/Master/tlpkg/tlperl/lib/CORE/mydtrace.h
@@ -13,80 +13,39 @@
 
 #  include "perldtrace.h"
 
-#  if defined(STAP_PROBE_ADDR) && !defined(DEBUGGING)
+#  define PERL_DTRACE_PROBE_ENTRY(cv)               \
+    if (PERL_SUB_ENTRY_ENABLED())                   \
+        Perl_dtrace_probe_call(aTHX_ cv, TRUE);
 
-/* SystemTap 1.2 uses a construct that chokes on passing a char array
- * as a char *, in this case hek_key in struct hek.  Workaround it
- * with a temporary.
- */
-
-#    define ENTRY_PROBE(func, file, line, stash)  	\
-    if (PERL_SUB_ENTRY_ENABLED()) {	        	\
-	const char *tmp_func = func;			\
-	PERL_SUB_ENTRY(tmp_func, file, line, stash); 	\
-    }
-
-#    define RETURN_PROBE(func, file, line, stash) 	\
-    if (PERL_SUB_RETURN_ENABLED()) {    		\
-	const char *tmp_func = func;			\
-	PERL_SUB_RETURN(tmp_func, file, line, stash);	\
-    }
-
-#    define LOADING_FILE_PROBE(name) 	                        \
-    if (PERL_LOADING_FILE_ENABLED()) {    		        \
-	const char *tmp_name = name;			\
-	PERL_LOADING_FILE(tmp_name);	                        \
-    }
-
-#    define LOADED_FILE_PROBE(name) 	                        \
-    if (PERL_LOADED_FILE_ENABLED()) {    		        \
-	const char *tmp_name = name;			\
-	PERL_LOADED_FILE(tmp_name);	                        \
-    }
-
-#  else
-
-#    define ENTRY_PROBE(func, file, line, stash) 	\
-    if (PERL_SUB_ENTRY_ENABLED()) {	        	\
-	PERL_SUB_ENTRY(func, file, line, stash); 	\
-    }
-
-#    define RETURN_PROBE(func, file, line, stash)	\
-    if (PERL_SUB_RETURN_ENABLED()) {    		\
-	PERL_SUB_RETURN(func, file, line, stash); 	\
-    }
-
-#    define LOADING_FILE_PROBE(name)	                        \
-    if (PERL_LOADING_FILE_ENABLED()) {    		        \
-	PERL_LOADING_FILE(name); 	                                \
-    }
+#  define PERL_DTRACE_PROBE_RETURN(cv)              \
+    if (PERL_SUB_ENTRY_ENABLED())                   \
+        Perl_dtrace_probe_call(aTHX_ cv, FALSE);
 
-#    define LOADED_FILE_PROBE(name)	                        \
-    if (PERL_LOADED_FILE_ENABLED()) {    		        \
-	PERL_LOADED_FILE(name); 	                                \
-    }
+#  define PERL_DTRACE_PROBE_FILE_LOADING(name)      \
+    if (PERL_SUB_ENTRY_ENABLED())                   \
+        Perl_dtrace_probe_load(aTHX_ name, TRUE);
 
-#  endif
+#  define PERL_DTRACE_PROBE_FILE_LOADED(name)       \
+    if (PERL_SUB_ENTRY_ENABLED())                   \
+        Perl_dtrace_probe_load(aTHX_ name, FALSE);
 
-#  define OP_ENTRY_PROBE(name)	                \
-    if (PERL_OP_ENTRY_ENABLED()) {    		        \
-	PERL_OP_ENTRY(name); 	                        \
-    }
+#  define PERL_DTRACE_PROBE_OP(op)                  \
+    if (PERL_OP_ENTRY_ENABLED())                    \
+        Perl_dtrace_probe_op(aTHX_ op);
 
-#  define PHASE_CHANGE_PROBE(new_phase, old_phase)      \
-    if (PERL_PHASE_CHANGE_ENABLED()) {                  \
-	PERL_PHASE_CHANGE(new_phase, old_phase);        \
-    }
+#  define PERL_DTRACE_PROBE_PHASE(phase)            \
+    if (PERL_OP_ENTRY_ENABLED())                    \
+        Perl_dtrace_probe_phase(aTHX_ phase);
 
 #else
 
 /* NOPs */
-#  define ENTRY_PROBE(func, file, line, stash)
-#  define RETURN_PROBE(func, file, line, stash)
-#  define PHASE_CHANGE_PROBE(new_phase, old_phase)
-#  define OP_ENTRY_PROBE(name)
-#  define LOADING_FILE_PROBE(name)
-#  define LOADED_FILE_PROBE(name)
+#  define PERL_DTRACE_PROBE_ENTRY(cv)
+#  define PERL_DTRACE_PROBE_RETURN(cv)
+#  define PERL_DTRACE_PROBE_FILE_LOADING(cv)
+#  define PERL_DTRACE_PROBE_FILE_LOADED(cv)
+#  define PERL_DTRACE_PROBE_OP(op)
+#  define PERL_DTRACE_PROBE_PHASE(phase)
 
 #endif
 
diff --git a/Master/tlpkg/tlperl/lib/CORE/op.h b/Master/tlpkg/tlperl/lib/CORE/op.h
index ed3e9a128e1..3ded4bb318e 100644
--- a/Master/tlpkg/tlperl/lib/CORE/op.h
+++ b/Master/tlpkg/tlperl/lib/CORE/op.h
@@ -67,7 +67,7 @@ typedef PERL_BITFIELD16 Optype;
     U8		op_private;
 #endif
 
-/* If op_type:9 is changed to :10, also change PUSHEVAL in cop.h.
+/* If op_type:9 is changed to :10, also change cx_pusheval()
    Also, if the type of op_type is ever changed (e.g. to PERL_BITFIELD32)
    then all the other bit-fields before/after it should change their
    types too to let VC pack them into the same 4 byte integer.*/
@@ -113,7 +113,8 @@ Deprecated.  Use C<GIMME_V> instead.
 				/*  On local LVAL, don't init local value. */
 				/*  On OP_SORT, subroutine is inlined. */
 				/*  On OP_NOT, inversion was implicit. */
-				/*  On OP_LEAVE, don't restore curpm. */
+				/*  On OP_LEAVE, don't restore curpm, e.g.
+                                 *      /(...)/ while ...>;  */
 				/*  On truncate, we truncate filehandle */
 				/*  On control verbs, we saw no label */
 				/*  On flipflop, we saw ... instead of .. */
@@ -613,7 +614,7 @@ struct loop {
 Given the root of an optree, link the tree in execution order using the
 C<op_next> pointers and return the first op executed.  If this has
 already been done, it will not be redone, and C<< o->op_next >> will be
-returned.  If C<< o->op_next >> is not already set, I<o> should be at
+returned.  If C<< o->op_next >> is not already set, C<o> should be at
 least an C<UNOP>.
 
 =cut
@@ -712,30 +713,30 @@ struct block_hooks {
 Return the BHK's flags.
 
 =for apidoc mx|void *|BhkENTRY|BHK *hk|which
-Return an entry from the BHK structure.  I<which> is a preprocessor token
+Return an entry from the BHK structure.  C<which> is a preprocessor token
 indicating which entry to return.  If the appropriate flag is not set
-this will return NULL.  The type of the return value depends on which
+this will return C<NULL>.  The type of the return value depends on which
 entry you ask for.
 
 =for apidoc Amx|void|BhkENTRY_set|BHK *hk|which|void *ptr
 Set an entry in the BHK structure, and set the flags to indicate it is
-valid.  I<which> is a preprocessing token indicating which entry to set.
-The type of I<ptr> depends on the entry.
+valid.  C<which> is a preprocessing token indicating which entry to set.
+The type of C<ptr> depends on the entry.
 
 =for apidoc Amx|void|BhkDISABLE|BHK *hk|which
 Temporarily disable an entry in this BHK structure, by clearing the
-appropriate flag.  I<which> is a preprocessor token indicating which
+appropriate flag.  C<which> is a preprocessor token indicating which
 entry to disable.
 
 =for apidoc Amx|void|BhkENABLE|BHK *hk|which
 Re-enable an entry in this BHK structure, by setting the appropriate
-flag.  I<which> is a preprocessor token indicating which entry to enable.
+flag.  C<which> is a preprocessor token indicating which entry to enable.
 This will assert (under -DDEBUGGING) if the entry doesn't contain a valid
 pointer.
 
 =for apidoc mx|void|CALL_BLOCK_HOOKS|which|arg
-Call all the registered block hooks for type I<which>.  I<which> is a
-preprocessing token; the type of I<arg> depends on I<which>.
+Call all the registered block hooks for type C<which>.  C<which> is a
+preprocessing token; the type of C<arg> depends on C<which>.
 
 =cut
 */
@@ -810,19 +811,19 @@ preprocessing token; the type of I<arg> depends on I<which>.
 Return the XOP's flags.
 
 =for apidoc Am||XopENTRY|XOP *xop|which
-Return a member of the XOP structure.  I<which> is a cpp token
+Return a member of the XOP structure.  C<which> is a cpp token
 indicating which entry to return.  If the member is not set
 this will return a default value.  The return type depends
-on I<which>.  This macro evaluates its arguments more than
+on C<which>.  This macro evaluates its arguments more than
 once.  If you are using C<Perl_custom_op_xop> to retreive a
 C<XOP *> from a C<OP *>, use the more efficient L</XopENTRYCUSTOM> instead.
 
 =for apidoc Am||XopENTRYCUSTOM|const OP *o|which
 Exactly like C<XopENTRY(XopENTRY(Perl_custom_op_xop(aTHX_ o), which)> but more
-efficient.  The I<which> parameter is identical to L</XopENTRY>.
+efficient.  The C<which> parameter is identical to L</XopENTRY>.
 
 =for apidoc Am|void|XopENTRY_set|XOP *xop|which|value
-Set a member of the XOP structure.  I<which> is a cpp token
+Set a member of the XOP structure.  C<which> is a cpp token
 indicating which entry to set.  See L<perlguts/"Custom Operators">
 for details about the available members and how
 they are used.  This macro evaluates its argument
@@ -912,13 +913,13 @@ Return a short description of the provided OP.
 =for apidoc Am|U32|OP_CLASS|OP *o
 Return the class of the provided OP: that is, which of the *OP
 structures it uses.  For core ops this currently gets the information out
-of PL_opargs, which does not always accurately reflect the type used.
+of C<PL_opargs>, which does not always accurately reflect the type used.
 For custom ops the type is returned from the registration, and it is up
 to the registree to ensure it is accurate.  The value returned will be
-one of the OA_* constants from op.h.
+one of the C<OA_>* constants from F<op.h>.
 
 =for apidoc Am|bool|OP_TYPE_IS|OP *o|Optype type
-Returns true if the given OP is not a NULL pointer
+Returns true if the given OP is not a C<NULL> pointer
 and if it is of the given type.
 
 The negation of this macro, C<OP_TYPE_ISNT> is also available
@@ -933,28 +934,28 @@ replaced by an OP of type OP_NULL.
 The negation of this macro, C<OP_TYPE_ISNT_AND_WASNT>
 is also available as well as C<OP_TYPE_IS_OR_WAS_NN>
 and C<OP_TYPE_ISNT_AND_WASNT_NN> which elide
-the NULL pointer check.
+the C<NULL> pointer check.
 
 =for apidoc Am|bool|OpHAS_SIBLING|OP *o
-Returns true if o has a sibling
+Returns true if C<o> has a sibling
 
 =for apidoc Am|OP*|OpSIBLING|OP *o
-Returns the sibling of o, or NULL if there is no sibling
+Returns the sibling of C<o>, or C<NULL> if there is no sibling
 
 =for apidoc Am|void|OpMORESIB_set|OP *o|OP *sib
-Sets the sibling of o to the non-zero value sib. See also C<OpLASTSIB_set>
-and C<OpMAYBESIB_set>. For a higher-level interface, see
-C<op_sibling_splice>.
+Sets the sibling of C<o> to the non-zero value C<sib>. See also C<L</OpLASTSIB_set>>
+and C<L</OpMAYBESIB_set>>. For a higher-level interface, see
+C<L</op_sibling_splice>>.
 
 =for apidoc Am|void|OpLASTSIB_set|OP *o|OP *parent
-Marks o as having no further siblings. On C<PERL_OP_PARENT> builds, marks
-o as having the specified parent. See also C<OpMORESIB_set> and
+Marks C<o> as having no further siblings. On C<PERL_OP_PARENT> builds, marks
+o as having the specified parent. See also C<L</OpMORESIB_set>> and
 C<OpMAYBESIB_set>. For a higher-level interface, see
-C<op_sibling_splice>.
+C<L</op_sibling_splice>>.
 
 =for apidoc Am|void|OpMAYBESIB_set|OP *o|OP *sib|OP *parent
 Conditionally does C<OpMORESIB_set> or C<OpLASTSIB_set> depending on whether
-sib is non-null. For a higher-level interface, see C<op_sibling_splice>.
+C<sib> is non-null. For a higher-level interface, see C<L</op_sibling_splice>>.
 
 =cut
 */
@@ -1075,6 +1076,12 @@ sib is non-null. For a higher-level interface, see C<op_sibling_splice>.
 #define MDEREF_MASK         0x7F
 #define MDEREF_SHIFT           7
 
+#if defined(PERL_IN_DOOP_C) || defined(PERL_IN_PP_C)
+static const char * const deprecated_above_ff_msg
+    = "Use of strings with code points over 0xFF as arguments to "
+      "%s operator is deprecated";
+#endif
+
 
 /*
  * ex: set ts=8 sts=4 sw=4 et:
diff --git a/Master/tlpkg/tlperl/lib/CORE/op_reg_common.h b/Master/tlpkg/tlperl/lib/CORE/op_reg_common.h
index 6b5841eb203..c500aa4180e 100644
--- a/Master/tlpkg/tlperl/lib/CORE/op_reg_common.h
+++ b/Master/tlpkg/tlperl/lib/CORE/op_reg_common.h
@@ -104,8 +104,10 @@ get_regex_charset(const U32 flags)
 #define RXf_PMf_COMPILETIME    (RXf_PMf_MULTILINE|RXf_PMf_SINGLELINE|RXf_PMf_FOLD|RXf_PMf_EXTENDED|RXf_PMf_EXTENDED_MORE|RXf_PMf_KEEPCOPY|RXf_PMf_NOCAPTURE|RXf_PMf_CHARSET|RXf_PMf_STRICT)
 #define RXf_PMf_FLAGCOPYMASK   (RXf_PMf_COMPILETIME|RXf_PMf_SPLIT)
 
-#if 0   /* Temporary to get Jenkins happy again */
-See thread starting at http://nntp.perl.org/group/perl.perl5.porters/220710
+/* Temporary to get Jenkins happy again
+ * See thread starting at http://nntp.perl.org/group/perl.perl5.porters/220710
+ */
+#if 0
     /* Exclude win32 because it can't cope with I32_MAX definition */
 #ifndef WIN32
 #   if RXf_PMf_COMPILETIME > I32_MAX
diff --git a/Master/tlpkg/tlperl/lib/CORE/opcode.h b/Master/tlpkg/tlperl/lib/CORE/opcode.h
index 5c4254b6026..5ec8f58e702 100644
--- a/Master/tlpkg/tlperl/lib/CORE/opcode.h
+++ b/Master/tlpkg/tlperl/lib/CORE/opcode.h
@@ -22,11 +22,9 @@
 #define Perl_pp_chomp Perl_pp_chop
 #define Perl_pp_schomp Perl_pp_schop
 #define Perl_pp_i_preinc Perl_pp_preinc
-#define Perl_pp_predec Perl_pp_preinc
-#define Perl_pp_i_predec Perl_pp_preinc
+#define Perl_pp_i_predec Perl_pp_predec
 #define Perl_pp_i_postinc Perl_pp_postinc
-#define Perl_pp_postdec Perl_pp_postinc
-#define Perl_pp_i_postdec Perl_pp_postinc
+#define Perl_pp_i_postdec Perl_pp_postdec
 #define Perl_pp_slt Perl_pp_sle
 #define Perl_pp_sgt Perl_pp_sle
 #define Perl_pp_sge Perl_pp_sle
@@ -142,8 +140,6 @@
 #define Perl_pp_sgrent Perl_pp_ehostent
 #define Perl_pp_egrent Perl_pp_ehostent
 #define Perl_pp_custom Perl_unimplemented_op
-#define Perl_pp_reach Perl_pp_rkeys
-#define Perl_pp_rvalues Perl_pp_rkeys
 START_EXTERN_C
 
 #ifndef DOINIT
@@ -531,9 +527,6 @@ EXTCONST char* const PL_op_name[] = {
 	"lock",
 	"once",
 	"custom",
-	"reach",
-	"rkeys",
-	"rvalues",
 	"coreargs",
 	"runcv",
 	"fc",
@@ -935,9 +928,6 @@ EXTCONST char* const PL_op_desc[] = {
 	"lock",
 	"once",
 	"unknown custom operator",
-	"each on reference",
-	"keys on reference",
-	"values on reference",
 	"CORE:: subroutine",
 	"__SUB__",
 	"fc",
@@ -1021,12 +1011,12 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 	Perl_pp_pos,
 	Perl_pp_preinc,
 	Perl_pp_i_preinc,	/* implemented by Perl_pp_preinc */
-	Perl_pp_predec,	/* implemented by Perl_pp_preinc */
-	Perl_pp_i_predec,	/* implemented by Perl_pp_preinc */
+	Perl_pp_predec,
+	Perl_pp_i_predec,	/* implemented by Perl_pp_predec */
 	Perl_pp_postinc,
 	Perl_pp_i_postinc,	/* implemented by Perl_pp_postinc */
-	Perl_pp_postdec,	/* implemented by Perl_pp_postinc */
-	Perl_pp_i_postdec,	/* implemented by Perl_pp_postinc */
+	Perl_pp_postdec,
+	Perl_pp_i_postdec,	/* implemented by Perl_pp_postdec */
 	Perl_pp_pow,
 	Perl_pp_multiply,
 	Perl_pp_i_multiply,
@@ -1353,9 +1343,6 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 	Perl_pp_lock,
 	Perl_pp_once,
 	Perl_pp_custom,	/* implemented by Perl_unimplemented_op */
-	Perl_pp_reach,	/* implemented by Perl_pp_rkeys */
-	Perl_pp_rkeys,
-	Perl_pp_rvalues,	/* implemented by Perl_pp_rkeys */
 	Perl_pp_coreargs,
 	Perl_pp_runcv,
 	Perl_pp_fc,
@@ -1767,9 +1754,6 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
 	Perl_ck_rfun,		/* lock */
 	Perl_ck_null,		/* once */
 	Perl_ck_null,		/* custom */
-	Perl_ck_each,		/* reach */
-	Perl_ck_each,		/* rkeys */
-	Perl_ck_each,		/* rvalues */
 	Perl_ck_null,		/* coreargs */
 	Perl_ck_null,		/* runcv */
 	Perl_ck_fun,		/* fc */
@@ -2175,9 +2159,6 @@ EXTCONST U32 PL_opargs[] = {
 	0x00007b04,	/* lock */
 	0x00000300,	/* once */
 	0x00000000,	/* custom */
-	0x00001b40,	/* reach */
-	0x00001b08,	/* rkeys */
-	0x00001b48,	/* rvalues */
 	0x00000600,	/* coreargs */
 	0x00000004,	/* runcv */
 	0x00009b8e,	/* fc */
@@ -2208,8 +2189,8 @@ END_EXTERN_C
 #define OPpCOREARGS_DEREF2      0x02
 #define OPpEVAL_HAS_HH          0x02
 #define OPpFT_ACCESS            0x02
-#define OPpGREP_LEX             0x02
 #define OPpHINT_STRICT_REFS     0x02
+#define OPpITER_REVERSED        0x02
 #define OPpSORT_INTEGER         0x02
 #define OPpTRANS_TO_UTF         0x02
 #define OPpARG2_MASK            0x03
@@ -2218,7 +2199,6 @@ END_EXTERN_C
 #define OPpENTERSUB_HASTARG     0x04
 #define OPpEVAL_UNICODE         0x04
 #define OPpFT_STACKED           0x04
-#define OPpITER_REVERSED        0x04
 #define OPpLVREF_ELEM           0x04
 #define OPpSLICEWARNING         0x04
 #define OPpSORT_REVERSE         0x04
@@ -2236,6 +2216,7 @@ END_EXTERN_C
 #define OPpSORT_INPLACE         0x08
 #define OPpTRANS_SQUASH         0x08
 #define OPpARG4_MASK            0x0f
+#define OPpASSIGN_COMMON_AGG    0x10
 #define OPpCONST_ENTERED        0x10
 #define OPpDEREF_AV             0x10
 #define OPpEVAL_COPHH           0x10
@@ -2247,6 +2228,7 @@ END_EXTERN_C
 #define OPpSORT_DESCEND         0x10
 #define OPpSUBSTR_REPL_FIRST    0x10
 #define OPpTARGET_MY            0x10
+#define OPpASSIGN_COMMON_RC1    0x20
 #define OPpDEREF_HV             0x20
 #define OPpEARLY_CV             0x20
 #define OPpEVAL_RE_REPARSING    0x20
@@ -2264,7 +2246,7 @@ END_EXTERN_C
 #define OPpLVREF_TYPE           0x30
 #define OPpALLOW_FAKE           0x40
 #define OPpASSIGN_BACKWARDS     0x40
-#define OPpASSIGN_COMMON        0x40
+#define OPpASSIGN_COMMON_SCALAR 0x40
 #define OPpCONST_BARE           0x40
 #define OPpCOREARGS_SCALARMOD   0x40
 #define OPpENTERSUB_DB          0x40
@@ -2327,8 +2309,10 @@ EXTCONST char PL_op_private_labels[] = {
     'B','O','O','L','\0',
     'B','O','O','L','?','\0',
     'B','Y','T','E','S','\0',
-    'C','O','M','M','O','N','\0',
     'C','O','M','P','L','\0',
+    'C','O','M','_','A','G','G','\0',
+    'C','O','M','_','R','C','1','\0',
+    'C','O','M','_','S','C','A','L','A','R','\0',
     'C','O','N','S','T','\0',
     'C','O','P','H','H','\0',
     'C','V','\0',
@@ -2353,7 +2337,6 @@ EXTCONST char PL_op_private_labels[] = {
     'F','T','A','F','T','E','R','t','\0',
     'F','T','S','T','A','C','K','E','D','\0',
     'F','T','S','T','A','C','K','I','N','G','\0',
-    'G','R','E','P','L','E','X','\0',
     'G','R','O','W','S','\0',
     'G','U','E','S','S','E','D','\0',
     'H','A','S','_','H','H','\0',
@@ -2422,8 +2405,8 @@ EXTCONST I16 PL_op_private_bitfields[] = {
     0, 8, -1,
     0, 8, -1,
     0, 8, -1,
-    4, -1, 1, 137, 2, 144, 3, 151, -1,
-    4, -1, 0, 495, 1, 26, 2, 264, 3, 83, -1,
+    4, -1, 1, 157, 2, 164, 3, 171, -1,
+    4, -1, 0, 507, 1, 26, 2, 276, 3, 103, -1,
 
 };
 
@@ -2446,18 +2429,18 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
       20, /* padhv */
       -1, /* padany */
       26, /* pushre */
-      28, /* rv2gv */
-      35, /* rv2sv */
-      40, /* av2arylen */
-      42, /* rv2cv */
+      27, /* rv2gv */
+      34, /* rv2sv */
+      39, /* av2arylen */
+      41, /* rv2cv */
       -1, /* anoncode */
        0, /* prototype */
        0, /* refgen */
        0, /* srefgen */
        0, /* ref */
-      49, /* bless */
-      50, /* backtick */
-      49, /* glob */
+      48, /* bless */
+      49, /* backtick */
+      48, /* glob */
        0, /* readline */
       -1, /* rcatline */
        0, /* regcmaybe */
@@ -2466,11 +2449,11 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
       26, /* match */
       26, /* qr */
       26, /* subst */
-      55, /* substcont */
-      57, /* trans */
-      57, /* transr */
-      65, /* sassign */
-      68, /* aassign */
+      54, /* substcont */
+      56, /* trans */
+      56, /* transr */
+      63, /* sassign */
+      66, /* aassign */
        0, /* chop */
        0, /* schop */
       71, /* chomp */
@@ -2478,7 +2461,7 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
        0, /* defined */
        0, /* undef */
        0, /* study */
-      40, /* pos */
+      39, /* pos */
        0, /* preinc */
        0, /* i_preinc */
        0, /* predec */
@@ -2557,8 +2540,8 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
       82, /* vec */
       77, /* index */
       77, /* rindex */
-      49, /* sprintf */
-      49, /* formline */
+      48, /* sprintf */
+      48, /* formline */
       71, /* ord */
       71, /* chr */
       77, /* crypt */
@@ -2578,7 +2561,7 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
        0, /* avalues */
        0, /* each */
        0, /* values */
-      40, /* keys */
+      39, /* keys */
      100, /* delete */
      103, /* exists */
      105, /* rv2hv */
@@ -2586,62 +2569,62 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
       96, /* hslice */
       99, /* kvhslice */
      113, /* multideref */
-      49, /* unpack */
-      49, /* pack */
+      48, /* unpack */
+      48, /* pack */
      120, /* split */
-      49, /* join */
+      48, /* join */
      122, /* list */
       12, /* lslice */
-      49, /* anonlist */
-      49, /* anonhash */
-      49, /* splice */
+      48, /* anonlist */
+      48, /* anonhash */
+      48, /* splice */
       77, /* push */
        0, /* pop */
        0, /* shift */
       77, /* unshift */
      124, /* sort */
      131, /* reverse */
-     133, /* grepstart */
-     133, /* grepwhile */
-     133, /* mapstart */
-     133, /* mapwhile */
+       0, /* grepstart */
+       0, /* grepwhile */
+       0, /* mapstart */
+       0, /* mapwhile */
        0, /* range */
-     135, /* flip */
-     135, /* flop */
+     133, /* flip */
+     133, /* flop */
        0, /* and */
        0, /* or */
       12, /* xor */
        0, /* dor */
-     137, /* cond_expr */
+     135, /* cond_expr */
        0, /* andassign */
        0, /* orassign */
        0, /* dorassign */
        0, /* method */
-     139, /* entersub */
-     146, /* leavesub */
-     146, /* leavesublv */
-     148, /* caller */
-      49, /* warn */
-      49, /* die */
-      49, /* reset */
+     137, /* entersub */
+     144, /* leavesub */
+     144, /* leavesublv */
+     146, /* caller */
+      48, /* warn */
+      48, /* die */
+      48, /* reset */
       -1, /* lineseq */
-     150, /* nextstate */
-     150, /* dbstate */
+     148, /* nextstate */
+     148, /* dbstate */
       -1, /* unstack */
       -1, /* enter */
-     151, /* leave */
+     149, /* leave */
       -1, /* scope */
-     153, /* enteriter */
-     157, /* iter */
+     151, /* enteriter */
+     155, /* iter */
       -1, /* enterloop */
-     158, /* leaveloop */
+     156, /* leaveloop */
       -1, /* return */
-     160, /* last */
-     160, /* next */
-     160, /* redo */
-     160, /* dump */
-     160, /* goto */
-      49, /* exit */
+     158, /* last */
+     158, /* next */
+     158, /* redo */
+     158, /* dump */
+     158, /* goto */
+      48, /* exit */
        0, /* method_named */
        0, /* method_super */
        0, /* method_redir */
@@ -2652,79 +2635,79 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
        0, /* leavewhen */
       -1, /* break */
       -1, /* continue */
-     162, /* open */
-      49, /* close */
-      49, /* pipe_op */
-      49, /* fileno */
-      49, /* umask */
-      49, /* binmode */
-      49, /* tie */
+     160, /* open */
+      48, /* close */
+      48, /* pipe_op */
+      48, /* fileno */
+      48, /* umask */
+      48, /* binmode */
+      48, /* tie */
        0, /* untie */
        0, /* tied */
-      49, /* dbmopen */
+      48, /* dbmopen */
        0, /* dbmclose */
-      49, /* sselect */
-      49, /* select */
-      49, /* getc */
-      49, /* read */
-      49, /* enterwrite */
-     146, /* leavewrite */
+      48, /* sselect */
+      48, /* select */
+      48, /* getc */
+      48, /* read */
+      48, /* enterwrite */
+     144, /* leavewrite */
       -1, /* prtf */
       -1, /* print */
       -1, /* say */
-      49, /* sysopen */
-      49, /* sysseek */
-      49, /* sysread */
-      49, /* syswrite */
-      49, /* eof */
-      49, /* tell */
-      49, /* seek */
-      49, /* truncate */
-      49, /* fcntl */
-      49, /* ioctl */
+      48, /* sysopen */
+      48, /* sysseek */
+      48, /* sysread */
+      48, /* syswrite */
+      48, /* eof */
+      48, /* tell */
+      48, /* seek */
+      48, /* truncate */
+      48, /* fcntl */
+      48, /* ioctl */
       77, /* flock */
-      49, /* send */
-      49, /* recv */
-      49, /* socket */
-      49, /* sockpair */
-      49, /* bind */
-      49, /* connect */
-      49, /* listen */
-      49, /* accept */
-      49, /* shutdown */
-      49, /* gsockopt */
-      49, /* ssockopt */
+      48, /* send */
+      48, /* recv */
+      48, /* socket */
+      48, /* sockpair */
+      48, /* bind */
+      48, /* connect */
+      48, /* listen */
+      48, /* accept */
+      48, /* shutdown */
+      48, /* gsockopt */
+      48, /* ssockopt */
        0, /* getsockname */
        0, /* getpeername */
        0, /* lstat */
        0, /* stat */
-     167, /* ftrread */
-     167, /* ftrwrite */
-     167, /* ftrexec */
-     167, /* fteread */
-     167, /* ftewrite */
-     167, /* fteexec */
-     172, /* ftis */
-     172, /* ftsize */
-     172, /* ftmtime */
-     172, /* ftatime */
-     172, /* ftctime */
-     172, /* ftrowned */
-     172, /* fteowned */
-     172, /* ftzero */
-     172, /* ftsock */
-     172, /* ftchr */
-     172, /* ftblk */
-     172, /* ftfile */
-     172, /* ftdir */
-     172, /* ftpipe */
-     172, /* ftsuid */
-     172, /* ftsgid */
-     172, /* ftsvtx */
-     172, /* ftlink */
-     172, /* fttty */
-     172, /* fttext */
-     172, /* ftbinary */
+     165, /* ftrread */
+     165, /* ftrwrite */
+     165, /* ftrexec */
+     165, /* fteread */
+     165, /* ftewrite */
+     165, /* fteexec */
+     170, /* ftis */
+     170, /* ftsize */
+     170, /* ftmtime */
+     170, /* ftatime */
+     170, /* ftctime */
+     170, /* ftrowned */
+     170, /* fteowned */
+     170, /* ftzero */
+     170, /* ftsock */
+     170, /* ftchr */
+     170, /* ftblk */
+     170, /* ftfile */
+     170, /* ftdir */
+     170, /* ftpipe */
+     170, /* ftsuid */
+     170, /* ftsgid */
+     170, /* ftsvtx */
+     170, /* ftlink */
+     170, /* fttty */
+     170, /* fttext */
+     170, /* ftbinary */
       77, /* chdir */
       77, /* chown */
       71, /* chroot */
@@ -2737,58 +2720,58 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
        0, /* readlink */
       77, /* mkdir */
       71, /* rmdir */
-      49, /* open_dir */
+      48, /* open_dir */
        0, /* readdir */
        0, /* telldir */
-      49, /* seekdir */
+      48, /* seekdir */
        0, /* rewinddir */
        0, /* closedir */
       -1, /* fork */
-     176, /* wait */
+     174, /* wait */
       77, /* waitpid */
       77, /* system */
       77, /* exec */
       77, /* kill */
-     176, /* getppid */
+     174, /* getppid */
       77, /* getpgrp */
       77, /* setpgrp */
       77, /* getpriority */
       77, /* setpriority */
-     176, /* time */
+     174, /* time */
       -1, /* tms */
        0, /* localtime */
-      49, /* gmtime */
+      48, /* gmtime */
        0, /* alarm */
       77, /* sleep */
-      49, /* shmget */
-      49, /* shmctl */
-      49, /* shmread */
-      49, /* shmwrite */
-      49, /* msgget */
-      49, /* msgctl */
-      49, /* msgsnd */
-      49, /* msgrcv */
-      49, /* semop */
-      49, /* semget */
-      49, /* semctl */
+      48, /* shmget */
+      48, /* shmctl */
+      48, /* shmread */
+      48, /* shmwrite */
+      48, /* msgget */
+      48, /* msgctl */
+      48, /* msgsnd */
+      48, /* msgrcv */
+      48, /* semop */
+      48, /* semget */
+      48, /* semctl */
        0, /* require */
        0, /* dofile */
       -1, /* hintseval */
-     177, /* entereval */
-     146, /* leaveeval */
+     175, /* entereval */
+     144, /* leaveeval */
        0, /* entertry */
       -1, /* leavetry */
        0, /* ghbyname */
-      49, /* ghbyaddr */
+      48, /* ghbyaddr */
       -1, /* ghostent */
        0, /* gnbyname */
-      49, /* gnbyaddr */
+      48, /* gnbyaddr */
       -1, /* gnetent */
        0, /* gpbyname */
-      49, /* gpbynumber */
+      48, /* gpbynumber */
       -1, /* gprotoent */
-      49, /* gsbyname */
-      49, /* gsbyport */
+      48, /* gsbyname */
+      48, /* gsbyport */
       -1, /* gservent */
        0, /* shostent */
        0, /* snetent */
@@ -2809,24 +2792,21 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
       -1, /* sgrent */
       -1, /* egrent */
       -1, /* getlogin */
-      49, /* syscall */
+      48, /* syscall */
        0, /* lock */
        0, /* once */
       -1, /* custom */
-       0, /* reach */
-      40, /* rkeys */
-       0, /* rvalues */
-     183, /* coreargs */
+     181, /* coreargs */
        3, /* runcv */
        0, /* fc */
       -1, /* padcv */
       -1, /* introcv */
       -1, /* clonecv */
-     187, /* padrange */
-     189, /* refassign */
-     195, /* lvref */
-     201, /* lvrefslice */
-     202, /* lvavref */
+     185, /* padrange */
+     187, /* refassign */
+     193, /* lvref */
+     199, /* lvrefslice */
+     200, /* lvavref */
        0, /* anonconst */
 
 };
@@ -2846,69 +2826,68 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
  */
 
 EXTCONST U16  PL_op_private_bitdefs[] = {
-    0x0003, /* scalar, prototype, refgen, srefgen, ref, readline, regcmaybe, regcreset, regcomp, chop, schop, defined, undef, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, negate, i_negate, not, complement, ucfirst, lcfirst, uc, lc, quotemeta, aeach, akeys, avalues, each, values, pop, shift, range, and, or, dor, andassign, orassign, dorassign, method, method_named, method_super, method_redir, method_redir_super, entergiven, leavegiven, enterwhen, leavewhen, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, reach, rvalues, fc, anonconst */
-    0x29dc, 0x3bd9, /* pushmark */
+    0x0003, /* scalar, prototype, refgen, srefgen, ref, readline, regcmaybe, regcreset, regcomp, chop, schop, defined, undef, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, negate, i_negate, not, complement, ucfirst, lcfirst, uc, lc, quotemeta, aeach, akeys, avalues, each, values, pop, shift, grepstart, grepwhile, mapstart, mapwhile, range, and, or, dor, andassign, orassign, dorassign, method, method_named, method_super, method_redir, method_redir_super, entergiven, leavegiven, enterwhen, leavewhen, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, fc, anonconst */
+    0x2b5c, 0x3d59, /* pushmark */
     0x00bd, /* wantarray, runcv */
-    0x03b8, 0x1570, 0x3c8c, 0x3748, 0x2da5, /* const */
-    0x29dc, 0x2ef9, /* gvsv */
-    0x13d5, /* gv */
+    0x03b8, 0x17f0, 0x3e0c, 0x38c8, 0x2f25, /* const */
+    0x2b5c, 0x3079, /* gvsv */
+    0x1655, /* gv */
     0x0067, /* gelem, lt, i_lt, gt, i_gt, le, i_le, ge, i_ge, eq, i_eq, ne, i_ne, ncmp, i_ncmp, slt, sgt, sle, sge, seq, sne, scmp, bit_and, bit_xor, bit_or, sbit_and, sbit_xor, sbit_or, smartmatch, lslice, xor */
-    0x29dc, 0x3bd8, 0x0257, /* padsv */
-    0x29dc, 0x3bd8, 0x2acc, 0x38c9, /* padav */
-    0x29dc, 0x3bd8, 0x0534, 0x05d0, 0x2acc, 0x38c9, /* padhv */
-    0x3698, 0x3ef1, /* pushre, match, qr, subst */
-    0x29dc, 0x1758, 0x0256, 0x2acc, 0x2cc8, 0x3c84, 0x0003, /* rv2gv */
-    0x29dc, 0x2ef8, 0x0256, 0x3c84, 0x0003, /* rv2sv */
-    0x2acc, 0x0003, /* av2arylen, pos, keys, rkeys */
-    0x2c3c, 0x0b98, 0x08f4, 0x028c, 0x3e48, 0x3c84, 0x0003, /* rv2cv */
+    0x2b5c, 0x3d58, 0x0257, /* padsv */
+    0x2b5c, 0x3d58, 0x2c4c, 0x3a49, /* padav */
+    0x2b5c, 0x3d58, 0x0534, 0x05d0, 0x2c4c, 0x3a49, /* padhv */
+    0x3819, /* pushre, match, qr, subst */
+    0x2b5c, 0x19d8, 0x0256, 0x2c4c, 0x2e48, 0x3e04, 0x0003, /* rv2gv */
+    0x2b5c, 0x3078, 0x0256, 0x3e04, 0x0003, /* rv2sv */
+    0x2c4c, 0x0003, /* av2arylen, pos, keys */
+    0x2dbc, 0x0e18, 0x0b74, 0x028c, 0x3fc8, 0x3e04, 0x0003, /* rv2cv */
     0x012f, /* bless, glob, sprintf, formline, unpack, pack, join, anonlist, anonhash, splice, warn, die, reset, exit, close, pipe_op, fileno, umask, binmode, tie, dbmopen, sselect, select, getc, read, enterwrite, sysopen, sysseek, sysread, syswrite, eof, tell, seek, truncate, fcntl, ioctl, send, recv, socket, sockpair, bind, connect, listen, accept, shutdown, gsockopt, ssockopt, open_dir, seekdir, gmtime, shmget, shmctl, shmread, shmwrite, msgget, msgctl, msgsnd, msgrcv, semop, semget, semctl, ghbyaddr, gnbyaddr, gpbynumber, gsbyname, gsbyport, syscall */
-    0x30dc, 0x2ff8, 0x24b4, 0x23f0, 0x0003, /* backtick */
-    0x3698, 0x0003, /* substcont */
-    0x0c9c, 0x1dd8, 0x0834, 0x3ef0, 0x3a0c, 0x2168, 0x01e4, 0x0141, /* trans, transr */
-    0x0adc, 0x0458, 0x0067, /* sassign */
-    0x0758, 0x2acc, 0x0067, /* aassign */
-    0x3ef0, 0x0003, /* chomp, schomp, ncomplement, scomplement, sin, cos, exp, log, sqrt, int, hex, oct, abs, length, ord, chr, chroot, rmdir */
-    0x3ef0, 0x0067, /* pow, multiply, i_multiply, divide, i_divide, modulo, i_modulo, add, i_add, subtract, i_subtract, concat, left_shift, right_shift, nbit_and, nbit_xor, nbit_or */
-    0x1058, 0x0067, /* repeat */
-    0x3ef0, 0x012f, /* stringify, atan2, rand, srand, index, rindex, crypt, push, unshift, flock, chdir, chown, unlink, chmod, utime, rename, link, symlink, mkdir, waitpid, system, exec, kill, getpgrp, setpgrp, getpriority, setpriority, sleep */
-    0x33f0, 0x2acc, 0x00cb, /* substr */
-    0x2acc, 0x0067, /* vec */
-    0x29dc, 0x2ef8, 0x2acc, 0x38c8, 0x3c84, 0x0003, /* rv2av */
+    0x325c, 0x3178, 0x2634, 0x2570, 0x0003, /* backtick */
+    0x3818, 0x0003, /* substcont */
+    0x0f1c, 0x1f58, 0x0754, 0x3b8c, 0x22e8, 0x01e4, 0x0141, /* trans, transr */
+    0x0d5c, 0x0458, 0x0067, /* sassign */
+    0x0a18, 0x0914, 0x0810, 0x2c4c, 0x0067, /* aassign */
+    0x4070, 0x0003, /* chomp, schomp, ncomplement, scomplement, sin, cos, exp, log, sqrt, int, hex, oct, abs, length, ord, chr, chroot, rmdir */
+    0x4070, 0x0067, /* pow, multiply, i_multiply, divide, i_divide, modulo, i_modulo, add, i_add, subtract, i_subtract, concat, left_shift, right_shift, nbit_and, nbit_xor, nbit_or */
+    0x12d8, 0x0067, /* repeat */
+    0x4070, 0x012f, /* stringify, atan2, rand, srand, index, rindex, crypt, push, unshift, flock, chdir, chown, unlink, chmod, utime, rename, link, symlink, mkdir, waitpid, system, exec, kill, getpgrp, setpgrp, getpriority, setpriority, sleep */
+    0x3570, 0x2c4c, 0x00cb, /* substr */
+    0x2c4c, 0x0067, /* vec */
+    0x2b5c, 0x3078, 0x2c4c, 0x3a48, 0x3e04, 0x0003, /* rv2av */
     0x01ff, /* aelemfast, aelemfast_lex */
-    0x29dc, 0x28d8, 0x0256, 0x2acc, 0x0067, /* aelem, helem */
-    0x29dc, 0x2acc, 0x38c9, /* aslice, hslice */
-    0x2acd, /* kvaslice, kvhslice */
-    0x29dc, 0x3818, 0x0003, /* delete */
-    0x3d78, 0x0003, /* exists */
-    0x29dc, 0x2ef8, 0x0534, 0x05d0, 0x2acc, 0x38c8, 0x3c84, 0x0003, /* rv2hv */
-    0x29dc, 0x28d8, 0x0d14, 0x1670, 0x2acc, 0x3c84, 0x0003, /* multideref */
-    0x223c, 0x2ef9, /* split */
-    0x29dc, 0x1e99, /* list */
-    0x3af8, 0x3194, 0x0fb0, 0x254c, 0x34e8, 0x2644, 0x2e61, /* sort */
-    0x254c, 0x0003, /* reverse */
-    0x1cc4, 0x0003, /* grepstart, grepwhile, mapstart, mapwhile */
-    0x2778, 0x0003, /* flip, flop */
-    0x29dc, 0x0003, /* cond_expr */
-    0x29dc, 0x0b98, 0x0256, 0x028c, 0x3e48, 0x3c84, 0x2301, /* entersub */
-    0x3258, 0x0003, /* leavesub, leavesublv, leavewrite, leaveeval */
+    0x2b5c, 0x2a58, 0x0256, 0x2c4c, 0x0067, /* aelem, helem */
+    0x2b5c, 0x2c4c, 0x3a49, /* aslice, hslice */
+    0x2c4d, /* kvaslice, kvhslice */
+    0x2b5c, 0x3998, 0x0003, /* delete */
+    0x3ef8, 0x0003, /* exists */
+    0x2b5c, 0x3078, 0x0534, 0x05d0, 0x2c4c, 0x3a48, 0x3e04, 0x0003, /* rv2hv */
+    0x2b5c, 0x2a58, 0x0f94, 0x18f0, 0x2c4c, 0x3e04, 0x0003, /* multideref */
+    0x23bc, 0x3079, /* split */
+    0x2b5c, 0x2019, /* list */
+    0x3c78, 0x3314, 0x1230, 0x26cc, 0x3668, 0x27c4, 0x2fe1, /* sort */
+    0x26cc, 0x0003, /* reverse */
+    0x28f8, 0x0003, /* flip, flop */
+    0x2b5c, 0x0003, /* cond_expr */
+    0x2b5c, 0x0e18, 0x0256, 0x028c, 0x3fc8, 0x3e04, 0x2481, /* entersub */
+    0x33d8, 0x0003, /* leavesub, leavesublv, leavewrite, leaveeval */
     0x00bc, 0x012f, /* caller */
-    0x2075, /* nextstate, dbstate */
-    0x287c, 0x3259, /* leave */
-    0x29dc, 0x2ef8, 0x0c0c, 0x3569, /* enteriter */
-    0x3569, /* iter */
-    0x287c, 0x0067, /* leaveloop */
-    0x405c, 0x0003, /* last, next, redo, dump, goto */
-    0x30dc, 0x2ff8, 0x24b4, 0x23f0, 0x012f, /* open */
-    0x1910, 0x1b6c, 0x1a28, 0x17e4, 0x0003, /* ftrread, ftrwrite, ftrexec, fteread, ftewrite, fteexec */
-    0x1910, 0x1b6c, 0x1a28, 0x0003, /* ftis, ftsize, ftmtime, ftatime, ftctime, ftrowned, fteowned, ftzero, ftsock, ftchr, ftblk, ftfile, ftdir, ftpipe, ftsuid, ftsgid, ftsvtx, ftlink, fttty, fttext, ftbinary */
-    0x3ef1, /* wait, getppid, time */
-    0x32f4, 0x09b0, 0x068c, 0x3fc8, 0x1f84, 0x0003, /* entereval */
-    0x2b9c, 0x0018, 0x0ec4, 0x0de1, /* coreargs */
-    0x29dc, 0x019b, /* padrange */
-    0x29dc, 0x3bd8, 0x0376, 0x26cc, 0x14c8, 0x0067, /* refassign */
-    0x29dc, 0x3bd8, 0x0376, 0x26cc, 0x14c8, 0x0003, /* lvref */
-    0x29dd, /* lvrefslice */
-    0x29dc, 0x3bd8, 0x0003, /* lvavref */
+    0x21f5, /* nextstate, dbstate */
+    0x29fc, 0x33d9, /* leave */
+    0x2b5c, 0x3078, 0x0e8c, 0x36e5, /* enteriter */
+    0x36e5, /* iter */
+    0x29fc, 0x0067, /* leaveloop */
+    0x41dc, 0x0003, /* last, next, redo, dump, goto */
+    0x325c, 0x3178, 0x2634, 0x2570, 0x012f, /* open */
+    0x1b90, 0x1dec, 0x1ca8, 0x1a64, 0x0003, /* ftrread, ftrwrite, ftrexec, fteread, ftewrite, fteexec */
+    0x1b90, 0x1dec, 0x1ca8, 0x0003, /* ftis, ftsize, ftmtime, ftatime, ftctime, ftrowned, fteowned, ftzero, ftsock, ftchr, ftblk, ftfile, ftdir, ftpipe, ftsuid, ftsgid, ftsvtx, ftlink, fttty, fttext, ftbinary */
+    0x4071, /* wait, getppid, time */
+    0x3474, 0x0c30, 0x068c, 0x4148, 0x2104, 0x0003, /* entereval */
+    0x2d1c, 0x0018, 0x1144, 0x1061, /* coreargs */
+    0x2b5c, 0x019b, /* padrange */
+    0x2b5c, 0x3d58, 0x0376, 0x284c, 0x1748, 0x0067, /* refassign */
+    0x2b5c, 0x3d58, 0x0376, 0x284c, 0x1748, 0x0003, /* lvref */
+    0x2b5d, /* lvrefslice */
+    0x2b5c, 0x3d58, 0x0003, /* lvavref */
 
 };
 
@@ -2930,7 +2909,7 @@ EXTCONST U8 PL_op_private_valid[] = {
     /* PADAV      */ (OPpSLICEWARNING|OPpMAYBE_LVSUB|OPpPAD_STATE|OPpLVAL_INTRO),
     /* PADHV      */ (OPpSLICEWARNING|OPpMAYBE_LVSUB|OPpMAYBE_TRUEBOOL|OPpTRUEBOOL|OPpPAD_STATE|OPpLVAL_INTRO),
     /* PADANY     */ (0),
-    /* PUSHRE     */ (OPpTARGET_MY|OPpRUNTIME),
+    /* PUSHRE     */ (OPpRUNTIME),
     /* RV2GV      */ (OPpARG1_MASK|OPpHINT_STRICT_REFS|OPpDONT_INIT_GV|OPpMAYBE_LVSUB|OPpDEREF|OPpALLOW_FAKE|OPpLVAL_INTRO),
     /* RV2SV      */ (OPpARG1_MASK|OPpHINT_STRICT_REFS|OPpDEREF|OPpOUR_INTRO|OPpLVAL_INTRO),
     /* AV2ARYLEN  */ (OPpARG1_MASK|OPpMAYBE_LVSUB),
@@ -2948,14 +2927,14 @@ EXTCONST U8 PL_op_private_valid[] = {
     /* REGCMAYBE  */ (OPpARG1_MASK),
     /* REGCRESET  */ (OPpARG1_MASK),
     /* REGCOMP    */ (OPpARG1_MASK),
-    /* MATCH      */ (OPpTARGET_MY|OPpRUNTIME),
-    /* QR         */ (OPpTARGET_MY|OPpRUNTIME),
-    /* SUBST      */ (OPpTARGET_MY|OPpRUNTIME),
+    /* MATCH      */ (OPpRUNTIME),
+    /* QR         */ (OPpRUNTIME),
+    /* SUBST      */ (OPpRUNTIME),
     /* SUBSTCONT  */ (OPpARG1_MASK|OPpRUNTIME),
-    /* TRANS      */ (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF|OPpTRANS_IDENTICAL|OPpTRANS_SQUASH|OPpTARGET_MY|OPpTRANS_COMPLEMENT|OPpTRANS_GROWS|OPpTRANS_DELETE),
-    /* TRANSR     */ (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF|OPpTRANS_IDENTICAL|OPpTRANS_SQUASH|OPpTARGET_MY|OPpTRANS_COMPLEMENT|OPpTRANS_GROWS|OPpTRANS_DELETE),
+    /* TRANS      */ (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF|OPpTRANS_IDENTICAL|OPpTRANS_SQUASH|OPpTRANS_COMPLEMENT|OPpTRANS_GROWS|OPpTRANS_DELETE),
+    /* TRANSR     */ (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF|OPpTRANS_IDENTICAL|OPpTRANS_SQUASH|OPpTRANS_COMPLEMENT|OPpTRANS_GROWS|OPpTRANS_DELETE),
     /* SASSIGN    */ (OPpARG2_MASK|OPpASSIGN_BACKWARDS|OPpASSIGN_CV_TO_GV),
-    /* AASSIGN    */ (OPpARG2_MASK|OPpMAYBE_LVSUB|OPpASSIGN_COMMON),
+    /* AASSIGN    */ (OPpARG2_MASK|OPpMAYBE_LVSUB|OPpASSIGN_COMMON_AGG|OPpASSIGN_COMMON_RC1|OPpASSIGN_COMMON_SCALAR),
     /* CHOP       */ (OPpARG1_MASK),
     /* SCHOP      */ (OPpARG1_MASK),
     /* CHOMP      */ (OPpARG1_MASK|OPpTARGET_MY),
@@ -3086,10 +3065,10 @@ EXTCONST U8 PL_op_private_valid[] = {
     /* UNSHIFT    */ (OPpARG4_MASK|OPpTARGET_MY),
     /* SORT       */ (OPpSORT_NUMERIC|OPpSORT_INTEGER|OPpSORT_REVERSE|OPpSORT_INPLACE|OPpSORT_DESCEND|OPpSORT_QSORT|OPpSORT_STABLE),
     /* REVERSE    */ (OPpARG1_MASK|OPpREVERSE_INPLACE),
-    /* GREPSTART  */ (OPpARG1_MASK|OPpGREP_LEX),
-    /* GREPWHILE  */ (OPpARG1_MASK|OPpGREP_LEX),
-    /* MAPSTART   */ (OPpARG1_MASK|OPpGREP_LEX),
-    /* MAPWHILE   */ (OPpARG1_MASK|OPpGREP_LEX),
+    /* GREPSTART  */ (OPpARG1_MASK),
+    /* GREPWHILE  */ (OPpARG1_MASK),
+    /* MAPSTART   */ (OPpARG1_MASK),
+    /* MAPWHILE   */ (OPpARG1_MASK),
     /* RANGE      */ (OPpARG1_MASK),
     /* FLIP       */ (OPpARG1_MASK|OPpFLIP_LINENUM),
     /* FLOP       */ (OPpARG1_MASK|OPpFLIP_LINENUM),
@@ -3298,9 +3277,6 @@ EXTCONST U8 PL_op_private_valid[] = {
     /* LOCK       */ (OPpARG1_MASK),
     /* ONCE       */ (OPpARG1_MASK),
     /* CUSTOM     */ (0xff),
-    /* REACH      */ (OPpARG1_MASK),
-    /* RKEYS      */ (OPpARG1_MASK|OPpMAYBE_LVSUB),
-    /* RVALUES    */ (OPpARG1_MASK),
     /* COREARGS   */ (OPpCOREARGS_DEREF1|OPpCOREARGS_DEREF2|OPpCOREARGS_SCALARMOD|OPpCOREARGS_PUSHMARK),
     /* RUNCV      */ (OPpOFFBYONE),
     /* FC         */ (OPpARG1_MASK),
diff --git a/Master/tlpkg/tlperl/lib/CORE/opnames.h b/Master/tlpkg/tlperl/lib/CORE/opnames.h
index c225ac42c02..065c1a858f3 100644
--- a/Master/tlpkg/tlperl/lib/CORE/opnames.h
+++ b/Master/tlpkg/tlperl/lib/CORE/opnames.h
@@ -395,25 +395,22 @@ typedef enum opcode {
 	OP_LOCK		 = 378,
 	OP_ONCE		 = 379,
 	OP_CUSTOM	 = 380,
-	OP_REACH	 = 381,
-	OP_RKEYS	 = 382,
-	OP_RVALUES	 = 383,
-	OP_COREARGS	 = 384,
-	OP_RUNCV	 = 385,
-	OP_FC		 = 386,
-	OP_PADCV	 = 387,
-	OP_INTROCV	 = 388,
-	OP_CLONECV	 = 389,
-	OP_PADRANGE	 = 390,
-	OP_REFASSIGN	 = 391,
-	OP_LVREF	 = 392,
-	OP_LVREFSLICE	 = 393,
-	OP_LVAVREF	 = 394,
-	OP_ANONCONST	 = 395,
+	OP_COREARGS	 = 381,
+	OP_RUNCV	 = 382,
+	OP_FC		 = 383,
+	OP_PADCV	 = 384,
+	OP_INTROCV	 = 385,
+	OP_CLONECV	 = 386,
+	OP_PADRANGE	 = 387,
+	OP_REFASSIGN	 = 388,
+	OP_LVREF	 = 389,
+	OP_LVREFSLICE	 = 390,
+	OP_LVAVREF	 = 391,
+	OP_ANONCONST	 = 392,
 	OP_max		
 } opcode;
 
-#define MAXO 396
+#define MAXO 393
 #define OP_FREED MAXO
 
 /* the OP_IS_* macros are optimized to a simple range check because
diff --git a/Master/tlpkg/tlperl/lib/CORE/pad.h b/Master/tlpkg/tlperl/lib/CORE/pad.h
index 1f86248ac69..7ed10333f20 100644
--- a/Master/tlpkg/tlperl/lib/CORE/pad.h
+++ b/Master/tlpkg/tlperl/lib/CORE/pad.h
@@ -33,7 +33,15 @@ typedef U64TYPE PADOFFSET;
 
 struct padlist {
     SSize_t	xpadl_max;	/* max index for which array has space */
-    PAD **	xpadl_alloc;	/* pointer to beginning of array of AVs */
+    union {
+	PAD **	xpadlarr_alloc; /* Pointer to beginning of array of AVs.
+				   index 0 is a padnamelist *          */
+	struct {
+	    PADNAMELIST * padnl;
+	    PAD * pad_1;        /* this slice of PAD * array always alloced */
+	    PAD * pad_2;        /* maybe unalloced */
+	} * xpadlarr_dbg;       /* for use with a C debugger only */
+    } xpadl_arr;
     U32		xpadl_id;	/* Semi-unique ID, shared between clones */
     U32		xpadl_outid;	/* ID of outer pad */
 };
@@ -171,10 +179,10 @@ Save a pad slot (used to restore after an iteration)
 XXX DAPM it would make more sense to make the arg a PADOFFSET
 =for apidoc m|void|SAVECLEARSV	|SV **svp
 Clear the pointed to pad value on scope exit.  (i.e. the runtime action of
-'my')
+C<my>)
 
 =for apidoc m|void|SAVECOMPPAD
-save PL_comppad and PL_curpad
+save C<PL_comppad> and C<PL_curpad>
 
 
 =for apidoc Amx|PAD **|PadlistARRAY|PADLIST padlist
@@ -183,7 +191,7 @@ numbers >= 1, as the 0th entry is not guaranteed to remain usable.
 
 =for apidoc Amx|SSize_t|PadlistMAX|PADLIST padlist
 The index of the last allocated space in the padlist.  Note that the last
-pad may be in an earlier slot.  Any entries following it will be NULL in
+pad may be in an earlier slot.  Any entries following it will be C<NULL> in
 that case.
 
 =for apidoc Amx|PADNAMELIST *|PadlistNAMES|PADLIST padlist
@@ -217,14 +225,14 @@ The C array of pad entries.
 The index of the last pad entry.
 
 =for apidoc Amx|char *|PadnamePV|PADNAME pn	
-The name stored in the pad name struct.  This returns NULL for a target
+The name stored in the pad name struct.  This returns C<NULL> for a target
 slot.
 
 =for apidoc Amx|STRLEN|PadnameLEN|PADNAME pn	
 The length of the name.
 
 =for apidoc Amx|bool|PadnameUTF8|PADNAME pn
-Whether PadnamePV is in UTF8.  Currently, this is always true.
+Whether PadnamePV is in UTF-8.  Currently, this is always true.
 
 =for apidoc Amx|SV *|PadnameSV|PADNAME pn
 Returns the pad name as a mortal SV.
@@ -243,7 +251,7 @@ are often referred to as 'fake'.
 Whether this is a "state" variable.
 
 =for apidoc m|HV *|PadnameTYPE|PADNAME pn
-The stash associated with a typed lexical.  This returns the %Foo:: hash
+The stash associated with a typed lexical.  This returns the C<%Foo::> hash
 for C<my Foo $bar>.
 
 =for apidoc Amx|SSize_t|PadnameREFCNT|PADNAME pn
@@ -284,18 +292,18 @@ like PAD_SET_CUR, but without the save
 Save the current pad then set it to null.
 
 =for apidoc m|void|PAD_SAVE_LOCAL|PAD *opad|PAD *npad
-Save the current pad to the local variable opad, then make the
-current pad equal to npad
+Save the current pad to the local variable C<opad>, then make the
+current pad equal to C<npad>
 
 =for apidoc m|void|PAD_RESTORE_LOCAL|PAD *opad
-Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL()
+Restore the old pad saved into the local variable C<opad> by C<PAD_SAVE_LOCAL()>
 
 =cut
 */
 
-#define PadlistARRAY(pl)	(pl)->xpadl_alloc
+#define PadlistARRAY(pl)	(pl)->xpadl_arr.xpadlarr_alloc
 #define PadlistMAX(pl)		(pl)->xpadl_max
-#define PadlistNAMES(pl)	((PADNAMELIST *)*PadlistARRAY(pl))
+#define PadlistNAMES(pl)	*((PADNAMELIST **)PadlistARRAY(pl))
 #define PadlistNAMESARRAY(pl)	PadnamelistARRAY(PadlistNAMES(pl))
 #define PadlistNAMESMAX(pl)	PadnamelistMAX(PadlistNAMES(pl))
 #define PadlistREFCNT(pl)	1	/* reserved for future use */
@@ -404,7 +412,7 @@ Restore the old pad saved into the local variable opad by PAD_SAVE_LOCAL()
 Save the current pad in the given context block structure.
 
 =for apidoc m|SV *|CX_CURPAD_SV|struct context|PADOFFSET po
-Access the SV at offset po in the saved current pad in the given
+Access the SV at offset C<po> in the saved current pad in the given
 context block structure (can be used as an lvalue).
 
 =cut
@@ -433,12 +441,11 @@ Assumes the slot entry is a valid C<our> lexical.
 
 =for apidoc m|STRLEN|PAD_COMPNAME_GEN|PADOFFSET po
 The generation number of the name at offset C<po> in the current
-compiling pad (lvalue).  Note that C<SvUVX> is hijacked for this purpose.
+compiling pad (lvalue).
 
 =for apidoc m|STRLEN|PAD_COMPNAME_GEN_set|PADOFFSET po|int gen
 Sets the generation number of the name at offset C<po> in the current
-ling pad (lvalue) to C<gen>.  Note that C<SvUV_set> is hijacked for this purpose.
-
+ling pad (lvalue) to C<gen>.
 =cut
 
 */
@@ -493,8 +500,8 @@ Clone the state variables associated with running and compiling pads.
 /*
 =for apidoc Am|PADOFFSET|pad_add_name_pvs|const char *name|U32 flags|HV *typestash|HV *ourstash
 
-Exactly like L</pad_add_name_pvn>, but takes a literal string instead
-of a string/length pair.
+Exactly like L</pad_add_name_pvn>, but takes a C<NUL>-terminated literal string
+instead of a string/length pair.
 
 =cut
 */
@@ -505,8 +512,8 @@ of a string/length pair.
 /*
 =for apidoc Am|PADOFFSET|pad_findmy_pvs|const char *name|U32 flags
 
-Exactly like L</pad_findmy_pvn>, but takes a literal string instead
-of a string/length pair.
+Exactly like L</pad_findmy_pvn>, but takes a C<NUL>-terminated literal string
+instead of a string/length pair.
 
 =cut
 */
diff --git a/Master/tlpkg/tlperl/lib/CORE/patchlevel.h b/Master/tlpkg/tlperl/lib/CORE/patchlevel.h
index bd566121152..0d8ab183f39 100644
--- a/Master/tlpkg/tlperl/lib/CORE/patchlevel.h
+++ b/Master/tlpkg/tlperl/lib/CORE/patchlevel.h
@@ -14,7 +14,7 @@
  * exactly on the third column */
 
 #define PERL_REVISION	5		/* age */
-#define PERL_VERSION	22		/* epoch */
+#define PERL_VERSION	24		/* epoch */
 #define PERL_SUBVERSION	1		/* generation */
 
 /* The following numbers describe the earliest compatible version of
@@ -35,7 +35,7 @@
    changing them should not be necessary.
 */
 #define PERL_API_REVISION	5
-#define PERL_API_VERSION	22
+#define PERL_API_VERSION	24
 #define PERL_API_SUBVERSION	0
 /*
    XXX Note:  The selection of non-default Configure options, such
diff --git a/Master/tlpkg/tlperl/lib/CORE/perl.h b/Master/tlpkg/tlperl/lib/CORE/perl.h
index e840450a3d9..f8f0069dfa5 100644
--- a/Master/tlpkg/tlperl/lib/CORE/perl.h
+++ b/Master/tlpkg/tlperl/lib/CORE/perl.h
@@ -35,7 +35,7 @@
  * NOTE 2: headers lie.  Do not expect that if HAS_C99 gets to be true,
  * all the C99 features are there and are correct. */
 #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
-     defined(_STDC_C99)
+    defined(_STDC_C99) || defined(__c99)
 #  define HAS_C99 1
 #endif
 
@@ -231,7 +231,7 @@
     Perl_pregfree(aTHX_ (prog))
 
 #define CALLREGFREE_PVT(prog) \
-    if(prog) RX_ENGINE(prog)->free(aTHX_ (prog))
+    if(prog) RX_ENGINE(prog)->rxfree(aTHX_ (prog))
 
 #define CALLREG_NUMBUF_FETCH(rx,paren,usesv)                                \
     RX_ENGINE(rx)->numbered_buff_FETCH(aTHX_ (rx),(paren),(usesv))
@@ -421,6 +421,16 @@
 #  define GCC_DIAG_IGNORE(w)
 #  define GCC_DIAG_RESTORE
 #endif
+/* for clang specific pragmas */
+#if defined(__clang__) || defined(__clang)
+#  define CLANG_DIAG_PRAGMA(x) _Pragma (#x)
+#  define CLANG_DIAG_IGNORE(x) _Pragma("clang diagnostic push") \
+                               CLANG_DIAG_PRAGMA(clang diagnostic ignored #x)
+#  define CLANG_DIAG_RESTORE   _Pragma("clang diagnostic pop")
+#else
+#  define CLANG_DIAG_IGNORE(w)
+#  define CLANG_DIAG_RESTORE
+#endif
 
 #define NOOP /*EMPTY*/(void)0
 /* cea2e8a9dd23747f accidentally lost the comment originally from the first
@@ -496,26 +506,6 @@
 #  endif
 #endif
 
-/* Some platforms require marking function declarations
- * for them to be exportable.  Used in perlio.h, proto.h
- * is handled either by the makedef.pl or by defining the
- * PERL_CALLCONV to be something special.  See also the
- * definition of XS() in XSUB.h. */
-#ifndef PERL_EXPORT_C
-#  ifdef __cplusplus
-#    define PERL_EXPORT_C extern "C"
-#  else
-#    define PERL_EXPORT_C extern
-#  endif
-#endif
-#ifndef PERL_XS_EXPORT_C
-#  ifdef __cplusplus
-#    define PERL_XS_EXPORT_C extern "C"
-#  else
-#    define PERL_XS_EXPORT_C
-#  endif
-#endif
-
 #if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) && !defined(__cplusplus)
 #  ifndef PERL_USE_GCC_BRACE_GROUPS
 #    define PERL_USE_GCC_BRACE_GROUPS
@@ -617,9 +607,9 @@
 #   define TAINT_WARN_get       0
 #   define TAINT_WARN_set(s)    NOOP
 #else
-#   define TAINT		(PL_tainted = TRUE)
+#   define TAINT		(PL_tainted = PL_tainting)
 #   define TAINT_NOT	(PL_tainted = FALSE)
-#   define TAINT_IF(c)	if (UNLIKELY(c)) { PL_tainted = TRUE; }
+#   define TAINT_IF(c)	if (UNLIKELY(c)) { PL_tainted = PL_tainting; }
 #   define TAINT_ENV()	if (UNLIKELY(PL_tainting)) { taint_env(); }
 #   define TAINT_PROPER(s)	if (UNLIKELY(PL_tainting)) { taint_proper(NULL, s); }
 #   define TAINT_set(s)		(PL_tainted = (s))
@@ -797,7 +787,21 @@
 
 /* If this causes problems, set i_unistd=undef in the hint file.  */
 #ifdef I_UNISTD
+#    if defined(__amigaos4__)
+#        ifdef I_NETINET_IN
+#            include <netinet/in.h>
+#        endif
+#   endif
 #   include <unistd.h>
+#   if defined(__amigaos4__)
+/* Under AmigaOS 4 newlib.library provides an environ.  However using
+ * it doesn't give us enough control over inheritance of variables by
+ * subshells etc. so replace with custom version based on abc-shell
+ * code. */
+extern char **myenviron;
+#       undef environ
+#       define environ myenviron
+#   endif
 #endif
 
 /* for WCOREDUMP */
@@ -1003,11 +1007,7 @@ EXTERN_C int usleep(unsigned int);
 #  endif
 #else
 #   ifndef memcpy
-#	ifdef HAS_BCOPY
-#	    define memcpy(d,s,l) bcopy(s,d,l)
-#	else
-#	    define memcpy(d,s,l) my_bcopy(s,d,l)
-#	endif
+#	define memcpy(d,s,l) my_bcopy(s,d,l)
 #   endif
 #endif /* HAS_MEMCPY */
 
@@ -1023,14 +1023,10 @@ EXTERN_C int usleep(unsigned int);
 #endif /* HAS_MEMSET */
 
 #if !defined(HAS_MEMMOVE) && !defined(memmove)
-#   if defined(HAS_BCOPY) && defined(HAS_SAFE_BCOPY)
-#	define memmove(d,s,l) bcopy(s,d,l)
+#   if defined(HAS_MEMCPY) && defined(HAS_SAFE_MEMCPY)
+#	define memmove(d,s,l) memcpy(d,s,l)
 #   else
-#	if defined(HAS_MEMCPY) && defined(HAS_SAFE_MEMCPY)
-#	    define memmove(d,s,l) memcpy(d,s,l)
-#	else
-#	    define memmove(d,s,l) my_bcopy(s,d,l)
-#	endif
+#	define memmove(d,s,l) my_bcopy(s,d,l)
 #   endif
 #endif
 
@@ -1974,11 +1970,15 @@ extern long double Perl_my_frexpl(long double x, int *e);
 #   ifndef Perl_isnan
 #       if defined(HAS_ISNANL) && !(defined(isnan) && defined(HAS_C99))
 #           define Perl_isnan(x) isnanl(x)
+#       elif defined(__sgi) && defined(__c99)  /* XXX Configure test needed */
+#           define Perl_isnan(x) isnan(x)
 #       endif
 #   endif
 #   ifndef Perl_isinf
 #       if defined(HAS_ISINFL) && !(defined(isinf) && defined(HAS_C99))
 #           define Perl_isinf(x) isinfl(x)
+#       elif defined(__sgi) && defined(__c99)  /* XXX Configure test needed */
+#           define Perl_isinf(x) isinf(x)
 #       elif defined(LDBL_MAX) && !defined(NAN_COMPARE_BROKEN)
 #           define Perl_isinf(x) ((x) > LDBL_MAX || (x) < -LDBL_MAX)
 #       endif
@@ -1997,8 +1997,6 @@ extern long double Perl_my_frexpl(long double x, int *e);
 #   define NV_EPSILON FLT128_EPSILON
 #   define NV_MIN_10_EXP FLT128_MIN_10_EXP
 #   define NV_MAX_10_EXP FLT128_MAX_10_EXP
-#   define NV_INF HUGE_VALQ
-#   define NV_NAN nanq("0")
 #   define Perl_acos acosq
 #   define Perl_asin asinq
 #   define Perl_atan atanq
@@ -2168,7 +2166,7 @@ extern long double Perl_my_frexpl(long double x, int *e);
 /* Solaris and IRIX have fpclass/fpclassl, but they are using
  * an enum typedef, not cpp symbols, and Configure doesn't detect that.
  * Define some symbols also as cpp symbols so we can detect them. */
-#    if defined(__sun) || defined(__irix__) /* XXX Configure test instead */
+#    if defined(__sun) || defined(__sgi) /* XXX Configure test instead */
 #     define FP_PINF FP_PINF
 #     define FP_QNAN FP_QNAN
 #    endif
@@ -2218,7 +2216,7 @@ extern long double Perl_my_frexpl(long double x, int *e);
 #        include <fp_class.h>
 #    endif
 #    if defined(FP_POS_INF) && defined(FP_QNAN)
-#        ifdef __irix__ /* XXX Configure test instead */
+#        ifdef __sgi /* XXX Configure test instead */
 #            ifdef USE_LONG_DOUBLE
 #                define Perl_fp_class(x)	fp_class_l(x)
 #            else
@@ -2668,17 +2666,13 @@ typedef AV PAD;
 typedef struct padnamelist PADNAMELIST;
 typedef struct padname PADNAME;
 
-/* enable PERL_NEW_COPY_ON_WRITE by default */
-#if !defined(PERL_OLD_COPY_ON_WRITE) && !defined(PERL_NEW_COPY_ON_WRITE) && !defined(PERL_NO_COW)
-#  define PERL_NEW_COPY_ON_WRITE
+/* enable PERL_COPY_ON_WRITE by default */
+#if !defined(PERL_COPY_ON_WRITE) && !defined(PERL_NO_COW)
+#  define PERL_COPY_ON_WRITE
 #endif
 
-#if defined(PERL_OLD_COPY_ON_WRITE) || defined(PERL_NEW_COPY_ON_WRITE)
-# if defined(PERL_OLD_COPY_ON_WRITE) && defined(PERL_NEW_COPY_ON_WRITE)
-#  error PERL_OLD_COPY_ON_WRITE and PERL_NEW_COPY_ON_WRITE are exclusive
-# else
+#ifdef PERL_COPY_ON_WRITE
 #  define PERL_ANY_COW
-# endif
 #else
 # define PERL_SAWAMPERSAND
 #endif
@@ -2818,6 +2812,11 @@ typedef struct padname PADNAME;
 #   include "unixish.h"
 #endif
 
+#ifdef __amigaos4__
+#    include "amigaos.h"
+#    undef FD_CLOEXEC /* a lie in AmigaOS */
+#endif
+
 /* NSIG logic from Configure --> */
 /* Strange style to avoid deeply-nested #if/#else/#endif */
 #ifndef NSIG
@@ -3055,6 +3054,103 @@ freeing any remaining Perl interpreters.
  * May make sense to have threads after "*ish.h" anyway
  */
 
+/* clang Thread Safety Analysis/Annotations/Attributes
+ * http://clang.llvm.org/docs/ThreadSafetyAnalysis.html
+ *
+ * Available since clang 3.6-ish (appeared in 3.4, but shaky still in 3.5).
+ * Apple XCode hijacks __clang_major__ and __clang_minor__
+ * (6.1 means really clang 3.6), so needs extra hijinks
+ * (could probably also test the contents of __apple_build_version__).
+ */
+#if defined(USE_ITHREADS) && defined(I_PTHREAD) && \
+    defined(__clang__) && \
+    !defined(SWIG) && \
+  ((!defined(__apple_build_version__) &&               \
+    ((__clang_major__ == 3 && __clang_minor__ >= 6) || \
+     (__clang_major__ >= 4))) || \
+   (defined(__apple_build_version__) &&                \
+    ((__clang_major__ == 6 && __clang_minor__ >= 1) || \
+     (__clang_major__ >= 7))))
+#  define PERL_TSA__(x)   __attribute__((x))
+#  define PERL_TSA_ACTIVE
+#else
+#  define PERL_TSA__(x)   /* No TSA, make TSA attributes no-ops. */
+#  undef PERL_TSA_ACTIVE
+#endif
+
+/* PERL_TSA_CAPABILITY() is used to annotate typedefs.
+ * typedef old_type PERL_TSA_CAPABILITY("mutex") new_type;
+ */
+#define PERL_TSA_CAPABILITY(x) \
+    PERL_TSA__(capability(x))
+
+/* In the below examples the mutex must be lexically visible, usually
+ * either as global variables, or as function arguments. */
+
+/* PERL_TSA_GUARDED_BY() is used to annotate global variables.
+ *
+ * Foo foo PERL_TSA_GUARDED_BY(mutex);
+ */
+#define PERL_TSA_GUARDED_BY(x) \
+    PERL_TSA__(guarded_by(x))
+
+/* PERL_TSA_PT_GUARDED_BY() is used to annotate global pointers.
+ * The data _behind_ the pointer is guarded.
+ *
+ * Foo* ptr PERL_TSA_PT_GUARDED_BY(mutex);
+ */
+#define PERL_TSA_PT_GUARDED_BY(x) \
+    PERL_TSA__(pt_guarded_by(x))
+
+/* PERL_TSA_REQUIRES() is used to annotate functions.
+ * The caller MUST hold the resource when calling the function.
+ *
+ * void Foo() PERL_TSA_REQUIRES(mutex);
+ */
+#define PERL_TSA_REQUIRES(x) \
+    PERL_TSA__(requires_capability(x))
+
+/* PERL_TSA_EXCLUDES() is used to annotate functions.
+ * The caller MUST NOT hold resource when calling the function.
+ *
+ * EXCLUDES should be used when the function first acquires
+ * the resource and then releases it.  Use to avoid deadlock.
+ *
+ * void Foo() PERL_TSA_EXCLUDES(mutex);
+ */
+#define PERL_TSA_EXCLUDES(x) \
+    PERL_TSA__(locks_excluded(x))
+
+/* PERL_TSA_ACQUIRE() is used to annotate functions.
+ * The caller MUST NOT hold the resource when calling the function,
+ * and the function will acquire the resource.
+ *
+ * void Foo() PERL_TSA_ACQUIRE(mutex);
+ */
+#define PERL_TSA_ACQUIRE(x) \
+    PERL_TSA__(acquire_capability(x))
+
+/* PERL_TSA_RELEASE() is used to annotate functions.
+ * The caller MUST hold the resource when calling the function,
+ * and the function will release the resource.
+ *
+ * void Foo() PERL_TSA_RELEASE(mutex);
+ */
+#define PERL_TSA_RELEASE(x) \
+    PERL_TSA__(release_capability(x))
+
+/* PERL_TSA_NO_TSA is used to annotate functions.
+ * Used when being intentionally unsafe, or when the code is too
+ * complicated for the analysis.  Use sparingly.
+ *
+ * void Foo() PERL_TSA_NO_TSA;
+ */
+#define PERL_TSA_NO_TSA \
+    PERL_TSA__(no_thread_safety_analysis)
+
+/* There are more annotations/attributes available, see the clang
+ * documentation for details. */
+
 #if defined(USE_ITHREADS)
 #  ifdef NETWARE
 #   include <nw5thread.h>
@@ -3076,7 +3172,7 @@ typedef void *		perl_key;
 #            include <pthread.h>
 #          endif
 typedef pthread_t	perl_os_thread;
-typedef pthread_mutex_t	perl_mutex;
+typedef pthread_mutex_t PERL_TSA_CAPABILITY("mutex") perl_mutex;
 typedef pthread_cond_t	perl_cond;
 typedef pthread_key_t	perl_key;
 #        endif /* I_MACH_CTHREADS */
@@ -3085,6 +3181,25 @@ typedef pthread_key_t	perl_key;
 #  endif /* NETWARE */
 #endif /* USE_ITHREADS */
 
+#ifdef PERL_TSA_ACTIVE
+/* Since most pthread mutex interfaces have not been annotated, we
+ * need to have these wrappers. The NO_TSA annotation is quite ugly
+ * but it cannot be avoided in plain C, unlike in C++, where one could
+ * e.g. use ACQUIRE() with no arg on a mutex lock method.
+ *
+ * The bodies of these wrappers are in util.c
+ *
+ * TODO: however, some platforms are starting to get these clang
+ * thread safety annotations for pthreads, for example FreeBSD.
+ * Do we need a way to a bypass these wrappers? */
+EXTERN_C int perl_tsa_mutex_lock(perl_mutex* mutex)
+  PERL_TSA_ACQUIRE(*mutex)
+  PERL_TSA_NO_TSA;
+EXTERN_C int perl_tsa_mutex_unlock(perl_mutex* mutex)
+  PERL_TSA_RELEASE(*mutex)
+  PERL_TSA_NO_TSA;
+#endif
+
 #if defined(WIN32)
 #  include "win32.h"
 #endif
@@ -3279,6 +3394,32 @@ typedef pthread_key_t	perl_key;
      vaxc$errno = PL_statusvalue_vms = MY_POSIX_EXIT ? \
 	(C_FAC_POSIX | (1 << 3) | STS$K_ERROR | STS$M_INHIB_MSG) : SS$_ABORT)
 
+#elif defined(__amigaos4__)
+ /* A somewhat experimental attempt to simulate posix return code values */
+#   define STATUS_NATIVE	PL_statusvalue_posix
+#   define STATUS_NATIVE_CHILD_SET(n)                      \
+        STMT_START {                                       \
+            PL_statusvalue_posix = (n);                    \
+            if (PL_statusvalue_posix < 0) {                \
+                PL_statusvalue = -1;                       \
+            }                                              \
+            else {                                         \
+                PL_statusvalue = n << 8;                   \
+            }                                              \
+        } STMT_END
+#   define STATUS_UNIX_SET(n)		\
+	STMT_START {			\
+	    PL_statusvalue = (n);		\
+	    if (PL_statusvalue != -1)	\
+		PL_statusvalue &= 0xFFFF;	\
+	} STMT_END
+#   define STATUS_UNIX_EXIT_SET(n) STATUS_UNIX_SET(n)
+#   define STATUS_EXIT_SET(n) STATUS_UNIX_SET(n)
+#   define STATUS_CURRENT STATUS_UNIX
+#   define STATUS_EXIT STATUS_UNIX
+#   define STATUS_ALL_SUCCESS	(PL_statusvalue = 0, PL_statusvalue_posix = 0)
+#   define STATUS_ALL_FAILURE	(PL_statusvalue = 1, PL_statusvalue_posix = 1)
+
 #else
 #   define STATUS_NATIVE	PL_statusvalue_posix
 #   if defined(WCOREDUMP)
@@ -3511,9 +3652,9 @@ typedef pthread_key_t	perl_key;
    appropriate to call return.  In either case, include the lint directive.
  */
 #ifdef HASATTRIBUTE_NORETURN
-#  define NORETURN_FUNCTION_END NOT_REACHED; /* NOTREACHED */
+#  define NORETURN_FUNCTION_END NOT_REACHED;
 #else
-#  define NORETURN_FUNCTION_END NOT_REACHED; /* NOTREACHED */ return 0
+#  define NORETURN_FUNCTION_END NOT_REACHED; return 0
 #endif
 
 /* Some OS warn on NULL format to printf */
@@ -3687,6 +3828,30 @@ typedef        struct crypt_data {     /* straight from /usr/include/crypt.h */
 #endif /* threading */
 #endif /* AIX */
 
+#ifndef PERL_CALLCONV
+#  ifdef __cplusplus
+#    define PERL_CALLCONV extern "C"
+#  else
+#    define PERL_CALLCONV
+#  endif
+#endif
+#ifndef PERL_CALLCONV_NO_RET
+#    define PERL_CALLCONV_NO_RET PERL_CALLCONV
+#endif
+
+/* PERL_STATIC_NO_RET is supposed to be equivalent to STATIC on builds that
+   dont have a noreturn as a declaration specifier
+*/
+#ifndef PERL_STATIC_NO_RET
+#  define PERL_STATIC_NO_RET STATIC
+#endif
+/* PERL_STATIC_NO_RET is supposed to be equivalent to PERL_STATIC_INLINE on
+   builds that dont have a noreturn as a declaration specifier
+*/
+#ifndef PERL_STATIC_INLINE_NO_RET
+#  define PERL_STATIC_INLINE_NO_RET PERL_STATIC_INLINE
+#endif
+
 #if !defined(OS2)
 #  include "iperlsys.h"
 #endif
@@ -3707,11 +3872,10 @@ typedef        struct crypt_data {     /* straight from /usr/include/crypt.h */
 #  define USE_HASH_SEED
 #endif
 
-/* Win32 defines a type 'WORD' in windef.h. This conflicts with the enumerator
- * 'WORD' defined in perly.h. The yytokentype enum is only a debugging aid, so
- * it's not really needed.
- */
-#if defined(WIN32)
+/* Win32 defines a type 'WORD' in windef.h, and AmigaOS in exec/types.h.
+ * This conflicts with the enumerator 'WORD' defined in perly.h.
+ * The yytokentype enum is only a debugging aid, so it's not really needed. */
+#if defined(WIN32) || defined(__amigaos4__)
 #  define YYTOKENTYPE
 #endif
 #include "perly.h"
@@ -4007,11 +4171,11 @@ Gid_t getegid (void);
 #define DEBUG_M_FLAG		0x01000000 /*16777216*/
 #define DEBUG_B_FLAG		0x02000000 /*33554432*/
 #define DEBUG_L_FLAG		0x04000000 /*67108864*/
-#define DEBUG_MASK		0x07FFEFFF /* mask of all the standard flags */
+#define DEBUG_i_FLAG		0x08000000 /*134217728*/
+#define DEBUG_MASK		0x0FFFEFFF /* mask of all the standard flags */
 
 #define DEBUG_DB_RECURSE_FLAG	0x40000000
-#define DEBUG_TOP_FLAG		0x80000000 /* XXX what's this for ??? Signal
-					      that something was done? */
+#define DEBUG_TOP_FLAG		0x80000000 /* -D was given --> PL_debug |= FLAG */
 
 #  define DEBUG_p_TEST_ (PL_debug & DEBUG_p_FLAG)
 #  define DEBUG_s_TEST_ (PL_debug & DEBUG_s_FLAG)
@@ -4040,9 +4204,11 @@ Gid_t getegid (void);
 #  define DEBUG_M_TEST_ (PL_debug & DEBUG_M_FLAG)
 #  define DEBUG_B_TEST_ (PL_debug & DEBUG_B_FLAG)
 #  define DEBUG_L_TEST_ (PL_debug & DEBUG_L_FLAG)
+#  define DEBUG_i_TEST_ (PL_debug & DEBUG_i_FLAG)
 #  define DEBUG_Xv_TEST_ (DEBUG_X_TEST_ && DEBUG_v_TEST_)
 #  define DEBUG_Uv_TEST_ (DEBUG_U_TEST_ && DEBUG_v_TEST_)
 #  define DEBUG_Pv_TEST_ (DEBUG_P_TEST_ && DEBUG_v_TEST_)
+#  define DEBUG_Lv_TEST_ (DEBUG_L_TEST_ && DEBUG_v_TEST_)
 
 #ifdef DEBUGGING
 
@@ -4073,9 +4239,11 @@ Gid_t getegid (void);
 #  define DEBUG_M_TEST DEBUG_M_TEST_
 #  define DEBUG_B_TEST DEBUG_B_TEST_
 #  define DEBUG_L_TEST DEBUG_L_TEST_
+#  define DEBUG_i_TEST DEBUG_i_TEST_
 #  define DEBUG_Xv_TEST DEBUG_Xv_TEST_
 #  define DEBUG_Uv_TEST DEBUG_Uv_TEST_
 #  define DEBUG_Pv_TEST DEBUG_Pv_TEST_
+#  define DEBUG_Lv_TEST DEBUG_Lv_TEST_
 
 #  define PERL_DEB(a)                  a
 #  define PERL_DEB2(a,b)               a
@@ -4115,6 +4283,7 @@ Gid_t getegid (void);
 #  define DEBUG_Xv(a) DEBUG__(DEBUG_Xv_TEST, a)
 #  define DEBUG_Uv(a) DEBUG__(DEBUG_Uv_TEST, a)
 #  define DEBUG_Pv(a) DEBUG__(DEBUG_Pv_TEST, a)
+#  define DEBUG_Lv(a) DEBUG__(DEBUG_Lv_TEST, a)
 
 #  define DEBUG_S(a) DEBUG__(DEBUG_S_TEST, a)
 #  define DEBUG_T(a) DEBUG__(DEBUG_T_TEST, a)
@@ -4126,6 +4295,7 @@ Gid_t getegid (void);
 #  define DEBUG_M(a) DEBUG__(DEBUG_M_TEST, a)
 #  define DEBUG_B(a) DEBUG__(DEBUG_B_TEST, a)
 #  define DEBUG_L(a) DEBUG__(DEBUG_L_TEST, a)
+#  define DEBUG_i(a) DEBUG__(DEBUG_i_TEST, a)
 
 #else /* DEBUGGING */
 
@@ -4156,9 +4326,11 @@ Gid_t getegid (void);
 #  define DEBUG_M_TEST (0)
 #  define DEBUG_B_TEST (0)
 #  define DEBUG_L_TEST (0)
+#  define DEBUG_i_TEST (0)
 #  define DEBUG_Xv_TEST (0)
 #  define DEBUG_Uv_TEST (0)
 #  define DEBUG_Pv_TEST (0)
+#  define DEBUG_Lv_TEST (0)
 
 #  define PERL_DEB(a)
 #  define PERL_DEB2(a,b)               b
@@ -4189,9 +4361,11 @@ Gid_t getegid (void);
 #  define DEBUG_M(a)
 #  define DEBUG_B(a)
 #  define DEBUG_L(a)
+#  define DEBUG_i(a)
 #  define DEBUG_Xv(a)
 #  define DEBUG_Uv(a)
 #  define DEBUG_Pv(a)
+#  define DEBUG_Lv(a)
 #endif /* DEBUGGING */
 
 
@@ -4293,98 +4467,6 @@ START_EXTERN_C
 END_EXTERN_C
 #endif
 
-/* If you are thinking of using HUGE_VAL for infinity, or using
- * <math.h> functions to generate NV_INF (e.g. exp(1e9), log(-1.0)),
- * stop.  Neither will work portably: HUGE_VAL can be just DBL_MAX,
- * and the math functions might be just generating DBL_MAX, or even
- * zero.  */
-
-#if !defined(NV_INF) && defined(USE_LONG_DOUBLE)
-#  if !defined(NV_INF) && defined(LDBL_INFINITY)
-#    define NV_INF LDBL_INFINITY
-#  endif
-#  if !defined(NV_INF) && defined(INFINITYL)
-#    define NV_INF INFINITYL
-#  endif
-#endif
-#if !defined(NV_INF) && defined(DBL_INFINITY)
-#  define NV_INF (NV)DBL_INFINITY
-#endif
-#if !defined(NV_INF) && defined(INFINITY)
-#  define NV_INF (NV)INFINITY
-#endif
-#if !defined(NV_INF) && defined(INF)
-#  define NV_INF (NV)INF
-#endif
-#if !defined(NV_INF)
-#  if INTSIZE == 4
-/* At this point we assume the IEEE 754 floating point (and of course,
- * we also assume a floating point format that can encode an infinity).
- * We will coerce an int32 (which will encode the infinity) into
- * a 32-bit float, which will then be cast into NV.
- *
- * Note that we intentionally use a float and 32-bit int, instead of
- * shifting a small integer into a full IV, and from that into a full
- * NV, because:
- *
- * (1) an IV might not be wide enough to cover all the bits of an NV.
- * (2) the exponent part (including the infinity and nan bits) of a NV
- *     might be wider than just 16 bits.
- *
- * Below the NV_NAN logic has similar __PL_nan_u fallback, the only
- * difference being the int32 constant being coerced. */
-#    define __PL_inf_float_int32 0x7F800000
-static const union { unsigned int __i; float __f; } __PL_inf_u =
-    { __PL_inf_float_int32 };
-#    define NV_INF ((NV)(__PL_inf_u.__f))
-#  endif
-#endif
-#if !defined(NV_INF)
-#  define NV_INF ((NV)1.0/0.0) /* Some compilers will warn. */
-#endif
-
-#if !defined(NV_NAN) && defined(USE_LONG_DOUBLE)
-#   if !defined(NV_NAN) && defined(LDBL_NAN)
-#       define NV_NAN LDBL_NAN
-#   endif
-#   if !defined(NV_NAN) && defined(NANL)
-#       define NV_NAN NANL
-#   endif
-#   if !defined(NV_NAN) && defined(LDBL_QNAN)
-#       define NV_NAN LDBL_QNAN
-#   endif
-#endif
-#if !defined(NV_NAN) && defined(DBL_NAN)
-#  define NV_NAN (NV)DBL_NAN
-#endif
-#if !defined(NV_NAN) && defined(DBL_QNAN)
-#  define NV_NAN (NV)DBL_QNAN
-#endif
-#if !defined(NV_NAN) && defined(NAN)
-#  define NV_NAN (NV)NAN
-#endif
-#if !defined(NV_NAN) && defined(QNAN)
-#  define NV_NAN (NV)QNAN
-#endif
-#if !defined(NV_NAN) && defined(USE_LONG_DOUBLE) && defined(I_SUNMATH)
-#  define NV_NAN (NV)quiet_nan()
-#endif
-#if !defined(NV_NAN)
-#  if INTSIZE == 4
-/* See the discussion near __PL_inf_u. */
-#    define __PL_nan_float_int32 0x7FC00000
-static const union { unsigned int __i; float __f; } __PL_nan_u =
-    { __PL_nan_float_int32 };
-#    define NV_NAN ((NV)(__PL_nan_u.__f))
-#  endif
-#endif
-#if !defined(NV_NAN)
-#  define NV_NAN ((NV)0.0/0.0) /* Some compilers will warn. */
-#endif
-/* Do NOT try doing NV_NAN based on NV_INF and trying (NV_INF-NV_INF).
- * Though IEEE-754-logically correct, some compilers (like Visual C 2003)
- * falsely misoptimize that to zero (x-x is zero, right?) */
-
 #ifndef __cplusplus
 #  if !defined(WIN32) && !defined(VMS)
 #ifndef crypt
@@ -4877,7 +4959,14 @@ EXTCONST  unsigned char PL_mod_latin1_uc[] = {
 	192,	193,	194,	195,	196,	197,	198,	199,
 	200,	201,	202,	203,	204,	205,	206,	207,
 	208,	209,	210,	211,	212,	213,	214,	215,
-	216,	217,	218,	219,	220,	221,	222,	255 /*sharp s*/,	
+	216,	217,	218,	219,	220,	221,	222,
+#if    UNICODE_MAJOR_VERSION > 2                                        \
+   || (UNICODE_MAJOR_VERSION == 2 && UNICODE_DOT_VERSION >= 1		\
+                                  && UNICODE_DOT_DOT_VERSION >= 8)
+	                                                        255 /*sharp s*/,
+#else   /* uc() is itself in early unicode */
+	                                                        223,
+#endif
 	224-32,	225-32,	226-32,	227-32,	228-32,	229-32,	230-32,	231-32,
 	232-32,	233-32,	234-32,	235-32,	236-32,	237-32,	238-32,	239-32,
 	240-32,	241-32,	242-32,	243-32,	244-32,	245-32,	246-32,	247,
@@ -5019,10 +5108,11 @@ EXTCONST char* const PL_block_type[] = {
 	"WHEN",
 	"BLOCK",
 	"GIVEN",
-	"LOOP_FOR",
-	"LOOP_PLAIN",
+	"LOOP_ARY",
 	"LOOP_LAZYSV",
 	"LOOP_LAZYIV",
+	"LOOP_LIST",
+	"LOOP_PLAIN",
 	"SUB",
 	"FORMAT",
 	"EVAL",
@@ -5090,9 +5180,6 @@ EXTCONST char PL_bincompat_options[] =
 #  ifdef PERL_NEED_TIMESBASE
 			     " PERL_NEED_TIMESBASE"
 #  endif
-#  ifdef PERL_OLD_COPY_ON_WRITE
-			     " PERL_OLD_COPY_ON_WRITE"
-#  endif
 #  ifdef PERL_POISON
 			     " PERL_POISON"
 #  endif
@@ -5160,7 +5247,7 @@ EXTCONST char PL_bincompat_options[];
 
 #ifndef PERL_SET_PHASE
 #  define PERL_SET_PHASE(new_phase) \
-    PHASE_CHANGE_PROBE(PL_phase_names[new_phase], PL_phase_names[PL_phase]); \
+    PERL_DTRACE_PROBE_PHASE(new_phase); \
     PL_phase = new_phase;
 #endif
 
@@ -5194,7 +5281,7 @@ EXTCONST char *const PL_phase_names[];
 /* Do not use this macro. It only exists for extensions that rely on PL_dirty
  * instead of using the newer PL_phase, which provides everything PL_dirty
  * provided, and more. */
-#  define PL_dirty (PL_phase == PERL_PHASE_DESTRUCT)
+#  define PL_dirty cBOOL(PL_phase == PERL_PHASE_DESTRUCT)
 
 #  define PL_amagic_generation PL_na
 #endif /* !PERL_CORE */
@@ -5472,31 +5559,6 @@ struct tempsym; /* defined in pp_pack.c */
 #include "thread.h"
 #include "pp.h"
 
-#ifndef PERL_CALLCONV
-#  ifdef __cplusplus
-#    define PERL_CALLCONV extern "C"
-#  else
-#    define PERL_CALLCONV
-#  endif
-#endif
-#ifndef PERL_CALLCONV_NO_RET
-#    define PERL_CALLCONV_NO_RET PERL_CALLCONV
-#endif
-
-/* PERL_STATIC_NO_RET is supposed to be equivalent to STATIC on builds that
-   dont have a noreturn as a declaration specifier
-*/
-#ifndef PERL_STATIC_NO_RET
-#  define PERL_STATIC_NO_RET STATIC
-#endif
-/* PERL_STATIC_NO_RET is supposed to be equivalent to PERL_STATIC_INLINE on
-   builds that dont have a noreturn as a declaration specifier
-*/
-#ifndef PERL_STATIC_INLINE_NO_RET
-#  define PERL_STATIC_INLINE_NO_RET PERL_STATIC_INLINE
-#endif
-
-
 #undef PERL_CKDEF
 #undef PERL_PPDEF
 #define PERL_CKDEF(s)	PERL_CALLCONV OP *s (pTHX_ OP *o);
@@ -5506,6 +5568,15 @@ struct tempsym; /* defined in pp_pack.c */
 #  include "malloc_ctl.h"
 #endif
 
+/*
+ * This provides a layer of functions and macros to ensure extensions will
+ * get to use the same RTL functions as the core.
+ */
+#if defined(WIN32)
+#  include "win32iop.h"
+#endif
+
+
 #include "proto.h"
 
 /* this has structure inits, so it cannot be included before here */
@@ -5636,6 +5707,123 @@ EXTCONST bool PL_valid_types_NV_set[];
 
 #endif
 
+/* In C99 we could use designated (named field) union initializers.
+ * In C89 we need to initialize the member declared first.
+ *
+ * With the U8_NV version you will want to have inner braces,
+ * while with the NV_U8 use just the NV.*/
+#define INFNAN_U8_NV_DECL EXTCONST union { U8 u8[NVSIZE]; NV nv; }
+#define INFNAN_NV_U8_DECL EXTCONST union { NV nv; U8 u8[NVSIZE]; }
+
+#ifdef DOINIT
+
+/* PL_inf and PL_nan initialization.
+ *
+ * For inf and nan initialization the ultimate fallback is dividing
+ * one or zero by zero: however, some compilers will warn or even fail
+ * on divide-by-zero, but hopefully something earlier will work.
+ *
+ * If you are thinking of using HUGE_VAL for infinity, or using
+ * <math.h> functions to generate NV_INF (e.g. exp(1e9), log(-1.0)),
+ * stop.  Neither will work portably: HUGE_VAL can be just DBL_MAX,
+ * and the math functions might be just generating DBL_MAX, or even zero.
+ *
+ * Also, do NOT try doing NV_NAN based on NV_INF and trying (NV_INF-NV_INF).
+ * Though logically correct, some compilers (like Visual C 2003)
+ * falsely misoptimize that to zero (x-x is always zero, right?)
+ */
+
+/* The quadmath literals are anon structs which -Wc++-compat doesn't like. */
+GCC_DIAG_IGNORE(-Wc++-compat)
+
+#  ifdef USE_QUADMATH
+/* Cannot use HUGE_VALQ for PL_inf because not a compile-time
+ * constant. */
+INFNAN_NV_U8_DECL PL_inf = { 1.0Q/0.0Q };
+#  elif NVSIZE == LONG_DOUBLESIZE && defined(LONGDBLINFBYTES)
+INFNAN_U8_NV_DECL PL_inf = { { LONGDBLINFBYTES } };
+#  elif NVSIZE == DOUBLESIZE && defined(DOUBLEINFBYTES)
+INFNAN_U8_NV_DECL PL_inf = { { DOUBLEINFBYTES } };
+#  else
+#    if NVSIZE == LONG_DOUBLESIZE && defined(USE_LONG_DOUBLE)
+#      if defined(LDBL_INFINITY)
+INFNAN_NV_U8_DECL PL_inf = { LDBL_INFINITY };
+#      elif defined(LDBL_INF)
+INFNAN_NV_U8_DECL PL_inf = { LDBL_INF };
+#      elif defined(INFINITY)
+INFNAN_NV_U8_DECL PL_inf = { (NV)INFINITY };
+#      elif defined(INF)
+INFNAN_NV_U8_DECL PL_inf = { (NV)INF };
+#      else
+INFNAN_NV_U8_DECL PL_inf = { 1.0L/0.0L }; /* keep last */
+#      endif
+#    else
+#      if defined(DBL_INFINITY)
+INFNAN_NV_U8_DECL PL_inf = { DBL_INFINITY };
+#      elif defined(DBL_INF)
+INFNAN_NV_U8_DECL PL_inf = { DBL_INF };
+#      elif defined(INFINITY) /* C99 */
+INFNAN_NV_U8_DECL PL_inf = { (NV)INFINITY };
+#      elif defined(INF)
+INFNAN_NV_U8_DECL PL_inf = { (NV)INF };
+#      else
+INFNAN_NV_U8_DECL PL_inf = { 1.0/0.0 }; /* keep last */
+#      endif
+#    endif
+#  endif
+
+#  ifdef USE_QUADMATH
+/* Cannot use nanq("0") for PL_nan because not a compile-time
+ * constant. */
+INFNAN_NV_U8_DECL PL_nan = { 0.0Q/0.0Q };
+#  elif NVSIZE == LONG_DOUBLESIZE && defined(LONGDBLNANBYTES)
+INFNAN_U8_NV_DECL PL_nan = { { LONGDBLNANBYTES } };
+#  elif NVSIZE == DOUBLESIZE && defined(DOUBLENANBYTES)
+INFNAN_U8_NV_DECL PL_nan = { { DOUBLENANBYTES } };
+#  else
+#    if NVSIZE == LONG_DOUBLESIZE && defined(USE_LONG_DOUBLE)
+#      if defined(LDBL_NAN)
+INFNAN_NV_U8_DECL PL_nan = { LDBL_NAN };
+#      elif defined(LDBL_QNAN)
+INFNAN_NV_U8_DECL PL_nan = { LDBL_QNAN };
+#      elif defined(NAN)
+INFNAN_NV_U8_DECL PL_nan = { (NV)NAN };
+#      else
+INFNAN_NV_U8_DECL PL_nan = { 0.0L/0.0L }; /* keep last */
+#      endif
+#    else
+#      if defined(DBL_NAN)
+INFNAN_NV_U8_DECL PL_nan = { DBL_NAN };
+#      elif defined(DBL_QNAN)
+INFNAN_NV_U8_DECL PL_nan = { DBL_QNAN };
+#      elif defined(NAN) /* C99 */
+INFNAN_NV_U8_DECL PL_nan = { (NV)NAN };
+#      else
+INFNAN_NV_U8_DECL PL_nan = { 0.0/0.0 }; /* keep last */
+#      endif
+#    endif
+#  endif
+
+GCC_DIAG_RESTORE
+
+#else
+
+INFNAN_NV_U8_DECL PL_inf;
+INFNAN_NV_U8_DECL PL_nan;
+
+#endif
+
+/* If you have not defined NV_INF/NV_NAN (like for example win32/win32.h),
+ * we will define NV_INF/NV_NAN as the nv part of the global const
+ * PL_inf/PL_nan.  Note, however, that the preexisting NV_INF/NV_NAN
+ * might not be a compile-time constant, in which case it cannot be
+ * used to initialize PL_inf/PL_nan above. */
+#ifndef NV_INF
+#  define NV_INF PL_inf.nv
+#endif
+#ifndef NV_NAN
+#  define NV_NAN PL_nan.nv
+#endif
 
 /* if these never got defined, they need defaults */
 #ifndef PERL_SET_CONTEXT
@@ -5768,8 +5956,17 @@ typedef struct am_table_short AMTS;
 #define PERLDB_SAVESRC_NOSUBS	(PL_perldb & PERLDBf_SAVESRC_NOSUBS)
 #define PERLDB_SAVESRC_INVALID	(PL_perldb & PERLDBf_SAVESRC_INVALID)
 
+#define PERLDB_LINE_OR_SAVESRC (PL_perldb & (PERLDBf_LINE | PERLDBf_SAVESRC))
+
 #ifdef USE_LOCALE
 /* These locale things are all subject to change */
+
+#   define LOCALE_INIT   MUTEX_INIT(&PL_locale_mutex)
+#   define LOCALE_TERM   MUTEX_DESTROY(&PL_locale_mutex)
+
+#   define LOCALE_LOCK   MUTEX_LOCK(&PL_locale_mutex)
+#   define LOCALE_UNLOCK MUTEX_UNLOCK(&PL_locale_mutex)
+
 /* Returns TRUE if the plain locale pragma without a parameter is in effect
  */
 #   define IN_LOCALE_RUNTIME	cBOOL(CopHINTS_get(PL_curcop) & HINT_LOCALE)
@@ -5853,6 +6050,10 @@ typedef struct am_table_short AMTS;
 #   endif   /* PERL_CORE or PERL_IN_XSUB_RE */
 
 #else   /* No locale usage */
+#   define LOCALE_INIT
+#   define LOCALE_TERM
+#   define LOCALE_LOCK
+#   define LOCALE_UNLOCK
 #   define IN_LOCALE_RUNTIME                0
 #   define IN_SOME_LOCALE_FORM_RUNTIME      0
 #   define IN_LOCALE_COMPILETIME            0
@@ -6162,13 +6363,8 @@ expression, but with an empty argument list, like this:
 #define PERL_SCRIPT_MODE "r"
 #endif
 
-/*
- * Some operating systems are stingy with stack allocation,
- * so perl may have to guard against stack overflow.
- */
-#ifndef PERL_STACK_OVERFLOW_CHECK
+/* not used. Kept as a NOOP for backcompat */
 #define PERL_STACK_OVERFLOW_CHECK()  NOOP
-#endif
 
 /*
  * Some nonpreemptive operating systems find it convenient to
@@ -6334,6 +6530,10 @@ expression, but with an empty argument list, like this:
 #  include <fcntl.h>
 #endif
 
+#ifdef __amigaos4__
+#  undef FD_CLOEXEC /* a lie in AmigaOS */
+#endif
+
 #ifdef I_SYS_FILE
 #  include <sys/file.h>
 #endif
@@ -6423,14 +6623,6 @@ extern void moncontrol(int);
 /* See http://www.unicode.org/unicode/reports/tr13/ */
 #define NEXT_LINE_CHAR	NEXT_LINE_NATIVE
 
-/* The UTF-8 bytes of the Unicode LS and PS, U+2028 and U+2029 */
-#define UNICODE_LINE_SEPA_0	0xE2
-#define UNICODE_LINE_SEPA_1	0x80
-#define UNICODE_LINE_SEPA_2	0xA8
-#define UNICODE_PARA_SEPA_0	0xE2
-#define UNICODE_PARA_SEPA_1	0x80
-#define UNICODE_PARA_SEPA_2	0xA9
-
 #ifndef PIPESOCK_MODE
 #  define PIPESOCK_MODE
 #endif
@@ -6510,7 +6702,7 @@ extern void moncontrol(int);
 
 #define IS_SAFE_PATHNAME(p, len, op_name) IS_SAFE_SYSCALL((p), (len), "pathname", (op_name))
 
-#if defined(OEMVS)
+#if defined(OEMVS) || defined(__amigaos4__)
 #define NO_ENV_ARRAY_IN_MAIN
 #endif
 
@@ -6571,16 +6763,21 @@ extern void moncontrol(int);
 
 #  if LONG_DOUBLEKIND == LONG_DOUBLE_IS_IEEE_754_128_BIT_LITTLE_ENDIAN || \
       LONG_DOUBLEKIND == LONG_DOUBLE_IS_X86_80_BIT_LITTLE_ENDIAN || \
-      LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN
+      LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE
 #    define LONGDOUBLE_LITTLE_ENDIAN
 #  endif
 
 #  if LONG_DOUBLEKIND == LONG_DOUBLE_IS_IEEE_754_128_BIT_BIG_ENDIAN || \
       LONG_DOUBLEKIND == LONG_DOUBLE_IS_X86_80_BIT_BIG_ENDIAN || \
-      LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN
+      LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE
 #    define LONGDOUBLE_BIG_ENDIAN
 #  endif
 
+#  if LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_BE || \
+      LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_LE
+#    define LONGDOUBLE_MIX_ENDIAN
+#  endif
+
 #  if LONG_DOUBLEKIND == LONG_DOUBLE_IS_X86_80_BIT_LITTLE_ENDIAN || \
       LONG_DOUBLEKIND == LONG_DOUBLE_IS_X86_80_BIT_BIG_ENDIAN
 #    define LONGDOUBLE_X86_80_BIT
@@ -6589,14 +6786,24 @@ extern void moncontrol(int);
 #    endif
 #  endif
 
-#  if LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN || \
-      LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN
+#  if LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE || \
+      LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE || \
+      LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_BE || \
+      LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_LE
 #    define LONGDOUBLE_DOUBLEDOUBLE
 #  endif
 
 #endif /* LONG_DOUBLEKIND */
 
-#if NVSIZE == DOUBLESIZE
+#ifdef USE_QUADMATH /* assume quadmath endianness == native double endianness */
+#  if defined(DOUBLE_LITTLE_ENDIAN)
+#    define NV_LITTLE_ENDIAN
+#  elif defined(DOUBLE_BIG_ENDIAN)
+#    define NV_BIG_ENDIAN
+#  elif defined(DOUBLE_MIX_ENDIAN) /* stretch */
+#    define NV_MIX_ENDIAN
+#  endif
+#elif NVSIZE == DOUBLESIZE
 #  ifdef DOUBLE_LITTLE_ENDIAN
 #    define NV_LITTLE_ENDIAN
 #  endif
@@ -6613,8 +6820,363 @@ extern void moncontrol(int);
 #  ifdef LONGDOUBLE_BIG_ENDIAN
 #    define NV_BIG_ENDIAN
 #  endif
+#  ifdef LONGDOUBLE_MIX_ENDIAN
+#    define NV_MIX_ENDIAN
+#  endif
 #endif
 
+/* NaNs (not-a-numbers) can carry payload bits, in addition to
+ * "nan-ness".  Part of the payload is the quiet/signaling bit.
+ * To back up a bit (harhar):
+ *
+ * For IEEE 754 64-bit formats [1]:
+ *
+ * s 000 (mantissa all-zero)  zero
+ * s 000 (mantissa non-zero)  subnormals (denormals)
+ * s 001 ... 7fe              normals
+ * s 7ff q                    nan
+ *
+ * For IEEE 754 128-bit formats:
+ *
+ * s 0000 (mantissa all-zero)  zero
+ * s 0000 (mantissa non-zero)  subnormals (denormals)
+ * s 0001 ... 7ffe             normals
+ * s 7fff q                    nan
+ *
+ * [1] this looks like big-endian, but applies equally to little-endian.
+ *
+ * s = Sign bit.  Yes, zeros and nans can have negative sign,
+ *     the interpretation is application-specific.
+ *
+ * q = Quietness bit, the interpretation is platform-specific.
+ *     Most platforms have the most significant bit being one
+ *     meaning quiet, but some (older mips, hppa) have the msb
+ *     being one meaning signaling.  Note that the above means
+ *     that on most platforms there cannot be signaling nan with
+ *     zero payload because that is identical with infinity;
+ *     while conversely on older mips/hppa there cannot be a quiet nan
+ *     because that is identical with infinity.
+ *
+ *     Moreover, whether there is any behavioral difference
+ *     between quiet and signaling NaNs, depends on the platform.
+ *
+ * x86 80-bit extended precision is different, the mantissa bits:
+ *
+ * 63 62 61   30387+    pre-387    visual c
+ * --------   ----      --------   --------
+ *  0  0  0   invalid   infinity
+ *  0  0  1   invalid   snan
+ *  0  1  0   invalid   snan
+ *  0  1  1   invalid   snan
+ *  1  0  0   infinity  snan        1.#INF
+ *  1  0  1   snan                  1.#SNAN
+ *  1  1  0   qnan                 -1.#IND  (x86 chooses this to negative)
+ *  1  1  1   qnan                  1.#QNAN
+ *
+ * This means that in this format there are 61 bits available
+ * for the nan payload.
+ *
+ * Note that the 32-bit x86 ABI cannot do signaling nans: the x87
+ * simply cannot preserve the bit.  You can either use the 80-bit
+ * extended precision (long double, -Duselongdouble), or use x86-64.
+ *
+ * In all platforms, the payload bytes (and bits, some of them are
+ * often in a partial byte) themselves can be either all zero (x86),
+ * all one (sparc or mips), or a mixture: in IEEE 754 128-bit double
+ * or in a double-double, the first half of the payload can follow the
+ * native double, while in the second half the payload can be all
+ * zeros.  (Therefore the mask for payload bits is not necessarily
+ * identical to bit complement of the NaN.)  Another way of putting
+ * this: the payload for the default NaN might not be zero.
+ *
+ * For the x86 80-bit long doubles, the trailing bytes (the 80 bits
+ * being 'packaged' in either 12 or 16 bytes) can be whatever random
+ * garbage.
+ *
+ * Furthermore, the semantics of the sign bit on NaNs are platform-specific.
+ * On normal floats, the sign bit being on means negative.  But this may,
+ * or may not, be reverted on NaNs: in other words, the default NaN might
+ * have the sign bit on, and therefore look like negative if you look
+ * at it at the bit level.
+ *
+ * NaN payloads are not propagated even on copies, or in arithmetics.
+ * They *might* be, according to some rules, on your particular
+ * cpu/os/compiler/libraries, but no guarantees.
+ *
+ * To summarize, on most platforms, and for 64-bit doubles
+ * (using big-endian ordering here):
+ *
+ * [7FF8000000000000..7FFFFFFFFFFFFFFF] quiet
+ * [FFF8000000000000..FFFFFFFFFFFFFFFF] quiet
+ * [7FF0000000000001..7FF7FFFFFFFFFFFF] signaling
+ * [FFF0000000000001..FFF7FFFFFFFFFFFF] signaling
+ *
+ * The C99 nan() is supposed to generate *quiet* NaNs.
+ *
+ * Note the asymmetry:
+ * The 7FF0000000000000 is positive infinity,
+ * the FFF0000000000000 is negative infinity.
+ */
+
+/* NVMANTBITS is the number of _real_ mantissa bits in an NV.
+ * For the standard IEEE 754 fp this number is usually one less that
+ * *DBL_MANT_DIG because of the implicit (aka hidden) bit, which isn't
+ * real.  For the 80-bit extended precision formats (x86*), the number
+ * of mantissa bits... depends. For normal floats, it's 64.  But for
+ * the inf/nan, it's different (zero for inf, 61 for nan).
+ * NVMANTBITS works for normal floats. */
+
+/* We do not want to include the quiet/signaling bit. */
+#define NV_NAN_BITS (NVMANTBITS - 1)
+
+#if defined(USE_LONG_DOUBLE) && NVSIZE > DOUBLESIZE
+#  if LONG_DOUBLEKIND == LONG_DOUBLE_IS_IEEE_754_128_BIT_LITTLE_ENDIAN
+#    define NV_NAN_QS_BYTE_OFFSET 13
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_IEEE_754_128_BIT_BIG_ENDIAN
+#    define NV_NAN_QS_BYTE_OFFSET 2
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_X86_80_BIT_LITTLE_ENDIAN
+#    define NV_NAN_QS_BYTE_OFFSET 7
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_X86_80_BIT_BIG_ENDIAN
+#    define NV_NAN_QS_BYTE_OFFSET 2
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE
+#    define NV_NAN_QS_BYTE_OFFSET 13
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE
+#    define NV_NAN_QS_BYTE_OFFSET 1
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_BE
+#    define NV_NAN_QS_BYTE_OFFSET 9
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_LE
+#    define NV_NAN_QS_BYTE_OFFSET 6
+#  else
+#    error "Unexpected long double format"
+#  endif
+#else
+#  ifdef USE_QUADMATH
+#    ifdef NV_LITTLE_ENDIAN
+#      define NV_NAN_QS_BYTE_OFFSET 13
+#    elif defined(NV_BIG_ENDIAN)
+#      define NV_NAN_QS_BYTE_OFFSET 2
+#    else
+#      error "Unexpected quadmath format"
+#    endif
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_32_BIT_LITTLE_ENDIAN
+#    define NV_NAN_QS_BYTE_OFFSET 2
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_32_BIT_BIG_ENDIAN
+#    define NV_NAN_QS_BYTE_OFFSET 1
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_64_BIT_LITTLE_ENDIAN
+#    define NV_NAN_QS_BYTE_OFFSET 6
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_64_BIT_BIG_ENDIAN
+#    define NV_NAN_QS_BYTE_OFFSET 1
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_128_BIT_LITTLE_ENDIAN
+#    define NV_NAN_QS_BYTE_OFFSET 13
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_128_BIT_BIG_ENDIAN
+#    define NV_NAN_QS_BYTE_OFFSET 2
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_64_BIT_MIXED_ENDIAN_LE_BE
+#    define NV_NAN_QS_BYTE_OFFSET 2 /* bytes 4 5 6 7 0 1 2 3 (MSB 7) */
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_64_BIT_MIXED_ENDIAN_BE_LE
+#    define NV_NAN_QS_BYTE_OFFSET 5 /* bytes 3 2 1 0 7 6 5 4 (MSB 7) */
+#  else
+#    error "Unexpected double format"
+#  endif
+#endif
+/* NV_NAN_QS_BYTE is the byte to test for the quiet/signaling */
+#define NV_NAN_QS_BYTE(nvp) (((U8*)(nvp))[NV_NAN_QS_BYTE_OFFSET])
+/* NV_NAN_QS_BIT is the bit to test in the NV_NAN_QS_BYTE_OFFSET
+ * for the quiet/signaling */
+#if defined(USE_LONG_DOUBLE) && \
+  (LONG_DOUBLEKIND == LONG_DOUBLE_IS_X86_80_BIT_LITTLE_ENDIAN || \
+   LONG_DOUBLEKIND == LONG_DOUBLE_IS_X86_80_BIT_BIG_ENDIAN)
+#  define NV_NAN_QS_BIT_SHIFT 6 /* 0x40 */
+#elif defined(USE_LONG_DOUBLE) && \
+  (LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE || \
+   LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE || \
+   LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_BE || \
+   LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_LE)
+#  define NV_NAN_QS_BIT_SHIFT 3 /* 0x08, but not via NV_NAN_BITS */
+#else
+#  define NV_NAN_QS_BIT_SHIFT ((NV_NAN_BITS) % 8) /* usually 3, or 0x08 */
+#endif
+#define NV_NAN_QS_BIT (1 << (NV_NAN_QS_BIT_SHIFT))
+/* NV_NAN_QS_BIT_OFFSET is the bit offset from the beginning of a NV
+ * (bytes ordered big-endianly) for the quiet/signaling bit
+ * for the quiet/signaling */
+#define NV_NAN_QS_BIT_OFFSET \
+    (8 * (NV_NAN_QS_BYTE_OFFSET) + (NV_NAN_QS_BIT_SHIFT))
+/* NV_NAN_QS_QUIET (always defined) is true if the NV_NAN_QS_QS_BIT being
+ * on indicates quiet NaN.  NV_NAN_QS_SIGNALING (also always defined)
+ * is true if the NV_NAN_QS_BIT being on indicates signaling NaN. */
+#define NV_NAN_QS_QUIET \
+    ((NV_NAN_QS_BYTE(PL_nan.u8) & NV_NAN_QS_BIT) == NV_NAN_QS_BIT)
+#define NV_NAN_QS_SIGNALING (!(NV_NAN_QS_QUIET))
+#define NV_NAN_QS_TEST(nvp) (NV_NAN_QS_BYTE(nvp) & NV_NAN_QS_BIT)
+/* NV_NAN_IS_QUIET() returns true if the NV behind nvp is a NaN,
+ * whether it is a quiet NaN, NV_NAN_IS_SIGNALING() if a signaling NaN.
+ * Note however that these do not check whether the nvp is a NaN. */
+#define NV_NAN_IS_QUIET(nvp) \
+    (NV_NAN_QS_TEST(nvp) == (NV_NAN_QS_QUIET ? NV_NAN_QS_BIT : 0))
+#define NV_NAN_IS_SIGNALING(nvp) \
+    (NV_NAN_QS_TEST(nvp) == (NV_NAN_QS_QUIET ? 0 : NV_NAN_QS_BIT))
+#define NV_NAN_SET_QUIET(nvp) \
+    (NV_NAN_QS_QUIET ? \
+     (NV_NAN_QS_BYTE(nvp) |= NV_NAN_QS_BIT) : \
+     (NV_NAN_QS_BYTE(nvp) &= ~NV_NAN_QS_BIT))
+#define NV_NAN_SET_SIGNALING(nvp) \
+    (NV_NAN_QS_QUIET ? \
+     (NV_NAN_QS_BYTE(nvp) &= ~NV_NAN_QS_BIT) : \
+     (NV_NAN_QS_BYTE(nvp) |= NV_NAN_QS_BIT))
+#define NV_NAN_QS_XOR(nvp) (NV_NAN_QS_BYTE(nvp) ^= NV_NAN_QS_BIT)
+
+/* NV_NAN_PAYLOAD_MASK: masking the nan payload bits.
+ *
+ * NV_NAN_PAYLOAD_PERM: permuting the nan payload bytes.
+ * 0xFF means "don't go here".*/
+
+/* Shorthands to avoid typoses. */
+#define NV_NAN_PAYLOAD_MASK_SKIP_EIGHT \
+  0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+#define NV_NAN_PAYLOAD_PERM_SKIP_EIGHT \
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+#define NV_NAN_PAYLOAD_PERM_0_TO_7 \
+  0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7
+#define NV_NAN_PAYLOAD_PERM_7_TO_0 \
+  0x7, 0x6, 0x5, 0x4, 0x3, 0x2, 0x1, 0x0
+#define NV_NAN_PAYLOAD_MASK_IEEE_754_128_LE \
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00
+#define NV_NAN_PAYLOAD_PERM_IEEE_754_128_LE \
+  NV_NAN_PAYLOAD_PERM_0_TO_7, \
+  0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xFF, 0xFF
+#define NV_NAN_PAYLOAD_MASK_IEEE_754_128_BE \
+  0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, \
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+#define NV_NAN_PAYLOAD_PERM_IEEE_754_128_BE \
+  0xFF, 0xFF, 0xd, 0xc, 0xb, 0xa, 0x9, 0x8, \
+  NV_NAN_PAYLOAD_PERM_7_TO_0
+#define NV_NAN_PAYLOAD_MASK_IEEE_754_64_LE \
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00
+#define NV_NAN_PAYLOAD_PERM_IEEE_754_64_LE \
+  0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0xFF
+#define NV_NAN_PAYLOAD_MASK_IEEE_754_64_BE \
+  0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+#define NV_NAN_PAYLOAD_PERM_IEEE_754_64_BE \
+  0xFF, 0x6, 0x5, 0x4, 0x3, 0x2, 0x1, 0x0
+
+#if defined(USE_LONG_DOUBLE) && NVSIZE > DOUBLESIZE
+#  if LONG_DOUBLEKIND == LONG_DOUBLE_IS_IEEE_754_128_BIT_LITTLE_ENDIAN
+#    define NV_NAN_PAYLOAD_MASK NV_NAN_PAYLOAD_MASK_IEEE_754_128_LE
+#    define NV_NAN_PAYLOAD_PERM NV_NAN_PAYLOAD_PERM_IEEE_754_128_LE
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_IEEE_754_128_BIT_BIG_ENDIAN
+#    define NV_NAN_PAYLOAD_MASK NV_NAN_PAYLOAD_MASK_IEEE_754_128_BE
+#    define NV_NAN_PAYLOAD_PERM NV_NAN_PAYLOAD_PERM_IEEE_754_128_BE
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_X86_80_BIT_LITTLE_ENDIAN
+#    if LONG_DOUBLESIZE == 10
+#      define NV_NAN_PAYLOAD_MASK \
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, \
+         0x00, 0x00
+#      define NV_NAN_PAYLOAD_PERM \
+         NV_NAN_PAYLOAD_PERM_0_TO_7, 0xFF, 0xFF
+#    elif LONG_DOUBLESIZE == 12
+#      define NV_NAN_PAYLOAD_MASK \
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, \
+         0x00, 0x00, 0x00, 0x00
+#      define NV_NAN_PAYLOAD_PERM \
+         NV_NAN_PAYLOAD_PERM_0_TO_7, 0xFF, 0xFF, 0xFF, 0xFF
+#    elif LONG_DOUBLESIZE == 16
+#      define NV_NAN_PAYLOAD_MASK \
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, \
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+#      define NV_NAN_PAYLOAD_PERM \
+         NV_NAN_PAYLOAD_PERM_0_TO_7, \
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+#    else
+#      error "Unexpected x86 80-bit little-endian long double format"
+#    endif
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_X86_80_BIT_BIG_ENDIAN
+#    if LONG_DOUBLESIZE == 10
+#      define NV_NAN_PAYLOAD_MASK \
+         0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, \
+         0xff, 0xff
+#      define NV_NAN_PAYLOAD_PERM \
+         NV_NAN_PAYLOAD_PERM_7_TO_0, 0xFF, 0xFF
+#    elif LONG_DOUBLESIZE == 12
+#      define NV_NAN_PAYLOAD_MASK \
+         0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, \
+         0xff, 0xff, 0x00, 0x00
+#      define NV_NAN_PAYLOAD_PERM \
+         NV_NAN_PAYLOAD_PERM_7_TO_0, 0xFF, 0xFF, 0xFF, 0xFF
+#    elif LONG_DOUBLESIZE == 16
+#      define NV_NAN_PAYLOAD_MASK \
+         0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, \
+         0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+#      define NV_NAN_PAYLOAD_PERM \
+         NV_NAN_PAYLOAD_PERM_7_TO_0, \
+         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+#    else
+#      error "Unexpected x86 80-bit big-endian long double format"
+#    endif
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE
+/* For double-double we assume only the first double (in LE or BE terms)
+ * is used for NaN. */
+#    define NV_NAN_PAYLOAD_MASK \
+       NV_NAN_PAYLOAD_MASK_SKIP_EIGHT, NV_NAN_PAYLOAD_MASK_IEEE_754_64_LE
+#    define NV_NAN_PAYLOAD_PERM \
+       NV_NAN_PAYLOAD_PERM_SKIP_EIGHT, NV_NAN_PAYLOAD_PERM_IEEE_754_64_LE
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE
+#    define NV_NAN_PAYLOAD_MASK \
+       NV_NAN_PAYLOAD_MASK_IEEE_754_64_BE
+#    define NV_NAN_PAYLOAD_PERM \
+       NV_NAN_PAYLOAD_PERM_IEEE_754_64_BE
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_BE
+#    define NV_NAN_PAYLOAD_MASK \
+       NV_NAN_PAYLOAD_MASK_IEEE_754_64_LE
+#    define NV_NAN_PAYLOAD_PERM \
+       NV_NAN_PAYLOAD_PERM_IEEE_754_64_LE
+#  elif LONG_DOUBLEKIND == LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_LE
+#    define NV_NAN_PAYLOAD_MASK \
+       NV_NAN_PAYLOAD_MASK_SKIP_EIGHT, NV_NAN_PAYLOAD_MASK_IEEE_754_64_BE
+#    define NV_NAN_PAYLOAD_PERM \
+       NV_NAN_PAYLOAD_PERM_SKIP_EIGHT, NV_NAN_PAYLOAD_PERM_IEEE_754_64_BE
+#  else
+#    error "Unexpected long double format"
+#  endif
+#else
+#  ifdef USE_QUADMATH /* quadmath is not long double */
+#    ifdef NV_LITTLE_ENDIAN
+#      define NV_NAN_PAYLOAD_MASK NV_NAN_PAYLOAD_MASK_IEEE_754_128_LE
+#      define NV_NAN_PAYLOAD_PERM NV_NAN_PAYLOAD_PERM_IEEE_754_128_LE
+#    elif defined(NV_BIG_ENDIAN)
+#      define NV_NAN_PAYLOAD_MASK NV_NAN_PAYLOAD_MASK_IEEE_754_128_BE
+#      define NV_NAN_PAYLOAD_PERM NV_NAN_PAYLOAD_PERM_IEEE_754_128_BE
+#    else
+#      error "Unexpected quadmath format"
+#    endif
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_32_BIT_LITTLE_ENDIAN
+#    define NV_NAN_PAYLOAD_MASK 0xff, 0xff, 0x07, 0x00
+#    define NV_NAN_PAYLOAD_PERM 0x0, 0x1, 0x2, 0xFF
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_32_BIT_BIG_ENDIAN
+#    define NV_NAN_PAYLOAD_MASK 0x00, 0x07, 0xff, 0xff
+#    define NV_NAN_PAYLOAD_PERM 0xFF, 0x2, 0x1, 0x0
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_64_BIT_LITTLE_ENDIAN
+#    define NV_NAN_PAYLOAD_MASK NV_NAN_PAYLOAD_MASK_IEEE_754_64_LE
+#    define NV_NAN_PAYLOAD_PERM NV_NAN_PAYLOAD_PERM_IEEE_754_64_LE
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_64_BIT_BIG_ENDIAN
+#    define NV_NAN_PAYLOAD_MASK NV_NAN_PAYLOAD_MASK_IEEE_754_64_BE
+#    define NV_NAN_PAYLOAD_PERM NV_NAN_PAYLOAD_PERM_IEEE_754_64_BE
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_128_BIT_LITTLE_ENDIAN
+#    define NV_NAN_PAYLOAD_MASK NV_NAN_PAYLOAD_MASK_IEEE_754_128_LE
+#    define NV_NAN_PAYLOAD_PERM NV_NAN_PAYLOAD_PERM_IEEE_754_128_LE
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_128_BIT_BIG_ENDIAN
+#    define NV_NAN_PAYLOAD_MASK NV_NAN_PAYLOAD_MASK_IEEE_754_128_BE
+#    define NV_NAN_PAYLOAD_PERM NV_NAN_PAYLOAD_PERM_IEEE_754_128_BE
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_64_BIT_MIXED_ENDIAN_LE_BE
+#    define NV_NAN_PAYLOAD_MASK 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0xff, 0xff
+#    define NV_NAN_PAYLOAD_PERM 0x4, 0x5, 0x6, 0xFF, 0x0, 0x1, 0x2, 0x3
+#  elif DOUBLEKIND == DOUBLE_IS_IEEE_754_64_BIT_MIXED_ENDIAN_BE_LE
+#    define NV_NAN_PAYLOAD_MASK 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xff, 0xff
+#    define NV_NAN_PAYLOAD_PERM 0x3, 0x2, 0x1, 0x0, 0xFF, 0x6, 0x5, 0x4
+#  else
+#    error "Unexpected double format"
+#  endif
+#endif
 /*
 
    (KEEP THIS LAST IN perl.h!)
diff --git a/Master/tlpkg/tlperl/lib/CORE/perlapi.h b/Master/tlpkg/tlperl/lib/CORE/perlapi.h
index 910f7895406..7aa445578e8 100644
--- a/Master/tlpkg/tlperl/lib/CORE/perlapi.h
+++ b/Master/tlpkg/tlperl/lib/CORE/perlapi.h
@@ -123,6 +123,8 @@ END_EXTERN_C
 #define PL_hints_mutex		(*Perl_Ghints_mutex_ptr(NULL))
 #undef  PL_keyword_plugin
 #define PL_keyword_plugin	(*Perl_Gkeyword_plugin_ptr(NULL))
+#undef  PL_locale_mutex
+#define PL_locale_mutex		(*Perl_Glocale_mutex_ptr(NULL))
 #undef  PL_malloc_mutex
 #define PL_malloc_mutex		(*Perl_Gmalloc_mutex_ptr(NULL))
 #undef  PL_mmap_page_size
diff --git a/Master/tlpkg/tlperl/lib/CORE/perlhost.h b/Master/tlpkg/tlperl/lib/CORE/perlhost.h
index b1c6c805e50..9963319a929 100644
--- a/Master/tlpkg/tlperl/lib/CORE/perlhost.h
+++ b/Master/tlpkg/tlperl/lib/CORE/perlhost.h
@@ -26,9 +26,6 @@
 #endif
 
 START_EXTERN_C
-extern char *	g_win32_get_privlib(const char *pl, STRLEN *const len);
-extern char *	g_win32_get_sitelib(const char *pl, STRLEN *const len);
-extern char *	g_win32_get_vendorlib(const char *pl, STRLEN *const len);
 extern char *	g_getlogin(void);
 END_EXTERN_C
 
@@ -332,7 +329,7 @@ PerlMemIsLocked(struct IPerlMem* piPerl)
     return IPERL2HOST(piPerl)->IsLocked();
 }
 
-struct IPerlMem perlMem =
+const struct IPerlMem perlMem =
 {
     PerlMemMalloc,
     PerlMemRealloc,
@@ -386,7 +383,7 @@ PerlMemSharedIsLocked(struct IPerlMem* piPerl)
     return IPERL2HOST(piPerl)->IsLockedShared();
 }
 
-struct IPerlMem perlMemShared =
+const struct IPerlMem perlMemShared =
 {
     PerlMemSharedMalloc,
     PerlMemSharedRealloc,
@@ -440,7 +437,7 @@ PerlMemParseIsLocked(struct IPerlMem* piPerl)
     return IPERL2HOST(piPerl)->IsLockedParse();
 }
 
-struct IPerlMem perlMemParse =
+const struct IPerlMem perlMemParse =
 {
     PerlMemParseMalloc,
     PerlMemParseRealloc,
@@ -517,22 +514,22 @@ PerlEnvOsId(struct IPerlEnv* piPerl)
 }
 
 char*
-PerlEnvLibPath(struct IPerlEnv* piPerl, const char *pl, STRLEN *const len)
+PerlEnvLibPath(struct IPerlEnv* piPerl, WIN32_NO_REGISTRY_M_(const char *pl) STRLEN *const len)
 {
-    return g_win32_get_privlib(pl, len);
+    return win32_get_privlib(WIN32_NO_REGISTRY_M_(pl) len);
 }
 
 char*
 PerlEnvSiteLibPath(struct IPerlEnv* piPerl, const char *pl, STRLEN *const len)
 {
-    return g_win32_get_sitelib(pl, len);
+    return win32_get_sitelib(pl, len);
 }
 
 char*
 PerlEnvVendorLibPath(struct IPerlEnv* piPerl, const char *pl,
 		     STRLEN *const len)
 {
-    return g_win32_get_vendorlib(pl, len);
+    return win32_get_vendorlib(pl, len);
 }
 
 void
@@ -541,7 +538,7 @@ PerlEnvGetChildIO(struct IPerlEnv* piPerl, child_IO_table* ptr)
     win32_get_child_IO(ptr);
 }
 
-struct IPerlEnv perlEnv =
+const struct IPerlEnv perlEnv =
 {
     PerlEnvGetenv,
     PerlEnvPutenv,
@@ -869,7 +866,7 @@ PerlStdIOFdupopen(struct IPerlStdIO* piPerl, FILE* pf)
 #endif
 }
 
-struct IPerlStdIO perlStdIO =
+const struct IPerlStdIO perlStdIO =
 {
     PerlStdIOStdin,
     PerlStdIOStdout,
@@ -1080,7 +1077,7 @@ PerlLIOWrite(struct IPerlLIO* piPerl, int handle, const void *buffer, unsigned i
     return win32_write(handle, buffer, count);
 }
 
-struct IPerlLIO perlLIO =
+const struct IPerlLIO perlLIO =
 {
     PerlLIOAccess,
     PerlLIOChmod,
@@ -1181,7 +1178,7 @@ PerlDirMapPathW(struct IPerlDir* piPerl, const WCHAR* path)
     return IPERL2HOST(piPerl)->MapPathW(path);
 }
 
-struct IPerlDir perlDir =
+const struct IPerlDir perlDir =
 {
     PerlDirMakedir,
     PerlDirChdir,
@@ -1467,7 +1464,7 @@ PerlSockIoctlsocket(struct IPerlSock* piPerl, SOCKET s, long cmd, u_long *argp)
     return win32_ioctlsocket(s, cmd, argp);
 }
 
-struct IPerlSock perlSock =
+const struct IPerlSock perlSock =
 {
     PerlSockHtonl,
     PerlSockHtons,
@@ -1901,7 +1898,7 @@ PerlProcLastHost(struct IPerlProc* piPerl)
  return h->LastHost();
 }
 
-struct IPerlProc perlProc =
+const struct IPerlProc perlProc =
 {
     PerlProcAbort,
     PerlProcCrypt,
diff --git a/Master/tlpkg/tlperl/lib/CORE/perlio.h b/Master/tlpkg/tlperl/lib/CORE/perlio.h
index 55e0ce330b5..1a3d480f43d 100644
--- a/Master/tlpkg/tlperl/lib/CORE/perlio.h
+++ b/Master/tlpkg/tlperl/lib/CORE/perlio.h
@@ -13,41 +13,23 @@
 /*
   Interface for perl to IO functions.
   There is a hierarchy of Configure determined #define controls:
-   USE_STDIO   - forces PerlIO_xxx() to be #define-d onto stdio functions.
-                 This is used for conservative
-                 builds - "just like perl5.00X used to be".
-                 This dominates over the others.
+   USE_STDIO   - No longer available via Configure.  Formerly forced
+                 PerlIO_xxx() to be #define-d onto stdio functions.
+                 Now generates compile-time error.
 
    USE_PERLIO  - The primary Configure variable that enables PerlIO.
-                 If USE_PERLIO is _NOT_ set
-                   then USE_STDIO above will be set to be conservative.
                  PerlIO_xxx() are real functions
                  defined in perlio.c which implement extra functionality
                  required for utf8 support.
 
-   One further note - the table-of-functions scheme controlled
-   by PERL_IMPLICIT_SYS turns on USE_PERLIO so that iperlsys.h can
-   #define PerlIO_xxx() to go via the function table, without having
-   to #undef them from (say) stdio forms.
-
 */
 
-#if defined(PERL_IMPLICIT_SYS)
-#ifndef USE_PERLIO
-#ifndef NETWARE
-/* # define USE_PERLIO */
-#endif
-#endif
-#endif
-
 #ifndef USE_PERLIO
 # define USE_STDIO
 #endif
 
 #ifdef USE_STDIO
-#  ifndef PERLIO_IS_STDIO
-#      define PERLIO_IS_STDIO
-#  endif
+#  error "stdio is no longer supported as the default base layer -- use perlio."
 #endif
 
 /* --------------------  End of Configure controls ---------------------------- */
@@ -71,11 +53,6 @@
 #undef O_BINARY
 #endif
 
-#ifdef PERLIO_IS_STDIO
-/* #define PerlIO_xxxx() as equivalent stdio function */
-#include "perlsdio.h"
-#endif				/* PERLIO_IS_STDIO */
-
 #ifndef PerlIO
 /* ----------- PerlIO implementation ---------- */
 /* PerlIO not #define-d to something else - define the implementation */
@@ -96,42 +73,39 @@ typedef PerlIOl *PerlIO;
 #define PERLIO_FUNCS_CAST(funcs) (funcs)
 #endif
 
-PERL_EXPORT_C void PerlIO_define_layer(pTHX_ PerlIO_funcs *tab);
-PERL_EXPORT_C PerlIO_funcs *PerlIO_find_layer(pTHX_ const char *name,
+PERL_CALLCONV void PerlIO_define_layer(pTHX_ PerlIO_funcs *tab);
+PERL_CALLCONV PerlIO_funcs *PerlIO_find_layer(pTHX_ const char *name,
                                               STRLEN len,
 				              int load);
-PERL_EXPORT_C PerlIO *PerlIO_push(pTHX_ PerlIO *f, PERLIO_FUNCS_DECL(*tab),
+PERL_CALLCONV PerlIO *PerlIO_push(pTHX_ PerlIO *f, PERLIO_FUNCS_DECL(*tab),
 			          const char *mode, SV *arg);
-PERL_EXPORT_C void PerlIO_pop(pTHX_ PerlIO *f);
-PERL_EXPORT_C AV* PerlIO_get_layers(pTHX_ PerlIO *f);
-PERL_EXPORT_C void PerlIO_clone(pTHX_ PerlInterpreter *proto,
+PERL_CALLCONV void PerlIO_pop(pTHX_ PerlIO *f);
+PERL_CALLCONV AV* PerlIO_get_layers(pTHX_ PerlIO *f);
+PERL_CALLCONV void PerlIO_clone(pTHX_ PerlInterpreter *proto,
                                 CLONE_PARAMS *param);
 
 #endif				/* PerlIO */
 
 /* ----------- End of implementation choices  ---------- */
 
-#ifndef PERLIO_IS_STDIO
-/* Not using stdio _directly_ as PerlIO */
-
 /* We now need to determine  what happens if source trys to use stdio.
  * There are three cases based on PERLIO_NOT_STDIO which XS code
  * can set how it wants.
  */
 
-#   ifdef PERL_CORE
+#ifdef PERL_CORE
 /* Make a choice for perl core code
    - currently this is set to try and catch lingering raw stdio calls.
      This is a known issue with some non UNIX ports which still use
      "native" stdio features.
 */
-#       ifndef PERLIO_NOT_STDIO
-#           define PERLIO_NOT_STDIO 1
-#       endif
-    #else
-#   ifndef PERLIO_NOT_STDIO
-#       define PERLIO_NOT_STDIO 0
-#   endif
+#  ifndef PERLIO_NOT_STDIO
+#    define PERLIO_NOT_STDIO 1
+#  endif
+#else
+#  ifndef PERLIO_NOT_STDIO
+#    define PERLIO_NOT_STDIO 0
+#  endif
 #endif
 
 #ifdef PERLIO_NOT_STDIO
@@ -154,7 +128,6 @@ PERL_EXPORT_C void PerlIO_clone(pTHX_ PerlInterpreter *proto,
  */
 #include "fakesdio.h"
 #endif				/* ifndef PERLIO_NOT_STDIO */
-#endif				/* PERLIO_IS_STDIO */
 
 /* ----------- fill in things that have not got #define'd  ---------- */
 
@@ -202,165 +175,164 @@ START_EXTERN_C
 #  endif
 #endif
 #ifndef PerlIO_init
-PERL_EXPORT_C void PerlIO_init(pTHX);
+PERL_CALLCONV void PerlIO_init(pTHX);
 #endif
 #ifndef PerlIO_stdoutf
-PERL_EXPORT_C int PerlIO_stdoutf(const char *, ...)
+PERL_CALLCONV int PerlIO_stdoutf(const char *, ...)
     __attribute__format__(__printf__, 1, 2);
 #endif
 #ifndef PerlIO_puts
-PERL_EXPORT_C int PerlIO_puts(PerlIO *, const char *);
+PERL_CALLCONV int PerlIO_puts(PerlIO *, const char *);
 #endif
 #ifndef PerlIO_open
-PERL_EXPORT_C PerlIO *PerlIO_open(const char *, const char *);
+PERL_CALLCONV PerlIO *PerlIO_open(const char *, const char *);
 #endif
 #ifndef PerlIO_openn
-PERL_EXPORT_C PerlIO *PerlIO_openn(pTHX_ const char *layers, const char *mode,
+PERL_CALLCONV PerlIO *PerlIO_openn(pTHX_ const char *layers, const char *mode,
 				   int fd, int imode, int perm, PerlIO *old,
 				   int narg, SV **arg);
 #endif
 #ifndef PerlIO_eof
-PERL_EXPORT_C int PerlIO_eof(PerlIO *);
+PERL_CALLCONV int PerlIO_eof(PerlIO *);
 #endif
 #ifndef PerlIO_error
-PERL_EXPORT_C int PerlIO_error(PerlIO *);
+PERL_CALLCONV int PerlIO_error(PerlIO *);
 #endif
 #ifndef PerlIO_clearerr
-PERL_EXPORT_C void PerlIO_clearerr(PerlIO *);
+PERL_CALLCONV void PerlIO_clearerr(PerlIO *);
 #endif
 #ifndef PerlIO_getc
-PERL_EXPORT_C int PerlIO_getc(PerlIO *);
+PERL_CALLCONV int PerlIO_getc(PerlIO *);
 #endif
 #ifndef PerlIO_putc
-PERL_EXPORT_C int PerlIO_putc(PerlIO *, int);
+PERL_CALLCONV int PerlIO_putc(PerlIO *, int);
 #endif
 #ifndef PerlIO_ungetc
-PERL_EXPORT_C int PerlIO_ungetc(PerlIO *, int);
+PERL_CALLCONV int PerlIO_ungetc(PerlIO *, int);
 #endif
 #ifndef PerlIO_fdopen
-PERL_EXPORT_C PerlIO *PerlIO_fdopen(int, const char *);
+PERL_CALLCONV PerlIO *PerlIO_fdopen(int, const char *);
 #endif
 #ifndef PerlIO_importFILE
-PERL_EXPORT_C PerlIO *PerlIO_importFILE(FILE *, const char *);
+PERL_CALLCONV PerlIO *PerlIO_importFILE(FILE *, const char *);
 #endif
 #ifndef PerlIO_exportFILE
-PERL_EXPORT_C FILE *PerlIO_exportFILE(PerlIO *, const char *);
+PERL_CALLCONV FILE *PerlIO_exportFILE(PerlIO *, const char *);
 #endif
 #ifndef PerlIO_findFILE
-PERL_EXPORT_C FILE *PerlIO_findFILE(PerlIO *);
+PERL_CALLCONV FILE *PerlIO_findFILE(PerlIO *);
 #endif
 #ifndef PerlIO_releaseFILE
-PERL_EXPORT_C void PerlIO_releaseFILE(PerlIO *, FILE *);
+PERL_CALLCONV void PerlIO_releaseFILE(PerlIO *, FILE *);
 #endif
 #ifndef PerlIO_read
-PERL_EXPORT_C SSize_t PerlIO_read(PerlIO *, void *, Size_t);
+PERL_CALLCONV SSize_t PerlIO_read(PerlIO *, void *, Size_t);
 #endif
 #ifndef PerlIO_unread
-PERL_EXPORT_C SSize_t PerlIO_unread(PerlIO *, const void *, Size_t);
+PERL_CALLCONV SSize_t PerlIO_unread(PerlIO *, const void *, Size_t);
 #endif
 #ifndef PerlIO_write
-PERL_EXPORT_C SSize_t PerlIO_write(PerlIO *, const void *, Size_t);
+PERL_CALLCONV SSize_t PerlIO_write(PerlIO *, const void *, Size_t);
 #endif
 #ifndef PerlIO_setlinebuf
-PERL_EXPORT_C void PerlIO_setlinebuf(PerlIO *);
+PERL_CALLCONV void PerlIO_setlinebuf(PerlIO *);
 #endif
 #ifndef PerlIO_printf
-PERL_EXPORT_C int PerlIO_printf(PerlIO *, const char *, ...)
+PERL_CALLCONV int PerlIO_printf(PerlIO *, const char *, ...)
     __attribute__format__(__printf__, 2, 3);
 #endif
 #ifndef PerlIO_vprintf
-PERL_EXPORT_C int PerlIO_vprintf(PerlIO *, const char *, va_list);
+PERL_CALLCONV int PerlIO_vprintf(PerlIO *, const char *, va_list);
 #endif
 #ifndef PerlIO_tell
-PERL_EXPORT_C Off_t PerlIO_tell(PerlIO *);
+PERL_CALLCONV Off_t PerlIO_tell(PerlIO *);
 #endif
 #ifndef PerlIO_seek
-PERL_EXPORT_C int PerlIO_seek(PerlIO *, Off_t, int);
+PERL_CALLCONV int PerlIO_seek(PerlIO *, Off_t, int);
 #endif
 #ifndef PerlIO_rewind
-PERL_EXPORT_C void PerlIO_rewind(PerlIO *);
+PERL_CALLCONV void PerlIO_rewind(PerlIO *);
 #endif
 #ifndef PerlIO_has_base
-PERL_EXPORT_C int PerlIO_has_base(PerlIO *);
+PERL_CALLCONV int PerlIO_has_base(PerlIO *);
 #endif
 #ifndef PerlIO_has_cntptr
-PERL_EXPORT_C int PerlIO_has_cntptr(PerlIO *);
+PERL_CALLCONV int PerlIO_has_cntptr(PerlIO *);
 #endif
 #ifndef PerlIO_fast_gets
-PERL_EXPORT_C int PerlIO_fast_gets(PerlIO *);
+PERL_CALLCONV int PerlIO_fast_gets(PerlIO *);
 #endif
 #ifndef PerlIO_canset_cnt
-PERL_EXPORT_C int PerlIO_canset_cnt(PerlIO *);
+PERL_CALLCONV int PerlIO_canset_cnt(PerlIO *);
 #endif
 #ifndef PerlIO_get_ptr
-PERL_EXPORT_C STDCHAR *PerlIO_get_ptr(PerlIO *);
+PERL_CALLCONV STDCHAR *PerlIO_get_ptr(PerlIO *);
 #endif
 #ifndef PerlIO_get_cnt
-PERL_EXPORT_C SSize_t PerlIO_get_cnt(PerlIO *);
+PERL_CALLCONV SSize_t PerlIO_get_cnt(PerlIO *);
 #endif
 #ifndef PerlIO_set_cnt
-PERL_EXPORT_C void PerlIO_set_cnt(PerlIO *, SSize_t);
+PERL_CALLCONV void PerlIO_set_cnt(PerlIO *, SSize_t);
 #endif
 #ifndef PerlIO_set_ptrcnt
-PERL_EXPORT_C void PerlIO_set_ptrcnt(PerlIO *, STDCHAR *, SSize_t);
+PERL_CALLCONV void PerlIO_set_ptrcnt(PerlIO *, STDCHAR *, SSize_t);
 #endif
 #ifndef PerlIO_get_base
-PERL_EXPORT_C STDCHAR *PerlIO_get_base(PerlIO *);
+PERL_CALLCONV STDCHAR *PerlIO_get_base(PerlIO *);
 #endif
 #ifndef PerlIO_get_bufsiz
-PERL_EXPORT_C SSize_t PerlIO_get_bufsiz(PerlIO *);
+PERL_CALLCONV SSize_t PerlIO_get_bufsiz(PerlIO *);
 #endif
 #ifndef PerlIO_tmpfile
-PERL_EXPORT_C PerlIO *PerlIO_tmpfile(void);
+PERL_CALLCONV PerlIO *PerlIO_tmpfile(void);
 #endif
 #ifndef PerlIO_stdin
-PERL_EXPORT_C PerlIO *PerlIO_stdin(void);
+PERL_CALLCONV PerlIO *PerlIO_stdin(void);
 #endif
 #ifndef PerlIO_stdout
-PERL_EXPORT_C PerlIO *PerlIO_stdout(void);
+PERL_CALLCONV PerlIO *PerlIO_stdout(void);
 #endif
 #ifndef PerlIO_stderr
-PERL_EXPORT_C PerlIO *PerlIO_stderr(void);
+PERL_CALLCONV PerlIO *PerlIO_stderr(void);
 #endif
 #ifndef PerlIO_getpos
-PERL_EXPORT_C int PerlIO_getpos(PerlIO *, SV *);
+PERL_CALLCONV int PerlIO_getpos(PerlIO *, SV *);
 #endif
 #ifndef PerlIO_setpos
-PERL_EXPORT_C int PerlIO_setpos(PerlIO *, SV *);
+PERL_CALLCONV int PerlIO_setpos(PerlIO *, SV *);
 #endif
 #ifndef PerlIO_fdupopen
-PERL_EXPORT_C PerlIO *PerlIO_fdupopen(pTHX_ PerlIO *, CLONE_PARAMS *, int);
+PERL_CALLCONV PerlIO *PerlIO_fdupopen(pTHX_ PerlIO *, CLONE_PARAMS *, int);
 #endif
-#if !defined(PerlIO_modestr) && !defined(PERLIO_IS_STDIO)
-PERL_EXPORT_C char *PerlIO_modestr(PerlIO *, char *buf);
+#if !defined(PerlIO_modestr)
+PERL_CALLCONV char *PerlIO_modestr(PerlIO *, char *buf);
 #endif
 #ifndef PerlIO_isutf8
-PERL_EXPORT_C int PerlIO_isutf8(PerlIO *);
+PERL_CALLCONV int PerlIO_isutf8(PerlIO *);
 #endif
 #ifndef PerlIO_apply_layers
-PERL_EXPORT_C int PerlIO_apply_layers(pTHX_ PerlIO *f, const char *mode,
+PERL_CALLCONV int PerlIO_apply_layers(pTHX_ PerlIO *f, const char *mode,
 				      const char *names);
 #endif
 #ifndef PerlIO_binmode
-PERL_EXPORT_C int PerlIO_binmode(pTHX_ PerlIO *f, int iotype, int omode,
+PERL_CALLCONV int PerlIO_binmode(pTHX_ PerlIO *f, int iotype, int omode,
 			  	 const char *names);
 #endif
 #ifndef PerlIO_getname
-PERL_EXPORT_C char *PerlIO_getname(PerlIO *, char *);
+PERL_CALLCONV char *PerlIO_getname(PerlIO *, char *);
 #endif
 
-PERL_EXPORT_C void PerlIO_destruct(pTHX);
+PERL_CALLCONV void PerlIO_destruct(pTHX);
 
-PERL_EXPORT_C int PerlIO_intmode2str(int rawmode, char *mode, int *writing);
+PERL_CALLCONV int PerlIO_intmode2str(int rawmode, char *mode, int *writing);
 
 #ifdef PERLIO_LAYERS
-PERL_EXPORT_C void PerlIO_cleanup(pTHX);
+PERL_CALLCONV void PerlIO_cleanup(pTHX);
 
-PERL_EXPORT_C void PerlIO_debug(const char *fmt, ...)
+PERL_CALLCONV void PerlIO_debug(const char *fmt, ...)
     __attribute__format__(__printf__, 1, 2);
 typedef struct PerlIO_list_s PerlIO_list_t;
 
-
 #endif
 
 END_EXTERN_C
diff --git a/Master/tlpkg/tlperl/lib/CORE/perliol.h b/Master/tlpkg/tlperl/lib/CORE/perliol.h
index b8c0eae6d6d..d15c937150d 100644
--- a/Master/tlpkg/tlperl/lib/CORE/perliol.h
+++ b/Master/tlpkg/tlperl/lib/CORE/perliol.h
@@ -124,8 +124,8 @@ EXTPERLIO PerlIO_funcs PerlIO_pending;
 #ifdef WIN32
 EXTPERLIO PerlIO_funcs PerlIO_win32;
 #endif
-PERL_EXPORT_C PerlIO *PerlIO_allocate(pTHX);
-PERL_EXPORT_C SV *PerlIO_arg_fetch(PerlIO_list_t *av, IV n);
+PERL_CALLCONV PerlIO *PerlIO_allocate(pTHX);
+PERL_CALLCONV SV *PerlIO_arg_fetch(PerlIO_list_t *av, IV n);
 #define PerlIOArg PerlIO_arg_fetch(layers,n)
 
 #ifdef PERLIO_USING_CRLF
@@ -150,28 +150,28 @@ typedef struct {
     IV oneword;			/* Emergency buffer */
 } PerlIOBuf;
 
-PERL_EXPORT_C int PerlIO_apply_layera(pTHX_ PerlIO *f, const char *mode,
+PERL_CALLCONV int PerlIO_apply_layera(pTHX_ PerlIO *f, const char *mode,
 		    PerlIO_list_t *layers, IV n, IV max);
-PERL_EXPORT_C int PerlIO_parse_layers(pTHX_ PerlIO_list_t *av, const char *names);
-PERL_EXPORT_C PerlIO_funcs *PerlIO_layer_fetch(pTHX_ PerlIO_list_t *av, IV n, PerlIO_funcs *def);
+PERL_CALLCONV int PerlIO_parse_layers(pTHX_ PerlIO_list_t *av, const char *names);
+PERL_CALLCONV PerlIO_funcs *PerlIO_layer_fetch(pTHX_ PerlIO_list_t *av, IV n, PerlIO_funcs *def);
 
 
-PERL_EXPORT_C SV *PerlIO_sv_dup(pTHX_ SV *arg, CLONE_PARAMS *param);
-PERL_EXPORT_C void PerlIO_cleantable(pTHX_ PerlIOl **tablep);
-PERL_EXPORT_C SV * PerlIO_tab_sv(pTHX_ PerlIO_funcs *tab);
-PERL_EXPORT_C void PerlIO_default_buffer(pTHX_ PerlIO_list_t *av);
-PERL_EXPORT_C void PerlIO_stdstreams(pTHX);
-PERL_EXPORT_C int PerlIO__close(pTHX_ PerlIO *f);
-PERL_EXPORT_C PerlIO_list_t * PerlIO_resolve_layers(pTHX_ const char *layers, const char *mode, int narg, SV **args);
-PERL_EXPORT_C PerlIO_funcs * PerlIO_default_layer(pTHX_ I32 n);
-PERL_EXPORT_C PerlIO_list_t * PerlIO_default_layers(pTHX);
-PERL_EXPORT_C PerlIO * PerlIO_reopen(const char *path, const char *mode, PerlIO *f);
+PERL_CALLCONV SV *PerlIO_sv_dup(pTHX_ SV *arg, CLONE_PARAMS *param);
+PERL_CALLCONV void PerlIO_cleantable(pTHX_ PerlIOl **tablep);
+PERL_CALLCONV SV * PerlIO_tab_sv(pTHX_ PerlIO_funcs *tab);
+PERL_CALLCONV void PerlIO_default_buffer(pTHX_ PerlIO_list_t *av);
+PERL_CALLCONV void PerlIO_stdstreams(pTHX);
+PERL_CALLCONV int PerlIO__close(pTHX_ PerlIO *f);
+PERL_CALLCONV PerlIO_list_t * PerlIO_resolve_layers(pTHX_ const char *layers, const char *mode, int narg, SV **args);
+PERL_CALLCONV PerlIO_funcs * PerlIO_default_layer(pTHX_ I32 n);
+PERL_CALLCONV PerlIO_list_t * PerlIO_default_layers(pTHX);
+PERL_CALLCONV PerlIO * PerlIO_reopen(const char *path, const char *mode, PerlIO *f);
 
-PERL_EXPORT_C PerlIO_list_t *PerlIO_list_alloc(pTHX);
-PERL_EXPORT_C PerlIO_list_t *PerlIO_clone_list(pTHX_ PerlIO_list_t *proto, CLONE_PARAMS *param);
-PERL_EXPORT_C void PerlIO_list_free(pTHX_ PerlIO_list_t *list);
-PERL_EXPORT_C void PerlIO_list_push(pTHX_ PerlIO_list_t *list, PerlIO_funcs *funcs, SV *arg);
-PERL_EXPORT_C void PerlIO_list_free(pTHX_ PerlIO_list_t *list);
+PERL_CALLCONV PerlIO_list_t *PerlIO_list_alloc(pTHX);
+PERL_CALLCONV PerlIO_list_t *PerlIO_clone_list(pTHX_ PerlIO_list_t *proto, CLONE_PARAMS *param);
+PERL_CALLCONV void PerlIO_list_free(pTHX_ PerlIO_list_t *list);
+PERL_CALLCONV void PerlIO_list_push(pTHX_ PerlIO_list_t *list, PerlIO_funcs *funcs, SV *arg);
+PERL_CALLCONV void PerlIO_list_free(pTHX_ PerlIO_list_t *list);
 
 /* PerlIO_teardown doesn't need exporting, but the EXTERN_C is needed
  * for compiling as C++.  Must also match with what perl.h says. */
@@ -180,111 +180,111 @@ EXTERN_C void PerlIO_teardown(void);
 /*--------------------------------------------------------------------------------------*/
 /* Generic, or stub layer functions */
 
-PERL_EXPORT_C IV        PerlIOBase_binmode(pTHX_ PerlIO *f);
-PERL_EXPORT_C void      PerlIOBase_clearerr(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOBase_close(pTHX_ PerlIO *f);
-PERL_EXPORT_C PerlIO *  PerlIOBase_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param, int flags);
-PERL_EXPORT_C IV        PerlIOBase_eof(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOBase_error(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOBase_fileno(pTHX_ PerlIO *f);
-PERL_EXPORT_C void      PerlIOBase_flush_linebuf(pTHX);
-PERL_EXPORT_C IV        PerlIOBase_noop_fail(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOBase_noop_ok(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOBase_popped(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOBase_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
-PERL_EXPORT_C PerlIO *  PerlIOBase_open(pTHX_ PerlIO_funcs *self, PerlIO_list_t *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *old, int narg, SV **args);
-PERL_EXPORT_C SSize_t   PerlIOBase_read(pTHX_ PerlIO *f, void *vbuf, Size_t count);
-PERL_EXPORT_C void      PerlIOBase_setlinebuf(pTHX_ PerlIO *f);
-PERL_EXPORT_C SSize_t   PerlIOBase_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
+PERL_CALLCONV IV        PerlIOBase_binmode(pTHX_ PerlIO *f);
+PERL_CALLCONV void      PerlIOBase_clearerr(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOBase_close(pTHX_ PerlIO *f);
+PERL_CALLCONV PerlIO *  PerlIOBase_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param, int flags);
+PERL_CALLCONV IV        PerlIOBase_eof(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOBase_error(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOBase_fileno(pTHX_ PerlIO *f);
+PERL_CALLCONV void      PerlIOBase_flush_linebuf(pTHX);
+PERL_CALLCONV IV        PerlIOBase_noop_fail(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOBase_noop_ok(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOBase_popped(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOBase_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
+PERL_CALLCONV PerlIO *  PerlIOBase_open(pTHX_ PerlIO_funcs *self, PerlIO_list_t *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *old, int narg, SV **args);
+PERL_CALLCONV SSize_t   PerlIOBase_read(pTHX_ PerlIO *f, void *vbuf, Size_t count);
+PERL_CALLCONV void      PerlIOBase_setlinebuf(pTHX_ PerlIO *f);
+PERL_CALLCONV SSize_t   PerlIOBase_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
 
 /* Buf */
-PERL_EXPORT_C Size_t    PerlIOBuf_bufsiz(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOBuf_close(pTHX_ PerlIO *f);
-PERL_EXPORT_C PerlIO *  PerlIOBuf_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param, int flags);
-PERL_EXPORT_C IV        PerlIOBuf_fill(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOBuf_flush(pTHX_ PerlIO *f);
-PERL_EXPORT_C STDCHAR * PerlIOBuf_get_base(pTHX_ PerlIO *f);
-PERL_EXPORT_C SSize_t   PerlIOBuf_get_cnt(pTHX_ PerlIO *f);
-PERL_EXPORT_C STDCHAR * PerlIOBuf_get_ptr(pTHX_ PerlIO *f);
-PERL_EXPORT_C PerlIO *  PerlIOBuf_open(pTHX_ PerlIO_funcs *self, PerlIO_list_t *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *old, int narg, SV **args);
-PERL_EXPORT_C IV        PerlIOBuf_popped(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOBuf_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
-PERL_EXPORT_C SSize_t   PerlIOBuf_read(pTHX_ PerlIO *f, void *vbuf, Size_t count);
-PERL_EXPORT_C IV        PerlIOBuf_seek(pTHX_ PerlIO *f, Off_t offset, int whence);
-PERL_EXPORT_C void      PerlIOBuf_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt);
-PERL_EXPORT_C Off_t     PerlIOBuf_tell(pTHX_ PerlIO *f);
-PERL_EXPORT_C SSize_t   PerlIOBuf_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
-PERL_EXPORT_C SSize_t   PerlIOBuf_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
+PERL_CALLCONV Size_t    PerlIOBuf_bufsiz(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOBuf_close(pTHX_ PerlIO *f);
+PERL_CALLCONV PerlIO *  PerlIOBuf_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param, int flags);
+PERL_CALLCONV IV        PerlIOBuf_fill(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOBuf_flush(pTHX_ PerlIO *f);
+PERL_CALLCONV STDCHAR * PerlIOBuf_get_base(pTHX_ PerlIO *f);
+PERL_CALLCONV SSize_t   PerlIOBuf_get_cnt(pTHX_ PerlIO *f);
+PERL_CALLCONV STDCHAR * PerlIOBuf_get_ptr(pTHX_ PerlIO *f);
+PERL_CALLCONV PerlIO *  PerlIOBuf_open(pTHX_ PerlIO_funcs *self, PerlIO_list_t *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *old, int narg, SV **args);
+PERL_CALLCONV IV        PerlIOBuf_popped(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOBuf_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
+PERL_CALLCONV SSize_t   PerlIOBuf_read(pTHX_ PerlIO *f, void *vbuf, Size_t count);
+PERL_CALLCONV IV        PerlIOBuf_seek(pTHX_ PerlIO *f, Off_t offset, int whence);
+PERL_CALLCONV void      PerlIOBuf_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt);
+PERL_CALLCONV Off_t     PerlIOBuf_tell(pTHX_ PerlIO *f);
+PERL_CALLCONV SSize_t   PerlIOBuf_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
+PERL_CALLCONV SSize_t   PerlIOBuf_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
 
 /* Crlf */
-PERL_EXPORT_C IV        PerlIOCrlf_binmode(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOCrlf_flush(pTHX_ PerlIO *f);
-PERL_EXPORT_C SSize_t   PerlIOCrlf_get_cnt(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOCrlf_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
-PERL_EXPORT_C void      PerlIOCrlf_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt);
-PERL_EXPORT_C SSize_t   PerlIOCrlf_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
-PERL_EXPORT_C SSize_t   PerlIOCrlf_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
+PERL_CALLCONV IV        PerlIOCrlf_binmode(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOCrlf_flush(pTHX_ PerlIO *f);
+PERL_CALLCONV SSize_t   PerlIOCrlf_get_cnt(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOCrlf_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
+PERL_CALLCONV void      PerlIOCrlf_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt);
+PERL_CALLCONV SSize_t   PerlIOCrlf_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
+PERL_CALLCONV SSize_t   PerlIOCrlf_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
 
 /* Pending */
-PERL_EXPORT_C IV        PerlIOPending_close(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOPending_fill(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOPending_flush(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOPending_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
-PERL_EXPORT_C SSize_t   PerlIOPending_read(pTHX_ PerlIO *f, void *vbuf, Size_t count);
-PERL_EXPORT_C IV        PerlIOPending_seek(pTHX_ PerlIO *f, Off_t offset, int whence);
-PERL_EXPORT_C void      PerlIOPending_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt);
+PERL_CALLCONV IV        PerlIOPending_close(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOPending_fill(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOPending_flush(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOPending_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
+PERL_CALLCONV SSize_t   PerlIOPending_read(pTHX_ PerlIO *f, void *vbuf, Size_t count);
+PERL_CALLCONV IV        PerlIOPending_seek(pTHX_ PerlIO *f, Off_t offset, int whence);
+PERL_CALLCONV void      PerlIOPending_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt);
 
 /* Pop */
-PERL_EXPORT_C IV        PerlIOPop_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
+PERL_CALLCONV IV        PerlIOPop_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
 
 /* Raw */
-PERL_EXPORT_C IV        PerlIORaw_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
+PERL_CALLCONV IV        PerlIORaw_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
 
 /* Stdio */
-PERL_EXPORT_C void      PerlIOStdio_clearerr(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOStdio_close(pTHX_ PerlIO *f);
-PERL_EXPORT_C PerlIO *  PerlIOStdio_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param, int flags);
-PERL_EXPORT_C IV        PerlIOStdio_eof(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOStdio_error(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOStdio_fileno(pTHX_ PerlIO *f);
+PERL_CALLCONV void      PerlIOStdio_clearerr(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOStdio_close(pTHX_ PerlIO *f);
+PERL_CALLCONV PerlIO *  PerlIOStdio_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param, int flags);
+PERL_CALLCONV IV        PerlIOStdio_eof(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOStdio_error(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOStdio_fileno(pTHX_ PerlIO *f);
 #ifdef USE_STDIO_PTR
-PERL_EXPORT_C STDCHAR * PerlIOStdio_get_ptr(pTHX_ PerlIO *f);
-PERL_EXPORT_C SSize_t   PerlIOStdio_get_cnt(pTHX_ PerlIO *f);
-PERL_EXPORT_C void      PerlIOStdio_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt);
+PERL_CALLCONV STDCHAR * PerlIOStdio_get_ptr(pTHX_ PerlIO *f);
+PERL_CALLCONV SSize_t   PerlIOStdio_get_cnt(pTHX_ PerlIO *f);
+PERL_CALLCONV void      PerlIOStdio_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt);
 #endif
-PERL_EXPORT_C IV        PerlIOStdio_fill(pTHX_ PerlIO *f);
-PERL_EXPORT_C IV        PerlIOStdio_flush(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOStdio_fill(pTHX_ PerlIO *f);
+PERL_CALLCONV IV        PerlIOStdio_flush(pTHX_ PerlIO *f);
 #ifdef FILE_base
-PERL_EXPORT_C STDCHAR * PerlIOStdio_get_base(pTHX_ PerlIO *f);
-PERL_EXPORT_C Size_t    PerlIOStdio_get_bufsiz(pTHX_ PerlIO *f);
+PERL_CALLCONV STDCHAR * PerlIOStdio_get_base(pTHX_ PerlIO *f);
+PERL_CALLCONV Size_t    PerlIOStdio_get_bufsiz(pTHX_ PerlIO *f);
 #endif
-PERL_EXPORT_C char *    PerlIOStdio_mode(const char *mode, char *tmode);
-PERL_EXPORT_C PerlIO *  PerlIOStdio_open(pTHX_ PerlIO_funcs *self, PerlIO_list_t *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *f, int narg, SV **args);
-PERL_EXPORT_C IV        PerlIOStdio_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
-PERL_EXPORT_C SSize_t   PerlIOStdio_read(pTHX_ PerlIO *f, void *vbuf, Size_t count);
-PERL_EXPORT_C IV        PerlIOStdio_seek(pTHX_ PerlIO *f, Off_t offset, int whence);
-PERL_EXPORT_C void      PerlIOStdio_setlinebuf(pTHX_ PerlIO *f);
-PERL_EXPORT_C Off_t     PerlIOStdio_tell(pTHX_ PerlIO *f);
-PERL_EXPORT_C SSize_t   PerlIOStdio_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
-PERL_EXPORT_C SSize_t   PerlIOStdio_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
+PERL_CALLCONV char *    PerlIOStdio_mode(const char *mode, char *tmode);
+PERL_CALLCONV PerlIO *  PerlIOStdio_open(pTHX_ PerlIO_funcs *self, PerlIO_list_t *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *f, int narg, SV **args);
+PERL_CALLCONV IV        PerlIOStdio_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
+PERL_CALLCONV SSize_t   PerlIOStdio_read(pTHX_ PerlIO *f, void *vbuf, Size_t count);
+PERL_CALLCONV IV        PerlIOStdio_seek(pTHX_ PerlIO *f, Off_t offset, int whence);
+PERL_CALLCONV void      PerlIOStdio_setlinebuf(pTHX_ PerlIO *f);
+PERL_CALLCONV Off_t     PerlIOStdio_tell(pTHX_ PerlIO *f);
+PERL_CALLCONV SSize_t   PerlIOStdio_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
+PERL_CALLCONV SSize_t   PerlIOStdio_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
 
 /* Unix */
-PERL_EXPORT_C IV        PerlIOUnix_close(pTHX_ PerlIO *f);
-PERL_EXPORT_C PerlIO *  PerlIOUnix_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param, int flags);
-PERL_EXPORT_C IV        PerlIOUnix_fileno(pTHX_ PerlIO *f);
-PERL_EXPORT_C int       PerlIOUnix_oflags(const char *mode);
-PERL_EXPORT_C PerlIO *  PerlIOUnix_open(pTHX_ PerlIO_funcs *self, PerlIO_list_t *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *f, int narg, SV **args);
-PERL_EXPORT_C IV        PerlIOUnix_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
-PERL_EXPORT_C SSize_t   PerlIOUnix_read(pTHX_ PerlIO *f, void *vbuf, Size_t count);
-PERL_EXPORT_C int       PerlIOUnix_refcnt_dec(int fd);
-PERL_EXPORT_C void      PerlIOUnix_refcnt_inc(int fd);
-PERL_EXPORT_C int       PerlIOUnix_refcnt(int fd);
-PERL_EXPORT_C IV        PerlIOUnix_seek(pTHX_ PerlIO *f, Off_t offset, int whence);
-PERL_EXPORT_C Off_t     PerlIOUnix_tell(pTHX_ PerlIO *f);
-PERL_EXPORT_C SSize_t   PerlIOUnix_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
+PERL_CALLCONV IV        PerlIOUnix_close(pTHX_ PerlIO *f);
+PERL_CALLCONV PerlIO *  PerlIOUnix_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *param, int flags);
+PERL_CALLCONV IV        PerlIOUnix_fileno(pTHX_ PerlIO *f);
+PERL_CALLCONV int       PerlIOUnix_oflags(const char *mode);
+PERL_CALLCONV PerlIO *  PerlIOUnix_open(pTHX_ PerlIO_funcs *self, PerlIO_list_t *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *f, int narg, SV **args);
+PERL_CALLCONV IV        PerlIOUnix_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
+PERL_CALLCONV SSize_t   PerlIOUnix_read(pTHX_ PerlIO *f, void *vbuf, Size_t count);
+PERL_CALLCONV int       PerlIOUnix_refcnt_dec(int fd);
+PERL_CALLCONV void      PerlIOUnix_refcnt_inc(int fd);
+PERL_CALLCONV int       PerlIOUnix_refcnt(int fd);
+PERL_CALLCONV IV        PerlIOUnix_seek(pTHX_ PerlIO *f, Off_t offset, int whence);
+PERL_CALLCONV Off_t     PerlIOUnix_tell(pTHX_ PerlIO *f);
+PERL_CALLCONV SSize_t   PerlIOUnix_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
 
 /* Utf8 */
-PERL_EXPORT_C IV        PerlIOUtf8_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
+PERL_CALLCONV IV        PerlIOUtf8_pushed(pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab);
 
 #endif				/* _PERLIOL_H */
 
diff --git a/Master/tlpkg/tlperl/lib/CORE/perlsdio.h b/Master/tlpkg/tlperl/lib/CORE/perlsdio.h
index cb255775790..2d6b22ebbfe 100644
--- a/Master/tlpkg/tlperl/lib/CORE/perlsdio.h
+++ b/Master/tlpkg/tlperl/lib/CORE/perlsdio.h
@@ -8,134 +8,12 @@
  *
  */
 
-#ifdef PERLIO_IS_STDIO
-
-#ifdef NETWARE
-	#include "nwstdio.h"
-#else
-
-/*
- * This file #define-s the PerlIO_xxx abstraction onto stdio functions.
- * Make this as close to original stdio as possible.
- */
-#define PerlIO				FILE
-#define PerlIO_stderr()			PerlSIO_stderr
-#define PerlIO_stdout()			PerlSIO_stdout
-#define PerlIO_stdin()			PerlSIO_stdin
-
-#define PerlIO_isutf8(f)		0
-
-#define PerlIO_printf			PerlSIO_printf
-#define PerlIO_stdoutf			PerlSIO_stdoutf
-#define PerlIO_vprintf(f,fmt,a)		PerlSIO_vprintf(f,fmt,a)
-#define PerlIO_write(f,buf,count)	PerlSIO_fwrite(buf,1,count,f)
-#define PerlIO_unread(f,buf,count)	(-1)
-#define PerlIO_open			PerlSIO_fopen
-#define PerlIO_fdopen			PerlSIO_fdopen
-#define PerlIO_reopen			PerlSIO_freopen
-#define PerlIO_close(f)			PerlSIO_fclose(f)
-#define PerlIO_puts(f,s)		PerlSIO_fputs(s,f)
-#define PerlIO_putc(f,c)		PerlSIO_fputc(c,f)
-#if defined(__VMS)
-     /* Unusual definition of ungetc() here to accommodate fast_sv_gets()'
-      * belief that it can mix getc/ungetc with reads from stdio buffer */
-START_EXTERN_C
-     int decc$ungetc(int __c, FILE *__stream);
-END_EXTERN_C
-#    define PerlIO_ungetc(f,c) ((c) == EOF ? EOF : \
-            ((*(f) && !((*(f))->_flag & _IONBF) && \
-            ((*(f))->_ptr > (*(f))->_base)) ? \
-            ((*(f))->_cnt++, *(--(*(f))->_ptr) = (c)) : decc$ungetc(c,f)))
-#else
-#    define PerlIO_ungetc(f,c)		ungetc(c,f)
-#endif
-#define PerlIO_getc(f)		PerlSIO_fgetc(f)
-#define PerlIO_ungetc(f,c)		PerlSIO_ungetc(c,f)
-#define PerlIO_read(f,buf,count)	(SSize_t)PerlSIO_fread(buf,1,count,f)
-#define PerlIO_tell(f)		PerlSIO_ftell(f)
-#define PerlIO_eof(f)			PerlSIO_feof(f)
-#define PerlIO_getname(f,b)		fgetname(f,b)
-#define PerlIO_error(f)			PerlSIO_ferror(f)
-#define PerlIO_fileno(f)		PerlSIO_fileno(f)
-#define PerlIO_clearerr(f)		PerlSIO_clearerr(f)
-#define PerlIO_flush(f)			PerlSIO_fflush(f)
-#define PerlIO_seek(f,o,w)		PerlSIO_fseek(f,o,w)
-
-#define PerlIO_rewind(f)		PerlSIO_rewind(f)
-#define PerlIO_tmpfile()		PerlSIO_tmpfile()
-
-#define PerlIO_importFILE(f,fl)		(f)
-#define PerlIO_exportFILE(f,fl)		(f)
-#define PerlIO_findFILE(f)		(f)
-#define PerlIO_releaseFILE(p,f)		((void) 0)
-
-#ifdef HAS_SETLINEBUF
-#define PerlIO_setlinebuf(f)		PerlSIO_setlinebuf(f);
-#else
-#define PerlIO_setlinebuf(f)		PerlSIO_setvbuf(f, NULL, _IOLBF, 0);
-#endif
-
-/* Now our interface to Configure's FILE_xxx macros */
-
-#ifdef USE_STDIO_PTR
-#define PerlIO_has_cntptr(f)		1
-#define PerlIO_get_ptr(f)		PerlSIO_get_ptr(f)
-#define PerlIO_get_cnt(f)		PerlSIO_get_cnt(f)
-
-#ifdef STDIO_CNT_LVALUE
-#define PerlIO_canset_cnt(f)		1
-#define PerlIO_set_cnt(f,c)		PerlSIO_set_cnt(f,c)
-#ifdef STDIO_PTR_LVALUE
-#ifdef STDIO_PTR_LVAL_NOCHANGE_CNT
-#define PerlIO_fast_gets(f)		1
-#endif
-#endif /* STDIO_PTR_LVALUE */
-#else /* STDIO_CNT_LVALUE */
-#define PerlIO_canset_cnt(f)		0
-#define PerlIO_set_cnt(f,c)		abort()
-#endif
-
-#ifdef STDIO_PTR_LVALUE
-#ifdef STDIO_PTR_LVAL_NOCHANGE_CNT
-#define PerlIO_set_ptrcnt(f,p,c)      STMT_START {PerlSIO_set_ptr(f,p), PerlIO_set_cnt(f,c);} STMT_END
-#else
-#ifdef STDIO_PTR_LVAL_SETS_CNT
-/* assert() may pre-process to ""; potential syntax error (FILE_ptr(), ) */
-#define PerlIO_set_ptrcnt(f,p,c)      STMT_START {PerlSIO_set_ptr(f,p); assert(PerlSIO_get_cnt(f) == (c));} STMT_END
-#define PerlIO_fast_gets(f)		1
-#else
-#define PerlIO_set_ptrcnt(f,p,c)	abort()
-#endif
-#endif
-#endif
-
-#else  /* USE_STDIO_PTR */
-
-#define PerlIO_has_cntptr(f)		0
-#define PerlIO_canset_cnt(f)		0
-#define PerlIO_get_cnt(f)		(abort(),0)
-#define PerlIO_get_ptr(f)		(abort(),(void *)0)
-#define PerlIO_set_cnt(f,c)		abort()
-#define PerlIO_set_ptrcnt(f,p,c)	abort()
-
-#endif /* USE_STDIO_PTR */
-
-#ifndef PerlIO_fast_gets
-#define PerlIO_fast_gets(f)		0
-#endif
+/* Shouldn't be possible to get here, but if we did ... */
 
+#ifdef PERLIO_IS_STDIO
 
-#ifdef FILE_base
-#define PerlIO_has_base(f)		1
-#define PerlIO_get_base(f)		PerlSIO_get_base(f)
-#define PerlIO_get_bufsiz(f)		PerlSIO_get_bufsiz(f)
-#else
-#define PerlIO_has_base(f)		0
-#define PerlIO_get_base(f)		(abort(),(void *)0)
-#define PerlIO_get_bufsiz(f)		(abort(),0)
-#endif
+#  error "stdio is no longer supported as the default base layer -- use perlio."
 
-#endif	/* NETWARE */
 #endif /* PERLIO_IS_STDIO */
 
 /*
diff --git a/Master/tlpkg/tlperl/lib/CORE/perlvars.h b/Master/tlpkg/tlperl/lib/CORE/perlvars.h
index 7bafa40882f..5466294963d 100644
--- a/Master/tlpkg/tlperl/lib/CORE/perlvars.h
+++ b/Master/tlpkg/tlperl/lib/CORE/perlvars.h
@@ -10,9 +10,14 @@
 
 /*
 =head1 Global Variables
-
 These variables are global to an entire process.  They are shared between
-all interpreters and all threads in a process.
+all interpreters and all threads in a process.  Any variables not documented
+here may be changed or removed without notice, so don't use them!
+If you feel you really do need to use an unlisted variable, first send email to
+L<perl5-porters@perl.org|mailto:perl5-porters@perl.org>.  It may be that
+someone there will point out a way to accomplish what you need without using an
+internal variable.  But if not, you should get a go-ahead to document and then
+use the variable.
 
 =cut
 */
@@ -94,6 +99,8 @@ PERLVARI(G, mmap_page_size, IV, 0)
 
 #if defined(USE_ITHREADS)
 PERLVAR(G, hints_mutex, perl_mutex)    /* Mutex for refcounted he refcounting */
+PERLVAR(G, locale_mutex, perl_mutex)   /* Mutex for setlocale() changing */
+
 #endif
 
 #ifdef DEBUGGING
diff --git a/Master/tlpkg/tlperl/lib/CORE/perly.h b/Master/tlpkg/tlperl/lib/CORE/perly.h
index db139d85f32..acbdaaec974 100644
--- a/Master/tlpkg/tlperl/lib/CORE/perly.h
+++ b/Master/tlpkg/tlperl/lib/CORE/perly.h
@@ -4,28 +4,27 @@
    Any changes made here will be lost!
  */
 
-#ifdef PERL_CORE
-/* A Bison parser, made by GNU Bison 2.3.  */
-
-/* Skeleton interface for Bison's Yacc-like parsers in C
+#define PERL_BISON_VERSION  20007
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+#ifdef PERL_CORE
+/* A Bison parser, made by GNU Bison 2.7.  */
 
-   This program is free software; you can redistribute it and/or modify
+/* Bison interface for Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -36,10 +35,18 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -128,6 +135,7 @@
      ARROW = 337
    };
 #endif
+
 /* Tokens.  */
 #define GRAMPROG 258
 #define GRAMEXPR 259
@@ -211,8 +219,6 @@
 #define ARROW 337
 
 
-
-
 #ifdef PERL_IN_TOKE_C
 static bool
 S_is_opval_token(int type) {
@@ -239,23 +245,39 @@ S_is_opval_token(int type) {
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
+/* Line 2058 of yacc.c  */
+
     I32	ival; /* __DEFAULT__ (marker for regen_perly.pl;
 				must always be 1st union member) */
     char *pval;
     OP *opval;
     GV *gvval;
-}
-/* Line 1529 of yacc.c.  */
-	YYSTYPE;
+
+
+/* Line 2058 of yacc.c  */
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
 
 
 /* Generated from:
- * e2ef3626c25dd92c66987e4c2f707e7f194c2bd5df74da27c51df206d9809412 perly.y
- * d1d4df7b8e30ac9dede664af9179e6e5e7ddc7f2ad9c4eff9e2e5b32c9e16a6e regen_perly.pl
+ * 703ebd267cf8ca45f9dee9bc0f4b21511117a0c1dca1c8bc9438ce91950217ae perly.y
+ * a4923588f219644801577c514014847e1e5240f49413fa3b89d3306fa4874d07 regen_perly.pl
  * ex: set ro: */
diff --git a/Master/tlpkg/tlperl/lib/CORE/pp.h b/Master/tlpkg/tlperl/lib/CORE/pp.h
index 828b7a2820f..d3d8f988ee0 100644
--- a/Master/tlpkg/tlperl/lib/CORE/pp.h
+++ b/Master/tlpkg/tlperl/lib/CORE/pp.h
@@ -14,36 +14,36 @@
 =head1 Stack Manipulation Macros
 
 =for apidoc AmU||SP
-Stack pointer.  This is usually handled by C<xsubpp>.  See C<dSP> and
+Stack pointer.  This is usually handled by C<xsubpp>.  See C<L</dSP>> and
 C<SPAGAIN>.
 
 =for apidoc AmU||MARK
-Stack marker variable for the XSUB.  See C<dMARK>.
+Stack marker variable for the XSUB.  See C<L</dMARK>>.
 
 =for apidoc Am|void|PUSHMARK|SP
-Opening bracket for arguments on a callback.  See C<PUTBACK> and
+Opening bracket for arguments on a callback.  See C<L</PUTBACK>> and
 L<perlcall>.
 
 =for apidoc Ams||dSP
 Declares a local copy of perl's stack pointer for the XSUB, available via
-the C<SP> macro.  See C<SP>.
+the C<SP> macro.  See C<L</SP>>.
 
 =for apidoc ms||djSP
 
 Declare Just C<SP>.  This is actually identical to C<dSP>, and declares
 a local copy of perl's stack pointer, available via the C<SP> macro.
-See C<SP>.  (Available for backward source code compatibility with the
-old (Perl 5.005) thread model.)
+See C<L<perlapi/SP>>.  (Available for backward source code compatibility with
+the old (Perl 5.005) thread model.)
 
 =for apidoc Ams||dMARK
-Declare a stack marker variable, C<mark>, for the XSUB.  See C<MARK> and
-C<dORIGMARK>.
+Declare a stack marker variable, C<mark>, for the XSUB.  See C<L</MARK>> and
+C<L</dORIGMARK>>.
 
 =for apidoc Ams||dORIGMARK
-Saves the original stack mark for the XSUB.  See C<ORIGMARK>.
+Saves the original stack mark for the XSUB.  See C<L</ORIGMARK>>.
 
 =for apidoc AmU||ORIGMARK
-The original stack mark for the XSUB.  See C<dORIGMARK>.
+The original stack mark for the XSUB.  See C<L</dORIGMARK>>.
 
 =for apidoc Ams||SPAGAIN
 Refetch the stack pointer.  Used after a callback.  See L<perlcall>.
@@ -55,16 +55,58 @@ Refetch the stack pointer.  Used after a callback.  See L<perlcall>.
 #define MARK mark
 #define TARG targ
 
-#define PUSHMARK(p)	\
-	STMT_START {					\
-	    I32 * mark_stack_entry;			\
-	    if (UNLIKELY((mark_stack_entry = ++PL_markstack_ptr) == PL_markstack_max))	\
-	    mark_stack_entry = markstack_grow();					\
-	    *mark_stack_entry  = (I32)((p) - PL_stack_base);				\
-	} STMT_END
+#if defined(DEBUGGING) && defined(PERL_USE_GCC_BRACE_GROUPS)
+
+#  define PUSHMARK(p) \
+    STMT_START {                                                      \
+        I32 * mark_stack_entry;                                       \
+        if (UNLIKELY((mark_stack_entry = ++PL_markstack_ptr)          \
+                                           == PL_markstack_max))      \
+	    mark_stack_entry = markstack_grow();                      \
+        *mark_stack_entry  = (I32)((p) - PL_stack_base);              \
+        DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log,                 \
+                "MARK push %p %"IVdf"\n",                             \
+                PL_markstack_ptr, (IV)*mark_stack_entry)));           \
+    } STMT_END
+
+#  define TOPMARK \
+    ({                                                                \
+        DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log,                 \
+                "MARK top  %p %"IVdf"\n",                             \
+                PL_markstack_ptr, (IV)*PL_markstack_ptr)));           \
+        *PL_markstack_ptr;                                            \
+    })
+
+#  define POPMARK \
+    ({                                                                \
+        DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log,                 \
+                "MARK pop  %p %"IVdf"\n",                             \
+                (PL_markstack_ptr-1), (IV)*(PL_markstack_ptr-1))));   \
+        assert((PL_markstack_ptr > PL_markstack) || !"MARK underflow");\
+        *PL_markstack_ptr--;                                          \
+    })
+
+#  define INCMARK \
+    ({                                                                \
+        DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log,                 \
+                "MARK inc  %p %"IVdf"\n",                             \
+                (PL_markstack_ptr+1), (IV)*(PL_markstack_ptr+1))));   \
+        *PL_markstack_ptr++;                                          \
+    })
+
+#else
 
-#define TOPMARK		(*PL_markstack_ptr)
-#define POPMARK		(*PL_markstack_ptr--)
+#  define PUSHMARK(p)                                                   \
+    STMT_START {					              \
+        I32 * mark_stack_entry;                                       \
+        if (UNLIKELY((mark_stack_entry = ++PL_markstack_ptr) == PL_markstack_max)) \
+	    mark_stack_entry = markstack_grow();                      \
+        *mark_stack_entry  = (I32)((p) - PL_stack_base);              \
+    } STMT_END
+#  define TOPMARK                (*PL_markstack_ptr)
+#  define POPMARK                (*PL_markstack_ptr--)
+#  define INCMARK                (*PL_markstack_ptr++)
+#endif
 
 #define dSP		SV **sp = PL_stack_sp
 #define djSP		dSP
@@ -92,7 +134,7 @@ Refetch the stack pointer.  Used after a callback.  See L<perlcall>.
 /*
 =for apidoc Ams||PUTBACK
 Closing bracket for XSUB arguments.  This is usually handled by C<xsubpp>.
-See C<PUSHMARK> and L<perlcall> for other uses.
+See C<L</PUSHMARK>> and L<perlcall> for other uses.
 
 =for apidoc Amn|SV*|POPs
 Pops an SV off the stack.
@@ -113,9 +155,15 @@ Pops a double off the stack.
 =for apidoc Amn|IV|POPi
 Pops an integer off the stack.
 
+=for apidoc Amn|UV|POPu
+Pops an unsigned integer off the stack.
+
 =for apidoc Amn|long|POPl
 Pops a long off the stack.
 
+=for apidoc Amn|long|POPul
+Pops an unsigned long off the stack.
+
 =cut
 */
 
@@ -156,40 +204,40 @@ onto the stack.
 
 =for apidoc Am|void|PUSHs|SV* sv
 Push an SV onto the stack.  The stack must have room for this element.
-Does not handle 'set' magic.  Does not use C<TARG>.  See also C<PUSHmortal>,
-C<XPUSHs> and C<XPUSHmortal>.
+Does not handle 'set' magic.  Does not use C<TARG>.  See also
+C<L</PUSHmortal>>, C<L</XPUSHs>>, and C<L</XPUSHmortal>>.
 
 =for apidoc Am|void|PUSHp|char* str|STRLEN len
 Push a string onto the stack.  The stack must have room for this element.
 The C<len> indicates the length of the string.  Handles 'set' magic.  Uses
 C<TARG>, so C<dTARGET> or C<dXSTARG> should be called to declare it.  Do not
 call multiple C<TARG>-oriented macros to return lists from XSUB's - see
-C<mPUSHp> instead.  See also C<XPUSHp> and C<mXPUSHp>.
+C<L</mPUSHp>> instead.  See also C<L</XPUSHp>> and C<L</mXPUSHp>>.
 
 =for apidoc Am|void|PUSHn|NV nv
 Push a double onto the stack.  The stack must have room for this element.
 Handles 'set' magic.  Uses C<TARG>, so C<dTARGET> or C<dXSTARG> should be
 called to declare it.  Do not call multiple C<TARG>-oriented macros to
-return lists from XSUB's - see C<mPUSHn> instead.  See also C<XPUSHn> and
-C<mXPUSHn>.
+return lists from XSUB's - see C<L</mPUSHn>> instead.  See also C<L</XPUSHn>>
+and C<L</mXPUSHn>>.
 
 =for apidoc Am|void|PUSHi|IV iv
 Push an integer onto the stack.  The stack must have room for this element.
 Handles 'set' magic.  Uses C<TARG>, so C<dTARGET> or C<dXSTARG> should be
 called to declare it.  Do not call multiple C<TARG>-oriented macros to 
-return lists from XSUB's - see C<mPUSHi> instead.  See also C<XPUSHi> and
-C<mXPUSHi>.
+return lists from XSUB's - see C<L</mPUSHi>> instead.  See also C<L</XPUSHi>>
+and C<L</mXPUSHi>>.
 
 =for apidoc Am|void|PUSHu|UV uv
 Push an unsigned integer onto the stack.  The stack must have room for this
 element.  Handles 'set' magic.  Uses C<TARG>, so C<dTARGET> or C<dXSTARG>
 should be called to declare it.  Do not call multiple C<TARG>-oriented
-macros to return lists from XSUB's - see C<mPUSHu> instead.  See also
-C<XPUSHu> and C<mXPUSHu>.
+macros to return lists from XSUB's - see C<L</mPUSHu>> instead.  See also
+C<L</XPUSHu>> and C<L</mXPUSHu>>.
 
 =for apidoc Am|void|XPUSHs|SV* sv
 Push an SV onto the stack, extending the stack if necessary.  Does not
-handle 'set' magic.  Does not use C<TARG>.  See also C<XPUSHmortal>,
+handle 'set' magic.  Does not use C<TARG>.  See also C<L</XPUSHmortal>>,
 C<PUSHs> and C<PUSHmortal>.
 
 =for apidoc Am|void|XPUSHp|char* str|STRLEN len
@@ -197,121 +245,222 @@ Push a string onto the stack, extending the stack if necessary.  The C<len>
 indicates the length of the string.  Handles 'set' magic.  Uses C<TARG>, so
 C<dTARGET> or C<dXSTARG> should be called to declare it.  Do not call
 multiple C<TARG>-oriented macros to return lists from XSUB's - see
-C<mXPUSHp> instead.  See also C<PUSHp> and C<mPUSHp>.
+C<L</mXPUSHp>> instead.  See also C<L</PUSHp>> and C<L</mPUSHp>>.
 
 =for apidoc Am|void|XPUSHn|NV nv
 Push a double onto the stack, extending the stack if necessary.  Handles
 'set' magic.  Uses C<TARG>, so C<dTARGET> or C<dXSTARG> should be called to
 declare it.  Do not call multiple C<TARG>-oriented macros to return lists
-from XSUB's - see C<mXPUSHn> instead.  See also C<PUSHn> and C<mPUSHn>.
+from XSUB's - see C<L</mXPUSHn>> instead.  See also C<L</PUSHn>> and
+C<L</mPUSHn>>.
 
 =for apidoc Am|void|XPUSHi|IV iv
 Push an integer onto the stack, extending the stack if necessary.  Handles
 'set' magic.  Uses C<TARG>, so C<dTARGET> or C<dXSTARG> should be called to
 declare it.  Do not call multiple C<TARG>-oriented macros to return lists
-from XSUB's - see C<mXPUSHi> instead.  See also C<PUSHi> and C<mPUSHi>.
+from XSUB's - see C<L</mXPUSHi>> instead.  See also C<L</PUSHi>> and
+C<L</mPUSHi>>.
 
 =for apidoc Am|void|XPUSHu|UV uv
 Push an unsigned integer onto the stack, extending the stack if necessary.
 Handles 'set' magic.  Uses C<TARG>, so C<dTARGET> or C<dXSTARG> should be
 called to declare it.  Do not call multiple C<TARG>-oriented macros to
-return lists from XSUB's - see C<mXPUSHu> instead.  See also C<PUSHu> and
-C<mPUSHu>.
+return lists from XSUB's - see C<L</mXPUSHu>> instead.  See also C<L</PUSHu>> and
+C<L</mPUSHu>>.
 
 =for apidoc Am|void|mPUSHs|SV* sv
 Push an SV onto the stack and mortalizes the SV.  The stack must have room
-for this element.  Does not use C<TARG>.  See also C<PUSHs> and C<mXPUSHs>.
+for this element.  Does not use C<TARG>.  See also C<L</PUSHs>> and
+C<L</mXPUSHs>>.
 
 =for apidoc Am|void|PUSHmortal
 Push a new mortal SV onto the stack.  The stack must have room for this
-element.  Does not use C<TARG>.  See also C<PUSHs>, C<XPUSHmortal> and C<XPUSHs>.
+element.  Does not use C<TARG>.  See also C<L</PUSHs>>, C<L</XPUSHmortal>> and
+C<L</XPUSHs>>.
 
 =for apidoc Am|void|mPUSHp|char* str|STRLEN len
 Push a string onto the stack.  The stack must have room for this element.
 The C<len> indicates the length of the string.  Does not use C<TARG>.
-See also C<PUSHp>, C<mXPUSHp> and C<XPUSHp>.
+See also C<L</PUSHp>>, C<L</mXPUSHp>> and C<L</XPUSHp>>.
 
 =for apidoc Am|void|mPUSHn|NV nv
 Push a double onto the stack.  The stack must have room for this element.
-Does not use C<TARG>.  See also C<PUSHn>, C<mXPUSHn> and C<XPUSHn>.
+Does not use C<TARG>.  See also C<L</PUSHn>>, C<L</mXPUSHn>> and C<L</XPUSHn>>.
 
 =for apidoc Am|void|mPUSHi|IV iv
 Push an integer onto the stack.  The stack must have room for this element.
-Does not use C<TARG>.  See also C<PUSHi>, C<mXPUSHi> and C<XPUSHi>.
+Does not use C<TARG>.  See also C<L</PUSHi>>, C<L</mXPUSHi>> and C<L</XPUSHi>>.
 
 =for apidoc Am|void|mPUSHu|UV uv
 Push an unsigned integer onto the stack.  The stack must have room for this
-element.  Does not use C<TARG>.  See also C<PUSHu>, C<mXPUSHu> and C<XPUSHu>.
+element.  Does not use C<TARG>.  See also C<L</PUSHu>>, C<L</mXPUSHu>> and
+C<L</XPUSHu>>.
 
 =for apidoc Am|void|mXPUSHs|SV* sv
 Push an SV onto the stack, extending the stack if necessary and mortalizes
-the SV.  Does not use C<TARG>.  See also C<XPUSHs> and C<mPUSHs>.
+the SV.  Does not use C<TARG>.  See also C<L</XPUSHs>> and C<L</mPUSHs>>.
 
 =for apidoc Am|void|XPUSHmortal
 Push a new mortal SV onto the stack, extending the stack if necessary.
-Does not use C<TARG>.  See also C<XPUSHs>, C<PUSHmortal> and C<PUSHs>.
+Does not use C<TARG>.  See also C<L</XPUSHs>>, C<L</PUSHmortal>> and
+C<L</PUSHs>>.
 
 =for apidoc Am|void|mXPUSHp|char* str|STRLEN len
 Push a string onto the stack, extending the stack if necessary.  The C<len>
-indicates the length of the string.  Does not use C<TARG>.  See also C<XPUSHp>,
-C<mPUSHp> and C<PUSHp>.
+indicates the length of the string.  Does not use C<TARG>.  See also
+C<L</XPUSHp>>, C<mPUSHp> and C<PUSHp>.
 
 =for apidoc Am|void|mXPUSHn|NV nv
 Push a double onto the stack, extending the stack if necessary.
-Does not use C<TARG>.  See also C<XPUSHn>, C<mPUSHn> and C<PUSHn>.
+Does not use C<TARG>.  See also C<L</XPUSHn>>, C<L</mPUSHn>> and C<L</PUSHn>>.
 
 =for apidoc Am|void|mXPUSHi|IV iv
 Push an integer onto the stack, extending the stack if necessary.
-Does not use C<TARG>.  See also C<XPUSHi>, C<mPUSHi> and C<PUSHi>.
+Does not use C<TARG>.  See also C<L</XPUSHi>>, C<L</mPUSHi>> and C<L</PUSHi>>.
 
 =for apidoc Am|void|mXPUSHu|UV uv
 Push an unsigned integer onto the stack, extending the stack if necessary.
-Does not use C<TARG>.  See also C<XPUSHu>, C<mPUSHu> and C<PUSHu>.
+Does not use C<TARG>.  See also C<L</XPUSHu>>, C<L</mPUSHu>> and C<L</PUSHu>>.
 
 =cut
 */
 
+/* _EXTEND_SAFE_N(n): private helper macro for EXTEND().
+ * Tests whether the value of n would be truncated when implicitly cast to
+ * SSize_t as an arg to stack_grow(). If so, sets it to -1 instead to
+ * trigger a panic. It will be constant folded on platforms where this
+ * can't happen.
+ */
+
+#define _EXTEND_SAFE_N(n) \
+        (sizeof(n) > sizeof(SSize_t) && ((SSize_t)(n) != (n)) ? -1 : (n))
+
 #ifdef STRESS_REALLOC
 # define EXTEND(p,n)   STMT_START {                                     \
-                           sp = stack_grow(sp,p,(SSize_t) (n));         \
+                           sp = stack_grow(sp,p,_EXTEND_SAFE_N(n));     \
                            PERL_UNUSED_VAR(sp);                         \
                        } STMT_END
 /* Same thing, but update mark register too. */
 # define MEXTEND(p,n)   STMT_START {                                    \
                             const SSize_t markoff = mark - PL_stack_base; \
-                            sp = stack_grow(sp,p,(SSize_t) (n));        \
+                            sp = stack_grow(sp,p,_EXTEND_SAFE_N(n));    \
                             mark = PL_stack_base + markoff;             \
                             PERL_UNUSED_VAR(sp);                        \
                         } STMT_END
 #else
-# define EXTEND(p,n)   STMT_START {                                     \
-                         if (UNLIKELY(PL_stack_max - p < (SSize_t)(n))) { \
-                           sp = stack_grow(sp,p,(SSize_t) (n));         \
+
+/* _EXTEND_NEEDS_GROW(p,n): private helper macro for EXTEND().
+ * Tests to see whether n is too big and we need to grow the stack. Be
+ * very careful if modifying this. There are many ways to get things wrong
+ * (wrapping, truncating etc) that could cause a false negative and cause
+ * the call to stack_grow() to be skipped. On the other hand, false
+ * positives are safe.
+ * Bear in mind that sizeof(p) may be less than, equal to, or greater
+ * than sizeof(n), and while n is documented to be signed, someone might
+ * pass an unsigned value or expression. In general don't use casts to
+ * avoid warnings; instead expect the caller to fix their code.
+ * It is legal for p to be greater than PL_stack_max.
+ * If the allocated stack is already very large but current usage is
+ * small, then PL_stack_max - p might wrap round to a negative value, but
+ * this just gives a safe false positive
+ */
+
+#  define _EXTEND_NEEDS_GROW(p,n) ( (n) < 0 || PL_stack_max - p < (n))
+
+#  define EXTEND(p,n)   STMT_START {                                    \
+                         if (UNLIKELY(_EXTEND_NEEDS_GROW(p,n))) {       \
+                           sp = stack_grow(sp,p,_EXTEND_SAFE_N(n));     \
                            PERL_UNUSED_VAR(sp);                         \
                          } } STMT_END
 /* Same thing, but update mark register too. */
-# define MEXTEND(p,n)  STMT_START {                                     \
-                         if (UNLIKELY(PL_stack_max - p < (SSize_t)(n))) { \
-                           const SSize_t markoff = mark - PL_stack_base;  \
-                           sp = stack_grow(sp,p,(SSize_t) (n));         \
+#  define MEXTEND(p,n)  STMT_START {                                    \
+                         if (UNLIKELY(_EXTEND_NEEDS_GROW(p,n))) {       \
+                           const SSize_t markoff = mark - PL_stack_base;\
+                           sp = stack_grow(sp,p,_EXTEND_SAFE_N(n));     \
                            mark = PL_stack_base + markoff;              \
                            PERL_UNUSED_VAR(sp);                         \
                          } } STMT_END
 #endif
 
+/* set TARG to the IV value i. If do_taint is false,
+ * assume that PL_tainted can never be true */
+#define TARGi(i, do_taint) \
+    STMT_START {                                                        \
+        IV TARGi_iv = i;                                                \
+        if (LIKELY(                                                     \
+              ((SvFLAGS(TARG) & (SVTYPEMASK|SVf_THINKFIRST|SVf_IVisUV)) == SVt_IV) \
+            & (do_taint ? !TAINT_get : 1)))                             \
+        {                                                               \
+            /* Cheap SvIOK_only().                                      \
+             * Assert that flags which SvIOK_only() would test or       \
+             * clear can't be set, because we're SVt_IV */              \
+            assert(!(SvFLAGS(TARG) &                                    \
+                (SVf_OOK|SVf_UTF8|(SVf_OK & ~(SVf_IOK|SVp_IOK)))));     \
+            SvFLAGS(TARG) |= (SVf_IOK|SVp_IOK);                         \
+            /* SvIV_set() where sv_any points to head */                \
+            TARG->sv_u.svu_iv = TARGi_iv;                               \
+        }                                                               \
+        else                                                            \
+            sv_setiv_mg(targ, TARGi_iv);                                \
+    } STMT_END
+
+/* set TARG to the UV value u. If do_taint is false,
+ * assume that PL_tainted can never be true */
+#define TARGu(u, do_taint) \
+    STMT_START {                                                        \
+        UV TARGu_uv = u;                                                \
+        if (LIKELY(                                                     \
+              ((SvFLAGS(TARG) & (SVTYPEMASK|SVf_THINKFIRST|SVf_IVisUV)) == SVt_IV) \
+            & (do_taint ? !TAINT_get : 1)                               \
+            & (TARGu_uv <= (UV)IV_MAX)))                                \
+        {                                                               \
+            /* Cheap SvIOK_only().                                      \
+             * Assert that flags which SvIOK_only() would test or       \
+             * clear can't be set, because we're SVt_IV */              \
+            assert(!(SvFLAGS(TARG) &                                    \
+                (SVf_OOK|SVf_UTF8|(SVf_OK & ~(SVf_IOK|SVp_IOK)))));     \
+            SvFLAGS(TARG) |= (SVf_IOK|SVp_IOK);                         \
+            /* SvIV_set() where sv_any points to head */                \
+            TARG->sv_u.svu_iv = TARGu_uv;                               \
+        }                                                               \
+        else                                                            \
+            sv_setuv_mg(targ, TARGu_uv);                                \
+    } STMT_END
+
+/* set TARG to the NV value n. If do_taint is false,
+ * assume that PL_tainted can never be true */
+#define TARGn(n, do_taint) \
+    STMT_START {                                                        \
+        NV TARGn_nv = n;                                                \
+        if (LIKELY(                                                     \
+              ((SvFLAGS(TARG) & (SVTYPEMASK|SVf_THINKFIRST)) == SVt_NV) \
+            & (do_taint ? !TAINT_get : 1)))                             \
+        {                                                               \
+            /* Cheap SvNOK_only().                                      \
+             * Assert that flags which SvNOK_only() would test or       \
+             * clear can't be set, because we're SVt_NV */              \
+            assert(!(SvFLAGS(TARG) &                                    \
+                (SVf_OOK|SVf_UTF8|(SVf_OK & ~(SVf_NOK|SVp_NOK)))));     \
+            SvFLAGS(TARG) |= (SVf_NOK|SVp_NOK);                         \
+            SvNV_set(TARG, TARGn_nv);                                   \
+        }                                                               \
+        else                                                            \
+            sv_setnv_mg(targ, TARGn_nv);                                \
+    } STMT_END
+
 #define PUSHs(s)	(*++sp = (s))
 #define PUSHTARG	STMT_START { SvSETMAGIC(TARG); PUSHs(TARG); } STMT_END
 #define PUSHp(p,l)	STMT_START { sv_setpvn(TARG, (p), (l)); PUSHTARG; } STMT_END
-#define PUSHn(n)	STMT_START { sv_setnv(TARG, (NV)(n)); PUSHTARG; } STMT_END
-#define PUSHi(i)	STMT_START { sv_setiv(TARG, (IV)(i)); PUSHTARG; } STMT_END
-#define PUSHu(u)	STMT_START { sv_setuv(TARG, (UV)(u)); PUSHTARG; } STMT_END
+#define PUSHn(n)	STMT_START { TARGn(n,1); PUSHs(TARG); } STMT_END
+#define PUSHi(i)	STMT_START { TARGi(i,1); PUSHs(TARG); } STMT_END
+#define PUSHu(u)	STMT_START { TARGu(u,1); PUSHs(TARG); } STMT_END
 
 #define XPUSHs(s)	STMT_START { EXTEND(sp,1); *++sp = (s); } STMT_END
 #define XPUSHTARG	STMT_START { SvSETMAGIC(TARG); XPUSHs(TARG); } STMT_END
 #define XPUSHp(p,l)	STMT_START { sv_setpvn(TARG, (p), (l)); XPUSHTARG; } STMT_END
-#define XPUSHn(n)	STMT_START { sv_setnv(TARG, (NV)(n)); XPUSHTARG; } STMT_END
-#define XPUSHi(i)	STMT_START { sv_setiv(TARG, (IV)(i)); XPUSHTARG; } STMT_END
-#define XPUSHu(u)	STMT_START { sv_setuv(TARG, (UV)(u)); XPUSHTARG; } STMT_END
+#define XPUSHn(n)	STMT_START { TARGn(n,1); XPUSHs(TARG); } STMT_END
+#define XPUSHi(i)	STMT_START { TARGi(i,1); XPUSHs(TARG); } STMT_END
+#define XPUSHu(u)	STMT_START { TARGu(u,1); XPUSHs(TARG); } STMT_END
 #define XPUSHundef	STMT_START { SvOK_off(TARG); XPUSHs(TARG); } STMT_END
 
 #define mPUSHs(s)	PUSHs(sv_2mortal(s))
@@ -331,9 +480,9 @@ Does not use C<TARG>.  See also C<XPUSHu>, C<mPUSHu> and C<PUSHu>.
 #define SETs(s)		(*sp = s)
 #define SETTARG		STMT_START { SvSETMAGIC(TARG); SETs(TARG); } STMT_END
 #define SETp(p,l)	STMT_START { sv_setpvn(TARG, (p), (l)); SETTARG; } STMT_END
-#define SETn(n)		STMT_START { sv_setnv(TARG, (NV)(n)); SETTARG; } STMT_END
-#define SETi(i)		STMT_START { sv_setiv(TARG, (IV)(i)); SETTARG; } STMT_END
-#define SETu(u)		STMT_START { sv_setuv(TARG, (UV)(u)); SETTARG; } STMT_END
+#define SETn(n)		STMT_START { TARGn(n,1); SETs(TARG); } STMT_END
+#define SETi(i)		STMT_START { TARGi(i,1); SETs(TARG); } STMT_END
+#define SETu(u)		STMT_START { TARGu(u,1); SETs(TARG); } STMT_END
 
 #define dTOPss		SV *sv = TOPs
 #define dPOPss		SV *sv = POPs
@@ -432,7 +581,7 @@ Does not use C<TARG>.  See also C<XPUSHu>, C<mPUSHu> and C<PUSHu>.
 	dSP;							\
 	SV *tmpsv;						\
 	SV *arg= *sp;						\
-        int gimme = GIMME_V;                                    \
+        U8 gimme = GIMME_V;                                    \
 	if (UNLIKELY(SvAMAGIC(arg) &&				\
 	    (tmpsv = amagic_call(arg, &PL_sv_undef, meth,	\
 				 AMGf_want_list | AMGf_noright	\
@@ -465,7 +614,7 @@ Does not use C<TARG>.  See also C<XPUSHu>, C<mPUSHu> and C<PUSHu>.
 		while (jump_o->op_type == OP_NULL)		\
 		    jump_o = jump_o->op_next;			\
 		assert(jump_o->op_type == OP_ENTERSUB);		\
-		PL_markstack_ptr--;				\
+		(void)POPMARK;                                        \
 		return jump_o->op_next;				\
 	    }							\
 	    return NORMAL;					\
diff --git a/Master/tlpkg/tlperl/lib/CORE/pp_proto.h b/Master/tlpkg/tlperl/lib/CORE/pp_proto.h
index 7f9d1223334..f919313ed1f 100644
--- a/Master/tlpkg/tlperl/lib/CORE/pp_proto.h
+++ b/Master/tlpkg/tlperl/lib/CORE/pp_proto.h
@@ -184,8 +184,10 @@ PERL_CALLCONV OP *Perl_pp_padrange(pTHX);
 PERL_CALLCONV OP *Perl_pp_padsv(pTHX);
 PERL_CALLCONV OP *Perl_pp_pipe_op(pTHX);
 PERL_CALLCONV OP *Perl_pp_pos(pTHX);
+PERL_CALLCONV OP *Perl_pp_postdec(pTHX);
 PERL_CALLCONV OP *Perl_pp_postinc(pTHX);
 PERL_CALLCONV OP *Perl_pp_pow(pTHX);
+PERL_CALLCONV OP *Perl_pp_predec(pTHX);
 PERL_CALLCONV OP *Perl_pp_preinc(pTHX);
 PERL_CALLCONV OP *Perl_pp_print(pTHX);
 PERL_CALLCONV OP *Perl_pp_prototype(pTHX);
@@ -215,7 +217,6 @@ PERL_CALLCONV OP *Perl_pp_return(pTHX);
 PERL_CALLCONV OP *Perl_pp_reverse(pTHX);
 PERL_CALLCONV OP *Perl_pp_rewinddir(pTHX);
 PERL_CALLCONV OP *Perl_pp_right_shift(pTHX);
-PERL_CALLCONV OP *Perl_pp_rkeys(pTHX);
 PERL_CALLCONV OP *Perl_pp_rmdir(pTHX);
 PERL_CALLCONV OP *Perl_pp_runcv(pTHX);
 PERL_CALLCONV OP *Perl_pp_rv2av(pTHX);
diff --git a/Master/tlpkg/tlperl/lib/CORE/proto.h b/Master/tlpkg/tlperl/lib/CORE/proto.h
index 0a3375884a7..fb4ee295087 100644
--- a/Master/tlpkg/tlperl/lib/CORE/proto.h
+++ b/Master/tlpkg/tlperl/lib/CORE/proto.h
@@ -22,11 +22,9 @@ PERL_CALLCONV UV	ASCII_TO_NEED(const UV enc, const UV ch)
 			__attribute__warn_unused_result__
 			__attribute__pure__;
 
-PERL_CALLCONV int	Perl_Gv_AMupdate(pTHX_ HV* stash, bool destructing)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_Gv_AMupdate(pTHX_ HV* stash, bool destructing);
 #define PERL_ARGS_ASSERT_GV_AMUPDATE	\
 	assert(stash)
-
 PERL_CALLCONV UV	NATIVE_TO_NEED(const UV enc, const UV ch)
 			__attribute__deprecated__
 			__attribute__warn_unused_result__
@@ -37,11 +35,9 @@ PERL_CALLCONV void*	Perl_Slab_Alloc(pTHX_ size_t sz)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV void	Perl_Slab_Free(pTHX_ void *op)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_Slab_Free(pTHX_ void *op);
 #define PERL_ARGS_ASSERT_SLAB_FREE	\
 	assert(op)
-
 PERL_CALLCONV SV*	Perl__get_encoding(pTHX)
 			__attribute__pure__;
 
@@ -56,325 +52,204 @@ PERL_CALLCONV bool	Perl__is_uni_perl_idstart(pTHX_ UV c)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV bool	Perl__is_utf8_FOO(pTHX_ const U8 classnum, const U8 *p)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__IS_UTF8_FOO	\
 	assert(p)
 
-PERL_STATIC_INLINE STRLEN	S__is_utf8_char_slow(const U8 *s, const U8 *e)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
-#define PERL_ARGS_ASSERT__IS_UTF8_CHAR_SLOW	\
-	assert(s); assert(e)
-
 PERL_CALLCONV bool	Perl__is_utf8_idcont(pTHX_ const U8 *p)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__IS_UTF8_IDCONT	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl__is_utf8_idstart(pTHX_ const U8 *p)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__IS_UTF8_IDSTART	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl__is_utf8_mark(pTHX_ const U8 *p)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__IS_UTF8_MARK	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl__is_utf8_perl_idcont(pTHX_ const U8 *p)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__IS_UTF8_PERL_IDCONT	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl__is_utf8_perl_idstart(pTHX_ const U8 *p)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__IS_UTF8_PERL_IDSTART	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl__is_utf8_xidcont(pTHX_ const U8 *p)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__IS_UTF8_XIDCONT	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl__is_utf8_xidstart(pTHX_ const U8 *p)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__IS_UTF8_XIDSTART	\
 	assert(p)
 
-PERL_CALLCONV UV	Perl__to_uni_fold_flags(pTHX_ UV c, U8 *p, STRLEN *lenp, U8 flags)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV UV	Perl__to_uni_fold_flags(pTHX_ UV c, U8 *p, STRLEN *lenp, U8 flags);
 #define PERL_ARGS_ASSERT__TO_UNI_FOLD_FLAGS	\
 	assert(p); assert(lenp)
-
-PERL_CALLCONV UV	Perl__to_utf8_fold_flags(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp, U8 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV UV	Perl__to_utf8_fold_flags(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp, U8 flags);
 #define PERL_ARGS_ASSERT__TO_UTF8_FOLD_FLAGS	\
 	assert(p); assert(ustrp)
-
-PERL_CALLCONV UV	Perl__to_utf8_lower_flags(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp, bool flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV UV	Perl__to_utf8_lower_flags(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp, bool flags);
 #define PERL_ARGS_ASSERT__TO_UTF8_LOWER_FLAGS	\
 	assert(p); assert(ustrp)
-
-PERL_CALLCONV UV	Perl__to_utf8_title_flags(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp, bool flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV UV	Perl__to_utf8_title_flags(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp, bool flags);
 #define PERL_ARGS_ASSERT__TO_UTF8_TITLE_FLAGS	\
 	assert(p); assert(ustrp)
-
-PERL_CALLCONV UV	Perl__to_utf8_upper_flags(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp, bool flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV UV	Perl__to_utf8_upper_flags(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp, bool flags);
 #define PERL_ARGS_ASSERT__TO_UTF8_UPPER_FLAGS	\
 	assert(p); assert(ustrp)
-
 PERL_CALLCONV void	Perl__warn_problematic_locale(void);
-PERL_CALLCONV PADOFFSET	Perl_allocmy(pTHX_ const char *const name, const STRLEN len, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PADOFFSET	Perl_allocmy(pTHX_ const char *const name, const STRLEN len, const U32 flags);
 #define PERL_ARGS_ASSERT_ALLOCMY	\
 	assert(name)
-
-PERL_CALLCONV SV*	Perl_amagic_call(pTHX_ SV* left, SV* right, int method, int dir)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV*	Perl_amagic_call(pTHX_ SV* left, SV* right, int method, int dir);
 #define PERL_ARGS_ASSERT_AMAGIC_CALL	\
 	assert(left); assert(right)
-
-PERL_CALLCONV SV *	Perl_amagic_deref_call(pTHX_ SV *ref, int method)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV *	Perl_amagic_deref_call(pTHX_ SV *ref, int method);
 #define PERL_ARGS_ASSERT_AMAGIC_DEREF_CALL	\
 	assert(ref)
-
 PERL_CALLCONV bool	Perl_amagic_is_enabled(pTHX_ int method);
-PERL_STATIC_INLINE void	S_append_utf8_from_native_byte(const U8 byte, U8** dest)
-			__attribute__nonnull__(2);
-#define PERL_ARGS_ASSERT_APPEND_UTF8_FROM_NATIVE_BYTE	\
-	assert(dest)
-
-PERL_CALLCONV I32	Perl_apply(pTHX_ I32 type, SV** mark, SV** sp)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV I32	Perl_apply(pTHX_ I32 type, SV** mark, SV** sp);
 #define PERL_ARGS_ASSERT_APPLY	\
 	assert(mark); assert(sp)
-
-PERL_CALLCONV void	Perl_apply_attrs_string(pTHX_ const char *stashpv, CV *cv, const char *attrstr, STRLEN len)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_apply_attrs_string(pTHX_ const char *stashpv, CV *cv, const char *attrstr, STRLEN len);
 #define PERL_ARGS_ASSERT_APPLY_ATTRS_STRING	\
 	assert(stashpv); assert(cv); assert(attrstr)
-
 PERL_CALLCONV void	Perl_atfork_lock(void);
 PERL_CALLCONV void	Perl_atfork_unlock(void);
-PERL_CALLCONV SV**	Perl_av_arylen_p(pTHX_ AV *av)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV**	Perl_av_arylen_p(pTHX_ AV *av);
 #define PERL_ARGS_ASSERT_AV_ARYLEN_P	\
 	assert(av)
-
-PERL_CALLCONV void	Perl_av_clear(pTHX_ AV *av)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_av_clear(pTHX_ AV *av);
 #define PERL_ARGS_ASSERT_AV_CLEAR	\
 	assert(av)
-
-PERL_CALLCONV void	Perl_av_create_and_push(pTHX_ AV **const avp, SV *const val)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_av_create_and_push(pTHX_ AV **const avp, SV *const val);
 #define PERL_ARGS_ASSERT_AV_CREATE_AND_PUSH	\
 	assert(avp); assert(val)
-
-PERL_CALLCONV SV**	Perl_av_create_and_unshift_one(pTHX_ AV **const avp, SV *const val)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV**	Perl_av_create_and_unshift_one(pTHX_ AV **const avp, SV *const val);
 #define PERL_ARGS_ASSERT_AV_CREATE_AND_UNSHIFT_ONE	\
 	assert(avp); assert(val)
-
-PERL_CALLCONV SV*	Perl_av_delete(pTHX_ AV *av, SSize_t key, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_av_delete(pTHX_ AV *av, SSize_t key, I32 flags);
 #define PERL_ARGS_ASSERT_AV_DELETE	\
 	assert(av)
-
 PERL_CALLCONV bool	Perl_av_exists(pTHX_ AV *av, SSize_t key)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_AV_EXISTS	\
 	assert(av)
 
-PERL_CALLCONV void	Perl_av_extend(pTHX_ AV *av, SSize_t key)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_av_extend(pTHX_ AV *av, SSize_t key);
 #define PERL_ARGS_ASSERT_AV_EXTEND	\
 	assert(av)
-
-PERL_CALLCONV void	Perl_av_extend_guts(pTHX_ AV *av, SSize_t key, SSize_t *maxp, SV ***allocp, SV ***arrayp)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+PERL_CALLCONV void	Perl_av_extend_guts(pTHX_ AV *av, SSize_t key, SSize_t *maxp, SV ***allocp, SV ***arrayp);
 #define PERL_ARGS_ASSERT_AV_EXTEND_GUTS	\
 	assert(maxp); assert(allocp); assert(arrayp)
-
 PERL_CALLCONV SV**	Perl_av_fetch(pTHX_ AV *av, SSize_t key, I32 lval)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_AV_FETCH	\
 	assert(av)
 
-PERL_CALLCONV void	Perl_av_fill(pTHX_ AV *av, SSize_t fill)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_av_fill(pTHX_ AV *av, SSize_t fill);
 #define PERL_ARGS_ASSERT_AV_FILL	\
 	assert(av)
-
-PERL_CALLCONV IV*	Perl_av_iter_p(pTHX_ AV *av)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV IV*	Perl_av_iter_p(pTHX_ AV *av);
 #define PERL_ARGS_ASSERT_AV_ITER_P	\
 	assert(av)
-
 PERL_CALLCONV SSize_t	Perl_av_len(pTHX_ AV *av)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_AV_LEN	\
 	assert(av)
 
 PERL_CALLCONV AV*	Perl_av_make(pTHX_ SSize_t size, SV **strp)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_AV_MAKE	\
 	assert(strp)
 
-PERL_CALLCONV SV*	Perl_av_pop(pTHX_ AV *av)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_av_pop(pTHX_ AV *av);
 #define PERL_ARGS_ASSERT_AV_POP	\
 	assert(av)
-
-PERL_CALLCONV void	Perl_av_push(pTHX_ AV *av, SV *val)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_av_push(pTHX_ AV *av, SV *val);
 #define PERL_ARGS_ASSERT_AV_PUSH	\
 	assert(av); assert(val)
-
-PERL_CALLCONV void	Perl_av_reify(pTHX_ AV *av)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_av_reify(pTHX_ AV *av);
 #define PERL_ARGS_ASSERT_AV_REIFY	\
 	assert(av)
-
 PERL_CALLCONV SV*	Perl_av_shift(pTHX_ AV *av)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_AV_SHIFT	\
 	assert(av)
 
-PERL_CALLCONV SV**	Perl_av_store(pTHX_ AV *av, SSize_t key, SV *val)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV**	Perl_av_store(pTHX_ AV *av, SSize_t key, SV *val);
 #define PERL_ARGS_ASSERT_AV_STORE	\
 	assert(av)
-
 /* PERL_CALLCONV SSize_t	Perl_av_tindex(pTHX_ AV *av)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1); */
-
-PERL_STATIC_INLINE SSize_t	S_av_top_index(pTHX_ AV *av)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_AV_TOP_INDEX	\
-	assert(av)
+			__attribute__warn_unused_result__; */
 
-PERL_CALLCONV void	Perl_av_undef(pTHX_ AV *av)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_av_undef(pTHX_ AV *av);
 #define PERL_ARGS_ASSERT_AV_UNDEF	\
 	assert(av)
-
-PERL_CALLCONV void	Perl_av_unshift(pTHX_ AV *av, SSize_t num)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_av_unshift(pTHX_ AV *av, SSize_t num);
 #define PERL_ARGS_ASSERT_AV_UNSHIFT	\
 	assert(av)
-
 PERL_CALLCONV OP*	Perl_bind_match(pTHX_ I32 type, OP *left, OP *right)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_BIND_MATCH	\
 	assert(left); assert(right)
 
 PERL_CALLCONV OP*	Perl_block_end(pTHX_ I32 floor, OP* seq)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV I32	Perl_block_gimme(pTHX)
+PERL_CALLCONV U8	Perl_block_gimme(pTHX)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV int	Perl_block_start(pTHX_ int full)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV void	Perl_blockhook_register(pTHX_ BHK *hk)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_blockhook_register(pTHX_ BHK *hk);
 #define PERL_ARGS_ASSERT_BLOCKHOOK_REGISTER	\
 	assert(hk)
-
 PERL_CALLCONV void	Perl_boot_core_PerlIO(pTHX);
 PERL_CALLCONV void	Perl_boot_core_UNIVERSAL(pTHX);
 PERL_CALLCONV void	Perl_boot_core_mro(pTHX);
-PERL_CALLCONV int	Perl_bytes_cmp_utf8(pTHX_ const U8 *b, STRLEN blen, const U8 *u, STRLEN ulen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV int	Perl_bytes_cmp_utf8(pTHX_ const U8 *b, STRLEN blen, const U8 *u, STRLEN ulen);
 #define PERL_ARGS_ASSERT_BYTES_CMP_UTF8	\
 	assert(b); assert(u)
-
-PERL_CALLCONV U8*	Perl_bytes_from_utf8(pTHX_ const U8 *s, STRLEN *len, bool *is_utf8)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV U8*	Perl_bytes_from_utf8(pTHX_ const U8 *s, STRLEN *len, bool *is_utf8);
 #define PERL_ARGS_ASSERT_BYTES_FROM_UTF8	\
 	assert(s); assert(len)
-
-PERL_CALLCONV U8*	Perl_bytes_to_utf8(pTHX_ const U8 *s, STRLEN *len)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV U8*	Perl_bytes_to_utf8(pTHX_ const U8 *s, STRLEN *len);
 #define PERL_ARGS_ASSERT_BYTES_TO_UTF8	\
 	assert(s); assert(len)
-
-PERL_CALLCONV I32	Perl_call_argv(pTHX_ const char* sub_name, I32 flags, char** argv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV I32	Perl_call_argv(pTHX_ const char* sub_name, I32 flags, char** argv);
 #define PERL_ARGS_ASSERT_CALL_ARGV	\
 	assert(sub_name); assert(argv)
-
 PERL_CALLCONV void	Perl_call_atexit(pTHX_ ATEXIT_t fn, void *ptr);
-PERL_CALLCONV void	Perl_call_list(pTHX_ I32 oldscope, AV *paramList)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_call_list(pTHX_ I32 oldscope, AV *paramList);
 #define PERL_ARGS_ASSERT_CALL_LIST	\
 	assert(paramList)
-
-PERL_CALLCONV I32	Perl_call_method(pTHX_ const char* methname, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV I32	Perl_call_method(pTHX_ const char* methname, I32 flags);
 #define PERL_ARGS_ASSERT_CALL_METHOD	\
 	assert(methname)
-
-PERL_CALLCONV I32	Perl_call_pv(pTHX_ const char* sub_name, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV I32	Perl_call_pv(pTHX_ const char* sub_name, I32 flags);
 #define PERL_ARGS_ASSERT_CALL_PV	\
 	assert(sub_name)
-
-PERL_CALLCONV I32	Perl_call_sv(pTHX_ SV* sv, VOL I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV I32	Perl_call_sv(pTHX_ SV* sv, VOL I32 flags);
 #define PERL_ARGS_ASSERT_CALL_SV	\
 	assert(sv)
-
 PERL_CALLCONV const PERL_CONTEXT *	Perl_caller_cx(pTHX_ I32 level, const PERL_CONTEXT **dbcxp);
 PERL_CALLCONV Malloc_t	Perl_calloc(MEM_SIZE elements, MEM_SIZE size)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV bool	Perl_cando(pTHX_ Mode_t mode, bool effective, const Stat_t* statbufp)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CANDO	\
 	assert(statbufp)
 
@@ -390,354 +265,282 @@ PERL_CALLCONV U32	Perl_cast_ulong(NV f)
 PERL_CALLCONV UV	Perl_cast_uv(NV f)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV bool	Perl_check_utf8_print(pTHX_ const U8 *s, const STRLEN len)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV bool	Perl_check_utf8_print(pTHX_ const U8 *s, const STRLEN len);
 #define PERL_ARGS_ASSERT_CHECK_UTF8_PRINT	\
 	assert(s)
-
 PERL_CALLCONV OP *	Perl_ck_anoncode(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_ANONCODE	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_backtick(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_BACKTICK	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_bitop(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_BITOP	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_cmp(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_CMP	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_concat(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_CONCAT	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_defined(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_DEFINED	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_delete(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_DELETE	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_each(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_EACH	\
 	assert(o)
 
-PERL_CALLCONV OP*	Perl_ck_entersub_args_core(pTHX_ OP *entersubop, GV *namegv, SV *protosv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV OP*	Perl_ck_entersub_args_core(pTHX_ OP *entersubop, GV *namegv, SV *protosv);
 #define PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_CORE	\
 	assert(entersubop); assert(namegv); assert(protosv)
-
-PERL_CALLCONV OP*	Perl_ck_entersub_args_list(pTHX_ OP *entersubop)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV OP*	Perl_ck_entersub_args_list(pTHX_ OP *entersubop);
 #define PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_LIST	\
 	assert(entersubop)
-
-PERL_CALLCONV OP*	Perl_ck_entersub_args_proto(pTHX_ OP *entersubop, GV *namegv, SV *protosv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV OP*	Perl_ck_entersub_args_proto(pTHX_ OP *entersubop, GV *namegv, SV *protosv);
 #define PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_PROTO	\
 	assert(entersubop); assert(namegv); assert(protosv)
-
-PERL_CALLCONV OP*	Perl_ck_entersub_args_proto_or_list(pTHX_ OP *entersubop, GV *namegv, SV *protosv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV OP*	Perl_ck_entersub_args_proto_or_list(pTHX_ OP *entersubop, GV *namegv, SV *protosv);
 #define PERL_ARGS_ASSERT_CK_ENTERSUB_ARGS_PROTO_OR_LIST	\
 	assert(entersubop); assert(namegv); assert(protosv)
-
 PERL_CALLCONV OP *	Perl_ck_eof(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_EOF	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_eval(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_EVAL	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_exec(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_EXEC	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_exists(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_EXISTS	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_ftst(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_FTST	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_fun(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_FUN	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_glob(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_GLOB	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_grep(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_GREP	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_index(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_INDEX	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_join(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_JOIN	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_length(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_LENGTH	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_lfun(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_LFUN	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_listiob(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_LISTIOB	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_match(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_MATCH	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_method(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_METHOD	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_null(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_NULL	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_open(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_OPEN	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_prototype(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_PROTOTYPE	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_readline(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_READLINE	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_refassign(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_REFASSIGN	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_repeat(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_REPEAT	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_require(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_REQUIRE	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_return(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_RETURN	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_rfun(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_RFUN	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_rvconst(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_RVCONST	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_sassign(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_SASSIGN	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_select(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_SELECT	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_shift(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_SHIFT	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_smartmatch(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_SMARTMATCH	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_sort(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_SORT	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_spair(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_SPAIR	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_split(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_SPLIT	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_stringify(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_STRINGIFY	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_subr(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_SUBR	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_substr(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_SUBSTR	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_svconst(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_SVCONST	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_tell(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_TELL	\
 	assert(o)
 
 PERL_CALLCONV OP *	Perl_ck_trunc(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CK_TRUNC	\
 	assert(o)
 
 PERL_CALLCONV void	Perl_ck_warner(pTHX_ U32 err, const char* pat, ...)
-			__attribute__format__(__printf__,pTHX_2,pTHX_3)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__format__(__printf__,pTHX_2,pTHX_3);
 #define PERL_ARGS_ASSERT_CK_WARNER	\
 	assert(pat)
 
 PERL_CALLCONV void	Perl_ck_warner_d(pTHX_ U32 err, const char* pat, ...)
-			__attribute__format__(__printf__,pTHX_2,pTHX_3)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__format__(__printf__,pTHX_2,pTHX_3);
 #define PERL_ARGS_ASSERT_CK_WARNER_D	\
 	assert(pat)
 
 PERL_CALLCONV bool	Perl_ckwarn(pTHX_ U32 w);
 PERL_CALLCONV bool	Perl_ckwarn_d(pTHX_ U32 w);
-PERL_CALLCONV const COP*	Perl_closest_cop(pTHX_ const COP *cop, const OP *o, const OP *curop, bool opnext)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_clear_defarray(pTHX_ AV* av, bool abandon);
+#define PERL_ARGS_ASSERT_CLEAR_DEFARRAY	\
+	assert(av)
+PERL_CALLCONV const COP*	Perl_closest_cop(pTHX_ const COP *cop, const OP *o, const OP *curop, bool opnext);
 #define PERL_ARGS_ASSERT_CLOSEST_COP	\
 	assert(cop)
-
-PERL_CALLCONV const char *	Perl_cop_fetch_label(pTHX_ COP *const cop, STRLEN *len, U32 *flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV const char *	Perl_cop_fetch_label(pTHX_ COP *const cop, STRLEN *len, U32 *flags);
 #define PERL_ARGS_ASSERT_COP_FETCH_LABEL	\
 	assert(cop)
-
-PERL_CALLCONV void	Perl_cop_store_label(pTHX_ COP *const cop, const char *label, STRLEN len, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_cop_store_label(pTHX_ COP *const cop, const char *label, STRLEN len, U32 flags);
 #define PERL_ARGS_ASSERT_COP_STORE_LABEL	\
 	assert(cop); assert(label)
-
-PERL_CALLCONV SV *	Perl_core_prototype(pTHX_ SV *sv, const char *name, const int code, int * const opnum)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV *	Perl_core_prototype(pTHX_ SV *sv, const char *name, const int code, int * const opnum);
 #define PERL_ARGS_ASSERT_CORE_PROTOTYPE	\
 	assert(name)
-
-PERL_CALLCONV OP *	Perl_coresub_op(pTHX_ SV *const coreargssv, const int code, const int opnum)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV OP *	Perl_coresub_op(pTHX_ SV *const coreargssv, const int code, const int opnum);
 #define PERL_ARGS_ASSERT_CORESUB_OP	\
 	assert(coreargssv)
-
-PERL_CALLCONV PERL_CONTEXT*	Perl_create_eval_scope(pTHX_ U32 flags);
+PERL_CALLCONV void	Perl_create_eval_scope(pTHX_ OP *retop, U32 flags);
 PERL_CALLCONV_NO_RET void	Perl_croak(pTHX_ const char* pat, ...)
 			__attribute__noreturn__
 			__attribute__format__null_ok__(__printf__,pTHX_1,pTHX_2);
@@ -755,63 +558,46 @@ PERL_CALLCONV_NO_RET void	Perl_croak_popstack(void)
 			__attribute__noreturn__;
 
 PERL_CALLCONV_NO_RET void	Perl_croak_sv(pTHX_ SV *baseex)
-			__attribute__noreturn__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__noreturn__;
 #define PERL_ARGS_ASSERT_CROAK_SV	\
 	assert(baseex)
 
 PERL_CALLCONV_NO_RET void	Perl_croak_xs_usage(const CV *const cv, const char *const params)
-			__attribute__noreturn__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__noreturn__;
 #define PERL_ARGS_ASSERT_CROAK_XS_USAGE	\
 	assert(cv); assert(params)
 
 PERL_CALLCONV regexp_engine const *	Perl_current_re_engine(pTHX);
 PERL_CALLCONV const char *	Perl_custom_op_desc(pTHX_ const OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CUSTOM_OP_DESC	\
 	assert(o)
 
 PERL_CALLCONV XOPRETANY	Perl_custom_op_get_field(pTHX_ const OP *o, const xop_flags_enum field)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CUSTOM_OP_GET_FIELD	\
 	assert(o)
 
 PERL_CALLCONV const char *	Perl_custom_op_name(pTHX_ const OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CUSTOM_OP_NAME	\
 	assert(o)
 
-PERL_CALLCONV void	Perl_custom_op_register(pTHX_ Perl_ppaddr_t ppaddr, const XOP *xop)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_custom_op_register(pTHX_ Perl_ppaddr_t ppaddr, const XOP *xop);
 #define PERL_ARGS_ASSERT_CUSTOM_OP_REGISTER	\
 	assert(ppaddr); assert(xop)
-
 /* PERL_CALLCONV const XOP *	Perl_custom_op_xop(pTHX_ const OP *o)
-			__attribute__pure__
-			__attribute__nonnull__(pTHX_1); */
+			__attribute__pure__; */
 
-PERL_CALLCONV void	Perl_cv_ckproto_len_flags(pTHX_ const CV* cv, const GV* gv, const char* p, const STRLEN len, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_cv_ckproto_len_flags(pTHX_ const CV* cv, const GV* gv, const char* p, const STRLEN len, const U32 flags);
 #define PERL_ARGS_ASSERT_CV_CKPROTO_LEN_FLAGS	\
 	assert(cv)
-
-PERL_CALLCONV CV*	Perl_cv_clone(pTHX_ CV* proto)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV CV*	Perl_cv_clone(pTHX_ CV* proto);
 #define PERL_ARGS_ASSERT_CV_CLONE	\
 	assert(proto)
-
-PERL_CALLCONV CV*	Perl_cv_clone_into(pTHX_ CV* proto, CV *target)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV CV*	Perl_cv_clone_into(pTHX_ CV* proto, CV *target);
 #define PERL_ARGS_ASSERT_CV_CLONE_INTO	\
 	assert(proto); assert(target)
-
 PERL_CALLCONV SV*	Perl_cv_const_sv(const CV *const cv)
 			__attribute__warn_unused_result__;
 
@@ -819,393 +605,243 @@ PERL_CALLCONV SV*	Perl_cv_const_sv_or_av(const CV *const cv)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV void	Perl_cv_forget_slab(pTHX_ CV *cv);
-PERL_CALLCONV void	Perl_cv_get_call_checker(pTHX_ CV *cv, Perl_call_checker *ckfun_p, SV **ckobj_p)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_cv_get_call_checker(pTHX_ CV *cv, Perl_call_checker *ckfun_p, SV **ckobj_p);
 #define PERL_ARGS_ASSERT_CV_GET_CALL_CHECKER	\
 	assert(cv); assert(ckfun_p); assert(ckobj_p)
-
-PERL_CALLCONV SV *	Perl_cv_name(pTHX_ CV *cv, SV *sv, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV *	Perl_cv_name(pTHX_ CV *cv, SV *sv, U32 flags);
 #define PERL_ARGS_ASSERT_CV_NAME	\
 	assert(cv)
-
-PERL_CALLCONV void	Perl_cv_set_call_checker(pTHX_ CV *cv, Perl_call_checker ckfun, SV *ckobj)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_cv_set_call_checker(pTHX_ CV *cv, Perl_call_checker ckfun, SV *ckobj);
 #define PERL_ARGS_ASSERT_CV_SET_CALL_CHECKER	\
 	assert(cv); assert(ckfun); assert(ckobj)
-
-PERL_CALLCONV void	Perl_cv_set_call_checker_flags(pTHX_ CV *cv, Perl_call_checker ckfun, SV *ckobj, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_cv_set_call_checker_flags(pTHX_ CV *cv, Perl_call_checker ckfun, SV *ckobj, U32 flags);
 #define PERL_ARGS_ASSERT_CV_SET_CALL_CHECKER_FLAGS	\
 	assert(cv); assert(ckfun); assert(ckobj)
-
-PERL_CALLCONV void	Perl_cv_undef(pTHX_ CV* cv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_cv_undef(pTHX_ CV* cv);
 #define PERL_ARGS_ASSERT_CV_UNDEF	\
 	assert(cv)
-
-PERL_CALLCONV void	Perl_cv_undef_flags(pTHX_ CV* cv, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_cv_undef_flags(pTHX_ CV* cv, U32 flags);
 #define PERL_ARGS_ASSERT_CV_UNDEF_FLAGS	\
 	assert(cv)
-
-PERL_CALLCONV GV *	Perl_cvgv_from_hek(pTHX_ CV* cv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV GV *	Perl_cvgv_from_hek(pTHX_ CV* cv);
 #define PERL_ARGS_ASSERT_CVGV_FROM_HEK	\
 	assert(cv)
-
-PERL_CALLCONV void	Perl_cvgv_set(pTHX_ CV* cv, GV* gv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_cvgv_set(pTHX_ CV* cv, GV* gv);
 #define PERL_ARGS_ASSERT_CVGV_SET	\
 	assert(cv)
-
-PERL_CALLCONV void	Perl_cvstash_set(pTHX_ CV* cv, HV* stash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_cvstash_set(pTHX_ CV* cv, HV* stash);
 #define PERL_ARGS_ASSERT_CVSTASH_SET	\
 	assert(cv)
-
-PERL_CALLCONV void	Perl_cx_dump(pTHX_ PERL_CONTEXT* cx)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_cx_dump(pTHX_ PERL_CONTEXT* cx);
 #define PERL_ARGS_ASSERT_CX_DUMP	\
 	assert(cx)
-
 PERL_CALLCONV I32	Perl_cxinc(pTHX)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV void	Perl_deb(pTHX_ const char* pat, ...)
-			__attribute__format__(__printf__,pTHX_1,pTHX_2)
-			__attribute__nonnull__(pTHX_1);
+			__attribute__format__(__printf__,pTHX_1,pTHX_2);
 #define PERL_ARGS_ASSERT_DEB	\
 	assert(pat)
 
 PERL_CALLCONV void	Perl_deb_stack_all(pTHX);
-PERL_CALLCONV I32	Perl_debop(pTHX_ const OP* o)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV I32	Perl_debop(pTHX_ const OP* o);
 #define PERL_ARGS_ASSERT_DEBOP	\
 	assert(o)
-
 PERL_CALLCONV void	Perl_debprofdump(pTHX);
 PERL_CALLCONV I32	Perl_debstack(pTHX);
 PERL_CALLCONV I32	Perl_debstackptrs(pTHX);
 PERL_CALLCONV SV *	Perl_defelem_target(pTHX_ SV *sv, MAGIC *mg)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DEFELEM_TARGET	\
 	assert(sv)
 
 PERL_CALLCONV void	Perl_delete_eval_scope(pTHX);
-PERL_CALLCONV char*	Perl_delimcpy(char* to, const char* toend, const char* from, const char* fromend, int delim, I32* retlen)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2)
-			__attribute__nonnull__(3)
-			__attribute__nonnull__(4)
-			__attribute__nonnull__(6);
+PERL_CALLCONV char*	Perl_delimcpy(char* to, const char* toend, const char* from, const char* fromend, int delim, I32* retlen);
 #define PERL_ARGS_ASSERT_DELIMCPY	\
 	assert(to); assert(toend); assert(from); assert(fromend); assert(retlen)
-
 PERL_CALLCONV void	Perl_despatch_signals(pTHX);
 PERL_CALLCONV_NO_RET OP*	Perl_die(pTHX_ const char* pat, ...)
 			__attribute__noreturn__
 			__attribute__format__null_ok__(__printf__,pTHX_1,pTHX_2);
 
 PERL_CALLCONV_NO_RET OP*	Perl_die_sv(pTHX_ SV *baseex)
-			__attribute__noreturn__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__noreturn__;
 #define PERL_ARGS_ASSERT_DIE_SV	\
 	assert(baseex)
 
 PERL_CALLCONV_NO_RET void	Perl_die_unwind(pTHX_ SV* msv)
-			__attribute__noreturn__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__noreturn__;
 #define PERL_ARGS_ASSERT_DIE_UNWIND	\
 	assert(msv)
 
-/* PERL_CALLCONV bool	Perl_do_aexec(pTHX_ SV* really, SV** mark, SV** sp)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3); */
+/* PERL_CALLCONV bool	Perl_do_aexec(pTHX_ SV* really, SV** mark, SV** sp); */
 #define PERL_ARGS_ASSERT_DO_AEXEC	\
 	assert(mark); assert(sp)
-
-PERL_CALLCONV bool	Perl_do_aexec5(pTHX_ SV* really, SV** mark, SV** sp, int fd, int do_report)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV bool	Perl_do_aexec5(pTHX_ SV* really, SV** mark, SV** sp, int fd, int do_report);
 #define PERL_ARGS_ASSERT_DO_AEXEC5	\
 	assert(mark); assert(sp)
-
-PERL_CALLCONV int	Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_do_binmode(pTHX_ PerlIO *fp, int iotype, int mode);
 #define PERL_ARGS_ASSERT_DO_BINMODE	\
 	assert(fp)
-
 PERL_CALLCONV bool	Perl_do_close(pTHX_ GV* gv, bool not_implicit);
-PERL_CALLCONV void	Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_do_dump_pad(pTHX_ I32 level, PerlIO *file, PADLIST *padlist, int full);
 #define PERL_ARGS_ASSERT_DO_DUMP_PAD	\
 	assert(file)
-
-PERL_CALLCONV bool	Perl_do_eof(pTHX_ GV* gv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV bool	Perl_do_eof(pTHX_ GV* gv);
 #define PERL_ARGS_ASSERT_DO_EOF	\
 	assert(gv)
-
 PERL_CALLCONV void	Perl_do_execfree(pTHX);
-PERL_CALLCONV void	Perl_do_gv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_do_gv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv);
 #define PERL_ARGS_ASSERT_DO_GV_DUMP	\
 	assert(file); assert(name)
-
-PERL_CALLCONV void	Perl_do_gvgv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_do_gvgv_dump(pTHX_ I32 level, PerlIO *file, const char *name, GV *sv);
 #define PERL_ARGS_ASSERT_DO_GVGV_DUMP	\
 	assert(file); assert(name)
-
-PERL_CALLCONV void	Perl_do_hv_dump(pTHX_ I32 level, PerlIO *file, const char *name, HV *sv)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_do_hv_dump(pTHX_ I32 level, PerlIO *file, const char *name, HV *sv);
 #define PERL_ARGS_ASSERT_DO_HV_DUMP	\
 	assert(file); assert(name)
-
-PERL_CALLCONV void	Perl_do_join(pTHX_ SV *sv, SV *delim, SV **mark, SV **sp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+PERL_CALLCONV void	Perl_do_join(pTHX_ SV *sv, SV *delim, SV **mark, SV **sp);
 #define PERL_ARGS_ASSERT_DO_JOIN	\
 	assert(sv); assert(delim); assert(mark); assert(sp)
-
-PERL_CALLCONV void	Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim);
 #define PERL_ARGS_ASSERT_DO_MAGIC_DUMP	\
 	assert(file)
-
 PERL_CALLCONV I32	Perl_do_ncmp(pTHX_ SV *const left, SV *const right)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DO_NCMP	\
 	assert(left); assert(right)
 
-PERL_CALLCONV void	Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o);
 #define PERL_ARGS_ASSERT_DO_OP_DUMP	\
 	assert(file)
-
-/* PERL_CALLCONV bool	Perl_do_open(pTHX_ GV* gv, const char* name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO* supplied_fp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV bool	Perl_do_open(pTHX_ GV* gv, const char* name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO* supplied_fp); */
 #define PERL_ARGS_ASSERT_DO_OPEN	\
 	assert(gv); assert(name)
-
-PERL_CALLCONV bool	Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len, PerlIO *supplied_fp, SV **svp, U32 num)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV bool	Perl_do_open6(pTHX_ GV *gv, const char *oname, STRLEN len, PerlIO *supplied_fp, SV **svp, U32 num);
 #define PERL_ARGS_ASSERT_DO_OPEN6	\
 	assert(gv); assert(oname)
-
-PERL_CALLCONV bool	Perl_do_open9(pTHX_ GV *gv, const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV *svs, I32 num)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_8);
+PERL_CALLCONV bool	Perl_do_open9(pTHX_ GV *gv, const char *name, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV *svs, I32 num);
 #define PERL_ARGS_ASSERT_DO_OPEN9	\
 	assert(gv); assert(name); assert(svs)
-
-PERL_CALLCONV bool	Perl_do_open_raw(pTHX_ GV *gv, const char *oname, STRLEN len, int rawmode, int rawperm)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV bool	Perl_do_open_raw(pTHX_ GV *gv, const char *oname, STRLEN len, int rawmode, int rawperm);
 #define PERL_ARGS_ASSERT_DO_OPEN_RAW	\
 	assert(gv); assert(oname)
-
-PERL_CALLCONV bool	Perl_do_openn(pTHX_ GV *gv, const char *oname, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV **svp, I32 num)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV bool	Perl_do_openn(pTHX_ GV *gv, const char *oname, I32 len, int as_raw, int rawmode, int rawperm, PerlIO *supplied_fp, SV **svp, I32 num);
 #define PERL_ARGS_ASSERT_DO_OPENN	\
 	assert(gv); assert(oname)
-
-PERL_CALLCONV void	Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, const PMOP *pm)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_do_pmop_dump(pTHX_ I32 level, PerlIO *file, const PMOP *pm);
 #define PERL_ARGS_ASSERT_DO_PMOP_DUMP	\
 	assert(file)
-
-PERL_CALLCONV bool	Perl_do_print(pTHX_ SV* sv, PerlIO* fp)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV bool	Perl_do_print(pTHX_ SV* sv, PerlIO* fp);
 #define PERL_ARGS_ASSERT_DO_PRINT	\
 	assert(fp)
-
 PERL_CALLCONV OP*	Perl_do_readline(pTHX)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV bool	Perl_do_seek(pTHX_ GV* gv, Off_t pos, int whence);
-PERL_CALLCONV void	Perl_do_sprintf(pTHX_ SV* sv, I32 len, SV** sarg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_do_sprintf(pTHX_ SV* sv, I32 len, SV** sarg);
 #define PERL_ARGS_ASSERT_DO_SPRINTF	\
 	assert(sv); assert(sarg)
-
-PERL_CALLCONV void	Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_do_sv_dump(pTHX_ I32 level, PerlIO *file, SV *sv, I32 nest, I32 maxnest, bool dumpops, STRLEN pvlim);
 #define PERL_ARGS_ASSERT_DO_SV_DUMP	\
 	assert(file)
-
-PERL_CALLCONV Off_t	Perl_do_sysseek(pTHX_ GV* gv, Off_t pos, int whence)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV Off_t	Perl_do_sysseek(pTHX_ GV* gv, Off_t pos, int whence);
 #define PERL_ARGS_ASSERT_DO_SYSSEEK	\
 	assert(gv)
-
 PERL_CALLCONV Off_t	Perl_do_tell(pTHX_ GV* gv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DO_TELL	\
 	assert(gv)
 
-PERL_CALLCONV I32	Perl_do_trans(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV I32	Perl_do_trans(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_DO_TRANS	\
 	assert(sv)
-
-PERL_CALLCONV UV	Perl_do_vecget(pTHX_ SV* sv, SSize_t offset, int size)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV UV	Perl_do_vecget(pTHX_ SV* sv, SSize_t offset, int size);
 #define PERL_ARGS_ASSERT_DO_VECGET	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_do_vecset(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_do_vecset(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_DO_VECSET	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_do_vop(pTHX_ I32 optype, SV* sv, SV* left, SV* right)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+PERL_CALLCONV void	Perl_do_vop(pTHX_ I32 optype, SV* sv, SV* left, SV* right);
 #define PERL_ARGS_ASSERT_DO_VOP	\
 	assert(sv); assert(left); assert(right)
-
-PERL_CALLCONV OP*	Perl_dofile(pTHX_ OP* term, I32 force_builtin)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV OP*	Perl_dofile(pTHX_ OP* term, I32 force_builtin);
 #define PERL_ARGS_ASSERT_DOFILE	\
 	assert(term)
-
 PERL_CALLCONV bool	Perl_doing_taint(int argc, char** argv, char** env)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV OP *	Perl_doref(pTHX_ OP *o, I32 type, bool set_op_ref)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV OP *	Perl_doref(pTHX_ OP *o, I32 type, bool set_op_ref);
 #define PERL_ARGS_ASSERT_DOREF	\
 	assert(o)
-
 PERL_CALLCONV void	Perl_dounwind(pTHX_ I32 cxix);
-PERL_CALLCONV I32	Perl_dowantarray(pTHX)
+PERL_CALLCONV U8	Perl_dowantarray(pTHX)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV void	Perl_drand48_init_r(perl_drand48_t *random_state, U32 seed)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void	Perl_drand48_init_r(perl_drand48_t *random_state, U32 seed);
 #define PERL_ARGS_ASSERT_DRAND48_INIT_R	\
 	assert(random_state)
-
-PERL_CALLCONV double	Perl_drand48_r(perl_drand48_t *random_state)
-			__attribute__nonnull__(1);
+PERL_CALLCONV double	Perl_drand48_r(perl_drand48_t *random_state);
 #define PERL_ARGS_ASSERT_DRAND48_R	\
 	assert(random_state)
-
 PERL_CALLCONV void	Perl_dump_all(pTHX);
 PERL_CALLCONV void	Perl_dump_all_perl(pTHX_ bool justperl);
 PERL_CALLCONV void	Perl_dump_eval(pTHX);
-PERL_CALLCONV void	Perl_dump_form(pTHX_ const GV* gv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_dump_form(pTHX_ const GV* gv);
 #define PERL_ARGS_ASSERT_DUMP_FORM	\
 	assert(gv)
-
 PERL_CALLCONV void	Perl_dump_indent(pTHX_ I32 level, PerlIO *file, const char* pat, ...)
-			__attribute__format__(__printf__,pTHX_3,pTHX_4)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+			__attribute__format__(__printf__,pTHX_3,pTHX_4);
 #define PERL_ARGS_ASSERT_DUMP_INDENT	\
 	assert(file); assert(pat)
 
-PERL_CALLCONV void	Perl_dump_packsubs(pTHX_ const HV* stash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_dump_packsubs(pTHX_ const HV* stash);
 #define PERL_ARGS_ASSERT_DUMP_PACKSUBS	\
 	assert(stash)
-
-PERL_CALLCONV void	Perl_dump_packsubs_perl(pTHX_ const HV* stash, bool justperl)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_dump_packsubs_perl(pTHX_ const HV* stash, bool justperl);
 #define PERL_ARGS_ASSERT_DUMP_PACKSUBS_PERL	\
 	assert(stash)
-
-PERL_CALLCONV void	Perl_dump_sub(pTHX_ const GV* gv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_dump_sub(pTHX_ const GV* gv);
 #define PERL_ARGS_ASSERT_DUMP_SUB	\
 	assert(gv)
-
-PERL_CALLCONV void	Perl_dump_sub_perl(pTHX_ const GV* gv, bool justperl)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_dump_sub_perl(pTHX_ const GV* gv, bool justperl);
 #define PERL_ARGS_ASSERT_DUMP_SUB_PERL	\
 	assert(gv)
-
-PERL_CALLCONV void	Perl_dump_vindent(pTHX_ I32 level, PerlIO *file, const char* pat, va_list *args)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_dump_vindent(pTHX_ I32 level, PerlIO *file, const char* pat, va_list *args);
 #define PERL_ARGS_ASSERT_DUMP_VINDENT	\
 	assert(file); assert(pat)
-
-PERL_CALLCONV void	Perl_emulate_cop_io(pTHX_ const COP *const c, SV *const sv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_emulate_cop_io(pTHX_ const COP *const c, SV *const sv);
 #define PERL_ARGS_ASSERT_EMULATE_COP_IO	\
 	assert(c); assert(sv)
-
-PERL_CALLCONV SV*	Perl_eval_pv(pTHX_ const char* p, I32 croak_on_error)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_eval_pv(pTHX_ const char* p, I32 croak_on_error);
 #define PERL_ARGS_ASSERT_EVAL_PV	\
 	assert(p)
-
-PERL_CALLCONV I32	Perl_eval_sv(pTHX_ SV* sv, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV I32	Perl_eval_sv(pTHX_ SV* sv, I32 flags);
 #define PERL_ARGS_ASSERT_EVAL_SV	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_fbm_compile(pTHX_ SV* sv, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_fbm_compile(pTHX_ SV* sv, U32 flags);
 #define PERL_ARGS_ASSERT_FBM_COMPILE	\
 	assert(sv)
-
 PERL_CALLCONV char*	Perl_fbm_instr(pTHX_ unsigned char* big, unsigned char* bigend, SV* littlestr, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_FBM_INSTR	\
 	assert(big); assert(bigend); assert(littlestr)
 
-PERL_CALLCONV bool	Perl_feature_is_enabled(pTHX_ const char *const name, STRLEN namelen)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV bool	Perl_feature_is_enabled(pTHX_ const char *const name, STRLEN namelen);
 #define PERL_ARGS_ASSERT_FEATURE_IS_ENABLED	\
 	assert(name)
-
 PERL_CALLCONV SV*	Perl_filter_add(pTHX_ filter_t funcp, SV* datasv);
-PERL_CALLCONV void	Perl_filter_del(pTHX_ filter_t funcp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_filter_del(pTHX_ filter_t funcp);
 #define PERL_ARGS_ASSERT_FILTER_DEL	\
 	assert(funcp)
-
 PERL_CALLCONV I32	Perl_filter_read(pTHX_ int idx, SV *buf_sv, int maxlen)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_FILTER_READ	\
 	assert(buf_sv)
 
-PERL_CALLCONV void	Perl_finalize_optree(pTHX_ OP* o)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_finalize_optree(pTHX_ OP* o);
 #define PERL_ARGS_ASSERT_FINALIZE_OPTREE	\
 	assert(o)
-
 PERL_CALLCONV CV *	Perl_find_lexical_cv(pTHX_ PADOFFSET off);
 PERL_CALLCONV CV*	Perl_find_runcv(pTHX_ U32 *db_seqp)
 			__attribute__warn_unused_result__;
@@ -1214,91 +850,59 @@ PERL_CALLCONV CV*	Perl_find_runcv_where(pTHX_ U8 cond, IV arg, U32 *db_seqp)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV SV*	Perl_find_rundefsv(pTHX);
-PERL_CALLCONV SV*	Perl_find_rundefsv2(pTHX_ CV *cv, U32 seq)
-			__attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_FIND_RUNDEFSV2	\
-	assert(cv)
-
 PERL_CALLCONV PADOFFSET	Perl_find_rundefsvoffset(pTHX)
 			__attribute__deprecated__;
 
-PERL_CALLCONV char*	Perl_find_script(pTHX_ const char *scriptname, bool dosearch, const char *const *const search_ext, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV char*	Perl_find_script(pTHX_ const char *scriptname, bool dosearch, const char *const *const search_ext, I32 flags);
 #define PERL_ARGS_ASSERT_FIND_SCRIPT	\
 	assert(scriptname)
-
 PERL_CALLCONV I32	Perl_foldEQ(const char* a, const char* b, I32 len)
-			__attribute__pure__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_FOLDEQ	\
 	assert(a); assert(b)
 
 PERL_CALLCONV I32	Perl_foldEQ_latin1(const char* a, const char* b, I32 len)
-			__attribute__pure__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_FOLDEQ_LATIN1	\
 	assert(a); assert(b)
 
 PERL_CALLCONV I32	Perl_foldEQ_locale(const char* a, const char* b, I32 len)
-			__attribute__pure__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_FOLDEQ_LOCALE	\
 	assert(a); assert(b)
 
-/* PERL_CALLCONV I32	foldEQ_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_5); */
-
-PERL_CALLCONV I32	Perl_foldEQ_utf8_flags(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_5);
+/* PERL_CALLCONV I32	foldEQ_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2); */
+PERL_CALLCONV I32	Perl_foldEQ_utf8_flags(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2, U32 flags);
 #define PERL_ARGS_ASSERT_FOLDEQ_UTF8_FLAGS	\
 	assert(s1); assert(s2)
-
 PERL_CALLCONV char*	Perl_form(pTHX_ const char* pat, ...)
-			__attribute__format__(__printf__,pTHX_1,pTHX_2)
-			__attribute__nonnull__(pTHX_1);
+			__attribute__format__(__printf__,pTHX_1,pTHX_2);
 #define PERL_ARGS_ASSERT_FORM	\
 	assert(pat)
 
 PERL_CALLCONV void	Perl_free_tied_hv_pool(pTHX);
 PERL_CALLCONV void	Perl_free_tmps(pTHX);
-PERL_CALLCONV AV*	Perl_get_av(pTHX_ const char *name, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV AV*	Perl_get_av(pTHX_ const char *name, I32 flags);
 #define PERL_ARGS_ASSERT_GET_AV	\
 	assert(name)
-
 PERL_CALLCONV void*	Perl_get_context(void)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV CV*	Perl_get_cv(pTHX_ const char* name, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV CV*	Perl_get_cv(pTHX_ const char* name, I32 flags);
 #define PERL_ARGS_ASSERT_GET_CV	\
 	assert(name)
-
-PERL_CALLCONV CV*	Perl_get_cvn_flags(pTHX_ const char* name, STRLEN len, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV CV*	Perl_get_cvn_flags(pTHX_ const char* name, STRLEN len, I32 flags);
 #define PERL_ARGS_ASSERT_GET_CVN_FLAGS	\
 	assert(name)
-
-PERL_CALLCONV void	Perl_get_db_sub(pTHX_ SV **svp, CV *cv)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_get_db_sub(pTHX_ SV **svp, CV *cv);
 #define PERL_ARGS_ASSERT_GET_DB_SUB	\
 	assert(cv)
-
-PERL_CALLCONV void	Perl_get_hash_seed(pTHX_ unsigned char * const seed_buffer)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_get_hash_seed(pTHX_ unsigned char * const seed_buffer);
 #define PERL_ARGS_ASSERT_GET_HASH_SEED	\
 	assert(seed_buffer)
-
-PERL_CALLCONV HV*	Perl_get_hv(pTHX_ const char *name, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV HV*	Perl_get_hv(pTHX_ const char *name, I32 flags);
 #define PERL_ARGS_ASSERT_GET_HV	\
 	assert(name)
-
 PERL_CALLCONV const char*	Perl_get_no_modify(pTHX)
 			__attribute__warn_unused_result__
 			__attribute__pure__;
@@ -1320,484 +924,303 @@ PERL_CALLCONV PPADDR_t*	Perl_get_ppaddr(pTHX)
 			__attribute__pure__;
 
 PERL_CALLCONV REGEXP *	Perl_get_re_arg(pTHX_ SV *sv);
-PERL_CALLCONV SV*	Perl_get_sv(pTHX_ const char *name, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_get_sv(pTHX_ const char *name, I32 flags);
 #define PERL_ARGS_ASSERT_GET_SV	\
 	assert(name)
-
 PERL_CALLCONV MGVTBL*	Perl_get_vtbl(pTHX_ int vtbl_id)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV int	Perl_getcwd_sv(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_getcwd_sv(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_GETCWD_SV	\
 	assert(sv)
-
 PERL_CALLCONV void	Perl_gp_free(pTHX_ GV* gv);
 PERL_CALLCONV GP*	Perl_gp_ref(pTHX_ GP* gp);
-PERL_CALLCONV bool	Perl_grok_atoUV(const char* pv, UV* valptr, const char** endptr)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+PERL_CALLCONV bool	Perl_grok_atoUV(const char* pv, UV* valptr, const char** endptr);
 #define PERL_ARGS_ASSERT_GROK_ATOUV	\
 	assert(pv); assert(valptr)
-
-PERL_CALLCONV UV	Perl_grok_bin(pTHX_ const char* start, STRLEN* len_p, I32* flags, NV *result)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV UV	Perl_grok_bin(pTHX_ const char* start, STRLEN* len_p, I32* flags, NV *result);
 #define PERL_ARGS_ASSERT_GROK_BIN	\
 	assert(start); assert(len_p); assert(flags)
-
-PERL_CALLCONV UV	Perl_grok_hex(pTHX_ const char* start, STRLEN* len_p, I32* flags, NV *result)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV UV	Perl_grok_hex(pTHX_ const char* start, STRLEN* len_p, I32* flags, NV *result);
 #define PERL_ARGS_ASSERT_GROK_HEX	\
 	assert(start); assert(len_p); assert(flags)
-
-PERL_CALLCONV int	Perl_grok_infnan(pTHX_ const char** sp, const char *send)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_grok_infnan(pTHX_ const char** sp, const char *send);
 #define PERL_ARGS_ASSERT_GROK_INFNAN	\
 	assert(sp); assert(send)
-
-PERL_CALLCONV int	Perl_grok_number(pTHX_ const char *pv, STRLEN len, UV *valuep)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_grok_number(pTHX_ const char *pv, STRLEN len, UV *valuep);
 #define PERL_ARGS_ASSERT_GROK_NUMBER	\
 	assert(pv)
-
-PERL_CALLCONV int	Perl_grok_number_flags(pTHX_ const char *pv, STRLEN len, UV *valuep, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_grok_number_flags(pTHX_ const char *pv, STRLEN len, UV *valuep, U32 flags);
 #define PERL_ARGS_ASSERT_GROK_NUMBER_FLAGS	\
 	assert(pv)
-
 PERL_CALLCONV bool	Perl_grok_numeric_radix(pTHX_ const char **sp, const char *send)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GROK_NUMERIC_RADIX	\
 	assert(sp); assert(send)
 
-PERL_CALLCONV UV	Perl_grok_oct(pTHX_ const char* start, STRLEN* len_p, I32* flags, NV *result)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV UV	Perl_grok_oct(pTHX_ const char* start, STRLEN* len_p, I32* flags, NV *result);
 #define PERL_ARGS_ASSERT_GROK_OCT	\
 	assert(start); assert(len_p); assert(flags)
-
 /* PERL_CALLCONV GV*	Perl_gv_AVadd(pTHX_ GV *gv); */
 /* PERL_CALLCONV GV*	Perl_gv_HVadd(pTHX_ GV *gv); */
 /* PERL_CALLCONV GV*	Perl_gv_IOadd(pTHX_ GV* gv); */
 PERL_CALLCONV GV*	Perl_gv_add_by_type(pTHX_ GV *gv, svtype type);
 /* PERL_CALLCONV GV*	gv_autoload4(pTHX_ HV* stash, const char* name, STRLEN len, I32 method)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2); */
+			__attribute__warn_unused_result__; */
 
 PERL_CALLCONV GV*	Perl_gv_autoload_pv(pTHX_ HV* stash, const char* namepv, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GV_AUTOLOAD_PV	\
 	assert(namepv)
 
 PERL_CALLCONV GV*	Perl_gv_autoload_pvn(pTHX_ HV* stash, const char* name, STRLEN len, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GV_AUTOLOAD_PVN	\
 	assert(name)
 
 PERL_CALLCONV GV*	Perl_gv_autoload_sv(pTHX_ HV* stash, SV* namesv, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GV_AUTOLOAD_SV	\
 	assert(namesv)
 
-PERL_CALLCONV void	Perl_gv_check(pTHX_ HV* stash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_gv_check(pTHX_ HV* stash);
 #define PERL_ARGS_ASSERT_GV_CHECK	\
 	assert(stash)
-
 PERL_CALLCONV SV*	Perl_gv_const_sv(pTHX_ GV* gv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GV_CONST_SV	\
 	assert(gv)
 
 PERL_CALLCONV void	Perl_gv_dump(pTHX_ GV* gv);
-PERL_CALLCONV void	Perl_gv_efullname(pTHX_ SV* sv, const GV* gv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_gv_efullname(pTHX_ SV* sv, const GV* gv);
 #define PERL_ARGS_ASSERT_GV_EFULLNAME	\
 	assert(sv); assert(gv)
-
-/* PERL_CALLCONV void	Perl_gv_efullname3(pTHX_ SV* sv, const GV* gv, const char* prefix)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV void	Perl_gv_efullname3(pTHX_ SV* sv, const GV* gv, const char* prefix); */
 #define PERL_ARGS_ASSERT_GV_EFULLNAME3	\
 	assert(sv); assert(gv)
-
-PERL_CALLCONV void	Perl_gv_efullname4(pTHX_ SV* sv, const GV* gv, const char* prefix, bool keepmain)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_gv_efullname4(pTHX_ SV* sv, const GV* gv, const char* prefix, bool keepmain);
 #define PERL_ARGS_ASSERT_GV_EFULLNAME4	\
 	assert(sv); assert(gv)
-
-PERL_CALLCONV GV*	Perl_gv_fetchfile(pTHX_ const char* name)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV GV*	Perl_gv_fetchfile(pTHX_ const char* name);
 #define PERL_ARGS_ASSERT_GV_FETCHFILE	\
 	assert(name)
-
-PERL_CALLCONV GV*	Perl_gv_fetchfile_flags(pTHX_ const char *const name, const STRLEN len, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV GV*	Perl_gv_fetchfile_flags(pTHX_ const char *const name, const STRLEN len, const U32 flags);
 #define PERL_ARGS_ASSERT_GV_FETCHFILE_FLAGS	\
 	assert(name)
-
-/* PERL_CALLCONV GV*	gv_fetchmeth(pTHX_ HV* stash, const char* name, STRLEN len, I32 level)
-			__attribute__nonnull__(pTHX_2); */
-
-/* PERL_CALLCONV GV*	gv_fetchmeth_autoload(pTHX_ HV* stash, const char* name, STRLEN len, I32 level)
-			__attribute__nonnull__(pTHX_2); */
-
-PERL_CALLCONV GV*	Perl_gv_fetchmeth_pv(pTHX_ HV* stash, const char* name, I32 level, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+/* PERL_CALLCONV GV*	gv_fetchmeth(pTHX_ HV* stash, const char* name, STRLEN len, I32 level); */
+/* PERL_CALLCONV GV*	gv_fetchmeth_autoload(pTHX_ HV* stash, const char* name, STRLEN len, I32 level); */
+PERL_CALLCONV GV*	Perl_gv_fetchmeth_pv(pTHX_ HV* stash, const char* name, I32 level, U32 flags);
 #define PERL_ARGS_ASSERT_GV_FETCHMETH_PV	\
 	assert(name)
-
-PERL_CALLCONV GV*	Perl_gv_fetchmeth_pv_autoload(pTHX_ HV* stash, const char* name, I32 level, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV GV*	Perl_gv_fetchmeth_pv_autoload(pTHX_ HV* stash, const char* name, I32 level, U32 flags);
 #define PERL_ARGS_ASSERT_GV_FETCHMETH_PV_AUTOLOAD	\
 	assert(name)
-
-PERL_CALLCONV GV*	Perl_gv_fetchmeth_pvn(pTHX_ HV* stash, const char* name, STRLEN len, I32 level, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV GV*	Perl_gv_fetchmeth_pvn(pTHX_ HV* stash, const char* name, STRLEN len, I32 level, U32 flags);
 #define PERL_ARGS_ASSERT_GV_FETCHMETH_PVN	\
 	assert(name)
-
-PERL_CALLCONV GV*	Perl_gv_fetchmeth_pvn_autoload(pTHX_ HV* stash, const char* name, STRLEN len, I32 level, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV GV*	Perl_gv_fetchmeth_pvn_autoload(pTHX_ HV* stash, const char* name, STRLEN len, I32 level, U32 flags);
 #define PERL_ARGS_ASSERT_GV_FETCHMETH_PVN_AUTOLOAD	\
 	assert(name)
-
-PERL_CALLCONV GV*	Perl_gv_fetchmeth_sv(pTHX_ HV* stash, SV* namesv, I32 level, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV GV*	Perl_gv_fetchmeth_sv(pTHX_ HV* stash, SV* namesv, I32 level, U32 flags);
 #define PERL_ARGS_ASSERT_GV_FETCHMETH_SV	\
 	assert(namesv)
-
-PERL_CALLCONV GV*	Perl_gv_fetchmeth_sv_autoload(pTHX_ HV* stash, SV* namesv, I32 level, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV GV*	Perl_gv_fetchmeth_sv_autoload(pTHX_ HV* stash, SV* namesv, I32 level, U32 flags);
 #define PERL_ARGS_ASSERT_GV_FETCHMETH_SV_AUTOLOAD	\
 	assert(namesv)
-
-/* PERL_CALLCONV GV*	Perl_gv_fetchmethod(pTHX_ HV* stash, const char* name)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV GV*	Perl_gv_fetchmethod(pTHX_ HV* stash, const char* name); */
 #define PERL_ARGS_ASSERT_GV_FETCHMETHOD	\
 	assert(stash); assert(name)
-
-PERL_CALLCONV GV*	Perl_gv_fetchmethod_autoload(pTHX_ HV* stash, const char* name, I32 autoload)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV GV*	Perl_gv_fetchmethod_autoload(pTHX_ HV* stash, const char* name, I32 autoload);
 #define PERL_ARGS_ASSERT_GV_FETCHMETHOD_AUTOLOAD	\
 	assert(stash); assert(name)
-
-PERL_CALLCONV GV*	Perl_gv_fetchmethod_pv_flags(pTHX_ HV* stash, const char* name, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV GV*	Perl_gv_fetchmethod_pv_flags(pTHX_ HV* stash, const char* name, U32 flags);
 #define PERL_ARGS_ASSERT_GV_FETCHMETHOD_PV_FLAGS	\
 	assert(stash); assert(name)
-
-PERL_CALLCONV GV*	Perl_gv_fetchmethod_pvn_flags(pTHX_ HV* stash, const char* name, const STRLEN len, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV GV*	Perl_gv_fetchmethod_pvn_flags(pTHX_ HV* stash, const char* name, const STRLEN len, U32 flags);
 #define PERL_ARGS_ASSERT_GV_FETCHMETHOD_PVN_FLAGS	\
 	assert(stash); assert(name)
-
-PERL_CALLCONV GV*	Perl_gv_fetchmethod_sv_flags(pTHX_ HV* stash, SV* namesv, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV GV*	Perl_gv_fetchmethod_sv_flags(pTHX_ HV* stash, SV* namesv, U32 flags);
 #define PERL_ARGS_ASSERT_GV_FETCHMETHOD_SV_FLAGS	\
 	assert(stash); assert(namesv)
-
-PERL_CALLCONV GV*	Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, const svtype sv_type)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV GV*	Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, const svtype sv_type);
 #define PERL_ARGS_ASSERT_GV_FETCHPV	\
 	assert(nambeg)
-
-PERL_CALLCONV GV*	Perl_gv_fetchpvn_flags(pTHX_ const char* name, STRLEN len, I32 flags, const svtype sv_type)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV GV*	Perl_gv_fetchpvn_flags(pTHX_ const char* name, STRLEN len, I32 flags, const svtype sv_type);
 #define PERL_ARGS_ASSERT_GV_FETCHPVN_FLAGS	\
 	assert(name)
-
-PERL_CALLCONV GV*	Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, const svtype sv_type)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV GV*	Perl_gv_fetchsv(pTHX_ SV *name, I32 flags, const svtype sv_type);
 #define PERL_ARGS_ASSERT_GV_FETCHSV	\
 	assert(name)
-
-PERL_CALLCONV void	Perl_gv_fullname(pTHX_ SV* sv, const GV* gv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_gv_fullname(pTHX_ SV* sv, const GV* gv);
 #define PERL_ARGS_ASSERT_GV_FULLNAME	\
 	assert(sv); assert(gv)
-
-/* PERL_CALLCONV void	Perl_gv_fullname3(pTHX_ SV* sv, const GV* gv, const char* prefix)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV void	Perl_gv_fullname3(pTHX_ SV* sv, const GV* gv, const char* prefix); */
 #define PERL_ARGS_ASSERT_GV_FULLNAME3	\
 	assert(sv); assert(gv)
-
-PERL_CALLCONV void	Perl_gv_fullname4(pTHX_ SV* sv, const GV* gv, const char* prefix, bool keepmain)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_gv_fullname4(pTHX_ SV* sv, const GV* gv, const char* prefix, bool keepmain);
 #define PERL_ARGS_ASSERT_GV_FULLNAME4	\
 	assert(sv); assert(gv)
-
 PERL_CALLCONV CV*	Perl_gv_handler(pTHX_ HV* stash, I32 id)
 			__attribute__warn_unused_result__;
 
-/* PERL_CALLCONV void	gv_init(pTHX_ GV* gv, HV* stash, const char* name, STRLEN len, int multi)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3); */
-
-PERL_CALLCONV void	Perl_gv_init_pv(pTHX_ GV* gv, HV* stash, const char* name, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+/* PERL_CALLCONV void	gv_init(pTHX_ GV* gv, HV* stash, const char* name, STRLEN len, int multi); */
+PERL_CALLCONV void	Perl_gv_init_pv(pTHX_ GV* gv, HV* stash, const char* name, U32 flags);
 #define PERL_ARGS_ASSERT_GV_INIT_PV	\
 	assert(gv); assert(name)
-
-PERL_CALLCONV void	Perl_gv_init_pvn(pTHX_ GV* gv, HV* stash, const char* name, STRLEN len, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_gv_init_pvn(pTHX_ GV* gv, HV* stash, const char* name, STRLEN len, U32 flags);
 #define PERL_ARGS_ASSERT_GV_INIT_PVN	\
 	assert(gv); assert(name)
-
-PERL_CALLCONV void	Perl_gv_init_sv(pTHX_ GV* gv, HV* stash, SV* namesv, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_gv_init_sv(pTHX_ GV* gv, HV* stash, SV* namesv, U32 flags);
 #define PERL_ARGS_ASSERT_GV_INIT_SV	\
 	assert(gv); assert(namesv)
-
-PERL_CALLCONV void	Perl_gv_name_set(pTHX_ GV* gv, const char *name, U32 len, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_gv_name_set(pTHX_ GV* gv, const char *name, U32 len, U32 flags);
 #define PERL_ARGS_ASSERT_GV_NAME_SET	\
 	assert(gv); assert(name)
-
-PERL_CALLCONV GV *	Perl_gv_override(pTHX_ const char * const name, const STRLEN len)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV GV *	Perl_gv_override(pTHX_ const char * const name, const STRLEN len);
 #define PERL_ARGS_ASSERT_GV_OVERRIDE	\
 	assert(name)
-
-PERL_CALLCONV void	Perl_gv_setref(pTHX_ SV *const dstr, SV *const sstr)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_gv_setref(pTHX_ SV *const dstr, SV *const sstr);
 #define PERL_ARGS_ASSERT_GV_SETREF	\
 	assert(dstr); assert(sstr)
-
-PERL_CALLCONV HV*	Perl_gv_stashpv(pTHX_ const char* name, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV HV*	Perl_gv_stashpv(pTHX_ const char* name, I32 flags);
 #define PERL_ARGS_ASSERT_GV_STASHPV	\
 	assert(name)
-
-PERL_CALLCONV HV*	Perl_gv_stashpvn(pTHX_ const char* name, U32 namelen, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV HV*	Perl_gv_stashpvn(pTHX_ const char* name, U32 namelen, I32 flags);
 #define PERL_ARGS_ASSERT_GV_STASHPVN	\
 	assert(name)
-
-PERL_CALLCONV HV*	Perl_gv_stashsv(pTHX_ SV* sv, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV HV*	Perl_gv_stashsv(pTHX_ SV* sv, I32 flags);
 #define PERL_ARGS_ASSERT_GV_STASHSV	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_gv_try_downgrade(pTHX_ GV* gv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_gv_try_downgrade(pTHX_ GV* gv);
 #define PERL_ARGS_ASSERT_GV_TRY_DOWNGRADE	\
 	assert(gv)
-
-PERL_CALLCONV AV**	Perl_hv_backreferences_p(pTHX_ HV *hv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV AV**	Perl_hv_backreferences_p(pTHX_ HV *hv);
 #define PERL_ARGS_ASSERT_HV_BACKREFERENCES_P	\
 	assert(hv)
-
 PERL_CALLCONV void	Perl_hv_clear(pTHX_ HV *hv);
-PERL_CALLCONV void	Perl_hv_clear_placeholders(pTHX_ HV *hv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_hv_clear_placeholders(pTHX_ HV *hv);
 #define PERL_ARGS_ASSERT_HV_CLEAR_PLACEHOLDERS	\
 	assert(hv)
-
 PERL_CALLCONV void*	Perl_hv_common(pTHX_ HV *hv, SV *keysv, const char* key, STRLEN klen, int flags, int action, SV *val, U32 hash);
-PERL_CALLCONV void*	Perl_hv_common_key_len(pTHX_ HV *hv, const char *key, I32 klen_i32, const int action, SV *val, const U32 hash)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void*	Perl_hv_common_key_len(pTHX_ HV *hv, const char *key, I32 klen_i32, const int action, SV *val, const U32 hash);
 #define PERL_ARGS_ASSERT_HV_COMMON_KEY_LEN	\
 	assert(key)
-
 PERL_CALLCONV HV *	Perl_hv_copy_hints_hv(pTHX_ HV *const ohv)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV void	Perl_hv_delayfree_ent(pTHX_ HV *hv, HE *entry)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_hv_delayfree_ent(pTHX_ HV *hv, HE *entry);
 #define PERL_ARGS_ASSERT_HV_DELAYFREE_ENT	\
 	assert(hv)
-
-/* PERL_CALLCONV SV*	Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen, I32 flags)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV SV*	Perl_hv_delete(pTHX_ HV *hv, const char *key, I32 klen, I32 flags); */
 #define PERL_ARGS_ASSERT_HV_DELETE	\
 	assert(key)
-
-/* PERL_CALLCONV SV*	Perl_hv_delete_ent(pTHX_ HV *hv, SV *keysv, I32 flags, U32 hash)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV SV*	Perl_hv_delete_ent(pTHX_ HV *hv, SV *keysv, I32 flags, U32 hash); */
 #define PERL_ARGS_ASSERT_HV_DELETE_ENT	\
 	assert(keysv)
-
 PERL_CALLCONV HE**	Perl_hv_eiter_p(pTHX_ HV *hv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HV_EITER_P	\
 	assert(hv)
 
-PERL_CALLCONV void	Perl_hv_eiter_set(pTHX_ HV *hv, HE *eiter)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_hv_eiter_set(pTHX_ HV *hv, HE *eiter);
 #define PERL_ARGS_ASSERT_HV_EITER_SET	\
 	assert(hv)
-
-PERL_CALLCONV void	Perl_hv_ename_add(pTHX_ HV *hv, const char *name, U32 len, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_hv_ename_add(pTHX_ HV *hv, const char *name, U32 len, U32 flags);
 #define PERL_ARGS_ASSERT_HV_ENAME_ADD	\
 	assert(hv); assert(name)
-
-PERL_CALLCONV void	Perl_hv_ename_delete(pTHX_ HV *hv, const char *name, U32 len, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_hv_ename_delete(pTHX_ HV *hv, const char *name, U32 len, U32 flags);
 #define PERL_ARGS_ASSERT_HV_ENAME_DELETE	\
 	assert(hv); assert(name)
-
 /* PERL_CALLCONV bool	Perl_hv_exists(pTHX_ HV *hv, const char *key, I32 klen)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2); */
+			__attribute__warn_unused_result__; */
 #define PERL_ARGS_ASSERT_HV_EXISTS	\
 	assert(key)
 
 /* PERL_CALLCONV bool	Perl_hv_exists_ent(pTHX_ HV *hv, SV *keysv, U32 hash)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2); */
+			__attribute__warn_unused_result__; */
 #define PERL_ARGS_ASSERT_HV_EXISTS_ENT	\
 	assert(keysv)
 
-/* PERL_CALLCONV SV**	Perl_hv_fetch(pTHX_ HV *hv, const char *key, I32 klen, I32 lval)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV SV**	Perl_hv_fetch(pTHX_ HV *hv, const char *key, I32 klen, I32 lval); */
 #define PERL_ARGS_ASSERT_HV_FETCH	\
 	assert(key)
-
-/* PERL_CALLCONV HE*	Perl_hv_fetch_ent(pTHX_ HV *hv, SV *keysv, I32 lval, U32 hash)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV HE*	Perl_hv_fetch_ent(pTHX_ HV *hv, SV *keysv, I32 lval, U32 hash); */
 #define PERL_ARGS_ASSERT_HV_FETCH_ENT	\
 	assert(keysv)
-
-PERL_CALLCONV STRLEN	Perl_hv_fill(pTHX_ HV *const hv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV STRLEN	Perl_hv_fill(pTHX_ HV *const hv);
 #define PERL_ARGS_ASSERT_HV_FILL	\
 	assert(hv)
-
-PERL_CALLCONV void	Perl_hv_free_ent(pTHX_ HV *hv, HE *entry)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_hv_free_ent(pTHX_ HV *hv, HE *entry);
 #define PERL_ARGS_ASSERT_HV_FREE_ENT	\
 	assert(hv)
-
-PERL_CALLCONV I32	Perl_hv_iterinit(pTHX_ HV *hv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV I32	Perl_hv_iterinit(pTHX_ HV *hv);
 #define PERL_ARGS_ASSERT_HV_ITERINIT	\
 	assert(hv)
-
 PERL_CALLCONV char*	Perl_hv_iterkey(pTHX_ HE* entry, I32* retlen)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HV_ITERKEY	\
 	assert(entry); assert(retlen)
 
 PERL_CALLCONV SV*	Perl_hv_iterkeysv(pTHX_ HE* entry)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HV_ITERKEYSV	\
 	assert(entry)
 
 /* PERL_CALLCONV HE*	Perl_hv_iternext(pTHX_ HV *hv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1); */
+			__attribute__warn_unused_result__; */
 #define PERL_ARGS_ASSERT_HV_ITERNEXT	\
 	assert(hv)
 
 PERL_CALLCONV HE*	Perl_hv_iternext_flags(pTHX_ HV *hv, I32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HV_ITERNEXT_FLAGS	\
 	assert(hv)
 
 PERL_CALLCONV SV*	Perl_hv_iternextsv(pTHX_ HV *hv, char **key, I32 *retlen)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HV_ITERNEXTSV	\
 	assert(hv); assert(key); assert(retlen)
 
 PERL_CALLCONV SV*	Perl_hv_iterval(pTHX_ HV *hv, HE *entry)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HV_ITERVAL	\
 	assert(hv); assert(entry)
 
-PERL_CALLCONV void	Perl_hv_ksplit(pTHX_ HV *hv, IV newmax)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_hv_ksplit(pTHX_ HV *hv, IV newmax);
 #define PERL_ARGS_ASSERT_HV_KSPLIT	\
 	assert(hv)
-
-/* PERL_CALLCONV void	Perl_hv_magic(pTHX_ HV *hv, GV *gv, int how)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV void	Perl_hv_magic(pTHX_ HV *hv, GV *gv, int how); */
 #define PERL_ARGS_ASSERT_HV_MAGIC	\
 	assert(hv)
-
-PERL_CALLCONV void	Perl_hv_name_set(pTHX_ HV *hv, const char *name, U32 len, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_hv_name_set(pTHX_ HV *hv, const char *name, U32 len, U32 flags);
 #define PERL_ARGS_ASSERT_HV_NAME_SET	\
 	assert(hv)
-
 PERL_CALLCONV I32	Perl_hv_placeholders_get(pTHX_ const HV *hv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HV_PLACEHOLDERS_GET	\
 	assert(hv)
 
 PERL_CALLCONV SSize_t*	Perl_hv_placeholders_p(pTHX_ HV *hv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HV_PLACEHOLDERS_P	\
 	assert(hv)
 
-PERL_CALLCONV void	Perl_hv_placeholders_set(pTHX_ HV *hv, I32 ph)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_hv_placeholders_set(pTHX_ HV *hv, I32 ph);
 #define PERL_ARGS_ASSERT_HV_PLACEHOLDERS_SET	\
 	assert(hv)
-
-PERL_CALLCONV void	Perl_hv_rand_set(pTHX_ HV *hv, U32 new_xhv_rand)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_hv_rand_set(pTHX_ HV *hv, U32 new_xhv_rand);
 #define PERL_ARGS_ASSERT_HV_RAND_SET	\
 	assert(hv)
-
 PERL_CALLCONV I32*	Perl_hv_riter_p(pTHX_ HV *hv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HV_RITER_P	\
 	assert(hv)
 
-PERL_CALLCONV void	Perl_hv_riter_set(pTHX_ HV *hv, I32 riter)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_hv_riter_set(pTHX_ HV *hv, I32 riter);
 #define PERL_ARGS_ASSERT_HV_RITER_SET	\
 	assert(hv)
-
 PERL_CALLCONV SV*	Perl_hv_scalar(pTHX_ HV *hv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HV_SCALAR	\
 	assert(hv)
 
@@ -1806,39 +1229,24 @@ PERL_CALLCONV SV*	Perl_hv_scalar(pTHX_ HV *hv)
 /* PERL_CALLCONV SV**	Perl_hv_store_flags(pTHX_ HV *hv, const char *key, I32 klen, SV *val, U32 hash, int flags); */
 /* PERL_CALLCONV void	hv_undef(pTHX_ HV *hv); */
 PERL_CALLCONV void	Perl_hv_undef_flags(pTHX_ HV *hv, U32 flags);
-/* PERL_CALLCONV I32	ibcmp(pTHX_ const char* a, const char* b, I32 len)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
-
-/* PERL_CALLCONV I32	ibcmp_locale(pTHX_ const char* a, const char* b, I32 len)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
-
-/* PERL_CALLCONV I32	ibcmp_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_5); */
-
-PERL_CALLCONV void	Perl_init_argv_symbols(pTHX_ int argc, char **argv)
-			__attribute__nonnull__(pTHX_2);
+/* PERL_CALLCONV I32	ibcmp(pTHX_ const char* a, const char* b, I32 len); */
+/* PERL_CALLCONV I32	ibcmp_locale(pTHX_ const char* a, const char* b, I32 len); */
+/* PERL_CALLCONV I32	ibcmp_utf8(pTHX_ const char *s1, char **pe1, UV l1, bool u1, const char *s2, char **pe2, UV l2, bool u2); */
+PERL_CALLCONV void	Perl_init_argv_symbols(pTHX_ int argc, char **argv);
 #define PERL_ARGS_ASSERT_INIT_ARGV_SYMBOLS	\
 	assert(argv)
-
 PERL_CALLCONV void	Perl_init_constants(pTHX);
 PERL_CALLCONV void	Perl_init_dbargs(pTHX);
 PERL_CALLCONV void	Perl_init_debugger(pTHX);
 PERL_CALLCONV int	Perl_init_i18nl10n(pTHX_ int printwarn);
 PERL_CALLCONV int	Perl_init_i18nl14n(pTHX_ int printwarn);
 PERL_CALLCONV void	Perl_init_stacks(pTHX);
-PERL_CALLCONV void	Perl_init_tm(pTHX_ struct tm *ptm)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_init_tm(pTHX_ struct tm *ptm);
 #define PERL_ARGS_ASSERT_INIT_TM	\
 	assert(ptm)
-
 PERL_CALLCONV char*	Perl_instr(const char* big, const char* little)
 			__attribute__warn_unused_result__
-			__attribute__pure__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_INSTR	\
 	assert(big); assert(little)
 
@@ -1846,48 +1254,34 @@ PERL_CALLCONV U32	Perl_intro_my(pTHX);
 PERL_CALLCONV OP*	Perl_invert(pTHX_ OP* cmd)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV bool	Perl_io_close(pTHX_ IO* io, GV *gv, bool not_implicit, bool warn_on_fail)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV bool	Perl_io_close(pTHX_ IO* io, GV *gv, bool not_implicit, bool warn_on_fail);
 #define PERL_ARGS_ASSERT_IO_CLOSE	\
 	assert(io)
-
 PERL_CALLCONV bool	Perl_isALNUM_lazy(pTHX_ const char* p)
 			__attribute__deprecated__
 			__attribute__warn_unused_result__
-			__attribute__pure__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_ISALNUM_LAZY	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_isIDFIRST_lazy(pTHX_ const char* p)
 			__attribute__deprecated__
 			__attribute__warn_unused_result__
-			__attribute__pure__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_ISIDFIRST_LAZY	\
 	assert(p)
 
 /* PERL_CALLCONV bool	Perl_is_ascii_string(pTHX_ const U8 *s, STRLEN len)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1); */
+			__attribute__warn_unused_result__; */
 
 PERL_CALLCONV bool	Perl_is_invariant_string(const U8 *s, STRLEN len)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_INVARIANT_STRING	\
 	assert(s)
 
 PERL_CALLCONV I32	Perl_is_lvalue_sub(pTHX)
 			__attribute__warn_unused_result__;
 
-PERL_STATIC_INLINE bool	S_is_safe_syscall(pTHX_ const char *pv, STRLEN len, const char *what, const char *op_name)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
-#define PERL_ARGS_ASSERT_IS_SAFE_SYSCALL	\
-	assert(pv); assert(what); assert(op_name)
-
 PERL_CALLCONV bool	Perl_is_uni_alnum(pTHX_ UV c)
 			__attribute__deprecated__
 			__attribute__warn_unused_result__
@@ -2040,752 +1434,476 @@ PERL_CALLCONV bool	Perl_is_uni_xdigit_lc(pTHX_ UV c)
 
 PERL_CALLCONV bool	Perl_is_utf8_alnum(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_ALNUM	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_alnumc(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_ALNUMC	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_alpha(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_ALPHA	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_ascii(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_ASCII	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_blank(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_BLANK	\
 	assert(p)
 
 PERL_CALLCONV STRLEN	Perl_is_utf8_char(const U8 *s)
-			__attribute__deprecated__
-			__attribute__nonnull__(1);
+			__attribute__deprecated__;
 #define PERL_ARGS_ASSERT_IS_UTF8_CHAR	\
 	assert(s)
 
-/* PERL_CALLCONV STRLEN	Perl_is_utf8_char_buf(const U8 *buf, const U8 *buf_end)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2); */
+/* PERL_CALLCONV STRLEN	Perl_is_utf8_char_buf(const U8 *buf, const U8 *buf_end); */
 #define PERL_ARGS_ASSERT_IS_UTF8_CHAR_BUF	\
 	assert(buf); assert(buf_end)
-
 PERL_CALLCONV bool	Perl_is_utf8_cntrl(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_CNTRL	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_digit(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_DIGIT	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_graph(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_GRAPH	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_idcont(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_IDCONT	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_idfirst(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_IDFIRST	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_lower(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_LOWER	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_mark(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_MARK	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_perl_space(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_PERL_SPACE	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_perl_word(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_PERL_WORD	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_posix_digit(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_POSIX_DIGIT	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_print(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_PRINT	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_punct(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_PUNCT	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_space(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_SPACE	\
 	assert(p)
 
-PERL_CALLCONV bool	Perl_is_utf8_string(const U8 *s, STRLEN len)
-			__attribute__nonnull__(1);
+PERL_CALLCONV bool	Perl_is_utf8_string(const U8 *s, STRLEN len);
 #define PERL_ARGS_ASSERT_IS_UTF8_STRING	\
 	assert(s)
-
-/* PERL_CALLCONV bool	Perl_is_utf8_string_loc(const U8 *s, STRLEN len, const U8 **ep)
-			__attribute__nonnull__(1); */
+/* PERL_CALLCONV bool	Perl_is_utf8_string_loc(const U8 *s, STRLEN len, const U8 **ep); */
 #define PERL_ARGS_ASSERT_IS_UTF8_STRING_LOC	\
 	assert(s)
-
-PERL_CALLCONV bool	Perl_is_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el)
-			__attribute__nonnull__(1);
+PERL_CALLCONV bool	Perl_is_utf8_string_loclen(const U8 *s, STRLEN len, const U8 **ep, STRLEN *el);
 #define PERL_ARGS_ASSERT_IS_UTF8_STRING_LOCLEN	\
 	assert(s)
-
 PERL_CALLCONV bool	Perl_is_utf8_upper(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_UPPER	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_xdigit(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_XDIGIT	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_xidcont(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_XIDCONT	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_is_utf8_xidfirst(pTHX_ const U8 *p)
 			__attribute__deprecated__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_XIDFIRST	\
 	assert(p)
 
 PERL_CALLCONV bool	Perl_isinfnan(NV nv);
-PERL_CALLCONV bool	Perl_isinfnansv(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV bool	Perl_isinfnansv(pTHX_ SV *sv);
 #define PERL_ARGS_ASSERT_ISINFNANSV	\
 	assert(sv)
-
-PERL_CALLCONV OP*	Perl_jmaybe(pTHX_ OP *o)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV OP*	Perl_jmaybe(pTHX_ OP *o);
 #define PERL_ARGS_ASSERT_JMAYBE	\
 	assert(o)
-
 PERL_CALLCONV I32	Perl_keyword(pTHX_ const char *name, I32 len, bool all_keywords)
-			__attribute__pure__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_KEYWORD	\
 	assert(name)
 
-PERL_CALLCONV int	Perl_keyword_plugin_standard(pTHX_ char* keyword_ptr, STRLEN keyword_len, OP** op_ptr)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV int	Perl_keyword_plugin_standard(pTHX_ char* keyword_ptr, STRLEN keyword_len, OP** op_ptr);
 #define PERL_ARGS_ASSERT_KEYWORD_PLUGIN_STANDARD	\
 	assert(keyword_ptr); assert(op_ptr)
-
+PERL_CALLCONV void	Perl_leave_adjust_stacks(pTHX_ SV **from_sp, SV **to_sp, U8 gimme, int filter);
+#define PERL_ARGS_ASSERT_LEAVE_ADJUST_STACKS	\
+	assert(from_sp); assert(to_sp)
 PERL_CALLCONV void	Perl_leave_scope(pTHX_ I32 base);
 PERL_CALLCONV bool	Perl_lex_bufutf8(pTHX);
-PERL_CALLCONV void	Perl_lex_discard_to(pTHX_ char* ptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_lex_discard_to(pTHX_ char* ptr);
 #define PERL_ARGS_ASSERT_LEX_DISCARD_TO	\
 	assert(ptr)
-
 PERL_CALLCONV char*	Perl_lex_grow_linestr(pTHX_ STRLEN len);
 PERL_CALLCONV bool	Perl_lex_next_chunk(pTHX_ U32 flags);
 PERL_CALLCONV I32	Perl_lex_peek_unichar(pTHX_ U32 flags);
 PERL_CALLCONV void	Perl_lex_read_space(pTHX_ U32 flags);
-PERL_CALLCONV void	Perl_lex_read_to(pTHX_ char* ptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_lex_read_to(pTHX_ char* ptr);
 #define PERL_ARGS_ASSERT_LEX_READ_TO	\
 	assert(ptr)
-
 PERL_CALLCONV I32	Perl_lex_read_unichar(pTHX_ U32 flags);
 PERL_CALLCONV void	Perl_lex_start(pTHX_ SV* line, PerlIO *rsfp, U32 flags);
-PERL_CALLCONV void	Perl_lex_stuff_pv(pTHX_ const char* pv, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_lex_stuff_pv(pTHX_ const char* pv, U32 flags);
 #define PERL_ARGS_ASSERT_LEX_STUFF_PV	\
 	assert(pv)
-
-PERL_CALLCONV void	Perl_lex_stuff_pvn(pTHX_ const char* pv, STRLEN len, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_lex_stuff_pvn(pTHX_ const char* pv, STRLEN len, U32 flags);
 #define PERL_ARGS_ASSERT_LEX_STUFF_PVN	\
 	assert(pv)
-
-PERL_CALLCONV void	Perl_lex_stuff_sv(pTHX_ SV* sv, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_lex_stuff_sv(pTHX_ SV* sv, U32 flags);
 #define PERL_ARGS_ASSERT_LEX_STUFF_SV	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_lex_unstuff(pTHX_ char* ptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_lex_unstuff(pTHX_ char* ptr);
 #define PERL_ARGS_ASSERT_LEX_UNSTUFF	\
 	assert(ptr)
-
 PERL_CALLCONV OP*	Perl_list(pTHX_ OP* o);
-PERL_CALLCONV void	Perl_load_module(pTHX_ U32 flags, SV* name, SV* ver, ...)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_load_module(pTHX_ U32 flags, SV* name, SV* ver, ...);
 #define PERL_ARGS_ASSERT_LOAD_MODULE	\
 	assert(name)
-
-PERL_CALLCONV OP*	Perl_localize(pTHX_ OP *o, I32 lex)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV OP*	Perl_localize(pTHX_ OP *o, I32 lex);
 #define PERL_ARGS_ASSERT_LOCALIZE	\
 	assert(o)
-
 PERL_CALLCONV I32	Perl_looks_like_number(pTHX_ SV *const sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_LOOKS_LIKE_NUMBER	\
 	assert(sv)
 
-PERL_CALLCONV int	Perl_magic_clear_all_env(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_clear_all_env(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_CLEAR_ALL_ENV	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_cleararylen_p(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_cleararylen_p(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_CLEARARYLEN_P	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_clearenv(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_clearenv(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_CLEARENV	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_clearhint(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_clearhint(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_CLEARHINT	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_clearhints(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_clearhints(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_CLEARHINTS	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_clearisa(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_clearisa(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_CLEARISA	\
 	assert(mg)
-
-PERL_CALLCONV int	Perl_magic_clearpack(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_clearpack(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_CLEARPACK	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_clearsig(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_clearsig(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_CLEARSIG	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_copycallchecker(pTHX_ SV* sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV int	Perl_magic_copycallchecker(pTHX_ SV* sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen);
 #define PERL_ARGS_ASSERT_MAGIC_COPYCALLCHECKER	\
 	assert(sv); assert(mg); assert(nsv)
-
 PERL_CALLCONV void	Perl_magic_dump(pTHX_ const MAGIC *mg);
-PERL_CALLCONV int	Perl_magic_existspack(pTHX_ SV* sv, const MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_existspack(pTHX_ SV* sv, const MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_EXISTSPACK	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_freearylen_p(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_freearylen_p(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_FREEARYLEN_P	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_freeovrld(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_freeovrld(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_FREEOVRLD	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_get(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_get(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GET	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_getarylen(pTHX_ SV* sv, const MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_getarylen(pTHX_ SV* sv, const MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GETARYLEN	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_getdebugvar(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_getdebugvar(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GETDEBUGVAR	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_getdefelem(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_getdefelem(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GETDEFELEM	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_getnkeys(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_getnkeys(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GETNKEYS	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_getpack(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_getpack(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GETPACK	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_getpos(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_getpos(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GETPOS	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_getsig(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_getsig(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GETSIG	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_getsubstr(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_getsubstr(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GETSUBSTR	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_gettaint(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_gettaint(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GETTAINT	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_getuvar(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_getuvar(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GETUVAR	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_getvec(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_getvec(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_GETVEC	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_killbackrefs(pTHX_ SV *sv, MAGIC *mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_killbackrefs(pTHX_ SV *sv, MAGIC *mg);
 #define PERL_ARGS_ASSERT_MAGIC_KILLBACKREFS	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV SV*	Perl_magic_methcall(pTHX_ SV *sv, const MAGIC *mg, SV *meth, U32 flags, U32 argc, ...)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV SV*	Perl_magic_methcall(pTHX_ SV *sv, const MAGIC *mg, SV *meth, U32 flags, U32 argc, ...);
 #define PERL_ARGS_ASSERT_MAGIC_METHCALL	\
 	assert(sv); assert(mg); assert(meth)
-
-PERL_CALLCONV int	Perl_magic_nextpack(pTHX_ SV *sv, MAGIC *mg, SV *key)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV int	Perl_magic_nextpack(pTHX_ SV *sv, MAGIC *mg, SV *key);
 #define PERL_ARGS_ASSERT_MAGIC_NEXTPACK	\
 	assert(sv); assert(mg); assert(key)
-
-PERL_CALLCONV U32	Perl_magic_regdata_cnt(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV U32	Perl_magic_regdata_cnt(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_REGDATA_CNT	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_regdatum_get(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_regdatum_get(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_REGDATUM_GET	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV SV*	Perl_magic_scalarpack(pTHX_ HV *hv, MAGIC *mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV*	Perl_magic_scalarpack(pTHX_ HV *hv, MAGIC *mg);
 #define PERL_ARGS_ASSERT_MAGIC_SCALARPACK	\
 	assert(hv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_set(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_set(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SET	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_set_all_env(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_set_all_env(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SET_ALL_ENV	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setarylen(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setarylen(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETARYLEN	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setdbline(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setdbline(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETDBLINE	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setdebugvar(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setdebugvar(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETDEBUGVAR	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setdefelem(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setdefelem(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETDEFELEM	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setenv(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setenv(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETENV	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_sethint(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_sethint(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETHINT	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setisa(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setisa(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETISA	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setlvref(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setlvref(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETLVREF	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setmglob(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setmglob(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETMGLOB	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setnkeys(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setnkeys(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETNKEYS	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setpack(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setpack(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETPACK	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setpos(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setpos(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETPOS	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setregexp(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setregexp(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETREGEXP	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setsig(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setsig(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETSIG	\
 	assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setsubstr(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setsubstr(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETSUBSTR	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_settaint(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_settaint(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETTAINT	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setutf8(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setutf8(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETUTF8	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setuvar(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setuvar(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETUVAR	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_setvec(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setvec(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETVEC	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV U32	Perl_magic_sizepack(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV U32	Perl_magic_sizepack(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SIZEPACK	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV int	Perl_magic_wipepack(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_wipepack(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_WIPEPACK	\
 	assert(sv); assert(mg)
-
 PERL_CALLCONV Malloc_t	Perl_malloc(MEM_SIZE nbytes)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV I32 *	Perl_markstack_grow(pTHX);
 PERL_CALLCONV SV*	Perl_mess(pTHX_ const char* pat, ...)
-			__attribute__format__(__printf__,pTHX_1,pTHX_2)
-			__attribute__nonnull__(pTHX_1);
+			__attribute__format__(__printf__,pTHX_1,pTHX_2);
 #define PERL_ARGS_ASSERT_MESS	\
 	assert(pat)
 
-PERL_CALLCONV SV*	Perl_mess_sv(pTHX_ SV* basemsg, bool consume)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_mess_sv(pTHX_ SV* basemsg, bool consume);
 #define PERL_ARGS_ASSERT_MESS_SV	\
 	assert(basemsg)
-
 PERL_CALLCONV Free_t	Perl_mfree(Malloc_t where);
-PERL_CALLCONV int	Perl_mg_clear(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_mg_clear(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_MG_CLEAR	\
 	assert(sv)
-
-PERL_CALLCONV int	Perl_mg_copy(pTHX_ SV *sv, SV *nsv, const char *key, I32 klen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_mg_copy(pTHX_ SV *sv, SV *nsv, const char *key, I32 klen);
 #define PERL_ARGS_ASSERT_MG_COPY	\
 	assert(sv); assert(nsv)
-
 PERL_CALLCONV MAGIC*	Perl_mg_find(const SV* sv, int type)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV MAGIC*	Perl_mg_find_mglob(pTHX_ SV* sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_MG_FIND_MGLOB	\
 	assert(sv)
 
 PERL_CALLCONV MAGIC*	Perl_mg_findext(const SV* sv, int type, const MGVTBL *vtbl)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV int	Perl_mg_free(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_mg_free(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_MG_FREE	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_mg_free_type(pTHX_ SV* sv, int how)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_mg_free_type(pTHX_ SV* sv, int how);
 #define PERL_ARGS_ASSERT_MG_FREE_TYPE	\
 	assert(sv)
-
-PERL_CALLCONV int	Perl_mg_get(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_mg_get(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_MG_GET	\
 	assert(sv)
-
 PERL_CALLCONV U32	Perl_mg_length(pTHX_ SV* sv)
-			__attribute__deprecated__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__deprecated__;
 #define PERL_ARGS_ASSERT_MG_LENGTH	\
 	assert(sv)
 
-PERL_CALLCONV void	Perl_mg_localize(pTHX_ SV* sv, SV* nsv, bool setmagic)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_mg_localize(pTHX_ SV* sv, SV* nsv, bool setmagic);
 #define PERL_ARGS_ASSERT_MG_LOCALIZE	\
 	assert(sv); assert(nsv)
-
-PERL_CALLCONV void	Perl_mg_magical(SV* sv)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void	Perl_mg_magical(SV* sv);
 #define PERL_ARGS_ASSERT_MG_MAGICAL	\
 	assert(sv)
-
-PERL_CALLCONV int	Perl_mg_set(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_mg_set(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_MG_SET	\
 	assert(sv)
-
-PERL_CALLCONV I32	Perl_mg_size(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV I32	Perl_mg_size(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_MG_SIZE	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_mini_mktime(struct tm *ptm)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void	Perl_mini_mktime(struct tm *ptm);
 #define PERL_ARGS_ASSERT_MINI_MKTIME	\
 	assert(ptm)
-
 PERL_CALLCONV int	Perl_mode_from_discipline(pTHX_ const char* s, STRLEN len);
 PERL_CALLCONV void *	Perl_more_bodies(pTHX_ const svtype sv_type, const size_t body_size, const size_t arena_size);
-PERL_CALLCONV const char*	Perl_moreswitches(pTHX_ const char* s)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV const char*	Perl_moreswitches(pTHX_ const char* s);
 #define PERL_ARGS_ASSERT_MORESWITCHES	\
 	assert(s)
-
-PERL_CALLCONV const struct mro_alg *	Perl_mro_get_from_name(pTHX_ SV *name)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV const struct mro_alg *	Perl_mro_get_from_name(pTHX_ SV *name);
 #define PERL_ARGS_ASSERT_MRO_GET_FROM_NAME	\
 	assert(name)
-
-PERL_CALLCONV AV*	Perl_mro_get_linear_isa(pTHX_ HV* stash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV AV*	Perl_mro_get_linear_isa(pTHX_ HV* stash);
 #define PERL_ARGS_ASSERT_MRO_GET_LINEAR_ISA	\
 	assert(stash)
-
-PERL_CALLCONV SV*	Perl_mro_get_private_data(pTHX_ struct mro_meta *const smeta, const struct mro_alg *const which)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV*	Perl_mro_get_private_data(pTHX_ struct mro_meta *const smeta, const struct mro_alg *const which);
 #define PERL_ARGS_ASSERT_MRO_GET_PRIVATE_DATA	\
 	assert(smeta); assert(which)
-
-PERL_CALLCONV void	Perl_mro_isa_changed_in(pTHX_ HV* stash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_mro_isa_changed_in(pTHX_ HV* stash);
 #define PERL_ARGS_ASSERT_MRO_ISA_CHANGED_IN	\
 	assert(stash)
-
-PERL_CALLCONV struct mro_meta*	Perl_mro_meta_init(pTHX_ HV* stash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV struct mro_meta*	Perl_mro_meta_init(pTHX_ HV* stash);
 #define PERL_ARGS_ASSERT_MRO_META_INIT	\
 	assert(stash)
-
-PERL_CALLCONV void	Perl_mro_method_changed_in(pTHX_ HV* stash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_mro_method_changed_in(pTHX_ HV* stash);
 #define PERL_ARGS_ASSERT_MRO_METHOD_CHANGED_IN	\
 	assert(stash)
-
-PERL_CALLCONV void	Perl_mro_package_moved(pTHX_ HV * const stash, HV * const oldstash, const GV * const gv, U32 flags)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_mro_package_moved(pTHX_ HV * const stash, HV * const oldstash, const GV * const gv, U32 flags);
 #define PERL_ARGS_ASSERT_MRO_PACKAGE_MOVED	\
 	assert(gv)
-
-PERL_CALLCONV void	Perl_mro_register(pTHX_ const struct mro_alg *mro)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_mro_register(pTHX_ const struct mro_alg *mro);
 #define PERL_ARGS_ASSERT_MRO_REGISTER	\
 	assert(mro)
-
-PERL_CALLCONV void	Perl_mro_set_mro(pTHX_ struct mro_meta *const meta, SV *const name)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_mro_set_mro(pTHX_ struct mro_meta *const meta, SV *const name);
 #define PERL_ARGS_ASSERT_MRO_SET_MRO	\
 	assert(meta); assert(name)
-
-PERL_CALLCONV SV*	Perl_mro_set_private_data(pTHX_ struct mro_meta *const smeta, const struct mro_alg *const which, SV *const data)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV SV*	Perl_mro_set_private_data(pTHX_ struct mro_meta *const smeta, const struct mro_alg *const which, SV *const data);
 #define PERL_ARGS_ASSERT_MRO_SET_PRIVATE_DATA	\
 	assert(smeta); assert(which); assert(data)
-
-PERL_CALLCONV SV*	Perl_multideref_stringify(pTHX_ const OP* o, CV *cv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_multideref_stringify(pTHX_ const OP* o, CV *cv);
 #define PERL_ARGS_ASSERT_MULTIDEREF_STRINGIFY	\
 	assert(o)
-
-PERL_CALLCONV NV	Perl_my_atof(pTHX_ const char *s)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV NV	Perl_my_atof(pTHX_ const char *s);
 #define PERL_ARGS_ASSERT_MY_ATOF	\
 	assert(s)
-
-PERL_CALLCONV char*	Perl_my_atof2(pTHX_ const char *s, NV* value)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_my_atof2(pTHX_ const char *s, NV* value);
 #define PERL_ARGS_ASSERT_MY_ATOF2	\
 	assert(s); assert(value)
-
-PERL_CALLCONV OP *	Perl_my_attrs(pTHX_ OP *o, OP *attrs)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV OP *	Perl_my_attrs(pTHX_ OP *o, OP *attrs);
 #define PERL_ARGS_ASSERT_MY_ATTRS	\
 	assert(o)
-
 PERL_CALLCONV void	Perl_my_clearenv(pTHX);
 PERL_CALLCONV int	Perl_my_dirfd(DIR* dir);
 PERL_CALLCONV_NO_RET void	Perl_my_exit(pTHX_ U32 status)
@@ -2798,17 +1916,12 @@ PERL_CALLCONV I32	Perl_my_fflush_all(pTHX);
 PERL_CALLCONV Pid_t	Perl_my_fork(void);
 /* PERL_CALLCONV I32	Perl_my_lstat(pTHX); */
 PERL_CALLCONV I32	Perl_my_lstat_flags(pTHX_ const U32 flags);
-PERL_CALLCONV PerlIO*	Perl_my_popen_list(pTHX_ const char* mode, int n, SV ** args)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV PerlIO*	Perl_my_popen_list(pTHX_ const char* mode, int n, SV ** args);
 #define PERL_ARGS_ASSERT_MY_POPEN_LIST	\
 	assert(mode); assert(args)
-
 PERL_CALLCONV void	Perl_my_setenv(pTHX_ const char* nam, const char* val);
 PERL_CALLCONV int	Perl_my_snprintf(char *buffer, const Size_t len, const char *format, ...)
-			__attribute__format__(__printf__,3,4)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(3);
+			__attribute__format__(__printf__,3,4);
 #define PERL_ARGS_ASSERT_MY_SNPRINTF	\
 	assert(buffer); assert(format)
 
@@ -2817,18 +1930,14 @@ PERL_CALLCONV int	Perl_my_socketpair(int family, int type, int protocol, int fd[
 PERL_CALLCONV I32	Perl_my_stat_flags(pTHX_ const U32 flags);
 PERL_CALLCONV char*	Perl_my_strerror(pTHX_ const int errnum);
 PERL_CALLCONV char *	Perl_my_strftime(pTHX_ const char *fmt, int sec, int min, int hour, int mday, int mon, int year, int wday, int yday, int isdst)
-			__attribute__format__(__strftime__,pTHX_1,0)
-			__attribute__nonnull__(pTHX_1);
+			__attribute__format__(__strftime__,pTHX_1,0);
 #define PERL_ARGS_ASSERT_MY_STRFTIME	\
 	assert(fmt)
 
 PERL_CALLCONV void	Perl_my_unexec(pTHX);
-PERL_CALLCONV int	Perl_my_vsnprintf(char *buffer, const Size_t len, const char *format, va_list ap)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(3);
+PERL_CALLCONV int	Perl_my_vsnprintf(char *buffer, const Size_t len, const char *format, va_list ap);
 #define PERL_ARGS_ASSERT_MY_VSNPRINTF	\
 	assert(buffer); assert(format)
-
 PERL_CALLCONV OP*	Perl_newANONATTRSUB(pTHX_ I32 floor, OP *proto, OP *attrs, OP *block);
 PERL_CALLCONV OP*	Perl_newANONHASH(pTHX_ OP* o)
 			__attribute__malloc__
@@ -2850,8 +1959,7 @@ PERL_CALLCONV CV*	Perl_newATTRSUB_x(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs
 
 PERL_CALLCONV OP*	Perl_newAVREF(pTHX_ OP* o)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWAVREF	\
 	assert(o)
 
@@ -2861,8 +1969,7 @@ PERL_CALLCONV OP*	Perl_newBINOP(pTHX_ I32 type, I32 flags, OP* first, OP* last)
 
 PERL_CALLCONV OP*	Perl_newCONDOP(pTHX_ I32 flags, OP* first, OP* trueop, OP* falseop)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWCONDOP	\
 	assert(first)
 
@@ -2878,28 +1985,22 @@ PERL_CALLCONV OP*	Perl_newDEFSVOP(pTHX)
 PERL_CALLCONV void	Perl_newFORM(pTHX_ I32 floor, OP* o, OP* block);
 PERL_CALLCONV OP*	Perl_newFOROP(pTHX_ I32 flags, OP* sv, OP* expr, OP* block, OP* cont)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWFOROP	\
 	assert(expr)
 
 PERL_CALLCONV OP*	Perl_newGIVENOP(pTHX_ OP* cond, OP* block, PADOFFSET defsv_off)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWGIVENOP	\
 	assert(cond); assert(block)
 
-PERL_CALLCONV GP *	Perl_newGP(pTHX_ GV *const gv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV GP *	Perl_newGP(pTHX_ GV *const gv);
 #define PERL_ARGS_ASSERT_NEWGP	\
 	assert(gv)
-
 PERL_CALLCONV OP*	Perl_newGVOP(pTHX_ I32 type, I32 flags, GV* gv)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWGVOP	\
 	assert(gv)
 
@@ -2907,13 +2008,10 @@ PERL_CALLCONV OP*	Perl_newGVREF(pTHX_ I32 type, OP* o)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
-/* PERL_CALLCONV GV*	newGVgen(pTHX_ const char* pack)
-			__attribute__nonnull__(pTHX_1); */
-
+/* PERL_CALLCONV GV*	newGVgen(pTHX_ const char* pack); */
 PERL_CALLCONV GV*	Perl_newGVgen_flags(pTHX_ const char* pack, U32 flags)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWGVGEN_FLAGS	\
 	assert(pack)
 
@@ -2922,8 +2020,7 @@ PERL_CALLCONV GV*	Perl_newGVgen_flags(pTHX_ const char* pack, U32 flags)
 
 PERL_CALLCONV OP*	Perl_newHVREF(pTHX_ OP* o)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWHVREF	\
 	assert(o)
 
@@ -2941,16 +2038,13 @@ PERL_CALLCONV OP*	Perl_newLISTOP(pTHX_ I32 type, I32 flags, OP* first, OP* last)
 
 PERL_CALLCONV OP*	Perl_newLOGOP(pTHX_ I32 optype, I32 flags, OP *first, OP *other)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWLOGOP	\
 	assert(first); assert(other)
 
 PERL_CALLCONV OP*	Perl_newLOOPEX(pTHX_ I32 type, OP* label)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWLOOPEX	\
 	assert(label)
 
@@ -2960,23 +2054,19 @@ PERL_CALLCONV OP*	Perl_newLOOPOP(pTHX_ I32 flags, I32 debuggable, OP* expr, OP*
 
 PERL_CALLCONV OP*	Perl_newMETHOP(pTHX_ I32 type, I32 flags, OP* dynamic_meth)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWMETHOP	\
 	assert(dynamic_meth)
 
 PERL_CALLCONV OP*	Perl_newMETHOP_named(pTHX_ I32 type, I32 flags, SV* const_meth)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWMETHOP_NAMED	\
 	assert(const_meth)
 
-PERL_CALLCONV CV *	Perl_newMYSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV CV *	Perl_newMYSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block);
 #define PERL_ARGS_ASSERT_NEWMYSUB	\
 	assert(o)
-
 PERL_CALLCONV OP*	Perl_newNULLLIST(pTHX)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
@@ -2991,15 +2081,13 @@ PERL_CALLCONV PADNAMELIST *	Perl_newPADNAMELIST(size_t max)
 
 PERL_CALLCONV PADNAME *	Perl_newPADNAMEouter(PADNAME *outer)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWPADNAMEOUTER	\
 	assert(outer)
 
 PERL_CALLCONV PADNAME *	Perl_newPADNAMEpvn(const char *s, STRLEN len)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWPADNAMEPVN	\
 	assert(s)
 
@@ -3007,34 +2095,28 @@ PERL_CALLCONV OP*	Perl_newPMOP(pTHX_ I32 type, I32 flags)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV void	Perl_newPROG(pTHX_ OP* o)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_newPROG(pTHX_ OP* o);
 #define PERL_ARGS_ASSERT_NEWPROG	\
 	assert(o)
-
 PERL_CALLCONV OP*	Perl_newPVOP(pTHX_ I32 type, I32 flags, char* pv)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV OP*	Perl_newRANGE(pTHX_ I32 flags, OP* left, OP* right)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWRANGE	\
 	assert(left); assert(right)
 
 PERL_CALLCONV SV*	Perl_newRV(pTHX_ SV *const sv)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWRV	\
 	assert(sv)
 
 PERL_CALLCONV SV*	Perl_newRV_noinc(pTHX_ SV *const tmpRef)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWRV_NOINC	\
 	assert(tmpRef)
 
@@ -3046,11 +2128,9 @@ PERL_CALLCONV OP*	Perl_newSTATEOP(pTHX_ I32 flags, char* label, OP* o)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV CV*	Perl_newSTUB(pTHX_ GV *gv, bool fake)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV CV*	Perl_newSTUB(pTHX_ GV *gv, bool fake);
 #define PERL_ARGS_ASSERT_NEWSTUB	\
 	assert(gv)
-
 /* PERL_CALLCONV CV*	Perl_newSUB(pTHX_ I32 floor, OP* o, OP* proto, OP* block); */
 PERL_CALLCONV SV*	Perl_newSV(pTHX_ const STRLEN len)
 			__attribute__malloc__
@@ -3058,15 +2138,13 @@ PERL_CALLCONV SV*	Perl_newSV(pTHX_ const STRLEN len)
 
 PERL_CALLCONV OP*	Perl_newSVOP(pTHX_ I32 type, I32 flags, SV* sv)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWSVOP	\
 	assert(sv)
 
 PERL_CALLCONV OP*	Perl_newSVREF(pTHX_ OP* o)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWSVREF	\
 	assert(o)
 
@@ -3076,8 +2154,7 @@ PERL_CALLCONV SV*	Perl_newSV_type(pTHX_ const svtype type)
 
 PERL_CALLCONV SV*	Perl_newSVavdefelem(pTHX_ AV *av, SSize_t ix, bool extendible)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWSVAVDEFELEM	\
 	assert(av)
 
@@ -3104,8 +2181,7 @@ PERL_CALLCONV SV*	Perl_newSVpv_share(pTHX_ const char* s, U32 hash)
 PERL_CALLCONV SV*	Perl_newSVpvf(pTHX_ const char *const pat, ...)
 			__attribute__malloc__
 			__attribute__warn_unused_result__
-			__attribute__format__(__printf__,pTHX_1,pTHX_2)
-			__attribute__nonnull__(pTHX_1);
+			__attribute__format__(__printf__,pTHX_1,pTHX_2);
 #define PERL_ARGS_ASSERT_NEWSVPVF	\
 	assert(pat)
 
@@ -3121,11 +2197,9 @@ PERL_CALLCONV SV*	Perl_newSVpvn_share(pTHX_ const char* s, I32 len, U32 hash)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV SV*	Perl_newSVrv(pTHX_ SV *const rv, const char *const classname)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_newSVrv(pTHX_ SV *const rv, const char *const classname);
 #define PERL_ARGS_ASSERT_NEWSVRV	\
 	assert(rv)
-
 PERL_CALLCONV SV*	Perl_newSVsv(pTHX_ SV *const old)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
@@ -3144,8 +2218,7 @@ PERL_CALLCONV OP*	Perl_newUNOP_AUX(pTHX_ I32 type, I32 flags, OP* first, UNOP_AU
 
 PERL_CALLCONV OP*	Perl_newWHENOP(pTHX_ OP* cond, OP* block)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWWHENOP	\
 	assert(block)
 
@@ -3153,245 +2226,162 @@ PERL_CALLCONV OP*	Perl_newWHILEOP(pTHX_ I32 flags, I32 debuggable, LOOP* loop, O
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV CV*	Perl_newXS(pTHX_ const char *name, XSUBADDR_t subaddr, const char *filename)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV CV*	Perl_newXS(pTHX_ const char *name, XSUBADDR_t subaddr, const char *filename);
 #define PERL_ARGS_ASSERT_NEWXS	\
 	assert(subaddr); assert(filename)
-
-PERL_CALLCONV CV *	Perl_newXS_deffile(pTHX_ const char *name, XSUBADDR_t subaddr)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV CV *	Perl_newXS_deffile(pTHX_ const char *name, XSUBADDR_t subaddr);
 #define PERL_ARGS_ASSERT_NEWXS_DEFFILE	\
 	assert(name); assert(subaddr)
-
-PERL_CALLCONV CV *	Perl_newXS_flags(pTHX_ const char *name, XSUBADDR_t subaddr, const char *const filename, const char *const proto, U32 flags)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV CV *	Perl_newXS_flags(pTHX_ const char *name, XSUBADDR_t subaddr, const char *const filename, const char *const proto, U32 flags);
 #define PERL_ARGS_ASSERT_NEWXS_FLAGS	\
 	assert(subaddr); assert(filename)
-
-PERL_CALLCONV CV *	Perl_newXS_len_flags(pTHX_ const char *name, STRLEN len, XSUBADDR_t subaddr, const char *const filename, const char *const proto, SV **const_svp, U32 flags)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV CV *	Perl_newXS_len_flags(pTHX_ const char *name, STRLEN len, XSUBADDR_t subaddr, const char *const filename, const char *const proto, SV **const_svp, U32 flags);
 #define PERL_ARGS_ASSERT_NEWXS_LEN_FLAGS	\
 	assert(subaddr)
-
 PERL_CALLCONV void	Perl_new_collate(pTHX_ const char* newcoll);
-PERL_CALLCONV void	Perl_new_ctype(pTHX_ const char* newctype)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_new_ctype(pTHX_ const char* newctype);
 #define PERL_ARGS_ASSERT_NEW_CTYPE	\
 	assert(newctype)
-
 PERL_CALLCONV void	Perl_new_numeric(pTHX_ const char* newcoll);
 PERL_CALLCONV PERL_SI*	Perl_new_stackinfo(pTHX_ I32 stitems, I32 cxitems)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV SV*	Perl_new_version(pTHX_ SV *ver)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_new_version(pTHX_ SV *ver);
 #define PERL_ARGS_ASSERT_NEW_VERSION	\
 	assert(ver)
-
 PERL_CALLCONV STRLEN *	Perl_new_warnings_bitfield(pTHX_ STRLEN *buffer, const char *const bits, STRLEN size)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEW_WARNINGS_BITFIELD	\
 	assert(bits)
 
-PERL_CALLCONV PerlIO*	Perl_nextargv(pTHX_ GV* gv, bool nomagicopen)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PerlIO*	Perl_nextargv(pTHX_ GV* gv, bool nomagicopen);
 #define PERL_ARGS_ASSERT_NEXTARGV	\
 	assert(gv)
-
 PERL_CALLCONV char*	Perl_ninstr(const char* big, const char* bigend, const char* little, const char* lend)
-			__attribute__pure__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2)
-			__attribute__nonnull__(3)
-			__attribute__nonnull__(4);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_NINSTR	\
 	assert(big); assert(bigend); assert(little); assert(lend)
 
 PERL_CALLCONV_NO_RET void	Perl_noperl_die(const char* pat, ...)
 			__attribute__noreturn__
-			__attribute__format__(__printf__,1,2)
-			__attribute__nonnull__(1);
+			__attribute__format__(__printf__,1,2);
 #define PERL_ARGS_ASSERT_NOPERL_DIE	\
 	assert(pat)
 
 PERL_CALLCONV int	Perl_nothreadhook(pTHX);
 PERL_CALLCONV OP*	Perl_oopsAV(pTHX_ OP* o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_OOPSAV	\
 	assert(o)
 
 PERL_CALLCONV OP*	Perl_oopsHV(pTHX_ OP* o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_OOPSHV	\
 	assert(o)
 
 PERL_CALLCONV OP*	Perl_op_append_elem(pTHX_ I32 optype, OP* first, OP* last);
 PERL_CALLCONV OP*	Perl_op_append_list(pTHX_ I32 optype, OP* first, OP* last);
-PERL_CALLCONV void	Perl_op_clear(pTHX_ OP* o)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_op_clear(pTHX_ OP* o);
 #define PERL_ARGS_ASSERT_OP_CLEAR	\
 	assert(o)
-
-PERL_CALLCONV OP*	Perl_op_contextualize(pTHX_ OP* o, I32 context)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV OP*	Perl_op_contextualize(pTHX_ OP* o, I32 context);
 #define PERL_ARGS_ASSERT_OP_CONTEXTUALIZE	\
 	assert(o)
-
 PERL_CALLCONV OP*	Perl_op_convert_list(pTHX_ I32 optype, I32 flags, OP* o)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV void	Perl_op_dump(pTHX_ const OP *o)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_op_dump(pTHX_ const OP *o);
 #define PERL_ARGS_ASSERT_OP_DUMP	\
 	assert(o)
-
 PERL_CALLCONV void	Perl_op_free(pTHX_ OP* arg);
-PERL_CALLCONV OP*	Perl_op_linklist(pTHX_ OP *o)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV OP*	Perl_op_linklist(pTHX_ OP *o);
 #define PERL_ARGS_ASSERT_OP_LINKLIST	\
 	assert(o)
-
 /* PERL_CALLCONV OP*	op_lvalue(pTHX_ OP* o, I32 type); */
 PERL_CALLCONV OP*	Perl_op_lvalue_flags(pTHX_ OP* o, I32 type, U32 flags);
-PERL_CALLCONV void	Perl_op_null(pTHX_ OP* o)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_op_null(pTHX_ OP* o);
 #define PERL_ARGS_ASSERT_OP_NULL	\
 	assert(o)
-
 PERL_CALLCONV OP*	Perl_op_prepend_elem(pTHX_ I32 optype, OP* first, OP* last);
 PERL_CALLCONV void	Perl_op_refcnt_lock(pTHX);
 PERL_CALLCONV void	Perl_op_refcnt_unlock(pTHX);
 PERL_CALLCONV OP*	Perl_op_scope(pTHX_ OP* o);
 PERL_CALLCONV OP*	Perl_op_sibling_splice(OP *parent, OP *start, int del_count, OP* insert);
 PERL_CALLCONV OP*	Perl_op_unscope(pTHX_ OP* o);
-PERL_CALLCONV void	Perl_pack_cat(pTHX_ SV *cat, const char *pat, const char *patend, SV **beglist, SV **endlist, SV ***next_in_list, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5)
-			__attribute__nonnull__(pTHX_6);
+PERL_CALLCONV void	Perl_pack_cat(pTHX_ SV *cat, const char *pat, const char *patend, SV **beglist, SV **endlist, SV ***next_in_list, U32 flags);
 #define PERL_ARGS_ASSERT_PACK_CAT	\
 	assert(cat); assert(pat); assert(patend); assert(beglist); assert(endlist); assert(next_in_list)
-
-PERL_CALLCONV void	Perl_package(pTHX_ OP* o)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_package(pTHX_ OP* o);
 #define PERL_ARGS_ASSERT_PACKAGE	\
 	assert(o)
-
-PERL_CALLCONV void	Perl_package_version(pTHX_ OP* v)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_package_version(pTHX_ OP* v);
 #define PERL_ARGS_ASSERT_PACKAGE_VERSION	\
 	assert(v)
-
-PERL_CALLCONV void	Perl_packlist(pTHX_ SV *cat, const char *pat, const char *patend, SV **beglist, SV **endlist)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+PERL_CALLCONV void	Perl_packlist(pTHX_ SV *cat, const char *pat, const char *patend, SV **beglist, SV **endlist);
 #define PERL_ARGS_ASSERT_PACKLIST	\
 	assert(cat); assert(pat); assert(patend); assert(beglist); assert(endlist)
-
-PERL_CALLCONV PADOFFSET	Perl_pad_add_anon(pTHX_ CV* func, I32 optype)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PADOFFSET	Perl_pad_add_anon(pTHX_ CV* func, I32 optype);
 #define PERL_ARGS_ASSERT_PAD_ADD_ANON	\
 	assert(func)
-
-PERL_CALLCONV PADOFFSET	Perl_pad_add_name_pv(pTHX_ const char *name, const U32 flags, HV *typestash, HV *ourstash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PADOFFSET	Perl_pad_add_name_pv(pTHX_ const char *name, const U32 flags, HV *typestash, HV *ourstash);
 #define PERL_ARGS_ASSERT_PAD_ADD_NAME_PV	\
 	assert(name)
-
-PERL_CALLCONV PADOFFSET	Perl_pad_add_name_pvn(pTHX_ const char *namepv, STRLEN namelen, U32 flags, HV *typestash, HV *ourstash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PADOFFSET	Perl_pad_add_name_pvn(pTHX_ const char *namepv, STRLEN namelen, U32 flags, HV *typestash, HV *ourstash);
 #define PERL_ARGS_ASSERT_PAD_ADD_NAME_PVN	\
 	assert(namepv)
-
-PERL_CALLCONV PADOFFSET	Perl_pad_add_name_sv(pTHX_ SV *name, U32 flags, HV *typestash, HV *ourstash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PADOFFSET	Perl_pad_add_name_sv(pTHX_ SV *name, U32 flags, HV *typestash, HV *ourstash);
 #define PERL_ARGS_ASSERT_PAD_ADD_NAME_SV	\
 	assert(name)
-
-PERL_CALLCONV void	Perl_pad_add_weakref(pTHX_ CV* func)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_pad_add_weakref(pTHX_ CV* func);
 #define PERL_ARGS_ASSERT_PAD_ADD_WEAKREF	\
 	assert(func)
-
 PERL_CALLCONV PADOFFSET	Perl_pad_alloc(pTHX_ I32 optype, U32 tmptype);
 PERL_CALLCONV void	Perl_pad_block_start(pTHX_ int full);
 PERL_CALLCONV HV*	Perl_pad_compname_type(pTHX_ const PADOFFSET po)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV PADOFFSET	Perl_pad_findmy_pv(pTHX_ const char* name, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PADOFFSET	Perl_pad_findmy_pv(pTHX_ const char* name, U32 flags);
 #define PERL_ARGS_ASSERT_PAD_FINDMY_PV	\
 	assert(name)
-
-PERL_CALLCONV PADOFFSET	Perl_pad_findmy_pvn(pTHX_ const char* namepv, STRLEN namelen, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PADOFFSET	Perl_pad_findmy_pvn(pTHX_ const char* namepv, STRLEN namelen, U32 flags);
 #define PERL_ARGS_ASSERT_PAD_FINDMY_PVN	\
 	assert(namepv)
-
-PERL_CALLCONV PADOFFSET	Perl_pad_findmy_sv(pTHX_ SV* name, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PADOFFSET	Perl_pad_findmy_sv(pTHX_ SV* name, U32 flags);
 #define PERL_ARGS_ASSERT_PAD_FINDMY_SV	\
 	assert(name)
-
-PERL_CALLCONV void	Perl_pad_fixup_inner_anons(pTHX_ PADLIST *padlist, CV *old_cv, CV *new_cv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_pad_fixup_inner_anons(pTHX_ PADLIST *padlist, CV *old_cv, CV *new_cv);
 #define PERL_ARGS_ASSERT_PAD_FIXUP_INNER_ANONS	\
 	assert(padlist); assert(old_cv); assert(new_cv)
-
 PERL_CALLCONV void	Perl_pad_free(pTHX_ PADOFFSET po);
 PERL_CALLCONV OP *	Perl_pad_leavemy(pTHX);
 PERL_CALLCONV PADLIST*	Perl_pad_new(pTHX_ int flags)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV void	Perl_pad_push(pTHX_ PADLIST *padlist, int depth)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_pad_push(pTHX_ PADLIST *padlist, int depth);
 #define PERL_ARGS_ASSERT_PAD_PUSH	\
 	assert(padlist)
-
 PERL_CALLCONV void	Perl_pad_swipe(pTHX_ PADOFFSET po, bool refadjust);
 PERL_CALLCONV void	Perl_pad_tidy(pTHX_ padtidy_type type);
-PERL_CALLCONV PAD **	Perl_padlist_store(pTHX_ PADLIST *padlist, I32 key, PAD *val)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PAD **	Perl_padlist_store(pTHX_ PADLIST *padlist, I32 key, PAD *val);
 #define PERL_ARGS_ASSERT_PADLIST_STORE	\
 	assert(padlist)
-
-PERL_CALLCONV void	Perl_padname_free(pTHX_ PADNAME *pn)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_padname_free(pTHX_ PADNAME *pn);
 #define PERL_ARGS_ASSERT_PADNAME_FREE	\
 	assert(pn)
-
 PERL_CALLCONV PADNAME *	Perl_padnamelist_fetch(PADNAMELIST *pnl, SSize_t key)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_PADNAMELIST_FETCH	\
 	assert(pnl)
 
-PERL_CALLCONV void	Perl_padnamelist_free(pTHX_ PADNAMELIST *pnl)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_padnamelist_free(pTHX_ PADNAMELIST *pnl);
 #define PERL_ARGS_ASSERT_PADNAMELIST_FREE	\
 	assert(pnl)
-
-PERL_CALLCONV PADNAME **	Perl_padnamelist_store(pTHX_ PADNAMELIST *pnl, SSize_t key, PADNAME *val)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PADNAME **	Perl_padnamelist_store(pTHX_ PADNAMELIST *pnl, SSize_t key, PADNAME *val);
 #define PERL_ARGS_ASSERT_PADNAMELIST_STORE	\
 	assert(pnl)
-
 PERL_CALLCONV OP*	Perl_parse_arithexpr(pTHX_ U32 flags);
 PERL_CALLCONV OP*	Perl_parse_barestmt(pTHX_ U32 flags);
 PERL_CALLCONV OP*	Perl_parse_block(pTHX_ U32 flags);
@@ -3404,87 +2394,55 @@ PERL_CALLCONV OP *	Perl_parse_subsignature(pTHX)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV OP*	Perl_parse_termexpr(pTHX_ U32 flags);
-PERL_CALLCONV U32	Perl_parse_unicode_opts(pTHX_ const char **popt)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV U32	Perl_parse_unicode_opts(pTHX_ const char **popt);
 #define PERL_ARGS_ASSERT_PARSE_UNICODE_OPTS	\
 	assert(popt)
-
-PERL_CALLCONV void	Perl_parser_free(pTHX_ const yy_parser *parser)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_parser_free(pTHX_ const yy_parser *parser);
 #define PERL_ARGS_ASSERT_PARSER_FREE	\
 	assert(parser)
-
 PERL_CALLCONV void	Perl_peep(pTHX_ OP* o);
 PERL_CALLCONV PerlInterpreter*	perl_alloc(void);
-PERL_CALLCONV void	perl_construct(PerlInterpreter *my_perl)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void	perl_construct(PerlInterpreter *my_perl);
 #define PERL_ARGS_ASSERT_PERL_CONSTRUCT	\
 	assert(my_perl)
-
-PERL_CALLCONV int	perl_destruct(PerlInterpreter *my_perl)
-			__attribute__nonnull__(1);
+PERL_CALLCONV int	perl_destruct(PerlInterpreter *my_perl);
 #define PERL_ARGS_ASSERT_PERL_DESTRUCT	\
 	assert(my_perl)
-
-PERL_CALLCONV void	perl_free(PerlInterpreter *my_perl)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void	perl_free(PerlInterpreter *my_perl);
 #define PERL_ARGS_ASSERT_PERL_FREE	\
 	assert(my_perl)
-
-PERL_CALLCONV int	perl_parse(PerlInterpreter *my_perl, XSINIT_t xsinit, int argc, char** argv, char** env)
-			__attribute__nonnull__(1);
+PERL_CALLCONV int	perl_parse(PerlInterpreter *my_perl, XSINIT_t xsinit, int argc, char** argv, char** env);
 #define PERL_ARGS_ASSERT_PERL_PARSE	\
 	assert(my_perl)
-
-PERL_CALLCONV int	perl_run(PerlInterpreter *my_perl)
-			__attribute__nonnull__(1);
+PERL_CALLCONV int	perl_run(PerlInterpreter *my_perl);
 #define PERL_ARGS_ASSERT_PERL_RUN	\
 	assert(my_perl)
-
 PERL_CALLCONV void	Perl_pmop_dump(pTHX_ PMOP* pm);
-PERL_CALLCONV OP*	Perl_pmruntime(pTHX_ OP *o, OP *expr, OP *repl, bool isreg, I32 floor)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV OP*	Perl_pmruntime(pTHX_ OP *o, OP *expr, OP *repl, bool isreg, I32 floor);
 #define PERL_ARGS_ASSERT_PMRUNTIME	\
 	assert(o); assert(expr)
-
 PERL_CALLCONV void	Perl_pop_scope(pTHX);
-PERL_CALLCONV void	Perl_populate_isa(pTHX_ const char *name, STRLEN len, ...)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_populate_isa(pTHX_ const char *name, STRLEN len, ...);
 #define PERL_ARGS_ASSERT_POPULATE_ISA	\
 	assert(name)
-
-PERL_CALLCONV REGEXP*	Perl_pregcomp(pTHX_ SV * const pattern, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV REGEXP*	Perl_pregcomp(pTHX_ SV * const pattern, const U32 flags);
 #define PERL_ARGS_ASSERT_PREGCOMP	\
 	assert(pattern)
-
-PERL_CALLCONV I32	Perl_pregexec(pTHX_ REGEXP * const prog, char* stringarg, char* strend, char* strbeg, SSize_t minend, SV* screamer, U32 nosave)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_6);
+PERL_CALLCONV I32	Perl_pregexec(pTHX_ REGEXP * const prog, char* stringarg, char* strend, char* strbeg, SSize_t minend, SV* screamer, U32 nosave);
 #define PERL_ARGS_ASSERT_PREGEXEC	\
 	assert(prog); assert(stringarg); assert(strend); assert(strbeg); assert(screamer)
-
 PERL_CALLCONV void	Perl_pregfree(pTHX_ REGEXP* r);
-PERL_CALLCONV void	Perl_pregfree2(pTHX_ REGEXP *rx)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_pregfree2(pTHX_ REGEXP *rx);
 #define PERL_ARGS_ASSERT_PREGFREE2	\
 	assert(rx)
-
-PERL_CALLCONV const char*	Perl_prescan_version(pTHX_ const char *s, bool strict, const char** errstr, bool *sqv, int *ssaw_decimal, int *swidth, bool *salpha)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV const char*	Perl_prescan_version(pTHX_ const char *s, bool strict, const char** errstr, bool *sqv, int *ssaw_decimal, int *swidth, bool *salpha);
 #define PERL_ARGS_ASSERT_PRESCAN_VERSION	\
 	assert(s)
-
 PERL_CALLCONV void	Perl_ptr_table_clear(pTHX_ PTR_TBL_t *const tbl)
 			__attribute__deprecated__;
 
 PERL_CALLCONV void*	Perl_ptr_table_fetch(pTHX_ PTR_TBL_t *const tbl, const void *const sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_PTR_TABLE_FETCH	\
 	assert(tbl)
 
@@ -3493,256 +2451,156 @@ PERL_CALLCONV PTR_TBL_t*	Perl_ptr_table_new(pTHX)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV void	Perl_ptr_table_split(pTHX_ PTR_TBL_t *const tbl)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_ptr_table_split(pTHX_ PTR_TBL_t *const tbl);
 #define PERL_ARGS_ASSERT_PTR_TABLE_SPLIT	\
 	assert(tbl)
-
-PERL_CALLCONV void	Perl_ptr_table_store(pTHX_ PTR_TBL_t *const tbl, const void *const oldsv, void *const newsv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_ptr_table_store(pTHX_ PTR_TBL_t *const tbl, const void *const oldsv, void *const newsv);
 #define PERL_ARGS_ASSERT_PTR_TABLE_STORE	\
 	assert(tbl); assert(newsv)
-
 PERL_CALLCONV void	Perl_push_scope(pTHX);
-PERL_CALLCONV char*	Perl_pv_display(pTHX_ SV *dsv, const char *pv, STRLEN cur, STRLEN len, STRLEN pvlim)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_pv_display(pTHX_ SV *dsv, const char *pv, STRLEN cur, STRLEN len, STRLEN pvlim);
 #define PERL_ARGS_ASSERT_PV_DISPLAY	\
 	assert(dsv); assert(pv)
-
-PERL_CALLCONV char*	Perl_pv_escape(pTHX_ SV *dsv, char const * const str, const STRLEN count, const STRLEN max, STRLEN * const escaped, const U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_pv_escape(pTHX_ SV *dsv, char const * const str, const STRLEN count, const STRLEN max, STRLEN * const escaped, const U32 flags);
 #define PERL_ARGS_ASSERT_PV_ESCAPE	\
 	assert(str)
-
-PERL_CALLCONV char*	Perl_pv_pretty(pTHX_ SV *dsv, char const * const str, const STRLEN count, const STRLEN max, char const * const start_color, char const * const end_color, const U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_pv_pretty(pTHX_ SV *dsv, char const * const str, const STRLEN count, const STRLEN max, char const * const start_color, char const * const end_color, const U32 flags);
 #define PERL_ARGS_ASSERT_PV_PRETTY	\
 	assert(dsv); assert(str)
-
-PERL_CALLCONV char*	Perl_pv_uni_display(pTHX_ SV *dsv, const U8 *spv, STRLEN len, STRLEN pvlim, UV flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_pv_uni_display(pTHX_ SV *dsv, const U8 *spv, STRLEN len, STRLEN pvlim, UV flags);
 #define PERL_ARGS_ASSERT_PV_UNI_DISPLAY	\
 	assert(dsv); assert(spv)
-
-PERL_CALLCONV void	Perl_qerror(pTHX_ SV* err)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_qerror(pTHX_ SV* err);
 #define PERL_ARGS_ASSERT_QERROR	\
 	assert(err)
-
-PERL_CALLCONV REGEXP*	Perl_re_compile(pTHX_ SV * const pattern, U32 orig_rx_flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV REGEXP*	Perl_re_compile(pTHX_ SV * const pattern, U32 orig_rx_flags);
 #define PERL_ARGS_ASSERT_RE_COMPILE	\
 	assert(pattern)
-
-PERL_CALLCONV char*	Perl_re_intuit_start(pTHX_ REGEXP * const rx, SV* sv, const char* const strbeg, char* strpos, char* strend, const U32 flags, re_scream_pos_data *data)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+PERL_CALLCONV char*	Perl_re_intuit_start(pTHX_ REGEXP * const rx, SV* sv, const char* const strbeg, char* strpos, char* strend, const U32 flags, re_scream_pos_data *data);
 #define PERL_ARGS_ASSERT_RE_INTUIT_START	\
 	assert(rx); assert(strbeg); assert(strpos); assert(strend)
-
-PERL_CALLCONV SV*	Perl_re_intuit_string(pTHX_ REGEXP  *const r)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_re_intuit_string(pTHX_ REGEXP  *const r);
 #define PERL_ARGS_ASSERT_RE_INTUIT_STRING	\
 	assert(r)
-
-PERL_CALLCONV REGEXP*	Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, OP *expr, const regexp_engine* eng, REGEXP *old_re, bool *is_bare_re, U32 rx_flags, U32 pm_flags)
-			__attribute__nonnull__(pTHX_4);
+PERL_CALLCONV REGEXP*	Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count, OP *expr, const regexp_engine* eng, REGEXP *old_re, bool *is_bare_re, U32 rx_flags, U32 pm_flags);
 #define PERL_ARGS_ASSERT_RE_OP_COMPILE	\
 	assert(eng)
-
 PERL_CALLCONV Malloc_t	Perl_realloc(Malloc_t where, MEM_SIZE nbytes)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV void	Perl_reentrant_free(pTHX);
 PERL_CALLCONV void	Perl_reentrant_init(pTHX);
-PERL_CALLCONV void*	Perl_reentrant_retry(const char *f, ...)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void*	Perl_reentrant_retry(const char *f, ...);
 #define PERL_ARGS_ASSERT_REENTRANT_RETRY	\
 	assert(f)
-
 PERL_CALLCONV void	Perl_reentrant_size(pTHX);
 /* PERL_CALLCONV OP*	Perl_ref(pTHX_ OP* o, I32 type); */
 PERL_CALLCONV HV *	Perl_refcounted_he_chain_2hv(pTHX_ const struct refcounted_he *c, U32 flags);
-PERL_CALLCONV SV *	Perl_refcounted_he_fetch_pv(pTHX_ const struct refcounted_he *chain, const char *key, U32 hash, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV *	Perl_refcounted_he_fetch_pv(pTHX_ const struct refcounted_he *chain, const char *key, U32 hash, U32 flags);
 #define PERL_ARGS_ASSERT_REFCOUNTED_HE_FETCH_PV	\
 	assert(key)
-
-PERL_CALLCONV SV *	Perl_refcounted_he_fetch_pvn(pTHX_ const struct refcounted_he *chain, const char *keypv, STRLEN keylen, U32 hash, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV *	Perl_refcounted_he_fetch_pvn(pTHX_ const struct refcounted_he *chain, const char *keypv, STRLEN keylen, U32 hash, U32 flags);
 #define PERL_ARGS_ASSERT_REFCOUNTED_HE_FETCH_PVN	\
 	assert(keypv)
-
-PERL_CALLCONV SV *	Perl_refcounted_he_fetch_sv(pTHX_ const struct refcounted_he *chain, SV *key, U32 hash, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV *	Perl_refcounted_he_fetch_sv(pTHX_ const struct refcounted_he *chain, SV *key, U32 hash, U32 flags);
 #define PERL_ARGS_ASSERT_REFCOUNTED_HE_FETCH_SV	\
 	assert(key)
-
 PERL_CALLCONV void	Perl_refcounted_he_free(pTHX_ struct refcounted_he *he);
 PERL_CALLCONV struct refcounted_he *	Perl_refcounted_he_inc(pTHX_ struct refcounted_he *he);
-PERL_CALLCONV struct refcounted_he *	Perl_refcounted_he_new_pv(pTHX_ struct refcounted_he *parent, const char *key, U32 hash, SV *value, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV struct refcounted_he *	Perl_refcounted_he_new_pv(pTHX_ struct refcounted_he *parent, const char *key, U32 hash, SV *value, U32 flags);
 #define PERL_ARGS_ASSERT_REFCOUNTED_HE_NEW_PV	\
 	assert(key)
-
-PERL_CALLCONV struct refcounted_he *	Perl_refcounted_he_new_pvn(pTHX_ struct refcounted_he *parent, const char *keypv, STRLEN keylen, U32 hash, SV *value, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV struct refcounted_he *	Perl_refcounted_he_new_pvn(pTHX_ struct refcounted_he *parent, const char *keypv, STRLEN keylen, U32 hash, SV *value, U32 flags);
 #define PERL_ARGS_ASSERT_REFCOUNTED_HE_NEW_PVN	\
 	assert(keypv)
-
-PERL_CALLCONV struct refcounted_he *	Perl_refcounted_he_new_sv(pTHX_ struct refcounted_he *parent, SV *key, U32 hash, SV *value, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV struct refcounted_he *	Perl_refcounted_he_new_sv(pTHX_ struct refcounted_he *parent, SV *key, U32 hash, SV *value, U32 flags);
 #define PERL_ARGS_ASSERT_REFCOUNTED_HE_NEW_SV	\
 	assert(key)
-
-PERL_CALLCONV SV*	Perl_reg_named_buff(pTHX_ REGEXP * const rx, SV * const key, SV * const value, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_reg_named_buff(pTHX_ REGEXP * const rx, SV * const key, SV * const value, const U32 flags);
 #define PERL_ARGS_ASSERT_REG_NAMED_BUFF	\
 	assert(rx)
-
-PERL_CALLCONV SV*	Perl_reg_named_buff_all(pTHX_ REGEXP * const rx, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_reg_named_buff_all(pTHX_ REGEXP * const rx, const U32 flags);
 #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_ALL	\
 	assert(rx)
-
-PERL_CALLCONV bool	Perl_reg_named_buff_exists(pTHX_ REGEXP * const rx, SV * const key, const U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV bool	Perl_reg_named_buff_exists(pTHX_ REGEXP * const rx, SV * const key, const U32 flags);
 #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_EXISTS	\
 	assert(rx); assert(key)
-
-PERL_CALLCONV SV*	Perl_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const namesv, const U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV*	Perl_reg_named_buff_fetch(pTHX_ REGEXP * const rx, SV * const namesv, const U32 flags);
 #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_FETCH	\
 	assert(rx); assert(namesv)
-
-PERL_CALLCONV SV*	Perl_reg_named_buff_firstkey(pTHX_ REGEXP * const rx, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_reg_named_buff_firstkey(pTHX_ REGEXP * const rx, const U32 flags);
 #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_FIRSTKEY	\
 	assert(rx)
-
-PERL_CALLCONV SV*	Perl_reg_named_buff_iter(pTHX_ REGEXP * const rx, const SV * const lastkey, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_reg_named_buff_iter(pTHX_ REGEXP * const rx, const SV * const lastkey, const U32 flags);
 #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_ITER	\
 	assert(rx)
-
-PERL_CALLCONV SV*	Perl_reg_named_buff_nextkey(pTHX_ REGEXP * const rx, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_reg_named_buff_nextkey(pTHX_ REGEXP * const rx, const U32 flags);
 #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_NEXTKEY	\
 	assert(rx)
-
-PERL_CALLCONV SV*	Perl_reg_named_buff_scalar(pTHX_ REGEXP * const rx, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_reg_named_buff_scalar(pTHX_ REGEXP * const rx, const U32 flags);
 #define PERL_ARGS_ASSERT_REG_NAMED_BUFF_SCALAR	\
 	assert(rx)
-
-PERL_CALLCONV void	Perl_reg_numbered_buff_fetch(pTHX_ REGEXP * const rx, const I32 paren, SV * const sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_reg_numbered_buff_fetch(pTHX_ REGEXP * const rx, const I32 paren, SV * const sv);
 #define PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_FETCH	\
 	assert(rx)
-
-PERL_CALLCONV I32	Perl_reg_numbered_buff_length(pTHX_ REGEXP * const rx, const SV * const sv, const I32 paren)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV I32	Perl_reg_numbered_buff_length(pTHX_ REGEXP * const rx, const SV * const sv, const I32 paren);
 #define PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_LENGTH	\
 	assert(rx); assert(sv)
-
-PERL_CALLCONV void	Perl_reg_numbered_buff_store(pTHX_ REGEXP * const rx, const I32 paren, SV const * const value)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_reg_numbered_buff_store(pTHX_ REGEXP * const rx, const I32 paren, SV const * const value);
 #define PERL_ARGS_ASSERT_REG_NUMBERED_BUFF_STORE	\
 	assert(rx)
-
-PERL_CALLCONV SV*	Perl_reg_qr_package(pTHX_ REGEXP * const rx)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_reg_qr_package(pTHX_ REGEXP * const rx);
 #define PERL_ARGS_ASSERT_REG_QR_PACKAGE	\
 	assert(rx)
-
-PERL_CALLCONV REGEXP*	Perl_reg_temp_copy(pTHX_ REGEXP* ret_x, REGEXP* rx)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV REGEXP*	Perl_reg_temp_copy(pTHX_ REGEXP* ret_x, REGEXP* rx);
 #define PERL_ARGS_ASSERT_REG_TEMP_COPY	\
 	assert(rx)
-
-PERL_CALLCONV SV*	Perl_regclass_swash(pTHX_ const regexp *prog, const struct regnode *node, bool doinit, SV **listsvp, SV **altsvp)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV*	Perl_regclass_swash(pTHX_ const regexp *prog, const struct regnode *node, bool doinit, SV **listsvp, SV **altsvp);
 #define PERL_ARGS_ASSERT_REGCLASS_SWASH	\
 	assert(node)
-
-PERL_CALLCONV void	Perl_regdump(pTHX_ const regexp* r)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_regdump(pTHX_ const regexp* r);
 #define PERL_ARGS_ASSERT_REGDUMP	\
 	assert(r)
-
-PERL_CALLCONV I32	Perl_regexec_flags(pTHX_ REGEXP *const rx, char *stringarg, char *strend, char *strbeg, SSize_t minend, SV *sv, void *data, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_6);
+PERL_CALLCONV I32	Perl_regexec_flags(pTHX_ REGEXP *const rx, char *stringarg, char *strend, char *strbeg, SSize_t minend, SV *sv, void *data, U32 flags);
 #define PERL_ARGS_ASSERT_REGEXEC_FLAGS	\
 	assert(rx); assert(stringarg); assert(strend); assert(strbeg); assert(sv)
-
-PERL_CALLCONV void	Perl_regfree_internal(pTHX_ REGEXP *const rx)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_regfree_internal(pTHX_ REGEXP *const rx);
 #define PERL_ARGS_ASSERT_REGFREE_INTERNAL	\
 	assert(rx)
-
 PERL_CALLCONV void	Perl_reginitcolors(pTHX);
 PERL_CALLCONV regnode*	Perl_regnext(pTHX_ regnode* p)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV void	Perl_repeatcpy(char* to, const char* from, I32 len, IV count)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+PERL_CALLCONV void	Perl_repeatcpy(char* to, const char* from, I32 len, IV count);
 #define PERL_ARGS_ASSERT_REPEATCPY	\
 	assert(to); assert(from)
-
 PERL_CALLCONV void	Perl_report_evil_fh(pTHX_ const GV *gv);
 PERL_CALLCONV void	Perl_report_uninit(pTHX_ const SV *uninit_sv);
 PERL_CALLCONV void	Perl_report_wrongway_fh(pTHX_ const GV *gv, const char have);
-PERL_CALLCONV void	Perl_require_pv(pTHX_ const char* pv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_require_pv(pTHX_ const char* pv);
 #define PERL_ARGS_ASSERT_REQUIRE_PV	\
 	assert(pv)
-
 PERL_CALLCONV char*	Perl_rninstr(const char* big, const char* bigend, const char* little, const char* lend)
-			__attribute__pure__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2)
-			__attribute__nonnull__(3)
-			__attribute__nonnull__(4);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_RNINSTR	\
 	assert(big); assert(bigend); assert(little); assert(lend)
 
 PERL_CALLCONV void	Perl_rpeep(pTHX_ OP* o);
 PERL_CALLCONV Sighandler_t	Perl_rsignal(pTHX_ int i, Sighandler_t t);
 PERL_CALLCONV int	Perl_rsignal_restore(pTHX_ int i, Sigsave_t* t);
-PERL_CALLCONV int	Perl_rsignal_save(pTHX_ int i, Sighandler_t t1, Sigsave_t* save)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV int	Perl_rsignal_save(pTHX_ int i, Sighandler_t t1, Sigsave_t* save);
 #define PERL_ARGS_ASSERT_RSIGNAL_SAVE	\
 	assert(save)
-
 PERL_CALLCONV Sighandler_t	Perl_rsignal_state(pTHX_ int i);
 PERL_CALLCONV int	Perl_runops_debug(pTHX);
 PERL_CALLCONV int	Perl_runops_standard(pTHX);
-PERL_CALLCONV CV*	Perl_rv2cv_op_cv(pTHX_ OP *cvop, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV CV*	Perl_rv2cv_op_cv(pTHX_ OP *cvop, U32 flags);
 #define PERL_ARGS_ASSERT_RV2CV_OP_CV	\
 	assert(cvop)
-
-PERL_CALLCONV void	Perl_rxres_save(pTHX_ void **rsp, REGEXP *rx)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_rxres_save(pTHX_ void **rsp, REGEXP *rx);
 #define PERL_ARGS_ASSERT_RXRES_SAVE	\
 	assert(rsp); assert(rx)
-
 PERL_CALLCONV Malloc_t	Perl_safesyscalloc(MEM_SIZE elements, MEM_SIZE size)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
@@ -3756,202 +2614,119 @@ PERL_CALLCONV Malloc_t	Perl_safesysrealloc(Malloc_t where, MEM_SIZE nbytes)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV void	Perl_save_I16(pTHX_ I16* intp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_I16(pTHX_ I16* intp);
 #define PERL_ARGS_ASSERT_SAVE_I16	\
 	assert(intp)
-
-PERL_CALLCONV void	Perl_save_I32(pTHX_ I32* intp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_I32(pTHX_ I32* intp);
 #define PERL_ARGS_ASSERT_SAVE_I32	\
 	assert(intp)
-
-PERL_CALLCONV void	Perl_save_I8(pTHX_ I8* bytep)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_I8(pTHX_ I8* bytep);
 #define PERL_ARGS_ASSERT_SAVE_I8	\
 	assert(bytep)
-
-PERL_CALLCONV void	Perl_save_adelete(pTHX_ AV *av, SSize_t key)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_adelete(pTHX_ AV *av, SSize_t key);
 #define PERL_ARGS_ASSERT_SAVE_ADELETE	\
 	assert(av)
-
-/* PERL_CALLCONV void	Perl_save_aelem(pTHX_ AV* av, SSize_t idx, SV **sptr)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3); */
-
-PERL_CALLCONV void	Perl_save_aelem_flags(pTHX_ AV* av, SSize_t idx, SV **sptr, const U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+/* PERL_CALLCONV void	Perl_save_aelem(pTHX_ AV* av, SSize_t idx, SV **sptr); */
+PERL_CALLCONV void	Perl_save_aelem_flags(pTHX_ AV* av, SSize_t idx, SV **sptr, const U32 flags);
 #define PERL_ARGS_ASSERT_SAVE_AELEM_FLAGS	\
 	assert(av); assert(sptr)
-
-PERL_CALLCONV void	Perl_save_aliased_sv(pTHX_ GV* gv)
-			__attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_SAVE_ALIASED_SV	\
-	assert(gv)
-
 PERL_CALLCONV I32	Perl_save_alloc(pTHX_ I32 size, I32 pad);
-PERL_CALLCONV void	Perl_save_aptr(pTHX_ AV** aptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_aptr(pTHX_ AV** aptr);
 #define PERL_ARGS_ASSERT_SAVE_APTR	\
 	assert(aptr)
-
-PERL_CALLCONV AV*	Perl_save_ary(pTHX_ GV* gv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV AV*	Perl_save_ary(pTHX_ GV* gv);
 #define PERL_ARGS_ASSERT_SAVE_ARY	\
 	assert(gv)
-
-PERL_CALLCONV void	Perl_save_bool(pTHX_ bool* boolp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_bool(pTHX_ bool* boolp);
 #define PERL_ARGS_ASSERT_SAVE_BOOL	\
 	assert(boolp)
-
-PERL_CALLCONV void	Perl_save_clearsv(pTHX_ SV** svp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_clearsv(pTHX_ SV** svp);
 #define PERL_ARGS_ASSERT_SAVE_CLEARSV	\
 	assert(svp)
-
-PERL_CALLCONV void	Perl_save_delete(pTHX_ HV *hv, char *key, I32 klen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_save_delete(pTHX_ HV *hv, char *key, I32 klen);
 #define PERL_ARGS_ASSERT_SAVE_DELETE	\
 	assert(hv); assert(key)
-
-PERL_CALLCONV void	Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void* p)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_save_destructor(pTHX_ DESTRUCTORFUNC_NOCONTEXT_t f, void* p);
 #define PERL_ARGS_ASSERT_SAVE_DESTRUCTOR	\
 	assert(p)
-
 PERL_CALLCONV void	Perl_save_destructor_x(pTHX_ DESTRUCTORFUNC_t f, void* p);
 /* PERL_CALLCONV void	Perl_save_freeop(pTHX_ OP* o); */
 /* PERL_CALLCONV void	Perl_save_freepv(pTHX_ char* pv); */
 /* PERL_CALLCONV void	Perl_save_freesv(pTHX_ SV* sv); */
-PERL_CALLCONV void	Perl_save_generic_pvref(pTHX_ char** str)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_generic_pvref(pTHX_ char** str);
 #define PERL_ARGS_ASSERT_SAVE_GENERIC_PVREF	\
 	assert(str)
-
-PERL_CALLCONV void	Perl_save_generic_svref(pTHX_ SV** sptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_generic_svref(pTHX_ SV** sptr);
 #define PERL_ARGS_ASSERT_SAVE_GENERIC_SVREF	\
 	assert(sptr)
-
-PERL_CALLCONV void	Perl_save_gp(pTHX_ GV* gv, I32 empty)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_gp(pTHX_ GV* gv, I32 empty);
 #define PERL_ARGS_ASSERT_SAVE_GP	\
 	assert(gv)
-
-PERL_CALLCONV HV*	Perl_save_hash(pTHX_ GV* gv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV HV*	Perl_save_hash(pTHX_ GV* gv);
 #define PERL_ARGS_ASSERT_SAVE_HASH	\
 	assert(gv)
-
-PERL_CALLCONV void	Perl_save_hdelete(pTHX_ HV *hv, SV *keysv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_save_hdelete(pTHX_ HV *hv, SV *keysv);
 #define PERL_ARGS_ASSERT_SAVE_HDELETE	\
 	assert(hv); assert(keysv)
-
-/* PERL_CALLCONV void	Perl_save_helem(pTHX_ HV *hv, SV *key, SV **sptr)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3); */
-
-PERL_CALLCONV void	Perl_save_helem_flags(pTHX_ HV *hv, SV *key, SV **sptr, const U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+/* PERL_CALLCONV void	Perl_save_helem(pTHX_ HV *hv, SV *key, SV **sptr); */
+PERL_CALLCONV void	Perl_save_helem_flags(pTHX_ HV *hv, SV *key, SV **sptr, const U32 flags);
 #define PERL_ARGS_ASSERT_SAVE_HELEM_FLAGS	\
 	assert(hv); assert(key); assert(sptr)
-
 PERL_CALLCONV void	Perl_save_hints(pTHX);
-PERL_CALLCONV void	Perl_save_hptr(pTHX_ HV** hptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_hptr(pTHX_ HV** hptr);
 #define PERL_ARGS_ASSERT_SAVE_HPTR	\
 	assert(hptr)
-
-PERL_CALLCONV void	Perl_save_int(pTHX_ int* intp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_int(pTHX_ int* intp);
 #define PERL_ARGS_ASSERT_SAVE_INT	\
 	assert(intp)
-
-PERL_CALLCONV void	Perl_save_item(pTHX_ SV* item)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_item(pTHX_ SV* item);
 #define PERL_ARGS_ASSERT_SAVE_ITEM	\
 	assert(item)
-
-PERL_CALLCONV void	Perl_save_iv(pTHX_ IV *ivp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_iv(pTHX_ IV *ivp);
 #define PERL_ARGS_ASSERT_SAVE_IV	\
 	assert(ivp)
-
-PERL_CALLCONV void	Perl_save_list(pTHX_ SV** sarg, I32 maxsarg)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_list(pTHX_ SV** sarg, I32 maxsarg);
 #define PERL_ARGS_ASSERT_SAVE_LIST	\
 	assert(sarg)
-
-PERL_CALLCONV void	Perl_save_long(pTHX_ long* longp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_long(pTHX_ long* longp);
 #define PERL_ARGS_ASSERT_SAVE_LONG	\
 	assert(longp)
-
-/* PERL_CALLCONV void	Perl_save_mortalizesv(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV void	Perl_save_mortalizesv(pTHX_ SV* sv); */
 #define PERL_ARGS_ASSERT_SAVE_MORTALIZESV	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_save_nogv(pTHX_ GV* gv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_nogv(pTHX_ GV* gv);
 #define PERL_ARGS_ASSERT_SAVE_NOGV	\
 	assert(gv)
-
 /* PERL_CALLCONV void	Perl_save_op(pTHX); */
 PERL_CALLCONV void	Perl_save_padsv_and_mortalize(pTHX_ PADOFFSET off);
-PERL_CALLCONV void	Perl_save_pptr(pTHX_ char** pptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_pptr(pTHX_ char** pptr);
 #define PERL_ARGS_ASSERT_SAVE_PPTR	\
 	assert(pptr)
-
 PERL_CALLCONV void	Perl_save_pushi32ptr(pTHX_ const I32 i, void *const ptr, const int type);
 PERL_CALLCONV void	Perl_save_pushptr(pTHX_ void *const ptr, const int type);
 PERL_CALLCONV void	Perl_save_pushptrptr(pTHX_ void *const ptr1, void *const ptr2, const int type);
 PERL_CALLCONV void	Perl_save_re_context(pTHX);
-PERL_CALLCONV SV*	Perl_save_scalar(pTHX_ GV* gv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_save_scalar(pTHX_ GV* gv);
 #define PERL_ARGS_ASSERT_SAVE_SCALAR	\
 	assert(gv)
-
-PERL_CALLCONV void	Perl_save_set_svflags(pTHX_ SV *sv, U32 mask, U32 val)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_set_svflags(pTHX_ SV *sv, U32 mask, U32 val);
 #define PERL_ARGS_ASSERT_SAVE_SET_SVFLAGS	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_save_shared_pvref(pTHX_ char** str)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_shared_pvref(pTHX_ char** str);
 #define PERL_ARGS_ASSERT_SAVE_SHARED_PVREF	\
 	assert(str)
-
-PERL_CALLCONV void	Perl_save_sptr(pTHX_ SV** sptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_sptr(pTHX_ SV** sptr);
 #define PERL_ARGS_ASSERT_SAVE_SPTR	\
 	assert(sptr)
-
-PERL_CALLCONV void	Perl_save_strlen(pTHX_ STRLEN* ptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_strlen(pTHX_ STRLEN* ptr);
 #define PERL_ARGS_ASSERT_SAVE_STRLEN	\
 	assert(ptr)
-
-PERL_CALLCONV SV*	Perl_save_svref(pTHX_ SV** sptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_save_svref(pTHX_ SV** sptr);
 #define PERL_ARGS_ASSERT_SAVE_SVREF	\
 	assert(sptr)
-
-PERL_CALLCONV void	Perl_save_vptr(pTHX_ void *ptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_save_vptr(pTHX_ void *ptr);
 #define PERL_ARGS_ASSERT_SAVE_VPTR	\
 	assert(ptr)
-
 PERL_CALLCONV char*	Perl_savepv(pTHX_ const char* pv)
 			__attribute__malloc__
 			__attribute__warn_unused_result__;
@@ -3970,8 +2745,7 @@ PERL_CALLCONV char*	Perl_savesharedpvn(pTHX_ const char *const pv, const STRLEN
 
 PERL_CALLCONV char*	Perl_savesharedsvpv(pTHX_ SV *sv)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SAVESHAREDSVPV	\
 	assert(sv)
 
@@ -3979,465 +2753,292 @@ PERL_CALLCONV void	Perl_savestack_grow(pTHX);
 PERL_CALLCONV void	Perl_savestack_grow_cnt(pTHX_ I32 need);
 PERL_CALLCONV char*	Perl_savesvpv(pTHX_ SV* sv)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SAVESVPV	\
 	assert(sv)
 
+PERL_CALLCONV void	Perl_savetmps(pTHX);
 PERL_CALLCONV OP*	Perl_sawparens(pTHX_ OP* o);
 PERL_CALLCONV OP*	Perl_scalar(pTHX_ OP* o);
-PERL_CALLCONV OP*	Perl_scalarvoid(pTHX_ OP* o)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV OP*	Perl_scalarvoid(pTHX_ OP* o);
 #define PERL_ARGS_ASSERT_SCALARVOID	\
 	assert(o)
-
-PERL_CALLCONV NV	Perl_scan_bin(pTHX_ const char* start, STRLEN len, STRLEN* retlen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV NV	Perl_scan_bin(pTHX_ const char* start, STRLEN len, STRLEN* retlen);
 #define PERL_ARGS_ASSERT_SCAN_BIN	\
 	assert(start); assert(retlen)
-
-PERL_CALLCONV NV	Perl_scan_hex(pTHX_ const char* start, STRLEN len, STRLEN* retlen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV NV	Perl_scan_hex(pTHX_ const char* start, STRLEN len, STRLEN* retlen);
 #define PERL_ARGS_ASSERT_SCAN_HEX	\
 	assert(start); assert(retlen)
-
-PERL_CALLCONV char*	Perl_scan_num(pTHX_ const char* s, YYSTYPE *lvalp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_scan_num(pTHX_ const char* s, YYSTYPE *lvalp);
 #define PERL_ARGS_ASSERT_SCAN_NUM	\
 	assert(s); assert(lvalp)
-
-PERL_CALLCONV NV	Perl_scan_oct(pTHX_ const char* start, STRLEN len, STRLEN* retlen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV NV	Perl_scan_oct(pTHX_ const char* start, STRLEN len, STRLEN* retlen);
 #define PERL_ARGS_ASSERT_SCAN_OCT	\
 	assert(start); assert(retlen)
-
-PERL_CALLCONV const char*	Perl_scan_version(pTHX_ const char *s, SV *rv, bool qv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV const char*	Perl_scan_version(pTHX_ const char *s, SV *rv, bool qv);
 #define PERL_ARGS_ASSERT_SCAN_VERSION	\
 	assert(s); assert(rv)
-
-PERL_CALLCONV char*	Perl_scan_vstring(pTHX_ const char *s, const char *const e, SV *sv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV char*	Perl_scan_vstring(pTHX_ const char *s, const char *const e, SV *sv);
 #define PERL_ARGS_ASSERT_SCAN_VSTRING	\
 	assert(s); assert(e); assert(sv)
-
 PERL_CALLCONV U32	Perl_seed(pTHX);
 PERL_CALLCONV void	Perl_set_caret_X(pTHX);
-PERL_CALLCONV void	Perl_set_context(void *t)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void	Perl_set_context(void *t);
 #define PERL_ARGS_ASSERT_SET_CONTEXT	\
 	assert(t)
-
 PERL_CALLCONV void	Perl_set_numeric_local(pTHX);
 PERL_CALLCONV void	Perl_set_numeric_radix(pTHX);
 PERL_CALLCONV void	Perl_set_numeric_standard(pTHX);
-PERL_CALLCONV void	Perl_setdefout(pTHX_ GV* gv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_setdefout(pTHX_ GV* gv);
 #define PERL_ARGS_ASSERT_SETDEFOUT	\
 	assert(gv)
-
-PERL_CALLCONV HEK*	Perl_share_hek(pTHX_ const char* str, I32 len, U32 hash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV HEK*	Perl_share_hek(pTHX_ const char* str, I32 len, U32 hash);
 #define PERL_ARGS_ASSERT_SHARE_HEK	\
 	assert(str)
-
-PERL_CALLCONV void	Perl_sortsv(pTHX_ SV** array, size_t num_elts, SVCOMPARE_t cmp)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_sortsv(pTHX_ SV** array, size_t num_elts, SVCOMPARE_t cmp);
 #define PERL_ARGS_ASSERT_SORTSV	\
 	assert(cmp)
-
-PERL_CALLCONV void	Perl_sortsv_flags(pTHX_ SV** array, size_t num_elts, SVCOMPARE_t cmp, U32 flags)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_sortsv_flags(pTHX_ SV** array, size_t num_elts, SVCOMPARE_t cmp, U32 flags);
 #define PERL_ARGS_ASSERT_SORTSV_FLAGS	\
 	assert(cmp)
-
-PERL_CALLCONV SV**	Perl_stack_grow(pTHX_ SV** sp, SV** p, SSize_t n)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV**	Perl_stack_grow(pTHX_ SV** sp, SV** p, SSize_t n);
 #define PERL_ARGS_ASSERT_STACK_GROW	\
 	assert(sp); assert(p)
-
-PERL_CALLCONV PerlIO*	Perl_start_glob(pTHX_ SV *tmpglob, IO *io)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV PerlIO*	Perl_start_glob(pTHX_ SV *tmpglob, IO *io);
 #define PERL_ARGS_ASSERT_START_GLOB	\
 	assert(tmpglob); assert(io)
-
 PERL_CALLCONV I32	Perl_start_subparse(pTHX_ I32 is_format, U32 flags);
 PERL_CALLCONV NV	Perl_str_to_version(pTHX_ SV *sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_STR_TO_VERSION	\
 	assert(sv)
 
-PERL_CALLCONV void	Perl_sub_crush_depth(pTHX_ CV* cv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sub_crush_depth(pTHX_ CV* cv);
 #define PERL_ARGS_ASSERT_SUB_CRUSH_DEPTH	\
 	assert(cv)
-
-/* PERL_CALLCONV bool	sv_2bool(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1); */
-
-PERL_CALLCONV bool	Perl_sv_2bool_flags(pTHX_ SV *sv, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+/* PERL_CALLCONV bool	sv_2bool(pTHX_ SV *const sv); */
+PERL_CALLCONV bool	Perl_sv_2bool_flags(pTHX_ SV *sv, I32 flags);
 #define PERL_ARGS_ASSERT_SV_2BOOL_FLAGS	\
 	assert(sv)
-
-PERL_CALLCONV CV*	Perl_sv_2cv(pTHX_ SV* sv, HV **const st, GV **const gvp, const I32 lref)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV CV*	Perl_sv_2cv(pTHX_ SV* sv, HV **const st, GV **const gvp, const I32 lref);
 #define PERL_ARGS_ASSERT_SV_2CV	\
 	assert(st); assert(gvp)
-
-PERL_CALLCONV IO*	Perl_sv_2io(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV IO*	Perl_sv_2io(pTHX_ SV *const sv);
 #define PERL_ARGS_ASSERT_SV_2IO	\
 	assert(sv)
-
-/* PERL_CALLCONV IV	Perl_sv_2iv(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV IV	Perl_sv_2iv(pTHX_ SV *sv); */
 #define PERL_ARGS_ASSERT_SV_2IV	\
 	assert(sv)
-
-PERL_CALLCONV IV	Perl_sv_2iv_flags(pTHX_ SV *const sv, const I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV IV	Perl_sv_2iv_flags(pTHX_ SV *const sv, const I32 flags);
 #define PERL_ARGS_ASSERT_SV_2IV_FLAGS	\
 	assert(sv)
-
 PERL_CALLCONV SV*	Perl_sv_2mortal(pTHX_ SV *const sv);
-PERL_CALLCONV SV*	Perl_sv_2num(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_sv_2num(pTHX_ SV *const sv);
 #define PERL_ARGS_ASSERT_SV_2NUM	\
 	assert(sv)
-
-PERL_CALLCONV NV	Perl_sv_2nv_flags(pTHX_ SV *const sv, const I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV NV	Perl_sv_2nv_flags(pTHX_ SV *const sv, const I32 flags);
 #define PERL_ARGS_ASSERT_SV_2NV_FLAGS	\
 	assert(sv)
-
-/* PERL_CALLCONV char*	Perl_sv_2pv(pTHX_ SV *sv, STRLEN *lp)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV char*	Perl_sv_2pv(pTHX_ SV *sv, STRLEN *lp); */
 #define PERL_ARGS_ASSERT_SV_2PV	\
 	assert(sv)
-
-PERL_CALLCONV char*	Perl_sv_2pv_flags(pTHX_ SV *const sv, STRLEN *const lp, const I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV char*	Perl_sv_2pv_flags(pTHX_ SV *const sv, STRLEN *const lp, const I32 flags);
 #define PERL_ARGS_ASSERT_SV_2PV_FLAGS	\
 	assert(sv)
-
 /* PERL_CALLCONV char*	Perl_sv_2pv_nolen(pTHX_ SV* sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1); */
+			__attribute__warn_unused_result__; */
 #define PERL_ARGS_ASSERT_SV_2PV_NOLEN	\
 	assert(sv)
 
-PERL_CALLCONV char*	Perl_sv_2pvbyte(pTHX_ SV *sv, STRLEN *const lp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV char*	Perl_sv_2pvbyte(pTHX_ SV *sv, STRLEN *const lp);
 #define PERL_ARGS_ASSERT_SV_2PVBYTE	\
 	assert(sv)
-
 /* PERL_CALLCONV char*	Perl_sv_2pvbyte_nolen(pTHX_ SV* sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1); */
+			__attribute__warn_unused_result__; */
 #define PERL_ARGS_ASSERT_SV_2PVBYTE_NOLEN	\
 	assert(sv)
 
-PERL_CALLCONV char*	Perl_sv_2pvutf8(pTHX_ SV *sv, STRLEN *const lp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV char*	Perl_sv_2pvutf8(pTHX_ SV *sv, STRLEN *const lp);
 #define PERL_ARGS_ASSERT_SV_2PVUTF8	\
 	assert(sv)
-
 /* PERL_CALLCONV char*	Perl_sv_2pvutf8_nolen(pTHX_ SV* sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1); */
+			__attribute__warn_unused_result__; */
 #define PERL_ARGS_ASSERT_SV_2PVUTF8_NOLEN	\
 	assert(sv)
 
-/* PERL_CALLCONV UV	Perl_sv_2uv(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV UV	Perl_sv_2uv(pTHX_ SV *sv); */
 #define PERL_ARGS_ASSERT_SV_2UV	\
 	assert(sv)
-
-PERL_CALLCONV UV	Perl_sv_2uv_flags(pTHX_ SV *const sv, const I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV UV	Perl_sv_2uv_flags(pTHX_ SV *const sv, const I32 flags);
 #define PERL_ARGS_ASSERT_SV_2UV_FLAGS	\
 	assert(sv)
-
-PERL_CALLCONV int	Perl_sv_backoff(SV *const sv)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void	Perl_sv_backoff(SV *const sv);
 #define PERL_ARGS_ASSERT_SV_BACKOFF	\
 	assert(sv)
-
-PERL_CALLCONV SV*	Perl_sv_bless(pTHX_ SV *const sv, HV *const stash)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV*	Perl_sv_bless(pTHX_ SV *const sv, HV *const stash);
 #define PERL_ARGS_ASSERT_SV_BLESS	\
 	assert(sv); assert(stash)
-
-PERL_CALLCONV bool	Perl_sv_cat_decode(pTHX_ SV* dsv, SV *encoding, SV *ssv, int *offset, char* tstr, int tlen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+PERL_CALLCONV bool	Perl_sv_cat_decode(pTHX_ SV* dsv, SV *encoding, SV *ssv, int *offset, char* tstr, int tlen);
 #define PERL_ARGS_ASSERT_SV_CAT_DECODE	\
 	assert(dsv); assert(encoding); assert(ssv); assert(offset); assert(tstr)
-
-PERL_CALLCONV void	Perl_sv_catpv(pTHX_ SV *const sv, const char* ptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_catpv(pTHX_ SV *const sv, const char* ptr);
 #define PERL_ARGS_ASSERT_SV_CATPV	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_catpv_flags(pTHX_ SV *dstr, const char *sstr, const I32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_catpv_flags(pTHX_ SV *dstr, const char *sstr, const I32 flags);
 #define PERL_ARGS_ASSERT_SV_CATPV_FLAGS	\
 	assert(dstr); assert(sstr)
-
-PERL_CALLCONV void	Perl_sv_catpv_mg(pTHX_ SV *const sv, const char *const ptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_catpv_mg(pTHX_ SV *const sv, const char *const ptr);
 #define PERL_ARGS_ASSERT_SV_CATPV_MG	\
 	assert(sv)
-
 PERL_CALLCONV void	Perl_sv_catpvf(pTHX_ SV *const sv, const char *const pat, ...)
-			__attribute__format__(__printf__,pTHX_2,pTHX_3)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__format__(__printf__,pTHX_2,pTHX_3);
 #define PERL_ARGS_ASSERT_SV_CATPVF	\
 	assert(sv); assert(pat)
 
 PERL_CALLCONV void	Perl_sv_catpvf_mg(pTHX_ SV *const sv, const char *const pat, ...)
-			__attribute__format__(__printf__,pTHX_2,pTHX_3)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__format__(__printf__,pTHX_2,pTHX_3);
 #define PERL_ARGS_ASSERT_SV_CATPVF_MG	\
 	assert(sv); assert(pat)
 
-/* PERL_CALLCONV void	Perl_sv_catpvn(pTHX_ SV *dsv, const char *sstr, STRLEN len)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV void	Perl_sv_catpvn(pTHX_ SV *dsv, const char *sstr, STRLEN len); */
 #define PERL_ARGS_ASSERT_SV_CATPVN	\
 	assert(dsv); assert(sstr)
-
-PERL_CALLCONV void	Perl_sv_catpvn_flags(pTHX_ SV *const dstr, const char *sstr, const STRLEN len, const I32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_catpvn_flags(pTHX_ SV *const dstr, const char *sstr, const STRLEN len, const I32 flags);
 #define PERL_ARGS_ASSERT_SV_CATPVN_FLAGS	\
 	assert(dstr); assert(sstr)
-
-/* PERL_CALLCONV void	Perl_sv_catpvn_mg(pTHX_ SV *sv, const char *ptr, STRLEN len)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV void	Perl_sv_catpvn_mg(pTHX_ SV *sv, const char *ptr, STRLEN len); */
 #define PERL_ARGS_ASSERT_SV_CATPVN_MG	\
 	assert(sv); assert(ptr)
-
-/* PERL_CALLCONV void	Perl_sv_catsv(pTHX_ SV *dstr, SV *sstr)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV void	Perl_sv_catsv(pTHX_ SV *dstr, SV *sstr); */
 #define PERL_ARGS_ASSERT_SV_CATSV	\
 	assert(dstr)
-
-PERL_CALLCONV void	Perl_sv_catsv_flags(pTHX_ SV *const dsv, SV *const ssv, const I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_catsv_flags(pTHX_ SV *const dsv, SV *const ssv, const I32 flags);
 #define PERL_ARGS_ASSERT_SV_CATSV_FLAGS	\
 	assert(dsv)
-
-/* PERL_CALLCONV void	Perl_sv_catsv_mg(pTHX_ SV *dsv, SV *ssv)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV void	Perl_sv_catsv_mg(pTHX_ SV *dsv, SV *ssv); */
 #define PERL_ARGS_ASSERT_SV_CATSV_MG	\
 	assert(dsv)
-
-PERL_CALLCONV void	Perl_sv_chop(pTHX_ SV *const sv, const char *const ptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_chop(pTHX_ SV *const sv, const char *const ptr);
 #define PERL_ARGS_ASSERT_SV_CHOP	\
 	assert(sv)
-
 PERL_CALLCONV I32	Perl_sv_clean_all(pTHX);
 PERL_CALLCONV void	Perl_sv_clean_objs(pTHX);
-PERL_CALLCONV void	Perl_sv_clear(pTHX_ SV *const orig_sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_clear(pTHX_ SV *const orig_sv);
 #define PERL_ARGS_ASSERT_SV_CLEAR	\
 	assert(orig_sv)
-
 PERL_CALLCONV I32	Perl_sv_cmp(pTHX_ SV *const sv1, SV *const sv2);
 PERL_CALLCONV I32	Perl_sv_cmp_flags(pTHX_ SV *const sv1, SV *const sv2, const U32 flags);
 PERL_CALLCONV I32	Perl_sv_cmp_locale(pTHX_ SV *const sv1, SV *const sv2);
 PERL_CALLCONV I32	Perl_sv_cmp_locale_flags(pTHX_ SV *const sv1, SV *const sv2, const U32 flags);
-/* PERL_CALLCONV void	Perl_sv_copypv(pTHX_ SV *const dsv, SV *const ssv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV void	Perl_sv_copypv(pTHX_ SV *const dsv, SV *const ssv); */
 #define PERL_ARGS_ASSERT_SV_COPYPV	\
 	assert(dsv); assert(ssv)
-
-PERL_CALLCONV void	Perl_sv_copypv_flags(pTHX_ SV *const dsv, SV *const ssv, const I32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_copypv_flags(pTHX_ SV *const dsv, SV *const ssv, const I32 flags);
 #define PERL_ARGS_ASSERT_SV_COPYPV_FLAGS	\
 	assert(dsv); assert(ssv)
-
-/* PERL_CALLCONV void	Perl_sv_copypv_nomg(pTHX_ SV *const dsv, SV *const ssv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
-
+/* PERL_CALLCONV void	Perl_sv_copypv_nomg(pTHX_ SV *const dsv, SV *const ssv); */
 PERL_CALLCONV void	Perl_sv_dec(pTHX_ SV *const sv);
 PERL_CALLCONV void	Perl_sv_dec_nomg(pTHX_ SV *const sv);
-PERL_CALLCONV void	Perl_sv_del_backref(pTHX_ SV *const tsv, SV *const sv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_del_backref(pTHX_ SV *const tsv, SV *const sv);
 #define PERL_ARGS_ASSERT_SV_DEL_BACKREF	\
 	assert(tsv); assert(sv)
-
 PERL_CALLCONV bool	Perl_sv_derived_from(pTHX_ SV* sv, const char *const name)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_DERIVED_FROM	\
 	assert(sv); assert(name)
 
 PERL_CALLCONV bool	Perl_sv_derived_from_pv(pTHX_ SV* sv, const char *const name, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_DERIVED_FROM_PV	\
 	assert(sv); assert(name)
 
 PERL_CALLCONV bool	Perl_sv_derived_from_pvn(pTHX_ SV* sv, const char *const name, const STRLEN len, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_DERIVED_FROM_PVN	\
 	assert(sv); assert(name)
 
 PERL_CALLCONV bool	Perl_sv_derived_from_sv(pTHX_ SV* sv, SV *namesv, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_DERIVED_FROM_SV	\
 	assert(sv); assert(namesv)
 
 PERL_CALLCONV bool	Perl_sv_destroyable(pTHX_ SV *sv);
 PERL_CALLCONV bool	Perl_sv_does(pTHX_ SV* sv, const char *const name)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_DOES	\
 	assert(sv); assert(name)
 
 PERL_CALLCONV bool	Perl_sv_does_pv(pTHX_ SV* sv, const char *const name, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_DOES_PV	\
 	assert(sv); assert(name)
 
 PERL_CALLCONV bool	Perl_sv_does_pvn(pTHX_ SV* sv, const char *const name, const STRLEN len, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_DOES_PVN	\
 	assert(sv); assert(name)
 
 PERL_CALLCONV bool	Perl_sv_does_sv(pTHX_ SV* sv, SV* namesv, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_DOES_SV	\
 	assert(sv); assert(namesv)
 
-PERL_CALLCONV void	Perl_sv_dump(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_dump(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_SV_DUMP	\
 	assert(sv)
-
 /* PERL_CALLCONV I32	sv_eq(pTHX_ SV* sv1, SV* sv2); */
 PERL_CALLCONV I32	Perl_sv_eq_flags(pTHX_ SV* sv1, SV* sv2, const U32 flags);
-/* PERL_CALLCONV void	Perl_sv_force_normal(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV void	Perl_sv_force_normal(pTHX_ SV *sv); */
 #define PERL_ARGS_ASSERT_SV_FORCE_NORMAL	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_force_normal_flags(pTHX_ SV *const sv, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_force_normal_flags(pTHX_ SV *const sv, const U32 flags);
 #define PERL_ARGS_ASSERT_SV_FORCE_NORMAL_FLAGS	\
 	assert(sv)
-
 PERL_CALLCONV void	Perl_sv_free(pTHX_ SV *const sv);
-PERL_CALLCONV void	Perl_sv_free2(pTHX_ SV *const sv, const U32 refcnt)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_free2(pTHX_ SV *const sv, const U32 refcnt);
 #define PERL_ARGS_ASSERT_SV_FREE2	\
 	assert(sv)
-
 PERL_CALLCONV void	Perl_sv_free_arenas(pTHX);
 PERL_CALLCONV SV*	Perl_sv_get_backrefs(SV *const sv)
-			__attribute__pure__
-			__attribute__nonnull__(1);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_SV_GET_BACKREFS	\
 	assert(sv)
 
-PERL_CALLCONV char*	Perl_sv_gets(pTHX_ SV *const sv, PerlIO *const fp, I32 append)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_sv_gets(pTHX_ SV *const sv, PerlIO *const fp, I32 append);
 #define PERL_ARGS_ASSERT_SV_GETS	\
 	assert(sv); assert(fp)
-
-PERL_CALLCONV char*	Perl_sv_grow(pTHX_ SV *const sv, STRLEN newlen)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV char*	Perl_sv_grow(pTHX_ SV *const sv, STRLEN newlen);
 #define PERL_ARGS_ASSERT_SV_GROW	\
 	assert(sv)
-
 PERL_CALLCONV void	Perl_sv_inc(pTHX_ SV *const sv);
 PERL_CALLCONV void	Perl_sv_inc_nomg(pTHX_ SV *const sv);
-/* PERL_CALLCONV void	Perl_sv_insert(pTHX_ SV *const bigstr, const STRLEN offset, const STRLEN len, const char *const little, const STRLEN littlelen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_4); */
+/* PERL_CALLCONV void	Perl_sv_insert(pTHX_ SV *const bigstr, const STRLEN offset, const STRLEN len, const char *const little, const STRLEN littlelen); */
 #define PERL_ARGS_ASSERT_SV_INSERT	\
 	assert(bigstr); assert(little)
-
-PERL_CALLCONV void	Perl_sv_insert_flags(pTHX_ SV *const bigstr, const STRLEN offset, const STRLEN len, const char *const little, const STRLEN littlelen, const U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_4);
+PERL_CALLCONV void	Perl_sv_insert_flags(pTHX_ SV *const bigstr, const STRLEN offset, const STRLEN len, const char *const little, const STRLEN littlelen, const U32 flags);
 #define PERL_ARGS_ASSERT_SV_INSERT_FLAGS	\
 	assert(bigstr); assert(little)
-
-PERL_CALLCONV int	Perl_sv_isa(pTHX_ SV* sv, const char *const name)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_sv_isa(pTHX_ SV* sv, const char *const name);
 #define PERL_ARGS_ASSERT_SV_ISA	\
 	assert(name)
-
 PERL_CALLCONV int	Perl_sv_isobject(pTHX_ SV* sv);
-PERL_CALLCONV IV	Perl_sv_iv(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV IV	Perl_sv_iv(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_SV_IV	\
 	assert(sv)
-
 PERL_CALLCONV STRLEN	Perl_sv_len(pTHX_ SV *const sv);
 PERL_CALLCONV STRLEN	Perl_sv_len_utf8(pTHX_ SV *const sv);
-PERL_CALLCONV STRLEN	Perl_sv_len_utf8_nomg(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV STRLEN	Perl_sv_len_utf8_nomg(pTHX_ SV *const sv);
 #define PERL_ARGS_ASSERT_SV_LEN_UTF8_NOMG	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_magic(pTHX_ SV *const sv, SV *const obj, const int how, const char *const name, const I32 namlen)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_magic(pTHX_ SV *const sv, SV *const obj, const int how, const char *const name, const I32 namlen);
 #define PERL_ARGS_ASSERT_SV_MAGIC	\
 	assert(sv)
-
-PERL_CALLCONV MAGIC *	Perl_sv_magicext(pTHX_ SV *const sv, SV *const obj, const int how, const MGVTBL *const vtbl, const char *const name, const I32 namlen)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV MAGIC *	Perl_sv_magicext(pTHX_ SV *const sv, SV *const obj, const int how, const MGVTBL *const vtbl, const char *const name, const I32 namlen);
 #define PERL_ARGS_ASSERT_SV_MAGICEXT	\
 	assert(sv)
-
-PERL_CALLCONV MAGIC *	Perl_sv_magicext_mglob(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV MAGIC *	Perl_sv_magicext_mglob(pTHX_ SV *sv);
 #define PERL_ARGS_ASSERT_SV_MAGICEXT_MGLOB	\
 	assert(sv)
-
 /* PERL_CALLCONV SV*	Perl_sv_mortalcopy(pTHX_ SV *const oldsv)
 			__attribute__malloc__
 			__attribute__warn_unused_result__; */
@@ -4452,821 +3053,501 @@ PERL_CALLCONV SV*	Perl_sv_newmortal(pTHX)
 PERL_CALLCONV SV*	Perl_sv_newref(pTHX_ SV *const sv);
 /* PERL_CALLCONV void	Perl_sv_nolocking(pTHX_ SV *sv); */
 PERL_CALLCONV void	Perl_sv_nosharing(pTHX_ SV *sv);
-PERL_CALLCONV NV	Perl_sv_nv(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV NV	Perl_sv_nv(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_SV_NV	\
 	assert(sv)
-
-PERL_STATIC_INLINE bool	S_sv_only_taint_gmagic(SV *sv)
-			__attribute__nonnull__(1);
-#define PERL_ARGS_ASSERT_SV_ONLY_TAINT_GMAGIC	\
-	assert(sv)
-
 PERL_CALLCONV char*	Perl_sv_peek(pTHX_ SV* sv);
-PERL_CALLCONV void	Perl_sv_pos_b2u(pTHX_ SV *const sv, I32 *const offsetp)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_pos_b2u(pTHX_ SV *const sv, I32 *const offsetp);
 #define PERL_ARGS_ASSERT_SV_POS_B2U	\
 	assert(offsetp)
-
-PERL_CALLCONV STRLEN	Perl_sv_pos_b2u_flags(pTHX_ SV *const sv, STRLEN const offset, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV STRLEN	Perl_sv_pos_b2u_flags(pTHX_ SV *const sv, STRLEN const offset, U32 flags);
 #define PERL_ARGS_ASSERT_SV_POS_B2U_FLAGS	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_pos_u2b(pTHX_ SV *const sv, I32 *const offsetp, I32 *const lenp)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_pos_u2b(pTHX_ SV *const sv, I32 *const offsetp, I32 *const lenp);
 #define PERL_ARGS_ASSERT_SV_POS_U2B	\
 	assert(offsetp)
-
-PERL_CALLCONV STRLEN	Perl_sv_pos_u2b_flags(pTHX_ SV *const sv, STRLEN uoffset, STRLEN *const lenp, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV STRLEN	Perl_sv_pos_u2b_flags(pTHX_ SV *const sv, STRLEN uoffset, STRLEN *const lenp, U32 flags);
 #define PERL_ARGS_ASSERT_SV_POS_U2B_FLAGS	\
 	assert(sv)
-
 /* PERL_CALLCONV char*	Perl_sv_pv(pTHX_ SV *sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1); */
+			__attribute__warn_unused_result__; */
 #define PERL_ARGS_ASSERT_SV_PV	\
 	assert(sv)
 
 /* PERL_CALLCONV char*	Perl_sv_pvbyte(pTHX_ SV *sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1); */
+			__attribute__warn_unused_result__; */
 #define PERL_ARGS_ASSERT_SV_PVBYTE	\
 	assert(sv)
 
-PERL_CALLCONV char*	Perl_sv_pvbyten(pTHX_ SV *sv, STRLEN *lp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_sv_pvbyten(pTHX_ SV *sv, STRLEN *lp);
 #define PERL_ARGS_ASSERT_SV_PVBYTEN	\
 	assert(sv); assert(lp)
-
-PERL_CALLCONV char*	Perl_sv_pvbyten_force(pTHX_ SV *const sv, STRLEN *const lp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV char*	Perl_sv_pvbyten_force(pTHX_ SV *const sv, STRLEN *const lp);
 #define PERL_ARGS_ASSERT_SV_PVBYTEN_FORCE	\
 	assert(sv)
-
-PERL_CALLCONV char*	Perl_sv_pvn(pTHX_ SV *sv, STRLEN *lp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_sv_pvn(pTHX_ SV *sv, STRLEN *lp);
 #define PERL_ARGS_ASSERT_SV_PVN	\
 	assert(sv); assert(lp)
-
-/* PERL_CALLCONV char*	Perl_sv_pvn_force(pTHX_ SV* sv, STRLEN* lp)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV char*	Perl_sv_pvn_force(pTHX_ SV* sv, STRLEN* lp); */
 #define PERL_ARGS_ASSERT_SV_PVN_FORCE	\
 	assert(sv)
-
-PERL_CALLCONV char*	Perl_sv_pvn_force_flags(pTHX_ SV *const sv, STRLEN *const lp, const I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV char*	Perl_sv_pvn_force_flags(pTHX_ SV *const sv, STRLEN *const lp, const I32 flags);
 #define PERL_ARGS_ASSERT_SV_PVN_FORCE_FLAGS	\
 	assert(sv)
-
-PERL_CALLCONV char*	Perl_sv_pvn_nomg(pTHX_ SV* sv, STRLEN* lp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV char*	Perl_sv_pvn_nomg(pTHX_ SV* sv, STRLEN* lp);
 #define PERL_ARGS_ASSERT_SV_PVN_NOMG	\
 	assert(sv)
-
 /* PERL_CALLCONV char*	Perl_sv_pvutf8(pTHX_ SV *sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1); */
+			__attribute__warn_unused_result__; */
 #define PERL_ARGS_ASSERT_SV_PVUTF8	\
 	assert(sv)
 
-PERL_CALLCONV char*	Perl_sv_pvutf8n(pTHX_ SV *sv, STRLEN *lp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_sv_pvutf8n(pTHX_ SV *sv, STRLEN *lp);
 #define PERL_ARGS_ASSERT_SV_PVUTF8N	\
 	assert(sv); assert(lp)
-
-PERL_CALLCONV char*	Perl_sv_pvutf8n_force(pTHX_ SV *const sv, STRLEN *const lp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV char*	Perl_sv_pvutf8n_force(pTHX_ SV *const sv, STRLEN *const lp);
 #define PERL_ARGS_ASSERT_SV_PVUTF8N_FORCE	\
 	assert(sv)
-
-PERL_CALLCONV char*	Perl_sv_recode_to_utf8(pTHX_ SV* sv, SV *encoding)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_sv_recode_to_utf8(pTHX_ SV* sv, SV *encoding);
 #define PERL_ARGS_ASSERT_SV_RECODE_TO_UTF8	\
 	assert(sv); assert(encoding)
-
-PERL_CALLCONV SV*	Perl_sv_ref(pTHX_ SV *dst, const SV *const sv, const int ob)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV*	Perl_sv_ref(pTHX_ SV *dst, const SV *const sv, const int ob);
 #define PERL_ARGS_ASSERT_SV_REF	\
 	assert(sv)
-
 PERL_CALLCONV const char*	Perl_sv_reftype(pTHX_ const SV *const sv, const int ob)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_REFTYPE	\
 	assert(sv)
 
-PERL_CALLCONV void	Perl_sv_replace(pTHX_ SV *const sv, SV *const nsv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_replace(pTHX_ SV *const sv, SV *const nsv);
 #define PERL_ARGS_ASSERT_SV_REPLACE	\
 	assert(sv); assert(nsv)
-
 PERL_CALLCONV void	Perl_sv_report_used(pTHX);
-PERL_CALLCONV void	Perl_sv_reset(pTHX_ const char* s, HV *const stash)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_reset(pTHX_ const char* s, HV *const stash);
 #define PERL_ARGS_ASSERT_SV_RESET	\
 	assert(s)
-
 PERL_CALLCONV void	Perl_sv_resetpvn(pTHX_ const char* s, STRLEN len, HV *const stash);
-PERL_CALLCONV SV*	Perl_sv_rvweaken(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_sv_rvweaken(pTHX_ SV *const sv);
 #define PERL_ARGS_ASSERT_SV_RVWEAKEN	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_sethek(pTHX_ SV *const sv, const HEK *const hek)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_sethek(pTHX_ SV *const sv, const HEK *const hek);
 #define PERL_ARGS_ASSERT_SV_SETHEK	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_setiv(pTHX_ SV *const sv, const IV num)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setiv(pTHX_ SV *const sv, const IV num);
 #define PERL_ARGS_ASSERT_SV_SETIV	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_setiv_mg(pTHX_ SV *const sv, const IV i)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setiv_mg(pTHX_ SV *const sv, const IV i);
 #define PERL_ARGS_ASSERT_SV_SETIV_MG	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_setnv(pTHX_ SV *const sv, const NV num)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setnv(pTHX_ SV *const sv, const NV num);
 #define PERL_ARGS_ASSERT_SV_SETNV	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_setnv_mg(pTHX_ SV *const sv, const NV num)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setnv_mg(pTHX_ SV *const sv, const NV num);
 #define PERL_ARGS_ASSERT_SV_SETNV_MG	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_setpv(pTHX_ SV *const sv, const char *const ptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setpv(pTHX_ SV *const sv, const char *const ptr);
 #define PERL_ARGS_ASSERT_SV_SETPV	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_setpv_mg(pTHX_ SV *const sv, const char *const ptr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setpv_mg(pTHX_ SV *const sv, const char *const ptr);
 #define PERL_ARGS_ASSERT_SV_SETPV_MG	\
 	assert(sv)
-
 PERL_CALLCONV void	Perl_sv_setpvf(pTHX_ SV *const sv, const char *const pat, ...)
-			__attribute__format__(__printf__,pTHX_2,pTHX_3)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__format__(__printf__,pTHX_2,pTHX_3);
 #define PERL_ARGS_ASSERT_SV_SETPVF	\
 	assert(sv); assert(pat)
 
 PERL_CALLCONV void	Perl_sv_setpvf_mg(pTHX_ SV *const sv, const char *const pat, ...)
-			__attribute__format__(__printf__,pTHX_2,pTHX_3)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__format__(__printf__,pTHX_2,pTHX_3);
 #define PERL_ARGS_ASSERT_SV_SETPVF_MG	\
 	assert(sv); assert(pat)
 
-PERL_CALLCONV void	Perl_sv_setpviv(pTHX_ SV *const sv, const IV num)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setpviv(pTHX_ SV *const sv, const IV num);
 #define PERL_ARGS_ASSERT_SV_SETPVIV	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_setpviv_mg(pTHX_ SV *const sv, const IV iv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setpviv_mg(pTHX_ SV *const sv, const IV iv);
 #define PERL_ARGS_ASSERT_SV_SETPVIV_MG	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_setpvn(pTHX_ SV *const sv, const char *const ptr, const STRLEN len)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setpvn(pTHX_ SV *const sv, const char *const ptr, const STRLEN len);
 #define PERL_ARGS_ASSERT_SV_SETPVN	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_setpvn_mg(pTHX_ SV *const sv, const char *const ptr, const STRLEN len)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_setpvn_mg(pTHX_ SV *const sv, const char *const ptr, const STRLEN len);
 #define PERL_ARGS_ASSERT_SV_SETPVN_MG	\
 	assert(sv); assert(ptr)
-
-PERL_CALLCONV SV*	Perl_sv_setref_iv(pTHX_ SV *const rv, const char *const classname, const IV iv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_sv_setref_iv(pTHX_ SV *const rv, const char *const classname, const IV iv);
 #define PERL_ARGS_ASSERT_SV_SETREF_IV	\
 	assert(rv)
-
-PERL_CALLCONV SV*	Perl_sv_setref_nv(pTHX_ SV *const rv, const char *const classname, const NV nv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_sv_setref_nv(pTHX_ SV *const rv, const char *const classname, const NV nv);
 #define PERL_ARGS_ASSERT_SV_SETREF_NV	\
 	assert(rv)
-
-PERL_CALLCONV SV*	Perl_sv_setref_pv(pTHX_ SV *const rv, const char *const classname, void *const pv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_sv_setref_pv(pTHX_ SV *const rv, const char *const classname, void *const pv);
 #define PERL_ARGS_ASSERT_SV_SETREF_PV	\
 	assert(rv)
-
-PERL_CALLCONV SV*	Perl_sv_setref_pvn(pTHX_ SV *const rv, const char *const classname, const char *const pv, const STRLEN n)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV SV*	Perl_sv_setref_pvn(pTHX_ SV *const rv, const char *const classname, const char *const pv, const STRLEN n);
 #define PERL_ARGS_ASSERT_SV_SETREF_PVN	\
 	assert(rv); assert(pv)
-
-PERL_CALLCONV SV*	Perl_sv_setref_uv(pTHX_ SV *const rv, const char *const classname, const UV uv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_sv_setref_uv(pTHX_ SV *const rv, const char *const classname, const UV uv);
 #define PERL_ARGS_ASSERT_SV_SETREF_UV	\
 	assert(rv)
-
-/* PERL_CALLCONV void	Perl_sv_setsv(pTHX_ SV *dstr, SV *sstr)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV void	Perl_sv_setsv(pTHX_ SV *dstr, SV *sstr); */
 #define PERL_ARGS_ASSERT_SV_SETSV	\
 	assert(dstr)
-
-PERL_CALLCONV void	Perl_sv_setsv_flags(pTHX_ SV *dstr, SV *sstr, const I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setsv_flags(pTHX_ SV *dstr, SV *sstr, const I32 flags);
 #define PERL_ARGS_ASSERT_SV_SETSV_FLAGS	\
 	assert(dstr)
-
-PERL_CALLCONV void	Perl_sv_setsv_mg(pTHX_ SV *const dstr, SV *const sstr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setsv_mg(pTHX_ SV *const dstr, SV *const sstr);
 #define PERL_ARGS_ASSERT_SV_SETSV_MG	\
 	assert(dstr)
-
-PERL_CALLCONV void	Perl_sv_setuv(pTHX_ SV *const sv, const UV num)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setuv(pTHX_ SV *const sv, const UV num);
 #define PERL_ARGS_ASSERT_SV_SETUV	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_setuv_mg(pTHX_ SV *const sv, const UV u)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_setuv_mg(pTHX_ SV *const sv, const UV u);
 #define PERL_ARGS_ASSERT_SV_SETUV_MG	\
 	assert(sv)
-
-/* PERL_CALLCONV void	Perl_sv_taint(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV void	Perl_sv_taint(pTHX_ SV* sv); */
 #define PERL_ARGS_ASSERT_SV_TAINT	\
 	assert(sv)
-
 PERL_CALLCONV bool	Perl_sv_tainted(pTHX_ SV *const sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_TAINTED	\
 	assert(sv)
 
 PERL_CALLCONV I32	Perl_sv_true(pTHX_ SV *const sv);
 PERL_CALLCONV char*	Perl_sv_uni_display(pTHX_ SV *dsv, SV *ssv, STRLEN pvlim, UV flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_UNI_DISPLAY	\
 	assert(dsv); assert(ssv)
 
-PERL_CALLCONV int	Perl_sv_unmagic(pTHX_ SV *const sv, const int type)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_sv_unmagic(pTHX_ SV *const sv, const int type);
 #define PERL_ARGS_ASSERT_SV_UNMAGIC	\
 	assert(sv)
-
-PERL_CALLCONV int	Perl_sv_unmagicext(pTHX_ SV *const sv, const int type, MGVTBL *vtbl)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_sv_unmagicext(pTHX_ SV *const sv, const int type, MGVTBL *vtbl);
 #define PERL_ARGS_ASSERT_SV_UNMAGICEXT	\
 	assert(sv)
-
-/* PERL_CALLCONV void	Perl_sv_unref(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV void	Perl_sv_unref(pTHX_ SV* sv); */
 #define PERL_ARGS_ASSERT_SV_UNREF	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_unref_flags(pTHX_ SV *const ref, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_unref_flags(pTHX_ SV *const ref, const U32 flags);
 #define PERL_ARGS_ASSERT_SV_UNREF_FLAGS	\
 	assert(ref)
-
-PERL_CALLCONV void	Perl_sv_untaint(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_untaint(pTHX_ SV *const sv);
 #define PERL_ARGS_ASSERT_SV_UNTAINT	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_upgrade(pTHX_ SV *const sv, svtype new_type)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_upgrade(pTHX_ SV *const sv, svtype new_type);
 #define PERL_ARGS_ASSERT_SV_UPGRADE	\
 	assert(sv)
-
-/* PERL_CALLCONV void	Perl_sv_usepvn(pTHX_ SV* sv, char* ptr, STRLEN len)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV void	Perl_sv_usepvn(pTHX_ SV* sv, char* ptr, STRLEN len); */
 #define PERL_ARGS_ASSERT_SV_USEPVN	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_usepvn_flags(pTHX_ SV *const sv, char* ptr, const STRLEN len, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_usepvn_flags(pTHX_ SV *const sv, char* ptr, const STRLEN len, const U32 flags);
 #define PERL_ARGS_ASSERT_SV_USEPVN_FLAGS	\
 	assert(sv)
-
-/* PERL_CALLCONV void	Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV void	Perl_sv_usepvn_mg(pTHX_ SV *sv, char *ptr, STRLEN len); */
 #define PERL_ARGS_ASSERT_SV_USEPVN_MG	\
 	assert(sv)
-
-PERL_CALLCONV bool	Perl_sv_utf8_decode(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV bool	Perl_sv_utf8_decode(pTHX_ SV *const sv);
 #define PERL_ARGS_ASSERT_SV_UTF8_DECODE	\
 	assert(sv)
-
-PERL_CALLCONV bool	Perl_sv_utf8_downgrade(pTHX_ SV *const sv, const bool fail_ok)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV bool	Perl_sv_utf8_downgrade(pTHX_ SV *const sv, const bool fail_ok);
 #define PERL_ARGS_ASSERT_SV_UTF8_DOWNGRADE	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_utf8_encode(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_utf8_encode(pTHX_ SV *const sv);
 #define PERL_ARGS_ASSERT_SV_UTF8_ENCODE	\
 	assert(sv)
-
-/* PERL_CALLCONV STRLEN	Perl_sv_utf8_upgrade(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1); */
+/* PERL_CALLCONV STRLEN	Perl_sv_utf8_upgrade(pTHX_ SV *sv); */
 #define PERL_ARGS_ASSERT_SV_UTF8_UPGRADE	\
 	assert(sv)
-
-/* PERL_CALLCONV STRLEN	Perl_sv_utf8_upgrade_flags(pTHX_ SV *const sv, const I32 flags)
-			__attribute__nonnull__(pTHX_1); */
-
-PERL_CALLCONV STRLEN	Perl_sv_utf8_upgrade_flags_grow(pTHX_ SV *const sv, const I32 flags, STRLEN extra)
-			__attribute__nonnull__(pTHX_1);
+/* PERL_CALLCONV STRLEN	Perl_sv_utf8_upgrade_flags(pTHX_ SV *const sv, const I32 flags); */
+PERL_CALLCONV STRLEN	Perl_sv_utf8_upgrade_flags_grow(pTHX_ SV *const sv, const I32 flags, STRLEN extra);
 #define PERL_ARGS_ASSERT_SV_UTF8_UPGRADE_FLAGS_GROW	\
 	assert(sv)
-
-/* PERL_CALLCONV STRLEN	sv_utf8_upgrade_nomg(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1); */
-
-PERL_CALLCONV UV	Perl_sv_uv(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+/* PERL_CALLCONV STRLEN	sv_utf8_upgrade_nomg(pTHX_ SV *sv); */
+PERL_CALLCONV UV	Perl_sv_uv(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_SV_UV	\
 	assert(sv)
-
-PERL_CALLCONV void	Perl_sv_vcatpvf(pTHX_ SV *const sv, const char *const pat, va_list *const args)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_vcatpvf(pTHX_ SV *const sv, const char *const pat, va_list *const args);
 #define PERL_ARGS_ASSERT_SV_VCATPVF	\
 	assert(sv); assert(pat)
-
-PERL_CALLCONV void	Perl_sv_vcatpvf_mg(pTHX_ SV *const sv, const char *const pat, va_list *const args)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_vcatpvf_mg(pTHX_ SV *const sv, const char *const pat, va_list *const args);
 #define PERL_ARGS_ASSERT_SV_VCATPVF_MG	\
 	assert(sv); assert(pat)
-
-PERL_CALLCONV void	Perl_sv_vcatpvfn(pTHX_ SV *const sv, const char *const pat, const STRLEN patlen, va_list *const args, SV **const svargs, const I32 svmax, bool *const maybe_tainted)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_vcatpvfn(pTHX_ SV *const sv, const char *const pat, const STRLEN patlen, va_list *const args, SV **const svargs, const I32 svmax, bool *const maybe_tainted);
 #define PERL_ARGS_ASSERT_SV_VCATPVFN	\
 	assert(sv); assert(pat)
-
-PERL_CALLCONV void	Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN patlen, va_list *const args, SV **const svargs, const I32 svmax, bool *const maybe_tainted, const U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN patlen, va_list *const args, SV **const svargs, const I32 svmax, bool *const maybe_tainted, const U32 flags);
 #define PERL_ARGS_ASSERT_SV_VCATPVFN_FLAGS	\
 	assert(sv); assert(pat)
-
-PERL_CALLCONV void	Perl_sv_vsetpvf(pTHX_ SV *const sv, const char *const pat, va_list *const args)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_vsetpvf(pTHX_ SV *const sv, const char *const pat, va_list *const args);
 #define PERL_ARGS_ASSERT_SV_VSETPVF	\
 	assert(sv); assert(pat)
-
-PERL_CALLCONV void	Perl_sv_vsetpvf_mg(pTHX_ SV *const sv, const char *const pat, va_list *const args)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_vsetpvf_mg(pTHX_ SV *const sv, const char *const pat, va_list *const args);
 #define PERL_ARGS_ASSERT_SV_VSETPVF_MG	\
 	assert(sv); assert(pat)
-
-PERL_CALLCONV void	Perl_sv_vsetpvfn(pTHX_ SV *const sv, const char *const pat, const STRLEN patlen, va_list *const args, SV **const svargs, const I32 svmax, bool *const maybe_tainted)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_vsetpvfn(pTHX_ SV *const sv, const char *const pat, const STRLEN patlen, va_list *const args, SV **const svargs, const I32 svmax, bool *const maybe_tainted);
 #define PERL_ARGS_ASSERT_SV_VSETPVFN	\
 	assert(sv); assert(pat)
-
-PERL_CALLCONV UV	Perl_swash_fetch(pTHX_ SV *swash, const U8 *ptr, bool do_utf8)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV UV	Perl_swash_fetch(pTHX_ SV *swash, const U8 *ptr, bool do_utf8);
 #define PERL_ARGS_ASSERT_SWASH_FETCH	\
 	assert(swash); assert(ptr)
-
 PERL_CALLCONV SV*	Perl_swash_init(pTHX_ const char* pkg, const char* name, SV* listsv, I32 minbits, I32 none)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SWASH_INIT	\
 	assert(pkg); assert(name); assert(listsv)
 
 PERL_CALLCONV void	Perl_sync_locale(pTHX);
-PERL_CALLCONV void	Perl_sys_init(int* argc, char*** argv)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+PERL_CALLCONV void	Perl_sys_init(int* argc, char*** argv);
 #define PERL_ARGS_ASSERT_SYS_INIT	\
 	assert(argc); assert(argv)
-
-PERL_CALLCONV void	Perl_sys_init3(int* argc, char*** argv, char*** env)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2)
-			__attribute__nonnull__(3);
+PERL_CALLCONV void	Perl_sys_init3(int* argc, char*** argv, char*** env);
 #define PERL_ARGS_ASSERT_SYS_INIT3	\
 	assert(argc); assert(argv); assert(env)
-
 PERL_CALLCONV void	Perl_sys_term(void);
 PERL_CALLCONV void	Perl_taint_env(pTHX);
-PERL_CALLCONV void	Perl_taint_proper(pTHX_ const char* f, const char *const s)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_taint_proper(pTHX_ const char* f, const char *const s);
 #define PERL_ARGS_ASSERT_TAINT_PROPER	\
 	assert(s)
-
-PERL_CALLCONV OP *	Perl_tied_method(pTHX_ SV *methname, SV **sp, SV *const sv, const MAGIC *const mg, const U32 flags, U32 argc, ...)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+PERL_CALLCONV OP *	Perl_tied_method(pTHX_ SV *methname, SV **sp, SV *const sv, const MAGIC *const mg, const U32 flags, U32 argc, ...);
 #define PERL_ARGS_ASSERT_TIED_METHOD	\
 	assert(methname); assert(sp); assert(sv); assert(mg)
-
 PERL_CALLCONV SSize_t	Perl_tmps_grow_p(pTHX_ SSize_t ix);
-/* PERL_CALLCONV UV	Perl_to_uni_fold(pTHX_ UV c, U8 *p, STRLEN *lenp)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3); */
-
-PERL_CALLCONV UV	Perl_to_uni_lower(pTHX_ UV c, U8 *p, STRLEN *lenp)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+/* PERL_CALLCONV UV	Perl_to_uni_fold(pTHX_ UV c, U8 *p, STRLEN *lenp); */
+PERL_CALLCONV UV	Perl_to_uni_lower(pTHX_ UV c, U8 *p, STRLEN *lenp);
 #define PERL_ARGS_ASSERT_TO_UNI_LOWER	\
 	assert(p); assert(lenp)
-
 PERL_CALLCONV U32	Perl_to_uni_lower_lc(pTHX_ U32 c)
 			__attribute__deprecated__
 			__attribute__warn_unused_result__
 			__attribute__pure__;
 
-PERL_CALLCONV UV	Perl_to_uni_title(pTHX_ UV c, U8 *p, STRLEN *lenp)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV UV	Perl_to_uni_title(pTHX_ UV c, U8 *p, STRLEN *lenp);
 #define PERL_ARGS_ASSERT_TO_UNI_TITLE	\
 	assert(p); assert(lenp)
-
 PERL_CALLCONV U32	Perl_to_uni_title_lc(pTHX_ U32 c)
 			__attribute__deprecated__
 			__attribute__warn_unused_result__
 			__attribute__pure__;
 
-PERL_CALLCONV UV	Perl_to_uni_upper(pTHX_ UV c, U8 *p, STRLEN *lenp)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV UV	Perl_to_uni_upper(pTHX_ UV c, U8 *p, STRLEN *lenp);
 #define PERL_ARGS_ASSERT_TO_UNI_UPPER	\
 	assert(p); assert(lenp)
-
 PERL_CALLCONV U32	Perl_to_uni_upper_lc(pTHX_ U32 c)
 			__attribute__deprecated__
 			__attribute__warn_unused_result__
 			__attribute__pure__;
 
 PERL_CALLCONV UV	Perl_to_utf8_case(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp, SV **swashp, const char *normal, const char *special)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+			__attribute__deprecated__;
 #define PERL_ARGS_ASSERT_TO_UTF8_CASE	\
 	assert(p); assert(ustrp); assert(swashp); assert(normal)
 
-/* PERL_CALLCONV UV	Perl_to_utf8_fold(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV UV	Perl_to_utf8_fold(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp); */
 #define PERL_ARGS_ASSERT_TO_UTF8_FOLD	\
 	assert(p); assert(ustrp)
-
-/* PERL_CALLCONV UV	Perl_to_utf8_lower(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV UV	Perl_to_utf8_lower(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp); */
 #define PERL_ARGS_ASSERT_TO_UTF8_LOWER	\
 	assert(p); assert(ustrp)
-
-/* PERL_CALLCONV UV	Perl_to_utf8_title(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV UV	Perl_to_utf8_title(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp); */
 #define PERL_ARGS_ASSERT_TO_UTF8_TITLE	\
 	assert(p); assert(ustrp)
-
-/* PERL_CALLCONV UV	Perl_to_utf8_upper(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
+/* PERL_CALLCONV UV	Perl_to_utf8_upper(pTHX_ const U8 *p, U8* ustrp, STRLEN *lenp); */
 #define PERL_ARGS_ASSERT_TO_UTF8_UPPER	\
 	assert(p); assert(ustrp)
-
 PERL_CALLCONV bool	Perl_try_amagic_bin(pTHX_ int method, int flags);
 PERL_CALLCONV bool	Perl_try_amagic_un(pTHX_ int method, int flags);
-PERL_CALLCONV I32	Perl_unpack_str(pTHX_ const char *pat, const char *patend, const char *s, const char *strbeg, const char *strend, char **new_s, I32 ocnt, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_5);
+PERL_CALLCONV I32	Perl_unpack_str(pTHX_ const char *pat, const char *patend, const char *s, const char *strbeg, const char *strend, char **new_s, I32 ocnt, U32 flags);
 #define PERL_ARGS_ASSERT_UNPACK_STR	\
 	assert(pat); assert(patend); assert(s); assert(strend)
-
-PERL_CALLCONV I32	Perl_unpackstring(pTHX_ const char *pat, const char *patend, const char *s, const char *strend, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+PERL_CALLCONV I32	Perl_unpackstring(pTHX_ const char *pat, const char *patend, const char *s, const char *strend, U32 flags);
 #define PERL_ARGS_ASSERT_UNPACKSTRING	\
 	assert(pat); assert(patend); assert(s); assert(strend)
-
 PERL_CALLCONV void	Perl_unshare_hek(pTHX_ HEK* hek);
 PERL_CALLCONV void	Perl_unsharepvn(pTHX_ const char* sv, I32 len, U32 hash);
-PERL_CALLCONV SV*	Perl_upg_version(pTHX_ SV *ver, bool qv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_upg_version(pTHX_ SV *ver, bool qv);
 #define PERL_ARGS_ASSERT_UPG_VERSION	\
 	assert(ver)
-
-PERL_CALLCONV U8*	Perl_utf16_to_utf8(pTHX_ U8* p, U8 *d, I32 bytelen, I32 *newlen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_4);
+PERL_CALLCONV U8*	Perl_utf16_to_utf8(pTHX_ U8* p, U8 *d, I32 bytelen, I32 *newlen);
 #define PERL_ARGS_ASSERT_UTF16_TO_UTF8	\
 	assert(p); assert(d); assert(newlen)
-
-PERL_CALLCONV U8*	Perl_utf16_to_utf8_reversed(pTHX_ U8* p, U8 *d, I32 bytelen, I32 *newlen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_4);
+PERL_CALLCONV U8*	Perl_utf16_to_utf8_reversed(pTHX_ U8* p, U8 *d, I32 bytelen, I32 *newlen);
 #define PERL_ARGS_ASSERT_UTF16_TO_UTF8_REVERSED	\
 	assert(p); assert(d); assert(newlen)
-
 PERL_CALLCONV IV	Perl_utf8_distance(pTHX_ const U8 *a, const U8 *b)
 			__attribute__warn_unused_result__
-			__attribute__pure__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_UTF8_DISTANCE	\
 	assert(a); assert(b)
 
-PERL_CALLCONV U8*	Perl_utf8_hop(const U8 *s, I32 off)
+PERL_CALLCONV U8*	Perl_utf8_hop(const U8 *s, SSize_t off)
 			__attribute__warn_unused_result__
-			__attribute__pure__
-			__attribute__nonnull__(1);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_UTF8_HOP	\
 	assert(s)
 
 PERL_CALLCONV STRLEN	Perl_utf8_length(pTHX_ const U8* s, const U8 *e)
 			__attribute__warn_unused_result__
-			__attribute__pure__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_UTF8_LENGTH	\
 	assert(s); assert(e)
 
-PERL_CALLCONV U8*	Perl_utf8_to_bytes(pTHX_ U8 *s, STRLEN *len)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV U8*	Perl_utf8_to_bytes(pTHX_ U8 *s, STRLEN *len);
 #define PERL_ARGS_ASSERT_UTF8_TO_BYTES	\
 	assert(s); assert(len)
-
 PERL_CALLCONV UV	Perl_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen)
-			__attribute__deprecated__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__deprecated__;
 #define PERL_ARGS_ASSERT_UTF8_TO_UVCHR	\
 	assert(s)
 
-/* PERL_CALLCONV UV	utf8_to_uvchr_buf(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
-
+/* PERL_CALLCONV UV	utf8_to_uvchr_buf(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen); */
 PERL_CALLCONV UV	Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen)
-			__attribute__deprecated__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__deprecated__;
 #define PERL_ARGS_ASSERT_UTF8_TO_UVUNI	\
 	assert(s)
 
 PERL_CALLCONV UV	Perl_utf8_to_uvuni_buf(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen)
-			__attribute__deprecated__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__deprecated__;
 #define PERL_ARGS_ASSERT_UTF8_TO_UVUNI_BUF	\
 	assert(s); assert(send)
 
-PERL_CALLCONV UV	Perl_utf8n_to_uvchr(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV UV	Perl_utf8n_to_uvchr(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags);
 #define PERL_ARGS_ASSERT_UTF8N_TO_UVCHR	\
 	assert(s)
-
-PERL_CALLCONV UV	Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV UV	Perl_utf8n_to_uvuni(pTHX_ const U8 *s, STRLEN curlen, STRLEN *retlen, U32 flags);
 #define PERL_ARGS_ASSERT_UTF8N_TO_UVUNI	\
 	assert(s)
-
-PERL_CALLCONV void	Perl_utilize(pTHX_ int aver, I32 floor, OP* version, OP* idop, OP* arg)
-			__attribute__nonnull__(pTHX_4);
+PERL_CALLCONV void	Perl_utilize(pTHX_ int aver, I32 floor, OP* version, OP* idop, OP* arg);
 #define PERL_ARGS_ASSERT_UTILIZE	\
 	assert(idop)
-
-/* PERL_CALLCONV U8*	uvchr_to_utf8(pTHX_ U8 *d, UV uv)
-			__attribute__nonnull__(pTHX_1); */
-
-/* PERL_CALLCONV U8*	uvchr_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags)
-			__attribute__nonnull__(pTHX_1); */
-
-PERL_CALLCONV U8*	Perl_uvoffuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags)
-			__attribute__nonnull__(pTHX_1);
+/* PERL_CALLCONV U8*	uvchr_to_utf8(pTHX_ U8 *d, UV uv); */
+/* PERL_CALLCONV U8*	uvchr_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags); */
+PERL_CALLCONV U8*	Perl_uvoffuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags);
 #define PERL_ARGS_ASSERT_UVOFFUNI_TO_UTF8_FLAGS	\
 	assert(d)
-
-PERL_CALLCONV U8*	Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV U8*	Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv);
 #define PERL_ARGS_ASSERT_UVUNI_TO_UTF8	\
 	assert(d)
-
-PERL_CALLCONV U8*	Perl_uvuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV U8*	Perl_uvuni_to_utf8_flags(pTHX_ U8 *d, UV uv, UV flags);
 #define PERL_ARGS_ASSERT_UVUNI_TO_UTF8_FLAGS	\
 	assert(d)
-
-PERL_CALLCONV UV	Perl_valid_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV UV	Perl_valid_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen);
 #define PERL_ARGS_ASSERT_VALID_UTF8_TO_UVCHR	\
 	assert(s)
-
 PERL_CALLCONV UV	Perl_valid_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen)
-			__attribute__deprecated__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__deprecated__;
 #define PERL_ARGS_ASSERT_VALID_UTF8_TO_UVUNI	\
 	assert(s)
 
-PERL_CALLCONV bool	Perl_validate_proto(pTHX_ SV *name, SV *proto, bool warn)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV bool	Perl_validate_proto(pTHX_ SV *name, SV *proto, bool warn);
 #define PERL_ARGS_ASSERT_VALIDATE_PROTO	\
 	assert(name)
-
-PERL_CALLCONV int	Perl_vcmp(pTHX_ SV *lhv, SV *rhv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_vcmp(pTHX_ SV *lhv, SV *rhv);
 #define PERL_ARGS_ASSERT_VCMP	\
 	assert(lhv); assert(rhv)
-
 PERL_CALLCONV_NO_RET void	Perl_vcroak(pTHX_ const char* pat, va_list* args)
 			__attribute__noreturn__;
 
-PERL_CALLCONV void	Perl_vdeb(pTHX_ const char* pat, va_list* args)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_vdeb(pTHX_ const char* pat, va_list* args);
 #define PERL_ARGS_ASSERT_VDEB	\
 	assert(pat)
-
-PERL_CALLCONV char*	Perl_vform(pTHX_ const char* pat, va_list* args)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV char*	Perl_vform(pTHX_ const char* pat, va_list* args);
 #define PERL_ARGS_ASSERT_VFORM	\
 	assert(pat)
-
-PERL_CALLCONV void	Perl_vivify_defelem(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_vivify_defelem(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_VIVIFY_DEFELEM	\
 	assert(sv)
-
 PERL_CALLCONV SV*	Perl_vivify_ref(pTHX_ SV* sv, U32 to_what)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_VIVIFY_REF	\
 	assert(sv)
 
-PERL_CALLCONV void	Perl_vload_module(pTHX_ U32 flags, SV* name, SV* ver, va_list* args)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_vload_module(pTHX_ U32 flags, SV* name, SV* ver, va_list* args);
 #define PERL_ARGS_ASSERT_VLOAD_MODULE	\
 	assert(name)
-
-PERL_CALLCONV SV*	Perl_vmess(pTHX_ const char* pat, va_list* args)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_vmess(pTHX_ const char* pat, va_list* args);
 #define PERL_ARGS_ASSERT_VMESS	\
 	assert(pat)
-
 PERL_CALLCONV SV*	Perl_vnewSVpvf(pTHX_ const char *const pat, va_list *const args)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_VNEWSVPVF	\
 	assert(pat)
 
-PERL_CALLCONV SV*	Perl_vnormal(pTHX_ SV *vs)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_vnormal(pTHX_ SV *vs);
 #define PERL_ARGS_ASSERT_VNORMAL	\
 	assert(vs)
-
-PERL_CALLCONV SV*	Perl_vnumify(pTHX_ SV *vs)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_vnumify(pTHX_ SV *vs);
 #define PERL_ARGS_ASSERT_VNUMIFY	\
 	assert(vs)
-
-PERL_CALLCONV SV*	Perl_vstringify(pTHX_ SV *vs)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_vstringify(pTHX_ SV *vs);
 #define PERL_ARGS_ASSERT_VSTRINGIFY	\
 	assert(vs)
-
-PERL_CALLCONV SV*	Perl_vverify(pTHX_ SV *vs)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV SV*	Perl_vverify(pTHX_ SV *vs);
 #define PERL_ARGS_ASSERT_VVERIFY	\
 	assert(vs)
-
-PERL_CALLCONV void	Perl_vwarn(pTHX_ const char* pat, va_list* args)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_vwarn(pTHX_ const char* pat, va_list* args);
 #define PERL_ARGS_ASSERT_VWARN	\
 	assert(pat)
-
-PERL_CALLCONV void	Perl_vwarner(pTHX_ U32 err, const char* pat, va_list* args)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_vwarner(pTHX_ U32 err, const char* pat, va_list* args);
 #define PERL_ARGS_ASSERT_VWARNER	\
 	assert(pat)
-
-PERL_CALLCONV I32	Perl_wait4pid(pTHX_ Pid_t pid, int* statusp, int flags)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV I32	Perl_wait4pid(pTHX_ Pid_t pid, int* statusp, int flags);
 #define PERL_ARGS_ASSERT_WAIT4PID	\
 	assert(statusp)
-
 PERL_CALLCONV void	Perl_warn(pTHX_ const char* pat, ...)
-			__attribute__format__(__printf__,pTHX_1,pTHX_2)
-			__attribute__nonnull__(pTHX_1);
+			__attribute__format__(__printf__,pTHX_1,pTHX_2);
 #define PERL_ARGS_ASSERT_WARN	\
 	assert(pat)
 
-PERL_CALLCONV void	Perl_warn_sv(pTHX_ SV *baseex)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_warn_sv(pTHX_ SV *baseex);
 #define PERL_ARGS_ASSERT_WARN_SV	\
 	assert(baseex)
-
 PERL_CALLCONV void	Perl_warner(pTHX_ U32 err, const char* pat, ...)
-			__attribute__format__(__printf__,pTHX_2,pTHX_3)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__format__(__printf__,pTHX_2,pTHX_3);
 #define PERL_ARGS_ASSERT_WARNER	\
 	assert(pat)
 
 PERL_CALLCONV I32	Perl_was_lvalue_sub(pTHX)
 			__attribute__warn_unused_result__;
 
-PERL_CALLCONV void	Perl_watch(pTHX_ char** addr)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_watch(pTHX_ char** addr);
 #define PERL_ARGS_ASSERT_WATCH	\
 	assert(addr)
-
-/* PERL_CALLCONV I32	whichsig(pTHX_ const char* sig)
-			__attribute__nonnull__(pTHX_1); */
-
-PERL_CALLCONV I32	Perl_whichsig_pv(pTHX_ const char* sig)
-			__attribute__nonnull__(pTHX_1);
+/* PERL_CALLCONV I32	whichsig(pTHX_ const char* sig); */
+PERL_CALLCONV I32	Perl_whichsig_pv(pTHX_ const char* sig);
 #define PERL_ARGS_ASSERT_WHICHSIG_PV	\
 	assert(sig)
-
-PERL_CALLCONV I32	Perl_whichsig_pvn(pTHX_ const char* sig, STRLEN len)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV I32	Perl_whichsig_pvn(pTHX_ const char* sig, STRLEN len);
 #define PERL_ARGS_ASSERT_WHICHSIG_PVN	\
 	assert(sig)
-
-PERL_CALLCONV I32	Perl_whichsig_sv(pTHX_ SV* sigsv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV I32	Perl_whichsig_sv(pTHX_ SV* sigsv);
 #define PERL_ARGS_ASSERT_WHICHSIG_SV	\
 	assert(sigsv)
-
-PERL_CALLCONV void	Perl_wrap_op_checker(pTHX_ Optype opcode, Perl_check_t new_checker, Perl_check_t *old_checker_p)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_wrap_op_checker(pTHX_ Optype opcode, Perl_check_t new_checker, Perl_check_t *old_checker_p);
 #define PERL_ARGS_ASSERT_WRAP_OP_CHECKER	\
 	assert(new_checker); assert(old_checker_p)
-
-PERL_CALLCONV void	Perl_write_to_stderr(pTHX_ SV* msv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_write_to_stderr(pTHX_ SV* msv);
 #define PERL_ARGS_ASSERT_WRITE_TO_STDERR	\
 	assert(msv)
-
-PERL_CALLCONV void	Perl_xs_boot_epilog(pTHX_ const U32 ax);
-PERL_CALLCONV I32	Perl_xs_handshake(const U32 key, void * v_my_perl, const char * file, ...)
-			__attribute__nonnull__(2)
-			__attribute__nonnull__(3);
+PERL_CALLCONV void	Perl_xs_boot_epilog(pTHX_ const I32 ax);
+PERL_CALLCONV I32	Perl_xs_handshake(const U32 key, void * v_my_perl, const char * file, ...);
 #define PERL_ARGS_ASSERT_XS_HANDSHAKE	\
 	assert(v_my_perl); assert(file)
-
-PERL_CALLCONV int	Perl_yyerror(pTHX_ const char *const s)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_yyerror(pTHX_ const char *const s);
 #define PERL_ARGS_ASSERT_YYERROR	\
 	assert(s)
-
-PERL_CALLCONV int	Perl_yyerror_pv(pTHX_ const char *const s, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_yyerror_pv(pTHX_ const char *const s, U32 flags);
 #define PERL_ARGS_ASSERT_YYERROR_PV	\
 	assert(s)
-
-PERL_CALLCONV int	Perl_yyerror_pvn(pTHX_ const char *const s, STRLEN len, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_yyerror_pvn(pTHX_ const char *const s, STRLEN len, U32 flags);
 #define PERL_ARGS_ASSERT_YYERROR_PVN	\
 	assert(s)
-
 PERL_CALLCONV int	Perl_yylex(pTHX);
 PERL_CALLCONV int	Perl_yyparse(pTHX_ int gramtype);
 PERL_CALLCONV void	Perl_yyunlex(pTHX);
 #if !(defined(DEBUGGING))
 #  if !defined(NV_PRESERVES_UV)
 #    if defined(PERL_IN_SV_C)
-STATIC int	S_sv_2iuv_non_preserve(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1);
+STATIC int	S_sv_2iuv_non_preserve(pTHX_ SV *const sv);
 #define PERL_ARGS_ASSERT_SV_2IUV_NON_PRESERVE	\
 	assert(sv)
-
 #    endif
 #  endif
 #endif
@@ -5278,19 +3559,15 @@ PERL_CALLCONV Signal_t	Perl_sighandler(int sig);
 PERL_CALLCONV void	Perl_sv_nounlocking(pTHX_ SV *sv);
 #endif
 #if !(defined(PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION))
-PERL_CALLCONV bool	Perl_do_exec(pTHX_ const char* cmd)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV bool	Perl_do_exec(pTHX_ const char* cmd);
 #define PERL_ARGS_ASSERT_DO_EXEC	\
 	assert(cmd)
-
 #endif
 #if !(defined(PERL_GLOBAL_STRUCT_PRIVATE))
 #  if defined(PERL_IMPLICIT_CONTEXT)
-PERL_CALLCONV void*	Perl_my_cxt_init(pTHX_ int *index, size_t size)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void*	Perl_my_cxt_init(pTHX_ int *index, size_t size);
 #define PERL_ARGS_ASSERT_MY_CXT_INIT	\
 	assert(index)
-
 #  endif
 #endif
 #if !(defined(WIN32))
@@ -5300,62 +3577,51 @@ PERL_CALLCONV void*	Perl_my_cxt_init(pTHX_ int *index, size_t size)
 #endif
 #if !(defined(_MSC_VER))
 PERL_CALLCONV_NO_RET int	Perl_magic_regdatum_set(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__noreturn__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__noreturn__;
 #define PERL_ARGS_ASSERT_MAGIC_REGDATUM_SET	\
 	assert(sv); assert(mg)
 
 #endif
 #if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
-PERL_CALLCONV char*	Perl_my_bzero(char* loc, I32 len)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void*	Perl_my_bzero(void* vloc, size_t len);
 #define PERL_ARGS_ASSERT_MY_BZERO	\
-	assert(loc)
-
+	assert(vloc)
 #endif
 #if !defined(HAS_GETENV_LEN)
-PERL_CALLCONV char*	Perl_getenv_len(pTHX_ const char *env_elem, unsigned long *len)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV char*	Perl_getenv_len(pTHX_ const char *env_elem, unsigned long *len);
 #define PERL_ARGS_ASSERT_GETENV_LEN	\
 	assert(env_elem); assert(len)
-
 #endif
 #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
-PERL_CALLCONV I32	Perl_my_memcmp(const char* s1, const char* s2, I32 len)
-			__attribute__pure__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+PERL_CALLCONV int	Perl_my_memcmp(const void* vs1, const void* vs2, size_t len)
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_MY_MEMCMP	\
-	assert(s1); assert(s2)
+	assert(vs1); assert(vs2)
 
 #endif
+#if !defined(HAS_MEMCPY) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY))
+PERL_CALLCONV void*	Perl_my_bcopy(const void* vfrom, void* vto, size_t len);
+#define PERL_ARGS_ASSERT_MY_BCOPY	\
+	assert(vfrom); assert(vto)
+#endif
 #if !defined(HAS_MEMSET)
-PERL_CALLCONV void*	Perl_my_memset(char* loc, I32 ch, I32 len)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void*	Perl_my_memset(void* vloc, int ch, size_t len);
 #define PERL_ARGS_ASSERT_MY_MEMSET	\
-	assert(loc)
-
+	assert(vloc)
 #endif
 #if !defined(HAS_MKDIR) || !defined(HAS_RMDIR)
 #  if defined(PERL_IN_PP_SYS_C)
 STATIC int	S_dooneliner(pTHX_ const char *cmd, const char *filename)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DOONELINER	\
 	assert(cmd); assert(filename)
 
 #  endif
 #endif
 #if !defined(HAS_RENAME)
-PERL_CALLCONV I32	Perl_same_dirent(pTHX_ const char* a, const char* b)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV I32	Perl_same_dirent(pTHX_ const char* a, const char* b);
 #define PERL_ARGS_ASSERT_SAME_DIRENT	\
 	assert(a); assert(b)
-
 #endif
 #if !defined(HAS_SIGNBIT)
 PERL_CALLCONV int	Perl_signbit(NV f)
@@ -5376,19 +3642,16 @@ PERL_CALLCONV I32	Perl_my_chsize(pTHX_ int fd, Off_t length)
 #if !defined(NV_PRESERVES_UV)
 #  if defined(DEBUGGING)
 #    if defined(PERL_IN_SV_C)
-STATIC int	S_sv_2iuv_non_preserve(pTHX_ SV *const sv, I32 numtype)
-			__attribute__nonnull__(pTHX_1);
+STATIC int	S_sv_2iuv_non_preserve(pTHX_ SV *const sv, I32 numtype);
 #define PERL_ARGS_ASSERT_SV_2IUV_NON_PRESERVE	\
 	assert(sv)
-
 #    endif
 #  endif
 #endif
 #if !defined(PERL_DISABLE_PMC)
 #  if defined(PERL_IN_PP_CTL_C)
 STATIC PerlIO *	S_doopen_pm(pTHX_ SV *name)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DOOPEN_PM	\
 	assert(name)
 
@@ -5397,85 +3660,140 @@ STATIC PerlIO *	S_doopen_pm(pTHX_ SV *name)
 #if !defined(PERL_EXT_RE_BUILD)
 #  if defined(PERL_IN_REGCOMP_C)
 PERL_STATIC_INLINE IV*	S_get_invlist_previous_index_addr(SV* invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GET_INVLIST_PREVIOUS_INDEX_ADDR	\
 	assert(invlist)
 
-PERL_STATIC_INLINE bool	S_invlist_is_iterating(SV* const invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
-#define PERL_ARGS_ASSERT_INVLIST_IS_ITERATING	\
+PERL_STATIC_INLINE void	S_invlist_clear(pTHX_ SV* invlist);
+#define PERL_ARGS_ASSERT_INVLIST_CLEAR	\
 	assert(invlist)
-
 PERL_STATIC_INLINE IV	S_invlist_previous_index(SV* const invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_INVLIST_PREVIOUS_INDEX	\
 	assert(invlist)
 
-PERL_STATIC_INLINE void	S_invlist_set_previous_index(SV* const invlist, const IV index)
-			__attribute__nonnull__(1);
+STATIC void	S_invlist_replace_list_destroys_src(pTHX_ SV *dest, SV *src);
+#define PERL_ARGS_ASSERT_INVLIST_REPLACE_LIST_DESTROYS_SRC	\
+	assert(dest); assert(src)
+PERL_STATIC_INLINE void	S_invlist_set_previous_index(SV* const invlist, const IV index);
 #define PERL_ARGS_ASSERT_INVLIST_SET_PREVIOUS_INDEX	\
 	assert(invlist)
-
-PERL_STATIC_INLINE void	S_invlist_trim(SV* const invlist)
-			__attribute__nonnull__(1);
+PERL_STATIC_INLINE void	S_invlist_trim(SV* invlist);
 #define PERL_ARGS_ASSERT_INVLIST_TRIM	\
 	assert(invlist)
-
 #  endif
 #endif
 #if !defined(PERL_IMPLICIT_SYS)
 PERL_CALLCONV I32	Perl_my_pclose(pTHX_ PerlIO* ptr);
-PERL_CALLCONV PerlIO*	Perl_my_popen(pTHX_ const char* cmd, const char* mode)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV PerlIO*	Perl_my_popen(pTHX_ const char* cmd, const char* mode);
 #define PERL_ARGS_ASSERT_MY_POPEN	\
 	assert(cmd); assert(mode)
-
 #endif
 #if !defined(PERL_IS_MINIPERL)
 #  if defined(PERL_IN_PERL_C)
-STATIC SV *	S_incpush_if_exists(pTHX_ AV *const av, SV *dir, SV *const stem)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC SV *	S_incpush_if_exists(pTHX_ AV *const av, SV *dir, SV *const stem);
 #define PERL_ARGS_ASSERT_INCPUSH_IF_EXISTS	\
 	assert(av); assert(dir); assert(stem)
-
 #  endif
 #endif
+#if !defined(PERL_NO_INLINE_FUNCTIONS)
+PERL_STATIC_INLINE STRLEN	S__is_utf8_char_slow(const U8 *s, const U8 *e)
+			__attribute__warn_unused_result__;
+#define PERL_ARGS_ASSERT__IS_UTF8_CHAR_SLOW	\
+	assert(s); assert(e)
+
+PERL_STATIC_INLINE void	S_append_utf8_from_native_byte(const U8 byte, U8** dest);
+#define PERL_ARGS_ASSERT_APPEND_UTF8_FROM_NATIVE_BYTE	\
+	assert(dest)
+PERL_STATIC_INLINE SSize_t	S_av_top_index(pTHX_ AV *av)
+			__attribute__warn_unused_result__;
+#define PERL_ARGS_ASSERT_AV_TOP_INDEX	\
+	assert(av)
+
+PERL_STATIC_INLINE void	S_cx_popblock(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_POPBLOCK	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_popeval(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_POPEVAL	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_popformat(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_POPFORMAT	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_popgiven(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_POPGIVEN	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_poploop(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_POPLOOP	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_popsub(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_POPSUB	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_popsub_args(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_POPSUB_ARGS	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_popsub_common(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_POPSUB_COMMON	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_popwhen(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_POPWHEN	\
+	assert(cx)
+PERL_STATIC_INLINE PERL_CONTEXT *	S_cx_pushblock(pTHX_ U8 type, U8 gimme, SV** sp, I32 saveix);
+#define PERL_ARGS_ASSERT_CX_PUSHBLOCK	\
+	assert(sp)
+PERL_STATIC_INLINE void	S_cx_pusheval(pTHX_ PERL_CONTEXT *cx, OP *retop, SV *namesv);
+#define PERL_ARGS_ASSERT_CX_PUSHEVAL	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_pushformat(pTHX_ PERL_CONTEXT *cx, CV *cv, OP *retop, GV *gv);
+#define PERL_ARGS_ASSERT_CX_PUSHFORMAT	\
+	assert(cx); assert(cv)
+PERL_STATIC_INLINE void	S_cx_pushgiven(pTHX_ PERL_CONTEXT *cx, SV *orig_defsv);
+#define PERL_ARGS_ASSERT_CX_PUSHGIVEN	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_pushloop_for(pTHX_ PERL_CONTEXT *cx, void *itervarp, SV *itersave);
+#define PERL_ARGS_ASSERT_CX_PUSHLOOP_FOR	\
+	assert(cx); assert(itervarp)
+PERL_STATIC_INLINE void	S_cx_pushloop_plain(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_PUSHLOOP_PLAIN	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_pushsub(pTHX_ PERL_CONTEXT *cx, CV *cv, OP *retop, bool hasargs);
+#define PERL_ARGS_ASSERT_CX_PUSHSUB	\
+	assert(cx); assert(cv)
+PERL_STATIC_INLINE void	S_cx_pushwhen(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_PUSHWHEN	\
+	assert(cx)
+PERL_STATIC_INLINE void	S_cx_topblock(pTHX_ PERL_CONTEXT *cx);
+#define PERL_ARGS_ASSERT_CX_TOPBLOCK	\
+	assert(cx)
+PERL_STATIC_INLINE bool	S_is_safe_syscall(pTHX_ const char *pv, STRLEN len, const char *what, const char *op_name)
+			__attribute__warn_unused_result__;
+#define PERL_ARGS_ASSERT_IS_SAFE_SYSCALL	\
+	assert(pv); assert(what); assert(op_name)
+
+PERL_STATIC_INLINE bool	S_sv_only_taint_gmagic(SV *sv);
+#define PERL_ARGS_ASSERT_SV_ONLY_TAINT_GMAGIC	\
+	assert(sv)
+#endif
 #if !defined(PERL_NO_UTF16_FILTER)
 #  if defined(PERL_IN_TOKE_C)
-STATIC U8*	S_add_utf16_textfilter(pTHX_ U8 *const s, bool reversed)
-			__attribute__nonnull__(pTHX_1);
+STATIC U8*	S_add_utf16_textfilter(pTHX_ U8 *const s, bool reversed);
 #define PERL_ARGS_ASSERT_ADD_UTF16_TEXTFILTER	\
 	assert(s)
-
-STATIC I32	S_utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen)
-			__attribute__nonnull__(pTHX_2);
+STATIC I32	S_utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen);
 #define PERL_ARGS_ASSERT_UTF16_TEXTFILTER	\
 	assert(sv)
-
 #  endif
 #endif
 #if !defined(SETUID_SCRIPTS_ARE_SECURE_NOW)
 #  if defined(PERL_IN_PERL_C)
-STATIC void	S_validate_suid(pTHX_ PerlIO *rsfp)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_validate_suid(pTHX_ PerlIO *rsfp);
 #define PERL_ARGS_ASSERT_VALIDATE_SUID	\
 	assert(rsfp)
-
 #  endif
 #endif
 #if !defined(SPRINTF_RETURNS_STRLEN)
-PERL_CALLCONV int	Perl_my_sprintf(char *buffer, const char *pat, ...)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+PERL_CALLCONV int	Perl_my_sprintf(char *buffer, const char *pat, ...);
 #define PERL_ARGS_ASSERT_MY_SPRINTF	\
 	assert(buffer); assert(pat)
-
 #endif
 #if !defined(USE_QUADMATH)
 #  if defined(PERL_IN_NUMERIC_C)
@@ -5483,189 +3801,125 @@ STATIC NV	S_mulexp10(NV value, I32 exponent);
 #  endif
 #endif
 #if !defined(WIN32)
-PERL_CALLCONV bool	Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV bool	Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report);
 #define PERL_ARGS_ASSERT_DO_EXEC3	\
 	assert(incmd)
-
-#endif
-#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) && !defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
-PERL_CALLCONV char*	Perl_my_bcopy(const char* from, char* to, I32 len)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
-#define PERL_ARGS_ASSERT_MY_BCOPY	\
-	assert(from); assert(to)
-
 #endif
 #if defined(DEBUGGING)
 PERL_CALLCONV int	Perl_get_debug_opts(pTHX_ const char **s, bool givehelp)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GET_DEBUG_OPTS	\
 	assert(s)
 
-PERL_CALLCONV void	Perl_hv_assert(pTHX_ HV *hv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_hv_assert(pTHX_ HV *hv);
 #define PERL_ARGS_ASSERT_HV_ASSERT	\
 	assert(hv)
-
-PERL_CALLCONV void	Perl_pad_setsv(pTHX_ PADOFFSET po, SV* sv)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_pad_setsv(pTHX_ PADOFFSET po, SV* sv);
 #define PERL_ARGS_ASSERT_PAD_SETSV	\
 	assert(sv)
-
 PERL_CALLCONV SV*	Perl_pad_sv(pTHX_ PADOFFSET po);
-PERL_CALLCONV void	Perl_set_padlist(CV * cv, PADLIST * padlist)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void	Perl_set_padlist(CV * cv, PADLIST * padlist);
 #define PERL_ARGS_ASSERT_SET_PADLIST	\
 	assert(cv)
-
 #  if defined(PERL_IN_PAD_C)
-STATIC void	S_cv_dump(pTHX_ const CV *cv, const char *title)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_cv_dump(pTHX_ const CV *cv, const char *title);
 #define PERL_ARGS_ASSERT_CV_DUMP	\
 	assert(cv); assert(title)
-
 #  endif
 #  if defined(PERL_IN_REGCOMP_C)
-STATIC void	S_dump_trie(pTHX_ const struct _reg_trie_data *trie, HV* widecharmap, AV *revcharmap, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_dump_trie(pTHX_ const struct _reg_trie_data *trie, HV* widecharmap, AV *revcharmap, U32 depth);
 #define PERL_ARGS_ASSERT_DUMP_TRIE	\
 	assert(trie); assert(revcharmap)
-
-STATIC void	S_dump_trie_interim_list(pTHX_ const struct _reg_trie_data *trie, HV* widecharmap, AV *revcharmap, U32 next_alloc, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_dump_trie_interim_list(pTHX_ const struct _reg_trie_data *trie, HV* widecharmap, AV *revcharmap, U32 next_alloc, U32 depth);
 #define PERL_ARGS_ASSERT_DUMP_TRIE_INTERIM_LIST	\
 	assert(trie); assert(revcharmap)
-
-STATIC void	S_dump_trie_interim_table(pTHX_ const struct _reg_trie_data *trie, HV* widecharmap, AV *revcharmap, U32 next_alloc, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_dump_trie_interim_table(pTHX_ const struct _reg_trie_data *trie, HV* widecharmap, AV *revcharmap, U32 next_alloc, U32 depth);
 #define PERL_ARGS_ASSERT_DUMP_TRIE_INTERIM_TABLE	\
 	assert(trie); assert(revcharmap)
-
-STATIC const regnode*	S_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, const regnode *last, const regnode *plast, SV* sv, I32 indent, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_6);
+STATIC const regnode*	S_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, const regnode *last, const regnode *plast, SV* sv, I32 indent, U32 depth);
 #define PERL_ARGS_ASSERT_DUMPUNTIL	\
 	assert(r); assert(start); assert(node); assert(sv)
-
-STATIC bool	S_put_charclass_bitmap_innards(pTHX_ SV* sv, char* bitmap, SV** bitmap_invlist)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC bool	S_put_charclass_bitmap_innards(pTHX_ SV* sv, char* bitmap, SV* nonbitmap_invlist, SV* only_utf8_locale_invlist, const regnode * const node);
 #define PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS	\
 	assert(sv); assert(bitmap)
-
-STATIC void	S_put_code_point(pTHX_ SV* sv, UV c)
-			__attribute__nonnull__(pTHX_1);
+STATIC SV*	S_put_charclass_bitmap_innards_common(pTHX_ SV* invlist, SV* posixes, SV* only_utf8, SV* not_utf8, SV* only_utf8_locale, const bool invert);
+#define PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS_COMMON	\
+	assert(invlist)
+STATIC void	S_put_charclass_bitmap_innards_invlist(pTHX_ SV *sv, SV* invlist);
+#define PERL_ARGS_ASSERT_PUT_CHARCLASS_BITMAP_INNARDS_INVLIST	\
+	assert(sv); assert(invlist)
+STATIC void	S_put_code_point(pTHX_ SV* sv, UV c);
 #define PERL_ARGS_ASSERT_PUT_CODE_POINT	\
 	assert(sv)
-
-STATIC void	S_put_range(pTHX_ SV* sv, UV start, const UV end, const bool allow_literals)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_put_range(pTHX_ SV* sv, UV start, const UV end, const bool allow_literals);
 #define PERL_ARGS_ASSERT_PUT_RANGE	\
 	assert(sv)
-
+PERL_CALLCONV int	Perl_re_indentf(pTHX_ const char *fmt, U32 depth, ...);
+#define PERL_ARGS_ASSERT_RE_INDENTF	\
+	assert(fmt)
 STATIC void	S_regdump_extflags(pTHX_ const char *lead, const U32 flags);
 STATIC void	S_regdump_intflags(pTHX_ const char *lead, const U32 flags);
-STATIC U8	S_regtail_study(pTHX_ RExC_state_t *pRExC_state, regnode *p, const regnode *val, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC U8	S_regtail_study(pTHX_ RExC_state_t *pRExC_state, regnode *p, const regnode *val, U32 depth);
 #define PERL_ARGS_ASSERT_REGTAIL_STUDY	\
 	assert(pRExC_state); assert(p); assert(val)
-
 #  endif
 #  if defined(PERL_IN_REGEXEC_C)
-STATIC void	S_debug_start_match(pTHX_ const REGEXP *prog, const bool do_utf8, const char *start, const char *end, const char *blurb)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+STATIC void	S_debug_start_match(pTHX_ const REGEXP *prog, const bool do_utf8, const char *start, const char *end, const char *blurb);
 #define PERL_ARGS_ASSERT_DEBUG_START_MATCH	\
 	assert(prog); assert(start); assert(end); assert(blurb)
-
-STATIC void	S_dump_exec_pos(pTHX_ const char *locinput, const regnode *scan, const char *loc_regeol, const char *loc_bostr, const char *loc_reg_starttry, const bool do_utf8)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+STATIC void	S_dump_exec_pos(pTHX_ const char *locinput, const regnode *scan, const char *loc_regeol, const char *loc_bostr, const char *loc_reg_starttry, const bool do_utf8, const U32 depth);
 #define PERL_ARGS_ASSERT_DUMP_EXEC_POS	\
 	assert(locinput); assert(scan); assert(loc_regeol); assert(loc_bostr); assert(loc_reg_starttry)
-
+PERL_CALLCONV int	Perl_re_exec_indentf(pTHX_ const char *fmt, U32 depth, ...);
+#define PERL_ARGS_ASSERT_RE_EXEC_INDENTF	\
+	assert(fmt)
 #  endif
 #  if defined(PERL_IN_SV_C)
-STATIC void	S_del_sv(pTHX_ SV *p)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_del_sv(pTHX_ SV *p);
 #define PERL_ARGS_ASSERT_DEL_SV	\
 	assert(p)
-
 #  endif
 #  if defined(PERL_IN_TOKE_C)
 STATIC void	S_printbuf(pTHX_ const char *const fmt, const char *const s)
-			__attribute__format__(__printf__,pTHX_1,0)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__format__(__printf__,pTHX_1,0);
 #define PERL_ARGS_ASSERT_PRINTBUF	\
 	assert(fmt); assert(s)
 
-STATIC int	S_tokereport(pTHX_ I32 rv, const YYSTYPE* lvalp)
-			__attribute__nonnull__(pTHX_2);
+STATIC int	S_tokereport(pTHX_ I32 rv, const YYSTYPE* lvalp);
 #define PERL_ARGS_ASSERT_TOKEREPORT	\
 	assert(lvalp)
+#  endif
+#  if defined(USE_LOCALE)     && (defined(PERL_IN_LOCALE_C) || defined (PERL_EXT_POSIX))
+PERL_CALLCONV char *	Perl__setlocale_debug_string(const int category, const char* const locale, const char* const retval)
+			__attribute__warn_unused_result__
+			__attribute__pure__;
 
 #  endif
 #endif
 #if defined(DEBUG_LEAKING_SCALARS_FORK_DUMP)
-PERL_CALLCONV void	Perl_dump_sv_child(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_dump_sv_child(pTHX_ SV *sv);
 #define PERL_ARGS_ASSERT_DUMP_SV_CHILD	\
 	assert(sv)
-
 #endif
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
-PERL_CALLCONV I32	Perl_do_ipcctl(pTHX_ I32 optype, SV** mark, SV** sp)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV I32	Perl_do_ipcctl(pTHX_ I32 optype, SV** mark, SV** sp);
 #define PERL_ARGS_ASSERT_DO_IPCCTL	\
 	assert(mark); assert(sp)
-
-PERL_CALLCONV I32	Perl_do_ipcget(pTHX_ I32 optype, SV** mark, SV** sp)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV I32	Perl_do_ipcget(pTHX_ I32 optype, SV** mark, SV** sp);
 #define PERL_ARGS_ASSERT_DO_IPCGET	\
 	assert(mark); assert(sp)
-
-PERL_CALLCONV I32	Perl_do_msgrcv(pTHX_ SV** mark, SV** sp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV I32	Perl_do_msgrcv(pTHX_ SV** mark, SV** sp);
 #define PERL_ARGS_ASSERT_DO_MSGRCV	\
 	assert(mark); assert(sp)
-
-PERL_CALLCONV I32	Perl_do_msgsnd(pTHX_ SV** mark, SV** sp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV I32	Perl_do_msgsnd(pTHX_ SV** mark, SV** sp);
 #define PERL_ARGS_ASSERT_DO_MSGSND	\
 	assert(mark); assert(sp)
-
-PERL_CALLCONV I32	Perl_do_semop(pTHX_ SV** mark, SV** sp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV I32	Perl_do_semop(pTHX_ SV** mark, SV** sp);
 #define PERL_ARGS_ASSERT_DO_SEMOP	\
 	assert(mark); assert(sp)
-
-PERL_CALLCONV I32	Perl_do_shmio(pTHX_ I32 optype, SV** mark, SV** sp)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV I32	Perl_do_shmio(pTHX_ I32 optype, SV** mark, SV** sp);
 #define PERL_ARGS_ASSERT_DO_SHMIO	\
 	assert(mark); assert(sp)
-
 #endif
 #if defined(HAS_SIGACTION) && defined(SA_SIGINFO)
 PERL_CALLCONV Signal_t	Perl_csighandler(int sig, siginfo_t *info, void *uap);
@@ -5675,31 +3929,23 @@ PERL_CALLCONV Signal_t	Perl_sighandler(int sig, siginfo_t *info, void *uap);
 PERL_CALLCONV void	Perl_sys_intern_clear(pTHX);
 PERL_CALLCONV void	Perl_sys_intern_init(pTHX);
 #  if defined(USE_ITHREADS)
-PERL_CALLCONV void	Perl_sys_intern_dup(pTHX_ struct interp_intern* src, struct interp_intern* dst)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sys_intern_dup(pTHX_ struct interp_intern* src, struct interp_intern* dst);
 #define PERL_ARGS_ASSERT_SYS_INTERN_DUP	\
 	assert(src); assert(dst)
-
 #  endif
 #endif
 #if defined(MYMALLOC)
-PERL_CALLCONV void	Perl_dump_mstats(pTHX_ const char* s)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_dump_mstats(pTHX_ const char* s);
 #define PERL_ARGS_ASSERT_DUMP_MSTATS	\
 	assert(s)
-
-PERL_CALLCONV int	Perl_get_mstats(pTHX_ perl_mstats_t *buf, int buflen, int level)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_get_mstats(pTHX_ perl_mstats_t *buf, int buflen, int level);
 #define PERL_ARGS_ASSERT_GET_MSTATS	\
 	assert(buf)
-
 PERL_CALLCONV MEM_SIZE	Perl_malloc_good_size(size_t nbytes)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV MEM_SIZE	Perl_malloced_size(void *p)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_MALLOCED_SIZE	\
 	assert(p)
 
@@ -5708,122 +3954,87 @@ PERL_CALLCONV MEM_SIZE	Perl_malloced_size(void *p)
 /* PERL_CALLCONV void	Perl_sv_nounlocking(pTHX_ SV *sv); */
 #endif
 #if defined(PERL_ANY_COW)
-PERL_CALLCONV SV*	Perl_sv_setsv_cow(pTHX_ SV* dstr, SV* sstr)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV*	Perl_sv_setsv_cow(pTHX_ SV* dstr, SV* sstr);
 #define PERL_ARGS_ASSERT_SV_SETSV_COW	\
 	assert(sstr)
-
 #endif
 #if defined(PERL_CORE)
-PERL_CALLCONV void	Perl_opslab_force_free(pTHX_ OPSLAB *slab)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_opslab_force_free(pTHX_ OPSLAB *slab);
 #define PERL_ARGS_ASSERT_OPSLAB_FORCE_FREE	\
 	assert(slab)
-
-PERL_CALLCONV void	Perl_opslab_free(pTHX_ OPSLAB *slab)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_opslab_free(pTHX_ OPSLAB *slab);
 #define PERL_ARGS_ASSERT_OPSLAB_FREE	\
 	assert(slab)
-
-PERL_CALLCONV void	Perl_opslab_free_nopad(pTHX_ OPSLAB *slab)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_opslab_free_nopad(pTHX_ OPSLAB *slab);
 #define PERL_ARGS_ASSERT_OPSLAB_FREE_NOPAD	\
 	assert(slab)
-
-PERL_CALLCONV void	Perl_parser_free_nexttoke_ops(pTHX_ yy_parser *parser, OPSLAB *slab)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_parser_free_nexttoke_ops(pTHX_ yy_parser *parser, OPSLAB *slab);
 #define PERL_ARGS_ASSERT_PARSER_FREE_NEXTTOKE_OPS	\
 	assert(parser); assert(slab)
-
 PERL_STATIC_INLINE bool	S_should_warn_nl(const char *pv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SHOULD_WARN_NL	\
 	assert(pv)
 
 #  if defined(PERL_DEBUG_READONLY_OPS)
-PERL_CALLCONV void	Perl_Slab_to_ro(pTHX_ OPSLAB *slab)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_Slab_to_ro(pTHX_ OPSLAB *slab);
 #define PERL_ARGS_ASSERT_SLAB_TO_RO	\
 	assert(slab)
-
-PERL_CALLCONV void	Perl_Slab_to_rw(pTHX_ OPSLAB *const slab)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_Slab_to_rw(pTHX_ OPSLAB *const slab);
 #define PERL_ARGS_ASSERT_SLAB_TO_RW	\
 	assert(slab)
-
 #  endif
 #endif
 #if defined(PERL_CORE) || defined (PERL_EXT)
-PERL_STATIC_INLINE STRLEN	S_sv_or_pv_pos_u2b(pTHX_ SV *sv, const char *pv, STRLEN pos, STRLEN *lenp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_STATIC_INLINE STRLEN	S_sv_or_pv_pos_u2b(pTHX_ SV *sv, const char *pv, STRLEN pos, STRLEN *lenp);
 #define PERL_ARGS_ASSERT_SV_OR_PV_POS_U2B	\
 	assert(sv); assert(pv)
-
 #endif
 #if defined(PERL_CR_FILTER)
 #  if defined(PERL_IN_TOKE_C)
 STATIC I32	S_cr_textfilter(pTHX_ int idx, SV *sv, int maxlen);
-STATIC void	S_strip_return(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_strip_return(pTHX_ SV *sv);
 #define PERL_ARGS_ASSERT_STRIP_RETURN	\
 	assert(sv)
-
 #  endif
 #endif
 #if defined(PERL_DEBUG_READONLY_COW)
-PERL_CALLCONV void	Perl_sv_buf_to_ro(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_buf_to_ro(pTHX_ SV *sv);
 #define PERL_ARGS_ASSERT_SV_BUF_TO_RO	\
 	assert(sv)
-
 #  if defined(PERL_IN_SV_C)
-STATIC void	S_sv_buf_to_rw(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_sv_buf_to_rw(pTHX_ SV *sv);
 #define PERL_ARGS_ASSERT_SV_BUF_TO_RW	\
 	assert(sv)
-
 #  endif
 #endif
 #if defined(PERL_DEBUG_READONLY_OPS)
-PERL_CALLCONV PADOFFSET	Perl_op_refcnt_dec(pTHX_ OP *o)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PADOFFSET	Perl_op_refcnt_dec(pTHX_ OP *o);
 #define PERL_ARGS_ASSERT_OP_REFCNT_DEC	\
 	assert(o)
-
 PERL_CALLCONV OP *	Perl_op_refcnt_inc(pTHX_ OP *o);
 #endif
 #if defined(PERL_DEFAULT_DO_EXEC3_IMPLEMENTATION)
-/* PERL_CALLCONV bool	Perl_do_exec(pTHX_ const char* cmd)
-			__attribute__nonnull__(pTHX_1); */
-
+/* PERL_CALLCONV bool	Perl_do_exec(pTHX_ const char* cmd); */
 #endif
 #if defined(PERL_DONT_CREATE_GVSV)
 /* PERL_CALLCONV GV*	Perl_gv_SVadd(pTHX_ GV *gv); */
 #endif
 #if defined(PERL_GLOBAL_STRUCT)
 PERL_CALLCONV struct perl_vars *	Perl_GetVars(pTHX);
-PERL_CALLCONV void	Perl_free_global_struct(pTHX_ struct perl_vars *plvarsp)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_free_global_struct(pTHX_ struct perl_vars *plvarsp);
 #define PERL_ARGS_ASSERT_FREE_GLOBAL_STRUCT	\
 	assert(plvarsp)
-
 PERL_CALLCONV struct perl_vars*	Perl_init_global_struct(pTHX);
 #endif
 #if defined(PERL_GLOBAL_STRUCT_PRIVATE)
 #  if defined(PERL_IMPLICIT_CONTEXT)
-PERL_CALLCONV int	Perl_my_cxt_index(pTHX_ const char *my_cxt_key)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_my_cxt_index(pTHX_ const char *my_cxt_key);
 #define PERL_ARGS_ASSERT_MY_CXT_INDEX	\
 	assert(my_cxt_key)
-
-PERL_CALLCONV void*	Perl_my_cxt_init(pTHX_ const char *my_cxt_key, size_t size)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void*	Perl_my_cxt_init(pTHX_ const char *my_cxt_key, size_t size);
 #define PERL_ARGS_ASSERT_MY_CXT_INIT	\
 	assert(my_cxt_key)
-
 #  endif
 #endif
 #if defined(PERL_IMPLICIT_CONTEXT)
@@ -5832,8 +4043,7 @@ PERL_CALLCONV_NO_RET void	Perl_croak_nocontext(const char* pat, ...)
 			__attribute__format__null_ok__(__printf__,1,2);
 
 PERL_CALLCONV void	Perl_deb_nocontext(const char* pat, ...)
-			__attribute__format__(__printf__,1,2)
-			__attribute__nonnull__(1);
+			__attribute__format__(__printf__,1,2);
 #define PERL_ARGS_ASSERT_DEB_NOCONTEXT	\
 	assert(pat)
 
@@ -5842,326 +4052,206 @@ PERL_CALLCONV_NO_RET OP*	Perl_die_nocontext(const char* pat, ...)
 			__attribute__format__null_ok__(__printf__,1,2);
 
 PERL_CALLCONV char*	Perl_form_nocontext(const char* pat, ...)
-			__attribute__format__(__printf__,1,2)
-			__attribute__nonnull__(1);
+			__attribute__format__(__printf__,1,2);
 #define PERL_ARGS_ASSERT_FORM_NOCONTEXT	\
 	assert(pat)
 
 PERL_CALLCONV int	Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
-			__attribute__format__(__printf__,2,3)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__format__(__printf__,2,3);
 #define PERL_ARGS_ASSERT_FPRINTF_NOCONTEXT	\
 	assert(stream); assert(format)
 
-PERL_CALLCONV void	Perl_load_module_nocontext(U32 flags, SV* name, SV* ver, ...)
-			__attribute__nonnull__(2);
+PERL_CALLCONV void	Perl_load_module_nocontext(U32 flags, SV* name, SV* ver, ...);
 #define PERL_ARGS_ASSERT_LOAD_MODULE_NOCONTEXT	\
 	assert(name)
-
 PERL_CALLCONV SV*	Perl_mess_nocontext(const char* pat, ...)
-			__attribute__format__(__printf__,1,2)
-			__attribute__nonnull__(1);
+			__attribute__format__(__printf__,1,2);
 #define PERL_ARGS_ASSERT_MESS_NOCONTEXT	\
 	assert(pat)
 
 PERL_CALLCONV SV*	Perl_newSVpvf_nocontext(const char *const pat, ...)
-			__attribute__format__(__printf__,1,2)
-			__attribute__nonnull__(1);
+			__attribute__format__(__printf__,1,2);
 #define PERL_ARGS_ASSERT_NEWSVPVF_NOCONTEXT	\
 	assert(pat)
 
 PERL_CALLCONV int	Perl_printf_nocontext(const char *format, ...)
-			__attribute__format__(__printf__,1,2)
-			__attribute__nonnull__(1);
+			__attribute__format__(__printf__,1,2);
 #define PERL_ARGS_ASSERT_PRINTF_NOCONTEXT	\
 	assert(format)
 
 PERL_CALLCONV void	Perl_sv_catpvf_mg_nocontext(SV *const sv, const char *const pat, ...)
-			__attribute__format__(__printf__,2,3)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__format__(__printf__,2,3);
 #define PERL_ARGS_ASSERT_SV_CATPVF_MG_NOCONTEXT	\
 	assert(sv); assert(pat)
 
 PERL_CALLCONV void	Perl_sv_catpvf_nocontext(SV *const sv, const char *const pat, ...)
-			__attribute__format__(__printf__,2,3)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__format__(__printf__,2,3);
 #define PERL_ARGS_ASSERT_SV_CATPVF_NOCONTEXT	\
 	assert(sv); assert(pat)
 
 PERL_CALLCONV void	Perl_sv_setpvf_mg_nocontext(SV *const sv, const char *const pat, ...)
-			__attribute__format__(__printf__,2,3)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__format__(__printf__,2,3);
 #define PERL_ARGS_ASSERT_SV_SETPVF_MG_NOCONTEXT	\
 	assert(sv); assert(pat)
 
 PERL_CALLCONV void	Perl_sv_setpvf_nocontext(SV *const sv, const char *const pat, ...)
-			__attribute__format__(__printf__,2,3)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__format__(__printf__,2,3);
 #define PERL_ARGS_ASSERT_SV_SETPVF_NOCONTEXT	\
 	assert(sv); assert(pat)
 
 PERL_CALLCONV void	Perl_warn_nocontext(const char* pat, ...)
-			__attribute__format__(__printf__,1,2)
-			__attribute__nonnull__(1);
+			__attribute__format__(__printf__,1,2);
 #define PERL_ARGS_ASSERT_WARN_NOCONTEXT	\
 	assert(pat)
 
 PERL_CALLCONV void	Perl_warner_nocontext(U32 err, const char* pat, ...)
-			__attribute__format__(__printf__,2,3)
-			__attribute__nonnull__(2);
+			__attribute__format__(__printf__,2,3);
 #define PERL_ARGS_ASSERT_WARNER_NOCONTEXT	\
 	assert(pat)
 
 #endif
 #if defined(PERL_IMPLICIT_SYS)
-PERL_CALLCONV PerlInterpreter*	perl_alloc_using(struct IPerlMem *ipM, struct IPerlMem *ipMS, struct IPerlMem *ipMP, struct IPerlEnv *ipE, struct IPerlStdIO *ipStd, struct IPerlLIO *ipLIO, struct IPerlDir *ipD, struct IPerlSock *ipS, struct IPerlProc *ipP)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2)
-			__attribute__nonnull__(3)
-			__attribute__nonnull__(4)
-			__attribute__nonnull__(5)
-			__attribute__nonnull__(6)
-			__attribute__nonnull__(7)
-			__attribute__nonnull__(8)
-			__attribute__nonnull__(9);
+PERL_CALLCONV PerlInterpreter*	perl_alloc_using(struct IPerlMem *ipM, struct IPerlMem *ipMS, struct IPerlMem *ipMP, struct IPerlEnv *ipE, struct IPerlStdIO *ipStd, struct IPerlLIO *ipLIO, struct IPerlDir *ipD, struct IPerlSock *ipS, struct IPerlProc *ipP);
 #define PERL_ARGS_ASSERT_PERL_ALLOC_USING	\
 	assert(ipM); assert(ipMS); assert(ipMP); assert(ipE); assert(ipStd); assert(ipLIO); assert(ipD); assert(ipS); assert(ipP)
-
 #  if defined(USE_ITHREADS)
-PERL_CALLCONV PerlInterpreter*	perl_clone_using(PerlInterpreter *proto_perl, UV flags, struct IPerlMem* ipM, struct IPerlMem* ipMS, struct IPerlMem* ipMP, struct IPerlEnv* ipE, struct IPerlStdIO* ipStd, struct IPerlLIO* ipLIO, struct IPerlDir* ipD, struct IPerlSock* ipS, struct IPerlProc* ipP)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(3)
-			__attribute__nonnull__(4)
-			__attribute__nonnull__(5)
-			__attribute__nonnull__(6)
-			__attribute__nonnull__(7)
-			__attribute__nonnull__(8)
-			__attribute__nonnull__(9)
-			__attribute__nonnull__(10)
-			__attribute__nonnull__(11);
+PERL_CALLCONV PerlInterpreter*	perl_clone_using(PerlInterpreter *proto_perl, UV flags, struct IPerlMem* ipM, struct IPerlMem* ipMS, struct IPerlMem* ipMP, struct IPerlEnv* ipE, struct IPerlStdIO* ipStd, struct IPerlLIO* ipLIO, struct IPerlDir* ipD, struct IPerlSock* ipS, struct IPerlProc* ipP);
 #define PERL_ARGS_ASSERT_PERL_CLONE_USING	\
 	assert(proto_perl); assert(ipM); assert(ipMS); assert(ipMP); assert(ipE); assert(ipStd); assert(ipLIO); assert(ipD); assert(ipS); assert(ipP)
-
 #  endif
 #endif
 #if defined(PERL_IN_AV_C)
-STATIC MAGIC*	S_get_aux_mg(pTHX_ AV *av)
-			__attribute__nonnull__(pTHX_1);
+STATIC MAGIC*	S_get_aux_mg(pTHX_ AV *av);
 #define PERL_ARGS_ASSERT_GET_AUX_MG	\
 	assert(av)
-
 #endif
 #if defined(PERL_IN_DEB_C)
-STATIC void	S_deb_stack_n(pTHX_ SV** stack_base, I32 stack_min, I32 stack_max, I32 mark_min, I32 mark_max)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_deb_stack_n(pTHX_ SV** stack_base, I32 stack_min, I32 stack_max, I32 mark_min, I32 mark_max);
 #define PERL_ARGS_ASSERT_DEB_STACK_N	\
 	assert(stack_base)
-
 #endif
 #if defined(PERL_IN_DOIO_C)
-STATIC void	S_exec_failed(pTHX_ const char *cmd, int fd, int do_report)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_exec_failed(pTHX_ const char *cmd, int fd, int do_report);
 #define PERL_ARGS_ASSERT_EXEC_FAILED	\
 	assert(cmd)
-
 STATIC bool	S_ingroup(pTHX_ Gid_t testgid, bool effective)
 			__attribute__warn_unused_result__;
 
-STATIC bool	S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname, PerlIO *saveifp, PerlIO *saveofp, int savefd, char savetype, int writing, bool was_fdopen, const char *type)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+STATIC bool	S_openn_cleanup(pTHX_ GV *gv, IO *io, PerlIO *fp, char *mode, const char *oname, PerlIO *saveifp, PerlIO *saveofp, int savefd, char savetype, int writing, bool was_fdopen, const char *type);
 #define PERL_ARGS_ASSERT_OPENN_CLEANUP	\
 	assert(gv); assert(io); assert(mode); assert(oname)
-
-STATIC IO *	S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp, int *savefd, char *savetype)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5)
-			__attribute__nonnull__(pTHX_6);
+STATIC IO *	S_openn_setup(pTHX_ GV *gv, char *mode, PerlIO **saveifp, PerlIO **saveofp, int *savefd, char *savetype);
 #define PERL_ARGS_ASSERT_OPENN_SETUP	\
 	assert(gv); assert(mode); assert(saveifp); assert(saveofp); assert(savefd); assert(savetype)
-
 #endif
 #if defined(PERL_IN_DOOP_C)
 STATIC I32	S_do_trans_complex(pTHX_ SV * const sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DO_TRANS_COMPLEX	\
 	assert(sv)
 
 STATIC I32	S_do_trans_complex_utf8(pTHX_ SV * const sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DO_TRANS_COMPLEX_UTF8	\
 	assert(sv)
 
 STATIC I32	S_do_trans_count(pTHX_ SV * const sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DO_TRANS_COUNT	\
 	assert(sv)
 
 STATIC I32	S_do_trans_count_utf8(pTHX_ SV * const sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DO_TRANS_COUNT_UTF8	\
 	assert(sv)
 
 STATIC I32	S_do_trans_simple(pTHX_ SV * const sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DO_TRANS_SIMPLE	\
 	assert(sv)
 
 STATIC I32	S_do_trans_simple_utf8(pTHX_ SV * const sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DO_TRANS_SIMPLE_UTF8	\
 	assert(sv)
 
 #endif
 #if defined(PERL_IN_DUMP_C)
 STATIC CV*	S_deb_curcv(pTHX_ I32 ix);
-STATIC void	S_debprof(pTHX_ const OP *o)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_debprof(pTHX_ const OP *o);
 #define PERL_ARGS_ASSERT_DEBPROF	\
 	assert(o)
-
-STATIC SV*	S_pm_description(pTHX_ const PMOP *pm)
-			__attribute__nonnull__(pTHX_1);
+STATIC SV*	S_pm_description(pTHX_ const PMOP *pm);
 #define PERL_ARGS_ASSERT_PM_DESCRIPTION	\
 	assert(pm)
-
 STATIC UV	S_sequence_num(pTHX_ const OP *o);
 #endif
 #if defined(PERL_IN_DUMP_C) || defined(PERL_IN_HV_C) || defined(PERL_IN_SV_C) || defined(PERL_IN_SCOPE_C)
-PERL_CALLCONV void	Perl_hv_kill_backrefs(pTHX_ HV *hv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_hv_kill_backrefs(pTHX_ HV *hv);
 #define PERL_ARGS_ASSERT_HV_KILL_BACKREFS	\
 	assert(hv)
-
 #endif
 #if defined(PERL_IN_GV_C)
-STATIC bool	S_find_default_stash(pTHX_ HV **stash, const char *name, STRLEN len, const U32 is_utf8, const I32 add, const svtype sv_type)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC bool	S_find_default_stash(pTHX_ HV **stash, const char *name, STRLEN len, const U32 is_utf8, const I32 add, const svtype sv_type);
 #define PERL_ARGS_ASSERT_FIND_DEFAULT_STASH	\
 	assert(stash); assert(name)
-
 PERL_STATIC_INLINE GV*	S_gv_fetchmeth_internal(pTHX_ HV* stash, SV* meth, const char* name, STRLEN len, I32 level, U32 flags);
-STATIC void	S_gv_init_svtype(pTHX_ GV *gv, const svtype sv_type)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_gv_init_svtype(pTHX_ GV *gv, const svtype sv_type);
 #define PERL_ARGS_ASSERT_GV_INIT_SVTYPE	\
 	assert(gv)
-
-STATIC bool	S_gv_is_in_main(pTHX_ const char *name, STRLEN len, const U32 is_utf8)
-			__attribute__nonnull__(pTHX_1);
+STATIC bool	S_gv_is_in_main(pTHX_ const char *name, STRLEN len, const U32 is_utf8);
 #define PERL_ARGS_ASSERT_GV_IS_IN_MAIN	\
 	assert(name)
-
-STATIC bool	S_gv_magicalize(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, bool addmg, const svtype sv_type)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC bool	S_gv_magicalize(pTHX_ GV *gv, HV *stash, const char *name, STRLEN len, bool addmg, const svtype sv_type);
 #define PERL_ARGS_ASSERT_GV_MAGICALIZE	\
 	assert(gv); assert(stash); assert(name)
-
-STATIC void	S_gv_magicalize_isa(pTHX_ GV *gv)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_gv_magicalize_isa(pTHX_ GV *gv);
 #define PERL_ARGS_ASSERT_GV_MAGICALIZE_ISA	\
 	assert(gv)
-
-PERL_STATIC_INLINE HV*	S_gv_stashpvn_internal(pTHX_ const char* name, U32 namelen, I32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_STATIC_INLINE HV*	S_gv_stashpvn_internal(pTHX_ const char* name, U32 namelen, I32 flags);
 #define PERL_ARGS_ASSERT_GV_STASHPVN_INTERNAL	\
 	assert(name)
-
 PERL_STATIC_INLINE HV*	S_gv_stashsvpvn_cached(pTHX_ SV *namesv, const char* name, U32 namelen, I32 flags);
-STATIC void	S_maybe_multimagic_gv(pTHX_ GV *gv, const char *name, const svtype sv_type)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_maybe_multimagic_gv(pTHX_ GV *gv, const char *name, const svtype sv_type);
 #define PERL_ARGS_ASSERT_MAYBE_MULTIMAGIC_GV	\
 	assert(gv); assert(name)
-
-STATIC bool	S_parse_gv_stash_name(pTHX_ HV **stash, GV **gv, const char **name, STRLEN *len, const char *nambeg, STRLEN full_len, const U32 is_utf8, const I32 add)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+STATIC bool	S_parse_gv_stash_name(pTHX_ HV **stash, GV **gv, const char **name, STRLEN *len, const char *nambeg, STRLEN full_len, const U32 is_utf8, const I32 add);
 #define PERL_ARGS_ASSERT_PARSE_GV_STASH_NAME	\
 	assert(stash); assert(gv); assert(name); assert(len); assert(nambeg)
-
-STATIC HV*	S_require_tie_mod(pTHX_ GV *gv, const char *varpv, SV* namesv, const char *methpv, const U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+STATIC HV*	S_require_tie_mod(pTHX_ GV *gv, const char *varpv, SV* namesv, const char *methpv, const U32 flags);
 #define PERL_ARGS_ASSERT_REQUIRE_TIE_MOD	\
 	assert(gv); assert(varpv); assert(namesv); assert(methpv)
-
 #endif
 #if defined(PERL_IN_GV_C) || defined(PERL_IN_SV_C) || defined(PERL_IN_PAD_C) || defined(PERL_IN_OP_C)
-PERL_CALLCONV void	Perl_sv_add_backref(pTHX_ SV *const tsv, SV *const sv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_sv_add_backref(pTHX_ SV *const tsv, SV *const sv);
 #define PERL_ARGS_ASSERT_SV_ADD_BACKREF	\
 	assert(tsv); assert(sv)
-
 #endif
 #if defined(PERL_IN_HV_C)
-STATIC void	S_clear_placeholders(pTHX_ HV *hv, U32 items)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_clear_placeholders(pTHX_ HV *hv, U32 items);
 #define PERL_ARGS_ASSERT_CLEAR_PLACEHOLDERS	\
 	assert(hv)
-
-STATIC void	S_hfreeentries(pTHX_ HV *hv)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_hfreeentries(pTHX_ HV *hv);
 #define PERL_ARGS_ASSERT_HFREEENTRIES	\
 	assert(hv)
-
-STATIC void	S_hsplit(pTHX_ HV *hv, STRLEN const oldsize, STRLEN newsize)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_hsplit(pTHX_ HV *hv, STRLEN const oldsize, STRLEN newsize);
 #define PERL_ARGS_ASSERT_HSPLIT	\
 	assert(hv)
-
-STATIC struct xpvhv_aux*	S_hv_auxinit(pTHX_ HV *hv)
-			__attribute__nonnull__(pTHX_1);
+STATIC struct xpvhv_aux*	S_hv_auxinit(pTHX_ HV *hv);
 #define PERL_ARGS_ASSERT_HV_AUXINIT	\
 	assert(hv)
-
-STATIC struct xpvhv_aux*	S_hv_auxinit_internal(struct xpvhv_aux *iter)
-			__attribute__nonnull__(1);
+STATIC struct xpvhv_aux*	S_hv_auxinit_internal(struct xpvhv_aux *iter);
 #define PERL_ARGS_ASSERT_HV_AUXINIT_INTERNAL	\
 	assert(iter)
-
 STATIC SV*	S_hv_delete_common(pTHX_ HV *hv, SV *keysv, const char *key, STRLEN klen, int k_flags, I32 d_flags, U32 hash);
-STATIC SV*	S_hv_free_ent_ret(pTHX_ HV *hv, HE *entry)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC SV*	S_hv_free_ent_ret(pTHX_ HV *hv, HE *entry);
 #define PERL_ARGS_ASSERT_HV_FREE_ENT_RET	\
 	assert(hv); assert(entry)
-
-STATIC void	S_hv_magic_check(HV *hv, bool *needs_copy, bool *needs_store)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2)
-			__attribute__nonnull__(3);
+STATIC void	S_hv_magic_check(HV *hv, bool *needs_copy, bool *needs_store);
 #define PERL_ARGS_ASSERT_HV_MAGIC_CHECK	\
 	assert(hv); assert(needs_copy); assert(needs_store)
-
 PERL_STATIC_NO_RET void	S_hv_notallowed(pTHX_ int flags, const char *key, I32 klen, const char *msg)
-			__attribute__noreturn__
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_4);
+			__attribute__noreturn__;
 #define PERL_ARGS_ASSERT_HV_NOTALLOWED	\
 	assert(key); assert(msg)
 
@@ -6170,360 +4260,227 @@ STATIC HE*	S_new_he(pTHX)
 			__attribute__warn_unused_result__;
 
 PERL_STATIC_INLINE U32	S_ptr_hash(PTRV u);
-STATIC SV *	S_refcounted_he_value(pTHX_ const struct refcounted_he *he)
-			__attribute__nonnull__(pTHX_1);
+STATIC SV *	S_refcounted_he_value(pTHX_ const struct refcounted_he *he);
 #define PERL_ARGS_ASSERT_REFCOUNTED_HE_VALUE	\
 	assert(he)
-
 STATIC HEK*	S_save_hek_flags(const char *str, I32 len, U32 hash, int flags)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SAVE_HEK_FLAGS	\
 	assert(str)
 
 STATIC HEK*	S_share_hek_flags(pTHX_ const char *str, I32 len, U32 hash, int flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SHARE_HEK_FLAGS	\
 	assert(str)
 
 STATIC void	S_unshare_hek_or_pvn(pTHX_ const HEK* hek, const char* str, I32 len, U32 hash);
 #endif
 #if defined(PERL_IN_HV_C) || defined(PERL_IN_MG_C) || defined(PERL_IN_SV_C)
-PERL_CALLCONV void	Perl_sv_kill_backrefs(pTHX_ SV *const sv, AV *const av)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl_sv_kill_backrefs(pTHX_ SV *const sv, AV *const av);
 #define PERL_ARGS_ASSERT_SV_KILL_BACKREFS	\
 	assert(sv)
-
 #endif
 #if defined(PERL_IN_HV_C) || defined(PERL_IN_SV_C)
-PERL_CALLCONV SV*	Perl_hfree_next_entry(pTHX_ HV *hv, STRLEN *indexp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV*	Perl_hfree_next_entry(pTHX_ HV *hv, STRLEN *indexp);
 #define PERL_ARGS_ASSERT_HFREE_NEXT_ENTRY	\
 	assert(hv); assert(indexp)
-
 #endif
 #if defined(PERL_IN_MALLOC_C)
-STATIC int	S_adjust_size_and_find_bucket(size_t *nbytes_p)
-			__attribute__nonnull__(1);
+STATIC int	S_adjust_size_and_find_bucket(size_t *nbytes_p);
 #define PERL_ARGS_ASSERT_ADJUST_SIZE_AND_FIND_BUCKET	\
 	assert(nbytes_p)
-
 #endif
 #if defined(PERL_IN_MG_C)
-STATIC void	S_fixup_errno_string(pTHX_ SV* sv)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_fixup_errno_string(pTHX_ SV* sv);
 #define PERL_ARGS_ASSERT_FIXUP_ERRNO_STRING	\
 	assert(sv)
-
-STATIC SV*	S_magic_methcall1(pTHX_ SV *sv, const MAGIC *mg, SV *meth, U32 flags, int n, SV *val)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC SV*	S_magic_methcall1(pTHX_ SV *sv, const MAGIC *mg, SV *meth, U32 flags, int n, SV *val);
 #define PERL_ARGS_ASSERT_MAGIC_METHCALL1	\
 	assert(sv); assert(mg); assert(meth)
-
-STATIC int	S_magic_methpack(pTHX_ SV *sv, const MAGIC *mg, SV *meth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC int	S_magic_methpack(pTHX_ SV *sv, const MAGIC *mg, SV *meth);
 #define PERL_ARGS_ASSERT_MAGIC_METHPACK	\
 	assert(sv); assert(mg); assert(meth)
-
 STATIC void	S_restore_magic(pTHX_ const void *p);
-STATIC void	S_save_magic_flags(pTHX_ I32 mgs_ix, SV *sv, U32 flags)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_save_magic_flags(pTHX_ I32 mgs_ix, SV *sv, U32 flags);
 #define PERL_ARGS_ASSERT_SAVE_MAGIC_FLAGS	\
 	assert(sv)
-
 STATIC void	S_unwind_handler_stack(pTHX_ const void *p);
 #endif
 #if defined(PERL_IN_MG_C) || defined(PERL_IN_PP_C)
-PERL_CALLCONV bool	Perl_translate_substr_offsets(STRLEN curlen, IV pos1_iv, bool pos1_is_uv, IV len_iv, bool len_is_uv, STRLEN *posp, STRLEN *lenp)
-			__attribute__nonnull__(6)
-			__attribute__nonnull__(7);
+PERL_CALLCONV bool	Perl_translate_substr_offsets(STRLEN curlen, IV pos1_iv, bool pos1_is_uv, IV len_iv, bool len_is_uv, STRLEN *posp, STRLEN *lenp);
 #define PERL_ARGS_ASSERT_TRANSLATE_SUBSTR_OFFSETS	\
 	assert(posp); assert(lenp)
-
 #endif
 #if defined(PERL_IN_MRO_C)
-STATIC void	S_mro_clean_isarev(pTHX_ HV * const isa, const char * const name, const STRLEN len, HV * const exceptions, U32 hash, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_mro_clean_isarev(pTHX_ HV * const isa, const char * const name, const STRLEN len, HV * const exceptions, U32 hash, U32 flags);
 #define PERL_ARGS_ASSERT_MRO_CLEAN_ISAREV	\
 	assert(isa); assert(name)
-
-STATIC void	S_mro_gather_and_rename(pTHX_ HV * const stashes, HV * const seen_stashes, HV *stash, HV *oldstash, SV *namesv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_5);
+STATIC void	S_mro_gather_and_rename(pTHX_ HV * const stashes, HV * const seen_stashes, HV *stash, HV *oldstash, SV *namesv);
 #define PERL_ARGS_ASSERT_MRO_GATHER_AND_RENAME	\
 	assert(stashes); assert(seen_stashes); assert(namesv)
-
-STATIC AV*	S_mro_get_linear_isa_dfs(pTHX_ HV* stash, U32 level)
-			__attribute__nonnull__(pTHX_1);
+STATIC AV*	S_mro_get_linear_isa_dfs(pTHX_ HV* stash, U32 level);
 #define PERL_ARGS_ASSERT_MRO_GET_LINEAR_ISA_DFS	\
 	assert(stash)
-
 #endif
 #if defined(PERL_IN_OP_C)
-PERL_STATIC_INLINE bool	S_aassign_common_vars(pTHX_ OP* o);
-STATIC void	S_apply_attrs(pTHX_ HV *stash, SV *target, OP *attrs)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_apply_attrs(pTHX_ HV *stash, SV *target, OP *attrs);
 #define PERL_ARGS_ASSERT_APPLY_ATTRS	\
 	assert(stash); assert(target)
-
-STATIC void	S_apply_attrs_my(pTHX_ HV *stash, OP *target, OP *attrs, OP **imopsp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_4);
+STATIC void	S_apply_attrs_my(pTHX_ HV *stash, OP *target, OP *attrs, OP **imopsp);
 #define PERL_ARGS_ASSERT_APPLY_ATTRS_MY	\
 	assert(stash); assert(target); assert(imopsp)
-
 STATIC I32	S_assignment_type(pTHX_ const OP *o)
 			__attribute__warn_unused_result__;
 
-STATIC void	S_bad_type_gv(pTHX_ I32 n, GV *gv, const OP *kid, const char *t)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+STATIC void	S_bad_type_gv(pTHX_ I32 n, GV *gv, const OP *kid, const char *t);
 #define PERL_ARGS_ASSERT_BAD_TYPE_GV	\
 	assert(gv); assert(kid); assert(t)
-
-STATIC void	S_bad_type_pv(pTHX_ I32 n, const char *t, const OP *o, const OP *kid)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+STATIC void	S_bad_type_pv(pTHX_ I32 n, const char *t, const OP *o, const OP *kid);
 #define PERL_ARGS_ASSERT_BAD_TYPE_PV	\
 	assert(t); assert(o); assert(kid)
-
-STATIC void	S_clear_special_blocks(pTHX_ const char *const fullname, GV *const gv, CV *const cv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_clear_special_blocks(pTHX_ const char *const fullname, GV *const gv, CV *const cv);
 #define PERL_ARGS_ASSERT_CLEAR_SPECIAL_BLOCKS	\
 	assert(fullname); assert(gv); assert(cv)
-
-STATIC void	S_cop_free(pTHX_ COP *cop)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_cop_free(pTHX_ COP *cop);
 #define PERL_ARGS_ASSERT_COP_FREE	\
 	assert(cop)
-
-STATIC OP *	S_dup_attrlist(pTHX_ OP *o)
-			__attribute__nonnull__(pTHX_1);
+STATIC OP *	S_dup_attrlist(pTHX_ OP *o);
 #define PERL_ARGS_ASSERT_DUP_ATTRLIST	\
 	assert(o)
-
-STATIC void	S_finalize_op(pTHX_ OP* o)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_finalize_op(pTHX_ OP* o);
 #define PERL_ARGS_ASSERT_FINALIZE_OP	\
 	assert(o)
-
-STATIC void	S_find_and_forget_pmops(pTHX_ OP *o)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_find_and_forget_pmops(pTHX_ OP *o);
 #define PERL_ARGS_ASSERT_FIND_AND_FORGET_PMOPS	\
 	assert(o)
-
-STATIC OP*	S_fold_constants(pTHX_ OP *o)
-			__attribute__nonnull__(pTHX_1);
+STATIC OP*	S_fold_constants(pTHX_ OP *o);
 #define PERL_ARGS_ASSERT_FOLD_CONSTANTS	\
 	assert(o)
-
 STATIC OP*	S_force_list(pTHX_ OP* arg, bool nullit);
-STATIC void	S_forget_pmop(pTHX_ PMOP *const o)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_forget_pmop(pTHX_ PMOP *const o);
 #define PERL_ARGS_ASSERT_FORGET_PMOP	\
 	assert(o)
-
 STATIC OP*	S_gen_constant_list(pTHX_ OP* o);
-STATIC void	S_inplace_aassign(pTHX_ OP* o)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_inplace_aassign(pTHX_ OP* o);
 #define PERL_ARGS_ASSERT_INPLACE_AASSIGN	\
 	assert(o)
-
 STATIC bool	S_is_handle_constructor(const OP *o, I32 numargs)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_HANDLE_CONSTRUCTOR	\
 	assert(o)
 
 STATIC OP*	S_listkids(pTHX_ OP* o);
-STATIC bool	S_looks_like_bool(pTHX_ const OP* o)
-			__attribute__nonnull__(pTHX_1);
+STATIC bool	S_looks_like_bool(pTHX_ const OP* o);
 #define PERL_ARGS_ASSERT_LOOKS_LIKE_BOOL	\
 	assert(o)
-
 STATIC OP*	S_modkids(pTHX_ OP *o, I32 type);
-STATIC void	S_move_proto_attr(pTHX_ OP **proto, OP **attrs, const GV *name)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_move_proto_attr(pTHX_ OP **proto, OP **attrs, const GV *name);
 #define PERL_ARGS_ASSERT_MOVE_PROTO_ATTR	\
 	assert(proto); assert(attrs); assert(name)
-
-STATIC OP *	S_my_kid(pTHX_ OP *o, OP *attrs, OP **imopsp)
-			__attribute__nonnull__(pTHX_3);
+STATIC OP *	S_my_kid(pTHX_ OP *o, OP *attrs, OP **imopsp);
 #define PERL_ARGS_ASSERT_MY_KID	\
 	assert(imopsp)
-
-STATIC OP*	S_newGIVWHENOP(pTHX_ OP* cond, OP *block, I32 enter_opcode, I32 leave_opcode, PADOFFSET entertarg)
-			__attribute__nonnull__(pTHX_2);
+STATIC OP*	S_newGIVWHENOP(pTHX_ OP* cond, OP *block, I32 enter_opcode, I32 leave_opcode, PADOFFSET entertarg);
 #define PERL_ARGS_ASSERT_NEWGIVWHENOP	\
 	assert(block)
-
 PERL_STATIC_INLINE OP*	S_newMETHOP_internal(pTHX_ I32 type, I32 flags, OP* dynamic_meth, SV* const_meth);
 STATIC OP*	S_new_logop(pTHX_ I32 type, I32 flags, OP **firstp, OP **otherp)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEW_LOGOP	\
 	assert(firstp); assert(otherp)
 
-STATIC void	S_no_bareword_allowed(pTHX_ OP *o)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_no_bareword_allowed(pTHX_ OP *o);
 #define PERL_ARGS_ASSERT_NO_BAREWORD_ALLOWED	\
 	assert(o)
-
 STATIC OP*	S_no_fh_allowed(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NO_FH_ALLOWED	\
 	assert(o)
 
-PERL_STATIC_INLINE OP*	S_op_integerize(pTHX_ OP *o)
-			__attribute__nonnull__(pTHX_1);
+PERL_STATIC_INLINE OP*	S_op_integerize(pTHX_ OP *o);
 #define PERL_ARGS_ASSERT_OP_INTEGERIZE	\
 	assert(o)
-
-PERL_STATIC_INLINE OP*	S_op_std_init(pTHX_ OP *o)
-			__attribute__nonnull__(pTHX_1);
+PERL_STATIC_INLINE OP*	S_op_std_init(pTHX_ OP *o);
 #define PERL_ARGS_ASSERT_OP_STD_INIT	\
 	assert(o)
-
-STATIC OP*	S_pmtrans(pTHX_ OP* o, OP* expr, OP* repl)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC OP*	S_pmtrans(pTHX_ OP* o, OP* expr, OP* repl);
 #define PERL_ARGS_ASSERT_PMTRANS	\
 	assert(o); assert(expr); assert(repl)
-
-STATIC bool	S_process_special_blocks(pTHX_ I32 floor, const char *const fullname, GV *const gv, CV *const cv)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+STATIC bool	S_process_special_blocks(pTHX_ I32 floor, const char *const fullname, GV *const gv, CV *const cv);
 #define PERL_ARGS_ASSERT_PROCESS_SPECIAL_BLOCKS	\
 	assert(fullname); assert(gv); assert(cv)
-
 STATIC OP*	S_ref_array_or_hash(pTHX_ OP* cond);
 STATIC OP*	S_refkids(pTHX_ OP* o, I32 type);
 STATIC bool	S_scalar_mod_type(const OP *o, I32 type)
 			__attribute__warn_unused_result__;
 
-STATIC OP*	S_scalarboolean(pTHX_ OP *o)
-			__attribute__nonnull__(pTHX_1);
+STATIC OP*	S_scalarboolean(pTHX_ OP *o);
 #define PERL_ARGS_ASSERT_SCALARBOOLEAN	\
 	assert(o)
-
 STATIC OP*	S_scalarkids(pTHX_ OP* o);
 STATIC OP*	S_scalarseq(pTHX_ OP* o);
 STATIC OP*	S_search_const(pTHX_ OP *o)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SEARCH_CONST	\
 	assert(o)
 
-STATIC void	S_simplify_sort(pTHX_ OP *o)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_simplify_sort(pTHX_ OP *o);
 #define PERL_ARGS_ASSERT_SIMPLIFY_SORT	\
 	assert(o)
-
 STATIC OP*	S_too_few_arguments_pv(pTHX_ OP *o, const char* name, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_TOO_FEW_ARGUMENTS_PV	\
 	assert(o); assert(name)
 
-STATIC OP*	S_too_many_arguments_pv(pTHX_ OP *o, const char* name, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC OP*	S_too_many_arguments_pv(pTHX_ OP *o, const char* name, U32 flags);
 #define PERL_ARGS_ASSERT_TOO_MANY_ARGUMENTS_PV	\
 	assert(o); assert(name)
-
 #  if defined(USE_ITHREADS)
-PERL_STATIC_INLINE void	S_op_relocate_sv(pTHX_ SV** svp, PADOFFSET* targp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_STATIC_INLINE void	S_op_relocate_sv(pTHX_ SV** svp, PADOFFSET* targp);
 #define PERL_ARGS_ASSERT_OP_RELOCATE_SV	\
 	assert(svp); assert(targp)
-
 #  endif
 #endif
 #if defined(PERL_IN_OP_C) || defined(PERL_IN_SV_C)
-PERL_CALLCONV void	Perl_report_redefined_cv(pTHX_ const SV *name, const CV *old_cv, SV * const *new_const_svp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void	Perl_report_redefined_cv(pTHX_ const SV *name, const CV *old_cv, SV * const *new_const_svp);
 #define PERL_ARGS_ASSERT_REPORT_REDEFINED_CV	\
 	assert(name); assert(old_cv)
-
 #endif
 #if defined(PERL_IN_PAD_C)
-STATIC PADOFFSET	S_pad_alloc_name(pTHX_ PADNAME *name, U32 flags, HV *typestash, HV *ourstash)
-			__attribute__nonnull__(pTHX_1);
+STATIC PADOFFSET	S_pad_alloc_name(pTHX_ PADNAME *name, U32 flags, HV *typestash, HV *ourstash);
 #define PERL_ARGS_ASSERT_PAD_ALLOC_NAME	\
 	assert(name)
-
-STATIC void	S_pad_check_dup(pTHX_ PADNAME *name, U32 flags, const HV *ourstash)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_pad_check_dup(pTHX_ PADNAME *name, U32 flags, const HV *ourstash);
 #define PERL_ARGS_ASSERT_PAD_CHECK_DUP	\
 	assert(name)
-
-STATIC PADOFFSET	S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV* cv, U32 seq, int warn, SV** out_capture, PADNAME** out_name, int *out_flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_8)
-			__attribute__nonnull__(pTHX_9);
+STATIC PADOFFSET	S_pad_findlex(pTHX_ const char *namepv, STRLEN namelen, U32 flags, const CV* cv, U32 seq, int warn, SV** out_capture, PADNAME** out_name, int *out_flags);
 #define PERL_ARGS_ASSERT_PAD_FINDLEX	\
 	assert(namepv); assert(cv); assert(out_name); assert(out_flags)
-
 STATIC void	S_pad_reset(pTHX);
 #endif
 #if defined(PERL_IN_PERL_C)
-STATIC void	S_find_beginning(pTHX_ SV* linestr_sv, PerlIO *rsfp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_find_beginning(pTHX_ SV* linestr_sv, PerlIO *rsfp);
 #define PERL_ARGS_ASSERT_FIND_BEGINNING	\
 	assert(linestr_sv); assert(rsfp)
-
 STATIC void	S_forbid_setid(pTHX_ const char flag, const bool suidscript);
-STATIC void	S_incpush(pTHX_ const char *const dir, STRLEN len, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_incpush(pTHX_ const char *const dir, STRLEN len, U32 flags);
 #define PERL_ARGS_ASSERT_INCPUSH	\
 	assert(dir)
-
-STATIC void	S_incpush_use_sep(pTHX_ const char *p, STRLEN len, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_incpush_use_sep(pTHX_ const char *p, STRLEN len, U32 flags);
 #define PERL_ARGS_ASSERT_INCPUSH_USE_SEP	\
 	assert(p)
-
 STATIC void	S_init_ids(pTHX);
 STATIC void	S_init_interp(pTHX);
 STATIC void	S_init_main_stash(pTHX);
 STATIC void	S_init_perllib(pTHX);
-STATIC void	S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_init_postdump_symbols(pTHX_ int argc, char **argv, char **env);
 #define PERL_ARGS_ASSERT_INIT_POSTDUMP_SYMBOLS	\
 	assert(argv)
-
 STATIC void	S_init_predump_symbols(pTHX);
-STATIC SV*	S_mayberelocate(pTHX_ const char *const dir, STRLEN len, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+STATIC SV*	S_mayberelocate(pTHX_ const char *const dir, STRLEN len, U32 flags);
 #define PERL_ARGS_ASSERT_MAYBERELOCATE	\
 	assert(dir)
-
 PERL_STATIC_NO_RET void	S_minus_v(pTHX)
 			__attribute__noreturn__;
 
@@ -6531,12 +4488,9 @@ PERL_STATIC_NO_RET void	S_my_exit_jump(pTHX)
 			__attribute__noreturn__;
 
 STATIC void	S_nuke_stacks(pTHX);
-STATIC PerlIO *	S_open_script(pTHX_ const char *scriptname, bool dosearch, bool *suidscript)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+STATIC PerlIO *	S_open_script(pTHX_ const char *scriptname, bool dosearch, bool *suidscript);
 #define PERL_ARGS_ASSERT_OPEN_SCRIPT	\
 	assert(scriptname); assert(suidscript)
-
 STATIC void*	S_parse_body(pTHX_ char **env, XSINIT_t xsinit);
 PERL_STATIC_NO_RET void	S_run_body(pTHX_ I32 oldscope)
 			__attribute__noreturn__;
@@ -6546,70 +4500,53 @@ PERL_STATIC_NO_RET void	S_usage(pTHX)
 
 #endif
 #if defined(PERL_IN_PP_C)
-STATIC size_t	S_do_chomp(pTHX_ SV *retval, SV *sv, bool chomping)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC size_t	S_do_chomp(pTHX_ SV *retval, SV *sv, bool chomping);
 #define PERL_ARGS_ASSERT_DO_CHOMP	\
 	assert(retval); assert(sv)
-
 STATIC OP*	S_do_delete_local(pTHX);
 STATIC SV*	S_refto(pTHX_ SV* sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_REFTO	\
 	assert(sv)
 
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_IN_PP_HOT_C)
 PERL_CALLCONV GV*	Perl_softref2xv(pTHX_ SV *const sv, const char *const what, const svtype type, SV ***spp)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_4);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SOFTREF2XV	\
 	assert(sv); assert(what); assert(spp)
 
 #endif
 #if defined(PERL_IN_PP_CTL_C)
 STATIC PerlIO *	S_check_type_and_open(pTHX_ SV *name)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CHECK_TYPE_AND_OPEN	\
 	assert(name)
 
-STATIC void	S_destroy_matcher(pTHX_ PMOP* matcher)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_destroy_matcher(pTHX_ PMOP* matcher);
 #define PERL_ARGS_ASSERT_DESTROY_MATCHER	\
 	assert(matcher)
-
 STATIC OP*	S_do_smartmatch(pTHX_ HV* seen_this, HV* seen_other, const bool copied);
 STATIC OP*	S_docatch(pTHX_ OP *o)
 			__attribute__warn_unused_result__;
 
-STATIC bool	S_doeval(pTHX_ int gimme, CV* outside, U32 seq, HV* hh);
+STATIC bool	S_doeval_compile(pTHX_ U8 gimme, CV* outside, U32 seq, HV* hh);
 STATIC OP*	S_dofindlabel(pTHX_ OP *o, const char *label, STRLEN len, U32 flags, OP **opstack, OP **oplimit)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_5)
-			__attribute__nonnull__(pTHX_6);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DOFINDLABEL	\
 	assert(o); assert(label); assert(opstack); assert(oplimit)
 
-STATIC MAGIC *	S_doparseform(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1);
+STATIC MAGIC *	S_doparseform(pTHX_ SV *sv);
 #define PERL_ARGS_ASSERT_DOPARSEFORM	\
 	assert(sv)
-
 STATIC I32	S_dopoptoeval(pTHX_ I32 startingblock)
 			__attribute__warn_unused_result__;
 
-STATIC I32	S_dopoptogiven(pTHX_ I32 startingblock)
+STATIC I32	S_dopoptogivenfor(pTHX_ I32 startingblock)
 			__attribute__warn_unused_result__;
 
 STATIC I32	S_dopoptolabel(pTHX_ const char *label, STRLEN len, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DOPOPTOLABEL	\
 	assert(label)
 
@@ -6617,31 +4554,20 @@ STATIC I32	S_dopoptoloop(pTHX_ I32 startingblock)
 			__attribute__warn_unused_result__;
 
 STATIC I32	S_dopoptosub_at(pTHX_ const PERL_CONTEXT* cxstk, I32 startingblock)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DOPOPTOSUB_AT	\
 	assert(cxstk)
 
 STATIC I32	S_dopoptowhen(pTHX_ I32 startingblock)
 			__attribute__warn_unused_result__;
 
-STATIC SV **	S_leave_common(pTHX_ SV **newsp, SV **sp, SV **mark, I32 gimme, U32 flags, bool lvalue)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
-#define PERL_ARGS_ASSERT_LEAVE_COMMON	\
-	assert(newsp); assert(sp); assert(mark)
-
 STATIC PMOP*	S_make_matcher(pTHX_ REGEXP* re)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_MAKE_MATCHER	\
 	assert(re)
 
 STATIC bool	S_matcher_matches_sv(pTHX_ PMOP* matcher, SV* sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_MATCHER_MATCHES_SV	\
 	assert(matcher); assert(sv)
 
@@ -6649,699 +4575,446 @@ STATIC bool	S_num_overflow(NV value, I32 fldsize, I32 frcsize)
 			__attribute__warn_unused_result__;
 
 PERL_STATIC_INLINE bool	S_path_is_searchable(const char *name)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_PATH_IS_SEARCHABLE	\
 	assert(name)
 
 STATIC I32	S_run_user_filter(pTHX_ int idx, SV *buf_sv, int maxlen)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_RUN_USER_FILTER	\
 	assert(buf_sv)
 
-STATIC void	S_rxres_free(pTHX_ void** rsp)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_rxres_free(pTHX_ void** rsp);
 #define PERL_ARGS_ASSERT_RXRES_FREE	\
 	assert(rsp)
-
-STATIC void	S_rxres_restore(pTHX_ void **rsp, REGEXP *rx)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_rxres_restore(pTHX_ void **rsp, REGEXP *rx);
 #define PERL_ARGS_ASSERT_RXRES_RESTORE	\
 	assert(rsp); assert(rx)
-
-STATIC void	S_save_lines(pTHX_ AV *array, SV *sv)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_save_lines(pTHX_ AV *array, SV *sv);
 #define PERL_ARGS_ASSERT_SAVE_LINES	\
 	assert(sv)
-
 #endif
 #if defined(PERL_IN_PP_HOT_C)
-STATIC void	S_do_oddball(pTHX_ SV **oddkey, SV **firstkey)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_do_oddball(pTHX_ SV **oddkey, SV **firstkey);
 #define PERL_ARGS_ASSERT_DO_ODDBALL	\
 	assert(oddkey); assert(firstkey)
-
-PERL_STATIC_INLINE HV*	S_opmethod_stash(pTHX_ SV* meth)
-			__attribute__nonnull__(pTHX_1);
+PERL_STATIC_INLINE HV*	S_opmethod_stash(pTHX_ SV* meth);
 #define PERL_ARGS_ASSERT_OPMETHOD_STASH	\
 	assert(meth)
-
 #endif
 #if defined(PERL_IN_PP_PACK_C)
-STATIC int	S_div128(pTHX_ SV *pnum, bool *done)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC int	S_div128(pTHX_ SV *pnum, bool *done);
 #define PERL_ARGS_ASSERT_DIV128	\
 	assert(pnum); assert(done)
-
-STATIC char	S_first_symbol(const char *pat, const char *patend)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+STATIC char	S_first_symbol(const char *pat, const char *patend);
 #define PERL_ARGS_ASSERT_FIRST_SYMBOL	\
 	assert(pat); assert(patend)
-
 STATIC const char *	S_get_num(pTHX_ const char *patptr, I32 *lenptr)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GET_NUM	\
 	assert(patptr); assert(lenptr)
 
-STATIC const char *	S_group_end(pTHX_ const char *patptr, const char *patend, char ender)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC const char *	S_group_end(pTHX_ const char *patptr, const char *patend, char ender);
 #define PERL_ARGS_ASSERT_GROUP_END	\
 	assert(patptr); assert(patend)
-
 STATIC SV*	S_is_an_int(pTHX_ const char *s, STRLEN l)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_AN_INT	\
 	assert(s)
 
-STATIC I32	S_measure_struct(pTHX_ struct tempsym* symptr)
-			__attribute__nonnull__(pTHX_1);
+STATIC I32	S_measure_struct(pTHX_ struct tempsym* symptr);
 #define PERL_ARGS_ASSERT_MEASURE_STRUCT	\
 	assert(symptr)
-
-STATIC SV*	S_mul128(pTHX_ SV *sv, U8 m)
-			__attribute__nonnull__(pTHX_1);
+STATIC SV*	S_mul128(pTHX_ SV *sv, U8 m);
 #define PERL_ARGS_ASSERT_MUL128	\
 	assert(sv)
-
 STATIC char *	S_my_bytes_to_utf8(const U8 *start, STRLEN len, char *dest, const bool needs_swap)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_MY_BYTES_TO_UTF8	\
 	assert(start); assert(dest)
 
-STATIC bool	S_need_utf8(const char *pat, const char *patend)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+STATIC bool	S_need_utf8(const char *pat, const char *patend);
 #define PERL_ARGS_ASSERT_NEED_UTF8	\
 	assert(pat); assert(patend)
-
-STATIC bool	S_next_symbol(pTHX_ struct tempsym* symptr)
-			__attribute__nonnull__(pTHX_1);
+STATIC bool	S_next_symbol(pTHX_ struct tempsym* symptr);
 #define PERL_ARGS_ASSERT_NEXT_SYMBOL	\
 	assert(symptr)
-
-STATIC SV **	S_pack_rec(pTHX_ SV *cat, struct tempsym* symptr, SV **beglist, SV **endlist)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+STATIC SV **	S_pack_rec(pTHX_ SV *cat, struct tempsym* symptr, SV **beglist, SV **endlist);
 #define PERL_ARGS_ASSERT_PACK_REC	\
 	assert(cat); assert(symptr); assert(beglist); assert(endlist)
-
 STATIC char *	S_sv_exp_grow(pTHX_ SV *sv, STRLEN needed)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_EXP_GROW	\
 	assert(sv)
 
-STATIC I32	S_unpack_rec(pTHX_ struct tempsym* symptr, const char *s, const char *strbeg, const char *strend, const char **new_s)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+STATIC I32	S_unpack_rec(pTHX_ struct tempsym* symptr, const char *s, const char *strbeg, const char *strend, const char **new_s);
 #define PERL_ARGS_ASSERT_UNPACK_REC	\
 	assert(symptr); assert(s); assert(strbeg); assert(strend)
-
 #endif
 #if defined(PERL_IN_PP_SORT_C)
-STATIC I32	S_amagic_cmp(pTHX_ SV *const str1, SV *const str2)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC I32	S_amagic_cmp(pTHX_ SV *const str1, SV *const str2);
 #define PERL_ARGS_ASSERT_AMAGIC_CMP	\
 	assert(str1); assert(str2)
-
-STATIC I32	S_amagic_i_ncmp(pTHX_ SV *const a, SV *const b)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC I32	S_amagic_i_ncmp(pTHX_ SV *const a, SV *const b);
 #define PERL_ARGS_ASSERT_AMAGIC_I_NCMP	\
 	assert(a); assert(b)
-
-STATIC I32	S_amagic_ncmp(pTHX_ SV *const a, SV *const b)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC I32	S_amagic_ncmp(pTHX_ SV *const a, SV *const b);
 #define PERL_ARGS_ASSERT_AMAGIC_NCMP	\
 	assert(a); assert(b)
-
-STATIC void	S_qsortsvu(pTHX_ SV** array, size_t num_elts, SVCOMPARE_t compare)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_qsortsvu(pTHX_ SV** array, size_t num_elts, SVCOMPARE_t compare);
 #define PERL_ARGS_ASSERT_QSORTSVU	\
 	assert(compare)
-
-STATIC I32	S_sortcv(pTHX_ SV *const a, SV *const b)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC I32	S_sortcv(pTHX_ SV *const a, SV *const b);
 #define PERL_ARGS_ASSERT_SORTCV	\
 	assert(a); assert(b)
-
-STATIC I32	S_sortcv_stacked(pTHX_ SV *const a, SV *const b)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC I32	S_sortcv_stacked(pTHX_ SV *const a, SV *const b);
 #define PERL_ARGS_ASSERT_SORTCV_STACKED	\
 	assert(a); assert(b)
-
-STATIC I32	S_sortcv_xsub(pTHX_ SV *const a, SV *const b)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC I32	S_sortcv_xsub(pTHX_ SV *const a, SV *const b);
 #define PERL_ARGS_ASSERT_SORTCV_XSUB	\
 	assert(a); assert(b)
-
-STATIC I32	S_sv_i_ncmp(pTHX_ SV *const a, SV *const b)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC I32	S_sv_i_ncmp(pTHX_ SV *const a, SV *const b);
 #define PERL_ARGS_ASSERT_SV_I_NCMP	\
 	assert(a); assert(b)
-
-STATIC I32	S_sv_ncmp(pTHX_ SV *const a, SV *const b)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC I32	S_sv_ncmp(pTHX_ SV *const a, SV *const b);
 #define PERL_ARGS_ASSERT_SV_NCMP	\
 	assert(a); assert(b)
-
 #  if defined(USE_LOCALE_COLLATE)
-STATIC I32	S_amagic_cmp_locale(pTHX_ SV *const str1, SV *const str2)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC I32	S_amagic_cmp_locale(pTHX_ SV *const str1, SV *const str2);
 #define PERL_ARGS_ASSERT_AMAGIC_CMP_LOCALE	\
 	assert(str1); assert(str2)
-
 #  endif
 #endif
 #if defined(PERL_IN_PP_SYS_C)
-STATIC OP*	S_doform(pTHX_ CV *cv, GV *gv, OP *retop)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC OP*	S_doform(pTHX_ CV *cv, GV *gv, OP *retop);
 #define PERL_ARGS_ASSERT_DOFORM	\
 	assert(cv); assert(gv)
-
-STATIC SV *	S_space_join_names_mortal(pTHX_ char *const *array)
-			__attribute__nonnull__(pTHX_1);
+STATIC SV *	S_space_join_names_mortal(pTHX_ char *const *array);
 #define PERL_ARGS_ASSERT_SPACE_JOIN_NAMES_MORTAL	\
 	assert(array)
-
 #endif
 #if defined(PERL_IN_REGCOMP_C)
-STATIC void	S__append_range_to_invlist(pTHX_ SV* const invlist, const UV start, const UV end)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S__append_range_to_invlist(pTHX_ SV* const invlist, const UV start, const UV end);
 #define PERL_ARGS_ASSERT__APPEND_RANGE_TO_INVLIST	\
 	assert(invlist)
-
 PERL_STATIC_INLINE UV*	S__invlist_array_init(SV* const invlist, const bool will_have_0)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__INVLIST_ARRAY_INIT	\
 	assert(invlist)
 
 STATIC SV*	S__make_exactf_invlist(pTHX_ RExC_state_t *pRExC_state, regnode *node)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__MAKE_EXACTF_INVLIST	\
 	assert(pRExC_state); assert(node)
 
-STATIC void	S_add_above_Latin1_folds(pTHX_ RExC_state_t *pRExC_state, const U8 cp, SV** invlist)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_add_above_Latin1_folds(pTHX_ RExC_state_t *pRExC_state, const U8 cp, SV** invlist);
 #define PERL_ARGS_ASSERT_ADD_ABOVE_LATIN1_FOLDS	\
 	assert(pRExC_state); assert(invlist)
-
 PERL_STATIC_INLINE SV*	S_add_cp_to_invlist(pTHX_ SV* invlist, const UV cp)
 			__attribute__warn_unused_result__;
 
 STATIC U32	S_add_data(RExC_state_t* const pRExC_state, const char* const s, const U32 n)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_ADD_DATA	\
 	assert(pRExC_state); assert(s)
 
-STATIC AV*	S_add_multi_match(pTHX_ AV* multi_char_matches, SV* multi_string, const STRLEN cp_count)
-			__attribute__nonnull__(pTHX_2);
+STATIC AV*	S_add_multi_match(pTHX_ AV* multi_char_matches, SV* multi_string, const STRLEN cp_count);
 #define PERL_ARGS_ASSERT_ADD_MULTI_MATCH	\
 	assert(multi_string)
-
-PERL_STATIC_INLINE void	S_alloc_maybe_populate_EXACT(pTHX_ RExC_state_t *pRExC_state, regnode *node, I32 *flagp, STRLEN len, UV code_point, bool downgradable)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_STATIC_INLINE void	S_alloc_maybe_populate_EXACT(pTHX_ RExC_state_t *pRExC_state, regnode *node, I32 *flagp, STRLEN len, UV code_point, bool downgradable);
 #define PERL_ARGS_ASSERT_ALLOC_MAYBE_POPULATE_EXACT	\
 	assert(pRExC_state); assert(node); assert(flagp)
-
 STATIC const char *	S_cntrl_to_mnemonic(const U8 c)
 			__attribute__pure__;
 
-PERL_STATIC_INLINE U8	S_compute_EXACTish(RExC_state_t *pRExC_state)
-			__attribute__nonnull__(1);
+PERL_STATIC_INLINE U8	S_compute_EXACTish(RExC_state_t *pRExC_state);
 #define PERL_ARGS_ASSERT_COMPUTE_EXACTISH	\
 	assert(pRExC_state)
-
-STATIC regnode *	S_construct_ahocorasick_from_trie(pTHX_ RExC_state_t *pRExC_state, regnode *source, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC regnode *	S_construct_ahocorasick_from_trie(pTHX_ RExC_state_t *pRExC_state, regnode *source, U32 depth);
 #define PERL_ARGS_ASSERT_CONSTRUCT_AHOCORASICK_FROM_TRIE	\
 	assert(pRExC_state); assert(source)
+STATIC int	S_edit_distance(const UV *src, const UV *tgt, const STRLEN x, const STRLEN y, const SSize_t maxDistance)
+			__attribute__pure__;
+#define PERL_ARGS_ASSERT_EDIT_DISTANCE	\
+	assert(src); assert(tgt)
 
-STATIC bool	S_could_it_be_a_POSIX_class(RExC_state_t *pRExC_state)
-			__attribute__nonnull__(1);
-#define PERL_ARGS_ASSERT_COULD_IT_BE_A_POSIX_CLASS	\
-	assert(pRExC_state)
-
-STATIC SV*	S_get_ANYOF_cp_list_for_ssc(pTHX_ const RExC_state_t *pRExC_state, const regnode_charclass* const node)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC SV*	S_get_ANYOF_cp_list_for_ssc(pTHX_ const RExC_state_t *pRExC_state, const regnode_charclass* const node);
 #define PERL_ARGS_ASSERT_GET_ANYOF_CP_LIST_FOR_SSC	\
 	assert(pRExC_state); assert(node)
-
 PERL_STATIC_INLINE STRLEN*	S_get_invlist_iter_addr(SV* invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GET_INVLIST_ITER_ADDR	\
 	assert(invlist)
 
-STATIC bool	S_grok_bslash_N(pTHX_ RExC_state_t *pRExC_state, regnode** nodep, UV *code_point_p, int* cp_count, I32 *flagp, const U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_5);
+STATIC bool	S_grok_bslash_N(pTHX_ RExC_state_t *pRExC_state, regnode** nodep, UV *code_point_p, int* cp_count, I32 *flagp, const bool strict, const U32 depth);
 #define PERL_ARGS_ASSERT_GROK_BSLASH_N	\
 	assert(pRExC_state); assert(flagp)
-
-STATIC regnode*	S_handle_regex_sets(pTHX_ RExC_state_t *pRExC_state, SV ** return_invlist, I32 *flagp, U32 depth, char * const oregcomp_parse)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_5);
+PERL_STATIC_INLINE regnode*	S_handle_named_backref(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, char * parse_start, char ch);
+#define PERL_ARGS_ASSERT_HANDLE_NAMED_BACKREF	\
+	assert(pRExC_state); assert(flagp); assert(parse_start)
+STATIC int	S_handle_possible_posix(pTHX_ RExC_state_t *pRExC_state, const char* const s, char ** updated_parse_ptr, AV** posix_warnings, const bool check_only);
+#define PERL_ARGS_ASSERT_HANDLE_POSSIBLE_POSIX	\
+	assert(pRExC_state); assert(s)
+STATIC regnode*	S_handle_regex_sets(pTHX_ RExC_state_t *pRExC_state, SV ** return_invlist, I32 *flagp, U32 depth, char * const oregcomp_parse);
 #define PERL_ARGS_ASSERT_HANDLE_REGEX_SETS	\
 	assert(pRExC_state); assert(flagp); assert(oregcomp_parse)
-
 PERL_STATIC_INLINE SV*	S_invlist_clone(pTHX_ SV* const invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_INVLIST_CLONE	\
 	assert(invlist)
 
-STATIC void	S_invlist_extend(pTHX_ SV* const invlist, const UV len)
-			__attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_INVLIST_EXTEND	\
+STATIC SV*	S_invlist_contents(pTHX_ SV* const invlist, const bool traditional_style)
+			__attribute__warn_unused_result__;
+#define PERL_ARGS_ASSERT_INVLIST_CONTENTS	\
 	assert(invlist)
 
+STATIC void	S_invlist_extend(pTHX_ SV* const invlist, const UV len);
+#define PERL_ARGS_ASSERT_INVLIST_EXTEND	\
+	assert(invlist)
 PERL_STATIC_INLINE UV	S_invlist_highest(SV* const invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_INVLIST_HIGHEST	\
 	assert(invlist)
 
-PERL_STATIC_INLINE void	S_invlist_iterfinish(SV* invlist)
-			__attribute__nonnull__(1);
-#define PERL_ARGS_ASSERT_INVLIST_ITERFINISH	\
+PERL_STATIC_INLINE bool	S_invlist_is_iterating(SV* const invlist)
+			__attribute__warn_unused_result__;
+#define PERL_ARGS_ASSERT_INVLIST_IS_ITERATING	\
 	assert(invlist)
 
-PERL_STATIC_INLINE void	S_invlist_iterinit(SV* invlist)
-			__attribute__nonnull__(1);
+PERL_STATIC_INLINE void	S_invlist_iterfinish(SV* invlist);
+#define PERL_ARGS_ASSERT_INVLIST_ITERFINISH	\
+	assert(invlist)
+PERL_STATIC_INLINE void	S_invlist_iterinit(SV* invlist);
 #define PERL_ARGS_ASSERT_INVLIST_ITERINIT	\
 	assert(invlist)
-
 STATIC bool	S_invlist_iternext(SV* invlist, UV* start, UV* end)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2)
-			__attribute__nonnull__(3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_INVLIST_ITERNEXT	\
 	assert(invlist); assert(start); assert(end)
 
 PERL_STATIC_INLINE UV	S_invlist_max(SV* const invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_INVLIST_MAX	\
 	assert(invlist)
 
-PERL_STATIC_INLINE void	S_invlist_set_len(pTHX_ SV* const invlist, const UV len, const bool offset)
-			__attribute__nonnull__(pTHX_1);
+PERL_STATIC_INLINE void	S_invlist_set_len(pTHX_ SV* const invlist, const UV len, const bool offset);
 #define PERL_ARGS_ASSERT_INVLIST_SET_LEN	\
 	assert(invlist)
-
-STATIC bool	S_is_ssc_worth_it(const RExC_state_t * pRExC_state, const regnode_ssc * ssc)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+STATIC bool	S_is_ssc_worth_it(const RExC_state_t * pRExC_state, const regnode_ssc * ssc);
 #define PERL_ARGS_ASSERT_IS_SSC_WORTH_IT	\
 	assert(pRExC_state); assert(ssc)
-
-STATIC U32	S_join_exact(pTHX_ RExC_state_t *pRExC_state, regnode *scan, UV *min_subtract, bool *unfolded_multi_char, U32 flags, regnode *val, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+STATIC U32	S_join_exact(pTHX_ RExC_state_t *pRExC_state, regnode *scan, UV *min_subtract, bool *unfolded_multi_char, U32 flags, regnode *val, U32 depth);
 #define PERL_ARGS_ASSERT_JOIN_EXACT	\
 	assert(pRExC_state); assert(scan); assert(min_subtract); assert(unfolded_multi_char)
-
-STATIC I32	S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, regnode *first, regnode *last, regnode *tail, U32 word_count, U32 flags, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+STATIC I32	S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode *startbranch, regnode *first, regnode *last, regnode *tail, U32 word_count, U32 flags, U32 depth);
 #define PERL_ARGS_ASSERT_MAKE_TRIE	\
 	assert(pRExC_state); assert(startbranch); assert(first); assert(last); assert(tail)
-
-STATIC char *	S_nextchar(pTHX_ RExC_state_t *pRExC_state)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_nextchar(pTHX_ RExC_state_t *pRExC_state);
 #define PERL_ARGS_ASSERT_NEXTCHAR	\
 	assert(pRExC_state)
-
-STATIC void	S_parse_lparen_question_flags(pTHX_ RExC_state_t *pRExC_state)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_output_or_return_posix_warnings(pTHX_ RExC_state_t *pRExC_state, AV* posix_warnings, AV** return_posix_warnings);
+#define PERL_ARGS_ASSERT_OUTPUT_OR_RETURN_POSIX_WARNINGS	\
+	assert(pRExC_state); assert(posix_warnings)
+STATIC void	S_parse_lparen_question_flags(pTHX_ RExC_state_t *pRExC_state);
 #define PERL_ARGS_ASSERT_PARSE_LPAREN_QUESTION_FLAGS	\
 	assert(pRExC_state)
-
-STATIC void	S_populate_ANYOF_from_invlist(pTHX_ regnode *node, SV** invlist_ptr)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_populate_ANYOF_from_invlist(pTHX_ regnode *node, SV** invlist_ptr);
 #define PERL_ARGS_ASSERT_POPULATE_ANYOF_FROM_INVLIST	\
 	assert(node); assert(invlist_ptr)
-
 PERL_STATIC_NO_RET void	S_re_croak2(pTHX_ bool utf8, const char* pat1, const char* pat2, ...)
-			__attribute__noreturn__
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+			__attribute__noreturn__;
 #define PERL_ARGS_ASSERT_RE_CROAK2	\
 	assert(pat1); assert(pat2)
 
-STATIC regnode*	S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+STATIC regnode*	S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth);
 #define PERL_ARGS_ASSERT_REG	\
 	assert(pRExC_state); assert(flagp)
-
-STATIC regnode*	S_reg2Lanode(pTHX_ RExC_state_t *pRExC_state, const U8 op, const U32 arg1, const I32 arg2)
-			__attribute__nonnull__(pTHX_1);
+STATIC regnode*	S_reg2Lanode(pTHX_ RExC_state_t *pRExC_state, const U8 op, const U32 arg1, const I32 arg2);
 #define PERL_ARGS_ASSERT_REG2LANODE	\
 	assert(pRExC_state)
-
-STATIC regnode*	S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op)
-			__attribute__nonnull__(pTHX_1);
+STATIC regnode*	S_reg_node(pTHX_ RExC_state_t *pRExC_state, U8 op);
 #define PERL_ARGS_ASSERT_REG_NODE	\
 	assert(pRExC_state)
-
-STATIC UV	S_reg_recode(pTHX_ const char value, SV **encp)
-			__attribute__nonnull__(pTHX_2);
+STATIC UV	S_reg_recode(pTHX_ const U8 value, SV **encp);
 #define PERL_ARGS_ASSERT_REG_RECODE	\
 	assert(encp)
-
-STATIC SV *	S_reg_scan_name(pTHX_ RExC_state_t *pRExC_state, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+STATIC SV *	S_reg_scan_name(pTHX_ RExC_state_t *pRExC_state, U32 flags);
 #define PERL_ARGS_ASSERT_REG_SCAN_NAME	\
 	assert(pRExC_state)
-
-PERL_STATIC_INLINE char *	S_reg_skipcomment(RExC_state_t *pRExC_state, char * p)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+PERL_STATIC_INLINE char *	S_reg_skipcomment(RExC_state_t *pRExC_state, char * p);
 #define PERL_ARGS_ASSERT_REG_SKIPCOMMENT	\
 	assert(pRExC_state); assert(p)
-
-STATIC regnode*	S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg)
-			__attribute__nonnull__(pTHX_1);
+STATIC regnode*	S_reganode(pTHX_ RExC_state_t *pRExC_state, U8 op, U32 arg);
 #define PERL_ARGS_ASSERT_REGANODE	\
 	assert(pRExC_state)
-
-STATIC regnode*	S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC regnode*	S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth);
 #define PERL_ARGS_ASSERT_REGATOM	\
 	assert(pRExC_state); assert(flagp)
-
-STATIC regnode*	S_regbranch(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, I32 first, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC regnode*	S_regbranch(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, I32 first, U32 depth);
 #define PERL_ARGS_ASSERT_REGBRANCH	\
 	assert(pRExC_state); assert(flagp)
-
-STATIC regnode*	S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth, const bool stop_at_1, bool allow_multi_fold, const bool silence_non_portable, const bool strict, SV** ret_invlist)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC regnode*	S_regclass(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth, const bool stop_at_1, bool allow_multi_fold, const bool silence_non_portable, const bool strict, bool optimizable, SV** ret_invlist, AV** return_posix_warnings);
 #define PERL_ARGS_ASSERT_REGCLASS	\
 	assert(pRExC_state); assert(flagp)
-
 STATIC unsigned int	S_regex_set_precedence(const U8 my_operator)
 			__attribute__pure__;
 
-STATIC void	S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_reginsert(pTHX_ RExC_state_t *pRExC_state, U8 op, regnode *opnd, U32 depth);
 #define PERL_ARGS_ASSERT_REGINSERT	\
 	assert(pRExC_state); assert(opnd)
-
-STATIC regnode*	S_regnode_guts(pTHX_ RExC_state_t *pRExC_state, const U8 op, const STRLEN extra_len, const char* const name)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_4);
+STATIC regnode*	S_regnode_guts(pTHX_ RExC_state_t *pRExC_state, const U8 op, const STRLEN extra_len, const char* const name);
 #define PERL_ARGS_ASSERT_REGNODE_GUTS	\
 	assert(pRExC_state); assert(name)
-
-STATIC char *	S_regpatws(RExC_state_t *pRExC_state, char *p, const bool recognize_comment)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
-#define PERL_ARGS_ASSERT_REGPATWS	\
-	assert(pRExC_state); assert(p)
-
-STATIC regnode*	S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC regnode*	S_regpiece(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth);
 #define PERL_ARGS_ASSERT_REGPIECE	\
 	assert(pRExC_state); assert(flagp)
-
-PERL_STATIC_INLINE I32	S_regpposixcc(pTHX_ RExC_state_t *pRExC_state, I32 value, const bool strict)
-			__attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_REGPPOSIXCC	\
-	assert(pRExC_state)
-
-STATIC void	S_regtail(pTHX_ RExC_state_t *pRExC_state, regnode *p, const regnode *val, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_regtail(pTHX_ RExC_state_t * pRExC_state, const regnode * const p, const regnode * const val, const U32 depth);
 #define PERL_ARGS_ASSERT_REGTAIL	\
 	assert(pRExC_state); assert(p); assert(val)
-
-STATIC void	S_scan_commit(pTHX_ const RExC_state_t *pRExC_state, struct scan_data_t *data, SSize_t *minlenp, int is_inf)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_scan_commit(pTHX_ const RExC_state_t *pRExC_state, struct scan_data_t *data, SSize_t *minlenp, int is_inf);
 #define PERL_ARGS_ASSERT_SCAN_COMMIT	\
 	assert(pRExC_state); assert(data); assert(minlenp)
-
-STATIC void	S_set_ANYOF_arg(pTHX_ RExC_state_t* const pRExC_state, regnode* const node, SV* const cp_list, SV* const runtime_defns, SV* const only_utf8_locale_list, SV* const swash, const bool has_user_defined_property)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_set_ANYOF_arg(pTHX_ RExC_state_t* const pRExC_state, regnode* const node, SV* const cp_list, SV* const runtime_defns, SV* const only_utf8_locale_list, SV* const swash, const bool has_user_defined_property);
 #define PERL_ARGS_ASSERT_SET_ANYOF_ARG	\
 	assert(pRExC_state); assert(node)
-
-PERL_STATIC_INLINE void	S_ssc_add_range(pTHX_ regnode_ssc *ssc, UV const start, UV const end)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_skip_to_be_ignored_text(pTHX_ RExC_state_t *pRExC_state, char ** p, const bool force_to_xmod);
+#define PERL_ARGS_ASSERT_SKIP_TO_BE_IGNORED_TEXT	\
+	assert(pRExC_state); assert(p)
+PERL_STATIC_INLINE void	S_ssc_add_range(pTHX_ regnode_ssc *ssc, UV const start, UV const end);
 #define PERL_ARGS_ASSERT_SSC_ADD_RANGE	\
 	assert(ssc)
-
-STATIC void	S_ssc_and(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc, const regnode_charclass *and_with)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_ssc_and(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc, const regnode_charclass *and_with);
 #define PERL_ARGS_ASSERT_SSC_AND	\
 	assert(pRExC_state); assert(ssc); assert(and_with)
-
-STATIC void	S_ssc_anything(pTHX_ regnode_ssc *ssc)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_ssc_anything(pTHX_ regnode_ssc *ssc);
 #define PERL_ARGS_ASSERT_SSC_ANYTHING	\
 	assert(ssc)
-
-PERL_STATIC_INLINE void	S_ssc_clear_locale(regnode_ssc *ssc)
-			__attribute__nonnull__(1);
+PERL_STATIC_INLINE void	S_ssc_clear_locale(regnode_ssc *ssc);
 #define PERL_ARGS_ASSERT_SSC_CLEAR_LOCALE	\
 	assert(ssc)
-
-PERL_STATIC_INLINE void	S_ssc_cp_and(pTHX_ regnode_ssc *ssc, UV const cp)
-			__attribute__nonnull__(pTHX_1);
+PERL_STATIC_INLINE void	S_ssc_cp_and(pTHX_ regnode_ssc *ssc, UV const cp);
 #define PERL_ARGS_ASSERT_SSC_CP_AND	\
 	assert(ssc)
-
-STATIC void	S_ssc_finalize(pTHX_ RExC_state_t *pRExC_state, regnode_ssc *ssc)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_ssc_finalize(pTHX_ RExC_state_t *pRExC_state, regnode_ssc *ssc);
 #define PERL_ARGS_ASSERT_SSC_FINALIZE	\
 	assert(pRExC_state); assert(ssc)
-
-STATIC void	S_ssc_init(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_ssc_init(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc);
 #define PERL_ARGS_ASSERT_SSC_INIT	\
 	assert(pRExC_state); assert(ssc)
-
-PERL_STATIC_INLINE void	S_ssc_intersection(pTHX_ regnode_ssc *ssc, SV* const invlist, const bool invert_2nd)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_STATIC_INLINE void	S_ssc_intersection(pTHX_ regnode_ssc *ssc, SV* const invlist, const bool invert_2nd);
 #define PERL_ARGS_ASSERT_SSC_INTERSECTION	\
 	assert(ssc); assert(invlist)
-
 STATIC int	S_ssc_is_anything(const regnode_ssc *ssc)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SSC_IS_ANYTHING	\
 	assert(ssc)
 
 STATIC int	S_ssc_is_cp_posixl_init(const RExC_state_t *pRExC_state, const regnode_ssc *ssc)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SSC_IS_CP_POSIXL_INIT	\
 	assert(pRExC_state); assert(ssc)
 
-STATIC void	S_ssc_or(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc, const regnode_charclass *or_with)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_ssc_or(pTHX_ const RExC_state_t *pRExC_state, regnode_ssc *ssc, const regnode_charclass *or_with);
 #define PERL_ARGS_ASSERT_SSC_OR	\
 	assert(pRExC_state); assert(ssc); assert(or_with)
-
-PERL_STATIC_INLINE void	S_ssc_union(pTHX_ regnode_ssc *ssc, SV* const invlist, const bool invert_2nd)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_STATIC_INLINE void	S_ssc_union(pTHX_ regnode_ssc *ssc, SV* const invlist, const bool invert_2nd);
 #define PERL_ARGS_ASSERT_SSC_UNION	\
 	assert(ssc); assert(invlist)
-
-STATIC SSize_t	S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, SSize_t *minlenp, SSize_t *deltap, regnode *last, struct scan_data_t *data, I32 stopparen, U32 recursed_depth, regnode_ssc *and_withp, U32 flags, U32 depth)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+STATIC SSize_t	S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, SSize_t *minlenp, SSize_t *deltap, regnode *last, struct scan_data_t *data, I32 stopparen, U32 recursed_depth, regnode_ssc *and_withp, U32 flags, U32 depth);
 #define PERL_ARGS_ASSERT_STUDY_CHUNK	\
 	assert(pRExC_state); assert(scanp); assert(minlenp); assert(deltap); assert(last)
-
 #endif
 #if defined(PERL_IN_REGCOMP_C) || defined (PERL_IN_DUMP_C)
-PERL_CALLCONV void	Perl__invlist_dump(pTHX_ PerlIO *file, I32 level, const char* const indent, SV* const invlist)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+PERL_CALLCONV void	Perl__invlist_dump(pTHX_ PerlIO *file, I32 level, const char* const indent, SV* const invlist);
 #define PERL_ARGS_ASSERT__INVLIST_DUMP	\
 	assert(file); assert(indent); assert(invlist)
-
 #endif
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_PERL_C) || defined(PERL_IN_UTF8_C)
+PERL_CALLCONV bool	Perl__invlistEQ(pTHX_ SV* const a, SV* const b, const bool complement_b);
+#define PERL_ARGS_ASSERT__INVLISTEQ	\
+	assert(a); assert(b)
 PERL_CALLCONV SV*	Perl__new_invlist_C_array(pTHX_ const UV* const list)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__NEW_INVLIST_C_ARRAY	\
 	assert(list)
 
 #endif
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C)
-PERL_CALLCONV SV*	Perl__get_regclass_nonbitmap_data(pTHX_ const regexp *prog, const struct regnode *node, bool doinit, SV **listsvp, SV **lonly_utf8_locale, SV *exclude_list)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SV*	Perl__get_regclass_nonbitmap_data(pTHX_ const regexp *prog, const struct regnode *node, bool doinit, SV **listsvp, SV **lonly_utf8_locale, SV **output_invlist);
 #define PERL_ARGS_ASSERT__GET_REGCLASS_NONBITMAP_DATA	\
 	assert(node)
-
 PERL_CALLCONV void	Perl__load_PL_utf8_foldclosures(pTHX);
-PERL_CALLCONV void	Perl_regprop(pTHX_ const regexp *prog, SV* sv, const regnode* o, const regmatch_info *reginfo, const RExC_state_t *pRExC_state)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV int	Perl_re_printf(pTHX_ const char *fmt, ...);
+#define PERL_ARGS_ASSERT_RE_PRINTF	\
+	assert(fmt)
+PERL_CALLCONV void	Perl_regprop(pTHX_ const regexp *prog, SV* sv, const regnode* o, const regmatch_info *reginfo, const RExC_state_t *pRExC_state);
 #define PERL_ARGS_ASSERT_REGPROP	\
 	assert(sv); assert(o)
-
 #endif
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || defined(PERL_IN_UTF8_C)
 PERL_CALLCONV SV*	Perl__get_swash_invlist(pTHX_ SV* const swash)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__GET_SWASH_INVLIST	\
 	assert(swash)
 
 PERL_STATIC_INLINE bool	S__invlist_contains_cp(SV* const invlist, const UV cp)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__INVLIST_CONTAINS_CP	\
 	assert(invlist)
 
-PERL_CALLCONV SV*	Perl__invlist_contents(pTHX_ SV* const invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT__INVLIST_CONTENTS	\
-	assert(invlist)
-
 PERL_STATIC_INLINE UV	S__invlist_len(SV* const invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__INVLIST_LEN	\
 	assert(invlist)
 
 PERL_CALLCONV IV	Perl__invlist_search(SV* const invlist, const UV cp)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__INVLIST_SEARCH	\
 	assert(invlist)
 
 PERL_CALLCONV HV*	Perl__swash_inversion_hash(pTHX_ SV* const swash)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__SWASH_INVERSION_HASH	\
 	assert(swash)
 
 PERL_STATIC_INLINE bool*	S_get_invlist_offset_addr(SV* invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GET_INVLIST_OFFSET_ADDR	\
 	assert(invlist)
 
 PERL_STATIC_INLINE UV*	S_invlist_array(SV* const invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_INVLIST_ARRAY	\
 	assert(invlist)
 
 #endif
 #if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C) || defined(PERL_IN_UTF8_C) || defined(PERL_IN_TOKE_C)
-PERL_CALLCONV SV*	Perl__core_swash_init(pTHX_ const char* pkg, const char* name, SV* listsv, I32 minbits, I32 none, SV* invlist, U8* const flags_p)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV SV*	Perl__core_swash_init(pTHX_ const char* pkg, const char* name, SV* listsv, I32 minbits, I32 none, SV* invlist, U8* const flags_p);
 #define PERL_ARGS_ASSERT__CORE_SWASH_INIT	\
 	assert(pkg); assert(name); assert(listsv)
-
 #endif
-#if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_TOKE_C)
-STATIC char*	S_form_short_octal_warning(pTHX_ const char * const s, const STRLEN len)
-			__attribute__warn_unused_result__
-			__attribute__pure__
-			__attribute__nonnull__(pTHX_1);
+#if defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_TOKE_C) || defined(PERL_IN_DQUOTE_C)
+PERL_STATIC_INLINE char*	S_form_short_octal_warning(pTHX_ const char * const s, const STRLEN len)
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_FORM_SHORT_OCTAL_WARNING	\
 	assert(s)
 
-STATIC char	S_grok_bslash_c(pTHX_ const char source, const bool output_warning)
+PERL_CALLCONV char	Perl_grok_bslash_c(pTHX_ const char source, const bool output_warning)
 			__attribute__warn_unused_result__;
 
-STATIC bool	S_grok_bslash_o(pTHX_ char** s, UV* uv, const char** error_msg, const bool output_warning, const bool strict, const bool silence_non_portable, const bool utf8)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV bool	Perl_grok_bslash_o(pTHX_ char** s, UV* uv, const char** error_msg, const bool output_warning, const bool strict, const bool silence_non_portable, const bool utf8)
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GROK_BSLASH_O	\
 	assert(s); assert(uv); assert(error_msg)
 
-PERL_STATIC_INLINE bool	S_grok_bslash_x(pTHX_ char** s, UV* uv, const char** error_msg, const bool output_warning, const bool strict, const bool silence_non_portable, const bool utf8)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV bool	Perl_grok_bslash_x(pTHX_ char** s, UV* uv, const char** error_msg, const bool output_warning, const bool strict, const bool silence_non_portable, const bool utf8)
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GROK_BSLASH_X	\
 	assert(s); assert(uv); assert(error_msg)
 
 PERL_STATIC_INLINE I32	S_regcurly(const char *s)
 			__attribute__warn_unused_result__
-			__attribute__pure__
-			__attribute__nonnull__(1);
+			__attribute__pure__;
 #define PERL_ARGS_ASSERT_REGCURLY	\
 	assert(s)
 
@@ -7350,95 +5023,68 @@ PERL_STATIC_INLINE I32	S_regcurly(const char *s)
 PERL_CALLCONV SV*	Perl__add_range_to_invlist(pTHX_ SV* invlist, const UV start, const UV end)
 			__attribute__warn_unused_result__;
 
-/* PERL_CALLCONV void	_invlist_intersection(pTHX_ SV* const a, SV* const b, SV** i)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3); */
-
-PERL_CALLCONV void	Perl__invlist_intersection_maybe_complement_2nd(pTHX_ SV* const a, SV* const b, const bool complement_b, SV** i)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_4);
+/* PERL_CALLCONV void	_invlist_intersection(pTHX_ SV* const a, SV* const b, SV** i); */
+PERL_CALLCONV void	Perl__invlist_intersection_maybe_complement_2nd(pTHX_ SV* const a, SV* const b, const bool complement_b, SV** i);
 #define PERL_ARGS_ASSERT__INVLIST_INTERSECTION_MAYBE_COMPLEMENT_2ND	\
 	assert(b); assert(i)
-
-PERL_CALLCONV void	Perl__invlist_invert(pTHX_ SV* const invlist)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV void	Perl__invlist_invert(pTHX_ SV* const invlist);
 #define PERL_ARGS_ASSERT__INVLIST_INVERT	\
 	assert(invlist)
-
-PERL_CALLCONV void	Perl__invlist_populate_swatch(SV* const invlist, const UV start, const UV end, U8* swatch)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(4);
+PERL_CALLCONV void	Perl__invlist_populate_swatch(SV* const invlist, const UV start, const UV end, U8* swatch);
 #define PERL_ARGS_ASSERT__INVLIST_POPULATE_SWATCH	\
 	assert(invlist); assert(swatch)
-
-/* PERL_CALLCONV void	_invlist_subtract(pTHX_ SV* const a, SV* const b, SV** result)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3); */
-
-/* PERL_CALLCONV void	_invlist_union(pTHX_ SV* const a, SV* const b, SV** output)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3); */
-
-PERL_CALLCONV void	Perl__invlist_union_maybe_complement_2nd(pTHX_ SV* const a, SV* const b, const bool complement_b, SV** output)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_4);
+/* PERL_CALLCONV void	_invlist_subtract(pTHX_ SV* const a, SV* const b, SV** result); */
+/* PERL_CALLCONV void	_invlist_union(pTHX_ SV* const a, SV* const b, SV** output); */
+PERL_CALLCONV void	Perl__invlist_union_maybe_complement_2nd(pTHX_ SV* const a, SV* const b, const bool complement_b, SV** output);
 #define PERL_ARGS_ASSERT__INVLIST_UNION_MAYBE_COMPLEMENT_2ND	\
 	assert(b); assert(output)
-
 PERL_CALLCONV SV*	Perl__new_invlist(pTHX_ IV initial_size)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV SV*	Perl__setup_canned_invlist(pTHX_ const STRLEN size, const UV element0, UV** other_elements_ptr)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__SETUP_CANNED_INVLIST	\
 	assert(other_elements_ptr)
 
 PERL_CALLCONV SV*	Perl__swash_to_invlist(pTHX_ SV* const swash)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT__SWASH_TO_INVLIST	\
 	assert(swash)
 
 #endif
 #if defined(PERL_IN_REGEXEC_C)
+STATIC LB_enum	S_advance_one_LB(pTHX_ U8 ** curpos, const U8 * const strend, const bool utf8_target)
+			__attribute__warn_unused_result__;
+#define PERL_ARGS_ASSERT_ADVANCE_ONE_LB	\
+	assert(curpos); assert(strend)
+
 STATIC SB_enum	S_advance_one_SB(pTHX_ U8 ** curpos, const U8 * const strend, const bool utf8_target)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_ADVANCE_ONE_SB	\
 	assert(curpos); assert(strend)
 
-STATIC WB_enum	S_advance_one_WB(pTHX_ U8 ** curpos, const U8 * const strend, const bool utf8_target)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC WB_enum	S_advance_one_WB(pTHX_ U8 ** curpos, const U8 * const strend, const bool utf8_target, const bool skip_Extend_Format)
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_ADVANCE_ONE_WB	\
 	assert(curpos); assert(strend)
 
+STATIC LB_enum	S_backup_one_LB(pTHX_ const U8 * const strbeg, U8 ** curpos, const bool utf8_target)
+			__attribute__warn_unused_result__;
+#define PERL_ARGS_ASSERT_BACKUP_ONE_LB	\
+	assert(strbeg); assert(curpos)
+
 STATIC SB_enum	S_backup_one_SB(pTHX_ const U8 * const strbeg, U8 ** curpos, const bool utf8_target)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_BACKUP_ONE_SB	\
 	assert(strbeg); assert(curpos)
 
 STATIC WB_enum	S_backup_one_WB(pTHX_ WB_enum * previous, const U8 * const strbeg, U8 ** curpos, const bool utf8_target)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_BACKUP_ONE_WB	\
 	assert(previous); assert(strbeg); assert(curpos)
 
 STATIC char*	S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, const char *strend, regmatch_info *reginfo)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_FIND_BYCLASS	\
 	assert(prog); assert(c); assert(s); assert(strend)
 
@@ -7446,297 +5092,182 @@ STATIC bool	S_isFOO_lc(pTHX_ const U8 classnum, const U8 character)
 			__attribute__warn_unused_result__;
 
 STATIC bool	S_isFOO_utf8_lc(pTHX_ const U8 classnum, const U8* character)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_ISFOO_UTF8_LC	\
 	assert(character)
 
-STATIC bool	S_isGCB(const GCB_enum before, const GCB_enum after)
+PERL_STATIC_INLINE bool	S_isGCB(const GCB_enum before, const GCB_enum after)
 			__attribute__warn_unused_result__;
 
+STATIC bool	S_isLB(pTHX_ LB_enum before, LB_enum after, const U8 * const strbeg, const U8 * const curpos, const U8 * const strend, const bool utf8_target)
+			__attribute__warn_unused_result__;
+#define PERL_ARGS_ASSERT_ISLB	\
+	assert(strbeg); assert(curpos); assert(strend)
+
 STATIC bool	S_isSB(pTHX_ SB_enum before, SB_enum after, const U8 * const strbeg, const U8 * const curpos, const U8 * const strend, const bool utf8_target)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_ISSB	\
 	assert(strbeg); assert(curpos); assert(strend)
 
 STATIC bool	S_isWB(pTHX_ WB_enum previous, WB_enum before, WB_enum after, const U8 * const strbeg, const U8 * const curpos, const U8 * const strend, const bool utf8_target)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5)
-			__attribute__nonnull__(pTHX_6);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_ISWB	\
 	assert(strbeg); assert(curpos); assert(strend)
 
 STATIC I32	S_reg_check_named_buff_matched(const regexp *rex, const regnode *scan)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_REG_CHECK_NAMED_BUFF_MATCHED	\
 	assert(rex); assert(scan)
 
-STATIC void	S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_regcppop(pTHX_ regexp *rex, U32 *maxopenparen_p);
 #define PERL_ARGS_ASSERT_REGCPPOP	\
 	assert(rex); assert(maxopenparen_p)
-
-STATIC CHECKPOINT	S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen)
-			__attribute__nonnull__(pTHX_1);
+STATIC CHECKPOINT	S_regcppush(pTHX_ const regexp *rex, I32 parenfloor, U32 maxopenparen);
 #define PERL_ARGS_ASSERT_REGCPPUSH	\
 	assert(rex)
-
 STATIC U8*	S_reghop3(U8 *s, SSize_t off, const U8 *lim)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_REGHOP3	\
 	assert(s); assert(lim)
 
 STATIC U8*	S_reghop4(U8 *s, SSize_t off, const U8 *llim, const U8 *rlim)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(3)
-			__attribute__nonnull__(4);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_REGHOP4	\
 	assert(s); assert(llim); assert(rlim)
 
 STATIC U8*	S_reghopmaybe3(U8 *s, SSize_t off, const U8 *lim)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_REGHOPMAYBE3	\
 	assert(s); assert(lim)
 
 STATIC bool	S_reginclass(pTHX_ regexp * const prog, const regnode * const n, const U8 * const p, const U8 * const p_end, bool const utf8_target)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_REGINCLASS	\
 	assert(n); assert(p); assert(p_end)
 
 STATIC SSize_t	S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_REGMATCH	\
 	assert(reginfo); assert(startpos); assert(prog)
 
 STATIC I32	S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, regmatch_info *const reginfo, I32 max, int depth)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_REGREPEAT	\
 	assert(prog); assert(startposp); assert(p); assert(reginfo)
 
-STATIC I32	S_regtry(pTHX_ regmatch_info *reginfo, char **startposp)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC bool	S_regtry(pTHX_ regmatch_info *reginfo, char **startposp)
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_REGTRY	\
 	assert(reginfo); assert(startposp)
 
-STATIC bool	S_to_byte_substr(pTHX_ regexp * prog)
-			__attribute__nonnull__(pTHX_1);
+STATIC bool	S_to_byte_substr(pTHX_ regexp * prog);
 #define PERL_ARGS_ASSERT_TO_BYTE_SUBSTR	\
 	assert(prog)
-
-STATIC void	S_to_utf8_substr(pTHX_ regexp * prog)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_to_utf8_substr(pTHX_ regexp * prog);
 #define PERL_ARGS_ASSERT_TO_UTF8_SUBSTR	\
 	assert(prog)
-
 #endif
 #if defined(PERL_IN_SCOPE_C)
 STATIC void	S_save_pushptri32ptr(pTHX_ void *const ptr1, const I32 i, void *const ptr2, const int type);
-STATIC SV*	S_save_scalar_at(pTHX_ SV **sptr, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+STATIC SV*	S_save_scalar_at(pTHX_ SV **sptr, const U32 flags);
 #define PERL_ARGS_ASSERT_SAVE_SCALAR_AT	\
 	assert(sptr)
-
 #endif
 #if defined(PERL_IN_SV_C)
-STATIC char *	S_F0convert(NV nv, char *const endbuf, STRLEN *const len)
-			__attribute__nonnull__(2)
-			__attribute__nonnull__(3);
+STATIC char *	S_F0convert(NV nv, char *const endbuf, STRLEN *const len);
 #define PERL_ARGS_ASSERT_F0CONVERT	\
 	assert(endbuf); assert(len)
-
-STATIC void	S_anonymise_cv_maybe(pTHX_ GV *gv, CV *cv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_anonymise_cv_maybe(pTHX_ GV *gv, CV *cv);
 #define PERL_ARGS_ASSERT_ANONYMISE_CV_MAYBE	\
 	assert(gv); assert(cv)
-
-STATIC void	S_assert_uft8_cache_coherent(pTHX_ const char *const func, STRLEN from_cache, STRLEN real, SV *const sv)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_4);
+STATIC void	S_assert_uft8_cache_coherent(pTHX_ const char *const func, STRLEN from_cache, STRLEN real, SV *const sv);
 #define PERL_ARGS_ASSERT_ASSERT_UFT8_CACHE_COHERENT	\
 	assert(func); assert(sv)
-
-STATIC bool	S_curse(pTHX_ SV * const sv, const bool check_refcnt)
-			__attribute__nonnull__(pTHX_1);
+STATIC bool	S_curse(pTHX_ SV * const sv, const bool check_refcnt);
 #define PERL_ARGS_ASSERT_CURSE	\
 	assert(sv)
-
 STATIC I32	S_expect_number(pTHX_ char **const pattern)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_EXPECT_NUMBER	\
 	assert(pattern)
 
-STATIC I32	S_find_array_subscript(pTHX_ const AV *const av, const SV *const val)
-			__attribute__nonnull__(pTHX_2);
+STATIC I32	S_find_array_subscript(pTHX_ const AV *const av, const SV *const val);
 #define PERL_ARGS_ASSERT_FIND_ARRAY_SUBSCRIPT	\
 	assert(val)
-
-STATIC SV *	S_find_hash_subscript(pTHX_ const HV *const hv, const SV *const val)
-			__attribute__nonnull__(pTHX_2);
+STATIC SV *	S_find_hash_subscript(pTHX_ const HV *const hv, const SV *const val);
 #define PERL_ARGS_ASSERT_FIND_HASH_SUBSCRIPT	\
 	assert(val)
-
-STATIC SV*	S_find_uninit_var(pTHX_ const OP *const obase, const SV *const uninit_sv, bool match, const char **desc_p)
-			__attribute__nonnull__(pTHX_4);
+STATIC SV*	S_find_uninit_var(pTHX_ const OP *const obase, const SV *const uninit_sv, bool match, const char **desc_p);
 #define PERL_ARGS_ASSERT_FIND_UNINIT_VAR	\
 	assert(desc_p)
-
-STATIC bool	S_glob_2number(pTHX_ GV* const gv)
-			__attribute__nonnull__(pTHX_1);
+STATIC bool	S_glob_2number(pTHX_ GV* const gv);
 #define PERL_ARGS_ASSERT_GLOB_2NUMBER	\
 	assert(gv)
-
-STATIC void	S_glob_assign_glob(pTHX_ SV *const dstr, SV *const sstr, const int dtype)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_glob_assign_glob(pTHX_ SV *const dstr, SV *const sstr, const int dtype);
 #define PERL_ARGS_ASSERT_GLOB_ASSIGN_GLOB	\
 	assert(dstr); assert(sstr)
-
 STATIC SV *	S_more_sv(pTHX);
-STATIC void	S_not_a_number(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_not_a_number(pTHX_ SV *const sv);
 #define PERL_ARGS_ASSERT_NOT_A_NUMBER	\
 	assert(sv)
-
-STATIC void	S_not_incrementable(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_not_incrementable(pTHX_ SV *const sv);
 #define PERL_ARGS_ASSERT_NOT_INCREMENTABLE	\
 	assert(sv)
-
 STATIC PTR_TBL_ENT_t *	S_ptr_table_find(PTR_TBL_t *const tbl, const void *const sv)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_PTR_TABLE_FIND	\
 	assert(tbl)
 
-STATIC bool	S_sv_2iuv_common(pTHX_ SV *const sv)
-			__attribute__nonnull__(pTHX_1);
+STATIC bool	S_sv_2iuv_common(pTHX_ SV *const sv);
 #define PERL_ARGS_ASSERT_SV_2IUV_COMMON	\
 	assert(sv)
-
-STATIC void	S_sv_add_arena(pTHX_ char *const ptr, const U32 size, const U32 flags)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_sv_add_arena(pTHX_ char *const ptr, const U32 size, const U32 flags);
 #define PERL_ARGS_ASSERT_SV_ADD_ARENA	\
 	assert(ptr)
-
-STATIC const char *	S_sv_display(pTHX_ SV *const sv, char *tmpbuf, STRLEN tmpbuf_size)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC const char *	S_sv_display(pTHX_ SV *const sv, char *tmpbuf, STRLEN tmpbuf_size);
 #define PERL_ARGS_ASSERT_SV_DISPLAY	\
 	assert(sv); assert(tmpbuf)
-
-STATIC STRLEN	S_sv_pos_b2u_midway(pTHX_ const U8 *const s, const U8 *const target, const U8 *end, STRLEN endu)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC STRLEN	S_sv_pos_b2u_midway(pTHX_ const U8 *const s, const U8 *const target, const U8 *end, STRLEN endu);
 #define PERL_ARGS_ASSERT_SV_POS_B2U_MIDWAY	\
 	assert(s); assert(target); assert(end)
-
-STATIC STRLEN	S_sv_pos_u2b_cached(pTHX_ SV *const sv, MAGIC **const mgp, const U8 *const start, const U8 *const send, STRLEN uoffset, STRLEN uoffset0, STRLEN boffset0)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+STATIC STRLEN	S_sv_pos_u2b_cached(pTHX_ SV *const sv, MAGIC **const mgp, const U8 *const start, const U8 *const send, STRLEN uoffset, STRLEN uoffset0, STRLEN boffset0);
 #define PERL_ARGS_ASSERT_SV_POS_U2B_CACHED	\
 	assert(sv); assert(mgp); assert(start); assert(send)
-
-STATIC STRLEN	S_sv_pos_u2b_forwards(const U8 *const start, const U8 *const send, STRLEN *const uoffset, bool *const at_end)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2)
-			__attribute__nonnull__(3)
-			__attribute__nonnull__(4);
+STATIC STRLEN	S_sv_pos_u2b_forwards(const U8 *const start, const U8 *const send, STRLEN *const uoffset, bool *const at_end);
 #define PERL_ARGS_ASSERT_SV_POS_U2B_FORWARDS	\
 	assert(start); assert(send); assert(uoffset); assert(at_end)
-
-STATIC STRLEN	S_sv_pos_u2b_midway(const U8 *const start, const U8 *send, STRLEN uoffset, const STRLEN uend)
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+STATIC STRLEN	S_sv_pos_u2b_midway(const U8 *const start, const U8 *send, STRLEN uoffset, const STRLEN uend);
 #define PERL_ARGS_ASSERT_SV_POS_U2B_MIDWAY	\
 	assert(start); assert(send)
-
-PERL_STATIC_INLINE void	S_sv_unglob(pTHX_ SV *const sv, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+PERL_STATIC_INLINE void	S_sv_unglob(pTHX_ SV *const sv, U32 flags);
 #define PERL_ARGS_ASSERT_SV_UNGLOB	\
 	assert(sv)
-
 STATIC char *	S_uiv_2buf(char *const buf, const IV iv, UV uv, const int is_uv, char **const peob)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(5);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_UIV_2BUF	\
 	assert(buf); assert(peob)
 
-STATIC void	S_utf8_mg_len_cache_update(pTHX_ SV *const sv, MAGIC **const mgp, const STRLEN ulen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_utf8_mg_len_cache_update(pTHX_ SV *const sv, MAGIC **const mgp, const STRLEN ulen);
 #define PERL_ARGS_ASSERT_UTF8_MG_LEN_CACHE_UPDATE	\
 	assert(sv); assert(mgp)
-
-STATIC void	S_utf8_mg_pos_cache_update(pTHX_ SV *const sv, MAGIC **const mgp, const STRLEN byte, const STRLEN utf8, const STRLEN blen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC void	S_utf8_mg_pos_cache_update(pTHX_ SV *const sv, MAGIC **const mgp, const STRLEN byte, const STRLEN utf8, const STRLEN blen);
 #define PERL_ARGS_ASSERT_UTF8_MG_POS_CACHE_UPDATE	\
 	assert(sv); assert(mgp)
-
-STATIC I32	S_visit(pTHX_ SVFUNC_t f, const U32 flags, const U32 mask)
-			__attribute__nonnull__(pTHX_1);
+STATIC I32	S_visit(pTHX_ SVFUNC_t f, const U32 flags, const U32 mask);
 #define PERL_ARGS_ASSERT_VISIT	\
 	assert(f)
-
-#  if defined(PERL_OLD_COPY_ON_WRITE)
-STATIC void	S_sv_release_COW(pTHX_ SV *sv, const char *pvx, SV *after)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
-#define PERL_ARGS_ASSERT_SV_RELEASE_COW	\
-	assert(sv); assert(pvx); assert(after)
-
-#  endif
 #  if defined(USE_ITHREADS)
 STATIC SV*	S_sv_dup_common(pTHX_ const SV *const sstr, CLONE_PARAMS *const param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_DUP_COMMON	\
 	assert(sstr); assert(param)
 
-STATIC SV **	S_sv_dup_inc_multiple(pTHX_ SV *const *source, SV **dest, SSize_t items, CLONE_PARAMS *const param)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_4);
+STATIC SV **	S_sv_dup_inc_multiple(pTHX_ SV *const *source, SV **dest, SSize_t items, CLONE_PARAMS *const param);
 #define PERL_ARGS_ASSERT_SV_DUP_INC_MULTIPLE	\
 	assert(source); assert(dest); assert(param)
-
-STATIC void	S_unreferenced_to_tmp_stack(pTHX_ AV *const unreferenced)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_unreferenced_to_tmp_stack(pTHX_ AV *const unreferenced);
 #define PERL_ARGS_ASSERT_UNREFERENCED_TO_TMP_STACK	\
 	assert(unreferenced)
-
 #  endif
 #endif
 #if defined(PERL_IN_SV_C) || defined (PERL_IN_OP_C)
@@ -7747,161 +5278,112 @@ PERL_CALLCONV SV *	Perl_varname(pTHX_ const GV *const gv, const char gvtype, PAD
 #if defined(PERL_IN_TOKE_C)
 STATIC int	S_ao(pTHX_ int toketype);
 STATIC void	S_check_uni(pTHX);
-STATIC void	S_checkcomma(pTHX_ const char *s, const char *name, const char *what)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_checkcomma(pTHX_ const char *s, const char *name, const char *what);
 #define PERL_ARGS_ASSERT_CHECKCOMMA	\
 	assert(s); assert(name); assert(what)
-
 STATIC int	S_deprecate_commaless_var_list(pTHX);
 STATIC char *	S_filter_gets(pTHX_ SV *sv, STRLEN append)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_FILTER_GETS	\
 	assert(sv)
 
 STATIC HV *	S_find_in_my_stash(pTHX_ const char *pkgname, STRLEN len)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_FIND_IN_MY_STASH	\
 	assert(pkgname)
 
-STATIC void	S_force_ident(pTHX_ const char *s, int kind)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_force_ident(pTHX_ const char *s, int kind);
 #define PERL_ARGS_ASSERT_FORCE_IDENT	\
 	assert(s)
-
 STATIC void	S_force_ident_maybe_lex(pTHX_ char pit);
 STATIC void	S_force_next(pTHX_ I32 type);
-STATIC char*	S_force_strict_version(pTHX_ char *s)
-			__attribute__nonnull__(pTHX_1);
+STATIC char*	S_force_strict_version(pTHX_ char *s);
 #define PERL_ARGS_ASSERT_FORCE_STRICT_VERSION	\
 	assert(s)
-
-STATIC char*	S_force_version(pTHX_ char *s, int guessing)
-			__attribute__nonnull__(pTHX_1);
+STATIC char*	S_force_version(pTHX_ char *s, int guessing);
 #define PERL_ARGS_ASSERT_FORCE_VERSION	\
 	assert(s)
-
-STATIC char*	S_force_word(pTHX_ char *start, int token, int check_keyword, int allow_pack)
-			__attribute__nonnull__(pTHX_1);
+STATIC char*	S_force_word(pTHX_ char *start, int token, int check_keyword, int allow_pack);
 #define PERL_ARGS_ASSERT_FORCE_WORD	\
 	assert(start)
-
 PERL_STATIC_INLINE SV*	S_get_and_check_backslash_N_name(pTHX_ const char* s, const char* const e)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GET_AND_CHECK_BACKSLASH_N_NAME	\
 	assert(s); assert(e)
 
-STATIC void	S_incline(pTHX_ const char *s)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_incline(pTHX_ const char *s);
 #define PERL_ARGS_ASSERT_INCLINE	\
 	assert(s)
-
-STATIC int	S_intuit_method(pTHX_ char *s, SV *ioname, CV *cv)
-			__attribute__nonnull__(pTHX_1);
+STATIC int	S_intuit_method(pTHX_ char *s, SV *ioname, CV *cv);
 #define PERL_ARGS_ASSERT_INTUIT_METHOD	\
 	assert(s)
-
-STATIC int	S_intuit_more(pTHX_ char *s)
-			__attribute__nonnull__(pTHX_1);
+STATIC int	S_intuit_more(pTHX_ char *s);
 #define PERL_ARGS_ASSERT_INTUIT_MORE	\
 	assert(s)
-
-STATIC I32	S_lop(pTHX_ I32 f, int x, char *s)
-			__attribute__nonnull__(pTHX_3);
+STATIC I32	S_lop(pTHX_ I32 f, int x, char *s);
 #define PERL_ARGS_ASSERT_LOP	\
 	assert(s)
-
 PERL_STATIC_NO_RET void	S_missingterm(pTHX_ char *s)
 			__attribute__noreturn__;
 
-STATIC SV*	S_new_constant(pTHX_ const char *s, STRLEN len, const char *key, STRLEN keylen, SV *sv, SV *pv, const char *type, STRLEN typelen)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_5);
+STATIC SV*	S_new_constant(pTHX_ const char *s, STRLEN len, const char *key, STRLEN keylen, SV *sv, SV *pv, const char *type, STRLEN typelen);
 #define PERL_ARGS_ASSERT_NEW_CONSTANT	\
 	assert(key); assert(sv)
-
-STATIC void	S_no_op(pTHX_ const char *const what, char *s)
-			__attribute__nonnull__(pTHX_1);
+STATIC void	S_no_op(pTHX_ const char *const what, char *s);
 #define PERL_ARGS_ASSERT_NO_OP	\
 	assert(what)
-
-STATIC void	S_parse_ident(pTHX_ char **s, char **d, char * const e, int allow_package, bool is_utf8)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_parse_ident(pTHX_ char **s, char **d, char * const e, int allow_package, bool is_utf8);
 #define PERL_ARGS_ASSERT_PARSE_IDENT	\
 	assert(s); assert(d); assert(e)
-
 STATIC int	S_pending_ident(pTHX);
 STATIC char*	S_scan_const(pTHX_ char *start)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SCAN_CONST	\
 	assert(start)
 
 STATIC char*	S_scan_formline(pTHX_ char *s)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SCAN_FORMLINE	\
 	assert(s)
 
 STATIC char*	S_scan_heredoc(pTHX_ char *s)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SCAN_HEREDOC	\
 	assert(s)
 
-STATIC char*	S_scan_ident(pTHX_ char *s, char *dest, STRLEN destlen, I32 ck_uni)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC char*	S_scan_ident(pTHX_ char *s, char *dest, STRLEN destlen, I32 ck_uni);
 #define PERL_ARGS_ASSERT_SCAN_IDENT	\
 	assert(s); assert(dest)
-
 STATIC char*	S_scan_inputsymbol(pTHX_ char *start)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SCAN_INPUTSYMBOL	\
 	assert(start)
 
 STATIC char*	S_scan_pat(pTHX_ char *start, I32 type)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SCAN_PAT	\
 	assert(start)
 
 STATIC char*	S_scan_str(pTHX_ char *start, int keep_quoted, int keep_delims, int re_reparse, char **delimp)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SCAN_STR	\
 	assert(start)
 
 STATIC char*	S_scan_subst(pTHX_ char *start)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SCAN_SUBST	\
 	assert(start)
 
 STATIC char*	S_scan_trans(pTHX_ char *start)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SCAN_TRANS	\
 	assert(start)
 
-STATIC char*	S_scan_word(pTHX_ char *s, char *dest, STRLEN destlen, int allow_package, STRLEN *slp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_5);
+STATIC char*	S_scan_word(pTHX_ char *s, char *dest, STRLEN destlen, int allow_package, STRLEN *slp);
 #define PERL_ARGS_ASSERT_SCAN_WORD	\
 	assert(s); assert(dest); assert(slp)
-
 STATIC char*	S_skipspace_flags(pTHX_ char *s, U32 flags)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SKIPSPACE_FLAGS	\
 	assert(s)
 
@@ -7915,68 +5397,49 @@ STATIC I32	S_sublex_start(pTHX)
 			__attribute__warn_unused_result__;
 
 STATIC char*	S_swallow_bom(pTHX_ U8 *s)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SWALLOW_BOM	\
 	assert(s)
 
 STATIC char *	S_tokenize_use(pTHX_ int is_use, char *s)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_TOKENIZE_USE	\
 	assert(s)
 
-STATIC SV*	S_tokeq(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1);
+STATIC SV*	S_tokeq(pTHX_ SV *sv);
 #define PERL_ARGS_ASSERT_TOKEQ	\
 	assert(sv)
-
 STATIC void	S_update_debugger_info(pTHX_ SV *orig_sv, const char *const buf, STRLEN len);
-STATIC int	S_yywarn(pTHX_ const char *const s, U32 flags)
-			__attribute__nonnull__(pTHX_1);
+STATIC int	S_yywarn(pTHX_ const char *const s, U32 flags);
 #define PERL_ARGS_ASSERT_YYWARN	\
 	assert(s)
-
 #endif
 #if defined(PERL_IN_UNIVERSAL_C)
-STATIC bool	S_isa_lookup(pTHX_ HV *stash, const char * const name, STRLEN len, U32 flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+STATIC bool	S_isa_lookup(pTHX_ HV *stash, const char * const name, STRLEN len, U32 flags);
 #define PERL_ARGS_ASSERT_ISA_LOOKUP	\
 	assert(stash); assert(name)
-
 #endif
 #if defined(PERL_IN_UTF8_C)
+STATIC UV	S__to_utf8_case(pTHX_ const UV uv1, const U8 *p, U8* ustrp, STRLEN *lenp, SV **swashp, const char *normal, const char *special);
+#define PERL_ARGS_ASSERT__TO_UTF8_CASE	\
+	assert(p); assert(ustrp); assert(swashp); assert(normal)
 STATIC UV	S_check_locale_boundary_crossing(pTHX_ const U8* const p, const UV result, U8* const ustrp, STRLEN *lenp)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CHECK_LOCALE_BOUNDARY_CROSSING	\
 	assert(p); assert(ustrp); assert(lenp)
 
 PERL_STATIC_INLINE bool	S_is_utf8_common(pTHX_ const U8 *const p, SV **swash, const char * const swashname, SV* const invlist)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_IS_UTF8_COMMON	\
 	assert(p); assert(swash); assert(swashname)
 
 STATIC U8*	S_swash_scan_list_line(pTHX_ U8* l, U8* const lend, UV* min, UV* max, UV* val, const bool wants_value, const U8* const typestr)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3)
-			__attribute__nonnull__(pTHX_4)
-			__attribute__nonnull__(pTHX_5)
-			__attribute__nonnull__(pTHX_7);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SWASH_SCAN_LIST_LINE	\
 	assert(l); assert(lend); assert(min); assert(max); assert(val); assert(typestr)
 
 STATIC SV*	S_swatch_get(pTHX_ SV* swash, UV start, UV span)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SWATCH_GET	\
 	assert(swash)
 
@@ -7985,227 +5448,183 @@ STATIC U8	S_to_lower_latin1(const U8 c, U8 *p, STRLEN *lenp)
 
 #endif
 #if defined(PERL_IN_UTF8_C) || defined(PERL_IN_PP_C)
-PERL_CALLCONV UV	Perl__to_upper_title_latin1(pTHX_ const U8 c, U8 *p, STRLEN *lenp, const char S_or_s)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV UV	Perl__to_upper_title_latin1(pTHX_ const U8 c, U8 *p, STRLEN *lenp, const char S_or_s);
 #define PERL_ARGS_ASSERT__TO_UPPER_TITLE_LATIN1	\
 	assert(p); assert(lenp)
-
 #endif
 #if defined(PERL_IN_UTF8_C) || defined(PERL_IN_REGCOMP_C) || defined(PERL_IN_REGEXEC_C)
-PERL_CALLCONV UV	Perl__to_fold_latin1(pTHX_ const U8 c, U8 *p, STRLEN *lenp, const unsigned int flags)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV UV	Perl__to_fold_latin1(pTHX_ const U8 c, U8 *p, STRLEN *lenp, const unsigned int flags);
 #define PERL_ARGS_ASSERT__TO_FOLD_LATIN1	\
 	assert(p); assert(lenp)
-
 #endif
 #if defined(PERL_IN_UTIL_C)
 STATIC bool	S_ckwarn_common(pTHX_ U32 w);
 STATIC bool	S_invoke_exception_hook(pTHX_ SV *ex, bool warn);
 STATIC SV*	S_mess_alloc(pTHX);
-STATIC SV *	S_with_queued_errors(pTHX_ SV *ex)
-			__attribute__nonnull__(pTHX_1);
+STATIC SV *	S_with_queued_errors(pTHX_ SV *ex);
 #define PERL_ARGS_ASSERT_WITH_QUEUED_ERRORS	\
 	assert(ex)
-
-STATIC void	S_xs_version_bootcheck(pTHX_ U32 items, U32 ax, const char *xs_p, STRLEN xs_len)
-			__attribute__nonnull__(pTHX_3);
+STATIC void	S_xs_version_bootcheck(pTHX_ U32 items, U32 ax, const char *xs_p, STRLEN xs_len);
 #define PERL_ARGS_ASSERT_XS_VERSION_BOOTCHECK	\
 	assert(xs_p)
-
 #  if defined(PERL_MEM_LOG) && !defined(PERL_MEM_LOG_NOIMPL)
-STATIC void	S_mem_log_common(enum mem_log_type mlt, const UV n, const UV typesize, const char *type_name, const SV *sv, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname)
-			__attribute__nonnull__(4)
-			__attribute__nonnull__(8)
-			__attribute__nonnull__(10);
+STATIC void	S_mem_log_common(enum mem_log_type mlt, const UV n, const UV typesize, const char *type_name, const SV *sv, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname);
 #define PERL_ARGS_ASSERT_MEM_LOG_COMMON	\
 	assert(type_name); assert(filename); assert(funcname)
-
 #  endif
 #endif
+#if defined(PERL_MEM_LOG)
+PERL_CALLCONV Malloc_t	Perl_mem_log_alloc(const UV nconst, UV typesize, const char *type_name, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname);
+#define PERL_ARGS_ASSERT_MEM_LOG_ALLOC	\
+	assert(type_name); assert(filename); assert(funcname)
+PERL_CALLCONV Malloc_t	Perl_mem_log_free(Malloc_t oldalloc, const char *filename, const int linenumber, const char *funcname);
+#define PERL_ARGS_ASSERT_MEM_LOG_FREE	\
+	assert(filename); assert(funcname)
+PERL_CALLCONV Malloc_t	Perl_mem_log_realloc(const UV n, const UV typesize, const char *type_name, Malloc_t oldalloc, Malloc_t newalloc, const char *filename, const int linenumber, const char *funcname);
+#define PERL_ARGS_ASSERT_MEM_LOG_REALLOC	\
+	assert(type_name); assert(filename); assert(funcname)
+#endif
 #if defined(PERL_OP_PARENT)
-PERL_CALLCONV OP*	Perl_op_parent(OP *o)
-			__attribute__nonnull__(1);
+PERL_CALLCONV OP*	Perl_op_parent(OP *o);
 #define PERL_ARGS_ASSERT_OP_PARENT	\
 	assert(o)
-
 #endif
 #if defined(PERL_USES_PL_PIDSTATUS) && defined(PERL_IN_UTIL_C)
 STATIC void	S_pidgone(pTHX_ Pid_t pid, int status);
 #endif
 #if defined(UNLINK_ALL_VERSIONS)
-PERL_CALLCONV I32	Perl_unlnk(pTHX_ const char* f)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV I32	Perl_unlnk(pTHX_ const char* f);
 #define PERL_ARGS_ASSERT_UNLNK	\
 	assert(f)
-
 #endif
 #if defined(USE_C_BACKTRACE)
-PERL_CALLCONV bool	Perl_dump_c_backtrace(pTHX_ PerlIO* fp, int max_depth, int skip)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV bool	Perl_dump_c_backtrace(pTHX_ PerlIO* fp, int max_depth, int skip);
 #define PERL_ARGS_ASSERT_DUMP_C_BACKTRACE	\
 	assert(fp)
-
-/* PERL_CALLCONV void	free_c_backtrace(pTHX_ Perl_c_backtrace* bt)
-			__attribute__nonnull__(pTHX_1); */
-
+/* PERL_CALLCONV void	free_c_backtrace(pTHX_ Perl_c_backtrace* bt); */
 PERL_CALLCONV Perl_c_backtrace*	Perl_get_c_backtrace(pTHX_ int max_depth, int skip);
 PERL_CALLCONV SV*	Perl_get_c_backtrace_dump(pTHX_ int max_depth, int skip);
 #endif
+#if defined(USE_DTRACE)
+PERL_CALLCONV void	Perl_dtrace_probe_call(pTHX_ CV *cv, bool is_call);
+#define PERL_ARGS_ASSERT_DTRACE_PROBE_CALL	\
+	assert(cv)
+PERL_CALLCONV void	Perl_dtrace_probe_load(pTHX_ const char *name, bool is_loading);
+#define PERL_ARGS_ASSERT_DTRACE_PROBE_LOAD	\
+	assert(name)
+PERL_CALLCONV void	Perl_dtrace_probe_op(pTHX_ const OP *op);
+#define PERL_ARGS_ASSERT_DTRACE_PROBE_OP	\
+	assert(op)
+PERL_CALLCONV void	Perl_dtrace_probe_phase(pTHX_ enum perl_phase phase);
+#endif
 #if defined(USE_ITHREADS)
-PERL_CALLCONV PADOFFSET	Perl_alloccopstash(pTHX_ HV *hv)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV PADOFFSET	Perl_alloccopstash(pTHX_ HV *hv);
 #define PERL_ARGS_ASSERT_ALLOCCOPSTASH	\
 	assert(hv)
-
 PERL_CALLCONV void*	Perl_any_dup(pTHX_ void* v, const PerlInterpreter* proto_perl)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_ANY_DUP	\
 	assert(proto_perl)
 
-PERL_CALLCONV void	Perl_clone_params_del(CLONE_PARAMS *param)
-			__attribute__nonnull__(1);
+PERL_CALLCONV void	Perl_clone_params_del(CLONE_PARAMS *param);
 #define PERL_ARGS_ASSERT_CLONE_PARAMS_DEL	\
 	assert(param)
-
 PERL_CALLCONV CLONE_PARAMS *	Perl_clone_params_new(PerlInterpreter *const from, PerlInterpreter *const to)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(1)
-			__attribute__nonnull__(2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CLONE_PARAMS_NEW	\
 	assert(from); assert(to)
 
 PERL_CALLCONV PERL_CONTEXT*	Perl_cx_dup(pTHX_ PERL_CONTEXT* cx, I32 ix, I32 max, CLONE_PARAMS* param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_4);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_CX_DUP	\
 	assert(param)
 
 PERL_CALLCONV DIR*	Perl_dirp_dup(pTHX_ DIR *const dp, CLONE_PARAMS *const param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_DIRP_DUP	\
 	assert(param)
 
-PERL_CALLCONV PerlIO*	Perl_fp_dup(pTHX_ PerlIO *const fp, const char type, CLONE_PARAMS *const param)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV PerlIO*	Perl_fp_dup(pTHX_ PerlIO *const fp, const char type, CLONE_PARAMS *const param);
 #define PERL_ARGS_ASSERT_FP_DUP	\
 	assert(param)
-
 PERL_CALLCONV GP*	Perl_gp_dup(pTHX_ GP *const gp, CLONE_PARAMS *const param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_GP_DUP	\
 	assert(param)
 
 PERL_CALLCONV HE*	Perl_he_dup(pTHX_ const HE* e, bool shared, CLONE_PARAMS* param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HE_DUP	\
 	assert(param)
 
 PERL_CALLCONV HEK*	Perl_hek_dup(pTHX_ HEK* e, CLONE_PARAMS* param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_HEK_DUP	\
 	assert(param)
 
 PERL_CALLCONV MAGIC*	Perl_mg_dup(pTHX_ MAGIC *mg, CLONE_PARAMS *const param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_MG_DUP	\
 	assert(param)
 
-PERL_CALLCONV struct mro_meta*	Perl_mro_meta_dup(pTHX_ struct mro_meta* smeta, CLONE_PARAMS* param)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV struct mro_meta*	Perl_mro_meta_dup(pTHX_ struct mro_meta* smeta, CLONE_PARAMS* param);
 #define PERL_ARGS_ASSERT_MRO_META_DUP	\
 	assert(smeta); assert(param)
-
 PERL_CALLCONV OP*	Perl_newPADOP(pTHX_ I32 type, I32 flags, SV* sv)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_3);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWPADOP	\
 	assert(sv)
 
 PERL_CALLCONV PADLIST *	Perl_padlist_dup(pTHX_ PADLIST *srcpad, CLONE_PARAMS *param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_PADLIST_DUP	\
 	assert(srcpad); assert(param)
 
 PERL_CALLCONV PADNAME *	Perl_padname_dup(pTHX_ PADNAME *src, CLONE_PARAMS *param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_PADNAME_DUP	\
 	assert(src); assert(param)
 
 PERL_CALLCONV PADNAMELIST *	Perl_padnamelist_dup(pTHX_ PADNAMELIST *srcpad, CLONE_PARAMS *param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_PADNAMELIST_DUP	\
 	assert(srcpad); assert(param)
 
-PERL_CALLCONV yy_parser*	Perl_parser_dup(pTHX_ const yy_parser *const proto, CLONE_PARAMS *const param)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV yy_parser*	Perl_parser_dup(pTHX_ const yy_parser *const proto, CLONE_PARAMS *const param);
 #define PERL_ARGS_ASSERT_PARSER_DUP	\
 	assert(param)
-
-PERL_CALLCONV PerlInterpreter*	perl_clone(PerlInterpreter *proto_perl, UV flags)
-			__attribute__nonnull__(1);
+PERL_CALLCONV PerlInterpreter*	perl_clone(PerlInterpreter *proto_perl, UV flags);
 #define PERL_ARGS_ASSERT_PERL_CLONE	\
 	assert(proto_perl)
-
-PERL_CALLCONV void	Perl_re_dup_guts(pTHX_ const REGEXP *sstr, REGEXP *dstr, CLONE_PARAMS* param)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_re_dup_guts(pTHX_ const REGEXP *sstr, REGEXP *dstr, CLONE_PARAMS* param);
 #define PERL_ARGS_ASSERT_RE_DUP_GUTS	\
 	assert(sstr); assert(dstr); assert(param)
-
-PERL_CALLCONV void*	Perl_regdupe_internal(pTHX_ REGEXP * const r, CLONE_PARAMS* param)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV void*	Perl_regdupe_internal(pTHX_ REGEXP * const r, CLONE_PARAMS* param);
 #define PERL_ARGS_ASSERT_REGDUPE_INTERNAL	\
 	assert(r); assert(param)
-
-PERL_CALLCONV void	Perl_rvpv_dup(pTHX_ SV *const dstr, const SV *const sstr, CLONE_PARAMS *const param)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV void	Perl_rvpv_dup(pTHX_ SV *const dstr, const SV *const sstr, CLONE_PARAMS *const param);
 #define PERL_ARGS_ASSERT_RVPV_DUP	\
 	assert(dstr); assert(sstr); assert(param)
-
 PERL_CALLCONV PERL_SI*	Perl_si_dup(pTHX_ PERL_SI* si, CLONE_PARAMS* param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SI_DUP	\
 	assert(param)
 
 PERL_CALLCONV ANY*	Perl_ss_dup(pTHX_ PerlInterpreter* proto_perl, CLONE_PARAMS* param)
 			__attribute__malloc__
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SS_DUP	\
 	assert(proto_perl); assert(param)
 
 PERL_CALLCONV SV*	Perl_sv_dup(pTHX_ const SV *const sstr, CLONE_PARAMS *const param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_DUP	\
 	assert(param)
 
 PERL_CALLCONV SV*	Perl_sv_dup_inc(pTHX_ const SV *const sstr, CLONE_PARAMS *const param)
-			__attribute__warn_unused_result__
-			__attribute__nonnull__(pTHX_2);
+			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_SV_DUP_INC	\
 	assert(param)
 
@@ -8214,35 +5633,21 @@ PERL_CALLCONV SV*	Perl_sv_dup_inc(pTHX_ const SV *const sstr, CLONE_PARAMS *cons
 PERL_CALLCONV bool	Perl__is_cur_LC_category_utf8(pTHX_ int category);
 #endif
 #if defined(USE_LOCALE) && defined(PERL_IN_LOCALE_C)
-STATIC char*	S_stdize_locale(pTHX_ char* locs)
-			__attribute__nonnull__(pTHX_1);
+STATIC char*	S_stdize_locale(pTHX_ char* locs);
 #define PERL_ARGS_ASSERT_STDIZE_LOCALE	\
 	assert(locs)
-
 #endif
 #if defined(USE_LOCALE_COLLATE)
-PERL_CALLCONV int	Perl_magic_setcollxfrm(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_setcollxfrm(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_SETCOLLXFRM	\
 	assert(sv); assert(mg)
-
-PERL_CALLCONV char*	Perl_mem_collxfrm(pTHX_ const char* s, STRLEN len, STRLEN* xlen)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV char*	Perl_mem_collxfrm(pTHX_ const char* s, STRLEN len, STRLEN* xlen);
 #define PERL_ARGS_ASSERT_MEM_COLLXFRM	\
 	assert(s); assert(xlen)
-
-/* PERL_CALLCONV char*	sv_collxfrm(pTHX_ SV *const sv, STRLEN *const nxp)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2); */
-
-PERL_CALLCONV char*	Perl_sv_collxfrm_flags(pTHX_ SV *const sv, STRLEN *const nxp, I32 const flags)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+/* PERL_CALLCONV char*	sv_collxfrm(pTHX_ SV *const sv, STRLEN *const nxp); */
+PERL_CALLCONV char*	Perl_sv_collxfrm_flags(pTHX_ SV *const sv, STRLEN *const nxp, I32 const flags);
 #define PERL_ARGS_ASSERT_SV_COLLXFRM_FLAGS	\
 	assert(sv); assert(nxp)
-
 #endif
 #if defined(USE_PERLIO)
 PERL_CALLCONV void	Perl_PerlIO_clearerr(pTHX_ PerlIO *f);
@@ -8260,11 +5665,9 @@ PERL_CALLCONV SSize_t	Perl_PerlIO_get_cnt(pTHX_ PerlIO *f)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV STDCHAR *	Perl_PerlIO_get_ptr(pTHX_ PerlIO *f);
-PERL_CALLCONV SSize_t	Perl_PerlIO_read(pTHX_ PerlIO *f, void *vbuf, Size_t count)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SSize_t	Perl_PerlIO_read(pTHX_ PerlIO *f, void *vbuf, Size_t count);
 #define PERL_ARGS_ASSERT_PERLIO_READ	\
 	assert(vbuf)
-
 PERL_CALLCONV void	Perl_PerlIO_restore_errno(pTHX_ PerlIO *f);
 PERL_CALLCONV void	Perl_PerlIO_save_errno(pTHX_ PerlIO *f);
 PERL_CALLCONV int	Perl_PerlIO_seek(pTHX_ PerlIO *f, Off_t offset, int whence);
@@ -8281,65 +5684,46 @@ PERL_CALLCONV PerlIO *	Perl_PerlIO_stdout(pTHX)
 			__attribute__warn_unused_result__;
 
 PERL_CALLCONV Off_t	Perl_PerlIO_tell(pTHX_ PerlIO *f);
-PERL_CALLCONV SSize_t	Perl_PerlIO_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SSize_t	Perl_PerlIO_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
 #define PERL_ARGS_ASSERT_PERLIO_UNREAD	\
 	assert(vbuf)
-
-PERL_CALLCONV SSize_t	Perl_PerlIO_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV SSize_t	Perl_PerlIO_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count);
 #define PERL_ARGS_ASSERT_PERLIO_WRITE	\
 	assert(vbuf)
-
 #endif
 #if defined(USE_QUADMATH)
-PERL_CALLCONV bool	Perl_quadmath_format_needed(const char* format)
-			__attribute__nonnull__(1);
+PERL_CALLCONV bool	Perl_quadmath_format_needed(const char* format);
 #define PERL_ARGS_ASSERT_QUADMATH_FORMAT_NEEDED	\
 	assert(format)
-
-PERL_CALLCONV const char*	Perl_quadmath_format_single(const char* format)
-			__attribute__nonnull__(1);
+PERL_CALLCONV const char*	Perl_quadmath_format_single(const char* format);
 #define PERL_ARGS_ASSERT_QUADMATH_FORMAT_SINGLE	\
 	assert(format)
-
 #endif
 #if defined(WIN32)
 PERL_CALLCONV char*	Perl_my_setlocale(pTHX_ int category, const char* locale)
 			__attribute__pure__;
 
 PERL_CALLCONV_NO_RET void	win32_croak_not_implemented(const char * fname)
-			__attribute__noreturn__
-			__attribute__nonnull__(1);
+			__attribute__noreturn__;
 #define PERL_ARGS_ASSERT_WIN32_CROAK_NOT_IMPLEMENTED	\
 	assert(fname)
 
 #endif
 #if defined(WIN32) || defined(__SYMBIAN32__) || defined(VMS)
-PERL_CALLCONV int	Perl_do_aspawn(pTHX_ SV* really, SV** mark, SV** sp)
-			__attribute__nonnull__(pTHX_2)
-			__attribute__nonnull__(pTHX_3);
+PERL_CALLCONV int	Perl_do_aspawn(pTHX_ SV* really, SV** mark, SV** sp);
 #define PERL_ARGS_ASSERT_DO_ASPAWN	\
 	assert(mark); assert(sp)
-
-PERL_CALLCONV int	Perl_do_spawn(pTHX_ char* cmd)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_do_spawn(pTHX_ char* cmd);
 #define PERL_ARGS_ASSERT_DO_SPAWN	\
 	assert(cmd)
-
-PERL_CALLCONV int	Perl_do_spawn_nowait(pTHX_ char* cmd)
-			__attribute__nonnull__(pTHX_1);
+PERL_CALLCONV int	Perl_do_spawn_nowait(pTHX_ char* cmd);
 #define PERL_ARGS_ASSERT_DO_SPAWN_NOWAIT	\
 	assert(cmd)
-
 #endif
 #if defined(_MSC_VER)
-PERL_CALLCONV int	Perl_magic_regdatum_set(pTHX_ SV* sv, MAGIC* mg)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+PERL_CALLCONV int	Perl_magic_regdatum_set(pTHX_ SV* sv, MAGIC* mg);
 #define PERL_ARGS_ASSERT_MAGIC_REGDATUM_SET	\
 	assert(sv); assert(mg)
-
 #endif
 #ifdef PERL_CORE
 #  include "pp_proto.h"
diff --git a/Master/tlpkg/tlperl/lib/CORE/regcharclass.h b/Master/tlpkg/tlperl/lib/CORE/regcharclass.h
index 27cf8ea1e66..36fa1fd086a 100644
--- a/Master/tlpkg/tlperl/lib/CORE/regcharclass.h
+++ b/Master/tlpkg/tlperl/lib/CORE/regcharclass.h
@@ -168,7 +168,7 @@
 /*
 	NONCHAR: Non character code points
 
-	\p{Nchar}
+	\p{_Perl_Nchar}
 */
 /*** GENERATED CODE ***/
 #define is_NONCHAR_utf8(s)                                                  \
@@ -185,7 +185,7 @@
 /*
 	SURROGATE: Surrogate characters
 
-	\p{Gc=Cs}
+	\p{_Perl_Surrogate}
 */
 /*** GENERATED CODE ***/
 #define is_SURROGATE_utf8(s)                                                \
@@ -591,7 +591,7 @@
 /*
 	PATWS: pattern white space
 
-	\p{PatWS}
+	\p{_Perl_PatWS}
 */
 /*** GENERATED CODE ***/
 #define is_PATWS_safe(s,e,is_utf8)                                          \
@@ -761,7 +761,7 @@
 /*
 	NONCHAR: Non character code points
 
-	\p{Nchar}
+	\p{_Perl_Nchar}
 */
 /*** GENERATED CODE ***/
 #define is_NONCHAR_utf8(s)                                                  \
@@ -782,7 +782,7 @@
 /*
 	SURROGATE: Surrogate characters
 
-	\p{Gc=Cs}
+	\p{_Perl_Surrogate}
 */
 /*** GENERATED CODE ***/
 #define is_SURROGATE_utf8(s)                                                \
@@ -1205,7 +1205,7 @@
 /*
 	PATWS: pattern white space
 
-	\p{PatWS}
+	\p{_Perl_PatWS}
 */
 /*** GENERATED CODE ***/
 #define is_PATWS_safe(s,e,is_utf8)                                          \
@@ -1373,7 +1373,7 @@
 /*
 	NONCHAR: Non character code points
 
-	\p{Nchar}
+	\p{_Perl_Nchar}
 */
 /*** GENERATED CODE ***/
 #define is_NONCHAR_utf8(s)                                                  \
@@ -1394,7 +1394,7 @@
 /*
 	SURROGATE: Surrogate characters
 
-	\p{Gc=Cs}
+	\p{_Perl_Surrogate}
 */
 /*** GENERATED CODE ***/
 #define is_SURROGATE_utf8(s)                                                \
@@ -1825,7 +1825,7 @@
 /*
 	PATWS: pattern white space
 
-	\p{PatWS}
+	\p{_Perl_PatWS}
 */
 /*** GENERATED CODE ***/
 #define is_PATWS_safe(s,e,is_utf8)                                          \
@@ -1849,672 +1849,55 @@
 
 #endif	/* EBCDIC 037 */
 
-#if 'A' == 193 /* EBCDIC POSIX-BC */ \
-     && '\\' == 188 && '[' == 187 && ']' == 189 && '{' == 251 && '}' == 253 \
-     && '^' == 106 && '~' == 255 && '!' == 90 && '#' == 123 && '|' == 79 \
-     && '$' == 91 && '@' == 124 && '`' == 74
-/*
-	LNBREAK: Line Break: \R
-
-	"\x0D\x0A"      # CRLF - Network (Windows) line ending
-	\p{VertSpace}
-*/
-/*** GENERATED CODE ***/
-#define is_LNBREAK_safe(s,e,is_utf8)                                        \
-( ((e)-(s) > 2) ?                                                           \
-    ( ( ( 0x0B == ((U8*)s)[0] || 0x0C == ((U8*)s)[0] ) || 0x15 == ((U8*)s)[0] || 0x25 == ((U8*)s)[0] ) ? 1\
-    : ( 0x0D == ((U8*)s)[0] ) ?                                             \
-	( ( 0x15 == ((U8*)s)[1] ) ? 2 : 1 )                                 \
-    : ( ( ( ( is_utf8 ) && ( 0xCA == ((U8*)s)[0] ) ) && ( 0x42 == ((U8*)s)[1] ) ) && ( 0x49 == ((U8*)s)[2] || 0x51 == ((U8*)s)[2] ) ) ? 3 : 0 )\
-: ((e)-(s) > 1) ?                                                           \
-    ( ( ( 0x0B == ((U8*)s)[0] || 0x0C == ((U8*)s)[0] ) || 0x15 == ((U8*)s)[0] || 0x25 == ((U8*)s)[0] ) ? 1\
-    : ( 0x0D == ((U8*)s)[0] ) ?                                             \
-	( ( 0x15 == ((U8*)s)[1] ) ? 2 : 1 )                                 \
-    : 0 )                                                                   \
-: ((e)-(s) > 0) ?                                                           \
-    ( ( 0x0B <= ((U8*)s)[0] && ((U8*)s)[0] <= 0x0D ) || 0x15 == ((U8*)s)[0] || 0x25 == ((U8*)s)[0] )\
-: 0 )
-
-/*** GENERATED CODE ***/
-#define is_LNBREAK_utf8_safe(s,e)                                           \
-( ((e)-(s) > 2) ?                                                           \
-    ( ( ( 0x0B == ((U8*)s)[0] || 0x0C == ((U8*)s)[0] ) || 0x15 == ((U8*)s)[0] || 0x25 == ((U8*)s)[0] ) ? 1\
-    : ( 0x0D == ((U8*)s)[0] ) ?                                             \
-	( ( 0x15 == ((U8*)s)[1] ) ? 2 : 1 )                                 \
-    : ( ( ( 0xCA == ((U8*)s)[0] ) && ( 0x42 == ((U8*)s)[1] ) ) && ( 0x49 == ((U8*)s)[2] || 0x51 == ((U8*)s)[2] ) ) ? 3 : 0 )\
-: ((e)-(s) > 1) ?                                                           \
-    ( ( ( 0x0B == ((U8*)s)[0] || 0x0C == ((U8*)s)[0] ) || 0x15 == ((U8*)s)[0] || 0x25 == ((U8*)s)[0] ) ? 1\
-    : ( 0x0D == ((U8*)s)[0] ) ?                                             \
-	( ( 0x15 == ((U8*)s)[1] ) ? 2 : 1 )                                 \
-    : 0 )                                                                   \
-: ((e)-(s) > 0) ?                                                           \
-    ( ( 0x0B <= ((U8*)s)[0] && ((U8*)s)[0] <= 0x0D ) || 0x15 == ((U8*)s)[0] || 0x25 == ((U8*)s)[0] )\
-: 0 )
-
-/*** GENERATED CODE ***/
-#define is_LNBREAK_latin1_safe(s,e)                                         \
-( ((e)-(s) > 1) ?                                                           \
-    ( ( ( 0x0B == ((U8*)s)[0] || 0x0C == ((U8*)s)[0] ) || 0x15 == ((U8*)s)[0] || 0x25 == ((U8*)s)[0] ) ? 1\
-    : ( 0x0D == ((U8*)s)[0] ) ?                                             \
-	( ( 0x15 == ((U8*)s)[1] ) ? 2 : 1 )                                 \
-    : 0 )                                                                   \
-: ((e)-(s) > 0) ?                                                           \
-    ( ( 0x0B <= ((U8*)s)[0] && ((U8*)s)[0] <= 0x0D ) || 0x15 == ((U8*)s)[0] || 0x25 == ((U8*)s)[0] )\
-: 0 )
-
-/*
-	HORIZWS: Horizontal Whitespace: \h \H
-
-	\p{HorizSpace}
-*/
-/*** GENERATED CODE ***/
-#define is_HORIZWS_high(s)                                                  \
-( ( 0xBE == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( 0x64 == ((U8*)s)[1] ) && ( 0x41 == ((U8*)s)[2] ) ) ? 3 : 0 )      \
-: ( 0xCA == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x41 == ((U8*)s)[1] ) ?                                             \
-	( ( ( 0x41 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x49 ) || ( 0x51 == ((U8*)s)[2] || 0x52 == ((U8*)s)[2] ) ) ? 3 : 0 )\
-    : ( 0x42 == ((U8*)s)[1] ) ?                                             \
-	( ( 0x57 == ((U8*)s)[2] ) ? 3 : 0 )                                 \
-    : ( ( 0x43 == ((U8*)s)[1] ) && ( 0x75 == ((U8*)s)[2] ) ) ? 3 : 0 )      \
-: ( ( ( 0xCE == ((U8*)s)[0] ) && ( 0x41 == ((U8*)s)[1] ) ) && ( 0x41 == ((U8*)s)[2] ) ) ? 3 : 0 )
-
-/*** GENERATED CODE ***/
-#define is_HORIZWS_cp_high(cp)                                              \
-( 0x1680 == cp || ( 0x1680 < cp &&                                          \
-( ( 0x2000 <= cp && cp <= 0x200A ) || ( 0x200A < cp &&                      \
-( 0x202F == cp || ( 0x202F < cp &&                                          \
-( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) )
-
-/*
-	VERTWS: Vertical Whitespace: \v \V
-
-	\p{VertSpace}
-*/
-/*** GENERATED CODE ***/
-#define is_VERTWS_high(s)                                                   \
-( ( ( ( 0xCA == ((U8*)s)[0] ) && ( 0x42 == ((U8*)s)[1] ) ) && ( 0x49 == ((U8*)s)[2] || 0x51 == ((U8*)s)[2] ) ) ? 3 : 0 )
-
-/*** GENERATED CODE ***/
-#define is_VERTWS_cp_high(cp)                                               \
-( 0x2028 == cp || 0x2029 == cp )
-
-/*
-	XDIGIT: Hexadecimal digits
-
-	\p{XDigit}
-*/
-/*** GENERATED CODE ***/
-#define is_XDIGIT_high(s)                                                   \
-( ( ( 0xDC == ((U8*)s)[0] ) && ( 0x75 == ((U8*)s)[1] ) ) ? ( ( 0x68 == ((U8*)s)[2] ) ?\
-	    ( ( ( ((U8*)s)[3] & 0xFE ) == 0x58 || ( 0x62 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x69 ) ) ? 4 : 0 )\
-	: ( ( 0x69 == ((U8*)s)[2] || 0x70 == ((U8*)s)[2] ) && ( 0x42 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x47 ) ) ? 4 : 0 ) : 0 )
-
-/*** GENERATED CODE ***/
-#define is_XDIGIT_cp_high(cp)                                               \
-( ( 0xFF10 <= cp && cp <= 0xFF19 ) || ( 0xFF19 < cp &&                      \
-( ( 0xFF21 <= cp && cp <= 0xFF26 ) || ( 0xFF41 <= cp && cp <= 0xFF46 ) ) ) )
-
-/*
-	XPERLSPACE: \p{XPerlSpace}
-
-	\p{XPerlSpace}
-*/
-/*** GENERATED CODE ***/
-#define is_XPERLSPACE_high(s)                                               \
-( ( 0xBE == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( 0x64 == ((U8*)s)[1] ) && ( 0x41 == ((U8*)s)[2] ) ) ? 3 : 0 )      \
-: ( 0xCA == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x41 == ((U8*)s)[1] ) ?                                             \
-	( ( ( 0x41 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x49 ) || ( 0x51 == ((U8*)s)[2] || 0x52 == ((U8*)s)[2] ) ) ? 3 : 0 )\
-    : ( 0x42 == ((U8*)s)[1] ) ?                                             \
-	( ( 0x49 == ((U8*)s)[2] || 0x51 == ((U8*)s)[2] || 0x57 == ((U8*)s)[2] ) ? 3 : 0 )\
-    : ( ( 0x43 == ((U8*)s)[1] ) && ( 0x75 == ((U8*)s)[2] ) ) ? 3 : 0 )      \
-: ( ( ( 0xCE == ((U8*)s)[0] ) && ( 0x41 == ((U8*)s)[1] ) ) && ( 0x41 == ((U8*)s)[2] ) ) ? 3 : 0 )
-
-/*** GENERATED CODE ***/
-#define is_XPERLSPACE_cp_high(cp)                                           \
-( 0x1680 == cp || ( 0x1680 < cp &&                                          \
-( ( 0x2000 <= cp && cp <= 0x200A ) || ( 0x200A < cp &&                      \
-( 0x2028 == cp || ( 0x2028 < cp &&                                          \
-( 0x2029 == cp || ( 0x2029 < cp &&                                          \
-( 0x202F == cp || ( 0x202F < cp &&                                          \
-( 0x205F == cp || 0x3000 == cp ) ) ) ) ) ) ) ) ) ) )
-
-/*
-	REPLACEMENT: Unicode REPLACEMENT CHARACTER
-
-	0xFFFD
-*/
-/*** GENERATED CODE ***/
-#define is_REPLACEMENT_utf8_safe(s,e)                                       \
-( ( ( ( ( ( ((e) - (s)) >= 4 ) && ( 0xDC == ((U8*)s)[0] ) ) && ( 0x75 == ((U8*)s)[1] ) ) && ( 0x75 == ((U8*)s)[2] ) ) && ( 0x73 == ((U8*)s)[3] ) ) ? 4 : 0 )
-
-/*
-	NONCHAR: Non character code points
-
-	\p{Nchar}
-*/
-/*** GENERATED CODE ***/
-#define is_NONCHAR_utf8(s)                                                  \
-( ( 0xDC == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x75 == ((U8*)s)[1] ) ?                                             \
-	( ( 0x56 == ((U8*)s)[2] ) ?                                         \
-	    ( ( ( ((U8*)s)[3] & 0xFE ) == 0x58 || ( 0x62 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x69 ) || ( 0x70 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x75 ) ) ? 4 : 0 )\
-	: ( 0x57 == ((U8*)s)[2] ) ?                                         \
-	    ( ( ( 0x41 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x49 ) || ( 0x51 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x57 ) ) ? 4 : 0 )\
-	: ( ( 0x75 == ((U8*)s)[2] ) && ( ( ((U8*)s)[3] & 0xFE ) == 0x74 ) ) ? 4 : 0 )\
-    : 0 )                                                                   \
-: ( 0xDE == ((U8*)s)[0] || 0xE0 == ((U8*)s)[0] || 0xEA == ((U8*)s)[0] ) ?   \
-    ( ( ( ( 0x75 == ((U8*)s)[1] ) && ( 0x75 == ((U8*)s)[2] ) ) && ( ( ((U8*)s)[3] & 0xFE ) == 0x74 ) ) ? 4 : 0 )\
-: ( 0xEB == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( ( ( ( ( ((U8*)s)[1] & 0xF9 ) == 0x51 ) || ((U8*)s)[1] == 0x59 || ((U8*)s)[1] == 0x63 || ( ( ((U8*)s)[1] & 0xFD ) == 0x65 ) || ((U8*)s)[1] == 0x69 || ( ( ((U8*)s)[1] & 0xFD ) == 0x71 ) || ((U8*)s)[1] == 0x75 ) && ( 0x75 == ((U8*)s)[2] ) ) && ( 0x75 == ((U8*)s)[3] ) ) && ( ( ((U8*)s)[4] & 0xFE ) == 0x74 ) ) ? 5 : 0 )\
-: ( ( ( ( ( 0xEC == ((U8*)s)[0] ) && ( 0x42 == ((U8*)s)[1] ) ) && ( 0x75 == ((U8*)s)[2] ) ) && ( 0x75 == ((U8*)s)[3] ) ) && ( ( ((U8*)s)[4] & 0xFE ) == 0x74 ) ) ? 5 : 0 )
-
-/*
-	SURROGATE: Surrogate characters
-
-	\p{Gc=Cs}
-*/
-/*** GENERATED CODE ***/
-#define is_SURROGATE_utf8(s)                                                \
-( ( ( ( ( 0xDC == ((U8*)s)[0] ) && ( ( ((U8*)s)[1] & 0xFE ) == 0x66 ) ) && ( ( ( ((U8*)s)[2] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[2] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[2] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[2] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[2] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFA ) == 0x70 ) ) ) && ( ( ( ((U8*)s)[3] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[3] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[3] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[3] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[3] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[3] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[3] & 0xFA ) == 0x70 ) ) ) ? 4 : 0 )
-
-/*
-	UTF8_CHAR: Matches legal UTF-EBCDIC encoded characters from 2 through 3 bytes
-
-	0xA0 - 0x3FFF
-*/
-/*** GENERATED CODE ***/
-#define is_UTF8_CHAR_utf8_no_length_checks(s)                               \
-( ( ( 0x8A <= ((U8*)s)[0] && ((U8*)s)[0] <= 0x90 ) || ( 0x9A <= ((U8*)s)[0] && ((U8*)s)[0] <= 0xA1 ) || ( 0xAA <= ((U8*)s)[0] && ((U8*)s)[0] <= 0xB5 ) ) ?\
-    ( ( ( ( ((U8*)s)[1] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[1] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[1] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[1] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[1] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[1] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[1] & 0xFA ) == 0x70 ) ) ? 2 : 0 )\
-: ( ( ( ( 0xB7 <= ((U8*)s)[0] && ((U8*)s)[0] <= 0xBA ) || ( 0xBE <= ((U8*)s)[0] && ((U8*)s)[0] <= 0xC0 ) || ( 0xCA <= ((U8*)s)[0] && ((U8*)s)[0] <= 0xD0 ) || 0xDA == ((U8*)s)[0] ) && ( ( ( ((U8*)s)[1] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[1] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[1] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[1] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[1] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[1] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[1] & 0xFA ) == 0x70 ) ) ) && ( ( ( ((U8*)s)[2] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[2] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[2] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[2] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[2] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFA ) == 0x70 ) ) ) ? 3 : 0 )
-
-/*
-	QUOTEMETA: Meta-characters that \Q should quote
-
-	\p{_Perl_Quotemeta}
-*/
-/*** GENERATED CODE ***/
-#define is_QUOTEMETA_high_part0(s)                                          \
-( ( 0x64 == ((U8*)s)[1] ) ?                                                 \
-	( ( 0x41 == ((U8*)s)[2] ) ? 3 : 0 )                                 \
-    : ( ( 0x73 == ((U8*)s)[1] ) && ( ( ((U8*)s)[2] & 0xFE ) == 0x64 ) ) ? 3 : 0 )
-
-
-/*** GENERATED CODE ***/
-#define is_QUOTEMETA_high_part1(s)                                          \
-( ( 0xBF == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( 0x41 == ((U8*)s)[1] ) && ( 0x53 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x56 ) ) ? 3 : 0 )\
-: ( 0xCA == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x41 == ((U8*)s)[1] || ( 0x55 <= ((U8*)s)[1] && ((U8*)s)[1] <= 0x59 ) || ( 0x62 <= ((U8*)s)[1] && ((U8*)s)[1] <= 0x69 ) || ( 0x70 <= ((U8*)s)[1] && ((U8*)s)[1] <= 0x75 ) ) ?\
-	( ( ( ( ((U8*)s)[2] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[2] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[2] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[2] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[2] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFA ) == 0x70 ) ) ? 3 : 0 )\
-    : ( 0x42 == ((U8*)s)[1] ) ?                                             \
-	( ( ( 0x41 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x49 ) || ( 0x51 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x59 ) || ( 0x62 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x69 ) || ( 0x70 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x74 ) ) ? 3 : 0 )\
-    : ( 0x43 == ((U8*)s)[1] ) ?                                             \
-	( ( ( ( ((U8*)s)[2] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[2] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[2] & 0xEE ) == 0x48 ) || ((U8*)s)[2] == 0x51 || ((U8*)s)[2] == 0x65 || ( ( ((U8*)s)[2] & 0xFE ) == 0x66 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFA ) == 0x70 ) ) ? 3 : 0 )\
-    : ( 0x44 == ((U8*)s)[1] ) ?                                             \
-	( ( ( 0x41 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x49 ) || ( 0x51 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x57 ) ) ? 3 : 0 )\
-    : ( ( 0x54 == ((U8*)s)[1] ) && ( ( ((U8*)s)[2] & 0xFE ) == 0x58 || ( 0x62 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x69 ) || ( 0x70 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x75 ) ) ) ? 3 : 0 )\
-: ( 0xCB == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( 0x41 <= ((U8*)s)[1] && ((U8*)s)[1] <= 0x43 ) || 0x49 == ((U8*)s)[1] || ( 0x51 <= ((U8*)s)[1] && ((U8*)s)[1] <= 0x59 ) || ( 0x62 <= ((U8*)s)[1] && ((U8*)s)[1] <= 0x69 ) || 0x70 == ((U8*)s)[1] || ( 0x73 <= ((U8*)s)[1] && ((U8*)s)[1] <= 0x75 ) ) ?\
-	( ( ( ( ((U8*)s)[2] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[2] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[2] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[2] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[2] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFA ) == 0x70 ) ) ? 3 : 0 )\
-    : ( 0x71 == ((U8*)s)[1] ) ?                                             \
-	( ( ( 0x41 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x49 ) || ( 0x51 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x59 ) || ( 0x62 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x65 ) ) ? 3 : 0 )\
-    : ( ( 0x72 == ((U8*)s)[1] ) && ( ( 0x64 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x69 ) || ( 0x70 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x75 ) ) ) ? 3 : 0 )\
-: ( 0xCC == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( ( ( ((U8*)s)[1] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[1] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[1] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[1] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[1] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[1] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[1] & 0xFA ) == 0x70 ) ) && ( ( ( ((U8*)s)[2] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[2] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[2] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[2] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[2] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFA ) == 0x70 ) ) ) ? 3 : 0 )\
-: ( 0xCD == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( ( ((U8*)s)[1] & 0xFE ) == 0x58 || ( ((U8*)s)[1] & 0xFE ) == 0x62 ) && ( ( ( ((U8*)s)[2] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[2] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[2] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[2] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[2] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFA ) == 0x70 ) ) ) ? 3 : 0 )\
-: ( 0xCE == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x41 == ((U8*)s)[1] ) ?                                             \
-	( ( ( ( ((U8*)s)[2] & 0xE7 ) == 0x41 ) || ( ( ((U8*)s)[2] & 0xCE ) == 0x42 ) || ((U8*)s)[2] == 0x44 || ( ( ((U8*)s)[2] & 0xFC ) == 0x54 ) || ((U8*)s)[2] == 0x58 || ( ( ((U8*)s)[2] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFA ) == 0x70 ) ) ? 3 : 0 )\
-    : ( 0x42 == ((U8*)s)[1] ) ?                                             \
-	( ( 0x41 == ((U8*)s)[2] || 0x58 == ((U8*)s)[2] ) ? 3 : 0 )          \
-    : ( ( 0x53 == ((U8*)s)[1] ) && ( 0x45 == ((U8*)s)[2] ) ) ? 3 : 0 )      \
-: ( 0xDC == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x75 == ((U8*)s)[1] ) ?                                             \
-	( ( 0x51 == ((U8*)s)[2] ) ?                                         \
-	    ( ( ( ((U8*)s)[3] & 0xFE ) == 0x74 ) ? 4 : 0 )                  \
-	: ( 0x58 == ((U8*)s)[2] ) ?                                         \
-	    ( ( ( 0x41 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x49 ) || ( 0x51 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x57 ) ) ? 4 : 0 )\
-	: ( 0x62 == ((U8*)s)[2] ) ?                                         \
-	    ( ( ( ((U8*)s)[3] & 0xFE ) == 0x46 ) ? 4 : 0 )                  \
-	: ( 0x67 == ((U8*)s)[2] ) ?                                         \
-	    ( ( 0x75 == ((U8*)s)[3] ) ? 4 : 0 )                             \
-	: ( 0x73 == ((U8*)s)[2] ) ?                                         \
-	    ( ( 0x41 == ((U8*)s)[3] ) ? 4 : 0 )                             \
-	: ( ( 0x75 == ((U8*)s)[2] ) && ( ( ((U8*)s)[3] & 0xFE ) == 0x58 || ( 0x62 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x68 ) ) ) ? 4 : 0 )\
-    : 0 )                                                                   \
-: ( 0xDE == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x57 == ((U8*)s)[1] ) ?                                             \
-	( ( ( 0x46 == ((U8*)s)[2] ) && ( 0x41 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x44 ) ) ? 4 : 0 )\
-    : ( ( ( 0x64 == ((U8*)s)[1] ) && ( 0x53 == ((U8*)s)[2] ) ) && ( ( 0x63 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x69 ) || 0x70 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-: ( ( ( ( ( 0xEB == ((U8*)s)[0] ) && ( 0x72 == ((U8*)s)[1] ) ) && ( 0x41 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x44 ) ) && ( ( ( ((U8*)s)[3] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[3] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[3] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[3] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[3] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[3] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[3] & 0xFA ) == 0x70 ) ) ) && ( ( ( ((U8*)s)[4] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[4] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[4] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[4] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[4] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[4] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[4] & 0xFA ) == 0x70 ) ) ) ? 5 : 0 )
-
-
-/*** GENERATED CODE ***/
-#define is_QUOTEMETA_high(s)                                                \
-( ( 0xB0 == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x57 == ((U8*)s)[1] ) ? 2 : 0 )                                     \
-: ( 0xB7 == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( 0x58 == ((U8*)s)[1] ) && ( 0x72 == ((U8*)s)[2] ) ) ? 3 : 0 )      \
-: ( 0xBA == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x52 == ((U8*)s)[1] ) ?                                             \
-	( ( 0x75 == ((U8*)s)[2] ) ? 3 : 0 )                                 \
-    : ( ( 0x53 == ((U8*)s)[1] ) && ( 0x41 == ((U8*)s)[2] ) ) ? 3 : 0 )      \
-: ( 0xBE == ((U8*)s)[0] ) ? is_QUOTEMETA_high_part0(s) : is_QUOTEMETA_high_part1(s) )
-
-/*
-	MULTI_CHAR_FOLD: multi-char strings that are folded to by a single character
-
-	&regcharclass_multi_char_folds::multi_char_folds(1)
-*/
-/*** GENERATED CODE ***/
-#define is_MULTI_CHAR_FOLD_utf8_safe_part0(s,e)                             \
-( ( 0x81 == ((U8*)s)[0] ) ?                                                 \
-	( ( ( 0xAB == ((U8*)s)[1] ) && ( 0x74 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x86 == ((U8*)s)[0] ) ?                                             \
-	( ( 0x86 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0x89 == ((U8*)s)[2] || 0x93 == ((U8*)s)[2] ) ? 3 : 2 )      \
-	: ( 0x89 == ((U8*)s)[1] || 0x93 == ((U8*)s)[1] ) ? 2 : 0 )          \
-    : ( 0x88 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAF == ((U8*)s)[1] ) && ( 0x59 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x89 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x48 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x90 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ( 0x75 == ((U8*)s)[1] ) && ( 0x90 == ((U8*)s)[2] ) ) && ( 0x75 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-    : ( 0x91 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x54 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xA2 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ((U8*)s)[1] & 0xFE ) == 0xA2 ) ? 2 : 0 )                      \
-    : ( 0xA3 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x49 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xA6 == ((U8*)s)[0] || 0xA8 == ((U8*)s)[0] ) ?                      \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x52 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xAB == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0x72 == ((U8*)s)[1] ) && ( 0x95 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xB3 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ((U8*)s)[1] & 0xFD ) == 0x54 ) ?                              \
-	    ( ( ( 0xB3 == ((U8*)s)[2] ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( 0x59 == ((U8*)s)[1] || 0x67 == ((U8*)s)[1] ) ?                  \
-	    ( ( 0xB0 == ((U8*)s)[2] ) ?                                     \
-		( ( 0x43 == ((U8*)s)[3] ) ? 4 : 0 )                         \
-	    : ( ( 0xB3 == ((U8*)s)[2] ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( ( ( 0x69 == ((U8*)s)[1] ) && ( 0xB0 == ((U8*)s)[2] ) ) && ( 0x43 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-    : ( 0xB4 == ((U8*)s)[0] ) ?                                             \
-	( ( 0x42 == ((U8*)s)[1] ) ?                                         \
-	    ( ( ( 0xAE == ((U8*)s)[2] ) && ( 0x63 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( 0x46 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0xAE == ((U8*)s)[2] ) ?                                     \
-		( ( 0x63 == ((U8*)s)[3] ) ? 4 : 0 )                         \
-	    : ( ( 0xB0 == ((U8*)s)[2] ) && ( 0x43 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( 0x51 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0xB0 == ((U8*)s)[2] ) ?                                     \
-		( ( 0x43 == ((U8*)s)[3] ) ? 4 : 0 )                         \
-	    : ( ( 0xB3 == ((U8*)s)[2] ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( ( ( 0x56 == ((U8*)s)[1] ) && ( 0xB3 == ((U8*)s)[2] ) ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-    : ( 0xC0 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ((U8*)s)[1] & 0xFE ) == 0x68 ) ?                              \
-	    ( ( ( ( 0x41 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x48 ) && ( 0xB3 == ((U8*)s)[3] ) ) && ( 0x69 == ((U8*)s)[4] ) ) ? 5 : 0 )\
-	: ( ( ( ( 0x71 == ((U8*)s)[1] ) && ( ( 0x41 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x48 ) || 0x58 == ((U8*)s)[2] || 0x64 == ((U8*)s)[2] || 0x72 == ((U8*)s)[2] ) ) && ( 0xB3 == ((U8*)s)[3] ) ) && ( 0x69 == ((U8*)s)[4] ) ) ? 5 : 0 )\
-    : 0 )
-
-
-/*** GENERATED CODE ***/
-#define is_MULTI_CHAR_FOLD_utf8_safe_part1(s,e)                             \
-( ((e)-(s) > 3) ?                                                           \
-    ( ( 0x81 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAB == ((U8*)s)[1] ) && ( 0x74 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x86 == ((U8*)s)[0] ) ?                                             \
-	( ( 0x86 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0x89 == ((U8*)s)[2] || 0x93 == ((U8*)s)[2] ) ? 3 : 2 )      \
-	: ( 0x89 == ((U8*)s)[1] || 0x93 == ((U8*)s)[1] ) ? 2 : 0 )          \
-    : ( 0x88 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAF == ((U8*)s)[1] ) && ( 0x59 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x89 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x48 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x90 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ( 0x75 == ((U8*)s)[1] ) && ( 0x90 == ((U8*)s)[2] ) ) && ( 0x75 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-    : ( 0x91 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x54 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xA2 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ((U8*)s)[1] & 0xFE ) == 0xA2 ) ? 2 : 0 )                      \
-    : ( 0xA3 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x49 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xA6 == ((U8*)s)[0] || 0xA8 == ((U8*)s)[0] ) ?                      \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x52 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xAB == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0x72 == ((U8*)s)[1] ) && ( 0x95 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xB3 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ((U8*)s)[1] & 0xFD ) == 0x54 ) ?                              \
-	    ( ( ( 0xB3 == ((U8*)s)[2] ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( 0x59 == ((U8*)s)[1] || 0x67 == ((U8*)s)[1] ) ?                  \
-	    ( ( 0xB0 == ((U8*)s)[2] ) ?                                     \
-		( ( 0x43 == ((U8*)s)[3] ) ? 4 : 0 )                         \
-	    : ( ( 0xB3 == ((U8*)s)[2] ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( ( ( 0x69 == ((U8*)s)[1] ) && ( 0xB0 == ((U8*)s)[2] ) ) && ( 0x43 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-    : ( 0xB4 == ((U8*)s)[0] ) ?                                             \
-	( ( 0x42 == ((U8*)s)[1] ) ?                                         \
-	    ( ( ( 0xAE == ((U8*)s)[2] ) && ( 0x63 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( 0x46 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0xAE == ((U8*)s)[2] ) ?                                     \
-		( ( 0x63 == ((U8*)s)[3] ) ? 4 : 0 )                         \
-	    : ( ( 0xB0 == ((U8*)s)[2] ) && ( 0x43 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( 0x51 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0xB0 == ((U8*)s)[2] ) ?                                     \
-		( ( 0x43 == ((U8*)s)[3] ) ? 4 : 0 )                         \
-	    : ( ( 0xB3 == ((U8*)s)[2] ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( ( ( 0x56 == ((U8*)s)[1] ) && ( 0xB3 == ((U8*)s)[2] ) ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-    : 0 )                                                                   \
-: ((e)-(s) > 2) ?                                                           \
-    ( ( 0x81 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAB == ((U8*)s)[1] ) && ( 0x74 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x86 == ((U8*)s)[0] ) ?                                             \
-	( ( 0x86 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0x89 == ((U8*)s)[2] || 0x93 == ((U8*)s)[2] ) ? 3 : 2 )      \
-	: ( 0x89 == ((U8*)s)[1] || 0x93 == ((U8*)s)[1] ) ? 2 : 0 )          \
-    : ( 0x88 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAF == ((U8*)s)[1] ) && ( 0x59 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x89 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x48 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x91 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x54 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xA2 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ((U8*)s)[1] & 0xFE ) == 0xA2 ) ? 2 : 0 )                      \
-    : ( 0xA3 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x49 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xA6 == ((U8*)s)[0] || 0xA8 == ((U8*)s)[0] ) ?                      \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x52 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( ( ( 0xAB == ((U8*)s)[0] ) && ( 0x72 == ((U8*)s)[1] ) ) && ( 0x95 == ((U8*)s)[2] ) ) ? 3 : 0 )\
-: ((e)-(s) > 1) ?                                                           \
-    ( ( 0x86 == ((U8*)s)[0] ) ?                                             \
-	( ( 0x86 == ((U8*)s)[1] || 0x89 == ((U8*)s)[1] || 0x93 == ((U8*)s)[1] ) ? 2 : 0 )\
-    : ( ( 0xA2 == ((U8*)s)[0] ) && ( ( ((U8*)s)[1] & 0xFE ) == 0xA2 ) ) ? 2 : 0 )\
-: 0 )
-
-
-/*** GENERATED CODE ***/
-#define is_MULTI_CHAR_FOLD_utf8_safe(s,e)                                   \
-( ((e)-(s) > 5) ?                                                           \
-    ( ( 0x81 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAB == ((U8*)s)[1] ) && ( 0x74 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x86 == ((U8*)s)[0] ) ?                                             \
-	( ( 0x86 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0x89 == ((U8*)s)[2] || 0x93 == ((U8*)s)[2] ) ? 3 : 2 )      \
-	: ( 0x89 == ((U8*)s)[1] || 0x93 == ((U8*)s)[1] ) ? 2 : 0 )          \
-    : ( 0x88 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAF == ((U8*)s)[1] ) && ( 0x59 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x89 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x48 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0x90 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ( 0x75 == ((U8*)s)[1] ) && ( 0x90 == ((U8*)s)[2] ) ) && ( 0x75 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-    : ( 0x91 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x54 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xA2 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ((U8*)s)[1] & 0xFE ) == 0xA2 ) ? 2 : 0 )                      \
-    : ( 0xA3 == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x49 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xA6 == ((U8*)s)[0] || 0xA8 == ((U8*)s)[0] ) ?                      \
-	( ( ( 0xAE == ((U8*)s)[1] ) && ( 0x52 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xAB == ((U8*)s)[0] ) ?                                             \
-	( ( ( 0x72 == ((U8*)s)[1] ) && ( 0x95 == ((U8*)s)[2] ) ) ? 3 : 0 )  \
-    : ( 0xB3 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ((U8*)s)[1] & 0xFD ) == 0x54 ) ?                              \
-	    ( ( ( 0xB3 == ((U8*)s)[2] ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( 0x59 == ((U8*)s)[1] || 0x67 == ((U8*)s)[1] ) ?                  \
-	    ( ( 0xB0 == ((U8*)s)[2] ) ?                                     \
-		( ( 0x43 == ((U8*)s)[3] ) ?                                 \
-		    ( ( ( 0xB3 == ((U8*)s)[4] ) && ( 0x69 == ((U8*)s)[5] ) ) ? 6 : 4 )\
-		: 0 )                                                       \
-	    : ( ( 0xB3 == ((U8*)s)[2] ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( 0x69 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0xAE == ((U8*)s)[2] ) ?                                     \
-		( ( 0x49 == ((U8*)s)[3] ) ?                                 \
-		    ( ( 0xAE == ((U8*)s)[4] ) ?                             \
-			( ( 0x41 == ((U8*)s)[5] || 0x42 == ((U8*)s)[5] ) ? 6 : 0 )\
-		    : ( ( 0xB0 == ((U8*)s)[4] ) && ( 0x43 == ((U8*)s)[5] ) ) ? 6 : 0 )\
-		: 0 )                                                       \
-	    : ( ( 0xB0 == ((U8*)s)[2] ) && ( 0x43 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: 0 )                                                               \
-    : ( 0xB4 == ((U8*)s)[0] ) ?                                             \
-	( ( 0x42 == ((U8*)s)[1] ) ?                                         \
-	    ( ( ( 0xAE == ((U8*)s)[2] ) && ( 0x63 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( 0x46 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0xAE == ((U8*)s)[2] ) ?                                     \
-		( ( 0x49 == ((U8*)s)[3] ) ?                                 \
-		    ( ( 0xAE == ((U8*)s)[4] ) ?                             \
-			( ( 0x41 == ((U8*)s)[5] || 0x42 == ((U8*)s)[5] ) ? 6 : 0 )\
-		    : ( ( 0xB0 == ((U8*)s)[4] ) && ( 0x43 == ((U8*)s)[5] ) ) ? 6 : 0 )\
-		: ( 0x63 == ((U8*)s)[3] ) ?                                 \
-		    ( ( 0xAE == ((U8*)s)[4] ) ?                             \
-			( ( 0x41 == ((U8*)s)[5] || 0x42 == ((U8*)s)[5] ) ? 6 : 4 )\
-		    : ( ( 0xB0 == ((U8*)s)[4] ) && ( 0x43 == ((U8*)s)[5] ) ) ? 6 : 4 )\
-		: 0 )                                                       \
-	    : ( ( 0xB0 == ((U8*)s)[2] ) && ( 0x43 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( 0x51 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0xB0 == ((U8*)s)[2] ) ?                                     \
-		( ( 0x43 == ((U8*)s)[3] ) ?                                 \
-		    ( ( ( 0xB3 == ((U8*)s)[4] ) && ( 0x69 == ((U8*)s)[5] ) ) ? 6 : 4 )\
-		: 0 )                                                       \
-	    : ( ( 0xB3 == ((U8*)s)[2] ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-	: ( ( ( 0x56 == ((U8*)s)[1] ) && ( 0xB3 == ((U8*)s)[2] ) ) && ( 0x69 == ((U8*)s)[3] ) ) ? 4 : 0 )\
-    : ( 0xB7 == ((U8*)s)[0] ) ?                                             \
-	( ( 0x53 == ((U8*)s)[1] ) ?                                         \
-	    ( ( 0x46 == ((U8*)s)[2] ) ?                                     \
-		( ( ( ( 0xB7 == ((U8*)s)[3] ) && ( 0x54 == ((U8*)s)[4] ) ) && ( 0x43 == ((U8*)s)[5] ) ) ? 6 : 0 )\
-	    : ( 0x64 == ((U8*)s)[2] ) ?                                     \
-		( ( ( ( 0xB7 == ((U8*)s)[3] ) && ( 0x53 == ((U8*)s)[4] ) ) && ( ( ( ((U8*)s)[5] & 0xDF ) == 0x46 ) || ((U8*)s)[5] == 0x53 || ((U8*)s)[5] == 0x55 ) ) ? 6 : 0 )\
-	    : ( ( ( ( 0x74 == ((U8*)s)[2] ) && ( 0xB7 == ((U8*)s)[3] ) ) && ( 0x53 == ((U8*)s)[4] ) ) && ( 0x66 == ((U8*)s)[5] ) ) ? 6 : 0 )\
-	: 0 )                                                               \
-    : ( 0xC0 == ((U8*)s)[0] ) ?                                             \
-	( ( ( ((U8*)s)[1] & 0xFE ) == 0x68 ) ?                              \
-	    ( ( ( ( 0x41 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x48 ) && ( 0xB3 == ((U8*)s)[3] ) ) && ( 0x69 == ((U8*)s)[4] ) ) ? 5 : 0 )\
-	: ( ( ( ( 0x71 == ((U8*)s)[1] ) && ( ( 0x41 <= ((U8*)s)[2] && ((U8*)s)[2] <= 0x48 ) || 0x58 == ((U8*)s)[2] || 0x64 == ((U8*)s)[2] || 0x72 == ((U8*)s)[2] ) ) && ( 0xB3 == ((U8*)s)[3] ) ) && ( 0x69 == ((U8*)s)[4] ) ) ? 5 : 0 )\
-    : 0 )                                                                   \
-: ((e)-(s) > 4) ? is_MULTI_CHAR_FOLD_utf8_safe_part0(s,e) : is_MULTI_CHAR_FOLD_utf8_safe_part1(s,e) )
-
-/*
-	MULTI_CHAR_FOLD: multi-char strings that are folded to by a single character
-
-	&regcharclass_multi_char_folds::multi_char_folds(0)
-*/
-/*** GENERATED CODE ***/
-#define is_MULTI_CHAR_FOLD_latin1_safe(s,e)                                 \
-( ((e)-(s) > 2) ?                                                           \
-    ( ( ( ((U8*)s)[0] & 0xBF ) == 0x86 ) ?                                  \
-	( ( ( ((U8*)s)[1] & 0xBF ) == 0x86 ) ?                              \
-	    ( ( ( ( ((U8*)s)[2] & 0xBF ) == 0x89 ) || ( ( ((U8*)s)[2] & 0xBF ) == 0x93 ) ) ? 3 : 2 )\
-	: ( ( ( ((U8*)s)[1] & 0xBF ) == 0x89 ) || ( ( ((U8*)s)[1] & 0xBF ) == 0x93 ) ) ? 2 : 0 )\
-    : ( ( ( ((U8*)s)[0] & 0xBF ) == 0xA2 ) && ( ( ((U8*)s)[1] & 0xBE ) == 0xA2 ) ) ? 2 : 0 )\
-: ((e)-(s) > 1) ?                                                           \
-    ( ( ( ((U8*)s)[0] & 0xBF ) == 0x86 ) ?                                  \
-	( ( ( ( ((U8*)s)[1] & 0xBF ) == 0x86 ) || ( ( ((U8*)s)[1] & 0xBF ) == 0x89 ) || ( ( ((U8*)s)[1] & 0xBF ) == 0x93 ) ) ? 2 : 0 )\
-    : ( ( ( ((U8*)s)[0] & 0xBF ) == 0xA2 ) && ( ( ((U8*)s)[1] & 0xBE ) == 0xA2 ) ) ? 2 : 0 )\
-: 0 )
-
-/*
-	FOLDS_TO_MULTI: characters that fold to multi-char strings
-
-	\p{_Perl_Folds_To_Multi_Char}
-*/
-/*** GENERATED CODE ***/
-#define is_FOLDS_TO_MULTI_utf8(s)                                           \
-( ( 0x8B == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x75 == ((U8*)s)[1] ) ? 2 : 0 )                                     \
-: ( 0x8E == ((U8*)s)[0] || 0x9D == ((U8*)s)[0] || ( ((U8*)s)[0] & 0xFE ) == 0xB2 ) ?\
-    ( ( 0x58 == ((U8*)s)[1] ) ? 2 : 0 )                                     \
-: ( 0x8F == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x51 == ((U8*)s)[1] ) ? 2 : 0 )                                     \
-: ( 0xB7 == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( 0x54 == ((U8*)s)[1] ) && ( 0x48 == ((U8*)s)[2] ) ) ? 3 : 0 )      \
-: ( 0xC0 == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x64 == ((U8*)s)[1] ) ?                                             \
-	( ( ( ( ((U8*)s)[2] & 0xFE ) == 0x66 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFB ) == 0x70 ) ) ? 3 : 0 )\
-    : ( 0x70 == ((U8*)s)[1] ) ?                                             \
-	( ( ((U8*)s)[2] == 0x58 || ((U8*)s)[2] == 0x62 || ( ( ((U8*)s)[2] & 0xFD ) == 0x64 ) ) ? 3 : 0 )\
-    : ( 0x72 == ((U8*)s)[1] ) ?                                             \
-	( ( ( ( ((U8*)s)[2] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[2] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[2] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[2] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[2] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFA ) == 0x70 ) ) ? 3 : 0 )\
-    : ( 0x73 == ((U8*)s)[1] ) ?                                             \
-	( ( ( ( ((U8*)s)[2] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[2] & 0xEE ) == 0x42 ) || ( ( ((U8*)s)[2] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x48 ) || ( ( ((U8*)s)[2] & 0xFA ) == 0x62 ) || ((U8*)s)[2] == 0x64 || ((U8*)s)[2] == 0x72 ) ? 3 : 0 )\
-    : ( 0x74 == ((U8*)s)[1] ) ?                                             \
-	( ( ( ( ((U8*)s)[2] & 0xFB ) == 0x43 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x44 ) || ((U8*)s)[2] == 0x48 || ((U8*)s)[2] == 0x54 || ( ( ((U8*)s)[2] & 0xFA ) == 0x62 ) ) ? 3 : 0 )\
-    : ( ( 0x75 == ((U8*)s)[1] ) && ( ( ( ((U8*)s)[2] & 0xFB ) == 0x43 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x44 ) || ((U8*)s)[2] == 0x48 || ( ( ((U8*)s)[2] & 0xFA ) == 0x62 ) || ((U8*)s)[2] == 0x64 || ((U8*)s)[2] == 0x72 ) ) ? 3 : 0 )\
-: ( ( ( ( 0xDC == ((U8*)s)[0] ) && ( 0x74 == ((U8*)s)[1] ) ) && ( 0x68 == ((U8*)s)[2] ) ) && ( ( 0x41 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x47 ) || ( 0x63 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x67 ) ) ) ? 4 : 0 )
-
-/*
-	PROBLEMATIC_LOCALE_FOLD: characters whose fold is problematic under locale
-
-	\p{_Perl_Problematic_Locale_Folds}
-*/
-/*** GENERATED CODE ***/
-#define is_PROBLEMATIC_LOCALE_FOLD_utf8(s)                                  \
-( ( ( ( ((U8*)s)[0] & 0xC0 ) == 0x00 ) || ( ( ((U8*)s)[0] & 0xEF ) == 0x40 ) || ( ( ((U8*)s)[0] & 0xCE ) == 0x4A ) || ( ( ((U8*)s)[0] & 0xCC ) == 0x4C ) || ( ( ((U8*)s)[0] & 0xFE ) == 0x60 ) || ( ( ((U8*)s)[0] & 0xAF ) == 0x81 ) || ( ( ((U8*)s)[0] & 0xEE ) == 0x82 ) || ( ( ((U8*)s)[0] & 0xEC ) == 0x84 ) || ( ( ((U8*)s)[0] & 0xEE ) == 0x88 ) || ( ( ((U8*)s)[0] & 0xFE ) == 0xA2 ) || ( ( ((U8*)s)[0] & 0xFC ) == 0xA4 ) || ( ( ((U8*)s)[0] & 0xFE ) == 0xA8 ) || ( ( ((U8*)s)[0] & 0xBF ) == 0xBB ) || ( ( ((U8*)s)[0] & 0xFE ) == 0xBC ) || ( ( ((U8*)s)[0] & 0xCE ) == 0xC2 ) || ( ( ((U8*)s)[0] & 0xCC ) == 0xC4 ) || ( ( ((U8*)s)[0] & 0xCE ) == 0xC8 ) || ( ( ((U8*)s)[0] & 0xFE ) == 0xF0 ) || ( ( ((U8*)s)[0] & 0xFD ) == 0xFD ) ) ? 1\
-: ( 0x8A <= ((U8*)s)[0] && ((U8*)s)[0] <= 0x8C ) ?                          \
-    ( ( ( ( ((U8*)s)[1] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[1] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[1] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[1] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[1] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[1] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[1] & 0xFA ) == 0x70 ) ) ? 2 : 0 )\
-: ( 0x8E == ((U8*)s)[0] || 0x9D == ((U8*)s)[0] ) ?                          \
-    ( ( 0x58 == ((U8*)s)[1] ) ? 2 : 0 )                                     \
-: ( 0x8F == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x51 == ((U8*)s)[1] ) ? 2 : 0 )                                     \
-: ( 0x90 == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x68 == ((U8*)s)[1] || 0x75 == ((U8*)s)[1] ) ? 2 : 0 )              \
-: ( ( ((U8*)s)[0] & 0xFE ) == 0xB2 ) ?                                      \
-    ( ( 0x72 == ((U8*)s)[1] ) ? 2 : 0 )                                     \
-: ( 0xC0 == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( 0x64 == ((U8*)s)[1] ) && ( ( ( ((U8*)s)[2] & 0xFE ) == 0x66 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFB ) == 0x70 ) ) ) ? 3 : 0 )\
-: ( 0xCA == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( 0x51 == ((U8*)s)[1] ) && ( ( ((U8*)s)[2] & 0xFE ) == 0x52 ) ) ? 3 : 0 )\
-: ( ( ( ( 0xDC == ((U8*)s)[0] ) && ( 0x74 == ((U8*)s)[1] ) ) && ( 0x68 == ((U8*)s)[2] ) ) && ( 0x41 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x47 ) ) ? 4 : 0 )
-
-/*** GENERATED CODE ***/
-#define is_PROBLEMATIC_LOCALE_FOLD_cp(cp)                                   \
-( cp <= 0xFF || ( 0xFF < cp &&                                              \
-( 0x130 == cp || ( 0x130 < cp &&                                            \
-( 0x149 == cp || ( 0x149 < cp &&                                            \
-( 0x178 == cp || ( 0x178 < cp &&                                            \
-( 0x17F == cp || ( 0x17F < cp &&                                            \
-( 0x1F0 == cp || ( 0x1F0 < cp &&                                            \
-( 0x39C == cp || ( 0x39C < cp &&                                            \
-( 0x3BC == cp || ( 0x3BC < cp &&                                            \
-( ( 0x1E96 <= cp && cp <= 0x1E9A ) || ( 0x1E9A < cp &&                      \
-( 0x1E9E == cp || ( 0x1E9E < cp &&                                          \
-( 0x212A == cp || ( 0x212A < cp &&                                          \
-( 0x212B == cp || ( 0xFB00 <= cp && cp <= 0xFB06 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) )
-
-/*
-	PROBLEMATIC_LOCALE_FOLDEDS_START: The first folded character of folds which are problematic under locale
-
-	\p{_Perl_Problematic_Locale_Foldeds_Start}
-*/
-/*** GENERATED CODE ***/
-#define is_PROBLEMATIC_LOCALE_FOLDEDS_START_utf8(s)                         \
-( ( ( ( ((U8*)s)[0] & 0xC0 ) == 0x00 ) || ( ( ((U8*)s)[0] & 0xEF ) == 0x40 ) || ( ( ((U8*)s)[0] & 0xCE ) == 0x4A ) || ( ( ((U8*)s)[0] & 0xCC ) == 0x4C ) || ( ( ((U8*)s)[0] & 0xFE ) == 0x60 ) || ( ( ((U8*)s)[0] & 0xAF ) == 0x81 ) || ( ( ((U8*)s)[0] & 0xEE ) == 0x82 ) || ( ( ((U8*)s)[0] & 0xEC ) == 0x84 ) || ( ( ((U8*)s)[0] & 0xEE ) == 0x88 ) || ( ( ((U8*)s)[0] & 0xFE ) == 0xA2 ) || ( ( ((U8*)s)[0] & 0xFC ) == 0xA4 ) || ( ( ((U8*)s)[0] & 0xFE ) == 0xA8 ) || ( ( ((U8*)s)[0] & 0xBF ) == 0xBB ) || ( ( ((U8*)s)[0] & 0xFE ) == 0xBC ) || ( ( ((U8*)s)[0] & 0xCE ) == 0xC2 ) || ( ( ((U8*)s)[0] & 0xCC ) == 0xC4 ) || ( ( ((U8*)s)[0] & 0xCE ) == 0xC8 ) || ( ( ((U8*)s)[0] & 0xFE ) == 0xF0 ) || ( ( ((U8*)s)[0] & 0xFD ) == 0xFD ) ) ? 1\
-: ( 0x8A <= ((U8*)s)[0] && ((U8*)s)[0] <= 0x8C ) ?                          \
-    ( ( ( ( ((U8*)s)[1] & 0xEF ) == 0x41 ) || ( ( ((U8*)s)[1] & 0xCE ) == 0x42 ) || ( ( ((U8*)s)[1] & 0xEC ) == 0x44 ) || ( ( ((U8*)s)[1] & 0xEE ) == 0x48 ) || ( ( ((U8*)s)[1] & 0xFC ) == 0x64 ) || ( ( ((U8*)s)[1] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[1] & 0xFA ) == 0x70 ) ) ? 2 : 0 )\
-: ( 0x8E == ((U8*)s)[0] || 0x9D == ((U8*)s)[0] ) ?                          \
-    ( ( 0x58 == ((U8*)s)[1] ) ? 2 : 0 )                                     \
-: ( 0x8F == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x51 == ((U8*)s)[1] ) ? 2 : 0 )                                     \
-: ( 0x90 == ((U8*)s)[0] ) ?                                                 \
-    ( ( 0x68 == ((U8*)s)[1] || 0x75 == ((U8*)s)[1] ) ? 2 : 0 )              \
-: ( 0xAB == ((U8*)s)[0] || ( ((U8*)s)[0] & 0xFE ) == 0xB2 ) ?               \
-    ( ( 0x72 == ((U8*)s)[1] ) ? 2 : 0 )                                     \
-: ( 0xC0 == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( 0x64 == ((U8*)s)[1] ) && ( ( ( ((U8*)s)[2] & 0xFE ) == 0x66 ) || ( ( ((U8*)s)[2] & 0xFE ) == 0x68 ) || ( ( ((U8*)s)[2] & 0xFB ) == 0x70 ) ) ) ? 3 : 0 )\
-: ( 0xCA == ((U8*)s)[0] ) ?                                                 \
-    ( ( ( 0x51 == ((U8*)s)[1] ) && ( ( ((U8*)s)[2] & 0xFE ) == 0x52 ) ) ? 3 : 0 )\
-: ( ( ( ( 0xDC == ((U8*)s)[0] ) && ( 0x74 == ((U8*)s)[1] ) ) && ( 0x68 == ((U8*)s)[2] ) ) && ( 0x41 <= ((U8*)s)[3] && ((U8*)s)[3] <= 0x47 ) ) ? 4 : 0 )
-
-/*** GENERATED CODE ***/
-#define is_PROBLEMATIC_LOCALE_FOLDEDS_START_cp(cp)                          \
-( cp <= 0xFF || ( 0xFF < cp &&                                              \
-( 0x130 == cp || ( 0x130 < cp &&                                            \
-( 0x149 == cp || ( 0x149 < cp &&                                            \
-( 0x178 == cp || ( 0x178 < cp &&                                            \
-( 0x17F == cp || ( 0x17F < cp &&                                            \
-( 0x1F0 == cp || ( 0x1F0 < cp &&                                            \
-( 0x2BC == cp || ( 0x2BC < cp &&                                            \
-( 0x39C == cp || ( 0x39C < cp &&                                            \
-( 0x3BC == cp || ( 0x3BC < cp &&                                            \
-( ( 0x1E96 <= cp && cp <= 0x1E9A ) || ( 0x1E9A < cp &&                      \
-( 0x1E9E == cp || ( 0x1E9E < cp &&                                          \
-( 0x212A == cp || ( 0x212A < cp &&                                          \
-( 0x212B == cp || ( 0xFB00 <= cp && cp <= 0xFB06 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) )
-
-/*
-	PATWS: pattern white space
-
-	\p{PatWS}
-*/
-/*** GENERATED CODE ***/
-#define is_PATWS_safe(s,e,is_utf8)                                          \
-( ( LIKELY((e) > (s)) ) ?                                                   \
-    ( ( ( ( ((U8*)s)[0] & 0xEF ) == 0x05 ) || ((U8*)s)[0] == 0x0B || ( ( ((U8*)s)[0] & 0xFE ) == 0x0C ) || ((U8*)s)[0] == 0x25 || ((U8*)s)[0] == 0x40 ) ? 1\
-    : ( ( is_utf8 && LIKELY(((e) - (s)) >= UTF8SKIP(s)) ) && ( 0xCA == ((U8*)s)[0] ) ) ? ( ( 0x41 == ((U8*)s)[1] ) ?\
-		    ( ( ( ((U8*)s)[2] & 0xFE ) == 0x56 ) ? 3 : 0 )          \
-		: ( ( 0x42 == ((U8*)s)[1] ) && ( 0x49 == ((U8*)s)[2] || 0x51 == ((U8*)s)[2] ) ) ? 3 : 0 ) : 0 )\
-: 0 )
-
-/*** GENERATED CODE ***/
-#define is_PATWS_cp(cp)                                                     \
-( 0x05 == cp || ( 0x05 < cp &&                                              \
-( ( 0x0B <= cp && cp <= 0x0D ) || ( 0x0D < cp &&                            \
-( 0x15 == cp || ( 0x15 < cp &&                                              \
-( 0x25 == cp || ( 0x25 < cp &&                                              \
-( 0x40 == cp || ( 0x40 < cp &&                                              \
-( 0x200E == cp || ( 0x200E < cp &&                                          \
-( 0x200F == cp || ( 0x200F < cp &&                                          \
-( 0x2028 == cp || 0x2029 == cp ) ) ) ) ) ) ) ) ) ) ) ) ) ) )
-
-#endif	/* EBCDIC POSIX-BC */
-
 #endif /* H_REGCHARCLASS */
 
 /* Generated from:
- * 083180df694deb1fc173361406c1a75619fb8376403db3a76dc585c1e3951eca lib/Unicode/UCD.pm
- * 827aa7ee45ca9fe09f3e0969a5a27a69ce58a6c7134548125266210018d27b49 lib/unicore/ArabicShaping.txt
- * 3748fbbe9d280a9da700bfd0c28beaaf6f32a67ec263a124fcb0a4095a30fae5 lib/unicore/BidiBrackets.txt
- * 3925329c2432fa7248b2e180cddcedb9a4f9eafbbb10ab9e105eaf833043b2fb lib/unicore/BidiMirroring.txt
- * 7f5a1b4a346c6cdbe948d3baf50fc31fff29c26bcd4ad422dc1fbcc1c23b0bde lib/unicore/Blocks.txt
- * 82f3cc8217455f22d294d7df767a62906baf31456ea8902336ae7fee943a2538 lib/unicore/CaseFolding.txt
- * 8be553529f7dd22e3e0ffa25eb3f1743f5243bbfe868559be73bf3a163c21913 lib/unicore/CompositionExclusions.txt
- * ab64278818411762311b9d5974438ac5cf14e98c79b44a6373022f0780de38a7 lib/unicore/DAge.txt
- * f2ff892add5e6624cee8300c297373216df7f1a596c6e74510afe5e8b96c8d91 lib/unicore/DCoreProperties.txt
- * 656aa2c6996a049e84c6d38676bc73c3245c808869d64073b812690ae475d534 lib/unicore/DNormalizationProps.txt
- * e064b066e555cbace95951fcba9b5336a4d04c88c5949a1ff7615190eaa67682 lib/unicore/EastAsianWidth.txt
- * 2aa574984e9cea6980eddd6e36044168d543b7f0449266fa3248aca28790cf06 lib/unicore/HangulSyllableType.txt
- * e7122c4d4d598854b5fbefeb2b1ee9f05aef6a8d6e718b5f56c2a8ea31145f12 lib/unicore/IndicMatraCategory.txt
- * 478ca00ea86b47209f0b27eb3959ad83cb2b76f5159213d242390d07d5af2b8d lib/unicore/IndicSyllabicCategory.txt
- * 0aa8af5cbb4d0570b1006aefffc021c6ef637dffb15572a5a85e7f7e7778fe22 lib/unicore/Jamo.txt
- * 3b359eeff325f7e773ea9d5feb8af053b94c579844f0db7ce648f418c9d136d8 lib/unicore/LineBreak.txt
- * af85d961d0ed6055271ca6e0174451a8dc1822e31de9e07e1246535318b9341a lib/unicore/NameAliases.txt
- * 1c379b9c1b0f6cd14208b766f74fc92ff5a9528aee66083db307f1fc9a615729 lib/unicore/NamedSequences.txt
- * 0df343d93293f14e9ff0b0a721d8b8e6c23c86dbad7be18d362d6bf1281590d9 lib/unicore/PropList.txt
- * 6c14f474761b8db46f95cf2d1e235ce40abf3382226c5b1a2210df83775fe6fa lib/unicore/PropValueAliases.txt
- * 3f3dd77644faa905ce02de7c0e3167fdc4afdf94748f074192bd70821c8341ea lib/unicore/PropertyAliases.txt
- * 2767531dec8c525a317ab488b95eed73461fe9c6fbb8088594f3886964724475 lib/unicore/ScriptExtensions.txt
- * a638f9f0eb3c521ed6c7755fce93c04bf6e4ba89f23ac3d1bd4c4e486c400118 lib/unicore/Scripts.txt
- * 35496d45fc8babd8deb866491ea82ff7b3d2d49ad4c9c656685cd14833101e25 lib/unicore/SpecialCasing.txt
- * bfa3da58ea982199829e1107ac5a9a544b83100470a2d0cc28fb50ec234cb840 lib/unicore/UnicodeData.txt
- * 916289f471c4a337fb1e0715985a11e6bc8bb205736e84164849d601d265d9e0 lib/unicore/auxiliary/GCBTest.txt
- * 3d7ffae56e506d595f3e0e5d36978bc6721d53470e5ca9666ad7cdfc4a46cb3d lib/unicore/auxiliary/GraphemeBreakProperty.txt
- * 370ddf3ba9b337819cf21795c2bd7cda578ac5ff4700d1a3ac923e8be988b57e lib/unicore/auxiliary/SBTest.txt
- * 28356f6912113a9fe8244d9396e9786115dbc10b3ffb5e31b08969122e91d3f3 lib/unicore/auxiliary/SentenceBreakProperty.txt
- * 3f56d3ccfc35c6dac44d143a4d6087af4e4ee9f1bdbae482c12f6149b60dec3b lib/unicore/auxiliary/WBTest.txt
- * 82f7304030e6866ef8e02cdfb0485c52c18a661282bfce9c259cc6300abd79ad lib/unicore/auxiliary/WordBreakProperty.txt
- * b88801b4a469207892a0401697c6b1c5fd64042ae0ef867f4ad0ec04942b415c lib/unicore/extracted/DBidiClass.txt
- * 074d33ea6c7349eab840d690369dffb3568e2f7b039552b7c10480274d321545 lib/unicore/extracted/DBinaryProperties.txt
- * 8ad457aef3525aedce823b9177dad33e0088df536dff11e3df405ecefc92ba08 lib/unicore/extracted/DCombiningClass.txt
- * 59ec46c1e30458ffff50d41196fd45e3bbaf3172a8111117af1b930199be2d96 lib/unicore/extracted/DDecompositionType.txt
- * cf7c07557ae915a7508c6c7fc8c2e8c900782364ec62e8a5d2813f3b97449ee0 lib/unicore/extracted/DEastAsianWidth.txt
- * 56a5b47331a7ec784e848bcaae1ddc08cbf72aab583ca82dcc98ecf2851a3d43 lib/unicore/extracted/DGeneralCategory.txt
- * c14e83161e56eb15d78b1589352d6c0bd8feb7889a5d17f70a2ebb2a43cab86d lib/unicore/extracted/DJoinGroup.txt
- * 8c9405c54d8b1dd3fe2f2d691b30c0816ca15481995152ed07fc9b844dfd0ad4 lib/unicore/extracted/DJoinType.txt
- * a9791f08281d7b0a417e4ad882cf64463f6815db8156932acd85228ac717fd94 lib/unicore/extracted/DLineBreak.txt
- * a17a0330e57d774343a53c019f1bc69827c2676982a1bf48e0898a76710e8877 lib/unicore/extracted/DNumType.txt
- * c2cb810a67cc5fb4a8d236b6c1bc6dd4d89733d8603881997e8aae2c816a3db1 lib/unicore/extracted/DNumValues.txt
- * 808d76136d9952faf581347e9bc040dbab5158f143f243a6de455a4af39b7401 lib/unicore/mktables
- * 746472de66b936ac885ca6d6e68058242b4e909e3260c6317f3ec719f78f76cc lib/unicore/version
- * 3eaedce3745bef6219cff3b5f63e5f8622c58dc66736281a82df991636d54451 regen/regcharclass.pl
+ * cb3170dd603ad12ba0299440e99e8f50a8afde60ade2ffcbf1ff4a8a53854b90 lib/Unicode/UCD.pm
+ * ae98bec7e4f0564758eed81eca5015481ba32581f8a735a825b71b3bba714450 lib/unicore/ArabicShaping.txt
+ * 1687fe5994eb7e5c0dab8503fc2a1b3b479d91af9d3b8055941c9bd791f7d0b5 lib/unicore/BidiBrackets.txt
+ * 350d1302116194b0b21def287434b55c5088098fbc726e879f7420a391965643 lib/unicore/BidiMirroring.txt
+ * 288fc7b85c76bda296e296c8465f1f4baeb456cb814430dfaa0f546bfbe86b4a lib/unicore/Blocks.txt
+ * 86e075f2ede997b3fa5965516c75190b5a88bb82d302272d9c3179b7a57af03f lib/unicore/CaseFolding.txt
+ * 2fafee5be73bf2817ee669c53c504a6c4aa02ac7344194af18511aea2e05d750 lib/unicore/CompositionExclusions.txt
+ * 302f6d6171dc9c6165db86d0226b7923a64cea06c493d339d35436bf137606a3 lib/unicore/DAge.txt
+ * ff666dece87dfdbdbf04a2e26a0bfb52c4ba98db1f8965b0b01ddb9e15f97476 lib/unicore/DCoreProperties.txt
+ * 6cc76100d402d7dd12bd769ac61158b91e71aad58c8333abb848f1b9c9fdde2d lib/unicore/DNormalizationProps.txt
+ * ccc571829b384b8a2c24b7a62f8aa6a891a6e8c48f08513ef84fd6da26dba4bb lib/unicore/EastAsianWidth.txt
+ * 2320db06cf88c755ec7b9cfec96dd9e1d774173521dbc3ee7985377c2ab90d32 lib/unicore/HangulSyllableType.txt
+ * e52216b5fdb04910e06e94f01cabdf70656b0077c92b756c7b38822626d572f2 lib/unicore/IndicPositionalCategory.txt
+ * 4db71a39102e173095cb8bda8b4c35e78fe6b365e443c584b19f081d8c4894fc lib/unicore/IndicSyllabicCategory.txt
+ * eeb30346bb545bb45ff16486d9234397bfe1a195bb12b54fc1d9f48f87e8aa5e lib/unicore/Jamo.txt
+ * 13e2b7087bcca3163272e64e34e480534bd2f8353a0245c26e6642566f59a60d lib/unicore/LineBreak.txt
+ * 9bb54cd7b5509779f269fa60341bcbfca8da8f17d3c4999e44a5a51671d3c402 lib/unicore/NameAliases.txt
+ * e4c29d9ceefbe2382af819ac7646265a9e4ea599ce04a90d31bec97cfaa2848f lib/unicore/NamedSequences.txt
+ * 70d40297f1bf91397fbdab5a770c12100733e67c5c3398446c5e950715d5e535 lib/unicore/PropList.txt
+ * 03a440f2a4b9151043a6bb53d4a4e528b73238079f9d686dc2a5846e6895588a lib/unicore/PropValueAliases.txt
+ * 8e8b48c2080d31aa6713f5535aad94a1f7bc9a65cc52563724e5e69b0a3b4196 lib/unicore/PropertyAliases.txt
+ * 45d42b1ecbac2263c1c63c95104e63ea64313eb99be94542e040aea11c449f6c lib/unicore/ScriptExtensions.txt
+ * 79fbd73ad82c30fdb67d36a349d12667bd58d3e9da6a8ce7dd26383b637ba85f lib/unicore/Scripts.txt
+ * fb2025dae3b9b17649b6e379c1cdbddf50641267ca6d2446caeccf4a141fe167 lib/unicore/SpecialCasing.txt
+ * 38b17e1118206489a7e0ab5d29d7932212d38838df7d3ec025ecb58e8798ec20 lib/unicore/UnicodeData.txt
+ * 0cedd6e0f5cadf57ce9cfc96beccfd083b0faa0809a631a777cd25f0316bfabb lib/unicore/auxiliary/GCBTest.txt
+ * 230005412f9a47128e37bc52330766aaa0b5522a53737a89cff66e891e14527a lib/unicore/auxiliary/GraphemeBreakProperty.txt
+ * 149b14ab93b06c887a958fb16d0ad01193063ef69cc14f10338ae4d0accd6c28 lib/unicore/auxiliary/LBTest.txt
+ * 41bf82452d71ce15eda8c9bb1bb0c20b72205acaaf503e3cb84734ed8e85d33a lib/unicore/auxiliary/SBTest.txt
+ * d3b45cdb0a73eeb9d25158336583dfc1e6f64da59537acb0008988b40e6b3b63 lib/unicore/auxiliary/SentenceBreakProperty.txt
+ * a661f42a54f7cc4dded72a61c508be2b482f912d4b6cf140335010f0c684dbb9 lib/unicore/auxiliary/WBTest.txt
+ * c255bd2e1f163373510679bf4b272eee97b635bfce2a6550d6c10fe5c917f01a lib/unicore/auxiliary/WordBreakProperty.txt
+ * 16dac6f1c164a4f52741b71221a8aafb6acb52cd8a436af139da6e93d86efdfb lib/unicore/extracted/DBidiClass.txt
+ * c4e78efc041668548117f7462af03b28dfbb2caca5d46a1ae78ae0ce0bb26c4a lib/unicore/extracted/DBinaryProperties.txt
+ * 5886bb44aae8f2821663f742793cb91d4ed0923c6840f3bfb73530e37030abf8 lib/unicore/extracted/DCombiningClass.txt
+ * 9edba3785ed0e6e46e10f67e2dd0ec3cb0799b7f75f526fe918429576060352e lib/unicore/extracted/DDecompositionType.txt
+ * b774387f79b27ae4268ae89450f971408dc9bbbb523426482ab4375c962bd922 lib/unicore/extracted/DEastAsianWidth.txt
+ * ba4207d2464077e807b20caf063041142afc0a8a38c328c5c23b3417c9f2da33 lib/unicore/extracted/DGeneralCategory.txt
+ * 29fdd151266595eb1b37715937afe0727bb632a2bc1130f0d2314040175df82e lib/unicore/extracted/DJoinGroup.txt
+ * 7725fe247da06986e43e89fd316b8b22a0619546d0c1ed499a94b25e9164c150 lib/unicore/extracted/DJoinType.txt
+ * 1a0687fb9c6c4567e853913549df0944fe40821279a3e9cdaa6ab8679bc286fd lib/unicore/extracted/DLineBreak.txt
+ * 40bcfed3ca727c19e1331f6c33806231d5f7eeeabd2e6a9e06a3740c85d0c250 lib/unicore/extracted/DNumType.txt
+ * a18d502bad39d527ac5586d7bc93e29f565859e3bcc24ada627eff606d6f5fed lib/unicore/extracted/DNumValues.txt
+ * 285aef7ed2bf69724b1fa9bba177640636f666e1a5dd0ba5e538d4790129bbfe lib/unicore/mktables
+ * 462c9aaa608fb2014cd9649af1c5c009485c60b9c8b15b89401fdc10cf6161c6 lib/unicore/version
+ * 913d2f93f3cb6cdf1664db888bf840bc4eb074eef824e082fceda24a9445e60c regen/charset_translations.pl
+ * d9c04ac46bdd81bb3e26519f2b8eb6242cb12337205add3f7cf092b0c58dccc4 regen/regcharclass.pl
+ * 393f8d882713a3ba227351ad0f00ea4839fda74fcf77dcd1cdf31519925adba5 regen/regcharclass_multi_char_folds.pl
  * ex: set ro: */
diff --git a/Master/tlpkg/tlperl/lib/CORE/regcomp.h b/Master/tlpkg/tlperl/lib/CORE/regcomp.h
index f418086c9f2..a8842a1bc79 100644
--- a/Master/tlpkg/tlperl/lib/CORE/regcomp.h
+++ b/Master/tlpkg/tlperl/lib/CORE/regcomp.h
@@ -90,8 +90,6 @@
 /* This is the stuff that used to live in regexp.h that was truly
    private to the engine itself. It now lives here. */
 
-
-
  typedef struct regexp_internal {
         int name_list_idx;	/* Optional data index of an array of paren names */
         union {
@@ -134,13 +132,14 @@
 #define PREGf_USE_RE_EVAL	0x00000020 /* compiled with "use re 'eval'" */
 /* these used to be extflags, but are now intflags */
 #define PREGf_NOSCAN            0x00000040
-#define PREGf_CANY_SEEN         0x00000080
+                                /* spare */
 #define PREGf_GPOS_SEEN         0x00000100
 #define PREGf_GPOS_FLOAT        0x00000200
 
 #define PREGf_ANCH_MBOL         0x00000400
 #define PREGf_ANCH_SBOL         0x00000800
 #define PREGf_ANCH_GPOS         0x00001000
+#define PREGf_RECURSE_SEEN      0x00002000
 
 #define PREGf_ANCH              \
     ( PREGf_ANCH_SBOL | PREGf_ANCH_GPOS | PREGf_ANCH_MBOL )
@@ -261,7 +260,7 @@ struct regnode_ssc {
 #define set_ANYOF_SYNTHETIC(n) STMT_START{ OP(n) = ANYOF;              \
                                            NEXT_OFF(n) = 1;            \
                                } STMT_END
-#define is_ANYOF_SYNTHETIC(n) (OP(n) == ANYOF && NEXT_OFF(n) == 1)
+#define is_ANYOF_SYNTHETIC(n) (PL_regkind[OP(n)] == ANYOF && NEXT_OFF(n) == 1)
 
 /* XXX fix this description.
    Impose a limit of REG_INFTY on various pattern matching operations
@@ -369,85 +368,198 @@ struct regnode_ssc {
 
 #define REG_MAGIC 0234
 
-#define SIZE_ONLY (RExC_emit == (regnode *) & RExC_emit_dummy)
+#define SIZE_ONLY cBOOL(RExC_emit == (regnode *) & RExC_emit_dummy)
 #define PASS1 SIZE_ONLY
 #define PASS2 (! SIZE_ONLY)
 
-/* If the bitmap fully represents what this ANYOF node can match, the
- * ARG is set to this special value (since 0, 1, ... are legal, but will never
- * reach this high). */
+/* An ANYOF node is basically a bitmap with the index being a code point.  If
+ * the bit for that code point is 1, the code point matches;  if 0, it doesn't
+ * match (complemented if inverted).  There is an additional mechanism to deal
+ * with cases where the bitmap is insufficient in and of itself.  This #define
+ * indicates if the bitmap does fully represent what this ANYOF node can match.
+ * The ARG is set to this special value (since 0, 1, ... are legal, but will
+ * never reach this high). */
 #define ANYOF_ONLY_HAS_BITMAP	((U32) -1)
 
-/* Flags for node->flags of ANYOF.  These are in short supply, with none
- * currently available.  The ABOVE_BITMAP_ALL bit could be freed up
- * by resorting to creating a swash containing everything above 255.  This
- * introduces a performance penalty.  An option that wouldn't slow things down
- * would be to split one of the two LOC flags out into a separate
- * node, like what was done with ANYOF_NON_UTF8_NON_ASCII_ALL in commit
- * 34fdef848b1687b91892ba55e9e0c3430e0770f6 (but which was reverted because it
- * wasn't the best option available at the time), and using a LOC flag is
- * probably better than that commit anyway.  But it could be reinstated if we
- * need a bit.  The LOC flags are only for /l nodes; the reverted commit was
- * only for /d, so there are no combinatorial issues.  The LOC flag to use is
- * probably the POSIXL one.  Now that there is an ANYOFL (locale) node, another
- * option would be to make all of those include the POSIXL data structure,
- * which would get rid of needing a separate POSIXL flag.  But it would
- * increase the size of all such nodes, so it's probably not as atractive as
- * having an ANYOF_POSIXL node type.  But if we did do it, note that not all 32
- * bits of that extra space are used, one bit of that could be set aside for
- * the LOC_FOLD flag, yielding yet another bit.  This would require extra code
- * for masking, so again not the most attractive solution.
+/* When the bimap isn't completely sufficient for handling the ANYOF node,
+ * flags (in node->flags of the ANYOF node) get set to indicate this.  These
+ * are perennially in short supply.  Beyond several cases where warnings need
+ * to be raised under certain circumstances, currently, there are six cases
+ * where the bitmap alone isn't sufficient.  We could use six flags to
+ * represent the 6 cases, but to save flags bits, we play some games.  The
+ * cases are:
+ *
+ *  1)  The bitmap has a compiled-in very finite size.  So something else needs
+ *      to be used to specify if a code point that is too large for the bitmap
+ *      actually matches.  The mechanism currently is a swash or inversion
+ *      list.  ANYOF_ONLY_HAS_BITMAP, described above, being TRUE indicates
+ *      there are no matches of too-large code points.  But if it is FALSE,
+ *      then almost certainly there are matches too large for the bitmap.  (The
+ *      other cases, described below, either imply this one or are extremely
+ *      rare in practice.)  So we can just assume that a too-large code point
+ *      will need something beyond the bitmap if ANYOF_ONLY_HAS_BITMAP is
+ *      FALSE, instead of having a separate flag for this.
+ *  2)  A subset of item 1) is if all possible code points outside the bitmap
+ *      match.  This is a common occurrence when the class is complemented,
+ *      like /[^ij]/.  Therefore a bit is reserved to indicate this,
+ *      rather than having an expensive swash created,
+ *      ANYOF_MATCHES_ALL_ABOVE_BITMAP.
+ *  3)  Under /d rules, it can happen that code points that are in the upper
+ *      latin1 range (\x80-\xFF or their equivalents on EBCDIC platforms) match
+ *      only if the runtime target string being matched against is UTF-8.  For
+ *      example /[\w[:punct:]]/d.  This happens only for posix classes (with a
+ *      couple of exceptions, like \d where it doesn't happen), and all such
+ *      ones also have above-bitmap matches.  Thus, 3) implies 1) as well.
+ *      Note that /d rules are no longer encouraged; 'use 5.14' or higher
+ *      deselects them.  But a flag is required so that they can be properly
+ *      handled.  But it can be a shared flag: see 5) below.
+ *  4)  Also under /d rules, something like /[\Wfoo]/ will match everything in
+ *      the \x80-\xFF range, unless the string being matched against is UTF-8.
+ *      A swash could be created for this case, but this is relatively common,
+ *      and it turns out that it's all or nothing:  if any one of these code
+ *      points matches, they all do.  Hence a single bit suffices.  We use a
+ *      shared flag that doesn't take up space by itself:
+ *      ANYOF_SHARED_d_MATCHES_ALL_NON_UTF8_NON_ASCII_non_d_WARN_SUPER.
+ *      This also implies 1), with one exception: [:^cntrl:].
+ *  5)  A user-defined \p{} property may not have been defined by the time the
+ *      regex is compiled.  In this case, we don't know until runtime what it
+ *      will match, so we have to assume it could match anything, including
+ *      code points that ordinarily would be in the bitmap.  A flag bit is
+ *      necessary to indicate this , though it can be shared with the item 3)
+ *      flag, as that only occurs under /d, and this only occurs under non-d.
+ *      This case is quite uncommon in the field, and the /(?[ ...])/ construct
+ *      is a better way to accomplish what this feature does.  This case also
+ *      implies 1).
+ *      ANYOF_SHARED_d_UPPER_LATIN1_UTF8_STRING_MATCHES_non_d_RUNTIME_USER_PROP
+ *      is the shared flag.
+ *  6)  /[foo]/il may have folds that are only valid if the runtime locale is a
+ *      UTF-8 one.  These are quite rare, so it would be good to avoid the
+ *      expense of looking for them.  But /l matching is slow anyway, and we've
+ *      traditionally not worried too much about its performance.  And this
+ *      condition requires the ANYOFL_FOLD flag to be set, so testing for
+ *      that flag would be sufficient to rule out most cases of this.  So it is
+ *      unclear if this should have a flag or not.  But, this flag can be
+ *      shared with another, so it doesn't occupy extra space.
+ *
+ * At the moment, there is one spare bit, but this could be increased by
+ * various tricks.
+ *
+ * If just one more bit is needed, at this writing it seems to khw that the
+ * best choice would be to make ANYOF_MATCHES_ALL_ABOVE_BITMAP not a flag, but
+ * something like
+ *
+ *      #define ANYOF_MATCHES_ALL_ABOVE_BITMAP      ((U32) -2)
  *
- * Several flags are not used in synthetic start class (SSC) nodes, so could be
+ * and access it through the ARG like ANYOF_ONLY_HAS_BITMAP is.  This flag is
+ * used by all ANYOF node types, and it could be used to avoid calling the
+ * handler function, as the macro REGINCLASS in regexec.c does now for other
+ * cases.
+ *
+ * Another possibility is to instead (or additionally) rename the ANYOF_POSIXL
+ * flag to be ANYOFL_LARGE, to mean that the ANYOF node has an extra 32 bits
+ * beyond what a regular one does.  That's what it effectively means now, with
+ * the extra space all for the POSIX class flags.  But those classes actually
+ * only occupy 30 bits, so the ANYOFL_FOLD and
+ * ANYOFL_SHARED_UTF8_LOCALE_fold_HAS_MATCHES_nonfold_REQD flags could be moved
+ * to that extra space.  The 30 bits in the extra word would indicate if a
+ * posix class should be looked up or not.  The downside of this is that ANYOFL
+ * nodes with folding would always have to have the extra space allocated, even
+ * if they didn't use the 30 posix bits.  There isn't an SSC problem as all
+ * SSCs are this large anyway.
+ *
+ * One could completely remove ANYOFL_LARGE and make all ANYOFL nodes large.
+ * REGINCLASS would have to be modified so that if the node type were this, it
+ * would call reginclass(), as the flag bit that indicates to do this now would
+ * be gone.
+ *
+ * All told, 5 bits could be available for other uses if all of the above were
+ * done.
+ *
+ * Some flags are not used in synthetic start class (SSC) nodes, so could be
  * shared should new flags be needed for SSCs, like SSC_MATCHES_EMPTY_STRING
  * now. */
 
-/* regexec.c is expecting this to be in the low bit */
+/* If this is set, the result of the match should be complemented.  regexec.c
+ * is expecting this to be in the low bit.  Never in an SSC */
 #define ANYOF_INVERT		                0x01
 
 /* For the SSC node only, which cannot be inverted, so is shared with that bit.
  * This is used only during regex compilation. */
 #define SSC_MATCHES_EMPTY_STRING                ANYOF_INVERT
 
-/* Are there things outside the bitmap that will match only if the target
- * string is encoded in UTF-8?  (This is not set if ANYOF_ABOVE_BITMAP_ALL is
- * set) */
-#define ANYOF_HAS_UTF8_NONBITMAP_MATCHES        0x02
-
-/* The fold is calculated and stored in the bitmap where possible at compile
- * time.  However under locale, the actual folding varies depending on
- * what the locale is at the time of execution, so it has to be deferred until
- * then */
-#define ANYOF_LOC_FOLD                          0x04
-
 /* Set if this is a regnode_charclass_posixl vs a regnode_charclass.  This
  * is used for runtime \d, \w, [:posix:], ..., which are used only in locale
  * and the optimizer's synthetic start class.  Non-locale \d, etc are resolved
- * at compile-time */
-#define ANYOF_MATCHES_POSIXL                    0x08
+ * at compile-time.  Only set under /l; can be in SSC */
+#define ANYOF_MATCHES_POSIXL                    0x02
 
-/* Should we raise a warning if matching against an above-Unicode code point?
+/* The fold is calculated and stored in the bitmap where possible at compile
+ * time.  However under locale, the actual folding varies depending on
+ * what the locale is at the time of execution, so it has to be deferred until
+ * then.  Only set under /l; never in an SSC  */
+#define ANYOFL_FOLD                             0x04
+
+/* Shared bit set only with ANYOFL and SSC nodes:
+ *    If ANYOFL_FOLD is set, this means there are potential matches valid
+ *       only if the locale is a UTF-8 one.
+ *    If ANYOFL_FOLD is NOT set, this means to warn if the runtime locale
+ *       isn't a UTF-8 one (and the generated node assumes a UTF-8 locale).
+ *       None of INVERT, POSIXL,
+ *       ANYOF_SHARED_d_UPPER_LATIN1_UTF8_STRING_MATCHES_non_d_RUNTIME_USER_PROP
+ *       can be set.  */
+#define ANYOFL_SHARED_UTF8_LOCALE_fold_HAS_MATCHES_nonfold_REQD        0x08
+
+/* Convenience macros for teasing apart the meanings when reading the above bit
  * */
-#define ANYOF_WARN_SUPER                        0x10
-
-/* Can match something outside the bitmap that isn't in utf8 */
-#define ANYOF_HAS_NONBITMAP_NON_UTF8_MATCHES    0x20
-
-/* Matches every code point NUM_ANYOF_CODE_POINTS and above*/
-#define ANYOF_MATCHES_ALL_ABOVE_BITMAP          0x40
-
-/* Match all Latin1 characters that aren't ASCII when the target string is not
- * in utf8. */
-#define ANYOF_MATCHES_ALL_NON_UTF8_NON_ASCII    0x80
-
-#define ANYOF_FLAGS_ALL		(0xff)
-
-#define ANYOF_LOCALE_FLAGS (ANYOF_LOC_FOLD | ANYOF_MATCHES_POSIXL)
+#define ANYOFL_SOME_FOLDS_ONLY_IN_UTF8_LOCALE(flags)                        \
+    ((flags & ( ANYOFL_FOLD /* Both bits are set */                         \
+               |ANYOFL_SHARED_UTF8_LOCALE_fold_HAS_MATCHES_nonfold_REQD))   \
+             == ( ANYOFL_FOLD                                               \
+                 |ANYOFL_SHARED_UTF8_LOCALE_fold_HAS_MATCHES_nonfold_REQD))
+
+#define  ANYOFL_UTF8_LOCALE_REQD(flags)                                     \
+    ((flags & ( ANYOFL_FOLD /* Only REQD bit is set */                      \
+               |ANYOFL_SHARED_UTF8_LOCALE_fold_HAS_MATCHES_nonfold_REQD))   \
+             == ANYOFL_SHARED_UTF8_LOCALE_fold_HAS_MATCHES_nonfold_REQD)
+
+/* Spare:                                       0x10 */
+
+/* If set, the node matches every code point NUM_ANYOF_CODE_POINTS and above.
+ * Can be in an SSC */
+#define ANYOF_MATCHES_ALL_ABOVE_BITMAP          0x20
+
+/* Shared bit:
+ *      Under /d it means the ANYOFD node matches more things if the target
+ *          string is encoded in UTF-8; any such things will be non-ASCII,
+ *          characters that are < 256, and can be accessed via the swash.
+ *      When not under /d, it means the ANYOF node contains a user-defined
+ *      property that wasn't yet defined at the time the regex was compiled,
+ *      and so must be looked up at runtime, by creating a swash
+ * (These uses are mutually exclusive because a user-defined property is
+ * specified by \p{}, and \p{} implies /u which deselects /d).  The long macro
+ * name is to make sure that you are cautioned about its shared nature.  Only
+ * the non-/d meaning can be in an SSC */
+#define ANYOF_SHARED_d_UPPER_LATIN1_UTF8_STRING_MATCHES_non_d_RUNTIME_USER_PROP  0x40
+
+/* Shared bit:
+ *      Under /d it means the ANYOFD node matches all non-ASCII Latin1
+ *          characters when the target string is not in utf8.
+ *      When not under /d, it means the ANYOF node should raise a warning if
+ *          matching against an above-Unicode code point.
+ * (These uses are mutually exclusive because the warning requires a \p{}, and
+ * \p{} implies /u which deselects /d).  An SSC node only has this bit set if
+ * what is meant is the warning.  The long macro name is to make sure that you
+ * are cautioned about its shared nature */
+#define ANYOF_SHARED_d_MATCHES_ALL_NON_UTF8_NON_ASCII_non_d_WARN_SUPER 0x80
+
+#define ANYOF_FLAGS_ALL		(0xff & ~0x10)
+
+#define ANYOF_LOCALE_FLAGS (ANYOFL_FOLD | ANYOF_MATCHES_POSIXL)
 
 /* These are the flags that apply to both regular ANYOF nodes and synthetic
  * start class nodes during construction of the SSC.  During finalization of
- * the SSC, other of the flags could be added to it */
-#define ANYOF_COMMON_FLAGS    (ANYOF_WARN_SUPER|ANYOF_HAS_UTF8_NONBITMAP_MATCHES)
+ * the SSC, other of the flags may get added to it */
+#define ANYOF_COMMON_FLAGS      0
 
 /* Character classes for node->classflags of ANYOF */
 /* Should be synchronized with a table in regprop() */
@@ -567,9 +679,9 @@ struct regnode_ssc {
 
 #define ANYOF_POSIXL_AND(source, dest) STMT_START { (dest)->classflags &= (source)->classflags ; } STMT_END
 
-#define ANYOF_BITMAP_ZERO(ret)	Zero(((struct regnode_charclass*)(ret))->bitmap, ANYOF_BITMAP_SIZE, char)
-#define ANYOF_BITMAP(p)		(((struct regnode_charclass*)(p))->bitmap)
-#define ANYOF_BITMAP_BYTE(p, c)	(ANYOF_BITMAP(p)[(((U8)(c)) >> 3) & 31])
+#define ANYOF_BITMAP_ZERO(ret)	Zero(((regnode_charclass*)(ret))->bitmap, ANYOF_BITMAP_SIZE, char)
+#define ANYOF_BITMAP(p)		((regnode_charclass*)(p))->bitmap
+#define ANYOF_BITMAP_BYTE(p, c)	BITMAP_BYTE(ANYOF_BITMAP(p), c)
 #define ANYOF_BITMAP_SET(p, c)	(ANYOF_BITMAP_BYTE(p, c) |=  ANYOF_BIT(c))
 #define ANYOF_BITMAP_CLEAR(p,c)	(ANYOF_BITMAP_BYTE(p, c) &= ~ANYOF_BIT(c))
 #define ANYOF_BITMAP_TEST(p, c)	cBOOL(ANYOF_BITMAP_BYTE(p, c) &   ANYOF_BIT(c))
@@ -579,7 +691,7 @@ struct regnode_ssc {
 #define ANYOF_BITMAP_CLEARALL(p)	\
 	Zero (ANYOF_BITMAP(p), ANYOF_BITMAP_SIZE)
 
-#define ANYOF_SKIP		EXTRA_SIZE(struct regnode_charclass)
+#define ANYOF_SKIP		EXTRA_SIZE(regnode_charclass)
 #define ANYOF_POSIXL_SKIP	EXTRA_SIZE(regnode_charclass_posixl)
 
 /*
@@ -597,14 +709,13 @@ struct regnode_ssc {
 #define REG_LOOKBEHIND_SEEN                 0x00000002
 #define REG_GPOS_SEEN                       0x00000004
 /* spare */
-#define REG_CANY_SEEN                       0x00000010
 #define REG_RECURSE_SEEN                    0x00000020
 #define REG_TOP_LEVEL_BRANCHES_SEEN         0x00000040
 #define REG_VERBARG_SEEN                    0x00000080
 #define REG_CUTGROUP_SEEN                   0x00000100
 #define REG_RUN_ON_COMMENT_SEEN             0x00000200
 #define REG_UNFOLDED_MULTI_SEEN             0x00000400
-#define REG_GOSTART_SEEN                    0x00000800
+/* spare */
 #define REG_UNBOUNDED_QUANTIFIER_SEEN       0x00001000
 
 
@@ -796,7 +907,7 @@ typedef struct _reg_ac_data reg_ac_data;
    three different sets... */
 
 #define TRIE_BITMAP(p)		(((reg_trie_data *)(p))->bitmap)
-#define TRIE_BITMAP_BYTE(p, c)	(TRIE_BITMAP(p)[(((U8)(c)) >> 3) & 31])
+#define TRIE_BITMAP_BYTE(p, c)	BITMAP_BYTE(TRIE_BITMAP(p), c)
 #define TRIE_BITMAP_SET(p, c)	(TRIE_BITMAP_BYTE(p, c) |=  ANYOF_BIT((U8)c))
 #define TRIE_BITMAP_CLEAR(p,c)	(TRIE_BITMAP_BYTE(p, c) &= ~ANYOF_BIT((U8)c))
 #define TRIE_BITMAP_TEST(p, c)	(TRIE_BITMAP_BYTE(p, c) &   ANYOF_BIT((U8)c))
@@ -805,7 +916,7 @@ typedef struct _reg_ac_data reg_ac_data;
 #define IS_TRIE_AC(op) ((op)>=AHOCORASICK)
 
 
-#define BITMAP_BYTE(p, c)	(((U8*)p)[(((U8)(c)) >> 3) & 31])
+#define BITMAP_BYTE(p, c)	(( (U8*) p) [ ( ( (UV) (c)) >> 3) ] )
 #define BITMAP_TEST(p, c)	(BITMAP_BYTE(p, c) &   ANYOF_BIT((U8)c))
 
 /* these defines assume uniquecharcount is the correct variable, and state may be evaluated twice */
@@ -943,7 +1054,7 @@ re.pm, especially to the documentation.
 /* get_sv() can return NULL during global destruction. */
 #define GET_RE_DEBUG_FLAGS DEBUG_r({ \
         SV * re_debug_flags_sv = NULL; \
-        re_debug_flags_sv = get_sv(RE_DEBUG_FLAGS, 1); \
+        re_debug_flags_sv = PL_curcop ? get_sv(RE_DEBUG_FLAGS, 1) : NULL; \
         if (re_debug_flags_sv) { \
             if (!SvIOK(re_debug_flags_sv)) \
                 sv_setuv(re_debug_flags_sv, RE_DEBUG_COMPILE_DUMP | RE_DEBUG_EXECUTE_MASK ); \
@@ -957,22 +1068,25 @@ re.pm, especially to the documentation.
         PERL_UNUSED_VAR(re_debug_flags); GET_RE_DEBUG_FLAGS;
 
 #define RE_PV_COLOR_DECL(rpv,rlen,isuni,dsv,pv,l,m,c1,c2) \
-    const char * const rpv =                          \
-        pv_pretty((dsv), (pv), (l), (m), \
-            PL_colors[(c1)],PL_colors[(c2)], \
+    const char * const rpv =                                 \
+        pv_pretty((dsv), (pv), (l),                          \
+            (PL_dump_re_max_len) ? PL_dump_re_max_len : (m), \
+            PL_colors[(c1)],PL_colors[(c2)],                 \
             PERL_PV_ESCAPE_RE|PERL_PV_ESCAPE_NONASCII |((isuni) ? PERL_PV_ESCAPE_UNI : 0) );         \
     const int rlen = SvCUR(dsv)
 
-#define RE_SV_ESCAPE(rpv,isuni,dsv,sv,m) \
-    const char * const rpv =                          \
-        pv_pretty((dsv), (SvPV_nolen_const(sv)), (SvCUR(sv)), (m), \
-            PL_colors[(c1)],PL_colors[(c2)], \
+#define RE_SV_ESCAPE(rpv,isuni,dsv,sv,m)                        \
+    const char * const rpv =                                    \
+        pv_pretty((dsv), (SvPV_nolen_const(sv)), (SvCUR(sv)),   \
+            (PL_dump_re_max_len) ? PL_dump_re_max_len : (m),    \
+            PL_colors[(c1)],PL_colors[(c2)],                    \
             PERL_PV_ESCAPE_RE|PERL_PV_ESCAPE_NONASCII |((isuni) ? PERL_PV_ESCAPE_UNI : 0) )
 
 #define RE_PV_QUOTED_DECL(rpv,isuni,dsv,pv,l,m)                    \
     const char * const rpv =                                       \
-        pv_pretty((dsv), (pv), (l), (m), \
-            PL_colors[0], PL_colors[1], \
+        pv_pretty((dsv), (pv), (l),                                \
+            (PL_dump_re_max_len) ? PL_dump_re_max_len : (m),       \
+            PL_colors[0], PL_colors[1],                            \
             ( PERL_PV_PRETTY_QUOTE | PERL_PV_ESCAPE_RE | PERL_PV_ESCAPE_NONASCII | PERL_PV_PRETTY_ELLIPSES | \
               ((isuni) ? PERL_PV_ESCAPE_UNI : 0))                  \
         )
@@ -994,6 +1108,7 @@ re.pm, especially to the documentation.
 typedef enum {
 	TRADITIONAL_BOUND = _CC_WORDCHAR,
 	GCB_BOUND,
+	LB_BOUND,
 	SB_BOUND,
 	WB_BOUND
 } bound_type;
diff --git a/Master/tlpkg/tlperl/lib/CORE/regexp.h b/Master/tlpkg/tlperl/lib/CORE/regexp.h
index 04eeba9c9e5..78aa899625e 100644
--- a/Master/tlpkg/tlperl/lib/CORE/regexp.h
+++ b/Master/tlpkg/tlperl/lib/CORE/regexp.h
@@ -102,6 +102,7 @@ struct reg_code_block {
 	const struct regexp_engine* engine; 				\
 	REGEXP *mother_re; /* what re is this a lightweight copy of? */	\
 	HV *paren_names;   /* Optional hash of paren names */		\
+        /*--------------------------------------------------------*/    \
 	/* Information about the match that the perl core uses to */	\
 	/* manage things */						\
 	U32 extflags;	/* Flags used both externally and internally */	\
@@ -116,12 +117,15 @@ struct reg_code_block {
 	U32 intflags;	/* Engine Specific Internal flags */		\
 	void *pprivate;	/* Data private to the regex engine which */	\
 			/* created this object. */			\
+        /*--------------------------------------------------------*/    \
 	/* Data about the last/current match. These are modified */	\
 	/* during matching */						\
 	U32 lastparen;			/* last open paren matched */	\
 	U32 lastcloseparen;		/* last close paren matched */	\
 	/* Array of offsets for (@-) and (@+) */			\
 	regexp_paren_pair *offs;					\
+        char **recurse_locinput; /* used to detect infinite recursion, XXX: move to internal */ \
+        /*--------------------------------------------------------*/    \
 	/* saved or original string so \digit works forever. */		\
 	char *subbeg;							\
 	SV_SAVED_COPY	/* If non-NULL, SV which is COW from original */\
@@ -130,11 +134,13 @@ struct reg_code_block {
 	SSize_t subcoffset; /* suboffset equiv, but in chars (for @-/@+) */ \
 	/* Information about the match that isn't often used */		\
         SSize_t maxlen;        /* mininum possible number of chars in string to match */\
+        /*--------------------------------------------------------*/    \
 	/* offset from wrapped to the start of precomp */		\
 	PERL_BITFIELD32 pre_prefix:4;					\
         /* original flags used to compile the pattern, may differ */    \
         /* from extflags in various ways */                             \
         PERL_BITFIELD32 compflags:9;                                    \
+        /*--------------------------------------------------------*/    \
 	CV *qr_anoncv	/* the anon sub wrapped round qr/(?{..})/ */
 
 typedef struct regexp {
@@ -168,7 +174,7 @@ typedef struct regexp_engine {
                         const U32 flags,
                        re_scream_pos_data *data);
     SV*     (*checkstr) (pTHX_ REGEXP * const rx);
-    void    (*free) (pTHX_ REGEXP * const rx);
+    void    (*rxfree) (pTHX_ REGEXP * const rx);
     void    (*numbered_buff_FETCH) (pTHX_ REGEXP * const rx, const I32 paren,
                                     SV * const sv);
     void    (*numbered_buff_STORE) (pTHX_ REGEXP * const rx, const I32 paren,
@@ -242,7 +248,7 @@ equivalent to the following snippet:
     if (SvTYPE(sv) == SVt_REGEXP)
         return (REGEXP*) sv;
 
-NULL will be returned if a REGEXP* is not found.
+C<NULL> will be returned if a REGEXP* is not found.
 
 =for apidoc Am|bool|SvRXOK|SV* sv
 
@@ -657,7 +663,7 @@ typedef struct {
 /* structures for holding and saving the state maintained by regmatch() */
 
 #ifndef MAX_RECURSE_EVAL_NOCHANGE_DEPTH
-#define MAX_RECURSE_EVAL_NOCHANGE_DEPTH 1000
+#define MAX_RECURSE_EVAL_NOCHANGE_DEPTH 10
 #endif
 
 typedef I32 CHECKPOINT;
@@ -742,13 +748,14 @@ typedef struct regmatch_state {
 	struct {
 	    /* this first element must match u.yes */
 	    struct regmatch_state *prev_yes_state;
-	    struct regmatch_state *prev_eval;
 	    struct regmatch_state *prev_curlyx;
+            struct regmatch_state *prev_eval;
 	    REGEXP	*prev_rex;
 	    CHECKPOINT	cp;	/* remember current savestack indexes */
 	    CHECKPOINT	lastcp;
-	    U32        close_paren; /* which close bracket is our end */
+            U32         close_paren; /* which close bracket is our end (+1) */
 	    regnode	*B;	/* the node following us  */
+            char        *prev_recurse_locinput;
 	} eval;
 
 	struct {
@@ -833,6 +840,8 @@ typedef struct regmatch_state {
     } u;
 } regmatch_state;
 
+
+
 /* how many regmatch_state structs to allocate as a single slab.
  * We do it in 4K blocks for efficiency. The "3" is 2 for the next/prev
  * pointers, plus 1 for any mythical malloc overhead. */
diff --git a/Master/tlpkg/tlperl/lib/CORE/regnodes.h b/Master/tlpkg/tlperl/lib/CORE/regnodes.h
index 3c9b9912957..f820c5684e6 100644
--- a/Master/tlpkg/tlperl/lib/CORE/regnodes.h
+++ b/Master/tlpkg/tlperl/lib/CORE/regnodes.h
@@ -6,8 +6,8 @@
 
 /* Regops and State definitions */
 
-#define REGNODE_MAX           	93
-#define REGMATCH_STATE_MAX    	133
+#define REGNODE_MAX           	92
+#define REGMATCH_STATE_MAX    	132
 
 #define	END                   	0	/* 0000 End of program. */
 #define	SUCCEED               	1	/* 0x01 Return from a subroutine, basically. */
@@ -29,8 +29,8 @@
 #define	NBOUNDA               	15	/* 0x0f Match "" betweeen any \w\w or \W\W, where \w is [_a-zA-Z0-9] */
 #define	REG_ANY               	16	/* 0x10 Match any one character (except newline). */
 #define	SANY                  	17	/* 0x11 Match any one character. */
-#define	CANY                  	18	/* 0x12 Match any one byte. */
-#define	ANYOF                 	19	/* 0x13 Match character in (or not in) this class, single char match only */
+#define	ANYOF                 	18	/* 0x12 Match character in (or not in) this class, single char match only */
+#define	ANYOFD                	19	/* 0x13 Like ANYOF, but /d is in effect */
 #define	ANYOFL                	20	/* 0x14 Like ANYOF, but /l is in effect */
 #define	POSIXD                	21	/* 0x15 Some [[:class:]] under /d; the FLAGS field gives which one */
 #define	POSIXL                	22	/* 0x16 Some [[:class:]] under /l; the FLAGS field gives which one */
@@ -43,7 +43,7 @@
 #define	CLUMP                 	29	/* 0x1d Match any extended grapheme cluster sequence */
 #define	BRANCH                	30	/* 0x1e Match this alternative, or the next... */
 #define	EXACT                 	31	/* 0x1f Match this string (preceded by length). */
-#define	EXACTL                	32	/* 0x20 Like EXACT, but /l is in effect. */
+#define	EXACTL                	32	/* 0x20 Like EXACT, but /l is in effect (used so locale-related warnings can be checked for). */
 #define	EXACTF                	33	/* 0x21 Match this non-UTF-8 string (not guaranteed to be folded) using /id rules (w/len). */
 #define	EXACTFL               	34	/* 0x22 Match this string (not guaranteed to be folded) using /il rules (w/len). */
 #define	EXACTFU               	35	/* 0x23 Match this string (folded iff in UTF-8, length in folding doesn't change if not in UTF-8) using /iu rules (w/len). */
@@ -88,23 +88,22 @@
 #define	AHOCORASICK           	74	/* 0x4a Aho Corasick stclass. flags==type */
 #define	AHOCORASICKC          	75	/* 0x4b Same as AHOCORASICK, but with embedded charclass data */
 #define	GOSUB                 	76	/* 0x4c recurse to paren arg1 at (signed) ofs arg2 */
-#define	GOSTART               	77	/* 0x4d recurse to start of pattern */
-#define	NGROUPP               	78	/* 0x4e Whether the group matched. */
-#define	INSUBP                	79	/* 0x4f Whether we are in a specific recurse. */
-#define	DEFINEP               	80	/* 0x50 Never execute directly. */
-#define	ENDLIKE               	81	/* 0x51 Used only for the type field of verbs */
-#define	OPFAIL                	82	/* 0x52 Same as (?!) */
-#define	ACCEPT                	83	/* 0x53 Accepts the current matched string. */
-#define	VERB                  	84	/* 0x54 Used only for the type field of verbs */
-#define	PRUNE                 	85	/* 0x55 Pattern fails at this startpoint if no-backtracking through this */
-#define	MARKPOINT             	86	/* 0x56 Push the current location for rollback by cut. */
-#define	SKIP                  	87	/* 0x57 On failure skip forward (to the mark) before retrying */
-#define	COMMIT                	88	/* 0x58 Pattern fails outright if backtracking through this */
-#define	CUTGROUP              	89	/* 0x59 On failure go to the next alternation in the group */
-#define	KEEPS                 	90	/* 0x5a $& begins here. */
-#define	LNBREAK               	91	/* 0x5b generic newline pattern */
-#define	OPTIMIZED             	92	/* 0x5c Placeholder for dump. */
-#define	PSEUDO                	93	/* 0x5d Pseudo opcode for internal use. */
+#define	NGROUPP               	77	/* 0x4d Whether the group matched. */
+#define	INSUBP                	78	/* 0x4e Whether we are in a specific recurse. */
+#define	DEFINEP               	79	/* 0x4f Never execute directly. */
+#define	ENDLIKE               	80	/* 0x50 Used only for the type field of verbs */
+#define	OPFAIL                	81	/* 0x51 Same as (?!), but with verb arg */
+#define	ACCEPT                	82	/* 0x52 Accepts the current matched string, with verbar */
+#define	VERB                  	83	/* 0x53 Used only for the type field of verbs */
+#define	PRUNE                 	84	/* 0x54 Pattern fails at this startpoint if no-backtracking through this */
+#define	MARKPOINT             	85	/* 0x55 Push the current location for rollback by cut. */
+#define	SKIP                  	86	/* 0x56 On failure skip forward (to the mark) before retrying */
+#define	COMMIT                	87	/* 0x57 Pattern fails outright if backtracking through this */
+#define	CUTGROUP              	88	/* 0x58 On failure go to the next alternation in the group */
+#define	KEEPS                 	89	/* 0x59 $& begins here. */
+#define	LNBREAK               	90	/* 0x5a generic newline pattern */
+#define	OPTIMIZED             	91	/* 0x5b Placeholder for dump. */
+#define	PSEUDO                	92	/* 0x5c Pseudo opcode for internal use. */
 	/* ------------ States ------------- */
 #define	TRIE_next             	(REGNODE_MAX + 1)	/* state for TRIE */
 #define	TRIE_next_fail        	(REGNODE_MAX + 2)	/* state for TRIE */
@@ -171,8 +170,8 @@ EXTCONST U8 PL_regkind[] = {
 	NBOUND,   	/* NBOUNDA                */
 	REG_ANY,  	/* REG_ANY                */
 	REG_ANY,  	/* SANY                   */
-	REG_ANY,  	/* CANY                   */
 	ANYOF,    	/* ANYOF                  */
+	ANYOF,    	/* ANYOFD                 */
 	ANYOF,    	/* ANYOFL                 */
 	POSIXD,   	/* POSIXD                 */
 	POSIXD,   	/* POSIXL                 */
@@ -230,7 +229,6 @@ EXTCONST U8 PL_regkind[] = {
 	TRIE,     	/* AHOCORASICK            */
 	TRIE,     	/* AHOCORASICKC           */
 	GOSUB,    	/* GOSUB                  */
-	GOSTART,  	/* GOSTART                */
 	NGROUPP,  	/* NGROUPP                */
 	INSUBP,   	/* INSUBP                 */
 	DEFINEP,  	/* DEFINEP                */
@@ -291,9 +289,10 @@ EXTCONST U8 PL_regkind[] = {
 };
 #endif
 
+#ifdef REG_COMP_C
+
 /* regarglen[] - How large is the argument part of the node (in regnodes) */
 
-#ifdef REG_COMP_C
 static const U8 regarglen[] = {
 	0,                                   	/* END          */
 	0,                                   	/* SUCCEED      */
@@ -313,8 +312,8 @@ static const U8 regarglen[] = {
 	0,                                   	/* NBOUNDA      */
 	0,                                   	/* REG_ANY      */
 	0,                                   	/* SANY         */
-	0,                                   	/* CANY         */
 	EXTRA_SIZE(struct regnode_1),        	/* ANYOF        */
+	EXTRA_SIZE(struct regnode_1),        	/* ANYOFD       */
 	EXTRA_SIZE(struct regnode_1),        	/* ANYOFL       */
 	0,                                   	/* POSIXD       */
 	0,                                   	/* POSIXL       */
@@ -372,13 +371,12 @@ static const U8 regarglen[] = {
 	EXTRA_SIZE(struct regnode_1),        	/* AHOCORASICK  */
 	EXTRA_SIZE(struct regnode_charclass),	/* AHOCORASICKC */
 	EXTRA_SIZE(struct regnode_2L),       	/* GOSUB        */
-	0,                                   	/* GOSTART      */
 	EXTRA_SIZE(struct regnode_1),        	/* NGROUPP      */
 	EXTRA_SIZE(struct regnode_1),        	/* INSUBP       */
 	EXTRA_SIZE(struct regnode_1),        	/* DEFINEP      */
 	0,                                   	/* ENDLIKE      */
-	0,                                   	/* OPFAIL       */
-	EXTRA_SIZE(struct regnode_1),        	/* ACCEPT       */
+	EXTRA_SIZE(struct regnode_1),        	/* OPFAIL       */
+	EXTRA_SIZE(struct regnode_2L),       	/* ACCEPT       */
 	EXTRA_SIZE(struct regnode_1),        	/* VERB         */
 	EXTRA_SIZE(struct regnode_1),        	/* PRUNE        */
 	EXTRA_SIZE(struct regnode_1),        	/* MARKPOINT    */
@@ -412,8 +410,8 @@ static const char reg_off_by_arg[] = {
 	0,	/* NBOUNDA      */
 	0,	/* REG_ANY      */
 	0,	/* SANY         */
-	0,	/* CANY         */
 	0,	/* ANYOF        */
+	0,	/* ANYOFD       */
 	0,	/* ANYOFL       */
 	0,	/* POSIXD       */
 	0,	/* POSIXL       */
@@ -471,7 +469,6 @@ static const char reg_off_by_arg[] = {
 	0,	/* AHOCORASICK  */
 	0,	/* AHOCORASICKC */
 	0,	/* GOSUB        */
-	0,	/* GOSTART      */
 	0,	/* NGROUPP      */
 	0,	/* INSUBP       */
 	0,	/* DEFINEP      */
@@ -492,6 +489,7 @@ static const char reg_off_by_arg[] = {
 
 #endif /* REG_COMP_C */
 
+
 /* reg_name[] - Opcode/state names in string form, for debugging */
 
 #ifndef DOINIT
@@ -516,8 +514,8 @@ EXTCONST char * const PL_reg_name[] = {
 	"NBOUNDA",               	/* 0x0f */
 	"REG_ANY",               	/* 0x10 */
 	"SANY",                  	/* 0x11 */
-	"CANY",                  	/* 0x12 */
-	"ANYOF",                 	/* 0x13 */
+	"ANYOF",                 	/* 0x12 */
+	"ANYOFD",                	/* 0x13 */
 	"ANYOFL",                	/* 0x14 */
 	"POSIXD",                	/* 0x15 */
 	"POSIXL",                	/* 0x16 */
@@ -575,23 +573,22 @@ EXTCONST char * const PL_reg_name[] = {
 	"AHOCORASICK",           	/* 0x4a */
 	"AHOCORASICKC",          	/* 0x4b */
 	"GOSUB",                 	/* 0x4c */
-	"GOSTART",               	/* 0x4d */
-	"NGROUPP",               	/* 0x4e */
-	"INSUBP",                	/* 0x4f */
-	"DEFINEP",               	/* 0x50 */
-	"ENDLIKE",               	/* 0x51 */
-	"OPFAIL",                	/* 0x52 */
-	"ACCEPT",                	/* 0x53 */
-	"VERB",                  	/* 0x54 */
-	"PRUNE",                 	/* 0x55 */
-	"MARKPOINT",             	/* 0x56 */
-	"SKIP",                  	/* 0x57 */
-	"COMMIT",                	/* 0x58 */
-	"CUTGROUP",              	/* 0x59 */
-	"KEEPS",                 	/* 0x5a */
-	"LNBREAK",               	/* 0x5b */
-	"OPTIMIZED",             	/* 0x5c */
-	"PSEUDO",                	/* 0x5d */
+	"NGROUPP",               	/* 0x4d */
+	"INSUBP",                	/* 0x4e */
+	"DEFINEP",               	/* 0x4f */
+	"ENDLIKE",               	/* 0x50 */
+	"OPFAIL",                	/* 0x51 */
+	"ACCEPT",                	/* 0x52 */
+	"VERB",                  	/* 0x53 */
+	"PRUNE",                 	/* 0x54 */
+	"MARKPOINT",             	/* 0x55 */
+	"SKIP",                  	/* 0x56 */
+	"COMMIT",                	/* 0x57 */
+	"CUTGROUP",              	/* 0x58 */
+	"KEEPS",                 	/* 0x59 */
+	"LNBREAK",               	/* 0x5a */
+	"OPTIMIZED",             	/* 0x5b */
+	"PSEUDO",                	/* 0x5c */
 	/* ------------ States ------------- */
 	"TRIE_next",             	/* REGNODE_MAX +0x01 */
 	"TRIE_next_fail",        	/* REGNODE_MAX +0x02 */
@@ -695,12 +692,12 @@ EXTCONST char * const PL_reg_intflags_name[] = {
 	"CUTGROUP_SEEN",              /* 0x00000010 - PREGf_CUTGROUP_SEEN */
 	"USE_RE_EVAL",                /* 0x00000020 - PREGf_USE_RE_EVAL -  compiled with "use re 'eval'"  */
 	"NOSCAN",                     /* 0x00000040 - PREGf_NOSCAN */
-	"CANY_SEEN",                  /* 0x00000080 - PREGf_CANY_SEEN */
 	"GPOS_SEEN",                  /* 0x00000100 - PREGf_GPOS_SEEN */
 	"GPOS_FLOAT",                 /* 0x00000200 - PREGf_GPOS_FLOAT */
 	"ANCH_MBOL",                  /* 0x00000400 - PREGf_ANCH_MBOL */
 	"ANCH_SBOL",                  /* 0x00000800 - PREGf_ANCH_SBOL */
 	"ANCH_GPOS",                  /* 0x00001000 - PREGf_ANCH_GPOS */
+	"RECURSE_SEEN",               /* 0x00002000 - PREGf_RECURSE_SEEN */
 };
 #endif /* DOINIT */
 
@@ -738,7 +735,7 @@ EXTCONST U8 PL_varies_bitmask[] = {
 EXTCONST U8 PL_simple[] __attribute__deprecated__;
 #else
 EXTCONST U8 PL_simple[] __attribute__deprecated__ = {
-    REG_ANY, SANY, CANY, ANYOF, ANYOFL, POSIXD, POSIXL, POSIXU, POSIXA,
+    REG_ANY, SANY, ANYOF, ANYOFD, ANYOFL, POSIXD, POSIXL, POSIXU, POSIXA,
     NPOSIXD, NPOSIXL, NPOSIXU, NPOSIXA,
     0
 };
diff --git a/Master/tlpkg/tlperl/lib/CORE/scope.h b/Master/tlpkg/tlperl/lib/CORE/scope.h
index 97ef3faa913..9a504f1bfd8 100644
--- a/Master/tlpkg/tlperl/lib/CORE/scope.h
+++ b/Master/tlpkg/tlperl/lib/CORE/scope.h
@@ -21,7 +21,7 @@
 
 /* one arg */
 
-#define SAVEt_GP_ALIASED_SV	4
+#define SAVEt_TMPSFLOOR		4
 #define SAVEt_BOOL		5
 #define SAVEt_COMPILE_WARNINGS	6
 #define SAVEt_COMPPAD		7
@@ -100,8 +100,8 @@
  * macros */
 #define SS_MAXPUSH 4
 
-#define SSCHECK(need) if (UNLIKELY(PL_savestack_ix + (I32)(need) + SS_MAXPUSH > PL_savestack_max)) savestack_grow()
-#define SSGROW(need) if (UNLIKELY(PL_savestack_ix + (I32)(need) + SS_MAXPUSH > PL_savestack_max)) savestack_grow_cnt(need + SS_MAXPUSH)
+#define SSCHECK(need) if (UNLIKELY(PL_savestack_ix + (I32)(need) > PL_savestack_max)) savestack_grow()
+#define SSGROW(need) if (UNLIKELY(PL_savestack_ix + (I32)(need) > PL_savestack_max)) savestack_grow_cnt(need)
 #define SSPUSHINT(i) (PL_savestack[PL_savestack_ix++].any_i32 = (I32)(i))
 #define SSPUSHLONG(i) (PL_savestack[PL_savestack_ix++].any_long = (long)(i))
 #define SSPUSHBOOL(p) (PL_savestack[PL_savestack_ix++].any_bool = (p))
@@ -119,7 +119,9 @@
  * of the grow() can be done. These changes reduce the code of something
  * like save_pushptrptr() to half its former size.
  * Of course, doing the size check *after* pushing means we must always
- * ensure there are SS_MAXPUSH free slots on the savestack
+ * ensure there are SS_MAXPUSH free slots on the savestack. This ensured
+ * bt savestack_grow() and savestack_grow_cnt always allocating SS_MAXPUSH
+ * slots more than asked for, or that it sets PL_savestack_max to
  *
  * These are for internal core use only and are subject to change */
 
@@ -131,9 +133,9 @@
     assert((need) <= SS_MAXPUSH);                               \
     ix += (need);                                               \
     PL_savestack_ix = ix;                                       \
-    assert(ix <= PL_savestack_max);                             \
-    if (UNLIKELY((ix + SS_MAXPUSH) > PL_savestack_max)) savestack_grow(); \
-    assert(PL_savestack_ix + SS_MAXPUSH <= PL_savestack_max);
+    assert(ix <= PL_savestack_max + SS_MAXPUSH);                \
+    if (UNLIKELY(ix > PL_savestack_max)) savestack_grow();      \
+    assert(PL_savestack_ix <= PL_savestack_max);
 
 #define SS_ADD_INT(i)   ((ssp++)->any_i32 = (I32)(i))
 #define SS_ADD_LONG(i)  ((ssp++)->any_long = (long)(i))
@@ -158,18 +160,18 @@
 =head1 Callback Functions
 
 =for apidoc Ams||SAVETMPS
-Opening bracket for temporaries on a callback.  See C<FREETMPS> and
+Opening bracket for temporaries on a callback.  See C<L</FREETMPS>> and
 L<perlcall>.
 
 =for apidoc Ams||FREETMPS
-Closing bracket for temporaries on a callback.  See C<SAVETMPS> and
+Closing bracket for temporaries on a callback.  See C<L</SAVETMPS>> and
 L<perlcall>.
 
 =for apidoc Ams||ENTER
-Opening bracket on a callback.  See C<LEAVE> and L<perlcall>.
+Opening bracket on a callback.  See C<L</LEAVE>> and L<perlcall>.
 
 =for apidoc Ams||LEAVE
-Closing bracket on a callback.  See C<ENTER> and L<perlcall>.
+Closing bracket on a callback.  See C<L</ENTER>> and L<perlcall>.
 
 =over
 
@@ -181,15 +183,15 @@ given literal string with the new scope.
 =item LEAVE_with_name(name)
 
 Same as C<LEAVE>, but when debugging is enabled it first checks that the
-scope has the given name. Name must be a literal string.
+scope has the given name. C<name> must be a C<NUL>-terminated literal string.
 
 =back
 
 =cut
 */
 
-#define SAVETMPS Perl_save_strlen(aTHX_ (STRLEN *)&PL_tmps_floor), \
-		 PL_tmps_floor = PL_tmps_ix
+#define SAVETMPS Perl_savetmps(aTHX)
+
 #define FREETMPS if (PL_tmps_ix > PL_tmps_floor) free_tmps()
 
 #ifdef DEBUGGING
@@ -308,7 +310,7 @@ scope has the given name. Name must be a literal string.
 #define SAVECOPLINE(c)		SAVEI32(CopLINE(c))
 
 /* SSNEW() temporarily allocates a specified number of bytes of data on the
- * savestack.  It returns an integer index into the savestack, because a
+ * savestack.  It returns an I32 index into the savestack, because a
  * pointer would get broken if the savestack is moved on reallocation.
  * SSNEWa() works like SSNEW(), but also aligns the data to the specified
  * number of bytes.  MEM_ALIGNBYTES is perhaps the most useful.  The
diff --git a/Master/tlpkg/tlperl/lib/CORE/sv.h b/Master/tlpkg/tlperl/lib/CORE/sv.h
index 665c330fe6e..bfda6bf6cb1 100644
--- a/Master/tlpkg/tlperl/lib/CORE/sv.h
+++ b/Master/tlpkg/tlperl/lib/CORE/sv.h
@@ -16,7 +16,7 @@
 =head1 SV Flags
 
 =for apidoc AmU||svtype
-An enum of flags for Perl types.  These are found in the file B<sv.h>
+An enum of flags for Perl types.  These are found in the file F<sv.h>
 in the C<svtype> enum.  Test these flags with the C<SvTYPE> macro.
 
 The types are:
@@ -41,8 +41,8 @@ The types are:
 
 These are most easily explained from the bottom up.
 
-SVt_PVIO is for I/O objects, SVt_PVFM for formats, SVt_PVCV for
-subroutines, SVt_PVHV for hashes and SVt_PVAV for arrays.
+C<SVt_PVIO> is for I/O objects, C<SVt_PVFM> for formats, C<SVt_PVCV> for
+subroutines, C<SVt_PVHV> for hashes and C<SVt_PVAV> for arrays.
 
 All the others are scalar types, that is, things that can be bound to a
 C<$> variable.  For these, the internal types are mostly orthogonal to
@@ -51,25 +51,25 @@ types in the Perl language.
 Hence, checking C<< SvTYPE(sv) < SVt_PVAV >> is the best way to see whether
 something is a scalar.
 
-SVt_PVGV represents a typeglob.  If !SvFAKE(sv), then it is a real,
-incoercible typeglob.  If SvFAKE(sv), then it is a scalar to which a
+C<SVt_PVGV> represents a typeglob.  If C<!SvFAKE(sv)>, then it is a real,
+incoercible typeglob.  If C<SvFAKE(sv)>, then it is a scalar to which a
 typeglob has been assigned.  Assigning to it again will stop it from being
-a typeglob.  SVt_PVLV represents a scalar that delegates to another scalar
+a typeglob.  C<SVt_PVLV> represents a scalar that delegates to another scalar
 behind the scenes.  It is used, e.g., for the return value of C<substr> and
 for tied hash and array elements.  It can hold any scalar value, including
-a typeglob.  SVt_REGEXP is for regular
-expressions.  SVt_INVLIST is for Perl
+a typeglob.  C<SVt_REGEXP> is for regular
+expressions.  C<SVt_INVLIST> is for Perl
 core internal use only.
 
-SVt_PVMG represents a "normal" scalar (not a typeglob, regular expression,
+C<SVt_PVMG> represents a "normal" scalar (not a typeglob, regular expression,
 or delegate).  Since most scalars do not need all the internal fields of a
 PVMG, we save memory by allocating smaller structs when possible.  All the
-other types are just simpler forms of SVt_PVMG, with fewer internal fields.
- SVt_NULL can only hold undef.  SVt_IV can hold undef, an integer, or a
-reference.  (SVt_RV is an alias for SVt_IV, which exists for backward
-compatibility.)  SVt_NV can hold any of those or a double.  SVt_PV can only
-hold undef or a string.  SVt_PVIV is a superset of SVt_PV and SVt_IV.
-SVt_PVNV is similar.  SVt_PVMG can hold anything SVt_PVNV can hold, but it
+other types are just simpler forms of C<SVt_PVMG>, with fewer internal fields.
+C<SVt_NULL> can only hold undef.  C<SVt_IV> can hold undef, an integer, or a
+reference.  (C<SVt_RV> is an alias for C<SVt_IV>, which exists for backward
+compatibility.)  C<SVt_NV> can hold any of those or a double.  C<SVt_PV> can only
+hold C<undef> or a string.  C<SVt_PVIV> is a superset of C<SVt_PV> and C<SVt_IV>.
+C<SVt_PVNV> is similar.  C<SVt_PVMG> can hold anything C<SVt_PVNV> can hold, but it
 can, but does not have to, be blessed or magical.
 
 =for apidoc AmU||SVt_NULL
@@ -212,20 +212,24 @@ typedef struct hek HEK;
 	HE**	svu_hash;		\
 	GP*	svu_gp;			\
 	PerlIO *svu_fp;			\
-    }	sv_u
+    }	sv_u				\
+    _SV_HEAD_DEBUG
 
+#ifdef DEBUG_LEAKING_SCALARS
+#define _SV_HEAD_DEBUG ;\
+    PERL_BITFIELD32 sv_debug_optype:9;	/* the type of OP that allocated us */ \
+    PERL_BITFIELD32 sv_debug_inpad:1;	/* was allocated in a pad for an OP */ \
+    PERL_BITFIELD32 sv_debug_line:16;	/* the line where we were allocated */ \
+    UV		    sv_debug_serial;	/* serial number of sv allocation   */ \
+    char *	    sv_debug_file;	/* the file where we were allocated */ \
+    SV *	    sv_debug_parent	/* what we were cloned from (ithreads)*/
+#else
+#define _SV_HEAD_DEBUG
+#endif
 
 struct STRUCT_SV {		/* struct sv { */
     _SV_HEAD(void*);
     _SV_HEAD_UNION;
-#ifdef DEBUG_LEAKING_SCALARS
-    PERL_BITFIELD32 sv_debug_optype:9;	/* the type of OP that allocated us */
-    PERL_BITFIELD32 sv_debug_inpad:1;	/* was allocated in a pad for an OP */
-    PERL_BITFIELD32 sv_debug_line:16;	/* the line where we were allocated */
-    UV		    sv_debug_serial;	/* serial number of sv allocation   */
-    char *	    sv_debug_file;	/* the file where we were allocated */
-    SV *	    sv_debug_parent;	/* what we were cloned from (ithreads)*/
-#endif
 };
 
 struct gv {
@@ -270,57 +274,57 @@ Returns the value of the object's reference count.
 =for apidoc Am|SV*|SvREFCNT_inc|SV* sv
 Increments the reference count of the given SV, returning the SV.
 
-All of the following SvREFCNT_inc* macros are optimized versions of
-SvREFCNT_inc, and can be replaced with SvREFCNT_inc.
+All of the following C<SvREFCNT_inc>* macros are optimized versions of
+C<SvREFCNT_inc>, and can be replaced with C<SvREFCNT_inc>.
 
 =for apidoc Am|SV*|SvREFCNT_inc_NN|SV* sv
-Same as SvREFCNT_inc, but can only be used if you know I<sv>
-is not NULL.  Since we don't have to check the NULLness, it's faster
+Same as C<SvREFCNT_inc>, but can only be used if you know C<sv>
+is not C<NULL>.  Since we don't have to check the NULLness, it's faster
 and smaller.
 
 =for apidoc Am|void|SvREFCNT_inc_void|SV* sv
-Same as SvREFCNT_inc, but can only be used if you don't need the
+Same as C<SvREFCNT_inc>, but can only be used if you don't need the
 return value.  The macro doesn't need to return a meaningful value.
 
 =for apidoc Am|void|SvREFCNT_inc_void_NN|SV* sv
-Same as SvREFCNT_inc, but can only be used if you don't need the return
-value, and you know that I<sv> is not NULL.  The macro doesn't need
+Same as C<SvREFCNT_inc>, but can only be used if you don't need the return
+value, and you know that C<sv> is not C<NULL>.  The macro doesn't need
 to return a meaningful value, or check for NULLness, so it's smaller
 and faster.
 
 =for apidoc Am|SV*|SvREFCNT_inc_simple|SV* sv
-Same as SvREFCNT_inc, but can only be used with expressions without side
+Same as C<SvREFCNT_inc>, but can only be used with expressions without side
 effects.  Since we don't have to store a temporary value, it's faster.
 
 =for apidoc Am|SV*|SvREFCNT_inc_simple_NN|SV* sv
-Same as SvREFCNT_inc_simple, but can only be used if you know I<sv>
-is not NULL.  Since we don't have to check the NULLness, it's faster
+Same as C<SvREFCNT_inc_simple>, but can only be used if you know C<sv>
+is not C<NULL>.  Since we don't have to check the NULLness, it's faster
 and smaller.
 
 =for apidoc Am|void|SvREFCNT_inc_simple_void|SV* sv
-Same as SvREFCNT_inc_simple, but can only be used if you don't need the
+Same as C<SvREFCNT_inc_simple>, but can only be used if you don't need the
 return value.  The macro doesn't need to return a meaningful value.
 
 =for apidoc Am|void|SvREFCNT_inc_simple_void_NN|SV* sv
-Same as SvREFCNT_inc, but can only be used if you don't need the return
-value, and you know that I<sv> is not NULL.  The macro doesn't need
+Same as C<SvREFCNT_inc>, but can only be used if you don't need the return
+value, and you know that C<sv> is not C<NULL>.  The macro doesn't need
 to return a meaningful value, or check for NULLness, so it's smaller
 and faster.
 
 =for apidoc Am|void|SvREFCNT_dec|SV* sv
-Decrements the reference count of the given SV.  I<sv> may be NULL.
+Decrements the reference count of the given SV.  C<sv> may be C<NULL>.
 
 =for apidoc Am|void|SvREFCNT_dec_NN|SV* sv
-Same as SvREFCNT_dec, but can only be used if you know I<sv>
-is not NULL.  Since we don't have to check the NULLness, it's faster
+Same as C<SvREFCNT_dec>, but can only be used if you know C<sv>
+is not C<NULL>.  Since we don't have to check the NULLness, it's faster
 and smaller.
 
 =for apidoc Am|svtype|SvTYPE|SV* sv
-Returns the type of the SV.  See C<svtype>.
+Returns the type of the SV.  See C<L</svtype>>.
 
 =for apidoc Am|void|SvUPGRADE|SV* sv|svtype type
 Used to upgrade an SV to a more complex form.  Uses C<sv_upgrade> to
-perform the upgrade if necessary.  See C<svtype>.
+perform the upgrade if necessary.  See C<L</svtype>>.
 
 =cut
 */
@@ -365,6 +369,7 @@ perform the upgrade if necessary.  See C<svtype>.
 #define SVp_NOK		0x00002000  /* has valid non-public numeric value */
 #define SVp_POK		0x00004000  /* has valid non-public pointer value */
 #define SVp_SCREAM	0x00008000  /* method name is DOES */
+                                    /* eval cx text is ref counted */
 #define SVphv_CLONEABLE	SVp_SCREAM  /* PVHV (stashes) clone its objects */
 #define SVpgv_GP	SVp_SCREAM  /* GV has a valid GP */
 #define SVprv_PCS_IMPORTED  SVp_SCREAM  /* RV is a proxy for a constant
@@ -394,7 +399,9 @@ perform the upgrade if necessary.  See C<svtype>.
 #define SVf_BREAK	0x04000000  /* refcnt is artificially low - used by
 				       SVs in final arena cleanup.
 				       Set in S_regtry on PL_reg_curpm, so that
-				       perl_destruct will skip it. */
+				       perl_destruct will skip it.
+                                       Used for mark and sweep by OP_AASSIGN
+                                       */
 #define SVf_READONLY	0x08000000  /* may not be modified */
 
 
@@ -460,7 +467,7 @@ perform the upgrade if necessary.  See C<svtype>.
 /* PVHV */
 #define SVphv_HASKFLAGS	0x80000000  /* keys have flag byte after hash */
 /* PVGV when SVpbm_VALID is true */
-#define SVpbm_TAIL	0x80000000
+#define SVpbm_TAIL	0x80000000  /* string has a fake "\n" appended */
 /* RV upwards. However, SVf_ROK and SVp_IOK are exclusive  */
 #define SVprv_WEAKREF   0x80000000  /* Weak reference */
 /* pad name vars only */
@@ -684,20 +691,20 @@ Tells an SV that it is an integer.
 Unsets the IV status of an SV.
 
 =for apidoc Am|void|SvIOK_only|SV* sv
-Tells an SV that it is an integer and disables all other OK bits.
+Tells an SV that it is an integer and disables all other C<OK> bits.
 
 =for apidoc Am|void|SvIOK_only_UV|SV* sv
-Tells an SV that it is an unsigned integer and disables all other OK bits.
+Tells an SV that it is an unsigned integer and disables all other C<OK> bits.
 
 =for apidoc Am|bool|SvIOK_UV|SV* sv
 Returns a boolean indicating whether the SV contains an integer that must be
 interpreted as unsigned.  A non-negative integer whose value is within the
-range of both an IV and a UV may be be flagged as either SvUOK or SVIOK.
+range of both an IV and a UV may be be flagged as either C<SvUOK> or C<SVIOK>.
 
 =for apidoc Am|bool|SvUOK|SV* sv
 Returns a boolean indicating whether the SV contains an integer that must be
 interpreted as unsigned.  A non-negative integer whose value is within the
-range of both an IV and a UV may be be flagged as either SvUOK or SVIOK.
+range of both an IV and a UV may be be flagged as either C<SvUOK> or C<SVIOK>.
 
 =for apidoc Am|bool|SvIOK_notUV|SV* sv
 Returns a boolean indicating whether the SV contains a signed integer.
@@ -725,7 +732,7 @@ Tells an SV that it is a string.
 Unsets the PV status of an SV.
 
 =for apidoc Am|void|SvPOK_only|SV* sv
-Tells an SV that it is a string and disables all other OK bits.
+Tells an SV that it is a string and disables all other C<OK> bits.
 Will also turn off the UTF-8 status.
 
 =for apidoc Am|bool|SvVOK|SV* sv
@@ -734,9 +741,9 @@ Returns a boolean indicating whether the SV contains a v-string.
 =for apidoc Am|U32|SvOOK|SV* sv
 Returns a U32 indicating whether the pointer to the string buffer is offset.
 This hack is used internally to speed up removal of characters from the
-beginning of a SvPV.  When SvOOK is true, then the start of the
-allocated string buffer is actually C<SvOOK_offset()> bytes before SvPVX.
-This offset used to be stored in SvIVX, but is now stored within the spare
+beginning of a C<SvPV>.  When C<SvOOK> is true, then the start of the
+allocated string buffer is actually C<SvOOK_offset()> bytes before C<SvPVX>.
+This offset used to be stored in C<SvIVX>, but is now stored within the spare
 part of the buffer.
 
 =for apidoc Am|U32|SvROK|SV* sv
@@ -753,37 +760,37 @@ Dereferences an RV to return the SV.
 
 =for apidoc Am|IV|SvIVX|SV* sv
 Returns the raw value in the SV's IV slot, without checks or conversions.
-Only use when you are sure SvIOK is true.  See also C<SvIV()>.
+Only use when you are sure C<SvIOK> is true.  See also C<L</SvIV>>.
 
 =for apidoc Am|UV|SvUVX|SV* sv
 Returns the raw value in the SV's UV slot, without checks or conversions.
-Only use when you are sure SvIOK is true.  See also C<SvUV()>.
+Only use when you are sure C<SvIOK> is true.  See also C<L</SvUV>>.
 
 =for apidoc Am|NV|SvNVX|SV* sv
 Returns the raw value in the SV's NV slot, without checks or conversions.
-Only use when you are sure SvNOK is true.  See also C<SvNV()>.
+Only use when you are sure C<SvNOK> is true.  See also C<L</SvNV>>.
 
 =for apidoc Am|char*|SvPVX|SV* sv
 Returns a pointer to the physical string in the SV.  The SV must contain a
 string.  Prior to 5.9.3 it is not safe
 to execute this macro unless the SV's
-type >= SVt_PV.
+type >= C<SVt_PV>.
 
 This is also used to store the name of an autoloaded subroutine in an XS
 AUTOLOAD routine.  See L<perlguts/Autoloading with XSUBs>.
 
 =for apidoc Am|STRLEN|SvCUR|SV* sv
-Returns the length of the string which is in the SV.  See C<SvLEN>.
+Returns the length of the string which is in the SV.  See C<L</SvLEN>>.
 
 =for apidoc Am|STRLEN|SvLEN|SV* sv
 Returns the size of the string buffer in the SV, not including any part
-attributable to C<SvOOK>.  See C<SvCUR>.
+attributable to C<SvOOK>.  See C<L</SvCUR>>.
 
 =for apidoc Am|char*|SvEND|SV* sv
 Returns a pointer to the spot just after the last character in
 the string which is in the SV, where there is usually a trailing
 C<NUL> character (even though Perl scalars do not strictly require it).
-See C<SvCUR>.  Access the character as *(SvEND(sv)).
+See C<L</SvCUR>>.  Access the character as C<*(SvEND(sv))>.
 
 Warning: If C<SvCUR> is equal to C<SvLEN>, then C<SvEND> points to
 unallocated memory.
@@ -798,40 +805,40 @@ With future Perls, however, it will be more efficient to use
 C<SvIV_set> instead of the lvalue assignment to C<SvIVX>.
 
 =for apidoc Am|void|SvNV_set|SV* sv|NV val
-Set the value of the NV pointer in sv to val.  See C<SvIV_set>.
+Set the value of the NV pointer in C<sv> to val.  See C<L</SvIV_set>>.
 
 =for apidoc Am|void|SvPV_set|SV* sv|char* val
 This is probably not what you want to use, you probably wanted
 L</sv_usepvn_flags> or L</sv_setpvn> or L</sv_setpvs>.
 
 Set the value of the PV pointer in C<sv> to the Perl allocated
-C<NUL>-terminated string C<val>.  See also C<SvIV_set>.
+C<NUL>-terminated string C<val>.  See also C<L</SvIV_set>>.
 
 Remember to free the previous PV buffer. There are many things to check.
 Beware that the existing pointer may be involved in copy-on-write or other
 mischief, so do C<SvOOK_off(sv)> and use C<sv_force_normal> or
-C<SvPV_force> (or check the SvIsCOW flag) first to make sure this
+C<SvPV_force> (or check the C<SvIsCOW> flag) first to make sure this
 modification is safe. Then finally, if it is not a COW, call C<SvPV_free> to
 free the previous PV buffer.
 
 =for apidoc Am|void|SvUV_set|SV* sv|UV val
-Set the value of the UV pointer in sv to val.  See C<SvIV_set>.
+Set the value of the UV pointer in C<sv> to val.  See C<L</SvIV_set>>.
 
 =for apidoc Am|void|SvRV_set|SV* sv|SV* val
-Set the value of the RV pointer in sv to val.  See C<SvIV_set>.
+Set the value of the RV pointer in C<sv> to val.  See C<L</SvIV_set>>.
 
 =for apidoc Am|void|SvMAGIC_set|SV* sv|MAGIC* val
-Set the value of the MAGIC pointer in sv to val.  See C<SvIV_set>.
+Set the value of the MAGIC pointer in C<sv> to val.  See C<L</SvIV_set>>.
 
 =for apidoc Am|void|SvSTASH_set|SV* sv|HV* val
-Set the value of the STASH pointer in sv to val.  See C<SvIV_set>.
+Set the value of the STASH pointer in C<sv> to val.  See C<L</SvIV_set>>.
 
 =for apidoc Am|void|SvCUR_set|SV* sv|STRLEN len
-Set the current length of the string which is in the SV.  See C<SvCUR>
-and C<SvIV_set>.
+Set the current length of the string which is in the SV.  See C<L</SvCUR>>
+and C<SvIV_set>>.
 
 =for apidoc Am|void|SvLEN_set|SV* sv|STRLEN len
-Set the actual length of the string which is in the SV.  See C<SvIV_set>.
+Set the size of the string buffer for the SV. See C<L</SvLEN>>.
 
 =cut
 */
@@ -856,7 +863,7 @@ Set the actual length of the string which is in the SV.  See C<SvIV_set>.
 
 #define SvOKp(sv)		(SvFLAGS(sv) & (SVp_IOK|SVp_NOK|SVp_POK))
 #define SvIOKp(sv)		(SvFLAGS(sv) & SVp_IOK)
-#define SvIOKp_on(sv)		(assert_not_glob(sv) SvRELEASE_IVX_(sv)	\
+#define SvIOKp_on(sv)		(assert_not_glob(sv)	\
 				    SvFLAGS(sv) |= SVp_IOK)
 #define SvNOKp(sv)		(SvFLAGS(sv) & SVp_NOK)
 #define SvNOKp_on(sv)		(assert_not_glob(sv) SvFLAGS(sv) |= SVp_NOK)
@@ -865,7 +872,7 @@ Set the actual length of the string which is in the SV.  See C<SvIV_set>.
 				 SvFLAGS(sv) |= SVp_POK)
 
 #define SvIOK(sv)		(SvFLAGS(sv) & SVf_IOK)
-#define SvIOK_on(sv)		(assert_not_glob(sv) SvRELEASE_IVX_(sv)	\
+#define SvIOK_on(sv)		(assert_not_glob(sv)	\
 				    SvFLAGS(sv) |= (SVf_IOK|SVp_IOK))
 #define SvIOK_off(sv)		(SvFLAGS(sv) &= ~(SVf_IOK|SVp_IOK|SVf_IVisUV))
 #define SvIOK_only(sv)		(SvOK_off(sv), \
@@ -894,7 +901,7 @@ Set the actual length of the string which is in the SV.  See C<SvIV_set>.
 =for apidoc Am|U32|SvUTF8|SV* sv
 Returns a U32 value indicating the UTF-8 status of an SV.  If things are set-up
 properly, this indicates whether or not the SV contains UTF-8 encoded data.
-You should use this I<after> a call to SvPV() or one of its variants, in
+You should use this I<after> a call to C<SvPV()> or one of its variants, in
 case any call to string overloading updates the internal flag.
 
 If you want to take into account the L<bytes> pragma, use C<L</DO_UTF8>>
@@ -909,7 +916,7 @@ Unsets the UTF-8 status of an SV (the data is not changed, just the flag).
 Do not use frivolously.
 
 =for apidoc Am|void|SvPOK_only_UTF8|SV* sv
-Tells an SV that it is a string and disables all other OK bits,
+Tells an SV that it is a string and disables all other C<OK> bits,
 and leaves the UTF-8 status as it was.
 
 =cut
@@ -942,7 +949,7 @@ in gv.h: */
 
 #define SvOOK(sv)		(SvFLAGS(sv) & SVf_OOK)
 #define SvOOK_on(sv)		(SvFLAGS(sv) |= SVf_OOK)
-#define SvOOK_off(sv)		((void)(SvOOK(sv) && sv_backoff(sv)))
+#define SvOOK_off(sv)		((void)(SvOOK(sv) && (sv_backoff(sv),0)))
 
 #define SvFAKE(sv)		(SvFLAGS(sv) & SVf_FAKE)
 #define SvFAKE_on(sv)		(SvFLAGS(sv) |= SVf_FAKE)
@@ -1037,14 +1044,14 @@ the scalar's value cannot change unless written to.
 /*
 =for apidoc m|U32|SvTHINKFIRST|SV *sv
 
-A quick flag check to see whether an sv should be passed to sv_force_normal
-to be "downgraded" before SvIVX or SvPVX can be modified directly.
+A quick flag check to see whether an C<sv> should be passed to C<sv_force_normal>
+to be "downgraded" before C<SvIVX> or C<SvPVX> can be modified directly.
 
-For example, if your scalar is a reference and you want to modify the SvIVX
-slot, you can't just do SvROK_off, as that will leak the referent.
+For example, if your scalar is a reference and you want to modify the C<SvIVX>
+slot, you can't just do C<SvROK_off>, as that will leak the referent.
 
 This is used internally by various sv-modifying functions, such as
-sv_setsv, sv_setiv and sv_pvn_force.
+C<sv_setsv>, C<sv_setiv> and C<sv_pvn_force>.
 
 One case that this does not handle is a gv without SvFAKE set.  After
 
@@ -1052,8 +1059,8 @@ One case that this does not handle is a gv without SvFAKE set.  After
 
 it will still be a gv.
 
-SvTHINKFIRST sometimes produces false positives.  In those cases
-sv_force_normal does nothing.
+C<SvTHINKFIRST> sometimes produces false positives.  In those cases
+C<sv_force_normal> does nothing.
 
 =cut
 */
@@ -1466,10 +1473,9 @@ attention to precisely which outputs are influenced by which inputs.
 
 #define SvTAINT(sv)			\
     STMT_START {			\
-	if (UNLIKELY(TAINTING_get)) {	\
-	    if (UNLIKELY(TAINT_get))	\
-		SvTAINTED_on(sv);	\
-	}				\
+        assert(TAINTING_get || !TAINT_get); \
+        if (UNLIKELY(TAINT_get))	\
+            SvTAINTED_on(sv);	        \
     } STMT_END
 
 /*
@@ -1492,17 +1498,17 @@ Returns a pointer to the string in the SV, or a stringified form of
 the SV if the SV does not contain a string.  The SV may cache the
 stringified version becoming C<SvPOK>.  Handles 'get' magic.  The
 C<len> variable will be set to the length of the string (this is a macro, so
-don't use C<&len>).  See also C<SvPVx> for a version which guarantees to
-evaluate sv only once.
+don't use C<&len>).  See also C<L</SvPVx>> for a version which guarantees to
+evaluate C<sv> only once.
 
 Note that there is no guarantee that the return value of C<SvPV()> is
 equal to C<SvPVX(sv)>, or that C<SvPVX(sv)> contains valid data, or that
 successive calls to C<SvPV(sv)> will return the same pointer value each
 time.  This is due to the way that things like overloading and
 Copy-On-Write are handled.  In these cases, the return value may point to
-a temporary buffer or similar.  If you absolutely need the SvPVX field to
+a temporary buffer or similar.  If you absolutely need the C<SvPVX> field to
 be valid (for example, if you intend to write to it), then see
-L</SvPV_force>.
+C<L</SvPV_force>>.
 
 =for apidoc Am|char*|SvPVx|SV* sv|STRLEN len
 A version of C<SvPV> which guarantees to evaluate C<sv> only once.
@@ -1519,8 +1525,8 @@ Like C<SvPV> but doesn't set a length variable.
 Like C<SvPV_nolen> but doesn't process magic.
 
 =for apidoc Am|IV|SvIV|SV* sv
-Coerces the given SV to an integer and returns it.  See C<SvIVx> for a
-version which guarantees to evaluate sv only once.
+Coerces the given SV to an integer and returns it.  See C<L</SvIVx>> for a
+version which guarantees to evaluate C<sv> only once.
 
 =for apidoc Am|IV|SvIV_nomg|SV* sv
 Like C<SvIV> but doesn't process magic.
@@ -1532,8 +1538,8 @@ this if C<sv> is an expression with side effects,
 otherwise use the more efficient C<SvIV>.
 
 =for apidoc Am|NV|SvNV|SV* sv
-Coerce the given SV to a double and return it.  See C<SvNVx> for a version
-which guarantees to evaluate sv only once.
+Coerce the given SV to a double and return it.  See C<L</SvNVx>> for a version
+which guarantees to evaluate C<sv> only once.
 
 =for apidoc Am|NV|SvNV_nomg|SV* sv
 Like C<SvNV> but doesn't process magic.
@@ -1545,8 +1551,8 @@ this if C<sv> is an expression with side effects,
 otherwise use the more efficient C<SvNV>.
 
 =for apidoc Am|UV|SvUV|SV* sv
-Coerces the given SV to an unsigned integer and returns it.  See C<SvUVx>
-for a version which guarantees to evaluate sv only once.
+Coerces the given SV to an unsigned integer and returns it.  See C<L</SvUVx>>
+for a version which guarantees to evaluate C<sv> only once.
 
 =for apidoc Am|UV|SvUV_nomg|SV* sv
 Like C<SvUV> but doesn't process magic.
@@ -1559,50 +1565,50 @@ otherwise use the more efficient C<SvUV>.
 
 =for apidoc Am|bool|SvTRUE|SV* sv
 Returns a boolean indicating whether Perl would evaluate the SV as true or
-false.  See SvOK() for a defined/undefined test.  Handles 'get' magic
-unless the scalar is already SvPOK, SvIOK or SvNOK (the public, not the
+false.  See C<L</SvOK>> for a defined/undefined test.  Handles 'get' magic
+unless the scalar is already C<SvPOK>, C<SvIOK> or C<SvNOK> (the public, not the
 private flags).
 
 =for apidoc Am|bool|SvTRUE_nomg|SV* sv
 Returns a boolean indicating whether Perl would evaluate the SV as true or
-false.  See SvOK() for a defined/undefined test.  Does not handle 'get' magic.
+false.  See C<L</SvOK>> for a defined/undefined test.  Does not handle 'get' magic.
 
 =for apidoc Am|char*|SvPVutf8_force|SV* sv|STRLEN len
-Like C<SvPV_force>, but converts sv to utf8 first if necessary.
+Like C<SvPV_force>, but converts C<sv> to UTF-8 first if necessary.
 
 =for apidoc Am|char*|SvPVutf8|SV* sv|STRLEN len
-Like C<SvPV>, but converts sv to utf8 first if necessary.
+Like C<SvPV>, but converts C<sv> to UTF-8 first if necessary.
 
 =for apidoc Am|char*|SvPVutf8_nolen|SV* sv
-Like C<SvPV_nolen>, but converts sv to utf8 first if necessary.
+Like C<SvPV_nolen>, but converts C<sv> to UTF-8 first if necessary.
 
 =for apidoc Am|char*|SvPVbyte_force|SV* sv|STRLEN len
-Like C<SvPV_force>, but converts sv to byte representation first if necessary.
+Like C<SvPV_force>, but converts C<sv> to byte representation first if necessary.
 
 =for apidoc Am|char*|SvPVbyte|SV* sv|STRLEN len
-Like C<SvPV>, but converts sv to byte representation first if necessary.
+Like C<SvPV>, but converts C<sv> to byte representation first if necessary.
 
 =for apidoc Am|char*|SvPVbyte_nolen|SV* sv
-Like C<SvPV_nolen>, but converts sv to byte representation first if necessary.
+Like C<SvPV_nolen>, but converts C<sv> to byte representation first if necessary.
 
 =for apidoc Am|char*|SvPVutf8x_force|SV* sv|STRLEN len
-Like C<SvPV_force>, but converts sv to utf8 first if necessary.
-Guarantees to evaluate sv only once; use the more efficient C<SvPVutf8_force>
+Like C<SvPV_force>, but converts C<sv> to UTF-8 first if necessary.
+Guarantees to evaluate C<sv> only once; use the more efficient C<SvPVutf8_force>
 otherwise.
 
 =for apidoc Am|char*|SvPVutf8x|SV* sv|STRLEN len
-Like C<SvPV>, but converts sv to utf8 first if necessary.
-Guarantees to evaluate sv only once; use the more efficient C<SvPVutf8>
+Like C<SvPV>, but converts C<sv> to UTF-8 first if necessary.
+Guarantees to evaluate C<sv> only once; use the more efficient C<SvPVutf8>
 otherwise.
 
 =for apidoc Am|char*|SvPVbytex_force|SV* sv|STRLEN len
-Like C<SvPV_force>, but converts sv to byte representation first if necessary.
-Guarantees to evaluate sv only once; use the more efficient C<SvPVbyte_force>
+Like C<SvPV_force>, but converts C<sv> to byte representation first if necessary.
+Guarantees to evaluate C<sv> only once; use the more efficient C<SvPVbyte_force>
 otherwise.
 
 =for apidoc Am|char*|SvPVbytex|SV* sv|STRLEN len
-Like C<SvPV>, but converts sv to byte representation first if necessary.
-Guarantees to evaluate sv only once; use the more efficient C<SvPVbyte>
+Like C<SvPV>, but converts C<sv> to byte representation first if necessary.
+Guarantees to evaluate C<sv> only once; use the more efficient C<SvPVbyte>
 otherwise.
 
 =for apidoc Am|U32|SvIsCOW|SV* sv
@@ -1628,7 +1634,7 @@ Like C<sv_catsv> but doesn't process magic.
 
 =for apidoc Amdb|STRLEN|sv_utf8_upgrade_nomg|NN SV *sv
 
-Like sv_utf8_upgrade, but doesn't do magic on C<sv>.
+Like C<sv_utf8_upgrade>, but doesn't do magic on C<sv>.
 
 =cut
 */
@@ -1819,6 +1825,9 @@ Like sv_utf8_upgrade, but doesn't do magic on C<sv>.
 #define SV_HAS_TRAILING_NUL	256
 #define SV_COW_SHARED_HASH_KEYS	512
 /* This one is only enabled for PERL_OLD_COPY_ON_WRITE */
+/* XXX This flag actually enabled for any COW.  But it appears not to do
+       anything.  Can we just remove it?  Or will it serve some future
+       purpose.  */
 #define SV_COW_OTHER_PVS	1024
 /* Make sv_2pv_flags return NULL if something is undefined.  */
 #define SV_UNDEF_RETURNS_NULL	2048
@@ -1860,26 +1869,7 @@ Like sv_utf8_upgrade, but doesn't do magic on C<sv>.
 #define SV_CHECK_THINKFIRST_COW_DROP(sv) if (SvTHINKFIRST(sv)) \
 				    sv_force_normal_flags(sv, SV_COW_DROP_PV)
 
-#ifdef PERL_OLD_COPY_ON_WRITE
-#define SvRELEASE_IVX(sv)   \
-    ((SvIsCOW(sv) ? sv_force_normal_flags(sv, 0) : (void) 0), 0)
-#  define SvIsCOW_normal(sv)	(SvIsCOW(sv) && SvLEN(sv))
-#  define SvRELEASE_IVX_(sv)	SvRELEASE_IVX(sv),
-#  define SvCANCOW(sv) \
-	(SvIsCOW(sv) || (SvFLAGS(sv) & CAN_COW_MASK) == CAN_COW_FLAGS)
-/* This is a pessimistic view. Scalar must be purely a read-write PV to copy-
-   on-write.  */
-#  define CAN_COW_MASK	(SVs_OBJECT|SVs_GMG|SVs_SMG|SVs_RMG|SVf_IOK|SVf_NOK| \
-			 SVf_POK|SVf_ROK|SVp_IOK|SVp_NOK|SVp_POK|SVf_FAKE| \
-			 SVf_OOK|SVf_BREAK|SVf_READONLY|SVf_PROTECT)
-#else
-#  define SvRELEASE_IVX(sv)   0
-/* This little game brought to you by the need to shut this warning up:
-mg.c: In function 'Perl_magic_get':
-mg.c:1024: warning: left-hand operand of comma expression has no effect
-*/
-#  define SvRELEASE_IVX_(sv)  /**/
-#  ifdef PERL_NEW_COPY_ON_WRITE
+#ifdef PERL_COPY_ON_WRITE
 #   define SvCANCOW(sv)					    \
 	(SvIsCOW(sv)					     \
 	 ? SvLEN(sv) ? CowREFCNT(sv) != SV_COW_REFCNT_MAX : 1 \
@@ -1890,8 +1880,7 @@ mg.c:1024: warning: left-hand operand of comma expression has no effect
 #   define SV_COW_REFCNT_MAX	((1 << sizeof(U8)*8) - 1)
 #   define CAN_COW_MASK	(SVf_POK|SVf_ROK|SVp_POK|SVf_FAKE| \
 			 SVf_OOK|SVf_BREAK|SVf_READONLY|SVf_PROTECT)
-#  endif
-#endif /* PERL_OLD_COPY_ON_WRITE */
+#endif
 
 #define CAN_COW_FLAGS	(SVp_POK|SVf_POK)
 
@@ -1980,7 +1969,7 @@ incremented.
 
 #define newRV_inc(sv)	newRV(sv)
 
-/* the following macros update any magic values this sv is associated with */
+/* the following macros update any magic values this C<sv> is associated with */
 
 /*
 =head1 Magical Functions
@@ -1997,12 +1986,12 @@ or a tied variable (it calls C<STORE>).  This macro evaluates its
 argument more than once.
 
 =for apidoc Am|void|SvSetSV|SV* dsv|SV* ssv
-Calls C<sv_setsv> if dsv is not the same as ssv.  May evaluate arguments
+Calls C<sv_setsv> if C<dsv> is not the same as C<ssv>.  May evaluate arguments
 more than once.  Does not handle 'set' magic on the destination SV.
 
 =for apidoc Am|void|SvSetSV_nosteal|SV* dsv|SV* ssv
-Calls a non-destructive version of C<sv_setsv> if dsv is not the same as
-ssv.  May evaluate arguments more than once.
+Calls a non-destructive version of C<sv_setsv> if C<dsv> is not the same as
+C<ssv>.  May evaluate arguments more than once.
 
 =for apidoc Am|void|SvSetMagicSV|SV* dsv|SV* ssv
 Like C<SvSetSV>, but does any set magic required afterwards.
@@ -2011,15 +2000,15 @@ Like C<SvSetSV>, but does any set magic required afterwards.
 Like C<SvSetSV_nosteal>, but does any set magic required afterwards.
 
 =for apidoc Am|void|SvSHARE|SV* sv
-Arranges for sv to be shared between threads if a suitable module
+Arranges for C<sv> to be shared between threads if a suitable module
 has been loaded.
 
 =for apidoc Am|void|SvLOCK|SV* sv
-Arranges for a mutual exclusion lock to be obtained on sv if a suitable module
+Arranges for a mutual exclusion lock to be obtained on C<sv> if a suitable module
 has been loaded.
 
 =for apidoc Am|void|SvUNLOCK|SV* sv
-Releases a mutual exclusion lock on sv if a suitable module
+Releases a mutual exclusion lock on C<sv> if a suitable module
 has been loaded.
 
 =head1 SV Manipulation Functions
@@ -2029,7 +2018,7 @@ Expands the character buffer in the SV so that it has room for the
 indicated number of bytes (remember to reserve space for an extra trailing
 C<NUL> character).  Calls C<sv_grow> to perform the expansion if necessary.
 Returns a pointer to the character
-buffer.  SV must be of type >= SVt_PV.  One
+buffer.  SV must be of type >= C<SVt_PV>.  One
 alternative is to call C<sv_grow> if you are not sure of the type of SV.
 
 =cut
@@ -2089,7 +2078,7 @@ alternative is to call C<sv_grow> if you are not sure of the type of SV.
 
 Returns a true SV if C<b> is a true value, or a false SV if C<b> is 0.
 
-See also C<PL_sv_yes> and C<PL_sv_no>.
+See also C<L</PL_sv_yes>> and C<L</PL_sv_no>>.
 
 =cut
 */
@@ -2147,7 +2136,7 @@ struct clone_params {
 =for apidoc Am|SV*|newSVpvn_utf8|NULLOK const char* s|STRLEN len|U32 utf8
 
 Creates a new SV and copies a string (which may contain C<NUL> (C<\0>)
-characters) into it.  If utf8 is true, calls
+characters) into it.  If C<utf8> is true, calls
 C<SvUTF8_on> on the new SV.  Implemented as a wrapper around C<newSVpvn_flags>.
 
 =cut
@@ -2168,11 +2157,11 @@ Creates a new SV containing the pad name.
 /*
 =for apidoc Am|void|SvOOK_offset|NN SV*sv|STRLEN len
 
-Reads into I<len> the offset from SvPVX back to the true start of the
+Reads into C<len> the offset from C<SvPVX> back to the true start of the
 allocated buffer, which will be non-zero if C<sv_chop> has been used to
 efficiently remove characters from start of the buffer.  Implemented as a
-macro, which takes the address of I<len>, which must be of type C<STRLEN>.
-Evaluates I<sv> more than once.  Sets I<len> to 0 if C<SvOOK(sv)> is false.
+macro, which takes the address of C<len>, which must be of type C<STRLEN>.
+Evaluates C<sv> more than once.  Sets C<len> to 0 if C<SvOOK(sv)> is false.
 
 =cut
 */
@@ -2271,5 +2260,39 @@ Evaluates I<sv> more than once.  Sets I<len> to 0 if C<SvOOK(sv)> is false.
 #define SV_CONSTS_COUNT 35
 
 /*
+ * Bodyless IVs and NVs!
+ *
+ * Since 5.9.2, we can avoid allocating a body for SVt_IV-type SVs.
+ * Since the larger IV-holding variants of SVs store their integer
+ * values in their respective bodies, the family of SvIV() accessor
+ * macros would  naively have to branch on the SV type to find the
+ * integer value either in the HEAD or BODY. In order to avoid this
+ * expensive branch, a clever soul has deployed a great hack:
+ * We set up the SvANY pointer such that instead of pointing to a
+ * real body, it points into the memory before the location of the
+ * head. We compute this pointer such that the location of
+ * the integer member of the hypothetical body struct happens to
+ * be the same as the location of the integer member of the bodyless
+ * SV head. This now means that the SvIV() family of accessors can
+ * always read from the (hypothetical or real) body via SvANY.
+ *
+ * Since the 5.21 dev series, we employ the same trick for NVs
+ * if the architecture can support it (NVSIZE <= IVSIZE).
+ */
+
+/* The following two macros compute the necessary offsets for the above
+ * trick and store them in SvANY for SvIV() (and friends) to use. */
+
+#ifdef PERL_CORE
+#  define SET_SVANY_FOR_BODYLESS_IV(sv) \
+	SvANY(sv) =   (XPVIV*)((char*)&(sv->sv_u.svu_iv) \
+                    - STRUCT_OFFSET(XPVIV, xiv_iv))
+
+#  define SET_SVANY_FOR_BODYLESS_NV(sv) \
+	SvANY(sv) =   (XPVNV*)((char*)&(sv->sv_u.svu_nv) \
+                    - STRUCT_OFFSET(XPVNV, xnv_u.xnv_nv))
+#endif
+
+/*
  * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/Master/tlpkg/tlperl/lib/CORE/thread.h b/Master/tlpkg/tlperl/lib/CORE/thread.h
index 1fb1cc61315..9958a5bffb8 100644
--- a/Master/tlpkg/tlperl/lib/CORE/thread.h
+++ b/Master/tlpkg/tlperl/lib/CORE/thread.h
@@ -208,10 +208,18 @@
     } STMT_END
 #  endif
 
+#  ifdef PERL_TSA_ACTIVE
+#    define perl_pthread_mutex_lock(m) perl_tsa_mutex_lock(m)
+#    define perl_pthread_mutex_unlock(m) perl_tsa_mutex_unlock(m)
+#  else
+#    define perl_pthread_mutex_lock(m) pthread_mutex_lock(m)
+#    define perl_pthread_mutex_unlock(m) pthread_mutex_unlock(m)
+#  endif
+
 #  define MUTEX_LOCK(m) \
     STMT_START {						\
 	int _eC_;						\
-	if ((_eC_ = pthread_mutex_lock((m))))			\
+	if ((_eC_ = perl_pthread_mutex_lock((m))))			\
 	    Perl_croak_nocontext("panic: MUTEX_LOCK (%d) [%s:%d]",	\
 				 _eC_, __FILE__, __LINE__);	\
     } STMT_END
@@ -219,7 +227,7 @@
 #  define MUTEX_UNLOCK(m) \
     STMT_START {						\
 	int _eC_;						\
-	if ((_eC_ = pthread_mutex_unlock((m))))			\
+	if ((_eC_ = perl_pthread_mutex_unlock((m))))			\
 	    Perl_croak_nocontext("panic: MUTEX_UNLOCK (%d) [%s:%d]",	\
 				 _eC_, __FILE__, __LINE__);	\
     } STMT_END
diff --git a/Master/tlpkg/tlperl/lib/CORE/time64.h b/Master/tlpkg/tlperl/lib/CORE/time64.h
index b7306d01fb4..6f60bce8330 100644
--- a/Master/tlpkg/tlperl/lib/CORE/time64.h
+++ b/Master/tlpkg/tlperl/lib/CORE/time64.h
@@ -49,9 +49,8 @@ struct TM64 {
 
 
 /* Declare functions */
-static struct TM *S_gmtime64_r    (const Time64_T *, struct TM *);
-static struct TM *S_localtime64_r (const Time64_T *, struct TM *);
-static Time64_T   S_timegm64      (struct TM *);
+struct TM *Perl_gmtime64_r    (const Time64_T *, struct TM *);
+struct TM *Perl_localtime64_r (const Time64_T *, struct TM *);
 
 
 /* Not everyone has gm/localtime_r(), provide a replacement */
diff --git a/Master/tlpkg/tlperl/lib/CORE/uconfig.h b/Master/tlpkg/tlperl/lib/CORE/uconfig.h
index 1c132a31ecf..c050a08328e 100644
--- a/Master/tlpkg/tlperl/lib/CORE/uconfig.h
+++ b/Master/tlpkg/tlperl/lib/CORE/uconfig.h
@@ -850,6 +850,12 @@
  */
 /*#define I_VFORK	/ **/
 
+/* STDCHAR:
+ *	This symbol is defined to be the type of char used in stdio.h.
+ *	It has the values "unsigned char" or "char".
+ */
+#define STDCHAR char	/**/
+
 /* CAN_VAPROTO:
  *	This variable is defined on systems supporting prototype declaration
  *	of functions with a variable number of arguments.
@@ -872,18 +878,21 @@
 #define	_V(args) ()
 #endif
 
-/* OSNAME:
- *	This symbol contains the name of the operating system, as determined
- *	by Configure.  You shouldn't rely on it too much; the specific
- *	feature tests from Configure are generally more reliable.
+/* INTSIZE:
+ *	This symbol contains the value of sizeof(int) so that the C
+ *	preprocessor can make decisions based on it.
  */
-/* OSVERS:
- *	This symbol contains the version of the operating system, as determined
- *	by Configure.  You shouldn't rely on it too much; the specific
- *	feature tests from Configure are generally more reliable.
+/* LONGSIZE:
+ *	This symbol contains the value of sizeof(long) so that the C
+ *	preprocessor can make decisions based on it.
  */
-#define OSNAME "unknown"		/**/
-#define OSVERS "unknown"		/**/
+/* SHORTSIZE:
+ *	This symbol contains the value of sizeof(short) so that the C
+ *	preprocessor can make decisions based on it.
+ */
+#define INTSIZE 4		/**/
+#define LONGSIZE 4		/**/
+#define SHORTSIZE 2		/**/
 
 /* MULTIARCH:
  *	This symbol, if defined, signifies that the build
@@ -894,69 +903,55 @@
  */
 /*#define MULTIARCH		/ **/
 
-/* MEM_ALIGNBYTES:
- *	This symbol contains the number of bytes required to align a
- *	double, or a long double when applicable. Usual values are 2,
- *	4 and 8. The default is eight, for safety.  For cross-compiling
- *  	or multiarch support, Configure will set a minimum of 8.
+/* HAS_QUAD:
+ *	This symbol, if defined, tells that there's a 64-bit integer type,
+ *	Quad_t, and its unsigned counterpart, Uquad_t. QUADKIND will be one
+ *	of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, QUAD_IS_INT64_T,
+ *	or QUAD_IS___INT64.
  */
-#define MEM_ALIGNBYTES 4
+/*#define HAS_QUAD	/ **/
+#ifdef HAS_QUAD
+#   define Quad_t int64_t	/**/
+#   define Uquad_t uint64_t	/**/
+#   define QUADKIND 4	/**/
+#   define QUAD_IS_INT	1
+#   define QUAD_IS_LONG	2
+#   define QUAD_IS_LONG_LONG	3
+#   define QUAD_IS_INT64_T	4
+#   define QUAD_IS___INT64	5
+#endif
 
-/* ARCHLIB:
- *	This variable, if defined, holds the name of the directory in
- *	which the user wants to put architecture-dependent public
- *	library files for perl5.  It is most often a local directory
- *	such as /usr/local/lib.  Programs using this variable must be
- *	prepared to deal with filename expansion.  If ARCHLIB is the
- *	same as PRIVLIB, it is not defined, since presumably the
- *	program already searches PRIVLIB.
- */
-/* ARCHLIB_EXP:
- *	This symbol contains the ~name expanded version of ARCHLIB, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
+/* HAS_ACCESSX:
+ *	This symbol, if defined, indicates that the accessx routine is
+ *	available to do extended access checks.
  */
-/*#define ARCHLIB "/usr/local/lib/perl5/5.22/unknown"		/ **/
-/*#define ARCHLIB_EXP "/usr/local/lib/perl5/5.22/unknown"		/ **/
+/*#define HAS_ACCESSX		/ **/
 
-/* ARCHNAME:
- *	This symbol holds a string representing the architecture name.
- *	It may be used to construct an architecture-dependant pathname
- *	where library files may be held under a private library, for
- *	instance.
+/* HAS_EACCESS:
+ *	This symbol, if defined, indicates that the eaccess routine is
+ *	available to do extended access checks.
  */
-#define ARCHNAME "unknown"		/**/
+/*#define HAS_EACCESS		/ **/
 
-/* BIN:
- *	This symbol holds the path of the bin directory where the package will
- *	be installed. Program must be prepared to deal with ~name substitution.
- */
-/* BIN_EXP:
- *	This symbol is the filename expanded version of the BIN symbol, for
- *	programs that do not want to deal with that at run-time.
- */
-/* PERL_RELOCATABLE_INC:
- *	This symbol, if defined, indicates that we'd like to relocate entries
- *	in @INC at run time based on the location of the perl binary.
+/* I_SYS_ACCESS:
+ *     This symbol, if defined, indicates to the C program that it should
+ *     include <sys/access.h>.
  */
-#define BIN "/usr/local/bin"	/**/
-#define BIN_EXP "/usr/local/bin"	/**/
-#define PERL_RELOCATABLE_INC "undef" 		/**/
+/*#define   I_SYS_ACCESS                / **/
 
-/* INTSIZE:
- *	This symbol contains the value of sizeof(int) so that the C
- *	preprocessor can make decisions based on it.
- */
-/* LONGSIZE:
- *	This symbol contains the value of sizeof(long) so that the C
- *	preprocessor can make decisions based on it.
+/* I_SYS_SECURITY:
+ *     This symbol, if defined, indicates to the C program that it should
+ *     include <sys/security.h>.
  */
-/* SHORTSIZE:
- *	This symbol contains the value of sizeof(short) so that the C
- *	preprocessor can make decisions based on it.
+/*#define   I_SYS_SECURITY	/ **/
+
+/* MEM_ALIGNBYTES:
+ *	This symbol contains the number of bytes required to align a
+ *	double, or a long double when applicable. Usual values are 2,
+ *	4 and 8. The default is eight, for safety.  For cross-compiling
+ *  	or multiarch support, Configure will set a minimum of 8.
  */
-#define INTSIZE 4		/**/
-#define LONGSIZE 4		/**/
-#define SHORTSIZE 2		/**/
+#define MEM_ALIGNBYTES 4
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
@@ -995,6 +990,556 @@
  */
 #define CHARBITS 8		/**/
 
+/* CASTI32:
+ *	This symbol is defined if the C compiler can cast negative
+ *	or large floating point numbers to 32-bit ints.
+ */
+/*#define	CASTI32		/ **/
+
+/* CASTNEGFLOAT:
+ *	This symbol is defined if the C compiler can cast negative
+ *	numbers to unsigned longs, ints and shorts.
+ */
+/* CASTFLAGS:
+ *	This symbol contains flags that say what difficulties the compiler
+ *	has casting odd floating values to unsigned long:
+ *		0 = ok
+ *		1 = couldn't cast < 0
+ *		2 = couldn't cast >= 0x80000000
+ *		4 = couldn't cast in argument expression list
+ */
+/*#define	CASTNEGFLOAT		/ **/
+#define CASTFLAGS 0		/**/
+
+/* VOID_CLOSEDIR:
+ *	This symbol, if defined, indicates that the closedir() routine
+ *	does not return a value.
+ */
+/*#define VOID_CLOSEDIR		/ **/
+
+/* HAS_FD_SET:
+ *	This symbol, when defined, indicates presence of the fd_set typedef
+ *	in <sys/types.h>
+ */
+/*#define HAS_FD_SET	/ **/
+
+/* Gconvert:
+ *	This preprocessor macro is defined to convert a floating point
+ *	number to a string without a trailing decimal point.  This
+ *	emulates the behavior of sprintf("%g"), but is sometimes much more
+ *	efficient.  If gconvert() is not available, but gcvt() drops the
+ *	trailing decimal point, then gcvt() is used.  If all else fails,
+ *	a macro using sprintf("%g") is used. Arguments for the Gconvert
+ *	macro are: value, number of digits, whether trailing zeros should
+ *	be retained, and the output buffer.
+ *	The usual values are:
+ *		d_Gconvert='gconvert((x),(n),(t),(b))'
+ *		d_Gconvert='gcvt((x),(n),(b))'
+ *		d_Gconvert='sprintf((b),"%.*g",(n),(x))'
+ *	The last two assume trailing zeros should not be kept.
+ */
+#define Gconvert(x,n,t,b) sprintf((b),"%.*g",(n),(x))
+
+/* HAS_GETPAGESIZE:
+ *	This symbol, if defined, indicates that the getpagesize system call
+ *	is available to get system page size, which is the granularity of
+ *	many memory management calls.
+ */
+/*#define HAS_GETPAGESIZE		/ **/
+
+/* HAS_GNULIBC:
+ *	This symbol, if defined, indicates to the C program that
+ *	the GNU C library is being used.  A better check is to use
+ *	the __GLIBC__ and __GLIBC_MINOR__ symbols supplied with glibc.
+ */
+/*#define HAS_GNULIBC  	/ **/
+#if defined(HAS_GNULIBC) && !defined(_GNU_SOURCE)
+#   define _GNU_SOURCE
+#endif
+
+/* HAS_ISASCII:
+ *	This manifest constant lets the C program know that isascii
+ *	is available.
+ */
+/*#define HAS_ISASCII		/ **/
+
+/* HAS_LCHOWN:
+ *	This symbol, if defined, indicates that the lchown routine is
+ *	available to operate on a symbolic link (instead of following the
+ *	link).
+ */
+/*#define HAS_LCHOWN		/ **/
+
+/* HAS_OPEN3:
+ *	This manifest constant lets the C program know that the three
+ *	argument form of open(2) is available.
+ */
+/*#define HAS_OPEN3		/ **/
+
+/* HAS_SAFE_BCOPY:
+ *	This symbol, if defined, indicates that the bcopy routine is available
+ *	to copy potentially overlapping memory blocks. Normally, you should
+ *	probably use memmove() or memcpy(). If neither is defined, roll your
+ *	own version.
+ */
+/*#define HAS_SAFE_BCOPY	/ **/
+
+/* HAS_SAFE_MEMCPY:
+ *	This symbol, if defined, indicates that the memcpy routine is available
+ *	to copy potentially overlapping memory blocks.  If you need to
+ *	copy overlapping memory blocks, you should check HAS_MEMMOVE and
+ *	use memmove() instead, if available.
+ */
+/*#define HAS_SAFE_MEMCPY	/ **/
+
+/* HAS_SANE_MEMCMP:
+ *	This symbol, if defined, indicates that the memcmp routine is available
+ *	and can be used to compare relative magnitudes of chars with their high
+ *	bits set.  If it is not defined, roll your own version.
+ */
+/*#define HAS_SANE_MEMCMP	/ **/
+
+/* HAS_SIGACTION:
+ *	This symbol, if defined, indicates that Vr4's sigaction() routine
+ *	is available.
+ */
+/*#define HAS_SIGACTION	/ **/
+
+/* HAS_SIGINFO_SI_ERRNO:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_errno member
+ */
+/* HAS_SIGINFO_SI_PID:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_pid member
+ */
+/* HAS_SIGINFO_SI_UID:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_uid member
+ */
+/* HAS_SIGINFO_SI_ADDR:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_addr member
+ */
+/* HAS_SIGINFO_SI_STATUS:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_status member
+ */
+/* HAS_SIGINFO_SI_BAND:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_band member
+ */
+/* HAS_SIGINFO_SI_VALUE:
+ *	This symbol, if defined, indicates that siginfo_t has the
+ *	si_value member
+ */
+/*#define	HAS_SIGINFO_SI_ERRNO	/ **/
+/*#define	HAS_SIGINFO_SI_PID	/ **/
+/*#define	HAS_SIGINFO_SI_UID	/ **/
+/*#define	HAS_SIGINFO_SI_ADDR	/ **/
+/*#define	HAS_SIGINFO_SI_STATUS	/ **/
+/*#define	HAS_SIGINFO_SI_BAND	/ **/
+/*#define	HAS_SIGINFO_SI_VALUE	/ **/
+
+/* HAS_SIGSETJMP:
+ *	This variable indicates to the C program that the sigsetjmp()
+ *	routine is available to save the calling process's registers
+ *	and stack environment for later use by siglongjmp(), and
+ *	to optionally save the process's signal mask.  See
+ *	Sigjmp_buf, Sigsetjmp, and Siglongjmp.
+ */
+/* Sigjmp_buf:
+ *	This is the buffer type to be used with Sigsetjmp and Siglongjmp.
+ */
+/* Sigsetjmp:
+ *	This macro is used in the same way as sigsetjmp(), but will invoke
+ *	traditional setjmp() if sigsetjmp isn't available.
+ *	See HAS_SIGSETJMP.
+ */
+/* Siglongjmp:
+ *	This macro is used in the same way as siglongjmp(), but will invoke
+ *	traditional longjmp() if siglongjmp isn't available.
+ *	See HAS_SIGSETJMP.
+ */
+/*#define HAS_SIGSETJMP	/ **/
+#ifdef HAS_SIGSETJMP
+#define Sigjmp_buf sigjmp_buf
+#define Sigsetjmp(buf,save_mask) sigsetjmp((buf),(save_mask))
+#define Siglongjmp(buf,retval) siglongjmp((buf),(retval))
+#else
+#define Sigjmp_buf jmp_buf
+#define Sigsetjmp(buf,save_mask) setjmp((buf))
+#define Siglongjmp(buf,retval) longjmp((buf),(retval))
+#endif
+
+/* HAS_STATIC_INLINE:
+ *	This symbol, if defined, indicates that the C compiler supports
+ *	C99-style static inline.  That is, the function can't be called
+ *	from another translation unit.
+ */
+/* PERL_STATIC_INLINE:
+ *	This symbol gives the best-guess incantation to use for static
+ *	inline functions.  If HAS_STATIC_INLINE is defined, this will
+ *	give C99-style inline.  If HAS_STATIC_INLINE is not defined,
+ *	this will give a plain 'static'.  It will always be defined
+ *	to something that gives static linkage.
+ *	Possibilities include
+ *		static inline       (c99)
+ *		static __inline__   (gcc -ansi)
+ *		static __inline     (MSVC)
+ *		static _inline      (older MSVC)
+ *		static              (c89 compilers)
+ */
+/*#define HAS_STATIC_INLINE				/ **/
+#define PERL_STATIC_INLINE static	/**/
+
+/* USE_STDIO_PTR:
+ *	This symbol is defined if the _ptr and _cnt fields (or similar)
+ *	of the stdio FILE structure can be used to access the stdio buffer
+ *	for a file handle.  If this is defined, then the FILE_ptr(fp)
+ *	and FILE_cnt(fp) macros will also be defined and should be used
+ *	to access these fields.
+ */
+/* FILE_ptr:
+ *	This macro is used to access the _ptr field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_PTR is defined.
+ */
+/* STDIO_PTR_LVALUE:
+ *	This symbol is defined if the FILE_ptr macro can be used as an
+ *	lvalue.
+ */
+/* FILE_cnt:
+ *	This macro is used to access the _cnt field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_PTR is defined.
+ */
+/* STDIO_CNT_LVALUE:
+ *	This symbol is defined if the FILE_cnt macro can be used as an
+ *	lvalue.
+ */
+/* STDIO_PTR_LVAL_SETS_CNT:
+ *	This symbol is defined if using the FILE_ptr macro as an lvalue
+ *	to increase the pointer by n has the side effect of decreasing the
+ *	value of File_cnt(fp) by n.
+ */
+/* STDIO_PTR_LVAL_NOCHANGE_CNT:
+ *	This symbol is defined if using the FILE_ptr macro as an lvalue
+ *	to increase the pointer by n leaves File_cnt(fp) unchanged.
+ */
+/*#define USE_STDIO_PTR 	/ **/
+#ifdef USE_STDIO_PTR
+#define FILE_ptr(fp)	((fp)->_IO_read_ptr)
+/*#define STDIO_PTR_LVALUE 		/ **/
+#define FILE_cnt(fp)	((fp)->_IO_read_end - (fp)->_IO_read_ptr)
+/*#define STDIO_CNT_LVALUE 		/ **/
+/*#define STDIO_PTR_LVAL_SETS_CNT	/ **/
+/*#define STDIO_PTR_LVAL_NOCHANGE_CNT	/ **/
+#endif
+
+/* USE_STDIO_BASE:
+ *	This symbol is defined if the _base field (or similar) of the
+ *	stdio FILE structure can be used to access the stdio buffer for
+ *	a file handle.  If this is defined, then the FILE_base(fp) macro
+ *	will also be defined and should be used to access this field.
+ *	Also, the FILE_bufsiz(fp) macro will be defined and should be used
+ *	to determine the number of bytes in the buffer.  USE_STDIO_BASE
+ *	will never be defined unless USE_STDIO_PTR is.
+ */
+/* FILE_base:
+ *	This macro is used to access the _base field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_BASE is defined.
+ */
+/* FILE_bufsiz:
+ *	This macro is used to determine the number of bytes in the I/O
+ *	buffer pointed to by _base field (or equivalent) of the FILE
+ *	structure pointed to its argument. This macro will always be defined
+ *	if USE_STDIO_BASE is defined.
+ */
+/*#define USE_STDIO_BASE 	/ **/
+#ifdef USE_STDIO_BASE
+#define FILE_base(fp)	((fp)->_IO_read_base)
+#define FILE_bufsiz(fp)	((fp)->_IO_read_end - (fp)->_IO_read_base)
+#endif
+
+/* HAS_VPRINTF:
+ *	This symbol, if defined, indicates that the vprintf routine is available
+ *	to printf with a pointer to an argument list.  If unavailable, you
+ *	may need to write your own, probably in terms of _doprnt().
+ */
+/* USE_CHAR_VSPRINTF:
+ *	This symbol is defined if this system has vsprintf() returning type
+ *	(char*).  The trend seems to be to declare it as "int vsprintf()".  It
+ *	is up to the package author to declare vsprintf correctly based on the
+ *	symbol.
+ */
+#define HAS_VPRINTF	/**/
+/*#define USE_CHAR_VSPRINTF 	/ **/
+
+/* DOUBLESIZE:
+ *	This symbol contains the size of a double, so that the C preprocessor
+ *	can make decisions based on it.
+ */
+#define DOUBLESIZE 8		/**/
+
+/* I_TIME:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <time.h>.
+ */
+/* I_SYS_TIME:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <sys/time.h>.
+ */
+/* I_SYS_TIME_KERNEL:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <sys/time.h> with KERNEL defined.
+ */
+/* HAS_TM_TM_ZONE:
+ *	This symbol, if defined, indicates to the C program that
+ *	the struct tm has a tm_zone field.
+ */
+/* HAS_TM_TM_GMTOFF:
+ *	This symbol, if defined, indicates to the C program that
+ *	the struct tm has a tm_gmtoff field.
+ */
+#define I_TIME		/**/
+/*#define I_SYS_TIME		/ **/
+/*#define I_SYS_TIME_KERNEL		/ **/
+/*#define HAS_TM_TM_ZONE		/ **/
+/*#define HAS_TM_TM_GMTOFF		/ **/
+
+/* VAL_O_NONBLOCK:
+ *	This symbol is to be used during open() or fcntl(F_SETFL) to turn on
+ *	non-blocking I/O for the file descriptor. Note that there is no way
+ *	back, i.e. you cannot turn it blocking again this way. If you wish to
+ *	alternatively switch between blocking and non-blocking, use the
+ *	ioctl(FIOSNBIO) call instead, but that is not supported by all devices.
+ */
+/* VAL_EAGAIN:
+ *	This symbol holds the errno error code set by read() when no data was
+ *	present on the non-blocking file descriptor.
+ */
+/* RD_NODATA:
+ *	This symbol holds the return code from read() when no data is present
+ *	on the non-blocking file descriptor. Be careful! If EOF_NONBLOCK is
+ *	not defined, then you can't distinguish between no data and EOF by
+ *	issuing a read(). You'll have to find another way to tell for sure!
+ */
+/* EOF_NONBLOCK:
+ *	This symbol, if defined, indicates to the C program that a read() on
+ *	a non-blocking file descriptor will return 0 on EOF, and not the value
+ *	held in RD_NODATA (-1 usually, in that case!).
+ */
+#define VAL_O_NONBLOCK O_NONBLOCK
+#define VAL_EAGAIN EAGAIN
+#define RD_NODATA -1
+#undef EOF_NONBLOCK
+
+/* PTRSIZE:
+ *	This symbol contains the size of a pointer, so that the C preprocessor
+ *	can make decisions based on it.  It will be sizeof(void *) if
+ *	the compiler supports (void *); otherwise it will be
+ *	sizeof(char *).
+ */
+#define PTRSIZE 4		/**/
+
+/* Drand01:
+ *	This macro is to be used to generate uniformly distributed
+ *	random numbers over the range [0., 1.[.  You may have to supply
+ *	an 'extern double drand48();' in your program since SunOS 4.1.3
+ *	doesn't provide you with anything relevant in its headers.
+ *	See HAS_DRAND48_PROTO.
+ */
+/* Rand_seed_t:
+ *	This symbol defines the type of the argument of the
+ *	random seed function.
+ */
+/* seedDrand01:
+ *	This symbol defines the macro to be used in seeding the
+ *	random number generator (see Drand01).
+ */
+/* RANDBITS:
+ *	This symbol indicates how many bits are produced by the
+ *	function used to generate normalized random numbers.
+ *	Values include 15, 16, 31, and 48.
+ */
+#define Drand01()		Perl_drand48()		/**/
+#define Rand_seed_t		U32		/**/
+#define seedDrand01(x)	Perl_drand48_init((Rand_seed_t)x)	/**/
+#define RANDBITS		48		/**/
+
+/* SSize_t:
+ *	This symbol holds the type used by functions that return
+ *	a count of bytes or an error condition.  It must be a signed type.
+ *	It is usually ssize_t, but may be long or int, etc.
+ *	It may be necessary to include <sys/types.h> or <unistd.h>
+ *	to get any typedef'ed information.
+ *	We will pick a type such that sizeof(SSize_t) == sizeof(Size_t).
+ */
+#define SSize_t int	 /* signed count of bytes */
+
+/* EBCDIC:
+ *	This symbol, if defined, indicates that this system uses
+ *	EBCDIC encoding.
+ */
+/*#define	EBCDIC 		/ **/
+
+/* ARCHLIB:
+ *	This variable, if defined, holds the name of the directory in
+ *	which the user wants to put architecture-dependent public
+ *	library files for perl5.  It is most often a local directory
+ *	such as /usr/local/lib.  Programs using this variable must be
+ *	prepared to deal with filename expansion.  If ARCHLIB is the
+ *	same as PRIVLIB, it is not defined, since presumably the
+ *	program already searches PRIVLIB.
+ */
+/* ARCHLIB_EXP:
+ *	This symbol contains the ~name expanded version of ARCHLIB, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+/*#define ARCHLIB "/usr/local/lib/perl5/5.24/unknown"		/ **/
+/*#define ARCHLIB_EXP "/usr/local/lib/perl5/5.24/unknown"		/ **/
+
+/* BIN:
+ *	This symbol holds the path of the bin directory where the package will
+ *	be installed. Program must be prepared to deal with ~name substitution.
+ */
+/* BIN_EXP:
+ *	This symbol is the filename expanded version of the BIN symbol, for
+ *	programs that do not want to deal with that at run-time.
+ */
+/* PERL_RELOCATABLE_INC:
+ *	This symbol, if defined, indicates that we'd like to relocate entries
+ *	in @INC at run time based on the location of the perl binary.
+ */
+#define BIN "/usr/local/bin"	/**/
+#define BIN_EXP "/usr/local/bin"	/**/
+#define PERL_RELOCATABLE_INC "undef" 		/**/
+
+/* PERL_INC_VERSION_LIST:
+ *	This variable specifies the list of subdirectories in over
+ *	which perl.c:incpush() and lib/lib.pm will automatically
+ *	search when adding directories to @INC, in a format suitable
+ *	for a C initialization string.  See the inc_version_list entry
+ *	in Porting/Glossary for more details.
+ */
+/*#define PERL_INC_VERSION_LIST NULL		/ **/
+
+/* INSTALL_USR_BIN_PERL:
+ *	This symbol, if defined, indicates that Perl is to be installed
+ * 	also as /usr/bin/perl.
+ */
+/*#define INSTALL_USR_BIN_PERL	/ **/
+
+/* PERL_OTHERLIBDIRS:
+ *	This variable contains a colon-separated set of paths for the perl
+ *	binary to search for additional library files or modules.
+ *	These directories will be tacked to the end of @INC.
+ *	Perl will automatically search below each path for version-
+ *	and architecture-specific directories.  See PERL_INC_VERSION_LIST
+ *	for more details.
+ */
+/*#define PERL_OTHERLIBDIRS " "		/ **/
+
+/* PRIVLIB:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ */
+/* PRIVLIB_EXP:
+ *	This symbol contains the ~name expanded version of PRIVLIB, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+#define PRIVLIB "/usr/local/lib/perl5/5.24"		/**/
+#define PRIVLIB_EXP "/usr/local/lib/perl5/5.24"		/**/
+
+/* SITEARCH:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ *	The standard distribution will put nothing in this directory.
+ *	After perl has been installed, users may install their own local
+ *	architecture-dependent modules in this directory with
+ *		MakeMaker Makefile.PL
+ *	or equivalent.  See INSTALL for details.
+ */
+/* SITEARCH_EXP:
+ *	This symbol contains the ~name expanded version of SITEARCH, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+/*#define SITEARCH "/usr/local/lib/perl5/5.24/unknown"		/ **/
+/*#define SITEARCH_EXP "/usr/local/lib/perl5/5.24/unknown"		/ **/
+
+/* SITELIB:
+ *	This symbol contains the name of the private library for this package.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.  The program
+ *	should be prepared to do ~ expansion.
+ *	The standard distribution will put nothing in this directory.
+ *	After perl has been installed, users may install their own local
+ *	architecture-independent modules in this directory with
+ *		MakeMaker Makefile.PL
+ *	or equivalent.  See INSTALL for details.
+ */
+/* SITELIB_EXP:
+ *	This symbol contains the ~name expanded version of SITELIB, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+/* SITELIB_STEM:
+ *	This define is SITELIB_EXP with any trailing version-specific component
+ *	removed.  The elements in inc_version_list (inc_version_list.U) can
+ *	be tacked onto this variable to generate a list of directories to search.
+ */
+#define SITELIB "/usr/local/lib/perl5/5.24"		/**/
+#define SITELIB_EXP "/usr/local/lib/perl5/5.24"		/**/
+#define SITELIB_STEM "/usr/local/lib/perl5"		/**/
+
+/* PERL_VENDORARCH:
+ *	If defined, this symbol contains the name of a private library.
+ *	The library is private in the sense that it needn't be in anyone's
+ *	execution path, but it should be accessible by the world.
+ *	It may have a ~ on the front.
+ *	The standard distribution will put nothing in this directory.
+ *	Vendors who distribute perl may wish to place their own
+ *	architecture-dependent modules and extensions in this directory with
+ *		MakeMaker Makefile.PL INSTALLDIRS=vendor
+ *	or equivalent.  See INSTALL for details.
+ */
+/* PERL_VENDORARCH_EXP:
+ *	This symbol contains the ~name expanded version of PERL_VENDORARCH, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+/*#define PERL_VENDORARCH ""		/ **/
+/*#define PERL_VENDORARCH_EXP ""		/ **/
+
+/* PERL_VENDORLIB_EXP:
+ *	This symbol contains the ~name expanded version of VENDORLIB, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+/* PERL_VENDORLIB_STEM:
+ *	This define is PERL_VENDORLIB_EXP with any trailing version-specific component
+ *	removed.  The elements in inc_version_list (inc_version_list.U) can
+ *	be tacked onto this variable to generate a list of directories to search.
+ */
+/*#define PERL_VENDORLIB_EXP ""		/ **/
+/*#define PERL_VENDORLIB_STEM ""		/ **/
+
+/* OSNAME:
+ *	This symbol contains the name of the operating system, as determined
+ *	by Configure.  You shouldn't rely on it too much; the specific
+ *	feature tests from Configure are generally more reliable.
+ */
+/* OSVERS:
+ *	This symbol contains the version of the operating system, as determined
+ *	by Configure.  You shouldn't rely on it too much; the specific
+ *	feature tests from Configure are generally more reliable.
+ */
+#define OSNAME "unknown"		/**/
+#define OSVERS "unknown"		/**/
+
 /* CAT2:
  *	This macro concatenates 2 tokens together.
  */
@@ -1053,25 +1598,6 @@
  */
 /*#define HAS_ACCESS		/ **/
 
-/* HAS_ACCESSX:
- *	This symbol, if defined, indicates that the accessx routine is
- *	available to do extended access checks.
- */
-/*#define HAS_ACCESSX		/ **/
-
-/* HAS_ASCTIME_R:
- *	This symbol, if defined, indicates that the asctime_r routine
- *	is available to asctime re-entrantly.
- */
-/* ASCTIME_R_PROTO:
- *	This symbol encodes the prototype of asctime_r.
- *	It is zero if d_asctime_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_asctime_r
- *	is defined.
- */
-/*#define HAS_ASCTIME_R	   / **/
-#define ASCTIME_R_PROTO 0	   /**/
-
 /* HASATTRIBUTE_FORMAT:
  *	Can we handle GCC attribute for checking printf-style formats
  */
@@ -1116,33 +1642,6 @@
  */
 /*#define HAS_BACKTRACE	/ **/
 
-/* CASTI32:
- *	This symbol is defined if the C compiler can cast negative
- *	or large floating point numbers to 32-bit ints.
- */
-/*#define	CASTI32		/ **/
-
-/* CASTNEGFLOAT:
- *	This symbol is defined if the C compiler can cast negative
- *	numbers to unsigned longs, ints and shorts.
- */
-/* CASTFLAGS:
- *	This symbol contains flags that say what difficulties the compiler
- *	has casting odd floating values to unsigned long:
- *		0 = ok
- *		1 = couldn't cast < 0
- *		2 = couldn't cast >= 0x80000000
- *		4 = couldn't cast in argument expression list
- */
-/*#define	CASTNEGFLOAT		/ **/
-#define CASTFLAGS 0		/**/
-
-/* VOID_CLOSEDIR:
- *	This symbol, if defined, indicates that the closedir() routine
- *	does not return a value.
- */
-/*#define VOID_CLOSEDIR		/ **/
-
 /* HASCONST:
  *	This symbol, if defined, indicates that this C compiler knows about
  *	the const type. There is no need to actually test for that symbol
@@ -1154,19 +1653,6 @@
 #define const
 #endif
 
-/* HAS_CRYPT_R:
- *	This symbol, if defined, indicates that the crypt_r routine
- *	is available to crypt re-entrantly.
- */
-/* CRYPT_R_PROTO:
- *	This symbol encodes the prototype of crypt_r.
- *	It is zero if d_crypt_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_crypt_r
- *	is defined.
- */
-/*#define HAS_CRYPT_R	   / **/
-#define CRYPT_R_PROTO 0	   /**/
-
 /* HAS_CSH:
  *	This symbol, if defined, indicates that the C-shell exists.
  */
@@ -1178,32 +1664,6 @@
 #define CSH ""	/**/
 #endif
 
-/* HAS_CTERMID_R:
- *	This symbol, if defined, indicates that the ctermid_r routine
- *	is available to ctermid re-entrantly.
- */
-/* CTERMID_R_PROTO:
- *	This symbol encodes the prototype of ctermid_r.
- *	It is zero if d_ctermid_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctermid_r
- *	is defined.
- */
-/*#define HAS_CTERMID_R	   / **/
-#define CTERMID_R_PROTO 0	   /**/
-
-/* HAS_CTIME_R:
- *	This symbol, if defined, indicates that the ctime_r routine
- *	is available to ctime re-entrantly.
- */
-/* CTIME_R_PROTO:
- *	This symbol encodes the prototype of ctime_r.
- *	It is zero if d_ctime_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctime_r
- *	is defined.
- */
-/*#define HAS_CTIME_R	   / **/
-#define CTIME_R_PROTO 0	   /**/
-
 /* HAS_DLADDR:
  *	This symbol, if defined, indicates that the dladdr() routine is
  *	available to query dynamic linker information for an address.
@@ -1231,221 +1691,54 @@
 /*#define SETUID_SCRIPTS_ARE_SECURE_NOW	/ **/
 /*#define DOSUID		/ **/
 
-/* HAS_DRAND48_R:
- *	This symbol, if defined, indicates that the drand48_r routine
- *	is available to drand48 re-entrantly.
- */
-/* DRAND48_R_PROTO:
- *	This symbol encodes the prototype of drand48_r.
- *	It is zero if d_drand48_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_drand48_r
- *	is defined.
- */
-/*#define HAS_DRAND48_R	   / **/
-#define DRAND48_R_PROTO 0	   /**/
-
-/* HAS_DRAND48_PROTO:
- *	This symbol, if defined, indicates that the system provides
- *	a prototype for the drand48() function.  Otherwise, it is up
- *	to the program to supply one.  A good guess is
- *		extern double drand48(void);
- */
-/*#define	HAS_DRAND48_PROTO	/ **/
-
-/* HAS_EACCESS:
- *	This symbol, if defined, indicates that the eaccess routine is
- *	available to do extended access checks.
- */
-/*#define HAS_EACCESS		/ **/
-
 /* HAS_ENDGRENT:
  *	This symbol, if defined, indicates that the getgrent routine is
  *	available for finalizing sequential access of the group database.
  */
 /*#define HAS_ENDGRENT		/ **/
 
-/* HAS_ENDGRENT_R:
- *	This symbol, if defined, indicates that the endgrent_r routine
- *	is available to endgrent re-entrantly.
- */
-/* ENDGRENT_R_PROTO:
- *	This symbol encodes the prototype of endgrent_r.
- *	It is zero if d_endgrent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endgrent_r
- *	is defined.
- */
-/*#define HAS_ENDGRENT_R	   / **/
-#define ENDGRENT_R_PROTO 0	   /**/
-
 /* HAS_ENDHOSTENT:
  *	This symbol, if defined, indicates that the endhostent() routine is
  *	available to close whatever was being used for host queries.
  */
 /*#define HAS_ENDHOSTENT		/ **/
 
-/* HAS_ENDHOSTENT_R:
- *	This symbol, if defined, indicates that the endhostent_r routine
- *	is available to endhostent re-entrantly.
- */
-/* ENDHOSTENT_R_PROTO:
- *	This symbol encodes the prototype of endhostent_r.
- *	It is zero if d_endhostent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endhostent_r
- *	is defined.
- */
-/*#define HAS_ENDHOSTENT_R	   / **/
-#define ENDHOSTENT_R_PROTO 0	   /**/
-
 /* HAS_ENDNETENT:
  *	This symbol, if defined, indicates that the endnetent() routine is
  *	available to close whatever was being used for network queries.
  */
 /*#define HAS_ENDNETENT		/ **/
 
-/* HAS_ENDNETENT_R:
- *	This symbol, if defined, indicates that the endnetent_r routine
- *	is available to endnetent re-entrantly.
- */
-/* ENDNETENT_R_PROTO:
- *	This symbol encodes the prototype of endnetent_r.
- *	It is zero if d_endnetent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endnetent_r
- *	is defined.
- */
-/*#define HAS_ENDNETENT_R	   / **/
-#define ENDNETENT_R_PROTO 0	   /**/
-
 /* HAS_ENDPROTOENT:
  *	This symbol, if defined, indicates that the endprotoent() routine is
  *	available to close whatever was being used for protocol queries.
  */
 /*#define HAS_ENDPROTOENT		/ **/
 
-/* HAS_ENDPROTOENT_R:
- *	This symbol, if defined, indicates that the endprotoent_r routine
- *	is available to endprotoent re-entrantly.
- */
-/* ENDPROTOENT_R_PROTO:
- *	This symbol encodes the prototype of endprotoent_r.
- *	It is zero if d_endprotoent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endprotoent_r
- *	is defined.
- */
-/*#define HAS_ENDPROTOENT_R	   / **/
-#define ENDPROTOENT_R_PROTO 0	   /**/
-
 /* HAS_ENDPWENT:
  *	This symbol, if defined, indicates that the getgrent routine is
  *	available for finalizing sequential access of the passwd database.
  */
 /*#define HAS_ENDPWENT		/ **/
 
-/* HAS_ENDPWENT_R:
- *	This symbol, if defined, indicates that the endpwent_r routine
- *	is available to endpwent re-entrantly.
- */
-/* ENDPWENT_R_PROTO:
- *	This symbol encodes the prototype of endpwent_r.
- *	It is zero if d_endpwent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endpwent_r
- *	is defined.
- */
-/*#define HAS_ENDPWENT_R	   / **/
-#define ENDPWENT_R_PROTO 0	   /**/
-
 /* HAS_ENDSERVENT:
  *	This symbol, if defined, indicates that the endservent() routine is
  *	available to close whatever was being used for service queries.
  */
 /*#define HAS_ENDSERVENT		/ **/
 
-/* HAS_ENDSERVENT_R:
- *	This symbol, if defined, indicates that the endservent_r routine
- *	is available to endservent re-entrantly.
- */
-/* ENDSERVENT_R_PROTO:
- *	This symbol encodes the prototype of endservent_r.
- *	It is zero if d_endservent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endservent_r
- *	is defined.
- */
-/*#define HAS_ENDSERVENT_R	   / **/
-#define ENDSERVENT_R_PROTO 0	   /**/
-
-/* HAS_FD_SET:
- *	This symbol, when defined, indicates presence of the fd_set typedef
- *	in <sys/types.h>
- */
-/*#define HAS_FD_SET	/ **/
-
 /* FLEXFILENAMES:
  *	This symbol, if defined, indicates that the system supports filenames
  *	longer than 14 characters.
  */
 /*#define	FLEXFILENAMES		/ **/
 
-/* Gconvert:
- *	This preprocessor macro is defined to convert a floating point
- *	number to a string without a trailing decimal point.  This
- *	emulates the behavior of sprintf("%g"), but is sometimes much more
- *	efficient.  If gconvert() is not available, but gcvt() drops the
- *	trailing decimal point, then gcvt() is used.  If all else fails,
- *	a macro using sprintf("%g") is used. Arguments for the Gconvert
- *	macro are: value, number of digits, whether trailing zeros should
- *	be retained, and the output buffer.
- *	The usual values are:
- *		d_Gconvert='gconvert((x),(n),(t),(b))'
- *		d_Gconvert='gcvt((x),(n),(b))'
- *		d_Gconvert='sprintf((b),"%.*g",(n),(x))'
- *	The last two assume trailing zeros should not be kept.
- */
-#define Gconvert(x,n,t,b) sprintf((b),"%.*g",(n),(x))
-
 /* HAS_GETGRENT:
  *	This symbol, if defined, indicates that the getgrent routine is
  *	available for sequential access of the group database.
  */
 /*#define HAS_GETGRENT		/ **/
 
-/* HAS_GETGRENT_R:
- *	This symbol, if defined, indicates that the getgrent_r routine
- *	is available to getgrent re-entrantly.
- */
-/* GETGRENT_R_PROTO:
- *	This symbol encodes the prototype of getgrent_r.
- *	It is zero if d_getgrent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrent_r
- *	is defined.
- */
-/*#define HAS_GETGRENT_R	   / **/
-#define GETGRENT_R_PROTO 0	   /**/
-
-/* HAS_GETGRGID_R:
- *	This symbol, if defined, indicates that the getgrgid_r routine
- *	is available to getgrgid re-entrantly.
- */
-/* GETGRGID_R_PROTO:
- *	This symbol encodes the prototype of getgrgid_r.
- *	It is zero if d_getgrgid_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrgid_r
- *	is defined.
- */
-/*#define HAS_GETGRGID_R	   / **/
-#define GETGRGID_R_PROTO 0	   /**/
-
-/* HAS_GETGRNAM_R:
- *	This symbol, if defined, indicates that the getgrnam_r routine
- *	is available to getgrnam re-entrantly.
- */
-/* GETGRNAM_R_PROTO:
- *	This symbol encodes the prototype of getgrnam_r.
- *	It is zero if d_getgrnam_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrnam_r
- *	is defined.
- */
-/*#define HAS_GETGRNAM_R	   / **/
-#define GETGRNAM_R_PROTO 0	   /**/
-
 /* HAS_GETHOSTBYADDR:
  *	This symbol, if defined, indicates that the gethostbyaddr() routine is
  *	available to look up hosts by their IP addresses.
@@ -1493,66 +1786,6 @@
 #define PHOSTNAME "/bin/hostname"	/* How to get the host name */
 #endif
 
-/* HAS_GETHOSTBYADDR_R:
- *	This symbol, if defined, indicates that the gethostbyaddr_r routine
- *	is available to gethostbyaddr re-entrantly.
- */
-/* GETHOSTBYADDR_R_PROTO:
- *	This symbol encodes the prototype of gethostbyaddr_r.
- *	It is zero if d_gethostbyaddr_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyaddr_r
- *	is defined.
- */
-/*#define HAS_GETHOSTBYADDR_R	   / **/
-#define GETHOSTBYADDR_R_PROTO 0	   /**/
-
-/* HAS_GETHOSTBYNAME_R:
- *	This symbol, if defined, indicates that the gethostbyname_r routine
- *	is available to gethostbyname re-entrantly.
- */
-/* GETHOSTBYNAME_R_PROTO:
- *	This symbol encodes the prototype of gethostbyname_r.
- *	It is zero if d_gethostbyname_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyname_r
- *	is defined.
- */
-/*#define HAS_GETHOSTBYNAME_R	   / **/
-#define GETHOSTBYNAME_R_PROTO 0	   /**/
-
-/* HAS_GETHOSTENT_R:
- *	This symbol, if defined, indicates that the gethostent_r routine
- *	is available to gethostent re-entrantly.
- */
-/* GETHOSTENT_R_PROTO:
- *	This symbol encodes the prototype of gethostent_r.
- *	It is zero if d_gethostent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostent_r
- *	is defined.
- */
-/*#define HAS_GETHOSTENT_R	   / **/
-#define GETHOSTENT_R_PROTO 0	   /**/
-
-/* HAS_GETHOST_PROTOS:
- *	This symbol, if defined, indicates that <netdb.h> includes
- *	prototypes for gethostent(), gethostbyname(), and
- *	gethostbyaddr().  Otherwise, it is up to the program to guess
- *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
- */
-/*#define	HAS_GETHOST_PROTOS	/ **/
-
-/* HAS_GETLOGIN_R:
- *	This symbol, if defined, indicates that the getlogin_r routine
- *	is available to getlogin re-entrantly.
- */
-/* GETLOGIN_R_PROTO:
- *	This symbol encodes the prototype of getlogin_r.
- *	It is zero if d_getlogin_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getlogin_r
- *	is defined.
- */
-/*#define HAS_GETLOGIN_R	   / **/
-#define GETLOGIN_R_PROTO 0	   /**/
-
 /* HAS_GETNETBYADDR:
  *	This symbol, if defined, indicates that the getnetbyaddr() routine is
  *	available to look up networks by their IP addresses.
@@ -1571,60 +1804,6 @@
  */
 /*#define HAS_GETNETENT		/ **/
 
-/* HAS_GETNETBYADDR_R:
- *	This symbol, if defined, indicates that the getnetbyaddr_r routine
- *	is available to getnetbyaddr re-entrantly.
- */
-/* GETNETBYADDR_R_PROTO:
- *	This symbol encodes the prototype of getnetbyaddr_r.
- *	It is zero if d_getnetbyaddr_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyaddr_r
- *	is defined.
- */
-/*#define HAS_GETNETBYADDR_R	   / **/
-#define GETNETBYADDR_R_PROTO 0	   /**/
-
-/* HAS_GETNETBYNAME_R:
- *	This symbol, if defined, indicates that the getnetbyname_r routine
- *	is available to getnetbyname re-entrantly.
- */
-/* GETNETBYNAME_R_PROTO:
- *	This symbol encodes the prototype of getnetbyname_r.
- *	It is zero if d_getnetbyname_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyname_r
- *	is defined.
- */
-/*#define HAS_GETNETBYNAME_R	   / **/
-#define GETNETBYNAME_R_PROTO 0	   /**/
-
-/* HAS_GETNETENT_R:
- *	This symbol, if defined, indicates that the getnetent_r routine
- *	is available to getnetent re-entrantly.
- */
-/* GETNETENT_R_PROTO:
- *	This symbol encodes the prototype of getnetent_r.
- *	It is zero if d_getnetent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetent_r
- *	is defined.
- */
-/*#define HAS_GETNETENT_R	   / **/
-#define GETNETENT_R_PROTO 0	   /**/
-
-/* HAS_GETNET_PROTOS:
- *	This symbol, if defined, indicates that <netdb.h> includes
- *	prototypes for getnetent(), getnetbyname(), and
- *	getnetbyaddr().  Otherwise, it is up to the program to guess
- *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
- */
-/*#define	HAS_GETNET_PROTOS	/ **/
-
-/* HAS_GETPAGESIZE:
- *	This symbol, if defined, indicates that the getpagesize system call
- *	is available to get system page size, which is the granularity of
- *	many memory management calls.
- */
-/*#define HAS_GETPAGESIZE		/ **/
-
 /* HAS_GETPROTOENT:
  *	This symbol, if defined, indicates that the getprotoent() routine is
  *	available to look up protocols in some data base or another.
@@ -1653,53 +1832,6 @@
 /*#define HAS_GETPROTOBYNAME		/ **/
 /*#define HAS_GETPROTOBYNUMBER		/ **/
 
-/* HAS_GETPROTOBYNAME_R:
- *	This symbol, if defined, indicates that the getprotobyname_r routine
- *	is available to getprotobyname re-entrantly.
- */
-/* GETPROTOBYNAME_R_PROTO:
- *	This symbol encodes the prototype of getprotobyname_r.
- *	It is zero if d_getprotobyname_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobyname_r
- *	is defined.
- */
-/*#define HAS_GETPROTOBYNAME_R	   / **/
-#define GETPROTOBYNAME_R_PROTO 0	   /**/
-
-/* HAS_GETPROTOBYNUMBER_R:
- *	This symbol, if defined, indicates that the getprotobynumber_r routine
- *	is available to getprotobynumber re-entrantly.
- */
-/* GETPROTOBYNUMBER_R_PROTO:
- *	This symbol encodes the prototype of getprotobynumber_r.
- *	It is zero if d_getprotobynumber_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobynumber_r
- *	is defined.
- */
-/*#define HAS_GETPROTOBYNUMBER_R	   / **/
-#define GETPROTOBYNUMBER_R_PROTO 0	   /**/
-
-/* HAS_GETPROTOENT_R:
- *	This symbol, if defined, indicates that the getprotoent_r routine
- *	is available to getprotoent re-entrantly.
- */
-/* GETPROTOENT_R_PROTO:
- *	This symbol encodes the prototype of getprotoent_r.
- *	It is zero if d_getprotoent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotoent_r
- *	is defined.
- */
-/*#define HAS_GETPROTOENT_R	   / **/
-#define GETPROTOENT_R_PROTO 0	   /**/
-
-/* HAS_GETPROTO_PROTOS:
- *	This symbol, if defined, indicates that <netdb.h> includes
- *	prototypes for getprotoent(), getprotobyname(), and
- *	getprotobyaddr().  Otherwise, it is up to the program to guess
- *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
- */
-/*#define	HAS_GETPROTO_PROTOS	/ **/
-
 /* HAS_GETPWENT:
  *	This symbol, if defined, indicates that the getpwent routine is
  *	available for sequential access of the passwd database.
@@ -1707,111 +1839,12 @@
  */
 /*#define HAS_GETPWENT		/ **/
 
-/* HAS_GETPWENT_R:
- *	This symbol, if defined, indicates that the getpwent_r routine
- *	is available to getpwent re-entrantly.
- */
-/* GETPWENT_R_PROTO:
- *	This symbol encodes the prototype of getpwent_r.
- *	It is zero if d_getpwent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwent_r
- *	is defined.
- */
-/*#define HAS_GETPWENT_R	   / **/
-#define GETPWENT_R_PROTO 0	   /**/
-
-/* HAS_GETPWNAM_R:
- *	This symbol, if defined, indicates that the getpwnam_r routine
- *	is available to getpwnam re-entrantly.
- */
-/* GETPWNAM_R_PROTO:
- *	This symbol encodes the prototype of getpwnam_r.
- *	It is zero if d_getpwnam_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwnam_r
- *	is defined.
- */
-/*#define HAS_GETPWNAM_R	   / **/
-#define GETPWNAM_R_PROTO 0	   /**/
-
-/* HAS_GETPWUID_R:
- *	This symbol, if defined, indicates that the getpwuid_r routine
- *	is available to getpwuid re-entrantly.
- */
-/* GETPWUID_R_PROTO:
- *	This symbol encodes the prototype of getpwuid_r.
- *	It is zero if d_getpwuid_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwuid_r
- *	is defined.
- */
-/*#define HAS_GETPWUID_R	   / **/
-#define GETPWUID_R_PROTO 0	   /**/
-
 /* HAS_GETSERVENT:
  *	This symbol, if defined, indicates that the getservent() routine is
  *	available to look up network services in some data base or another.
  */
 /*#define HAS_GETSERVENT		/ **/
 
-/* HAS_GETSERVBYNAME_R:
- *	This symbol, if defined, indicates that the getservbyname_r routine
- *	is available to getservbyname re-entrantly.
- */
-/* GETSERVBYNAME_R_PROTO:
- *	This symbol encodes the prototype of getservbyname_r.
- *	It is zero if d_getservbyname_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyname_r
- *	is defined.
- */
-/*#define HAS_GETSERVBYNAME_R	   / **/
-#define GETSERVBYNAME_R_PROTO 0	   /**/
-
-/* HAS_GETSERVBYPORT_R:
- *	This symbol, if defined, indicates that the getservbyport_r routine
- *	is available to getservbyport re-entrantly.
- */
-/* GETSERVBYPORT_R_PROTO:
- *	This symbol encodes the prototype of getservbyport_r.
- *	It is zero if d_getservbyport_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyport_r
- *	is defined.
- */
-/*#define HAS_GETSERVBYPORT_R	   / **/
-#define GETSERVBYPORT_R_PROTO 0	   /**/
-
-/* HAS_GETSERVENT_R:
- *	This symbol, if defined, indicates that the getservent_r routine
- *	is available to getservent re-entrantly.
- */
-/* GETSERVENT_R_PROTO:
- *	This symbol encodes the prototype of getservent_r.
- *	It is zero if d_getservent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservent_r
- *	is defined.
- */
-/*#define HAS_GETSERVENT_R	   / **/
-#define GETSERVENT_R_PROTO 0	   /**/
-
-/* HAS_GETSERV_PROTOS:
- *	This symbol, if defined, indicates that <netdb.h> includes
- *	prototypes for getservent(), getservbyname(), and
- *	getservbyaddr().  Otherwise, it is up to the program to guess
- *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
- */
-/*#define	HAS_GETSERV_PROTOS	/ **/
-
-/* HAS_GETSPNAM_R:
- *	This symbol, if defined, indicates that the getspnam_r routine
- *	is available to getspnam re-entrantly.
- */
-/* GETSPNAM_R_PROTO:
- *	This symbol encodes the prototype of getspnam_r.
- *	It is zero if d_getspnam_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getspnam_r
- *	is defined.
- */
-/*#define HAS_GETSPNAM_R	   / **/
-#define GETSPNAM_R_PROTO 0	   /**/
-
 /* HAS_GETSERVBYNAME:
  *	This symbol, if defined, indicates that the getservbyname()
  *	routine is available to look up services by their name.
@@ -1823,29 +1856,6 @@
 /*#define HAS_GETSERVBYNAME		/ **/
 /*#define HAS_GETSERVBYPORT		/ **/
 
-/* HAS_GMTIME_R:
- *	This symbol, if defined, indicates that the gmtime_r routine
- *	is available to gmtime re-entrantly.
- */
-/* GMTIME_R_PROTO:
- *	This symbol encodes the prototype of gmtime_r.
- *	It is zero if d_gmtime_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gmtime_r
- *	is defined.
- */
-/*#define HAS_GMTIME_R	   / **/
-#define GMTIME_R_PROTO 0	   /**/
-
-/* HAS_GNULIBC:
- *	This symbol, if defined, indicates to the C program that
- *	the GNU C library is being used.  A better check is to use
- *	the __GLIBC__ and __GLIBC_MINOR__ symbols supplied with glibc.
- */
-/*#define HAS_GNULIBC  	/ **/
-#if defined(HAS_GNULIBC) && !defined(_GNU_SOURCE)
-#   define _GNU_SOURCE
-#endif
-
 /* HAS_HTONL:
  *	This symbol, if defined, indicates that the htonl() routine (and
  *	friends htons() ntohl() ntohs()) are available to do network
@@ -1871,45 +1881,6 @@
 /*#define HAS_NTOHL		/ **/
 /*#define HAS_NTOHS		/ **/
 
-/* HAS_ISASCII:
- *	This manifest constant lets the C program know that isascii
- *	is available.
- */
-/*#define HAS_ISASCII		/ **/
-
-/* HAS_LCHOWN:
- *	This symbol, if defined, indicates that the lchown routine is
- *	available to operate on a symbolic link (instead of following the
- *	link).
- */
-/*#define HAS_LCHOWN		/ **/
-
-/* HAS_LOCALTIME_R:
- *	This symbol, if defined, indicates that the localtime_r routine
- *	is available to localtime re-entrantly.
- */
-/* LOCALTIME_R_NEEDS_TZSET:
- *	Many libc's localtime_r implementations do not call tzset,
- *	making them differ from localtime(), and making timezone
- *	changes using $ENV{TZ} without explicitly calling tzset
- *	impossible. This symbol makes us call tzset before localtime_r
- */
-/*#define LOCALTIME_R_NEEDS_TZSET / **/
-#ifdef LOCALTIME_R_NEEDS_TZSET
-#define L_R_TZSET tzset(),
-#else
-#define L_R_TZSET
-#endif
-
-/* LOCALTIME_R_PROTO:
- *	This symbol encodes the prototype of localtime_r.
- *	It is zero if d_localtime_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_localtime_r
- *	is defined.
- */
-/*#define HAS_LOCALTIME_R	   / **/
-#define LOCALTIME_R_PROTO 0	   /**/
-
 /* HAS_LONG_DOUBLE:
  *	This symbol will be defined if the C compiler supports long
  *	doubles.
@@ -1917,7 +1888,7 @@
 /* LONG_DOUBLESIZE:
  *	This symbol contains the size of a long double, so that the
  *	C preprocessor can make decisions based on it.  It is only
- *	defined if the system supports long doubles.   Note that this
+ *	defined if the system supports long doubles.  Note that this
  *	is sizeof(long double), which may include unused bytes.
  */
 /* HAS_LDEXPL:
@@ -1932,8 +1903,10 @@
  *	LONG_DOUBLE_IS_IEEE_754_128_BIT_BIG_ENDIAN
  *	LONG_DOUBLE_IS_X86_80_BIT_LITTLE_ENDIAN
  *	LONG_DOUBLE_IS_X86_80_BIT_BIG_ENDIAN
- *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN
- *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN
+ *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE
+ *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE
+ *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_BE
+ *	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_LE
  *	LONG_DOUBLE_IS_UNKNOWN_FORMAT
  *	It is only defined if the system supports long doubles.
  */
@@ -1947,9 +1920,13 @@
 #define LONG_DOUBLE_IS_IEEE_754_128_BIT_BIG_ENDIAN	2
 #define LONG_DOUBLE_IS_X86_80_BIT_LITTLE_ENDIAN		3
 #define LONG_DOUBLE_IS_X86_80_BIT_BIG_ENDIAN		4
-#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN	5
-#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN	6
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE	5
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE	6
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_BE	7
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_LE	8
 #define LONG_DOUBLE_IS_UNKNOWN_FORMAT			-1
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LITTLE_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_LE_LE /* back-compat */
+#define LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BIG_ENDIAN	LONG_DOUBLE_IS_DOUBLEDOUBLE_128_BIT_BE_BE /* back-compat */
 #endif
 
 /* HAS_LONG_LONG:
@@ -1965,14 +1942,6 @@
 #define LONGLONGSIZE 8		/**/
 #endif
 
-/* HAS_LSEEK_PROTO:
- *	This symbol, if defined, indicates that the system provides
- *	a prototype for the lseek() function.  Otherwise, it is up
- *	to the program to supply one.  A good guess is
- *		extern off_t lseek(int, off_t, int);
- */
-/*#define	HAS_LSEEK_PROTO	/ **/
-
 /* HAS_MEMCHR:
  *	This symbol, if defined, indicates that the memchr routine is available
  *	to locate characters within a C string.
@@ -2004,109 +1973,6 @@
  */
 /*#define HAS_MSG		/ **/
 
-/* HAS_OPEN3:
- *	This manifest constant lets the C program know that the three
- *	argument form of open(2) is available.
- */
-/*#define HAS_OPEN3		/ **/
-
-/* OLD_PTHREAD_CREATE_JOINABLE:
- *	This symbol, if defined, indicates how to create pthread
- *	in joinable (aka undetached) state.  NOTE: not defined
- *	if pthread.h already has defined PTHREAD_CREATE_JOINABLE
- *	(the new version of the constant).
- *	If defined, known values are PTHREAD_CREATE_UNDETACHED
- *	and __UNDETACHED.
- */
-/*#define OLD_PTHREAD_CREATE_JOINABLE  / **/
-
-/* HAS_PTHREAD_ATFORK:
- *	This symbol, if defined, indicates that the pthread_atfork routine
- *	is available to setup fork handlers.
- */
-/*#define HAS_PTHREAD_ATFORK		/ **/
-
-/* HAS_PTHREAD_YIELD:
- *	This symbol, if defined, indicates that the pthread_yield
- *	routine is available to yield the execution of the current
- *	thread.	 sched_yield is preferable to pthread_yield.
- */
-/* SCHED_YIELD:
- *	This symbol defines the way to yield the execution of
- *	the current thread.  Known ways are sched_yield,
- *	pthread_yield, and pthread_yield with NULL.
- */
-/* HAS_SCHED_YIELD:
- *	This symbol, if defined, indicates that the sched_yield
- *	routine is available to yield the execution of the current
- *	thread.	 sched_yield is preferable to pthread_yield.
- */
-/*#define HAS_PTHREAD_YIELD	/ **/
-#define SCHED_YIELD	sched_yield()	/**/
-/*#define HAS_SCHED_YIELD	/ **/
-
-/* HAS_RANDOM_R:
- *	This symbol, if defined, indicates that the random_r routine
- *	is available to random re-entrantly.
- */
-/* RANDOM_R_PROTO:
- *	This symbol encodes the prototype of random_r.
- *	It is zero if d_random_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_random_r
- *	is defined.
- */
-/*#define HAS_RANDOM_R	   / **/
-#define RANDOM_R_PROTO 0	   /**/
-
-/* HAS_READDIR64_R:
- *	This symbol, if defined, indicates that the readdir64_r routine
- *	is available to readdir64 re-entrantly.
- */
-/* READDIR64_R_PROTO:
- *	This symbol encodes the prototype of readdir64_r.
- *	It is zero if d_readdir64_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir64_r
- *	is defined.
- */
-/*#define HAS_READDIR64_R	   / **/
-#define READDIR64_R_PROTO 0	   /**/
-
-/* HAS_READDIR_R:
- *	This symbol, if defined, indicates that the readdir_r routine
- *	is available to readdir re-entrantly.
- */
-/* READDIR_R_PROTO:
- *	This symbol encodes the prototype of readdir_r.
- *	It is zero if d_readdir_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir_r
- *	is defined.
- */
-/*#define HAS_READDIR_R	   / **/
-#define READDIR_R_PROTO 0	   /**/
-
-/* HAS_SAFE_BCOPY:
- *	This symbol, if defined, indicates that the bcopy routine is available
- *	to copy potentially overlapping memory blocks. Normally, you should
- *	probably use memmove() or memcpy(). If neither is defined, roll your
- *	own version.
- */
-/*#define HAS_SAFE_BCOPY	/ **/
-
-/* HAS_SAFE_MEMCPY:
- *	This symbol, if defined, indicates that the memcpy routine is available
- *	to copy potentially overlapping memory blocks.  If you need to
- *	copy overlapping memory blocks, you should check HAS_MEMMOVE and
- *	use memmove() instead, if available.
- */
-/*#define HAS_SAFE_MEMCPY	/ **/
-
-/* HAS_SANE_MEMCMP:
- *	This symbol, if defined, indicates that the memcmp routine is available
- *	and can be used to compare relative magnitudes of chars with their high
- *	bits set.  If it is not defined, roll your own version.
- */
-/*#define HAS_SANE_MEMCMP	/ **/
-
 /* HAS_SEM:
  *	This symbol, if defined, indicates that the entire sem*(2) library is
  *	supported.
@@ -2119,70 +1985,18 @@
  */
 /*#define HAS_SETGRENT		/ **/
 
-/* HAS_SETGRENT_R:
- *	This symbol, if defined, indicates that the setgrent_r routine
- *	is available to setgrent re-entrantly.
- */
-/* SETGRENT_R_PROTO:
- *	This symbol encodes the prototype of setgrent_r.
- *	It is zero if d_setgrent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setgrent_r
- *	is defined.
- */
-/*#define HAS_SETGRENT_R	   / **/
-#define SETGRENT_R_PROTO 0	   /**/
-
 /* HAS_SETHOSTENT:
  *	This symbol, if defined, indicates that the sethostent() routine is
  *	available.
  */
 /*#define HAS_SETHOSTENT		/ **/
 
-/* HAS_SETHOSTENT_R:
- *	This symbol, if defined, indicates that the sethostent_r routine
- *	is available to sethostent re-entrantly.
- */
-/* SETHOSTENT_R_PROTO:
- *	This symbol encodes the prototype of sethostent_r.
- *	It is zero if d_sethostent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_sethostent_r
- *	is defined.
- */
-/*#define HAS_SETHOSTENT_R	   / **/
-#define SETHOSTENT_R_PROTO 0	   /**/
-
-/* HAS_SETLOCALE_R:
- *	This symbol, if defined, indicates that the setlocale_r routine
- *	is available to setlocale re-entrantly.
- */
-/* SETLOCALE_R_PROTO:
- *	This symbol encodes the prototype of setlocale_r.
- *	It is zero if d_setlocale_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setlocale_r
- *	is defined.
- */
-/*#define HAS_SETLOCALE_R	   / **/
-#define SETLOCALE_R_PROTO 0	   /**/
-
 /* HAS_SETNETENT:
  *	This symbol, if defined, indicates that the setnetent() routine is
  *	available.
  */
 /*#define HAS_SETNETENT		/ **/
 
-/* HAS_SETNETENT_R:
- *	This symbol, if defined, indicates that the setnetent_r routine
- *	is available to setnetent re-entrantly.
- */
-/* SETNETENT_R_PROTO:
- *	This symbol encodes the prototype of setnetent_r.
- *	It is zero if d_setnetent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setnetent_r
- *	is defined.
- */
-/*#define HAS_SETNETENT_R	   / **/
-#define SETNETENT_R_PROTO 0	   /**/
-
 /* HAS_SETPROTOENT:
  *	This symbol, if defined, indicates that the setprotoent() routine is
  *	available.
@@ -2201,57 +2015,18 @@
 /*#define HAS_SETPGRP		/ **/
 /*#define USE_BSD_SETPGRP	/ **/
 
-/* HAS_SETPROTOENT_R:
- *	This symbol, if defined, indicates that the setprotoent_r routine
- *	is available to setprotoent re-entrantly.
- */
-/* SETPROTOENT_R_PROTO:
- *	This symbol encodes the prototype of setprotoent_r.
- *	It is zero if d_setprotoent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setprotoent_r
- *	is defined.
- */
-/*#define HAS_SETPROTOENT_R	   / **/
-#define SETPROTOENT_R_PROTO 0	   /**/
-
 /* HAS_SETPWENT:
  *	This symbol, if defined, indicates that the setpwent routine is
  *	available for initializing sequential access of the passwd database.
  */
 /*#define HAS_SETPWENT		/ **/
 
-/* HAS_SETPWENT_R:
- *	This symbol, if defined, indicates that the setpwent_r routine
- *	is available to setpwent re-entrantly.
- */
-/* SETPWENT_R_PROTO:
- *	This symbol encodes the prototype of setpwent_r.
- *	It is zero if d_setpwent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setpwent_r
- *	is defined.
- */
-/*#define HAS_SETPWENT_R	   / **/
-#define SETPWENT_R_PROTO 0	   /**/
-
 /* HAS_SETSERVENT:
  *	This symbol, if defined, indicates that the setservent() routine is
  *	available.
  */
 /*#define HAS_SETSERVENT		/ **/
 
-/* HAS_SETSERVENT_R:
- *	This symbol, if defined, indicates that the setservent_r routine
- *	is available to setservent re-entrantly.
- */
-/* SETSERVENT_R_PROTO:
- *	This symbol encodes the prototype of setservent_r.
- *	It is zero if d_setservent_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setservent_r
- *	is defined.
- */
-/*#define HAS_SETSERVENT_R	   / **/
-#define SETSERVENT_R_PROTO 0	   /**/
-
 /* HAS_SETVBUF:
  *	This symbol, if defined, indicates that the setvbuf routine is
  *	available to change buffering on an open stdio stream.
@@ -2279,43 +2054,6 @@
 #define Shmat_t void *	/**/
 /*#define HAS_SHMAT_PROTOTYPE	/ **/
 
-/* HAS_SIGACTION:
- *	This symbol, if defined, indicates that Vr4's sigaction() routine
- *	is available.
- */
-/*#define HAS_SIGACTION	/ **/
-
-/* HAS_SIGSETJMP:
- *	This variable indicates to the C program that the sigsetjmp()
- *	routine is available to save the calling process's registers
- *	and stack environment for later use by siglongjmp(), and
- *	to optionally save the process's signal mask.  See
- *	Sigjmp_buf, Sigsetjmp, and Siglongjmp.
- */
-/* Sigjmp_buf:
- *	This is the buffer type to be used with Sigsetjmp and Siglongjmp.
- */
-/* Sigsetjmp:
- *	This macro is used in the same way as sigsetjmp(), but will invoke
- *	traditional setjmp() if sigsetjmp isn't available.
- *	See HAS_SIGSETJMP.
- */
-/* Siglongjmp:
- *	This macro is used in the same way as siglongjmp(), but will invoke
- *	traditional longjmp() if siglongjmp isn't available.
- *	See HAS_SIGSETJMP.
- */
-/*#define HAS_SIGSETJMP	/ **/
-#ifdef HAS_SIGSETJMP
-#define Sigjmp_buf sigjmp_buf
-#define Sigsetjmp(buf,save_mask) sigsetjmp((buf),(save_mask))
-#define Siglongjmp(buf,retval) siglongjmp((buf),(retval))
-#else
-#define Sigjmp_buf jmp_buf
-#define Sigsetjmp(buf,save_mask) setjmp((buf))
-#define Siglongjmp(buf,retval) longjmp((buf),(retval))
-#endif
-
 /* HAS_SOCKET:
  *	This symbol, if defined, indicates that the BSD socket interface is
  *	supported.
@@ -2324,36 +2062,6 @@
  *	This symbol, if defined, indicates that the BSD socketpair() call is
  *	supported.
  */
-/* HAS_MSG_CTRUNC:
- *	This symbol, if defined, indicates that the MSG_CTRUNC is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
-/* HAS_MSG_DONTROUTE:
- *	This symbol, if defined, indicates that the MSG_DONTROUTE is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
-/* HAS_MSG_OOB:
- *	This symbol, if defined, indicates that the MSG_OOB is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
-/* HAS_MSG_PEEK:
- *	This symbol, if defined, indicates that the MSG_PEEK is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
-/* HAS_MSG_PROXY:
- *	This symbol, if defined, indicates that the MSG_PROXY is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
-/* HAS_SCM_RIGHTS:
- *	This symbol, if defined, indicates that the SCM_RIGHTS is supported.
- *	Checking just with #ifdef might not be enough because this symbol
- *	has been known to be an enum.
- */
 /* HAS_SOCKADDR_SA_LEN:
  *	This symbol, if defined, indicates that the struct sockaddr
  *	structure has a member called sa_len, indicating the length of
@@ -2386,12 +2094,6 @@
 /*#define	HAS_SOCKET		/ **/
 /*#define	HAS_SOCKETPAIR	/ **/
 /*#define	HAS_SOCKADDR_SA_LEN	/ **/
-/*#define	HAS_MSG_CTRUNC	/ **/
-/*#define	HAS_MSG_DONTROUTE	/ **/
-/*#define	HAS_MSG_OOB	/ **/
-/*#define	HAS_MSG_PEEK	/ **/
-/*#define	HAS_MSG_PROXY	/ **/
-/*#define	HAS_SCM_RIGHTS	/ **/
 /*#define	HAS_SOCKADDR_IN6	/ **/
 /*#define	HAS_SIN6_SCOPE_ID	/ **/
 /*#define	HAS_IP_MREQ	/ **/
@@ -2399,32 +2101,6 @@
 /*#define	HAS_IPV6_MREQ	/ **/
 /*#define	HAS_IPV6_MREQ_SOURCE	/ **/
 
-/* HAS_SRAND48_R:
- *	This symbol, if defined, indicates that the srand48_r routine
- *	is available to srand48 re-entrantly.
- */
-/* SRAND48_R_PROTO:
- *	This symbol encodes the prototype of srand48_r.
- *	It is zero if d_srand48_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srand48_r
- *	is defined.
- */
-/*#define HAS_SRAND48_R	   / **/
-#define SRAND48_R_PROTO 0	   /**/
-
-/* HAS_SRANDOM_R:
- *	This symbol, if defined, indicates that the srandom_r routine
- *	is available to srandom re-entrantly.
- */
-/* SRANDOM_R_PROTO:
- *	This symbol encodes the prototype of srandom_r.
- *	It is zero if d_srandom_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srandom_r
- *	is defined.
- */
-/*#define HAS_SRANDOM_R	   / **/
-#define SRANDOM_R_PROTO 0	   /**/
-
 /* USE_STAT_BLOCKS:
  *	This symbol is defined if this system has a stat structure declaring
  *	st_blksize and st_blocks.
@@ -2433,97 +2109,6 @@
 /*#define USE_STAT_BLOCKS 	/ **/
 #endif
 
-/* HAS_STATIC_INLINE:
- *	This symbol, if defined, indicates that the C compiler supports
- *	C99-style static inline.  That is, the function can't be called
- *	from another translation unit.
- */
-/* PERL_STATIC_INLINE:
- *	This symbol gives the best-guess incantation to use for static
- *	inline functions.  If HAS_STATIC_INLINE is defined, this will
- *	give C99-style inline.  If HAS_STATIC_INLINE is not defined,
- *	this will give a plain 'static'.  It will always be defined
- *	to something that gives static linkage.
- *	Possibilities include
- *		static inline       (c99)
- *		static __inline__   (gcc -ansi)
- *		static __inline     (MSVC)
- *		static _inline      (older MSVC)
- *		static              (c89 compilers)
- */
-/*#define HAS_STATIC_INLINE				/ **/
-#define PERL_STATIC_INLINE static	/**/
-
-/* USE_STDIO_PTR:
- *	This symbol is defined if the _ptr and _cnt fields (or similar)
- *	of the stdio FILE structure can be used to access the stdio buffer
- *	for a file handle.  If this is defined, then the FILE_ptr(fp)
- *	and FILE_cnt(fp) macros will also be defined and should be used
- *	to access these fields.
- */
-/* FILE_ptr:
- *	This macro is used to access the _ptr field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_PTR is defined.
- */
-/* STDIO_PTR_LVALUE:
- *	This symbol is defined if the FILE_ptr macro can be used as an
- *	lvalue.
- */
-/* FILE_cnt:
- *	This macro is used to access the _cnt field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_PTR is defined.
- */
-/* STDIO_CNT_LVALUE:
- *	This symbol is defined if the FILE_cnt macro can be used as an
- *	lvalue.
- */
-/* STDIO_PTR_LVAL_SETS_CNT:
- *	This symbol is defined if using the FILE_ptr macro as an lvalue
- *	to increase the pointer by n has the side effect of decreasing the
- *	value of File_cnt(fp) by n.
- */
-/* STDIO_PTR_LVAL_NOCHANGE_CNT:
- *	This symbol is defined if using the FILE_ptr macro as an lvalue
- *	to increase the pointer by n leaves File_cnt(fp) unchanged.
- */
-/*#define USE_STDIO_PTR 	/ **/
-#ifdef USE_STDIO_PTR
-#define FILE_ptr(fp)	((fp)->_IO_read_ptr)
-/*#define STDIO_PTR_LVALUE 		/ **/
-#define FILE_cnt(fp)	((fp)->_IO_read_end - (fp)->_IO_read_ptr)
-/*#define STDIO_CNT_LVALUE 		/ **/
-/*#define STDIO_PTR_LVAL_SETS_CNT	/ **/
-/*#define STDIO_PTR_LVAL_NOCHANGE_CNT	/ **/
-#endif
-
-/* USE_STDIO_BASE:
- *	This symbol is defined if the _base field (or similar) of the
- *	stdio FILE structure can be used to access the stdio buffer for
- *	a file handle.  If this is defined, then the FILE_base(fp) macro
- *	will also be defined and should be used to access this field.
- *	Also, the FILE_bufsiz(fp) macro will be defined and should be used
- *	to determine the number of bytes in the buffer.  USE_STDIO_BASE
- *	will never be defined unless USE_STDIO_PTR is.
- */
-/* FILE_base:
- *	This macro is used to access the _base field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_BASE is defined.
- */
-/* FILE_bufsiz:
- *	This macro is used to determine the number of bytes in the I/O
- *	buffer pointed to by _base field (or equivalent) of the FILE
- *	structure pointed to its argument. This macro will always be defined
- *	if USE_STDIO_BASE is defined.
- */
-/*#define USE_STDIO_BASE 	/ **/
-#ifdef USE_STDIO_BASE
-#define FILE_base(fp)	((fp)->_IO_read_base)
-#define FILE_bufsiz(fp)	((fp)->_IO_read_end - (fp)->_IO_read_base)
-#endif
-
 /* USE_STRUCT_COPY:
  *	This symbol, if defined, indicates that this C compiler knows how
  *	to copy structures.  If undefined, you'll need to use a block copy
@@ -2550,69 +2135,12 @@
 /*#define HAS_SYS_ERRLIST	/ **/
 #define Strerror(e) strerror(e)
 
-/* HAS_STRERROR_R:
- *	This symbol, if defined, indicates that the strerror_r routine
- *	is available to strerror re-entrantly.
- */
-/* STRERROR_R_PROTO:
- *	This symbol encodes the prototype of strerror_r.
- *	It is zero if d_strerror_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_strerror_r
- *	is defined.
- */
-/*#define HAS_STRERROR_R	   / **/
-#define STRERROR_R_PROTO 0	   /**/
-
 /* HAS_STRTOUL:
  *	This symbol, if defined, indicates that the strtoul routine is
  *	available to provide conversion of strings to unsigned long.
  */
 #define HAS_STRTOUL	/**/
 
-/* HAS_TIME:
- *	This symbol, if defined, indicates that the time() routine exists.
- */
-/* Time_t:
- *	This symbol holds the type returned by time(). It can be long,
- *	or time_t on BSD sites (in which case <sys/types.h> should be
- *	included).
- */
-#define HAS_TIME		/**/
-#define Time_t time_t		/* Time type */
-
-/* HAS_TIMES:
- *	This symbol, if defined, indicates that the times() routine exists.
- *	Note that this became obsolete on some systems (SUNOS), which now
- * use getrusage(). It may be necessary to include <sys/times.h>.
- */
-/*#define HAS_TIMES		/ **/
-
-/* HAS_TMPNAM_R:
- *	This symbol, if defined, indicates that the tmpnam_r routine
- *	is available to tmpnam re-entrantly.
- */
-/* TMPNAM_R_PROTO:
- *	This symbol encodes the prototype of tmpnam_r.
- *	It is zero if d_tmpnam_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_tmpnam_r
- *	is defined.
- */
-/*#define HAS_TMPNAM_R	   / **/
-#define TMPNAM_R_PROTO 0	   /**/
-
-/* HAS_TTYNAME_R:
- *	This symbol, if defined, indicates that the ttyname_r routine
- *	is available to ttyname re-entrantly.
- */
-/* TTYNAME_R_PROTO:
- *	This symbol encodes the prototype of ttyname_r.
- *	It is zero if d_ttyname_r is undef, and one of the
- *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ttyname_r
- *	is defined.
- */
-/*#define HAS_TTYNAME_R	   / **/
-#define TTYNAME_R_PROTO 0	   /**/
-
 /* HAS_UNION_SEMUN:
  *	This symbol, if defined, indicates that the union semun is
  *	defined by including <sys/sem.h>.  If not, the user code
@@ -2663,64 +2191,6 @@
 #define volatile
 #endif
 
-/* HAS_VPRINTF:
- *	This symbol, if defined, indicates that the vprintf routine is available
- *	to printf with a pointer to an argument list.  If unavailable, you
- *	may need to write your own, probably in terms of _doprnt().
- */
-/* USE_CHAR_VSPRINTF:
- *	This symbol is defined if this system has vsprintf() returning type
- *	(char*).  The trend seems to be to declare it as "int vsprintf()".  It
- *	is up to the package author to declare vsprintf correctly based on the
- *	symbol.
- */
-#define HAS_VPRINTF	/**/
-/*#define USE_CHAR_VSPRINTF 	/ **/
-
-/* DOUBLESIZE:
- *	This symbol contains the size of a double, so that the C preprocessor
- *	can make decisions based on it.
- */
-#define DOUBLESIZE 8		/**/
-
-/* EBCDIC:
- *	This symbol, if defined, indicates that this system uses
- *	EBCDIC encoding.
- */
-/*#define	EBCDIC 		/ **/
-
-/* Fpos_t:
- *	This symbol holds the type used to declare file positions in libc.
- *	It can be fpos_t, long, uint, etc... It may be necessary to include
- *	<sys/types.h> to get any typedef'ed information.
- */
-#define Fpos_t int		/* File position type */
-
-/* Gid_t_f:
- *	This symbol defines the format string used for printing a Gid_t.
- */
-#define	Gid_t_f		"lu"		/**/
-
-/* Gid_t_sign:
- *	This symbol holds the signedness of a Gid_t.
- *	1 for unsigned, -1 for signed.
- */
-#define Gid_t_sign	1		/* GID sign */
-
-/* Gid_t_size:
- *	This symbol holds the size of a Gid_t in bytes.
- */
-#define Gid_t_size 4		/* GID size */
-
-/* Gid_t:
- *	This symbol holds the return type of getgid() and the type of
- *	argument to setrgid() and related functions.  Typically,
- *	it is the type of group ids in the kernel. It can be int, ushort,
- *	gid_t, etc... It may be necessary to include <sys/types.h> to get
- *	any typedef'ed information.
- */
-#define Gid_t int		/* Type for getgid(), etc... */
-
 /* I_DIRENT:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <dirent.h>. Using this symbol also triggers the definition
@@ -2758,12 +2228,6 @@
 /*#define I_GRP		/ **/
 /*#define GRPASSWD	/ **/
 
-/* I_MACH_CTHREADS:
- *     This symbol, if defined, indicates to the C program that it should
- *     include <mach/cthreads.h>.
- */
-/*#define   I_MACH_CTHREADS	/ **/
-
 /* I_NDBM:
  *	This symbol, if defined, indicates that <ndbm.h> exists and should
  *	be included.
@@ -2815,12 +2279,6 @@
  */
 /*#define I_NET_ERRNO		/ **/
 
-/* I_PTHREAD:
- *     This symbol, if defined, indicates to the C program that it should
- *     include <pthread.h>.
- */
-/*#define   I_PTHREAD	/ **/
-
 /* I_PWD:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <pwd.h>.
@@ -2867,18 +2325,6 @@
 /*#define PWGECOS	/ **/
 /*#define PWPASSWD	/ **/
 
-/* I_SYS_ACCESS:
- *     This symbol, if defined, indicates to the C program that it should
- *     include <sys/access.h>.
- */
-/*#define   I_SYS_ACCESS                / **/
-
-/* I_SYS_SECURITY:
- *     This symbol, if defined, indicates to the C program that it should
- *     include <sys/security.h>.
- */
-/*#define   I_SYS_SECURITY	/ **/
-
 /* I_SYSUIO:
  *	This symbol, if defined, indicates that <sys/uio.h> exists and
  *	should be included.
@@ -2905,32 +2351,6 @@
 /*#define I_TERMIOS		/ **/
 /*#define I_SGTTY		/ **/
 
-/* I_TIME:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <time.h>.
- */
-/* I_SYS_TIME:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sys/time.h>.
- */
-/* I_SYS_TIME_KERNEL:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sys/time.h> with KERNEL defined.
- */
-/* HAS_TM_TM_ZONE:
- *	This symbol, if defined, indicates to the C program that
- *	the struct tm has a tm_zone field.
- */
-/* HAS_TM_TM_GMTOFF:
- *	This symbol, if defined, indicates to the C program that
- *	the struct tm has a tm_gmtoff field.
- */
-#define I_TIME		/**/
-/*#define I_SYS_TIME		/ **/
-/*#define I_SYS_TIME_KERNEL		/ **/
-/*#define HAS_TM_TM_ZONE		/ **/
-/*#define HAS_TM_TM_GMTOFF		/ **/
-
 /* I_STDARG:
  *	This symbol, if defined, indicates that <stdarg.h> exists and should
  *	be included.
@@ -2942,36 +2362,6 @@
 #define I_STDARG		/**/
 /*#define I_VARARGS	/ **/
 
-/* PERL_INC_VERSION_LIST:
- *	This variable specifies the list of subdirectories in over
- *	which perl.c:incpush() and lib/lib.pm will automatically
- *	search when adding directories to @INC, in a format suitable
- *	for a C initialization string.  See the inc_version_list entry
- *	in Porting/Glossary for more details.
- */
-/*#define PERL_INC_VERSION_LIST NULL		/ **/
-
-/* INSTALL_USR_BIN_PERL:
- *	This symbol, if defined, indicates that Perl is to be installed
- * 	also as /usr/bin/perl.
- */
-/*#define INSTALL_USR_BIN_PERL	/ **/
-
-/* Off_t:
- *	This symbol holds the type used to declare offsets in the kernel.
- *	It can be int, long, off_t, etc... It may be necessary to include
- *	<sys/types.h> to get any typedef'ed information.
- */
-/* LSEEKSIZE:
- *	This symbol holds the number of bytes used by the Off_t.
- */
-/* Off_t_size:
- *	This symbol holds the number of bytes used by the Off_t.
- */
-#define Off_t int		/* <offset> type */
-#define LSEEKSIZE 4		/* <offset> size */
-#define Off_t_size 4	/* <offset> size */
-
 /* Free_t:
  *	This variable contains the return type of free().  It is usually
  * void, but occasionally int.
@@ -2992,92 +2382,6 @@
  */
 /*#define MYMALLOC			/ **/
 
-/* Mode_t:
- *	This symbol holds the type used to declare file modes
- *	for systems calls.  It is usually mode_t, but may be
- *	int or unsigned short.  It may be necessary to include <sys/types.h>
- *	to get any typedef'ed information.
- */
-#define Mode_t int	 /* file mode parameter for system calls */
-
-/* VAL_O_NONBLOCK:
- *	This symbol is to be used during open() or fcntl(F_SETFL) to turn on
- *	non-blocking I/O for the file descriptor. Note that there is no way
- *	back, i.e. you cannot turn it blocking again this way. If you wish to
- *	alternatively switch between blocking and non-blocking, use the
- *	ioctl(FIOSNBIO) call instead, but that is not supported by all devices.
- */
-/* VAL_EAGAIN:
- *	This symbol holds the errno error code set by read() when no data was
- *	present on the non-blocking file descriptor.
- */
-/* RD_NODATA:
- *	This symbol holds the return code from read() when no data is present
- *	on the non-blocking file descriptor. Be careful! If EOF_NONBLOCK is
- *	not defined, then you can't distinguish between no data and EOF by
- *	issuing a read(). You'll have to find another way to tell for sure!
- */
-/* EOF_NONBLOCK:
- *	This symbol, if defined, indicates to the C program that a read() on
- *	a non-blocking file descriptor will return 0 on EOF, and not the value
- *	held in RD_NODATA (-1 usually, in that case!).
- */
-#define VAL_O_NONBLOCK O_NONBLOCK
-#define VAL_EAGAIN EAGAIN
-#define RD_NODATA -1
-#undef EOF_NONBLOCK
-
-/* Netdb_host_t:
- *	This symbol holds the type used for the 1st argument
- *	to gethostbyaddr().
- */
-/* Netdb_hlen_t:
- *	This symbol holds the type used for the 2nd argument
- *	to gethostbyaddr().
- */
-/* Netdb_name_t:
- *	This symbol holds the type used for the argument to
- *	gethostbyname().
- */
-/* Netdb_net_t:
- *	This symbol holds the type used for the 1st argument to
- *	getnetbyaddr().
- */
-#define Netdb_host_t		const char * /**/
-#define Netdb_hlen_t		int /**/
-#define Netdb_name_t		const char * /**/
-#define Netdb_net_t		unsigned long /**/
-
-/* PERL_OTHERLIBDIRS:
- *	This variable contains a colon-separated set of paths for the perl
- *	binary to search for additional library files or modules.
- *	These directories will be tacked to the end of @INC.
- *	Perl will automatically search below each path for version-
- *	and architecture-specific directories.  See PERL_INC_VERSION_LIST
- *	for more details.
- */
-/*#define PERL_OTHERLIBDIRS " "		/ **/
-
-/* Pid_t:
- *	This symbol holds the type used to declare process ids in the kernel.
- *	It can be int, uint, pid_t, etc... It may be necessary to include
- *	<sys/types.h> to get any typedef'ed information.
- */
-#define Pid_t int		/* PID type */
-
-/* PRIVLIB:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
- */
-/* PRIVLIB_EXP:
- *	This symbol contains the ~name expanded version of PRIVLIB, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
- */
-#define PRIVLIB "/usr/local/lib/perl5/5.22"		/**/
-#define PRIVLIB_EXP "/usr/local/lib/perl5/5.22"		/**/
-
 /* CAN_PROTOTYPE:
  *	If defined, this macro indicates that the C compiler can handle
  *	function prototypes.
@@ -3096,65 +2400,6 @@
 #define	_(args) ()
 #endif
 
-/* PTRSIZE:
- *	This symbol contains the size of a pointer, so that the C preprocessor
- *	can make decisions based on it.  It will be sizeof(void *) if
- *	the compiler supports (void *); otherwise it will be
- *	sizeof(char *).
- */
-#define PTRSIZE 4		/**/
-
-/* HAS_QUAD:
- *	This symbol, if defined, tells that there's a 64-bit integer type,
- *	Quad_t, and its unsigned counterpart, Uquad_t. QUADKIND will be one
- *	of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, QUAD_IS_INT64_T,
- *	or QUAD_IS___INT64.
- */
-/*#define HAS_QUAD	/ **/
-#ifdef HAS_QUAD
-#   define Quad_t int64_t	/**/
-#   define Uquad_t uint64_t	/**/
-#   define QUADKIND 4	/**/
-#   define QUAD_IS_INT	1
-#   define QUAD_IS_LONG	2
-#   define QUAD_IS_LONG_LONG	3
-#   define QUAD_IS_INT64_T	4
-#   define QUAD_IS___INT64	5
-#endif
-
-/* Drand01:
- *	This macro is to be used to generate uniformly distributed
- *	random numbers over the range [0., 1.[.  You may have to supply
- *	an 'extern double drand48();' in your program since SunOS 4.1.3
- *	doesn't provide you with anything relevant in its headers.
- *	See HAS_DRAND48_PROTO.
- */
-/* Rand_seed_t:
- *	This symbol defines the type of the argument of the
- *	random seed function.
- */
-/* seedDrand01:
- *	This symbol defines the macro to be used in seeding the
- *	random number generator (see Drand01).
- */
-/* RANDBITS:
- *	This symbol indicates how many bits are produced by the
- *	function used to generate normalized random numbers.
- *	Values include 15, 16, 31, and 48.
- */
-#define Drand01()		Perl_drand48()		/**/
-#define Rand_seed_t		U32		/**/
-#define seedDrand01(x)	Perl_drand48_init((Rand_seed_t)x)	/**/
-#define RANDBITS		48		/**/
-
-/* Select_fd_set_t:
- *	This symbol holds the type used for the 2nd, 3rd, and 4th
- *	arguments to select.  Usually, this is 'fd_set *', if HAS_FD_SET
- *	is defined, and 'int *' otherwise.  This is only useful if you
- *	have select(), of course.
- */
-#define Select_fd_set_t 	int	/**/
-
 /* SH_PATH:
  *	This symbol contains the full pathname to the shell used on this
  *	on this system to execute Bourne shell scripts.  Usually, this will be
@@ -3204,162 +2449,6 @@
 #define SIG_NUM  0		/**/
 #define SIG_SIZE 1			/**/
 
-/* SITEARCH:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
- *	The standard distribution will put nothing in this directory.
- *	After perl has been installed, users may install their own local
- *	architecture-dependent modules in this directory with
- *		MakeMaker Makefile.PL
- *	or equivalent.  See INSTALL for details.
- */
-/* SITEARCH_EXP:
- *	This symbol contains the ~name expanded version of SITEARCH, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
- */
-/*#define SITEARCH "/usr/local/lib/perl5/5.22/unknown"		/ **/
-/*#define SITEARCH_EXP "/usr/local/lib/perl5/5.22/unknown"		/ **/
-
-/* SITELIB:
- *	This symbol contains the name of the private library for this package.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.  The program
- *	should be prepared to do ~ expansion.
- *	The standard distribution will put nothing in this directory.
- *	After perl has been installed, users may install their own local
- *	architecture-independent modules in this directory with
- *		MakeMaker Makefile.PL
- *	or equivalent.  See INSTALL for details.
- */
-/* SITELIB_EXP:
- *	This symbol contains the ~name expanded version of SITELIB, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
- */
-/* SITELIB_STEM:
- *	This define is SITELIB_EXP with any trailing version-specific component
- *	removed.  The elements in inc_version_list (inc_version_list.U) can
- *	be tacked onto this variable to generate a list of directories to search.
- */
-#define SITELIB "/usr/local/lib/perl5/5.22"		/**/
-#define SITELIB_EXP "/usr/local/lib/perl5/5.22"		/**/
-#define SITELIB_STEM "/usr/local/lib/perl5"		/**/
-
-/* Size_t_size:
- *	This symbol holds the size of a Size_t in bytes.
- */
-#define Size_t_size 4		/**/
-
-/* Size_t:
- *	This symbol holds the type used to declare length parameters
- *	for string functions.  It is usually size_t, but may be
- *	unsigned long, int, etc.  It may be necessary to include
- *	<sys/types.h> to get any typedef'ed information.
- */
-#define Size_t size_t	 /* length parameter for string functions */
-
-/* Sock_size_t:
- *	This symbol holds the type used for the size argument of
- *	various socket calls (just the base type, not the pointer-to).
- */
-#define Sock_size_t		int /**/
-
-/* SSize_t:
- *	This symbol holds the type used by functions that return
- *	a count of bytes or an error condition.  It must be a signed type.
- *	It is usually ssize_t, but may be long or int, etc.
- *	It may be necessary to include <sys/types.h> or <unistd.h>
- *	to get any typedef'ed information.
- *	We will pick a type such that sizeof(SSize_t) == sizeof(Size_t).
- */
-#define SSize_t int	 /* signed count of bytes */
-
-/* STDCHAR:
- *	This symbol is defined to be the type of char used in stdio.h.
- *	It has the values "unsigned char" or "char".
- */
-#define STDCHAR char	/**/
-
-/* Uid_t_f:
- *	This symbol defines the format string used for printing a Uid_t.
- */
-#define	Uid_t_f		"lu"		/**/
-
-/* Uid_t_sign:
- *	This symbol holds the signedness of a Uid_t.
- *	1 for unsigned, -1 for signed.
- */
-#define Uid_t_sign	1		/* UID sign */
-
-/* Uid_t_size:
- *	This symbol holds the size of a Uid_t in bytes.
- */
-#define Uid_t_size 4		/* UID size */
-
-/* Uid_t:
- *	This symbol holds the type used to declare user ids in the kernel.
- *	It can be int, ushort, uid_t, etc... It may be necessary to include
- *	<sys/types.h> to get any typedef'ed information.
- */
-#define Uid_t int		/* UID type */
-
-/* USE_ITHREADS:
- *	This symbol, if defined, indicates that Perl should be built to
- *	use the interpreter-based threading implementation.
- */
-/* USE_5005THREADS:
- *	This symbol, if defined, indicates that Perl should be built to
- *	use the 5.005-based threading implementation.
- *	Only valid up to 5.8.x.
- */
-/* OLD_PTHREADS_API:
- *	This symbol, if defined, indicates that Perl should
- *	be built to use the old draft POSIX threads API.
- */
-/* USE_REENTRANT_API:
- *	This symbol, if defined, indicates that Perl should
- *	try to use the various _r versions of library functions.
- *	This is extremely experimental.
- */
-/*#define	USE_5005THREADS		/ **/
-/*#define	USE_ITHREADS		/ **/
-#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
-#define		USE_THREADS		/* until src is revised*/
-#endif
-/*#define	OLD_PTHREADS_API		/ **/
-/*#define	USE_REENTRANT_API	/ **/
-
-/* PERL_VENDORARCH:
- *	If defined, this symbol contains the name of a private library.
- *	The library is private in the sense that it needn't be in anyone's
- *	execution path, but it should be accessible by the world.
- *	It may have a ~ on the front.
- *	The standard distribution will put nothing in this directory.
- *	Vendors who distribute perl may wish to place their own
- *	architecture-dependent modules and extensions in this directory with
- *		MakeMaker Makefile.PL INSTALLDIRS=vendor
- *	or equivalent.  See INSTALL for details.
- */
-/* PERL_VENDORARCH_EXP:
- *	This symbol contains the ~name expanded version of PERL_VENDORARCH, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
- */
-/*#define PERL_VENDORARCH ""		/ **/
-/*#define PERL_VENDORARCH_EXP ""		/ **/
-
-/* PERL_VENDORLIB_EXP:
- *	This symbol contains the ~name expanded version of VENDORLIB, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
- */
-/* PERL_VENDORLIB_STEM:
- *	This define is PERL_VENDORLIB_EXP with any trailing version-specific component
- *	removed.  The elements in inc_version_list (inc_version_list.U) can
- *	be tacked onto this variable to generate a list of directories to search.
- */
-/*#define PERL_VENDORLIB_EXP ""		/ **/
-/*#define PERL_VENDORLIB_STEM ""		/ **/
-
 /* USE_CROSS_COMPILE:
  *	This symbol, if defined, indicates that Perl is being cross-compiled.
  */
@@ -3555,6 +2644,13 @@
  */
 /*#define FCNTL_CAN_LOCK		/ **/
 
+/* HAS_FDCLOSE:
+ *	This symbol, if defined, indicates that the fdclose routine is
+ *	available to free a FILE structure without closing the underlying
+ *	file descriptor.  This function appeared in FreeBSD 10.2.
+ */
+/*#define HAS_FDCLOSE		/ **/
+
 /* HAS_FDIM:
  *	This symbol, if defined, indicates that the fdim routine is
  *	available to do the positive difference function.
@@ -3956,15 +3052,15 @@
 
 /* HAS_LLRINT:
  *	This symbol, if defined, indicates that the llrint routine is
- *	available to return the closest long long value according to
- *	the current rounding mode.
+ *	available to return the long long value closest to a double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LLRINT		/ **/
 
 /* HAS_LLRINTL:
  *	This symbol, if defined, indicates that the llrintl routine is
- *	available to return the closest long long value of the long double
- *	argument according to the current rounding mode.
+ *	available to return the long long value closest to a long double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LLRINTL		/ **/
 
@@ -4001,15 +3097,15 @@
 
 /* HAS_LRINT:
  *	This symbol, if defined, indicates that the lrint routine is
- *	available to return the closest integral value according to
- *	the current rounding mode.
+ *	available to return the integral value closest to a double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LRINT		/ **/
 
 /* HAS_LRINTL:
  *	This symbol, if defined, indicates that the lrintl routine is
- *	available to return the closest integral value of the long double
- *	argument according to the current rounding mode.
+ *	available to return the integral value closest to a long double
+ *	(according to the current rounding mode).
  */
 /*#define HAS_LRINTL		/ **/
 
@@ -4044,6 +3140,13 @@
  */
 /*#define HAS_MALLOC_GOOD_SIZE	/ **/
 
+/* HAS_MEMMEM:
+ *	This symbol, if defined, indicates that the memmem routine is
+ *	available to return a pointer to the start of the first occurance
+ *	of a substring in a memory area (or NULL if not found).
+ */
+/*#define HAS_MEMMEM		/ **/
+
 /* HAS_MKDTEMP:
  *	This symbol, if defined, indicates that the mkdtemp routine is
  *	available to exclusively create a uniquely named temporary directory.
@@ -4067,16 +3170,8 @@
  *	a prototype for the modfl() function.  Otherwise, it is up
  *	to the program to supply one.
  */
-/* HAS_MODFL_POW32_BUG:
- *	This symbol, if defined, indicates that the modfl routine is
- *	broken for long doubles >= pow(2, 32).
- *	For example from 4294967303.150000 one would get 4294967302.000000
- *	and 1.150000.  The bug has been seen in certain versions of glibc,
- *	release 2.2.2 is known to be okay.
- */
 /*#define HAS_MODFL		/ **/
 /*#define HAS_MODFL_PROTO		/ **/
-/*#define HAS_MODFL_POW32_BUG		/ **/
 
 /* HAS_MPROTECT:
  *	This symbol, if defined, indicates that the mprotect system call is
@@ -4103,6 +3198,23 @@
  */
 /*#define HAS_NEARBYINT		/ **/
 
+/* HAS_NEWLOCALE:
+ *	This symbol, if defined, indicates that the newlocale routine is
+ *	available to return a new locale object or modify an existing
+ *	locale object.
+ */
+/* HAS_FREELOCALE:
+ *	This symbol, if defined, indicates that the freelocale routine is
+ *	available to deallocates the resources associated with a locale object.
+ */
+/* HAS_USELOCALE:
+ *	This symbol, if defined, indicates that the uselocale routine is
+ *	available to set the current locale for the calling thread.
+ */
+/*#define	HAS_NEWLOCALE	/ **/
+/*#define	HAS_FREELOCALE	/ **/
+/*#define	HAS_USELOCALE	/ **/
+
 /* HAS_NEXTAFTER:
  *	This symbol, if defined, indicates that the nextafter routine is
  *	available to return the next machine representable double from
@@ -4759,6 +3871,27 @@
  */
 /*#define	I_USTAT		/ **/
 
+/* DOUBLEINFBYTES:
+ *	This symbol, if defined, is a comma-separated list of
+ *	hexadecimal bytes for the double precision infinity.
+ */
+/* DOUBLENANBYTES:
+ *	This symbol, if defined, is a comma-separated list of
+ *	hexadecimal bytes (0xHH) for the double precision not-a-number.
+ */
+/* LONGDBLINFBYTES:
+ *	This symbol, if defined, is a comma-separated list of
+ *	hexadecimal bytes for the long double precision infinity.
+ */
+/* LONGDBLNANBYTES:
+ *	This symbol, if defined, is a comma-separated list of
+ *	hexadecimal bytes (0xHH) for the long double precision not-a-number.
+ */
+#define DOUBLEINFBYTES  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x7f		/**/
+#define DOUBLENANBYTES  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x7f		/**/
+#define LONGDBLINFBYTES 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00		/**/
+#define LONGDBLNANBYTES 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00		/**/
+
 /* PERL_PRIfldbl:
  *	This symbol, if defined, contains the string used by stdio to
  *	format long doubles (format 'f') for output.
@@ -4802,6 +3935,30 @@
 /*#define PERL_PRIeldbl	"lle"	/ **/
 /*#define PERL_SCNfldbl	"llf"	/ **/
 
+/* DOUBLEMANTBITS:
+ *	This symbol, if defined, tells how many mantissa bits
+ *	there are in double precision floating point format.
+ *	Note that this is usually DBL_MANT_DIG minus one, since
+ *	with the standard IEEE 754 formats DBL_MANT_DIG includes
+ *	the implicit bit, which doesn't really exist.
+ */
+/* LONGDBLMANTBITS:
+ *	This symbol, if defined, tells how many mantissa bits
+ *	there are in long double precision floating point format.
+ *	Note that this can be LDBL_MANT_DIG minus one,
+ *	since LDBL_MANT_DIG can include the IEEE 754 implicit bit.
+ *	The common x86-style 80-bit long double does not have
+ *	an implicit bit.
+ */
+/* NVMANTBITS:
+ *	This symbol, if defined, tells how many mantissa bits
+ *	(not including implicit bit) there are in a Perl NV.
+ *	This depends on which floating point type was chosen.
+ */
+#define DOUBLEMANTBITS  52
+#define LONGDBLMANTBITS 64
+#define NVMANTBITS      52
+
 /* NEED_VA_COPY:
  *	This symbol, if defined, indicates that the system stores
  *	the variable argument list datatype, va_list, in a format
@@ -5164,9 +4321,926 @@
 /*#define	USE_SOCKS		/ **/
 #endif
 
+/* HAS_DRAND48_PROTO:
+ *	This symbol, if defined, indicates that the system provides
+ *	a prototype for the drand48() function.  Otherwise, it is up
+ *	to the program to supply one.  A good guess is
+ *		extern double drand48(void);
+ */
+/*#define	HAS_DRAND48_PROTO	/ **/
+
+/* HAS_GETHOST_PROTOS:
+ *	This symbol, if defined, indicates that <netdb.h> includes
+ *	prototypes for gethostent(), gethostbyname(), and
+ *	gethostbyaddr().  Otherwise, it is up to the program to guess
+ *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
+ */
+/*#define	HAS_GETHOST_PROTOS	/ **/
+
+/* HAS_GETNET_PROTOS:
+ *	This symbol, if defined, indicates that <netdb.h> includes
+ *	prototypes for getnetent(), getnetbyname(), and
+ *	getnetbyaddr().  Otherwise, it is up to the program to guess
+ *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
+ */
+/*#define	HAS_GETNET_PROTOS	/ **/
+
+/* HAS_GETPROTO_PROTOS:
+ *	This symbol, if defined, indicates that <netdb.h> includes
+ *	prototypes for getprotoent(), getprotobyname(), and
+ *	getprotobyaddr().  Otherwise, it is up to the program to guess
+ *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
+ */
+/*#define	HAS_GETPROTO_PROTOS	/ **/
+
+/* HAS_GETSERV_PROTOS:
+ *	This symbol, if defined, indicates that <netdb.h> includes
+ *	prototypes for getservent(), getservbyname(), and
+ *	getservbyaddr().  Otherwise, it is up to the program to guess
+ *	them.  See netdbtype.U for probing for various Netdb_xxx_t types.
+ */
+/*#define	HAS_GETSERV_PROTOS	/ **/
+
+/* HAS_LSEEK_PROTO:
+ *	This symbol, if defined, indicates that the system provides
+ *	a prototype for the lseek() function.  Otherwise, it is up
+ *	to the program to supply one.  A good guess is
+ *		extern off_t lseek(int, off_t, int);
+ */
+/*#define	HAS_LSEEK_PROTO	/ **/
+
+/* Netdb_host_t:
+ *	This symbol holds the type used for the 1st argument
+ *	to gethostbyaddr().
+ */
+/* Netdb_hlen_t:
+ *	This symbol holds the type used for the 2nd argument
+ *	to gethostbyaddr().
+ */
+/* Netdb_name_t:
+ *	This symbol holds the type used for the argument to
+ *	gethostbyname().
+ */
+/* Netdb_net_t:
+ *	This symbol holds the type used for the 1st argument to
+ *	getnetbyaddr().
+ */
+#define Netdb_host_t		const char * /**/
+#define Netdb_hlen_t		int /**/
+#define Netdb_name_t		const char * /**/
+#define Netdb_net_t		unsigned long /**/
+
+/* Select_fd_set_t:
+ *	This symbol holds the type used for the 2nd, 3rd, and 4th
+ *	arguments to select.  Usually, this is 'fd_set *', if HAS_FD_SET
+ *	is defined, and 'int *' otherwise.  This is only useful if you
+ *	have select(), of course.
+ */
+#define Select_fd_set_t 	int	/**/
+
+/* Sock_size_t:
+ *	This symbol holds the type used for the size argument of
+ *	various socket calls (just the base type, not the pointer-to).
+ */
+#define Sock_size_t		int /**/
+
+/* ARCHNAME:
+ *	This symbol holds a string representing the architecture name.
+ *	It may be used to construct an architecture-dependant pathname
+ *	where library files may be held under a private library, for
+ *	instance.
+ */
+#define ARCHNAME "unknown"		/**/
+
+/* HAS_ASCTIME_R:
+ *	This symbol, if defined, indicates that the asctime_r routine
+ *	is available to asctime re-entrantly.
+ */
+/* ASCTIME_R_PROTO:
+ *	This symbol encodes the prototype of asctime_r.
+ *	It is zero if d_asctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_asctime_r
+ *	is defined.
+ */
+/*#define HAS_ASCTIME_R	   / **/
+#define ASCTIME_R_PROTO 0	   /**/
+
+/* HAS_CRYPT_R:
+ *	This symbol, if defined, indicates that the crypt_r routine
+ *	is available to crypt re-entrantly.
+ */
+/* CRYPT_R_PROTO:
+ *	This symbol encodes the prototype of crypt_r.
+ *	It is zero if d_crypt_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_crypt_r
+ *	is defined.
+ */
+/*#define HAS_CRYPT_R	   / **/
+#define CRYPT_R_PROTO 0	   /**/
+
+/* HAS_CTERMID_R:
+ *	This symbol, if defined, indicates that the ctermid_r routine
+ *	is available to ctermid re-entrantly.
+ */
+/* CTERMID_R_PROTO:
+ *	This symbol encodes the prototype of ctermid_r.
+ *	It is zero if d_ctermid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctermid_r
+ *	is defined.
+ */
+/*#define HAS_CTERMID_R	   / **/
+#define CTERMID_R_PROTO 0	   /**/
+
+/* HAS_CTIME_R:
+ *	This symbol, if defined, indicates that the ctime_r routine
+ *	is available to ctime re-entrantly.
+ */
+/* CTIME_R_PROTO:
+ *	This symbol encodes the prototype of ctime_r.
+ *	It is zero if d_ctime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctime_r
+ *	is defined.
+ */
+/*#define HAS_CTIME_R	   / **/
+#define CTIME_R_PROTO 0	   /**/
+
+/* HAS_DRAND48_R:
+ *	This symbol, if defined, indicates that the drand48_r routine
+ *	is available to drand48 re-entrantly.
+ */
+/* DRAND48_R_PROTO:
+ *	This symbol encodes the prototype of drand48_r.
+ *	It is zero if d_drand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_drand48_r
+ *	is defined.
+ */
+/*#define HAS_DRAND48_R	   / **/
+#define DRAND48_R_PROTO 0	   /**/
+
+/* HAS_ENDGRENT_R:
+ *	This symbol, if defined, indicates that the endgrent_r routine
+ *	is available to endgrent re-entrantly.
+ */
+/* ENDGRENT_R_PROTO:
+ *	This symbol encodes the prototype of endgrent_r.
+ *	It is zero if d_endgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endgrent_r
+ *	is defined.
+ */
+/*#define HAS_ENDGRENT_R	   / **/
+#define ENDGRENT_R_PROTO 0	   /**/
+
+/* HAS_ENDHOSTENT_R:
+ *	This symbol, if defined, indicates that the endhostent_r routine
+ *	is available to endhostent re-entrantly.
+ */
+/* ENDHOSTENT_R_PROTO:
+ *	This symbol encodes the prototype of endhostent_r.
+ *	It is zero if d_endhostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endhostent_r
+ *	is defined.
+ */
+/*#define HAS_ENDHOSTENT_R	   / **/
+#define ENDHOSTENT_R_PROTO 0	   /**/
+
+/* HAS_ENDNETENT_R:
+ *	This symbol, if defined, indicates that the endnetent_r routine
+ *	is available to endnetent re-entrantly.
+ */
+/* ENDNETENT_R_PROTO:
+ *	This symbol encodes the prototype of endnetent_r.
+ *	It is zero if d_endnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endnetent_r
+ *	is defined.
+ */
+/*#define HAS_ENDNETENT_R	   / **/
+#define ENDNETENT_R_PROTO 0	   /**/
+
+/* HAS_ENDPROTOENT_R:
+ *	This symbol, if defined, indicates that the endprotoent_r routine
+ *	is available to endprotoent re-entrantly.
+ */
+/* ENDPROTOENT_R_PROTO:
+ *	This symbol encodes the prototype of endprotoent_r.
+ *	It is zero if d_endprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endprotoent_r
+ *	is defined.
+ */
+/*#define HAS_ENDPROTOENT_R	   / **/
+#define ENDPROTOENT_R_PROTO 0	   /**/
+
+/* HAS_ENDPWENT_R:
+ *	This symbol, if defined, indicates that the endpwent_r routine
+ *	is available to endpwent re-entrantly.
+ */
+/* ENDPWENT_R_PROTO:
+ *	This symbol encodes the prototype of endpwent_r.
+ *	It is zero if d_endpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endpwent_r
+ *	is defined.
+ */
+/*#define HAS_ENDPWENT_R	   / **/
+#define ENDPWENT_R_PROTO 0	   /**/
+
+/* HAS_ENDSERVENT_R:
+ *	This symbol, if defined, indicates that the endservent_r routine
+ *	is available to endservent re-entrantly.
+ */
+/* ENDSERVENT_R_PROTO:
+ *	This symbol encodes the prototype of endservent_r.
+ *	It is zero if d_endservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_endservent_r
+ *	is defined.
+ */
+/*#define HAS_ENDSERVENT_R	   / **/
+#define ENDSERVENT_R_PROTO 0	   /**/
+
+/* HAS_GETGRENT_R:
+ *	This symbol, if defined, indicates that the getgrent_r routine
+ *	is available to getgrent re-entrantly.
+ */
+/* GETGRENT_R_PROTO:
+ *	This symbol encodes the prototype of getgrent_r.
+ *	It is zero if d_getgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrent_r
+ *	is defined.
+ */
+/*#define HAS_GETGRENT_R	   / **/
+#define GETGRENT_R_PROTO 0	   /**/
+
+/* HAS_GETGRGID_R:
+ *	This symbol, if defined, indicates that the getgrgid_r routine
+ *	is available to getgrgid re-entrantly.
+ */
+/* GETGRGID_R_PROTO:
+ *	This symbol encodes the prototype of getgrgid_r.
+ *	It is zero if d_getgrgid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrgid_r
+ *	is defined.
+ */
+/*#define HAS_GETGRGID_R	   / **/
+#define GETGRGID_R_PROTO 0	   /**/
+
+/* HAS_GETGRNAM_R:
+ *	This symbol, if defined, indicates that the getgrnam_r routine
+ *	is available to getgrnam re-entrantly.
+ */
+/* GETGRNAM_R_PROTO:
+ *	This symbol encodes the prototype of getgrnam_r.
+ *	It is zero if d_getgrnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrnam_r
+ *	is defined.
+ */
+/*#define HAS_GETGRNAM_R	   / **/
+#define GETGRNAM_R_PROTO 0	   /**/
+
+/* HAS_GETHOSTBYADDR_R:
+ *	This symbol, if defined, indicates that the gethostbyaddr_r routine
+ *	is available to gethostbyaddr re-entrantly.
+ */
+/* GETHOSTBYADDR_R_PROTO:
+ *	This symbol encodes the prototype of gethostbyaddr_r.
+ *	It is zero if d_gethostbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyaddr_r
+ *	is defined.
+ */
+/*#define HAS_GETHOSTBYADDR_R	   / **/
+#define GETHOSTBYADDR_R_PROTO 0	   /**/
+
+/* HAS_GETHOSTBYNAME_R:
+ *	This symbol, if defined, indicates that the gethostbyname_r routine
+ *	is available to gethostbyname re-entrantly.
+ */
+/* GETHOSTBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of gethostbyname_r.
+ *	It is zero if d_gethostbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyname_r
+ *	is defined.
+ */
+/*#define HAS_GETHOSTBYNAME_R	   / **/
+#define GETHOSTBYNAME_R_PROTO 0	   /**/
+
+/* HAS_GETHOSTENT_R:
+ *	This symbol, if defined, indicates that the gethostent_r routine
+ *	is available to gethostent re-entrantly.
+ */
+/* GETHOSTENT_R_PROTO:
+ *	This symbol encodes the prototype of gethostent_r.
+ *	It is zero if d_gethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostent_r
+ *	is defined.
+ */
+/*#define HAS_GETHOSTENT_R	   / **/
+#define GETHOSTENT_R_PROTO 0	   /**/
+
+/* HAS_GETLOGIN_R:
+ *	This symbol, if defined, indicates that the getlogin_r routine
+ *	is available to getlogin re-entrantly.
+ */
+/* GETLOGIN_R_PROTO:
+ *	This symbol encodes the prototype of getlogin_r.
+ *	It is zero if d_getlogin_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getlogin_r
+ *	is defined.
+ */
+/*#define HAS_GETLOGIN_R	   / **/
+#define GETLOGIN_R_PROTO 0	   /**/
+
+/* HAS_GETNETBYADDR_R:
+ *	This symbol, if defined, indicates that the getnetbyaddr_r routine
+ *	is available to getnetbyaddr re-entrantly.
+ */
+/* GETNETBYADDR_R_PROTO:
+ *	This symbol encodes the prototype of getnetbyaddr_r.
+ *	It is zero if d_getnetbyaddr_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyaddr_r
+ *	is defined.
+ */
+/*#define HAS_GETNETBYADDR_R	   / **/
+#define GETNETBYADDR_R_PROTO 0	   /**/
+
+/* HAS_GETNETBYNAME_R:
+ *	This symbol, if defined, indicates that the getnetbyname_r routine
+ *	is available to getnetbyname re-entrantly.
+ */
+/* GETNETBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of getnetbyname_r.
+ *	It is zero if d_getnetbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyname_r
+ *	is defined.
+ */
+/*#define HAS_GETNETBYNAME_R	   / **/
+#define GETNETBYNAME_R_PROTO 0	   /**/
+
+/* HAS_GETNETENT_R:
+ *	This symbol, if defined, indicates that the getnetent_r routine
+ *	is available to getnetent re-entrantly.
+ */
+/* GETNETENT_R_PROTO:
+ *	This symbol encodes the prototype of getnetent_r.
+ *	It is zero if d_getnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetent_r
+ *	is defined.
+ */
+/*#define HAS_GETNETENT_R	   / **/
+#define GETNETENT_R_PROTO 0	   /**/
+
+/* HAS_GETPROTOBYNAME_R:
+ *	This symbol, if defined, indicates that the getprotobyname_r routine
+ *	is available to getprotobyname re-entrantly.
+ */
+/* GETPROTOBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of getprotobyname_r.
+ *	It is zero if d_getprotobyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobyname_r
+ *	is defined.
+ */
+/*#define HAS_GETPROTOBYNAME_R	   / **/
+#define GETPROTOBYNAME_R_PROTO 0	   /**/
+
+/* HAS_GETPROTOBYNUMBER_R:
+ *	This symbol, if defined, indicates that the getprotobynumber_r routine
+ *	is available to getprotobynumber re-entrantly.
+ */
+/* GETPROTOBYNUMBER_R_PROTO:
+ *	This symbol encodes the prototype of getprotobynumber_r.
+ *	It is zero if d_getprotobynumber_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobynumber_r
+ *	is defined.
+ */
+/*#define HAS_GETPROTOBYNUMBER_R	   / **/
+#define GETPROTOBYNUMBER_R_PROTO 0	   /**/
+
+/* HAS_GETPROTOENT_R:
+ *	This symbol, if defined, indicates that the getprotoent_r routine
+ *	is available to getprotoent re-entrantly.
+ */
+/* GETPROTOENT_R_PROTO:
+ *	This symbol encodes the prototype of getprotoent_r.
+ *	It is zero if d_getprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotoent_r
+ *	is defined.
+ */
+/*#define HAS_GETPROTOENT_R	   / **/
+#define GETPROTOENT_R_PROTO 0	   /**/
+
+/* HAS_GETPWENT_R:
+ *	This symbol, if defined, indicates that the getpwent_r routine
+ *	is available to getpwent re-entrantly.
+ */
+/* GETPWENT_R_PROTO:
+ *	This symbol encodes the prototype of getpwent_r.
+ *	It is zero if d_getpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwent_r
+ *	is defined.
+ */
+/*#define HAS_GETPWENT_R	   / **/
+#define GETPWENT_R_PROTO 0	   /**/
+
+/* HAS_GETPWNAM_R:
+ *	This symbol, if defined, indicates that the getpwnam_r routine
+ *	is available to getpwnam re-entrantly.
+ */
+/* GETPWNAM_R_PROTO:
+ *	This symbol encodes the prototype of getpwnam_r.
+ *	It is zero if d_getpwnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwnam_r
+ *	is defined.
+ */
+/*#define HAS_GETPWNAM_R	   / **/
+#define GETPWNAM_R_PROTO 0	   /**/
+
+/* HAS_GETPWUID_R:
+ *	This symbol, if defined, indicates that the getpwuid_r routine
+ *	is available to getpwuid re-entrantly.
+ */
+/* GETPWUID_R_PROTO:
+ *	This symbol encodes the prototype of getpwuid_r.
+ *	It is zero if d_getpwuid_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwuid_r
+ *	is defined.
+ */
+/*#define HAS_GETPWUID_R	   / **/
+#define GETPWUID_R_PROTO 0	   /**/
+
+/* HAS_GETSERVBYNAME_R:
+ *	This symbol, if defined, indicates that the getservbyname_r routine
+ *	is available to getservbyname re-entrantly.
+ */
+/* GETSERVBYNAME_R_PROTO:
+ *	This symbol encodes the prototype of getservbyname_r.
+ *	It is zero if d_getservbyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyname_r
+ *	is defined.
+ */
+/*#define HAS_GETSERVBYNAME_R	   / **/
+#define GETSERVBYNAME_R_PROTO 0	   /**/
+
+/* HAS_GETSERVBYPORT_R:
+ *	This symbol, if defined, indicates that the getservbyport_r routine
+ *	is available to getservbyport re-entrantly.
+ */
+/* GETSERVBYPORT_R_PROTO:
+ *	This symbol encodes the prototype of getservbyport_r.
+ *	It is zero if d_getservbyport_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyport_r
+ *	is defined.
+ */
+/*#define HAS_GETSERVBYPORT_R	   / **/
+#define GETSERVBYPORT_R_PROTO 0	   /**/
+
+/* HAS_GETSERVENT_R:
+ *	This symbol, if defined, indicates that the getservent_r routine
+ *	is available to getservent re-entrantly.
+ */
+/* GETSERVENT_R_PROTO:
+ *	This symbol encodes the prototype of getservent_r.
+ *	It is zero if d_getservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservent_r
+ *	is defined.
+ */
+/*#define HAS_GETSERVENT_R	   / **/
+#define GETSERVENT_R_PROTO 0	   /**/
+
+/* HAS_GETSPNAM_R:
+ *	This symbol, if defined, indicates that the getspnam_r routine
+ *	is available to getspnam re-entrantly.
+ */
+/* GETSPNAM_R_PROTO:
+ *	This symbol encodes the prototype of getspnam_r.
+ *	It is zero if d_getspnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_getspnam_r
+ *	is defined.
+ */
+/*#define HAS_GETSPNAM_R	   / **/
+#define GETSPNAM_R_PROTO 0	   /**/
+
+/* HAS_GMTIME_R:
+ *	This symbol, if defined, indicates that the gmtime_r routine
+ *	is available to gmtime re-entrantly.
+ */
+/* GMTIME_R_PROTO:
+ *	This symbol encodes the prototype of gmtime_r.
+ *	It is zero if d_gmtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_gmtime_r
+ *	is defined.
+ */
+/*#define HAS_GMTIME_R	   / **/
+#define GMTIME_R_PROTO 0	   /**/
+
+/* HAS_LOCALTIME_R:
+ *	This symbol, if defined, indicates that the localtime_r routine
+ *	is available to localtime re-entrantly.
+ */
+/* LOCALTIME_R_NEEDS_TZSET:
+ *	Many libc's localtime_r implementations do not call tzset,
+ *	making them differ from localtime(), and making timezone
+ *	changes using $ENV{TZ} without explicitly calling tzset
+ *	impossible. This symbol makes us call tzset before localtime_r
+ */
+/*#define LOCALTIME_R_NEEDS_TZSET / **/
+#ifdef LOCALTIME_R_NEEDS_TZSET
+#define L_R_TZSET tzset(),
+#else
+#define L_R_TZSET
+#endif
+
+/* LOCALTIME_R_PROTO:
+ *	This symbol encodes the prototype of localtime_r.
+ *	It is zero if d_localtime_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_localtime_r
+ *	is defined.
+ */
+/*#define HAS_LOCALTIME_R	   / **/
+#define LOCALTIME_R_PROTO 0	   /**/
+
+/* OLD_PTHREAD_CREATE_JOINABLE:
+ *	This symbol, if defined, indicates how to create pthread
+ *	in joinable (aka undetached) state.  NOTE: not defined
+ *	if pthread.h already has defined PTHREAD_CREATE_JOINABLE
+ *	(the new version of the constant).
+ *	If defined, known values are PTHREAD_CREATE_UNDETACHED
+ *	and __UNDETACHED.
+ */
+/*#define OLD_PTHREAD_CREATE_JOINABLE  / **/
+
+/* HAS_PTHREAD_ATFORK:
+ *	This symbol, if defined, indicates that the pthread_atfork routine
+ *	is available to setup fork handlers.
+ */
+/*#define HAS_PTHREAD_ATFORK		/ **/
+
+/* HAS_PTHREAD_YIELD:
+ *	This symbol, if defined, indicates that the pthread_yield
+ *	routine is available to yield the execution of the current
+ *	thread.	 sched_yield is preferable to pthread_yield.
+ */
+/* SCHED_YIELD:
+ *	This symbol defines the way to yield the execution of
+ *	the current thread.  Known ways are sched_yield,
+ *	pthread_yield, and pthread_yield with NULL.
+ */
+/* HAS_SCHED_YIELD:
+ *	This symbol, if defined, indicates that the sched_yield
+ *	routine is available to yield the execution of the current
+ *	thread.	 sched_yield is preferable to pthread_yield.
+ */
+/*#define HAS_PTHREAD_YIELD	/ **/
+#define SCHED_YIELD	sched_yield()	/**/
+/*#define HAS_SCHED_YIELD	/ **/
+
+/* HAS_RANDOM_R:
+ *	This symbol, if defined, indicates that the random_r routine
+ *	is available to random re-entrantly.
+ */
+/* RANDOM_R_PROTO:
+ *	This symbol encodes the prototype of random_r.
+ *	It is zero if d_random_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_random_r
+ *	is defined.
+ */
+/*#define HAS_RANDOM_R	   / **/
+#define RANDOM_R_PROTO 0	   /**/
+
+/* HAS_READDIR64_R:
+ *	This symbol, if defined, indicates that the readdir64_r routine
+ *	is available to readdir64 re-entrantly.
+ */
+/* READDIR64_R_PROTO:
+ *	This symbol encodes the prototype of readdir64_r.
+ *	It is zero if d_readdir64_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir64_r
+ *	is defined.
+ */
+/*#define HAS_READDIR64_R	   / **/
+#define READDIR64_R_PROTO 0	   /**/
+
+/* HAS_READDIR_R:
+ *	This symbol, if defined, indicates that the readdir_r routine
+ *	is available to readdir re-entrantly.
+ */
+/* READDIR_R_PROTO:
+ *	This symbol encodes the prototype of readdir_r.
+ *	It is zero if d_readdir_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir_r
+ *	is defined.
+ */
+/*#define HAS_READDIR_R	   / **/
+#define READDIR_R_PROTO 0	   /**/
+
+/* HAS_SETGRENT_R:
+ *	This symbol, if defined, indicates that the setgrent_r routine
+ *	is available to setgrent re-entrantly.
+ */
+/* SETGRENT_R_PROTO:
+ *	This symbol encodes the prototype of setgrent_r.
+ *	It is zero if d_setgrent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setgrent_r
+ *	is defined.
+ */
+/*#define HAS_SETGRENT_R	   / **/
+#define SETGRENT_R_PROTO 0	   /**/
+
+/* HAS_SETHOSTENT_R:
+ *	This symbol, if defined, indicates that the sethostent_r routine
+ *	is available to sethostent re-entrantly.
+ */
+/* SETHOSTENT_R_PROTO:
+ *	This symbol encodes the prototype of sethostent_r.
+ *	It is zero if d_sethostent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_sethostent_r
+ *	is defined.
+ */
+/*#define HAS_SETHOSTENT_R	   / **/
+#define SETHOSTENT_R_PROTO 0	   /**/
+
+/* HAS_SETLOCALE_R:
+ *	This symbol, if defined, indicates that the setlocale_r routine
+ *	is available to setlocale re-entrantly.
+ */
+/* SETLOCALE_R_PROTO:
+ *	This symbol encodes the prototype of setlocale_r.
+ *	It is zero if d_setlocale_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setlocale_r
+ *	is defined.
+ */
+/*#define HAS_SETLOCALE_R	   / **/
+#define SETLOCALE_R_PROTO 0	   /**/
+
+/* HAS_SETNETENT_R:
+ *	This symbol, if defined, indicates that the setnetent_r routine
+ *	is available to setnetent re-entrantly.
+ */
+/* SETNETENT_R_PROTO:
+ *	This symbol encodes the prototype of setnetent_r.
+ *	It is zero if d_setnetent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setnetent_r
+ *	is defined.
+ */
+/*#define HAS_SETNETENT_R	   / **/
+#define SETNETENT_R_PROTO 0	   /**/
+
+/* HAS_SETPROTOENT_R:
+ *	This symbol, if defined, indicates that the setprotoent_r routine
+ *	is available to setprotoent re-entrantly.
+ */
+/* SETPROTOENT_R_PROTO:
+ *	This symbol encodes the prototype of setprotoent_r.
+ *	It is zero if d_setprotoent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setprotoent_r
+ *	is defined.
+ */
+/*#define HAS_SETPROTOENT_R	   / **/
+#define SETPROTOENT_R_PROTO 0	   /**/
+
+/* HAS_SETPWENT_R:
+ *	This symbol, if defined, indicates that the setpwent_r routine
+ *	is available to setpwent re-entrantly.
+ */
+/* SETPWENT_R_PROTO:
+ *	This symbol encodes the prototype of setpwent_r.
+ *	It is zero if d_setpwent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setpwent_r
+ *	is defined.
+ */
+/*#define HAS_SETPWENT_R	   / **/
+#define SETPWENT_R_PROTO 0	   /**/
+
+/* HAS_SETSERVENT_R:
+ *	This symbol, if defined, indicates that the setservent_r routine
+ *	is available to setservent re-entrantly.
+ */
+/* SETSERVENT_R_PROTO:
+ *	This symbol encodes the prototype of setservent_r.
+ *	It is zero if d_setservent_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_setservent_r
+ *	is defined.
+ */
+/*#define HAS_SETSERVENT_R	   / **/
+#define SETSERVENT_R_PROTO 0	   /**/
+
+/* HAS_SRAND48_R:
+ *	This symbol, if defined, indicates that the srand48_r routine
+ *	is available to srand48 re-entrantly.
+ */
+/* SRAND48_R_PROTO:
+ *	This symbol encodes the prototype of srand48_r.
+ *	It is zero if d_srand48_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srand48_r
+ *	is defined.
+ */
+/*#define HAS_SRAND48_R	   / **/
+#define SRAND48_R_PROTO 0	   /**/
+
+/* HAS_SRANDOM_R:
+ *	This symbol, if defined, indicates that the srandom_r routine
+ *	is available to srandom re-entrantly.
+ */
+/* SRANDOM_R_PROTO:
+ *	This symbol encodes the prototype of srandom_r.
+ *	It is zero if d_srandom_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_srandom_r
+ *	is defined.
+ */
+/*#define HAS_SRANDOM_R	   / **/
+#define SRANDOM_R_PROTO 0	   /**/
+
+/* HAS_STRERROR_R:
+ *	This symbol, if defined, indicates that the strerror_r routine
+ *	is available to strerror re-entrantly.
+ */
+/* STRERROR_R_PROTO:
+ *	This symbol encodes the prototype of strerror_r.
+ *	It is zero if d_strerror_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_strerror_r
+ *	is defined.
+ */
+/*#define HAS_STRERROR_R	   / **/
+#define STRERROR_R_PROTO 0	   /**/
+
+/* HAS_TMPNAM_R:
+ *	This symbol, if defined, indicates that the tmpnam_r routine
+ *	is available to tmpnam re-entrantly.
+ */
+/* TMPNAM_R_PROTO:
+ *	This symbol encodes the prototype of tmpnam_r.
+ *	It is zero if d_tmpnam_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_tmpnam_r
+ *	is defined.
+ */
+/*#define HAS_TMPNAM_R	   / **/
+#define TMPNAM_R_PROTO 0	   /**/
+
+/* HAS_TTYNAME_R:
+ *	This symbol, if defined, indicates that the ttyname_r routine
+ *	is available to ttyname re-entrantly.
+ */
+/* TTYNAME_R_PROTO:
+ *	This symbol encodes the prototype of ttyname_r.
+ *	It is zero if d_ttyname_r is undef, and one of the
+ *	REENTRANT_PROTO_T_ABC macros of reentr.h if d_ttyname_r
+ *	is defined.
+ */
+/*#define HAS_TTYNAME_R	   / **/
+#define TTYNAME_R_PROTO 0	   /**/
+
+/* I_MACH_CTHREADS:
+ *     This symbol, if defined, indicates to the C program that it should
+ *     include <mach/cthreads.h>.
+ */
+/*#define   I_MACH_CTHREADS	/ **/
+
+/* I_PTHREAD:
+ *     This symbol, if defined, indicates to the C program that it should
+ *     include <pthread.h>.
+ */
+/*#define   I_PTHREAD	/ **/
+
+/* USE_ITHREADS:
+ *	This symbol, if defined, indicates that Perl should be built to
+ *	use the interpreter-based threading implementation.
+ */
+/* USE_5005THREADS:
+ *	This symbol, if defined, indicates that Perl should be built to
+ *	use the 5.005-based threading implementation.
+ *	Only valid up to 5.8.x.
+ */
+/* OLD_PTHREADS_API:
+ *	This symbol, if defined, indicates that Perl should
+ *	be built to use the old draft POSIX threads API.
+ */
+/* USE_REENTRANT_API:
+ *	This symbol, if defined, indicates that Perl should
+ *	try to use the various _r versions of library functions.
+ *	This is extremely experimental.
+ */
+/*#define	USE_5005THREADS		/ **/
+/*#define	USE_ITHREADS		/ **/
+#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
+#define		USE_THREADS		/* until src is revised*/
+#endif
+/*#define	OLD_PTHREADS_API		/ **/
+/*#define	USE_REENTRANT_API	/ **/
+
+/* HAS_TIME:
+ *	This symbol, if defined, indicates that the time() routine exists.
+ */
+/* Time_t:
+ *	This symbol holds the type returned by time(). It can be long,
+ *	or time_t on BSD sites (in which case <sys/types.h> should be
+ *	included).
+ */
+#define HAS_TIME		/**/
+#define Time_t time_t		/* Time type */
+
+/* HAS_TIMES:
+ *	This symbol, if defined, indicates that the times() routine exists.
+ *	Note that this became obsolete on some systems (SUNOS), which now
+ * use getrusage(). It may be necessary to include <sys/times.h>.
+ */
+/*#define HAS_TIMES		/ **/
+
+/* Fpos_t:
+ *	This symbol holds the type used to declare file positions in libc.
+ *	It can be fpos_t, long, uint, etc... It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
+ */
+#define Fpos_t int		/* File position type */
+
+/* Gid_t_f:
+ *	This symbol defines the format string used for printing a Gid_t.
+ */
+#define	Gid_t_f		"lu"		/**/
+
+/* Gid_t_sign:
+ *	This symbol holds the signedness of a Gid_t.
+ *	1 for unsigned, -1 for signed.
+ */
+#define Gid_t_sign	1		/* GID sign */
+
+/* Gid_t_size:
+ *	This symbol holds the size of a Gid_t in bytes.
+ */
+#define Gid_t_size 4		/* GID size */
+
+/* Gid_t:
+ *	This symbol holds the return type of getgid() and the type of
+ *	argument to setrgid() and related functions.  Typically,
+ *	it is the type of group ids in the kernel. It can be int, ushort,
+ *	gid_t, etc... It may be necessary to include <sys/types.h> to get
+ *	any typedef'ed information.
+ */
+#define Gid_t int		/* Type for getgid(), etc... */
+
+/* Off_t:
+ *	This symbol holds the type used to declare offsets in the kernel.
+ *	It can be int, long, off_t, etc... It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
+ */
+/* LSEEKSIZE:
+ *	This symbol holds the number of bytes used by the Off_t.
+ */
+/* Off_t_size:
+ *	This symbol holds the number of bytes used by the Off_t.
+ */
+#define Off_t int		/* <offset> type */
+#define LSEEKSIZE 4		/* <offset> size */
+#define Off_t_size 4	/* <offset> size */
+
+/* Mode_t:
+ *	This symbol holds the type used to declare file modes
+ *	for systems calls.  It is usually mode_t, but may be
+ *	int or unsigned short.  It may be necessary to include <sys/types.h>
+ *	to get any typedef'ed information.
+ */
+#define Mode_t int	 /* file mode parameter for system calls */
+
+/* Pid_t:
+ *	This symbol holds the type used to declare process ids in the kernel.
+ *	It can be int, uint, pid_t, etc... It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
+ */
+#define Pid_t int		/* PID type */
+
+/* Size_t_size:
+ *	This symbol holds the size of a Size_t in bytes.
+ */
+#define Size_t_size 4		/**/
+
+/* Size_t:
+ *	This symbol holds the type used to declare length parameters
+ *	for string functions.  It is usually size_t, but may be
+ *	unsigned long, int, etc.  It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
+ */
+#define Size_t size_t	 /* length parameter for string functions */
+
+/* Uid_t_f:
+ *	This symbol defines the format string used for printing a Uid_t.
+ */
+#define	Uid_t_f		"lu"		/**/
+
+/* Uid_t_sign:
+ *	This symbol holds the signedness of a Uid_t.
+ *	1 for unsigned, -1 for signed.
+ */
+#define Uid_t_sign	1		/* UID sign */
+
+/* Uid_t_size:
+ *	This symbol holds the size of a Uid_t in bytes.
+ */
+#define Uid_t_size 4		/* UID size */
+
+/* Uid_t:
+ *	This symbol holds the type used to declare user ids in the kernel.
+ *	It can be int, ushort, uid_t, etc... It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
+ */
+#define Uid_t int		/* UID type */
+
 #endif
 
 /* Generated from:
- * 496e563499c7b715275d61ae663d25dd20d963c75f9d3ee7850dae949df14136 config_h.SH
- * 45fb46f69ab3d7fd8ea14fc29d490d044cbdd81e8a0111bc0b37aff4321d6182 uconfig.sh
+ * ce61c4f18e82f6356cdae44c5336ceac1d3253033d7449651927f5633be5c3c2 config_h.SH
+ * fc611849cb5b1e14ec1687b255dac15414cc5e2e11b192d94e08136cfe277f75 uconfig.sh
  * ex: set ro: */
diff --git a/Master/tlpkg/tlperl/lib/CORE/unicode_constants.h b/Master/tlpkg/tlperl/lib/CORE/unicode_constants.h
index a7ddfeb9afa..bffaffedb2e 100755
--- a/Master/tlpkg/tlperl/lib/CORE/unicode_constants.h
+++ b/Master/tlpkg/tlperl/lib/CORE/unicode_constants.h
@@ -8,10 +8,11 @@
 #ifndef H_UNICODE_CONSTANTS   /* Guard against nested #includes */
 #define H_UNICODE_CONSTANTS   1
 
-/* This file contains #defines for various Unicode code points.  The values
- * the macros expand to are the native Unicode code point, or all or portions
- * of the UTF-8 encoding for the code point.  In the former case, the macro
- * name has the suffix "_NATIVE"; otherwise, the suffix "_UTF8".
+/* This file contains #defines for the version of Unicode being used and
+ * various Unicode code points.  The values the code point macros expand to
+ * are the native Unicode code point, or all or portions of the UTF-8 encoding
+ * for the code point.  In the former case, the macro name has the suffix
+ * "_NATIVE"; otherwise, the suffix "_UTF8".
  *
  * The macros that have the suffix "_UTF8" may have further suffixes, as
  * follows:
@@ -20,6 +21,10 @@
  *  "_TAIL"       if instead it represents all but the first byte.  This, and
  *                with no additional suffix are both string constants */
 
+#define UNICODE_MAJOR_VERSION   8
+#define UNICODE_DOT_VERSION     0
+#define UNICODE_DOT_DOT_VERSION 0
+
 
 #if 'A' == 65 /* ASCII/Latin1 */
 #   define LATIN_SMALL_LETTER_LONG_S_UTF8  "\xC5\xBF"    /* U+017F */
@@ -33,9 +38,10 @@
 
 #   define LATIN_SMALL_LIGATURE_LONG_S_T_UTF8  "\xEF\xAC\x85"    /* U+FB05 */
 #   define LATIN_SMALL_LIGATURE_ST_UTF8  "\xEF\xAC\x86"    /* U+FB06 */
+#   define LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE_UTF8  "\xC4\xB0"    /* U+0130 */
+#   define LATIN_SMALL_LETTER_DOTLESS_I_UTF8  "\xC4\xB1"    /* U+0131 */
 
 #   define HYPHEN_UTF8  "\xE2\x80\x90"    /* U+2010 */
-#   define FIRST_SURROGATE_UTF8_FIRST_BYTE  0xED    /* U+D800 */
 #   define BOM_UTF8_FIRST_BYTE  0xEF    /* U+FEFF */
 #   define BOM_UTF8_TAIL  "\xBB\xBF"    /* U+FEFF */
 
@@ -71,9 +77,10 @@
 
 #   define LATIN_SMALL_LIGATURE_LONG_S_T_UTF8  "\xDD\x72\x67\x46"    /* U+FB05 */
 #   define LATIN_SMALL_LIGATURE_ST_UTF8  "\xDD\x72\x67\x47"    /* U+FB06 */
+#   define LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE_UTF8  "\x8D\x57"    /* U+0130 */
+#   define LATIN_SMALL_LETTER_DOTLESS_I_UTF8  "\x8D\x58"    /* U+0131 */
 
 #   define HYPHEN_UTF8  "\xCA\x41\x57"    /* U+2010 */
-#   define FIRST_SURROGATE_UTF8_FIRST_BYTE  0xDD    /* U+D800 */
 #   define BOM_UTF8_FIRST_BYTE  0xDD    /* U+FEFF */
 #   define BOM_UTF8_TAIL  "\x73\x66\x73"    /* U+FEFF */
 
@@ -109,9 +116,10 @@
 
 #   define LATIN_SMALL_LIGATURE_LONG_S_T_UTF8  "\xDD\x71\x66\x46"    /* U+FB05 */
 #   define LATIN_SMALL_LIGATURE_ST_UTF8  "\xDD\x71\x66\x47"    /* U+FB06 */
+#   define LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE_UTF8  "\x8C\x57"    /* U+0130 */
+#   define LATIN_SMALL_LETTER_DOTLESS_I_UTF8  "\x8C\x58"    /* U+0131 */
 
 #   define HYPHEN_UTF8  "\xCA\x41\x57"    /* U+2010 */
-#   define FIRST_SURROGATE_UTF8_FIRST_BYTE  0xDD    /* U+D800 */
 #   define BOM_UTF8_FIRST_BYTE  0xDD    /* U+FEFF */
 #   define BOM_UTF8_TAIL  "\x72\x65\x72"    /* U+FEFF */
 
@@ -132,46 +140,11 @@
 
 #endif	/* EBCDIC 037 */
 
-#if 'A' == 193 /* EBCDIC POSIX-BC */ \
-     && '\\' == 188 && '[' == 187 && ']' == 189 && '{' == 251 && '}' == 253 \
-     && '^' == 106 && '~' == 255 && '!' == 90 && '#' == 123 && '|' == 79 \
-     && '$' == 91 && '@' == 124 && '`' == 74
-#   define LATIN_SMALL_LETTER_LONG_S_UTF8  "\x90\x75"    /* U+017F */
-
-#   define COMBINING_GRAVE_ACCENT_UTF8  "\xAE\x41"    /* U+0300 */
-
-#   define GREEK_CAPITAL_LETTER_IOTA_UTF8  "\xB2\x69"    /* U+0399 */
-#   define GREEK_SMALL_LETTER_MU_UTF8  "\xB3\x72"    /* U+03BC */
-
-#   define LATIN_CAPITAL_LETTER_SHARP_S_UTF8  "\xC0\x64\x74"    /* U+1E9E */
-
-#   define LATIN_SMALL_LIGATURE_LONG_S_T_UTF8  "\xDC\x74\x68\x46"    /* U+FB05 */
-#   define LATIN_SMALL_LIGATURE_ST_UTF8  "\xDC\x74\x68\x47"    /* U+FB06 */
-
-#   define HYPHEN_UTF8  "\xCA\x41\x58"    /* U+2010 */
-#   define FIRST_SURROGATE_UTF8_FIRST_BYTE  0xDC    /* U+D800 */
-#   define BOM_UTF8_FIRST_BYTE  0xDC    /* U+FEFF */
-#   define BOM_UTF8_TAIL  "\x75\x67\x75"    /* U+FEFF */
-
-#   define NBSP_NATIVE  0x41    /* U+00A0 */
-#   define NBSP_UTF8  "\x8A\x41"    /* U+00A0 */
-
-#   define DEL_NATIVE  0x07    /* U+007F */
-#   define CR_NATIVE  0x0D    /* U+000D */
-#   define LF_NATIVE  0x15    /* U+000A */
-#   define VT_NATIVE  0x0B    /* U+000B */
-#   define ESC_NATIVE  0x27    /* U+001B */
-#   define LATIN_SMALL_LETTER_SHARP_S_NATIVE  0x59    /* U+00DF */
-#   define LATIN_SMALL_LETTER_A_WITH_RING_ABOVE_NATIVE  0x47    /* U+00E5 */
-#   define LATIN_CAPITAL_LETTER_A_WITH_RING_ABOVE_NATIVE  0x67    /* U+00C5 */
-#   define LATIN_SMALL_LETTER_Y_WITH_DIAERESIS_NATIVE  0xDF    /* U+00FF */
-#   define MICRO_SIGN_NATIVE  0xA0    /* U+00B5 */
-#   define MAX_PRINT_A_FOR_USE_ONLY_BY_REGCOMP_DOT_C   0xFF   /* The max code point that isPRINT_A */
-
-#endif	/* EBCDIC POSIX-BC */
-
 /* The number of code points not matching \pC */
-#define NON_OTHER_COUNT_FOR_USE_ONLY_BY_REGCOMP_DOT_C  112806
+#define NON_OTHER_COUNT_FOR_USE_ONLY_BY_REGCOMP_DOT_C  120522
+
+/* The highest code point that has any type of case change */
+#define HIGHEST_CASE_CHANGING_CP_FOR_USE_ONLY_BY_UTF8_DOT_C  0x118DF
 
 #endif /* H_UNICODE_CONSTANTS */
 
diff --git a/Master/tlpkg/tlperl/lib/CORE/unixish.h b/Master/tlpkg/tlperl/lib/CORE/unixish.h
index 1eb6785f952..e05cb6a4f34 100644
--- a/Master/tlpkg/tlperl/lib/CORE/unixish.h
+++ b/Master/tlpkg/tlperl/lib/CORE/unixish.h
@@ -122,19 +122,38 @@
 #define fwrite1 fwrite
 
 #define Stat(fname,bufptr) stat((fname),(bufptr))
-#define Fstat(fd,bufptr)   fstat((fd),(bufptr))
+
+#ifdef __amigaos4__
+int afstat(int fd, struct stat *statb);
+#  define Fstat(fd,bufptr) afstat((fd),(bufptr))
+#endif
+
+#ifndef Fstat
+#  define Fstat(fd,bufptr)   fstat((fd),(bufptr))
+#endif
+
 #define Fflush(fp)         fflush(fp)
 #define Mkdir(path,mode)   mkdir((path),(mode))
 
+#if defined(__amigaos4__)
+#  define PERL_SYS_INIT_BODY(c,v)					\
+	MALLOC_CHECK_TAINT2(*c,*v) PERL_FPU_INIT; PERLIO_INIT; MALLOC_INIT; amigaos4_init_fork_array(); amigaos4_init_environ_sema();
+#  define PERL_SYS_TERM_BODY()                              \
+    HINTS_REFCNT_TERM; OP_CHECK_MUTEX_TERM;                 \
+    OP_REFCNT_TERM; PERLIO_TERM; MALLOC_TERM; LOCALE_TERM;  \
+    amigaos4_dispose_fork_array();
+#endif
+
 #ifndef PERL_SYS_INIT_BODY
 #  define PERL_SYS_INIT_BODY(c,v)					\
 	MALLOC_CHECK_TAINT2(*c,*v) PERL_FPU_INIT; PERLIO_INIT; MALLOC_INIT
 #endif
 
 #ifndef PERL_SYS_TERM_BODY
-#  define PERL_SYS_TERM_BODY() \
-    HINTS_REFCNT_TERM; OP_CHECK_MUTEX_TERM; \
-    OP_REFCNT_TERM; PERLIO_TERM; MALLOC_TERM;
+#  define PERL_SYS_TERM_BODY()                      \
+    HINTS_REFCNT_TERM; OP_CHECK_MUTEX_TERM;         \
+    OP_REFCNT_TERM; PERLIO_TERM; MALLOC_TERM;       \
+    LOCALE_TERM;
 
 #endif
 
diff --git a/Master/tlpkg/tlperl/lib/CORE/utf8.h b/Master/tlpkg/tlperl/lib/CORE/utf8.h
index 3e15707ff8a..c954b42ff5d 100644
--- a/Master/tlpkg/tlperl/lib/CORE/utf8.h
+++ b/Master/tlpkg/tlperl/lib/CORE/utf8.h
@@ -30,9 +30,9 @@
 #include "unicode_constants.h"
 
 /* For to_utf8_fold_flags, q.v. */
-#define FOLD_FLAGS_LOCALE 0x1
-#define FOLD_FLAGS_FULL   0x2
-#define FOLD_FLAGS_NOMIX_ASCII 0x4
+#define FOLD_FLAGS_LOCALE       0x1
+#define FOLD_FLAGS_FULL         0x2
+#define FOLD_FLAGS_NOMIX_ASCII  0x4
 
 /* For _core_swash_init(), internal core use only */
 #define _CORE_SWASH_INIT_USER_DEFINED_PROPERTY 0x1
@@ -97,6 +97,13 @@ than just the ASCII characters, so C<is_invariant_string> is preferred.
 #else	/* ! EBCDIC */
 START_EXTERN_C
 
+/* How wide can a single UTF-8 encoded character become in bytes. */
+/* NOTE: Strictly speaking Perl's UTF-8 should not be called UTF-8 since UTF-8
+ * is an encoding of Unicode, and Unicode's upper limit, 0x10FFFF, can be
+ * expressed with 4 bytes.  However, Perl thinks of UTF-8 as a way to encode
+ * non-negative integers in a binary format, even those above Unicode */
+#define UTF8_MAXBYTES 13
+
 #ifdef DOINIT
 EXTCONST unsigned char PL_utf8skip[] = {
 /* 0x00 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* ascii */
@@ -112,12 +119,14 @@ EXTCONST unsigned char PL_utf8skip[] = {
 /* 0xA0 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* bogus: continuation byte */
 /* 0xB0 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* bogus: continuation byte */
 /* 0xC0 */ 2,2,				    /* overlong */
-/* 0xC2 */ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,     /* U+0080 to U+03FF */
+/* 0xC2 */     2,2,2,2,2,2,2,2,2,2,2,2,2,2, /* U+0080 to U+03FF */
 /* 0xD0 */ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, /* U+0400 to U+07FF */
 /* 0xE0 */ 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, /* U+0800 to U+FFFF */
 /* 0xF0 */ 4,4,4,4,4,4,4,4,5,5,5,5,6,6,	    /* above BMP to 2**31 - 1 */
-/* 0xFE */ 7,13, /* Perl extended (never was official UTF-8).  Up to 72bit
-		    allowed (64-bit + reserved). */
+           /* Perl extended (never was official UTF-8).  Up to 36 bit */
+/* 0xFE */                             7,
+           /* More extended, Up to 72 bits (64-bit + reserved) */
+/* 0xFF */                               UTF8_MAXBYTES
 };
 #else
 EXTCONST unsigned char PL_utf8skip[];
@@ -125,10 +134,20 @@ EXTCONST unsigned char PL_utf8skip[];
 
 END_EXTERN_C
 
+#if defined(_MSC_VER) && _MSC_VER < 1400
+/* older MSVC versions have a smallish macro buffer */
+#define PERL_SMALL_MACRO_BUFFER
+#endif
+
 /* Native character to/from iso-8859-1.  Are the identity functions on ASCII
  * platforms */
-#define NATIVE_TO_LATIN1(ch)     (ch)
-#define LATIN1_TO_NATIVE(ch)     (ch)
+#ifdef PERL_SMALL_MACRO_BUFFER
+#define NATIVE_TO_LATIN1(ch)     ((U8)(ch))
+#define LATIN1_TO_NATIVE(ch)     ((U8)(ch))
+#else
+#define NATIVE_TO_LATIN1(ch)     (__ASSERT_(FITS_IN_8_BITS(ch)) ((U8) (ch)))
+#define LATIN1_TO_NATIVE(ch)     (__ASSERT_(FITS_IN_8_BITS(ch)) ((U8) (ch)))
+#endif
 
 /* I8 is an intermediate version of UTF-8 used only in UTF-EBCDIC.  We thus
  * consider it to be identical to UTF-8 on ASCII platforms.  Strictly speaking
@@ -136,12 +155,17 @@ END_EXTERN_C
  * because they are 8-bit encodings that serve the same purpose in Perl, and
  * rarely do we need to distinguish them.  The term "NATIVE_UTF8" applies to
  * whichever one is applicable on the current platform */
+#ifdef PERL_SMALL_MACRO_BUFFER
 #define NATIVE_UTF8_TO_I8(ch) (ch)
 #define I8_TO_NATIVE_UTF8(ch) (ch)
+#else
+#define NATIVE_UTF8_TO_I8(ch) (__ASSERT_(FITS_IN_8_BITS(ch)) ((U8) (ch)))
+#define I8_TO_NATIVE_UTF8(ch) (__ASSERT_(FITS_IN_8_BITS(ch)) ((U8) (ch)))
+#endif
 
 /* Transforms in wide UV chars */
-#define UNI_TO_NATIVE(ch)        (ch)
-#define NATIVE_TO_UNI(ch)        (ch)
+#define UNI_TO_NATIVE(ch)        ((UV) (ch))
+#define NATIVE_TO_UNI(ch)        ((UV) (ch))
 
 /*
 
@@ -190,46 +214,50 @@ Perl's extended UTF-8 means we can have start bytes up to FF.
 
 */
 
-/* Is the representation of the Unicode code point 'c' the same regardless of
+/* Is the representation of the Unicode code point 'cp' the same regardless of
  * being encoded in UTF-8 or not? */
-#define UNI_IS_INVARIANT(c)		(((UV)c) <  0x80)
+#define OFFUNI_IS_INVARIANT(cp)     isASCII(cp)
 
-/* Is the UTF8-encoded byte 'c' part of a variant sequence in UTF-8?  This is
- * the inverse of UTF8_IS_INVARIANT */
-#define UTF8_IS_CONTINUED(c) 		(((U8)c) &  0x80)
+/* Is the representation of the code point 'cp' the same regardless of
+ * being encoded in UTF-8 or not?  'cp' is native if < 256; Unicode otherwise
+ * */
+#define UVCHR_IS_INVARIANT(cp)      OFFUNI_IS_INVARIANT(cp)
+
+/* This defines the bits that are to be in the continuation bytes of a multi-byte
+ * UTF-8 encoded character that mark it is a continuation byte. */
+#define UTF_CONTINUATION_MARK		0x80
+
+/* Misleadingly named: is the UTF8-encoded byte 'c' part of a variant sequence
+ * in UTF-8?  This is the inverse of UTF8_IS_INVARIANT.  The |0 makes sure this
+ * isn't mistakenly called with a ptr argument */
+#define UTF8_IS_CONTINUED(c)        (((U8)((c) | 0)) &  UTF_CONTINUATION_MARK)
 
 /* Is the byte 'c' the first byte of a multi-byte UTF8-8 encoded sequence?
  * This doesn't catch invariants (they are single-byte).  It also excludes the
- * illegal overlong sequences that begin with C0 and C1. */
-#define UTF8_IS_START(c)		(((U8)c) >= 0xc2)
+ * illegal overlong sequences that begin with C0 and C1.  The |0 makes sure
+ * this isn't mistakenly called with a ptr argument */
+#define UTF8_IS_START(c)            (((U8)((c) | 0)) >= 0xc2)
+
+/* For use in UTF8_IS_CONTINUATION() below */
+#define UTF_IS_CONTINUATION_MASK    0xC0
 
 /* Is the byte 'c' part of a multi-byte UTF8-8 encoded sequence, and not the
- * first byte thereof?  */
-#define UTF8_IS_CONTINUATION(c)		((((U8)c) & 0xC0) == 0x80)
+ * first byte thereof?  The |0 makes sure this isn't mistakenly called with a
+ * ptr argument */
+#define UTF8_IS_CONTINUATION(c)                                             \
+    ((((U8)((c) | 0)) & UTF_IS_CONTINUATION_MASK) == UTF_CONTINUATION_MARK)
 
 /* Is the UTF8-encoded byte 'c' the first byte of a two byte sequence?  Use
  * UTF8_IS_NEXT_CHAR_DOWNGRADEABLE() instead if the input isn't known to
  * be well-formed.  Masking with 0xfe allows the low bit to be 0 or 1; thus
- * this matches 0xc[23]. */
-#define UTF8_IS_DOWNGRADEABLE_START(c)	(((U8)(c) & 0xfe) == 0xc2)
+ * this matches 0xc[23].  The |0 makes sure this isn't mistakenly called with a
+ * ptr argument */
+#define UTF8_IS_DOWNGRADEABLE_START(c)	((((U8)((c) | 0)) & 0xfe) == 0xc2)
 
 /* Is the UTF8-encoded byte 'c' the first byte of a sequence of bytes that
- * represent a code point > 255? */
-#define UTF8_IS_ABOVE_LATIN1(c)	((U8)(c) >= 0xc4)
-
-/* This defines the 1-bits that are to be in the first byte of a multi-byte
- * UTF-8 encoded character that give the number of bytes that comprise the
- * character. 'len' is the number of bytes in the multi-byte sequence. */
-#define UTF_START_MARK(len) (((len) >  7) ? 0xFF : (0xFF & (0xFE << (7-(len)))))
-
-/* Masks out the initial one bits in a start byte, leaving the real data ones.
- * Doesn't work on an invariant byte.  'len' is the number of bytes in the
- * multi-byte sequence that comprises the character. */
-#define UTF_START_MASK(len) (((len) >= 7) ? 0x00 : (0x1F >> ((len)-2)))
-
-/* This defines the bits that are to be in the continuation bytes of a multi-byte
- * UTF-8 encoded character that indicate it is a continuation byte. */
-#define UTF_CONTINUATION_MARK		0x80
+ * represent a code point > 255?  The |0 makes sure this isn't mistakenly
+ * called with a ptr argument */
+#define UTF8_IS_ABOVE_LATIN1(c)     (((U8)((c) | 0)) >= 0xc4)
 
 /* This is the number of low-order bits a continuation byte in a UTF-8 encoded
  * sequence contributes to the specification of the code point.  In the bit
@@ -237,63 +265,98 @@ Perl's extended UTF-8 means we can have start bytes up to FF.
  * real information */
 #define UTF_ACCUMULATION_SHIFT		6
 
-/* 2**UTF_ACCUMULATION_SHIFT - 1 */
-#define UTF_CONTINUATION_MASK		((U8)0x3f)
+/* ^? is defined to be DEL on ASCII systems.  See the definition of toCTRL()
+ * for more */
+#define QUESTION_MARK_CTRL  DEL_NATIVE
 
-/* If a value is anded with this, and the result is non-zero, then using the
- * original value in UTF8_ACCUMULATE will overflow, shifting bits off the left
- * */
-#define UTF_ACCUMULATION_OVERFLOW_MASK					\
-    (((UV) UTF_CONTINUATION_MASK) << ((sizeof(UV) * CHARBITS)           \
-           - UTF_ACCUMULATION_SHIFT))
+/* Surrogates, non-character code points and above-Unicode code points are
+ * problematic in some contexts.  This allows code that needs to check for
+ * those to to quickly exclude the vast majority of code points it will
+ * encounter */
+#define isUTF8_POSSIBLY_PROBLEMATIC(c) ((U8) c >= 0xED)
 
-#if UVSIZE >= 8
-#  define UTF8_QUAD_MAX UINT64_C(0x1000000000)
+#endif /* EBCDIC vs ASCII */
 
-/* Input is a true Unicode (not-native) code point */
-#define OFFUNISKIP(uv) ( (uv) < 0x80        ? 1 : \
-		      (uv) < 0x800          ? 2 : \
-		      (uv) < 0x10000        ? 3 : \
-		      (uv) < 0x200000       ? 4 : \
-		      (uv) < 0x4000000      ? 5 : \
-		      (uv) < 0x80000000     ? 6 : \
-                      (uv) < UTF8_QUAD_MAX ? 7 : 13 )
+/* 2**UTF_ACCUMULATION_SHIFT - 1 */
+#define UTF_CONTINUATION_MASK  ((U8) ((1U << UTF_ACCUMULATION_SHIFT) - 1))
+
+/* Internal macro to be used only in this file to aid in constructing other
+ * publicly accessible macros.
+ * The number of bytes required to express this uv in UTF-8, for just those
+ * uv's requiring 2 through 6 bytes, as these are common to all platforms and
+ * word sizes.  The number of bytes needed is given by the number of leading 1
+ * bits in the start byte.  There are 32 start bytes that have 2 initial 1 bits
+ * (C0-DF); there are 16 that have 3 initial 1 bits (E0-EF); 8 that have 4
+ * initial 1 bits (F0-F8); 4 that have 5 initial 1 bits (F9-FB), and 2 that
+ * have 6 initial 1 bits (FC-FD).  The largest number a string of n bytes can
+ * represent is       (the number of possible start bytes for 'n')
+ *                  * (the number of possiblities for each start byte
+ * The latter in turn is
+ *                  2  ** (  (how many continuation bytes there are)
+ *                         * (the number of bits of information each
+ *                            continuation byte holds))
+ *
+ * If we were on a platform where we could use a fast find first set bit
+ * instruction (or count leading zeros instruction) this could be replaced by
+ * using that to find the log2 of the uv, and divide that by the number of bits
+ * of information in each continuation byte, adjusting for large cases and how
+ * much information is in a start byte for that length */
+#define __COMMON_UNI_SKIP(uv)                                               \
+          (UV) (uv) < (32 * (1U << (    UTF_ACCUMULATION_SHIFT))) ? 2 :     \
+          (UV) (uv) < (16 * (1U << (2 * UTF_ACCUMULATION_SHIFT))) ? 3 :     \
+          (UV) (uv) < ( 8 * (1U << (3 * UTF_ACCUMULATION_SHIFT))) ? 4 :     \
+          (UV) (uv) < ( 4 * (1U << (4 * UTF_ACCUMULATION_SHIFT))) ? 5 :     \
+          (UV) (uv) < ( 2 * (1U << (5 * UTF_ACCUMULATION_SHIFT))) ? 6 :
+
+/* Internal macro to be used only in this file.
+ * This adds to __COMMON_UNI_SKIP the details at this platform's upper range.
+ * For any-sized EBCDIC platforms, or 64-bit ASCII ones, we need one more test
+ * to see if just 7 bytes is needed, or if the maximum is needed.  For 32-bit
+ * ASCII platforms, everything is representable by 7 bytes */
+#if defined(UV_IS_QUAD) || defined(EBCDIC)
+#   define __BASE_UNI_SKIP(uv) (__COMMON_UNI_SKIP(uv)                       \
+     (UV) (uv) < ((UV) 1U << (6 * UTF_ACCUMULATION_SHIFT)) ? 7 : UTF8_MAXBYTES)
 #else
-/* No, I'm not even going to *TRY* putting #ifdef inside a #define */
-#define OFFUNISKIP(uv) ( (uv) < 0x80        ? 1 : \
-		      (uv) < 0x800          ? 2 : \
-		      (uv) < 0x10000        ? 3 : \
-		      (uv) < 0x200000       ? 4 : \
-		      (uv) < 0x4000000      ? 5 : \
-		      (uv) < 0x80000000     ? 6 : 7 )
+#   define __BASE_UNI_SKIP(uv) (__COMMON_UNI_SKIP(uv) 7)
 #endif
 
-/* How wide can a single UTF-8 encoded character become in bytes. */
-/* NOTE: Strictly speaking Perl's UTF-8 should not be called UTF-8 since UTF-8
- * is an encoding of Unicode, and Unicode's upper limit, 0x10FFFF, can be
- * expressed with 4 bytes.  However, Perl thinks of UTF-8 as a way to encode
- * non-negative integers in a binary format, even those above Unicode */
-#define UTF8_MAXBYTES 13
+/* The next two macros use the base macro defined above, and add in the tests
+ * at the low-end of the range, for just 1 byte, yielding complete macros,
+ * publicly accessible. */
 
-/* The maximum number of UTF-8 bytes a single Unicode character can
- * uppercase/lowercase/fold into.  Unicode guarantees that the maximum
- * expansion is 3 characters.  On ASCIIish platforms, the highest Unicode
- * character occupies 4 bytes, therefore this number would be 12, but this is
- * smaller than the maximum width a single above-Unicode character can occupy,
- * so use that instead */
-#if UTF8_MAXBYTES < 12
-#error UTF8_MAXBYTES must be at least 12
-#endif
+/* Input is a true Unicode (not-native) code point */
+#define OFFUNISKIP(uv) (OFFUNI_IS_INVARIANT(uv) ? 1 : __BASE_UNI_SKIP(uv))
 
-/* ^? is defined to be DEL on ASCII systems.  See the definition of toCTRL()
- * for more */
-#define QUESTION_MARK_CTRL  DEL_NATIVE
+/*
 
-#define MAX_UTF8_TWO_BYTE 0x7FF
+=for apidoc Am|STRLEN|UVCHR_SKIP|UV cp
+returns the number of bytes required to represent the code point C<cp> when
+encoded as UTF-8.  C<cp> is a native (ASCII or EBCDIC) code point if less than
+255; a Unicode code point otherwise.
 
-#define UTF8_MAXBYTES_CASE	UTF8_MAXBYTES
+=cut
+ */
+#define UVCHR_SKIP(uv) ( UVCHR_IS_INVARIANT(uv) ? 1 : __BASE_UNI_SKIP(uv))
 
-#endif /* EBCDIC vs ASCII */
+/* As explained in the comments for __COMMON_UNI_SKIP, 32 start bytes with
+ * UTF_ACCUMULATION_SHIFT bits of information each */
+#define MAX_UTF8_TWO_BYTE (32 * (1U << UTF_ACCUMULATION_SHIFT) - 1)
+
+/* constrained by EBCDIC which has 5 bits per continuation byte */
+#define MAX_PORTABLE_UTF8_TWO_BYTE (32 * (1U << 5) - 1)
+
+/* The maximum number of UTF-8 bytes a single Unicode character can
+ * uppercase/lowercase/fold into.  Unicode guarantees that the maximum
+ * expansion is UTF8_MAX_FOLD_CHAR_EXPAND characters, but any above-Unicode
+ * code point will fold to itself, so we only have to look at the expansion of
+ * the maximum Unicode code point.  But this number may be less than the space
+ * occupied by a very large code point under Perl's extended UTF-8.  We have to
+ * make it large enough to fit any single character.  (It turns out that ASCII
+ * and EBCDIC differ in which is larger) */
+#define UTF8_MAXBYTES_CASE	                                                \
+        (UTF8_MAXBYTES >= (UTF8_MAX_FOLD_CHAR_EXPAND * OFFUNISKIP(0x10FFFF))    \
+                           ? UTF8_MAXBYTES                                      \
+                           : (UTF8_MAX_FOLD_CHAR_EXPAND * OFFUNISKIP(0x10FFFF)))
 
 /* Rest of these are attributes of Unicode and perl's internals rather than the
  * encoding, or happen to be the same in both ASCII and EBCDIC (at least at
@@ -312,6 +375,17 @@ Perl's extended UTF-8 means we can have start bytes up to FF.
 #define I8_TO_NATIVE(ch)         I8_TO_NATIVE_UTF8(ch)
 #define NATIVE8_TO_UNI(ch)       NATIVE_TO_LATIN1(ch)
 
+/* This defines the 1-bits that are to be in the first byte of a multi-byte
+ * UTF-8 encoded character that mark it as a start byte and give the number of
+ * bytes that comprise the character. 'len' is the number of bytes in the
+ * multi-byte sequence. */
+#define UTF_START_MARK(len) (((len) >  7) ? 0xFF : (0xFF & (0xFE << (7-(len)))))
+
+/* Masks out the initial one bits in a start byte, leaving the real data ones.
+ * Doesn't work on an invariant byte.  'len' is the number of bytes in the
+ * multi-byte sequence that comprises the character. */
+#define UTF_START_MASK(len) (((len) >= 7) ? 0x00 : (0x1F >> ((len)-2)))
+
 /* Adds a UTF8 continuation byte 'new' of information to a running total code
  * point 'old' of all the continuation bytes so far.  This is designed to be
  * used in a loop to convert from UTF-8 to the code point represented.  Note
@@ -322,30 +396,44 @@ Perl's extended UTF-8 means we can have start bytes up to FF.
                                    | ((NATIVE_UTF8_TO_I8((U8)new))             \
                                        & UTF_CONTINUATION_MASK))
 
+/* If a value is anded with this, and the result is non-zero, then using the
+ * original value in UTF8_ACCUMULATE will overflow, shifting bits off the left
+ * */
+#define UTF_ACCUMULATION_OVERFLOW_MASK					\
+    (((UV) UTF_CONTINUATION_MASK) << ((sizeof(UV) * CHARBITS)           \
+           - UTF_ACCUMULATION_SHIFT))
+
 /* This works in the face of malformed UTF-8. */
 #define UTF8_IS_NEXT_CHAR_DOWNGRADEABLE(s, e) (UTF8_IS_DOWNGRADEABLE_START(*s) \
                                                && ( (e) - (s) > 1)             \
                                                && UTF8_IS_CONTINUATION(*((s)+1)))
 
 /* Number of bytes a code point occupies in UTF-8. */
-#define NATIVE_SKIP(uv) OFFUNISKIP(NATIVE_TO_UNI(uv))
-
-/*
-
-=for apidoc Am|STRLEN|UVCHR_SKIP|UV cp
-returns the number of bytes required to represent the code point C<cp> when
-encoded as UTF-8.  C<cp> is a native (ASCII or EBCDIC) code point if less than
-255; a Unicode code point otherwise.
-
-=cut
- */
+#define NATIVE_SKIP(uv) UVCHR_SKIP(uv)
 
 /* Most code which says UNISKIP is really thinking in terms of native code
  * points (0-255) plus all those beyond.  This is an imprecise term, but having
  * it means existing code continues to work.  For precision, use UVCHR_SKIP,
- * NATIVE_SKIP, and OFFUNISKIP */
-#define UNISKIP(uv)   NATIVE_SKIP(uv)
-#define UVCHR_SKIP(uv) NATIVE_SKIP(uv)
+ * NATIVE_SKIP, or OFFUNISKIP */
+#define UNISKIP(uv)   UVCHR_SKIP(uv)
+
+/* Longer, but more accurate name */
+#define UTF8_IS_ABOVE_LATIN1_START(c)     UTF8_IS_ABOVE_LATIN1(c)
+
+/* Convert a UTF-8 variant Latin1 character to a native code point value.
+ * Needs just one iteration of accumulate.  Should be used only if it is known
+ * that the code point is < 256, and is not UTF-8 invariant.  Use the slower
+ * but more general TWO_BYTE_UTF8_TO_NATIVE() which handles any code point
+ * representable by two bytes (which turns out to be up through
+ * MAX_PORTABLE_UTF8_TWO_BYTE).  The two parameters are:
+ *  HI: a downgradable start byte;
+ *  LO: continuation.
+ * */
+#define EIGHT_BIT_UTF8_TO_NATIVE(HI, LO)                                        \
+    ( __ASSERT_(UTF8_IS_DOWNGRADEABLE_START(HI))                                \
+      __ASSERT_(UTF8_IS_CONTINUATION(LO))                                       \
+     LATIN1_TO_NATIVE(UTF8_ACCUMULATE((                                         \
+                            NATIVE_UTF8_TO_I8(HI) & UTF_START_MASK(2)), (LO))))
 
 /* Convert a two (not one) byte utf8 character to a native code point value.
  * Needs just one iteration of accumulate.  Should not be used unless it is
@@ -353,8 +441,10 @@ encoded as UTF-8.  C<cp> is a native (ASCII or EBCDIC) code point if less than
  * Note that the result can be larger than 255 if the input character is not
  * downgradable */
 #define TWO_BYTE_UTF8_TO_NATIVE(HI, LO) \
+    ( __ASSERT_(PL_utf8skip[HI] == 2)                                           \
+      __ASSERT_(UTF8_IS_CONTINUATION(LO))                                       \
      UNI_TO_NATIVE(UTF8_ACCUMULATE((NATIVE_UTF8_TO_I8(HI) & UTF_START_MASK(2)), \
-                                   (LO)))
+                                   (LO))))
 
 /* Should never be used, and be deprecated */
 #define TWO_BYTE_UTF8_TO_UNI(HI, LO) NATIVE_TO_UNI(TWO_BYTE_UTF8_TO_NATIVE(HI, LO))
@@ -367,22 +457,25 @@ only) byte is pointed to by C<s>.
 
 =cut
  */
-#define UTF8SKIP(s) PL_utf8skip[*(const U8*)(s)]
+#define UTF8SKIP(s)  PL_utf8skip[*(const U8*)(s)]
+#define UTF8_SKIP(s) UTF8SKIP(s)
+
+/* Most code that says 'UNI_' really means the native value for code points up
+ * through 255 */
+#define UNI_IS_INVARIANT(cp)   UVCHR_IS_INVARIANT(cp)
 
 /* Is the byte 'c' the same character when encoded in UTF-8 as when not.  This
  * works on both UTF-8 encoded strings and non-encoded, as it returns TRUE in
- * each for the exact same set of bit patterns.  (And it works on any byte in a
- * UTF-8 encoded string) */
-#define UTF8_IS_INVARIANT(c)		UNI_IS_INVARIANT(NATIVE_UTF8_TO_I8(c))
-
-/* Like the above, but its name implies a non-UTF8 input, and is implemented
- * differently (for no particular reason) */
-#define NATIVE_BYTE_IS_INVARIANT(c)	UNI_IS_INVARIANT(NATIVE_TO_LATIN1(c))
-
-/* Like the above, but accepts any UV as input */
-#define UVCHR_IS_INVARIANT(uv)          UNI_IS_INVARIANT(NATIVE_TO_UNI(uv))
+ * each for the exact same set of bit patterns.  It is valid on a subset of
+ * what UVCHR_IS_INVARIANT is valid on, so can just use that; and the compiler
+ * should optimize out anything extraneous given the implementation of the
+ * latter.  The |0 makes sure this isn't mistakenly called with a ptr argument.
+ * */
+#define UTF8_IS_INVARIANT(c)	UVCHR_IS_INVARIANT((c) | 0)
 
-#define MAX_PORTABLE_UTF8_TWO_BYTE 0x3FF    /* constrained by EBCDIC */
+/* Like the above, but its name implies a non-UTF8 input, which as the comments
+ * above show, doesn't matter as to its implementation */
+#define NATIVE_BYTE_IS_INVARIANT(c)	UVCHR_IS_INVARIANT(c)
 
 /* The macros in the next 4 sets are used to generate the two utf8 or utfebcdic
  * bytes from an ordinal that is known to fit into exactly two (not one) bytes;
@@ -390,14 +483,16 @@ only) byte is pointed to by C<s>.
 
 /* These two are helper macros for the other three sets, and should not be used
  * directly anywhere else.  'translate_function' is either NATIVE_TO_LATIN1
- * (which works for code points up to 0xFF) or NATIVE_TO_UNI which works for any
- * code point */
+ * (which works for code points up through 0xFF) or NATIVE_TO_UNI which works
+ * for any code point */
 #define __BASE_TWO_BYTE_HI(c, translate_function)                               \
+           (__ASSERT_(! UVCHR_IS_INVARIANT(c))                                  \
             I8_TO_NATIVE_UTF8((translate_function(c) >> UTF_ACCUMULATION_SHIFT) \
-                              | UTF_START_MARK(2))
+                              | UTF_START_MARK(2)))
 #define __BASE_TWO_BYTE_LO(c, translate_function)                               \
+             (__ASSERT_(! UVCHR_IS_INVARIANT(c))                                \
               I8_TO_NATIVE_UTF8((translate_function(c) & UTF_CONTINUATION_MASK) \
-                                 | UTF_CONTINUATION_MARK)
+                                 | UTF_CONTINUATION_MARK))
 
 /* The next two macros should not be used.  They were designed to be usable as
  * the case label of a switch statement, but this doesn't work for EBCDIC.  Use
@@ -408,9 +503,9 @@ only) byte is pointed to by C<s>.
 /* The next two macros are used when the source should be a single byte
  * character; checked for under DEBUGGING */
 #define UTF8_EIGHT_BIT_HI(c) (__ASSERT_(FITS_IN_8_BITS(c))                    \
-                             ((U8) __BASE_TWO_BYTE_HI(c, NATIVE_TO_LATIN1)))
+                             ( __BASE_TWO_BYTE_HI(c, NATIVE_TO_LATIN1)))
 #define UTF8_EIGHT_BIT_LO(c) (__ASSERT_(FITS_IN_8_BITS(c))                    \
-                             ((U8) __BASE_TWO_BYTE_LO(c, NATIVE_TO_LATIN1)))
+                             (__BASE_TWO_BYTE_LO(c, NATIVE_TO_LATIN1)))
 
 /* These final two macros in the series are used when the source can be any
  * code point whose UTF-8 is known to occupy 2 bytes; they are less efficient
@@ -421,11 +516,11 @@ only) byte is pointed to by C<s>.
 #define UTF8_TWO_BYTE_HI(c)                                                    \
        (__ASSERT_((sizeof(c) ==  1)                                            \
                   || !(((WIDEST_UTYPE)(c)) & ~MAX_UTF8_TWO_BYTE))              \
-        ((U8) __BASE_TWO_BYTE_HI(c, NATIVE_TO_UNI)))
+        (__BASE_TWO_BYTE_HI(c, NATIVE_TO_UNI)))
 #define UTF8_TWO_BYTE_LO(c)                                                    \
        (__ASSERT_((sizeof(c) ==  1)                                            \
                   || !(((WIDEST_UTYPE)(c)) & ~MAX_UTF8_TWO_BYTE))              \
-        ((U8) __BASE_TWO_BYTE_LO(c, NATIVE_TO_UNI)))
+        (__BASE_TWO_BYTE_LO(c, NATIVE_TO_UNI)))
 
 /* This is illegal in any well-formed UTF-8 in both EBCDIC and ASCII
  * as it is only in overlongs. */
@@ -438,11 +533,11 @@ only) byte is pointed to by C<s>.
  * beginning of a utf8 character.  Now that foo_utf8() determines that itself,
  * no need to do it again here
  */
-#define isIDFIRST_lazy_if(p,UTF) ((IN_BYTES || !UTF ) \
-				 ? isIDFIRST(*(p)) \
+#define isIDFIRST_lazy_if(p,UTF) ((IN_BYTES || !UTF)                \
+				 ? isIDFIRST(*(p))                  \
 				 : isIDFIRST_utf8((const U8*)p))
-#define isWORDCHAR_lazy_if(p,UTF)   ((IN_BYTES || (!UTF )) \
-				 ? isWORDCHAR(*(p)) \
+#define isWORDCHAR_lazy_if(p,UTF)   ((IN_BYTES || (!UTF))           \
+				 ? isWORDCHAR(*(p))                 \
 				 : isWORDCHAR_utf8((const U8*)p))
 #define isALNUM_lazy_if(p,UTF)   isWORDCHAR_lazy_if(p,UTF)
 
@@ -465,7 +560,12 @@ case any call to string overloading updates the internal UTF-8 encoding flag.
 =cut
 */
 #define DO_UTF8(sv) (SvUTF8(sv) && !IN_BYTES)
-#define IN_UNI_8_BIT \
+
+/* Should all strings be treated as Unicode, and not just UTF-8 encoded ones?
+ * Is so within 'feature unicode_strings' or 'locale :not_characters', and not
+ * within 'use bytes'.  UTF-8 locales are not tested for here, but perhaps
+ * could be */
+#define IN_UNI_8_BIT                                                             \
 	    (((CopHINTS_get(PL_curcop) & (HINT_UNI_8_BIT))                       \
                || (CopHINTS_get(PL_curcop) & HINT_LOCALE_PARTIAL                 \
                    /* -1 below is for :not_characters */                         \
@@ -496,12 +596,16 @@ case any call to string overloading updates the internal UTF-8 encoding flag.
 #define UTF8_DISALLOW_SUPER		0x0200	/* Super-set of Unicode: code */
 #define UTF8_WARN_SUPER		        0x0400	/* points above the legal max */
 
-/* Code points which never were part of the original UTF-8 standard, the first
- * byte of which is a FE or FF on ASCII platforms. If the first byte is FF, it
- * will overflow a 32-bit word.  If the first byte is FE, it will overflow a
- * signed 32-bit word. */
-#define UTF8_DISALLOW_FE_FF		0x0800
-#define UTF8_WARN_FE_FF		        0x1000
+/* Code points which never were part of the original UTF-8 standard, which only
+ * went up to 2 ** 31 - 1.  Note that these all overflow a signed 32-bit word,
+ * The first byte of these code points is FE or FF on ASCII platforms.  If the
+ * first byte is FF, it will overflow a 32-bit word. */
+#define UTF8_DISALLOW_ABOVE_31_BIT      0x0800
+#define UTF8_WARN_ABOVE_31_BIT          0x1000
+
+/* For back compat, these old names are misleading for UTF_EBCDIC */
+#define UTF8_DISALLOW_FE_FF             UTF8_DISALLOW_ABOVE_31_BIT
+#define UTF8_WARN_FE_FF                 UTF8_WARN_ABOVE_31_BIT
 
 #define UTF8_CHECK_ONLY			0x2000
 
@@ -511,25 +615,25 @@ case any call to string overloading updates the internal UTF-8 encoding flag.
 #define UTF8_ALLOW_FFFF 0
 #define UTF8_ALLOW_SURROGATE 0
 
-#define UTF8_DISALLOW_ILLEGAL_INTERCHANGE (UTF8_DISALLOW_SUPER|UTF8_DISALLOW_NONCHAR|UTF8_DISALLOW_SURROGATE|UTF8_DISALLOW_FE_FF)
+#define UTF8_DISALLOW_ILLEGAL_INTERCHANGE                                       \
+                       ( UTF8_DISALLOW_SUPER|UTF8_DISALLOW_NONCHAR              \
+                        |UTF8_DISALLOW_SURROGATE)
 #define UTF8_WARN_ILLEGAL_INTERCHANGE \
-	(UTF8_WARN_SUPER|UTF8_WARN_NONCHAR|UTF8_WARN_SURROGATE|UTF8_WARN_FE_FF)
-#define UTF8_ALLOW_ANY \
-	    (~(UTF8_DISALLOW_ILLEGAL_INTERCHANGE|UTF8_WARN_ILLEGAL_INTERCHANGE))
+                         (UTF8_WARN_SUPER|UTF8_WARN_NONCHAR|UTF8_WARN_SURROGATE)
+#define UTF8_ALLOW_ANY                                                          \
+	    (~( UTF8_DISALLOW_ILLEGAL_INTERCHANGE|UTF8_DISALLOW_ABOVE_31_BIT    \
+               |UTF8_WARN_ILLEGAL_INTERCHANGE|UTF8_WARN_ABOVE_31_BIT))
 #define UTF8_ALLOW_ANYUV                                                        \
          (UTF8_ALLOW_EMPTY                                                      \
 	  & ~(UTF8_DISALLOW_ILLEGAL_INTERCHANGE|UTF8_WARN_ILLEGAL_INTERCHANGE))
 #define UTF8_ALLOW_DEFAULT		(ckWARN(WARN_UTF8) ? 0 : \
 					 UTF8_ALLOW_ANYUV)
 
-/* Surrogates, non-character code points and above-Unicode code points are
- * problematic in some contexts.  This allows code that needs to check for
- * those to to quickly exclude the vast majority of code points it will
- * encounter */
-#define UTF8_FIRST_PROBLEMATIC_CODE_POINT_FIRST_BYTE \
-                                    FIRST_SURROGATE_UTF8_FIRST_BYTE
+/* Several of the macros below have a second parameter that is currently
+ * unused; but could be used in the future to make sure that the input is
+ * well-formed. */
 
-#define UTF8_IS_SURROGATE(s) cBOOL(is_SURROGATE_utf8(s))
+#define UTF8_IS_SURROGATE(s, e) cBOOL(is_SURROGATE_utf8(s))
 #define UTF8_IS_REPLACEMENT(s, send) cBOOL(is_REPLACEMENT_utf8_safe(s,send))
 
 /*		  ASCII		     EBCDIC I8
@@ -540,20 +644,20 @@ case any call to string overloading updates the internal UTF-8 encoding flag.
  * BE AWARE that this test doesn't rule out malformed code points, in
  * particular overlongs */
 #ifdef EBCDIC /* Both versions assume well-formed UTF8 */
-#   define UTF8_IS_SUPER(s) (NATIVE_UTF8_TO_I8(* (U8*) (s)) >= 0xF9             \
+#   define UTF8_IS_SUPER(s, e) (NATIVE_UTF8_TO_I8(* (U8*) (s)) >= 0xF9          \
                          && (NATIVE_UTF8_TO_I8(* (U8*) (s)) > 0xF9              \
                              || (NATIVE_UTF8_TO_I8(* ((U8*) (s) + 1)) >= 0xA2)))
 #else
-#   define UTF8_IS_SUPER(s) (*(U8*) (s) >= 0xF4                                 \
-                            && (*(U8*) (s) > 0xF4 || (*((U8*) (s) + 1) >= 0x90)))
+#   define UTF8_IS_SUPER(s, e) (*(U8*) (s) >= 0xF4                              \
+                           && (*(U8*) (s) > 0xF4 || (*((U8*) (s) + 1) >= 0x90)))
 #endif
 
 /* These are now machine generated, and the 'given' clause is no longer
  * applicable */
-#define UTF8_IS_NONCHAR_GIVEN_THAT_NON_SUPER_AND_GE_PROBLEMATIC(s)             \
+#define UTF8_IS_NONCHAR_GIVEN_THAT_NON_SUPER_AND_GE_PROBLEMATIC(s, e)          \
                                                     cBOOL(is_NONCHAR_utf8(s))
-#define UTF8_IS_NONCHAR_(s)                                                    \
-                    UTF8_IS_NONCHAR_GIVEN_THAT_NON_SUPER_AND_GE_PROBLEMATIC(s)
+#define UTF8_IS_NONCHAR(s, e)                                                  \
+                UTF8_IS_NONCHAR_GIVEN_THAT_NON_SUPER_AND_GE_PROBLEMATIC(s, e)
 
 #define UNICODE_SURROGATE_FIRST		0xD800
 #define UNICODE_SURROGATE_LAST		0xDFFF
@@ -564,14 +668,14 @@ case any call to string overloading updates the internal UTF-8 encoding flag.
  * let's be conservative and do as Unicode says. */
 #define PERL_UNICODE_MAX	0x10FFFF
 
-#define UNICODE_WARN_SURROGATE     0x0001	/* UTF-16 surrogates */
-#define UNICODE_WARN_NONCHAR       0x0002	/* Non-char code points */
-#define UNICODE_WARN_SUPER         0x0004	/* Above 0x10FFFF */
-#define UNICODE_WARN_FE_FF         0x0008	/* Above 0x10FFFF */
-#define UNICODE_DISALLOW_SURROGATE 0x0010
-#define UNICODE_DISALLOW_NONCHAR   0x0020
-#define UNICODE_DISALLOW_SUPER     0x0040
-#define UNICODE_DISALLOW_FE_FF     0x0080
+#define UNICODE_WARN_SURROGATE        0x0001	/* UTF-16 surrogates */
+#define UNICODE_WARN_NONCHAR          0x0002	/* Non-char code points */
+#define UNICODE_WARN_SUPER            0x0004	/* Above 0x10FFFF */
+#define UNICODE_WARN_ABOVE_31_BIT     0x0008	/* Above 0x7FFF_FFFF */
+#define UNICODE_DISALLOW_SURROGATE    0x0010
+#define UNICODE_DISALLOW_NONCHAR      0x0020
+#define UNICODE_DISALLOW_SUPER        0x0040
+#define UNICODE_DISALLOW_ABOVE_31_BIT 0x0080
 #define UNICODE_WARN_ILLEGAL_INTERCHANGE                                      \
             (UNICODE_WARN_SURROGATE|UNICODE_WARN_NONCHAR|UNICODE_WARN_SUPER)
 #define UNICODE_DISALLOW_ILLEGAL_INTERCHANGE                                  \
@@ -582,19 +686,31 @@ case any call to string overloading updates the internal UTF-8 encoding flag.
 #define UNICODE_ALLOW_SUPER	0
 #define UNICODE_ALLOW_ANY	0
 
-#define UNICODE_IS_SURROGATE(c)		((c) >= UNICODE_SURROGATE_FIRST && \
-					 (c) <= UNICODE_SURROGATE_LAST)
-#define UNICODE_IS_REPLACEMENT(c)	((c) == UNICODE_REPLACEMENT)
-#define UNICODE_IS_BYTE_ORDER_MARK(c)	((c) == UNICODE_BYTE_ORDER_MARK)
-#define UNICODE_IS_NONCHAR(c)		((c >= 0xFDD0 && c <= 0xFDEF) \
-			/* The other noncharacters end in FFFE or FFFF, which  \
-			 * the mask below catches both of, but beyond the last \
-			 * official unicode code point, they aren't            \
-			 * noncharacters, since those aren't Unicode           \
-			 * characters at all */                                \
-			|| ((((c & 0xFFFE) == 0xFFFE)) && ! UNICODE_IS_SUPER(c)))
-#define UNICODE_IS_SUPER(c)		((c) > PERL_UNICODE_MAX)
-#define UNICODE_IS_FE_FF(c)		((c) > 0x7FFFFFFF)
+/* This matches the 2048 code points between UNICODE_SURROGATE_FIRST (0xD800) and
+ * UNICODE_SURROGATE_LAST (0xDFFF) */
+#define UNICODE_IS_SURROGATE(uv)        (((UV) (uv) & (~0xFFFF | 0xF800))       \
+                                                                    == 0xD800)
+
+#define UNICODE_IS_REPLACEMENT(uv)	((UV) (uv) == UNICODE_REPLACEMENT)
+#define UNICODE_IS_BYTE_ORDER_MARK(uv)	((UV) (uv) == UNICODE_BYTE_ORDER_MARK)
+
+/* Is 'uv' one of the 32 contiguous-range noncharacters? */
+#define UNICODE_IS_32_CONTIGUOUS_NONCHARS(uv)      ((UV) (uv) >= 0xFDD0         \
+                                                 && (UV) (uv) <= 0xFDEF)
+
+/* Is 'uv' one of the 34 plane-ending noncharacters 0xFFFE, 0xFFFF, 0x1FFFE,
+ * 0x1FFFF, ... 0x10FFFE, 0x10FFFF, given that we know that 'uv' is not above
+ * the Unicode legal max */
+#define UNICODE_IS_END_PLANE_NONCHAR_GIVEN_NOT_SUPER(uv)                        \
+                                              (((UV) (uv) & 0xFFFE) == 0xFFFE)
+
+#define UNICODE_IS_NONCHAR(uv)                                                  \
+    (   UNICODE_IS_32_CONTIGUOUS_NONCHARS(uv)                                   \
+     || (   LIKELY( ! UNICODE_IS_SUPER(uv))                                     \
+         && UNICODE_IS_END_PLANE_NONCHAR_GIVEN_NOT_SUPER(uv)))
+
+#define UNICODE_IS_SUPER(uv)    ((UV) (uv) > PERL_UNICODE_MAX)
+#define UNICODE_IS_ABOVE_31_BIT(uv)    ((UV) (uv) > 0x7FFFFFFF)
 
 #define LATIN_SMALL_LETTER_SHARP_S      LATIN_SMALL_LETTER_SHARP_S_NATIVE
 #define LATIN_SMALL_LETTER_Y_WITH_DIAERESIS                                  \
@@ -611,7 +727,11 @@ case any call to string overloading updates the internal UTF-8 encoding flag.
 #define GREEK_CAPITAL_LETTER_MU                 0x039C	/* Upper and title case
                                                            of MICRON */
 #define LATIN_CAPITAL_LETTER_Y_WITH_DIAERESIS   0x0178	/* Also is title case */
-#define LATIN_CAPITAL_LETTER_SHARP_S	        0x1E9E
+#ifdef LATIN_CAPITAL_LETTER_SHARP_S_UTF8
+#   define LATIN_CAPITAL_LETTER_SHARP_S	        0x1E9E
+#endif
+#define LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE   0x130
+#define LATIN_SMALL_LETTER_DOTLESS_I            0x131
 #define LATIN_SMALL_LETTER_LONG_S               0x017F
 #define LATIN_SMALL_LIGATURE_LONG_S_T           0xFB05
 #define LATIN_SMALL_LIGATURE_ST                 0xFB06
@@ -654,9 +774,9 @@ case any call to string overloading updates the internal UTF-8 encoding flag.
  * on the order of 10 minutes to generate, and is never going to change, unless
  * the generated code is improved.
  *
- * The EBCDIC versions have been cut to not cover all of legal Unicode, so
- * don't take too long to generate, and there is a separate one for each code
- * page, so they are in regcharclass.h instead of here */
+ * The EBCDIC versions have been cut to not cover all of legal Unicode,
+ * otherwise they take too long to generate; besides there is a separate one
+ * for each code page, so they are in regcharclass.h instead of here */
 /*
 	UTF8_CHAR: Matches legal UTF-8 encoded characters from 2 through 4 bytes
 
@@ -680,9 +800,9 @@ case any call to string overloading updates the internal UTF-8 encoding flag.
 =for apidoc Am|STRLEN|isUTF8_CHAR|const U8 *s|const U8 *e
 
 Returns the number of bytes beginning at C<s> which form a legal UTF-8 (or
-UTF-EBCDIC) encoded character, looking no further than C<e - s> bytes into
-C<s>.  Returns 0 if the sequence starting at C<s> through C<e - 1> is not
-well-formed UTF-8
+UTF-EBCDIC) encoded character, looking no further than S<C<e - s>> bytes into
+C<s>.  Returns 0 if the sequence starting at C<s> through S<C<e - 1>> is not
+well-formed UTF-8.
 
 Note that an INVARIANT character (i.e. ASCII on non-EBCDIC
 machines) is a valid UTF-8 character.
diff --git a/Master/tlpkg/tlperl/lib/CORE/utfebcdic.h b/Master/tlpkg/tlperl/lib/CORE/utfebcdic.h
index 24101edf6f0..10b666afe27 100644
--- a/Master/tlpkg/tlperl/lib/CORE/utfebcdic.h
+++ b/Master/tlpkg/tlperl/lib/CORE/utfebcdic.h
@@ -11,10 +11,12 @@
  *  http://www.unicode.org/unicode/reports/tr16
  *
  * To summarize, the way it works is:
- * To convert an EBCDIC character to UTF-EBCDIC:
- *  1)	convert to Unicode.  The table in the generated file 'ebcdic_tables.h'
- *      that does this for EBCDIC bytes is PL_e2a (with inverse PL_a2e).  The
- *      'a' stands for ASCII platform, meaning latin1.
+ * To convert an EBCDIC code point to UTF-EBCDIC:
+ *  1)	convert to Unicode.  No conversion is necesary for code points above
+ *      255, as Unicode and EBCDIC are identical in this range.  For smaller
+ *      code points, the conversion is done by lookup in the PL_e2a table (with
+ *      inverse PL_a2e) in the generated file 'ebcdic_tables.h'.  The 'a'
+ *      stands for ASCII platform, meaning 0-255 Unicode.
  *  2)	convert that to a utf8-like string called I8 ('I' stands for
  *	intermediate) with variant characters occupying multiple bytes.  This
  *	step is similar to the utf8-creating step from Unicode, but the details
@@ -25,17 +27,25 @@
  *	invariant byte	    starts with 0	starts with 0 or 100
  *	continuation byte   starts with 10	starts with 101
  *	start byte	    same in both: if the code point requires N bytes,
- *			    then the leading N bits are 1, followed by a 0.  (No
- *			    trailing 0 for the very largest possible allocation
- *			    in I8, far beyond the current Unicode standard's
- *			    max, as shown in the comment later in this file.)
+ *			    then the leading N bits are 1, followed by a 0.  If
+ *			    all 8 bits in the first byte are 1, the code point
+ *			    will occupy 14 bytes (compared to 13 in Perl's
+ *			    extended UTF-8).  This is incompatible with what
+ *			    tr16 implies should be the representation of code
+ *			    points 2**30 and above, but allows Perl to be able
+ *			    to represent all code points that fit in a 64-bit
+ *			    word in either our extended UTF-EBCDIC or UTF-8.
  *  3)	Use the algorithm in tr16 to convert each byte from step 2 into
  *	final UTF-EBCDIC.  This is done by table lookup from a table
  *	constructed from the algorithm, reproduced in ebcdic_tables.h as
  *	PL_utf2e, with its inverse being PL_e2utf.  They are constructed so that
  *	all EBCDIC invariants remain invariant, but no others do, and the first
  *	byte of a variant will always have its upper bit set.  But note that
- *	the upper bit of some invariants is also 1.
+ *	the upper bit of some invariants is also 1.  The table also is designed
+ *	so that lexically comparing two UTF-EBCDIC-variant characters yields
+ *	the Unicode code point order.  (To get native code point order, one has
+ *	to convert the latin1-range characters to their native code point
+ *	value.)
  *
  *  For example, the ordinal value of 'A' is 193 in EBCDIC, and also is 193 in
  *  UTF-EBCDIC.  Step 1) converts it to 65, Step 2 leaves it at 65, and Step 3
@@ -87,7 +97,8 @@
  * aren't equivalent to ASCII characters nor C1 controls form the set of
  * continuation bytes; the remaining 64 non-ASCII, non-control code points form
  * the potential start bytes, in order.  (However, the first 5 of these lead to
- * malformed overlongs, so there really are only 59 start bytes.) Hence the
+ * malformed overlongs, so there really are only 59 start bytes, and the first
+ * three of the 59 are the start bytes for the Latin1 range.)  Hence the
  * UTF-EBCDIC for the smallest variant code point, 0x160, will have likely 0x41
  * as its continuation byte, provided 0x41 isn't an ASCII or C1 equivalent.
  * And its start byte will be the code point that is 37 (32+5) non-ASCII,
@@ -130,20 +141,33 @@ END_EXTERN_C
 
 /* EBCDIC-happy ways of converting native code to UTF-8 */
 
-#define NATIVE_TO_LATIN1(ch)            PL_e2a[(U8)(ch)]
-#define LATIN1_TO_NATIVE(ch)            PL_a2e[(U8)(ch)]
+/* Use these when ch is known to be < 256 */
+#define NATIVE_TO_LATIN1(ch)            (__ASSERT_(FITS_IN_8_BITS(ch)) PL_e2a[(U8)(ch)])
+#define LATIN1_TO_NATIVE(ch)            (__ASSERT_(FITS_IN_8_BITS(ch)) PL_a2e[(U8)(ch)])
 
-#define NATIVE_UTF8_TO_I8(ch)           PL_e2utf[(U8)(ch)]
-#define I8_TO_NATIVE_UTF8(ch)           PL_utf2e[(U8)(ch)]
+/* Use these on bytes */
+#define NATIVE_UTF8_TO_I8(b)           (__ASSERT_(FITS_IN_8_BITS(b)) PL_e2utf[(U8)(b)])
+#define I8_TO_NATIVE_UTF8(b)           (__ASSERT_(FITS_IN_8_BITS(b)) PL_utf2e[(U8)(b)])
 
 /* Transforms in wide UV chars */
-#define NATIVE_TO_UNI(ch)        (((ch) > 255) ? (ch) : NATIVE_TO_LATIN1(ch))
-#define UNI_TO_NATIVE(ch)        (((ch) > 255) ? (ch) : LATIN1_TO_NATIVE(ch))
+#define NATIVE_TO_UNI(ch)    (FITS_IN_8_BITS(ch) ? NATIVE_TO_LATIN1(ch) : (UV) (ch))
+#define UNI_TO_NATIVE(ch)    (FITS_IN_8_BITS(ch) ? LATIN1_TO_NATIVE(ch) : (UV) (ch))
+
+/* How wide can a single UTF-8 encoded character become in bytes. */
+/* NOTE: Strictly speaking Perl's UTF-8 should not be called UTF-8 since UTF-8
+ * is an encoding of Unicode, and Unicode's upper limit, 0x10FFFF, can be
+ * expressed with 5 bytes.  However, Perl thinks of UTF-8 as a way to encode
+ * non-negative integers in a binary format, even those above Unicode.  14 is
+ * the smallest number that covers 2**64
+ *
+ * WARNING: This number must be in sync with the value in
+ * regen/charset_translations.pl. */
+#define UTF8_MAXBYTES 14
 
 /*
-  The following table is adapted from tr16, it shows I8 encoding of Unicode code points.
+  The following table is adapted from tr16, it shows the I8 encoding of Unicode code points.
 
-        Unicode                             Bit pattern 1st Byte 2nd Byte 3rd Byte 4th Byte 5th Byte 6th Byte 7th byte
+        Unicode                         U32 Bit pattern 1st Byte 2nd Byte 3rd Byte 4th Byte 5th Byte 6th Byte 7th Byte
     U+0000..U+007F                     000000000xxxxxxx 0xxxxxxx
     U+0080..U+009F                     00000000100xxxxx 100xxxxx
     U+00A0..U+03FF                     000000yyyyyxxxxx 110yyyyy 101xxxxx
@@ -151,68 +175,71 @@ END_EXTERN_C
     U+4000..U+3FFFF                 0wwwzzzzzyyyyyxxxxx 11110www 101zzzzz 101yyyyy 101xxxxx
    U+40000..U+3FFFFF            0vvwwwwwzzzzzyyyyyxxxxx 111110vv 101wwwww 101zzzzz 101yyyyy 101xxxxx
   U+400000..U+3FFFFFF       0uvvvvvwwwwwzzzzzyyyyyxxxxx 1111110u 101vvvvv 101wwwww 101zzzzz 101yyyyy 101xxxxx
- U+4000000..U+7FFFFFFF 0tuuuuuvvvvvwwwwwzzzzzyyyyyxxxxx 1111111t 101uuuuu 101vvvvv 101wwwww 101zzzzz 101yyyyy 101xxxxx
+ U+4000000..U+3FFFFFFF 00uuuuuvvvvvwwwwwzzzzzyyyyyxxxxx 11111110 101uuuuu 101vvvvv 101wwwww 101zzzzz 101yyyyy 101xxxxx
 
-  Note: The I8 transformation is valid for UCS-4 values X'0' to
-  X'7FFFFFFF' (the full extent of ISO/IEC 10646 coding space).
+Beyond this, Perl uses an incompatible extension, similar to the one used in
+regular UTF-8.  There are now 14 bytes.  A full 32 bits of information thus looks like this:
+                                                        1st Byte  2nd-7th 8th Byte 9th Byte 10th B   11th B   12th B   13th B   14th B
+U+40000000..U+FFFFFFFF ttuuuuuvvvvvwwwwwzzzzzyyyyyxxxxx 11111111 10100000 101000tt 101uuuuu 101vvvvv 101wwwww 101zzzzz 101yyyyy 101xxxxx
 
- */
+For 32-bit words, the 2nd through 7th bytes effectively function as leading
+zeros.  Above 32 bits, these fill up, with each byte yielding 5 bits of
+information, so that with 13 continuation bytes, we can handle 65 bits, just
+above what a 64 bit word can hold */
 
-/* Input is a true Unicode (not-native) code point */
-#define OFFUNISKIP(uv) ( (uv) < 0xA0        ? 1 : \
-		      (uv) < 0x400          ? 2 : \
-		      (uv) < 0x4000         ? 3 : \
-		      (uv) < 0x40000        ? 4 : \
-		      (uv) < 0x400000       ? 5 : \
-		      (uv) < 0x4000000      ? 6 : 7 )
 
-#define UNI_IS_INVARIANT(c)		(((UV)(c)) <  0xA0)
+/* This is a fundamental property of UTF-EBCDIC */
+#define OFFUNI_IS_INVARIANT(c) (((UV)(c)) <  0xA0)
 
-/* UTF-EBCDIC semantic macros - transform back into I8 and then compare
+/* It turns out that on EBCDIC platforms, the invariants are the characters
+ * that have ASCII equivalents, plus the C1 controls.  Since the C0 controls
+ * and DELETE are ASCII, this is the same as: (isASCII(uv) || isCNTRL_L1(uv))
+ * */
+#define UVCHR_IS_INVARIANT(uv) cBOOL(FITS_IN_8_BITS(uv)                        \
+   && (PL_charclass[(U8) (uv)] & (_CC_mask(_CC_ASCII) | _CC_mask(_CC_CNTRL))))
+
+/* UTF-EBCDIC semantic macros - We used to transform back into I8 and then
+ * compare, but now only have to do a single lookup by using a bit in
+ * l1_char_class_tab.h.
  * Comments as to the meaning of each are given at their corresponding utf8.h
- * definitions */
-
-#define UTF8_IS_START(c)		(NATIVE_UTF8_TO_I8(c) >= 0xC5     \
-                                         && NATIVE_UTF8_TO_I8(c) != 0xE0)
-#define UTF8_IS_CONTINUATION(c)		((NATIVE_UTF8_TO_I8(c) & 0xE0) == 0xA0)
-#define UTF8_IS_CONTINUED(c) 		(NATIVE_UTF8_TO_I8(c) >= 0xA0)
-
-#define UTF8_IS_DOWNGRADEABLE_START(c)	(NATIVE_UTF8_TO_I8(c) >= 0xC5     \
-                                         && NATIVE_UTF8_TO_I8(c) <= 0xC7)
-/* Saying it this way adds a runtime test, but removes 2 run-time lookups */
-/*#define UTF8_IS_DOWNGRADEABLE_START(c)  ((c) == I8_TO_NATIVE_UTF8(0xC5)     \
-                                         || (c) == I8_TO_NATIVE_UTF8(0xC6)  \
-                                         || (c) == I8_TO_NATIVE_UTF8(0xC7))
-*/
-#define UTF8_IS_ABOVE_LATIN1(c)	(NATIVE_UTF8_TO_I8(c) >= 0xC8)
-
-/* Can't exceed 7 on EBCDIC platforms */
-#define UTF_START_MARK(len) (0xFF & (0xFE << (7-(len))))
-
-#define UTF_START_MASK(len) (((len) >= 6) ? 0x01 : (0x1F >> ((len)-2)))
-#define UTF_CONTINUATION_MARK		0xA0
-#define UTF_CONTINUATION_MASK		((U8)0x1f)
-#define UTF_ACCUMULATION_SHIFT		5
+ * definitions. */
 
-/* How wide can a single UTF-8 encoded character become in bytes. */
-/* NOTE: Strictly speaking Perl's UTF-8 should not be called UTF-8 since UTF-8
- * is an encoding of Unicode, and Unicode's upper limit, 0x10FFFF, can be
- * expressed with 5 bytes.  However, Perl thinks of UTF-8 as a way to encode
- * non-negative integers in a binary format, even those above Unicode */
-#define UTF8_MAXBYTES 7
+#define UTF8_IS_START(c)		_generic_isCC(c, _CC_UTF8_IS_START)
+
+#define UTF_IS_CONTINUATION_MASK    0xE0
+
+#define UTF8_IS_CONTINUATION(c)		_generic_isCC(c, _CC_UTF8_IS_CONTINUATION)
+
+/* The above instead could be written as this:
+#define UTF8_IS_CONTINUATION(c)                                                 \
+            (((NATIVE_UTF8_TO_I8(c) & UTF_IS_CONTINUATION_MASK)                 \
+                                                == UTF_CONTINUATION_MARK)
+ */
+
+/* Equivalent to ! UVCHR_IS_INVARIANT(c) */
+#define UTF8_IS_CONTINUED(c) 		cBOOL(FITS_IN_8_BITS(c)                 \
+   && ! (PL_charclass[(U8) (c)] & (_CC_mask(_CC_ASCII) | _CC_mask(_CC_CNTRL))))
 
-/* The maximum number of UTF-8 bytes a single Unicode character can
- * uppercase/lowercase/fold into.  Unicode guarantees that the maximum
- * expansion is 3 characters.  On EBCDIC platforms, the highest Unicode
- * character occupies 5 bytes, therefore this number is 15 */
-#define UTF8_MAXBYTES_CASE	15
+#define UTF8_IS_DOWNGRADEABLE_START(c)   _generic_isCC(c,                       \
+                                              _CC_UTF8_IS_DOWNGRADEABLE_START)
+
+/* Equivalent to (UTF8_IS_START(c) && ! UTF8_IS_DOWNGRADEABLE_START(c))
+ * Makes sure that the START bit is set and the DOWNGRADEABLE bit isn't */
+#define UTF8_IS_ABOVE_LATIN1(c) cBOOL(FITS_IN_8_BITS(c)                         \
+  && ((PL_charclass[(U8) (c)] & ( _CC_mask(_CC_UTF8_IS_START)                   \
+                                 |_CC_mask(_CC_UTF8_IS_DOWNGRADEABLE_START)))   \
+                        == _CC_mask(_CC_UTF8_IS_START)))
+
+#define isUTF8_POSSIBLY_PROBLEMATIC(c)                                          \
+                _generic_isCC(c, _CC_UTF8_START_BYTE_IS_FOR_AT_LEAST_SURROGATE)
+
+#define UTF_CONTINUATION_MARK		0xA0
+#define UTF_ACCUMULATION_SHIFT		5
 
 /* ^? is defined to be APC on EBCDIC systems.  See the definition of toCTRL()
  * for more */
 #define QUESTION_MARK_CTRL   LATIN1_TO_NATIVE(0x9F)
 
-#define MAX_UTF8_TWO_BYTE 0x3FF
-
 /*
  * ex: set ts=8 sts=4 sw=4 et:
  */
diff --git a/Master/tlpkg/tlperl/lib/CORE/util.h b/Master/tlpkg/tlperl/lib/CORE/util.h
index 0d41ebc0270..3310b119d8e 100644
--- a/Master/tlpkg/tlperl/lib/CORE/util.h
+++ b/Master/tlpkg/tlperl/lib/CORE/util.h
@@ -43,11 +43,11 @@
 
 =for apidoc ibcmp
 
-This is a synonym for (! foldEQ())
+This is a synonym for S<C<(! foldEQ())>>
 
 =for apidoc ibcmp_locale
 
-This is a synonym for (! foldEQ_locale())
+This is a synonym for S<C<(! foldEQ_locale())>>
 
 =cut
 */
diff --git a/Master/tlpkg/tlperl/lib/CORE/vdir.h b/Master/tlpkg/tlperl/lib/CORE/vdir.h
index 42c306b7795..b5c6bc6f454 100644
--- a/Master/tlpkg/tlperl/lib/CORE/vdir.h
+++ b/Master/tlpkg/tlperl/lib/CORE/vdir.h
@@ -15,6 +15,7 @@
  * and one additional slot for a UNC name
  */
 const int driveCount = ('Z'-'A')+1+1;
+const int driveLetterCount = ('Z'-'A')+1;
 
 class VDir
 {
@@ -383,6 +384,7 @@ char *VDir::MapPathA(const char *pInName)
      * possiblities -- relative path or absolute path with or without drive letter
      * OR UNC name
      */
+    int driveIndex;
     char szBuffer[(MAX_PATH+1)*2];
     char szlBuf[MAX_PATH+1];
     int length = strlen(pInName);
@@ -402,15 +404,18 @@ char *VDir::MapPathA(const char *pInName)
     }
     /* strlen(pInName) is now <= MAX_PATH */
 
-    if (pInName[1] == ':') {
+    if (length > 1 && pInName[1] == ':') {
 	/* has drive letter */
-	if (IsPathSep(pInName[2])) {
+	if (length > 2 && IsPathSep(pInName[2])) {
 	    /* absolute with drive letter */
 	    DoGetFullPathNameA((char*)pInName, sizeof(szLocalBufferA), szLocalBufferA);
 	}
 	else {
 	    /* relative path with drive letter */
-	    strcpy(szBuffer, GetDirA(DriveIndex(*pInName)));
+            driveIndex = DriveIndex(*pInName);
+            if (driveIndex < 0 || driveIndex >= driveLetterCount)
+                return (char *)pInName;
+	    strcpy(szBuffer, GetDirA(driveIndex));
 	    strcat(szBuffer, &pInName[2]);
 	    if(strlen(szBuffer) > MAX_PATH)
 		szBuffer[MAX_PATH] = '\0';
@@ -420,7 +425,7 @@ char *VDir::MapPathA(const char *pInName)
     }
     else {
 	/* no drive letter */
-	if (IsPathSep(pInName[1]) && IsPathSep(pInName[0])) {
+	if (length > 1 && IsPathSep(pInName[1]) && IsPathSep(pInName[0])) {
 	    /* UNC name */
 	    DoGetFullPathNameA((char*)pInName, sizeof(szLocalBufferA), szLocalBufferA);
 	}
@@ -611,6 +616,7 @@ WCHAR* VDir::MapPathW(const WCHAR *pInName)
      * possiblities -- relative path or absolute path with or without drive letter
      * OR UNC name
      */
+    int driveIndex;
     WCHAR szBuffer[(MAX_PATH+1)*2];
     WCHAR szlBuf[MAX_PATH+1];
     int length = wcslen(pInName);
@@ -630,7 +636,7 @@ WCHAR* VDir::MapPathW(const WCHAR *pInName)
     }
     /* strlen(pInName) is now <= MAX_PATH */
 
-    if (pInName[1] == ':') {
+    if (length > 1 && pInName[1] == ':') {
 	/* has drive letter */
 	if (IsPathSep(pInName[2])) {
 	    /* absolute with drive letter */
@@ -638,7 +644,10 @@ WCHAR* VDir::MapPathW(const WCHAR *pInName)
 	}
 	else {
 	    /* relative path with drive letter */
-	    wcscpy(szBuffer, GetDirW(DriveIndex((char)*pInName)));
+            driveIndex = DriveIndex(*pInName);
+            if (driveIndex < 0 || driveIndex >= driveLetterCount)
+                return (WCHAR *)pInName;
+	    wcscpy(szBuffer, GetDirW(driveIndex));
 	    wcscat(szBuffer, &pInName[2]);
 	    if(wcslen(szBuffer) > MAX_PATH)
 		szBuffer[MAX_PATH] = '\0';
@@ -648,7 +657,7 @@ WCHAR* VDir::MapPathW(const WCHAR *pInName)
     }
     else {
 	/* no drive letter */
-	if (IsPathSep(pInName[1]) && IsPathSep(pInName[0])) {
+	if (length > 1 && IsPathSep(pInName[1]) && IsPathSep(pInName[0])) {
 	    /* UNC name */
 	    DoGetFullPathNameW((WCHAR*)pInName, (sizeof(szLocalBufferW)/sizeof(WCHAR)), szLocalBufferW);
 	}
diff --git a/Master/tlpkg/tlperl/lib/CORE/vutil.h b/Master/tlpkg/tlperl/lib/CORE/vutil.h
index aaf2284e89c..a60ca9d479e 100644
--- a/Master/tlpkg/tlperl/lib/CORE/vutil.h
+++ b/Master/tlpkg/tlperl/lib/CORE/vutil.h
@@ -131,16 +131,16 @@ S_croak_xs_usage(pTHX_ const CV *const cv, const char *const params)
 
 #  define VUTIL_REPLACE_CORE 1
 
-const char * Perl_scan_version2(pTHX_ const char *s, SV *rv, bool qv);
-SV * Perl_new_version2(pTHX_ SV *ver);
-SV * Perl_upg_version2(pTHX_ SV *sv, bool qv);
-SV * Perl_vstringify2(pTHX_ SV *vs);
-SV * Perl_vverify2(pTHX_ SV *vs);
-SV * Perl_vnumify2(pTHX_ SV *vs);
-SV * Perl_vnormal2(pTHX_ SV *vs);
-SV * Perl_vstringify2(pTHX_ SV *vs);
-int Perl_vcmp2(pTHX_ SV *lsv, SV *rsv);
-const char * Perl_prescan_version2(pTHX_ const char *s, bool strict, const char** errstr, bool *sqv, int *ssaw_decimal, int *swidth, bool *salpha);
+static const char * Perl_scan_version2(pTHX_ const char *s, SV *rv, bool qv);
+static SV * Perl_new_version2(pTHX_ SV *ver);
+static SV * Perl_upg_version2(pTHX_ SV *sv, bool qv);
+static SV * Perl_vstringify2(pTHX_ SV *vs);
+static SV * Perl_vverify2(pTHX_ SV *vs);
+static SV * Perl_vnumify2(pTHX_ SV *vs);
+static SV * Perl_vnormal2(pTHX_ SV *vs);
+static SV * Perl_vstringify2(pTHX_ SV *vs);
+static int Perl_vcmp2(pTHX_ SV *lsv, SV *rsv);
+static const char * Perl_prescan_version2(pTHX_ const char *s, bool strict, const char** errstr, bool *sqv, int *ssaw_decimal, int *swidth, bool *salpha);
 
 #  define SCAN_VERSION(a,b,c)	Perl_scan_version2(aTHX_ a,b,c)
 #  define NEW_VERSION(a)	Perl_new_version2(aTHX_ a)
@@ -239,3 +239,13 @@ const char * Perl_prescan_version(pTHX_ const char *s, bool strict, const char**
 #  define RESTORE_NUMERIC_LOCAL()
 # endif
 #endif
+
+#ifndef LOCK_NUMERIC_STANDARD
+#define LOCK_NUMERIC_STANDARD()
+#endif
+
+#ifndef UNLOCK_NUMERIC_STANDARD
+#define UNLOCK_NUMERIC_STANDARD()
+#endif
+
+/* ex: set ro: */
diff --git a/Master/tlpkg/tlperl/lib/CORE/warnings.h b/Master/tlpkg/tlperl/lib/CORE/warnings.h
index 24fe243464f..337bef374c0 100644
--- a/Master/tlpkg/tlperl/lib/CORE/warnings.h
+++ b/Master/tlpkg/tlperl/lib/CORE/warnings.h
@@ -91,34 +91,32 @@
 
 #define WARN_EXPERIMENTAL		 51
 #define WARN_EXPERIMENTAL__LEXICAL_SUBS	 52
-#define WARN_EXPERIMENTAL__LEXICAL_TOPIC 53
-#define WARN_EXPERIMENTAL__REGEX_SETS	 54
-#define WARN_EXPERIMENTAL__SMARTMATCH	 55
+#define WARN_EXPERIMENTAL__REGEX_SETS	 53
+#define WARN_EXPERIMENTAL__SMARTMATCH	 54
 
 /* Warnings Categories added in Perl 5.019 */
 
-#define WARN_EXPERIMENTAL__AUTODEREF	 56
-#define WARN_EXPERIMENTAL__POSTDEREF	 57
-#define WARN_EXPERIMENTAL__SIGNATURES	 58
-#define WARN_SYSCALLS			 59
+#define WARN_EXPERIMENTAL__POSTDEREF	 55
+#define WARN_EXPERIMENTAL__SIGNATURES	 56
+#define WARN_SYSCALLS			 57
 
 /* Warnings Categories added in Perl 5.021 */
 
-#define WARN_EXPERIMENTAL__BITWISE	 60
-#define WARN_EXPERIMENTAL__CONST_ATTR	 61
-#define WARN_EXPERIMENTAL__RE_STRICT	 62
-#define WARN_EXPERIMENTAL__REFALIASING	 63
-#define WARN_EXPERIMENTAL__WIN32_PERLIO	 64
-#define WARN_LOCALE			 65
-#define WARN_MISSING			 66
-#define WARN_REDUNDANT			 67
+#define WARN_EXPERIMENTAL__BITWISE	 58
+#define WARN_EXPERIMENTAL__CONST_ATTR	 59
+#define WARN_EXPERIMENTAL__RE_STRICT	 60
+#define WARN_EXPERIMENTAL__REFALIASING	 61
+#define WARN_EXPERIMENTAL__WIN32_PERLIO	 62
+#define WARN_LOCALE			 63
+#define WARN_MISSING			 64
+#define WARN_REDUNDANT			 65
 
 #define WARNsize			 17
 #define WARN_ALLstring			 "\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125"
 #define WARN_NONEstring			 "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
 
-#define isLEXWARN_on 	(PL_curcop->cop_warnings != pWARN_STD)
-#define isLEXWARN_off	(PL_curcop->cop_warnings == pWARN_STD)
+#define isLEXWARN_on 	cBOOL(PL_curcop->cop_warnings != pWARN_STD)
+#define isLEXWARN_off	cBOOL(PL_curcop->cop_warnings == pWARN_STD)
 #define isWARN_ONCE	(PL_dowarn & (G_WARN_ON|G_WARN_ONCE))
 #define isWARN_on(c,x)	(IsSet((U8 *)(c + 1), 2*(x)))
 #define isWARNf_on(c,x)	(IsSet((U8 *)(c + 1), 2*(x)+1))
diff --git a/Master/tlpkg/tlperl/lib/CORE/win32.h b/Master/tlpkg/tlperl/lib/CORE/win32.h
index daefeb84fb0..9b79e009f1e 100644
--- a/Master/tlpkg/tlperl/lib/CORE/win32.h
+++ b/Master/tlpkg/tlperl/lib/CORE/win32.h
@@ -24,6 +24,9 @@
 /* less I/O calls during each require */
 #  define PERL_DISABLE_PMC
 
+/* unnecessery for miniperl to lookup anything from an "installed" perl */
+#  define WIN32_NO_REGISTRY
+
 /* allow minitest to work */
 #  define PERL_TEXTMODE_SCRIPTS
 #endif
@@ -60,9 +63,6 @@
 #  ifdef PERL_GLOBAL_STRUCT
 #    error PERL_GLOBAL_STRUCT cannot be defined with PERL_IMPLICIT_SYS
 #  endif
-#  define win32_get_privlib PerlEnv_lib_path
-#  define win32_get_sitelib PerlEnv_sitelib_path
-#  define win32_get_vendorlib PerlEnv_vendorlib_path
 #endif
 
 #ifdef __GNUC__
@@ -209,6 +209,13 @@ struct utsname {
 #  define PERL_SOCK_SYSWRITE_IS_SEND
 #endif
 
+#ifdef WIN32_NO_REGISTRY
+/* the last _ in WIN32_NO_REGISTRY_M_ is like the _ in aTHX_ */
+#  define WIN32_NO_REGISTRY_M_(x)
+#else
+#  define WIN32_NO_REGISTRY_M_(x) x,
+#endif
+
 #define PERL_NO_FORCE_LINK		/* no need for PL_force_link_funcs */
 
 #define ENV_IS_CASELESS
@@ -397,7 +404,7 @@ DllExport HWND		win32_create_message_window(void);
 DllExport int		win32_async_check(pTHX);
 
 extern int		my_fclose(FILE *);
-extern char *		win32_get_privlib(const char *pl, STRLEN *const len);
+extern char *		win32_get_privlib(WIN32_NO_REGISTRY_M_(const char *pl) STRLEN *const len);
 extern char *		win32_get_sitelib(const char *pl, STRLEN *const len);
 extern char *		win32_get_vendorlib(const char *pl, STRLEN *const len);
 
@@ -497,6 +504,7 @@ struct interp_intern {
     UINT	timerid;
     unsigned 	poll_count;
     Sighandler_t sigtable[SIG_SIZE];
+    bool sloppystat;
 };
 
 #define WIN32_POLL_INTERVAL 32768
@@ -530,6 +538,7 @@ struct interp_intern {
 #define w32_init_socktype	(PL_sys_intern.thr_intern.Winit_socktype)
 #define w32_use_showwindow	(PL_sys_intern.thr_intern.Wuse_showwindow)
 #define w32_showwindow	(PL_sys_intern.thr_intern.Wshowwindow)
+#define w32_sloppystat	(PL_sys_intern.sloppystat)
 
 #ifdef USE_ITHREADS
 void win32_wait_for_children(pTHX);
@@ -636,14 +645,6 @@ EXTERN_C _CRTIMP ioinfo* __pioinfo[];
 #endif
 #define PERLIO_NOT_STDIO 0
 
-#include "perlio.h"
-
-/*
- * This provides a layer of functions and macros to ensure extensions will
- * get to use the same RTL functions as the core.
- */
-#include "win32iop.h"
-
 #define EXEC_ARGV_CAST(x) ((const char *const *) x)
 
 DllExport void *win32_signal_context(void);
diff --git a/Master/tlpkg/tlperl/lib/CPAN.pm b/Master/tlpkg/tlperl/lib/CPAN.pm
index 6096916bd9c..25bf3494a8e 100644
--- a/Master/tlpkg/tlperl/lib/CPAN.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN.pm
@@ -2,7 +2,7 @@
 # vim: ts=4 sts=4 sw=4:
 use strict;
 package CPAN;
-$CPAN::VERSION = '2.11';
+$CPAN::VERSION = '2.11_01';
 $CPAN::VERSION =~ s/_//;
 
 # we need to run chdir all over and we would get at wrong libraries
@@ -1104,6 +1104,8 @@ sub has_usable {
                                ]
               };
     if ($usable->{$mod}) {
+        local @INC = @INC;
+        pop @INC if $INC[-1] eq '.';
         for my $c (0..$#{$usable->{$mod}}) {
             my $code = $usable->{$mod}[$c];
             my $ret = eval { &$code() };
@@ -1146,6 +1148,8 @@ sub has_inst {
       $CPAN::META->{dontload_hash}{$mod}||=1; # unsafe meta access, ok
       return 0;
     }
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     my $file = $mod;
     my $obj;
     $file =~ s|::|/|g;
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta.pm b/Master/tlpkg/tlperl/lib/CPAN/Meta.pm
index 2a78691906b..afbb221855a 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 package CPAN::Meta;
 
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
 
 #pod =head1 SYNOPSIS
 #pod
@@ -591,6 +591,10 @@ sub as_struct {
 #pod both cases, the same rules are followed as in the C<save()> method for choosing
 #pod a serialization backend.
 #pod
+#pod The serialized structure will include a C<x_serialization_backend> entry giving
+#pod the package and version used to serialize.  Any existing key in the given
+#pod C<$meta> object will be clobbered.
+#pod
 #pod =cut
 
 sub as_string {
@@ -610,10 +614,14 @@ sub as_string {
   my ($data, $backend);
   if ( $version ge '2' ) {
     $backend = Parse::CPAN::Meta->json_backend();
+    local $struct->{x_serialization_backend} = sprintf '%s version %s',
+      $backend, $backend->VERSION;
     $data = $backend->new->pretty->canonical->encode($struct);
   }
   else {
     $backend = Parse::CPAN::Meta->yaml_backend();
+    local $struct->{x_serialization_backend} = sprintf '%s version %s',
+      $backend, $backend->VERSION;
     $data = eval { no strict 'refs'; &{"$backend\::Dump"}($struct) };
     if ( $@ ) {
       croak $backend->can('errstr') ? $backend->errstr : $@
@@ -632,8 +640,6 @@ sub TO_JSON {
 
 # ABSTRACT: the distribution metadata for a CPAN dist
 
-__END__
-
 =pod
 
 =encoding UTF-8
@@ -644,7 +650,7 @@ CPAN::Meta - the distribution metadata for a CPAN dist
 
 =head1 VERSION
 
-version 2.150001
+version 2.150005
 
 =head1 SYNOPSIS
 
@@ -859,6 +865,10 @@ JSON.  For C<version> less than 2, the string will be serialized as YAML.  In
 both cases, the same rules are followed as in the C<save()> method for choosing
 a serialization backend.
 
+The serialized structure will include a C<x_serialization_backend> entry giving
+the package and version used to serialize.  Any existing key in the given
+C<$meta> object will be clobbered.
+
 =head1 STRING DATA
 
 The following methods return a single value, which is the value for the
@@ -1025,7 +1035,7 @@ Ricardo Signes <rjbs@cpan.org>
 
 =head1 CONTRIBUTORS
 
-=for stopwords Ansgar Burchardt Avar Arnfjord Bjarmason Christopher J. Madsen Chuck Adams Cory G Watson Damyan Ivanov Eric Wilhelm Graham Knop Gregor Hermann Karen Etheridge Kenichi Ishigaki Ken Williams Lars Dieckow Leon Timmermans majensen Mark Fowler Matt S Trout Michael G. Schwern mohawk2 moznion Olaf Alders Olivier Mengue Randy Sims
+=for stopwords Ansgar Burchardt Avar Arnfjord Bjarmason Christopher J. Madsen Chuck Adams Cory G Watson Damyan Ivanov Eric Wilhelm Graham Knop Gregor Hermann Karen Etheridge Kenichi Ishigaki Ken Williams Lars Dieckow Leon Timmermans majensen Mark Fowler Matt S Trout Michael G. Schwern mohawk2 moznion Niko Tyni Olaf Alders Olivier Mengué Randy Sims Tomohiro Hosaka
 
 =over 4
 
@@ -1111,16 +1121,24 @@ moznion <moznion@gmail.com>
 
 =item *
 
+Niko Tyni <ntyni@debian.org>
+
+=item *
+
 Olaf Alders <olaf@wundersolutions.com>
 
 =item *
 
-Olivier Mengue <dolmen@cpan.org>
+Olivier Mengué <dolmen@cpan.org>
 
 =item *
 
 Randy Sims <randys@thepierianspring.org>
 
+=item *
+
+Tomohiro Hosaka <bokutin@bokut.in>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE
@@ -1131,3 +1149,8 @@ This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
 
 =cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/Converter.pm b/Master/tlpkg/tlperl/lib/CPAN/Meta/Converter.pm
index 8b32b1360ab..03806bc82bf 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/Converter.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/Converter.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 package CPAN::Meta::Converter;
 
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
 
 #pod =head1 SYNOPSIS
 #pod
@@ -388,6 +388,8 @@ sub _clean_version {
 
 sub _bad_version_hook {
   my ($v) = @_;
+  $v =~ s{^\s*}{};
+  $v =~ s{\s*$}{};
   $v =~ s{[a-z]+$}{}; # strip trailing alphabetics
   my $vobj = eval { version->new($v) };
   return defined($vobj) ? $vobj : version->new(0); # or give up
@@ -803,7 +805,7 @@ my %up_convert = (
     # CHANGED TO MANDATORY
     'dynamic_config'      => \&_keep_or_one,
     # ADDED MANDATORY
-    'release_status'      => \&_release_status_from_version,
+    'release_status'      => \&_release_status,
     # PRIOR OPTIONAL
     'keywords'            => \&_keep,
     'no_index'            => \&_no_index_directory,
@@ -1497,7 +1499,7 @@ CPAN::Meta::Converter - Convert CPAN distribution metadata structures
 
 =head1 VERSION
 
-version 2.150001
+version 2.150005
 
 =head1 SYNOPSIS
 
@@ -1634,4 +1636,4 @@ the same terms as the Perl 5 programming language system itself.
 __END__
 
 
-# vim: ts=2 sts=2 sw=2 et:
+# vim: ts=2 sts=2 sw=2 et :
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/Feature.pm b/Master/tlpkg/tlperl/lib/CPAN/Meta/Feature.pm
index 4bfbb19b4c7..9dac4f42185 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/Feature.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/Feature.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 package CPAN::Meta::Feature;
 
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
 
 use CPAN::Meta::Prereqs;
 
@@ -67,8 +67,6 @@ sub prereqs     { $_[0]{prereqs} }
 
 # ABSTRACT: an optional feature provided by a CPAN distribution
 
-__END__
-
 =pod
 
 =encoding UTF-8
@@ -79,7 +77,7 @@ CPAN::Meta::Feature - an optional feature provided by a CPAN distribution
 
 =head1 VERSION
 
-version 2.150001
+version 2.150005
 
 =head1 DESCRIPTION
 
@@ -144,3 +142,8 @@ This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
 
 =cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/History.pm b/Master/tlpkg/tlperl/lib/CPAN/Meta/History.pm
index 3d7e5585199..f4cac5e59a9 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/History.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/History.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 package CPAN::Meta::History;
 
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
 
 1;
 
@@ -22,7 +22,7 @@ CPAN::Meta::History - history of CPAN Meta Spec changes
 
 =head1 VERSION
 
-version 2.150001
+version 2.150005
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_0.pod b/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_0.pod
index 1052c3eb440..cd3bb9c3f68 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_0.pod
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_0.pod
@@ -7,7 +7,8 @@ CPAN::Meta::History::Meta_1_0 - Version 1.0 metadata specification for META.yml
 =head1 PREFACE
 
 This is a historical copy of the version 1.0 specification for F<META.yml>
-files, copyright by Ken Williams.
+files, copyright by Ken Williams and licensed under the same terms as Perl
+itself.
 
 Modifications from the original:
 
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_1.pod b/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_1.pod
index 69f34115189..7b4b2f41ce6 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_1.pod
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_1.pod
@@ -7,7 +7,8 @@ CPAN::Meta::History::Meta_1_1 - Version 1.1 metadata specification for META.yml
 =head1 PREFACE
 
 This is a historical copy of the version 1.1 specification for F<META.yml>
-files, copyright by Ken Williams.
+files, copyright by Ken Williams and licensed under the same terms as Perl
+itself.
 
 Modifications from the original:
 
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_2.pod b/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_2.pod
index 69cd5bb5861..48867b2b350 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_2.pod
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_2.pod
@@ -7,7 +7,8 @@ CPAN::Meta::History::Meta_1_2 - Version 1.2 metadata specification for META.yml
 =head1 PREFACE
 
 This is a historical copy of the version 1.2 specification for F<META.yml>
-files, copyright by Ken Williams.
+files, copyright by Ken Williams and licensed under the same terms as Perl
+itself.
 
 Modifications from the original:
 
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_3.pod b/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_3.pod
index deff28dc828..b075adccde6 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_3.pod
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_3.pod
@@ -7,7 +7,8 @@ CPAN::Meta::History::Meta_1_3 - Version 1.3 metadata specification for META.yml
 =head1 PREFACE
 
 This is a historical copy of the version 1.3 specification for F<META.yml>
-files, copyright by Ken Williams.
+files, copyright by Ken Williams and licensed under the same terms as Perl
+itself.
 
 Modifications from the original:
 
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_4.pod b/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_4.pod
index a84fb3dd8a6..471296ce291 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_4.pod
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/History/Meta_1_4.pod
@@ -7,7 +7,8 @@ CPAN::Meta::History::Meta_1_4 - Version 1.4 metadata specification for META.yml
 =head1 PREFACE
 
 This is a historical copy of the version 1.4 specification for F<META.yml>
-files, copyright by Ken Williams.
+files, copyright by Ken Williams and licensed under the same terms as Perl
+itself.
 
 Modifications from the original:
 
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/Merge.pm b/Master/tlpkg/tlperl/lib/CPAN/Meta/Merge.pm
index f4c12869c44..05a18ea9732 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/Merge.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/Merge.pm
@@ -3,15 +3,24 @@ use warnings;
 
 package CPAN::Meta::Merge;
 
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
 
 use Carp qw/croak/;
 use Scalar::Util qw/blessed/;
 use CPAN::Meta::Converter 2.141170;
 
+sub _is_identical {
+  my ($left, $right) = @_;
+  return
+    (not defined $left and not defined $right)
+    # if either of these are references, we compare the serialized value
+    || (defined $left and defined $right and $left eq $right);
+}
+
 sub _identical {
   my ($left, $right, $path) = @_;
-  croak sprintf "Can't merge attribute %s: '%s' does not equal '%s'", join('.', @{$path}), $left, $right unless $left eq $right;
+  croak sprintf "Can't merge attribute %s: '%s' does not equal '%s'", join('.', @{$path}), $left, $right
+    unless _is_identical($left, $right);
   return $left;
 }
 
@@ -50,6 +59,13 @@ sub _uniq_map {
     if (not exists $left->{$key}) {
       $left->{$key} = $right->{$key};
     }
+    # identical strings or references are merged identically
+    elsif (_is_identical($left->{$key}, $right->{$key})) {
+      1; # do nothing - keep left
+    }
+    elsif (ref $left->{$key} eq 'HASH' and ref $right->{$key} eq 'HASH') {
+      $left->{$key} = _uniq_map($left->{$key}, $right->{$key}, [ @{$path}, $key ]);
+    }
     else {
       croak 'Duplication of element ' . join '.', @{$path}, $key;
     }
@@ -219,6 +235,9 @@ sub merge {
 
 # ABSTRACT: Merging CPAN Meta fragments
 
+
+# vim: ts=2 sts=2 sw=2 et :
+
 __END__
 
 =pod
@@ -231,7 +250,7 @@ CPAN::Meta::Merge - Merging CPAN Meta fragments
 
 =head1 VERSION
 
-version 2.150001
+version 2.150005
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/Prereqs.pm b/Master/tlpkg/tlperl/lib/CPAN/Meta/Prereqs.pm
index 75035107f8c..8a13eb13c81 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/Prereqs.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/Prereqs.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 package CPAN::Meta::Prereqs;
 
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
 
 #pod =head1 DESCRIPTION
 #pod
@@ -163,7 +163,7 @@ sub with_merged_prereqs {
 #pod
 #pod     my $new_reqs = $prereqs->merged_requirements( \@phases, \@types );
 #pod     my $new_reqs = $prereqs->merged_requirements( \@phases );
-#pod     my $new_reqs = $preerqs->merged_requirements();
+#pod     my $new_reqs = $prereqs->merged_requirements();
 #pod
 #pod This method joins together all requirements across a number of phases
 #pod and types into a new L<CPAN::Meta::Requirements> object.  If arguments
@@ -275,8 +275,6 @@ sub clone {
 
 # ABSTRACT: a set of distribution prerequisites by phase and type
 
-__END__
-
 =pod
 
 =encoding UTF-8
@@ -287,7 +285,7 @@ CPAN::Meta::Prereqs - a set of distribution prerequisites by phase and type
 
 =head1 VERSION
 
-version 2.150001
+version 2.150005
 
 =head1 DESCRIPTION
 
@@ -353,7 +351,7 @@ will not alter them.
 
     my $new_reqs = $prereqs->merged_requirements( \@phases, \@types );
     my $new_reqs = $prereqs->merged_requirements( \@phases );
-    my $new_reqs = $preerqs->merged_requirements();
+    my $new_reqs = $prereqs->merged_requirements();
 
 This method joins together all requirements across a number of phases
 and types into a new L<CPAN::Meta::Requirements> object.  If arguments
@@ -417,3 +415,8 @@ This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
 
 =cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/Requirements.pm b/Master/tlpkg/tlperl/lib/CPAN/Meta/Requirements.pm
index 83485594985..b0e83b0d2d2 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/Requirements.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/Requirements.pm
@@ -1,9 +1,10 @@
+use 5.006; # keep at v5.6 for CPAN.pm
 use strict;
 use warnings;
 package CPAN::Meta::Requirements;
 # ABSTRACT: a set of version requirements for a CPAN dist
 
-our $VERSION = '2.132';
+our $VERSION = '2.140';
 
 #pod =head1 SYNOPSIS
 #pod
@@ -110,34 +111,38 @@ sub _isa_version {
 sub _version_object {
   my ($self, $module, $version) = @_;
 
-  my $vobj;
+  my ($vobj, $err);
 
-  # hack around version::vpp not handling <3 character vstring literals
-  if ( $INC{'version/vpp.pm'} || $INC{'ExtUtils/MakeMaker/version/vpp.pm'} ) {
-    my $magic = _find_magic_vstring( $version );
-    $version = $magic if length $magic;
+  if (not defined $version or (!ref($version) && $version eq '0')) {
+    return $V0;
   }
-
-  eval {
-    if (not defined $version or (!ref($version) && $version eq '0')) {
-      $vobj = $V0;
+  elsif ( ref($version) eq 'version' || ( ref($version) && _isa_version($version) ) ) {
+    $vobj = $version;
+  }
+  else {
+    # hack around version::vpp not handling <3 character vstring literals
+    if ( $INC{'version/vpp.pm'} || $INC{'ExtUtils/MakeMaker/version/vpp.pm'} ) {
+      my $magic = _find_magic_vstring( $version );
+      $version = $magic if length $magic;
     }
-    elsif ( ref($version) eq 'version' || _isa_version($version) ) {
-      $vobj = $version;
+    # pad to 3 characters if before 5.8.1 and appears to be a v-string
+    if ( $] < 5.008001 && $version !~ /\A[0-9]/ && substr($version,0,1) ne 'v' && length($version) < 3 ) {
+      $version .= "\0" x (3 - length($version));
     }
-    else {
+    eval {
       local $SIG{__WARN__} = sub { die "Invalid version: $_[0]" };
+      # avoid specific segfault on some older version.pm versions
+      die "Invalid version: $version" if $version eq 'version';
       $vobj = version->new($version);
-    }
-  };
-
-  if ( my $err = $@ ) {
-    my $hook = $self->{bad_version_hook};
-    $vobj = eval { $hook->($version, $module) }
-      if ref $hook eq 'CODE';
-    unless (eval { $vobj->isa("version") }) {
-      $err =~ s{ at .* line \d+.*$}{};
-      die "Can't convert '$version': $err";
+    };
+    if ( my $err = $@ ) {
+      my $hook = $self->{bad_version_hook};
+      $vobj = eval { $hook->($version, $module) }
+        if ref $hook eq 'CODE';
+      unless (eval { $vobj->isa("version") }) {
+        $err =~ s{ at .* line \d+.*$}{};
+        die "Can't convert '$version': $err";
+      }
     }
   }
 
@@ -220,22 +225,26 @@ BEGIN {
 
       return $self;
     };
-    
+
     no strict 'refs';
     *$to_add = $code;
   }
 }
 
+# add_minimum is optimized compared to generated subs above because
+# it is called frequently and with "0" or equivalent input
 sub add_minimum {
   my ($self, $name, $version) = @_;
 
-  if (not defined $version or (!ref($version) && $version eq '0')) {
+  # stringify $version so that version->new("0.00")->stringify ne "0"
+  # which preserves the user's choice of "0.00" as the requirement
+  if (not defined $version or "$version" eq '0') {
     return $self if $self->__entry_for($name);
     Carp::confess("can't add new requirements to finalized requirements")
       if $self->is_finalized;
 
     $self->{requirements}{ $name } =
-      CPAN::Meta::Requirements::_Range::Range->with_minimum($V0);
+      CPAN::Meta::Requirements::_Range::Range->with_minimum($V0, $name);
   }
   else {
     $version = $self->_version_object( $name, $version );
@@ -249,9 +258,9 @@ sub add_minimum {
 #pod
 #pod   $req->add_requirements( $another_req_object );
 #pod
-#pod This method adds all the requirements in the given CPAN::Meta::Requirements object
-#pod to the requirements object on which it was called.  If there are any conflicts,
-#pod an exception is thrown.
+#pod This method adds all the requirements in the given CPAN::Meta::Requirements
+#pod object to the requirements object on which it was called.  If there are any
+#pod conflicts, an exception is thrown.
 #pod
 #pod This method returns the requirements object.
 #pod
@@ -328,7 +337,7 @@ sub clear_requirement {
 #pod the format described in L<CPAN::Meta::Spec> or undef if the given module has no
 #pod requirements. This should only be used for informational purposes such as error
 #pod messages and should not be interpreted or used for comparison (see
-#pod L</accepts_module> instead.)
+#pod L</accepts_module> instead).
 #pod
 #pod =cut
 
@@ -339,6 +348,25 @@ sub requirements_for_module {
   return $entry->as_string;
 }
 
+#pod =method structured_requirements_for_module
+#pod
+#pod   $req->structured_requirements_for_module( $module );
+#pod
+#pod This returns a data structure containing the version requirements for a given
+#pod module or undef if the given module has no requirements.  This should
+#pod not be used for version checks (see L</accepts_module> instead).
+#pod
+#pod Added in version 2.134.
+#pod
+#pod =cut
+
+sub structured_requirements_for_module {
+  my ($self, $module) = @_;
+  my $entry = $self->__entry_for($module);
+  return unless $entry;
+  return $entry->as_struct;
+}
+
 #pod =method required_modules
 #pod
 #pod This method returns a list of all the modules for which requirements have been
@@ -376,7 +404,7 @@ sub __modify_entry_for {
     if $fin and not $old;
 
   my $new = ($old || 'CPAN::Meta::Requirements::_Range::Range')
-          ->$method($version);
+          ->$method($version, $name);
 
   Carp::confess("can't modify finalized requirements")
     if $fin and $old->as_string ne $new->as_string;
@@ -587,36 +615,62 @@ sub from_string_hash {
 
   sub as_string { return "== $_[0]{version}" }
 
+  sub as_struct { return [ [ '==', "$_[0]{version}" ] ] }
+
   sub as_modifiers { return [ [ exact_version => $_[0]{version} ] ] }
 
+  sub _reject_requirements {
+    my ($self, $module, $error) = @_;
+    Carp::confess("illegal requirements for $module: $error")
+  }
+
   sub _clone {
     (ref $_[0])->_new( version->new( $_[0]{version} ) )
   }
 
   sub with_exact_version {
-    my ($self, $version) = @_;
+    my ($self, $version, $module) = @_;
+    $module = 'module' unless defined $module;
 
     return $self->_clone if $self->_accepts($version);
 
-    Carp::confess("illegal requirements: unequal exact version specified");
+    $self->_reject_requirements(
+      $module,
+      "can't be exactly $version when exact requirement is already $self->{version}",
+    );
   }
 
   sub with_minimum {
-    my ($self, $minimum) = @_;
+    my ($self, $minimum, $module) = @_;
+    $module = 'module' unless defined $module;
+
     return $self->_clone if $self->{version} >= $minimum;
-    Carp::confess("illegal requirements: minimum above exact specification");
+    $self->_reject_requirements(
+      $module,
+      "minimum $minimum exceeds exact specification $self->{version}",
+    );
   }
 
   sub with_maximum {
-    my ($self, $maximum) = @_;
+    my ($self, $maximum, $module) = @_;
+    $module = 'module' unless defined $module;
+
     return $self->_clone if $self->{version} <= $maximum;
-    Carp::confess("illegal requirements: maximum below exact specification");
+    $self->_reject_requirements(
+      $module,
+      "maximum $maximum below exact specification $self->{version}",
+    );
   }
 
   sub with_exclusion {
-    my ($self, $exclusion) = @_;
+    my ($self, $exclusion, $module) = @_;
+    $module = 'module' unless defined $module;
+
     return $self->_clone unless $exclusion == $self->{version};
-    Carp::confess("illegal requirements: excluded exact specification");
+    $self->_reject_requirements(
+      $module,
+      "tried to exclude $exclusion, which is already exactly specified",
+    );
   }
 }
 
@@ -653,61 +707,87 @@ sub from_string_hash {
     return \@mods;
   }
 
-  sub as_string {
+  sub as_struct {
     my ($self) = @_;
 
     return 0 if ! keys %$self;
 
-    return "$self->{minimum}" if (keys %$self) == 1 and exists $self->{minimum};
-
     my @exclusions = @{ $self->{exclusions} || [] };
 
     my @parts;
 
-    for my $pair (
+    for my $tuple (
       [ qw( >= > minimum ) ],
       [ qw( <= < maximum ) ],
     ) {
-      my ($op, $e_op, $k) = @$pair;
+      my ($op, $e_op, $k) = @$tuple;
       if (exists $self->{$k}) {
         my @new_exclusions = grep { $_ != $self->{ $k } } @exclusions;
         if (@new_exclusions == @exclusions) {
-          push @parts, "$op $self->{ $k }";
+          push @parts, [ $op, "$self->{ $k }" ];
         } else {
-          push @parts, "$e_op $self->{ $k }";
+          push @parts, [ $e_op, "$self->{ $k }" ];
           @exclusions = @new_exclusions;
         }
       }
     }
 
-    push @parts, map {; "!= $_" } @exclusions;
+    push @parts, map {; [ "!=", "$_" ] } @exclusions;
 
-    return join q{, }, @parts;
+    return \@parts;
+  }
+
+  sub as_string {
+    my ($self) = @_;
+
+    my @parts = @{ $self->as_struct };
+
+    return $parts[0][1] if @parts == 1 and $parts[0][0] eq '>=';
+
+    return join q{, }, map {; join q{ }, @$_ } @parts;
+  }
+
+  sub _reject_requirements {
+    my ($self, $module, $error) = @_;
+    Carp::confess("illegal requirements for $module: $error")
   }
 
   sub with_exact_version {
-    my ($self, $version) = @_;
+    my ($self, $version, $module) = @_;
+    $module = 'module' unless defined $module;
     $self = $self->_clone;
 
-    Carp::confess("illegal requirements: exact specification outside of range")
-      unless $self->_accepts($version);
+    unless ($self->_accepts($version)) {
+      $self->_reject_requirements(
+        $module,
+        "exact specification $version outside of range " . $self->as_string
+      );
+    }
 
     return CPAN::Meta::Requirements::_Range::Exact->_new($version);
   }
 
   sub _simplify {
-    my ($self) = @_;
+    my ($self, $module) = @_;
 
     if (defined $self->{minimum} and defined $self->{maximum}) {
       if ($self->{minimum} == $self->{maximum}) {
-        Carp::confess("illegal requirements: excluded all values")
-          if grep { $_ == $self->{minimum} } @{ $self->{exclusions} || [] };
+        if (grep { $_ == $self->{minimum} } @{ $self->{exclusions} || [] }) {
+          $self->_reject_requirements(
+            $module,
+            "minimum and maximum are both $self->{minimum}, which is excluded",
+          );
+        }
 
         return CPAN::Meta::Requirements::_Range::Exact->_new($self->{minimum})
       }
 
-      Carp::confess("illegal requirements: minimum exceeds maximum")
-        if $self->{minimum} > $self->{maximum};
+      if ($self->{minimum} > $self->{maximum}) {
+        $self->_reject_requirements(
+          $module,
+          "minimum $self->{minimum} exceeds maximum $self->{maximum}",
+        );
+      }
     }
 
     # eliminate irrelevant exclusions
@@ -726,7 +806,8 @@ sub from_string_hash {
   }
 
   sub with_minimum {
-    my ($self, $minimum) = @_;
+    my ($self, $minimum, $module) = @_;
+    $module = 'module' unless defined $module;
     $self = $self->_clone;
 
     if (defined (my $old_min = $self->{minimum})) {
@@ -735,11 +816,12 @@ sub from_string_hash {
       $self->{minimum} = $minimum;
     }
 
-    return $self->_simplify;
+    return $self->_simplify($module);
   }
 
   sub with_maximum {
-    my ($self, $maximum) = @_;
+    my ($self, $maximum, $module) = @_;
+    $module = 'module' unless defined $module;
     $self = $self->_clone;
 
     if (defined (my $old_max = $self->{maximum})) {
@@ -748,16 +830,17 @@ sub from_string_hash {
       $self->{maximum} = $maximum;
     }
 
-    return $self->_simplify;
+    return $self->_simplify($module);
   }
 
   sub with_exclusion {
-    my ($self, $exclusion) = @_;
+    my ($self, $exclusion, $module) = @_;
+    $module = 'module' unless defined $module;
     $self = $self->_clone;
 
     push @{ $self->{exclusions} ||= [] }, $exclusion;
 
-    return $self->_simplify;
+    return $self->_simplify($module);
   }
 
   sub _accepts {
@@ -787,7 +870,7 @@ CPAN::Meta::Requirements - a set of version requirements for a CPAN dist
 
 =head1 VERSION
 
-version 2.132
+version 2.140
 
 =head1 SYNOPSIS
 
@@ -887,9 +970,9 @@ This method returns the requirements object.
 
   $req->add_requirements( $another_req_object );
 
-This method adds all the requirements in the given CPAN::Meta::Requirements object
-to the requirements object on which it was called.  If there are any conflicts,
-an exception is thrown.
+This method adds all the requirements in the given CPAN::Meta::Requirements
+object to the requirements object on which it was called.  If there are any
+conflicts, an exception is thrown.
 
 This method returns the requirements object.
 
@@ -924,7 +1007,17 @@ This returns a string containing the version requirements for a given module in
 the format described in L<CPAN::Meta::Spec> or undef if the given module has no
 requirements. This should only be used for informational purposes such as error
 messages and should not be interpreted or used for comparison (see
-L</accepts_module> instead.)
+L</accepts_module> instead).
+
+=head2 structured_requirements_for_module
+
+  $req->structured_requirements_for_module( $module );
+
+This returns a data structure containing the version requirements for a given
+module or undef if the given module has no requirements.  This should
+not be used for version checks (see L</accepts_module> instead).
+
+Added in version 2.134.
 
 =head2 required_modules
 
@@ -1041,7 +1134,7 @@ method.
 =head2 Bugs / Feature Requests
 
 Please report any bugs or feature requests through the issue tracker
-at L<https://github.com/dagolden/CPAN-Meta-Requirements/issues>.
+at L<https://github.com/Perl-Toolchain-Gang/CPAN-Meta-Requirements/issues>.
 You will be notified automatically of any progress on your issue.
 
 =head2 Source Code
@@ -1049,9 +1142,9 @@ You will be notified automatically of any progress on your issue.
 This is open source software.  The code repository is available for
 public review and contribution under the terms of the license.
 
-L<https://github.com/dagolden/CPAN-Meta-Requirements>
+L<https://github.com/Perl-Toolchain-Gang/CPAN-Meta-Requirements>
 
-  git clone https://github.com/dagolden/CPAN-Meta-Requirements.git
+  git clone https://github.com/Perl-Toolchain-Gang/CPAN-Meta-Requirements.git
 
 =head1 AUTHORS
 
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/Spec.pm b/Master/tlpkg/tlperl/lib/CPAN/Meta/Spec.pm
index ec68f178edf..9056940b51a 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/Spec.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/Spec.pm
@@ -8,7 +8,7 @@ use strict;
 use warnings;
 package CPAN::Meta::Spec;
 
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
 
 1;
 
@@ -29,7 +29,7 @@ CPAN::Meta::Spec - specification for CPAN distribution metadata
 
 =head1 VERSION
 
-version 2.150001
+version 2.150005
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/Validator.pm b/Master/tlpkg/tlperl/lib/CPAN/Meta/Validator.pm
index cc0409e6e48..eddaa107302 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/Validator.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/Validator.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 package CPAN::Meta::Validator;
 
-our $VERSION = '2.150001';
+our $VERSION = '2.150005';
 
 #pod =head1 SYNOPSIS
 #pod
@@ -986,8 +986,6 @@ sub _error {
 
 # ABSTRACT: validate CPAN distribution metadata structures
 
-__END__
-
 =pod
 
 =encoding UTF-8
@@ -998,7 +996,7 @@ CPAN::Meta::Validator - validate CPAN distribution metadata structures
 
 =head1 VERSION
 
-version 2.150001
+version 2.150005
 
 =head1 SYNOPSIS
 
@@ -1205,3 +1203,8 @@ This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
 
 =cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff --git a/Master/tlpkg/tlperl/lib/CPAN/Meta/YAML.pm b/Master/tlpkg/tlperl/lib/CPAN/Meta/YAML.pm
index 387a8c4bb80..746abd63bc4 100644
--- a/Master/tlpkg/tlperl/lib/CPAN/Meta/YAML.pm
+++ b/Master/tlpkg/tlperl/lib/CPAN/Meta/YAML.pm
@@ -1,17 +1,12 @@
 use 5.008001; # sane UTF-8 support
 use strict;
 use warnings;
-package CPAN::Meta::YAML;
-$CPAN::Meta::YAML::VERSION = '0.012';
-BEGIN {
-  $CPAN::Meta::YAML::AUTHORITY = 'cpan:ADAMK';
-}
-# git description: v1.60-1-g1c16a0a
-; # original $VERSION removed by Doppelgaenger
+package CPAN::Meta::YAML; # git description: v1.68-2-gcc5324e
 # XXX-INGY is 5.8.1 too old/broken for utf8?
 # XXX-XDG Lancaster consensus was that it was sufficient until
 # proven otherwise
-
+$CPAN::Meta::YAML::VERSION = '0.018';
+; # original $VERSION removed by Doppelgaenger
 
 #####################################################################
 # The CPAN::Meta::YAML API.
@@ -153,7 +148,7 @@ my %QUOTE = map { $_ => 1 } qw{
 my $re_capture_double_quoted = qr/\"([^\\"]*(?:\\.[^\\"]*)*)\"/;
 my $re_capture_single_quoted = qr/\'([^\']*(?:\'\'[^\']*)*)\'/;
 # unquoted re gets trailing space that needs to be stripped
-my $re_capture_unquoted_key  = qr/([^:]+(?::+\S[^:]*)*)(?=\s*\:(?:\s+|$))/;
+my $re_capture_unquoted_key  = qr/([^:]+(?::+\S(?:[^:]*|.*?(?=:)))*)(?=\s*\:(?:\s+|$))/;
 my $re_trailing_comment      = qr/(?:\s+\#.*)?/;
 my $re_key_value_separator   = qr/\s*:(?:\s+(?:\#.*)?|$)/;
 
@@ -300,10 +295,11 @@ Did you decode with lax ":utf8" instead of strict ":encoding(UTF-8)"?
             }
         }
     };
-    if ( ref $@ eq 'SCALAR' ) {
-        $self->_error(${$@});
-    } elsif ( $@ ) {
-        $self->_error($@);
+    my $err = $@;
+    if ( ref $err eq 'SCALAR' ) {
+        $self->_error(${$err});
+    } elsif ( $err ) {
+        $self->_error($err);
     }
 
     return $self;
@@ -515,6 +511,10 @@ sub _load_hash {
             die \"CPAN::Meta::YAML failed to classify line '$lines->[0]'";
         }
 
+        if ( exists $hash->{$key} ) {
+            warn "CPAN::Meta::YAML found a duplicate key '$key' in line '$lines->[0]'";
+        }
+
         # Do we have a value?
         if ( length $lines->[0] ) {
             # Yes
@@ -828,12 +828,10 @@ sub _can_flock {
 #####################################################################
 # Use Scalar::Util if possible, otherwise emulate it
 
+use Scalar::Util ();
 BEGIN {
     local $@;
-    if ( eval { require Scalar::Util }
-      && $Scalar::Util::VERSION
-      && eval($Scalar::Util::VERSION) >= 1.18
-    ) {
+    if ( eval { Scalar::Util->VERSION(1.18); } ) {
         *refaddr = *Scalar::Util::refaddr;
     }
     else {
@@ -855,8 +853,7 @@ END_PERL
     }
 }
 
-
-
+delete $CPAN::Meta::YAML::{refaddr};
 
 1;
 
@@ -881,7 +878,7 @@ CPAN::Meta::YAML - Read and write a subset of YAML for CPAN Meta files
 
 =head1 VERSION
 
-version 0.012
+version 0.018
 
 =head1 SYNOPSIS
 
@@ -917,31 +914,12 @@ C<write> methods do B<not> support UTF-8 and should not be used.
 This module is currently derived from L<YAML::Tiny> by Adam Kennedy.  If
 there are bugs in how it parses a particular META.yml file, please file
 a bug report in the YAML::Tiny bugtracker:
-L<https://rt.cpan.org/Public/Dist/Display.html?Name=YAML-Tiny>
+L<https://github.com/Perl-Toolchain-Gang/YAML-Tiny/issues>
 
 =head1 SEE ALSO
 
 L<YAML::Tiny>, L<YAML>, L<YAML::XS>
 
-=for :stopwords cpan testmatrix url annocpan anno bugtracker rt cpants kwalitee diff irc mailto metadata placeholders metacpan
-
-=head1 SUPPORT
-
-=head2 Bugs / Feature Requests
-
-Please report any bugs or feature requests through the issue tracker
-at L<https://github.com/dagolden/CPAN-Meta-YAML/issues>.
-You will be notified automatically of any progress on your issue.
-
-=head2 Source Code
-
-This is open source software.  The code repository is available for
-public review and contribution under the terms of the license.
-
-L<https://github.com/dagolden/CPAN-Meta-YAML>
-
-  git clone https://github.com/dagolden/CPAN-Meta-YAML.git
-
 =head1 AUTHORS
 
 =over 4
diff --git a/Master/tlpkg/tlperl/lib/Carp.pm b/Master/tlpkg/tlperl/lib/Carp.pm
index 5b191ebfe25..92f88661af6 100644
--- a/Master/tlpkg/tlperl/lib/Carp.pm
+++ b/Master/tlpkg/tlperl/lib/Carp.pm
@@ -87,7 +87,8 @@ BEGIN {
     }
 }
 
-our $VERSION = '1.36';
+our $VERSION = '1.40';
+$VERSION =~ tr/_//d;
 
 our $MaxEvalLen = 0;
 our $Verbose    = 0;
@@ -229,7 +230,7 @@ sub caller_info {
             my $overflow;
             if ( $MaxArgNums and @args > $MaxArgNums )
             {    # More than we want to show?
-                $#args = $MaxArgNums;
+                $#args = $MaxArgNums - 1;
                 $overflow = 1;
             }
 
@@ -444,7 +445,9 @@ sub long_error_loc {
 }
 
 sub longmess_heavy {
-    return @_ if ref( $_[0] );    # don't break references as exceptions
+    if ( ref( $_[0] ) ) {   # don't break references as exceptions
+        return wantarray ? @_ : $_[0];
+    }
     my $i = long_error_loc();
     return ret_backtrace( $i, @_ );
 }
@@ -783,7 +786,8 @@ Defaults to C<64>.
 =head2 $Carp::MaxArgNums
 
 This variable determines how many arguments to each function to show.
-Use a value of C<0> to show all arguments to a function call.
+Use a false value to show all arguments to a function call.  To suppress all
+arguments, use C<-1> or C<'0 but true'>.
 
 Defaults to C<8>.
 
@@ -904,6 +908,12 @@ call die() or warn(), as appropriate.
 L<Carp::Always>,
 L<Carp::Clan>
 
+=head1 CONTRIBUTING
+
+L<Carp> is maintained by the perl 5 porters as part of the core perl 5
+version control repository. Please see the L<perlhack> perldoc for how to
+submit patches and contribute to it.
+
 =head1 AUTHOR
 
 The Carp module first appeared in Larry Wall's perl 5.000 distribution.
diff --git a/Master/tlpkg/tlperl/lib/Carp/Heavy.pm b/Master/tlpkg/tlperl/lib/Carp/Heavy.pm
index a602297ed03..b05d7583c22 100644
--- a/Master/tlpkg/tlperl/lib/Carp/Heavy.pm
+++ b/Master/tlpkg/tlperl/lib/Carp/Heavy.pm
@@ -2,7 +2,8 @@ package Carp::Heavy;
 
 use Carp ();
 
-our $VERSION = '1.36';
+our $VERSION = '1.40';
+$VERSION =~ tr/_//d;
 
 # Carp::Heavy was merged into Carp in version 1.12.  Any mismatched versions
 # after this point are not significant and can be ignored.
diff --git a/Master/tlpkg/tlperl/lib/Compress/Raw/Bzip2.pm b/Master/tlpkg/tlperl/lib/Compress/Raw/Bzip2.pm
index a5cdc2f5620..d9e25bde1f2 100644
--- a/Master/tlpkg/tlperl/lib/Compress/Raw/Bzip2.pm
+++ b/Master/tlpkg/tlperl/lib/Compress/Raw/Bzip2.pm
@@ -11,7 +11,7 @@ use Carp ;
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
 
-$VERSION = '2.068';
+$VERSION = '2.069';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
@@ -378,7 +378,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/Compress/Raw/Zlib.pm b/Master/tlpkg/tlperl/lib/Compress/Raw/Zlib.pm
index 34bd4172263..59a6100ebfa 100644
--- a/Master/tlpkg/tlperl/lib/Compress/Raw/Zlib.pm
+++ b/Master/tlpkg/tlperl/lib/Compress/Raw/Zlib.pm
@@ -10,7 +10,7 @@ use warnings ;
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, %EXPORT_TAGS, @EXPORT_OK, $AUTOLOAD, %DEFLATE_CONSTANTS, @DEFLATE_CONSTANTS);
 
-$VERSION = '2.068';
+$VERSION = '2.069';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
@@ -1590,7 +1590,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/Compress/Zlib.pm b/Master/tlpkg/tlperl/lib/Compress/Zlib.pm
index d197a3478bd..897b1e26b54 100644
--- a/Master/tlpkg/tlperl/lib/Compress/Zlib.pm
+++ b/Master/tlpkg/tlperl/lib/Compress/Zlib.pm
@@ -7,17 +7,17 @@ use Carp ;
 use IO::Handle ;
 use Scalar::Util qw(dualvar);
 
-use IO::Compress::Base::Common 2.068 ;
-use Compress::Raw::Zlib 2.068 ;
-use IO::Compress::Gzip 2.068 ;
-use IO::Uncompress::Gunzip 2.068 ;
+use IO::Compress::Base::Common 2.069 ;
+use Compress::Raw::Zlib 2.069 ;
+use IO::Compress::Gzip 2.069 ;
+use IO::Uncompress::Gunzip 2.069 ;
 
 use strict ;
 use warnings ;
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
@@ -461,7 +461,7 @@ sub inflate
 
 package Compress::Zlib ;
 
-use IO::Compress::Gzip::Constants 2.068 ;
+use IO::Compress::Gzip::Constants 2.069 ;
 
 sub memGzip($)
 {
@@ -1500,7 +1500,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 1995-2014 Paul Marquess. All rights reserved.
+Copyright (c) 1995-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/Config.pm b/Master/tlpkg/tlperl/lib/Config.pm
index 779cf2da000..261fdceb3c7 100644
--- a/Master/tlpkg/tlperl/lib/Config.pm
+++ b/Master/tlpkg/tlperl/lib/Config.pm
@@ -10,7 +10,7 @@ use strict;
 use warnings;
 use vars '%Config', '$VERSION';
 
-$VERSION = "5.022001";
+$VERSION = "5.024001";
 
 # Skip @Config::EXPORT because it only contains %Config, which we special
 # case below as it's not a function. @Config::EXPORT won't change in the
@@ -56,11 +56,11 @@ sub import {
     return;
 }
 
-die "$0: Perl lib version (5.22.1) doesn't match executable '$^X' version ($])"
+die "$0: Perl lib version (5.24.1) doesn't match executable '$^X' version ($])"
     unless $^V;
 
-$^V eq 5.22.1
-    or die sprintf "%s: Perl lib version (5.22.1) doesn't match executable '$^X' version (%vd)", $0, $^V;
+$^V eq 5.24.1
+    or die sprintf "%s: Perl lib version (5.24.1) doesn't match executable '$^X' version (%vd)", $0, $^V;
 
 
 sub FETCH {
@@ -112,5 +112,5 @@ tie %Config, 'Config', {
     so => 'dll',
     useithreads => 'define',
     usevendorprefix => undef,
-    version => '5.22.1',
+    version => '5.24.1',
 };
diff --git a/Master/tlpkg/tlperl/lib/Config.pm.orig b/Master/tlpkg/tlperl/lib/Config.pm.orig
index 07a6b3eff09..be4cd2c56a8 100644
--- a/Master/tlpkg/tlperl/lib/Config.pm.orig
+++ b/Master/tlpkg/tlperl/lib/Config.pm.orig
@@ -10,7 +10,7 @@ use strict;
 use warnings;

 use vars '%Config', '$VERSION';

 

-$VERSION = "5.022001";

+$VERSION = "5.024001";

 

 # Skip @Config::EXPORT because it only contains %Config, which we special

 # case below as it's not a function. @Config::EXPORT won't change in the

@@ -56,11 +56,11 @@ sub import {
     return;

 }

 

-die "$0: Perl lib version (5.22.1) doesn't match executable '$^X' version ($])"

+die "$0: Perl lib version (5.24.1) doesn't match executable '$^X' version ($])"

     unless $^V;

 

-$^V eq 5.22.1

-    or die sprintf "%s: Perl lib version (5.22.1) doesn't match executable '$^X' version (%vd)", $0, $^V;

+$^V eq 5.24.1

+    or die sprintf "%s: Perl lib version (5.24.1) doesn't match executable '$^X' version (%vd)", $0, $^V;

 

 

 sub FETCH {

@@ -96,7 +96,7 @@ tie %Config, 'Config', {
     inc_version_list => '',

     intsize => '4',

     ldlibpthname => '',

-    libpth => 'X:\\mingw\\lib',

+    libpth => 'X:\\wprogs\\mingw\\lib',

     osname => 'MSWin32',

     osvers => '6.1',

     path_sep => ';',

@@ -107,5 +107,5 @@ tie %Config, 'Config', {
     so => 'dll',

     useithreads => 'define',

     usevendorprefix => undef,

-    version => '5.22.1',

+    version => '5.24.1',

 };

diff --git a/Master/tlpkg/tlperl/lib/Config.pod b/Master/tlpkg/tlperl/lib/Config.pod
index 3e2020fe2fc..dd2408a39de 100644
--- a/Master/tlpkg/tlperl/lib/Config.pod
+++ b/Master/tlpkg/tlperl/lib/Config.pod
@@ -1315,6 +1315,14 @@ From F<d_dup2.U>:
 This variable conditionally defines HAS_DUP2 if dup2() is

 available to duplicate file descriptors.

 

+=item C<d_duplocale>

+

+From F<d_newlocale.U>:

+

+This variable conditionally defines the C<HAS_DUPLOCALE> symbol, which

+indicates to the C program that the duplocale() routine is available

+to duplicate a locale object.

+

 =item C<d_eaccess>

 

 From F<d_eaccess.U>:

@@ -1516,6 +1524,13 @@ From F<d_fd_set.U>:
 This variable contains the eventual value of the C<HAS_FD_SET> symbol,

 which indicates if your C compiler knows about the fd_set typedef.

 

+=item C<d_fdclose>

+

+From F<d_fdclose.U>:

+

+This variable conditionally defines the C<HAS_FDCLOSE> symbol, which

+indicates to the C program that the fdclose() routine is available.

+

 =item C<d_fdim>

 

 From F<d_fdim.U>:

@@ -1676,6 +1691,14 @@ From F<d_fpos64_t.U>:
 

 This symbol will be defined if the C compiler supports fpos64_t.

 

+=item C<d_freelocale>

+

+From F<d_newlocale.U>:

+

+This variable conditionally defines the C<HAS_FREELOCALE> symbol, which

+indicates to the C program that the freelocale() routine is available

+to deallocates the resources associated with a locale object.

+

 =item C<d_frexpl>

 

 From F<d_frexpl.U>:

@@ -2436,6 +2459,13 @@ From F<d_isinfl.U>:
 This variable conditionally defines the C<HAS_ISINFL> symbol, which

 indicates to the C program that the isinfl() routine is available.

 

+=item C<d_isless>

+

+From F<d_isless.U>:

+

+This variable conditionally defines the C<HAS_ISLESS> symbol, which

+indicates to the C program that the isless() routine is available.

+

 =item C<d_isnan>

 

 From F<d_isnan.U>:

@@ -2556,8 +2586,8 @@ From F<d_llrint.U>:
 

 This variable conditionally defines the C<HAS_LLRINT> symbol, which

 indicates to the C program that the llrint() routine is available

-to return the long long value closest to (according to the current

-rounding mode) to x.

+to return the long long value closest to a double (according

+to the current rounding mode).

 

 =item C<d_llrintl>

 

@@ -2565,8 +2595,8 @@ From F<d_llrintl.U>:
 

 This variable conditionally defines the C<HAS_LLRINTL> symbol, which

 indicates to the C program that the llrintl() routine is available

-to return the long long value closest to (according to the current

-rounding mode) to long double x.

+to return the long long value closest to a long double (according

+to the current rounding mode).

 

 =item C<d_llround>

 

@@ -2582,7 +2612,7 @@ From F<d_llroundl.U>:
 

 This variable conditionally defines the C<HAS_LLROUNDL> symbol, which

 indicates to the C program that the llroundl() routine is available

-to return the long long value nearest to long double x.

+to return the long long value nearest to x away from zero.

 

 =item C<d_localtime64>

 

@@ -2664,8 +2694,8 @@ From F<d_lrint.U>:
 

 This variable conditionally defines the C<HAS_LRINT> symbol, which

 indicates to the C program that the lrint() routine is available

-to return the integral value closest to (according to the current

-rounding mode) to x.

+to return the integral value closest to a double (according

+to the current rounding mode).

 

 =item C<d_lrintl>

 

@@ -2673,8 +2703,8 @@ From F<d_lrintl.U>:
 

 This variable conditionally defines the C<HAS_LRINTL> symbol, which

 indicates to the C program that the lrintl() routine is available

-to return the integral value closest to (according to the current

-rounding mode) to long double x.

+to return the integral value closest to a long double (according

+to the current rounding mode).

 

 =item C<d_lround>

 

@@ -2690,7 +2720,7 @@ From F<d_lroundl.U>:
 

 This variable conditionally defines the C<HAS_LROUNDL> symbol, which

 indicates to the C program that the lroundl() routine is available

-to return the integral value nearest to x of the long double argument.

+to return the integral value nearest to x away from zero.

 

 =item C<d_lseekproto>

 

@@ -2777,6 +2807,15 @@ This variable conditionally defines the C<HAS_MEMCPY> symbol, which
 indicates to the C program that the memcpy() routine is available

 to copy blocks of memory.

 

+=item C<d_memmem>

+

+From F<d_memmem.U>:

+

+This variable conditionally defines the C<HAS_MEMMEM> symbol, which

+indicates to the C program that the memmem() routine is available

+to return a pointer to the start of the first occurance of a

+substring in a memory area (or C<NULL> if not found).

+

 =item C<d_memmove>

 

 From F<d_memmove.U>:

@@ -2861,16 +2900,6 @@ From F<d_modfl.U>:
 This variable conditionally defines the C<HAS_MODFL> symbol, which

 indicates to the C program that the modfl() routine is available.

 

-=item C<d_modfl_pow32_bug>

-

-From F<d_modfl.U>:

-

-This variable conditionally defines the HAS_MODFL_POW32_BUG symbol,

-which indicates that modfl() is broken for long doubles >= pow(2, 32).

-For example from 4294967303.150000 one would get 4294967302.000000

-and 1.150000.  The bug has been seen in certain versions of glibc,

-release 2.2.2 is known to be okay.

-

 =item C<d_modflproto>

 

 From F<d_modfl.U>:

@@ -3029,6 +3058,14 @@ This variable conditionally defines C<HAS_NEARBYINT> if nearbyint()
 is available to return the integral value closest to (according to

 the current rounding mode) to x.

 

+=item C<d_newlocale>

+

+From F<d_newlocale.U>:

+

+This variable conditionally defines the C<HAS_NEWLOCALE> symbol, which

+indicates to the C program that the newlocale() routine is available

+to return a new locale object or modify an existing locale object.

+

 =item C<d_nextafter>

 

 From F<d_nextafter.U>:

@@ -3958,6 +3995,62 @@ From F<d_sigaction.U>:
 This variable conditionally defines the C<HAS_SIGACTION> symbol, which

 indicates that the Vr4 sigaction() routine is available.

 

+=item C<d_siginfo_si_addr>

+

+From F<d_siginfo_si.U>:

+

+This variable conditionally defines the C<HAS_SIGINFO_SI_ADDR> symbol,

+which indicates that the siginfo_t struct has the si_addr member.

+

+=item C<d_siginfo_si_band>

+

+From F<d_siginfo_si.U>:

+

+This variable conditionally defines the C<HAS_SIGINFO_SI_BAND> symbol,

+which indicates that the siginfo_t struct has the si_band member.

+

+=item C<d_siginfo_si_errno>

+

+From F<d_siginfo_si.U>:

+

+This variable conditionally defines the C<HAS_SIGINFO_SI_ERRNO> symbol,

+which indicates that the siginfo_t struct has the si_errno member.

+

+=item C<d_siginfo_si_fd>

+

+From F<d_siginfo_si.U>:

+

+This variable conditionally defines the C<HAS_SIGINFO_SI_FD> symbol,

+which indicates that the siginfo_t struct has the si_fd member.

+

+=item C<d_siginfo_si_pid>

+

+From F<d_siginfo_si.U>:

+

+This variable conditionally defines the C<HAS_SIGINFO_SI_PID> symbol,

+which indicates that the siginfo_t struct has the si_pid member.

+

+=item C<d_siginfo_si_status>

+

+From F<d_siginfo_si.U>:

+

+This variable conditionally defines the C<HAS_SIGINFO_SI_STATUS> symbol,

+which indicates that the siginfo_t struct has the si_status member.

+

+=item C<d_siginfo_si_uid>

+

+From F<d_siginfo_si.U>:

+

+This variable conditionally defines the C<HAS_SIGINFO_SI_UID> symbol,

+which indicates that the siginfo_t struct has the si_uid member.

+

+=item C<d_siginfo_si_value>

+

+From F<d_siginfo_si.U>:

+

+This variable conditionally defines the C<HAS_SIGINFO_SI_VALUE> symbol,

+which indicates that the siginfo_t struct has the si_value member.

+

 =item C<d_signbit>

 

 From F<d_signbit.U>:

@@ -4581,6 +4674,14 @@ From F<d_unsetenv.U>:
 This variable conditionally defines the C<HAS_UNSETENV> symbol, which

 indicates to the C program that the unsetenv () routine is available.

 

+=item C<d_uselocale>

+

+From F<d_newlocale.U>:

+

+This variable conditionally defines the C<HAS_USELOCALE> symbol, which

+indicates to the C program that the uselocale() routine is available

+to set the current locale for the calling thread.

+

 =item C<d_usleep>

 

 From F<d_usleep.U>:

@@ -4812,21 +4913,45 @@ From F<dlsrc.U>:
 This variable contains the name of the dynamic loading file that

 will be used with the package.

 

+=item C<doubleinfbytes>

+

+From F<infnan.U>:

+

+This variable contains comma-separated list of hexadecimal bytes

+for the double precision infinity.

+

 =item C<doublekind>

 

 From F<longdblfio.U>:

 

 This variable, if defined, encodes the type of a double:

-1 = C<IEEE> 754 32-bit big little endian,

-2 = C<IEEE> 754 32-bit big big endian,

-3 = C<IEEE> 754 64-bit big little endian,

-4 = C<IEEE> 754 64-bit big big endian,

-5 = C<IEEE> 754 128-bit big little endian,

-6 = C<IEEE> 754 128-bit big big endian,

-7 = C<IEEE> 754 64-bit big mixed endian le-be,

-8 = C<IEEE> 754 64-bit big mixed endian be-le,

+1 = C<IEEE> 754 32-bit little endian,

+2 = C<IEEE> 754 32-bit big endian,

+3 = C<IEEE> 754 64-bit little endian,

+4 = C<IEEE> 754 64-bit big endian,

+5 = C<IEEE> 754 128-bit little endian,

+6 = C<IEEE> 754 128-bit big endian,

+7 = C<IEEE> 754 64-bit mixed endian le-be,

+8 = C<IEEE> 754 64-bit mixed endian be-le,

 -1 = unknown format.

 

+=item C<doublemantbits>

+

+From F<mantbits.U>:

+

+This symbol, if defined, tells how many mantissa bits

+there are in double precision floating point format.

+Note that this is usually C<DBL_MANT_DIG> minus one, since

+with the standard C<IEEE> 754 formats C<DBL_MANT_DIG> includes

+the implicit bit which doesn't really exist.

+

+=item C<doublenanbytes>

+

+From F<infnan.U>:

+

+This variable contains comma-separated list of hexadecimal bytes

+for the double precision not-a-number.

+

 =item C<doublesize>

 

 From F<doublesize.U>:

@@ -4859,6 +4984,12 @@ From F<usedtrace.U>:
 

 This variable holds the location of the dtrace executable.

 

+=item C<dtraceobject>

+

+From F<dtraceobject.U>:

+

+Whether we need to build an object file with the dtrace tool.

+

 =item C<dynamic_ext>

 

 From F<Extensions.U>:

@@ -6258,6 +6389,13 @@ From F<i_vfork.U>:
 This variable conditionally defines the C<I_VFORK> symbol, and indicates

 whether a C program should include F<vfork.h>.

 

+=item C<i_xlocale>

+

+From F<d_newlocale.U>:

+

+This symbol, if defined, indicates to the C program that it should

+include <xlocale.h> to get uselocale() and its friends

+

 =item C<ignore_versioned_solibs>

 

 From F<libs.U>:

@@ -6862,15 +7000,46 @@ This variable holds the paths (space-separated) used to find local
 libraries.  It is prepended to libpth, and is intended to be easily

 set from the command line.

 

+=item C<longdblinfbytes>

+

+From F<infnan.U>:

+

+This variable contains comma-separated list of hexadecimal bytes

+for the long double precision infinity.

+

 =item C<longdblkind>

 

 From F<d_longdbl.U>:

 

 This variable, if defined, encodes the type of a long double:

-0 = double, 1 = C<IEEE> 754 128-bit big little endian,

-2 = C<IEEE> 754 128-bit big big endian, 3 = x86 80-bit little endian,

-4 = x86 80-bit big endian, 5 = double-double 128-bit little endian,

-6 = double-double 128-bit big endian, -1 = unknown format.

+0 = double,

+1 = C<IEEE> 754 128-bit little endian,

+2 = C<IEEE> 754 128-bit big endian,

+3 = x86 80-bit little endian,

+4 = x86 80-bit big endian,

+5 = double-double 128-bit little endian,

+6 = double-double 128-bit big endian,

+7 = 128-bit mixed double-double (64-bit LEs in C<BE>),

+8 = 128-bit mixed double-double (64-bit BEs in C<LE>),

+-1 = unknown format.

+

+=item C<longdblmantbits>

+

+From F<mantbits.U>:

+

+This symbol, if defined, tells how many mantissa bits

+there are in long double precision floating point format.

+Note that this can be C<LDBL_MANT_DIG> minus one,

+since C<LDBL_MANT_DIG> can include the C<IEEE> 754 implicit bit.

+The common x86-style 80-bit long double does not have

+an implicit bit.

+

+=item C<longdblnanbytes>

+

+From F<infnan.U>:

+

+This variable contains comma-separated list of hexadecimal bytes

+for the long double precision not-a-number.

 

 =item C<longdblsize>

 

@@ -7316,6 +7485,13 @@ From F<perlxvf.U>:
 This variable contains the format string used for printing

 a Perl C<NV> using %G-ish floating point format.

 

+=item C<nvmantbits>

+

+From F<mantbits.U>:

+

+This variable tells how many bits the mantissa of a Perl C<NV> has,

+not including the possible implicit bit.

+

 =item C<nvsize>

 

 From F<perlxv.U>:

diff --git a/Master/tlpkg/tlperl/lib/Config/Perl/V.pm b/Master/tlpkg/tlperl/lib/Config/Perl/V.pm
index def79bb220b..79999fb43a7 100755
--- a/Master/tlpkg/tlperl/lib/Config/Perl/V.pm
+++ b/Master/tlpkg/tlperl/lib/Config/Perl/V.pm
@@ -8,7 +8,7 @@ use warnings;
 use Config;
 use Exporter;
 use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
-$VERSION     = "0.24";
+$VERSION     = "0.25";
 @ISA         = ("Exporter");
 @EXPORT_OK   = qw( plv2hash summary myconfig signature );
 %EXPORT_TAGS = (
@@ -33,6 +33,7 @@ my %BTD = map { $_ => 0 } qw(
     NO_MATHOMS
     NO_TAINT_SUPPORT
     PERL_BOOL_AS_CHAR
+    PERL_COPY_ON_WRITE
     PERL_DISABLE_PMC
     PERL_DONT_CREATE_GVSV
     PERL_EXTERNAL_GLOB
@@ -66,6 +67,7 @@ my %BTD = map { $_ => 0 } qw(
     USE_HASH_SEED_EXPLICIT
     USE_LOCALE
     USE_LOCALE_CTYPE
+    USE_NO_REGISTRY
     USE_PERL_ATOF
     USE_SITECUSTOMIZE
 
diff --git a/Master/tlpkg/tlperl/lib/Config_heavy.pl b/Master/tlpkg/tlperl/lib/Config_heavy.pl
index af84e63114f..9703d649253 100644
--- a/Master/tlpkg/tlperl/lib/Config_heavy.pl
+++ b/Master/tlpkg/tlperl/lib/Config_heavy.pl
@@ -139,15 +139,15 @@ Header=''
 Id='\$Id'
 Locker=''
 Log='\$Log'
-PATCHLEVEL='20'
+PATCHLEVEL='24'
 PERL_API_REVISION='5'
 PERL_API_SUBVERSION='0'
-PERL_API_VERSION='22'
+PERL_API_VERSION='24'
 PERL_CONFIG_SH='true'
 PERL_PATCHLEVEL=''
 PERL_REVISION='5'
 PERL_SUBVERSION='1'
-PERL_VERSION='22'
+PERL_VERSION='24'
 RCSfile='\$RCSfile'
 Revision='\$Revision'
 SUBVERSION='1'
@@ -163,8 +163,8 @@ ansi2knr=''
 aphostname=''
 api_revision='5'
 api_subversion='0'
-api_version='22'
-api_versionstring='5.22.0'
+api_version='24'
+api_versionstring='5.24.0'
 ar='ar'
 archlib='$rootdir\\lib'
 archlibexp='$rootdir\\lib'
@@ -187,14 +187,14 @@ cat='type'
 cc='gcc'
 cccdlflags=' '
 ccdlflags=' '
-ccflags=' -s -O0 -DWIN32  -DPERL_TEXTMODE_SCRIPTS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -fwrapv -fno-strict-aliasing -mms-bitfields'
+ccflags=' -s -O2 -DWIN32  -DPERL_TEXTMODE_SCRIPTS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -DWIN32_NO_REGISTRY -fwrapv -fno-strict-aliasing -mms-bitfields'
 ccflags_uselargefiles=''
 ccname='gcc'
 ccsymbols=''
 ccversion=''
 cf_by='siepo'
 cf_email='tex-live\@tug.org'
-cf_time='Sun Mar 13 16:28:51 2016'
+cf_time='Tue Apr 11 15:40:25 2017'
 charbits='8'
 chgrp=''
 chmod=''
@@ -329,6 +329,7 @@ d_fcntl='undef'
 d_fcntl_can_lock='undef'
 d_fd_macros='define'
 d_fd_set='define'
+d_fdclose='undef'
 d_fdim='undef'
 d_fds_bits='define'
 d_fegetround='undef'
@@ -351,6 +352,7 @@ d_fpclassify='undef'
 d_fpclassl='undef'
 d_fpgetround='undef'
 d_fpos64_t='undef'
+d_freelocale='undef'
 d_frexpl='undef'
 d_fs_data_s='undef'
 d_fseeko='undef'
@@ -490,6 +492,7 @@ d_mbtowc='define'
 d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
+d_memmem='undef'
 d_memmove='define'
 d_memset='define'
 d_mkdir='define'
@@ -522,6 +525,7 @@ d_nan='undef'
 d_ndbm='undef'
 d_ndbm_h_uses_prototypes='undef'
 d_nearbyint='undef'
+d_newlocale='undef'
 d_nextafter='undef'
 d_nexttoward='undef'
 d_nice='undef'
@@ -630,6 +634,13 @@ d_shmctl='undef'
 d_shmdt='undef'
 d_shmget='undef'
 d_sigaction='undef'
+d_siginfo_si_addr='undef'
+d_siginfo_si_band='undef'
+d_siginfo_si_errno='undef'
+d_siginfo_si_pid='undef'
+d_siginfo_si_status='undef'
+d_siginfo_si_uid='undef'
+d_siginfo_si_value='undef'
 d_signbit='undef'
 d_sigprocmask='undef'
 d_sigsetjmp='undef'
@@ -712,6 +723,7 @@ d_uname='define'
 d_union_semun='define'
 d_unordered='undef'
 d_unsetenv='undef'
+d_uselocale='undef'
 d_usleep='undef'
 d_usleepproto='undef'
 d_ustat='undef'
@@ -744,12 +756,15 @@ direntrytype='struct direct'
 dlext='dll'
 dlltool='dlltool'
 dlsrc='dl_win32.xs'
+doubleinfbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x7f'
 doublekind='3'
+doublemantbits='52'
+doublenanbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x7f'
 doublesize='8'
 drand01='Perl_drand48()'
 drand48_r_proto='0'
 dtrace=''
-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash IO List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Win32 Win32API/File XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash IO List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize Win32 Win32API/File XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -764,7 +779,7 @@ endservent_r_proto='0'
 eunicefix=':'
 exe_ext='.exe'
 expr='expr'
-extensions='Archive/Tar Attribute/Handlers AutoLoader B B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Opcode POSIX Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version'
+extensions='Archive/Tar Attribute/Handlers AutoLoader B B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Opcode POSIX Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version'
 extern_C='extern'
 extras=''
 fflushNULL='define'
@@ -781,7 +796,7 @@ full_csh=''
 full_sed=''
 gccansipedantic=''
 gccosandvers=''
-gccversion='4.9.2'
+gccversion='6.3.0'
 getgrent_r_proto='0'
 getgrgid_r_proto='0'
 getgrnam_r_proto='0'
@@ -962,7 +977,7 @@ issymlink=''
 ivdformat='"ld"'
 ivsize='4'
 ivtype='long'
-known_extensions='Archive/Tar Attribute/Handlers AutoLoader B B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call GDBM_File Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags I18N/Langinfo IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 IPC/SysV JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NDBM_File NEXT Net/Ping ODBM_File Opcode POSIX Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Sys/Syslog Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Filespec VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version'
+known_extensions='Amiga/ARexx Amiga/Exec Archive/Tar Attribute/Handlers AutoLoader B B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call GDBM_File Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags I18N/Langinfo IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 IPC/SysV JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NDBM_File NEXT Net/Ping ODBM_File Opcode POSIX Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Sys/Syslog Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Filespec VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version'
 ksh=''
 ld='g++'
 lddlflags='-mdll -s -L"$rootdir\\lib\\CORE" -L"$mingdir\\lib"'
@@ -972,7 +987,7 @@ ldlibpthname=''
 less='less'
 lib_ext='.a'
 libc=''
-libperl='libperl522.a'
+libperl='libperl524.a'
 libpth='$mingdir\\lib'
 libs='-lmoldname -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -lnetapi32 -luuid -lws2_32 -lmpr -lwinmm -lversion -lodbc32 -lodbccp32 -lcomctl32'
 libsdirs=''
@@ -989,7 +1004,10 @@ lns='copy'
 localtime_r_proto='0'
 locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
 loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
+longdblinfbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x7f, 0x00, 0x00'
 longdblkind='3'
+longdblmantbits='64'
+longdblnanbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x00, 0x00'
 longdblsize='12'
 longlongsize='8'
 longsize='4'
@@ -1033,7 +1051,7 @@ netdb_net_type='long'
 nm='nm'
 nm_opt=''
 nm_so_opt=''
-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local Unicode/Normalize XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'
 nroff=''
 nvEUformat='"E"'
 nvFUformat='"F"'
@@ -1043,12 +1061,13 @@ nv_preserves_uv_bits='32'
 nveformat='"e"'
 nvfformat='"f"'
 nvgformat='"g"'
+nvmantbits='52'
 nvsize='8'
 nvtype='double'
 o_nonblock='O_NONBLOCK'
 obj_ext='.o'
 old_pthread_create_joinable=''
-optimize='-s -O0'
+optimize='-s -O2'
 orderlib='false'
 osname='MSWin32'
 osvers='6.1'
@@ -1056,7 +1075,7 @@ otherlibdirs=''
 package='perl5'
 pager='more /e'
 passcat=''
-patchlevel='22'
+patchlevel='24'
 path_sep=';'
 perl5=''
 perl='perl'
@@ -1281,8 +1300,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.22.1'
-version_patchlevel_string='version 22 subversion 1'
+version='5.24.1'
+version_patchlevel_string='version 24 subversion 1'
 versiononly='undef'
 vi=''
 xlibpth='/usr/lib/386 /lib/386'
@@ -1300,7 +1319,7 @@ s/(byteorder=)(['"]).*?\2/$1$2$Config::byteorder$2/m;
 my $config_sh_len = length $_;
 
 our $Config_SH_expanded = "\n$_" . << 'EOVIRTUAL';
-ccflags_nolargefiles=' -s -O0 -DWIN32  -DPERL_TEXTMODE_SCRIPTS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -fwrapv -fno-strict-aliasing -mms-bitfields'
+ccflags_nolargefiles=' -s -O2 -DWIN32  -DPERL_TEXTMODE_SCRIPTS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -DWIN32_NO_REGISTRY -fwrapv -fno-strict-aliasing -mms-bitfields'
 ldflags_nolargefiles='-s -L\"$rootdir\\lib\\CORE\" -L\"$mingdir\\lib\"'
 libs_nolargefiles='-lmoldname -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -lnetapi32 -luuid -lws2_32 -lmpr -lwinmm -lversion -lodbc32 -lodbccp32 -lcomctl32'
 libswanted_nolargefiles=''
diff --git a/Master/tlpkg/tlperl/lib/Config_heavy.pl.orig b/Master/tlpkg/tlperl/lib/Config_heavy.pl.orig
index 745f9adf08f..22133cecc0e 100644
--- a/Master/tlpkg/tlperl/lib/Config_heavy.pl.orig
+++ b/Master/tlpkg/tlperl/lib/Config_heavy.pl.orig
@@ -134,15 +134,15 @@ Header=''
 Id='$Id'

 Locker=''

 Log='$Log'

-PATCHLEVEL='22'

+PATCHLEVEL='24'

 PERL_API_REVISION='5'

 PERL_API_SUBVERSION='0'

-PERL_API_VERSION='22'

+PERL_API_VERSION='24'

 PERL_CONFIG_SH='true'

 PERL_PATCHLEVEL=''

 PERL_REVISION='5'

 PERL_SUBVERSION='1'

-PERL_VERSION='22'

+PERL_VERSION='24'

 RCSfile='$RCSfile'

 Revision='$Revision'

 SUBVERSION='1'

@@ -158,8 +158,8 @@ ansi2knr=''
 aphostname=''

 api_revision='5'

 api_subversion='0'

-api_version='22'

-api_versionstring='5.22.0'

+api_version='24'

+api_versionstring='5.24.0'

 ar='ar'

 archlib='c:\tlperl\lib'

 archlibexp='c:\tlperl\lib'

@@ -182,14 +182,14 @@ cat='type'
 cc='gcc'

 cccdlflags=' '

 ccdlflags=' '

-ccflags=' -s -O0 -DWIN32  -DPERL_TEXTMODE_SCRIPTS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -fwrapv -fno-strict-aliasing -mms-bitfields'

+ccflags=' -s -O2 -DWIN32  -DPERL_TEXTMODE_SCRIPTS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -DWIN32_NO_REGISTRY -fwrapv -fno-strict-aliasing -mms-bitfields'

 ccflags_uselargefiles=''

 ccname='gcc'

 ccsymbols=''

 ccversion=''

 cf_by='siepo'

 cf_email='siepo@W7_64'

-cf_time='Sun Mar 13 16:28:51 2016'

+cf_time='Tue Apr 11 15:40:25 2017'

 charbits='8'

 chgrp=''

 chmod=''

@@ -324,6 +324,7 @@ d_fcntl='undef'
 d_fcntl_can_lock='undef'

 d_fd_macros='define'

 d_fd_set='define'

+d_fdclose='undef'

 d_fdim='undef'

 d_fds_bits='define'

 d_fegetround='undef'

@@ -346,6 +347,7 @@ d_fpclassify='undef'
 d_fpclassl='undef'

 d_fpgetround='undef'

 d_fpos64_t='undef'

+d_freelocale='undef'

 d_frexpl='undef'

 d_fs_data_s='undef'

 d_fseeko='undef'

@@ -485,6 +487,7 @@ d_mbtowc='define'
 d_memchr='define'

 d_memcmp='define'

 d_memcpy='define'

+d_memmem='undef'

 d_memmove='define'

 d_memset='define'

 d_mkdir='define'

@@ -517,6 +520,7 @@ d_nan='undef'
 d_ndbm='undef'

 d_ndbm_h_uses_prototypes='undef'

 d_nearbyint='undef'

+d_newlocale='undef'

 d_nextafter='undef'

 d_nexttoward='undef'

 d_nice='undef'

@@ -625,6 +629,13 @@ d_shmctl='undef'
 d_shmdt='undef'

 d_shmget='undef'

 d_sigaction='undef'

+d_siginfo_si_addr='undef'

+d_siginfo_si_band='undef'

+d_siginfo_si_errno='undef'

+d_siginfo_si_pid='undef'

+d_siginfo_si_status='undef'

+d_siginfo_si_uid='undef'

+d_siginfo_si_value='undef'

 d_signbit='undef'

 d_sigprocmask='undef'

 d_sigsetjmp='undef'

@@ -707,6 +718,7 @@ d_uname='define'
 d_union_semun='define'

 d_unordered='undef'

 d_unsetenv='undef'

+d_uselocale='undef'

 d_usleep='undef'

 d_usleepproto='undef'

 d_ustat='undef'

@@ -739,12 +751,15 @@ direntrytype='struct direct'
 dlext='dll'

 dlltool='dlltool'

 dlsrc='dl_win32.xs'

+doubleinfbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x7f'

 doublekind='3'

+doublemantbits='52'

+doublenanbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x7f'

 doublesize='8'

 drand01='Perl_drand48()'

 drand48_r_proto='0'

 dtrace=''

-dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash IO List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Win32 Win32API/File XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'

+dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash IO List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize Win32 Win32API/File XS/APItest XS/Typemap arybase attributes mro re threads threads/shared'

 eagain='EAGAIN'

 ebcdic='undef'

 echo='echo'

@@ -759,7 +774,7 @@ endservent_r_proto='0'
 eunicefix=':'

 exe_ext='.exe'

 expr='expr'

-extensions='Archive/Tar Attribute/Handlers AutoLoader B B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Opcode POSIX Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version'

+extensions='Archive/Tar Attribute/Handlers AutoLoader B B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Opcode POSIX Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version'

 extern_C='extern'

 extras=''

 fflushNULL='define'

@@ -776,7 +791,7 @@ full_csh=''
 full_sed=''

 gccansipedantic=''

 gccosandvers=''

-gccversion='4.9.2'

+gccversion='6.3.0'

 getgrent_r_proto='0'

 getgrgid_r_proto='0'

 getgrnam_r_proto='0'

@@ -919,7 +934,7 @@ i_vfork='undef'
 ignore_versioned_solibs=''

 inc_version_list=''

 inc_version_list_init='0'

-incpath='X:\mingw\include'

+incpath='X:\wprogs\mingw\include'

 inews=''

 initialinstalllocation=''

 installarchlib='c:\tlperl\lib'

@@ -957,18 +972,18 @@ issymlink=''
 ivdformat='"ld"'

 ivsize='4'

 ivtype='long'

-known_extensions='Archive/Tar Attribute/Handlers AutoLoader B B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call GDBM_File Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags I18N/Langinfo IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 IPC/SysV JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NDBM_File NEXT Net/Ping ODBM_File Opcode POSIX Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Sys/Syslog Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Filespec VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version'

+known_extensions='Amiga/ARexx Amiga/Exec Archive/Tar Attribute/Handlers AutoLoader B B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call GDBM_File Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags I18N/Langinfo IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 IPC/SysV JSON/PP List/Util Locale/Codes Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NDBM_File NEXT Net/Ping ODBM_File Opcode POSIX Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Sys/Syslog Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Filespec VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader arybase attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version'

 ksh=''

 ld='g++'

-lddlflags='-mdll -s -L"c:\tlperl\lib\CORE" -L"X:\mingw\lib"'

-ldflags='-s -L"c:\tlperl\lib\CORE" -L"X:\mingw\lib"'

+lddlflags='-mdll -s -L"c:\tlperl\lib\CORE" -L"X:\wprogs\mingw\lib"'

+ldflags='-s -L"c:\tlperl\lib\CORE" -L"X:\wprogs\mingw\lib"'

 ldflags_uselargefiles=''

 ldlibpthname=''

 less='less'

 lib_ext='.a'

 libc=''

-libperl='libperl522.a'

-libpth='X:\mingw\lib'

+libperl='libperl524.a'

+libpth='X:\wprogs\mingw\lib'

 libs='-lmoldname -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -lnetapi32 -luuid -lws2_32 -lmpr -lwinmm -lversion -lodbc32 -lodbccp32 -lcomctl32'

 libsdirs=''

 libsfiles=''

@@ -984,7 +999,10 @@ lns='copy'
 localtime_r_proto='0'

 locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'

 loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'

+longdblinfbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x7f, 0x00, 0x00'

 longdblkind='3'

+longdblmantbits='64'

+longdblnanbytes='0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x00, 0x00'

 longdblsize='12'

 longlongsize='8'

 longsize='4'

@@ -1028,7 +1046,7 @@ netdb_net_type='long'
 nm='nm'

 nm_opt=''

 nm_so_opt=''

-nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local Unicode/Normalize XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'

+nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version'

 nroff=''

 nvEUformat='"E"'

 nvFUformat='"F"'

@@ -1038,12 +1056,13 @@ nv_preserves_uv_bits='32'
 nveformat='"e"'

 nvfformat='"f"'

 nvgformat='"g"'

+nvmantbits='52'

 nvsize='8'

 nvtype='double'

 o_nonblock='O_NONBLOCK'

 obj_ext='.o'

 old_pthread_create_joinable=''

-optimize='-s -O0'

+optimize='-s -O2'

 orderlib='false'

 osname='MSWin32'

 osvers='6.1'

@@ -1051,7 +1070,7 @@ otherlibdirs=''
 package='perl5'

 pager='more /e'

 passcat=''

-patchlevel='22'

+patchlevel='24'

 path_sep=';'

 perl5=''

 perl='perl'

@@ -1276,8 +1295,8 @@ vendorprefix=''
 vendorprefixexp=''

 vendorscript=''

 vendorscriptexp=''

-version='5.22.1'

-version_patchlevel_string='version 22 subversion 1'

+version='5.24.1'

+version_patchlevel_string='version 24 subversion 1'

 versiononly='undef'

 vi=''

 xlibpth='/usr/lib/386 /lib/386'

@@ -1295,8 +1314,8 @@ s/(byteorder=)(['"]).*?\2/$1$2$Config::byteorder$2/m;
 my $config_sh_len = length $_;

 

 our $Config_SH_expanded = "\n$_" . << 'EOVIRTUAL';

-ccflags_nolargefiles=' -s -O0 -DWIN32  -DPERL_TEXTMODE_SCRIPTS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -fwrapv -fno-strict-aliasing -mms-bitfields'

-ldflags_nolargefiles='-s -L"c:\tlperl\lib\CORE" -L"X:\mingw\lib"'

+ccflags_nolargefiles=' -s -O2 -DWIN32  -DPERL_TEXTMODE_SCRIPTS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -DWIN32_NO_REGISTRY -fwrapv -fno-strict-aliasing -mms-bitfields'

+ldflags_nolargefiles='-s -L"c:\tlperl\lib\CORE" -L"X:\wprogs\mingw\lib"'

 libs_nolargefiles='-lmoldname -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -lnetapi32 -luuid -lws2_32 -lmpr -lwinmm -lversion -lodbc32 -lodbccp32 -lcomctl32'

 libswanted_nolargefiles=''

 EOVIRTUAL

diff --git a/Master/tlpkg/tlperl/lib/Cwd.pm b/Master/tlpkg/tlperl/lib/Cwd.pm
index 49cc4c1b398..3b6388938a1 100644
--- a/Master/tlpkg/tlperl/lib/Cwd.pm
+++ b/Master/tlpkg/tlperl/lib/Cwd.pm
@@ -3,9 +3,9 @@ use strict;
 use Exporter;
 use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
 
-$VERSION = '3.56';
+$VERSION = '3.63_01';
 my $xs_version = $VERSION;
-$VERSION =~ tr/_//;
+$VERSION =~ tr/_//d;
 
 @ISA = qw/ Exporter /;
 @EXPORT = qw(cwd getcwd fastcwd fastgetcwd);
@@ -40,7 +40,10 @@ if ($^O eq 'os2') {
 my $use_vms_feature;
 BEGIN {
     if ($^O eq 'VMS') {
-        if (eval { local $SIG{__DIE__}; require VMS::Feature; }) {
+        if (eval { local $SIG{__DIE__};
+                   local @INC = @INC;
+                   pop @INC if $INC[-1] eq '.';
+                   require VMS::Feature; }) {
             $use_vms_feature = 1;
         }
     }
@@ -158,6 +161,14 @@ my %METHOD_MAP =
     fastcwd		=> 'cwd',
     abs_path		=> 'fast_abs_path',
    },
+
+   amigaos =>
+   {
+    getcwd              => '_backtick_pwd',
+    fastgetcwd          => '_backtick_pwd',
+    fastcwd             => '_backtick_pwd',
+    abs_path            => 'fast_abs_path',
+   }
   );
 
 $METHOD_MAP{NT} = $METHOD_MAP{MSWin32};
@@ -210,9 +221,12 @@ sub _croak { require Carp; Carp::croak(@_) }
 
 # The 'natural and safe form' for UNIX (pwd may be setuid root)
 sub _backtick_pwd {
-    # Localize %ENV entries in a way that won't create new hash keys
-    my @localize = grep exists $ENV{$_}, qw(PATH IFS CDPATH ENV BASH_ENV);
-    local @ENV{@localize};
+
+    # Localize %ENV entries in a way that won't create new hash keys.
+    # Under AmigaOS we don't want to localize as it stops perl from
+    # finding 'sh' in the PATH.
+    my @localize = grep exists $ENV{$_}, qw(PATH IFS CDPATH ENV BASH_ENV) if $^O ne "amigaos";
+    local @ENV{@localize} if @localize;
     
     my $cwd = `$pwd_cmd`;
     # Belt-and-suspenders in case someone said "undef $/".
@@ -600,57 +614,51 @@ sub _vms_abs_path {
 }
 
 sub _os2_cwd {
-    $ENV{'PWD'} = `cmd /c cd`;
-    chomp $ENV{'PWD'};
-    $ENV{'PWD'} =~ s:\\:/:g ;
-    return $ENV{'PWD'};
+    my $pwd = `cmd /c cd`;
+    chomp $pwd;
+    $pwd =~ s:\\:/:g ;
+    $ENV{'PWD'} = $pwd;
+    return $pwd;
 }
 
 sub _win32_cwd_simple {
-    $ENV{'PWD'} = `cd`;
-    chomp $ENV{'PWD'};
-    $ENV{'PWD'} =~ s:\\:/:g ;
-    return $ENV{'PWD'};
+    my $pwd = `cd`;
+    chomp $pwd;
+    $pwd =~ s:\\:/:g ;
+    $ENV{'PWD'} = $pwd;
+    return $pwd;
 }
 
 sub _win32_cwd {
-    # Need to avoid taking any sort of reference to the typeglob or the code in
-    # the optree, so that this tests the runtime state of things, as the
-    # ExtUtils::MakeMaker tests for "miniperl" need to be able to fake things at
-    # runtime by deleting the subroutine. *foo{THING} syntax on a symbol table
-    # lookup avoids needing a string eval, which has been reported to cause
-    # problems (for reasons that we haven't been able to get to the bottom of -
-    # rt.cpan.org #56225)
-    if (*{$DynaLoader::{boot_DynaLoader}}{CODE}) {
-	$ENV{'PWD'} = Win32::GetCwd();
-    }
-    else { # miniperl
-	chomp($ENV{'PWD'} = `cd`);
-    }
-    $ENV{'PWD'} =~ s:\\:/:g ;
-    return $ENV{'PWD'};
+    my $pwd;
+    $pwd = Win32::GetCwd();
+    $pwd =~ s:\\:/:g ;
+    $ENV{'PWD'} = $pwd;
+    return $pwd;
 }
 
 *_NT_cwd = defined &Win32::GetCwd ? \&_win32_cwd : \&_win32_cwd_simple;
 
 sub _dos_cwd {
+    my $pwd;
     if (!defined &Dos::GetCwd) {
-        $ENV{'PWD'} = `command /c cd`;
-        chomp $ENV{'PWD'};
-        $ENV{'PWD'} =~ s:\\:/:g ;
+        chomp($pwd = `command /c cd`);
+        $pwd =~ s:\\:/:g ;
     } else {
-        $ENV{'PWD'} = Dos::GetCwd();
+        $pwd = Dos::GetCwd();
     }
-    return $ENV{'PWD'};
+    $ENV{'PWD'} = $pwd;
+    return $pwd;
 }
 
 sub _qnx_cwd {
 	local $ENV{PATH} = '';
 	local $ENV{CDPATH} = '';
 	local $ENV{ENV} = '';
-    $ENV{'PWD'} = `/usr/bin/fullpath -t`;
-    chomp $ENV{'PWD'};
-    return $ENV{'PWD'};
+    my $pwd = `/usr/bin/fullpath -t`;
+    chomp $pwd;
+    $ENV{'PWD'} = $pwd;
+    return $pwd;
 }
 
 sub _qnx_abs_path {
@@ -669,8 +677,7 @@ sub _qnx_abs_path {
 }
 
 sub _epoc_cwd {
-    $ENV{'PWD'} = EPOC::getcwd();
-    return $ENV{'PWD'};
+    return $ENV{'PWD'} = EPOC::getcwd();
 }
 
 
diff --git a/Master/tlpkg/tlperl/lib/Data/Dumper.pm b/Master/tlpkg/tlperl/lib/Data/Dumper.pm
index e884298d746..13be89d8fbd 100644
--- a/Master/tlpkg/tlperl/lib/Data/Dumper.pm
+++ b/Master/tlpkg/tlperl/lib/Data/Dumper.pm
@@ -10,7 +10,7 @@
 package Data::Dumper;
 
 BEGIN {
-    $VERSION = '2.158'; # Don't forget to set version and release
+    $VERSION = '2.160'; # Don't forget to set version and release
 }               # date in POD below!
 
 #$| = 1;
@@ -41,6 +41,7 @@ my $IS_ASCII  = ord 'A' ==  65;
 
 # module vars and their defaults
 $Indent     = 2         unless defined $Indent;
+$Trailingcomma = 0      unless defined $Trailingcomma;
 $Purity     = 0         unless defined $Purity;
 $Pad        = ""        unless defined $Pad;
 $Varname    = "VAR"     unless defined $Varname;
@@ -76,6 +77,7 @@ sub new {
   my($s) = {
         level      => 0,           # current recursive depth
         indent     => $Indent,     # various styles of indenting
+        trailingcomma => $Trailingcomma, # whether to add comma after last elem
         pad        => $Pad,        # all lines prefixed by this string
         xpad       => "",          # padding-per-level
         apad       => "",          # added padding for hash keys n such
@@ -413,7 +415,9 @@ sub _dump {
         $out .= $pad . $ipad . '#' . $i
           if $s->{indent} >= 3;
         $out .= $pad . $ipad . $s->_dump($v, $sname);
-        $out .= "," if $i++ < $#$val;
+        $out .= ","
+            if $i++ < $#$val
+            || ($s->{trailingcomma} && $s->{indent} >= 1);
       }
       $out .= $pad . ($s->{xpad} x ($s->{level} - 1)) if $i;
       $out .= ($name =~ /^\@/) ? ')' : ']';
@@ -473,7 +477,7 @@ sub _dump {
           if $s->{indent} >= 2;
       }
       if (substr($out, -1) eq ',') {
-        chop $out;
+        chop $out if !$s->{trailingcomma} || !$s->{indent};
         $out .= $pad . ($s->{xpad} x ($s->{level} - 1));
       }
       $out .= ($name =~ /^\%/) ? ')' : '}';
@@ -633,6 +637,11 @@ sub Indent {
   }
 }
 
+sub Trailingcomma {
+  my($s, $v) = @_;
+  defined($v) ? (($s->{trailingcomma} = $v), return $s) : $s->{trailingcomma};
+}
+
 sub Pair {
     my($s, $v) = @_;
     defined($v) ? (($s->{pair} = $v), return $s) : $s->{pair};
@@ -1032,6 +1041,15 @@ consumes twice the number of lines).  Style 2 is the default.
 
 =item *
 
+$Data::Dumper::Trailingcomma  I<or>  I<$OBJ>->Trailingcomma(I<[NEWVAL]>)
+
+Controls whether a comma is added after the last element of an array or
+hash. Even when true, no comma is added between the last element of an array
+or hash and a closing bracket when they appear on the same line. The default
+is false.
+
+=item *
+
 $Data::Dumper::Purity  I<or>  I<$OBJ>->Purity(I<[NEWVAL]>)
 
 Controls the degree to which the output can be C<eval>ed to recreate the
@@ -1454,7 +1472,7 @@ modify it under the same terms as Perl itself.
 
 =head1 VERSION
 
-Version 2.158  (March 13 2015)
+Version 2.160  (January 12 2016)
 
 =head1 SEE ALSO
 
diff --git a/Master/tlpkg/tlperl/lib/Devel/PPPort.pm b/Master/tlpkg/tlperl/lib/Devel/PPPort.pm
index dc2e1fe97bd..47d69fd906d 100644
--- a/Master/tlpkg/tlperl/lib/Devel/PPPort.pm
+++ b/Master/tlpkg/tlperl/lib/Devel/PPPort.pm
@@ -1621,7 +1621,7 @@ package Devel::PPPort;
 use strict;
 use vars qw($VERSION $data);
 
-$VERSION = '3.31';
+$VERSION = '3.32';
 
 sub _init_data
 {
diff --git a/Master/tlpkg/tlperl/lib/Devel/Peek.pm b/Master/tlpkg/tlperl/lib/Devel/Peek.pm
index bbea3cd4be6..c0483ca1449 100644
--- a/Master/tlpkg/tlperl/lib/Devel/Peek.pm
+++ b/Master/tlpkg/tlperl/lib/Devel/Peek.pm
@@ -3,7 +3,7 @@
 
 package Devel::Peek;
 
-$VERSION = '1.22';
+$VERSION = '1.23';
 $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
@@ -115,6 +115,8 @@ counts on SVs.  This document will take a passive, and safe, approach
 to data debugging and for that it will describe only the C<Dump()>
 function.
 
+All output is to STDERR.
+
 The C<Dump()> function takes one or two arguments: something to dump, and
 an optional limit for recursion and array elements (default is 4).  The
 first argument is evaluted in rvalue scalar context, with exceptions for
diff --git a/Master/tlpkg/tlperl/lib/Digest.pm b/Master/tlpkg/tlperl/lib/Digest.pm
index c3355a8bd44..16dae9d16e5 100644
--- a/Master/tlpkg/tlperl/lib/Digest.pm
+++ b/Master/tlpkg/tlperl/lib/Digest.pm
@@ -3,7 +3,7 @@ package Digest;
 use strict;
 use vars qw($VERSION %MMAP $AUTOLOAD);
 
-$VERSION = "1.17";
+$VERSION = "1.17_01";
 
 %MMAP = (
   "SHA-1"      => [["Digest::SHA", 1], "Digest::SHA1", ["Digest::SHA2", 1]],
@@ -38,7 +38,11 @@ sub new
         unless (exists ${"$class\::"}{"VERSION"}) {
             my $pm_file = $class . ".pm";
             $pm_file =~ s{::}{/}g;
-            eval { require $pm_file };
+            eval {
+                local @INC = @INC;
+                pop @INC if $INC[-1] eq '.';
+                require $pm_file
+	    };
             if ($@) {
                 $err ||= $@;
                 next;
diff --git a/Master/tlpkg/tlperl/lib/Digest/SHA.pm b/Master/tlpkg/tlperl/lib/Digest/SHA.pm
index 3abca3d32c1..e696decea45 100644
--- a/Master/tlpkg/tlperl/lib/Digest/SHA.pm
+++ b/Master/tlpkg/tlperl/lib/Digest/SHA.pm
@@ -8,7 +8,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 use Fcntl;
 use integer;
 
-$VERSION = '5.95';
+$VERSION = '5.95_01';
 
 require Exporter;
 require DynaLoader;
diff --git a/Master/tlpkg/tlperl/lib/Dumpvalue.pm b/Master/tlpkg/tlperl/lib/Dumpvalue.pm
index ca40548ce56..eef9b27157b 100644
--- a/Master/tlpkg/tlperl/lib/Dumpvalue.pm
+++ b/Master/tlpkg/tlperl/lib/Dumpvalue.pm
@@ -1,9 +1,20 @@
 use 5.006_001;			# for (defined ref) and $#$v and our
 package Dumpvalue;
 use strict;
-our $VERSION = '1.17';
+our $VERSION = '1.18';
 our(%address, $stab, @stab, %stab, %subs);
 
+sub ASCII { return ord('A') == 65; }
+
+# This module will give incorrect results for some inputs on EBCDIC platforms
+# before v5.8
+*to_native = ($] lt "5.008")
+             ? sub { return shift }
+             : sub { return utf8::unicode_to_native(shift) };
+
+my $APC = chr to_native(0x9F);
+my $backslash_c_question = (ASCII) ? '\177' : $APC;
+
 # documentation nits, handle complex data structures better by chromatic
 # translate control chars to ^X - Randal Schwartz
 # Modifications to print types by Peter Gordon v1.0
@@ -78,7 +89,8 @@ sub unctrl {
   local($_) = @_;
 
   return \$_ if ref \$_ eq "GLOB";
-  s/([\001-\037\177])/'^'.pack('c',ord($1)^64)/eg;
+  s/([\000-\037])/'^' . chr(to_native(ord($1)^64))/eg;
+  s/ $backslash_c_question /^?/xg;
   $_;
 }
 
@@ -95,9 +107,8 @@ sub stringify {
       if $self->{bareStringify} and ref $_
 	and %overload:: and defined &{'overload::StrVal'};
   }
-
   if ($tick eq 'auto') {
-    if (/[\000-\011\013-\037\177]/) {
+    if (/[^[:^cntrl:]\n]/) {   # All ASCII controls but \n get '"'
       $tick = '"';
     } else {
       $tick = "'";
@@ -107,20 +118,33 @@ sub stringify {
     s/([\'\\])/\\$1/g;
   } elsif ($self->{unctrl} eq 'unctrl') {
     s/([\"\\])/\\$1/g ;
-    s/([\000-\037\177])/'^'.pack('c',ord($1)^64)/eg;
-    s/([\200-\377])/'\\0x'.sprintf('%2X',ord($1))/eg
+    $_ = &unctrl($_);
+    s/([[:^ascii:]])/'\\0x'.sprintf('%2X',ord($1))/eg
       if $self->{quoteHighBit};
   } elsif ($self->{unctrl} eq 'quote') {
     s/([\"\\\$\@])/\\$1/g if $tick eq '"';
-    s/\033/\\e/g;
-    s/([\000-\037\177])/'\\c'.chr(ord($1)^64)/eg;
+    s/\e/\\e/g;
+    s/([\000-\037$backslash_c_question])/'\\c'._escaped_ord($1)/eg;
   }
-  s/([\200-\377])/'\\'.sprintf('%3o',ord($1))/eg if $self->{quoteHighBit};
+  s/([[:^ascii:]])/'\\'.sprintf('%3o',ord($1))/eg if $self->{quoteHighBit};
   ($noticks || /^\d+(\.\d*)?\Z/)
     ? $_
       : $tick . $_ . $tick;
 }
 
+# Ensure a resulting \ is escaped to be \\
+sub _escaped_ord {
+    my $chr = shift;
+    if ($chr eq $backslash_c_question) {
+        $chr = '?';
+    }
+    else {
+        $chr = chr(to_native(ord($chr)^64));
+        $chr =~ s{\\}{\\\\}g;
+    }
+    return $chr;
+}
+
 sub DumpElem {
   my ($self, $v) = (shift, shift);
   my $short = $self->stringify($v, ref $v);
diff --git a/Master/tlpkg/tlperl/lib/DynaLoader.pm b/Master/tlpkg/tlperl/lib/DynaLoader.pm
index 92b42e9eac3..87df3b55f50 100644
--- a/Master/tlpkg/tlperl/lib/DynaLoader.pm
+++ b/Master/tlpkg/tlperl/lib/DynaLoader.pm
@@ -1,5 +1,5 @@
 
-# Generated from DynaLoader_pm.PL
+# Generated from DynaLoader_pm.PL, this file is unique for every OS
 
 package DynaLoader;
 
@@ -16,7 +16,7 @@ package DynaLoader;
 # Tim.Bunce@ig.co.uk, August 1994
 
 BEGIN {
-    $VERSION = '1.32';
+    $VERSION = '1.38';
 }
 
 use Config;
@@ -44,7 +44,6 @@ sub dl_load_flags { 0x00 }
 $do_expand = 0;
 
 @dl_require_symbols = ();       # names of symbols we need
-@dl_resolve_using   = ();       # names of files to link with
 @dl_library_path    = ();       # path to look for files
 
 #XSLoader.pm may have added elements before we were required
@@ -52,9 +51,6 @@ $do_expand = 0;
 #@dl_librefs         = ();       # things we have loaded
 #@dl_modules         = ();       # Modules we have loaded
 
-# This is a fix to support DLD's unfortunate desire to relink -lc
-@dl_resolve_using = dl_findfile('-lc') if $dlsrc eq "dl_dld.xs";
-
 # Initialise @dl_library_path with the 'standard' library path
 # for this platform as determined by Configure.
 
@@ -128,6 +124,7 @@ sub bootstrap {
     
     my @modparts = split(/::/,$module);
     my $modfname = $modparts[-1];
+    my $modfname_orig = $modfname; # For .bs file search
 
     # Some systems have restrictions on files names for DLL's etc.
     # mod2fname returns appropriate file base name (typically truncated)
@@ -142,9 +139,10 @@ sub bootstrap {
 		       "(auto/$modpname/$modfname.$dl_dlext)\n"
 	if $dl_debug;
 
+    my $dir;
     foreach (@INC) {
 	
-	    my $dir = "$_/auto/$modpname";
+	    $dir = "$_/auto/$modpname";
 	
 	next unless -d $dir; # skip over uninteresting directories
 	
@@ -169,7 +167,9 @@ sub bootstrap {
     # Execute optional '.bootstrap' perl script for this module.
     # The .bs file can be used to configure @dl_resolve_using etc to
     # match the needs of the individual module on this architecture.
-    my $bs = $file;
+    # N.B. The .bs file does not following the naming convention used
+    # by mod2fname.
+    my $bs = "$dir/$modfname_orig";
     $bs =~ s/(\.\w+)?(;\d*)?$/\.bs/; # look for .bs 'beside' the library
     if (-s $bs) { # only read file if it's not empty
         print STDERR "BS: $bs ($^O, $dlsrc)\n" if $dl_debug;
@@ -195,12 +195,6 @@ sub bootstrap {
 
     push(@dl_librefs,$libref);  # record loaded object
 
-    my @unresolved = dl_undef_symbols();
-    if (@unresolved) {
-	require Carp;
-	Carp::carp("Undefined symbols present after loading $file: @unresolved\n");
-    }
-
     $boot_symbol_ref = dl_find_symbol($libref, $bootname) or
          croak("Can't find '$bootname' symbol in $file\n");
 
@@ -217,7 +211,6 @@ sub bootstrap {
 }
 
 sub dl_findfile {
-    # Read ext/DynaLoader/DynaLoader.doc for detailed information.
     # This function does not automatically consider the architecture
     # or the perl library auto directories.
     my (@args) = @_;
@@ -262,7 +255,6 @@ sub dl_findfile {
             push(@names,"$_.$dl_so")     unless m/\.$dl_so$/o;
 	    
             push(@names,"lib$_.$dl_so")  unless m:/:;
-            push(@names,"$_.a")          if !m/\.a$/ and $dlsrc eq "dl_dld.xs";
             push(@names, $_);
         }
 	my $dirsep = '/';
@@ -320,7 +312,7 @@ sub dl_find_symbol_anywhere
     my $sym = shift;
     my $libref;
     foreach $libref (@dl_librefs) {
-	my $symref = dl_find_symbol($libref,$sym);
+	my $symref = dl_find_symbol($libref,$sym,1);
 	return $symref if $symref;
     }
     return undef;
@@ -676,7 +668,7 @@ Syntax:
 
 Create a new Perl external subroutine named $perl_name using $symref as
 a pointer to the function which implements the routine.  This is simply
-a direct call to newXSUB().  Returns a reference to the installed
+a direct call to newXS()/newXS_flags().  Returns a reference to the installed
 function.
 
 The $filename parameter is used by Perl to identify the source file for
diff --git a/Master/tlpkg/tlperl/lib/Encode.pm b/Master/tlpkg/tlperl/lib/Encode.pm
index 3bb10970de6..dce6c5415e9 100644
--- a/Master/tlpkg/tlperl/lib/Encode.pm
+++ b/Master/tlpkg/tlperl/lib/Encode.pm
@@ -1,10 +1,10 @@
 #
-# $Id: Encode.pm,v 2.72 2015/03/14 02:43:24 dankogai Exp $
+# $Id: Encode.pm,v 2.80 2016/01/25 14:54:01 dankogai Exp $
 #
 package Encode;
 use strict;
 use warnings;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.72 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d_01", q$Revision: 2.80 $ =~ /(\d+)/g;
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 use XSLoader ();
 XSLoader::load( __PACKAGE__, $VERSION );
@@ -56,6 +56,8 @@ require Encode::Config;
 eval {
     local $SIG{__DIE__};
     local $SIG{__WARN__};
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     require Encode::ConfigLocal;
 };
 
@@ -311,7 +313,11 @@ sub predefine_encodings {
         $Encode::Encoding{Unicode} =
           bless { Name => "Internal" } => "Encode::Internal";
     }
-
+    {
+        # https://rt.cpan.org/Public/Bug/Display.html?id=103253
+        package Encode::XS;
+        push @Encode::XS::ISA, 'Encode::Encoding';
+    }
     {
 
         # was in Encode::utf8
diff --git a/Master/tlpkg/tlperl/lib/Encode/Alias.pm b/Master/tlpkg/tlperl/lib/Encode/Alias.pm
index c0945be7c8f..04ad4967c98 100644
--- a/Master/tlpkg/tlperl/lib/Encode/Alias.pm
+++ b/Master/tlpkg/tlperl/lib/Encode/Alias.pm
@@ -2,7 +2,7 @@ package Encode::Alias;
 use strict;
 use warnings;
 no warnings 'redefine';
-our $VERSION = do { my @r = ( q$Revision: 2.19 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.20 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 
 use Exporter 'import';
@@ -139,7 +139,7 @@ sub init_aliases {
     define_alias( qr/^UCS-?2-?LE$/i => '"UCS-2LE"' );
     define_alias(
         qr/^UCS-?2-?(BE)?$/i    => '"UCS-2BE"',
-        qr/^UCS-?4-?(BE|LE)?$/i => 'uc("UTF-32$1")',
+        qr/^UCS-?4-?(BE|LE|)?$/i => 'uc("UTF-32$1")',
         qr/^iso-10646-1$/i      => '"UCS-2BE"'
     );
     define_alias(
diff --git a/Master/tlpkg/tlperl/lib/Encode/MIME/Header.pm b/Master/tlpkg/tlperl/lib/Encode/MIME/Header.pm
index b970b62577d..ba6adba4758 100644
--- a/Master/tlpkg/tlperl/lib/Encode/MIME/Header.pm
+++ b/Master/tlpkg/tlperl/lib/Encode/MIME/Header.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 
-our $VERSION = do { my @r = ( q$Revision: 2.16 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.19 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 use Encode qw(find_encoding encode_utf8 decode_utf8);
 use MIME::Base64;
 use Carp;
@@ -39,15 +39,14 @@ sub perlio_ok   { 0 }
 sub decode($$;$) {
     use utf8;
     my ( $obj, $str, $chk ) = @_;
-
     # zap spaces between encoded words
     $str =~ s/\?=\s+=\?/\?==\?/gos;
-
+    
     # multi-line header to single line
     $str =~ s/(?:\r\n|[\r\n])[ \t]//gos;
 
     1 while ( $str =~
-        s/(=\?[-0-9A-Za-z_]+\?[Qq]\?)(.*?)\?=\1(.*?\?=)/$1$2$3/ )
+              s/(=\?[-0-9A-Za-z_]+\?[Qq]\?)([^?]*?)\?=\1([^?]*?\?=)/$1$2$3/ )
       ;    # Concat consecutive QP encoded mime headers
            # Fixes breaking inside multi-byte characters
 
@@ -108,20 +107,20 @@ my $re_encoded_word = qr{
 
 my $re_especials = qr{$re_encoded_word|$especials}xo;
 
+# cf:
+#    https://rt.cpan.org/Ticket/Display.html?id=88717
+#    https://www.ietf.org/rfc/rfc0822.txt
+my $re_linear_white_space = qr{(?:[ \t]|\r\n?)};
+
 sub encode($$;$) {
     my ( $obj, $str, $chk ) = @_;
     my @line = ();
     for my $line ( split /\r\n|[\r\n]/o, $str ) {
         my ( @word, @subline );
-        for my $word ( split /($re_especials)/o, $line ) {
-            if (   $word =~ /[^\x00-\x7f]/o
-                or $word =~ /^$re_encoded_word$/o )
-            {
-                push @word, $obj->_encode($word);
-            }
-            else {
-                push @word, $word;
-            }
+        if ($line =~ /\A([\w\-]+:\s+)(.*)\z/o) {
+            push @word, $1, $obj->_encode($2); # "X-Header-Name: ..."
+        } else {
+            push @word, $obj->_encode($line);  # anything else
         }
         my $subline = '';
         for my $word (@word) {
@@ -136,7 +135,7 @@ sub encode($$;$) {
             $subline .= $word;
         }
         length($subline) and push @subline, $subline;
-        push @line, join( "\n " => @subline );
+        push @line, join( "\n " => grep !/^$/, @subline );
     }
     $_[1] = '' if $chk;
     return (substr($str, 0, 0) . join( "\n", @line ));
diff --git a/Master/tlpkg/tlperl/lib/Encode/Supported.pod b/Master/tlpkg/tlperl/lib/Encode/Supported.pod
index 8efa4ff6f89..c731509a816 100644
--- a/Master/tlpkg/tlperl/lib/Encode/Supported.pod
+++ b/Master/tlpkg/tlperl/lib/Encode/Supported.pod
@@ -603,7 +603,7 @@ you're doing and unless you really benefit from using C<UTF-16>.
   ISO-IR-165    [RFC1345]
   VISCII
   GB 12345
-  GB 18030 (**)  (see links bellow)
+  GB 18030 (**)  (see links below)
   EUC-TW   (**)
 
 are totally valid encodings but not registered at IANA.
diff --git a/Master/tlpkg/tlperl/lib/Encode/Unicode.pm b/Master/tlpkg/tlperl/lib/Encode/Unicode.pm
index 6b35cb7566a..7dec3e38159 100644
--- a/Master/tlpkg/tlperl/lib/Encode/Unicode.pm
+++ b/Master/tlpkg/tlperl/lib/Encode/Unicode.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 
-our $VERSION = do { my @r = ( q$Revision: 2.9 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.15 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 use XSLoader;
 XSLoader::load( __PACKAGE__, $VERSION );
@@ -176,7 +176,15 @@ simply treated as a normal character (ZERO WIDTH NO-BREAK SPACE).
 
 When BE or LE is omitted during decode(), it checks if BOM is at the
 beginning of the string; if one is found, the endianness is set to
-what the BOM says.  If no BOM is found, the routine dies.
+what the BOM says.  
+
+=item *
+
+Default Byte Order
+
+When no BOM is found, Encode 2.76 and blow croaked.  Since Encode
+2.77, it falls back to BE accordingly to RFC2781 and the Unicode
+Standard version 8.0
 
 =item *
 
diff --git a/Master/tlpkg/tlperl/lib/English.pm b/Master/tlpkg/tlperl/lib/English.pm
index efd61ff89f0..e40cc124a13 100644
--- a/Master/tlpkg/tlperl/lib/English.pm
+++ b/Master/tlpkg/tlperl/lib/English.pm
@@ -1,6 +1,6 @@
 package English;
 
-our $VERSION = '1.09';
+our $VERSION = '1.10';
 
 require Exporter;
 @ISA = qw(Exporter);
@@ -182,7 +182,7 @@ sub import {
 
 	*FORMAT_PAGE_NUMBER			= *%	;
 	*FORMAT_LINES_PER_PAGE			= *=	;
-	*FORMAT_LINES_LEFT			= *-	;
+	*FORMAT_LINES_LEFT			= *-{SCALAR}	;
 	*FORMAT_NAME				= *~	;
 	*FORMAT_TOP_NAME			= *^	;
 	*FORMAT_LINE_BREAK_CHARACTERS		= *:	;
diff --git a/Master/tlpkg/tlperl/lib/Errno.pm b/Master/tlpkg/tlperl/lib/Errno.pm
index 7868f89f560..bd5fb6d0f72 100644
--- a/Master/tlpkg/tlperl/lib/Errno.pm
+++ b/Master/tlpkg/tlperl/lib/Errno.pm
@@ -5,14 +5,14 @@
 
 package Errno;
 require Exporter;
-use Config;
 use strict;
 
+use Config;
 "$Config{'archname'}-$Config{'osvers'}" eq
 "MSWin32-x86-multi-thread-6.1" or
 	die "Errno architecture (MSWin32-x86-multi-thread-6.1) does not match executable architecture ($Config{'archname'}-$Config{'osvers'})";
 
-our $VERSION = "1.23";
+our $VERSION = "1.25";
 $VERSION = eval $VERSION;
 our @ISA = 'Exporter';
 
@@ -450,6 +450,7 @@ BEGIN {
 	EALREADY => 103,
 	EMR_GLSBOUNDEDRECORD => 103,
 	ERROR_TOO_MANY_SEM_REQUESTS => 103,
+	EBADMSG => 104,
 	EMR_PIXELFORMAT => 104,
 	ERROR_INVALID_AT_INTERRUPT_TIME => 104,
 	ECANCELED => 105,
@@ -470,6 +471,7 @@ BEGIN {
 	EHOSTUNREACH => 110,
 	EMR_RESERVED_110 => 110,
 	ERROR_OPEN_FAILED => 110,
+	EIDRM => 111,
 	EMR_COLORCORRECTPALETTE => 111,
 	ERROR_BUFFER_OVERFLOW => 111,
 	EINPROGRESS => 112,
@@ -495,18 +497,24 @@ BEGIN {
 	ENOBUFS => 119,
 	ERROR_BAD_DRIVER_LEVEL => 119,
 	EMR_RESERVED_120 => 120,
+	ENODATA => 120,
 	ERROR_CALL_NOT_IMPLEMENTED => 120,
 	EMR_COLORMATCHTOTARGETW => 121,
+	ENOLINK => 121,
 	ERROR_SEM_TIMEOUT => 121,
 	EMR_CREATECOLORSPACEW => 122,
 	EMR_MAX => 122,
+	ENOMSG => 122,
 	ERROR_INSUFFICIENT_BUFFER => 122,
 	ENOPROTOOPT => 123,
 	ERROR_INVALID_NAME => 123,
+	ENOSR => 124,
 	ERROR_INVALID_LEVEL => 124,
+	ENOSTR => 125,
 	ERROR_NO_VOLUME_LABEL => 125,
 	ENOTCONN => 126,
 	ERROR_MOD_NOT_FOUND => 126,
+	ENOTRECOVERABLE => 127,
 	ERROR_PROC_NOT_FOUND => 127,
 	EC_ENABLEONE => 128,
 	ENABLE_EXTENDED_FLAGS => 128,
@@ -531,9 +539,11 @@ BEGIN {
 	EPROTOTYPE => 136,
 	ERROR_NOT_JOINED => 136,
 	ERROR_NOT_SUBSTED => 137,
+	ETIME => 137,
 	ERROR_JOIN_TO_JOIN => 138,
 	ETIMEDOUT => 138,
 	ERROR_SUBST_TO_SUBST => 139,
+	ETXTBSY => 139,
 	ERROR_JOIN_TO_SUBST => 140,
 	EWOULDBLOCK => 140,
 	ERROR_SUBST_TO_JOIN => 141,
@@ -1850,15 +1860,65 @@ BEGIN {
 	ERROR_DS_DISALLOWED_IN_SYSTEM_CONTAINER => 8615,
 	ERROR_DS_LDAP_SEND_QUEUE_FULL => 8616,
 	ERROR_DS_DRA_OUT_SCHEDULE_WINDOW => 8617,
+	WSAEINTR => 10004,
+	WSAEBADF => 10009,
+	WSAEACCES => 10013,
+	WSAEFAULT => 10014,
+	WSAEINVAL => 10022,
+	WSAEMFILE => 10024,
+	WSAEWOULDBLOCK => 10035,
+	WSAEINPROGRESS => 10036,
+	WSAEALREADY => 10037,
+	WSAENOTSOCK => 10038,
+	WSAEDESTADDRREQ => 10039,
+	WSAEMSGSIZE => 10040,
+	WSAEPROTOTYPE => 10041,
+	WSAENOPROTOOPT => 10042,
+	WSAEPROTONOSUPPORT => 10043,
 	ESOCKTNOSUPPORT => 10044,
+	WSAESOCKTNOSUPPORT => 10044,
+	WSAEOPNOTSUPP => 10045,
 	EPFNOSUPPORT => 10046,
+	WSAEPFNOSUPPORT => 10046,
+	WSAEAFNOSUPPORT => 10047,
+	WSAEADDRINUSE => 10048,
+	WSAEADDRNOTAVAIL => 10049,
+	WSAENETDOWN => 10050,
+	WSAENETUNREACH => 10051,
+	WSAENETRESET => 10052,
+	WSAECONNABORTED => 10053,
+	WSAECONNRESET => 10054,
+	WSAENOBUFS => 10055,
+	WSAEISCONN => 10056,
+	WSAENOTCONN => 10057,
 	ESHUTDOWN => 10058,
+	WSAESHUTDOWN => 10058,
 	ETOOMANYREFS => 10059,
+	WSAETOOMANYREFS => 10059,
+	WSAETIMEDOUT => 10060,
+	WSAECONNREFUSED => 10061,
+	WSAELOOP => 10062,
+	WSAENAMETOOLONG => 10063,
+	WSAEHOSTDOWN => 10064,
+	WSAEHOSTUNREACH => 10065,
+	WSAENOTEMPTY => 10066,
 	EPROCLIM => 10067,
+	WSAEPROCLIM => 10067,
 	EUSERS => 10068,
+	WSAEUSERS => 10068,
 	EDQUOT => 10069,
+	WSAEDQUOT => 10069,
 	ESTALE => 10070,
+	WSAESTALE => 10070,
 	EREMOTE => 10071,
+	WSAEREMOTE => 10071,
+	WSAEDISCON => 10101,
+	WSAENOMORE => 10102,
+	WSAECANCELLED => 10103,
+	WSAEINVALIDPROCTABLE => 10104,
+	WSAEINVALIDPROVIDER => 10105,
+	WSAEPROVIDERFAILEDINIT => 10106,
+	WSAEREFUSED => 10112,
 	ERROR_BIDI_ERROR_BASE => 13000,
 	ERROR_IPSEC_QM_POLICY_EXISTS => 13000,
 	ERROR_BIDI_STATUS_WARNING => 13001,
@@ -2451,8 +2511,21 @@ our %EXPORT_TAGS = (
 	ENOTDIR ENOTEMPTY ENOTSOCK ENOTTY ENXIO EOPNOTSUPP EPERM EPFNOSUPPORT
 	EPIPE EPROCLIM EPROTONOSUPPORT EPROTOTYPE ERANGE EREMOTE EROFS
 	ESHUTDOWN ESOCKTNOSUPPORT ESPIPE ESRCH ESTALE ETIMEDOUT ETOOMANYREFS
-	EUSERS EWOULDBLOCK EXDEV
-    )]
+	ETXTBSY EUSERS EWOULDBLOCK EXDEV
+    )],
+    WINSOCK => [qw(
+	WSAEAFNOSUPPORT WSAEPFNOSUPPORT WSAEPROCLIM WSAEINPROGRESS
+	WSAENAMETOOLONG WSAENETDOWN WSAETIMEDOUT WSAESHUTDOWN
+	WSAEINVALIDPROVIDER WSAENETRESET WSAETOOMANYREFS WSAEINVAL
+	WSAEADDRNOTAVAIL WSAEREMOTE WSAENOMORE WSAENETUNREACH WSAEWOULDBLOCK
+	WSAEUSERS WSAECONNREFUSED WSAENOBUFS WSAEBADF WSAEHOSTUNREACH
+	WSAEMSGSIZE WSAEPROVIDERFAILEDINIT WSAEINTR WSAEPROTONOSUPPORT
+	WSAENOTCONN WSAEFAULT WSAEINVALIDPROCTABLE WSAECONNRESET WSAESTALE
+	WSAEOPNOTSUPP WSAEADDRINUSE WSAENOPROTOOPT WSAELOOP WSAEDESTADDRREQ
+	WSAEDQUOT WSAENOTSOCK WSAESOCKTNOSUPPORT WSAEALREADY WSAEPROTOTYPE
+	WSAECANCELLED WSAECONNABORTED WSAEREFUSED WSAEISCONN WSAEDISCON
+	WSAEHOSTDOWN WSAENOTEMPTY WSAEACCES WSAEMFILE
+    )],
 );
 
 sub TIEHASH { bless \%err }
@@ -2500,9 +2573,13 @@ Errno - System errno constants
 =head1 DESCRIPTION
 
 C<Errno> defines and conditionally exports all the error constants
-defined in your system C<errno.h> include file. It has a single export
+defined in your system F<errno.h> include file. It has a single export
 tag, C<:POSIX>, which will export all POSIX defined error numbers.
 
+On Windows, C<Errno> also defines and conditionally exports all the
+Winsock error constants defined in your system F<WinError.h> include
+file. These are included in a second export tag, C<:WINSOCK>.
+
 C<Errno> also makes C<%!> magic such that each element of C<%!> has a
 non-zero value only if C<$!> is set to that value. For example:
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder.pm
index 17a49633984..6ce0c687943 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder.pm
@@ -1,10 +1,12 @@
 package ExtUtils::CBuilder;
-$ExtUtils::CBuilder::VERSION = '0.280221';
+$ExtUtils::CBuilder::VERSION = '0.280225';
 use File::Spec ();
 use File::Path ();
 use File::Basename ();
 use Perl::OSType qw/os_type/;
 
+use warnings;
+use strict;
 use vars qw(@ISA);
 
 # We only use this once - don't waste a symbol table entry on it.
@@ -18,17 +20,18 @@ my $load = sub {
 
 {
   my @package = split /::/, __PACKAGE__;
-  
+
   my $ostype = os_type();
 
   if (grep {-e File::Spec->catfile($_, @package, 'Platform', $^O) . '.pm'} @INC) {
-    $load->(__PACKAGE__ . "::Platform::$^O");
-    
-  } elsif ( $ostype && grep {-e File::Spec->catfile($_, @package, 'Platform', $ostype) . '.pm'} @INC) {
-    $load->(__PACKAGE__ . "::Platform::$ostype");
-    
+      $load->(__PACKAGE__ . "::Platform::$^O");
+
+  } elsif ( $ostype &&
+            grep {-e File::Spec->catfile($_, @package, 'Platform', $ostype) . '.pm'} @INC) {
+      $load->(__PACKAGE__ . "::Platform::$ostype");
+
   } else {
-    $load->(__PACKAGE__ . "::Base");
+      $load->(__PACKAGE__ . "::Base");
   }
 }
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Base.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Base.pm
index 7df61e4c54b..60b2f432dfb 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Base.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Base.pm
@@ -1,6 +1,7 @@
 package ExtUtils::CBuilder::Base;
-$ExtUtils::CBuilder::Base::VERSION = '0.280221';
+$ExtUtils::CBuilder::Base::VERSION = '0.280225';
 use strict;
+use warnings;
 use File::Spec;
 use File::Basename;
 use Cwd ();
@@ -128,20 +129,20 @@ sub arg_exec_file {
 
 sub arg_defines {
   my ($self, %args) = @_;
-  return map "-D$_=$args{$_}", keys %args;
+  return map "-D$_=$args{$_}", sort keys %args;
 }
 
 sub compile {
   my ($self, %args) = @_;
   die "Missing 'source' argument to compile()" unless defined $args{source};
-  
+
   my $cf = $self->{config}; # For convenience
-  
+
   my $object_file = $args{object_file}
     ? $args{object_file}
     : $self->object_file($args{source});
 
-  my $include_dirs_ref = 
+  my $include_dirs_ref =
     (exists($args{include_dirs}) && ref($args{include_dirs}) ne "ARRAY")
       ? [ $args{include_dirs} ]
       : $args{include_dirs};
@@ -149,9 +150,9 @@ sub compile {
     @{ $include_dirs_ref || [] },
     $self->perl_inc(),
   );
-  
+
   my @defines = $self->arg_defines( %{$args{defines} || {}} );
-  
+
   my @extra_compiler_flags =
     $self->split_like_shell($args{extra_compiler_flags});
   my @cccdlflags = $self->split_like_shell($cf->{cccdlflags});
@@ -168,7 +169,7 @@ sub compile {
     $self->arg_object_file($object_file),
   );
   my @cc = $self->split_like_shell($args{'C++'} ? $cf->{cxx} : $cf->{cc});
-  
+
   $self->do_system(@cc, @flags, $args{source})
     or die "error building $object_file from '$args{source}'";
 
@@ -222,7 +223,7 @@ sub lib_file {
   my ($self, $dl_file, %args) = @_;
   $dl_file =~ s/\.[^.]+$//;
   $dl_file =~ tr/"//d;
-  
+
   if (defined $args{module_name} and length $args{module_name}) {
     # Need to create with the same name as DynaLoader will load with.
     require DynaLoader;
@@ -232,7 +233,7 @@ sub lib_file {
       $dl_file = File::Spec->catpath($dev, $lib_dir, $lib);
     }
   }
-  
+
   $dl_file .= ".$self->{config}{dlext}";
 
   return $dl_file;
@@ -266,7 +267,7 @@ sub prelink {
 sub _prepare_mksymlists_args {
   my $args = shift;
   ($args->{dl_file} = $args->{dl_name}) =~ s/.*::// unless $args->{dl_file};
-  
+
   my %mksymlists_args = (
     DL_VARS  => $args->{dl_vars}      || [],
     DL_FUNCS => $args->{dl_funcs}     || {},
@@ -294,16 +295,16 @@ sub _do_link {
   my ($self, $type, %args) = @_;
 
   my $cf = $self->{config}; # For convenience
-  
+
   my $objects = delete $args{objects};
   $objects = [$objects] unless ref $objects;
   my $out = $args{$type} || $self->$type($objects->[0], %args);
-  
+
   my @temp_files;
   @temp_files =
     $self->prelink(%args, dl_name => $args{module_name})
       if $args{lddl} && $self->need_prelink;
-  
+
   my @linker_flags = (
     $self->split_like_shell($args{extra_linker_flags}),
     $self->extra_link_args_after_prelink(
@@ -316,10 +317,10 @@ sub _do_link {
     : $self->arg_exec_file($out);
   my @shrp = $self->split_like_shell($cf->{shrpenv});
   my @ld = $self->split_like_shell($cf->{ld});
-  
+
   $self->do_system(@shrp, @ld, @output, @$objects, @linker_flags)
     or die "error building $out from @$objects";
-  
+
   return wantarray ? ($out, @temp_files) : $out;
 }
 
@@ -332,17 +333,17 @@ sub do_system {
 
 sub split_like_shell {
   my ($self, $string) = @_;
-  
+
   return () unless defined($string);
   return @$string if UNIVERSAL::isa($string, 'ARRAY');
   $string =~ s/^\s+|\s+$//g;
   return () unless length($string);
-  
+
   # Text::ParseWords replaces all 'escaped' characters with themselves, which completely
   # breaks paths under windows. As such, we forcibly replace backwards slashes with forward
   # slashes on windows.
   $string =~ s@\\@/@g if $^O eq 'MSWin32';
-  
+
   return Text::ParseWords::shellwords($string);
 }
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Unix.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Unix.pm
index a05ae4bca6f..399e254aa0c 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Unix.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Unix.pm
@@ -1,5 +1,6 @@
 package ExtUtils::CBuilder::Platform::Unix;
-$ExtUtils::CBuilder::Platform::Unix::VERSION = '0.280221';
+$ExtUtils::CBuilder::Platform::Unix::VERSION = '0.280225';
+use warnings;
 use strict;
 use ExtUtils::CBuilder::Base;
 
@@ -20,19 +21,19 @@ sub link_executable {
 sub link {
   my $self = shift;
   my $cf = $self->{config};
-  
+
   # Some platforms (notably Mac OS X 10.3, but some others too) expect
   # the syntax "FOO=BAR /bin/command arg arg" to work in %Config
   # (notably $Config{ld}).  It usually works in system(SCALAR), but we
   # use system(LIST). We fix it up here with 'env'.
-  
+
   local $cf->{ld} = $cf->{ld};
   if (ref $cf->{ld}) {
     unshift @{$cf->{ld}}, 'env' if $cf->{ld}[0] =~ /^\s*\w+=/;
   } else {
     $cf->{ld} =~ s/^(\s*\w+=)/env $1/;
   }
-  
+
   return $self->SUPER::link(@_);
 }
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/VMS.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/VMS.pm
index 6285e33692d..e9d9f6fc2fd 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/VMS.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/VMS.pm
@@ -1,5 +1,6 @@
 package ExtUtils::CBuilder::Platform::VMS;
-$ExtUtils::CBuilder::Platform::VMS::VERSION = '0.280221';
+$ExtUtils::CBuilder::Platform::VMS::VERSION = '0.280225';
+use warnings;
 use strict;
 use ExtUtils::CBuilder::Base;
 
@@ -27,11 +28,11 @@ sub arg_defines {
 
   return '' unless keys(%args) || @config_defines;
 
-  return ('/define=(' 
-          . join(',', 
+  return ('/define=('
+          . join(',',
 		 @config_defines,
-                 map "\"$_" . ( length($args{$_}) ? "=$args{$_}" : '') . "\"", 
-                     keys %args) 
+                 map "\"$_" . ( length($args{$_}) ? "=$args{$_}" : '') . "\"",
+                     sort keys %args)
           . ')');
 }
 
@@ -50,7 +51,7 @@ sub arg_include_dirs {
 # We override the compile method because we consume the includes and defines
 # parts of ccflags in the process of compiling but don't save those parts
 # anywhere, so $self->{config}{ccflags} needs to be reset for each compile
-# operation.  
+# operation.
 
 sub compile {
   my ($self, %args) = @_;
@@ -63,10 +64,10 @@ sub compile {
 
 sub _do_link {
   my ($self, $type, %args) = @_;
-  
+
   my $objects = delete $args{objects};
   $objects = [$objects] unless ref $objects;
-  
+
   if ($args{lddl}) {
 
     # prelink will call Mksymlists, which creates the extension-specific
@@ -77,7 +78,7 @@ sub _do_link {
     # We now add the rest of what we need to the linker options file.  We
     # should replicate the functionality of C<ExtUtils::MM_VMS::dlsyms>,
     # but there is as yet no infrastructure for handling object libraries,
-    # so for now we depend on object files being listed individually on the 
+    # so for now we depend on object files being listed individually on the
     # command line, which should work for simple cases.  We do bring in our
     # own version of C<ExtUtils::Liblist::Kid::ext> so that any additional
     # libraries (including PERLSHR) can be added to the options file.
@@ -85,7 +86,7 @@ sub _do_link {
     my @optlibs = $self->_liblist_ext( $args{'libs'} );
 
     my $optfile = 'sys$disk:[]' . $temp_files[0];
-    open my $opt_fh, '>>', $optfile 
+    open my $opt_fh, '>>', $optfile
         or die "_do_link: Unable to open $optfile: $!";
     for my $lib (@optlibs) {print $opt_fh "$lib\n" if length $lib }
     close $opt_fh;
@@ -136,7 +137,7 @@ sub _liblist_ext {
   # which a system-wide logical may point.
   if ($self->perl_src) {
     my($lib,$locspec,$type);
-    foreach $lib (@crtls) { 
+    foreach $lib (@crtls) {
       if (($locspec,$type) = $lib =~ m{^([\w\$-]+)(/\w+)?} and $locspec =~ /perl/i) {
         if    (lc $type eq '/share')   { $locspec .= $self->{'config'}{'exe_ext'}; }
         elsif (lc $type eq '/library') { $locspec .= $self->{'config'}{'lib_ext'}; }
@@ -188,8 +189,8 @@ sub _liblist_ext {
       next;
     }
     warn "Resolving directory $dir\n" if $verbose;
-    if (!File::Spec->file_name_is_absolute($dir)) { 
-        $dir = catdir($cwd,$dir); 
+    if (!File::Spec->file_name_is_absolute($dir)) {
+        $dir = catdir($cwd,$dir);
     }
   }
   @dirs = grep { length($_) } @dirs;
@@ -243,14 +244,14 @@ sub _liblist_ext {
           $type = 'SHR';
           $name = $fullname unless $fullname =~ /exe;?\d*$/i;
         }
-        elsif (not length($ctype) and  # If we've got a lib already, 
+        elsif (not length($ctype) and  # If we've got a lib already,
                                        # don't bother
                ( -f ($fullname = VMS::Filespec::rmsexpand($name,$lib_ext)) or
                  -f ($fullname = VMS::Filespec::rmsexpand($name,'.olb'))))  {
           $type = 'OLB';
           $name = $fullname unless $fullname =~ /olb;?\d*$/i;
         }
-        elsif (not length($ctype) and  # If we've got a lib already, 
+        elsif (not length($ctype) and  # If we've got a lib already,
                                        # don't bother
                ( -f ($fullname = VMS::Filespec::rmsexpand($name,$obj_ext)) or
                  -f ($fullname = VMS::Filespec::rmsexpand($name,'.obj'))))  {
@@ -264,9 +265,9 @@ sub _liblist_ext {
           last if $ctype eq 'SHR';
         }
       }
-      if ($ctype) { 
+      if ($ctype) {
         push @{$found{$ctype}}, $cand;
-        warn "\tFound as $cand (really $fullname), type $ctype\n" 
+        warn "\tFound as $cand (really $fullname), type $ctype\n"
           if $verbose > 1;
 	push @flibs, $name unless $libs_seen{$fullname}++;
         next LIB;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows.pm
index 472c8012da3..80b8f29cd2d 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows.pm
@@ -1,5 +1,5 @@
 package ExtUtils::CBuilder::Platform::Windows;
-$ExtUtils::CBuilder::Platform::Windows::VERSION = '0.280221';
+$ExtUtils::CBuilder::Platform::Windows::VERSION = '0.280225';
 use strict;
 use warnings;
 
@@ -57,7 +57,7 @@ sub split_like_shell {
   # array) to the target program and make the program parse it itself,
   # we don't actually need to do any processing here.
   (my $self, local $_) = @_;
-  
+
   return @$_ if defined() && UNIVERSAL::isa($_, 'ARRAY');
   return unless defined() && length();
   return ($_);
@@ -76,7 +76,7 @@ sub do_system {
 sub arg_defines {
   my ($self, %args) = @_;
   s/"/\\"/g foreach values %args;
-  return map qq{"-D$_=$args{$_}"}, keys %args;
+  return map qq{"-D$_=$args{$_}"}, sort keys %args;
 }
 
 sub compile {
@@ -85,7 +85,7 @@ sub compile {
 
   die "Missing 'source' argument to compile()" unless defined $args{source};
 
-  $args{include_dirs} = [ $args{include_dirs} ] 
+  $args{include_dirs} = [ $args{include_dirs} ]
     if exists($args{include_dirs}) && ref($args{include_dirs}) ne "ARRAY";
 
   my ($basename, $srcdir) =
@@ -151,7 +151,7 @@ sub link {
   # if running in perl source tree, look for libs there, not installed
   my $lddlflags = $cf->{lddlflags};
   my $perl_src = $self->perl_src();
-  $lddlflags =~ s/\Q$cf->{archlibexp}\E[\\\/]CORE/$perl_src/ if $perl_src;
+  $lddlflags =~ s/\Q$cf->{archlibexp}\E[\\\/]CORE/$perl_src\/lib\/CORE/ if $perl_src;
 
   my %spec = (
     srcdir        => $to,
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm
index cbba074146a..513c4acaeea 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/BCC.pm
@@ -1,5 +1,8 @@
 package ExtUtils::CBuilder::Platform::Windows::BCC;
-$ExtUtils::CBuilder::Platform::Windows::BCC::VERSION = '0.280220';
+$ExtUtils::CBuilder::Platform::Windows::BCC::VERSION = '0.280225';
+use strict;
+use warnings;
+
 sub format_compiler_cmd {
   my ($self, %spec) = @_;
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm
index eb37a0e1711..19851df352e 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/GCC.pm
@@ -1,5 +1,8 @@
 package ExtUtils::CBuilder::Platform::Windows::GCC;
-$ExtUtils::CBuilder::Platform::Windows::GCC::VERSION = '0.280220';
+$ExtUtils::CBuilder::Platform::Windows::GCC::VERSION = '0.280225';
+use warnings;
+use strict;
+
 sub format_compiler_cmd {
   my ($self, %spec) = @_;
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm
index 8457485e22f..c8d675f4978 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/Windows/MSVC.pm
@@ -1,5 +1,8 @@
 package ExtUtils::CBuilder::Platform::Windows::MSVC;
-$ExtUtils::CBuilder::Platform::Windows::MSVC::VERSION = '0.280220';
+$ExtUtils::CBuilder::Platform::Windows::MSVC::VERSION = '0.280225';
+use warnings;
+use strict;
+
 sub arg_exec_file {
   my ($self, $file) = @_;
   return "/OUT:$file";
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/aix.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/aix.pm
index c40dfaa5f46..488d3e68bc9 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/aix.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/aix.pm
@@ -1,5 +1,6 @@
 package ExtUtils::CBuilder::Platform::aix;
-$ExtUtils::CBuilder::Platform::aix::VERSION = '0.280221';
+$ExtUtils::CBuilder::Platform::aix::VERSION = '0.280225';
+use warnings;
 use strict;
 use ExtUtils::CBuilder::Platform::Unix;
 use File::Spec;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/android.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/android.pm
index 8ceb1454d6d..b9e6af3129c 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/android.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/android.pm
@@ -1,5 +1,6 @@
 package ExtUtils::CBuilder::Platform::android;
-$ExtUtils::CBuilder::Platform::android::VERSION = '0.280221';
+$ExtUtils::CBuilder::Platform::android::VERSION = '0.280225';
+use warnings;
 use strict;
 use File::Spec;
 use ExtUtils::CBuilder::Platform::Unix;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/cygwin.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/cygwin.pm
index 9f1e7fea397..339840f8c19 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/cygwin.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/cygwin.pm
@@ -1,5 +1,6 @@
 package ExtUtils::CBuilder::Platform::cygwin;
-$ExtUtils::CBuilder::Platform::cygwin::VERSION = '0.280221';
+$ExtUtils::CBuilder::Platform::cygwin::VERSION = '0.280225';
+use warnings;
 use strict;
 use File::Spec;
 use ExtUtils::CBuilder::Platform::Unix;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/darwin.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/darwin.pm
index 391040bb934..04a87da3311 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/darwin.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/darwin.pm
@@ -1,5 +1,6 @@
 package ExtUtils::CBuilder::Platform::darwin;
-$ExtUtils::CBuilder::Platform::darwin::VERSION = '0.280221';
+$ExtUtils::CBuilder::Platform::darwin::VERSION = '0.280225';
+use warnings;
 use strict;
 use ExtUtils::CBuilder::Platform::Unix;
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm
index 5d4bdf78b13..d503e8614bf 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/dec_osf.pm
@@ -1,5 +1,6 @@
 package ExtUtils::CBuilder::Platform::dec_osf;
-$ExtUtils::CBuilder::Platform::dec_osf::VERSION = '0.280221';
+$ExtUtils::CBuilder::Platform::dec_osf::VERSION = '0.280225';
+use warnings;
 use strict;
 use ExtUtils::CBuilder::Platform::Unix;
 use File::Spec;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/os2.pm b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/os2.pm
index a5d81ca3311..8d0e3eb0dc2 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/os2.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/CBuilder/Platform/os2.pm
@@ -1,5 +1,6 @@
 package ExtUtils::CBuilder::Platform::os2;
-$ExtUtils::CBuilder::Platform::os2::VERSION = '0.280221';
+$ExtUtils::CBuilder::Platform::os2::VERSION = '0.280225';
+use warnings;
 use strict;
 use ExtUtils::CBuilder::Platform::Unix;
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Command.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Command.pm
index 7f3161a73a1..34e85decfbe 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Command.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Command.pm
@@ -7,7 +7,8 @@ use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
 @ISA       = qw(Exporter);
 @EXPORT    = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f test_d chmod
                 dos2unix);
-$VERSION = '1.20';
+$VERSION = '7.10_02';
+$VERSION = eval $VERSION;
 
 my $Is_VMS   = $^O eq 'VMS';
 my $Is_VMS_mode = $Is_VMS;
@@ -19,7 +20,10 @@ if( $Is_VMS ) {
     my $vms_efs;
     my $vms_case;
 
-    if (eval { local $SIG{__DIE__}; require VMS::Feature; }) {
+    if (eval { local $SIG{__DIE__};
+               local @INC = @INC;
+               pop @INC if $INC[-1] eq '.';
+               require VMS::Feature; }) {
         $vms_unix_rpt = VMS::Feature::current("filename_unix_report");
         $vms_efs = VMS::Feature::current("efs_charset");
         $vms_case = VMS::Feature::current("efs_case_preserve");
@@ -373,3 +377,4 @@ ExtUtils-MakeMaker package and, as a separate CPAN package, by
 Randy Kobes C<r.kobes@uwinnipeg.ca>.
 
 =cut
+
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Command/MM.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Command/MM.pm
index 203b3aa1d81..b4385fc8c60 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Command/MM.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Command/MM.pm
@@ -10,7 +10,7 @@ our @ISA = qw(Exporter);
 
 our @EXPORT  = qw(test_harness pod2man perllocal_install uninstall
                   warn_if_old_packlist test_s cp_nonempty);
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 my $Is_VMS = $^O eq 'VMS';
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Embed.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Embed.pm
index 3f983c11832..9305b5dc133 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Embed.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Embed.pm
@@ -10,7 +10,7 @@ use vars qw(@ISA @EXPORT $VERSION
 use strict;
 
 # This is not a dual-life module, so no need for development version numbers
-$VERSION = '1.32';
+$VERSION = '1.33';
 
 @ISA = qw(Exporter);
 @EXPORT = qw(&xsinit &ldopts 
@@ -350,7 +350,8 @@ This will generate code for linking with C<DynaLoader> and
 each static extension found in C<$Config{static_ext}>.
 The code is written to the default file name F<perlxsi.c>.
 
- perl -MExtUtils::Embed -e xsinit -- -o xsinit.c -std DBI DBD::Oracle
+ perl -MExtUtils::Embed -e xsinit -- -o xsinit.c \
+                            -std DBI DBD::Oracle
 
 Here, code is written for all the currently linked extensions along with code
 for C<DBI> and C<DBD::Oracle>.
@@ -424,9 +425,11 @@ are picked up from the F<extralibs.ld> file in the same directory.
 
  perl -MExtUtils::Embed -e ldopts -- -std Socket
 
-This will do the same as the above example, along with printing additional arguments for linking with the C<Socket> extension.
+This will do the same as the above example, along with printing additional
+arguments for linking with the C<Socket> extension.
 
- perl -MExtUtils::Embed -e ldopts -- -std Msql -- -L/usr/msql/lib -lmsql
+ perl -MExtUtils::Embed -e ldopts -- -std Msql -- \
+                        -L/usr/msql/lib -lmsql
 
 Any arguments after the second '--' token are additional linker
 arguments that will be examined for potential conflict.  If there is no
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Liblist.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Liblist.pm
index 3df17939933..ed38f8fe5d9 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Liblist.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Liblist.pm
@@ -2,7 +2,7 @@ package ExtUtils::Liblist;
 
 use strict;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 use File::Spec;
 require ExtUtils::Liblist::Kid;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Liblist/Kid.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Liblist/Kid.pm
index 37bcfd45129..93183a3792a 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Liblist/Kid.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Liblist/Kid.pm
@@ -11,7 +11,7 @@ use 5.006;
 
 use strict;
 use warnings;
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 use ExtUtils::MakeMaker::Config;
 use Cwd 'cwd';
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM.pm
index f2aa8b4fc0d..a8a176bc394 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM.pm
@@ -3,7 +3,7 @@ package ExtUtils::MM;
 use strict;
 use ExtUtils::MakeMaker::Config;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 require ExtUtils::Liblist;
 require ExtUtils::MakeMaker;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_AIX.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_AIX.pm
index 58ea5b917f5..bb7e6105a5f 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_AIX.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_AIX.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_AIX;
 
 use strict;
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 require ExtUtils::MM_Unix;
 our @ISA = qw(ExtUtils::MM_Unix);
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Any.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Any.pm
index 4c00129af16..7679dc415a6 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Any.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Any.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_Any;
 
 use strict;
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 use Carp;
 use File::Spec;
@@ -202,19 +202,28 @@ Returns true if C<<$self->make>> is the given type; possibilities are:
 
 =cut
 
+my %maketype2true;
+# undocumented - so t/cd.t can still do its thing
+sub _clear_maketype_cache { %maketype2true = () }
+
 sub is_make_type {
     my($self, $type) = @_;
+    return $maketype2true{$type} if defined $maketype2true{$type};
     (undef, undef, my $make_basename) = $self->splitpath($self->make);
-    return 1 if $make_basename =~ /\b$type\b/i; # executable's filename
-    return 0 if $make_basename =~ /\b(dmake|nmake)\b/i; # Never fall through for dmake/nmake
+    return $maketype2true{$type} = 1
+        if $make_basename =~ /\b$type\b/i; # executable's filename
+    return $maketype2true{$type} = 0
+        if $make_basename =~ /\b[gdn]make\b/i; # Never fall through for dmake/nmake/gmake
     # now have to run with "-v" and guess
     my $redirect = $self->can_redirect_error ? '2>&1' : '';
     my $make = $self->make || $self->{MAKE};
     my $minus_v = `"$make" -v $redirect`;
-    return 1 if $type eq 'gmake' and $minus_v =~ /GNU make/i;
-    return 1 if $type eq 'bsdmake'
+    return $maketype2true{$type} = 1
+        if $type eq 'gmake' and $minus_v =~ /GNU make/i;
+    return $maketype2true{$type} = 1
+        if $type eq 'bsdmake'
       and $minus_v =~ /^usage: make \[-BeikNnqrstWwX\]/im;
-    0; # it wasn't whatever you asked
+    $maketype2true{$type} = 0; # it wasn't whatever you asked
 }
 
 
@@ -1668,7 +1677,7 @@ CODE
     my $add_sign_to_dist = $self->cd('$(DISTVNAME)' => $add_sign );
 
     return sprintf <<'MAKE', $add_sign_to_dist, $touch_sig, $sign_dist
-distsignature : create_distdir
+distsignature : distmeta
 	$(NOECHO) %s
 	$(NOECHO) %s
 	%s
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_BeOS.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_BeOS.pm
index 35b76c0fdf0..3015f2dd655 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_BeOS.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_BeOS.pm
@@ -26,7 +26,7 @@ require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
 
 our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 
 =item os_flavor
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Cygwin.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Cygwin.pm
index b504c479f3c..659d430ffde 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Cygwin.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Cygwin.pm
@@ -9,7 +9,7 @@ require ExtUtils::MM_Unix;
 require ExtUtils::MM_Win32;
 our @ISA = qw( ExtUtils::MM_Unix );
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 
 =head1 NAME
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_DOS.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_DOS.pm
index 353c54ff9df..e89c632cb1a 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_DOS.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_DOS.pm
@@ -2,7 +2,7 @@ package ExtUtils::MM_DOS;
 
 use strict;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Darwin.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Darwin.pm
index 315d1b4dfb1..b6e7c5b86ce 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Darwin.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Darwin.pm
@@ -7,7 +7,7 @@ BEGIN {
     our @ISA = qw( ExtUtils::MM_Unix );
 }
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 
 =head1 NAME
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_MacOS.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_MacOS.pm
index bef2c00424d..7323bf12551 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_MacOS.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_MacOS.pm
@@ -2,7 +2,7 @@ package ExtUtils::MM_MacOS;
 
 use strict;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 sub new {
     die 'MacOS Classic (MacPerl) is no longer supported by MakeMaker';
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_NW5.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_NW5.pm
index 4e36796dc8b..967b5d4c8d6 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_NW5.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_NW5.pm
@@ -22,7 +22,7 @@ use strict;
 use ExtUtils::MakeMaker::Config;
 use File::Basename;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 require ExtUtils::MM_Win32;
 our @ISA = qw(ExtUtils::MM_Win32);
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_OS2.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_OS2.pm
index c9ace00b0b5..598087ca19f 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_OS2.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_OS2.pm
@@ -5,7 +5,7 @@ use strict;
 use ExtUtils::MakeMaker qw(neatvalue);
 use File::Spec;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_QNX.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_QNX.pm
index 13e12c4a9f5..1bdc6e0f97f 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_QNX.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_QNX.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_QNX;
 
 use strict;
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 require ExtUtils::MM_Unix;
 our @ISA = qw(ExtUtils::MM_Unix);
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_UWIN.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_UWIN.pm
index 4af2909b80b..6d85d944df4 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_UWIN.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_UWIN.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_UWIN;
 
 use strict;
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 require ExtUtils::MM_Unix;
 our @ISA = qw(ExtUtils::MM_Unix);
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Unix.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Unix.pm
index f63145ce116..009b18ee085 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Unix.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Unix.pm
@@ -15,7 +15,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue);
 
 # If we make $VERSION an our variable parse_version() breaks
 use vars qw($VERSION);
-$VERSION = '7.04_01';
+$VERSION = '7.10_02';
 $VERSION = eval $VERSION;  ## no critic [BuiltinFunctions::ProhibitStringyEval]
 
 require ExtUtils::MM_Any;
@@ -317,8 +317,8 @@ sub const_cccmd {
 
 =item const_config (o)
 
-Defines a couple of constants in the Makefile that are imported from
-%Config.
+Sets SHELL if needed, then defines a couple of constants in the Makefile
+that are imported from %Config.
 
 =cut
 
@@ -326,7 +326,8 @@ sub const_config {
 # --- Constants Sections ---
 
     my($self) = shift;
-    my @m = <<"END";
+    my @m = $self->specify_shell(); # Usually returns empty string
+    push @m, <<"END";
 
 # These definitions are from config.sh (via $INC{'Config.pm'}).
 # They may have been overridden via Makefile.PL or on the command line.
@@ -676,13 +677,13 @@ Defines a check in target for RCS.
 
 sub dist_ci {
     my($self) = shift;
-    return q{
-ci :
-	$(PERLRUN) "-MExtUtils::Manifest=maniread" \\
-	  -e "@all = keys %{ maniread() };" \\
-	  -e "print(qq{Executing $(CI) @all\n}); system(qq{$(CI) @all});" \\
-	  -e "print(qq{Executing $(RCS_LABEL) ...\n}); system(qq{$(RCS_LABEL) @all});"
-};
+    return sprintf "ci :\n\t%s\n", $self->oneliner(<<'EOF', [qw(-MExtUtils::Manifest=maniread)]);
+@all = sort keys %{ maniread() };
+print(qq{Executing $(CI) @all\n});
+system(qq{$(CI) @all}) == 0 or die $!;
+print(qq{Executing $(RCS_LABEL) ...\n});
+system(qq{$(RCS_LABEL) @all}) == 0 or die $!;
+EOF
 }
 
 =item dist_core (o)
@@ -3176,6 +3177,16 @@ MAKE_FRAG
     return $m;
 }
 
+=item specify_shell
+
+Specify SHELL if needed - not done on Unix.
+
+=cut
+
+sub specify_shell {
+  return '';
+}
+
 =item quote_paren
 
 Backslashes parentheses C<()> in command line arguments.
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_VMS.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_VMS.pm
index 45d06b00c52..60dd8713fc2 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_VMS.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_VMS.pm
@@ -15,7 +15,7 @@ BEGIN {
 
 use File::Basename;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
@@ -1764,7 +1764,8 @@ sub oneliner {
     $cmd =~ s{^\n+}{};
     $cmd =~ s{\n+$}{};
 
-    $cmd = $self->quote_literal($cmd);
+    my @cmds = split /\n/, $cmd;
+    $cmd = join " \n\t  -e ", map $self->quote_literal($_), @cmds;
     $cmd = $self->escape_newlines($cmd);
 
     # Switches must be quoted else they will be lowercased.
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_VOS.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_VOS.pm
index dfec6d5c9f9..07ad95f409a 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_VOS.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_VOS.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_VOS;
 
 use strict;
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 require ExtUtils::MM_Unix;
 our @ISA = qw(ExtUtils::MM_Unix);
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Win32.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Win32.pm
index fbd3f49f910..0a2fb606f45 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Win32.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Win32.pm
@@ -27,7 +27,7 @@ use ExtUtils::MakeMaker qw( neatvalue );
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
 our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 $ENV{EMXSHELL} = 'sh'; # to run `commands`
 
@@ -232,6 +232,17 @@ sub platform_constants {
     return $make_frag;
 }
 
+=item specify_shell
+
+Set SHELL to $ENV{COMSPEC} only if make is type 'gmake'.
+
+=cut
+
+sub specify_shell {
+    my $self = shift;
+    return '' unless $self->is_make_type('gmake');
+    "\nSHELL = $ENV{COMSPEC}\n";
+}
 
 =item constants
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Win95.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Win95.pm
index cc37c24140f..096f28d7e27 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MM_Win95.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MM_Win95.pm
@@ -2,7 +2,7 @@ package ExtUtils::MM_Win95;
 
 use strict;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 require ExtUtils::MM_Win32;
 our @ISA = qw(ExtUtils::MM_Win32);
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MY.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MY.pm
index f2114f9c138..5a080ea8c47 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MY.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MY.pm
@@ -3,7 +3,7 @@ package ExtUtils::MY;
 use strict;
 require ExtUtils::MM;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 our @ISA = qw(ExtUtils::MM);
 
 {
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker.pm
index fe95b2784ad..42b174fe347 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker.pm
@@ -24,7 +24,7 @@ my %Recognized_Att_Keys;
 our %macro_fsentity; # whether a macro is a filesystem name
 our %macro_dep; # whether a macro is a dependency
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 $VERSION = eval $VERSION;  ## no critic [BuiltinFunctions::ProhibitStringyEval]
 
 # Emulate something resembling CVS $Revision$
@@ -42,7 +42,7 @@ our @EXPORT_OK = qw($VERSION &neatvalue &mkbootstrap &mksymlists
 # purged.
 my $Is_VMS     = $^O eq 'VMS';
 my $Is_Win32   = $^O eq 'MSWin32';
-my $UNDER_CORE = $ENV{PERL_CORE};
+our $UNDER_CORE = $ENV{PERL_CORE}; # needs to be our
 
 full_setup();
 
@@ -439,7 +439,7 @@ sub new {
    }
 
     print "MakeMaker (v$VERSION)\n" if $Verbose;
-    if (-f "MANIFEST" && ! -f "Makefile" && ! $ENV{PERL_CORE}){
+    if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){
         check_manifest();
     }
 
@@ -525,7 +525,7 @@ END
             warn sprintf "Warning: prerequisite %s %s not found.\n",
               $prereq, $required_version
                    unless $self->{PREREQ_FATAL}
-                       or $ENV{PERL_CORE};
+                       or $UNDER_CORE;
 
             $unsatisfied{$prereq} = 'not installed';
         }
@@ -533,7 +533,7 @@ END
             warn sprintf "Warning: prerequisite %s %s not found. We have %s.\n",
               $prereq, $required_version, ($pr_version || 'unknown version')
                   unless $self->{PREREQ_FATAL}
-                       or $ENV{PERL_CORE};
+                       or $UNDER_CORE;
 
             $unsatisfied{$prereq} = $required_version ? $required_version : 'unknown version' ;
         }
@@ -1175,12 +1175,9 @@ sub flush {
     binmode $fh, ':encoding(locale)' if $CAN_DECODE;
 
     for my $chunk (@{$self->{RESULT}}) {
-        my $to_write = "$chunk\n";
-        if (!$CAN_DECODE && $] > 5.008) {
-            utf8::encode $to_write;
-        }
-        print $fh "$chunk\n"
-            or die "Can't write to MakeMaker.tmp: $!";
+        my $to_write = $chunk;
+        utf8::encode $to_write if !$CAN_DECODE && $] > 5.008;
+        print $fh "$to_write\n" or die "Can't write to MakeMaker.tmp: $!";
     }
 
     close $fh
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Config.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Config.pm
index 9001cc62685..707e3bf7c03 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Config.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Config.pm
@@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Config;
 
 use strict;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 use Config ();
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/FAQ.pod b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/FAQ.pod
index d2b4ab354f5..d3aa100fb9f 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/FAQ.pod
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/FAQ.pod
@@ -1,6 +1,6 @@
 package ExtUtils::MakeMaker::FAQ;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_01';
 
 1;
 __END__
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Locale.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Locale.pm
index 23d0c6ecfe9..68fcd4c5b84 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Locale.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Locale.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MakeMaker::Locale;
 
 use strict;
-our $VERSION = "7.04_01";
+our $VERSION = "7.10";
 
 use base 'Exporter';
 our @EXPORT_OK = qw(
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Tutorial.pod b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Tutorial.pod
index 9cbdd9b2ec5..7e53baa525b 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Tutorial.pod
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/Tutorial.pod
@@ -1,6 +1,6 @@
 package ExtUtils::MakeMaker::Tutorial;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_01';
 
 
 =head1 NAME
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/version.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/version.pm
index 3269f444415..35cd2ab9b30 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/version.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/version.pm
@@ -15,7 +15,7 @@ use strict;
 
 use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv);
 
-$VERSION = '7.04_01';
+$VERSION = '7.10_01';
 $CLASS = 'version';
 
 {
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/version/regex.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/version/regex.pm
deleted file mode 100644
index a134a00a42a..00000000000
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/version/regex.pm
+++ /dev/null
@@ -1,123 +0,0 @@
-#--------------------------------------------------------------------------#
-# This is a modified copy of version.pm 0.9909, bundled exclusively for
-# use by ExtUtils::Makemaker and its dependencies to bootstrap when
-# version.pm is not available.  It should not be used by ordinary modules.
-#--------------------------------------------------------------------------#
-
-package ExtUtils::MakeMaker::version::regex;
-
-use strict;
-
-use vars qw($VERSION $CLASS $STRICT $LAX);
-
-$VERSION = '7.04_01';
-
-#--------------------------------------------------------------------------#
-# Version regexp components
-#--------------------------------------------------------------------------#
-
-# Fraction part of a decimal version number.  This is a common part of
-# both strict and lax decimal versions
-
-my $FRACTION_PART = qr/\.[0-9]+/;
-
-# First part of either decimal or dotted-decimal strict version number.
-# Unsigned integer with no leading zeroes (except for zero itself) to
-# avoid confusion with octal.
-
-my $STRICT_INTEGER_PART = qr/0|[1-9][0-9]*/;
-
-# First part of either decimal or dotted-decimal lax version number.
-# Unsigned integer, but allowing leading zeros.  Always interpreted
-# as decimal.  However, some forms of the resulting syntax give odd
-# results if used as ordinary Perl expressions, due to how perl treats
-# octals.  E.g.
-#   version->new("010" ) == 10
-#   version->new( 010  ) == 8
-#   version->new( 010.2) == 82  # "8" . "2"
-
-my $LAX_INTEGER_PART = qr/[0-9]+/;
-
-# Second and subsequent part of a strict dotted-decimal version number.
-# Leading zeroes are permitted, and the number is always decimal.
-# Limited to three digits to avoid overflow when converting to decimal
-# form and also avoid problematic style with excessive leading zeroes.
-
-my $STRICT_DOTTED_DECIMAL_PART = qr/\.[0-9]{1,3}/;
-
-# Second and subsequent part of a lax dotted-decimal version number.
-# Leading zeroes are permitted, and the number is always decimal.  No
-# limit on the numerical value or number of digits, so there is the
-# possibility of overflow when converting to decimal form.
-
-my $LAX_DOTTED_DECIMAL_PART = qr/\.[0-9]+/;
-
-# Alpha suffix part of lax version number syntax.  Acts like a
-# dotted-decimal part.
-
-my $LAX_ALPHA_PART = qr/_[0-9]+/;
-
-#--------------------------------------------------------------------------#
-# Strict version regexp definitions
-#--------------------------------------------------------------------------#
-
-# Strict decimal version number.
-
-my $STRICT_DECIMAL_VERSION =
-    qr/ $STRICT_INTEGER_PART $FRACTION_PART? /x;
-
-# Strict dotted-decimal version number.  Must have both leading "v" and
-# at least three parts, to avoid confusion with decimal syntax.
-
-my $STRICT_DOTTED_DECIMAL_VERSION =
-    qr/ v $STRICT_INTEGER_PART $STRICT_DOTTED_DECIMAL_PART{2,} /x;
-
-# Complete strict version number syntax -- should generally be used
-# anchored: qr/ \A $STRICT \z /x
-
-$STRICT =
-    qr/ $STRICT_DECIMAL_VERSION | $STRICT_DOTTED_DECIMAL_VERSION /x;
-
-#--------------------------------------------------------------------------#
-# Lax version regexp definitions
-#--------------------------------------------------------------------------#
-
-# Lax decimal version number.  Just like the strict one except for
-# allowing an alpha suffix or allowing a leading or trailing
-# decimal-point
-
-my $LAX_DECIMAL_VERSION =
-    qr/ $LAX_INTEGER_PART (?: \. | $FRACTION_PART $LAX_ALPHA_PART? )?
-	|
-	$FRACTION_PART $LAX_ALPHA_PART?
-    /x;
-
-# Lax dotted-decimal version number.  Distinguished by having either
-# leading "v" or at least three non-alpha parts.  Alpha part is only
-# permitted if there are at least two non-alpha parts. Strangely
-# enough, without the leading "v", Perl takes .1.2 to mean v0.1.2,
-# so when there is no "v", the leading part is optional
-
-my $LAX_DOTTED_DECIMAL_VERSION =
-    qr/
-	v $LAX_INTEGER_PART (?: $LAX_DOTTED_DECIMAL_PART+ $LAX_ALPHA_PART? )?
-	|
-	$LAX_INTEGER_PART? $LAX_DOTTED_DECIMAL_PART{2,} $LAX_ALPHA_PART?
-    /x;
-
-# Complete lax version number syntax -- should generally be used
-# anchored: qr/ \A $LAX \z /x
-#
-# The string 'undef' is a special case to make for easier handling
-# of return values from ExtUtils::MM->parse_version
-
-$LAX =
-    qr/ undef | $LAX_DECIMAL_VERSION | $LAX_DOTTED_DECIMAL_VERSION /x;
-
-#--------------------------------------------------------------------------#
-
-# Preloaded methods go here.
-sub is_strict	{ defined $_[0] && $_[0] =~ qr/ \A $STRICT \z /x }
-sub is_lax	{ defined $_[0] && $_[0] =~ qr/ \A $LAX \z /x }
-
-1;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/version/vpp.pm b/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/version/vpp.pm
deleted file mode 100644
index 34bbd01bf1f..00000000000
--- a/Master/tlpkg/tlperl/lib/ExtUtils/MakeMaker/version/vpp.pm
+++ /dev/null
@@ -1,1028 +0,0 @@
-#--------------------------------------------------------------------------#
-# This is a modified copy of version.pm 0.9909, bundled exclusively for
-# use by ExtUtils::Makemaker and its dependencies to bootstrap when
-# version.pm is not available.  It should not be used by ordinary modules.
-#--------------------------------------------------------------------------#
-
-package ExtUtils::MakeMaker::charstar;
-# a little helper class to emulate C char* semantics in Perl
-# so that prescan_version can use the same code as in C
-
-use overload (
-    '""'	=> \&thischar,
-    '0+'	=> \&thischar,
-    '++'	=> \&increment,
-    '--'	=> \&decrement,
-    '+'		=> \&plus,
-    '-'		=> \&minus,
-    '*'		=> \&multiply,
-    'cmp'	=> \&cmp,
-    '<=>'	=> \&spaceship,
-    'bool'	=> \&thischar,
-    '='		=> \&clone,
-);
-
-sub new {
-    my ($self, $string) = @_;
-    my $class = ref($self) || $self;
-
-    my $obj = {
-	string  => [split(//,$string)],
-	current => 0,
-    };
-    return bless $obj, $class;
-}
-
-sub thischar {
-    my ($self) = @_;
-    my $last = $#{$self->{string}};
-    my $curr = $self->{current};
-    if ($curr >= 0 && $curr <= $last) {
-	return $self->{string}->[$curr];
-    }
-    else {
-	return '';
-    }
-}
-
-sub increment {
-    my ($self) = @_;
-    $self->{current}++;
-}
-
-sub decrement {
-    my ($self) = @_;
-    $self->{current}--;
-}
-
-sub plus {
-    my ($self, $offset) = @_;
-    my $rself = $self->clone;
-    $rself->{current} += $offset;
-    return $rself;
-}
-
-sub minus {
-    my ($self, $offset) = @_;
-    my $rself = $self->clone;
-    $rself->{current} -= $offset;
-    return $rself;
-}
-
-sub multiply {
-    my ($left, $right, $swapped) = @_;
-    my $char = $left->thischar();
-    return $char * $right;
-}
-
-sub spaceship {
-    my ($left, $right, $swapped) = @_;
-    unless (ref($right)) { # not an object already
-	$right = $left->new($right);
-    }
-    return $left->{current} <=> $right->{current};
-}
-
-sub cmp {
-    my ($left, $right, $swapped) = @_;
-    unless (ref($right)) { # not an object already
-	if (length($right) == 1) { # comparing single character only
-	    return $left->thischar cmp $right;
-	}
-	$right = $left->new($right);
-    }
-    return $left->currstr cmp $right->currstr;
-}
-
-sub bool {
-    my ($self) = @_;
-    my $char = $self->thischar;
-    return ($char ne '');
-}
-
-sub clone {
-    my ($left, $right, $swapped) = @_;
-    $right = {
-	string  => [@{$left->{string}}],
-	current => $left->{current},
-    };
-    return bless $right, ref($left);
-}
-
-sub currstr {
-    my ($self, $s) = @_;
-    my $curr = $self->{current};
-    my $last = $#{$self->{string}};
-    if (defined($s) && $s->{current} < $last) {
-	$last = $s->{current};
-    }
-
-    my $string = join('', @{$self->{string}}[$curr..$last]);
-    return $string;
-}
-
-package ExtUtils::MakeMaker::version::vpp;
-
-use 5.006002;
-use strict;
-
-use Config;
-use vars qw($VERSION $CLASS @ISA $LAX $STRICT);
-$VERSION = '7.04_01';
-$CLASS = 'ExtUtils::MakeMaker::version::vpp';
-
-require ExtUtils::MakeMaker::version::regex;
-*ExtUtils::MakeMaker::version::vpp::is_strict = \&ExtUtils::MakeMaker::version::regex::is_strict;
-*ExtUtils::MakeMaker::version::vpp::is_lax = \&ExtUtils::MakeMaker::version::regex::is_lax;
-*LAX = \$ExtUtils::MakeMaker::version::regex::LAX;
-*STRICT = \$ExtUtils::MakeMaker::version::regex::STRICT;
-
-use overload (
-    '""'       => \&stringify,
-    '0+'       => \&numify,
-    'cmp'      => \&vcmp,
-    '<=>'      => \&vcmp,
-    'bool'     => \&vbool,
-    '+'        => \&vnoop,
-    '-'        => \&vnoop,
-    '*'        => \&vnoop,
-    '/'        => \&vnoop,
-    '+='        => \&vnoop,
-    '-='        => \&vnoop,
-    '*='        => \&vnoop,
-    '/='        => \&vnoop,
-    'abs'      => \&vnoop,
-);
-
-eval "use warnings";
-if ($@) {
-    eval '
-	package
-	warnings;
-	sub enabled {return $^W;}
-	1;
-    ';
-}
-
-sub import {
-    no strict 'refs';
-    my ($class) = shift;
-
-    # Set up any derived class
-    unless ($class eq $CLASS) {
-	local $^W;
-	*{$class.'::declare'} =  \&{$CLASS.'::declare'};
-	*{$class.'::qv'} = \&{$CLASS.'::qv'};
-    }
-
-    my %args;
-    if (@_) { # any remaining terms are arguments
-	map { $args{$_} = 1 } @_
-    }
-    else { # no parameters at all on use line
-	%args =
-	(
-	    qv => 1,
-	    'UNIVERSAL::VERSION' => 1,
-	);
-    }
-
-    my $callpkg = caller();
-
-    if (exists($args{declare})) {
-	*{$callpkg.'::declare'} =
-	    sub {return $class->declare(shift) }
-	  unless defined(&{$callpkg.'::declare'});
-    }
-
-    if (exists($args{qv})) {
-	*{$callpkg.'::qv'} =
-	    sub {return $class->qv(shift) }
-	  unless defined(&{$callpkg.'::qv'});
-    }
-
-    if (exists($args{'UNIVERSAL::VERSION'})) {
-	local $^W;
-	*UNIVERSAL::VERSION
-		= \&{$CLASS.'::_VERSION'};
-    }
-
-    if (exists($args{'VERSION'})) {
-	*{$callpkg.'::VERSION'} = \&{$CLASS.'::_VERSION'};
-    }
-
-    if (exists($args{'is_strict'})) {
-	*{$callpkg.'::is_strict'} = \&{$CLASS.'::is_strict'}
-	  unless defined(&{$callpkg.'::is_strict'});
-    }
-
-    if (exists($args{'is_lax'})) {
-	*{$callpkg.'::is_lax'} = \&{$CLASS.'::is_lax'}
-	  unless defined(&{$callpkg.'::is_lax'});
-    }
-}
-
-my $VERSION_MAX = 0x7FFFFFFF;
-
-# implement prescan_version as closely to the C version as possible
-use constant TRUE  => 1;
-use constant FALSE => 0;
-
-sub isDIGIT {
-    my ($char) = shift->thischar();
-    return ($char =~ /\d/);
-}
-
-sub isALPHA {
-    my ($char) = shift->thischar();
-    return ($char =~ /[a-zA-Z]/);
-}
-
-sub isSPACE {
-    my ($char) = shift->thischar();
-    return ($char =~ /\s/);
-}
-
-sub BADVERSION {
-    my ($s, $errstr, $error) = @_;
-    if ($errstr) {
-	$$errstr = $error;
-    }
-    return $s;
-}
-
-sub prescan_version {
-    my ($s, $strict, $errstr, $sqv, $ssaw_decimal, $swidth, $salpha) = @_;
-    my $qv          = defined $sqv          ? $$sqv          : FALSE;
-    my $saw_decimal = defined $ssaw_decimal ? $$ssaw_decimal : 0;
-    my $width       = defined $swidth       ? $$swidth       : 3;
-    my $alpha       = defined $salpha       ? $$salpha       : FALSE;
-
-    my $d = $s;
-
-    if ($qv && isDIGIT($d)) {
-	goto dotted_decimal_version;
-    }
-
-    if ($d eq 'v') { # explicit v-string
-	$d++;
-	if (isDIGIT($d)) {
-	    $qv = TRUE;
-	}
-	else { # degenerate v-string
-	    # requires v1.2.3
-	    return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)");
-	}
-
-dotted_decimal_version:
-	if ($strict && $d eq '0' && isDIGIT($d+1)) {
-	    # no leading zeros allowed
-	    return BADVERSION($s,$errstr,"Invalid version format (no leading zeros)");
-	}
-
-	while (isDIGIT($d)) { 	# integer part
-	    $d++;
-	}
-
-	if ($d eq '.')
-	{
-	    $saw_decimal++;
-	    $d++; 		# decimal point
-	}
-	else
-	{
-	    if ($strict) {
-		# require v1.2.3
-		return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)");
-	    }
-	    else {
-		goto version_prescan_finish;
-	    }
-	}
-
-	{
-	    my $i = 0;
-	    my $j = 0;
-	    while (isDIGIT($d)) {	# just keep reading
-		$i++;
-		while (isDIGIT($d)) {
-		    $d++; $j++;
-		    # maximum 3 digits between decimal
-		    if ($strict && $j > 3) {
-			return BADVERSION($s,$errstr,"Invalid version format (maximum 3 digits between decimals)");
-		    }
-		}
-		if ($d eq '_') {
-		    if ($strict) {
-			return BADVERSION($s,$errstr,"Invalid version format (no underscores)");
-		    }
-		    if ( $alpha ) {
-			return BADVERSION($s,$errstr,"Invalid version format (multiple underscores)");
-		    }
-		    $d++;
-		    $alpha = TRUE;
-		}
-		elsif ($d eq '.') {
-		    if ($alpha) {
-			return BADVERSION($s,$errstr,"Invalid version format (underscores before decimal)");
-		    }
-		    $saw_decimal++;
-		    $d++;
-		}
-		elsif (!isDIGIT($d)) {
-		    last;
-		}
-		$j = 0;
-	    }
-
-	    if ($strict && $i < 2) {
-		# requires v1.2.3
-		return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)");
-	    }
-	}
-    } 					# end if dotted-decimal
-    else
-    {					# decimal versions
-	my $j = 0;
-	# special $strict case for leading '.' or '0'
-	if ($strict) {
-	    if ($d eq '.') {
-		return BADVERSION($s,$errstr,"Invalid version format (0 before decimal required)");
-	    }
-	    if ($d eq '0' && isDIGIT($d+1)) {
-		return BADVERSION($s,$errstr,"Invalid version format (no leading zeros)");
-	    }
-	}
-
-	# and we never support negative version numbers
-	if ($d eq '-') {
-	    return BADVERSION($s,$errstr,"Invalid version format (negative version number)");
-	}
-
-	# consume all of the integer part
-	while (isDIGIT($d)) {
-	    $d++;
-	}
-
-	# look for a fractional part
-	if ($d eq '.') {
-	    # we found it, so consume it
-	    $saw_decimal++;
-	    $d++;
-	}
-	elsif (!$d || $d eq ';' || isSPACE($d) || $d eq '}') {
-	    if ( $d == $s ) {
-		# found nothing
-		return BADVERSION($s,$errstr,"Invalid version format (version required)");
-	    }
-	    # found just an integer
-	    goto version_prescan_finish;
-	}
-	elsif ( $d == $s ) {
-	    # didn't find either integer or period
-	    return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)");
-	}
-	elsif ($d eq '_') {
-	    # underscore can't come after integer part
-	    if ($strict) {
-		return BADVERSION($s,$errstr,"Invalid version format (no underscores)");
-	    }
-	    elsif (isDIGIT($d+1)) {
-		return BADVERSION($s,$errstr,"Invalid version format (alpha without decimal)");
-	    }
-	    else {
-		return BADVERSION($s,$errstr,"Invalid version format (misplaced underscore)");
-	    }
-	}
-	elsif ($d) {
-	    # anything else after integer part is just invalid data
-	    return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)");
-	}
-
-	# scan the fractional part after the decimal point
-	if ($d && !isDIGIT($d) && ($strict || ! ($d eq ';' || isSPACE($d) || $d eq '}') )) {
-		# $strict or lax-but-not-the-end
-		return BADVERSION($s,$errstr,"Invalid version format (fractional part required)");
-	}
-
-	while (isDIGIT($d)) {
-	    $d++; $j++;
-	    if ($d eq '.' && isDIGIT($d-1)) {
-		if ($alpha) {
-		    return BADVERSION($s,$errstr,"Invalid version format (underscores before decimal)");
-		}
-		if ($strict) {
-		    return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions must begin with 'v')");
-		}
-		$d = $s; # start all over again
-		$qv = TRUE;
-		goto dotted_decimal_version;
-	    }
-	    if ($d eq '_') {
-		if ($strict) {
-		    return BADVERSION($s,$errstr,"Invalid version format (no underscores)");
-		}
-		if ( $alpha ) {
-		    return BADVERSION($s,$errstr,"Invalid version format (multiple underscores)");
-		}
-		if ( ! isDIGIT($d+1) ) {
-		    return BADVERSION($s,$errstr,"Invalid version format (misplaced underscore)");
-		}
-		$width = $j;
-		$d++;
-		$alpha = TRUE;
-	    }
-	}
-    }
-
-version_prescan_finish:
-    while (isSPACE($d)) {
-	$d++;
-    }
-
-    if ($d && !isDIGIT($d) && (! ($d eq ';' || $d eq '}') )) {
-	# trailing non-numeric data
-	return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)");
-    }
-
-    if (defined $sqv) {
-	$$sqv = $qv;
-    }
-    if (defined $swidth) {
-	$$swidth = $width;
-    }
-    if (defined $ssaw_decimal) {
-	$$ssaw_decimal = $saw_decimal;
-    }
-    if (defined $salpha) {
-	$$salpha = $alpha;
-    }
-    return $d;
-}
-
-sub scan_version {
-    my ($s, $rv, $qv) = @_;
-    my $start;
-    my $pos;
-    my $last;
-    my $errstr;
-    my $saw_decimal = 0;
-    my $width = 3;
-    my $alpha = FALSE;
-    my $vinf = FALSE;
-    my @av;
-
-    $s = new ExtUtils::MakeMaker::charstar $s;
-
-    while (isSPACE($s)) { # leading whitespace is OK
-	$s++;
-    }
-
-    $last = prescan_version($s, FALSE, \$errstr, \$qv, \$saw_decimal,
-	\$width, \$alpha);
-
-    if ($errstr) {
-	# 'undef' is a special case and not an error
-	if ( $s ne 'undef') {
-	    require Carp;
-	    Carp::croak($errstr);
-	}
-    }
-
-    $start = $s;
-    if ($s eq 'v') {
-	$s++;
-    }
-    $pos = $s;
-
-    if ( $qv ) {
-	$$rv->{qv} = $qv;
-    }
-    if ( $alpha ) {
-	$$rv->{alpha} = $alpha;
-    }
-    if ( !$qv && $width < 3 ) {
-	$$rv->{width} = $width;
-    }
-
-    while (isDIGIT($pos)) {
-	$pos++;
-    }
-    if (!isALPHA($pos)) {
-	my $rev;
-
-	for (;;) {
-	    $rev = 0;
-	    {
-  		# this is atoi() that delimits on underscores
-  		my $end = $pos;
-  		my $mult = 1;
-		my $orev;
-
-		#  the following if() will only be true after the decimal
-		#  point of a version originally created with a bare
-		#  floating point number, i.e. not quoted in any way
-		#
- 		if ( !$qv && $s > $start && $saw_decimal == 1 ) {
-		    $mult *= 100;
- 		    while ( $s < $end ) {
-			$orev = $rev;
- 			$rev += $s * $mult;
- 			$mult /= 10;
-			if (   (abs($orev) > abs($rev))
-			    || (abs($rev) > $VERSION_MAX )) {
-			    warn("Integer overflow in version %d",
-					   $VERSION_MAX);
-			    $s = $end - 1;
-			    $rev = $VERSION_MAX;
-			    $vinf = 1;
-			}
- 			$s++;
-			if ( $s eq '_' ) {
-			    $s++;
-			}
- 		    }
-  		}
- 		else {
- 		    while (--$end >= $s) {
-			$orev = $rev;
- 			$rev += $end * $mult;
- 			$mult *= 10;
-			if (   (abs($orev) > abs($rev))
-			    || (abs($rev) > $VERSION_MAX )) {
-			    warn("Integer overflow in version");
-			    $end = $s - 1;
-			    $rev = $VERSION_MAX;
-			    $vinf = 1;
-			}
- 		    }
- 		}
-  	    }
-
-  	    # Append revision
-	    push @av, $rev;
-	    if ( $vinf ) {
-		$s = $last;
-		last;
-	    }
-	    elsif ( $pos eq '.' ) {
-		$s = ++$pos;
-	    }
-	    elsif ( $pos eq '_' && isDIGIT($pos+1) ) {
-		$s = ++$pos;
-	    }
-	    elsif ( $pos eq ',' && isDIGIT($pos+1) ) {
-		$s = ++$pos;
-	    }
-	    elsif ( isDIGIT($pos) ) {
-		$s = $pos;
-	    }
-	    else {
-		$s = $pos;
-		last;
-	    }
-	    if ( $qv ) {
-		while ( isDIGIT($pos) ) {
-		    $pos++;
-		}
-	    }
-	    else {
-		my $digits = 0;
-		while ( ( isDIGIT($pos) || $pos eq '_' ) && $digits < 3 ) {
-		    if ( $pos ne '_' ) {
-			$digits++;
-		    }
-		    $pos++;
-		}
-	    }
-	}
-    }
-    if ( $qv ) { # quoted versions always get at least three terms
-	my $len = $#av;
-	#  This for loop appears to trigger a compiler bug on OS X, as it
-	#  loops infinitely. Yes, len is negative. No, it makes no sense.
-	#  Compiler in question is:
-	#  gcc version 3.3 20030304 (Apple Computer, Inc. build 1640)
-	#  for ( len = 2 - len; len > 0; len-- )
-	#  av_push(MUTABLE_AV(sv), newSViv(0));
-	#
-	$len = 2 - $len;
-	while ($len-- > 0) {
-	    push @av, 0;
-	}
-    }
-
-    # need to save off the current version string for later
-    if ( $vinf ) {
-	$$rv->{original} = "v.Inf";
-	$$rv->{vinf} = 1;
-    }
-    elsif ( $s > $start ) {
-	$$rv->{original} = $start->currstr($s);
-	if ( $qv && $saw_decimal == 1 && $start ne 'v' ) {
-	    # need to insert a v to be consistent
-	    $$rv->{original} = 'v' . $$rv->{original};
-	}
-    }
-    else {
-	$$rv->{original} = '0';
-	push(@av, 0);
-    }
-
-    # And finally, store the AV in the hash
-    $$rv->{version} = \@av;
-
-    # fix RT#19517 - special case 'undef' as string
-    if ($s eq 'undef') {
-	$s += 5;
-    }
-
-    return $s;
-}
-
-sub new {
-    my $class = shift;
-    unless (defined $class or $#_ > 1) {
-	require Carp;
-	Carp::croak('Usage: version::new(class, version)');
-    }
-
-    my $self = bless ({}, ref ($class) || $class);
-    my $qv = FALSE;
-
-    if ( $#_ == 1 ) { # must be CVS-style
-	$qv = TRUE;
-    }
-    my $value = pop; # always going to be the last element
-
-    if ( ref($value) && eval('$value->isa("version")') ) {
-	# Can copy the elements directly
-	$self->{version} = [ @{$value->{version} } ];
-	$self->{qv} = 1 if $value->{qv};
-	$self->{alpha} = 1 if $value->{alpha};
-	$self->{original} = ''.$value->{original};
-	return $self;
-    }
-
-    if ( not defined $value or $value =~ /^undef$/ ) {
-	# RT #19517 - special case for undef comparison
-	# or someone forgot to pass a value
-	push @{$self->{version}}, 0;
-	$self->{original} = "0";
-	return ($self);
-    }
-
-
-    if (ref($value) =~ m/ARRAY|HASH/) {
-	require Carp;
-	Carp::croak("Invalid version format (non-numeric data)");
-    }
-
-    $value = _un_vstring($value);
-
-    if ($Config{d_setlocale} && eval { require POSIX } ) {
-      require locale;
-	my $currlocale = POSIX::setlocale(&POSIX::LC_ALL);
-
-	# if the current locale uses commas for decimal points, we
-	# just replace commas with decimal places, rather than changing
-	# locales
-	if ( POSIX::localeconv()->{decimal_point} eq ',' ) {
-	    $value =~ tr/,/./;
-	}
-    }
-
-    # exponential notation
-    if ( $value =~ /\d+.?\d*e[-+]?\d+/ ) {
-	$value = sprintf("%.9f",$value);
-	$value =~ s/(0+)$//; # trim trailing zeros
-    }
-
-    my $s = scan_version($value, \$self, $qv);
-
-    if ($s) { # must be something left over
-	warn("Version string '%s' contains invalid data; "
-		   ."ignoring: '%s'", $value, $s);
-    }
-
-    return ($self);
-}
-
-*parse = \&new;
-
-sub numify {
-    my ($self) = @_;
-    unless (_verify($self)) {
-	require Carp;
-	Carp::croak("Invalid version object");
-    }
-    my $width = $self->{width} || 3;
-    my $alpha = $self->{alpha} || "";
-    my $len = $#{$self->{version}};
-    my $digit = $self->{version}[0];
-    my $string = sprintf("%d.", $digit );
-
-    for ( my $i = 1 ; $i < $len ; $i++ ) {
-	$digit = $self->{version}[$i];
-	if ( $width < 3 ) {
-	    my $denom = 10**(3-$width);
-	    my $quot = int($digit/$denom);
-	    my $rem = $digit - ($quot * $denom);
-	    $string .= sprintf("%0".$width."d_%d", $quot, $rem);
-	}
-	else {
-	    $string .= sprintf("%03d", $digit);
-	}
-    }
-
-    if ( $len > 0 ) {
-	$digit = $self->{version}[$len];
-	if ( $alpha && $width == 3 ) {
-	    $string .= "_";
-	}
-	$string .= sprintf("%0".$width."d", $digit);
-    }
-    else # $len = 0
-    {
-	$string .= sprintf("000");
-    }
-
-    return $string;
-}
-
-sub normal {
-    my ($self) = @_;
-    unless (_verify($self)) {
-	require Carp;
-	Carp::croak("Invalid version object");
-    }
-    my $alpha = $self->{alpha} || "";
-    my $len = $#{$self->{version}};
-    my $digit = $self->{version}[0];
-    my $string = sprintf("v%d", $digit );
-
-    for ( my $i = 1 ; $i < $len ; $i++ ) {
-	$digit = $self->{version}[$i];
-	$string .= sprintf(".%d", $digit);
-    }
-
-    if ( $len > 0 ) {
-	$digit = $self->{version}[$len];
-	if ( $alpha ) {
-	    $string .= sprintf("_%0d", $digit);
-	}
-	else {
-	    $string .= sprintf(".%0d", $digit);
-	}
-    }
-
-    if ( $len <= 2 ) {
-	for ( $len = 2 - $len; $len != 0; $len-- ) {
-	    $string .= sprintf(".%0d", 0);
-	}
-    }
-
-    return $string;
-}
-
-sub stringify {
-    my ($self) = @_;
-    unless (_verify($self)) {
-	require Carp;
-	Carp::croak("Invalid version object");
-    }
-    return exists $self->{original}
-    	? $self->{original}
-	: exists $self->{qv}
-	    ? $self->normal
-	    : $self->numify;
-}
-
-sub vcmp {
-    require UNIVERSAL;
-    my ($left,$right,$swap) = @_;
-    my $class = ref($left);
-    unless ( UNIVERSAL::isa($right, $class) ) {
-	$right = $class->new($right);
-    }
-
-    if ( $swap ) {
-	($left, $right) = ($right, $left);
-    }
-    unless (_verify($left)) {
-	require Carp;
-	Carp::croak("Invalid version object");
-    }
-    unless (_verify($right)) {
-	require Carp;
-	Carp::croak("Invalid version format");
-    }
-    my $l = $#{$left->{version}};
-    my $r = $#{$right->{version}};
-    my $m = $l < $r ? $l : $r;
-    my $lalpha = $left->is_alpha;
-    my $ralpha = $right->is_alpha;
-    my $retval = 0;
-    my $i = 0;
-    while ( $i <= $m && $retval == 0 ) {
-	$retval = $left->{version}[$i] <=> $right->{version}[$i];
-	$i++;
-    }
-
-    # tiebreaker for alpha with identical terms
-    if ( $retval == 0
-	&& $l == $r
-	&& $left->{version}[$m] == $right->{version}[$m]
-	&& ( $lalpha || $ralpha ) ) {
-
-	if ( $lalpha && !$ralpha ) {
-	    $retval = -1;
-	}
-	elsif ( $ralpha && !$lalpha) {
-	    $retval = +1;
-	}
-    }
-
-    # possible match except for trailing 0's
-    if ( $retval == 0 && $l != $r ) {
-	if ( $l < $r ) {
-	    while ( $i <= $r && $retval == 0 ) {
-		if ( $right->{version}[$i] != 0 ) {
-		    $retval = -1; # not a match after all
-		}
-		$i++;
-	    }
-	}
-	else {
-	    while ( $i <= $l && $retval == 0 ) {
-		if ( $left->{version}[$i] != 0 ) {
-		    $retval = +1; # not a match after all
-		}
-		$i++;
-	    }
-	}
-    }
-
-    return $retval;
-}
-
-sub vbool {
-    my ($self) = @_;
-    return vcmp($self,$self->new("0"),1);
-}
-
-sub vnoop {
-    require Carp;
-    Carp::croak("operation not supported with version object");
-}
-
-sub is_alpha {
-    my ($self) = @_;
-    return (exists $self->{alpha});
-}
-
-sub qv {
-    my $value = shift;
-    my $class = $CLASS;
-    if (@_) {
-	$class = ref($value) || $value;
-	$value = shift;
-    }
-
-    $value = _un_vstring($value);
-    $value = 'v'.$value unless $value =~ /(^v|\d+\.\d+\.\d)/;
-    my $obj = $CLASS->new($value);
-    return bless $obj, $class;
-}
-
-*declare = \&qv;
-
-sub is_qv {
-    my ($self) = @_;
-    return (exists $self->{qv});
-}
-
-
-sub _verify {
-    my ($self) = @_;
-    if ( ref($self)
-	&& eval { exists $self->{version} }
-	&& ref($self->{version}) eq 'ARRAY'
-	) {
-	return 1;
-    }
-    else {
-	return 0;
-    }
-}
-
-sub _is_non_alphanumeric {
-    my $s = shift;
-    $s = new ExtUtils::MakeMaker::charstar $s;
-    while ($s) {
-	return 0 if isSPACE($s); # early out
-	return 1 unless (isALPHA($s) || isDIGIT($s) || $s =~ /[.-]/);
-	$s++;
-    }
-    return 0;
-}
-
-sub _un_vstring {
-    my $value = shift;
-    # may be a v-string
-    if ( length($value) >= 3 && $value !~ /[._]/
-	&& _is_non_alphanumeric($value)) {
-	my $tvalue;
-	if ( $] ge 5.008_001 ) {
-	    $tvalue = _find_magic_vstring($value);
-	    $value = $tvalue if length $tvalue;
-	}
-	elsif ( $] ge 5.006_000 ) {
-	    $tvalue = sprintf("v%vd",$value);
-	    if ( $tvalue =~ /^v\d+(\.\d+){2,}$/ ) {
-		# must be a v-string
-		$value = $tvalue;
-	    }
-	}
-    }
-    return $value;
-}
-
-sub _find_magic_vstring {
-    my $value = shift;
-    my $tvalue = '';
-    require B;
-    my $sv = B::svref_2object(\$value);
-    my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef;
-    while ( $magic ) {
-	if ( $magic->TYPE eq 'V' ) {
-	    $tvalue = $magic->PTR;
-	    $tvalue =~ s/^v?(.+)$/v$1/;
-	    last;
-	}
-	else {
-	    $magic = $magic->MOREMAGIC;
-	}
-    }
-    return $tvalue;
-}
-
-sub _VERSION {
-    my ($obj, $req) = @_;
-    my $class = ref($obj) || $obj;
-
-    no strict 'refs';
-    if ( exists $INC{"$class.pm"} and not %{"$class\::"} and $] >= 5.008) {
-	 # file but no package
-	require Carp;
-	Carp::croak( "$class defines neither package nor VERSION"
-	    ."--version check failed");
-    }
-
-    my $version = eval "\$$class\::VERSION";
-    if ( defined $version ) {
-	local $^W if $] <= 5.008;
-	$version = ExtUtils::MakeMaker::version::vpp->new($version);
-    }
-
-    if ( defined $req ) {
-	unless ( defined $version ) {
-	    require Carp;
-	    my $msg =  $] < 5.006
-	    ? "$class version $req required--this is only version "
-	    : "$class does not define \$$class\::VERSION"
-	      ."--version check failed";
-
-	    if ( $ENV{VERSION_DEBUG} ) {
-		Carp::confess($msg);
-	    }
-	    else {
-		Carp::croak($msg);
-	    }
-	}
-
-	$req = ExtUtils::MakeMaker::version::vpp->new($req);
-
-	if ( $req > $version ) {
-	    require Carp;
-	    if ( $req->is_qv ) {
-		Carp::croak(
-		    sprintf ("%s version %s required--".
-			"this is only version %s", $class,
-			$req->normal, $version->normal)
-		);
-	    }
-	    else {
-		Carp::croak(
-		    sprintf ("%s version %s required--".
-			"this is only version %s", $class,
-			$req->stringify, $version->stringify)
-		);
-	    }
-	}
-    }
-
-    return defined $version ? $version->stringify : undef;
-}
-
-1; #this line is important and will help the module return a true value
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Mkbootstrap.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Mkbootstrap.pm
index 97d4300814e..dc2310e0f98 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Mkbootstrap.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Mkbootstrap.pm
@@ -3,7 +3,7 @@ package ExtUtils::Mkbootstrap;
 # There's just too much Dynaloader incest here to turn on strict vars.
 use strict 'refs';
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 require Exporter;
 our @ISA = ('Exporter');
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Mksymlists.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Mksymlists.pm
index 3a9fc71361a..37180b89605 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Mksymlists.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Mksymlists.pm
@@ -10,7 +10,7 @@ use Config;
 
 our @ISA = qw(Exporter);
 our @EXPORT = qw(&Mksymlists);
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 sub Mksymlists {
     my(%spec) = @_;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS.pm b/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS.pm
index 0987500ba4d..32d74e18e8d 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS.pm
@@ -11,7 +11,7 @@ use Symbol;
 
 our $VERSION;
 BEGIN {
-  $VERSION = '3.28';
+  $VERSION = '3.31';
 }
 use ExtUtils::ParseXS::Constants $VERSION;
 use ExtUtils::ParseXS::CountLines $VERSION;
@@ -579,7 +579,7 @@ EOF
           } );
         }
         else {
-          print "\t$class *";
+          print "\t" . map_type($self, "$class *");
           $self->{var_types}->{"THIS"} = "$class *";
           $self->generate_init( {
             type          => "$class *",
@@ -1577,6 +1577,25 @@ sub QuoteArgs {
   return join (' ', ($cmd, @args));
 }
 
+# code copied from CPAN::HandleConfig::safe_quote
+#  - that has doc saying leave if start/finish with same quote, but no code
+# given text, will conditionally quote it to protect from shell
+{
+  my ($quote, $use_quote) = $^O eq 'MSWin32'
+      ? (q{"}, q{"})
+      : (q{"'}, q{'});
+  sub _safe_quote {
+      my ($self, $command) = @_;
+      # Set up quote/default quote
+      if (defined($command)
+          and $command =~ /\s/
+          and $command !~ /[$quote]/) {
+          return qq{$use_quote$command$use_quote}
+      }
+      return $command;
+  }
+}
+
 sub INCLUDE_COMMAND_handler {
   my $self = shift;
   $_ = shift;
@@ -1598,7 +1617,8 @@ sub INCLUDE_COMMAND_handler {
 
   # If $^X is used in INCLUDE_COMMAND, we know it's supposed to be
   # the same perl interpreter as we're currently running
-  s/^\s*\$\^X/$^X/;
+  my $X = $self->_safe_quote($^X); # quotes if has spaces
+  s/^\s*\$\^X/$X/;
 
   # open the new file
   open ($self->{FH}, "-|", $_)
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Constants.pm b/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Constants.pm
index 5603613489c..2319a24c2c8 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Constants.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Constants.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Symbol;
 
-our $VERSION = '3.28';
+our $VERSION = '3.31';
 
 =head1 NAME
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/CountLines.pm b/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/CountLines.pm
index b30812c5f9a..222a95c245d 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/CountLines.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/CountLines.pm
@@ -1,7 +1,7 @@
 package ExtUtils::ParseXS::CountLines;
 use strict;
 
-our $VERSION = '3.28';
+our $VERSION = '3.31';
 
 our $SECTION_END_MARKER;
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Eval.pm b/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Eval.pm
index b4f41cb2fac..73153326e91 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Eval.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Eval.pm
@@ -2,7 +2,7 @@ package ExtUtils::ParseXS::Eval;
 use strict;
 use warnings;
 
-our $VERSION = '3.28';
+our $VERSION = '3.31';
 
 =head1 NAME
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Utilities.pm b/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Utilities.pm
index 37094cb3337..41a9f6de57c 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Utilities.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/ParseXS/Utilities.pm
@@ -5,7 +5,7 @@ use Exporter;
 use File::Spec;
 use ExtUtils::ParseXS::Constants ();
 
-our $VERSION = '3.28';
+our $VERSION = '3.31';
 
 our (@ISA, @EXPORT_OK);
 @ISA = qw(Exporter);
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps.pm
index f9b568daf48..48d623ef71d 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps.pm
@@ -2,7 +2,7 @@ package ExtUtils::Typemaps;
 use 5.006001;
 use strict;
 use warnings;
-our $VERSION = '3.28';
+our $VERSION = '3.31';
 
 require ExtUtils::ParseXS;
 require ExtUtils::ParseXS::Constants;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/Cmd.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/Cmd.pm
index c0d13c68ba6..ffed504f9ff 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/Cmd.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/Cmd.pm
@@ -2,7 +2,7 @@ package ExtUtils::Typemaps::Cmd;
 use 5.006001;
 use strict;
 use warnings;
-our $VERSION = '3.28';
+our $VERSION = '3.31';
 
 use ExtUtils::Typemaps;
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/InputMap.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/InputMap.pm
index 3a7c6fe6fda..86c646d543e 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/InputMap.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/InputMap.pm
@@ -2,7 +2,7 @@ package ExtUtils::Typemaps::InputMap;
 use 5.006001;
 use strict;
 use warnings;
-our $VERSION = '3.28';
+our $VERSION = '3.31';
 
 =head1 NAME
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/OutputMap.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/OutputMap.pm
index 758ad5ef056..32cf9f93270 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/OutputMap.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/OutputMap.pm
@@ -2,7 +2,7 @@ package ExtUtils::Typemaps::OutputMap;
 use 5.006001;
 use strict;
 use warnings;
-our $VERSION = '3.28';
+our $VERSION = '3.31';
 
 =head1 NAME
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/Type.pm b/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/Type.pm
index 47a26624b12..abe93cb8ebe 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/Type.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/Typemaps/Type.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 require ExtUtils::Typemaps;
 
-our $VERSION = '3.28';
+our $VERSION = '3.31';
 
 =head1 NAME
 
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/testlib.pm b/Master/tlpkg/tlperl/lib/ExtUtils/testlib.pm
index 2a5323e1709..1756998c4d1 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/testlib.pm
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/testlib.pm
@@ -3,7 +3,7 @@ package ExtUtils::testlib;
 use strict;
 use warnings;
 
-our $VERSION = '7.04_01';
+our $VERSION = '7.10_02';
 
 use Cwd;
 use File::Spec;
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/typemap b/Master/tlpkg/tlperl/lib/ExtUtils/typemap
index 0b09641f8d6..4bfba95e9e0 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/typemap
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/typemap
@@ -378,7 +378,19 @@ T_PACKEDARRAY
 T_ARRAY
         {
 	    U32 ix_$var;
-	    EXTEND(SP,size_$var);
+            SSize_t extend_size =
+                /* The weird way this is written is because g++ is dumb
+                 * enough to warn "comparison is always false" on something
+                 * like:
+                 *
+                 * sizeof(a) > sizeof(b) && a > B_t_MAX
+                 *
+                 * (where the LH condition is false)
+                 */
+                (size_$var > (sizeof(size_$var) > sizeof(SSize_t)
+                              ? SSize_t_MAX : size_$var))
+                ? -1 : (SSize_t)size_$var;
+	    EXTEND(SP, extend_size);
 	    for (ix_$var = 0; ix_$var < size_$var; ix_$var++) {
 		ST(ix_$var) = sv_newmortal();
 	DO_ARRAY_ELEM
@@ -388,32 +400,48 @@ T_STDIO
 	{
 	    GV *gv = newGVgen("$Package");
 	    PerlIO *fp = PerlIO_importFILE($var,0);
-	    if ( fp && do_open(gv, "+<&", 3, FALSE, 0, 0, fp) )
-		sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
+	    if ( fp && do_open(gv, "+<&", 3, FALSE, 0, 0, fp) ) {
+		SV *rv = newRV_inc((SV*)gv);
+		rv = sv_bless(rv, GvSTASH(gv));
+		${"$var" eq "RETVAL" ? \"$arg = sv_2mortal(rv);"
+		    : \"sv_setsv($arg, rv);\n\t\tSvREFCNT_dec_NN(rv);"}
+	    }${"$var" ne "RETVAL" ? \"
 	    else
-		$arg = &PL_sv_undef;
+		sv_setsv($arg, &PL_sv_undef);\n" : \""}
 	}
 T_IN
 	{
 	    GV *gv = newGVgen("$Package");
-	    if ( do_open(gv, "<&", 2, FALSE, 0, 0, $var) )
-		sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
+	    if ( do_open(gv, "<&", 2, FALSE, 0, 0, $var) ) {
+		SV *rv = newRV_inc((SV*)gv);
+		rv = sv_bless(rv, GvSTASH(gv));
+		${"$var" eq "RETVAL" ? \"$arg = sv_2mortal(rv);"
+		    : \"sv_setsv($arg, rv);\n\t\tSvREFCNT_dec_NN(rv);"}
+	    }${"$var" ne "RETVAL" ? \"
 	    else
-		$arg = &PL_sv_undef;
+		sv_setsv($arg, &PL_sv_undef);\n" : \""}
 	}
 T_INOUT
 	{
 	    GV *gv = newGVgen("$Package");
-	    if ( do_open(gv, "+<&", 3, FALSE, 0, 0, $var) )
-		sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
+	    if ( do_open(gv, "+<&", 3, FALSE, 0, 0, $var) ) {
+		SV *rv = newRV_inc((SV*)gv);
+		rv = sv_bless(rv, GvSTASH(gv));
+		${"$var" eq "RETVAL" ? \"$arg = sv_2mortal(rv);"
+		    : \"sv_setsv($arg, rv);\n\t\tSvREFCNT_dec_NN(rv);"}
+	    }${"$var" ne "RETVAL" ? \"
 	    else
-		$arg = &PL_sv_undef;
+		sv_setsv($arg, &PL_sv_undef);\n" : \""}
 	}
 T_OUT
 	{
 	    GV *gv = newGVgen("$Package");
-	    if ( do_open(gv, "+>&", 3, FALSE, 0, 0, $var) )
-		sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
+	    if ( do_open(gv, "+>&", 3, FALSE, 0, 0, $var) ) {
+		SV *rv = newRV_inc((SV*)gv);
+		rv = sv_bless(rv, GvSTASH(gv));
+		${"$var" eq "RETVAL" ? \"$arg = sv_2mortal(rv);"
+		    : \"sv_setsv($arg, rv);\n\t\tSvREFCNT_dec_NN(rv);"}
+	    }${"$var" ne "RETVAL" ? \"
 	    else
-		$arg = &PL_sv_undef;
+		sv_setsv($arg, &PL_sv_undef);\n" : \""}
 	}
diff --git a/Master/tlpkg/tlperl/lib/ExtUtils/xsubpp b/Master/tlpkg/tlperl/lib/ExtUtils/xsubpp
index e2ac71a3234..d596cdff42a 100644
--- a/Master/tlpkg/tlperl/lib/ExtUtils/xsubpp
+++ b/Master/tlpkg/tlperl/lib/ExtUtils/xsubpp
@@ -1,5 +1,6 @@
 #!perl
 use 5.006;
+BEGIN { pop @INC if $INC[-1] eq '.' }
 use strict;
 eval {
   require ExtUtils::ParseXS;
diff --git a/Master/tlpkg/tlperl/lib/Fatal.pm b/Master/tlpkg/tlperl/lib/Fatal.pm
index 8fe7899819e..16e17434742 100644
--- a/Master/tlpkg/tlperl/lib/Fatal.pm
+++ b/Master/tlpkg/tlperl/lib/Fatal.pm
@@ -10,7 +10,12 @@ use Tie::RefHash;   # To cache subroutine refs
 use Config;
 use Scalar::Util qw(set_prototype);
 
-use autodie::ScopeUtil qw(on_end_of_compile_scope);
+use autodie::Util qw(
+  fill_protos
+  install_subs
+  make_core_trampoline
+  on_end_of_compile_scope
+);
 
 use constant PERL510     => ( $] >= 5.010 );
 
@@ -50,7 +55,7 @@ use constant ERROR_58_HINTS => q{Non-subroutine %s hints for %s are not supporte
 
 use constant MIN_IPC_SYS_SIMPLE_VER => 0.12;
 
-our $VERSION = '2.26'; # VERSION: Generated by DZP::OurPkg::Version
+our $VERSION = '2.29'; # VERSION: Generated by DZP::OurPkg::Version
 
 our $Debug ||= 0;
 
@@ -103,7 +108,7 @@ my %TAGS = (
 
     ':default' => [qw(:io :threads)],
 
-    # Everything in v2.07 and brefore. This was :default less chmod and chown
+    # Everything in v2.07 and before. This was :default less chmod and chown
     ':v207'    => [qw(:threads :dbm :socket read seek sysread
                    syswrite sysseek open close flock sysopen fcntl fileno
                    binmode ioctl truncate opendir closedir chdir link unlink
@@ -157,6 +162,9 @@ my %TAGS = (
     ':2.24'  => [qw(:v225)],
     ':2.25'  => [qw(:v225)],
     ':2.26'  => [qw(:default)],
+    ':2.27'  => [qw(:default)],
+    ':2.28'  => [qw(:default)],
+    ':2.29'  => [qw(:default)],
 );
 
 
@@ -293,6 +301,8 @@ my %reusable_builtins;
     CORE::shmctl
     CORE::shmget
     CORE::shmread
+    CORE::exec
+    CORE::system
 )} = ();
 
 # Cached_fatalised_sub caches the various versions of our
@@ -359,6 +369,41 @@ sub import {
         $lexical = 1;
         shift @_;
 
+        # It is currently an implementation detail that autodie is
+        # implemented as "use Fatal qw(:lexical ...)".  For backwards
+        # compatibility, we allow it - but not without a warning.
+        # NB: Optimise for autodie as it is quite possibly the most
+        # freq. consumer of this case.
+        if ($class ne 'autodie' and not $class->isa('autodie')) {
+            if ($class eq 'Fatal') {
+                warnings::warnif(
+                    'deprecated',
+                    '[deprecated] The "use Fatal qw(:lexical ...)" '
+                    . 'should be replaced by "use autodie qw(...)". '
+                    . 'Seen' # warnif appends " at <...>"
+                    );
+            } else {
+                warnings::warnif(
+                    'deprecated',
+                    "[deprecated] The class/Package $class is a "
+                    . 'subclass of Fatal and used the :lexical. '
+                    . 'If $class provides lexical error checking '
+                    . 'it should extend autodie instead of using :lexical. '
+                    . 'Seen' # warnif appends " at <...>"
+                    );
+            }
+            # "Promote" the call to autodie from here on.  This is
+            # already mostly the case (e.g. use Fatal qw(:lexical ...)
+            # would throw autodie::exceptions on error rather than the
+            # Fatal errors.
+            $class = 'autodie';
+            # This requires that autodie is in fact loaded; otherwise
+            # the "$class->X()" method calls below will explode.
+            require autodie;
+            # TODO, when autodie and Fatal are cleanly separated, we
+            # should go a "goto &autodie::import" here instead.
+        }
+
         # If we see no arguments and :lexical, we assume they
         # wanted ':default'.
 
@@ -460,7 +505,7 @@ sub import {
         }
     }
 
-    $class->_install_subs($pkg, \%install_subs);
+    install_subs($pkg, \%install_subs);
 
     if ($lexical) {
 
@@ -477,7 +522,7 @@ sub import {
         # scope.
 
         on_end_of_compile_scope(sub {
-            $class->_install_subs($pkg, \%unload_later);
+            install_subs($pkg, \%unload_later);
         });
 
         # To allow others to determine when autodie was in scope,
@@ -496,63 +541,6 @@ sub import {
 
 }
 
-# The code here is originally lifted from namespace::clean,
-# by Robert "phaylon" Sedlacek.
-#
-# It's been redesigned after feedback from ikegami on perlmonks.
-# See http://perlmonks.org/?node_id=693338 .  Ikegami rocks.
-#
-# Given a package, and hash of (subname => subref) pairs,
-# we install the given subroutines into the package.  If
-# a subref is undef, the subroutine is removed.  Otherwise
-# it replaces any existing subs which were already there.
-
-sub _install_subs {
-    my ($class, $pkg, $subs_to_reinstate) = @_;
-
-    my $pkg_sym = "${pkg}::";
-
-    # It does not hurt to do this in a predictable order, and might help debugging.
-    foreach my $sub_name (sort keys %$subs_to_reinstate) {
-
-        # We will repeatedly mess with stuff that strict "refs" does
-        # not like.  So lets just disable it once for this entire
-        # scope.
-        no strict qw(refs);   ## no critic
-
-        my $sub_ref= $subs_to_reinstate->{$sub_name};
-
-        my $full_path = $pkg_sym.$sub_name;
-        my $oldglob = *$full_path;
-
-        # Nuke the old glob.
-        delete $pkg_sym->{$sub_name};
-
-        # For some reason this local *alias = *$full_path triggers an
-        # "only used once" warning.  Not entirely sure why, but at
-        # least it is easy to silence.
-        no warnings qw(once);
-        local *alias = *$full_path;
-        use warnings qw(once);
-
-        # Copy innocent bystanders back.  Note that we lose
-        # formats; it seems that Perl versions up to 5.10.0
-        # have a bug which causes copying formats to end up in
-        # the scalar slot.  Thanks to Ben Morrow for spotting this.
-
-        foreach my $slot (qw( SCALAR ARRAY HASH IO ) ) {
-            next unless defined *$oldglob{$slot};
-            *alias = *$oldglob{$slot};
-        }
-
-        if ($sub_ref) {
-            *$full_path = $sub_ref;
-        }
-    }
-
-    return;
-}
-
 sub unimport {
     my $class = shift;
 
@@ -597,9 +585,9 @@ sub unimport {
 
     }
 
-    $class->_install_subs($pkg, \%uninstall_subs);
+    install_subs($pkg, \%uninstall_subs);
     on_end_of_compile_scope(sub {
-        $class->_install_subs($pkg, \%reinstall_subs);
+        install_subs($pkg, \%reinstall_subs);
     });
 
     return;
@@ -755,32 +743,6 @@ sub _translate_import_args {
 
 }
 
-# This code is from the original Fatal.  It scares me.
-# It is 100% compatible with the 5.10.0 Fatal module, right down
-# to the scary 'XXXX' comment.  ;)
-
-sub fill_protos {
-    my $proto = shift;
-    my ($n, $isref, @out, @out1, $seen_semi) = -1;
-    if ($proto =~ m{^\s* (?: [;] \s*)? \@}x) {
-        # prototype is entirely slurp - special case that does not
-        # require any handling.
-        return ([0, '@_']);
-    }
-
-    while ($proto =~ /\S/) {
-        $n++;
-        push(@out1,[$n,@out]) if $seen_semi;
-        push(@out, $1 . "{\$_[$n]}"), next if $proto =~ s/^\s*\\([\@%\$\&])//;
-        push(@out, "\$_[$n]"),        next if $proto =~ s/^\s*([_*\$&])//;
-        push(@out, "\@_[$n..\$#_]"),  last if $proto =~ s/^\s*(;\s*)?\@//;
-        $seen_semi = 1, $n--,         next if $proto =~ s/^\s*;//; # XXXX ????
-        die "Internal error: Unknown prototype letters: \"$proto\"";
-    }
-    push(@out1,[$n+1,@out]);
-    return @out1;
-}
-
 # This is a backwards compatible version of _write_invocation.  It's
 # recommended you don't use it.
 
@@ -1620,7 +1582,7 @@ sub _make_leak_guard {
             # As $orig_sub is "closed over", updating its value will
             # be "remembered" for the next call.
 
-            $orig_sub = _make_core_trampoline($call, $pkg, $proto);
+            $orig_sub = make_core_trampoline($call, $pkg, $proto);
 
             # We still cache it despite remembering it in $orig_sub as
             # well.  In particularly, we rely on this to avoid
@@ -1643,51 +1605,6 @@ sub _make_leak_guard {
     return $leak_guard;
 }
 
-# Create a trampoline for calling a core sub.  Essentially, a tiny sub
-# that figures out how we should be calling our core sub, puts in the
-# arguments in the right way, and bounces our control over to it.
-#
-# If we could use `goto &` on core builtins, we wouldn't need this.
-sub _make_core_trampoline {
-    my ($call, $pkg, $proto_str) = @_;
-    my $trampoline_code = 'sub {';
-    my $trampoline_sub;
-    my @protos = fill_protos($proto_str);
-
-    # TODO: It may be possible to combine this with write_invocation().
-
-    foreach my $proto (@protos) {
-        local $" = ", ";    # So @args is formatted correctly.
-        my ($count, @args) = @$proto;
-        if (@args && $args[-1] =~ m/[@#]_/) {
-            $trampoline_code .= qq/
-                if (\@_ >= $count) {
-                    return $call(@args);
-                }
-             /;
-        } else {
-            $trampoline_code .= qq<
-                if (\@_ == $count) {
-                    return $call(@args);
-                }
-             >;
-        }
-    }
-
-    $trampoline_code .= qq< Carp::croak("Internal error in Fatal/autodie.  Leak-guard failure"); } >;
-    my $E;
-
-    {
-        local $@;
-        $trampoline_sub = eval "package $pkg;\n $trampoline_code"; ## no critic
-        $E = $@;
-    }
-    die "Internal error in Fatal/autodie: Leak-guard installation failure: $E"
-        if $E;
-
-    return $trampoline_sub;
-}
-
 sub _compile_wrapper {
     my ($class, $wrapper_pkg, $core, $call, $name, $void, $lexical, $sub, $sref, $hints, $proto) = @_;
     my $real_proto = '';
diff --git a/Master/tlpkg/tlperl/lib/File/Copy.pm b/Master/tlpkg/tlperl/lib/File/Copy.pm
index 95fb4e18f34..842bd31cefe 100644
--- a/Master/tlpkg/tlperl/lib/File/Copy.pm
+++ b/Master/tlpkg/tlperl/lib/File/Copy.pm
@@ -22,7 +22,7 @@ sub syscopy;
 sub cp;
 sub mv;
 
-$VERSION = '2.30';
+$VERSION = '2.31';
 
 require Exporter;
 @ISA = qw(Exporter);
@@ -489,6 +489,14 @@ it sets C<$!>, deletes the output file, and returns 0.
 All functions return 1 on success, 0 on failure.
 $! will be set if an error was encountered.
 
+=head1 NOTES
+
+Before calling copy() or move() on a filehandle, the caller should
+close or flush() the file to avoid writes being lost. Note that this
+is the case even for move(), because it may actually copy the file,
+depending on the OS-specific inplementation, and the underlying
+filesystem(s).
+
 =head1 AUTHOR
 
 File::Copy was written by Aaron Sherman I<E<lt>ajs@ajs.comE<gt>> in 1995,
diff --git a/Master/tlpkg/tlperl/lib/File/Fetch.pm b/Master/tlpkg/tlperl/lib/File/Fetch.pm
index 7d6a263e2bf..de2ab123363 100644
--- a/Master/tlpkg/tlperl/lib/File/Fetch.pm
+++ b/Master/tlpkg/tlperl/lib/File/Fetch.pm
@@ -22,7 +22,7 @@ use vars    qw[ $VERBOSE $PREFER_BIN $FROM_EMAIL $USER_AGENT
                 $FTP_PASSIVE $TIMEOUT $DEBUG $WARN $FORCEIPV4
             ];
 
-$VERSION        = '0.48';
+$VERSION        = '0.48_01';
 $VERSION        = eval $VERSION;    # avoid warnings with development releases
 $PREFER_BIN     = 0;                # XXX TODO implement
 $FROM_EMAIL     = 'File-Fetch@example.com';
@@ -567,6 +567,8 @@ sub _lwp_fetch {
 
     };
 
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     unless( can_load( modules => $use_list ) ) {
         $METHOD_FAIL->{'lwp'} = 1;
         return;
@@ -619,6 +621,8 @@ sub _httptiny_fetch {
 
     };
 
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     unless( can_load(modules => $use_list) ) {
         $METHOD_FAIL->{'httptiny'} = 1;
         return;
@@ -658,6 +662,8 @@ sub _httplite_fetch {
 
     };
 
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     unless( can_load(modules => $use_list) ) {
         $METHOD_FAIL->{'httplite'} = 1;
         return;
@@ -733,6 +739,8 @@ sub _iosock_fetch {
         'IO::Select'       => '0.0',
     };
 
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     unless( can_load(modules => $use_list) ) {
         $METHOD_FAIL->{'iosock'} = 1;
         return;
@@ -814,6 +822,8 @@ sub _netftp_fetch {
     check( $tmpl, \%hash ) or return;
 
     ### required modules ###
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     my $use_list = { 'Net::FTP' => 0 };
 
     unless( can_load( modules => $use_list ) ) {
diff --git a/Master/tlpkg/tlperl/lib/File/Find.pm b/Master/tlpkg/tlperl/lib/File/Find.pm
index af2a2e7a6f4..03dac9fbda7 100644
--- a/Master/tlpkg/tlperl/lib/File/Find.pm
+++ b/Master/tlpkg/tlperl/lib/File/Find.pm
@@ -3,7 +3,7 @@ use 5.006;
 use strict;
 use warnings;
 use warnings::register;
-our $VERSION = '1.29';
+our $VERSION = '1.34';
 require Exporter;
 require Cwd;
 
@@ -126,6 +126,7 @@ sub is_tainted_pp {
 
 sub _find_opt {
     my $wanted = shift;
+    return unless @_;
     die "invalid top directory" unless defined $_[0];
 
     # This function must local()ize everything because callbacks may
@@ -420,9 +421,9 @@ sub _find_dir($$$) {
 	    # This dir has subdirectories.
 	    $subcount = $nlink - 2;
 
-	    # HACK: insert directories at this position. so as to preserve
-	    # the user pre-processed ordering of files.
-	    # EG: directory traversal is in user sorted order, not at random.
+	    # HACK: insert directories at this position, so as to preserve
+	    # the user pre-processed ordering of files (thus ensuring
+	    # directory traversal is in user sorted order, not at random).
             my $stack_top = @Stack;
 
 	    for my $FN (@filenames) {
@@ -772,7 +773,7 @@ $File::Find::untaint_pattern = qr|^([-+@\w./]+)$|;
 # These are hard-coded for now, but may move to hint files.
 if ($^O eq 'VMS') {
     $Is_VMS = 1;
-    $File::Find::dont_use_nlink  = 1;
+    $File::Find::dont_use_nlink = 1;
 }
 elsif ($^O eq 'MSWin32') {
     $Is_Win32 = 1;
@@ -789,7 +790,7 @@ $File::Find::dont_use_nlink = 1
 # Set dont_use_nlink in your hint file if your system's stat doesn't
 # report the number of links in a directory as an indication
 # of the number of files.
-# See, e.g. hints/machten.sh for MachTen 2.2.
+# See e.g. hints/haiku.sh for Haiku.
 unless ($File::Find::dont_use_nlink) {
     require Config;
     $File::Find::dont_use_nlink = 1 if ($Config::Config{'dont_use_nlink'});
@@ -807,11 +808,6 @@ unless ($File::Find::dont_use_nlink) {
 1;
 
 __END__
-#
-# Modified to ensure sub-directory traversal order is not inverted by stack
-# push and pops.  That is remains in the same order as in the directory file,
-# or user pre-processing (EG:sorted).
-#
 
 =head1 NAME
 
@@ -869,7 +865,7 @@ where C<find()> works from the top of the tree down.
 The first argument to C<find()> is either a code reference to your
 C<&wanted> function, or a hash reference describing the operations
 to be performed for each file.  The
-code reference is described in L<The wanted function> below.
+code reference is described in L</The wanted function> below.
 
 Here are the possible keys for the hash:
 
@@ -878,7 +874,7 @@ Here are the possible keys for the hash:
 =item C<wanted>
 
 The value should be a code reference.  This code reference is
-described in L<The wanted function> below. The C<&wanted> subroutine is
+described in L</The wanted function> below. The C<&wanted> subroutine is
 mandatory.
 
 =item C<bydepth>
@@ -922,7 +918,7 @@ If either I<follow> or I<follow_fast> is in effect:
 =item *
 
 It is guaranteed that an I<lstat> has been called before the user's
-C<wanted()> function is called. This enables fast file checks involving S<_>.
+C<wanted()> function is called. This enables fast file checks involving C<_>.
 Note that this guarantee no longer holds if I<follow> or I<follow_fast>
 are not set.
 
@@ -961,10 +957,11 @@ directories but to proceed normally otherwise.
 
 =item C<dangling_symlinks>
 
+Specifies what to do with symbolic links whose target doesn't exist.
 If true and a code reference, will be called with the symbolic link
 name and the directory it lives in as arguments.  Otherwise, if true
-and warnings are on, warning "symbolic_link_name is a dangling
-symbolic link\n" will be issued.  If false, the dangling symbolic link
+and warnings are on, a warning of the form C<"symbolic_link_name is a dangling
+symbolic link\n"> will be issued.  If false, the dangling symbolic link
 will be silently ignored.
 
 =item C<no_chdir>
@@ -975,23 +972,23 @@ C<$_> will be the same as C<$File::Find::name>.
 
 =item C<untaint>
 
-If find is used in taint-mode (-T command line switch or if EUID != UID
-or if EGID != GID) then internally directory names have to be untainted
-before they can be chdir'ed to. Therefore they are checked against a regular
-expression I<untaint_pattern>.  Note that all names passed to the user's
-I<wanted()> function are still tainted. If this option is used while
-not in taint-mode, C<untaint> is a no-op.
+If find is used in L<taint-mode|perlsec/Taint mode> (-T command line switch or
+if EUID != UID or if EGID != GID), then internally directory names have to be
+untainted before they can be C<chdir>'d to. Therefore they are checked against
+a regular expression I<untaint_pattern>.  Note that all names passed to the
+user's C<wanted()> function are still tainted. If this option is used while not
+in taint-mode, C<untaint> is a no-op.
 
 =item C<untaint_pattern>
 
 See above. This should be set using the C<qr> quoting operator.
-The default is set to  C<qr|^([-+@\w./]+)$|>.
+The default is set to C<qr|^([-+@\w./]+)$|>.
 Note that the parentheses are vital.
 
 =item C<untaint_skip>
 
 If set, a directory which fails the I<untaint_pattern> is skipped,
-including all its sub-directories. The default is to 'die' in such a case.
+including all its sub-directories. The default is to C<die> in such a case.
 
 =back
 
@@ -1027,7 +1024,7 @@ For example, when examining the file F</some/path/foo.ext> you will have:
 
 You are chdir()'d to C<$File::Find::dir> when the function is called,
 unless C<no_chdir> was specified. Note that when changing to
-directories is in effect the root directory (F</>) is a somewhat
+directories is in effect, the root directory (F</>) is a somewhat
 special case inasmuch as the concatenation of C<$File::Find::dir>,
 C<'/'> and C<$_> is not literally equal to C<$File::Find::name>. The
 table below summarizes all variants:
@@ -1051,23 +1048,24 @@ following globals available: C<$File::Find::topdir>,
 C<$File::Find::topdev>, C<$File::Find::topino>,
 C<$File::Find::topmode> and C<$File::Find::topnlink>.
 
-This library is useful for the C<find2perl> tool, which when fed,
+This library is useful for the C<find2perl> tool (distributed as part of the
+App-find2perl CPAN distribution), which when fed,
 
-    find2perl / -name .nfs\* -mtime +7 \
-        -exec rm -f {} \; -o -fstype nfs -prune
+  find2perl / -name .nfs\* -mtime +7 \
+    -exec rm -f {} \; -o -fstype nfs -prune
 
 produces something like:
 
-    sub wanted {
-        /^\.nfs.*\z/s &&
-        (($dev, $ino, $mode, $nlink, $uid, $gid) = lstat($_)) &&
-        int(-M _) > 7 &&
-        unlink($_)
-        ||
-        ($nlink || (($dev, $ino, $mode, $nlink, $uid, $gid) = lstat($_))) &&
-        $dev < 0 &&
-        ($File::Find::prune = 1);
-    }
+ sub wanted {
+    /^\.nfs.*\z/s &&
+    (($dev, $ino, $mode, $nlink, $uid, $gid) = lstat($_)) &&
+    int(-M _) > 7 &&
+    unlink($_)
+    ||
+    ($nlink || (($dev, $ino, $mode, $nlink, $uid, $gid) = lstat($_))) &&
+    $dev < 0 &&
+    ($File::Find::prune = 1);
+ }
 
 Notice the C<_> in the above C<int(-M _)>: the C<_> is a magical
 filehandle that caches the information from the preceding
@@ -1108,7 +1106,7 @@ warnings.
 
 =item $dont_use_nlink
 
-You can set the variable C<$File::Find::dont_use_nlink> to 1, if you want to
+You can set the variable C<$File::Find::dont_use_nlink> to 1 if you want to
 force File::Find to always stat directories. This was used for file systems
 that do not have an C<nlink> count matching the number of sub-directories.
 Examples are ISO-9660 (CD-ROM), AFS, HPFS (OS/2 file system), FAT (DOS file
@@ -1146,6 +1144,6 @@ The first fixed version of File::Find was 1.01.
 
 =head1 SEE ALSO
 
-find, find2perl.
+L<find(1)>, find2perl.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/File/Glob.pm b/Master/tlpkg/tlperl/lib/File/Glob.pm
index de6f72d7c36..c0b5a4720d9 100644
--- a/Master/tlpkg/tlperl/lib/File/Glob.pm
+++ b/Master/tlpkg/tlperl/lib/File/Glob.pm
@@ -37,7 +37,7 @@ pop @{$EXPORT_TAGS{bsd_glob}}; # no "glob"
 
 @EXPORT_OK   = (@{$EXPORT_TAGS{'glob'}}, 'csh_glob');
 
-$VERSION = '1.24';
+$VERSION = '1.26';
 
 sub import {
     require Exporter;
@@ -363,35 +363,47 @@ E<lt>gsar@activestate.comE<gt>, and Thomas Wegner
 E<lt>wegner_thomas@yahoo.comE<gt>.  The C glob code has the
 following copyright:
 
-    Copyright (c) 1989, 1993 The Regents of the University of California.
-    All rights reserved.
-
-    This code is derived from software contributed to Berkeley by
-    Guido van Rossum.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. Neither the name of the University nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
+Copyright (c) 1989, 1993 The Regents of the University of California.
+All rights reserved.
+
+This code is derived from software contributed to Berkeley by
+Guido van Rossum.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+=over 4
+
+=item 1.
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+=item 2.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+=item 3.
+
+Neither the name of the University nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+=back
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/File/Path.pm b/Master/tlpkg/tlperl/lib/File/Path.pm
index 23751d5fa0a..034da1e578d 100644
--- a/Master/tlpkg/tlperl/lib/File/Path.pm
+++ b/Master/tlpkg/tlperl/lib/File/Path.pm
@@ -8,30 +8,38 @@ use File::Basename ();
 use File::Spec     ();
 
 BEGIN {
-    if ($] < 5.006) {
+    if ( $] < 5.006 ) {
+
         # can't say 'opendir my $dh, $dirname'
         # need to initialise $dh
-        eval "use Symbol";
+        eval 'use Symbol';
     }
 }
 
 use Exporter ();
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION   = '2.09';
+$VERSION   = '2.12_01';
+$VERSION   = eval $VERSION;
 @ISA       = qw(Exporter);
 @EXPORT    = qw(mkpath rmtree);
 @EXPORT_OK = qw(make_path remove_tree);
 
-my $Is_VMS     = $^O eq 'VMS';
-my $Is_MacOS   = $^O eq 'MacOS';
+BEGIN {
+  for (qw(VMS MacOS MSWin32 os2)) {
+    no strict 'refs';
+    *{"_IS_\U$_"} = $^O eq $_ ? sub () { 1 } : sub () { 0 };
+  }
 
-# These OSes complain if you want to remove a file that you have no
-# write permission to:
-my $Force_Writeable = grep {$^O eq $_} qw(amigaos dos epoc MSWin32 MacOS os2);
+  # These OSes complain if you want to remove a file that you have no
+  # write permission to:
+  *_FORCE_WRITABLE = (
+    grep { $^O eq $_ } qw(amigaos dos epoc MSWin32 MacOS os2)
+  ) ? sub () { 1 } : sub () { 0 };
 
-# Unix-like systems need to stat each directory in order to detect
-# race condition. MS-Windows is immune to this particular attack.
-my $Need_Stat_Check = !($^O eq 'MSWin32');
+  # Unix-like systems need to stat each directory in order to detect
+  # race condition. MS-Windows is immune to this particular attack.
+  *_NEED_STAT_CHECK = !(_IS_MSWIN32()) ? sub () { 1 } : sub () { 0 };
+}
 
 sub _carp {
     require Carp;
@@ -48,109 +56,152 @@ sub _error {
     my $message = shift;
     my $object  = shift;
 
-    if ($arg->{error}) {
+    if ( $arg->{error} ) {
         $object = '' unless defined $object;
         $message .= ": $!" if $!;
-        push @{${$arg->{error}}}, {$object => $message};
+        push @{ ${ $arg->{error} } }, { $object => $message };
     }
     else {
-        _carp(defined($object) ? "$message for $object: $!" : "$message: $!");
+        _carp( defined($object) ? "$message for $object: $!" : "$message: $!" );
     }
 }
 
+sub __is_arg {
+    my ($arg) = @_;
+
+    # If client code blessed an array ref to HASH, this will not work
+    # properly. We could have done $arg->isa() wrapped in eval, but
+    # that would be expensive. This implementation should suffice.
+    # We could have also used Scalar::Util:blessed, but we choose not
+    # to add this dependency
+    return ( ref $arg eq 'HASH' );
+}
+
 sub make_path {
-    push @_, {} unless @_ and UNIVERSAL::isa($_[-1],'HASH');
+    push @_, {} unless @_ and __is_arg( $_[-1] );
     goto &mkpath;
 }
 
 sub mkpath {
-    my $old_style = !(@_ and UNIVERSAL::isa($_[-1],'HASH'));
+    my $old_style = !( @_ and __is_arg( $_[-1] ) );
 
     my $arg;
     my $paths;
 
     if ($old_style) {
-        my ($verbose, $mode);
-        ($paths, $verbose, $mode) = @_;
-        $paths = [$paths] unless UNIVERSAL::isa($paths,'ARRAY');
+        my ( $verbose, $mode );
+        ( $paths, $verbose, $mode ) = @_;
+        $paths = [$paths] unless UNIVERSAL::isa( $paths, 'ARRAY' );
         $arg->{verbose} = $verbose;
-        $arg->{mode}    = defined $mode ? $mode : 0777;
+        $arg->{mode} = defined $mode ? $mode : oct '777';
     }
     else {
+        my %args_permitted = map { $_ => 1 } ( qw|
+            chmod
+            error
+            group
+            mask
+            mode
+            owner
+            uid
+            user
+            verbose
+        | );
+        my @bad_args = ();
         $arg = pop @_;
-        $arg->{mode}      = delete $arg->{mask} if exists $arg->{mask};
-        $arg->{mode}      = 0777 unless exists $arg->{mode};
-        ${$arg->{error}}  = [] if exists $arg->{error};
-        $arg->{owner}     = delete $arg->{user} if exists $arg->{user};
-        $arg->{owner}     = delete $arg->{uid}  if exists $arg->{uid};
-        if (exists $arg->{owner} and $arg->{owner} =~ /\D/) {
-            my $uid = (getpwnam $arg->{owner})[2];
-            if (defined $uid) {
+        for my $k (sort keys %{$arg}) {
+            push @bad_args, $k unless $args_permitted{$k};
+        }
+        _carp("Unrecognized option(s) passed to make_path(): @bad_args")
+            if @bad_args;
+        $arg->{mode} = delete $arg->{mask} if exists $arg->{mask};
+        $arg->{mode} = oct '777' unless exists $arg->{mode};
+        ${ $arg->{error} } = [] if exists $arg->{error};
+        $arg->{owner} = delete $arg->{user} if exists $arg->{user};
+        $arg->{owner} = delete $arg->{uid}  if exists $arg->{uid};
+        if ( exists $arg->{owner} and $arg->{owner} =~ /\D/ ) {
+            my $uid = ( getpwnam $arg->{owner} )[2];
+            if ( defined $uid ) {
                 $arg->{owner} = $uid;
             }
             else {
-                _error($arg, "unable to map $arg->{owner} to a uid, ownership not changed");
+                _error( $arg,
+"unable to map $arg->{owner} to a uid, ownership not changed"
+                );
                 delete $arg->{owner};
             }
         }
-        if (exists $arg->{group} and $arg->{group} =~ /\D/) {
-            my $gid = (getgrnam $arg->{group})[2];
-            if (defined $gid) {
+        if ( exists $arg->{group} and $arg->{group} =~ /\D/ ) {
+            my $gid = ( getgrnam $arg->{group} )[2];
+            if ( defined $gid ) {
                 $arg->{group} = $gid;
             }
             else {
-                _error($arg, "unable to map $arg->{group} to a gid, group ownership not changed");
+                _error( $arg,
+"unable to map $arg->{group} to a gid, group ownership not changed"
+                );
                 delete $arg->{group};
             }
         }
-        if (exists $arg->{owner} and not exists $arg->{group}) {
-            $arg->{group} = -1; # chown will leave group unchanged
+        if ( exists $arg->{owner} and not exists $arg->{group} ) {
+            $arg->{group} = -1;    # chown will leave group unchanged
         }
-        if (exists $arg->{group} and not exists $arg->{owner}) {
-            $arg->{owner} = -1; # chown will leave owner unchanged
+        if ( exists $arg->{group} and not exists $arg->{owner} ) {
+            $arg->{owner} = -1;    # chown will leave owner unchanged
         }
         $paths = [@_];
     }
-    return _mkpath($arg, $paths);
+    return _mkpath( $arg, $paths );
 }
 
 sub _mkpath {
     my $arg   = shift;
     my $paths = shift;
 
-    my(@created,$path);
-    foreach $path (@$paths) {
+    my ( @created );
+    foreach my $path ( @{$paths} ) {
         next unless defined($path) and length($path);
-        $path .= '/' if $^O eq 'os2' and $path =~ /^\w:\z/s; # feature of CRT 
+        $path .= '/' if _IS_OS2 and $path =~ /^\w:\z/s; # feature of CRT
+
         # Logic wants Unix paths, so go with the flow.
-        if ($Is_VMS) {
+        if (_IS_VMS) {
             next if $path eq '/';
             $path = VMS::Filespec::unixify($path);
         }
         next if -d $path;
         my $parent = File::Basename::dirname($path);
-        unless (-d $parent or $path eq $parent) {
-            push(@created,_mkpath($arg, [$parent]));
+        unless ( -d $parent or $path eq $parent ) {
+            push( @created, _mkpath( $arg, [$parent] ) );
         }
         print "mkdir $path\n" if $arg->{verbose};
-        if (mkdir($path,$arg->{mode})) {
-            push(@created, $path);
-            if (exists $arg->{owner}) {
-				# NB: $arg->{group} guaranteed to be set during initialisation
-                if (!chown $arg->{owner}, $arg->{group}, $path) {
-                    _error($arg, "Cannot change ownership of $path to $arg->{owner}:$arg->{group}");
+        if ( mkdir( $path, $arg->{mode} ) ) {
+            push( @created, $path );
+            if ( exists $arg->{owner} ) {
+
+                # NB: $arg->{group} guaranteed to be set during initialisation
+                if ( !chown $arg->{owner}, $arg->{group}, $path ) {
+                    _error( $arg,
+"Cannot change ownership of $path to $arg->{owner}:$arg->{group}"
+                    );
+                }
+            }
+            if ( exists $arg->{chmod} ) {
+                if ( !chmod $arg->{chmod}, $path ) {
+                    _error( $arg,
+                        "Cannot change permissions of $path to $arg->{chmod}" );
                 }
             }
         }
         else {
             my $save_bang = $!;
-            my ($e, $e1) = ($save_bang, $^E);
+            my ( $e, $e1 ) = ( $save_bang, $^E );
             $e .= "; $e1" if $e ne $e1;
+
             # allow for another process to have created it meanwhile
-            if (!-d $path) {
+            if ( ! -d $path ) {
                 $! = $save_bang;
-                if ($arg->{error}) {
-                    push @{${$arg->{error}}}, {$path => $e};
+                if ( $arg->{error} ) {
+                    push @{ ${ $arg->{error} } }, { $path => $e };
                 }
                 else {
                     _croak("mkdir $path: $e");
@@ -162,15 +213,15 @@ sub _mkpath {
 }
 
 sub remove_tree {
-    push @_, {} unless @_ and UNIVERSAL::isa($_[-1],'HASH');
+    push @_, {} unless @_ and __is_arg( $_[-1] );
     goto &rmtree;
 }
 
 sub _is_subdir {
-    my($dir, $test) = @_;
+    my ( $dir, $test ) = @_;
 
-    my($dv, $dd) = File::Spec->splitpath($dir, 1);
-    my($tv, $td) = File::Spec->splitpath($test, 1);
+    my ( $dv, $dd ) = File::Spec->splitpath( $dir,  1 );
+    my ( $tv, $td ) = File::Spec->splitpath( $test, 1 );
 
     # not on same volume
     return 0 if $dv ne $tv;
@@ -181,33 +232,46 @@ sub _is_subdir {
     # @t can't be a subdir if it's shorter than @d
     return 0 if @t < @d;
 
-    return join('/', @d) eq join('/', splice @t, 0, +@d);
+    return join( '/', @d ) eq join( '/', splice @t, 0, +@d );
 }
 
 sub rmtree {
-    my $old_style = !(@_ and UNIVERSAL::isa($_[-1],'HASH'));
+    my $old_style = !( @_ and __is_arg( $_[-1] ) );
 
     my $arg;
     my $paths;
 
     if ($old_style) {
-        my ($verbose, $safe);
-        ($paths, $verbose, $safe) = @_;
+        my ( $verbose, $safe );
+        ( $paths, $verbose, $safe ) = @_;
         $arg->{verbose} = $verbose;
-        $arg->{safe}    = defined $safe    ? $safe    : 0;
+        $arg->{safe} = defined $safe ? $safe : 0;
 
-        if (defined($paths) and length($paths)) {
-            $paths = [$paths] unless UNIVERSAL::isa($paths,'ARRAY');
+        if ( defined($paths) and length($paths) ) {
+            $paths = [$paths] unless UNIVERSAL::isa( $paths, 'ARRAY' );
         }
         else {
-            _carp ("No root path(s) specified\n");
+            _carp("No root path(s) specified\n");
             return 0;
         }
     }
     else {
+        my %args_permitted = map { $_ => 1 } ( qw|
+            error
+            keep_root
+            result
+            safe
+            verbose
+        | );
+        my @bad_args = ();
         $arg = pop @_;
-        ${$arg->{error}}  = [] if exists $arg->{error};
-        ${$arg->{result}} = [] if exists $arg->{result};
+        for my $k (sort keys %{$arg}) {
+            push @bad_args, $k unless $args_permitted{$k};
+        }
+        _carp("Unrecognized option(s) passed to remove_tree(): @bad_args")
+            if @bad_args;
+        ${ $arg->{error} }  = [] if exists $arg->{error};
+        ${ $arg->{result} } = [] if exists $arg->{result};
         $paths = [@_];
     }
 
@@ -216,28 +280,30 @@ sub rmtree {
 
     my @clean_path;
     $arg->{cwd} = getcwd() or do {
-        _error($arg, "cannot fetch initial working directory");
+        _error( $arg, "cannot fetch initial working directory" );
         return 0;
     };
-    for ($arg->{cwd}) { /\A(.*)\Z/; $_ = $1 } # untaint
+    for ( $arg->{cwd} ) { /\A(.*)\Z/s; $_ = $1 }    # untaint
 
     for my $p (@$paths) {
+
         # need to fixup case and map \ to / on Windows
-        my $ortho_root = $^O eq 'MSWin32' ? _slash_lc($p)          : $p;
-        my $ortho_cwd  = $^O eq 'MSWin32' ? _slash_lc($arg->{cwd}) : $arg->{cwd};
+        my $ortho_root = _IS_MSWIN32 ? _slash_lc($p) : $p;
+        my $ortho_cwd =
+          _IS_MSWIN32 ? _slash_lc( $arg->{cwd} ) : $arg->{cwd};
         my $ortho_root_length = length($ortho_root);
-        $ortho_root_length-- if $^O eq 'VMS'; # don't compare '.' with ']'
-        if ($ortho_root_length && _is_subdir($ortho_root, $ortho_cwd)) {
+        $ortho_root_length-- if _IS_VMS;   # don't compare '.' with ']'
+        if ( $ortho_root_length && _is_subdir( $ortho_root, $ortho_cwd ) ) {
             local $! = 0;
-            _error($arg, "cannot remove path when cwd is $arg->{cwd}", $p);
+            _error( $arg, "cannot remove path when cwd is $arg->{cwd}", $p );
             next;
         }
 
-        if ($Is_MacOS) {
-            $p  = ":$p" unless $p =~ /:/;
-            $p .= ":"   unless $p =~ /:\z/;
+        if (_IS_MACOS) {
+            $p = ":$p" unless $p =~ /:/;
+            $p .= ":" unless $p =~ /:\z/;
         }
-        elsif ($^O eq 'MSWin32') {
+        elsif ( _IS_MSWIN32 ) {
             $p =~ s{[/\\]\z}{};
         }
         else {
@@ -246,12 +312,12 @@ sub rmtree {
         push @clean_path, $p;
     }
 
-    @{$arg}{qw(device inode perm)} = (lstat $arg->{cwd})[0,1] or do {
-        _error($arg, "cannot stat initial working directory", $arg->{cwd});
+    @{$arg}{qw(device inode perm)} = ( lstat $arg->{cwd} )[ 0, 1 ] or do {
+        _error( $arg, "cannot stat initial working directory", $arg->{cwd} );
         return 0;
     };
 
-    return _rmtree($arg, \@clean_path);
+    return _rmtree( $arg, \@clean_path );
 }
 
 sub _rmtree {
@@ -262,74 +328,94 @@ sub _rmtree {
     my $curdir = File::Spec->curdir();
     my $updir  = File::Spec->updir();
 
-    my (@files, $root);
-    ROOT_DIR:
-    foreach $root (@$paths) {
+    my ( @files, $root );
+  ROOT_DIR:
+    foreach my $root (@$paths) {
+
         # since we chdir into each directory, it may not be obvious
         # to figure out where we are if we generate a message about
         # a file name. We therefore construct a semi-canonical
         # filename, anchored from the directory being unlinked (as
         # opposed to being truly canonical, anchored from the root (/).
 
-        my $canon = $arg->{prefix}
-            ? File::Spec->catfile($arg->{prefix}, $root)
-            : $root
-        ;
+        my $canon =
+          $arg->{prefix}
+          ? File::Spec->catfile( $arg->{prefix}, $root )
+          : $root;
 
-        my ($ldev, $lino, $perm) = (lstat $root)[0,1,2] or next ROOT_DIR;
+        my ( $ldev, $lino, $perm ) = ( lstat $root )[ 0, 1, 2 ]
+          or next ROOT_DIR;
 
         if ( -d _ ) {
-            $root = VMS::Filespec::vmspath(VMS::Filespec::pathify($root)) if $Is_VMS;
+            $root = VMS::Filespec::vmspath( VMS::Filespec::pathify($root) )
+              if _IS_VMS;
+
+            if ( !chdir($root) ) {
 
-            if (!chdir($root)) {
                 # see if we can escalate privileges to get in
                 # (e.g. funny protection mask such as -w- instead of rwx)
-                $perm &= 07777;
-                my $nperm = $perm | 0700;
-                if (!($arg->{safe} or $nperm == $perm or chmod($nperm, $root))) {
-                    _error($arg, "cannot make child directory read-write-exec", $canon);
+                $perm &= oct '7777';
+                my $nperm = $perm | oct '700';
+                if (
+                    !(
+                           $arg->{safe}
+                        or $nperm == $perm
+                        or chmod( $nperm, $root )
+                    )
+                  )
+                {
+                    _error( $arg,
+                        "cannot make child directory read-write-exec", $canon );
                     next ROOT_DIR;
                 }
-                elsif (!chdir($root)) {
-                    _error($arg, "cannot chdir to child", $canon);
+                elsif ( !chdir($root) ) {
+                    _error( $arg, "cannot chdir to child", $canon );
                     next ROOT_DIR;
                 }
             }
 
-            my ($cur_dev, $cur_inode, $perm) = (stat $curdir)[0,1,2] or do {
-                _error($arg, "cannot stat current working directory", $canon);
+            my ( $cur_dev, $cur_inode, $perm ) = ( stat $curdir )[ 0, 1, 2 ]
+              or do {
+                _error( $arg, "cannot stat current working directory", $canon );
                 next ROOT_DIR;
-            };
+              };
 
-            if ($Need_Stat_Check) {
-                ($ldev eq $cur_dev and $lino eq $cur_inode)
-                    or _croak("directory $canon changed before chdir, expected dev=$ldev ino=$lino, actual dev=$cur_dev ino=$cur_inode, aborting.");
+            if (_NEED_STAT_CHECK) {
+                ( $ldev eq $cur_dev and $lino eq $cur_inode )
+                  or _croak(
+"directory $canon changed before chdir, expected dev=$ldev ino=$lino, actual dev=$cur_dev ino=$cur_inode, aborting."
+                  );
             }
 
-            $perm &= 07777; # don't forget setuid, setgid, sticky bits
-            my $nperm = $perm | 0700;
+            $perm &= oct '7777';    # don't forget setuid, setgid, sticky bits
+            my $nperm = $perm | oct '700';
 
             # notabene: 0700 is for making readable in the first place,
             # it's also intended to change it to writable in case we have
-            # to recurse in which case we are better than rm -rf for 
+            # to recurse in which case we are better than rm -rf for
             # subtrees with strange permissions
 
-            if (!($arg->{safe} or $nperm == $perm or chmod($nperm, $curdir))) {
-                _error($arg, "cannot make directory read+writeable", $canon);
+            if (
+                !(
+                       $arg->{safe}
+                    or $nperm == $perm
+                    or chmod( $nperm, $curdir )
+                )
+              )
+            {
+                _error( $arg, "cannot make directory read+writeable", $canon );
                 $nperm = $perm;
             }
 
             my $d;
             $d = gensym() if $] < 5.006;
-            if (!opendir $d, $curdir) {
-                _error($arg, "cannot opendir", $canon);
+            if ( !opendir $d, $curdir ) {
+                _error( $arg, "cannot opendir", $canon );
                 @files = ();
             }
             else {
-                no strict 'refs';
-                if (!defined ${"\cTAINT"} or ${"\cTAINT"}) {
-                    # Blindly untaint dir names if taint mode is
-                    # active, or any perl < 5.006
+                if ( !defined ${^TAINT} or ${^TAINT} ) {
+                    # Blindly untaint dir names if taint mode is active
                     @files = map { /\A(.*)\z/s; $1 } readdir $d;
                 }
                 else {
@@ -338,63 +424,85 @@ sub _rmtree {
                 closedir $d;
             }
 
-            if ($Is_VMS) {
+            if (_IS_VMS) {
+
                 # Deleting large numbers of files from VMS Files-11
                 # filesystems is faster if done in reverse ASCIIbetical order.
                 # include '.' to '.;' from blead patch #31775
-                @files = map {$_ eq '.' ? '.;' : $_} reverse @files;
+                @files = map { $_ eq '.' ? '.;' : $_ } reverse @files;
             }
 
-            @files = grep {$_ ne $updir and $_ ne $curdir} @files;
+            @files = grep { $_ ne $updir and $_ ne $curdir } @files;
 
             if (@files) {
+
                 # remove the contained files before the directory itself
                 my $narg = {%$arg};
-                @{$narg}{qw(device inode cwd prefix depth)}
-                    = ($cur_dev, $cur_inode, $updir, $canon, $arg->{depth}+1);
-                $count += _rmtree($narg, \@files);
+                @{$narg}{qw(device inode cwd prefix depth)} =
+                  ( $cur_dev, $cur_inode, $updir, $canon, $arg->{depth} + 1 );
+                $count += _rmtree( $narg, \@files );
             }
 
             # restore directory permissions of required now (in case the rmdir
             # below fails), while we are still in the directory and may do so
             # without a race via '.'
-            if ($nperm != $perm and not chmod($perm, $curdir)) {
-                _error($arg, "cannot reset chmod", $canon);
+            if ( $nperm != $perm and not chmod( $perm, $curdir ) ) {
+                _error( $arg, "cannot reset chmod", $canon );
             }
 
             # don't leave the client code in an unexpected directory
-            chdir($arg->{cwd})
-                or _croak("cannot chdir to $arg->{cwd} from $canon: $!, aborting.");
+            chdir( $arg->{cwd} )
+              or
+              _croak("cannot chdir to $arg->{cwd} from $canon: $!, aborting.");
 
             # ensure that a chdir upwards didn't take us somewhere other
             # than we expected (see CVE-2002-0435)
-            ($cur_dev, $cur_inode) = (stat $curdir)[0,1]
-                or _croak("cannot stat prior working directory $arg->{cwd}: $!, aborting.");
-
-            if ($Need_Stat_Check) {
-                ($arg->{device} eq $cur_dev and $arg->{inode} eq $cur_inode)
-                    or _croak("previous directory $arg->{cwd} changed before entering $canon, expected dev=$ldev ino=$lino, actual dev=$cur_dev ino=$cur_inode, aborting.");
+            ( $cur_dev, $cur_inode ) = ( stat $curdir )[ 0, 1 ]
+              or _croak(
+                "cannot stat prior working directory $arg->{cwd}: $!, aborting."
+              );
+
+            if (_NEED_STAT_CHECK) {
+                ( $arg->{device} eq $cur_dev and $arg->{inode} eq $cur_inode )
+                  or _croak(  "previous directory $arg->{cwd} "
+                            . "changed before entering $canon, "
+                            . "expected dev=$ldev ino=$lino, "
+                            . "actual dev=$cur_dev ino=$cur_inode, aborting."
+                  );
             }
 
-            if ($arg->{depth} or !$arg->{keep_root}) {
-                if ($arg->{safe} &&
-                    ($Is_VMS ? !&VMS::Filespec::candelete($root) : !-w $root)) {
+            if ( $arg->{depth} or !$arg->{keep_root} ) {
+                if ( $arg->{safe}
+                    && ( _IS_VMS
+                        ? !&VMS::Filespec::candelete($root)
+                        : !-w $root ) )
+                {
                     print "skipped $root\n" if $arg->{verbose};
                     next ROOT_DIR;
                 }
-                if ($Force_Writeable and !chmod $perm | 0700, $root) {
-                    _error($arg, "cannot make directory writeable", $canon);
+                if ( _FORCE_WRITABLE and !chmod $perm | oct '700', $root ) {
+                    _error( $arg, "cannot make directory writeable", $canon );
                 }
                 print "rmdir $root\n" if $arg->{verbose};
-                if (rmdir $root) {
-                    push @{${$arg->{result}}}, $root if $arg->{result};
+                if ( rmdir $root ) {
+                    push @{ ${ $arg->{result} } }, $root if $arg->{result};
                     ++$count;
                 }
                 else {
-                    _error($arg, "cannot remove directory", $canon);
-                    if ($Force_Writeable && !chmod($perm, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
-                    ) {
-                        _error($arg, sprintf("cannot restore permissions to 0%o",$perm), $canon);
+                    _error( $arg, "cannot remove directory", $canon );
+                    if (
+                        _FORCE_WRITABLE
+                        && !chmod( $perm,
+                            ( _IS_VMS ? VMS::Filespec::fileify($root) : $root )
+                        )
+                      )
+                    {
+                        _error(
+                            $arg,
+                            sprintf( "cannot restore permissions to 0%o",
+                                $perm ),
+                            $canon
+                        );
                     }
                 }
             }
@@ -402,36 +510,47 @@ sub _rmtree {
         else {
             # not a directory
             $root = VMS::Filespec::vmsify("./$root")
-                if $Is_VMS
-                   && !File::Spec->file_name_is_absolute($root)
-                   && ($root !~ m/(?<!\^)[\]>]+/);  # not already in VMS syntax
-
-            if ($arg->{safe} &&
-                ($Is_VMS ? !&VMS::Filespec::candelete($root)
-                         : !(-l $root || -w $root)))
+              if _IS_VMS
+              && !File::Spec->file_name_is_absolute($root)
+              && ( $root !~ m/(?<!\^)[\]>]+/ );    # not already in VMS syntax
+
+            if (
+                $arg->{safe}
+                && (
+                    _IS_VMS
+                    ? !&VMS::Filespec::candelete($root)
+                    : !( -l $root || -w $root )
+                )
+              )
             {
                 print "skipped $root\n" if $arg->{verbose};
                 next ROOT_DIR;
             }
 
-            my $nperm = $perm & 07777 | 0600;
-            if ($Force_Writeable and $nperm != $perm and not chmod $nperm, $root) {
-                _error($arg, "cannot make file writeable", $canon);
+            my $nperm = $perm & oct '7777' | oct '600';
+            if (    _FORCE_WRITABLE
+                and $nperm != $perm
+                and not chmod $nperm, $root )
+            {
+                _error( $arg, "cannot make file writeable", $canon );
             }
             print "unlink $canon\n" if $arg->{verbose};
+
             # delete all versions under VMS
-            for (;;) {
-                if (unlink $root) {
-                    push @{${$arg->{result}}}, $root if $arg->{result};
+            for ( ; ; ) {
+                if ( unlink $root ) {
+                    push @{ ${ $arg->{result} } }, $root if $arg->{result};
                 }
                 else {
-                    _error($arg, "cannot unlink file", $canon);
-                    $Force_Writeable and chmod($perm, $root) or
-                        _error($arg, sprintf("cannot restore permissions to 0%o",$perm), $canon);
+                    _error( $arg, "cannot unlink file", $canon );
+                    _FORCE_WRITABLE and chmod( $perm, $root )
+                      or _error( $arg,
+                        sprintf( "cannot restore permissions to 0%o", $perm ),
+                        $canon );
                     last;
                 }
                 ++$count;
-                last unless $Is_VMS && lstat $root;
+                last unless _IS_VMS && lstat $root;
             }
         }
     }
@@ -439,6 +558,7 @@ sub _rmtree {
 }
 
 sub _slash_lc {
+
     # fix up slashes and case on MSWin32 so that we can determine that
     # c:\path\to\dir is underneath C:/Path/To
     my $path = shift;
@@ -447,6 +567,7 @@ sub _slash_lc {
 }
 
 1;
+
 __END__
 
 =head1 NAME
@@ -455,35 +576,37 @@ File::Path - Create or remove directory trees
 
 =head1 VERSION
 
-This document describes version 2.09 of File::Path, released
-2013-01-17.
+This document describes version 2.12 of File::Path.
 
 =head1 SYNOPSIS
 
   use File::Path qw(make_path remove_tree);
 
-  make_path('foo/bar/baz', '/zug/zwang');
-  make_path('foo/bar/baz', '/zug/zwang', {
+  @created = make_path('foo/bar/baz', '/zug/zwang');
+  @created = make_path('foo/bar/baz', '/zug/zwang', {
       verbose => 1,
       mode => 0711,
   });
+  make_path('foo/bar/baz', '/zug/zwang', {
+      chmod => 0777,
+  });
 
-  remove_tree('foo/bar/baz', '/zug/zwang');
-  remove_tree('foo/bar/baz', '/zug/zwang', {
+  $removed_count = remove_tree('foo/bar/baz', '/zug/zwang');
+  $removed_count = remove_tree('foo/bar/baz', '/zug/zwang', {
       verbose => 1,
       error  => \my $err_list,
   });
 
   # legacy (interface promoted before v2.00)
-  mkpath('/foo/bar/baz');
-  mkpath('/foo/bar/baz', 1, 0711);
-  mkpath(['/foo/bar/baz', 'blurfl/quux'], 1, 0711);
-  rmtree('foo/bar/baz', 1, 1);
-  rmtree(['foo/bar/baz', 'blurfl/quux'], 1, 1);
+  @created = mkpath('/foo/bar/baz');
+  @created = mkpath('/foo/bar/baz', 1, 0711);
+  @created = mkpath(['/foo/bar/baz', 'blurfl/quux'], 1, 0711);
+  $removed_count = rmtree('foo/bar/baz', 1, 1);
+  $removed_count = rmtree(['foo/bar/baz', 'blurfl/quux'], 1, 1);
 
   # legacy (interface promoted before v2.06)
-  mkpath('foo/bar/baz', '/zug/zwang', { verbose => 1, mode => 0711 });
-  rmtree('foo/bar/baz', '/zug/zwang', { verbose => 1, mode => 0711 });
+  @created = mkpath('foo/bar/baz', '/zug/zwang', { verbose => 1, mode => 0711 });
+  $removed_count = rmtree('foo/bar/baz', '/zug/zwang', { verbose => 1, mode => 0711 });
 
 =head1 DESCRIPTION
 
@@ -522,6 +645,13 @@ the permissions will not be modified.
 
 C<mask> is recognised as an alias for this parameter.
 
+=item chmod => $num
+
+Takes a numeric mode to apply to each created directory (not
+modified by the current C<umask>). If the directory already exists
+(and thus does not need to be created), the permissions will
+not be modified.
+
 =item verbose => $bool
 
 If present, will cause C<make_path> to print the name of each directory
@@ -535,7 +665,7 @@ be used to store any errors that are encountered.  See the L</"ERROR
 HANDLING"> section for more information.
 
 If this parameter is not used, certain error conditions may raise
-a fatal error that will cause the program will halt, unless trapped
+a fatal error that will cause the program to halt, unless trapped
 in an C<eval> block.
 
 =item owner => $owner
@@ -550,7 +680,7 @@ as username is assumed. An error will be issued if the username cannot be
 mapped to a uid, or the uid does not exist, or the process lacks the
 privileges to change ownership.
 
-Ownwership of directories that already exist will not be changed.
+Ownership of directories that already exist will not be changed.
 
 C<user> and C<uid> are aliases of C<owner>.
 
@@ -562,7 +692,7 @@ as group name is assumed. An error will be issued if the group name cannot be
 mapped to a gid, or the gid does not exist, or the process lacks the
 privileges to change group ownership.
 
-Group ownwership of directories that already exist will not be changed.
+Group ownership of directories that already exist will not be changed.
 
     make_path '/var/tmp/webcache', {owner=>'nobody', group=>'nogroup'};
 
@@ -586,11 +716,14 @@ return value of the function is otherwise identical to make_path().
 
 The C<remove_tree> function deletes the given directories and any
 files and subdirectories they might contain, much like the Unix
-command C<rm -r> or C<del /s> on Windows.
+command C<rm -r> or the Windows commands C<rmdir /s> and C<rd /s>. The
+only exception to the function similarity is C<remove_tree> accepts
+only directories whereas C<rm -r> also accepts files.
 
 The function accepts a list of directories to be
 removed. Its behaviour may be tuned by an optional hashref
-appearing as the last parameter on the call.
+appearing as the last parameter on the call.  If an empty string is
+passed to C<remove_tree>, an error will occur.
 
 The functions returns the number of files successfully deleted.
 
@@ -671,9 +804,12 @@ remove_tree().
 
 =item B<NOTE:>
 
-The following error handling mechanism is considered
-experimental and is subject to change pending feedback from
-users.
+The following error handling mechanism is consistent throughout all
+code paths EXCEPT in cases where the ROOT node is nonexistent.  In
+version 2.11 the maintainers attempted to rectify this inconsistency
+but too many downstream modules encountered problems.  In such case,
+if you require root node evaluation or error checking prior to calling
+C<make_path> or C<remove_tree>, you should take additional precautions.
 
 =back
 
@@ -709,7 +845,7 @@ An example usage looks like:
 
 Note that if no errors are encountered, C<$err> will reference an
 empty array.  This means that C<$err> will always end up TRUE; so you
-need to test C<@$err> to determine if errors occured.
+need to test C<@$err> to determine if errors occurred.
 
 =head2 NOTES
 
@@ -947,15 +1083,43 @@ to examining directory trees.
 
 =back
 
-=head1 BUGS
+=head1 BUGS AND LIMITATIONS
+
+The following describes F<File::Path> limitations and how to report bugs.
+
+=head2 MULTITHREAD APPLICATIONS
+
+F<File::Path> B<rmtree> and B<remove_tree> will not work with multithreaded
+applications due to its use of B<chdir>.  At this time, no warning or error
+results and you will certainly encounter unexpected results.
 
-Please report all bugs on the RT queue:
+The implementation that surfaces this limitation may change in a future
+release.
+
+=head2 NFS Mount Points
+
+F<File::Path> is not responsible for triggering the automounts, mirror mounts,
+and the contents of network mounted filesystems.  If your NFS implementation
+requires an action to be performed on the filesystem in order for
+F<File::Path> to perform operations, it is strongly suggested you assure
+filesystem availability by reading the root of the mounted filesystem.
+
+=head2 REPORTING BUGS
+
+Please report all bugs on the RT queue, either via the web interface:
 
 L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=File-Path>
 
+or by email:
+
+    bug-File-Path@rt.cpan.org
+
+In either case, please B<attach> patches to the bug report rather than
+including them inline in the web post or the body of the email.
+
 You can also send pull requests to the Github repository:
 
-L<https://github.com/dland/File-Path>
+L<https://github.com/rpcme/File-Path>
 
 =head1 ACKNOWLEDGEMENTS
 
@@ -969,13 +1133,36 @@ Gisle Aas made a number of improvements to the documentation for
 
 =head1 AUTHORS
 
-Tim Bunce and Charles Bailey. Currently maintained by David Landgren
-<F<david@landgren.net>>.
+Prior authors and maintainers: Tim Bunce, Charles Bailey, and
+David Landgren <F<david@landgren.net>>.
+
+Current maintainers are Richard Elberger <F<riche@cpan.org>> and
+James (Jim) Keenan <F<jkeenan@cpan.org>>.
+
+=head1 CONTRIBUTORS
+
+Contributors to File::Path, in alphabetical order.
+
+=over 1
+
+=item <F<bulkdd@cpan.org>>
+
+=item Craig A. Berry <F<craigberry@mac.com>>
+
+=item Richard Elberger <F<riche@cpan.org>>
+
+=item Ryan Yee <F<ryee@cpan.org>>
+
+=item Skye Shaw <F<shaw@cpan.org>>
+
+=item Tom Lutz <F<tommylutz@gmail.com>>
+
+=back
 
 =head1 COPYRIGHT
 
-This module is copyright (C) Charles Bailey, Tim Bunce and
-David Landgren 1995-2013. All rights reserved.
+This module is copyright (C) Charles Bailey, Tim Bunce, David Landgren,
+James Keenan, and Richard Elberger 1995-2015. All rights reserved.
 
 =head1 LICENSE
 
diff --git a/Master/tlpkg/tlperl/lib/File/Spec.pm b/Master/tlpkg/tlperl/lib/File/Spec.pm
index 8c77c986e39..3ef0f339db3 100644
--- a/Master/tlpkg/tlperl/lib/File/Spec.pm
+++ b/Master/tlpkg/tlperl/lib/File/Spec.pm
@@ -3,8 +3,8 @@ package File::Spec;
 use strict;
 use vars qw(@ISA $VERSION);
 
-$VERSION = '3.56';
-$VERSION =~ tr/_//;
+$VERSION = '3.63_01';
+$VERSION =~ tr/_//d;
 
 my %module = (MacOS   => 'Mac',
 	      MSWin32 => 'Win32',
@@ -14,7 +14,8 @@ my %module = (MacOS   => 'Mac',
 	      NetWare => 'Win32', # Yes, File::Spec::Win32 works on NetWare.
 	      symbian => 'Win32', # Yes, File::Spec::Win32 works on symbian.
 	      dos     => 'OS2',   # Yes, File::Spec::OS2 works on DJGPP.
-	      cygwin  => 'Cygwin');
+	      cygwin  => 'Cygwin',
+	      amigaos => 'AmigaOS');
 
 
 my $module = $module{$^O} || 'Unix';
diff --git a/Master/tlpkg/tlperl/lib/File/Spec/AmigaOS.pm b/Master/tlpkg/tlperl/lib/File/Spec/AmigaOS.pm
new file mode 100644
index 00000000000..7a5889cec49
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/File/Spec/AmigaOS.pm
@@ -0,0 +1,62 @@
+package File::Spec::AmigaOS;
+
+use strict;
+use vars qw(@ISA $VERSION);
+require File::Spec::Unix;
+
+$VERSION = '3.64';
+$VERSION =~ tr/_//d;
+
+@ISA = qw(File::Spec::Unix);
+
+=head1 NAME
+
+File::Spec::AmigaOS - File::Spec for AmigaOS
+
+=head1 SYNOPSIS
+
+ require File::Spec::AmigaOS; # Done automatically by File::Spec
+                              # if needed
+
+=head1 DESCRIPTION
+
+Methods for manipulating file specifications.
+
+=head1 METHODS
+
+=over 2
+
+=item tmpdir
+
+Returns $ENV{TMPDIR} or if that is unset, "/t".
+
+=cut
+
+my $tmpdir;
+sub tmpdir {
+  return $tmpdir if defined $tmpdir;
+  $tmpdir = $_[0]->_tmpdir( $ENV{TMPDIR}, "/t" );
+}
+
+=item file_name_is_absolute
+
+Returns true if there's a colon in the file name,
+or if it begins with a slash.
+
+=cut
+
+sub file_name_is_absolute {
+  my ($self, $file) = @_;
+
+  # Not 100% robust as a "/" must not preceded a ":"
+  # but this cannot happen in a well formed path.
+  return $file =~ m{^/|:}s;
+}
+
+=back
+
+All the other methods are from L<File::Spec::Unix>.
+
+=cut
+
+1;
diff --git a/Master/tlpkg/tlperl/lib/File/Spec/Cygwin.pm b/Master/tlpkg/tlperl/lib/File/Spec/Cygwin.pm
index 1b77e6adbd1..10b14c4b9a6 100644
--- a/Master/tlpkg/tlperl/lib/File/Spec/Cygwin.pm
+++ b/Master/tlpkg/tlperl/lib/File/Spec/Cygwin.pm
@@ -4,8 +4,8 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.56';
-$VERSION =~ tr/_//;
+$VERSION = '3.63_01';
+$VERSION =~ tr/_//d;
 
 @ISA = qw(File::Spec::Unix);
 
@@ -137,7 +137,11 @@ sub case_tolerant {
   if ($mntopts and ($mntopts =~ /,managed/)) {
     return 0;
   }
-  eval { require Win32API::File; } or return 1;
+  eval {
+      local @INC = @INC;
+      pop @INC if $INC[-1] eq '.';
+      require Win32API::File;
+  } or return 1;
   my $osFsType = "\0"x256;
   my $osVolName = "\0"x256;
   my $ouFsFlags = 0;
diff --git a/Master/tlpkg/tlperl/lib/File/Spec/Epoc.pm b/Master/tlpkg/tlperl/lib/File/Spec/Epoc.pm
index 7bc386768ec..9b9e1fae587 100644
--- a/Master/tlpkg/tlperl/lib/File/Spec/Epoc.pm
+++ b/Master/tlpkg/tlperl/lib/File/Spec/Epoc.pm
@@ -3,8 +3,8 @@ package File::Spec::Epoc;
 use strict;
 use vars qw($VERSION @ISA);
 
-$VERSION = '3.56';
-$VERSION =~ tr/_//;
+$VERSION = '3.63_01';
+$VERSION =~ tr/_//d;
 
 require File::Spec::Unix;
 @ISA = qw(File::Spec::Unix);
diff --git a/Master/tlpkg/tlperl/lib/File/Spec/Functions.pm b/Master/tlpkg/tlperl/lib/File/Spec/Functions.pm
index 8eafe2483b9..a4e1b1bb338 100644
--- a/Master/tlpkg/tlperl/lib/File/Spec/Functions.pm
+++ b/Master/tlpkg/tlperl/lib/File/Spec/Functions.pm
@@ -5,8 +5,8 @@ use strict;
 
 use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
 
-$VERSION = '3.56';
-$VERSION =~ tr/_//;
+$VERSION = '3.63_01';
+$VERSION =~ tr/_//d;
 
 require Exporter;
 
diff --git a/Master/tlpkg/tlperl/lib/File/Spec/Mac.pm b/Master/tlpkg/tlperl/lib/File/Spec/Mac.pm
index 02cae14b740..22424f32510 100644
--- a/Master/tlpkg/tlperl/lib/File/Spec/Mac.pm
+++ b/Master/tlpkg/tlperl/lib/File/Spec/Mac.pm
@@ -4,8 +4,8 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.56';
-$VERSION =~ tr/_//;
+$VERSION = '3.63_01';
+$VERSION =~ tr/_//d;
 
 @ISA = qw(File::Spec::Unix);
 
diff --git a/Master/tlpkg/tlperl/lib/File/Spec/OS2.pm b/Master/tlpkg/tlperl/lib/File/Spec/OS2.pm
index fb8f101692f..0119042c9c0 100644
--- a/Master/tlpkg/tlperl/lib/File/Spec/OS2.pm
+++ b/Master/tlpkg/tlperl/lib/File/Spec/OS2.pm
@@ -4,8 +4,8 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.56';
-$VERSION =~ tr/_//;
+$VERSION = '3.63_01';
+$VERSION =~ tr/_//d;
 
 @ISA = qw(File::Spec::Unix);
 
diff --git a/Master/tlpkg/tlperl/lib/File/Spec/Unix.pm b/Master/tlpkg/tlperl/lib/File/Spec/Unix.pm
index f76b29e3566..9598dbb3621 100644
--- a/Master/tlpkg/tlperl/lib/File/Spec/Unix.pm
+++ b/Master/tlpkg/tlperl/lib/File/Spec/Unix.pm
@@ -3,9 +3,9 @@ package File::Spec::Unix;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '3.56';
+$VERSION = '3.63_01';
 my $xs_version = $VERSION;
-$VERSION =~ tr/_//;
+$VERSION =~ tr/_//d;
 
 #dont try to load XSLoader and DynaLoader only to ultimately fail on miniperl
 if(!defined &canonpath && defined &DynaLoader::boot_DynaLoader) {
diff --git a/Master/tlpkg/tlperl/lib/File/Spec/VMS.pm b/Master/tlpkg/tlperl/lib/File/Spec/VMS.pm
index 254f5248cd8..c0cc1e50434 100644
--- a/Master/tlpkg/tlperl/lib/File/Spec/VMS.pm
+++ b/Master/tlpkg/tlperl/lib/File/Spec/VMS.pm
@@ -4,8 +4,8 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.56';
-$VERSION =~ tr/_//;
+$VERSION = '3.63_01';
+$VERSION =~ tr/_//d;
 
 @ISA = qw(File::Spec::Unix);
 
@@ -39,7 +39,10 @@ via the C<DECC$FILENAME_UNIX_REPORT> CRTL feature.
 
 my $use_feature;
 BEGIN {
-    if (eval { local $SIG{__DIE__}; require VMS::Feature; }) {
+    if (eval { local $SIG{__DIE__};
+               local @INC = @INC;
+               pop @INC if $INC[-1] eq '.';
+               require VMS::Feature; }) {
         $use_feature = 1;
     }
 }
@@ -437,15 +440,13 @@ Attempt to convert an absolute file specification to a relative specification.
 
 sub abs2rel {
     my $self = shift;
-    return vmspath(File::Spec::Unix::abs2rel( $self, @_ ))
-        if ((grep m{/}, @_) && !(grep m{(?<!\^)[\[<:]}, @_));
-
     my($path,$base) = @_;
+
     $base = $self->_cwd() unless defined $base and length $base;
 
     # If there is no device or directory syntax on $base, make sure it
     # is treated as a directory.
-    $base = VMS::Filespec::vmspath($base) unless $base =~ m{(?<!\^)[\[<:]};
+    $base = vmspath($base) unless $base =~ m{(?<!\^)[\[<:]};
 
     for ($path, $base) { $_ = $self->rel2abs($_) }
 
@@ -461,7 +462,7 @@ sub abs2rel {
     
     my ($path_volume, $path_directories, $path_file) = $self->splitpath($path);
     my ($base_volume, $base_directories, $base_file) = $self->splitpath($base);
-    return $path unless lc($path_volume) eq lc($base_volume);
+    return $self->canonpath( $path ) unless lc($path_volume) eq lc($base_volume);
 
     # Now, remove all leading components that are the same
     my @pathchunks = $self->splitdir( $path_directories );
diff --git a/Master/tlpkg/tlperl/lib/File/Spec/Win32.pm b/Master/tlpkg/tlperl/lib/File/Spec/Win32.pm
index 53f3854cd72..578d61b37f8 100644
--- a/Master/tlpkg/tlperl/lib/File/Spec/Win32.pm
+++ b/Master/tlpkg/tlperl/lib/File/Spec/Win32.pm
@@ -5,8 +5,8 @@ use strict;
 use vars qw(@ISA $VERSION);
 require File::Spec::Unix;
 
-$VERSION = '3.56';
-$VERSION =~ tr/_//;
+$VERSION = '3.63_01';
+$VERSION =~ tr/_//d;
 
 @ISA = qw(File::Spec::Unix);
 
@@ -90,7 +90,11 @@ Default: 1
 =cut
 
 sub case_tolerant {
-  eval { require Win32API::File; } or return 1;
+  eval {
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
+    require Win32API::File;
+  } or return 1;
   my $drive = shift || "C:";
   my $osFsType = "\0"x256;
   my $osVolName = "\0"x256;
diff --git a/Master/tlpkg/tlperl/lib/Filter/Util/Call.pm b/Master/tlpkg/tlperl/lib/Filter/Util/Call.pm
index f282a1516d5..8b4d41a821c 100644
--- a/Master/tlpkg/tlperl/lib/Filter/Util/Call.pm
+++ b/Master/tlpkg/tlperl/lib/Filter/Util/Call.pm
@@ -1,7 +1,7 @@
-
 # Call.pm
 #
 # Copyright (c) 1995-2011 Paul Marquess. All rights reserved.
+# Copyright (c) 2011-2014 Reini Urban. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the same terms as Perl itself.
@@ -18,7 +18,7 @@ use vars qw($VERSION @ISA @EXPORT) ;
 
 @ISA = qw(Exporter DynaLoader);
 @EXPORT = qw( filter_add filter_del filter_read filter_read_exact) ;
-$VERSION = "1.54" ;
+$VERSION = "1.55" ;
 
 sub filter_read_exact($)
 {
@@ -292,6 +292,29 @@ See L<Example 4: Using filter_del> for details.
 Internal function which adds the filter, based on the L<filter_add>
 argument type.
 
+=item I<unimport()>
+
+May be used to disable a filter, but is rarely needed. See L<filter_del>.
+
+=back
+
+=head1 LIMITATIONS
+
+See L<perlfilter/LIMITATIONS> for an overview of the general problems
+filtering code in a textual line-level only.
+
+=over
+
+=item __DATA__ is ignored
+
+The content from the __DATA__ block is not filtered.
+This is a serious limitation, e.g. for the L<Switch> module.
+See L<http://search.cpan.org/perldoc?Switch#LIMITATIONS> for more.
+
+=item Max. codesize limited to 32-bit
+
+Currently internal buffer lengths are limited to 32-bit only.
+
 =back
 
 =head1 EXAMPLES
diff --git a/Master/tlpkg/tlperl/lib/Getopt/Long.pm b/Master/tlpkg/tlperl/lib/Getopt/Long.pm
index 154c008d3a9..fdc96bd20cf 100644
--- a/Master/tlpkg/tlperl/lib/Getopt/Long.pm
+++ b/Master/tlpkg/tlperl/lib/Getopt/Long.pm
@@ -4,8 +4,8 @@
 # Author          : Johan Vromans
 # Created On      : Tue Sep 11 15:00:12 1990
 # Last Modified By: Johan Vromans
-# Last Modified On: Mon Feb 23 20:29:11 2015
-# Update Count    : 1683
+# Last Modified On: Thu Oct  8 14:57:49 2015
+# Update Count    : 1697
 # Status          : Released
 
 ################ Module Preamble ################
@@ -17,10 +17,10 @@ use 5.004;
 use strict;
 
 use vars qw($VERSION);
-$VERSION        =  2.45;
+$VERSION        =  2.48;
 # For testing versions only.
 use vars qw($VERSION_STRING);
-$VERSION_STRING = "2.45";
+$VERSION_STRING = "2.48";
 
 use Exporter;
 use vars qw(@ISA @EXPORT @EXPORT_OK);
@@ -255,7 +255,12 @@ use constant PAT_XINT  =>
   "|".
 	  "0[0-7_]*".
   ")";
-use constant PAT_FLOAT => "[-+]?[0-9_]+(\.[0-9_]+)?([eE][-+]?[0-9_]+)?";
+use constant PAT_FLOAT =>
+  "[-+]?".			# optional sign
+  "(?=[0-9.])".			# must start with digit or dec.point
+  "[0-9_]*".			# digits before the dec.point
+  "(\.[0-9_]+)?".		# optional fraction
+  "([eE][-+]?[0-9_]+)?";	# optional exponent
 
 sub GetOptions(@) {
     # Shift in default array.
@@ -1104,9 +1109,13 @@ sub FindOption ($$$$$) {
     my $mand = $ctl->[CTL_AMIN];
 
     # Check if there is an option argument available.
-    if ( $gnu_compat && defined $optarg && $optarg eq '' ) {
-	return (1, $opt, $ctl, $type eq 's' ? '' : 0) ;#unless $mand;
-	$optarg = 0 unless $type eq 's';
+    if ( $gnu_compat ) {
+	my $optargtype = 0; # 0 = none, 1 = empty, 2 = nonempty
+	$optargtype = ( !defined($optarg) ? 0 : ( (length($optarg) == 0) ? 1 : 2 ) );
+	return (1, $opt, $ctl, undef)
+	  if (($optargtype == 0) && !$mand);
+	return (1, $opt, $ctl, $type eq 's' ? '' : 0)
+	  if $optargtype == 1;  # --foo=  -> return nothing
     }
 
     # Check if there is an option argument available.
@@ -1227,8 +1236,6 @@ sub FindOption ($$$$$) {
     }
 
     elsif ( $type eq 'f' ) { # real number, int is also ok
-	# We require at least one digit before a point or 'e',
-	# and at least one digit following the point and 'e'.
 	my $o_valid = PAT_FLOAT;
 	if ( $bundling && defined $rest &&
 	     $rest =~ /^($key_valid)($o_valid)(.*)$/s ) {
@@ -1298,9 +1305,6 @@ sub ValidValue ($$$$$) {
     }
 
     elsif ( $type eq 'f' ) { # real number, int is also ok
-	# We require at least one digit before a point or 'e',
-	# and at least one digit following the point and 'e'.
-	# [-]NN[.NN][eNN]
 	my $o_valid = PAT_FLOAT;
 	return $arg =~ /^$o_valid$/;
     }
@@ -1312,13 +1316,13 @@ sub Configure (@) {
     my (@options) = @_;
 
     my $prevconfig =
-      [ $error, $debug, $major_version, $minor_version,
+      [ $error, $debug, $major_version, $minor_version, $caller,
 	$autoabbrev, $getopt_compat, $ignorecase, $bundling, $order,
 	$gnu_compat, $passthrough, $genprefix, $auto_version, $auto_help,
 	$longprefix, $bundling_values ];
 
     if ( ref($options[0]) eq 'ARRAY' ) {
-	( $error, $debug, $major_version, $minor_version,
+	( $error, $debug, $major_version, $minor_version, $caller,
 	  $autoabbrev, $getopt_compat, $ignorecase, $bundling, $order,
 	  $gnu_compat, $passthrough, $genprefix, $auto_version, $auto_help,
 	  $longprefix, $bundling_values ) = @{shift(@options)};
@@ -1359,6 +1363,8 @@ sub Configure (@) {
 	}
 	elsif ( $try eq 'gnu_compat' ) {
 	    $gnu_compat = $action;
+	    $bundling = 0;
+	    $bundling_values = 1;
 	}
 	elsif ( $try =~ /^(auto_?)?version$/ ) {
 	    $auto_version = $action;
diff --git a/Master/tlpkg/tlperl/lib/HTTP/Tiny.pm b/Master/tlpkg/tlperl/lib/HTTP/Tiny.pm
index 878cce89d8f..f9e51845bb4 100644
--- a/Master/tlpkg/tlperl/lib/HTTP/Tiny.pm
+++ b/Master/tlpkg/tlperl/lib/HTTP/Tiny.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 # ABSTRACT: A small, simple, correct HTTP/1.1 client
 
-our $VERSION = '0.054';
+our $VERSION = '0.056_001';
 
 use Carp ();
 
@@ -28,7 +28,7 @@ use Carp ();
 #pod * C<max_redirect> —
 #pod     Maximum number of redirects allowed (defaults to 5)
 #pod * C<max_size> —
-#pod     Maximum response size (only when not using a data callback).  If defined, responses larger than this will return an exception.
+#pod     Maximum response size in bytes (only when not using a data callback).  If defined, responses larger than this will return an exception.
 #pod * C<http_proxy> —
 #pod     URL of a proxy server to use for HTTP connections (default is C<$ENV{http_proxy}> — if set)
 #pod * C<https_proxy> —
@@ -462,6 +462,57 @@ sub www_form_urlencode {
     return join("&", (ref $data eq 'ARRAY') ? (@terms) : (sort @terms) );
 }
 
+#pod =method can_ssl
+#pod
+#pod     $ok         = HTTP::Tiny->can_ssl;
+#pod     ($ok, $why) = HTTP::Tiny->can_ssl;
+#pod     ($ok, $why) = $http->can_ssl;
+#pod
+#pod Indicates if SSL support is available.  When called as a class object, it
+#pod checks for the correct version of L<Net::SSLeay> and L<IO::Socket::SSL>.
+#pod When called as an object methods, if C<SSL_verify> is true or if C<SSL_verify_mode>
+#pod is set in C<SSL_options>, it checks that a CA file is available.
+#pod
+#pod In scalar context, returns a boolean indicating if SSL is available.
+#pod In list context, returns the boolean and a (possibly multi-line) string of
+#pod errors indicating why SSL isn't available.
+#pod
+#pod =cut
+
+sub can_ssl {
+    my ($self) = @_;
+
+    my($ok, $reason) = (1, '');
+
+    # Need IO::Socket::SSL 1.42 for SSL_create_ctx_callback
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
+    unless (eval {require IO::Socket::SSL; IO::Socket::SSL->VERSION(1.42)}) {
+        $ok = 0;
+        $reason .= qq/IO::Socket::SSL 1.42 must be installed for https support\n/;
+    }
+
+    # Need Net::SSLeay 1.49 for MODE_AUTO_RETRY
+    unless (eval {require Net::SSLeay; Net::SSLeay->VERSION(1.49)}) {
+        $ok = 0;
+        $reason .= qq/Net::SSLeay 1.49 must be installed for https support\n/;
+    }
+
+    # If an object, check that SSL config lets us get a CA if necessary
+    if ( ref($self) && ( $self->{verify_SSL} || $self->{SSL_options}{SSL_verify_mode} ) ) {
+        my $handle = HTTP::Tiny::Handle->new(
+            SSL_options => $self->{SSL_options},
+            verify_SSL  => $self->{verify_SSL},
+        );
+        unless ( eval { $handle->_find_CA_file; 1 } ) {
+            $ok = 0;
+            $reason .= "$@";
+        }
+    }
+
+    wantarray ? ($ok, $reason) : $ok;
+}
+
 #--------------------------------------------------------------------------#
 # private methods
 #--------------------------------------------------------------------------#
@@ -766,7 +817,7 @@ sub _maybe_redirect {
     my ($self, $request, $response, $args) = @_;
     my $headers = $response->{headers};
     my ($status, $method) = ($response->{status}, $request->{method});
-    if (($status eq '303' or ($status =~ /^30[127]/ && $method =~ /^GET|HEAD$/))
+    if (($status eq '303' or ($status =~ /^30[1278]/ && $method =~ /^GET|HEAD$/))
         and $headers->{location}
         and ++$args->{redirects} <= $self->{max_redirect}
     ) {
@@ -1362,12 +1413,8 @@ sub can_write {
 }
 
 sub _assert_ssl {
-    # Need IO::Socket::SSL 1.42 for SSL_create_ctx_callback
-    die(qq/IO::Socket::SSL 1.42 must be installed for https support\n/)
-        unless eval {require IO::Socket::SSL; IO::Socket::SSL->VERSION(1.42)};
-    # Need Net::SSLeay 1.49 for MODE_AUTO_RETRY
-    die(qq/Net::SSLeay 1.49 must be installed for https support\n/)
-        unless eval {require Net::SSLeay; Net::SSLeay->VERSION(1.49)};
+    my($ok, $reason) = HTTP::Tiny->can_ssl();
+    die $reason unless $ok;
 }
 
 sub can_reuse {
@@ -1389,11 +1436,17 @@ sub can_reuse {
 sub _find_CA_file {
     my $self = shift();
 
-    return $self->{SSL_options}->{SSL_ca_file}
-        if $self->{SSL_options}->{SSL_ca_file} and -e $self->{SSL_options}->{SSL_ca_file};
+    if ( $self->{SSL_options}->{SSL_ca_file} ) {
+        unless ( -r $self->{SSL_options}->{SSL_ca_file} ) {
+            die qq/SSL_ca_file '$self->{SSL_options}->{SSL_ca_file}' not found or not readable\n/;
+        }
+        return $self->{SSL_options}->{SSL_ca_file};
+    }
 
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     return Mozilla::CA::SSL_ca_file()
-        if eval { require Mozilla::CA };
+        if eval { require Mozilla::CA; 1 };
 
     # cert list copied from golang src/crypto/x509/root_unix.go
     foreach my $ca_bundle (
@@ -1463,7 +1516,7 @@ HTTP::Tiny - A small, simple, correct HTTP/1.1 client
 
 =head1 VERSION
 
-version 0.054
+version 0.056
 
 =head1 SYNOPSIS
 
@@ -1532,7 +1585,7 @@ C<max_redirect> — Maximum number of redirects allowed (defaults to 5)
 
 =item *
 
-C<max_size> — Maximum response size (only when not using a data callback).  If defined, responses larger than this will return an exception.
+C<max_size> — Maximum response size in bytes (only when not using a data callback).  If defined, responses larger than this will return an exception.
 
 =item *
 
@@ -1738,6 +1791,21 @@ array reference, the key will be repeated with each of the values of the array
 reference.  If data is provided as a hash reference, the key/value pairs in the
 resulting string will be sorted by key and value for consistent ordering.
 
+=head2 can_ssl
+
+    $ok         = HTTP::Tiny->can_ssl;
+    ($ok, $why) = HTTP::Tiny->can_ssl;
+    ($ok, $why) = $http->can_ssl;
+
+Indicates if SSL support is available.  When called as a class object, it
+checks for the correct version of L<Net::SSLeay> and L<IO::Socket::SSL>.
+When called as an object methods, if C<SSL_verify> is true or if C<SSL_verify_mode>
+is set in C<SSL_options>, it checks that a CA file is available.
+
+In scalar context, returns a boolean indicating if SSL is available.
+In list context, returns the boolean and a (possibly multi-line) string of
+errors indicating why SSL isn't available.
+
 =for Pod::Coverage SSL_options
 agent
 cookie_jar
@@ -1758,9 +1826,12 @@ verify_SSL
 Direct C<https> connections are supported only if L<IO::Socket::SSL> 1.56 or
 greater and L<Net::SSLeay> 1.49 or greater are installed. An exception will be
 thrown if new enough versions of these modules are not installed or if the SSL
-encryption fails. An C<https> connection may be made via an C<http> proxy that
-supports the CONNECT command (i.e. RFC 2817).  You may not proxy C<https> via
-a proxy that itself requires C<https> to communicate.
+encryption fails. You can also use C<HTTP::Tiny::can_ssl()> utility function
+that returns boolean to see if the required modules are installed.
+
+An C<https> connection may be made via an C<http> proxy that supports the CONNECT
+command (i.e. RFC 2817).  You may not proxy C<https> via a proxy that itself
+requires C<https> to communicate.
 
 SSL provides two distinct capabilities:
 
@@ -1936,10 +2007,10 @@ L<URI::_punycode> and L<Net::IDN::Encode>.
 =item *
 
 Redirection is very strict against the specification.  Redirection is only
-automatic for response codes 301, 302 and 307 if the request method is 'GET' or
-'HEAD'.  Response code 303 is always converted into a 'GET' redirection, as
-mandated by the specification.  There is no automatic support for status 305
-("Use proxy") redirections.
+automatic for response codes 301, 302, 307 and 308 if the request method is
+'GET' or 'HEAD'.  Response code 303 is always converted into a 'GET'
+redirection, as mandated by the specification.  There is no automatic support
+for status 305 ("Use proxy") redirections.
 
 =item *
 
@@ -2033,7 +2104,7 @@ David Golden <dagolden@cpan.org>
 
 =head1 CONTRIBUTORS
 
-=for stopwords Alan Gardner Alessandro Ghedini Brad Gilbert Chris Nehren Weyl Claes Jakobsson Clinton Gormley Craig Berry David Mitchell Dean Pearce Edward Zborowski James Raspass Jess Robinson Lukas Eklund Martin J. Evans Martin-Louis Bright Mike Doherty Olaf Alders Petr Písař Serguei Trouchelle Sören Kornetzki Syohei YOSHIDA Tom Hukins Tony Cook
+=for stopwords Alan Gardner Alessandro Ghedini Brad Gilbert Chris Nehren Weyl Claes Jakobsson Clinton Gormley Dean Pearce Edward Zborowski James Raspass Jeremy Mates Jess Robinson Lukas Eklund Martin J. Evans Martin-Louis Bright Mike Doherty Olaf Alders Olivier Mengué Petr Písař Sören Kornetzki Syohei YOSHIDA Tatsuhiko Miyagawa Tom Hukins Tony Cook
 
 =over 4
 
@@ -2067,14 +2138,6 @@ Clinton Gormley <clint@traveljury.com>
 
 =item *
 
-Craig Berry <cberry@cpan.org>
-
-=item *
-
-David Mitchell <davem@iabyn.com>
-
-=item *
-
 Dean Pearce <pearce@pythian.com>
 
 =item *
@@ -2087,6 +2150,10 @@ James Raspass <jraspass@gmail.com>
 
 =item *
 
+Jeremy Mates <jmates@cpan.org>
+
+=item *
+
 Jess Robinson <castaway@desert-island.me.uk>
 
 =item *
@@ -2111,11 +2178,11 @@ Olaf Alders <olaf@wundersolutions.com>
 
 =item *
 
-Petr Písař <ppisar@redhat.com>
+Olivier Mengué <dolmen@cpan.org>
 
 =item *
 
-Serguei Trouchelle <stro@cpan.org>
+Petr Písař <ppisar@redhat.com>
 
 =item *
 
@@ -2127,6 +2194,10 @@ Syohei YOSHIDA <syohex@gmail.com>
 
 =item *
 
+Tatsuhiko Miyagawa <miyagawa@bulknews.net>
+
+=item *
+
 Tom Hukins <tom@eborcom.com>
 
 =item *
diff --git a/Master/tlpkg/tlperl/lib/Hash/Util.pm b/Master/tlpkg/tlperl/lib/Hash/Util.pm
index da0251059cf..a947b9a76ef 100644
--- a/Master/tlpkg/tlperl/lib/Hash/Util.pm
+++ b/Master/tlpkg/tlperl/lib/Hash/Util.pm
@@ -31,10 +31,11 @@ our @EXPORT_OK  = qw(
                      hash_seed hash_value hv_store
                      bucket_stats bucket_stats_formatted bucket_info bucket_array
                      lock_hash_recurse unlock_hash_recurse
+                     lock_hashref_recurse unlock_hashref_recurse
 
                      hash_traversal_mask
                     );
-our $VERSION = '0.18';
+our $VERSION = '0.19';
 require XSLoader;
 XSLoader::load();
 
@@ -78,6 +79,7 @@ Hash::Util - A selection of general-utility hash subroutines
                      hash_seed hash_value hv_store
                      bucket_stats bucket_info bucket_array
                      lock_hash_recurse unlock_hash_recurse
+                     lock_hashref_recurse unlock_hashref_recurse
 
                      hash_traversal_mask
                    );
@@ -364,7 +366,7 @@ sub unlock_hashref_recurse {
         if (defined($type) and $type eq 'HASH') {
             unlock_hashref_recurse($value);
         }
-        Internals::SvREADONLY($value,1);
+        Internals::SvREADONLY($value,0);
     }
     unlock_ref_keys($hash);
     return $hash;
diff --git a/Master/tlpkg/tlperl/lib/Hash/Util/FieldHash.pm b/Master/tlpkg/tlperl/lib/Hash/Util/FieldHash.pm
index 2441491fa5c..0d0b7921c3c 100644
--- a/Master/tlpkg/tlperl/lib/Hash/Util/FieldHash.pm
+++ b/Master/tlpkg/tlperl/lib/Hash/Util/FieldHash.pm
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 use Scalar::Util qw( reftype);
 
-our $VERSION = '1.15';
+our $VERSION = '1.19';
 
 require Exporter;
 our @ISA = qw(Exporter);
@@ -103,7 +103,7 @@ Returns the reference address of a reference $obj.  If $obj is
 not a reference, returns $obj.
 
 This function is a stand-in replacement for
-L<Scalar::Util::refaddr|Scalar::Util/"$addr = refaddr( $ref )">,
+L<Scalar::Util::refaddr|Scalar::Util/refaddr>,
 that is, it returns
 the reference address of its argument as a numeric value.  The only
 difference is that C<refaddr()> returns C<undef> when given a
diff --git a/Master/tlpkg/tlperl/lib/I18N/LangTags/Detect.pm b/Master/tlpkg/tlperl/lib/I18N/LangTags/Detect.pm
index f13d5460b32..a877fbfc7f7 100644
--- a/Master/tlpkg/tlperl/lib/I18N/LangTags/Detect.pm
+++ b/Master/tlpkg/tlperl/lib/I18N/LangTags/Detect.pm
@@ -11,7 +11,7 @@ use vars qw( @ISA $VERSION $MATCH_SUPERS $USING_LANGUAGE_TAGS
 BEGIN { unless(defined &DEBUG) { *DEBUG = sub () {0} } }
  # define the constant 'DEBUG' at compile-time
 
-$VERSION = "1.05";
+$VERSION = "1.05_01";
 @ISA = ();
 use I18N::LangTags qw(alternate_language_tags locale2language_tag);
 
@@ -145,6 +145,8 @@ sub _try_use {   # Basically a wrapper around "require Modulename"
   print " About to use $module ...\n" if DEBUG;
   {
     local $SIG{'__DIE__'};
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     eval "require $module"; # used to be "use $module", but no point in that.
   }
   if($@) {
diff --git a/Master/tlpkg/tlperl/lib/IO.pm b/Master/tlpkg/tlperl/lib/IO.pm
index 27629582108..44b312b6a3e 100644
--- a/Master/tlpkg/tlperl/lib/IO.pm
+++ b/Master/tlpkg/tlperl/lib/IO.pm
@@ -7,7 +7,7 @@ use Carp;
 use strict;
 use warnings;
 
-our $VERSION = "1.35";
+our $VERSION = "1.36_01";
 XSLoader::load 'IO', $VERSION;
 
 sub import {
@@ -18,6 +18,8 @@ sub import {
     
     my @l = @_ ? @_ : qw(Handle Seekable File Pipe Socket Dir);
 
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     eval join("", map { "require IO::" . (/(\w+)/)[0] . ";\n" } @l)
 	or croak $@;
 }
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Bzip2.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Bzip2.pm
index 096c7530971..61955504c91 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Bzip2.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Bzip2.pm
@@ -4,12 +4,12 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.068 qw(:Status);
+use IO::Compress::Base::Common  2.069 qw(:Status);
 
-use Compress::Raw::Bzip2  2.068 ;
+use Compress::Raw::Bzip2  2.069 ;
 
 our ($VERSION);
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
 sub mkCompObject
 {
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Deflate.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Deflate.pm
index a52b623352d..8ea7e69915f 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Deflate.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Deflate.pm
@@ -4,13 +4,13 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common 2.068 qw(:Status);
-use Compress::Raw::Zlib  2.068 qw( !crc32 !adler32 ) ;
+use IO::Compress::Base::Common 2.069 qw(:Status);
+use Compress::Raw::Zlib  2.069 qw( !crc32 !adler32 ) ;
                                   
 require Exporter;                                     
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 @ISA = qw(Exporter);
 @EXPORT_OK = @Compress::Raw::Zlib::DEFLATE_CONSTANTS;
 %EXPORT_TAGS = %Compress::Raw::Zlib::DEFLATE_CONSTANTS;
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Identity.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Identity.pm
index b001abef576..7ec9b33f557 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Identity.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Identity.pm
@@ -4,10 +4,10 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.068 qw(:Status);
+use IO::Compress::Base::Common  2.069 qw(:Status);
 our ($VERSION);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
 sub mkCompObject
 {
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Base.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Base.pm
index 20adb0e19da..0b672914b6c 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Base.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Base.pm
@@ -6,7 +6,7 @@ require 5.006 ;
 use strict ;
 use warnings;
 
-use IO::Compress::Base::Common 2.068 ;
+use IO::Compress::Base::Common 2.069 ;
 
 use IO::File (); ;
 use Scalar::Util ();
@@ -20,7 +20,7 @@ use Symbol();
 our (@ISA, $VERSION);
 @ISA    = qw(Exporter IO::File);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
 #Can't locate object method "SWASHNEW" via package "utf8" (perhaps you forgot to load "utf8"?) at .../ext/Compress-Zlib/Gzip/blib/lib/Compress/Zlib/Common.pm line 16.
 
@@ -1041,7 +1041,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Base/Common.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Base/Common.pm
index 86bcaa6ef88..ef0eb7257e1 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Base/Common.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Base/Common.pm
@@ -11,7 +11,7 @@ use File::GlobMapper;
 require Exporter;
 our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
 @ISA = qw(Exporter);
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
 @EXPORT = qw( isaFilehandle isaFilename isaScalar
               whatIsInput whatIsOutput 
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Bzip2.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Bzip2.pm
index d6c2d66a79b..2ef5cb588e5 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Bzip2.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Bzip2.pm
@@ -5,16 +5,16 @@ use warnings;
 use bytes;
 require Exporter ;
 
-use IO::Compress::Base 2.068 ;
+use IO::Compress::Base 2.069 ;
 
-use IO::Compress::Base::Common  2.068 qw();
-use IO::Compress::Adapter::Bzip2 2.068 ;
+use IO::Compress::Base::Common  2.069 qw();
+use IO::Compress::Adapter::Bzip2 2.069 ;
 
 
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $Bzip2Error = '';
 
 @ISA    = qw(Exporter IO::Compress::Base);
@@ -51,7 +51,7 @@ sub getExtraParams
 {
     my $self = shift ;
 
-    use IO::Compress::Base::Common  2.068 qw(:Parse);
+    use IO::Compress::Base::Common  2.069 qw(:Parse);
     
     return (  
             'blocksize100k' => [IO::Compress::Base::Common::Parse_unsigned,  1],
@@ -798,7 +798,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Deflate.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Deflate.pm
index 4b8095343a8..33a262a444b 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Deflate.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Deflate.pm
@@ -8,16 +8,16 @@ use bytes;
 
 require Exporter ;
 
-use IO::Compress::RawDeflate 2.068 ();
-use IO::Compress::Adapter::Deflate 2.068 ;
+use IO::Compress::RawDeflate 2.069 ();
+use IO::Compress::Adapter::Deflate 2.069 ;
 
-use IO::Compress::Zlib::Constants 2.068 ;
-use IO::Compress::Base::Common  2.068 qw();
+use IO::Compress::Zlib::Constants 2.069 ;
+use IO::Compress::Base::Common  2.069 qw();
 
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $DeflateError = '';
 
 @ISA    = qw(Exporter IO::Compress::RawDeflate);
@@ -932,7 +932,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/FAQ.pod b/Master/tlpkg/tlperl/lib/IO/Compress/FAQ.pod
index 671824dc15f..7f51b6c4c15 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/FAQ.pod
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/FAQ.pod
@@ -201,7 +201,7 @@ L<http://www.faqs.org/rfcs/rfc1952.html>
 
 The primary site for gzip is F<http://www.gzip.org>.
 
-=head2 Dealing with Concatenated gzip files
+=head2 Dealing with concatenated gzip files
 
 If the gunzip program encounters a file containing multiple gzip files
 concatenated together it will automatically uncompress them all.
@@ -227,6 +227,17 @@ include the C<MultiStream> option, as shown below
     abc
     def
 
+=head2 Reading bgzip files with IO::Uncompress::Gunzip
+
+A C<bgzip> file consists of a series of valid gzip-compliant data streams
+concatenated together. To read a file created by C<bgzip> with
+C<IO::Uncompress::Gunzip> use the C<MultiStream> option as shown in the
+previous section.
+
+See the section titled "The BGZF compression format" in
+F<http://samtools.github.io/hts-specs/SAMv1.pdf> for a definition of
+C<bgzip>.
+
 =head1 ZLIB
 
 =head2 Zlib Resources
@@ -665,7 +676,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Gzip.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Gzip.pm
index 01ee34ef15c..800421124b3 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Gzip.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Gzip.pm
@@ -8,12 +8,12 @@ use bytes;
 
 require Exporter ;
 
-use IO::Compress::RawDeflate 2.068 () ; 
-use IO::Compress::Adapter::Deflate 2.068 ;
+use IO::Compress::RawDeflate 2.069 () ; 
+use IO::Compress::Adapter::Deflate 2.069 ;
 
-use IO::Compress::Base::Common  2.068 qw(:Status );
-use IO::Compress::Gzip::Constants 2.068 ;
-use IO::Compress::Zlib::Extra 2.068 ;
+use IO::Compress::Base::Common  2.069 qw(:Status );
+use IO::Compress::Gzip::Constants 2.069 ;
+use IO::Compress::Zlib::Extra 2.069 ;
 
 BEGIN
 {
@@ -25,7 +25,7 @@ BEGIN
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $GzipError = '' ;
 
 @ISA    = qw(Exporter IO::Compress::RawDeflate);
@@ -1244,7 +1244,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Gzip/Constants.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Gzip/Constants.pm
index 2b73a3c94c6..950bdb0ac44 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Gzip/Constants.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Gzip/Constants.pm
@@ -9,7 +9,7 @@ require Exporter;
 our ($VERSION, @ISA, @EXPORT, %GZIP_OS_Names);
 our ($GZIP_FNAME_INVALID_CHAR_RE, $GZIP_FCOMMENT_INVALID_CHAR_RE);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
 @ISA = qw(Exporter);
 
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/RawDeflate.pm b/Master/tlpkg/tlperl/lib/IO/Compress/RawDeflate.pm
index 2209952cd2b..2a553014deb 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/RawDeflate.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/RawDeflate.pm
@@ -6,15 +6,15 @@ use strict ;
 use warnings;
 use bytes;
 
-use IO::Compress::Base 2.068 ;
-use IO::Compress::Base::Common  2.068 qw(:Status );
-use IO::Compress::Adapter::Deflate 2.068 ;
+use IO::Compress::Base 2.069 ;
+use IO::Compress::Base::Common  2.069 qw(:Status );
+use IO::Compress::Adapter::Deflate 2.069 ;
 
 require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $RawDeflateError = '';
 
 @ISA = qw(Exporter IO::Compress::Base);
@@ -116,8 +116,8 @@ sub getExtraParams
     return getZlibParams();
 }
 
-use IO::Compress::Base::Common  2.068 qw(:Parse);
-use Compress::Raw::Zlib  2.068 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+use IO::Compress::Base::Common  2.069 qw(:Parse);
+use Compress::Raw::Zlib  2.069 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
 our %PARAMS = (
             #'method'   => [IO::Compress::Base::Common::Parse_unsigned,  Z_DEFLATED],
             'level'     => [IO::Compress::Base::Common::Parse_signed,    Z_DEFAULT_COMPRESSION],
@@ -988,7 +988,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Zip.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Zip.pm
index f8ec20cda70..98e4f501a3a 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Zip.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Zip.pm
@@ -4,30 +4,30 @@ use strict ;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.068 qw(:Status );
-use IO::Compress::RawDeflate 2.068 ();
-use IO::Compress::Adapter::Deflate 2.068 ;
-use IO::Compress::Adapter::Identity 2.068 ;
-use IO::Compress::Zlib::Extra 2.068 ;
-use IO::Compress::Zip::Constants 2.068 ;
+use IO::Compress::Base::Common  2.069 qw(:Status );
+use IO::Compress::RawDeflate 2.069 ();
+use IO::Compress::Adapter::Deflate 2.069 ;
+use IO::Compress::Adapter::Identity 2.069 ;
+use IO::Compress::Zlib::Extra 2.069 ;
+use IO::Compress::Zip::Constants 2.069 ;
 
 use File::Spec();
 use Config;
 
-use Compress::Raw::Zlib  2.068 (); 
+use Compress::Raw::Zlib  2.069 (); 
 
 BEGIN
 {
     eval { require IO::Compress::Adapter::Bzip2 ; 
-           import  IO::Compress::Adapter::Bzip2 2.068 ; 
+           import  IO::Compress::Adapter::Bzip2 2.069 ; 
            require IO::Compress::Bzip2 ; 
-           import  IO::Compress::Bzip2 2.068 ; 
+           import  IO::Compress::Bzip2 2.069 ; 
          } ;
          
     eval { require IO::Compress::Adapter::Lzma ; 
-           import  IO::Compress::Adapter::Lzma 2.068 ; 
+           import  IO::Compress::Adapter::Lzma 2.069 ; 
            require IO::Compress::Lzma ; 
-           import  IO::Compress::Lzma 2.068 ; 
+           import  IO::Compress::Lzma 2.069 ; 
          } ;
 }
 
@@ -36,7 +36,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $ZipError = '';
 
 @ISA = qw(Exporter IO::Compress::RawDeflate);
@@ -275,6 +275,9 @@ sub mkHeader
         my $x = '';
         $x .= pack "V V", 0, 0 ; # uncompressedLength   
         $x .= pack "V V", 0, 0 ; # compressedLength   
+        
+        # Zip64 needs to be first in extra field to workaround a Windows Explorer Bug
+        # See http://www.info-zip.org/phpBB3/viewtopic.php?f=3&t=440 for details
         $extra .= IO::Compress::Zlib::Extra::mkSubField(ZIP_EXTRA_ID_ZIP64, $x);
     }
 
@@ -397,13 +400,10 @@ sub mkHeader
     }
     
     $ctl .= $filename ;
-    $ctl .= $ctlExtra ;
-    $ctl .= $comment ;
 
     *$self->{ZipData}{Offset}->add32(length $hdr) ;
 
-    *$self->{ZipData}{CentralHeader} = $ctl;
-
+    *$self->{ZipData}{CentralHeader} = [ $ctl, $ctlExtra, $comment];
 
     return $hdr;
 }
@@ -420,7 +420,7 @@ sub mkTrailer
         $crc32 = pack "V", *$self->{ZipData}{CRC32};
     }
 
-    my $ctl = *$self->{ZipData}{CentralHeader} ;
+    my ($ctl, $ctlExtra, $comment) = @{ *$self->{ZipData}{CentralHeader} };   
 
     my $sizes ;
     if (! *$self->{ZipData}{Zip64}) {
@@ -434,7 +434,6 @@ sub mkTrailer
 
     my $data = $crc32 . $sizes ;
 
-
     my $xtrasize  = *$self->{UnCompSize}->getPacked_V64() ; # Uncompressed size
        $xtrasize .= *$self->{CompSize}->getPacked_V64() ;   # Compressed size
 
@@ -456,38 +455,44 @@ sub mkTrailer
 
     substr($ctl, 16, length $crc32) = $crc32 ;
 
-    my $x = '';
+    my $zip64Payload = '';
 
-    # uncompressed length
-    if (*$self->{UnCompSize}->isAlmost64bit() || *$self->{ZipData}{Zip64} > 1) {
-        $x .= *$self->{UnCompSize}->getPacked_V64() ; 
+    # uncompressed length - only set zip64 if needed
+    if (*$self->{UnCompSize}->isAlmost64bit()) { #  || *$self->{ZipData}{Zip64}) {
+        $zip64Payload .= *$self->{UnCompSize}->getPacked_V64() ; 
     } else {
         substr($ctl, 24, 4) = *$self->{UnCompSize}->getPacked_V32() ;
     }
 
-    # compressed length
-    if (*$self->{CompSize}->isAlmost64bit() || *$self->{ZipData}{Zip64} > 1) {
-        $x .= *$self->{CompSize}->getPacked_V64() ; 
+    # compressed length - only set zip64 if needed
+    if (*$self->{CompSize}->isAlmost64bit()) { # || *$self->{ZipData}{Zip64}) {
+        $zip64Payload .= *$self->{CompSize}->getPacked_V64() ; 
     } else {
         substr($ctl, 20, 4) = *$self->{CompSize}->getPacked_V32() ;
     }
 
     # Local Header offset
-    $x .= *$self->{ZipData}{LocalHdrOffset}->getPacked_V64()
+    $zip64Payload .= *$self->{ZipData}{LocalHdrOffset}->getPacked_V64()
         if *$self->{ZipData}{LocalHdrOffset}->is64bit() ; 
 
-    # disk no - always zero, so don't need it
-    #$x .= pack "V", 0    ; 
+    # disk no - always zero, so don't need to include it.
+    #$zip64Payload .= pack "V", 0    ; 
 
-    if (length $x) {
-        my $xtra = IO::Compress::Zlib::Extra::mkSubField(ZIP_EXTRA_ID_ZIP64, $x);
-        $ctl .= $xtra ;
+    my $zip64Xtra = '';
+    
+    if (length $zip64Payload) {
+        $zip64Xtra = IO::Compress::Zlib::Extra::mkSubField(ZIP_EXTRA_ID_ZIP64, $zip64Payload);
+        
         substr($ctl, *$self->{ZipData}{ExtraOffset}, 2) = 
-             pack 'v', *$self->{ZipData}{ExtraSize} + length $xtra;
+             pack 'v', *$self->{ZipData}{ExtraSize} + length $zip64Xtra;
 
         *$self->{ZipData}{AnyZip64} = 1;
     }
 
+    # Zip64 needs to be first in extra field to workaround a Windows Explorer Bug
+    # See http://www.info-zip.org/phpBB3/viewtopic.php?f=3&t=440 for details
+    $ctl .= $zip64Xtra . $ctlExtra . $comment;
+    
     *$self->{ZipData}{Offset}->add32(length($hdr));
     *$self->{ZipData}{Offset}->add( *$self->{CompSize} );
     push @{ *$self->{ZipData}{CentralDir} }, $ctl ;
@@ -1953,7 +1958,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Zip/Constants.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Zip/Constants.pm
index bc56966a452..d72d0dc69c4 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Zip/Constants.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Zip/Constants.pm
@@ -7,7 +7,7 @@ require Exporter;
 
 our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
 @ISA = qw(Exporter);
 
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Constants.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Constants.pm
index f85364d5b7f..70f2db1997a 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Constants.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Constants.pm
@@ -9,7 +9,7 @@ require Exporter;
 
 our ($VERSION, @ISA, @EXPORT);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
 @ISA = qw(Exporter);
 
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Extra.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Extra.pm
index f99b9ed02b9..92ca20521f1 100644
--- a/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Extra.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Extra.pm
@@ -8,9 +8,9 @@ use bytes;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
-use IO::Compress::Gzip::Constants 2.068 ;
+use IO::Compress::Gzip::Constants 2.069 ;
 
 sub ExtraFieldError
 {
diff --git a/Master/tlpkg/tlperl/lib/IO/Handle.pm b/Master/tlpkg/tlperl/lib/IO/Handle.pm
index aebf74e4c02..ce976b0f443 100644
--- a/Master/tlpkg/tlperl/lib/IO/Handle.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Handle.pm
@@ -122,8 +122,8 @@ otherwise.
 This works like <$io> described in L<perlop/"I/O Operators">
 except that it's more readable and can be safely called in a
 list context but still returns just one line.  If used as the conditional
-+within a C<while> or C-style C<for> loop, however, you will need to
-+emulate the functionality of <$io> with C<< defined($_ = $io->getline) >>.
+within a C<while> or C-style C<for> loop, however, you will need to
+emulate the functionality of <$io> with C<< defined($_ = $io->getline) >>.
 
 =item $io->getlines
 
@@ -271,7 +271,7 @@ use IO ();	# Load the XS module
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = "1.35";
+$VERSION = "1.36";
 $VERSION = eval $VERSION;
 
 @EXPORT_OK = qw(
diff --git a/Master/tlpkg/tlperl/lib/IO/Poll.pm b/Master/tlpkg/tlperl/lib/IO/Poll.pm
index 47f1a135595..a02dc3db948 100644
--- a/Master/tlpkg/tlperl/lib/IO/Poll.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Poll.pm
@@ -13,7 +13,7 @@ use Exporter ();
 our(@ISA, @EXPORT_OK, @EXPORT, $VERSION);
 
 @ISA = qw(Exporter);
-$VERSION = "0.09";
+$VERSION = "0.10";
 
 @EXPORT = qw( POLLIN
 	      POLLOUT
@@ -83,7 +83,7 @@ sub poll {
 	push(@poll,$fd => $mask);
     }
 
-    my $ret = @poll ? _poll(defined($timeout) ? $timeout * 1000 : -1,@poll) : 0;
+    my $ret = _poll(defined($timeout) ? $timeout * 1000 : -1,@poll);
 
     return $ret
 	unless $ret > 0;
diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Bunzip2.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Bunzip2.pm
index 0161b8fe7b7..3d8fefcf7d1 100644
--- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Bunzip2.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Bunzip2.pm
@@ -4,12 +4,12 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common 2.068 qw(:Status);
+use IO::Compress::Base::Common 2.069 qw(:Status);
 
-use Compress::Raw::Bzip2 2.068 ;
+use Compress::Raw::Bzip2 2.069 ;
 
 our ($VERSION, @ISA);
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
 sub mkUncompObject
 {
diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Identity.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Identity.pm
index ecc66b9a807..840a34fccd4 100644
--- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Identity.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Identity.pm
@@ -4,14 +4,14 @@ use warnings;
 use strict;
 use bytes;
 
-use IO::Compress::Base::Common  2.068 qw(:Status);
+use IO::Compress::Base::Common  2.069 qw(:Status);
 use IO::Compress::Zip::Constants ;
 
 our ($VERSION);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
-use Compress::Raw::Zlib  2.068 ();
+use Compress::Raw::Zlib  2.069 ();
 
 sub mkUncompObject
 {
diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Inflate.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Inflate.pm
index 2cfe61e865d..d23eb900bfb 100644
--- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Inflate.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Inflate.pm
@@ -4,11 +4,11 @@ use strict;
 use warnings;
 #use bytes;
 
-use IO::Compress::Base::Common  2.068 qw(:Status);
-use Compress::Raw::Zlib  2.068 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
+use IO::Compress::Base::Common  2.069 qw(:Status);
+use Compress::Raw::Zlib  2.069 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
 
 our ($VERSION);
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
 
 
diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyInflate.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyInflate.pm
index fd0bd69d8c7..637e6299b1b 100644
--- a/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyInflate.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyInflate.pm
@@ -6,22 +6,22 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.068 ();
+use IO::Compress::Base::Common  2.069 ();
 
-use IO::Uncompress::Adapter::Inflate  2.068 ();
+use IO::Uncompress::Adapter::Inflate  2.069 ();
 
 
-use IO::Uncompress::Base  2.068 ;
-use IO::Uncompress::Gunzip  2.068 ;
-use IO::Uncompress::Inflate  2.068 ;
-use IO::Uncompress::RawInflate  2.068 ;
-use IO::Uncompress::Unzip  2.068 ;
+use IO::Uncompress::Base  2.069 ;
+use IO::Uncompress::Gunzip  2.069 ;
+use IO::Uncompress::Inflate  2.069 ;
+use IO::Uncompress::RawInflate  2.069 ;
+use IO::Uncompress::Unzip  2.069 ;
 
 require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $AnyInflateError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
@@ -48,7 +48,7 @@ sub anyinflate
 
 sub getExtraParams
 {
-    use IO::Compress::Base::Common  2.068 qw(:Parse);
+    use IO::Compress::Base::Common  2.069 qw(:Parse);
     return ( 'rawinflate' => [Parse_boolean,  0] ) ;
 }
 
@@ -995,7 +995,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyUncompress.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyUncompress.pm
index 0d2568e5b3c..92a04a45d9d 100644
--- a/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyUncompress.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyUncompress.pm
@@ -4,16 +4,16 @@ use strict;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common 2.068 ();
+use IO::Compress::Base::Common 2.069 ();
 
-use IO::Uncompress::Base 2.068 ;
+use IO::Uncompress::Base 2.069 ;
 
 
 require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $AnyUncompressError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
@@ -27,22 +27,24 @@ Exporter::export_ok_tags('all');
 
 BEGIN
 {
-   eval ' use IO::Uncompress::Adapter::Inflate 2.068 ;';
-   eval ' use IO::Uncompress::Adapter::Bunzip2 2.068 ;';
-   eval ' use IO::Uncompress::Adapter::LZO 2.068 ;';
-   eval ' use IO::Uncompress::Adapter::Lzf 2.068 ;';
-   eval ' use IO::Uncompress::Adapter::UnLzma 2.068 ;';
-   eval ' use IO::Uncompress::Adapter::UnXz 2.068 ;';
-
-   eval ' use IO::Uncompress::Bunzip2 2.068 ;';
-   eval ' use IO::Uncompress::UnLzop 2.068 ;';
-   eval ' use IO::Uncompress::Gunzip 2.068 ;';
-   eval ' use IO::Uncompress::Inflate 2.068 ;';
-   eval ' use IO::Uncompress::RawInflate 2.068 ;';
-   eval ' use IO::Uncompress::Unzip 2.068 ;';
-   eval ' use IO::Uncompress::UnLzf 2.068 ;';
-   eval ' use IO::Uncompress::UnLzma 2.068 ;';
-   eval ' use IO::Uncompress::UnXz 2.068 ;';
+   local @INC = @INC;
+   pop @INC if $INC[-1] eq '.';
+   eval ' use IO::Uncompress::Adapter::Inflate 2.069 ;';
+   eval ' use IO::Uncompress::Adapter::Bunzip2 2.069 ;';
+   eval ' use IO::Uncompress::Adapter::LZO 2.069 ;';
+   eval ' use IO::Uncompress::Adapter::Lzf 2.069 ;';
+   eval ' use IO::Uncompress::Adapter::UnLzma 2.069 ;';
+   eval ' use IO::Uncompress::Adapter::UnXz 2.069 ;';
+
+   eval ' use IO::Uncompress::Bunzip2 2.069 ;';
+   eval ' use IO::Uncompress::UnLzop 2.069 ;';
+   eval ' use IO::Uncompress::Gunzip 2.069 ;';
+   eval ' use IO::Uncompress::Inflate 2.069 ;';
+   eval ' use IO::Uncompress::RawInflate 2.069 ;';
+   eval ' use IO::Uncompress::Unzip 2.069 ;';
+   eval ' use IO::Uncompress::UnLzf 2.069 ;';
+   eval ' use IO::Uncompress::UnLzma 2.069 ;';
+   eval ' use IO::Uncompress::UnXz 2.069 ;';
 }
 
 sub new
@@ -1025,7 +1027,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Base.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Base.pm
index 04348a23540..0906f34f2a8 100644
--- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Base.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Base.pm
@@ -9,12 +9,12 @@ our (@ISA, $VERSION, @EXPORT_OK, %EXPORT_TAGS);
 @ISA    = qw(Exporter IO::File);
 
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
 use constant G_EOF => 0 ;
 use constant G_ERR => -1 ;
 
-use IO::Compress::Base::Common 2.068 ;
+use IO::Compress::Base::Common 2.069 ;
 
 use IO::File ;
 use Symbol;
@@ -1549,7 +1549,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Bunzip2.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Bunzip2.pm
index c6e7f466ad6..97bc415878a 100644
--- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Bunzip2.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Bunzip2.pm
@@ -4,15 +4,15 @@ use strict ;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common 2.068 qw(:Status );
+use IO::Compress::Base::Common 2.069 qw(:Status );
 
-use IO::Uncompress::Base 2.068 ;
-use IO::Uncompress::Adapter::Bunzip2 2.068 ;
+use IO::Uncompress::Base 2.069 ;
+use IO::Uncompress::Adapter::Bunzip2 2.069 ;
 
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $Bunzip2Error = '';
 
 @ISA    = qw( Exporter IO::Uncompress::Base );
@@ -903,7 +903,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Gunzip.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Gunzip.pm
index 1f33f0b2ae0..a27f39d5287 100644
--- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Gunzip.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Gunzip.pm
@@ -9,12 +9,12 @@ use strict ;
 use warnings;
 use bytes;
 
-use IO::Uncompress::RawInflate 2.068 ;
+use IO::Uncompress::RawInflate 2.069 ;
 
-use Compress::Raw::Zlib 2.068 () ;
-use IO::Compress::Base::Common 2.068 qw(:Status );
-use IO::Compress::Gzip::Constants 2.068 ;
-use IO::Compress::Zlib::Extra 2.068 ;
+use Compress::Raw::Zlib 2.069 () ;
+use IO::Compress::Base::Common 2.069 qw(:Status );
+use IO::Compress::Gzip::Constants 2.069 ;
+use IO::Compress::Zlib::Extra 2.069 ;
 
 require Exporter ;
 
@@ -28,7 +28,7 @@ Exporter::export_ok_tags('all');
 
 $GunzipError = '';
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 
 sub new
 {
@@ -1118,7 +1118,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Inflate.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Inflate.pm
index 1330731e42a..db0f70cb2ea 100644
--- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Inflate.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Inflate.pm
@@ -5,15 +5,15 @@ use strict ;
 use warnings;
 use bytes;
 
-use IO::Compress::Base::Common  2.068 qw(:Status );
-use IO::Compress::Zlib::Constants 2.068 ;
+use IO::Compress::Base::Common  2.069 qw(:Status );
+use IO::Compress::Zlib::Constants 2.069 ;
 
-use IO::Uncompress::RawInflate  2.068 ;
+use IO::Uncompress::RawInflate  2.069 ;
 
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $InflateError = '';
 
 @ISA    = qw( Exporter IO::Uncompress::RawInflate );
@@ -990,7 +990,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/RawInflate.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/RawInflate.pm
index 3a375a7c16e..20a91626423 100644
--- a/Master/tlpkg/tlperl/lib/IO/Uncompress/RawInflate.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/RawInflate.pm
@@ -5,16 +5,16 @@ use strict ;
 use warnings;
 #use bytes;
 
-use Compress::Raw::Zlib  2.068 ;
-use IO::Compress::Base::Common  2.068 qw(:Status );
+use Compress::Raw::Zlib  2.069 ;
+use IO::Compress::Base::Common  2.069 qw(:Status );
 
-use IO::Uncompress::Base  2.068 ;
-use IO::Uncompress::Adapter::Inflate  2.068 ;
+use IO::Uncompress::Base  2.069 ;
+use IO::Uncompress::Adapter::Inflate  2.069 ;
 
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $RawInflateError = '';
 
 @ISA    = qw( Exporter IO::Uncompress::Base );
@@ -1118,7 +1118,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Unzip.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Unzip.pm
index f73313fe8ed..5394ec899df 100644
--- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Unzip.pm
+++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Unzip.pm
@@ -9,14 +9,14 @@ use warnings;
 #use bytes;
 
 use IO::File;
-use IO::Uncompress::RawInflate  2.068 ;
-use IO::Compress::Base::Common  2.068 qw(:Status );
-use IO::Uncompress::Adapter::Inflate  2.068 ;
-use IO::Uncompress::Adapter::Identity 2.068 ;
-use IO::Compress::Zlib::Extra 2.068 ;
-use IO::Compress::Zip::Constants 2.068 ;
+use IO::Uncompress::RawInflate  2.069 ;
+use IO::Compress::Base::Common  2.069 qw(:Status );
+use IO::Uncompress::Adapter::Inflate  2.069 ;
+use IO::Uncompress::Adapter::Identity 2.069 ;
+use IO::Compress::Zlib::Extra 2.069 ;
+use IO::Compress::Zip::Constants 2.069 ;
 
-use Compress::Raw::Zlib  2.068 () ;
+use Compress::Raw::Zlib  2.069 () ;
 
 BEGIN
 {
@@ -31,7 +31,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup);
 
-$VERSION = '2.068';
+$VERSION = '2.069_001';
 $UnzipError = '';
 
 @ISA    = qw(Exporter IO::Uncompress::RawInflate);
@@ -1861,7 +1861,7 @@ See the Changes file.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2005-2014 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2015 Paul Marquess. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/IPC/Cmd.pm b/Master/tlpkg/tlperl/lib/IPC/Cmd.pm
index 6a82bdff9bd..4705f044338 100644
--- a/Master/tlpkg/tlperl/lib/IPC/Cmd.pm
+++ b/Master/tlpkg/tlperl/lib/IPC/Cmd.pm
@@ -18,7 +18,7 @@ BEGIN {
                         $HAVE_MONOTONIC
                     ];
 
-    $VERSION        = '0.92';
+    $VERSION        = '0.92_01';
     $VERBOSE        = 0;
     $DEBUG          = 0;
     $WARN           = 1;
@@ -142,6 +142,8 @@ sub can_use_ipc_run     {
     return if IS_WIN98;
 
     ### if we don't have ipc::run, we obviously can't use it.
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     return unless can_load(
                         modules => { 'IPC::Run' => '0.55' },
                         verbose => ($WARN && $verbose),
@@ -169,6 +171,8 @@ sub can_use_ipc_open3   {
 
     ### IPC::Open3 works on every non-VMS platform, but it can't
     ### capture buffers on win32 :(
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     return unless can_load(
         modules => { map {$_ => '0.0'} qw|IPC::Open3 IO::Select Symbol| },
         verbose => ($WARN && $verbose),
diff --git a/Master/tlpkg/tlperl/lib/IPC/Open3.pm b/Master/tlpkg/tlperl/lib/IPC/Open3.pm
index 7c7e9b532ad..e5924a30a65 100644
--- a/Master/tlpkg/tlperl/lib/IPC/Open3.pm
+++ b/Master/tlpkg/tlperl/lib/IPC/Open3.pm
@@ -9,7 +9,7 @@ require Exporter;
 use Carp;
 use Symbol qw(gensym qualify);
 
-$VERSION	= '1.18';
+$VERSION	= '1.20';
 @ISA		= qw(Exporter);
 @EXPORT		= qw(open3);
 
@@ -280,7 +280,7 @@ sub _open3 {
 		return 1 if ($_[0] eq '-');
 		exec @_ or do {
 		    local($")=(" ");
-		    croak "$Me: exec of @_ failed";
+		    croak "$Me: exec of @_ failed: $!";
 		};
 	    } and do {
                 close $stat_w;
@@ -412,7 +412,11 @@ sub spawn_with_handles {
 	} else {
 	    $pid = eval { system 1, @_ }; # 1 == P_NOWAIT
 	}
-	push @errs, "IO::Pipe: Can't spawn-NOWAIT: $!" if !$pid || $pid < 0;
+	if($@) {
+	    push @errs, "IO::Pipe: Can't spawn-NOWAIT: $@";
+	} elsif(!$pid || $pid < 0) {
+	    push @errs, "IO::Pipe: Can't spawn-NOWAIT: $!";
+	}
     }
 
     # Do this in reverse, so that STDERR is restored first:
diff --git a/Master/tlpkg/tlperl/lib/JSON/PP.pm b/Master/tlpkg/tlperl/lib/JSON/PP.pm
index 7a011a4dea9..1e29eee039f 100644
--- a/Master/tlpkg/tlperl/lib/JSON/PP.pm
+++ b/Master/tlpkg/tlperl/lib/JSON/PP.pm
@@ -11,7 +11,7 @@ use Carp ();
 use B ();
 #use Devel::Peek;
 
-$JSON::PP::VERSION = '2.27300';
+$JSON::PP::VERSION = '2.27300_01';
 
 @JSON::PP::EXPORT = qw(encode_json decode_json from_json to_json);
 
diff --git a/Master/tlpkg/tlperl/lib/List/Util.pm b/Master/tlpkg/tlperl/lib/List/Util.pm
index 837b6c89a22..75866aa6c6b 100644
--- a/Master/tlpkg/tlperl/lib/List/Util.pm
+++ b/Master/tlpkg/tlperl/lib/List/Util.pm
@@ -12,9 +12,9 @@ require Exporter;
 our @ISA        = qw(Exporter);
 our @EXPORT_OK  = qw(
   all any first min max minstr maxstr none notall product reduce sum sum0 shuffle
-  pairmap pairgrep pairfirst pairs pairkeys pairvalues
+  pairs unpairs pairkeys pairvalues pairmap pairgrep pairfirst
 );
-our $VERSION    = "1.41";
+our $VERSION    = "1.42_02";
 our $XS_VERSION = $VERSION;
 $VERSION    = eval $VERSION;
 
@@ -254,8 +254,119 @@ or just a list of values. The functions will all preserve the original ordering
 of the pairs, and will not be confused by multiple pairs having the same "key"
 value - nor even do they require that the first of each pair be a plain string.
 
+B<NOTE>: At the time of writing, the following C<pair*> functions that take a
+block do not modify the value of C<$_> within the block, and instead operate
+using the C<$a> and C<$b> globals instead. This has turned out to be a poor
+design, as it precludes the ability to provide a C<pairsort> function. Better
+would be to pass pair-like objects as 2-element array references in C<$_>, in
+a style similar to the return value of the C<pairs> function. At some future
+version this behaviour may be added.
+
+Until then, users are alerted B<NOT> to rely on the value of C<$_> remaining
+unmodified between the outside and the inside of the control block. In
+particular, the following example is B<UNSAFE>:
+
+ my @kvlist = ...
+
+ foreach (qw( some keys here )) {
+    my @items = pairgrep { $a eq $_ } @kvlist;
+    ...
+ }
+
+Instead, write this using a lexical variable:
+
+ foreach my $key (qw( some keys here )) {
+    my @items = pairgrep { $a eq $key } @kvlist;
+    ...
+ }
+
 =cut
 
+=head2 pairs
+
+    my @pairs = pairs @kvlist;
+
+I<Since version 1.29.>
+
+A convenient shortcut to operating on even-sized lists of pairs, this function
+returns a list of ARRAY references, each containing two items from the given
+list. It is a more efficient version of
+
+    @pairs = pairmap { [ $a, $b ] } @kvlist
+
+It is most convenient to use in a C<foreach> loop, for example:
+
+    foreach my $pair ( pairs @KVLIST ) {
+       my ( $key, $value ) = @$pair;
+       ...
+    }
+
+Since version C<1.39> these ARRAY references are blessed objects, recognising
+the two methods C<key> and C<value>. The following code is equivalent:
+
+    foreach my $pair ( pairs @KVLIST ) {
+       my $key   = $pair->key;
+       my $value = $pair->value;
+       ...
+    }
+
+=head2 unpairs
+
+    my @kvlist = unpairs @pairs
+
+I<Since version 1.42.>
+
+The inverse function to C<pairs>; this function takes a list of ARRAY
+references containing two elements each, and returns a flattened list of the
+two values from each of the pairs, in order. This is notionally equivalent to
+
+    my @kvlist = map { @{$_}[0,1] } @pairs
+
+except that it is implemented more efficiently internally. Specifically, for
+any input item it will extract exactly two values for the output list; using
+C<undef> if the input array references are short.
+
+Between C<pairs> and C<unpairs>, a higher-order list function can be used to
+operate on the pairs as single scalars; such as the following near-equivalents
+of the other C<pair*> higher-order functions:
+
+    @kvlist = unpairs grep { FUNC } pairs @kvlist
+    # Like pairgrep, but takes $_ instead of $a and $b
+
+    @kvlist = unpairs map { FUNC } pairs @kvlist
+    # Like pairmap, but takes $_ instead of $a and $b
+
+Note however that these versions will not behave as nicely in scalar context.
+
+Finally, this technique can be used to implement a sort on a keyvalue pair
+list; e.g.:
+
+    @kvlist = unpairs sort { $a->key cmp $b->key } pairs @kvlist
+
+=head2 pairkeys
+
+    my @keys = pairkeys @kvlist;
+
+I<Since version 1.29.>
+
+A convenient shortcut to operating on even-sized lists of pairs, this function
+returns a list of the the first values of each of the pairs in the given list.
+It is a more efficient version of
+
+    @keys = pairmap { $a } @kvlist
+
+=head2 pairvalues
+
+    my @values = pairvalues @kvlist;
+
+I<Since version 1.29.>
+
+A convenient shortcut to operating on even-sized lists of pairs, this function
+returns a list of the the second values of each of the pairs in the given list.
+It is a more efficient version of
+
+    @values = pairmap { $b } @kvlist
+
 =head2 pairgrep
 
     my @kvlist = pairgrep { BLOCK } @kvlist;
@@ -329,58 +440,6 @@ will be visible to the caller.
 
 See L</KNOWN BUGS> for a known-bug with C<pairmap>, and a workaround.
 
-=head2 pairs
-
-    my @pairs = pairs @kvlist;
-
-I<Since version 1.29.>
-
-A convenient shortcut to operating on even-sized lists of pairs, this function
-returns a list of ARRAY references, each containing two items from the given
-list. It is a more efficient version of
-
-    @pairs = pairmap { [ $a, $b ] } @kvlist
-
-It is most convenient to use in a C<foreach> loop, for example:
-
-    foreach my $pair ( pairs @KVLIST ) {
-       my ( $key, $value ) = @$pair;
-       ...
-    }
-
-Since version C<1.39> these ARRAY references are blessed objects, recognising
-the two methods C<key> and C<value>. The following code is equivalent:
-
-    foreach my $pair ( pairs @KVLIST ) {
-       my $key   = $pair->key;
-       my $value = $pair->value;
-       ...
-    }
-
-=head2 pairkeys
-
-    my @keys = pairkeys @kvlist;
-
-I<Since version 1.29.>
-
-A convenient shortcut to operating on even-sized lists of pairs, this function
-returns a list of the the first values of each of the pairs in the given list.
-It is a more efficient version of
-
-    @keys = pairmap { $a } @kvlist
-
-=head2 pairvalues
-
-    my @values = pairvalues @kvlist;
-
-I<Since version 1.29.>
-
-A convenient shortcut to operating on even-sized lists of pairs, this function
-returns a list of the the second values of each of the pairs in the given list.
-It is a more efficient version of
-
-    @values = pairmap { $b } @kvlist
-
 =cut
 
 =head1 OTHER FUNCTIONS
diff --git a/Master/tlpkg/tlperl/lib/List/Util/XS.pm b/Master/tlpkg/tlperl/lib/List/Util/XS.pm
index f2e01ae94ba..fca0738e5a7 100644
--- a/Master/tlpkg/tlperl/lib/List/Util/XS.pm
+++ b/Master/tlpkg/tlperl/lib/List/Util/XS.pm
@@ -2,7 +2,7 @@ package List::Util::XS;
 use strict;
 use List::Util;
 
-our $VERSION = "1.41";       # FIXUP
+our $VERSION = "1.42_02";       # FIXUP
 $VERSION = eval $VERSION;    # FIXUP
 
 1;
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes.pm b/Master/tlpkg/tlperl/lib/Locale/Codes.pm
index 855c377162b..118c277c5b4 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes.pm
@@ -31,7 +31,7 @@ our($VERSION,%Data,%Retired);
 # $Retired{ TYPE }{ CODESET }{ code }{ CODE } = NAME
 #                            { name }{ NAME } = [CODE,NAME]  (the key is lowercase)
 
-$VERSION='3.34';
+$VERSION='3.37';
 
 #=======================================================================
 #
@@ -43,14 +43,14 @@ sub _code {
    return 1  if (@_ > 3);
 
    my($type,$code,$codeset) = @_;
-   $code = ''  if (! $code);
+   $code = ''  if (! defined $code);
 
    # Determine the codeset
 
    $codeset = $ALL_CODESETS{$type}{'default'}
      if (! defined($codeset)  ||  $codeset eq '');
    $codeset = lc($codeset);
-   return 1  if (! exists $ALL_CODESETS{$type}{'codesets'}{$codeset});
+   return (1)  if (! exists $ALL_CODESETS{$type}{'codesets'}{$codeset});
    return (0,$code,$codeset)  if (! $code);
 
    # Determine the properties of the codeset
@@ -59,20 +59,29 @@ sub _code {
 
    if      ($op eq 'lc') {
       $code = lc($code);
+      return (0,$code,$codeset);
+   }
 
-   } elsif ($op eq 'uc') {
+   if ($op eq 'uc') {
       $code = uc($code);
+      return (0,$code,$codeset);
+   }
 
-   } elsif ($op eq 'ucfirst') {
+   if ($op eq 'ucfirst') {
       $code = ucfirst(lc($code));
+      return (0,$code,$codeset);
+   }
 
-   } elsif ($op eq 'numeric') {
+   # uncoverable branch false
+   if ($op eq 'numeric') {
       return (1)  unless ($code =~ /^\d+$/);
       my $l = $args[0];
       $code    = sprintf("%.${l}d", $code);
+      return (0,$code,$codeset);
    }
 
-   return (0,$code,$codeset);
+   # uncoverable statement
+   die "ERROR: codeset not defined correctly: $codeset [$op]\n";
 }
 
 #=======================================================================
@@ -90,8 +99,7 @@ sub _code2name {
    }
 
    my($err,$code,$codeset) = _code($type,@args);
-   return undef  if ($err  ||
-                     ! defined $code);
+   return undef  if ($err);
 
    $code = $Data{$type}{'codealias'}{$codeset}{$code}
      if (exists $Data{$type}{'codealias'}{$codeset}{$code});
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes.pod b/Master/tlpkg/tlperl/lib/Locale/Codes.pod
index 430a4648c73..106f0bab1cc 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes.pod
@@ -14,49 +14,49 @@ Currently, the following modules are included:
 
 =over 4
 
-=item B<Locale::Codes::Country, Locale::Country>
+=item L<Locale::Codes::Country>, L<Locale::Country>
 
 This includes support for country codes (such as those listed in ISO-3166)
 to specify the country.
 
-Because this module was originally distributed as Locale::Country, it is
+Because this module was originally distributed as L<Locale::Country>, it is
 also available under that name.
 
-=item B<Locale::Codes::Language, Locale::Language>
+=item L<Locale::Codes::Language>, L<Locale::Language>
 
 This includes support for language codes (such as those listed in ISO-639)
 to specify the language.
 
-Because this module was originally distributed as Locale::Language, it is
+Because this module was originally distributed as L<Locale::Language>, it is
 also available under that name.
 
-=item B<Locale::Codes::Currency, Locale::Currency>
+=item L<Locale::Codes::Currency>, L<Locale::Currency>
 
 This includes support for currency codes (such as those listed in ISO-4217)
 to specify the currency.
 
-Because this module was originally distributed as Locale::Currency, it is
+Because this module was originally distributed as L<Locale::Currency>, it is
 also available under that name.
 
-=item B<Locale::Codes::Script, Locale::Script>
+=item L<Locale::Codes::Script>, L<Locale::Script>
 
 This includes support for script codes (such as those listed in ISO-15924)
 to specify the script.
 
-Because this module was originally distributed as Locale::Script, it is
+Because this module was originally distributed as L<Locale::Script>, it is
 also available under that name.
 
-=item B<Locale::Codes::LangExt>
+=item L<Locale::Codes::LangExt>
 
 This includes support for language extension codes (such as those listed
 in the IANA language registry) to specify the language extension.
 
-=item B<Locale::Codes::LangVar>
+=item L<Locale::Codes::LangVar>
 
 This includes support for language variation codes (such as those listed
 in the IANA language registry) to specify the language variation.
 
-=item B<Locale::Codes::LangFam>
+=item L<Locale::Codes::LangFam>
 
 This includes support for language family codes (such as those listed
 in ISO 639-5) to specify families of languages.
@@ -65,11 +65,12 @@ in ISO 639-5) to specify families of languages.
 
 Each module can support an arbitrary number of code sets, and it is
 not required that the relationship between these code sets be
-one-to-one.  For example, the Locale::Codes::Country module supports
-code sets from ISO-3166 and the IANA standard, and they do not
-break the world down into exactly the same sets of countries. This
-does not cause any problem (though converting codes from ISO-3166 to
-IANA or back will not work except for countries that are one-to-one).
+one-to-one.  For example, the L<Locale::Codes::Country> module
+supports code sets from ISO-3166 and the IANA standard, and those two
+standards do not break the world down into exactly the same sets of
+countries. This does not cause any problem (though converting codes
+from ISO-3166 to IANA or back will not work except for countries that
+are one-to-one).
 
 All data in all of these modules comes directly from the original
 standards (or as close to direct as possible), so it should be
@@ -106,7 +107,8 @@ in the distribution including:
 =back
 
 These modules are not intended to be used by programmers. They contain functions
-or data that are used by the modules listed above.
+or data that are used by the modules listed above.  No support of any kind is
+offered for using these modules directly.  They may be modified at any time.
 
 =head1 NEW CODE SETS
 
@@ -179,7 +181,7 @@ a few of the most common ones are included in the data. The country
 code for "United States" is "us", so:
 
    country2code('United States');
-      => "us"
+     => "us"
 
 Now the following will also return 'us':
 
@@ -199,11 +201,11 @@ country (please don't request this... I've already added it).
 
 On the other hand, a request to add Zaire as an alias for "Congo, The
 Democratic Republic of" will not be honored. The country's official
-name is no longer Zaire, so adding it as an alias violates the standard.
-Zaire was kept as an alias in versions prior to 3.00, but it has been
-removed. Other aliases (if any) which no longer appear in any standard
-(and which are not common variations of the name in the standards)
-have also been removed.
+name is no longer Zaire, so adding it as an alias violates the
+standard.  Zaire was kept as an alias in versions of this module prior
+to 3.00, but it has been removed. Other aliases (if any) which no
+longer appear in any standard (and which are not common variations of
+the name in the standards) have also been removed.
 
 =head1 DEPRECATED CODES
 
@@ -216,47 +218,47 @@ available), as of version 3.20, every code which has ever been included
 in these modules can be referenced.
 
 For more information, refer to the documentation on the code2XXX, XXX2code,
-all_XXX_codes, and all_XXX_names function in the B<Locale::Codes::API>
+all_XXX_codes, and all_XXX_names function in the L<Locale::Codes::API>
 documentation.
 
 =head1 SEE ALSO
 
 =over 4
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions available in each of the modules listed below.
 The APIs for each module are exactly identical.
 
-=item B<Locale::Codes::Country>
+=item L<Locale::Codes::Country>
 
 Codes for identification of countries.
 
-=item B<Locale::Codes::Language>
+=item L<Locale::Codes::Language>
 
 Codes for identification of languages.
 
-=item B<Locale::Codes::Script>
+=item L<Locale::Codes::Script>
 
 Codes for identification of scripts.
 
-=item B<Locale::Codes::Currency>
+=item L<Locale::Codes::Currency>
 
 Codes for identification of currencies and funds.
 
-=item B<Locale::Codes::LangExt>
+=item L<Locale::Codes::LangExt>
 
 Codes for identification of language extensions.
 
-=item B<Locale::Codes::LangVar>
+=item L<Locale::Codes::LangVar>
 
 Codes for identification of language variations.
 
-=item B<Locale::Codes::LangFam>
+=item L<Locale::Codes::LangFam>
 
 Codes for identification of language families.
 
-=item B<Locale::Codes::Changes>
+=item L<Locale::Codes::Changes>
 
 A history of changes made to this distribution.
 
@@ -282,7 +284,7 @@ with Neil Bower's permission.  All problems or comments should be
 sent there.  Alternately, problems can be reported using the
 perl problem tracker at:
 
-   https://rt.cpan.org/Dist/Display.html?Queue=Locale-Codes
+   L<https://rt.cpan.org/Dist/Display.html?Queue=Locale-Codes>
 
 =head1 COPYRIGHT
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/API.pod b/Master/tlpkg/tlperl/lib/Locale/Codes/API.pod
index 4353e1937d6..f196461ea01 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/API.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/API.pod
@@ -6,7 +6,7 @@ Locale::Codes::API - a description of the callable function in each module
 
 =head1 DESCRIPTION
 
-Although there are several modules in the Locale-Codes distribution, all of them
+Although there are several modules in the B<Locale-Codes> distribution, all of them
 (as of version 3.10) use exactly the same API.  As a matter of fact, each of the
 main callable modules are just wrappers around a central module which does all
 the real work.
@@ -18,7 +18,7 @@ the functions are all documented here, rather than in the documentation
 for the separate modules.
 
 The name of the function depends on the module. For example, every module
-contains a function "code2XXX" where XXX refers to the type of data.
+contains a function C<code2XXX> where XXX refers to the type of data.
 The values of XXX are described in the following table:
 
    XXX       MODULE
@@ -29,21 +29,22 @@ The values of XXX are described in the following table:
    script    Locale::Codes::Script
    langext   Locale::Codes::LangExt
    langvar   Locale::Codes::LangVar
-   langfam   Locale::Codes::LangFAM
+   langfam   Locale::Codes::LangFam
 
-So, the Locale::Country module contains the function code2country, the
-Locale::Language module contains the function code2language, etc.
+So, the L<Locale::Country> module contains the function C<code2country>, the
+L<Locale::Language> module contains the function C<code2language>, etc.
 
-In all of the functions below, CODE refers to a code for one element in
-the code set. For example, in the two-letter country codes from ISO 3166-1,
-the code 'fi' is used to refer to the country Finland. CODE is always
-case insensitive (though when a code is returned, it will always be in
-the case as used in the standard), so 'fi', 'FI', and 'Fi' would all
-be equivalent.
+In all of the functions below, B<CODE> refers to a code for one
+element in the code set. For example, in the two-letter country codes
+from ISO 3166-1, the code 'fi' is used to refer to the country
+Finland. B<CODE> is always case insensitive when passed in as an
+argument, so 'fi', 'FI', and 'Fi' would all be equivalent arguments.
+When B<CODE> is returned from an argument, it will always be in the
+case as used in the standard.
 
-CODESET refers to a constant specified in the documentation for each
+B<CODESET> refers to a constant specified in the documentation for each
 module to label the various code sets. For example, in the
-Locale::Language module, CODESET could be LOCALE_CODE_ALPHA_2 or
+L<Locale::Language> module, B<CODESET> could be LOCALE_CODE_ALPHA_2 or
 LOCALE_CODE_ALPHA_3 (among others). Most functions have a default one,
 so they do not need to be specified. So the following calls are valid:
 
@@ -60,15 +61,15 @@ identical.
 
 These functions take a code and returns a string which contains
 the name of the element identified.  If the code is not a valid
-code in the CODESET specified then C<undef> will be returned.
+code in the B<CODESET> specified then C<undef> will be returned.
 
 The name of the element is the name as specified in the standard,
 and as a result, different variations of an element name may
-be returned for different values of CODESET.
+be returned for different values of B<CODESET>.
 
-For example, the B<alpha-2> country code set defines the two-letter
+For example, the alpha-2 country code set defines the two-letter
 code "bo" to be "Bolivia, Plurinational State of", whereas the
-B<alpha-3> code set defines the code 'bol' to be the country "Bolivia
+alpha-3 code set defines the code 'bol' to be the country "Bolivia
 (Plurinational State of)". So:
 
    code2country('bo',LOCALE_CODE_ALPHA_2);
@@ -84,7 +85,7 @@ codes will be examined.
 =item B<XXX2code ( NAME [,CODESET] [,'retired'] )>
 
 These functions takes the name of an element (or any of it's aliases)
-and returns the code that corresponds to it, if it exists. If NAME
+and returns the code that corresponds to it, if it exists. If B<NAME>
 could not be identified as the name of one of the elements, then
 C<undef> will be returned.
 
@@ -92,9 +93,9 @@ The name is not case sensitive. Also, any known variation of a name
 may be passed in.
 
 For example, even though the country name returned using
-LOCALE_CODE_ALPHA_2 and LOCALE_CODE_ALPHA_3 country codes for Bolivia is different,
-either country name may be passed in since for each code set, in addition to
-the alias 'Bolivia'. So:
+LOCALE_CODE_ALPHA_2 and LOCALE_CODE_ALPHA_3 country codes for Bolivia
+is different, either country name may be passed in since for each code
+set (in addition to the alias 'Bolivia'). So:
 
    country2code('Bolivia, Plurinational State of',
                 LOCALE_CODE_ALPHA_2);
@@ -114,11 +115,11 @@ names will be examined.
 =item B<XXX_code2code ( CODE ,CODESET ,CODESET2 )>
 
 These functions takes a code from one code set, and returns the
-corresponding code from another code set. CODE must exists in the code
-set specified by CODESET and must have a corresponding code in the
-code set specified by CODESET2 or C<undef> will be returned.
+corresponding code from another code set. B<CODE> must exists in the code
+set specified by B<CODESET> and must have a corresponding code in the
+code set specified by B<CODESET2> or C<undef> will be returned.
 
-Both CODESETs must be explicitly entered.
+Both B<CODESET> and B<CODESET2> must be explicitly entered.
 
    country_code2code('fin', LOCALE_CODE_ALPHA_3,
                      LOCALE_CODE_ALPHA_2);
@@ -166,8 +167,8 @@ These routines do not currently work with retired codes.
 =item B<MODULE::rename_XXX  ( CODE ,NEW_NAME [,CODESET] )>
 
 These routines are used to change the official name of an element. At
-that point, the name returned by the code2XXX routine would be
-NEW_NAME instead of the name specified in the standard.
+that point, the name returned by the C<code2XXX> routine would be
+B<NEW_NAME> instead of the name specified in the standard.
 
 The original name will remain as an alias.
 
@@ -180,8 +181,8 @@ This means that calling code2country('gb') will now return 'Great
 Britain' instead of 'United Kingdom'.
 
 If any error occurs, a warning is issued and 0 is returned. An error
-occurs if CODE doesn't exist in the specified code set, or if
-NEW_NAME is already in use but for a different element.
+occurs if B<CODE> doesn't exist in the specified code set, or if
+B<NEW_NAME> is already in use but for a different element.
 
 If the routine succeeds, 1 is returned.
 
@@ -189,8 +190,8 @@ If the routine succeeds, 1 is returned.
 
 These routines are used to add a new code and name to the data.
 
-Both CODE and NAME must be unused in the data set or an error
-occurs (though NAME may be used in a different data set).
+Both B<CODE> and B<NAME> must be unused in the data set or an error
+occurs (though B<NAME> may be used in a different data set).
 
 For example, to create the fictitious country named "Duchy of
 Grand Fenwick" with codes "gf" and "fen", use the following:
@@ -207,16 +208,16 @@ The return value is 1 on success, 0 on an error.
 
 These routines are used to delete a code from the data.
 
-CODE must refer to an existing code in the code set.
+B<CODE> must refer to an existing code in the code set.
 
 The return value is 1 on success, 0 on an error.
 
 =item B<MODULE::add_XXX_alias  ( NAME ,NEW_NAME )>
 
 These routines are used to add a new alias to the data. They do
-not alter the return value of the code2XXX function.
+not alter the return value of the C<code2XXX> function.
 
-NAME must be an existing element name, and NEW_NAME must
+B<NAME> must be an existing element name, and B<NEW_NAME> must
 be unused or an error occurs.
 
 The return value is 1 on success, 0 on an error.
@@ -224,18 +225,18 @@ The return value is 1 on success, 0 on an error.
 =item B<MODULE::delete_XXX_alias  ( NAME )>
 
 These routines are used to delete an alias from the data. Once
-removed, the element may not be referred to by NAME.
+removed, the element may not be referred to by B<NAME>.
 
-NAME must be one of a list of at least two names that may be used to
+B<NAME> must be one of a list of at least two names that may be used to
 specify an element. If the element may only be referred to by a single
-name, you'll need to use the add_XXX_alias function to add a new alias
-first, or the remove_XXX function to remove the element entirely.
+name, you'll need to use the C<add_XXX_alias> function to add a new alias
+first, or the C<remove_XXX> function to remove the element entirely.
 
 If the alias is used as the name in any code set, one of the other
 names will be used instead. Predicting exactly which one will
 be used requires you to know the order in which the standards
 were read, which is not reliable, so you may want to use the
-rename_XXX function to force one of the alternate names to be
+C<rename_XXX> function to force one of the alternate names to be
 used.
 
 The return value is 1 on success, 0 on an error.
@@ -243,32 +244,32 @@ The return value is 1 on success, 0 on an error.
 =item B<MODULE::rename_XXX_code  ( CODE ,NEW_CODE [,CODESET] )>
 
 These routines are used to change the official code for an element. At
-that point, the code returned by the XXX2code routine would be
-NEW_CODE instead of the code specified in the standard.
+that point, the code returned by the C<XXX2code> routine would be
+B<NEW_CODE> instead of the code specified in the standard.
 
-NEW_CODE may either be a code that is not in use, or it may be an
-alias for CODE (in which case, CODE becomes and alias and NEW_CODE
+B<NEW_CODE> may either be a code that is not in use, or it may be an
+alias for B<CODE> (in which case, B<CODE> becomes and alias and B<NEW_CODE>
 becomes the "real" code).
 
-The original code is kept as an alias, so that the code2XXX routines
+The original code is kept as an alias, so that the C<code2XXX> routines
 will work with either the code from the standard or the new code.
 
-However, the all_XXX_codes routine will only return the codes which
+However, the C<all_XXX_codes> routine will only return the codes which
 are considered "real" (which means that the list of codes will now
-contain NEW_CODE, but will not contain CODE).
+contain B<NEW_CODE>, but will not contain B<CODE>).
 
 =item B<MODULE::add_XXX_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
 
-These routines add an alias for the code. At that point, NEW_CODE and CODE
-will both work in the code2XXX routines. However, the XXX2code routines will
+These routines add an alias for the code. At that point, B<NEW_CODE> and B<CODE>
+will both work in the C<code2XXX> routines. However, the C<XXX2code> routines will
 still return the original code.
 
 =item B<MODULE::delete_XXX_code_alias  ( CODE [,CODESET] )>
 
 These routines delete an alias for the code.
 
-These will only work if CODE is actually an alias. If it is the "real"
-code, it will not be deleted. You will need to use the rename_XXX_code
+These will only work if B<CODE> is actually an alias. If it is the "real"
+code, it will not be deleted. You will need to use the C<rename_XXX_code>
 function to switch the real code with one of the aliases, and then
 delete the alias.
 
@@ -300,7 +301,21 @@ limitation in the future.
 
 =head1 SEE ALSO
 
-Locale::Codes
+L<Locale::Codes>
+
+L<Locale::Codes::Country>
+
+L<Locale::Codes::Language>
+
+L<Locale::Codes::Currency>
+
+L<Locale::Codes::Script>
+
+L<Locale::Codes::LangExt>
+
+L<Locale::Codes::LangVar>
+
+L<Locale::Codes::LangFam>
 
 =head1 AUTHOR
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Changes.pod b/Master/tlpkg/tlperl/lib/Locale/Codes/Changes.pod
index 697a2e43ba8..199aa96d5b8 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Changes.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Changes.pod
@@ -22,11 +22,43 @@ September, December). I will also check on request, so if a code
 changes that you use, feel free to contact me.  Any time there are new
 codes, I will add them to the module and release a new version.
 
-=head1 VERSION 3.37  (planned 2015-12-01; sbeck)
+=head1 VERSION 3.41  (planned 2016-12-01; sbeck)
 
-=head1 VERSION 3.36  (planned 2015-09-01; sbeck)
+=head1 VERSION 3.40  (planned 2016-09-01; sbeck)
 
-=head1 VERSION 3.35  (planned 2015-06-01; sbeck)
+=head1 VERSION 3.39  (planned 2016-06-01; sbeck)
+
+=head1 VERSION 3.38  (planned 2016-03-01; sbeck)
+
+=head1 VERSION 3.37  (2015-12-01; sbeck)
+
+NEW CODE(s)
+
+=head1 VERSION 3.36  (2015-09-01; sbeck)
+
+NEW CODE(s)
+
+=over 4
+
+=item B<(!) Removed alias_code function>
+
+The alias_code function was preserved for backward compatibility, but
+has been deprecated since 3.20.  It has been removed.
+
+=back
+
+=head1 VERSION 3.35  (2015-06-01; sbeck)
+
+NEW CODE(s)
+
+=over 4
+
+=item B<Documentation improvements>
+
+Many changes to the formatting in the documentation to improve it.  Suggested
+by Pete Houston.
+
+=back
 
 =head1 VERSION 3.34  (2015-03-01; sbeck)
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Constants.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Constants.pm
index 256d695a70f..44e8f6da7f8 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Constants.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Constants.pm
@@ -17,7 +17,7 @@ require Exporter;
 our($VERSION,@ISA,@EXPORT);
 our(%ALL_CODESETS);
 
-$VERSION='3.34';
+$VERSION='3.37';
 @ISA     = qw(Exporter);
 @EXPORT  = qw(LOCALE_CODE_ALPHA_2
               LOCALE_CODE_ALPHA_3
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Constants.pod b/Master/tlpkg/tlperl/lib/Locale/Codes/Constants.pod
deleted file mode 100644
index 0ad133526f2..00000000000
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Constants.pod
+++ /dev/null
@@ -1,41 +0,0 @@
-=pod
-
-=head1 NAME
-
-Locale::Codes::Constants - constants for Locale codes
-
-=head1 DESCRIPTION
-
-B<Locale::Codes::Constants> defines symbols which are used in the other
-modules from the Locale-Codes distribution.
-
-You shouldn't have to C<use> this module directly yourself - it is
-used by the other Locale modules, which in turn export the symbols.
-
-The constants are documented in each of the Locale modules.
-
-=head1 KNOWN BUGS AND LIMITATIONS
-
-None known.
-
-=head1 SEE ALSO
-
-Locale::Codes
-
-=head1 AUTHOR
-
-See Locale::Codes for full author history.
-
-Currently maintained by Sullivan Beck (sbeck@cpan.org).
-
-=head1 COPYRIGHT
-
-   Copyright (c) 1997-2001 Canon Research Centre Europe (CRE).
-   Copyright (c) 2001-2010 Neil Bowers
-   Copyright (c) 2010-2015 Sullivan Beck
-
-This module is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
-
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Country.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Country.pm
index 2fc76c442ef..a182431dc0a 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Country.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Country.pm
@@ -22,7 +22,7 @@ use Locale::Codes::Country_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.34';
+$VERSION='3.37';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2country
                 country2code
@@ -87,19 +87,6 @@ sub delete_country_code_alias {
    return Locale::Codes::_delete_code_alias('country',@_);
 }
 
-#=======================================================================
-#
-# Old function for backward compatibility
-#
-#=======================================================================
-
-sub alias_code {
-   my($alias,$code,@args) = @_;
-   my $success = rename_country_code($code,$alias,@args);
-   return 0  if (! $success);
-   return $alias;
-}
-
 1;
 # Local Variables:
 # mode: cperl
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Country.pod b/Master/tlpkg/tlperl/lib/Locale/Codes/Country.pod
index e1d86466fac..f827732ca7d 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Country.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Country.pod
@@ -15,12 +15,11 @@ Locale::Codes::Country - standard codes for country identification
    @names   = all_country_names();
 
    # semi-private routines
-   Locale::Codes::Country::alias_code('uk' => 'gb');
    Locale::Codes::Country::rename_country('gb' => 'Great Britain');
 
 =head1 DESCRIPTION
 
-The C<Locale::Codes::Country> module provides access to several code sets
+This module provides access to several code sets
 that can be used for identifying countries, such as those defined in
 ISO 3166-1.
 
@@ -80,56 +79,33 @@ Locale::Codes::Changes document for details.
 
 =over 4
 
-=item B<code2country ( CODE [,CODESET] [,'retired'])>
+=item B<code2country(CODE [,CODESET] [,'retired'])>
 
-=item B<country2code ( NAME [,CODESET] [,'retired'])>
+=item B<country2code(NAME [,CODESET] [,'retired'])>
 
-=item B<country_code2code ( CODE ,CODESET ,CODESET2 )>
+=item B<country_code2code(CODE ,CODESET ,CODESET2)>
 
-=item B<all_country_codes ( [CODESET] [,'retired'])>
+=item B<all_country_codes([CODESET] [,'retired'])>
 
-=item B<all_country_names ( [CODESET] [,'retired'])>
+=item B<all_country_names([CODESET] [,'retired'])>
 
-=item B<Locale::Codes::Country::rename_country  ( CODE ,NEW_NAME [,CODESET] )>
+=item B<Locale::Codes::Country::rename_country(CODE ,NEW_NAME [,CODESET])>
 
-=item B<Locale::Codes::Country::add_country  ( CODE ,NAME [,CODESET] )>
+=item B<Locale::Codes::Country::add_country(CODE ,NAME [,CODESET])>
 
-=item B<Locale::Codes::Country::delete_country  ( CODE [,CODESET] )>
+=item B<Locale::Codes::Country::delete_country(CODE [,CODESET])>
 
-=item B<Locale::Codes::Country::add_country_alias  ( NAME ,NEW_NAME )>
+=item B<Locale::Codes::Country::add_country_alias(NAME ,NEW_NAME)>
 
-=item B<Locale::Codes::Country::delete_country_alias  ( NAME )>
+=item B<Locale::Codes::Country::delete_country_alias(NAME)>
 
-=item B<Locale::Codes::Country::rename_country_code  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::Country::rename_country_code(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::Country::add_country_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::Country::add_country_code_alias(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::Country::delete_country_code_alias  ( CODE [,CODESET] )>
+=item B<Locale::Codes::Country::delete_country_code_alias(CODE [,CODESET])>
 
-These routines are all documented in the Locale::Codes::API man page.
-
-=item B<alias_code ( ALIAS, CODE [,CODESET] )>
-
-Version 2.07 included 2 functions for modifying the internal data:
-rename_country and alias_code. Both of these could be used only to
-modify the internal data for country codes.
-
-As of 3.10, the internal data for all types of codes can be modified.
-
-The alias_code function is preserved for backwards compatibility, but
-the following two are identical:
-
-   alias_code(ALIAS,CODE [,CODESET]);
-   rename_country_code(CODE,ALIAS [,CODESET]);
-
-and the latter should be used for consistency.
-
-The alias_code function is deprecated and will be removed in the December
-2014 release.
-
-B<Note:> this function was previously called _alias_code, but the
-leading underscore has been dropped. The old name was supported for
-all 2.X releases, but has been dropped as of 3.00.
+These routines are all documented in the L<Locale::Codes::API> man page.
 
 =back
 
@@ -137,35 +113,35 @@ all 2.X releases, but has been dropped as of 3.00.
 
 =over 4
 
-=item B<Locale::Codes>
+=item L<Locale::Codes>
 
 The Locale-Codes distribution.
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions supported by this module.
 
-=item B<Locale::SubCountry>
+=item L<Locale::SubCountry>
 
 ISO codes for country sub-divisions (states, counties, provinces,
 etc), as defined in ISO 3166-2.  This module is not part of the
 Locale-Codes distribution, but is available from CPAN in
 CPAN/modules/by-module/Locale/
 
-=item B<http://www.iso.org/iso/home/standards/country_codes.htm>
+=item L<http://www.iso.org/iso/home/standards/country_codes.htm>
 
 Official home page for the ISO 3166 maintenance agency.
 
-=item B<http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm>
+=item L<http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm>
 
 The source of ISO 3166-1 two-letter codes used by this
 module.
 
-=item B<http://www.iana.org/domains/root/db/>
+=item L<http://www.iana.org/domains/root/db/>
 
 Official source of the top-level domain names.
 
-=item B<http://unstats.un.org/unsd/methods/m49/m49alpha.htm>
+=item L<http://unstats.un.org/unsd/methods/m49/m49alpha.htm>
 
 The source of the official ISO 3166-1 three-letter codes and
 three-digit codes.
@@ -174,13 +150,13 @@ For some reason, this table is incomplete! Several countries are
 missing from it, and I cannot find them anywhere on the UN site.  I
 no longer use this as a source of data.
 
-=item B<https://www.cia.gov/library/publications/the-world-factbook/appendix/print_appendix-d.html>
+=item L<https://www.cia.gov/library/publications/the-world-factbook/appendix/print_appendix-d.html>
 
 The World Factbook maintained by the CIA is a potential source of
 the data.  Unfortunately, it adds/preserves non-standard codes, so it is no
 longer used as a source of data.
 
-=item B<http://www.statoids.com/wab.html>
+=item L<http://www.statoids.com/wab.html>
 
 Another unofficial source of data. Currently, it is not used to get
 data, but the notes and explanatory material were very useful for
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Country_Codes.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Country_Codes.pm
index 4a0ffdbc652..11262e8548a 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Country_Codes.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Country_Codes.pm
@@ -3,7 +3,7 @@ Locale::Codes::Country_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'harvest_data' is run.
-#    Generated on: Thu Feb 19 20:23:53 GMT 2015
+#    Generated on: Tue Dec  1 14:41:05 EST 2015
 
 use strict;
 require 5.006;
@@ -11,7 +11,7 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
 $Locale::Codes::Data{'country'}{'id'} = '0250';
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Country_Retired.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Country_Retired.pm
index 7defc73bfb5..c07e44a4bdc 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Country_Retired.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Country_Retired.pm
@@ -3,7 +3,7 @@ Locale::Codes::Country_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Fri Feb 20 15:27:22 GMT 2015
+#    Generated on: Tue Dec  1 14:45:28 EST 2015
 
 use strict;
 require 5.006;
@@ -11,7 +11,7 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
 $Locale::Codes::Retired{'country'}{'alpha-2'}{'code'} = {
    q(an) => q(Netherlands Antilles),
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Currency.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Currency.pm
index a2478c2acd1..3d1f406383f 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Currency.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Currency.pm
@@ -22,7 +22,7 @@ use Locale::Codes::Currency_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.34';
+$VERSION='3.37';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2currency
                 currency2code
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Currency.pod b/Master/tlpkg/tlperl/lib/Locale/Codes/Currency.pod
index 39221f8d875..bc5ea0d668b 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Currency.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Currency.pod
@@ -14,11 +14,10 @@ Locale::Codes::Currency - standard codes for currency identification
     @codes   = all_currency_codes();
     @names   = all_currency_names();
 
-
 =head1 DESCRIPTION
 
-The C<Locale::Codes::Currency> module provides access to standard codes used
-for identifying currencies and funds, such as those defined in ISO 4217.
+This module provides access to standard codes used for identifying
+currencies and funds, such as those defined in ISO 4217.
 
 Most of the routines take an optional additional argument which
 specifies the code set to use. If not specified, the default ISO
@@ -60,33 +59,33 @@ This is the set of three-digit numeric codes from ISO 4217.
 
 =over 4
 
-=item B<code2currency ( CODE [,CODESET] [,'retired'])>
+=item B<code2currency(CODE [,CODESET] [,'retired'])>
 
-=item B<currency2code ( NAME [,CODESET] [,'retired'])>
+=item B<currency2code(NAME [,CODESET] [,'retired'])>
 
-=item B<currency_code2code ( CODE ,CODESET ,CODESET2 )>
+=item B<currency_code2code(CODE ,CODESET ,CODESET2)>
 
-=item B<all_currency_codes ( [CODESET] [,'retired'])>
+=item B<all_currency_codes([CODESET] [,'retired'])>
 
-=item B<all_currency_names ( [CODESET] [,'retired'])>
+=item B<all_currency_names([CODESET] [,'retired'])>
 
-=item B<Locale::Codes::Currency::rename_currency  ( CODE ,NEW_NAME [,CODESET] )>
+=item B<Locale::Codes::Currency::rename_currency(CODE ,NEW_NAME [,CODESET])>
 
-=item B<Locale::Codes::Currency::add_currency  ( CODE ,NAME [,CODESET] )>
+=item B<Locale::Codes::Currency::add_currency(CODE ,NAME [,CODESET])>
 
-=item B<Locale::Codes::Currency::delete_currency  ( CODE [,CODESET] )>
+=item B<Locale::Codes::Currency::delete_currency(CODE [,CODESET])>
 
-=item B<Locale::Codes::Currency::add_currency_alias  ( NAME ,NEW_NAME )>
+=item B<Locale::Codes::Currency::add_currency_alias(NAME ,NEW_NAME)>
 
-=item B<Locale::Codes::Currency::delete_currency_alias  ( NAME )>
+=item B<Locale::Codes::Currency::delete_currency_alias(NAME)>
 
-=item B<Locale::Codes::Currency::rename_currency_code  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::Currency::rename_currency_code(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::Currency::add_currency_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::Currency::add_currency_code_alias(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::Currency::delete_currency_code_alias  ( CODE [,CODESET] )>
+=item B<Locale::Codes::Currency::delete_currency_code_alias( ODE [,CODESET])>
 
-These routines are all documented in the Locale::Codes::API man page.
+These routines are all documented in the L<Locale::Codes::API> man page.
 
 =back
 
@@ -94,15 +93,15 @@ These routines are all documented in the Locale::Codes::API man page.
 
 =over 4
 
-=item B<Locale::Codes>
+=item L<Locale::Codes>
 
 The Locale-Codes distribution.
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions supported by this module.
 
-=item B<http://www.iso.org/iso/support/currency_codes_list-1.htm>
+=item L<http://www.iso.org/iso/support/currency_codes_list-1.htm>
 
 The ISO 4217 data.
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Currency_Codes.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Currency_Codes.pm
index 812d8276cc7..d1d39b7002e 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Currency_Codes.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Currency_Codes.pm
@@ -3,7 +3,7 @@ Locale::Codes::Currency_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'harvest_data' is run.
-#    Generated on: Thu Feb 19 20:50:17 GMT 2015
+#    Generated on: Tue Dec  1 14:44:02 EST 2015
 
 use strict;
 require 5.006;
@@ -11,7 +11,7 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
 $Locale::Codes::Data{'currency'}{'id'} = '0177';
 
@@ -110,16 +110,16 @@ $Locale::Codes::Data{'currency'}{'id2names'} = {
       q(Burundi Franc),
       ],
    q(0032) => [
-      q(Riel),
+      q(Cabo Verde Escudo),
       ],
    q(0033) => [
-      q(CFA Franc BEAC),
+      q(Riel),
       ],
    q(0034) => [
-      q(Canadian Dollar),
+      q(CFA Franc BEAC),
       ],
    q(0035) => [
-      q(Cabo Verde Escudo),
+      q(Canadian Dollar),
       ],
    q(0036) => [
       q(Cayman Islands Dollar),
@@ -152,7 +152,7 @@ $Locale::Codes::Data{'currency'}{'id2names'} = {
       q(Costa Rican Colon),
       ],
    q(0046) => [
-      q(Croatian Kuna),
+      q(Kuna),
       ],
    q(0047) => [
       q(Peso Convertible),
@@ -386,7 +386,7 @@ $Locale::Codes::Data{'currency'}{'id2names'} = {
       q(Qatari Rial),
       ],
    q(0124) => [
-      q(New Romanian Leu),
+      q(Romanian Leu),
       ],
    q(0125) => [
       q(Russian Ruble),
@@ -652,11 +652,11 @@ $Locale::Codes::Data{'currency'}{'alias2id'} = {
       q(0),
       ],
    q(cabo verde escudo) => [
-      q(0035),
+      q(0032),
       q(0),
       ],
    q(canadian dollar) => [
-      q(0034),
+      q(0035),
       q(0),
       ],
    q(cayman islands dollar) => [
@@ -668,7 +668,7 @@ $Locale::Codes::Data{'currency'}{'alias2id'} = {
       q(0),
       ],
    q(cfa franc beac) => [
-      q(0033),
+      q(0034),
       q(0),
       ],
    q(cfp franc) => [
@@ -703,10 +703,6 @@ $Locale::Codes::Data{'currency'}{'alias2id'} = {
       q(0045),
       q(0),
       ],
-   q(croatian kuna) => [
-      q(0046),
-      q(0),
-      ],
    q(cuban peso) => [
       q(0048),
       q(0),
@@ -847,6 +843,10 @@ $Locale::Codes::Data{'currency'}{'alias2id'} = {
       q(0088),
       q(0),
       ],
+   q(kuna) => [
+      q(0046),
+      q(0),
+      ],
    q(kuwaiti dinar) => [
       q(0086),
       q(0),
@@ -959,10 +959,6 @@ $Locale::Codes::Data{'currency'}{'alias2id'} = {
       q(0078),
       q(0),
       ],
-   q(new romanian leu) => [
-      q(0124),
-      q(0),
-      ],
    q(new taiwan dollar) => [
       q(0147),
       q(0),
@@ -1048,7 +1044,11 @@ $Locale::Codes::Data{'currency'}{'alias2id'} = {
       q(0),
       ],
    q(riel) => [
-      q(0032),
+      q(0033),
+      q(0),
+      ],
+   q(romanian leu) => [
+      q(0124),
       q(0),
       ],
    q(rufiyaa) => [
@@ -1360,7 +1360,7 @@ $Locale::Codes::Data{'currency'}{'code2id'} = {
          q(0),
          ],
       q(CAD) => [
-         q(0034),
+         q(0035),
          q(0),
          ],
       q(CDF) => [
@@ -1412,7 +1412,7 @@ $Locale::Codes::Data{'currency'}{'code2id'} = {
          q(0),
          ],
       q(CVE) => [
-         q(0035),
+         q(0032),
          q(0),
          ],
       q(CZK) => [
@@ -1556,7 +1556,7 @@ $Locale::Codes::Data{'currency'}{'code2id'} = {
          q(0),
          ],
       q(KHR) => [
-         q(0032),
+         q(0033),
          q(0),
          ],
       q(KMF) => [
@@ -1884,7 +1884,7 @@ $Locale::Codes::Data{'currency'}{'code2id'} = {
          q(0),
          ],
       q(XAF) => [
-         q(0033),
+         q(0034),
          q(0),
          ],
       q(XAG) => [
@@ -2034,15 +2034,15 @@ $Locale::Codes::Data{'currency'}{'code2id'} = {
          q(0),
          ],
       q(116) => [
-         q(0032),
+         q(0033),
          q(0),
          ],
       q(124) => [
-         q(0034),
+         q(0035),
          q(0),
          ],
       q(132) => [
-         q(0035),
+         q(0032),
          q(0),
          ],
       q(136) => [
@@ -2526,7 +2526,7 @@ $Locale::Codes::Data{'currency'}{'code2id'} = {
          q(0),
          ],
       q(950) => [
-         q(0033),
+         q(0034),
          q(0),
          ],
       q(951) => [
@@ -2701,10 +2701,10 @@ $Locale::Codes::Data{'currency'}{'id2code'} = {
       q(0029) => q(BND),
       q(0030) => q(BGN),
       q(0031) => q(BIF),
-      q(0032) => q(KHR),
-      q(0033) => q(XAF),
-      q(0034) => q(CAD),
-      q(0035) => q(CVE),
+      q(0032) => q(CVE),
+      q(0033) => q(KHR),
+      q(0034) => q(XAF),
+      q(0035) => q(CAD),
       q(0036) => q(KYD),
       q(0037) => q(CLF),
       q(0038) => q(CLP),
@@ -2879,10 +2879,10 @@ $Locale::Codes::Data{'currency'}{'id2code'} = {
       q(0029) => q(096),
       q(0030) => q(975),
       q(0031) => q(108),
-      q(0032) => q(116),
-      q(0033) => q(950),
-      q(0034) => q(124),
-      q(0035) => q(132),
+      q(0032) => q(132),
+      q(0033) => q(116),
+      q(0034) => q(950),
+      q(0035) => q(124),
       q(0036) => q(136),
       q(0037) => q(990),
       q(0038) => q(152),
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Currency_Retired.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Currency_Retired.pm
index eef9e73e7bb..483238fe87f 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Currency_Retired.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Currency_Retired.pm
@@ -3,7 +3,7 @@ Locale::Codes::Currency_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Fri Feb 20 15:27:22 GMT 2015
+#    Generated on: Tue Dec  1 14:45:28 EST 2015
 
 use strict;
 require 5.006;
@@ -11,7 +11,7 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
 $Locale::Codes::Retired{'currency'}{'alpha'}{'code'} = {
    q(ADP) => q(Andorran Peseta),
@@ -87,6 +87,7 @@ $Locale::Codes::Retired{'currency'}{'alpha'}{'name'} = {
    q(cape verde escudo) => [ q(CVE), q(Cape Verde Escudo) ],
    q(cedi) => [ q(GHS), q(Cedi) ],
    q(convertible marks) => [ q(BAM), q(Convertible Marks) ],
+   q(croatian kuna) => [ q(HRK), q(Croatian Kuna) ],
    q(cyprus pound) => [ q(CYP), q(Cyprus Pound) ],
    q(dinar) => [ q(BHD), q(Dinar) ],
    q(drachma) => [ q(GRD), q(Drachma) ],
@@ -127,6 +128,7 @@ $Locale::Codes::Retired{'currency'}{'alpha'}{'name'} = {
    q(new kwanza) => [ q(AON), q(New Kwanza) ],
    q(new leu) => [ q(RON), q(New Leu) ],
    q(new manat) => [ q(TMT), q(New Manat) ],
+   q(new romanian leu) => [ q(RON), q(New Romanian Leu) ],
    q(new zaire) => [ q(ZRN), q(New Zaire) ],
    q(portuguese escudo) => [ q(PTE), q(Portuguese Escudo) ],
    q(saint helena pound) => [ q(SHP), q(Saint Helena Pound) ],
@@ -154,11 +156,13 @@ $Locale::Codes::Retired{'currency'}{'num'}{'name'} = {
    q(bolivar fuerte) => [ q(937), q(Bolivar Fuerte) ],
    q(cape verde escudo) => [ q(132), q(Cape Verde Escudo) ],
    q(cedi) => [ q(936), q(Cedi) ],
+   q(croatian kuna) => [ q(191), q(Croatian Kuna) ],
    q(latvian lats) => [ q(428), q(Latvian Lats) ],
    q(leu) => [ q(946), q(Leu) ],
    q(lithuanian litas) => [ q(440), q(Lithuanian Litas) ],
    q(metical) => [ q(943), q(Metical) ],
    q(new manat) => [ q(934), q(New Manat) ],
+   q(new romanian leu) => [ q(946), q(New Romanian Leu) ],
    q(saint helena pound) => [ q(654), q(Saint Helena Pound) ],
    q(unidades de fomento) => [ q(990), q(Unidades de fomento) ],
    q(us dollar (same day)) => [ q(998), q(US Dollar (Same day)) ],
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt.pm
index 561e5d152d3..6376da26fe9 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt.pm
@@ -20,7 +20,7 @@ use Locale::Codes::LangExt_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.34';
+$VERSION='3.37';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2langext
                 langext2code
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt.pod b/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt.pod
index 4cc1b449bd6..271a5ac78da 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt.pod
@@ -16,7 +16,7 @@ Locale::Codes::LangExt - standard codes for language extension identification
 
 =head1 DESCRIPTION
 
-The C<Locale::Codes::LangExt> module provides access to standard codes
+This module provides access to standard codes
 used for identifying language extensions, such as those as defined in
 the IANA language registry.
 
@@ -52,33 +52,33 @@ This is the default code set.
 
 =over 4
 
-=item B<code2langext ( CODE [,CODESET] [,'retired'])>
+=item B<code2langext(CODE [,CODESET] [,'retired'])>
 
-=item B<langext2code ( NAME [,CODESET] [,'retired'])>
+=item B<langext2code(NAME [,CODESET] [,'retired'])>
 
-=item B<langext_code2code ( CODE ,CODESET ,CODESET2 )>
+=item B<langext_code2code(CODE ,CODESET ,CODESET2)>
 
-=item B<all_langext_codes ( [CODESET] [,'retired'])>
+=item B<all_langext_codes([CODESET] [,'retired'])>
 
-=item B<all_langext_names ( [CODESET] [,'retired'])>
+=item B<all_langext_names([CODESET] [,'retired'])>
 
-=item B<Locale::Codes::LangExt::rename_langext  ( CODE ,NEW_NAME [,CODESET] )>
+=item B<Locale::Codes::LangExt::rename_langext(CODE ,NEW_NAME [,CODESET])>
 
-=item B<Locale::Codes::LangExt::add_langext  ( CODE ,NAME [,CODESET] )>
+=item B<Locale::Codes::LangExt::add_langext(CODE ,NAME [,CODESET])>
 
-=item B<Locale::Codes::LangExt::delete_langext  ( CODE [,CODESET] )>
+=item B<Locale::Codes::LangExt::delete_langext(CODE [,CODESET])>
 
-=item B<Locale::Codes::LangExt::add_langext_alias  ( NAME ,NEW_NAME )>
+=item B<Locale::Codes::LangExt::add_langext_alias(NAME ,NEW_NAME)>
 
-=item B<Locale::Codes::LangExt::delete_langext_alias  ( NAME )>
+=item B<Locale::Codes::LangExt::delete_langext_alias(NAME)>
 
-=item B<Locale::Codes::LangExt::rename_langext_code  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::LangExt::rename_langext_code(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::LangExt::add_langext_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::LangExt::add_langext_code_alias(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::LangExt::delete_langext_code_alias  ( CODE [,CODESET] )>
+=item B<Locale::Codes::LangExt::delete_langext_code_alias(CODE [,CODESET])>
 
-These routines are all documented in the Locale::Codes::API man page.
+These routines are all documented in the L<Locale::Codes::API> man page.
 
 =back
 
@@ -86,15 +86,15 @@ These routines are all documented in the Locale::Codes::API man page.
 
 =over 4
 
-=item B<Locale::Codes>
+=item L<Locale::Codes>
 
 The Locale-Codes distribution.
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions supported by this module.
 
-=item B<http://www.iana.org/assignments/language-subtag-registry>
+=item L<http://www.iana.org/assignments/language-subtag-registry>
 
 The IANA language subtag registry.
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt_Codes.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt_Codes.pm
index c7e5e1e31f7..e2e1834603f 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt_Codes.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt_Codes.pm
@@ -3,7 +3,7 @@ Locale::Codes::LangExt_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'harvest_data' is run.
-#    Generated on: Thu Feb 19 20:50:35 GMT 2015
+#    Generated on: Tue Dec  1 14:44:16 EST 2015
 
 use strict;
 require 5.006;
@@ -11,9 +11,9 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
-$Locale::Codes::Data{'langext'}{'id'} = '0229';
+$Locale::Codes::Data{'langext'}{'id'} = '0230';
 
 $Locale::Codes::Data{'langext'}{'id2names'} = {
    q(0001) => [
@@ -694,25 +694,28 @@ $Locale::Codes::Data{'langext'}{'id2names'} = {
       q(Yolnu Sign Language),
       ],
    q(0222) => [
-      q(Yugoslavian Sign Language),
+      q(Yan-nhanu Sign Language),
       ],
    q(0223) => [
+      q(Yugoslavian Sign Language),
+      ],
+   q(0224) => [
       q(Yue Chinese),
       q(Cantonese),
       ],
-   q(0224) => [
+   q(0225) => [
       q(Zimbabwe Sign Language),
       ],
-   q(0225) => [
+   q(0226) => [
       q(Malay (individual language)),
       ],
-   q(0226) => [
+   q(0227) => [
       q(Negeri Sembilan Malay),
       ],
-   q(0227) => [
+   q(0228) => [
       q(Zambian Sign Language),
       ],
-   q(0228) => [
+   q(0229) => [
       q(Standard Malay),
       ],
 };
@@ -831,7 +834,7 @@ $Locale::Codes::Data{'langext'}{'alias2id'} = {
       q(0),
       ],
    q(cantonese) => [
-      q(0223),
+      q(0224),
       q(1),
       ],
    q(catalan sign language) => [
@@ -1239,7 +1242,7 @@ $Locale::Codes::Data{'langext'}{'alias2id'} = {
       q(0),
       ],
    q(malay (individual language)) => [
-      q(0225),
+      q(0226),
       q(0),
       ],
    q(malaysian sign language) => [
@@ -1335,7 +1338,7 @@ $Locale::Codes::Data{'langext'}{'alias2id'} = {
       q(0),
       ],
    q(negeri sembilan malay) => [
-      q(0226),
+      q(0227),
       q(0),
       ],
    q(nepalese sign language) => [
@@ -1535,7 +1538,7 @@ $Locale::Codes::Data{'langext'}{'alias2id'} = {
       q(0),
       ],
    q(standard malay) => [
-      q(0228),
+      q(0229),
       q(0),
       ],
    q(sudanese arabic) => [
@@ -1666,6 +1669,10 @@ $Locale::Codes::Data{'langext'}{'alias2id'} = {
       q(0096),
       q(0),
       ],
+   q(yan-nhanu sign language) => [
+      q(0222),
+      q(0),
+      ],
    q(yolnu sign language) => [
       q(0221),
       q(0),
@@ -1675,19 +1682,19 @@ $Locale::Codes::Data{'langext'}{'alias2id'} = {
       q(0),
       ],
    q(yue chinese) => [
-      q(0223),
+      q(0224),
       q(0),
       ],
    q(yugoslavian sign language) => [
-      q(0222),
+      q(0223),
       q(0),
       ],
    q(zambian sign language) => [
-      q(0227),
+      q(0228),
       q(0),
       ],
    q(zimbabwe sign language) => [
-      q(0224),
+      q(0225),
       q(0),
       ],
 };
@@ -2578,34 +2585,38 @@ $Locale::Codes::Data{'langext'}{'code2id'} = {
          q(0221),
          q(0),
          ],
-      q(ysl) => [
+      q(yhs) => [
          q(0222),
          q(0),
          ],
-      q(yue) => [
+      q(ysl) => [
          q(0223),
          q(0),
          ],
-      q(zib) => [
+      q(yue) => [
          q(0224),
          q(0),
          ],
-      q(zlm) => [
+      q(zib) => [
          q(0225),
          q(0),
          ],
-      q(zmi) => [
+      q(zlm) => [
          q(0226),
          q(0),
          ],
-      q(zsl) => [
+      q(zmi) => [
          q(0227),
          q(0),
          ],
-      q(zsm) => [
+      q(zsl) => [
          q(0228),
          q(0),
          ],
+      q(zsm) => [
+         q(0229),
+         q(0),
+         ],
       },
 };
 
@@ -2832,13 +2843,14 @@ $Locale::Codes::Data{'langext'}{'id2code'} = {
       q(0219) => q(xmm),
       q(0220) => q(xms),
       q(0221) => q(ygs),
-      q(0222) => q(ysl),
-      q(0223) => q(yue),
-      q(0224) => q(zib),
-      q(0225) => q(zlm),
-      q(0226) => q(zmi),
-      q(0227) => q(zsl),
-      q(0228) => q(zsm),
+      q(0222) => q(yhs),
+      q(0223) => q(ysl),
+      q(0224) => q(yue),
+      q(0225) => q(zib),
+      q(0226) => q(zlm),
+      q(0227) => q(zmi),
+      q(0228) => q(zsl),
+      q(0229) => q(zsm),
       },
 };
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt_Retired.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt_Retired.pm
index 4fe85fab04e..a0ec2d28176 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt_Retired.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangExt_Retired.pm
@@ -3,7 +3,7 @@ Locale::Codes::LangExt_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Fri Feb 20 15:27:22 GMT 2015
+#    Generated on: Tue Dec  1 14:45:28 EST 2015
 
 use strict;
 require 5.006;
@@ -11,7 +11,7 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
 $Locale::Codes::Retired{'langext'}{'alpha'}{'code'} = {
    q(yds) => q(Yiddish Sign Language),
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam.pm
index a83c82d8dec..fccec91784b 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam.pm
@@ -20,7 +20,7 @@ use Locale::Codes::LangFam_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.34';
+$VERSION='3.37';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2langfam
                 langfam2code
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam.pod b/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam.pod
index 00d60a8a1e7..acf71f5c910 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam.pod
@@ -16,7 +16,7 @@ Locale::Codes::LangFam - standard codes for language extension identification
 
 =head1 DESCRIPTION
 
-The C<Locale::Codes::LangFam> module provides access to standard codes
+This module provides access to standard codes
 used for identifying language families, such as those as defined in
 ISO 639-5.
 
@@ -52,33 +52,33 @@ This is the default code set.
 
 =over 4
 
-=item B<code2langfam ( CODE [,CODESET] [,'retired'])>
+=item B<code2langfam(CODE [,CODESET] [,'retired'])>
 
-=item B<langfam2code ( NAME [,CODESET] [,'retired'])>
+=item B<langfam2code(NAME [,CODESET] [,'retired'])>
 
-=item B<langfam_code2code ( CODE ,CODESET ,CODESET2 )>
+=item B<langfam_code2code(CODE ,CODESET ,CODESET2)>
 
-=item B<all_langfam_codes ( [CODESET] [,'retired'])>
+=item B<all_langfam_codes([CODESET] [,'retired'])>
 
-=item B<all_langfam_names ( [CODESET] [,'retired'])>
+=item B<all_langfam_names([CODESET] [,'retired'])>
 
-=item B<Locale::Codes::LangFam::rename_langfam  ( CODE ,NEW_NAME [,CODESET] )>
+=item B<Locale::Codes::LangFam::rename_langfam(CODE ,NEW_NAME [,CODESET])>
 
-=item B<Locale::Codes::LangFam::add_langfam  ( CODE ,NAME [,CODESET] )>
+=item B<Locale::Codes::LangFam::add_langfam(CODE ,NAME [,CODESET])>
 
-=item B<Locale::Codes::LangFam::delete_langfam  ( CODE [,CODESET] )>
+=item B<Locale::Codes::LangFam::delete_langfam(CODE [,CODESET])>
 
-=item B<Locale::Codes::LangFam::add_langfam_alias  ( NAME ,NEW_NAME )>
+=item B<Locale::Codes::LangFam::add_langfam_alias(NAME ,NEW_NAME)>
 
-=item B<Locale::Codes::LangFam::delete_langfam_alias  ( NAME )>
+=item B<Locale::Codes::LangFam::delete_langfam_alias(NAME)>
 
-=item B<Locale::Codes::LangFam::rename_langfam_code  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::LangFam::rename_langfam_code(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::LangFam::add_langfam_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::LangFam::add_langfam_code_alias(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::LangFam::delete_langfam_code_alias  ( CODE [,CODESET] )>
+=item B<Locale::Codes::LangFam::delete_langfam_code_alias(CODE [,CODESET])>
 
-These routines are all documented in the Locale::Codes::API man page.
+These routines are all documented in the L<Locale::Codes::API> man page.
 
 =back
 
@@ -86,15 +86,15 @@ These routines are all documented in the Locale::Codes::API man page.
 
 =over 4
 
-=item B<Locale::Codes>
+=item L<Locale::Codes>
 
 The Locale-Codes distribution.
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions supported by this module.
 
-=item B<http://www.loc.gov/standards/iso639-5/id.php>
+=item L<http://www.loc.gov/standards/iso639-5/id.php>
 
 ISO 639-5 .
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam_Codes.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam_Codes.pm
index c1988a15ebd..090806199ab 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam_Codes.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam_Codes.pm
@@ -3,7 +3,7 @@ Locale::Codes::LangFam_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'harvest_data' is run.
-#    Generated on: Thu Feb 19 20:50:47 GMT 2015
+#    Generated on: Tue Dec  1 14:44:25 EST 2015
 
 use strict;
 require 5.006;
@@ -11,7 +11,7 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
 $Locale::Codes::Data{'langfam'}{'id'} = '0116';
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam_Retired.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam_Retired.pm
index 7fb4daf15de..2fce4216977 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam_Retired.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangFam_Retired.pm
@@ -5,40 +5,12 @@ Locale::Codes::LangFam_Retired;
 # be lost the next time 'deprecate_codes' is run.
 #    Generated on: Tue Sep 27 15:40:31 EDT 2011
 
-=pod
-
-=head1 NAME
-
-Locale::Codes::LangFam_Retired - retired langfam codes for the Locale::Codes::LangFam module
-
-=head1 SYNOPSIS
-
-This module contains data used by the Locale::Codes::LangFam module. It is
-not intended to be used directly, and contains no calleable routines.
-
-=head1 AUTHOR
-
-See Locale::Codes for full author history.
-
-Currently maintained by Sullivan Beck (sbeck@cpan.org).
-
-=head1 COPYRIGHT
-
-   Copyright (c) 1997-2001 Canon Research Centre Europe (CRE).
-   Copyright (c) 2001-2010 Neil Bowers
-   Copyright (c) 2010-2015 Sullivan Beck
-
-This module is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
-
 use strict;
 use warnings;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
 $Locale::Codes::Retired{'langfam'}{'alpha'}{'code'} = {
 };
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar.pm
index 9d9fc396a4a..23b20cffb05 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar.pm
@@ -20,7 +20,7 @@ use Locale::Codes::LangVar_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.34';
+$VERSION='3.37';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2langvar
                 langvar2code
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar.pod b/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar.pod
index 35d979b26a8..b815e13cb7f 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar.pod
@@ -16,7 +16,7 @@ Locale::Codes::LangVar - standard codes for language variation identification
 
 =head1 DESCRIPTION
 
-The C<Locale::Codes::LangVar> module provides access to standard codes
+This module provides access to standard codes
 used for identifying language variations, such as those as defined in
 the IANA language registry.
 
@@ -54,33 +54,33 @@ This is the default code set.
 
 =over 4
 
-=item B<code2langvar ( CODE [,CODESET] [,'retired'])>
+=item B<code2langvar(CODE [,CODESET] [,'retired'])>
 
-=item B<langvar2code ( NAME [,CODESET] [,'retired'])>
+=item B<langvar2code(NAME [,CODESET] [,'retired'])>
 
-=item B<langvar_code2code ( CODE ,CODESET ,CODESET2 )>
+=item B<langvar_code2code(CODE ,CODESET ,CODESET2)>
 
-=item B<all_langvar_codes ( [CODESET] [,'retired'])>
+=item B<all_langvar_codes([CODESET] [,'retired'])>
 
-=item B<all_langvar_names ( [CODESET] [,'retired'])>
+=item B<all_langvar_names([CODESET] [,'retired'])>
 
-=item B<Locale::Codes::LangVar::rename_langvar  ( CODE ,NEW_NAME [,CODESET] )>
+=item B<Locale::Codes::LangVar::rename_langvar(CODE ,NEW_NAME [,CODESET])>
 
-=item B<Locale::Codes::LangVar::add_langvar  ( CODE ,NAME [,CODESET] )>
+=item B<Locale::Codes::LangVar::add_langvar(CODE ,NAME [,CODESET])>
 
-=item B<Locale::Codes::LangVar::delete_langvar  ( CODE [,CODESET] )>
+=item B<Locale::Codes::LangVar::delete_langvar(CODE [,CODESET])>
 
-=item B<Locale::Codes::LangVar::add_langvar_alias  ( NAME ,NEW_NAME )>
+=item B<Locale::Codes::LangVar::add_langvar_alias(NAME ,NEW_NAME)>
 
-=item B<Locale::Codes::LangVar::delete_langvar_alias  ( NAME )>
+=item B<Locale::Codes::LangVar::delete_langvar_alias(NAME)>
 
-=item B<Locale::Codes::LangVar::rename_langvar_code  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::LangVar::rename_langvar_code(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::LangVar::add_langvar_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::LangVar::add_langvar_code_alias(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::LangVar::delete_langvar_code_alias  ( CODE [,CODESET] )>
+=item B<Locale::Codes::LangVar::delete_langvar_code_alias(CODE [,CODESET])>
 
-These routines are all documented in the Locale::Codes::API man page.
+These routines are all documented in the L<Locale::Codes::API> man page.
 
 =back
 
@@ -88,15 +88,15 @@ These routines are all documented in the Locale::Codes::API man page.
 
 =over 4
 
-=item B<Locale::Codes>
+=item L<Locale::Codes>
 
 The Locale-Codes distribution.
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions supported by this module.
 
-=item B<http://www.iana.org/assignments/language-subtag-registry>
+=item L<http://www.iana.org/assignments/language-subtag-registry>
 
 The IANA language subtag registry.
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar_Codes.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar_Codes.pm
index 49daafa1d85..7613dd056c6 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar_Codes.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar_Codes.pm
@@ -3,7 +3,7 @@ Locale::Codes::LangVar_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'harvest_data' is run.
-#    Generated on: Thu Feb 19 20:50:44 GMT 2015
+#    Generated on: Tue Dec  1 14:44:22 EST 2015
 
 use strict;
 require 5.006;
@@ -11,9 +11,9 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
-$Locale::Codes::Data{'langvar'}{'id'} = '0068';
+$Locale::Codes::Data{'langvar'}{'id'} = '0073';
 
 $Locale::Codes::Data{'langvar'}{'id2names'} = {
    q(0001) => [
@@ -26,8 +26,7 @@ $Locale::Codes::Data{'langvar'}{'id2names'} = {
       q(Traditional German orthography),
       ],
    q(0004) => [
-      q("Academic" ("governmental") variant of Belarusian as),
-      q("Academic" ("governmental") variant of Belarusian as),
+      q("Academic" ("governmental") variant of Belarusian as codified in 1959),
       ],
    q(0005) => [
       q(Standardized Resian orthography),
@@ -36,118 +35,130 @@ $Locale::Codes::Data{'langvar'}{'id2names'} = {
       q(German orthography of 1996),
       ],
    q(0007) => [
-      q(ALA-LC Romanization, 1997 edition),
+      q(Orthographic formulation of 1943 - Official in Brazil (Formulario Ortografico de 1943 - Oficial no Brasil)),
       ],
    q(0008) => [
+      q(ALA-LC Romanization, 1997 edition),
+      ],
+   q(0009) => [
       q(Aluku dialect),
       q(Boni dialect),
       ],
-   q(0009) => [
+   q(0010) => [
+      q(Portuguese Language Orthographic Agreement of 1990 (Acordo Ortografico da Lingua Portuguesa de 1990)),
+      ],
+   q(0011) => [
       q(Eastern Armenian),
       ],
-   q(0010) => [
+   q(0012) => [
       q(Western Armenian),
       ],
-   q(0011) => [
+   q(0013) => [
       q(Unified Turkic Latin Alphabet (Historical)),
       ],
-   q(0012) => [
+   q(0014) => [
       q(The Balanka dialect of Anii),
       ],
-   q(0013) => [
+   q(0015) => [
       q(The Barlavento dialect group of Kabuverdianu),
       ],
-   q(0014) => [
+   q(0016) => [
       q(Buddhist Hybrid Sanskrit),
       ],
-   q(0015) => [
+   q(0017) => [
       q(Biscayan dialect of Basque),
       ],
-   q(0016) => [
+   q(0018) => [
       q(The San Giorgio dialect of Resian),
       q(The Bila dialect of Resian),
       ],
-   q(0017) => [
+   q(0019) => [
       q(Slovene in Bohoric alphabet),
       ],
-   q(0018) => [
+   q(0020) => [
       q(Boontling),
       ],
-   q(0019) => [
+   q(0021) => [
+      q(Portuguese-Brazilian Orthographic Convention of 1945 (Convencao Ortografica Luso-Brasileira de 1945)),
+      ],
+   q(0022) => [
       q(Slovene in Dajnko alphabet),
       ],
-   q(0020) => [
+   q(0023) => [
       q(Serbian with Ekavian pronunciation),
       ],
-   q(0021) => [
+   q(0024) => [
       q(Early Modern English (1500-1700)),
       ],
-   q(0022) => [
+   q(0025) => [
       q(International Phonetic Alphabet),
       ],
-   q(0023) => [
+   q(0026) => [
       q(Uralic Phonetic Alphabet),
       ],
-   q(0024) => [
+   q(0027) => [
       q(X-SAMPA transcription),
       ],
-   q(0025) => [
+   q(0028) => [
       q(Hepburn romanization),
       ],
-   q(0026) => [
+   q(0029) => [
       q(Norwegian in Hognorsk (High Norwegian) orthography),
       ],
-   q(0027) => [
+   q(0030) => [
       q(Serbian with Ijekavian pronunciation),
       ],
-   q(0028) => [
+   q(0031) => [
       q(Epic Sanskrit),
       ],
-   q(0029) => [
+   q(0032) => [
       q(Jauer dialect of Romansh),
       ],
-   q(0030) => [
+   q(0033) => [
       q(Jyutping Cantonese Romanization),
       ],
-   q(0031) => [
+   q(0034) => [
       q(Common Cornish orthography of Revived Cornish),
       ],
-   q(0032) => [
+   q(0035) => [
       q(The Kociewie dialect of Polish),
       ],
-   q(0033) => [
+   q(0036) => [
       q(Standard Cornish orthography of Revived Cornish),
       q(Kernowek Standard),
       ],
-   q(0034) => [
+   q(0037) => [
       q(Classical Sanskrit),
       ],
-   q(0035) => [
+   q(0038) => [
       q(The Lipovaz dialect of Resian),
       q(The Lipovec dialect of Resian),
       ],
-   q(0036) => [
+   q(0039) => [
       q(Post-1917 Russian orthography),
       ],
-   q(0037) => [
+   q(0040) => [
       q(Slovene in Metelko alphabet),
       ],
-   q(0038) => [
+   q(0041) => [
       q(Monotonic Greek),
       ],
-   q(0039) => [
+   q(0042) => [
       q(Ndyuka dialect),
       q(Aukan dialect),
       ],
-   q(0040) => [
+   q(0043) => [
       q(Natisone dialect),
       q(Nadiza dialect),
       ],
-   q(0041) => [
+   q(0044) => [
+      q(Newfoundland English),
+      ],
+   q(0045) => [
       q(The Gniva dialect of Resian),
       q(The Njiva dialect of Resian),
       ],
-   q(0042) => [
+   q(0046) => [
       q(Volapuk nulik),
       q(Volapuk perevidol),
       q(Volapuk nuladik),
@@ -156,145 +167,148 @@ $Locale::Codes::Data{'langvar'}{'id2names'} = {
       q(Revised Volapuk),
       q(Modern Volapuk),
       ],
-   q(0043) => [
+   q(0047) => [
       q(The Oseacco dialect of Resian),
       q(The Osojane dialect of Resian),
       ],
-   q(0044) => [
+   q(0048) => [
+      q(Oxford English Dictionary spelling),
+      ],
+   q(0049) => [
       q(Pamaka dialect),
       ],
-   q(0045) => [
+   q(0050) => [
       q(Petrine orthography),
       ],
-   q(0046) => [
+   q(0051) => [
       q(Pinyin romanization),
       ],
-   q(0047) => [
+   q(0052) => [
       q(Polytonic Greek),
       ],
-   q(0048) => [
+   q(0053) => [
       q(Puter idiom of Romansh),
       ],
-   q(0049) => [
+   q(0054) => [
       q(Volapuk rigik),
       q(Schleyer's Volapuk),
       q(Original Volapuk),
       q(Classic Volapuk),
       ],
-   q(0050) => [
+   q(0055) => [
       q(Resian),
       q(Resianic),
       q(Rezijan),
       ],
-   q(0051) => [
+   q(0056) => [
       q(Rumantsch Grischun),
       ],
-   q(0052) => [
+   q(0057) => [
       q(Scottish Standard English),
       ],
-   q(0053) => [
+   q(0058) => [
       q(Scouse),
       ],
-   q(0054) => [
+   q(0059) => [
       q(The Stolvizza dialect of Resian),
       q(The Solbica dialect of Resian),
       ],
-   q(0055) => [
+   q(0060) => [
       q(The Sotavento dialect group of Kabuverdianu),
       ],
-   q(0056) => [
+   q(0061) => [
       q(Surmiran idiom of Romansh),
       ],
-   q(0057) => [
+   q(0062) => [
       q(Sursilvan idiom of Romansh),
       ],
-   q(0058) => [
+   q(0063) => [
       q(Sutsilvan idiom of Romansh),
       ],
-   q(0059) => [
+   q(0064) => [
       q(Belarusian in Taraskievica orthography),
       ],
-   q(0060) => [
+   q(0065) => [
       q(Unified Cornish orthography of Revived Cornish),
       ],
-   q(0061) => [
+   q(0066) => [
       q(Unified Cornish Revised orthography of Revived Cornish),
       ],
-   q(0062) => [
+   q(0067) => [
       q(Ulster dialect of Scots),
       ],
-   q(0063) => [
+   q(0068) => [
       q(Unifon phonetic alphabet),
       ],
-   q(0064) => [
+   q(0069) => [
       q(Vedic Sanskrit),
       ],
-   q(0065) => [
+   q(0070) => [
       q(Valencian),
       ],
-   q(0066) => [
+   q(0071) => [
       q(Vallader idiom of Romansh),
       ],
-   q(0067) => [
+   q(0072) => [
       q(Wade-Giles romanization),
       ],
 };
 
 $Locale::Codes::Data{'langvar'}{'alias2id'} = {
-   q("academic" ("governmental") variant of belarusian as) => [
+   q("academic" ("governmental") variant of belarusian as codified in 1959) => [
       q(0004),
-      q(1),
+      q(0),
       ],
    q(ala-lc romanization, 1997 edition) => [
-      q(0007),
+      q(0008),
       q(0),
       ],
    q(aluku dialect) => [
-      q(0008),
+      q(0009),
       q(0),
       ],
    q(aukan dialect) => [
-      q(0039),
+      q(0042),
       q(1),
       ],
    q(belarusian in taraskievica orthography) => [
-      q(0059),
+      q(0064),
       q(0),
       ],
    q(biscayan dialect of basque) => [
-      q(0015),
+      q(0017),
       q(0),
       ],
    q(boni dialect) => [
-      q(0008),
+      q(0009),
       q(1),
       ],
    q(boontling) => [
-      q(0018),
+      q(0020),
       q(0),
       ],
    q(buddhist hybrid sanskrit) => [
-      q(0014),
+      q(0016),
       q(0),
       ],
    q(classic volapuk) => [
-      q(0049),
+      q(0054),
       q(3),
       ],
    q(classical sanskrit) => [
-      q(0034),
+      q(0037),
       q(0),
       ],
    q(common cornish orthography of revived cornish) => [
-      q(0031),
+      q(0034),
       q(0),
       ],
    q(de jong's volapuk) => [
-      q(0042),
+      q(0046),
       q(3),
       ],
    q(early modern english (1500-1700)) => [
-      q(0021),
+      q(0024),
       q(0),
       ],
    q(early modern french) => [
@@ -302,11 +316,11 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0),
       ],
    q(eastern armenian) => [
-      q(0009),
+      q(0011),
       q(0),
       ],
    q(epic sanskrit) => [
-      q(0028),
+      q(0031),
       q(0),
       ],
    q(german orthography of 1996) => [
@@ -314,23 +328,23 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0),
       ],
    q(hepburn romanization) => [
-      q(0025),
+      q(0028),
       q(0),
       ],
    q(international phonetic alphabet) => [
-      q(0022),
+      q(0025),
       q(0),
       ],
    q(jauer dialect of romansh) => [
-      q(0029),
+      q(0032),
       q(0),
       ],
    q(jyutping cantonese romanization) => [
-      q(0030),
+      q(0033),
       q(0),
       ],
    q(kernowek standard) => [
-      q(0033),
+      q(0036),
       q(1),
       ],
    q(late middle french (to 1606)) => [
@@ -338,115 +352,135 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0),
       ],
    q(modern volapuk) => [
-      q(0042),
+      q(0046),
       q(6),
       ],
    q(monotonic greek) => [
-      q(0038),
+      q(0041),
       q(0),
       ],
    q(nadiza dialect) => [
-      q(0040),
+      q(0043),
       q(1),
       ],
    q(natisone dialect) => [
-      q(0040),
+      q(0043),
       q(0),
       ],
    q(ndyuka dialect) => [
-      q(0039),
+      q(0042),
       q(0),
       ],
    q(new volapuk) => [
-      q(0042),
+      q(0046),
       q(4),
       ],
+   q(newfoundland english) => [
+      q(0044),
+      q(0),
+      ],
    q(norwegian in hognorsk (high norwegian) orthography) => [
-      q(0026),
+      q(0029),
       q(0),
       ],
    q(original volapuk) => [
-      q(0049),
+      q(0054),
       q(2),
       ],
+   q(orthographic formulation of 1943 - official in brazil (formulario ortografico de 1943 - oficial no brasil)) => [
+      q(0007),
+      q(0),
+      ],
+   q(oxford english dictionary spelling) => [
+      q(0048),
+      q(0),
+      ],
    q(pamaka dialect) => [
-      q(0044),
+      q(0049),
       q(0),
       ],
    q(petrine orthography) => [
-      q(0045),
+      q(0050),
       q(0),
       ],
    q(pinyin romanization) => [
-      q(0046),
+      q(0051),
       q(0),
       ],
    q(polytonic greek) => [
-      q(0047),
+      q(0052),
+      q(0),
+      ],
+   q(portuguese language orthographic agreement of 1990 (acordo ortografico da lingua portuguesa de 1990)) => [
+      q(0010),
+      q(0),
+      ],
+   q(portuguese-brazilian orthographic convention of 1945 (convencao ortografica luso-brasileira de 1945)) => [
+      q(0021),
       q(0),
       ],
    q(post-1917 russian orthography) => [
-      q(0036),
+      q(0039),
       q(0),
       ],
    q(puter idiom of romansh) => [
-      q(0048),
+      q(0053),
       q(0),
       ],
    q(resian) => [
-      q(0050),
+      q(0055),
       q(0),
       ],
    q(resianic) => [
-      q(0050),
+      q(0055),
       q(1),
       ],
    q(revised volapuk) => [
-      q(0042),
+      q(0046),
       q(5),
       ],
    q(rezijan) => [
-      q(0050),
+      q(0055),
       q(2),
       ],
    q(rumantsch grischun) => [
-      q(0051),
+      q(0056),
       q(0),
       ],
    q(schleyer's volapuk) => [
-      q(0049),
+      q(0054),
       q(1),
       ],
    q(scottish standard english) => [
-      q(0052),
+      q(0057),
       q(0),
       ],
    q(scouse) => [
-      q(0053),
+      q(0058),
       q(0),
       ],
    q(serbian with ekavian pronunciation) => [
-      q(0020),
+      q(0023),
       q(0),
       ],
    q(serbian with ijekavian pronunciation) => [
-      q(0027),
+      q(0030),
       q(0),
       ],
    q(slovene in bohoric alphabet) => [
-      q(0017),
+      q(0019),
       q(0),
       ],
    q(slovene in dajnko alphabet) => [
-      q(0019),
+      q(0022),
       q(0),
       ],
    q(slovene in metelko alphabet) => [
-      q(0037),
+      q(0040),
       q(0),
       ],
    q(standard cornish orthography of revived cornish) => [
-      q(0033),
+      q(0036),
       q(0),
       ],
    q(standardized resian orthography) => [
@@ -454,71 +488,71 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0),
       ],
    q(surmiran idiom of romansh) => [
-      q(0056),
+      q(0061),
       q(0),
       ],
    q(sursilvan idiom of romansh) => [
-      q(0057),
+      q(0062),
       q(0),
       ],
    q(sutsilvan idiom of romansh) => [
-      q(0058),
+      q(0063),
       q(0),
       ],
    q(the balanka dialect of anii) => [
-      q(0012),
+      q(0014),
       q(0),
       ],
    q(the barlavento dialect group of kabuverdianu) => [
-      q(0013),
+      q(0015),
       q(0),
       ],
    q(the bila dialect of resian) => [
-      q(0016),
+      q(0018),
       q(1),
       ],
    q(the gniva dialect of resian) => [
-      q(0041),
+      q(0045),
       q(0),
       ],
    q(the kociewie dialect of polish) => [
-      q(0032),
+      q(0035),
       q(0),
       ],
    q(the lipovaz dialect of resian) => [
-      q(0035),
+      q(0038),
       q(0),
       ],
    q(the lipovec dialect of resian) => [
-      q(0035),
+      q(0038),
       q(1),
       ],
    q(the njiva dialect of resian) => [
-      q(0041),
+      q(0045),
       q(1),
       ],
    q(the oseacco dialect of resian) => [
-      q(0043),
+      q(0047),
       q(0),
       ],
    q(the osojane dialect of resian) => [
-      q(0043),
+      q(0047),
       q(1),
       ],
    q(the san giorgio dialect of resian) => [
-      q(0016),
+      q(0018),
       q(0),
       ],
    q(the solbica dialect of resian) => [
-      q(0054),
+      q(0059),
       q(1),
       ],
    q(the sotavento dialect group of kabuverdianu) => [
-      q(0055),
+      q(0060),
       q(0),
       ],
    q(the stolvizza dialect of resian) => [
-      q(0054),
+      q(0059),
       q(0),
       ],
    q(traditional german orthography) => [
@@ -526,67 +560,67 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0),
       ],
    q(ulster dialect of scots) => [
-      q(0062),
+      q(0067),
       q(0),
       ],
    q(unified cornish orthography of revived cornish) => [
-      q(0060),
+      q(0065),
       q(0),
       ],
    q(unified cornish revised orthography of revived cornish) => [
-      q(0061),
+      q(0066),
       q(0),
       ],
    q(unified turkic latin alphabet (historical)) => [
-      q(0011),
+      q(0013),
       q(0),
       ],
    q(unifon phonetic alphabet) => [
-      q(0063),
+      q(0068),
       q(0),
       ],
    q(uralic phonetic alphabet) => [
-      q(0023),
+      q(0026),
       q(0),
       ],
    q(valencian) => [
-      q(0065),
+      q(0070),
       q(0),
       ],
    q(vallader idiom of romansh) => [
-      q(0066),
+      q(0071),
       q(0),
       ],
    q(vedic sanskrit) => [
-      q(0064),
+      q(0069),
       q(0),
       ],
    q(volapuk nuladik) => [
-      q(0042),
+      q(0046),
       q(2),
       ],
    q(volapuk nulik) => [
-      q(0042),
+      q(0046),
       q(0),
       ],
    q(volapuk perevidol) => [
-      q(0042),
+      q(0046),
       q(1),
       ],
    q(volapuk rigik) => [
-      q(0049),
+      q(0054),
       q(0),
       ],
    q(wade-giles romanization) => [
-      q(0067),
+      q(0072),
       q(0),
       ],
    q(western armenian) => [
-      q(0010),
+      q(0012),
       q(0),
       ],
    q(x-sampa transcription) => [
-      q(0024),
+      q(0027),
       q(0),
       ],
 };
@@ -617,250 +651,270 @@ $Locale::Codes::Data{'langvar'}{'code2id'} = {
          q(0006),
          q(0),
          ],
-      q(alalc97) => [
+      q(abl1943) => [
          q(0007),
          q(0),
          ],
-      q(aluku) => [
+      q(alalc97) => [
          q(0008),
          q(0),
          ],
-      q(arevela) => [
+      q(aluku) => [
          q(0009),
          q(0),
          ],
-      q(arevmda) => [
+      q(ao1990) => [
          q(0010),
          q(0),
          ],
-      q(baku1926) => [
+      q(arevela) => [
          q(0011),
          q(0),
          ],
-      q(balanka) => [
+      q(arevmda) => [
          q(0012),
          q(0),
          ],
-      q(barla) => [
+      q(baku1926) => [
          q(0013),
          q(0),
          ],
-      q(bauddha) => [
+      q(balanka) => [
          q(0014),
          q(0),
          ],
-      q(biscayan) => [
+      q(barla) => [
          q(0015),
          q(0),
          ],
-      q(biske) => [
+      q(bauddha) => [
          q(0016),
          q(0),
          ],
-      q(bohoric) => [
+      q(biscayan) => [
          q(0017),
          q(0),
          ],
-      q(boont) => [
+      q(biske) => [
          q(0018),
          q(0),
          ],
-      q(dajnko) => [
+      q(bohoric) => [
          q(0019),
          q(0),
          ],
-      q(ekavsk) => [
+      q(boont) => [
          q(0020),
          q(0),
          ],
-      q(emodeng) => [
+      q(colb1945) => [
          q(0021),
          q(0),
          ],
-      q(fonipa) => [
+      q(dajnko) => [
          q(0022),
          q(0),
          ],
-      q(fonupa) => [
+      q(ekavsk) => [
          q(0023),
          q(0),
          ],
-      q(fonxsamp) => [
+      q(emodeng) => [
          q(0024),
          q(0),
          ],
-      q(hepburn) => [
+      q(fonipa) => [
          q(0025),
          q(0),
          ],
-      q(hognorsk) => [
+      q(fonupa) => [
          q(0026),
          q(0),
          ],
-      q(ijekavsk) => [
+      q(fonxsamp) => [
          q(0027),
          q(0),
          ],
-      q(itihasa) => [
+      q(hepburn) => [
          q(0028),
          q(0),
          ],
-      q(jauer) => [
+      q(hognorsk) => [
          q(0029),
          q(0),
          ],
-      q(jyutping) => [
+      q(ijekavsk) => [
          q(0030),
          q(0),
          ],
-      q(kkcor) => [
+      q(itihasa) => [
          q(0031),
          q(0),
          ],
-      q(kociewie) => [
+      q(jauer) => [
          q(0032),
          q(0),
          ],
-      q(kscor) => [
+      q(jyutping) => [
          q(0033),
          q(0),
          ],
-      q(laukika) => [
+      q(kkcor) => [
          q(0034),
          q(0),
          ],
-      q(lipaw) => [
+      q(kociewie) => [
          q(0035),
          q(0),
          ],
-      q(luna1918) => [
+      q(kscor) => [
          q(0036),
          q(0),
          ],
-      q(metelko) => [
+      q(laukika) => [
          q(0037),
          q(0),
          ],
-      q(monoton) => [
+      q(lipaw) => [
          q(0038),
          q(0),
          ],
-      q(ndyuka) => [
+      q(luna1918) => [
          q(0039),
          q(0),
          ],
-      q(nedis) => [
+      q(metelko) => [
          q(0040),
          q(0),
          ],
-      q(njiva) => [
+      q(monoton) => [
          q(0041),
          q(0),
          ],
-      q(nulik) => [
+      q(ndyuka) => [
          q(0042),
          q(0),
          ],
-      q(osojs) => [
+      q(nedis) => [
          q(0043),
          q(0),
          ],
-      q(pamaka) => [
+      q(newfound) => [
          q(0044),
          q(0),
          ],
-      q(petr1708) => [
+      q(njiva) => [
          q(0045),
          q(0),
          ],
-      q(pinyin) => [
+      q(nulik) => [
          q(0046),
          q(0),
          ],
-      q(polyton) => [
+      q(osojs) => [
          q(0047),
          q(0),
          ],
-      q(puter) => [
+      q(oxendict) => [
          q(0048),
          q(0),
          ],
-      q(rigik) => [
+      q(pamaka) => [
          q(0049),
          q(0),
          ],
-      q(rozaj) => [
+      q(petr1708) => [
          q(0050),
          q(0),
          ],
-      q(rumgr) => [
+      q(pinyin) => [
          q(0051),
          q(0),
          ],
-      q(scotland) => [
+      q(polyton) => [
          q(0052),
          q(0),
          ],
-      q(scouse) => [
+      q(puter) => [
          q(0053),
          q(0),
          ],
-      q(solba) => [
+      q(rigik) => [
          q(0054),
          q(0),
          ],
-      q(sotav) => [
+      q(rozaj) => [
          q(0055),
          q(0),
          ],
-      q(surmiran) => [
+      q(rumgr) => [
          q(0056),
          q(0),
          ],
-      q(sursilv) => [
+      q(scotland) => [
          q(0057),
          q(0),
          ],
-      q(sutsilv) => [
+      q(scouse) => [
          q(0058),
          q(0),
          ],
-      q(tarask) => [
+      q(solba) => [
          q(0059),
          q(0),
          ],
-      q(uccor) => [
+      q(sotav) => [
          q(0060),
          q(0),
          ],
-      q(ucrcor) => [
+      q(surmiran) => [
          q(0061),
          q(0),
          ],
-      q(ulster) => [
+      q(sursilv) => [
          q(0062),
          q(0),
          ],
-      q(unifon) => [
+      q(sutsilv) => [
          q(0063),
          q(0),
          ],
-      q(vaidika) => [
+      q(tarask) => [
          q(0064),
          q(0),
          ],
-      q(valencia) => [
+      q(uccor) => [
          q(0065),
          q(0),
          ],
-      q(vallader) => [
+      q(ucrcor) => [
          q(0066),
          q(0),
          ],
-      q(wadegile) => [
+      q(ulster) => [
          q(0067),
          q(0),
          ],
+      q(unifon) => [
+         q(0068),
+         q(0),
+         ],
+      q(vaidika) => [
+         q(0069),
+         q(0),
+         ],
+      q(valencia) => [
+         q(0070),
+         q(0),
+         ],
+      q(vallader) => [
+         q(0071),
+         q(0),
+         ],
+      q(wadegile) => [
+         q(0072),
+         q(0),
+         ],
       },
 };
 
@@ -872,67 +926,72 @@ $Locale::Codes::Data{'langvar'}{'id2code'} = {
       q(0004) => q(1959acad),
       q(0005) => q(1994),
       q(0006) => q(1996),
-      q(0007) => q(alalc97),
-      q(0008) => q(aluku),
-      q(0009) => q(arevela),
-      q(0010) => q(arevmda),
-      q(0011) => q(baku1926),
-      q(0012) => q(balanka),
-      q(0013) => q(barla),
-      q(0014) => q(bauddha),
-      q(0015) => q(biscayan),
-      q(0016) => q(biske),
-      q(0017) => q(bohoric),
-      q(0018) => q(boont),
-      q(0019) => q(dajnko),
-      q(0020) => q(ekavsk),
-      q(0021) => q(emodeng),
-      q(0022) => q(fonipa),
-      q(0023) => q(fonupa),
-      q(0024) => q(fonxsamp),
-      q(0025) => q(hepburn),
-      q(0026) => q(hognorsk),
-      q(0027) => q(ijekavsk),
-      q(0028) => q(itihasa),
-      q(0029) => q(jauer),
-      q(0030) => q(jyutping),
-      q(0031) => q(kkcor),
-      q(0032) => q(kociewie),
-      q(0033) => q(kscor),
-      q(0034) => q(laukika),
-      q(0035) => q(lipaw),
-      q(0036) => q(luna1918),
-      q(0037) => q(metelko),
-      q(0038) => q(monoton),
-      q(0039) => q(ndyuka),
-      q(0040) => q(nedis),
-      q(0041) => q(njiva),
-      q(0042) => q(nulik),
-      q(0043) => q(osojs),
-      q(0044) => q(pamaka),
-      q(0045) => q(petr1708),
-      q(0046) => q(pinyin),
-      q(0047) => q(polyton),
-      q(0048) => q(puter),
-      q(0049) => q(rigik),
-      q(0050) => q(rozaj),
-      q(0051) => q(rumgr),
-      q(0052) => q(scotland),
-      q(0053) => q(scouse),
-      q(0054) => q(solba),
-      q(0055) => q(sotav),
-      q(0056) => q(surmiran),
-      q(0057) => q(sursilv),
-      q(0058) => q(sutsilv),
-      q(0059) => q(tarask),
-      q(0060) => q(uccor),
-      q(0061) => q(ucrcor),
-      q(0062) => q(ulster),
-      q(0063) => q(unifon),
-      q(0064) => q(vaidika),
-      q(0065) => q(valencia),
-      q(0066) => q(vallader),
-      q(0067) => q(wadegile),
+      q(0007) => q(abl1943),
+      q(0008) => q(alalc97),
+      q(0009) => q(aluku),
+      q(0010) => q(ao1990),
+      q(0011) => q(arevela),
+      q(0012) => q(arevmda),
+      q(0013) => q(baku1926),
+      q(0014) => q(balanka),
+      q(0015) => q(barla),
+      q(0016) => q(bauddha),
+      q(0017) => q(biscayan),
+      q(0018) => q(biske),
+      q(0019) => q(bohoric),
+      q(0020) => q(boont),
+      q(0021) => q(colb1945),
+      q(0022) => q(dajnko),
+      q(0023) => q(ekavsk),
+      q(0024) => q(emodeng),
+      q(0025) => q(fonipa),
+      q(0026) => q(fonupa),
+      q(0027) => q(fonxsamp),
+      q(0028) => q(hepburn),
+      q(0029) => q(hognorsk),
+      q(0030) => q(ijekavsk),
+      q(0031) => q(itihasa),
+      q(0032) => q(jauer),
+      q(0033) => q(jyutping),
+      q(0034) => q(kkcor),
+      q(0035) => q(kociewie),
+      q(0036) => q(kscor),
+      q(0037) => q(laukika),
+      q(0038) => q(lipaw),
+      q(0039) => q(luna1918),
+      q(0040) => q(metelko),
+      q(0041) => q(monoton),
+      q(0042) => q(ndyuka),
+      q(0043) => q(nedis),
+      q(0044) => q(newfound),
+      q(0045) => q(njiva),
+      q(0046) => q(nulik),
+      q(0047) => q(osojs),
+      q(0048) => q(oxendict),
+      q(0049) => q(pamaka),
+      q(0050) => q(petr1708),
+      q(0051) => q(pinyin),
+      q(0052) => q(polyton),
+      q(0053) => q(puter),
+      q(0054) => q(rigik),
+      q(0055) => q(rozaj),
+      q(0056) => q(rumgr),
+      q(0057) => q(scotland),
+      q(0058) => q(scouse),
+      q(0059) => q(solba),
+      q(0060) => q(sotav),
+      q(0061) => q(surmiran),
+      q(0062) => q(sursilv),
+      q(0063) => q(sutsilv),
+      q(0064) => q(tarask),
+      q(0065) => q(uccor),
+      q(0066) => q(ucrcor),
+      q(0067) => q(ulster),
+      q(0068) => q(unifon),
+      q(0069) => q(vaidika),
+      q(0070) => q(valencia),
+      q(0071) => q(vallader),
+      q(0072) => q(wadegile),
       },
 };
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar_Retired.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar_Retired.pm
index 67ce0e9f518..3ebef842303 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar_Retired.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/LangVar_Retired.pm
@@ -3,7 +3,7 @@ Locale::Codes::LangVar_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Fri Feb 20 15:27:22 GMT 2015
+#    Generated on: Tue Dec  1 14:45:28 EST 2015
 
 use strict;
 require 5.006;
@@ -11,12 +11,14 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
 $Locale::Codes::Retired{'langvar'}{'alpha'}{'code'} = {
 };
 
 $Locale::Codes::Retired{'langvar'}{'alpha'}{'name'} = {
+   q("academic" ("governmental") variant of belarusian as) => [ q(1959acad), q("Academic" ("governmental") variant of Belarusian as) ],
+   q(portugese language orthographic agreement of 1990 (acordo ortografico da lingua portuguesa de 1990)) => [ q(ao1990), q(Portugese Language Orthographic Agreement of 1990 (Acordo Ortografico da Lingua Portuguesa de 1990)) ],
    q(slovene in bohoric alphabet) => [ q(bohoric), q(Slovene in Bohoric alphabet) ],
 };
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Language.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Language.pm
index 3daf64501ff..4109d6c204f 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Language.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Language.pm
@@ -22,7 +22,7 @@ use Locale::Codes::Language_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.34';
+$VERSION='3.37';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2language
                 language2code
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Language.pod b/Master/tlpkg/tlperl/lib/Locale/Codes/Language.pod
index a9145668d7f..123d2a8e667 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Language.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Language.pod
@@ -16,7 +16,7 @@ Locale::Codes::Language - standard codes for language identification
 
 =head1 DESCRIPTION
 
-The C<Locale::Codes::Language> module provides access to standard codes used
+This module provides access to standard codes used
 for identifying languages, such as those as defined in ISO 639.
 
 Most of the routines take an optional additional argument which
@@ -63,33 +63,33 @@ ISO 639.
 
 =over 4
 
-=item B<code2language ( CODE [,CODESET] [,'retired'])>
+=item B<code2language(CODE [,CODESET] [,'retired'])>
 
-=item B<language2code ( NAME [,CODESET] [,'retired'])>
+=item B<language2code(NAME [,CODESET] [,'retired'])>
 
-=item B<language_code2code ( CODE ,CODESET ,CODESET2 )>
+=item B<language_code2code(CODE ,CODESET ,CODESET2)>
 
-=item B<all_language_codes ( [CODESET] [,'retired'])>
+=item B<all_language_codes([CODESET] [,'retired'])>
 
-=item B<all_language_names ( [CODESET] [,'retired'])>
+=item B<all_language_names([CODESET] [,'retired'])>
 
-=item B<Locale::Codes::Language::rename_language  ( CODE ,NEW_NAME [,CODESET] )>
+=item B<Locale::Codes::Language::rename_language(CODE ,NEW_NAME [,CODESET])>
 
-=item B<Locale::Codes::Language::add_language  ( CODE ,NAME [,CODESET] )>
+=item B<Locale::Codes::Language::add_language(CODE ,NAME [,CODESET])>
 
-=item B<Locale::Codes::Language::delete_language  ( CODE [,CODESET] )>
+=item B<Locale::Codes::Language::delete_language(CODE [,CODESET])>
 
-=item B<Locale::Codes::Language::add_language_alias  ( NAME ,NEW_NAME )>
+=item B<Locale::Codes::Language::add_language_alias(NAME ,NEW_NAME)>
 
-=item B<Locale::Codes::Language::delete_language_alias  ( NAME )>
+=item B<Locale::Codes::Language::delete_language_alias(NAME)>
 
-=item B<Locale::Codes::Language::rename_language_code  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::Language::rename_language_code(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::Language::add_language_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::Language::add_language_code_alias(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::Language::delete_language_code_alias  ( CODE [,CODESET] )>
+=item B<Locale::Codes::Language::delete_language_code_alias(CODE [,CODESET])>
 
-These routines are all documented in the Locale::Codes::API man page.
+These routines are all documented in the L<Locale::Codes::API> man page.
 
 =back
 
@@ -97,23 +97,23 @@ These routines are all documented in the Locale::Codes::API man page.
 
 =over 4
 
-=item B<Locale::Codes>
+=item L<Locale::Codes>
 
 The Locale-Codes distribution.
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions supported by this module.
 
-=item B<http://www.loc.gov/standards/iso639-2/>
+=item L<http://www.loc.gov/standards/iso639-2/>
 
 Source of the ISO 639-2 codes.
 
-=item B<http://www.loc.gov/standards/iso639-5/>
+=item L<http://www.loc.gov/standards/iso639-5/>
 
 Source of the ISO 639-5 codes.
 
-=item B<http://www.iana.org/assignments/language-subtag-registry>
+=item L<http://www.iana.org/assignments/language-subtag-registry>
 
 The IANA language subtag registry.
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Language_Codes.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Language_Codes.pm
index 7c2fa8388e1..51abf1bcb0e 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Language_Codes.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Language_Codes.pm
@@ -3,7 +3,7 @@ Locale::Codes::Language_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'harvest_data' is run.
-#    Generated on: Thu Feb 19 20:49:39 GMT 2015
+#    Generated on: Tue Dec  1 14:41:14 EST 2015
 
 use strict;
 require 5.006;
@@ -11,9 +11,9 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
-$Locale::Codes::Data{'language'}{'id'} = '7974';
+$Locale::Codes::Data{'language'}{'id'} = '7976';
 
 $Locale::Codes::Data{'language'}{'id2names'} = {
    q(0001) => [
@@ -2633,7 +2633,7 @@ $Locale::Codes::Data{'language'}{'id2names'} = {
       q(Taikat),
       ],
    q(0830) => [
-      q(Atong),
+      q(Atong (India)),
       q(A'tong),
       ],
    q(0831) => [
@@ -2908,5034 +2908,5035 @@ $Locale::Codes::Data{'language'}{'id2names'} = {
       q(Ashtiani),
       ],
    q(0921) => [
-      q(Pudtol Atta),
+      q(Atong (Cameroon)),
       ],
    q(0922) => [
-      q(Aralle-Tabulahan),
+      q(Pudtol Atta),
       ],
    q(0923) => [
-      q(Waimiri-Atroari),
+      q(Aralle-Tabulahan),
       ],
    q(0924) => [
-      q(Gros Ventre),
+      q(Waimiri-Atroari),
       ],
    q(0925) => [
-      q(Pamplona Atta),
+      q(Gros Ventre),
       ],
    q(0926) => [
-      q(Reel),
+      q(Pamplona Atta),
       ],
    q(0927) => [
-      q(Northern Altai),
+      q(Reel),
       ],
    q(0928) => [
-      q(Atsugewi),
+      q(Northern Altai),
       ],
    q(0929) => [
-      q(Arutani),
+      q(Atsugewi),
       ],
    q(0930) => [
-      q(Aneityum),
+      q(Arutani),
       ],
    q(0931) => [
-      q(Arta),
+      q(Aneityum),
       ],
    q(0932) => [
-      q(Asumboa),
+      q(Arta),
       ],
    q(0933) => [
-      q(Alugu),
+      q(Asumboa),
       ],
    q(0934) => [
-      q(Waorani),
+      q(Alugu),
       ],
    q(0935) => [
-      q(Anuta),
+      q(Waorani),
       ],
    q(0936) => [
-      q(Aguna),
+      q(Anuta),
       ],
    q(0937) => [
-      q(Aushi),
+      q(Aguna),
       ],
    q(0938) => [
-      q(Anuki),
+      q(Aushi),
       ],
    q(0939) => [
-      q(Awjilah),
+      q(Anuki),
       ],
    q(0940) => [
-      q(Heyo),
+      q(Awjilah),
       ],
    q(0941) => [
-      q(Aulua),
+      q(Heyo),
       ],
    q(0942) => [
-      q(Asu (Nigeria)),
+      q(Aulua),
       ],
    q(0943) => [
-      q(Molmo One),
+      q(Asu (Nigeria)),
       ],
    q(0944) => [
-      q(Auyokawa),
+      q(Molmo One),
       ],
    q(0945) => [
-      q(Makayam),
+      q(Auyokawa),
       ],
    q(0946) => [
+      q(Makayam),
+      ],
+   q(0947) => [
       q(Anus),
       q(Korur),
       ],
-   q(0947) => [
+   q(0948) => [
       q(Aruek),
       ],
-   q(0948) => [
+   q(0949) => [
       q(Austral),
       ],
-   q(0949) => [
+   q(0950) => [
       q(Auye),
       ],
-   q(0950) => [
+   q(0951) => [
       q(Awyi),
       ],
-   q(0951) => [
+   q(0952) => [
       q(Aura),
       ],
-   q(0952) => [
+   q(0953) => [
       q(Awiyaana),
       ],
-   q(0953) => [
+   q(0954) => [
       q(Uzbeki Arabic),
       ],
-   q(0954) => [
+   q(0955) => [
       q(Avau),
       ],
-   q(0955) => [
+   q(0956) => [
       q(Alviri-Vidari),
       ],
-   q(0956) => [
+   q(0957) => [
       q(Avikam),
       ],
-   q(0957) => [
+   q(0958) => [
       q(Kotava),
       ],
-   q(0958) => [
+   q(0959) => [
       q(Eastern Egyptian Bedawi Arabic),
       ],
-   q(0959) => [
+   q(0960) => [
       q(Angkamuthi),
       ],
-   q(0960) => [
+   q(0961) => [
       q(Avatime),
       ],
-   q(0961) => [
+   q(0962) => [
       q(Agavotaguerra),
       ],
-   q(0962) => [
+   q(0963) => [
       q(Aushiri),
       ],
-   q(0963) => [
+   q(0964) => [
       q(Au),
       ],
-   q(0964) => [
+   q(0965) => [
       q(Avokaya),
       ],
-   q(0965) => [
+   q(0966) => [
       q(Ava-Canoeiro),
       ],
-   q(0966) => [
+   q(0967) => [
       q(Awa (Papua New Guinea)),
       ],
-   q(0967) => [
+   q(0968) => [
       q(Cicipu),
       ],
-   q(0968) => [
+   q(0969) => [
       q(Aweti),
       ],
-   q(0969) => [
+   q(0970) => [
       q(Anguthimri),
       ],
-   q(0970) => [
+   q(0971) => [
       q(Awbono),
       ],
-   q(0971) => [
+   q(0972) => [
       q(Aekyom),
       ],
-   q(0972) => [
+   q(0973) => [
       q(Awabakal),
       ],
-   q(0973) => [
+   q(0974) => [
       q(Arawum),
       ],
-   q(0974) => [
+   q(0975) => [
       q(Awngi),
       ],
-   q(0975) => [
+   q(0976) => [
       q(Awak),
       ],
-   q(0976) => [
+   q(0977) => [
       q(Awera),
       ],
-   q(0977) => [
+   q(0978) => [
       q(South Awyu),
       ],
-   q(0978) => [
+   q(0979) => [
       q(Arawete),
       ],
-   q(0979) => [
+   q(0980) => [
       q(Central Awyu),
       ],
-   q(0980) => [
+   q(0981) => [
       q(Jair Awyu),
       ],
-   q(0981) => [
+   q(0982) => [
       q(Awun),
       ],
-   q(0982) => [
+   q(0983) => [
       q(Awara),
       ],
-   q(0983) => [
+   q(0984) => [
       q(Edera Awyu),
       ],
-   q(0984) => [
+   q(0985) => [
       q(Abipon),
       ],
-   q(0985) => [
+   q(0986) => [
       q(Ayerrerenge),
       ],
-   q(0986) => [
+   q(0987) => [
       q(Mato Grosso Arara),
       ],
-   q(0987) => [
+   q(0988) => [
       q(Yaka (Central African Republic)),
       ],
-   q(0988) => [
+   q(0989) => [
       q(Lower Southern Aranda),
       ],
-   q(0989) => [
+   q(0990) => [
       q(Middle Armenian),
       ],
-   q(0990) => [
+   q(0991) => [
       q(Xaragure),
       ],
-   q(0991) => [
+   q(0992) => [
       q(Awar),
       ],
-   q(0992) => [
+   q(0993) => [
       q(Ayizo Gbe),
       ],
-   q(0993) => [
+   q(0994) => [
       q(Southern Aymara),
       ],
-   q(0994) => [
+   q(0995) => [
       q(Ayabadhu),
       ],
-   q(0995) => [
+   q(0996) => [
       q(Ayere),
       ],
-   q(0996) => [
+   q(0997) => [
       q(Ginyanga),
       ],
-   q(0997) => [
+   q(0998) => [
       q(Hadrami Arabic),
       ],
-   q(0998) => [
+   q(0999) => [
       q(Leyigha),
       ],
-   q(0999) => [
+   q(1000) => [
       q(Akuku),
       ],
-   q(1000) => [
+   q(1001) => [
       q(Libyan Arabic),
       ],
-   q(1001) => [
+   q(1002) => [
       q(Sanaani Arabic),
       ],
-   q(1002) => [
+   q(1003) => [
       q(Ayoreo),
       ],
-   q(1003) => [
+   q(1004) => [
       q(North Mesopotamian Arabic),
       ],
-   q(1004) => [
+   q(1005) => [
       q(Ayi (Papua New Guinea)),
       ],
-   q(1005) => [
+   q(1006) => [
       q(Central Aymara),
       ],
-   q(1006) => [
+   q(1007) => [
       q(Sorsogon Ayta),
       ],
-   q(1007) => [
+   q(1008) => [
       q(Magbukun Ayta),
       ],
-   q(1008) => [
+   q(1009) => [
       q(Ayu),
       ],
-   q(1009) => [
+   q(1010) => [
       q(Tayabas Ayta),
       ],
-   q(1010) => [
+   q(1011) => [
       q(Mai Brat),
       ],
-   q(1011) => [
+   q(1012) => [
       q(Azha),
       ],
-   q(1012) => [
+   q(1013) => [
       q(South Azerbaijani),
       ],
-   q(1013) => [
+   q(1014) => [
       q(Eastern Durango Nahuatl),
       ],
-   q(1014) => [
+   q(1015) => [
       q(San Pedro Amuzgos Amuzgo),
       ],
-   q(1015) => [
+   q(1016) => [
       q(North Azerbaijani),
       ],
-   q(1016) => [
+   q(1017) => [
       q(Ipalapa Amuzgo),
       ],
-   q(1017) => [
+   q(1018) => [
       q(Western Durango Nahuatl),
       ],
-   q(1018) => [
+   q(1019) => [
       q(Awing),
       ],
-   q(1019) => [
+   q(1020) => [
       q(Faire Atta),
       ],
-   q(1020) => [
+   q(1021) => [
       q(Highland Puebla Nahuatl),
       ],
-   q(1021) => [
+   q(1022) => [
       q(Babatana),
       ],
-   q(1022) => [
+   q(1023) => [
       q(Bainouk-Gunyuno),
       ],
-   q(1023) => [
+   q(1024) => [
       q(Badui),
       ],
-   q(1024) => [
+   q(1025) => [
       q(Bare),
       ],
-   q(1025) => [
+   q(1026) => [
       q(Nubaca),
       ],
-   q(1026) => [
+   q(1027) => [
       q(Tuki),
       ],
-   q(1027) => [
+   q(1028) => [
       q(Bahamas Creole English),
       ],
-   q(1028) => [
+   q(1029) => [
       q(Barakai),
       ],
-   q(1029) => [
+   q(1030) => [
       q(Waimaha),
       ],
-   q(1030) => [
+   q(1031) => [
       q(Bantawa),
       ],
-   q(1031) => [
+   q(1032) => [
       q(Bavarian),
       ],
-   q(1032) => [
+   q(1033) => [
       q(Bada (Nigeria)),
       ],
-   q(1033) => [
+   q(1034) => [
       q(Vengo),
       ],
-   q(1034) => [
+   q(1035) => [
       q(Bambili-Bambui),
       ],
-   q(1035) => [
+   q(1036) => [
       q(Bamun),
       ],
-   q(1036) => [
+   q(1037) => [
       q(Batuley),
       ],
-   q(1037) => [
+   q(1038) => [
       q(Baatonum),
       ],
-   q(1038) => [
+   q(1039) => [
       q(Barai),
       ],
-   q(1039) => [
+   q(1040) => [
       q(Batak Toba),
       ],
-   q(1040) => [
+   q(1041) => [
       q(Bau),
       ],
-   q(1041) => [
+   q(1042) => [
       q(Bangba),
       ],
-   q(1042) => [
+   q(1043) => [
       q(Baibai),
       ],
-   q(1043) => [
+   q(1044) => [
       q(Barama),
       ],
-   q(1044) => [
+   q(1045) => [
       q(Bugan),
       ],
-   q(1045) => [
+   q(1046) => [
       q(Barombi),
       ],
-   q(1046) => [
+   q(1047) => [
       q(Ghomala'),
       ],
-   q(1047) => [
+   q(1048) => [
       q(Babanki),
       ],
-   q(1048) => [
+   q(1049) => [
       q(Bats),
       ],
-   q(1049) => [
+   q(1050) => [
       q(Babango),
       ],
-   q(1050) => [
+   q(1051) => [
       q(Uneapa),
       ],
-   q(1051) => [
+   q(1052) => [
       q(Northern Bobo Madare),
       q(Konabere),
       ],
-   q(1052) => [
+   q(1053) => [
       q(West Central Banda),
       ],
-   q(1053) => [
+   q(1054) => [
       q(Bamali),
       ],
-   q(1054) => [
+   q(1055) => [
       q(Girawa),
       ],
-   q(1055) => [
+   q(1056) => [
       q(Bakpinka),
       ],
-   q(1056) => [
+   q(1057) => [
       q(Mburku),
       ],
-   q(1057) => [
+   q(1058) => [
       q(Kulung (Nigeria)),
       ],
-   q(1058) => [
+   q(1059) => [
       q(Karnai),
       ],
-   q(1059) => [
+   q(1060) => [
       q(Baba),
       ],
-   q(1060) => [
+   q(1061) => [
       q(Bubia),
       ],
-   q(1061) => [
+   q(1062) => [
       q(Befang),
       ],
-   q(1062) => [
+   q(1063) => [
       q(Babalia Creole Arabic),
       ],
-   q(1063) => [
+   q(1064) => [
       q(Central Bai),
       ],
-   q(1064) => [
+   q(1065) => [
       q(Bainouk-Samik),
       ],
-   q(1065) => [
+   q(1066) => [
       q(Southern Balochi),
       ],
-   q(1066) => [
+   q(1067) => [
       q(North Babar),
       ],
-   q(1067) => [
+   q(1068) => [
       q(Bamenyam),
       ],
-   q(1068) => [
+   q(1069) => [
       q(Bamu),
       ],
-   q(1069) => [
+   q(1070) => [
       q(Baga Binari),
       ],
-   q(1070) => [
+   q(1071) => [
       q(Bariai),
       ],
-   q(1071) => [
+   q(1072) => [
       q(Baoule),
       ],
-   q(1072) => [
+   q(1073) => [
       q(Bardi),
       ],
-   q(1073) => [
+   q(1074) => [
       q(Bunaba),
       ],
-   q(1074) => [
+   q(1075) => [
       q(Central Bikol),
       ],
-   q(1075) => [
+   q(1076) => [
       q(Bannoni),
       ],
-   q(1076) => [
+   q(1077) => [
       q(Bali (Nigeria)),
       ],
-   q(1077) => [
+   q(1078) => [
       q(Kaluli),
       ],
-   q(1078) => [
+   q(1079) => [
       q(Bali (Democratic Republic of Congo)),
       ],
-   q(1079) => [
+   q(1080) => [
       q(Bench),
       ],
-   q(1080) => [
+   q(1081) => [
       q(Babine),
       ],
-   q(1081) => [
+   q(1082) => [
       q(Kohumono),
       ],
-   q(1082) => [
+   q(1083) => [
       q(Bendi),
       ],
-   q(1083) => [
+   q(1084) => [
       q(Awad Bing),
       ],
-   q(1084) => [
+   q(1085) => [
       q(Shoo-Minda-Nye),
       ],
-   q(1085) => [
+   q(1086) => [
       q(Bana),
       ],
-   q(1086) => [
+   q(1087) => [
       q(Bacama),
       ],
-   q(1087) => [
+   q(1088) => [
       q(Bainouk-Gunyaamolo),
       ],
-   q(1088) => [
+   q(1089) => [
       q(Bayot),
       ],
-   q(1089) => [
+   q(1090) => [
       q(Basap),
       ],
-   q(1090) => [
+   q(1091) => [
       q(Embera-Baudo),
       ],
-   q(1091) => [
+   q(1092) => [
       q(Bunama),
       ],
-   q(1092) => [
+   q(1093) => [
       q(Bade),
       ],
-   q(1093) => [
+   q(1094) => [
       q(Biage),
       ],
-   q(1094) => [
+   q(1095) => [
       q(Bonggi),
       ],
-   q(1095) => [
+   q(1096) => [
       q(Baka (Sudan)),
       ],
-   q(1096) => [
+   q(1097) => [
       q(Burun),
       ],
-   q(1097) => [
+   q(1098) => [
       q(Bai),
       ],
-   q(1098) => [
+   q(1099) => [
       q(Budukh),
       ],
-   q(1099) => [
+   q(1100) => [
       q(Indonesian Bajau),
       ],
-   q(1100) => [
+   q(1101) => [
       q(Buduma),
       ],
-   q(1101) => [
+   q(1102) => [
       q(Baldemu),
       ],
-   q(1102) => [
+   q(1103) => [
       q(Morom),
       ],
-   q(1103) => [
+   q(1104) => [
       q(Bende),
       ],
-   q(1104) => [
+   q(1105) => [
       q(Bahnar),
       ],
-   q(1105) => [
+   q(1106) => [
       q(West Coast Bajau),
       ],
-   q(1106) => [
+   q(1107) => [
       q(Burunge),
       ],
-   q(1107) => [
+   q(1108) => [
       q(Bokoto),
       ],
-   q(1108) => [
+   q(1109) => [
       q(Oroko),
       ],
-   q(1109) => [
+   q(1110) => [
       q(Bodo Parja),
       ],
-   q(1110) => [
+   q(1111) => [
       q(Baham),
       ],
-   q(1111) => [
+   q(1112) => [
       q(Budong-Budong),
       ],
-   q(1112) => [
+   q(1113) => [
       q(Bandjalang),
       ],
-   q(1113) => [
+   q(1114) => [
       q(Badeshi),
       ],
-   q(1114) => [
+   q(1115) => [
       q(Beaver),
       ],
-   q(1115) => [
+   q(1116) => [
       q(Bebele),
       ],
-   q(1116) => [
+   q(1117) => [
       q(Iceve-Maci),
       ],
-   q(1117) => [
+   q(1118) => [
       q(Bedoanas),
       ],
-   q(1118) => [
+   q(1119) => [
       q(Byangsi),
       ],
-   q(1119) => [
+   q(1120) => [
       q(Benabena),
       ],
-   q(1120) => [
+   q(1121) => [
       q(Belait),
       ],
-   q(1121) => [
+   q(1122) => [
       q(Biali),
       ],
-   q(1122) => [
+   q(1123) => [
       q(Bekati'),
       ],
-   q(1123) => [
+   q(1124) => [
       q(Bebeli),
       ],
-   q(1124) => [
+   q(1125) => [
       q(Beami),
       ],
-   q(1125) => [
+   q(1126) => [
       q(Besoa),
       ],
-   q(1126) => [
+   q(1127) => [
       q(Beembe),
       ],
-   q(1127) => [
+   q(1128) => [
       q(Besme),
       ],
-   q(1128) => [
+   q(1129) => [
       q(Guiberoua Bete),
       ],
-   q(1129) => [
+   q(1130) => [
       q(Blagar),
       ],
-   q(1130) => [
+   q(1131) => [
       q(Daloa Bete),
       ],
-   q(1131) => [
+   q(1132) => [
       q(Betawi),
       ],
-   q(1132) => [
+   q(1133) => [
       q(Jur Modo),
       ],
-   q(1133) => [
+   q(1134) => [
       q(Beli (Papua New Guinea)),
       ],
-   q(1134) => [
+   q(1135) => [
       q(Bena (Tanzania)),
       ],
-   q(1135) => [
+   q(1136) => [
       q(Bari),
       ],
-   q(1136) => [
+   q(1137) => [
       q(Pauri Bareli),
       ],
-   q(1137) => [
+   q(1138) => [
       q(Panyi Bai),
       q(Northern Bai),
       ],
-   q(1138) => [
+   q(1139) => [
       q(Bafut),
       ],
-   q(1139) => [
+   q(1140) => [
       q(Betaf),
       q(Tena),
       ],
-   q(1140) => [
+   q(1141) => [
       q(Bofi),
       ],
-   q(1141) => [
+   q(1142) => [
       q(Busang Kayan),
       ],
-   q(1142) => [
+   q(1143) => [
       q(Blafe),
       ],
-   q(1143) => [
+   q(1144) => [
       q(British Sign Language),
       ],
-   q(1144) => [
+   q(1145) => [
       q(Bafanji),
       ],
-   q(1145) => [
+   q(1146) => [
       q(Ban Khor Sign Language),
       ],
-   q(1146) => [
+   q(1147) => [
       q(Banda-Ndele),
       ],
-   q(1147) => [
+   q(1148) => [
       q(Mmen),
       ],
-   q(1148) => [
+   q(1149) => [
       q(Bunak),
       ],
-   q(1149) => [
+   q(1150) => [
       q(Malba Birifor),
       ],
-   q(1150) => [
+   q(1151) => [
       q(Beba),
       ],
-   q(1151) => [
+   q(1152) => [
       q(Badaga),
       ],
-   q(1152) => [
+   q(1153) => [
       q(Bazigar),
       ],
-   q(1153) => [
+   q(1154) => [
       q(Southern Bai),
       ],
-   q(1154) => [
+   q(1155) => [
       q(Balti),
       ],
-   q(1155) => [
+   q(1156) => [
       q(Gahri),
       ],
-   q(1156) => [
+   q(1157) => [
       q(Bondo),
       ],
-   q(1157) => [
+   q(1158) => [
       q(Bantayanon),
       ],
-   q(1158) => [
+   q(1159) => [
       q(Bagheli),
       ],
-   q(1159) => [
+   q(1160) => [
       q(Mahasu Pahari),
       ],
-   q(1160) => [
+   q(1161) => [
       q(Gwamhi-Wuri),
       ],
-   q(1161) => [
+   q(1162) => [
       q(Bobongko),
       ],
-   q(1162) => [
+   q(1163) => [
       q(Haryanvi),
       ],
-   q(1163) => [
+   q(1164) => [
       q(Rathwi Bareli),
       ],
-   q(1164) => [
+   q(1165) => [
       q(Bauria),
       ],
-   q(1165) => [
+   q(1166) => [
       q(Bangandu),
       ],
-   q(1166) => [
+   q(1167) => [
       q(Bugun),
       ],
-   q(1167) => [
+   q(1168) => [
       q(Giangan),
       ],
-   q(1168) => [
+   q(1169) => [
       q(Bangolan),
       ],
-   q(1169) => [
+   q(1170) => [
       q(Bit),
       q(Buxinhua),
       ],
-   q(1170) => [
+   q(1171) => [
       q(Bo (Laos)),
       ],
-   q(1171) => [
+   q(1172) => [
       q(Baga Mboteni),
       ],
-   q(1172) => [
+   q(1173) => [
       q(Western Balochi),
       ],
-   q(1173) => [
+   q(1174) => [
       q(Baga Koga),
       ],
-   q(1174) => [
+   q(1175) => [
       q(Eastern Balochi),
       ],
-   q(1175) => [
+   q(1176) => [
       q(Bagri),
       ],
-   q(1176) => [
+   q(1177) => [
       q(Bawm Chin),
       ],
-   q(1177) => [
+   q(1178) => [
       q(Tagabawa),
       ],
-   q(1178) => [
+   q(1179) => [
       q(Bughotu),
       ],
-   q(1179) => [
+   q(1180) => [
       q(Mbongno),
       ],
-   q(1180) => [
+   q(1181) => [
       q(Warkay-Bipim),
       ],
-   q(1181) => [
+   q(1182) => [
       q(Bhatri),
       ],
-   q(1182) => [
+   q(1183) => [
       q(Balkan Gagauz Turkish),
       ],
-   q(1183) => [
+   q(1184) => [
       q(Benggoi),
       ],
-   q(1184) => [
+   q(1185) => [
       q(Banggai),
       ],
-   q(1185) => [
+   q(1186) => [
       q(Bharia),
       ],
-   q(1186) => [
+   q(1187) => [
       q(Bhili),
       ],
-   q(1187) => [
+   q(1188) => [
       q(Biga),
       ],
-   q(1188) => [
+   q(1189) => [
       q(Bhadrawahi),
       ],
-   q(1189) => [
+   q(1190) => [
       q(Bhaya),
       ],
-   q(1190) => [
+   q(1191) => [
       q(Odiai),
       ],
-   q(1191) => [
+   q(1192) => [
       q(Binandere),
       ],
-   q(1192) => [
+   q(1193) => [
       q(Bukharic),
       ],
-   q(1193) => [
+   q(1194) => [
       q(Bhilali),
       ],
-   q(1194) => [
+   q(1195) => [
       q(Bahing),
       ],
-   q(1195) => [
+   q(1196) => [
       q(Bimin),
       ],
-   q(1196) => [
+   q(1197) => [
       q(Bathari),
       ],
-   q(1197) => [
+   q(1198) => [
       q(Bohtan Neo-Aramaic),
       ],
-   q(1198) => [
+   q(1199) => [
       q(Bima),
       ],
-   q(1199) => [
+   q(1200) => [
       q(Tukang Besi South),
       ],
-   q(1200) => [
+   q(1201) => [
       q(Bara Malagasy),
       ],
-   q(1201) => [
+   q(1202) => [
       q(Buwal),
       ],
-   q(1202) => [
+   q(1203) => [
       q(Bhattiyali),
       ],
-   q(1203) => [
+   q(1204) => [
       q(Bhunjia),
       ],
-   q(1204) => [
+   q(1205) => [
       q(Bahau),
       ],
-   q(1205) => [
+   q(1206) => [
       q(Biak),
       ],
-   q(1206) => [
+   q(1207) => [
       q(Bhalay),
       ],
-   q(1207) => [
+   q(1208) => [
       q(Bhele),
       ],
-   q(1208) => [
+   q(1209) => [
       q(Bada (Indonesia)),
       ],
-   q(1209) => [
+   q(1210) => [
       q(Badimaya),
       ],
-   q(1210) => [
+   q(1211) => [
       q(Bissa),
       q(Bisa),
       ],
-   q(1211) => [
+   q(1212) => [
       q(Bikaru),
       ],
-   q(1212) => [
+   q(1213) => [
       q(Bidiyo),
       ],
-   q(1213) => [
+   q(1214) => [
       q(Bepour),
       ],
-   q(1214) => [
+   q(1215) => [
       q(Biafada),
       ],
-   q(1215) => [
+   q(1216) => [
       q(Biangai),
       ],
-   q(1216) => [
+   q(1217) => [
       q(Vaghat-Ya-Bijim-Legeri),
       ],
-   q(1217) => [
+   q(1218) => [
       q(Bile),
       ],
-   q(1218) => [
+   q(1219) => [
       q(Bimoba),
       ],
-   q(1219) => [
+   q(1220) => [
       q(Nai),
       ],
-   q(1220) => [
+   q(1221) => [
       q(Bila),
       ],
-   q(1221) => [
+   q(1222) => [
       q(Bipi),
       ],
-   q(1222) => [
+   q(1223) => [
       q(Bisorio),
       ],
-   q(1223) => [
+   q(1224) => [
       q(Berinomo),
       ],
-   q(1224) => [
+   q(1225) => [
       q(Biete),
       ],
-   q(1225) => [
+   q(1226) => [
       q(Southern Birifor),
       ],
-   q(1226) => [
+   q(1227) => [
       q(Kol (Cameroon)),
       ],
-   q(1227) => [
+   q(1228) => [
       q(Bijori),
       ],
-   q(1228) => [
+   q(1229) => [
       q(Birhor),
       ],
-   q(1229) => [
+   q(1230) => [
       q(Baloi),
       ],
-   q(1230) => [
+   q(1231) => [
       q(Budza),
       ],
-   q(1231) => [
+   q(1232) => [
       q(Banggarla),
       ],
-   q(1232) => [
+   q(1233) => [
       q(Bariji),
       ],
-   q(1233) => [
+   q(1234) => [
       q(Biao-Jiao Mien),
       ],
-   q(1234) => [
+   q(1235) => [
       q(Barzani Jewish Neo-Aramaic),
       ],
-   q(1235) => [
+   q(1236) => [
       q(Bidyogo),
       ],
-   q(1236) => [
+   q(1237) => [
       q(Bahinemo),
       ],
-   q(1237) => [
+   q(1238) => [
       q(Burji),
       ],
-   q(1238) => [
+   q(1239) => [
       q(Kanauji),
       ],
-   q(1239) => [
+   q(1240) => [
       q(Barok),
       ],
-   q(1240) => [
+   q(1241) => [
       q(Bulu (Papua New Guinea)),
       ],
-   q(1241) => [
+   q(1242) => [
       q(Bajelani),
       ],
-   q(1242) => [
+   q(1243) => [
       q(Banjar),
       ],
-   q(1243) => [
+   q(1244) => [
       q(Mid-Southern Banda),
       ],
-   q(1244) => [
+   q(1245) => [
       q(Fanamaket),
       ],
-   q(1245) => [
+   q(1246) => [
       q(Binumarien),
       ],
-   q(1246) => [
+   q(1247) => [
       q(Bajan),
       ],
-   q(1247) => [
+   q(1248) => [
       q(Balanta-Ganja),
       ],
-   q(1248) => [
+   q(1249) => [
       q(Busuu),
       ],
-   q(1249) => [
+   q(1250) => [
       q(Bedjond),
       ],
-   q(1250) => [
+   q(1251) => [
       q(Bakwe),
       ],
-   q(1251) => [
+   q(1252) => [
       q(Banao Itneg),
       ],
-   q(1252) => [
+   q(1253) => [
       q(Bayali),
       ],
-   q(1253) => [
+   q(1254) => [
       q(Baruga),
       ],
-   q(1254) => [
+   q(1255) => [
       q(Kyak),
       ],
-   q(1255) => [
+   q(1256) => [
       q(Baka (Cameroon)),
       ],
-   q(1256) => [
+   q(1257) => [
       q(Binukid),
       q(Talaandig),
       ],
-   q(1257) => [
+   q(1258) => [
       q(Beeke),
       ],
-   q(1258) => [
+   q(1259) => [
       q(Buraka),
       ],
-   q(1259) => [
+   q(1260) => [
       q(Bakoko),
       ],
-   q(1260) => [
+   q(1261) => [
       q(Baki),
       ],
-   q(1261) => [
+   q(1262) => [
       q(Pande),
       ],
-   q(1262) => [
+   q(1263) => [
       q(Brokskat),
       ],
-   q(1263) => [
+   q(1264) => [
       q(Berik),
       ],
-   q(1264) => [
+   q(1265) => [
       q(Kom (Cameroon)),
       ],
-   q(1265) => [
+   q(1266) => [
       q(Bukitan),
       ],
-   q(1266) => [
+   q(1267) => [
       q(Kwa'),
       ],
-   q(1267) => [
+   q(1268) => [
       q(Boko (Democratic Republic of Congo)),
       ],
-   q(1268) => [
+   q(1269) => [
       q(Bakairi),
       ],
-   q(1269) => [
+   q(1270) => [
       q(Bakumpai),
       ],
-   q(1270) => [
+   q(1271) => [
       q(Northern Sorsoganon),
       ],
-   q(1271) => [
+   q(1272) => [
       q(Boloki),
       ],
-   q(1272) => [
+   q(1273) => [
       q(Buhid),
       ],
-   q(1273) => [
+   q(1274) => [
       q(Bekwarra),
       ],
-   q(1274) => [
+   q(1275) => [
       q(Bekwel),
       ],
-   q(1275) => [
+   q(1276) => [
       q(Baikeno),
       ],
-   q(1276) => [
+   q(1277) => [
       q(Bokyi),
       ],
-   q(1277) => [
+   q(1278) => [
       q(Bungku),
       ],
-   q(1278) => [
+   q(1279) => [
       q(Bilua),
       ],
-   q(1279) => [
+   q(1280) => [
       q(Bella Coola),
       ],
-   q(1280) => [
+   q(1281) => [
       q(Bolango),
       ],
-   q(1281) => [
+   q(1282) => [
       q(Balanta-Kentohe),
       ],
-   q(1282) => [
+   q(1283) => [
       q(Buol),
       ],
-   q(1283) => [
+   q(1284) => [
       q(Balau),
       ],
-   q(1284) => [
+   q(1285) => [
       q(Kuwaa),
       ],
-   q(1285) => [
+   q(1286) => [
       q(Bolia),
       ],
-   q(1286) => [
+   q(1287) => [
       q(Bolongan),
       ],
-   q(1287) => [
+   q(1288) => [
       q(Pa'o Karen),
       q(Pa'O),
       ],
-   q(1288) => [
+   q(1289) => [
       q(Biloxi),
       ],
-   q(1289) => [
+   q(1290) => [
       q(Beli (Sudan)),
       ],
-   q(1290) => [
+   q(1291) => [
       q(Southern Catanduanes Bikol),
       ],
-   q(1291) => [
+   q(1292) => [
       q(Anii),
       ],
-   q(1292) => [
+   q(1293) => [
       q(Blablanga),
       ],
-   q(1293) => [
+   q(1294) => [
       q(Baluan-Pam),
       ],
-   q(1294) => [
+   q(1295) => [
       q(Blang),
       ],
-   q(1295) => [
+   q(1296) => [
       q(Balaesang),
       ],
-   q(1296) => [
+   q(1297) => [
       q(Tai Dam),
       ],
-   q(1297) => [
+   q(1298) => [
       q(Bolo),
       ],
-   q(1298) => [
+   q(1299) => [
       q(Balangao),
       ],
-   q(1299) => [
+   q(1300) => [
       q(Mag-Indi Ayta),
       ],
-   q(1300) => [
+   q(1301) => [
       q(Notre),
       ],
-   q(1301) => [
+   q(1302) => [
       q(Balantak),
       ],
-   q(1302) => [
+   q(1303) => [
       q(Lame),
       ],
-   q(1303) => [
+   q(1304) => [
       q(Bembe),
       ],
-   q(1304) => [
+   q(1305) => [
       q(Biem),
       ],
-   q(1305) => [
+   q(1306) => [
       q(Baga Manduri),
       ],
-   q(1306) => [
+   q(1307) => [
       q(Limassa),
       ],
-   q(1307) => [
+   q(1308) => [
       q(Bom),
       ],
-   q(1308) => [
+   q(1309) => [
       q(Bamwe),
       ],
-   q(1309) => [
+   q(1310) => [
       q(Kein),
       ],
-   q(1310) => [
+   q(1311) => [
       q(Bagirmi),
       ],
-   q(1311) => [
+   q(1312) => [
       q(Bote-Majhi),
       ],
-   q(1312) => [
+   q(1313) => [
       q(Ghayavi),
       ],
-   q(1313) => [
+   q(1314) => [
       q(Bomboli),
       ],
-   q(1314) => [
+   q(1315) => [
       q(Northern Betsimisaraka Malagasy),
       ],
-   q(1315) => [
+   q(1316) => [
       q(Bina (Papua New Guinea)),
       ],
-   q(1316) => [
+   q(1317) => [
       q(Bambalang),
       ],
-   q(1317) => [
+   q(1318) => [
       q(Bulgebi),
       ],
-   q(1318) => [
+   q(1319) => [
       q(Bomu),
       ],
-   q(1319) => [
+   q(1320) => [
       q(Muinane),
       ],
-   q(1320) => [
+   q(1321) => [
       q(Bilma Kanuri),
       ],
-   q(1321) => [
+   q(1322) => [
       q(Biao Mon),
       ],
-   q(1322) => [
+   q(1323) => [
       q(Somba-Siawari),
       ],
-   q(1323) => [
+   q(1324) => [
       q(Bum),
       ],
-   q(1324) => [
+   q(1325) => [
       q(Bomwali),
       ],
-   q(1325) => [
+   q(1326) => [
       q(Baimak),
       ],
-   q(1326) => [
+   q(1327) => [
       q(Baramu),
       ],
-   q(1327) => [
+   q(1328) => [
       q(Bonerate),
       ],
-   q(1328) => [
+   q(1329) => [
       q(Bookan),
       ],
-   q(1329) => [
+   q(1330) => [
       q(Bontok),
       ],
-   q(1330) => [
+   q(1331) => [
       q(Banda (Indonesia)),
       ],
-   q(1331) => [
+   q(1332) => [
       q(Bintauna),
       ],
-   q(1332) => [
+   q(1333) => [
       q(Masiwang),
       ],
-   q(1333) => [
+   q(1334) => [
       q(Benga),
       ],
-   q(1334) => [
+   q(1335) => [
       q(Bangi),
       ],
-   q(1335) => [
+   q(1336) => [
       q(Eastern Tawbuid),
       ],
-   q(1336) => [
+   q(1337) => [
       q(Bierebo),
       ],
-   q(1337) => [
+   q(1338) => [
       q(Boon),
       ],
-   q(1338) => [
+   q(1339) => [
       q(Batanga),
       ],
-   q(1339) => [
+   q(1340) => [
       q(Bunun),
       ],
-   q(1340) => [
+   q(1341) => [
       q(Bantoanon),
       ],
-   q(1341) => [
+   q(1342) => [
       q(Bola),
       ],
-   q(1342) => [
+   q(1343) => [
       q(Bantik),
       ],
-   q(1343) => [
+   q(1344) => [
       q(Butmas-Tur),
       ],
-   q(1344) => [
+   q(1345) => [
       q(Bundeli),
       ],
-   q(1345) => [
+   q(1346) => [
       q(Bentong),
       ],
-   q(1346) => [
+   q(1347) => [
       q(Bonerif),
       q(Beneraf),
       q(Edwas),
       ],
-   q(1347) => [
+   q(1348) => [
       q(Bisis),
       ],
-   q(1348) => [
+   q(1349) => [
       q(Bangubangu),
       ],
-   q(1349) => [
+   q(1350) => [
       q(Bintulu),
       ],
-   q(1350) => [
+   q(1351) => [
       q(Beezen),
       ],
-   q(1351) => [
+   q(1352) => [
       q(Bora),
       ],
-   q(1352) => [
+   q(1353) => [
       q(Aweer),
       ],
-   q(1353) => [
+   q(1354) => [
       q(Mundabli),
       ],
-   q(1354) => [
+   q(1355) => [
       q(Bolon),
       ],
-   q(1355) => [
+   q(1356) => [
       q(Bamako Sign Language),
       ],
-   q(1356) => [
+   q(1357) => [
       q(Boma),
       ],
-   q(1357) => [
+   q(1358) => [
       q(Barbareno),
       ],
-   q(1358) => [
+   q(1359) => [
       q(Anjam),
       ],
-   q(1359) => [
+   q(1360) => [
       q(Bonjo),
       ],
-   q(1360) => [
+   q(1361) => [
       q(Bole),
       ],
-   q(1361) => [
+   q(1362) => [
       q(Berom),
       ],
-   q(1362) => [
+   q(1363) => [
       q(Bine),
       ],
-   q(1363) => [
+   q(1364) => [
       q(Tiemacewe Bozo),
       ],
-   q(1364) => [
+   q(1365) => [
       q(Bonkiman),
       ],
-   q(1365) => [
+   q(1366) => [
       q(Bogaya),
       ],
-   q(1366) => [
+   q(1367) => [
       q(Bororo),
       ],
-   q(1367) => [
+   q(1368) => [
       q(Bongo),
       ],
-   q(1368) => [
+   q(1369) => [
       q(Bondei),
       ],
-   q(1369) => [
+   q(1370) => [
       q(Tuwuli),
       ],
-   q(1370) => [
+   q(1371) => [
       q(Rema),
       ],
-   q(1371) => [
+   q(1372) => [
       q(Buamu),
       ],
-   q(1372) => [
+   q(1373) => [
       q(Bodo (Central African Republic)),
       ],
-   q(1373) => [
+   q(1374) => [
       q(Tieyaxo Bozo),
       ],
-   q(1374) => [
+   q(1375) => [
       q(Daakaka),
       ],
-   q(1375) => [
+   q(1376) => [
       q(Barbacoas),
       ],
-   q(1376) => [
+   q(1377) => [
       q(Banda-Banda),
       ],
-   q(1377) => [
+   q(1378) => [
       q(Bonggo),
       ],
-   q(1378) => [
+   q(1379) => [
       q(Botlikh),
       ],
-   q(1379) => [
+   q(1380) => [
       q(Bagupi),
       ],
-   q(1380) => [
+   q(1381) => [
       q(Binji),
       ],
-   q(1381) => [
+   q(1382) => [
       q(Orowe),
       q('Oroe),
       ],
-   q(1382) => [
+   q(1383) => [
       q(Broome Pearling Lugger Pidgin),
       ],
-   q(1383) => [
+   q(1384) => [
       q(Biyom),
       ],
-   q(1384) => [
+   q(1385) => [
       q(Dzao Min),
       ],
-   q(1385) => [
+   q(1386) => [
       q(Anasi),
       ],
-   q(1386) => [
+   q(1387) => [
       q(Kaure),
       ],
-   q(1387) => [
+   q(1388) => [
       q(Banda Malay),
       ],
-   q(1388) => [
+   q(1389) => [
       q(Koronadal Blaan),
       ],
-   q(1389) => [
+   q(1390) => [
       q(Sarangani Blaan),
       ],
-   q(1390) => [
+   q(1391) => [
       q(Barrow Point),
       ],
-   q(1391) => [
+   q(1392) => [
       q(Bongu),
       ],
-   q(1392) => [
+   q(1393) => [
       q(Bian Marind),
       ],
-   q(1393) => [
+   q(1394) => [
       q(Bo (Papua New Guinea)),
       ],
-   q(1394) => [
+   q(1395) => [
       q(Palya Bareli),
       ],
-   q(1395) => [
+   q(1396) => [
       q(Bishnupriya),
       ],
-   q(1396) => [
+   q(1397) => [
       q(Bilba),
       ],
-   q(1397) => [
+   q(1398) => [
       q(Tchumbuli),
       ],
-   q(1398) => [
+   q(1399) => [
       q(Bagusa),
       ],
-   q(1399) => [
+   q(1400) => [
       q(Boko (Benin)),
       q(Boo),
       ],
-   q(1400) => [
+   q(1401) => [
       q(Bung),
       ],
-   q(1401) => [
+   q(1402) => [
       q(Baga Kaloum),
       ],
-   q(1402) => [
+   q(1403) => [
       q(Bago-Kusuntu),
       ],
-   q(1403) => [
+   q(1404) => [
       q(Baima),
       ],
-   q(1404) => [
+   q(1405) => [
       q(Bakhtiari),
       ],
-   q(1405) => [
+   q(1406) => [
       q(Bandial),
       ],
-   q(1406) => [
+   q(1407) => [
       q(Banda-Mbres),
       ],
-   q(1407) => [
+   q(1408) => [
       q(Bilakura),
       ],
-   q(1408) => [
+   q(1409) => [
       q(Wumboko),
       ],
-   q(1409) => [
+   q(1410) => [
       q(Bulgarian Sign Language),
       ],
-   q(1410) => [
+   q(1411) => [
       q(Balo),
       ],
-   q(1411) => [
+   q(1412) => [
       q(Busa),
       ],
-   q(1412) => [
+   q(1413) => [
       q(Biritai),
       ],
-   q(1413) => [
+   q(1414) => [
       q(Burusu),
       ],
-   q(1414) => [
+   q(1415) => [
       q(Bosngun),
       ],
-   q(1415) => [
+   q(1416) => [
       q(Bamukumbit),
       ],
-   q(1416) => [
+   q(1417) => [
       q(Boguru),
       ],
-   q(1417) => [
+   q(1418) => [
       q(Koro Wachi),
       q(Begbere-Ejar),
       ],
-   q(1418) => [
+   q(1419) => [
       q(Buru (Nigeria)),
       ],
-   q(1419) => [
+   q(1420) => [
       q(Baangi),
       ],
-   q(1420) => [
+   q(1421) => [
       q(Bengkala Sign Language),
       ],
-   q(1421) => [
+   q(1422) => [
       q(Bakaka),
       ],
-   q(1422) => [
+   q(1423) => [
       q(Lave),
       ],
-   q(1423) => [
+   q(1424) => [
       q(Berbice Creole Dutch),
       ],
-   q(1424) => [
+   q(1425) => [
       q(Baraamu),
       ],
-   q(1425) => [
+   q(1426) => [
       q(Bera),
       ],
-   q(1426) => [
+   q(1427) => [
       q(Baure),
       ],
-   q(1427) => [
+   q(1428) => [
       q(Brahui),
       ],
-   q(1428) => [
+   q(1429) => [
       q(Mokpwe),
       ],
-   q(1429) => [
+   q(1430) => [
       q(Bieria),
       ],
-   q(1430) => [
+   q(1431) => [
       q(Birked),
       ],
-   q(1431) => [
+   q(1432) => [
       q(Birwa),
       ],
-   q(1432) => [
+   q(1433) => [
       q(Barambu),
       ],
-   q(1433) => [
+   q(1434) => [
       q(Boruca),
       ],
-   q(1434) => [
+   q(1435) => [
       q(Brokkat),
       ],
-   q(1435) => [
+   q(1436) => [
       q(Barapasi),
       ],
-   q(1436) => [
+   q(1437) => [
       q(Breri),
       ],
-   q(1437) => [
+   q(1438) => [
       q(Birao),
       ],
-   q(1438) => [
+   q(1439) => [
       q(Baras),
       ],
-   q(1439) => [
+   q(1440) => [
       q(Bitare),
       ],
-   q(1440) => [
+   q(1441) => [
       q(Eastern Bru),
       ],
-   q(1441) => [
+   q(1442) => [
       q(Western Bru),
       ],
-   q(1442) => [
+   q(1443) => [
       q(Bellari),
       ],
-   q(1443) => [
+   q(1444) => [
       q(Bodo (India)),
       ],
-   q(1444) => [
+   q(1445) => [
       q(Burui),
       ],
-   q(1445) => [
+   q(1446) => [
       q(Bilbil),
       ],
-   q(1446) => [
+   q(1447) => [
       q(Abinomn),
       ],
-   q(1447) => [
+   q(1448) => [
       q(Brunei Bisaya),
       ],
-   q(1448) => [
+   q(1449) => [
       q(Bassari),
       q(Oniyan),
       ],
-   q(1449) => [
+   q(1450) => [
       q(Wushi),
       ],
-   q(1450) => [
+   q(1451) => [
       q(Bauchi),
       ],
-   q(1451) => [
+   q(1452) => [
       q(Bashkardi),
       ],
-   q(1452) => [
+   q(1453) => [
       q(Kati),
       ],
-   q(1453) => [
+   q(1454) => [
       q(Bassossi),
       ],
-   q(1454) => [
+   q(1455) => [
       q(Bangwinji),
       ],
-   q(1455) => [
+   q(1456) => [
       q(Burushaski),
       ],
-   q(1456) => [
+   q(1457) => [
       q(Basa-Gumna),
       ],
-   q(1457) => [
+   q(1458) => [
       q(Busami),
       ],
-   q(1458) => [
+   q(1459) => [
       q(Barasana-Eduria),
       ],
-   q(1459) => [
+   q(1460) => [
       q(Buso),
       ],
-   q(1460) => [
+   q(1461) => [
       q(Baga Sitemu),
       ],
-   q(1461) => [
+   q(1462) => [
       q(Bassa),
       ],
-   q(1462) => [
+   q(1463) => [
       q(Bassa-Kontagora),
       ],
-   q(1463) => [
+   q(1464) => [
       q(Akoose),
       ],
-   q(1464) => [
+   q(1465) => [
       q(Basketo),
       ],
-   q(1465) => [
+   q(1466) => [
       q(Bahonsuai),
       ],
-   q(1466) => [
+   q(1467) => [
       q(Baga Sobane),
       ],
-   q(1467) => [
+   q(1468) => [
       q(Baiso),
       ],
-   q(1468) => [
+   q(1469) => [
       q(Yangkam),
       ],
-   q(1469) => [
+   q(1470) => [
       q(Sabah Bisaya),
       ],
-   q(1470) => [
+   q(1471) => [
       q(Bata),
       ],
-   q(1471) => [
+   q(1472) => [
       q(Bati (Cameroon)),
       ],
-   q(1472) => [
+   q(1473) => [
       q(Batak Dairi),
       ],
-   q(1473) => [
+   q(1474) => [
       q(Gamo-Ningi),
       ],
-   q(1474) => [
+   q(1475) => [
       q(Birgit),
       ],
-   q(1475) => [
+   q(1476) => [
       q(Gagnoa Bete),
       ],
-   q(1476) => [
+   q(1477) => [
       q(Biatah Bidayuh),
       ],
-   q(1477) => [
+   q(1478) => [
       q(Burate),
       ],
-   q(1478) => [
+   q(1479) => [
       q(Bacanese Malay),
       ],
-   q(1479) => [
+   q(1480) => [
       q(Bhatola),
       ],
-   q(1480) => [
+   q(1481) => [
       q(Batak Mandailing),
       ],
-   q(1481) => [
+   q(1482) => [
       q(Ratagnon),
       ],
-   q(1482) => [
+   q(1483) => [
       q(Rinconada Bikol),
       ],
-   q(1483) => [
+   q(1484) => [
       q(Budibud),
       ],
-   q(1484) => [
+   q(1485) => [
       q(Batek),
       ],
-   q(1485) => [
+   q(1486) => [
       q(Baetora),
       ],
-   q(1486) => [
+   q(1487) => [
       q(Batak Simalungun),
       ],
-   q(1487) => [
+   q(1488) => [
       q(Bete-Bendi),
       ],
-   q(1488) => [
+   q(1489) => [
       q(Batu),
       ],
-   q(1489) => [
+   q(1490) => [
       q(Bateri),
       ],
-   q(1490) => [
+   q(1491) => [
       q(Butuanon),
       ],
-   q(1491) => [
+   q(1492) => [
       q(Batak Karo),
       ],
-   q(1492) => [
+   q(1493) => [
       q(Bobot),
       ],
-   q(1493) => [
+   q(1494) => [
       q(Batak Alas-Kluet),
       ],
-   q(1494) => [
+   q(1495) => [
       q(Bua),
       ],
-   q(1495) => [
+   q(1496) => [
       q(Bushi),
       ],
-   q(1496) => [
+   q(1497) => [
       q(Ntcham),
       ],
-   q(1497) => [
+   q(1498) => [
       q(Beothuk),
       ],
-   q(1498) => [
+   q(1499) => [
       q(Bushoong),
       ],
-   q(1499) => [
+   q(1500) => [
       q(Younuo Bunu),
       ],
-   q(1500) => [
+   q(1501) => [
       q(Bongili),
       ],
-   q(1501) => [
+   q(1502) => [
       q(Basa-Gurmana),
       ],
-   q(1502) => [
+   q(1503) => [
       q(Bugawac),
       ],
-   q(1503) => [
+   q(1504) => [
       q(Bulu (Cameroon)),
       ],
-   q(1504) => [
+   q(1505) => [
       q(Sherbro),
       ],
-   q(1505) => [
+   q(1506) => [
       q(Terei),
       ],
-   q(1506) => [
+   q(1507) => [
       q(Busoa),
       ],
-   q(1507) => [
+   q(1508) => [
       q(Brem),
       ],
-   q(1508) => [
+   q(1509) => [
       q(Bokobaru),
       ],
-   q(1509) => [
+   q(1510) => [
       q(Bungain),
       ],
-   q(1510) => [
+   q(1511) => [
       q(Budu),
       ],
-   q(1511) => [
+   q(1512) => [
       q(Bun),
       ],
-   q(1512) => [
+   q(1513) => [
       q(Bubi),
       ],
-   q(1513) => [
+   q(1514) => [
       q(Boghom),
       ],
-   q(1514) => [
+   q(1515) => [
       q(Bullom So),
       ],
-   q(1515) => [
+   q(1516) => [
       q(Bukwen),
       ],
-   q(1516) => [
+   q(1517) => [
       q(Barein),
       ],
-   q(1517) => [
+   q(1518) => [
       q(Bube),
       ],
-   q(1518) => [
+   q(1519) => [
       q(Baelelea),
       ],
-   q(1519) => [
+   q(1520) => [
       q(Baeggu),
       ],
-   q(1520) => [
+   q(1521) => [
       q(Berau Malay),
       ],
-   q(1521) => [
+   q(1522) => [
       q(Boor),
       ],
-   q(1522) => [
+   q(1523) => [
       q(Bonkeng),
       ],
-   q(1523) => [
+   q(1524) => [
       q(Bure),
       ],
-   q(1524) => [
+   q(1525) => [
       q(Belanda Viri),
       ],
-   q(1525) => [
+   q(1526) => [
       q(Baan),
       ],
-   q(1526) => [
+   q(1527) => [
       q(Bukat),
       ],
-   q(1527) => [
+   q(1528) => [
       q(Bolivian Sign Language),
       ],
-   q(1528) => [
+   q(1529) => [
       q(Bamunka),
       ],
-   q(1529) => [
+   q(1530) => [
       q(Buna),
       ],
-   q(1530) => [
+   q(1531) => [
       q(Bolgo),
       ],
-   q(1531) => [
+   q(1532) => [
       q(Bumang),
       ],
-   q(1532) => [
+   q(1533) => [
       q(Birri),
       ],
-   q(1533) => [
+   q(1534) => [
       q(Burarra),
       ],
-   q(1534) => [
+   q(1535) => [
       q(Bati (Indonesia)),
       ],
-   q(1535) => [
+   q(1536) => [
       q(Bukit Malay),
       ],
-   q(1536) => [
+   q(1537) => [
       q(Baniva),
       ],
-   q(1537) => [
+   q(1538) => [
       q(Boga),
       ],
-   q(1538) => [
+   q(1539) => [
       q(Dibole),
       ],
-   q(1539) => [
+   q(1540) => [
       q(Baybayanon),
       ],
-   q(1540) => [
+   q(1541) => [
       q(Bauzi),
       ],
-   q(1541) => [
+   q(1542) => [
       q(Bwatoo),
       ],
-   q(1542) => [
+   q(1543) => [
       q(Namosi-Naitasiri-Serua),
       ],
-   q(1543) => [
+   q(1544) => [
       q(Bwile),
       ],
-   q(1544) => [
+   q(1545) => [
       q(Bwaidoka),
       ],
-   q(1545) => [
+   q(1546) => [
       q(Bwe Karen),
       ],
-   q(1546) => [
+   q(1547) => [
       q(Boselewa),
       ],
-   q(1547) => [
+   q(1548) => [
       q(Barwe),
       ],
-   q(1548) => [
+   q(1549) => [
       q(Bishuo),
       ],
-   q(1549) => [
+   q(1550) => [
       q(Baniwa),
       ],
-   q(1550) => [
+   q(1551) => [
       q(Laa Laa Bwamu),
       ],
-   q(1551) => [
+   q(1552) => [
       q(Bauwaki),
       ],
-   q(1552) => [
+   q(1553) => [
       q(Bwela),
       ],
-   q(1553) => [
+   q(1554) => [
       q(Biwat),
       ],
-   q(1554) => [
+   q(1555) => [
       q(Wunai Bunu),
       ],
-   q(1555) => [
+   q(1556) => [
       q(Boro (Ethiopia)),
       q(Borna (Ethiopia)),
       ],
-   q(1556) => [
+   q(1557) => [
       q(Mandobo Bawah),
       ],
-   q(1557) => [
+   q(1558) => [
       q(Southern Bobo Madare),
       ],
-   q(1558) => [
+   q(1559) => [
       q(Bura-Pabir),
       ],
-   q(1559) => [
+   q(1560) => [
       q(Bomboma),
       ],
-   q(1560) => [
+   q(1561) => [
       q(Bafaw-Balong),
       ],
-   q(1561) => [
+   q(1562) => [
       q(Buli (Ghana)),
       ],
-   q(1562) => [
+   q(1563) => [
       q(Bwa),
       ],
-   q(1563) => [
+   q(1564) => [
       q(Bu-Nao Bunu),
       ],
-   q(1564) => [
+   q(1565) => [
       q(Cwi Bwamu),
       ],
-   q(1565) => [
+   q(1566) => [
       q(Bwisi),
       ],
-   q(1566) => [
+   q(1567) => [
       q(Tairaha),
       ],
-   q(1567) => [
+   q(1568) => [
       q(Belanda Bor),
       ],
-   q(1568) => [
+   q(1569) => [
       q(Molengue),
       ],
-   q(1569) => [
+   q(1570) => [
       q(Pela),
       ],
-   q(1570) => [
+   q(1571) => [
       q(Birale),
       ],
-   q(1571) => [
+   q(1572) => [
       q(Bilur),
       q(Minigir),
       ],
-   q(1572) => [
+   q(1573) => [
       q(Bangala),
       ],
-   q(1573) => [
+   q(1574) => [
       q(Buhutu),
       ],
-   q(1574) => [
+   q(1575) => [
       q(Pirlatapa),
       ],
-   q(1575) => [
+   q(1576) => [
       q(Bayungu),
       ],
-   q(1576) => [
+   q(1577) => [
       q(Bukusu),
       q(Lubukusu),
       ],
-   q(1577) => [
+   q(1578) => [
       q(Jalkunan),
       ],
-   q(1578) => [
+   q(1579) => [
       q(Mongolia Buriat),
       ],
-   q(1579) => [
+   q(1580) => [
       q(Burduna),
       ],
-   q(1580) => [
+   q(1581) => [
       q(Barikanchi),
       ],
-   q(1581) => [
+   q(1582) => [
       q(Bebil),
       ],
-   q(1582) => [
+   q(1583) => [
       q(Beele),
       ],
-   q(1583) => [
+   q(1584) => [
       q(Russia Buriat),
       ],
-   q(1584) => [
+   q(1585) => [
       q(Busam),
       ],
-   q(1585) => [
+   q(1586) => [
       q(China Buriat),
       ],
-   q(1586) => [
+   q(1587) => [
       q(Berakou),
       ],
-   q(1587) => [
+   q(1588) => [
       q(Bankagooma),
       ],
-   q(1588) => [
+   q(1589) => [
       q(Binahari),
       ],
-   q(1589) => [
+   q(1590) => [
       q(Batak),
       ],
-   q(1590) => [
+   q(1591) => [
       q(Bikya),
       ],
-   q(1591) => [
+   q(1592) => [
       q(Ubaghara),
       ],
-   q(1592) => [
+   q(1593) => [
       q(Benyadu'),
       ],
-   q(1593) => [
+   q(1594) => [
       q(Pouye),
       ],
-   q(1594) => [
+   q(1595) => [
       q(Bete),
       ],
-   q(1595) => [
+   q(1596) => [
       q(Baygo),
       ],
-   q(1596) => [
+   q(1597) => [
       q(Bhujel),
       ],
-   q(1597) => [
+   q(1598) => [
       q(Buyu),
       ],
-   q(1598) => [
+   q(1599) => [
       q(Bina (Nigeria)),
       ],
-   q(1599) => [
+   q(1600) => [
       q(Biao),
       ],
-   q(1600) => [
+   q(1601) => [
       q(Bayono),
       ],
-   q(1601) => [
+   q(1602) => [
       q(Bidyara),
       ],
-   q(1602) => [
+   q(1603) => [
       q(Biyo),
       ],
-   q(1603) => [
+   q(1604) => [
       q(Bumaji),
       ],
-   q(1604) => [
+   q(1605) => [
       q(Basay),
       ],
-   q(1605) => [
+   q(1606) => [
       q(Baruya),
       q(Yipma),
       ],
-   q(1606) => [
+   q(1607) => [
       q(Burak),
       ],
-   q(1607) => [
+   q(1608) => [
       q(Berti),
       ],
-   q(1608) => [
+   q(1609) => [
       q(Medumba),
       ],
-   q(1609) => [
+   q(1610) => [
       q(Belhariya),
       ],
-   q(1610) => [
+   q(1611) => [
       q(Qaqet),
       ],
-   q(1611) => [
+   q(1612) => [
       q(Banaro),
       ],
-   q(1612) => [
+   q(1613) => [
       q(Bandi),
       ],
-   q(1613) => [
+   q(1614) => [
       q(Andio),
       ],
-   q(1614) => [
+   q(1615) => [
       q(Southern Betsimisaraka Malagasy),
       ],
-   q(1615) => [
+   q(1616) => [
       q(Bribri),
       ],
-   q(1616) => [
+   q(1617) => [
       q(Jenaama Bozo),
       ],
-   q(1617) => [
+   q(1618) => [
       q(Boikin),
       ],
-   q(1618) => [
+   q(1619) => [
       q(Babuza),
       ],
-   q(1619) => [
+   q(1620) => [
       q(Mapos Buang),
       ],
-   q(1620) => [
+   q(1621) => [
       q(Bisu),
       ],
-   q(1621) => [
+   q(1622) => [
       q(Belize Kriol English),
       ],
-   q(1622) => [
+   q(1623) => [
       q(Nicaragua Creole English),
       ],
-   q(1623) => [
+   q(1624) => [
       q(Boano (Sulawesi)),
       ],
-   q(1624) => [
+   q(1625) => [
       q(Bolondo),
       ],
-   q(1625) => [
+   q(1626) => [
       q(Boano (Maluku)),
       ],
-   q(1626) => [
+   q(1627) => [
       q(Bozaba),
       ],
-   q(1627) => [
+   q(1628) => [
       q(Kemberano),
       ],
-   q(1628) => [
+   q(1629) => [
       q(Buli (Indonesia)),
       ],
-   q(1629) => [
+   q(1630) => [
       q(Biri),
       ],
-   q(1630) => [
+   q(1631) => [
       q(Brazilian Sign Language),
       ],
-   q(1631) => [
+   q(1632) => [
       q(Brithenig),
       ],
-   q(1632) => [
+   q(1633) => [
       q(Burmeso),
       ],
-   q(1633) => [
+   q(1634) => [
       q(Naami),
       ],
-   q(1634) => [
+   q(1635) => [
       q(Basa (Nigeria)),
       ],
-   q(1635) => [
+   q(1636) => [
       q(Kelengazxo Bozo),
       ],
-   q(1636) => [
+   q(1637) => [
       q(Obanliku),
       ],
-   q(1637) => [
+   q(1638) => [
       q(Evant),
       ],
-   q(1638) => [
+   q(1639) => [
       q(Chorti),
       ],
-   q(1639) => [
+   q(1640) => [
       q(Garifuna),
       ],
-   q(1640) => [
+   q(1641) => [
       q(Chuj),
       ],
-   q(1641) => [
+   q(1642) => [
       q(Lehar),
       q(Laalaa),
       ],
-   q(1642) => [
+   q(1643) => [
       q(Southern Carrier),
       ],
-   q(1643) => [
+   q(1644) => [
       q(Nivacle),
       ],
-   q(1644) => [
+   q(1645) => [
       q(Cahuarano),
       ],
-   q(1645) => [
+   q(1646) => [
       q(Chane),
       ],
-   q(1646) => [
+   q(1647) => [
       q(Kaqchikel),
       q(Cakchiquel),
       ],
-   q(1647) => [
+   q(1648) => [
       q(Carolinian),
       ],
-   q(1648) => [
+   q(1649) => [
       q(Cemuhi),
       ],
-   q(1649) => [
+   q(1650) => [
       q(Chambri),
       ],
-   q(1650) => [
+   q(1651) => [
       q(Chacobo),
       ],
-   q(1651) => [
+   q(1652) => [
       q(Chipaya),
       ],
-   q(1652) => [
+   q(1653) => [
       q(Car Nicobarese),
       ],
-   q(1653) => [
+   q(1654) => [
       q(Tsimane),
       ],
-   q(1654) => [
+   q(1655) => [
       q(Cavinena),
       ],
-   q(1655) => [
+   q(1656) => [
       q(Callawalla),
       ],
-   q(1656) => [
+   q(1657) => [
       q(Chiquitano),
       ],
-   q(1657) => [
+   q(1658) => [
       q(Cayuga),
       ],
-   q(1658) => [
+   q(1659) => [
       q(Canichana),
       ],
-   q(1659) => [
+   q(1660) => [
       q(Cabiyari),
       ],
-   q(1660) => [
+   q(1661) => [
       q(Carapana),
       ],
-   q(1661) => [
+   q(1662) => [
       q(Carijona),
       ],
-   q(1662) => [
+   q(1663) => [
       q(Chipiajes),
       ],
-   q(1663) => [
+   q(1664) => [
       q(Chimila),
       ],
-   q(1664) => [
+   q(1665) => [
       q(Cagua),
       ],
-   q(1665) => [
+   q(1666) => [
       q(Chachi),
       ],
-   q(1666) => [
+   q(1667) => [
       q(Ede Cabe),
       ],
-   q(1667) => [
+   q(1668) => [
       q(Chavacano),
       ],
-   q(1668) => [
+   q(1669) => [
       q(Bualkhaw Chin),
       ],
-   q(1669) => [
+   q(1670) => [
       q(Nyahkur),
       ],
-   q(1670) => [
+   q(1671) => [
       q(Izora),
       ],
-   q(1671) => [
+   q(1672) => [
       q(Tsucuba),
       q(Cuba),
       ],
-   q(1672) => [
+   q(1673) => [
       q(Cashibo-Cacataibo),
       ],
-   q(1673) => [
+   q(1674) => [
       q(Cashinahua),
       ],
-   q(1674) => [
+   q(1675) => [
       q(Chayahuita),
       ],
-   q(1675) => [
+   q(1676) => [
       q(Candoshi-Shapra),
       ],
-   q(1676) => [
+   q(1677) => [
       q(Cacua),
       ],
-   q(1677) => [
+   q(1678) => [
       q(Kinabalian),
       ],
-   q(1678) => [
+   q(1679) => [
       q(Carabayo),
       ],
-   q(1679) => [
+   q(1680) => [
       q(Cauca),
       ],
-   q(1680) => [
+   q(1681) => [
       q(Chamicuro),
       ],
-   q(1681) => [
+   q(1682) => [
       q(Cafundo Creole),
       ],
-   q(1682) => [
+   q(1683) => [
       q(Chopi),
       ],
-   q(1683) => [
+   q(1684) => [
       q(Samba Daka),
       ],
-   q(1684) => [
+   q(1685) => [
       q(Atsam),
       ],
-   q(1685) => [
+   q(1686) => [
       q(Kasanga),
       ],
-   q(1686) => [
+   q(1687) => [
       q(Cutchi-Swahili),
       ],
-   q(1687) => [
+   q(1688) => [
       q(Malaccan Creole Malay),
       ],
-   q(1688) => [
+   q(1689) => [
       q(Comaltepec Chinantec),
       ],
-   q(1689) => [
+   q(1690) => [
       q(Chakma),
       ],
-   q(1690) => [
+   q(1691) => [
       q(Cacaopera),
       ],
-   q(1691) => [
+   q(1692) => [
       q(Choni),
       ],
-   q(1692) => [
+   q(1693) => [
       q(Chenchu),
       ],
-   q(1693) => [
+   q(1694) => [
       q(Chiru),
       ],
-   q(1694) => [
+   q(1695) => [
       q(Chamari),
       ],
-   q(1695) => [
+   q(1696) => [
       q(Chambeali),
       ],
-   q(1696) => [
+   q(1697) => [
       q(Chodri),
       ],
-   q(1697) => [
+   q(1698) => [
       q(Churahi),
       ],
-   q(1698) => [
+   q(1699) => [
       q(Chepang),
       ],
-   q(1699) => [
+   q(1700) => [
       q(Chaudangsi),
       ],
-   q(1700) => [
+   q(1701) => [
       q(Min Dong Chinese),
       ],
-   q(1701) => [
+   q(1702) => [
       q(Cinda-Regi-Tiyal),
       ],
-   q(1702) => [
+   q(1703) => [
       q(Chadian Sign Language),
       ],
-   q(1703) => [
+   q(1704) => [
       q(Chadong),
       ],
-   q(1704) => [
+   q(1705) => [
       q(Koda),
       ],
-   q(1705) => [
+   q(1706) => [
       q(Lower Chehalis),
       ],
-   q(1706) => [
+   q(1707) => [
       q(Chamacoco),
       ],
-   q(1707) => [
+   q(1708) => [
       q(Eastern Khumi Chin),
       ],
-   q(1708) => [
+   q(1709) => [
       q(Cen),
       ],
-   q(1709) => [
+   q(1710) => [
       q(Centuum),
       ],
-   q(1710) => [
+   q(1711) => [
       q(Dijim-Bwilim),
       ],
-   q(1711) => [
+   q(1712) => [
       q(Cara),
       ],
-   q(1712) => [
+   q(1713) => [
       q(Como Karim),
       ],
-   q(1713) => [
+   q(1714) => [
       q(Falam Chin),
       ],
-   q(1714) => [
+   q(1715) => [
       q(Changriwa),
       ],
-   q(1715) => [
+   q(1716) => [
       q(Kagayanen),
       ],
-   q(1716) => [
+   q(1717) => [
       q(Chiga),
       ],
-   q(1717) => [
+   q(1718) => [
       q(Chocangacakha),
       ],
-   q(1718) => [
+   q(1719) => [
       q(Catawba),
       ],
-   q(1719) => [
+   q(1720) => [
       q(Highland Oaxaca Chontal),
       ],
-   q(1720) => [
+   q(1721) => [
       q(Tabasco Chontal),
       ],
-   q(1721) => [
+   q(1722) => [
       q(Chinook),
       ],
-   q(1722) => [
+   q(1723) => [
       q(Ojitlan Chinantec),
       ],
-   q(1723) => [
+   q(1724) => [
       q(Cahuilla),
       ],
-   q(1724) => [
+   q(1725) => [
       q(Quiotepec Chinantec),
       ],
-   q(1725) => [
+   q(1726) => [
       q(Cholon),
       ],
-   q(1726) => [
+   q(1727) => [
       q(Chuwabu),
       ],
-   q(1727) => [
+   q(1728) => [
       q(Chantyal),
       ],
-   q(1728) => [
+   q(1729) => [
       q(Ozumacin Chinantec),
       ],
-   q(1729) => [
+   q(1730) => [
       q(Cia-Cia),
       ],
-   q(1730) => [
+   q(1731) => [
       q(Ci Gbe),
       ],
-   q(1731) => [
+   q(1732) => [
       q(Chickasaw),
       ],
-   q(1732) => [
+   q(1733) => [
       q(Chimariko),
       ],
-   q(1733) => [
+   q(1734) => [
       q(Cineni),
       ],
-   q(1734) => [
+   q(1735) => [
       q(Chinali),
       ],
-   q(1735) => [
+   q(1736) => [
       q(Chitkuli Kinnauri),
       ],
-   q(1736) => [
+   q(1737) => [
       q(Cimbrian),
       ],
-   q(1737) => [
+   q(1738) => [
       q(Cinta Larga),
       ],
-   q(1738) => [
+   q(1739) => [
       q(Chiapanec),
       ],
-   q(1739) => [
+   q(1740) => [
       q(Tiri),
       q(Hamea),
       q(Mea),
       ],
-   q(1740) => [
+   q(1741) => [
       q(Chippewa),
       ],
-   q(1741) => [
+   q(1742) => [
       q(Chaima),
       ],
-   q(1742) => [
+   q(1743) => [
       q(Western Cham),
       ],
-   q(1743) => [
+   q(1744) => [
       q(Chru),
       ],
-   q(1744) => [
+   q(1745) => [
       q(Upper Chehalis),
       ],
-   q(1745) => [
+   q(1746) => [
       q(Chamalal),
       ],
-   q(1746) => [
+   q(1747) => [
       q(Chokwe),
       ],
-   q(1747) => [
+   q(1748) => [
       q(Eastern Cham),
       ],
-   q(1748) => [
+   q(1749) => [
       q(Chenapian),
       ],
-   q(1749) => [
+   q(1750) => [
       q(Asheninka Pajonal),
       ],
-   q(1750) => [
+   q(1751) => [
       q(Cabecar),
       ],
-   q(1751) => [
+   q(1752) => [
       q(Shor),
       ],
-   q(1752) => [
+   q(1753) => [
       q(Chuave),
       ],
-   q(1753) => [
+   q(1754) => [
       q(Jinyu Chinese),
       ],
-   q(1754) => [
+   q(1755) => [
       q(Central Kurdish),
       ],
-   q(1755) => [
+   q(1756) => [
       q(Chak),
       ],
-   q(1756) => [
+   q(1757) => [
       q(Cibak),
       ],
-   q(1757) => [
+   q(1758) => [
       q(Kaang Chin),
       ],
-   q(1758) => [
+   q(1759) => [
       q(Anufo),
       ],
-   q(1759) => [
+   q(1760) => [
       q(Kajakse),
       ],
-   q(1760) => [
+   q(1761) => [
       q(Kairak),
       ],
-   q(1761) => [
+   q(1762) => [
       q(Tayo),
       ],
-   q(1762) => [
+   q(1763) => [
       q(Chukot),
       ],
-   q(1763) => [
+   q(1764) => [
       q(Koasati),
       ],
-   q(1764) => [
+   q(1765) => [
       q(Kavalan),
       ],
-   q(1765) => [
+   q(1766) => [
       q(Caka),
       ],
-   q(1766) => [
+   q(1767) => [
       q(Cakfem-Mushere),
       ],
-   q(1767) => [
+   q(1768) => [
       q(Cakchiquel-Quiche Mixed Language),
       ],
-   q(1768) => [
+   q(1769) => [
       q(Ron),
       ],
-   q(1769) => [
+   q(1770) => [
       q(Chilcotin),
       ],
-   q(1770) => [
+   q(1771) => [
       q(Chaldean Neo-Aramaic),
       ],
-   q(1771) => [
+   q(1772) => [
       q(Lealao Chinantec),
       ],
-   q(1772) => [
+   q(1773) => [
       q(Chilisso),
       ],
-   q(1773) => [
+   q(1774) => [
       q(Chakali),
       ],
-   q(1774) => [
+   q(1775) => [
       q(Laitu Chin),
       ],
-   q(1775) => [
+   q(1776) => [
       q(Idu-Mishmi),
       ],
-   q(1776) => [
+   q(1777) => [
       q(Chala),
       ],
-   q(1777) => [
+   q(1778) => [
       q(Clallam),
       ],
-   q(1778) => [
+   q(1779) => [
       q(Lowland Oaxaca Chontal),
       ],
-   q(1779) => [
+   q(1780) => [
       q(Lautu Chin),
       ],
-   q(1780) => [
+   q(1781) => [
       q(Caluyanun),
       ],
-   q(1781) => [
+   q(1782) => [
       q(Chulym),
       ],
-   q(1782) => [
+   q(1783) => [
       q(Eastern Highland Chatino),
       ],
-   q(1783) => [
+   q(1784) => [
       q(Maa),
       ],
-   q(1784) => [
+   q(1785) => [
       q(Cerma),
       ],
-   q(1785) => [
+   q(1786) => [
       q(Classical Mongolian),
       ],
-   q(1786) => [
+   q(1787) => [
       q(Embera-Chami),
       ],
-   q(1787) => [
+   q(1788) => [
       q(Campalagian),
       ],
-   q(1788) => [
+   q(1789) => [
       q(Michigamea),
       ],
-   q(1789) => [
+   q(1790) => [
       q(Mandarin Chinese),
       ],
-   q(1790) => [
+   q(1791) => [
       q(Central Mnong),
       ],
-   q(1791) => [
+   q(1792) => [
       q(Mro-Khimi Chin),
       ],
-   q(1792) => [
+   q(1793) => [
       q(Messapic),
       ],
-   q(1793) => [
+   q(1794) => [
       q(Camtho),
       ],
-   q(1794) => [
+   q(1795) => [
       q(Changthang),
       ],
-   q(1795) => [
+   q(1796) => [
       q(Chinbon Chin),
       ],
-   q(1796) => [
+   q(1797) => [
       q(Coong),
       ],
-   q(1797) => [
+   q(1798) => [
       q(Northern Qiang),
       ],
-   q(1798) => [
+   q(1799) => [
       q(Haka Chin),
       ],
-   q(1799) => [
+   q(1800) => [
       q(Ashaninka),
       ],
-   q(1800) => [
+   q(1801) => [
       q(Khumi Chin),
       ],
-   q(1801) => [
+   q(1802) => [
       q(Lalana Chinantec),
       ],
-   q(1802) => [
+   q(1803) => [
       q(Con),
       ],
-   q(1803) => [
+   q(1804) => [
       q(Central Asmat),
       ],
-   q(1804) => [
+   q(1805) => [
       q(Tepetotutla Chinantec),
       ],
-   q(1805) => [
+   q(1806) => [
       q(Chenoua),
       ],
-   q(1806) => [
+   q(1807) => [
       q(Ngawn Chin),
       ],
-   q(1807) => [
+   q(1808) => [
       q(Middle Cornish),
       ],
-   q(1808) => [
+   q(1809) => [
       q(Cocos Islands Malay),
       ],
-   q(1809) => [
+   q(1810) => [
       q(Chicomuceltec),
       ],
-   q(1810) => [
+   q(1811) => [
       q(Cocopa),
       ],
-   q(1811) => [
+   q(1812) => [
       q(Cocama-Cocamilla),
       ],
-   q(1812) => [
+   q(1813) => [
       q(Koreguaje),
       ],
-   q(1813) => [
+   q(1814) => [
       q(Colorado),
       ],
-   q(1814) => [
+   q(1815) => [
       q(Chong),
       ],
-   q(1815) => [
+   q(1816) => [
       q(Chonyi-Dzihana-Kauma),
       q(Chichonyi-Chidzihana-Chikauma),
       ],
-   q(1816) => [
+   q(1817) => [
       q(Cochimi),
       ],
-   q(1817) => [
+   q(1818) => [
       q(Santa Teresa Cora),
       ],
-   q(1818) => [
+   q(1819) => [
       q(Columbia-Wenatchi),
       ],
-   q(1819) => [
+   q(1820) => [
       q(Comanche),
       ],
-   q(1820) => [
+   q(1821) => [
       q(Cofan),
       ],
-   q(1821) => [
+   q(1822) => [
       q(Comox),
       ],
-   q(1822) => [
+   q(1823) => [
       q(Coquille),
       ],
-   q(1823) => [
+   q(1824) => [
       q(Caquinte),
       ],
-   q(1824) => [
+   q(1825) => [
       q(Wamey),
       ],
-   q(1825) => [
+   q(1826) => [
       q(Cao Miao),
       ],
-   q(1826) => [
+   q(1827) => [
       q(Cowlitz),
       ],
-   q(1827) => [
+   q(1828) => [
       q(Nanti),
       ],
-   q(1828) => [
+   q(1829) => [
       q(Coyaima),
       ],
-   q(1829) => [
+   q(1830) => [
       q(Chochotec),
       ],
-   q(1830) => [
+   q(1831) => [
       q(Palantla Chinantec),
       ],
-   q(1831) => [
+   q(1832) => [
       q(Ucayali-Yurua Asheninka),
       ],
-   q(1832) => [
+   q(1833) => [
       q(Ajyininka Apurucayali),
       ],
-   q(1833) => [
+   q(1834) => [
       q(Cappadocian Greek),
       ],
-   q(1834) => [
+   q(1835) => [
       q(Chinese Pidgin English),
       ],
-   q(1835) => [
+   q(1836) => [
       q(Cherepon),
       ],
-   q(1836) => [
+   q(1837) => [
       q(Kpeego),
       ],
-   q(1837) => [
+   q(1838) => [
       q(Capiznon),
       ],
-   q(1838) => [
+   q(1839) => [
       q(Pichis Asheninka),
       ],
-   q(1839) => [
+   q(1840) => [
       q(Pu-Xian Chinese),
       ],
-   q(1840) => [
+   q(1841) => [
       q(South Ucayali Asheninka),
       ],
-   q(1841) => [
+   q(1842) => [
       q(Chuanqiandian Cluster Miao),
       ],
-   q(1842) => [
+   q(1843) => [
       q(Chilean Quechua),
       ],
-   q(1843) => [
+   q(1844) => [
       q(Chara),
       ],
-   q(1844) => [
+   q(1845) => [
       q(Island Carib),
       ],
-   q(1845) => [
+   q(1846) => [
       q(Lonwolwol),
       ],
-   q(1846) => [
+   q(1847) => [
       q(Coeur d'Alene),
       ],
-   q(1847) => [
+   q(1848) => [
       q(Caramanta),
       ],
-   q(1848) => [
+   q(1849) => [
       q(Michif),
       ],
-   q(1849) => [
+   q(1850) => [
       q(Saotomense),
       ],
-   q(1850) => [
+   q(1851) => [
       q(Southern East Cree),
       ],
-   q(1851) => [
+   q(1852) => [
       q(Plains Cree),
       ],
-   q(1852) => [
+   q(1853) => [
       q(Northern East Cree),
       ],
-   q(1853) => [
+   q(1854) => [
       q(Moose Cree),
       ],
-   q(1854) => [
+   q(1855) => [
       q(El Nayar Cora),
       ],
-   q(1855) => [
+   q(1856) => [
       q(Crow),
       ],
-   q(1856) => [
+   q(1857) => [
       q(Iyo'wujwa Chorote),
       ],
-   q(1857) => [
+   q(1858) => [
       q(Carolina Algonquian),
       ],
-   q(1858) => [
+   q(1859) => [
       q(Seselwa Creole French),
       ],
-   q(1859) => [
+   q(1860) => [
       q(Iyojwa'ja Chorote),
       ],
-   q(1860) => [
+   q(1861) => [
       q(Chaura),
       ],
-   q(1861) => [
+   q(1862) => [
       q(Chrau),
       ],
-   q(1862) => [
+   q(1863) => [
       q(Carrier),
       ],
-   q(1863) => [
+   q(1864) => [
       q(Cori),
       ],
-   q(1864) => [
+   q(1865) => [
       q(Cruzeno),
       ],
-   q(1865) => [
+   q(1866) => [
       q(Chiltepec Chinantec),
       ],
-   q(1866) => [
+   q(1867) => [
       q(Catalan Sign Language),
       q(Lengua de senas catalana),
       q(Llengua de Signes Catalana),
       ],
-   q(1867) => [
+   q(1868) => [
       q(Chiangmai Sign Language),
       ],
-   q(1868) => [
+   q(1869) => [
       q(Czech Sign Language),
       ],
-   q(1869) => [
+   q(1870) => [
       q(Cuba Sign Language),
       ],
-   q(1870) => [
+   q(1871) => [
       q(Chilean Sign Language),
       ],
-   q(1871) => [
+   q(1872) => [
       q(Asho Chin),
       ],
-   q(1872) => [
+   q(1873) => [
       q(Coast Miwok),
       ],
-   q(1873) => [
+   q(1874) => [
       q(Songlai Chin),
       ],
-   q(1874) => [
+   q(1875) => [
       q(Jola-Kasa),
       ],
-   q(1875) => [
+   q(1876) => [
       q(Chinese Sign Language),
       ],
-   q(1876) => [
+   q(1877) => [
       q(Central Sierra Miwok),
       ],
-   q(1877) => [
+   q(1878) => [
       q(Colombian Sign Language),
       ],
-   q(1878) => [
+   q(1879) => [
       q(Sochiapam Chinantec),
       q(Sochiapan Chinantec),
       ],
-   q(1879) => [
+   q(1880) => [
       q(Croatia Sign Language),
       ],
-   q(1880) => [
+   q(1881) => [
       q(Costa Rican Sign Language),
       ],
-   q(1881) => [
+   q(1882) => [
       q(Southern Ohlone),
       ],
-   q(1882) => [
+   q(1883) => [
       q(Northern Ohlone),
       ],
-   q(1883) => [
+   q(1884) => [
       q(Sumtu Chin),
       ],
-   q(1884) => [
+   q(1885) => [
       q(Swampy Cree),
       ],
-   q(1885) => [
+   q(1886) => [
       q(Siyin Chin),
       ],
-   q(1886) => [
+   q(1887) => [
       q(Coos),
       ],
-   q(1887) => [
+   q(1888) => [
       q(Tataltepec Chatino),
       ],
-   q(1888) => [
+   q(1889) => [
       q(Chetco),
       ],
-   q(1889) => [
+   q(1890) => [
       q(Tedim Chin),
       ],
-   q(1890) => [
+   q(1891) => [
       q(Tepinapa Chinantec),
       ],
-   q(1891) => [
+   q(1892) => [
       q(Chittagonian),
       ],
-   q(1892) => [
+   q(1893) => [
       q(Thaiphum Chin),
       ],
-   q(1893) => [
+   q(1894) => [
       q(Tlacoatzintepec Chinantec),
       ],
-   q(1894) => [
+   q(1895) => [
       q(Chitimacha),
       ],
-   q(1895) => [
+   q(1896) => [
       q(Chhintange),
       ],
-   q(1896) => [
+   q(1897) => [
       q(Embera-Catio),
       ],
-   q(1897) => [
+   q(1898) => [
       q(Western Highland Chatino),
       ],
-   q(1898) => [
+   q(1899) => [
       q(Northern Catanduanes Bikol),
       ],
-   q(1899) => [
+   q(1900) => [
       q(Wayanad Chetti),
       ],
-   q(1900) => [
+   q(1901) => [
       q(Chol),
       ],
-   q(1901) => [
+   q(1902) => [
       q(Zacatepec Chatino),
       ],
-   q(1902) => [
+   q(1903) => [
       q(Cua),
       ],
-   q(1903) => [
+   q(1904) => [
       q(Cubeo),
       ],
-   q(1904) => [
+   q(1905) => [
       q(Usila Chinantec),
       ],
-   q(1905) => [
+   q(1906) => [
       q(Cung),
       ],
-   q(1906) => [
+   q(1907) => [
       q(Chuka),
       q(Gichuka),
       ],
-   q(1907) => [
+   q(1908) => [
       q(Cuiba),
       ],
-   q(1908) => [
+   q(1909) => [
       q(Mashco Piro),
       ],
-   q(1909) => [
+   q(1910) => [
       q(San Blas Kuna),
       ],
-   q(1910) => [
+   q(1911) => [
       q(Culina),
       q(Kulina),
       ],
-   q(1911) => [
+   q(1912) => [
       q(Cumeral),
       ],
-   q(1912) => [
+   q(1913) => [
       q(Cumanagoto),
       ],
-   q(1913) => [
+   q(1914) => [
       q(Cupeno),
       ],
-   q(1914) => [
+   q(1915) => [
       q(Cun),
       ],
-   q(1915) => [
+   q(1916) => [
       q(Chhulung),
       ],
-   q(1916) => [
+   q(1917) => [
       q(Teutila Cuicatec),
       ],
-   q(1917) => [
+   q(1918) => [
       q(Tai Ya),
       ],
-   q(1918) => [
+   q(1919) => [
       q(Cuvok),
       ],
-   q(1919) => [
+   q(1920) => [
       q(Chukwa),
       ],
-   q(1920) => [
+   q(1921) => [
       q(Tepeuxila Cuicatec),
       ],
-   q(1921) => [
+   q(1922) => [
       q(Chug),
       ],
-   q(1922) => [
+   q(1923) => [
       q(Valle Nacional Chinantec),
       ],
-   q(1923) => [
+   q(1924) => [
       q(Kabwa),
       ],
-   q(1924) => [
+   q(1925) => [
       q(Maindo),
       ],
-   q(1925) => [
+   q(1926) => [
       q(Woods Cree),
       ],
-   q(1926) => [
+   q(1927) => [
       q(Kwere),
       ],
-   q(1927) => [
+   q(1928) => [
       q(Chewong),
       q(Cheq Wong),
       ],
-   q(1928) => [
+   q(1929) => [
       q(Kuwaataay),
       ],
-   q(1929) => [
+   q(1930) => [
       q(Nopala Chatino),
       ],
-   q(1930) => [
+   q(1931) => [
       q(Cayubaba),
       ],
-   q(1931) => [
+   q(1932) => [
       q(Cuyonon),
       ],
-   q(1932) => [
+   q(1933) => [
       q(Huizhou Chinese),
       ],
-   q(1933) => [
+   q(1934) => [
       q(Knaanic),
       ],
-   q(1934) => [
+   q(1935) => [
       q(Zenzontepec Chatino),
       ],
-   q(1935) => [
+   q(1936) => [
       q(Min Zhong Chinese),
       ],
-   q(1936) => [
+   q(1937) => [
       q(Zotung Chin),
       ],
-   q(1937) => [
+   q(1938) => [
       q(Dangaleat),
       ],
-   q(1938) => [
+   q(1939) => [
       q(Dambi),
       ],
-   q(1939) => [
+   q(1940) => [
       q(Marik),
       ],
-   q(1940) => [
+   q(1941) => [
       q(Duupa),
       ],
-   q(1941) => [
+   q(1942) => [
       q(Dagbani),
       ],
-   q(1942) => [
+   q(1943) => [
       q(Gwahatike),
       ],
-   q(1943) => [
+   q(1944) => [
       q(Day),
       ],
-   q(1944) => [
+   q(1945) => [
       q(Dar Fur Daju),
       ],
-   q(1945) => [
+   q(1946) => [
       q(Dahalo),
       ],
-   q(1946) => [
+   q(1947) => [
       q(Damakawa),
       ],
-   q(1947) => [
+   q(1948) => [
       q(Daai Chin),
       ],
-   q(1948) => [
+   q(1949) => [
       q(Dandami Maria),
       ],
-   q(1949) => [
+   q(1950) => [
       q(Daho-Doo),
       ],
-   q(1950) => [
+   q(1951) => [
       q(Dar Sila Daju),
       ],
-   q(1951) => [
+   q(1952) => [
       q(Taita),
       q(Dawida),
       ],
-   q(1952) => [
+   q(1953) => [
       q(Davawenyo),
       ],
-   q(1953) => [
+   q(1954) => [
       q(Dayi),
       ],
-   q(1954) => [
+   q(1955) => [
       q(Dao),
       ],
-   q(1955) => [
+   q(1956) => [
       q(Bangime),
       ],
-   q(1956) => [
+   q(1957) => [
       q(Deno),
       ],
-   q(1957) => [
+   q(1958) => [
       q(Dadiya),
       ],
-   q(1958) => [
+   q(1959) => [
       q(Dabe),
       ],
-   q(1959) => [
+   q(1960) => [
       q(Edopi),
       ],
-   q(1960) => [
+   q(1961) => [
       q(Dogul Dom Dogon),
       ],
-   q(1961) => [
+   q(1962) => [
       q(Doka),
       ],
-   q(1962) => [
+   q(1963) => [
       q(Ida'an),
       ],
-   q(1963) => [
+   q(1964) => [
       q(Dyirbal),
       ],
-   q(1964) => [
+   q(1965) => [
       q(Duguri),
       ],
-   q(1965) => [
+   q(1966) => [
       q(Duriankere),
       ],
-   q(1966) => [
+   q(1967) => [
       q(Dulbu),
       ],
-   q(1967) => [
+   q(1968) => [
       q(Duwai),
       ],
-   q(1968) => [
+   q(1969) => [
       q(Daba),
       ],
-   q(1969) => [
+   q(1970) => [
       q(Dabarre),
       ],
-   q(1970) => [
+   q(1971) => [
       q(Ben Tey Dogon),
       ],
-   q(1971) => [
+   q(1972) => [
       q(Bondum Dom Dogon),
       ],
-   q(1972) => [
+   q(1973) => [
       q(Dungu),
       ],
-   q(1973) => [
+   q(1974) => [
       q(Bankan Tey Dogon),
       ],
-   q(1974) => [
+   q(1975) => [
       q(Dibiyaso),
       ],
-   q(1975) => [
+   q(1976) => [
       q(Deccan),
       ],
-   q(1976) => [
+   q(1977) => [
       q(Negerhollands),
       ],
-   q(1977) => [
+   q(1978) => [
       q(Dadi Dadi),
       ],
-   q(1978) => [
+   q(1979) => [
       q(Dongotono),
       ],
-   q(1979) => [
+   q(1980) => [
       q(Doondo),
       ],
-   q(1980) => [
+   q(1981) => [
       q(Fataluku),
       ],
-   q(1981) => [
+   q(1982) => [
       q(West Goodenough),
       ],
-   q(1982) => [
+   q(1983) => [
       q(Jaru),
       ],
-   q(1983) => [
+   q(1984) => [
       q(Dendi (Benin)),
       ],
-   q(1984) => [
+   q(1985) => [
       q(Dido),
       ],
-   q(1985) => [
+   q(1986) => [
       q(Dhudhuroa),
       ],
-   q(1986) => [
+   q(1987) => [
       q(Donno So Dogon),
       ],
-   q(1987) => [
+   q(1988) => [
       q(Dawera-Daweloor),
       ],
-   q(1988) => [
+   q(1989) => [
       q(Dagik),
       ],
-   q(1989) => [
+   q(1990) => [
       q(Dedua),
       ],
-   q(1990) => [
+   q(1991) => [
       q(Dewoin),
       ],
-   q(1991) => [
+   q(1992) => [
       q(Dezfuli),
       ],
-   q(1992) => [
+   q(1993) => [
       q(Degema),
       ],
-   q(1993) => [
+   q(1994) => [
       q(Dehwari),
       ],
-   q(1994) => [
+   q(1995) => [
       q(Demisa),
       ],
-   q(1995) => [
+   q(1996) => [
       q(Dek),
       ],
-   q(1996) => [
+   q(1997) => [
       q(Dem),
       ],
-   q(1997) => [
+   q(1998) => [
       q(Pidgin Delaware),
       ],
-   q(1998) => [
+   q(1999) => [
       q(Dendi (Central African Republic)),
       ],
-   q(1999) => [
+   q(2000) => [
       q(Deori),
       ],
-   q(2000) => [
+   q(2001) => [
       q(Desano),
       ],
-   q(2001) => [
+   q(2002) => [
       q(Domung),
       ],
-   q(2002) => [
+   q(2003) => [
       q(Dengese),
       ],
-   q(2003) => [
+   q(2004) => [
       q(Southern Dagaare),
       ],
-   q(2004) => [
+   q(2005) => [
       q(Bunoge Dogon),
       ],
-   q(2005) => [
+   q(2006) => [
       q(Casiguran Dumagat Agta),
       ],
-   q(2006) => [
+   q(2007) => [
       q(Dagaari Dioula),
       ],
-   q(2007) => [
+   q(2008) => [
       q(Degenan),
       ],
-   q(2008) => [
+   q(2009) => [
       q(Doga),
       ],
-   q(2009) => [
+   q(2010) => [
       q(Dghwede),
       ],
-   q(2010) => [
+   q(2011) => [
       q(Northern Dagara),
       ],
-   q(2011) => [
+   q(2012) => [
       q(Dagba),
       ],
-   q(2012) => [
+   q(2013) => [
       q(Andaandi),
       q(Dongolawi),
       ],
-   q(2013) => [
+   q(2014) => [
       q(Dagoman),
       ],
-   q(2014) => [
+   q(2015) => [
       q(Dogri (individual language)),
       ],
-   q(2015) => [
+   q(2016) => [
       q(Dogoso),
       ],
-   q(2016) => [
+   q(2017) => [
       q(Ndra'ngith),
       ],
-   q(2017) => [
+   q(2018) => [
       q(Degaru),
       ],
-   q(2018) => [
+   q(2019) => [
       q(Daungwurrung),
       ],
-   q(2019) => [
+   q(2020) => [
       q(Doghoro),
       ],
-   q(2020) => [
+   q(2021) => [
       q(Daga),
       ],
-   q(2021) => [
+   q(2022) => [
       q(Dhundari),
       ],
-   q(2022) => [
+   q(2023) => [
       q(Dhangu),
       q(Djangu),
       ],
-   q(2023) => [
+   q(2024) => [
       q(Dhimal),
       ],
-   q(2024) => [
+   q(2025) => [
       q(Dhalandji),
       ],
-   q(2025) => [
+   q(2026) => [
       q(Zemba),
       ],
-   q(2026) => [
+   q(2027) => [
       q(Dhanki),
       ],
-   q(2027) => [
+   q(2028) => [
       q(Dhodia),
       ],
-   q(2028) => [
+   q(2029) => [
       q(Dhargari),
       ],
-   q(2029) => [
+   q(2030) => [
       q(Dhaiso),
       ],
-   q(2030) => [
+   q(2031) => [
       q(Dhurga),
       ],
-   q(2031) => [
+   q(2032) => [
       q(Dehu),
       q(Drehu),
       ],
-   q(2032) => [
+   q(2033) => [
       q(Dhanwar (Nepal)),
       ],
-   q(2033) => [
+   q(2034) => [
       q(Dhungaloo),
       ],
-   q(2034) => [
+   q(2035) => [
       q(Dia),
       ],
-   q(2035) => [
+   q(2036) => [
       q(South Central Dinka),
       ],
-   q(2036) => [
+   q(2037) => [
       q(Lakota Dida),
       ],
-   q(2037) => [
+   q(2038) => [
       q(Didinga),
       ],
-   q(2038) => [
+   q(2039) => [
       q(Dieri),
       ],
-   q(2039) => [
+   q(2040) => [
       q(Digo),
       q(Chidigo),
       ],
-   q(2040) => [
+   q(2041) => [
       q(Kumiai),
       ],
-   q(2041) => [
+   q(2042) => [
       q(Dimbong),
       ],
-   q(2042) => [
+   q(2043) => [
       q(Dai),
       ],
-   q(2043) => [
+   q(2044) => [
       q(Southwestern Dinka),
       ],
-   q(2044) => [
+   q(2045) => [
       q(Dilling),
       ],
-   q(2045) => [
+   q(2046) => [
       q(Dime),
       ],
-   q(2046) => [
+   q(2047) => [
       q(Dibo),
       ],
-   q(2047) => [
+   q(2048) => [
       q(Northeastern Dinka),
       ],
-   q(2048) => [
+   q(2049) => [
       q(Dimli (individual language)),
       ],
-   q(2049) => [
+   q(2050) => [
       q(Dirim),
       ],
-   q(2050) => [
+   q(2051) => [
       q(Dimasa),
       ],
-   q(2051) => [
+   q(2052) => [
       q(Dirari),
       ],
-   q(2052) => [
+   q(2053) => [
       q(Diriku),
       ],
-   q(2053) => [
+   q(2054) => [
       q(Northwestern Dinka),
       ],
-   q(2054) => [
+   q(2055) => [
       q(Dixon Reef),
       ],
-   q(2055) => [
+   q(2056) => [
       q(Diuwe),
       ],
-   q(2056) => [
+   q(2057) => [
       q(Ding),
       ],
-   q(2057) => [
+   q(2058) => [
       q(Djadjawurrung),
       ],
-   q(2058) => [
+   q(2059) => [
       q(Djinba),
       ],
-   q(2059) => [
+   q(2060) => [
       q(Dar Daju Daju),
       ],
-   q(2060) => [
+   q(2061) => [
       q(Djamindjung),
       ],
-   q(2061) => [
+   q(2062) => [
       q(Zarma),
       ],
-   q(2062) => [
+   q(2063) => [
       q(Djangun),
       ],
-   q(2063) => [
+   q(2064) => [
       q(Djinang),
       ],
-   q(2064) => [
+   q(2065) => [
       q(Djeebbana),
       ],
-   q(2065) => [
+   q(2066) => [
       q(Eastern Maroon Creole),
       q(Businenge Tongo),
       q(Nenge),
       ],
-   q(2066) => [
+   q(2067) => [
       q(Jamsay Dogon),
       ],
-   q(2067) => [
+   q(2068) => [
       q(Djauan),
       ],
-   q(2068) => [
+   q(2069) => [
       q(Jangkang),
       ],
-   q(2069) => [
+   q(2070) => [
       q(Djambarrpuyngu),
       ],
-   q(2070) => [
+   q(2071) => [
       q(Kapriman),
       ],
-   q(2071) => [
+   q(2072) => [
       q(Djawi),
       ],
-   q(2072) => [
+   q(2073) => [
       q(Dakpakha),
       ],
-   q(2073) => [
+   q(2074) => [
       q(Dakka),
       ],
-   q(2074) => [
+   q(2075) => [
       q(Kuijau),
       ],
-   q(2075) => [
+   q(2076) => [
       q(Southeastern Dinka),
       ],
-   q(2076) => [
+   q(2077) => [
       q(Mazagway),
       ],
-   q(2077) => [
+   q(2078) => [
       q(Dolgan),
       ],
-   q(2078) => [
+   q(2079) => [
       q(Dahalik),
       ],
-   q(2079) => [
+   q(2080) => [
       q(Dalmatian),
       ],
-   q(2080) => [
+   q(2081) => [
       q(Darlong),
       ],
-   q(2081) => [
+   q(2082) => [
       q(Duma),
       ],
-   q(2082) => [
+   q(2083) => [
       q(Mombo Dogon),
       ],
-   q(2083) => [
+   q(2084) => [
       q(Gavak),
       ],
-   q(2084) => [
+   q(2085) => [
       q(Madhi Madhi),
       ],
-   q(2085) => [
+   q(2086) => [
       q(Dugwor),
       ],
-   q(2086) => [
+   q(2087) => [
       q(Upper Kinabatangan),
       ],
-   q(2087) => [
+   q(2088) => [
       q(Domaaki),
       ],
-   q(2088) => [
+   q(2089) => [
       q(Dameli),
       ],
-   q(2089) => [
+   q(2090) => [
       q(Dama),
       ],
-   q(2090) => [
+   q(2091) => [
       q(Kemedzung),
       ],
-   q(2091) => [
+   q(2092) => [
       q(East Damar),
       ],
-   q(2092) => [
+   q(2093) => [
       q(Dampelas),
       ],
-   q(2093) => [
+   q(2094) => [
       q(Dubu),
       q(Tebi),
       ],
-   q(2094) => [
+   q(2095) => [
       q(Dumpas),
       ],
-   q(2095) => [
+   q(2096) => [
       q(Mudburra),
       ],
-   q(2096) => [
+   q(2097) => [
       q(Dema),
       ],
-   q(2097) => [
+   q(2098) => [
       q(Demta),
       q(Sowari),
       ],
-   q(2098) => [
+   q(2099) => [
       q(Upper Grand Valley Dani),
       ],
-   q(2099) => [
+   q(2100) => [
       q(Daonda),
       ],
-   q(2100) => [
+   q(2101) => [
       q(Ndendeule),
       ],
-   q(2101) => [
+   q(2102) => [
       q(Dungan),
       ],
-   q(2102) => [
+   q(2103) => [
       q(Lower Grand Valley Dani),
       ],
-   q(2103) => [
+   q(2104) => [
       q(Dan),
       ],
-   q(2104) => [
+   q(2105) => [
       q(Dengka),
       ],
-   q(2105) => [
+   q(2106) => [
       q(Dzuungoo),
       ],
-   q(2106) => [
+   q(2107) => [
       q(Danaru),
       ],
-   q(2107) => [
+   q(2108) => [
       q(Mid Grand Valley Dani),
       ],
-   q(2108) => [
+   q(2109) => [
       q(Danau),
       ],
-   q(2109) => [
+   q(2110) => [
       q(Danu),
       ],
-   q(2110) => [
+   q(2111) => [
       q(Western Dani),
       ],
-   q(2111) => [
+   q(2112) => [
       q(Deni),
       ],
-   q(2112) => [
+   q(2113) => [
       q(Dom),
       ],
-   q(2113) => [
+   q(2114) => [
       q(Dobu),
       ],
-   q(2114) => [
+   q(2115) => [
       q(Northern Dong),
       ],
-   q(2115) => [
+   q(2116) => [
       q(Doe),
       ],
-   q(2116) => [
+   q(2117) => [
       q(Domu),
       ],
-   q(2117) => [
+   q(2118) => [
       q(Dong),
       ],
-   q(2118) => [
+   q(2119) => [
       q(Dondo),
       ],
-   q(2119) => [
+   q(2120) => [
       q(Doso),
       ],
-   q(2120) => [
+   q(2121) => [
       q(Toura (Papua New Guinea)),
       ],
-   q(2121) => [
+   q(2122) => [
       q(Dongo),
       ],
-   q(2122) => [
+   q(2123) => [
       q(Lukpa),
       ],
-   q(2123) => [
+   q(2124) => [
       q(Dominican Sign Language),
       ],
-   q(2124) => [
+   q(2125) => [
       q(Dori'o),
       ],
-   q(2125) => [
+   q(2126) => [
       q(Dogose),
       ],
-   q(2126) => [
+   q(2127) => [
       q(Dass),
       ],
-   q(2127) => [
+   q(2128) => [
       q(Dombe),
       ],
-   q(2128) => [
+   q(2129) => [
       q(Doyayo),
       ],
-   q(2129) => [
+   q(2130) => [
       q(Bussa),
       ],
-   q(2130) => [
+   q(2131) => [
       q(Dompo),
       ],
-   q(2131) => [
+   q(2132) => [
       q(Dorze),
       ],
-   q(2132) => [
+   q(2133) => [
       q(Papar),
       ],
-   q(2133) => [
+   q(2134) => [
       q(Dair),
       ],
-   q(2134) => [
+   q(2135) => [
       q(Minderico),
       ],
-   q(2135) => [
+   q(2136) => [
       q(Darmiya),
       ],
-   q(2136) => [
+   q(2137) => [
       q(Dolpo),
       ],
-   q(2137) => [
+   q(2138) => [
       q(Rungus),
       ],
-   q(2138) => [
+   q(2139) => [
       q(C'lela),
       ],
-   q(2139) => [
+   q(2140) => [
       q(Paakantyi),
       ],
-   q(2140) => [
+   q(2141) => [
       q(West Damar),
       ],
-   q(2141) => [
+   q(2142) => [
       q(Daro-Matu Melanau),
       ],
-   q(2142) => [
+   q(2143) => [
       q(Dura),
       ],
-   q(2143) => [
+   q(2144) => [
       q(Dororo),
       ],
-   q(2144) => [
+   q(2145) => [
       q(Gedeo),
       ],
-   q(2145) => [
+   q(2146) => [
       q(Drents),
       ],
-   q(2146) => [
+   q(2147) => [
       q(Rukai),
       ],
-   q(2147) => [
+   q(2148) => [
       q(Darai),
       ],
-   q(2148) => [
+   q(2149) => [
       q(Dutch Sign Language),
       ],
-   q(2149) => [
+   q(2150) => [
       q(Daasanach),
       ],
-   q(2150) => [
+   q(2151) => [
       q(Disa),
       ],
-   q(2151) => [
+   q(2152) => [
       q(Danish Sign Language),
       ],
-   q(2152) => [
+   q(2153) => [
       q(Dusner),
       ],
-   q(2153) => [
+   q(2154) => [
       q(Desiya),
       ],
-   q(2154) => [
+   q(2155) => [
       q(Tadaksahak),
       ],
-   q(2155) => [
+   q(2156) => [
       q(Daur),
       ],
-   q(2156) => [
+   q(2157) => [
       q(Labuk-Kinabatangan Kadazan),
       ],
-   q(2157) => [
+   q(2158) => [
       q(Ditidaht),
       ],
-   q(2158) => [
+   q(2159) => [
       q(Adithinngithigh),
       ],
-   q(2159) => [
+   q(2160) => [
       q(Ana Tinga Dogon),
       ],
-   q(2160) => [
+   q(2161) => [
       q(Tene Kan Dogon),
       ],
-   q(2161) => [
+   q(2162) => [
       q(Tomo Kan Dogon),
       ],
-   q(2162) => [
+   q(2163) => [
       q(Tommo So Dogon),
       ],
-   q(2163) => [
+   q(2164) => [
       q(Central Dusun),
       ],
-   q(2164) => [
+   q(2165) => [
       q(Lotud),
       ],
-   q(2165) => [
+   q(2166) => [
       q(Toro So Dogon),
       ],
-   q(2166) => [
+   q(2167) => [
       q(Toro Tegu Dogon),
       ],
-   q(2167) => [
+   q(2168) => [
       q(Tebul Ure Dogon),
       ],
-   q(2168) => [
+   q(2169) => [
       q(Dotyali),
       ],
-   q(2169) => [
+   q(2170) => [
       q(Dubli),
       ],
-   q(2170) => [
+   q(2171) => [
       q(Duna),
       ],
-   q(2171) => [
+   q(2172) => [
       q(Hun-Saare),
       ],
-   q(2172) => [
+   q(2173) => [
       q(Umiray Dumaget Agta),
       ],
-   q(2173) => [
+   q(2174) => [
       q(Dumbea),
       q(Drubea),
       ],
-   q(2174) => [
+   q(2175) => [
       q(Duruma),
       q(Chiduruma),
       ],
-   q(2175) => [
+   q(2176) => [
       q(Dungra Bhil),
       ],
-   q(2176) => [
+   q(2177) => [
       q(Dumun),
       ],
-   q(2177) => [
+   q(2178) => [
       q(Dhuwal),
       ],
-   q(2178) => [
+   q(2179) => [
       q(Uyajitaya),
       ],
-   q(2179) => [
+   q(2180) => [
       q(Alabat Island Agta),
       ],
-   q(2180) => [
+   q(2181) => [
       q(Dusun Deyah),
       ],
-   q(2181) => [
+   q(2182) => [
       q(Dupaninan Agta),
       ],
-   q(2182) => [
+   q(2183) => [
       q(Duano),
       ],
-   q(2183) => [
+   q(2184) => [
       q(Dusun Malang),
       ],
-   q(2184) => [
+   q(2185) => [
       q(Dii),
       ],
-   q(2185) => [
+   q(2186) => [
       q(Dumi),
       ],
-   q(2186) => [
+   q(2187) => [
       q(Drung),
       ],
-   q(2187) => [
+   q(2188) => [
       q(Duvle),
       ],
-   q(2188) => [
+   q(2189) => [
       q(Dusun Witu),
       ],
-   q(2189) => [
+   q(2190) => [
       q(Duungooma),
       ],
-   q(2190) => [
+   q(2191) => [
       q(Dicamay Agta),
       ],
-   q(2191) => [
+   q(2192) => [
       q(Duli),
       ],
-   q(2192) => [
+   q(2193) => [
       q(Duau),
       ],
-   q(2193) => [
+   q(2194) => [
       q(Diri),
       ],
-   q(2194) => [
+   q(2195) => [
       q(Dawro),
       ],
-   q(2195) => [
+   q(2196) => [
       q(Dutton World Speedwords),
       ],
-   q(2196) => [
+   q(2197) => [
       q(Dawawa),
       ],
-   q(2197) => [
+   q(2198) => [
       q(Dyan),
       ],
-   q(2198) => [
+   q(2199) => [
       q(Dyaberdyaber),
       ],
-   q(2199) => [
+   q(2200) => [
       q(Dyugun),
       ],
-   q(2200) => [
+   q(2201) => [
       q(Villa Viciosa Agta),
       ],
-   q(2201) => [
+   q(2202) => [
       q(Djimini Senoufo),
       ],
-   q(2202) => [
+   q(2203) => [
       q(Yanda Dom Dogon),
       ],
-   q(2203) => [
+   q(2204) => [
       q(Dyangadi),
       ],
-   q(2204) => [
+   q(2205) => [
       q(Jola-Fonyi),
       ],
-   q(2205) => [
+   q(2206) => [
       q(Dyaabugay),
       ],
-   q(2206) => [
+   q(2207) => [
       q(Tunzu),
       ],
-   q(2207) => [
+   q(2208) => [
       q(Djiwarli),
       ],
-   q(2208) => [
+   q(2209) => [
       q(Dazaga),
       ],
-   q(2209) => [
+   q(2210) => [
       q(Dzalakha),
       ],
-   q(2210) => [
+   q(2211) => [
       q(Dzando),
       ],
-   q(2211) => [
+   q(2212) => [
       q(Karenggapa),
       ],
-   q(2212) => [
+   q(2213) => [
       q(Ebughu),
       ],
-   q(2213) => [
+   q(2214) => [
       q(Eastern Bontok),
       ],
-   q(2214) => [
+   q(2215) => [
       q(Teke-Ebo),
       ],
-   q(2215) => [
+   q(2216) => [
       q(Ebrie),
       ],
-   q(2216) => [
+   q(2217) => [
       q(Embu),
       q(Kiembu),
       ],
-   q(2217) => [
+   q(2218) => [
       q(Eteocretan),
       ],
-   q(2218) => [
+   q(2219) => [
       q(Ecuadorian Sign Language),
       ],
-   q(2219) => [
+   q(2220) => [
       q(Eteocypriot),
       ],
-   q(2220) => [
+   q(2221) => [
       q(E),
       ],
-   q(2221) => [
+   q(2222) => [
       q(Efai),
       ],
-   q(2222) => [
+   q(2223) => [
       q(Efe),
       ],
-   q(2223) => [
+   q(2224) => [
       q(Ega),
       ],
-   q(2224) => [
+   q(2225) => [
       q(Emilian),
       ],
-   q(2225) => [
+   q(2226) => [
       q(Eggon),
       ],
-   q(2226) => [
+   q(2227) => [
       q(Ehueun),
       ],
-   q(2227) => [
+   q(2228) => [
       q(Eipomek),
       ],
-   q(2228) => [
+   q(2229) => [
       q(Eitiep),
       ],
-   q(2229) => [
+   q(2230) => [
       q(Askopan),
       ],
-   q(2230) => [
+   q(2231) => [
       q(Ejamat),
       ],
-   q(2231) => [
+   q(2232) => [
       q(Eastern Karnic),
       ],
-   q(2232) => [
+   q(2233) => [
       q(Ekit),
       ],
-   q(2233) => [
+   q(2234) => [
       q(Ekari),
       ],
-   q(2234) => [
+   q(2235) => [
       q(Eki),
       ],
-   q(2235) => [
+   q(2236) => [
       q(Standard Estonian),
       ],
-   q(2236) => [
+   q(2237) => [
       q(Kol (Bangladesh)),
       q(Kol),
       ],
-   q(2237) => [
+   q(2238) => [
       q(Elip),
       ],
-   q(2238) => [
+   q(2239) => [
       q(Koti),
       ],
-   q(2239) => [
+   q(2240) => [
       q(Ekpeye),
       ],
-   q(2240) => [
+   q(2241) => [
       q(Yace),
       ],
-   q(2241) => [
+   q(2242) => [
       q(Eastern Kayah),
       ],
-   q(2242) => [
+   q(2243) => [
       q(Elepi),
       ],
-   q(2243) => [
+   q(2244) => [
       q(El Hugeirat),
       ],
-   q(2244) => [
+   q(2245) => [
       q(Nding),
       ],
-   q(2245) => [
+   q(2246) => [
       q(Elkei),
       ],
-   q(2246) => [
+   q(2247) => [
       q(Eleme),
       ],
-   q(2247) => [
+   q(2248) => [
       q(El Molo),
       ],
-   q(2248) => [
+   q(2249) => [
       q(Elu),
       ],
-   q(2249) => [
+   q(2250) => [
       q(Emai-Iuleha-Ora),
       ],
-   q(2250) => [
+   q(2251) => [
       q(Embaloh),
       ],
-   q(2251) => [
+   q(2252) => [
       q(Emerillon),
       ],
-   q(2252) => [
+   q(2253) => [
       q(Eastern Meohang),
       ],
-   q(2253) => [
+   q(2254) => [
       q(Mussau-Emira),
       ],
-   q(2254) => [
+   q(2255) => [
       q(Eastern Maninkakan),
       ],
-   q(2255) => [
+   q(2256) => [
       q(Mamulique),
       ],
-   q(2256) => [
+   q(2257) => [
       q(Eman),
       ],
-   q(2257) => [
+   q(2258) => [
       q(Northern Embera),
       ],
-   q(2258) => [
+   q(2259) => [
       q(Pacific Gulf Yupik),
       ],
-   q(2259) => [
+   q(2260) => [
       q(Eastern Muria),
       ],
-   q(2260) => [
+   q(2261) => [
       q(Emplawas),
       ],
-   q(2261) => [
+   q(2262) => [
       q(Erromintxela),
       ],
-   q(2262) => [
+   q(2263) => [
       q(Epigraphic Mayan),
       ],
-   q(2263) => [
+   q(2264) => [
       q(Apali),
       ],
-   q(2264) => [
+   q(2265) => [
       q(Markweeta),
       ],
-   q(2265) => [
+   q(2266) => [
       q(En),
       ],
-   q(2266) => [
+   q(2267) => [
       q(Ende),
       ],
-   q(2267) => [
+   q(2268) => [
       q(Forest Enets),
       ],
-   q(2268) => [
+   q(2269) => [
       q(Tundra Enets),
       ],
-   q(2269) => [
+   q(2270) => [
       q(Enlhet),
       ],
-   q(2270) => [
+   q(2271) => [
       q(Engenni),
       ],
-   q(2271) => [
+   q(2272) => [
       q(Enggano),
       ],
-   q(2272) => [
+   q(2273) => [
       q(Enga),
       ],
-   q(2273) => [
+   q(2274) => [
       q(Emumu),
       q(Emem),
       ],
-   q(2274) => [
+   q(2275) => [
       q(Enu),
       ],
-   q(2275) => [
+   q(2276) => [
       q(Enwan (Edu State)),
       ],
-   q(2276) => [
+   q(2277) => [
       q(Enwan (Akwa Ibom State)),
       ],
-   q(2277) => [
+   q(2278) => [
       q(Enxet),
       ],
-   q(2278) => [
+   q(2279) => [
       q(Beti (Cote d'Ivoire)),
       ],
-   q(2279) => [
+   q(2280) => [
       q(Epie),
       ],
-   q(2280) => [
+   q(2281) => [
       q(Eravallan),
       ],
-   q(2281) => [
+   q(2282) => [
       q(Sie),
       ],
-   q(2282) => [
+   q(2283) => [
       q(Eruwa),
       ],
-   q(2283) => [
+   q(2284) => [
       q(Ogea),
       ],
-   q(2284) => [
+   q(2285) => [
       q(South Efate),
       ],
-   q(2285) => [
+   q(2286) => [
       q(Horpa),
       ],
-   q(2286) => [
+   q(2287) => [
       q(Erre),
       ],
-   q(2287) => [
+   q(2288) => [
       q(Ersu),
       ],
-   q(2288) => [
+   q(2289) => [
       q(Eritai),
       ],
-   q(2289) => [
+   q(2290) => [
       q(Erokwanas),
       ],
-   q(2290) => [
+   q(2291) => [
       q(Ese Ejja),
       ],
-   q(2291) => [
+   q(2292) => [
       q(Eshtehardi),
       ],
-   q(2292) => [
+   q(2293) => [
       q(North Alaskan Inupiatun),
       ],
-   q(2293) => [
+   q(2294) => [
       q(Northwest Alaska Inupiatun),
       ],
-   q(2294) => [
+   q(2295) => [
       q(Egypt Sign Language),
       ],
-   q(2295) => [
+   q(2296) => [
       q(Esuma),
       ],
-   q(2296) => [
+   q(2297) => [
       q(Salvadoran Sign Language),
       ],
-   q(2297) => [
+   q(2298) => [
       q(Estonian Sign Language),
       ],
-   q(2298) => [
+   q(2299) => [
       q(Esselen),
       ],
-   q(2299) => [
+   q(2300) => [
       q(Central Siberian Yupik),
       ],
-   q(2300) => [
+   q(2301) => [
       q(Central Yupik),
       ],
-   q(2301) => [
+   q(2302) => [
       q(Eskayan),
       ],
-   q(2302) => [
+   q(2303) => [
       q(Etebi),
       ],
-   q(2303) => [
+   q(2304) => [
       q(Etchemin),
       ],
-   q(2304) => [
+   q(2305) => [
       q(Ethiopian Sign Language),
       ],
-   q(2305) => [
+   q(2306) => [
       q(Eton (Vanuatu)),
       ],
-   q(2306) => [
+   q(2307) => [
       q(Eton (Cameroon)),
       ],
-   q(2307) => [
+   q(2308) => [
       q(Edolo),
       ],
-   q(2308) => [
+   q(2309) => [
       q(Yekhee),
       ],
-   q(2309) => [
+   q(2310) => [
       q(Etruscan),
       ],
-   q(2310) => [
+   q(2311) => [
       q(Ejagham),
       ],
-   q(2311) => [
+   q(2312) => [
       q(Eten),
       ],
-   q(2312) => [
+   q(2313) => [
       q(Semimi),
       ],
-   q(2313) => [
+   q(2314) => [
       q(Even),
       ],
-   q(2314) => [
+   q(2315) => [
       q(Uvbie),
       ],
-   q(2315) => [
+   q(2316) => [
       q(Evenki),
       ],
-   q(2316) => [
+   q(2317) => [
       q(Extremaduran),
       ],
-   q(2317) => [
+   q(2318) => [
       q(Eyak),
       ],
-   q(2318) => [
+   q(2319) => [
       q(Keiyo),
       ],
-   q(2319) => [
+   q(2320) => [
       q(Ezaa),
       ],
-   q(2320) => [
+   q(2321) => [
       q(Uzekwe),
       ],
-   q(2321) => [
+   q(2322) => [
       q(Fasu),
       ],
-   q(2322) => [
+   q(2323) => [
       q(Fa d'Ambu),
       ],
-   q(2323) => [
+   q(2324) => [
       q(Wagi),
       ],
-   q(2324) => [
+   q(2325) => [
       q(Fagani),
       ],
-   q(2325) => [
+   q(2326) => [
       q(Finongan),
       ],
-   q(2326) => [
+   q(2327) => [
       q(Baissa Fali),
       ],
-   q(2327) => [
+   q(2328) => [
       q(Faiwol),
       ],
-   q(2328) => [
+   q(2329) => [
       q(Faita),
       ],
-   q(2329) => [
+   q(2330) => [
       q(Fang (Cameroon)),
       ],
-   q(2330) => [
+   q(2331) => [
       q(South Fali),
       ],
-   q(2331) => [
+   q(2332) => [
       q(Fam),
       ],
-   q(2332) => [
+   q(2333) => [
       q(Palor),
       ],
-   q(2333) => [
+   q(2334) => [
       q(Fataleka),
       ],
-   q(2334) => [
+   q(2335) => [
       q(Fayu),
       ],
-   q(2335) => [
+   q(2336) => [
       q(Fala),
       ],
-   q(2336) => [
+   q(2337) => [
       q(Southwestern Fars),
       ],
-   q(2337) => [
+   q(2338) => [
       q(Northwestern Fars),
       ],
-   q(2338) => [
+   q(2339) => [
       q(West Albay Bikol),
       ],
-   q(2339) => [
+   q(2340) => [
       q(Quebec Sign Language),
       ],
-   q(2340) => [
+   q(2341) => [
       q(Feroge),
       ],
-   q(2341) => [
+   q(2342) => [
       q(Foia Foia),
       ],
-   q(2342) => [
+   q(2343) => [
       q(Maasina Fulfulde),
       ],
-   q(2343) => [
+   q(2344) => [
       q(Fongoro),
       ],
-   q(2344) => [
+   q(2345) => [
       q(Nobiin),
       ],
-   q(2345) => [
+   q(2346) => [
       q(Fyer),
       ],
-   q(2346) => [
+   q(2347) => [
       q(Fipa),
       ],
-   q(2347) => [
+   q(2348) => [
       q(Firan),
       ],
-   q(2348) => [
+   q(2349) => [
       q(Tornedalen Finnish),
       ],
-   q(2349) => [
+   q(2350) => [
       q(Fiwaga),
       ],
-   q(2350) => [
+   q(2351) => [
       q(Kirya-Konzel),
       ],
-   q(2351) => [
+   q(2352) => [
       q(Kven Finnish),
       ],
-   q(2352) => [
+   q(2353) => [
       q(Kalispel-Pend d'Oreille),
       ],
-   q(2353) => [
+   q(2354) => [
       q(Foau),
       ],
-   q(2354) => [
+   q(2355) => [
       q(Fali),
       ],
-   q(2355) => [
+   q(2356) => [
       q(North Fali),
       ],
-   q(2356) => [
+   q(2357) => [
       q(Flinders Island),
       ],
-   q(2357) => [
+   q(2358) => [
       q(Fuliiru),
       ],
-   q(2358) => [
+   q(2359) => [
       q(Flaaitaal),
       q(Tsotsitaal),
       ],
-   q(2359) => [
+   q(2360) => [
       q(Fe'fe'),
       ],
-   q(2360) => [
+   q(2361) => [
       q(Far Western Muria),
       ],
-   q(2361) => [
+   q(2362) => [
       q(Fanagalo),
       ],
-   q(2362) => [
+   q(2363) => [
       q(Fania),
       ],
-   q(2363) => [
+   q(2364) => [
       q(Foodo),
       ],
-   q(2364) => [
+   q(2365) => [
       q(Foi),
       ],
-   q(2365) => [
+   q(2366) => [
       q(Foma),
       ],
-   q(2366) => [
+   q(2367) => [
       q(Fore),
       ],
-   q(2367) => [
+   q(2368) => [
       q(Siraya),
       ],
-   q(2368) => [
+   q(2369) => [
       q(Fernando Po Creole English),
       ],
-   q(2369) => [
+   q(2370) => [
       q(Fas),
       ],
-   q(2370) => [
+   q(2371) => [
       q(Cajun French),
       ],
-   q(2371) => [
+   q(2372) => [
       q(Fordata),
       ],
-   q(2372) => [
+   q(2373) => [
       q(Frankish),
       ],
-   q(2373) => [
+   q(2374) => [
       q(Arpitan),
       q(Francoprovencal),
       ],
-   q(2374) => [
+   q(2375) => [
       q(Forak),
       ],
-   q(2375) => [
+   q(2376) => [
       q(Fortsenal),
       ],
-   q(2376) => [
+   q(2377) => [
       q(Finnish Sign Language),
       ],
-   q(2377) => [
+   q(2378) => [
       q(French Sign Language),
       ],
-   q(2378) => [
+   q(2379) => [
       q(Finland-Swedish Sign Language),
       q(finlandssvenskt teckensprak),
       q(suomenruotsalainen viittomakieli),
       ],
-   q(2379) => [
+   q(2380) => [
       q(Adamawa Fulfulde),
       ],
-   q(2380) => [
+   q(2381) => [
       q(Pulaar),
       ],
-   q(2381) => [
+   q(2382) => [
       q(East Futuna),
       ],
-   q(2382) => [
+   q(2383) => [
       q(Borgu Fulfulde),
       ],
-   q(2383) => [
+   q(2384) => [
       q(Pular),
       ],
-   q(2384) => [
+   q(2385) => [
       q(Western Niger Fulfulde),
       ],
-   q(2385) => [
+   q(2386) => [
       q(Bagirmi Fulfulde),
       ],
-   q(2386) => [
+   q(2387) => [
       q(Ko),
       ],
-   q(2387) => [
+   q(2388) => [
       q(Fum),
       ],
-   q(2388) => [
+   q(2389) => [
       q(Fulnio),
       ],
-   q(2389) => [
+   q(2390) => [
       q(Central-Eastern Niger Fulfulde),
       ],
-   q(2390) => [
+   q(2391) => [
       q(Futuna-Aniwa),
       ],
-   q(2391) => [
+   q(2392) => [
       q(Furu),
       ],
-   q(2392) => [
+   q(2393) => [
       q(Nigerian Fulfulde),
       ],
-   q(2393) => [
+   q(2394) => [
       q(Fuyug),
       ],
-   q(2394) => [
+   q(2395) => [
       q(Fur),
       ],
-   q(2395) => [
+   q(2396) => [
       q(Fwai),
       ],
-   q(2396) => [
+   q(2397) => [
       q(Fwe),
       ],
-   q(2397) => [
+   q(2398) => [
       q(Gabri),
       ],
-   q(2398) => [
+   q(2399) => [
       q(Mixed Great Andamanese),
       ],
-   q(2399) => [
+   q(2400) => [
       q(Gaddang),
       ],
-   q(2400) => [
+   q(2401) => [
       q(Guarequena),
       ],
-   q(2401) => [
+   q(2402) => [
       q(Gende),
       ],
-   q(2402) => [
+   q(2403) => [
       q(Gagauz),
       ],
-   q(2403) => [
+   q(2404) => [
       q(Alekano),
       ],
-   q(2404) => [
+   q(2405) => [
       q(Borei),
       ],
-   q(2405) => [
+   q(2406) => [
       q(Gadsup),
       ],
-   q(2406) => [
+   q(2407) => [
       q(Gamkonora),
       ],
-   q(2407) => [
+   q(2408) => [
       q(Galolen),
       ],
-   q(2408) => [
+   q(2409) => [
       q(Kandawo),
       ],
-   q(2409) => [
+   q(2410) => [
       q(Gan Chinese),
       ],
-   q(2410) => [
+   q(2411) => [
       q(Gants),
       ],
-   q(2411) => [
+   q(2412) => [
       q(Gal),
       ],
-   q(2412) => [
+   q(2413) => [
       q(Gata'),
       ],
-   q(2413) => [
+   q(2414) => [
       q(Galeya),
       ],
-   q(2414) => [
+   q(2415) => [
       q(Adiwasi Garasia),
       ],
-   q(2415) => [
+   q(2416) => [
       q(Kenati),
       ],
-   q(2416) => [
+   q(2417) => [
       q(Mudhili Gadaba),
       ],
-   q(2417) => [
+   q(2418) => [
       q(Nobonob),
       ],
-   q(2418) => [
+   q(2419) => [
       q(Borana-Arsi-Guji Oromo),
       ],
-   q(2419) => [
+   q(2420) => [
       q(West Central Oromo),
       ],
-   q(2420) => [
+   q(2421) => [
       q(Kaytetye),
       ],
-   q(2421) => [
+   q(2422) => [
       q(Karadjeri),
       ],
-   q(2422) => [
+   q(2423) => [
       q(Niksek),
       ],
-   q(2423) => [
+   q(2424) => [
       q(Gaikundi),
       ],
-   q(2424) => [
+   q(2425) => [
       q(Gbanziri),
       ],
-   q(2425) => [
+   q(2426) => [
       q(Defi Gbe),
       ],
-   q(2426) => [
+   q(2427) => [
       q(Galela),
       ],
-   q(2427) => [
+   q(2428) => [
       q(Bodo Gadaba),
       ],
-   q(2428) => [
+   q(2429) => [
       q(Gaddi),
       ],
-   q(2429) => [
+   q(2430) => [
       q(Gamit),
       ],
-   q(2430) => [
+   q(2431) => [
       q(Garhwali),
       ],
-   q(2431) => [
+   q(2432) => [
       q(Mo'da),
       ],
-   q(2432) => [
+   q(2433) => [
       q(Northern Grebo),
       ],
-   q(2433) => [
+   q(2434) => [
       q(Gbaya-Bossangoa),
       ],
-   q(2434) => [
+   q(2435) => [
       q(Gbaya-Bozoum),
       ],
-   q(2435) => [
+   q(2436) => [
       q(Gbagyi),
       ],
-   q(2436) => [
+   q(2437) => [
       q(Gbesi Gbe),
       ],
-   q(2437) => [
+   q(2438) => [
       q(Gagadu),
       ],
-   q(2438) => [
+   q(2439) => [
       q(Gbanu),
       ],
-   q(2439) => [
+   q(2440) => [
       q(Gabi-Gabi),
       ],
-   q(2440) => [
+   q(2441) => [
       q(Eastern Xwla Gbe),
       ],
-   q(2441) => [
+   q(2442) => [
       q(Gbari),
       ],
-   q(2442) => [
+   q(2443) => [
       q(Zoroastrian Dari),
       ],
-   q(2443) => [
+   q(2444) => [
       q(Mali),
       ],
-   q(2444) => [
+   q(2445) => [
       q(Ganggalida),
       ],
-   q(2445) => [
+   q(2446) => [
       q(Galice),
       ],
-   q(2446) => [
+   q(2447) => [
       q(Guadeloupean Creole French),
       ],
-   q(2447) => [
+   q(2448) => [
       q(Grenadian Creole English),
       ],
-   q(2448) => [
+   q(2449) => [
       q(Gaina),
       ],
-   q(2449) => [
+   q(2450) => [
       q(Guianese Creole French),
       ],
-   q(2450) => [
+   q(2451) => [
       q(Colonia Tovar German),
       ],
-   q(2451) => [
+   q(2452) => [
       q(Gade Lohar),
       ],
-   q(2452) => [
+   q(2453) => [
       q(Pottangi Ollar Gadaba),
       ],
-   q(2453) => [
+   q(2454) => [
       q(Gugu Badhun),
       ],
-   q(2454) => [
+   q(2455) => [
       q(Gedaged),
       ],
-   q(2455) => [
+   q(2456) => [
       q(Gude),
       ],
-   q(2456) => [
+   q(2457) => [
       q(Guduf-Gava),
       ],
-   q(2457) => [
+   q(2458) => [
       q(Ga'dang),
       ],
-   q(2458) => [
+   q(2459) => [
       q(Gadjerawang),
       ],
-   q(2459) => [
+   q(2460) => [
       q(Gundi),
       ],
-   q(2460) => [
+   q(2461) => [
       q(Gurdjar),
       ],
-   q(2461) => [
+   q(2462) => [
       q(Gadang),
       ],
-   q(2462) => [
+   q(2463) => [
       q(Dirasha),
       ],
-   q(2463) => [
+   q(2464) => [
       q(Laal),
       ],
-   q(2464) => [
+   q(2465) => [
       q(Umanakaina),
       ],
-   q(2465) => [
+   q(2466) => [
       q(Ghodoberi),
       ],
-   q(2466) => [
+   q(2467) => [
       q(Mehri),
       ],
-   q(2467) => [
+   q(2468) => [
       q(Wipi),
       ],
-   q(2468) => [
+   q(2469) => [
       q(Ghandruk Sign Language),
       ],
-   q(2469) => [
+   q(2470) => [
       q(Kungardutyi),
       ],
-   q(2470) => [
+   q(2471) => [
       q(Gudu),
       ],
-   q(2471) => [
+   q(2472) => [
       q(Godwari),
       ],
-   q(2472) => [
+   q(2473) => [
       q(Geruma),
       ],
-   q(2473) => [
+   q(2474) => [
       q(Kire),
       ],
-   q(2474) => [
+   q(2475) => [
       q(Gboloo Grebo),
       ],
-   q(2475) => [
+   q(2476) => [
       q(Gade),
       ],
-   q(2476) => [
+   q(2477) => [
       q(Gengle),
       ],
-   q(2477) => [
+   q(2478) => [
       q(Hutterite German),
       q(Hutterisch),
       ],
-   q(2478) => [
+   q(2479) => [
       q(Gebe),
       ],
-   q(2479) => [
+   q(2480) => [
       q(Gen),
       ],
-   q(2480) => [
+   q(2481) => [
       q(Yiwom),
       ],
-   q(2481) => [
+   q(2482) => [
       q(ut-Ma'in),
       ],
-   q(2482) => [
+   q(2483) => [
       q(Geme),
       ],
-   q(2483) => [
+   q(2484) => [
       q(Geser-Gorom),
       ],
-   q(2484) => [
+   q(2485) => [
       q(Eviya),
       ],
-   q(2485) => [
+   q(2486) => [
       q(Gera),
       ],
-   q(2486) => [
+   q(2487) => [
       q(Garre),
       ],
-   q(2487) => [
+   q(2488) => [
       q(Enya),
       ],
-   q(2488) => [
+   q(2489) => [
       q(Patpatar),
       ],
-   q(2489) => [
+   q(2490) => [
       q(Gafat),
       ],
-   q(2490) => [
+   q(2491) => [
       q(Gao),
       ],
-   q(2491) => [
+   q(2492) => [
       q(Gbii),
       ],
-   q(2492) => [
+   q(2493) => [
       q(Gugadj),
       ],
-   q(2493) => [
+   q(2494) => [
       q(Guragone),
       ],
-   q(2494) => [
+   q(2495) => [
       q(Gurgula),
       ],
-   q(2495) => [
+   q(2496) => [
       q(Kungarakany),
       ],
-   q(2496) => [
+   q(2497) => [
       q(Ganglau),
       ],
-   q(2497) => [
+   q(2498) => [
       q(Eastern Gurung),
       ],
-   q(2498) => [
+   q(2499) => [
       q(Southern Gondi),
       ],
-   q(2499) => [
+   q(2500) => [
       q(Gitua),
       ],
-   q(2500) => [
+   q(2501) => [
       q(Gagu),
       q(Gban),
       ],
-   q(2501) => [
+   q(2502) => [
       q(Gogodala),
       ],
-   q(2502) => [
+   q(2503) => [
       q(Ghadames),
       ],
-   q(2503) => [
+   q(2504) => [
       q(Hiberno-Scottish Gaelic),
       ],
-   q(2504) => [
+   q(2505) => [
       q(Southern Ghale),
       ],
-   q(2505) => [
+   q(2506) => [
       q(Northern Ghale),
       ],
-   q(2506) => [
+   q(2507) => [
       q(Geko Karen),
       ],
-   q(2507) => [
+   q(2508) => [
       q(Ghulfan),
       ],
-   q(2508) => [
+   q(2509) => [
       q(Ghanongga),
       ],
-   q(2509) => [
+   q(2510) => [
       q(Ghomara),
       ],
-   q(2510) => [
+   q(2511) => [
       q(Ghera),
       ],
-   q(2511) => [
+   q(2512) => [
       q(Guhu-Samane),
       ],
-   q(2512) => [
+   q(2513) => [
       q(Kuke),
       q(Kutang Ghale),
       ],
-   q(2513) => [
+   q(2514) => [
       q(Kitja),
       ],
-   q(2514) => [
+   q(2515) => [
       q(Gibanawa),
       ],
-   q(2515) => [
+   q(2516) => [
       q(Gail),
       ],
-   q(2516) => [
+   q(2517) => [
       q(Gidar),
       ],
-   q(2517) => [
+   q(2518) => [
       q(Goaria),
       ],
-   q(2518) => [
+   q(2519) => [
       q(Githabul),
       ],
-   q(2519) => [
+   q(2520) => [
       q(Gimi (Eastern Highlands)),
       ],
-   q(2520) => [
+   q(2521) => [
       q(Hinukh),
       ],
-   q(2521) => [
+   q(2522) => [
       q(Gimi (West New Britain)),
       ],
-   q(2522) => [
+   q(2523) => [
       q(Green Gelao),
       ],
-   q(2523) => [
+   q(2524) => [
       q(Red Gelao),
       ],
-   q(2524) => [
+   q(2525) => [
       q(North Giziga),
       ],
-   q(2525) => [
+   q(2526) => [
       q(Gitxsan),
       ],
-   q(2526) => [
+   q(2527) => [
       q(Mulao),
       ],
-   q(2527) => [
+   q(2528) => [
       q(White Gelao),
       ],
-   q(2528) => [
+   q(2529) => [
       q(Gilima),
       ],
-   q(2529) => [
+   q(2530) => [
       q(Giyug),
       ],
-   q(2530) => [
+   q(2531) => [
       q(South Giziga),
       ],
-   q(2531) => [
+   q(2532) => [
       q(Geji),
       ],
-   q(2532) => [
+   q(2533) => [
       q(Kachi Koli),
       ],
-   q(2533) => [
+   q(2534) => [
       q(Gunditjmara),
       ],
-   q(2534) => [
+   q(2535) => [
       q(Gonja),
       ],
-   q(2535) => [
+   q(2536) => [
       q(Gujari),
       ],
-   q(2536) => [
+   q(2537) => [
       q(Guya),
       ],
-   q(2537) => [
+   q(2538) => [
       q(Ndai),
       ],
-   q(2538) => [
+   q(2539) => [
       q(Gokana),
       ],
-   q(2539) => [
+   q(2540) => [
       q(Kok-Nar),
       ],
-   q(2540) => [
+   q(2541) => [
       q(Guinea Kpelle),
       ],
-   q(2541) => [
+   q(2542) => [
       q(Ungkue),
       q(=/Ungkue),
       ],
-   q(2542) => [
+   q(2543) => [
       q(Bon Gula),
       ],
-   q(2543) => [
+   q(2544) => [
       q(Nanai),
       ],
-   q(2544) => [
+   q(2545) => [
       q(Northwest Pashai),
       q(Northwest Pashayi),
       ],
-   q(2545) => [
-      q(Guliguli),
-      ],
    q(2546) => [
-      q(Gula Iro),
+      q(Guliguli),
       ],
    q(2547) => [
-      q(Gilaki),
+      q(Gula Iro),
       ],
    q(2548) => [
-      q(Garlali),
+      q(Gilaki),
       ],
    q(2549) => [
-      q(Galambu),
+      q(Garlali),
       ],
    q(2550) => [
-      q(Glaro-Twabo),
+      q(Galambu),
       ],
    q(2551) => [
-      q(Gula (Chad)),
+      q(Glaro-Twabo),
       ],
    q(2552) => [
-      q(Glavda),
+      q(Gula (Chad)),
       ],
    q(2553) => [
-      q(Gule),
+      q(Glavda),
       ],
    q(2554) => [
-      q(Gambera),
+      q(Gule),
       ],
    q(2555) => [
-      q(Gula'alaa),
+      q(Gambera),
       ],
    q(2556) => [
-      q(Maghdi),
+      q(Gula'alaa),
       ],
    q(2557) => [
-      q(Magyi),
+      q(Maghdi),
       ],
    q(2558) => [
-      q(Middle Low German),
+      q(Magyi),
       ],
    q(2559) => [
-      q(Gbaya-Mbodomo),
+      q(Middle Low German),
       ],
    q(2560) => [
-      q(Gimnime),
+      q(Gbaya-Mbodomo),
       ],
    q(2561) => [
-      q(Gumalu),
+      q(Gimnime),
       ],
    q(2562) => [
-      q(Gamo),
+      q(Gumalu),
       ],
    q(2563) => [
-      q(Magoma),
+      q(Gamo),
       ],
    q(2564) => [
-      q(Mycenaean Greek),
+      q(Magoma),
       ],
    q(2565) => [
-      q(Mgbolizhia),
+      q(Mycenaean Greek),
       ],
    q(2566) => [
-      q(Kaansa),
+      q(Mgbolizhia),
       ],
    q(2567) => [
-      q(Gangte),
+      q(Kaansa),
       ],
    q(2568) => [
-      q(Guanche),
+      q(Gangte),
       ],
    q(2569) => [
-      q(Zulgo-Gemzek),
+      q(Guanche),
       ],
    q(2570) => [
-      q(Ganang),
+      q(Zulgo-Gemzek),
       ],
    q(2571) => [
-      q(Ngangam),
+      q(Ganang),
       ],
    q(2572) => [
-      q(Lere),
+      q(Ngangam),
       ],
    q(2573) => [
-      q(Gooniyandi),
+      q(Lere),
       ],
    q(2574) => [
-      q(//Gana),
+      q(Gooniyandi),
       ],
    q(2575) => [
-      q(Gangulu),
+      q(//Gana),
+      q(Gana),
       ],
    q(2576) => [
-      q(Ginuman),
+      q(Gangulu),
       ],
    q(2577) => [
-      q(Gumatj),
+      q(Ginuman),
       ],
    q(2578) => [
-      q(Northern Gondi),
+      q(Gumatj),
       ],
    q(2579) => [
-      q(Gana),
+      q(Northern Gondi),
       ],
    q(2580) => [
       q(Gureng Gureng),
@@ -8258,6 +8259,7 @@ $Locale::Codes::Data{'language'}{'id2names'} = {
       ],
    q(2686) => [
       q(/Gwi),
+      q(Gwi),
       ],
    q(2687) => [
       q(Awngthim),
@@ -8444,6 +8446,7 @@ $Locale::Codes::Data{'language'}{'id2names'} = {
       ],
    q(2748) => [
       q(Hai//om),
+      q(Haiom),
       ],
    q(2749) => [
       q(Haigwai),
@@ -8624,6 +8627,7 @@ $Locale::Codes::Data{'language'}{'id2names'} = {
       ],
    q(2803) => [
       q(//Ani),
+      q(Ani),
       ],
    q(2804) => [
       q(Hani),
@@ -8779,6 +8783,7 @@ $Locale::Codes::Data{'language'}{'id2names'} = {
       ],
    q(2853) => [
       q(=/Hua),
+      q(Hua),
       ],
    q(2854) => [
       q(Huaulu),
@@ -9636,14641 +9641,14652 @@ $Locale::Codes::Data{'language'}{'id2names'} = {
       q(Wojenaka),
       ],
    q(3136) => [
-      q(Jora),
+      q(Jogi),
       ],
    q(3137) => [
-      q(Jordanian Sign Language),
+      q(Jora),
       ],
    q(3138) => [
-      q(Jowulu),
+      q(Jordanian Sign Language),
       ],
    q(3139) => [
-      q(Jewish Palestinian Aramaic),
+      q(Jowulu),
       ],
    q(3140) => [
-      q(Jaqaru),
+      q(Jewish Palestinian Aramaic),
       ],
    q(3141) => [
-      q(Jarai),
+      q(Jaqaru),
       ],
    q(3142) => [
-      q(Jiru),
+      q(Jarai),
       ],
    q(3143) => [
-      q(Jorto),
+      q(Jiru),
       ],
    q(3144) => [
-      q(Japreria),
+      q(Jorto),
       ],
    q(3145) => [
-      q(Japanese Sign Language),
+      q(Japreria),
       ],
    q(3146) => [
-      q(Juma),
+      q(Japanese Sign Language),
       ],
    q(3147) => [
-      q(Wannu),
+      q(Juma),
       ],
    q(3148) => [
-      q(Jurchen),
+      q(Wannu),
       ],
    q(3149) => [
-      q(Worodougou),
+      q(Jurchen),
       ],
    q(3150) => [
-      q(Hone),
+      q(Worodougou),
       ],
    q(3151) => [
-      q(Ngadjuri),
+      q(Hone),
       ],
    q(3152) => [
-      q(Wapan),
+      q(Ngadjuri),
       ],
    q(3153) => [
-      q(Jirel),
+      q(Wapan),
       ],
    q(3154) => [
-      q(Jumjum),
+      q(Jirel),
       ],
    q(3155) => [
-      q(Juang),
+      q(Jumjum),
       ],
    q(3156) => [
-      q(Jiba),
+      q(Juang),
       ],
    q(3157) => [
-      q(Hupde),
+      q(Jiba),
       ],
    q(3158) => [
-      q(Juruna),
+      q(Hupde),
       ],
    q(3159) => [
-      q(Jumla Sign Language),
+      q(Juruna),
       ],
    q(3160) => [
-      q(Jutish),
+      q(Jumla Sign Language),
       ],
    q(3161) => [
-      q(Ju),
+      q(Jutish),
       ],
    q(3162) => [
-      q(Wapha),
+      q(Ju),
       ],
    q(3163) => [
-      q(Juray),
+      q(Wapha),
       ],
    q(3164) => [
-      q(Javindo),
+      q(Juray),
       ],
    q(3165) => [
-      q(Caribbean Javanese),
+      q(Javindo),
       ],
    q(3166) => [
-      q(Jwira-Pepesa),
+      q(Caribbean Javanese),
       ],
    q(3167) => [
-      q(Jiarong),
+      q(Jwira-Pepesa),
       ],
    q(3168) => [
-      q(Judeo-Yemeni Arabic),
+      q(Jiarong),
       ],
    q(3169) => [
-      q(Jaya),
+      q(Judeo-Yemeni Arabic),
       ],
    q(3170) => [
-      q(Adara),
+      q(Jaya),
       ],
    q(3171) => [
-      q(Ketangalan),
+      q(Adara),
       ],
    q(3172) => [
-      q(Katso),
+      q(Ketangalan),
       ],
    q(3173) => [
-      q(Kajaman),
+      q(Katso),
       ],
    q(3174) => [
-      q(Kara (Central African Republic)),
+      q(Kajaman),
       ],
    q(3175) => [
-      q(Karekare),
+      q(Kara (Central African Republic)),
       ],
    q(3176) => [
-      q(Jju),
+      q(Karekare),
       ],
    q(3177) => [
-      q(Kayapa Kallahan),
+      q(Jju),
       ],
    q(3178) => [
-      q(Xaasongaxango),
+      q(Kayapa Kallahan),
       ],
    q(3179) => [
-      q(Bezhta),
+      q(Xaasongaxango),
       ],
    q(3180) => [
-      q(Capanahua),
+      q(Bezhta),
       ],
    q(3181) => [
-      q(Katukina),
+      q(Capanahua),
       ],
    q(3182) => [
-      q(Kao),
+      q(Katukina),
       ],
    q(3183) => [
-      q(Kamayura),
+      q(Kao),
       ],
    q(3184) => [
-      q(Kalarko),
+      q(Kamayura),
       ],
    q(3185) => [
-      q(Kaxuiana),
+      q(Kalarko),
       ],
    q(3186) => [
-      q(Kadiweu),
+      q(Kaxuiana),
       ],
    q(3187) => [
-      q(Kanju),
+      q(Kadiweu),
       ],
    q(3188) => [
-      q(Khamba),
+      q(Kanju),
       ],
    q(3189) => [
-      q(Camsa),
+      q(Khamba),
       ],
    q(3190) => [
-      q(Kaptiau),
+      q(Camsa),
       ],
    q(3191) => [
-      q(Kari),
+      q(Kaptiau),
       ],
    q(3192) => [
-      q(Grass Koiari),
+      q(Kari),
       ],
    q(3193) => [
-      q(Kanembu),
+      q(Grass Koiari),
       ],
    q(3194) => [
-      q(Iwal),
+      q(Kanembu),
       ],
    q(3195) => [
-      q(Kare (Central African Republic)),
+      q(Iwal),
       ],
    q(3196) => [
-      q(Keliko),
+      q(Kare (Central African Republic)),
       ],
    q(3197) => [
-      q(Kabiye),
+      q(Keliko),
       ],
    q(3198) => [
-      q(Kamano),
+      q(Kabiye),
       ],
    q(3199) => [
-      q(Kafa),
+      q(Kamano),
       ],
    q(3200) => [
-      q(Kande),
+      q(Kafa),
       ],
    q(3201) => [
-      q(Abadi),
+      q(Kande),
       ],
    q(3202) => [
-      q(Kabutra),
+      q(Abadi),
       ],
    q(3203) => [
-      q(Dera (Indonesia)),
+      q(Kabutra),
       ],
    q(3204) => [
-      q(Kaiep),
+      q(Dera (Indonesia)),
       ],
    q(3205) => [
-      q(Ap Ma),
+      q(Kaiep),
       ],
    q(3206) => [
-      q(Manga Kanuri),
+      q(Ap Ma),
       ],
    q(3207) => [
-      q(Duhwa),
+      q(Manga Kanuri),
       ],
    q(3208) => [
-      q(Khanty),
+      q(Duhwa),
       ],
    q(3209) => [
-      q(Kawacha),
+      q(Khanty),
       ],
    q(3210) => [
-      q(Lubila),
+      q(Kawacha),
       ],
    q(3211) => [
-      q(Ngkalmpw Kanum),
+      q(Lubila),
       ],
    q(3212) => [
-      q(Kaivi),
+      q(Ngkalmpw Kanum),
       ],
    q(3213) => [
-      q(Ukaan),
+      q(Kaivi),
       ],
    q(3214) => [
-      q(Tyap),
+      q(Ukaan),
       ],
    q(3215) => [
-      q(Vono),
+      q(Tyap),
       ],
    q(3216) => [
-      q(Kamantan),
+      q(Vono),
       ],
    q(3217) => [
-      q(Kobiana),
+      q(Kamantan),
       ],
    q(3218) => [
-      q(Kalanga),
+      q(Kobiana),
       ],
    q(3219) => [
+      q(Kalanga),
+      ],
+   q(3220) => [
       q(Kela (Papua New Guinea)),
       q(Kala),
       ],
-   q(3220) => [
+   q(3221) => [
       q(Gula (Central African Republic)),
       ],
-   q(3221) => [
+   q(3222) => [
       q(Nubi),
       ],
-   q(3222) => [
+   q(3223) => [
       q(Kinalakna),
       ],
-   q(3223) => [
+   q(3224) => [
       q(Kanga),
       ],
-   q(3224) => [
+   q(3225) => [
       q(Kamo),
       ],
-   q(3225) => [
+   q(3226) => [
       q(Katla),
       ],
-   q(3226) => [
+   q(3227) => [
       q(Koenoem),
       ],
-   q(3227) => [
+   q(3228) => [
       q(Kaian),
       ],
-   q(3228) => [
+   q(3229) => [
       q(Kami (Tanzania)),
       ],
-   q(3229) => [
+   q(3230) => [
       q(Kete),
       ],
-   q(3230) => [
+   q(3231) => [
       q(Kabwari),
       ],
-   q(3231) => [
+   q(3232) => [
       q(Kachama-Ganjule),
       ],
-   q(3232) => [
+   q(3233) => [
       q(Korandje),
       ],
-   q(3233) => [
+   q(3234) => [
       q(Konongo),
       ],
-   q(3234) => [
+   q(3235) => [
       q(Worimi),
       ],
-   q(3235) => [
+   q(3236) => [
       q(Kutu),
       ],
-   q(3236) => [
+   q(3237) => [
       q(Yankunytjatjara),
       ],
-   q(3237) => [
+   q(3238) => [
       q(Makonde),
       ],
-   q(3238) => [
+   q(3239) => [
       q(Mamusi),
       ],
-   q(3239) => [
+   q(3240) => [
       q(Seba),
       ],
-   q(3240) => [
+   q(3241) => [
       q(Tem),
       ],
-   q(3241) => [
+   q(3242) => [
       q(Kumam),
       ],
-   q(3242) => [
+   q(3243) => [
       q(Karamojong),
       ],
-   q(3243) => [
+   q(3244) => [
       q(Numee),
       q(Kwenyi),
       ],
-   q(3244) => [
+   q(3245) => [
       q(Tsikimba),
       ],
-   q(3245) => [
+   q(3246) => [
       q(Kagoma),
       ],
-   q(3246) => [
+   q(3247) => [
       q(Kunda),
       ],
-   q(3247) => [
+   q(3248) => [
       q(Kaningdon-Nindem),
       ],
-   q(3248) => [
+   q(3249) => [
       q(Koch),
       ],
-   q(3249) => [
+   q(3250) => [
       q(Karaim),
       ],
-   q(3250) => [
+   q(3251) => [
       q(Kuy),
       ],
-   q(3251) => [
+   q(3252) => [
       q(Kadaru),
       ],
-   q(3252) => [
+   q(3253) => [
       q(Koneraw),
       ],
-   q(3253) => [
+   q(3254) => [
       q(Kam),
       ],
-   q(3254) => [
+   q(3255) => [
       q(Keder),
       q(Keijar),
       ],
-   q(3255) => [
+   q(3256) => [
       q(Kwaja),
       ],
-   q(3256) => [
+   q(3257) => [
       q(Kabuverdianu),
       ],
-   q(3257) => [
+   q(3258) => [
       q(Kele),
       ],
-   q(3258) => [
+   q(3259) => [
       q(Keiga),
       ],
-   q(3259) => [
+   q(3260) => [
       q(Kerewe),
       ],
-   q(3260) => [
+   q(3261) => [
       q(Eastern Keres),
       ],
-   q(3261) => [
+   q(3262) => [
       q(Kpessi),
       ],
-   q(3262) => [
+   q(3263) => [
       q(Tese),
       ],
-   q(3263) => [
+   q(3264) => [
       q(Keak),
       ],
-   q(3264) => [
+   q(3265) => [
       q(Kei),
       ],
-   q(3265) => [
+   q(3266) => [
       q(Kadar),
       ],
-   q(3266) => [
+   q(3267) => [
       q(Kekchi),
       ],
-   q(3267) => [
+   q(3268) => [
       q(Kela (Democratic Republic of Congo)),
       ],
-   q(3268) => [
+   q(3269) => [
       q(Kemak),
       ],
-   q(3269) => [
+   q(3270) => [
       q(Kenyang),
       ],
-   q(3270) => [
+   q(3271) => [
       q(Kakwa),
       ],
-   q(3271) => [
+   q(3272) => [
       q(Kaikadi),
       ],
-   q(3272) => [
+   q(3273) => [
       q(Kamar),
       ],
-   q(3273) => [
+   q(3274) => [
       q(Kera),
       ],
-   q(3274) => [
+   q(3275) => [
       q(Kugbo),
       ],
-   q(3275) => [
+   q(3276) => [
       q(Ket),
       ],
-   q(3276) => [
+   q(3277) => [
       q(Akebu),
       ],
-   q(3277) => [
+   q(3278) => [
       q(Kanikkaran),
       ],
-   q(3278) => [
+   q(3279) => [
       q(West Kewa),
       ],
-   q(3279) => [
+   q(3280) => [
       q(Kukna),
       ],
-   q(3280) => [
+   q(3281) => [
       q(Kupia),
       ],
-   q(3281) => [
+   q(3282) => [
       q(Kukele),
       ],
-   q(3282) => [
+   q(3283) => [
       q(Kodava),
       ],
-   q(3283) => [
+   q(3284) => [
       q(Northwestern Kolami),
       ],
-   q(3284) => [
+   q(3285) => [
       q(Konda-Dora),
       ],
-   q(3285) => [
+   q(3286) => [
       q(Korra Koraga),
       ],
-   q(3286) => [
+   q(3287) => [
       q(Kota (India)),
       ],
-   q(3287) => [
+   q(3288) => [
       q(Koya),
       ],
-   q(3288) => [
+   q(3289) => [
       q(Kudiya),
       ],
-   q(3289) => [
+   q(3290) => [
       q(Kurichiya),
       ],
-   q(3290) => [
+   q(3291) => [
       q(Kannada Kurumba),
       ],
-   q(3291) => [
+   q(3292) => [
       q(Kemiehua),
       ],
-   q(3292) => [
+   q(3293) => [
       q(Kinnauri),
       ],
-   q(3293) => [
+   q(3294) => [
       q(Kung),
       ],
-   q(3294) => [
+   q(3295) => [
       q(Khunsari),
       ],
-   q(3295) => [
+   q(3296) => [
       q(Kuk),
       ],
-   q(3296) => [
+   q(3297) => [
       q(Koro (Cote d'Ivoire)),
       ],
-   q(3297) => [
+   q(3298) => [
       q(Korwa),
       ],
-   q(3298) => [
+   q(3299) => [
       q(Korku),
       ],
-   q(3299) => [
+   q(3300) => [
       q(Kachchi),
       ],
-   q(3300) => [
+   q(3301) => [
       q(Bilaspuri),
       ],
-   q(3301) => [
+   q(3302) => [
       q(Kanjari),
       ],
-   q(3302) => [
+   q(3303) => [
       q(Katkari),
       ],
-   q(3303) => [
+   q(3304) => [
       q(Kurmukar),
       ],
-   q(3304) => [
+   q(3305) => [
       q(Kharam Naga),
       ],
-   q(3305) => [
+   q(3306) => [
       q(Kullu Pahari),
       ],
-   q(3306) => [
+   q(3307) => [
       q(Kumaoni),
       ],
-   q(3307) => [
+   q(3308) => [
       q(Koromfe),
       ],
-   q(3308) => [
+   q(3309) => [
       q(Koyaga),
       ],
-   q(3309) => [
+   q(3310) => [
       q(Kawe),
       ],
-   q(3310) => [
+   q(3311) => [
       q(Kasseng),
       ],
-   q(3311) => [
+   q(3312) => [
       q(Kataang),
       ],
-   q(3312) => [
+   q(3313) => [
       q(Komering),
       ],
-   q(3313) => [
+   q(3314) => [
       q(Kube),
       ],
-   q(3314) => [
+   q(3315) => [
       q(Kusunda),
       ],
-   q(3315) => [
+   q(3316) => [
       q(Selangor Sign Language),
       ],
-   q(3316) => [
+   q(3317) => [
       q(Gamale Kham),
       ],
-   q(3317) => [
+   q(3318) => [
       q(Kaiwa),
       ],
-   q(3318) => [
+   q(3319) => [
       q(Kunggari),
       ],
-   q(3319) => [
+   q(3320) => [
       q(Karipuna),
       ],
-   q(3320) => [
+   q(3321) => [
       q(Karingani),
       ],
-   q(3321) => [
+   q(3322) => [
       q(Krongo),
       ],
-   q(3322) => [
+   q(3323) => [
       q(Kaingang),
       ],
-   q(3323) => [
+   q(3324) => [
       q(Kamoro),
       ],
-   q(3324) => [
+   q(3325) => [
       q(Abun),
       ],
-   q(3325) => [
+   q(3326) => [
       q(Kumbainggar),
       ],
-   q(3326) => [
+   q(3327) => [
       q(Somyev),
       ],
-   q(3327) => [
+   q(3328) => [
       q(Kobol),
       ],
-   q(3328) => [
+   q(3329) => [
       q(Karas),
       ],
-   q(3329) => [
+   q(3330) => [
       q(Karon Dori),
       ],
-   q(3330) => [
+   q(3331) => [
       q(Kamaru),
       ],
-   q(3331) => [
+   q(3332) => [
       q(Kyerung),
       ],
-   q(3332) => [
+   q(3333) => [
       q(Lu),
       ],
-   q(3333) => [
+   q(3334) => [
       q(Tukang Besi North),
       ],
-   q(3334) => [
+   q(3335) => [
       q(Badi Kanum),
       ],
-   q(3335) => [
+   q(3336) => [
       q(Korowai),
       ],
-   q(3336) => [
+   q(3337) => [
       q(Khuen),
       ],
-   q(3337) => [
+   q(3338) => [
       q(Khams Tibetan),
       ],
-   q(3338) => [
+   q(3339) => [
       q(Kehu),
       ],
-   q(3339) => [
+   q(3340) => [
       q(Kuturmi),
       ],
-   q(3340) => [
+   q(3341) => [
       q(Halh Mongolian),
       ],
-   q(3341) => [
+   q(3342) => [
       q(Lusi),
       ],
-   q(3342) => [
+   q(3343) => [
       q(Khandesi),
       ],
-   q(3343) => [
+   q(3344) => [
       q(Kapori),
       q(Kapauri),
       ],
-   q(3344) => [
+   q(3345) => [
       q(Koyra Chiini Songhay),
       ],
-   q(3345) => [
+   q(3346) => [
       q(Kharia),
       ],
-   q(3346) => [
+   q(3347) => [
       q(Kasua),
       ],
-   q(3347) => [
+   q(3348) => [
       q(Khamti),
       ],
-   q(3348) => [
+   q(3349) => [
       q(Nkhumbi),
       ],
-   q(3349) => [
+   q(3350) => [
       q(Khvarshi),
       ],
-   q(3350) => [
+   q(3351) => [
       q(Khowar),
       ],
-   q(3351) => [
+   q(3352) => [
       q(Kanu),
       ],
-   q(3352) => [
+   q(3353) => [
       q(Kele (Democratic Republic of Congo)),
       ],
-   q(3353) => [
+   q(3354) => [
       q(Keapara),
       ],
-   q(3354) => [
+   q(3355) => [
       q(Kim),
       ],
-   q(3355) => [
+   q(3356) => [
       q(Koalib),
       ],
-   q(3356) => [
+   q(3357) => [
       q(Kickapoo),
       ],
-   q(3357) => [
+   q(3358) => [
       q(Koshin),
       ],
-   q(3358) => [
+   q(3359) => [
       q(Kibet),
       ],
-   q(3359) => [
+   q(3360) => [
       q(Eastern Parbate Kham),
       ],
-   q(3360) => [
+   q(3361) => [
       q(Kimaama),
       q(Kimaghima),
       ],
-   q(3361) => [
+   q(3362) => [
       q(Kilmeri),
       ],
-   q(3362) => [
+   q(3363) => [
       q(Kitsai),
       ],
-   q(3363) => [
+   q(3364) => [
       q(Kilivila),
       ],
-   q(3364) => [
+   q(3365) => [
       q(Kariya),
       ],
-   q(3365) => [
+   q(3366) => [
       q(Karagas),
       ],
-   q(3366) => [
+   q(3367) => [
       q(Kiowa),
       ],
-   q(3367) => [
+   q(3368) => [
       q(Sheshi Kham),
       ],
-   q(3368) => [
+   q(3369) => [
       q(Kosadle),
       q(Kosare),
       ],
-   q(3369) => [
+   q(3370) => [
       q(Kis),
       ],
-   q(3370) => [
+   q(3371) => [
       q(Agob),
       ],
-   q(3371) => [
+   q(3372) => [
       q(Kirmanjki (individual language)),
       ],
-   q(3372) => [
+   q(3373) => [
       q(Kimbu),
       ],
-   q(3373) => [
+   q(3374) => [
       q(Northeast Kiwai),
       ],
-   q(3374) => [
+   q(3375) => [
       q(Khiamniungan Naga),
       ],
-   q(3375) => [
+   q(3376) => [
       q(Kirikiri),
       ],
-   q(3376) => [
+   q(3377) => [
       q(Kisi),
       ],
-   q(3377) => [
+   q(3378) => [
       q(Mlap),
       ],
-   q(3378) => [
+   q(3379) => [
       q(Q'anjob'al),
       q(Kanjobal),
       ],
-   q(3379) => [
+   q(3380) => [
       q(Coastal Konjo),
       ],
-   q(3380) => [
+   q(3381) => [
       q(Southern Kiwai),
       ],
-   q(3381) => [
+   q(3382) => [
       q(Kisar),
       ],
-   q(3382) => [
+   q(3383) => [
       q(Khalaj),
       ],
-   q(3383) => [
+   q(3384) => [
       q(Khmu),
       ],
-   q(3384) => [
+   q(3385) => [
       q(Khakas),
       ],
-   q(3385) => [
+   q(3386) => [
       q(Zabana),
       ],
-   q(3386) => [
+   q(3387) => [
       q(Khinalugh),
       ],
-   q(3387) => [
+   q(3388) => [
       q(Highland Konjo),
       ],
-   q(3388) => [
+   q(3389) => [
       q(Western Parbate Kham),
       ],
-   q(3389) => [
+   q(3390) => [
       q(Khang),
       ],
-   q(3390) => [
+   q(3391) => [
       q(Kunjen),
       ],
-   q(3391) => [
+   q(3392) => [
       q(Harijan Kinnauri),
       ],
-   q(3392) => [
+   q(3393) => [
       q(Pwo Eastern Karen),
       ],
-   q(3393) => [
+   q(3394) => [
       q(Western Keres),
       ],
-   q(3394) => [
+   q(3395) => [
       q(Kurudu),
       ],
-   q(3395) => [
+   q(3396) => [
       q(East Kewa),
       ],
-   q(3396) => [
+   q(3397) => [
       q(Phrae Pwo Karen),
       ],
-   q(3397) => [
+   q(3398) => [
       q(Kashaya),
       ],
-   q(3398) => [
+   q(3399) => [
       q(Kaikavian Literary Language),
       ],
-   q(3399) => [
+   q(3400) => [
       q(Ramopa),
       ],
-   q(3400) => [
+   q(3401) => [
       q(Erave),
       ],
-   q(3401) => [
+   q(3402) => [
       q(Bumthangkha),
       ],
-   q(3402) => [
+   q(3403) => [
       q(Kakanda),
       ],
-   q(3403) => [
+   q(3404) => [
       q(Kwerisa),
       ],
-   q(3404) => [
+   q(3405) => [
       q(Odoodee),
       ],
-   q(3405) => [
+   q(3406) => [
       q(Kinuku),
       ],
-   q(3406) => [
+   q(3407) => [
       q(Kakabe),
       ],
-   q(3407) => [
+   q(3408) => [
       q(Kalaktang Monpa),
       ],
-   q(3408) => [
+   q(3409) => [
       q(Mabaka Valley Kalinga),
       ],
-   q(3409) => [
+   q(3410) => [
       q(Khun),
       ],
-   q(3410) => [
+   q(3411) => [
       q(Kagulu),
       ],
-   q(3411) => [
+   q(3412) => [
       q(Kako),
       ],
-   q(3412) => [
+   q(3413) => [
       q(Kokota),
       ],
-   q(3413) => [
+   q(3414) => [
       q(Kosarek Yale),
       ],
-   q(3414) => [
+   q(3415) => [
       q(Kiong),
       ],
-   q(3415) => [
+   q(3416) => [
       q(Kon Keu),
       ],
-   q(3416) => [
+   q(3417) => [
       q(Karko),
       ],
-   q(3417) => [
+   q(3418) => [
       q(Gugubera),
       ],
-   q(3418) => [
+   q(3419) => [
       q(Kaiku),
       ],
-   q(3419) => [
+   q(3420) => [
       q(Kir-Balar),
       ],
-   q(3420) => [
+   q(3421) => [
       q(Giiwo),
       ],
-   q(3421) => [
+   q(3422) => [
       q(Koi),
       ],
-   q(3422) => [
+   q(3423) => [
       q(Tumi),
       ],
-   q(3423) => [
+   q(3424) => [
       q(Kangean),
       ],
-   q(3424) => [
+   q(3425) => [
       q(Teke-Kukuya),
       ],
-   q(3425) => [
+   q(3426) => [
       q(Kohin),
       ],
-   q(3426) => [
+   q(3427) => [
       q(Guguyimidjir),
       ],
-   q(3427) => [
+   q(3428) => [
       q(Kaska),
       ],
-   q(3428) => [
+   q(3429) => [
       q(Klamath-Modoc),
       ],
-   q(3429) => [
+   q(3430) => [
       q(Kiliwa),
       ],
-   q(3430) => [
+   q(3431) => [
       q(Kolbila),
       ],
-   q(3431) => [
+   q(3432) => [
       q(Gamilaraay),
       ],
-   q(3432) => [
+   q(3433) => [
       q(Kulung (Nepal)),
       ],
-   q(3433) => [
+   q(3434) => [
       q(Kendeje),
       ],
-   q(3434) => [
+   q(3435) => [
       q(Tagakaulo),
       ],
-   q(3435) => [
+   q(3436) => [
       q(Weliki),
       ],
-   q(3436) => [
+   q(3437) => [
       q(Kalumpang),
       ],
-   q(3437) => [
+   q(3438) => [
       q(Turkic Khalaj),
       ],
-   q(3438) => [
+   q(3439) => [
       q(Kono (Nigeria)),
       ],
-   q(3439) => [
+   q(3440) => [
       q(Kagan Kalagan),
       ],
-   q(3440) => [
+   q(3441) => [
       q(Migum),
       ],
-   q(3441) => [
+   q(3442) => [
       q(Kalenjin),
       ],
-   q(3442) => [
+   q(3443) => [
       q(Kapya),
       ],
-   q(3443) => [
+   q(3444) => [
       q(Kamasa),
       ],
-   q(3444) => [
+   q(3445) => [
       q(Rumu),
       ],
-   q(3445) => [
+   q(3446) => [
       q(Khaling),
       ],
-   q(3446) => [
+   q(3447) => [
       q(Kalasha),
       ],
-   q(3447) => [
+   q(3448) => [
       q(Nukna),
       ],
-   q(3448) => [
+   q(3449) => [
       q(Klao),
       ],
-   q(3449) => [
+   q(3450) => [
       q(Maskelynes),
       ],
-   q(3450) => [
+   q(3451) => [
       q(Lindu),
       ],
-   q(3451) => [
+   q(3452) => [
       q(Koluwawa),
       ],
-   q(3452) => [
+   q(3453) => [
       q(Kalao),
       ],
-   q(3453) => [
+   q(3454) => [
       q(Kabola),
       ],
-   q(3454) => [
+   q(3455) => [
       q(Konni),
       ],
-   q(3455) => [
+   q(3456) => [
       q(Southern Dong),
       ],
-   q(3456) => [
+   q(3457) => [
       q(Majukayang Kalinga),
       ],
-   q(3457) => [
+   q(3458) => [
       q(Bakole),
       ],
-   q(3458) => [
+   q(3459) => [
       q(Kare (Papua New Guinea)),
       ],
-   q(3459) => [
+   q(3460) => [
       q(Kate),
       ],
-   q(3460) => [
+   q(3461) => [
       q(Kalam),
       ],
-   q(3461) => [
+   q(3462) => [
       q(Kami (Nigeria)),
       ],
-   q(3462) => [
+   q(3463) => [
       q(Kumarbhag Paharia),
       ],
-   q(3463) => [
+   q(3464) => [
       q(Limos Kalinga),
       ],
-   q(3464) => [
+   q(3465) => [
       q(Tanudan Kalinga),
       ],
-   q(3465) => [
+   q(3466) => [
       q(Kom (India)),
       ],
-   q(3466) => [
+   q(3467) => [
       q(Awtuw),
       ],
-   q(3467) => [
+   q(3468) => [
       q(Kwoma),
       ],
-   q(3468) => [
+   q(3469) => [
       q(Gimme),
       ],
-   q(3469) => [
+   q(3470) => [
       q(Kwama),
       ],
-   q(3470) => [
+   q(3471) => [
       q(Northern Kurdish),
       ],
-   q(3471) => [
+   q(3472) => [
       q(Kamasau),
       ],
-   q(3472) => [
+   q(3473) => [
       q(Kemtuik),
       ],
-   q(3473) => [
+   q(3474) => [
       q(Kanite),
       ],
-   q(3474) => [
+   q(3475) => [
       q(Karipuna Creole French),
       ],
-   q(3475) => [
+   q(3476) => [
       q(Komo (Democratic Republic of Congo)),
       ],
-   q(3476) => [
+   q(3477) => [
       q(Waboda),
       ],
-   q(3477) => [
+   q(3478) => [
       q(Koma),
       ],
-   q(3478) => [
+   q(3479) => [
       q(Khorasani Turkish),
       ],
-   q(3479) => [
+   q(3480) => [
       q(Dera (Nigeria)),
       ],
-   q(3480) => [
+   q(3481) => [
       q(Lubuagan Kalinga),
       ],
-   q(3481) => [
+   q(3482) => [
       q(Central Kanuri),
       ],
-   q(3482) => [
+   q(3483) => [
       q(Konda),
       ],
-   q(3483) => [
+   q(3484) => [
       q(Kankanaey),
       ],
-   q(3484) => [
+   q(3485) => [
       q(Mankanya),
       ],
-   q(3485) => [
+   q(3486) => [
       q(Koongo),
       ],
-   q(3486) => [
+   q(3487) => [
       q(Kanufi),
       ],
-   q(3487) => [
+   q(3488) => [
       q(Western Kanjobal),
       ],
-   q(3488) => [
+   q(3489) => [
       q(Kuranko),
       ],
-   q(3489) => [
+   q(3490) => [
       q(Keninjal),
       ],
-   q(3490) => [
+   q(3491) => [
       q(Kanamari),
       ],
-   q(3491) => [
+   q(3492) => [
       q(Konkani (individual language)),
       ],
-   q(3492) => [
+   q(3493) => [
       q(Kono (Sierra Leone)),
       ],
-   q(3493) => [
+   q(3494) => [
       q(Kwanja),
       ],
-   q(3494) => [
+   q(3495) => [
       q(Kintaq),
       ],
-   q(3495) => [
+   q(3496) => [
       q(Kaningra),
       ],
-   q(3496) => [
+   q(3497) => [
       q(Kensiu),
       ],
-   q(3497) => [
+   q(3498) => [
       q(Panoan Katukina),
       ],
-   q(3498) => [
+   q(3499) => [
       q(Kono (Guinea)),
       ],
-   q(3499) => [
+   q(3500) => [
       q(Tabo),
       ],
-   q(3500) => [
+   q(3501) => [
       q(Kung-Ekoka),
       ],
-   q(3501) => [
+   q(3502) => [
       q(Kendayan),
       q(Salako),
       ],
-   q(3502) => [
+   q(3503) => [
       q(Kanyok),
       ],
-   q(3503) => [
+   q(3504) => [
       q(Kalamse),
       ],
-   q(3504) => [
+   q(3505) => [
       q(Konomala),
       ],
-   q(3505) => [
+   q(3506) => [
       q(Kpati),
       ],
-   q(3506) => [
+   q(3507) => [
       q(Kodi),
       ],
-   q(3507) => [
+   q(3508) => [
       q(Kacipo-Balesi),
       ],
-   q(3508) => [
+   q(3509) => [
       q(Kubi),
       ],
-   q(3509) => [
+   q(3510) => [
       q(Cogui),
       q(Kogi),
       ],
-   q(3510) => [
+   q(3511) => [
       q(Koyo),
       ],
-   q(3511) => [
+   q(3512) => [
       q(Komi-Permyak),
       ],
-   q(3512) => [
+   q(3513) => [
       q(Kol (Papua New Guinea)),
       ],
-   q(3513) => [
+   q(3514) => [
       q(Konzo),
       ],
-   q(3514) => [
+   q(3515) => [
       q(Waube),
       ],
-   q(3515) => [
+   q(3516) => [
       q(Kota (Gabon)),
       ],
-   q(3516) => [
+   q(3517) => [
       q(Lagwan),
       ],
-   q(3517) => [
+   q(3518) => [
       q(Koke),
       ],
-   q(3518) => [
+   q(3519) => [
       q(Kudu-Camo),
       ],
-   q(3519) => [
+   q(3520) => [
       q(Kugama),
       ],
-   q(3520) => [
+   q(3521) => [
       q(Coxima),
       ],
-   q(3521) => [
+   q(3522) => [
       q(Koyukon),
       ],
-   q(3522) => [
+   q(3523) => [
       q(Korak),
       ],
-   q(3523) => [
+   q(3524) => [
       q(Kutto),
       ],
-   q(3524) => [
+   q(3525) => [
       q(Mullu Kurumba),
       ],
-   q(3525) => [
+   q(3526) => [
       q(Curripaco),
       ],
-   q(3526) => [
+   q(3527) => [
       q(Koba),
       ],
-   q(3527) => [
+   q(3528) => [
       q(Komba),
       ],
-   q(3528) => [
+   q(3529) => [
       q(Kapingamarangi),
       ],
-   q(3529) => [
+   q(3530) => [
       q(Kplang),
       ],
-   q(3530) => [
+   q(3531) => [
       q(Kofei),
       ],
-   q(3531) => [
+   q(3532) => [
       q(Karaja),
       ],
-   q(3532) => [
+   q(3533) => [
       q(Kpan),
       ],
-   q(3533) => [
+   q(3534) => [
       q(Kpala),
       ],
-   q(3534) => [
+   q(3535) => [
       q(Koho),
       ],
-   q(3535) => [
+   q(3536) => [
       q(Kepkiriwat),
       ],
-   q(3536) => [
+   q(3537) => [
       q(Ikposo),
       ],
-   q(3537) => [
+   q(3538) => [
       q(Korupun-Sela),
       ],
-   q(3538) => [
+   q(3539) => [
       q(Korafe-Yegha),
       ],
-   q(3539) => [
+   q(3540) => [
       q(Tehit),
       ],
-   q(3540) => [
+   q(3541) => [
       q(Karata),
       ],
-   q(3541) => [
+   q(3542) => [
       q(Kafoa),
       ],
-   q(3542) => [
+   q(3543) => [
       q(Komi-Zyrian),
       ],
-   q(3543) => [
+   q(3544) => [
       q(Kobon),
       ],
-   q(3544) => [
+   q(3545) => [
       q(Mountain Koiali),
       ],
-   q(3545) => [
+   q(3546) => [
       q(Koryak),
       ],
-   q(3546) => [
+   q(3547) => [
       q(Kupsabiny),
       ],
-   q(3547) => [
+   q(3548) => [
       q(Mum),
       ],
-   q(3548) => [
+   q(3549) => [
       q(Kovai),
       ],
-   q(3549) => [
+   q(3550) => [
       q(Doromu-Koki),
       ],
-   q(3550) => [
+   q(3551) => [
       q(Koy Sanjaq Surat),
       ],
-   q(3551) => [
+   q(3552) => [
       q(Kalagan),
       ],
-   q(3552) => [
+   q(3553) => [
       q(Kakabai),
       ],
-   q(3553) => [
+   q(3554) => [
       q(Khe),
       ],
-   q(3554) => [
+   q(3555) => [
       q(Kisankasa),
       ],
-   q(3555) => [
+   q(3556) => [
       q(Koitabu),
       ],
-   q(3556) => [
+   q(3557) => [
       q(Koromira),
       ],
-   q(3557) => [
+   q(3558) => [
       q(Kotafon Gbe),
       ],
-   q(3558) => [
+   q(3559) => [
       q(Kyenele),
       ],
-   q(3559) => [
+   q(3560) => [
       q(Khisa),
       ],
-   q(3560) => [
+   q(3561) => [
       q(Kaonde),
       ],
-   q(3561) => [
+   q(3562) => [
       q(Eastern Krahn),
       ],
-   q(3562) => [
+   q(3563) => [
       q(Kimre),
       ],
-   q(3563) => [
+   q(3564) => [
       q(Krenak),
       ],
-   q(3564) => [
+   q(3565) => [
       q(Kimaragang),
       ],
-   q(3565) => [
+   q(3566) => [
       q(Northern Kissi),
       ],
-   q(3566) => [
+   q(3567) => [
       q(Klias River Kadazan),
       ],
-   q(3567) => [
+   q(3568) => [
       q(Seroa),
       ],
-   q(3568) => [
+   q(3569) => [
       q(Okolod),
       ],
-   q(3569) => [
+   q(3570) => [
       q(Kandas),
       ],
-   q(3570) => [
+   q(3571) => [
       q(Mser),
       ],
-   q(3571) => [
+   q(3572) => [
       q(Koorete),
       ],
-   q(3572) => [
+   q(3573) => [
       q(Korana),
       ],
-   q(3573) => [
+   q(3574) => [
       q(Kumhali),
       ],
-   q(3574) => [
+   q(3575) => [
       q(Karkin),
       ],
-   q(3575) => [
+   q(3576) => [
       q(Kairui-Midiki),
       ],
-   q(3576) => [
+   q(3577) => [
       q(Panara),
       ],
-   q(3577) => [
+   q(3578) => [
       q(Koro (Vanuatu)),
       ],
-   q(3578) => [
+   q(3579) => [
       q(Kurama),
       ],
-   q(3579) => [
+   q(3580) => [
       q(Krio),
       ],
-   q(3580) => [
+   q(3581) => [
       q(Kinaray-A),
       ],
-   q(3581) => [
+   q(3582) => [
       q(Kerek),
       ],
-   q(3582) => [
+   q(3583) => [
       q(Krim),
       ],
-   q(3583) => [
+   q(3584) => [
       q(Sapo),
       ],
-   q(3584) => [
+   q(3585) => [
       q(Korop),
       ],
-   q(3585) => [
+   q(3586) => [
       q(Kru'ng 2),
       ],
-   q(3586) => [
+   q(3587) => [
       q(Gbaya (Sudan)),
       ],
-   q(3587) => [
+   q(3588) => [
       q(Tumari Kanuri),
       ],
-   q(3588) => [
+   q(3589) => [
       q(Kavet),
       ],
-   q(3589) => [
+   q(3590) => [
       q(Western Krahn),
       ],
-   q(3590) => [
+   q(3591) => [
       q(Karon),
       ],
-   q(3591) => [
+   q(3592) => [
       q(Kryts),
       ],
-   q(3592) => [
+   q(3593) => [
       q(Sota Kanum),
       ],
-   q(3593) => [
+   q(3594) => [
       q(Shuwa-Zamani),
       ],
-   q(3594) => [
+   q(3595) => [
       q(Shambala),
       ],
-   q(3595) => [
+   q(3596) => [
       q(Southern Kalinga),
       ],
-   q(3596) => [
+   q(3597) => [
       q(Kuanua),
       ],
-   q(3597) => [
+   q(3598) => [
       q(Kuni),
       ],
-   q(3598) => [
+   q(3599) => [
       q(Bafia),
       ],
-   q(3599) => [
+   q(3600) => [
       q(Kusaghe),
       ],
-   q(3600) => [
+   q(3601) => [
       q(Kolsch),
       ],
-   q(3601) => [
+   q(3602) => [
       q(Krisa),
       q(I'saka),
       ],
-   q(3602) => [
+   q(3603) => [
       q(Uare),
       ],
-   q(3603) => [
+   q(3604) => [
       q(Kansa),
       ],
-   q(3604) => [
+   q(3605) => [
       q(Kumalu),
       ],
-   q(3605) => [
+   q(3606) => [
       q(Kumba),
       ],
-   q(3606) => [
+   q(3607) => [
       q(Kasiguranin),
       ],
-   q(3607) => [
+   q(3608) => [
       q(Kofa),
       ],
-   q(3608) => [
+   q(3609) => [
       q(Kaba),
       ],
-   q(3609) => [
+   q(3610) => [
       q(Kwaami),
       ],
-   q(3610) => [
+   q(3611) => [
       q(Borong),
       ],
-   q(3611) => [
+   q(3612) => [
       q(Southern Kisi),
       ],
-   q(3612) => [
+   q(3613) => [
       q(Winye),
       ],
-   q(3613) => [
+   q(3614) => [
       q(Khamyang),
       ],
-   q(3614) => [
+   q(3615) => [
       q(Kusu),
       ],
-   q(3615) => [
+   q(3616) => [
       q(S'gaw Karen),
       ],
-   q(3616) => [
+   q(3617) => [
       q(Kedang),
       ],
-   q(3617) => [
+   q(3618) => [
       q(Kharia Thar),
       ],
-   q(3618) => [
+   q(3619) => [
       q(Kodaku),
       ],
-   q(3619) => [
+   q(3620) => [
       q(Katua),
       ],
-   q(3620) => [
+   q(3621) => [
       q(Kambaata),
       ],
-   q(3621) => [
+   q(3622) => [
       q(Kholok),
       ],
-   q(3622) => [
+   q(3623) => [
       q(Kokata),
       ],
-   q(3623) => [
+   q(3624) => [
       q(Nubri),
       ],
-   q(3624) => [
+   q(3625) => [
       q(Kwami),
       ],
-   q(3625) => [
+   q(3626) => [
       q(Kalkutung),
       ],
-   q(3626) => [
+   q(3627) => [
       q(Karanga),
       ],
-   q(3627) => [
+   q(3628) => [
       q(North Muyu),
       ],
-   q(3628) => [
+   q(3629) => [
       q(Plapo Krumen),
       ],
-   q(3629) => [
+   q(3630) => [
       q(Kaniet),
       ],
-   q(3630) => [
+   q(3631) => [
       q(Koroshi),
       ],
-   q(3631) => [
+   q(3632) => [
       q(Kurti),
       ],
-   q(3632) => [
+   q(3633) => [
       q(Karitiana),
       ],
-   q(3633) => [
+   q(3634) => [
       q(Kuot),
       ],
-   q(3634) => [
+   q(3635) => [
       q(Kaduo),
       ],
-   q(3635) => [
+   q(3636) => [
       q(Katabaga),
       ],
-   q(3636) => [
+   q(3637) => [
       q(Kota Marudu Tinagas),
       ],
-   q(3637) => [
+   q(3638) => [
       q(South Muyu),
       ],
-   q(3638) => [
+   q(3639) => [
       q(Ketum),
       ],
-   q(3639) => [
+   q(3640) => [
       q(Kituba (Democratic Republic of Congo)),
       ],
-   q(3640) => [
+   q(3641) => [
       q(Eastern Katu),
       ],
-   q(3641) => [
+   q(3642) => [
       q(Kato),
       ],
-   q(3642) => [
+   q(3643) => [
       q(Kaxarari),
       ],
-   q(3643) => [
+   q(3644) => [
       q(Kango (Bas-Uele District)),
       ],
-   q(3644) => [
+   q(3645) => [
       q(Ju/'hoan),
+      q(Juhoan),
       ],
-   q(3645) => [
+   q(3646) => [
       q(Kutep),
       ],
-   q(3646) => [
+   q(3647) => [
       q(Kwinsu),
       ],
-   q(3647) => [
+   q(3648) => [
       q('Auhelawa),
       ],
-   q(3648) => [
+   q(3649) => [
       q(Kuman (Papua New Guinea)),
       ],
-   q(3649) => [
+   q(3650) => [
       q(Western Katu),
       ],
-   q(3650) => [
+   q(3651) => [
       q(Kupa),
       ],
-   q(3651) => [
+   q(3652) => [
       q(Kushi),
       ],
-   q(3652) => [
+   q(3653) => [
       q(Kuikuro-Kalapalo),
       ],
-   q(3653) => [
+   q(3654) => [
       q(Kuria),
       ],
-   q(3654) => [
+   q(3655) => [
       q(Kepo'),
       ],
-   q(3655) => [
+   q(3656) => [
       q(Kulere),
       ],
-   q(3656) => [
+   q(3657) => [
       q(Kunama),
       ],
-   q(3657) => [
+   q(3658) => [
       q(Kumukio),
       ],
-   q(3658) => [
+   q(3659) => [
       q(Kunimaipa),
       ],
-   q(3659) => [
+   q(3660) => [
       q(Kusaal),
       ],
-   q(3660) => [
+   q(3661) => [
       q(Upper Kuskokwim),
       ],
-   q(3661) => [
+   q(3662) => [
       q(Kur),
       ],
-   q(3662) => [
+   q(3663) => [
       q(Kpagua),
       ],
-   q(3663) => [
+   q(3664) => [
       q(Kukatja),
       ],
-   q(3664) => [
+   q(3665) => [
       q(Kuuku-Ya'u),
       ],
-   q(3665) => [
+   q(3666) => [
       q(Kunza),
       ],
-   q(3666) => [
+   q(3667) => [
       q(Bagvalal),
       ],
-   q(3667) => [
+   q(3668) => [
       q(Kubu),
       ],
-   q(3668) => [
+   q(3669) => [
       q(Kove),
       ],
-   q(3669) => [
+   q(3670) => [
       q(Kui (Indonesia)),
       ],
-   q(3670) => [
+   q(3671) => [
       q(Kalabakan),
       ],
-   q(3671) => [
+   q(3672) => [
       q(Kabalai),
       ],
-   q(3672) => [
+   q(3673) => [
       q(Kuni-Boazi),
       ],
-   q(3673) => [
+   q(3674) => [
       q(Komodo),
       ],
-   q(3674) => [
+   q(3675) => [
       q(Kwang),
       ],
-   q(3675) => [
+   q(3676) => [
       q(Psikye),
       ],
-   q(3676) => [
+   q(3677) => [
       q(Korean Sign Language),
       ],
-   q(3677) => [
+   q(3678) => [
       q(Kayaw),
       ],
-   q(3678) => [
+   q(3679) => [
       q(Kendem),
       ],
-   q(3679) => [
+   q(3680) => [
       q(Border Kuna),
       ],
-   q(3680) => [
+   q(3681) => [
       q(Dobel),
       ],
-   q(3681) => [
+   q(3682) => [
       q(Kompane),
       ],
-   q(3682) => [
+   q(3683) => [
       q(Geba Karen),
       ],
-   q(3683) => [
+   q(3684) => [
       q(Kerinci),
       ],
-   q(3684) => [
+   q(3685) => [
       q(Kunggara),
       ],
-   q(3685) => [
+   q(3686) => [
       q(Lahta Karen),
       q(Lahta),
       ],
-   q(3686) => [
+   q(3687) => [
       q(Yinbaw Karen),
       ],
-   q(3687) => [
+   q(3688) => [
       q(Kola),
       ],
-   q(3688) => [
+   q(3689) => [
       q(Wersing),
       ],
-   q(3689) => [
+   q(3690) => [
       q(Parkari Koli),
       ],
-   q(3690) => [
+   q(3691) => [
       q(Yintale Karen),
       q(Yintale),
       ],
-   q(3691) => [
+   q(3692) => [
       q(Tsakwambo),
       q(Tsaukambo),
       ],
-   q(3692) => [
+   q(3693) => [
       q(Daw),
       ],
-   q(3693) => [
+   q(3694) => [
       q(Kwa),
       ],
-   q(3694) => [
+   q(3695) => [
       q(Likwala),
       ],
-   q(3695) => [
+   q(3696) => [
       q(Kwaio),
       ],
-   q(3696) => [
+   q(3697) => [
       q(Kwerba),
       ],
-   q(3697) => [
+   q(3698) => [
       q(Kwara'ae),
       ],
-   q(3698) => [
+   q(3699) => [
       q(Sara Kaba Deme),
       ],
-   q(3699) => [
+   q(3700) => [
       q(Kowiai),
       ],
-   q(3700) => [
+   q(3701) => [
       q(Awa-Cuaiquer),
       ],
-   q(3701) => [
+   q(3702) => [
       q(Kwanga),
       ],
-   q(3702) => [
+   q(3703) => [
       q(Kwakiutl),
       ],
-   q(3703) => [
+   q(3704) => [
       q(Kofyar),
       ],
-   q(3704) => [
+   q(3705) => [
       q(Kwambi),
       ],
-   q(3705) => [
+   q(3706) => [
       q(Kwangali),
       ],
-   q(3706) => [
+   q(3707) => [
       q(Kwomtari),
       ],
-   q(3707) => [
+   q(3708) => [
       q(Kodia),
       ],
-   q(3708) => [
+   q(3709) => [
       q(Kwer),
       ],
-   q(3709) => [
+   q(3710) => [
       q(Kwese),
       ],
-   q(3710) => [
+   q(3711) => [
       q(Kwesten),
       ],
-   q(3711) => [
+   q(3712) => [
       q(Kwakum),
       ],
-   q(3712) => [
+   q(3713) => [
       q(Sara Kaba Naa),
       ],
-   q(3713) => [
+   q(3714) => [
       q(Kwinti),
       ],
-   q(3714) => [
+   q(3715) => [
       q(Khirwar),
       ],
-   q(3715) => [
+   q(3716) => [
       q(San Salvador Kongo),
       ],
-   q(3716) => [
+   q(3717) => [
       q(Kwadi),
       ],
-   q(3717) => [
+   q(3718) => [
       q(Kairiru),
       ],
-   q(3718) => [
+   q(3719) => [
       q(Krobu),
       ],
-   q(3719) => [
+   q(3720) => [
       q(Konso),
       q(Khonso),
       ],
-   q(3720) => [
+   q(3721) => [
       q(Brunei),
       ],
-   q(3721) => [
+   q(3722) => [
       q(Manumanaw Karen),
       q(Manumanaw),
       ],
-   q(3722) => [
+   q(3723) => [
       q(Karo (Ethiopia)),
       ],
-   q(3723) => [
+   q(3724) => [
       q(Keningau Murut),
       ],
-   q(3724) => [
+   q(3725) => [
       q(Kulfa),
       ],
-   q(3725) => [
+   q(3726) => [
       q(Zayein Karen),
       ],
-   q(3726) => [
+   q(3727) => [
       q(Nepali Kurux),
       ],
-   q(3727) => [
+   q(3728) => [
       q(Northern Khmer),
       ],
-   q(3728) => [
+   q(3729) => [
       q(Kanowit-Tanjong Melanau),
       ],
-   q(3729) => [
+   q(3730) => [
       q(Kanoe),
       ],
-   q(3730) => [
+   q(3731) => [
       q(Wadiyara Koli),
       ],
-   q(3731) => [
+   q(3732) => [
       q(Smarky Kanum),
       ],
-   q(3732) => [
+   q(3733) => [
       q(Koro (Papua New Guinea)),
       ],
-   q(3733) => [
+   q(3734) => [
       q(Kangjia),
       ],
-   q(3734) => [
+   q(3735) => [
       q(Koiwat),
       ],
-   q(3735) => [
+   q(3736) => [
       q(Kui (India)),
       ],
-   q(3736) => [
+   q(3737) => [
       q(Kuvi),
       ],
-   q(3737) => [
+   q(3738) => [
       q(Konai),
       ],
-   q(3738) => [
+   q(3739) => [
       q(Likuba),
       ],
-   q(3739) => [
+   q(3740) => [
       q(Kayong),
       ],
-   q(3740) => [
+   q(3741) => [
       q(Kerewo),
       ],
-   q(3741) => [
+   q(3742) => [
       q(Kwaya),
       ],
-   q(3742) => [
+   q(3743) => [
       q(Butbut Kalinga),
       ],
-   q(3743) => [
+   q(3744) => [
       q(Kyaka),
       ],
-   q(3744) => [
+   q(3745) => [
       q(Karey),
       ],
-   q(3745) => [
+   q(3746) => [
       q(Krache),
       ],
-   q(3746) => [
+   q(3747) => [
       q(Kouya),
       ],
-   q(3747) => [
+   q(3748) => [
       q(Keyagana),
       ],
-   q(3748) => [
+   q(3749) => [
       q(Karok),
       ],
-   q(3749) => [
+   q(3750) => [
       q(Kiput),
       ],
-   q(3750) => [
+   q(3751) => [
       q(Karao),
       ],
-   q(3751) => [
+   q(3752) => [
       q(Kamayo),
       ],
-   q(3752) => [
+   q(3753) => [
       q(Kalapuya),
       ],
-   q(3753) => [
+   q(3754) => [
       q(Kpatili),
       ],
-   q(3754) => [
+   q(3755) => [
       q(Northern Binukidnon),
       ],
-   q(3755) => [
+   q(3756) => [
       q(Kelon),
       ],
-   q(3756) => [
+   q(3757) => [
       q(Kang),
       ],
-   q(3757) => [
+   q(3758) => [
       q(Kenga),
       ],
-   q(3758) => [
+   q(3759) => [
       q(Kuruaya),
       ],
-   q(3759) => [
+   q(3760) => [
       q(Baram Kayan),
       ],
-   q(3760) => [
+   q(3761) => [
       q(Kayagar),
       ],
-   q(3761) => [
+   q(3762) => [
       q(Western Kayah),
       ],
-   q(3762) => [
+   q(3763) => [
       q(Kayort),
       ],
-   q(3763) => [
+   q(3764) => [
       q(Kudmali),
       ],
-   q(3764) => [
+   q(3765) => [
       q(Rapoisi),
       ],
-   q(3765) => [
+   q(3766) => [
       q(Kambaira),
       ],
-   q(3766) => [
+   q(3767) => [
       q(Kayabi),
       ],
-   q(3767) => [
+   q(3768) => [
       q(Western Karaboro),
       ],
-   q(3768) => [
+   q(3769) => [
       q(Kaibobo),
       ],
-   q(3769) => [
+   q(3770) => [
       q(Bondoukou Kulango),
       ],
-   q(3770) => [
+   q(3771) => [
       q(Kadai),
       ],
-   q(3771) => [
+   q(3772) => [
       q(Kosena),
       ],
-   q(3772) => [
+   q(3773) => [
       q(Da'a Kaili),
       ],
-   q(3773) => [
+   q(3774) => [
       q(Kikai),
       ],
-   q(3774) => [
+   q(3775) => [
       q(Kelabit),
       ],
-   q(3775) => [
+   q(3776) => [
       q(Coastal Kadazan),
       ],
-   q(3776) => [
+   q(3777) => [
       q(Kazukuru),
       ],
-   q(3777) => [
+   q(3778) => [
       q(Kayeli),
       ],
-   q(3778) => [
+   q(3779) => [
       q(Kais),
       ],
-   q(3779) => [
+   q(3780) => [
       q(Kokola),
       ],
-   q(3780) => [
+   q(3781) => [
       q(Kaningi),
       ],
-   q(3781) => [
+   q(3782) => [
       q(Kaidipang),
       ],
-   q(3782) => [
+   q(3783) => [
       q(Kaike),
       ],
-   q(3783) => [
+   q(3784) => [
       q(Karang),
       ],
-   q(3784) => [
+   q(3785) => [
       q(Sugut Dusun),
       ],
-   q(3785) => [
+   q(3786) => [
       q(Tambunan Dusun),
       ],
-   q(3786) => [
+   q(3787) => [
       q(Kayupulau),
       ],
-   q(3787) => [
+   q(3788) => [
       q(Komyandaret),
       ],
-   q(3788) => [
+   q(3789) => [
       q(Kariri-Xoco),
       ],
-   q(3789) => [
+   q(3790) => [
       q(Kamarian),
       ],
-   q(3790) => [
+   q(3791) => [
       q(Kango (Tshopo District)),
       ],
-   q(3791) => [
+   q(3792) => [
       q(Kalabra),
       ],
-   q(3792) => [
+   q(3793) => [
       q(Southern Subanen),
       ],
-   q(3793) => [
+   q(3794) => [
       q(Linear A),
       ],
-   q(3794) => [
+   q(3795) => [
       q(Lacandon),
       ],
-   q(3795) => [
+   q(3796) => [
       q(Pattani),
       ],
-   q(3796) => [
+   q(3797) => [
       q(Lafofa),
       ],
-   q(3797) => [
+   q(3798) => [
       q(Langi),
       ],
-   q(3798) => [
+   q(3799) => [
       q(Lambya),
       ],
-   q(3799) => [
+   q(3800) => [
       q(Lango (Uganda)),
       ],
-   q(3800) => [
+   q(3801) => [
       q(Laka (Nigeria)),
       ],
-   q(3801) => [
+   q(3802) => [
       q(Lalia),
       ],
-   q(3802) => [
+   q(3803) => [
       q(Laru),
       ],
-   q(3803) => [
+   q(3804) => [
       q(Laka (Chad)),
       ],
-   q(3804) => [
+   q(3805) => [
       q(Qabiao),
       ],
-   q(3805) => [
+   q(3806) => [
       q(Larteh),
       ],
-   q(3806) => [
+   q(3807) => [
       q(Lama (Togo)),
       ],
-   q(3807) => [
+   q(3808) => [
       q(Laba),
       ],
-   q(3808) => [
+   q(3809) => [
       q(Lauje),
       ],
-   q(3809) => [
+   q(3810) => [
       q(Tiwa),
       ],
-   q(3810) => [
+   q(3811) => [
       q(Lama Bai),
       ],
-   q(3811) => [
+   q(3812) => [
       q(Aribwatsa),
       ],
-   q(3812) => [
+   q(3813) => [
       q(Lui),
       ],
-   q(3813) => [
+   q(3814) => [
       q(Label),
       ],
-   q(3814) => [
+   q(3815) => [
       q(Lakkia),
       ],
-   q(3815) => [
+   q(3816) => [
       q(Lak),
       ],
-   q(3816) => [
+   q(3817) => [
       q(Tinani),
       ],
-   q(3817) => [
+   q(3818) => [
       q(Laopang),
       ],
-   q(3818) => [
+   q(3819) => [
       q(La'bi),
       ],
-   q(3819) => [
+   q(3820) => [
       q(Ladakhi),
       ],
-   q(3820) => [
+   q(3821) => [
       q(Central Bontok),
       ],
-   q(3821) => [
+   q(3822) => [
       q(Libon Bikol),
       ],
-   q(3822) => [
+   q(3823) => [
       q(Lodhi),
       ],
-   q(3823) => [
+   q(3824) => [
       q(Lamet),
       ],
-   q(3824) => [
+   q(3825) => [
       q(Laven),
       ],
-   q(3825) => [
+   q(3826) => [
       q(Wampar),
       ],
-   q(3826) => [
+   q(3827) => [
       q(Lohorung),
       ],
-   q(3827) => [
+   q(3828) => [
       q(Libyan Sign Language),
       ],
-   q(3828) => [
+   q(3829) => [
       q(Lachi),
       ],
-   q(3829) => [
+   q(3830) => [
       q(Labu),
       ],
-   q(3830) => [
+   q(3831) => [
       q(Lavatbura-Lamusong),
       ],
-   q(3831) => [
+   q(3832) => [
       q(Tolaki),
       ],
-   q(3832) => [
+   q(3833) => [
       q(Lawangan),
       ],
-   q(3833) => [
+   q(3834) => [
       q(Lamu-Lamu),
       ],
-   q(3834) => [
+   q(3835) => [
       q(Lardil),
       ],
-   q(3835) => [
+   q(3836) => [
       q(Legenyem),
       ],
-   q(3836) => [
+   q(3837) => [
       q(Lola),
       ],
-   q(3837) => [
+   q(3838) => [
       q(Loncong),
       ],
-   q(3838) => [
+   q(3839) => [
       q(Lubu),
       ],
-   q(3839) => [
+   q(3840) => [
       q(Luchazi),
       ],
-   q(3840) => [
+   q(3841) => [
       q(Lisela),
       ],
-   q(3841) => [
+   q(3842) => [
       q(Tungag),
       ],
-   q(3842) => [
+   q(3843) => [
       q(Western Lawa),
       ],
-   q(3843) => [
+   q(3844) => [
       q(Luhu),
       ],
-   q(3844) => [
+   q(3845) => [
       q(Lisabata-Nuniali),
       ],
-   q(3845) => [
+   q(3846) => [
       q(Kla-Dan),
       ],
-   q(3846) => [
+   q(3847) => [
       q(Duya),
       ],
-   q(3847) => [
+   q(3848) => [
       q(Luri),
       ],
-   q(3848) => [
+   q(3849) => [
       q(Lenyima),
       ],
-   q(3849) => [
+   q(3850) => [
       q(Lamja-Dengsa-Tola),
       ],
-   q(3850) => [
+   q(3851) => [
       q(Laari),
       ],
-   q(3851) => [
+   q(3852) => [
       q(Lemoro),
       ],
-   q(3852) => [
+   q(3853) => [
       q(Leelau),
       ],
-   q(3853) => [
+   q(3854) => [
       q(Kaan),
       ],
-   q(3854) => [
+   q(3855) => [
       q(Landoma),
       ],
-   q(3855) => [
+   q(3856) => [
       q(Laadan),
       ],
-   q(3856) => [
+   q(3857) => [
       q(Loo),
       ],
-   q(3857) => [
+   q(3858) => [
       q(Tso),
       ],
-   q(3858) => [
+   q(3859) => [
       q(Lufu),
       ],
-   q(3859) => [
+   q(3860) => [
       q(Lega-Shabunda),
       ],
-   q(3860) => [
+   q(3861) => [
       q(Lala-Bisa),
       ],
-   q(3861) => [
+   q(3862) => [
       q(Leco),
       ],
-   q(3862) => [
+   q(3863) => [
       q(Lendu),
       ],
-   q(3863) => [
+   q(3864) => [
       q(Lyele),
       ],
-   q(3864) => [
+   q(3865) => [
       q(Lelemi),
       ],
-   q(3865) => [
+   q(3866) => [
       q(Lenje),
       ],
-   q(3866) => [
+   q(3867) => [
       q(Lemio),
       ],
-   q(3867) => [
+   q(3868) => [
       q(Lengola),
       ],
-   q(3868) => [
+   q(3869) => [
       q(Leipon),
       ],
-   q(3869) => [
+   q(3870) => [
       q(Lele (Democratic Republic of Congo)),
       ],
-   q(3870) => [
+   q(3871) => [
       q(Nomaande),
       ],
-   q(3871) => [
+   q(3872) => [
       q(Lenca),
       ],
-   q(3872) => [
+   q(3873) => [
       q(Leti (Cameroon)),
       ],
-   q(3873) => [
+   q(3874) => [
       q(Lepcha),
       ],
-   q(3874) => [
+   q(3875) => [
       q(Lembena),
       ],
-   q(3875) => [
+   q(3876) => [
       q(Lenkau),
       ],
-   q(3876) => [
+   q(3877) => [
       q(Lese),
       ],
-   q(3877) => [
+   q(3878) => [
       q(Lesing-Gelimi),
       q(Amio-Gelimi),
       ],
-   q(3878) => [
+   q(3879) => [
       q(Kara (Papua New Guinea)),
       ],
-   q(3879) => [
+   q(3880) => [
       q(Lamma),
       ],
-   q(3880) => [
+   q(3881) => [
       q(Ledo Kaili),
       ],
-   q(3881) => [
+   q(3882) => [
       q(Luang),
       ],
-   q(3882) => [
+   q(3883) => [
       q(Lemolang),
       ],
-   q(3883) => [
+   q(3884) => [
       q(Lefa),
       ],
-   q(3884) => [
+   q(3885) => [
       q(Lingua Franca Nova),
       ],
-   q(3885) => [
+   q(3886) => [
       q(Lungga),
       ],
-   q(3886) => [
+   q(3887) => [
       q(Laghu),
       ],
-   q(3887) => [
+   q(3888) => [
       q(Lugbara),
       ],
-   q(3888) => [
+   q(3889) => [
       q(Laghuu),
       ],
-   q(3889) => [
+   q(3890) => [
       q(Lengilu),
       ],
-   q(3890) => [
+   q(3891) => [
       q(Lingarak),
       q(Neverver),
       ],
-   q(3891) => [
+   q(3892) => [
       q(Wala),
       ],
-   q(3892) => [
+   q(3893) => [
       q(Lega-Mwenga),
       ],
-   q(3893) => [
+   q(3894) => [
       q(Opuuo),
       ],
-   q(3894) => [
+   q(3895) => [
       q(Logba),
       ],
-   q(3895) => [
+   q(3896) => [
       q(Lengo),
       ],
-   q(3896) => [
+   q(3897) => [
       q(Pahi),
       ],
-   q(3897) => [
+   q(3898) => [
       q(Longgu),
       ],
-   q(3898) => [
+   q(3899) => [
       q(Ligenza),
       ],
-   q(3899) => [
+   q(3900) => [
       q(Laha (Viet Nam)),
       ],
-   q(3900) => [
+   q(3901) => [
       q(Laha (Indonesia)),
       ],
-   q(3901) => [
+   q(3902) => [
       q(Lahu Shi),
       ],
-   q(3902) => [
+   q(3903) => [
       q(Lahul Lohar),
       ],
-   q(3903) => [
+   q(3904) => [
       q(Lhomi),
       ],
-   q(3904) => [
+   q(3905) => [
       q(Lahanan),
       ],
-   q(3905) => [
+   q(3906) => [
       q(Lhokpu),
       ],
-   q(3906) => [
+   q(3907) => [
       q(Mlahso),
       ],
-   q(3907) => [
+   q(3908) => [
       q(Lo-Toga),
       ],
-   q(3908) => [
+   q(3909) => [
       q(Lahu),
       ],
-   q(3909) => [
+   q(3910) => [
       q(West-Central Limba),
       ],
-   q(3910) => [
+   q(3911) => [
       q(Likum),
       ],
-   q(3911) => [
+   q(3912) => [
       q(Hlai),
       ],
-   q(3912) => [
+   q(3913) => [
       q(Nyindrou),
       ],
-   q(3913) => [
+   q(3914) => [
       q(Likila),
       ],
-   q(3914) => [
+   q(3915) => [
       q(Limbu),
       ],
-   q(3915) => [
+   q(3916) => [
       q(Ligbi),
       ],
-   q(3916) => [
+   q(3917) => [
       q(Lihir),
       ],
-   q(3917) => [
+   q(3918) => [
       q(Ligurian),
       ],
-   q(3918) => [
+   q(3919) => [
       q(Lika),
       ],
-   q(3919) => [
+   q(3920) => [
       q(Lillooet),
       ],
-   q(3920) => [
+   q(3921) => [
       q(Liki),
       ],
-   q(3921) => [
+   q(3922) => [
       q(Sekpele),
       ],
-   q(3922) => [
+   q(3923) => [
       q(Libido),
       ],
-   q(3923) => [
+   q(3924) => [
       q(Liberian English),
       ],
-   q(3924) => [
+   q(3925) => [
       q(Lisu),
       ],
-   q(3925) => [
+   q(3926) => [
       q(Logorik),
       ],
-   q(3926) => [
+   q(3927) => [
       q(Liv),
       ],
-   q(3927) => [
+   q(3928) => [
       q(Col),
       ],
-   q(3928) => [
+   q(3929) => [
       q(Liabuku),
       ],
-   q(3929) => [
+   q(3930) => [
       q(Banda-Bambari),
       ],
-   q(3930) => [
+   q(3931) => [
       q(Libinza),
       ],
-   q(3931) => [
+   q(3932) => [
       q(Golpa),
       ],
-   q(3932) => [
+   q(3933) => [
       q(Rampi),
       ],
-   q(3933) => [
+   q(3934) => [
       q(Laiyolo),
       ],
-   q(3934) => [
+   q(3935) => [
       q(Li'o),
       ],
-   q(3935) => [
+   q(3936) => [
       q(Lampung Api),
       ],
-   q(3936) => [
+   q(3937) => [
       q(Yirandali),
       ],
-   q(3937) => [
+   q(3938) => [
       q(Yuru),
       ],
-   q(3938) => [
+   q(3939) => [
       q(Lakalei),
       ],
-   q(3939) => [
+   q(3940) => [
       q(Kabras),
       q(Lukabaras),
       ],
-   q(3940) => [
+   q(3941) => [
       q(Kucong),
       ],
-   q(3941) => [
+   q(3942) => [
       q(Lakonde),
       ],
-   q(3942) => [
+   q(3943) => [
       q(Kenyi),
       ],
-   q(3943) => [
+   q(3944) => [
       q(Lakha),
       ],
-   q(3944) => [
+   q(3945) => [
       q(Laki),
       ],
-   q(3945) => [
+   q(3946) => [
       q(Remun),
       ],
-   q(3946) => [
+   q(3947) => [
       q(Laeko-Libuat),
       ],
-   q(3947) => [
+   q(3948) => [
       q(Kalaamaya),
       ],
-   q(3948) => [
+   q(3949) => [
       q(Lakon),
       q(Vure),
       ],
-   q(3949) => [
+   q(3950) => [
       q(Khayo),
       q(Olukhayo),
       ],
-   q(3950) => [
+   q(3951) => [
       q(Pari),
       ],
-   q(3951) => [
+   q(3952) => [
       q(Kisa),
       q(Olushisa),
       ],
-   q(3952) => [
+   q(3953) => [
       q(Lakota),
       ],
-   q(3953) => [
+   q(3954) => [
       q(Kungkari),
       ],
-   q(3954) => [
+   q(3955) => [
       q(Lokoya),
       ],
-   q(3955) => [
+   q(3956) => [
       q(Lala-Roba),
       ],
-   q(3956) => [
+   q(3957) => [
       q(Lolo),
       ],
-   q(3957) => [
+   q(3958) => [
       q(Lele (Guinea)),
       ],
-   q(3958) => [
+   q(3959) => [
       q(Ladin),
       ],
-   q(3959) => [
+   q(3960) => [
       q(Lele (Papua New Guinea)),
       ],
-   q(3960) => [
+   q(3961) => [
       q(Hermit),
       ],
-   q(3961) => [
+   q(3962) => [
       q(Lole),
       ],
-   q(3962) => [
+   q(3963) => [
       q(Lamu),
       ],
-   q(3963) => [
+   q(3964) => [
       q(Teke-Laali),
       ],
-   q(3964) => [
+   q(3965) => [
       q(Ladji Ladji),
       ],
-   q(3965) => [
+   q(3966) => [
       q(Lelak),
       ],
-   q(3966) => [
+   q(3967) => [
       q(Lilau),
       ],
-   q(3967) => [
+   q(3968) => [
       q(Lasalimu),
       ],
-   q(3968) => [
+   q(3969) => [
       q(Lele (Chad)),
       ],
-   q(3969) => [
+   q(3970) => [
       q(Khlor),
       ],
-   q(3970) => [
+   q(3971) => [
       q(North Efate),
       ],
-   q(3971) => [
+   q(3972) => [
       q(Lolak),
       ],
-   q(3972) => [
+   q(3973) => [
       q(Lithuanian Sign Language),
       ],
-   q(3973) => [
+   q(3974) => [
       q(Lau),
       ],
-   q(3974) => [
+   q(3975) => [
       q(Lauan),
       ],
-   q(3975) => [
+   q(3976) => [
       q(East Limba),
       ],
-   q(3976) => [
+   q(3977) => [
       q(Merei),
       ],
-   q(3977) => [
+   q(3978) => [
       q(Limilngan),
       ],
-   q(3978) => [
+   q(3979) => [
       q(Lumun),
       ],
-   q(3979) => [
+   q(3980) => [
       q(Peve),
       ],
-   q(3980) => [
+   q(3981) => [
       q(South Lembata),
       ],
-   q(3981) => [
+   q(3982) => [
       q(Lamogai),
       ],
-   q(3982) => [
+   q(3983) => [
       q(Lambichhong),
       ],
-   q(3983) => [
+   q(3984) => [
       q(Lombi),
       ],
-   q(3984) => [
+   q(3985) => [
       q(West Lembata),
       ],
-   q(3985) => [
+   q(3986) => [
       q(Lamkang),
       ],
-   q(3986) => [
+   q(3987) => [
       q(Hano),
       ],
-   q(3987) => [
+   q(3988) => [
       q(Lambadi),
       ],
-   q(3988) => [
+   q(3989) => [
       q(Lombard),
       ],
-   q(3989) => [
+   q(3990) => [
       q(Limbum),
       ],
-   q(3990) => [
+   q(3991) => [
       q(Lamatuka),
       ],
-   q(3991) => [
+   q(3992) => [
       q(Lamalera),
       ],
-   q(3992) => [
+   q(3993) => [
       q(Lamenu),
       ],
-   q(3993) => [
+   q(3994) => [
       q(Lomaiviti),
       ],
-   q(3994) => [
+   q(3995) => [
       q(Lake Miwok),
       ],
-   q(3995) => [
+   q(3996) => [
       q(Laimbue),
       ],
-   q(3996) => [
+   q(3997) => [
       q(Lamboya),
       ],
-   q(3997) => [
+   q(3998) => [
       q(Lumbee),
       ],
-   q(3998) => [
+   q(3999) => [
       q(Langbashe),
       ],
-   q(3999) => [
+   q(4000) => [
       q(Mbalanhu),
       ],
-   q(4000) => [
+   q(4001) => [
       q(Lundayeh),
       q(Lun Bawang),
       ],
-   q(4001) => [
+   q(4002) => [
       q(Langobardic),
       ],
-   q(4002) => [
+   q(4003) => [
       q(Lanoh),
       ],
-   q(4003) => [
+   q(4004) => [
       q(Daantanai'),
       ],
-   q(4004) => [
+   q(4005) => [
       q(Leningitij),
       ],
-   q(4005) => [
+   q(4006) => [
       q(South Central Banda),
       ],
-   q(4006) => [
+   q(4007) => [
       q(Langam),
       ],
-   q(4007) => [
+   q(4008) => [
       q(Lorediakarkar),
       ],
-   q(4008) => [
+   q(4009) => [
       q(Lango (Sudan)),
       ],
-   q(4009) => [
+   q(4010) => [
       q(Lamnso'),
       ],
-   q(4010) => [
+   q(4011) => [
       q(Longuda),
       ],
-   q(4011) => [
+   q(4012) => [
       q(Lanima),
       ],
-   q(4012) => [
+   q(4013) => [
       q(Lonzo),
       ],
-   q(4013) => [
+   q(4014) => [
       q(Loloda),
       ],
-   q(4014) => [
+   q(4015) => [
       q(Lobi),
       ],
-   q(4015) => [
+   q(4016) => [
       q(Inonhan),
       ],
-   q(4016) => [
+   q(4017) => [
       q(Saluan),
       ],
-   q(4017) => [
+   q(4018) => [
       q(Logol),
       ],
-   q(4018) => [
+   q(4019) => [
       q(Logo),
       ],
-   q(4019) => [
+   q(4020) => [
       q(Narim),
       ],
-   q(4020) => [
+   q(4021) => [
       q(Loma (Cote d'Ivoire)),
       ],
-   q(4021) => [
+   q(4022) => [
       q(Lou),
       ],
-   q(4022) => [
+   q(4023) => [
       q(Loko),
       ],
-   q(4023) => [
+   q(4024) => [
       q(Loma (Liberia)),
       ],
-   q(4024) => [
+   q(4025) => [
       q(Malawi Lomwe),
       ],
-   q(4025) => [
+   q(4026) => [
       q(Lombo),
       ],
-   q(4026) => [
+   q(4027) => [
       q(Lopa),
       ],
-   q(4027) => [
+   q(4028) => [
       q(Lobala),
       ],
-   q(4028) => [
+   q(4029) => [
       q(Teen),
       ],
-   q(4029) => [
+   q(4030) => [
       q(Loniu),
       ],
-   q(4030) => [
+   q(4031) => [
       q(Otuho),
       ],
-   q(4031) => [
+   q(4032) => [
       q(Louisiana Creole French),
       ],
-   q(4032) => [
+   q(4033) => [
       q(Lopi),
       ],
-   q(4033) => [
+   q(4034) => [
       q(Tampias Lobu),
       ],
-   q(4034) => [
+   q(4035) => [
       q(Loun),
       ],
-   q(4035) => [
+   q(4036) => [
       q(Loke),
       ],
-   q(4036) => [
+   q(4037) => [
       q(Lelepa),
       ],
-   q(4037) => [
+   q(4038) => [
       q(Lepki),
       ],
-   q(4038) => [
+   q(4039) => [
       q(Long Phuri Naga),
       ],
-   q(4039) => [
+   q(4040) => [
       q(Lipo),
       ],
-   q(4040) => [
+   q(4041) => [
       q(Lopit),
       ],
-   q(4041) => [
+   q(4042) => [
       q(Rara Bakati'),
       ],
-   q(4042) => [
+   q(4043) => [
       q(Northern Luri),
       ],
-   q(4043) => [
+   q(4044) => [
       q(Laurentian),
       ],
-   q(4044) => [
+   q(4045) => [
       q(Laragia),
       ],
-   q(4045) => [
+   q(4046) => [
       q(Marachi),
       q(Olumarachi),
       ],
-   q(4046) => [
+   q(4047) => [
       q(Loarki),
       ],
-   q(4047) => [
+   q(4048) => [
       q(Lari),
       ],
-   q(4048) => [
+   q(4049) => [
       q(Marama),
       q(Olumarama),
       ],
-   q(4049) => [
+   q(4050) => [
       q(Lorang),
       ],
-   q(4050) => [
+   q(4051) => [
       q(Laro),
       ],
-   q(4051) => [
+   q(4052) => [
       q(Southern Yamphu),
       ],
-   q(4052) => [
+   q(4053) => [
       q(Larantuka Malay),
       ],
-   q(4053) => [
+   q(4054) => [
       q(Larevat),
       ],
-   q(4054) => [
+   q(4055) => [
       q(Lemerig),
       ],
-   q(4055) => [
+   q(4056) => [
       q(Lasgerdi),
       ],
-   q(4056) => [
+   q(4057) => [
       q(Lishana Deni),
       ],
-   q(4057) => [
+   q(4058) => [
       q(Lusengo),
       ],
-   q(4058) => [
+   q(4059) => [
       q(Lyons Sign Language),
       ],
-   q(4059) => [
+   q(4060) => [
       q(Lish),
       ],
-   q(4060) => [
+   q(4061) => [
       q(Lashi),
       ],
-   q(4061) => [
+   q(4062) => [
       q(Latvian Sign Language),
       ],
-   q(4062) => [
+   q(4063) => [
       q(Saamia),
       q(Olusamia),
       ],
-   q(4063) => [
+   q(4064) => [
       q(Laos Sign Language),
       ],
-   q(4064) => [
+   q(4065) => [
       q(Panamanian Sign Language),
       q(Lengua de Senas Panamenas),
       ],
-   q(4065) => [
+   q(4066) => [
       q(Aruop),
       ],
-   q(4066) => [
+   q(4067) => [
       q(Lasi),
       ],
-   q(4067) => [
+   q(4068) => [
       q(Trinidad and Tobago Sign Language),
       ],
-   q(4068) => [
+   q(4069) => [
       q(Mauritian Sign Language),
       ],
-   q(4069) => [
+   q(4070) => [
       q(Late Middle Chinese),
       ],
-   q(4070) => [
+   q(4071) => [
       q(Latgalian),
       ],
-   q(4071) => [
+   q(4072) => [
       q(Leti (Indonesia)),
       ],
-   q(4072) => [
+   q(4073) => [
       q(Latunde),
       ],
-   q(4073) => [
+   q(4074) => [
       q(Tsotso),
       q(Olutsotso),
       ],
-   q(4074) => [
+   q(4075) => [
       q(Tachoni),
       q(Lutachoni),
       ],
-   q(4075) => [
+   q(4076) => [
       q(Latu),
       ],
-   q(4076) => [
+   q(4077) => [
       q(Aringa),
       ],
-   q(4077) => [
+   q(4078) => [
       q(Ludian),
       ],
-   q(4078) => [
+   q(4079) => [
       q(Luvale),
       ],
-   q(4079) => [
+   q(4080) => [
       q(Laua),
       ],
-   q(4080) => [
+   q(4081) => [
       q(Luna),
       ],
-   q(4081) => [
+   q(4082) => [
       q(Lunanakha),
       ],
-   q(4082) => [
+   q(4083) => [
       q(Olu'bo),
       ],
-   q(4083) => [
+   q(4084) => [
       q(Luimbi),
       ],
-   q(4084) => [
+   q(4085) => [
       q(Lumbu),
       ],
-   q(4085) => [
+   q(4086) => [
       q(Lucumi),
       ],
-   q(4086) => [
+   q(4087) => [
       q(Laura),
       ],
-   q(4087) => [
+   q(4088) => [
       q(Lushootseed),
       ],
-   q(4088) => [
+   q(4089) => [
       q(Lumba-Yakkha),
       ],
-   q(4089) => [
+   q(4090) => [
       q(Luwati),
       ],
-   q(4090) => [
+   q(4091) => [
       q(Luo (Cameroon)),
       ],
-   q(4091) => [
+   q(4092) => [
       q(Luyia),
       q(Oluluyia),
       ],
-   q(4092) => [
+   q(4093) => [
       q(Southern Luri),
       ],
-   q(4093) => [
+   q(4094) => [
       q(Maku'a),
       ],
-   q(4094) => [
+   q(4095) => [
       q(Lavukaleve),
       ],
-   q(4095) => [
+   q(4096) => [
       q(Standard Latvian),
       ],
-   q(4096) => [
+   q(4097) => [
       q(Levuka),
       ],
-   q(4097) => [
+   q(4098) => [
       q(Lwalu),
       ],
-   q(4098) => [
+   q(4099) => [
       q(Lewo Eleng),
       ],
-   q(4099) => [
+   q(4100) => [
       q(Wanga),
       q(Oluwanga),
       ],
-   q(4100) => [
+   q(4101) => [
       q(White Lachi),
       ],
-   q(4101) => [
+   q(4102) => [
       q(Eastern Lawa),
       ],
-   q(4102) => [
+   q(4103) => [
       q(Laomian),
       ],
-   q(4103) => [
+   q(4104) => [
       q(Luwo),
       ],
-   q(4104) => [
+   q(4105) => [
       q(Lewotobi),
       ],
-   q(4105) => [
+   q(4106) => [
       q(Lawu),
       ],
-   q(4106) => [
+   q(4107) => [
       q(Lewo),
       ],
-   q(4107) => [
+   q(4108) => [
       q(Layakha),
       ],
-   q(4108) => [
+   q(4109) => [
       q(Lyngngam),
       ],
-   q(4109) => [
+   q(4110) => [
       q(Luyana),
       ],
-   q(4110) => [
+   q(4111) => [
       q(Literary Chinese),
       ],
-   q(4111) => [
+   q(4112) => [
       q(Litzlitz),
       ],
-   q(4112) => [
+   q(4113) => [
       q(Leinong Naga),
       ],
-   q(4113) => [
+   q(4114) => [
       q(Laz),
       ],
-   q(4114) => [
+   q(4115) => [
       q(San Jeronimo Tecoatl Mazatec),
       ],
-   q(4115) => [
+   q(4116) => [
       q(Yutanduchi Mixtec),
       ],
-   q(4116) => [
+   q(4117) => [
       q(Bo-Rukul),
       ],
-   q(4117) => [
+   q(4118) => [
       q(Mafa),
       ],
-   q(4118) => [
+   q(4119) => [
       q(Jalapa De Diaz Mazatec),
       ],
-   q(4119) => [
+   q(4120) => [
       q(Mam),
       ],
-   q(4120) => [
+   q(4121) => [
       q(Chiquihuitlan Mazatec),
       ],
-   q(4121) => [
+   q(4122) => [
       q(San Francisco Matlatzinca),
       ],
-   q(4122) => [
+   q(4123) => [
       q(Huautla Mazatec),
       ],
-   q(4123) => [
+   q(4124) => [
       q(Satere-Mawe),
       ],
-   q(4124) => [
+   q(4125) => [
       q(Mampruli),
       ],
-   q(4125) => [
+   q(4126) => [
       q(North Moluccan Malay),
       ],
-   q(4126) => [
+   q(4127) => [
       q(Central Mazahua),
       ],
-   q(4127) => [
+   q(4128) => [
       q(Higaonon),
       ],
-   q(4128) => [
+   q(4129) => [
       q(Western Bukidnon Manobo),
       ],
-   q(4129) => [
+   q(4130) => [
       q(Macushi),
       ],
-   q(4130) => [
+   q(4131) => [
       q(Dibabawon Manobo),
       ],
-   q(4131) => [
+   q(4132) => [
       q(Molale),
       ],
-   q(4132) => [
+   q(4133) => [
       q(Baba Malay),
       ],
-   q(4133) => [
+   q(4134) => [
       q(Mangseng),
       ],
-   q(4134) => [
+   q(4135) => [
       q(Ilianen Manobo),
       ],
-   q(4135) => [
+   q(4136) => [
       q(Nadeb),
       ],
-   q(4136) => [
+   q(4137) => [
       q(Malol),
       ],
-   q(4137) => [
+   q(4138) => [
       q(Maxakali),
       ],
-   q(4138) => [
+   q(4139) => [
       q(Ombamba),
       ],
-   q(4139) => [
+   q(4140) => [
       q(Macaguan),
       ],
-   q(4140) => [
+   q(4141) => [
       q(Mbo (Cameroon)),
       ],
-   q(4141) => [
+   q(4142) => [
       q(Malayo),
       ],
-   q(4142) => [
+   q(4143) => [
       q(Maisin),
       ],
-   q(4143) => [
+   q(4144) => [
       q(Nukak Maku),
       ],
-   q(4144) => [
+   q(4145) => [
       q(Sarangani Manobo),
       ],
-   q(4145) => [
+   q(4146) => [
       q(Matigsalug Manobo),
       ],
-   q(4146) => [
+   q(4147) => [
       q(Mbula-Bwazza),
       ],
-   q(4147) => [
+   q(4148) => [
       q(Mbulungish),
       ],
-   q(4148) => [
+   q(4149) => [
       q(Maring),
       ],
-   q(4149) => [
+   q(4150) => [
       q(Mari (East Sepik Province)),
       ],
-   q(4150) => [
+   q(4151) => [
       q(Memoni),
       ],
-   q(4151) => [
+   q(4152) => [
       q(Amoltepec Mixtec),
       ],
-   q(4152) => [
+   q(4153) => [
       q(Maca),
       ],
-   q(4153) => [
+   q(4154) => [
       q(Machiguenga),
       ],
-   q(4154) => [
+   q(4155) => [
       q(Bitur),
       ],
-   q(4155) => [
+   q(4156) => [
       q(Sharanahua),
       ],
-   q(4156) => [
+   q(4157) => [
       q(Itundujia Mixtec),
       ],
-   q(4157) => [
+   q(4158) => [
       q(Matses),
       ],
-   q(4158) => [
+   q(4159) => [
       q(Mapoyo),
       ],
-   q(4159) => [
+   q(4160) => [
       q(Maquiritari),
       ],
-   q(4160) => [
+   q(4161) => [
       q(Mese),
       ],
-   q(4161) => [
+   q(4162) => [
       q(Mvanip),
       ],
-   q(4162) => [
+   q(4163) => [
       q(Mbunda),
       ],
-   q(4163) => [
+   q(4164) => [
       q(Macaguaje),
       ],
-   q(4164) => [
+   q(4165) => [
       q(Malaccan Creole Portuguese),
       ],
-   q(4165) => [
+   q(4166) => [
       q(Masana),
       ],
-   q(4166) => [
+   q(4167) => [
       q(Coatlan Mixe),
       ],
-   q(4167) => [
+   q(4168) => [
       q(Makaa),
       ],
-   q(4168) => [
+   q(4169) => [
       q(Ese),
       ],
-   q(4169) => [
+   q(4170) => [
       q(Menya),
       ],
-   q(4170) => [
+   q(4171) => [
       q(Mambai),
       ],
-   q(4171) => [
+   q(4172) => [
       q(Mengisa),
       ],
-   q(4172) => [
+   q(4173) => [
       q(Cameroon Mambila),
       ],
-   q(4173) => [
+   q(4174) => [
       q(Minanibai),
       ],
-   q(4174) => [
+   q(4175) => [
       q(Mawa (Chad)),
       ],
-   q(4175) => [
+   q(4176) => [
       q(Mpiemo),
       ],
-   q(4176) => [
+   q(4177) => [
       q(South Watut),
       ],
-   q(4177) => [
+   q(4178) => [
       q(Mawan),
       ],
-   q(4178) => [
+   q(4179) => [
       q(Mada (Nigeria)),
       ],
-   q(4179) => [
+   q(4180) => [
       q(Morigi),
       ],
-   q(4180) => [
+   q(4181) => [
       q(Male (Papua New Guinea)),
       ],
-   q(4181) => [
+   q(4182) => [
       q(Mbum),
       ],
-   q(4182) => [
+   q(4183) => [
       q(Maba (Chad)),
       ],
-   q(4183) => [
+   q(4184) => [
       q(Massalat),
       ],
-   q(4184) => [
+   q(4185) => [
       q(Maguindanaon),
       ],
-   q(4185) => [
+   q(4186) => [
       q(Mamvu),
       ],
-   q(4186) => [
+   q(4187) => [
       q(Mangbetu),
       ],
-   q(4187) => [
+   q(4188) => [
       q(Mangbutu),
       ],
-   q(4188) => [
+   q(4189) => [
       q(Maltese Sign Language),
       ],
-   q(4189) => [
+   q(4190) => [
       q(Mayogo),
       ],
-   q(4190) => [
+   q(4191) => [
       q(Mbati),
       ],
-   q(4191) => [
+   q(4192) => [
       q(Mbala),
       ],
-   q(4192) => [
+   q(4193) => [
       q(Mbole),
       ],
-   q(4193) => [
+   q(4194) => [
       q(Maria (Papua New Guinea)),
       ],
-   q(4194) => [
+   q(4195) => [
       q(Mbere),
       ],
-   q(4195) => [
+   q(4196) => [
       q(Mboko),
       ],
-   q(4196) => [
+   q(4197) => [
       q(Santa Lucia Monteverde Mixtec),
       ],
-   q(4197) => [
+   q(4198) => [
       q(Mbosi),
       ],
-   q(4198) => [
+   q(4199) => [
       q(Dizin),
       ],
-   q(4199) => [
+   q(4200) => [
       q(Male (Ethiopia)),
       ],
-   q(4200) => [
+   q(4201) => [
       q(Surui Do Para),
       ],
-   q(4201) => [
+   q(4202) => [
       q(Menka),
       ],
-   q(4202) => [
+   q(4203) => [
       q(Ikobi),
       ],
-   q(4203) => [
+   q(4204) => [
       q(Mara),
       ],
-   q(4204) => [
+   q(4205) => [
       q(Melpa),
       ],
-   q(4205) => [
+   q(4206) => [
       q(Mengen),
       ],
-   q(4206) => [
+   q(4207) => [
       q(Megam),
       ],
-   q(4207) => [
+   q(4208) => [
       q(Southwestern Tlaxiaco Mixtec),
       ],
-   q(4208) => [
+   q(4209) => [
       q(Midob),
       ],
-   q(4209) => [
+   q(4210) => [
       q(Meyah),
       ],
-   q(4210) => [
+   q(4211) => [
       q(Mekeo),
       ],
-   q(4211) => [
+   q(4212) => [
       q(Central Melanau),
       ],
-   q(4212) => [
+   q(4213) => [
       q(Mangala),
       ],
-   q(4213) => [
+   q(4214) => [
       q(Kedah Malay),
       ],
-   q(4214) => [
+   q(4215) => [
       q(Miriwung),
       ],
-   q(4215) => [
+   q(4216) => [
       q(Merey),
       ],
-   q(4216) => [
+   q(4217) => [
       q(Meru),
       ],
-   q(4217) => [
+   q(4218) => [
       q(Masmaje),
       ],
-   q(4218) => [
+   q(4219) => [
       q(Mato),
       ],
-   q(4219) => [
+   q(4220) => [
       q(Motu),
       ],
-   q(4220) => [
+   q(4221) => [
       q(Mano),
       ],
-   q(4221) => [
+   q(4222) => [
       q(Maaka),
       ],
-   q(4222) => [
+   q(4223) => [
       q(Hassaniyya),
       ],
-   q(4223) => [
+   q(4224) => [
       q(Menominee),
       ],
-   q(4224) => [
+   q(4225) => [
       q(Pattani Malay),
       ],
-   q(4225) => [
+   q(4226) => [
       q(Bangka),
       ],
-   q(4226) => [
+   q(4227) => [
       q(Mba),
       ],
-   q(4227) => [
+   q(4228) => [
       q(Mendankwe-Nkwen),
       ],
-   q(4228) => [
+   q(4229) => [
       q(Morisyen),
       ],
-   q(4229) => [
+   q(4230) => [
       q(Naki),
       ],
-   q(4230) => [
+   q(4231) => [
       q(Mogofin),
       ],
-   q(4231) => [
+   q(4232) => [
       q(Matal),
       ],
-   q(4232) => [
+   q(4233) => [
       q(Wandala),
       ],
-   q(4233) => [
+   q(4234) => [
       q(Mefele),
       ],
-   q(4234) => [
+   q(4235) => [
       q(North Mofu),
       ],
-   q(4235) => [
+   q(4236) => [
       q(Putai),
       ],
-   q(4236) => [
+   q(4237) => [
       q(Marghi South),
       ],
-   q(4237) => [
+   q(4238) => [
       q(Cross River Mbembe),
       ],
-   q(4238) => [
+   q(4239) => [
       q(Mbe),
       ],
-   q(4239) => [
+   q(4240) => [
       q(Makassar Malay),
       ],
-   q(4240) => [
+   q(4241) => [
       q(Moba),
       ],
-   q(4241) => [
+   q(4242) => [
       q(Marithiel),
       ],
-   q(4242) => [
+   q(4243) => [
       q(Mexican Sign Language),
       ],
-   q(4243) => [
+   q(4244) => [
       q(Mokerang),
       ],
-   q(4244) => [
+   q(4245) => [
       q(Mbwela),
       ],
-   q(4245) => [
+   q(4246) => [
       q(Mandjak),
       ],
-   q(4246) => [
+   q(4247) => [
       q(Mulaha),
       ],
-   q(4247) => [
+   q(4248) => [
       q(Melo),
       ],
-   q(4248) => [
+   q(4249) => [
       q(Mayo),
       ],
-   q(4249) => [
+   q(4250) => [
       q(Mabaan),
       ],
-   q(4250) => [
+   q(4251) => [
       q(Mararit),
       ],
-   q(4251) => [
+   q(4252) => [
       q(Morokodo),
       ],
-   q(4252) => [
+   q(4253) => [
       q(Moru),
       ],
-   q(4253) => [
+   q(4254) => [
       q(Mango),
       ],
-   q(4254) => [
+   q(4255) => [
       q(Maklew),
       ],
-   q(4255) => [
+   q(4256) => [
       q(Mpumpong),
       ],
-   q(4256) => [
+   q(4257) => [
       q(Makhuwa-Meetto),
       ],
-   q(4257) => [
+   q(4258) => [
       q(Lijili),
       ],
-   q(4258) => [
+   q(4259) => [
       q(Abureni),
       ],
-   q(4259) => [
+   q(4260) => [
       q(Mawes),
       ],
-   q(4260) => [
+   q(4261) => [
       q(Maleu-Kilenge),
       ],
-   q(4261) => [
+   q(4262) => [
       q(Mambae),
       ],
-   q(4262) => [
+   q(4263) => [
       q(Mbangi),
       ],
-   q(4263) => [
+   q(4264) => [
       q(Meta'),
       ],
-   q(4264) => [
+   q(4265) => [
       q(Eastern Magar),
       ],
-   q(4265) => [
+   q(4266) => [
       q(Malila),
       ],
-   q(4266) => [
+   q(4267) => [
       q(Mambwe-Lungu),
       ],
-   q(4267) => [
+   q(4268) => [
       q(Manda (Tanzania)),
       ],
-   q(4268) => [
+   q(4269) => [
       q(Mongol),
       ],
-   q(4269) => [
+   q(4270) => [
       q(Mailu),
       ],
-   q(4270) => [
+   q(4271) => [
       q(Matengo),
       ],
-   q(4271) => [
+   q(4272) => [
       q(Matumbi),
       ],
-   q(4272) => [
+   q(4273) => [
       q(Mbunga),
       ],
-   q(4273) => [
+   q(4274) => [
       q(Mbugwe),
       ],
-   q(4274) => [
+   q(4275) => [
       q(Manda (India)),
       ],
-   q(4275) => [
+   q(4276) => [
       q(Mahongwe),
       ],
-   q(4276) => [
+   q(4277) => [
       q(Mocho),
       ],
-   q(4277) => [
+   q(4278) => [
       q(Mbugu),
       ],
-   q(4278) => [
+   q(4279) => [
       q(Besisi),
       q(Mah Meri),
       ],
-   q(4279) => [
+   q(4280) => [
       q(Mamaa),
       ],
-   q(4280) => [
+   q(4281) => [
       q(Margu),
       ],
-   q(4281) => [
+   q(4282) => [
       q(Ma'di),
       ],
-   q(4282) => [
+   q(4283) => [
       q(Mogholi),
       ],
-   q(4283) => [
+   q(4284) => [
       q(Mungaka),
       ],
-   q(4284) => [
+   q(4285) => [
       q(Mauwake),
       ],
-   q(4285) => [
+   q(4286) => [
       q(Makhuwa-Moniga),
       ],
-   q(4286) => [
+   q(4287) => [
       q(Mocheno),
       ],
-   q(4287) => [
+   q(4288) => [
       q(Mashi (Zambia)),
       ],
-   q(4288) => [
+   q(4289) => [
       q(Balinese Malay),
       ],
-   q(4289) => [
+   q(4290) => [
       q(Mandan),
       ],
-   q(4290) => [
+   q(4291) => [
       q(Eastern Mari),
       ],
-   q(4291) => [
+   q(4292) => [
       q(Buru (Indonesia)),
       ],
-   q(4292) => [
+   q(4293) => [
       q(Mandahuaca),
       ],
-   q(4293) => [
+   q(4294) => [
       q(Digaro-Mishmi),
       q(Darang Deng),
       ],
-   q(4294) => [
+   q(4295) => [
       q(Mbukushu),
       ],
-   q(4295) => [
+   q(4296) => [
       q(Maru),
       q(Lhaovo),
       ],
-   q(4296) => [
+   q(4297) => [
       q(Ma'anyan),
       ],
-   q(4297) => [
+   q(4298) => [
       q(Mor (Mor Islands)),
       ],
-   q(4298) => [
+   q(4299) => [
       q(Miami),
       ],
-   q(4299) => [
+   q(4300) => [
       q(Atatlahuca Mixtec),
       ],
-   q(4300) => [
+   q(4301) => [
       q(Mandaic),
       ],
-   q(4301) => [
+   q(4302) => [
       q(Ocotepec Mixtec),
       ],
-   q(4302) => [
+   q(4303) => [
       q(Mofu-Gudur),
       ],
-   q(4303) => [
+   q(4304) => [
       q(San Miguel El Grande Mixtec),
       ],
-   q(4304) => [
+   q(4305) => [
       q(Chayuco Mixtec),
       ],
-   q(4305) => [
+   q(4306) => [
       q(Chigmecatitlan Mixtec),
       ],
-   q(4306) => [
+   q(4307) => [
       q(Abar),
       q(Mungbam),
       ],
-   q(4307) => [
+   q(4308) => [
       q(Mikasuki),
       ],
-   q(4308) => [
+   q(4309) => [
       q(Penoles Mixtec),
       ],
-   q(4309) => [
+   q(4310) => [
       q(Alacatlatzala Mixtec),
       ],
-   q(4310) => [
+   q(4311) => [
       q(Pinotepa Nacional Mixtec),
       ],
-   q(4311) => [
+   q(4312) => [
       q(Apasco-Apoala Mixtec),
       ],
-   q(4312) => [
+   q(4313) => [
       q(Miskito),
       ],
-   q(4313) => [
+   q(4314) => [
       q(Isthmus Mixe),
       ],
-   q(4314) => [
+   q(4315) => [
       q(Southern Puebla Mixtec),
       ],
-   q(4315) => [
+   q(4316) => [
       q(Cacaloxtepec Mixtec),
       ],
-   q(4316) => [
+   q(4317) => [
       q(Akoye),
       ],
-   q(4317) => [
+   q(4318) => [
       q(Mixtepec Mixtec),
       ],
-   q(4318) => [
+   q(4319) => [
       q(Ayutla Mixtec),
       ],
-   q(4319) => [
+   q(4320) => [
       q(Coatzospan Mixtec),
       ],
-   q(4320) => [
+   q(4321) => [
       q(San Juan Colorado Mixtec),
       ],
-   q(4321) => [
+   q(4322) => [
       q(Northwest Maidu),
       ],
-   q(4322) => [
+   q(4323) => [
       q(Muskum),
       ],
-   q(4323) => [
+   q(4324) => [
       q(Tu),
       ],
-   q(4324) => [
+   q(4325) => [
       q(Mwera (Nyasa)),
       ],
-   q(4325) => [
+   q(4326) => [
       q(Kim Mun),
       ],
-   q(4326) => [
+   q(4327) => [
       q(Mawak),
       ],
-   q(4327) => [
+   q(4328) => [
       q(Matukar),
       ],
-   q(4328) => [
+   q(4329) => [
       q(Mandeali),
       ],
-   q(4329) => [
+   q(4330) => [
       q(Medebur),
       ],
-   q(4330) => [
+   q(4331) => [
       q(Ma (Papua New Guinea)),
       ],
-   q(4331) => [
+   q(4332) => [
       q(Malankuravan),
       ],
-   q(4332) => [
+   q(4333) => [
       q(Malapandaram),
       ],
-   q(4333) => [
+   q(4334) => [
       q(Malaryan),
       ],
-   q(4334) => [
+   q(4335) => [
       q(Malavedan),
       ],
-   q(4335) => [
+   q(4336) => [
       q(Miship),
       ],
-   q(4336) => [
+   q(4337) => [
       q(Sauria Paharia),
       ],
-   q(4337) => [
+   q(4338) => [
       q(Manna-Dora),
       ],
-   q(4338) => [
+   q(4339) => [
       q(Mannan),
       ],
-   q(4339) => [
+   q(4340) => [
       q(Karbi),
       ],
-   q(4340) => [
+   q(4341) => [
       q(Mahali),
       ],
-   q(4341) => [
+   q(4342) => [
       q(Mahican),
       ],
-   q(4342) => [
+   q(4343) => [
       q(Majhi),
       ],
-   q(4343) => [
+   q(4344) => [
       q(Mbre),
       ],
-   q(4344) => [
+   q(4345) => [
       q(Mal Paharia),
       ],
-   q(4345) => [
+   q(4346) => [
       q(Siliput),
       ],
-   q(4346) => [
+   q(4347) => [
       q(Mawchi),
       ],
-   q(4347) => [
+   q(4348) => [
       q(Miya),
       ],
-   q(4348) => [
+   q(4349) => [
       q(Mak (China)),
       ],
-   q(4349) => [
+   q(4350) => [
       q(Dhatki),
       ],
-   q(4350) => [
+   q(4351) => [
       q(Mokilese),
       ],
-   q(4351) => [
+   q(4352) => [
       q(Byep),
       ],
-   q(4352) => [
+   q(4353) => [
       q(Mokole),
       ],
-   q(4353) => [
+   q(4354) => [
       q(Moklen),
       ],
-   q(4354) => [
+   q(4355) => [
       q(Kupang Malay),
       ],
-   q(4355) => [
+   q(4356) => [
       q(Mingang Doso),
       ],
-   q(4356) => [
+   q(4357) => [
       q(Moikodi),
       ],
-   q(4357) => [
+   q(4358) => [
       q(Bay Miwok),
       ],
-   q(4358) => [
+   q(4359) => [
       q(Malas),
       ],
-   q(4359) => [
+   q(4360) => [
       q(Silacayoapan Mixtec),
       ],
-   q(4360) => [
+   q(4361) => [
       q(Vamale),
       ],
-   q(4361) => [
+   q(4362) => [
       q(Konyanka Maninka),
       ],
-   q(4362) => [
+   q(4363) => [
       q(Mafea),
       ],
-   q(4363) => [
+   q(4364) => [
       q(Kituba (Congo)),
       ],
-   q(4364) => [
+   q(4365) => [
       q(Kinamiging Manobo),
       ],
-   q(4365) => [
+   q(4366) => [
       q(East Makian),
       ],
-   q(4366) => [
+   q(4367) => [
       q(Makasae),
       ],
-   q(4367) => [
+   q(4368) => [
       q(Malo),
       ],
-   q(4368) => [
+   q(4369) => [
       q(Mbule),
       ],
-   q(4369) => [
+   q(4370) => [
       q(Cao Lan),
       ],
-   q(4370) => [
+   q(4371) => [
       q(Manambu),
       ],
-   q(4371) => [
+   q(4372) => [
       q(Mal),
       ],
-   q(4372) => [
+   q(4373) => [
       q(Mape),
       ],
-   q(4373) => [
+   q(4374) => [
       q(Malimpung),
       ],
-   q(4374) => [
+   q(4375) => [
       q(Miltu),
       ],
-   q(4375) => [
+   q(4376) => [
       q(Ilwana),
       q(Kiwilwana),
       ],
-   q(4376) => [
+   q(4377) => [
       q(Malua Bay),
       ],
-   q(4377) => [
+   q(4378) => [
       q(Mulam),
       ],
-   q(4378) => [
+   q(4379) => [
       q(Malango),
       ],
-   q(4379) => [
+   q(4380) => [
       q(Mlomp),
       ],
-   q(4380) => [
+   q(4381) => [
       q(Bargam),
       ],
-   q(4381) => [
+   q(4382) => [
       q(Western Maninkakan),
       ],
-   q(4382) => [
+   q(4383) => [
       q(Vame),
       ],
-   q(4383) => [
+   q(4384) => [
       q(Masalit),
       ],
-   q(4384) => [
+   q(4385) => [
       q(To'abaita),
       ],
-   q(4385) => [
+   q(4386) => [
       q(Motlav),
       q(Mwotlap),
       ],
-   q(4386) => [
+   q(4387) => [
       q(Moloko),
       ],
-   q(4387) => [
+   q(4388) => [
       q(Malfaxal),
       q(Naha'ai),
       ],
-   q(4388) => [
+   q(4389) => [
       q(Malaynon),
       ],
-   q(4389) => [
+   q(4390) => [
       q(Mama),
       ],
-   q(4390) => [
+   q(4391) => [
       q(Momina),
       ],
-   q(4391) => [
+   q(4392) => [
       q(Michoacan Mazahua),
       ],
-   q(4392) => [
+   q(4393) => [
       q(Maonan),
       ],
-   q(4393) => [
+   q(4394) => [
       q(Mae),
       ],
-   q(4394) => [
+   q(4395) => [
       q(Mundat),
       ],
-   q(4395) => [
+   q(4396) => [
       q(North Ambrym),
       ],
-   q(4396) => [
+   q(4397) => [
       q(Mehinaku),
       ],
-   q(4397) => [
+   q(4398) => [
       q(Musar),
       ],
-   q(4398) => [
+   q(4399) => [
       q(Majhwar),
       ],
-   q(4399) => [
+   q(4400) => [
       q(Mukha-Dora),
       ],
-   q(4400) => [
+   q(4401) => [
       q(Man Met),
       ],
-   q(4401) => [
+   q(4402) => [
       q(Maii),
       ],
-   q(4402) => [
+   q(4403) => [
       q(Mamanwa),
       ],
-   q(4403) => [
+   q(4404) => [
       q(Mangga Buang),
       ],
-   q(4404) => [
+   q(4405) => [
       q(Siawi),
       ],
-   q(4405) => [
+   q(4406) => [
       q(Musak),
       ],
-   q(4406) => [
+   q(4407) => [
       q(Western Xiangxi Miao),
       ],
-   q(4407) => [
+   q(4408) => [
       q(Malalamai),
       ],
-   q(4408) => [
+   q(4409) => [
       q(Mmaala),
       ],
-   q(4409) => [
+   q(4410) => [
       q(Miriti),
       ],
-   q(4410) => [
+   q(4411) => [
       q(Emae),
       ],
-   q(4411) => [
+   q(4412) => [
       q(Madak),
       ],
-   q(4412) => [
+   q(4413) => [
       q(Migaama),
       ],
-   q(4413) => [
+   q(4414) => [
       q(Mabaale),
       ],
-   q(4414) => [
+   q(4415) => [
       q(Mbula),
       ],
-   q(4415) => [
+   q(4416) => [
       q(Muna),
       ],
-   q(4416) => [
+   q(4417) => [
       q(Monde),
       ],
-   q(4417) => [
+   q(4418) => [
       q(Naba),
       ],
-   q(4418) => [
+   q(4419) => [
       q(Mundani),
       ],
-   q(4419) => [
+   q(4420) => [
       q(Eastern Mnong),
       ],
-   q(4420) => [
+   q(4421) => [
       q(Mono (Democratic Republic of Congo)),
       ],
-   q(4421) => [
+   q(4422) => [
       q(Munji),
       ],
-   q(4422) => [
+   q(4423) => [
       q(Mandinka),
       ],
-   q(4423) => [
+   q(4424) => [
       q(Tiale),
       ],
-   q(4424) => [
+   q(4425) => [
       q(Mapena),
       ],
-   q(4425) => [
+   q(4426) => [
       q(Southern Mnong),
       ],
-   q(4426) => [
+   q(4427) => [
       q(Min Bei Chinese),
       ],
-   q(4427) => [
+   q(4428) => [
       q(Minriq),
       ],
-   q(4428) => [
+   q(4429) => [
       q(Mono (USA)),
       ],
-   q(4429) => [
+   q(4430) => [
       q(Mansi),
       ],
-   q(4430) => [
+   q(4431) => [
       q(Mer),
       ],
-   q(4431) => [
+   q(4432) => [
       q(Rennell-Bellona),
       ],
-   q(4432) => [
+   q(4433) => [
       q(Mon),
       ],
-   q(4433) => [
+   q(4434) => [
       q(Manikion),
       ],
-   q(4434) => [
+   q(4435) => [
       q(Manyawa),
       ],
-   q(4435) => [
+   q(4436) => [
       q(Moni),
       ],
-   q(4436) => [
+   q(4437) => [
       q(Mwan),
       ],
-   q(4437) => [
+   q(4438) => [
       q(Mocovi),
       ],
-   q(4438) => [
+   q(4439) => [
       q(Mobilian),
       ],
-   q(4439) => [
+   q(4440) => [
       q(Montagnais),
       ],
-   q(4440) => [
+   q(4441) => [
       q(Mongondow),
       ],
-   q(4441) => [
+   q(4442) => [
       q(Mboi),
       ],
-   q(4442) => [
+   q(4443) => [
       q(Monzombo),
       ],
-   q(4443) => [
+   q(4444) => [
       q(Morori),
       ],
-   q(4444) => [
+   q(4445) => [
       q(Mangue),
       ],
-   q(4445) => [
+   q(4446) => [
       q(Monom),
       ],
-   q(4446) => [
+   q(4447) => [
       q(Mopan Maya),
       ],
-   q(4447) => [
+   q(4448) => [
       q(Mor (Bomberai Peninsula)),
       ],
-   q(4448) => [
+   q(4449) => [
       q(Moro),
       ],
-   q(4449) => [
+   q(4450) => [
       q(Mogum),
       ],
-   q(4450) => [
+   q(4451) => [
       q(Mohave),
       ],
-   q(4451) => [
+   q(4452) => [
       q(Moi (Congo)),
       ],
-   q(4452) => [
+   q(4453) => [
       q(Molima),
       ],
-   q(4453) => [
+   q(4454) => [
       q(Shekkacho),
       ],
-   q(4454) => [
+   q(4455) => [
       q(Mukulu),
       q(Gergiko),
       ],
-   q(4455) => [
+   q(4456) => [
       q(Mpoto),
       ],
-   q(4456) => [
+   q(4457) => [
       q(Mullukmulluk),
       ],
-   q(4457) => [
+   q(4458) => [
       q(Mangarayi),
       ],
-   q(4458) => [
+   q(4459) => [
       q(Machinere),
       ],
-   q(4459) => [
+   q(4460) => [
       q(Majang),
       ],
-   q(4460) => [
+   q(4461) => [
       q(Marba),
       ],
-   q(4461) => [
+   q(4462) => [
       q(Maung),
       ],
-   q(4462) => [
+   q(4463) => [
       q(Mpade),
       ],
-   q(4463) => [
+   q(4464) => [
       q(Martu Wangka),
       ],
-   q(4464) => [
+   q(4465) => [
       q(Mbara (Chad)),
       ],
-   q(4465) => [
+   q(4466) => [
       q(Middle Watut),
       ],
-   q(4466) => [
+   q(4467) => [
       q(Yosondua Mixtec),
       ],
-   q(4467) => [
+   q(4468) => [
       q(Mindiri),
       ],
-   q(4468) => [
+   q(4469) => [
       q(Miu),
       ],
-   q(4469) => [
+   q(4470) => [
       q(Migabac),
       ],
-   q(4470) => [
+   q(4471) => [
       q(Matis),
       ],
-   q(4471) => [
+   q(4472) => [
       q(Vangunu),
       ],
-   q(4472) => [
+   q(4473) => [
       q(Dadibi),
       ],
-   q(4473) => [
+   q(4474) => [
       q(Mian),
       ],
-   q(4474) => [
+   q(4475) => [
       q(Makurap),
       ],
-   q(4475) => [
+   q(4476) => [
       q(Mungkip),
       ],
-   q(4476) => [
+   q(4477) => [
       q(Mapidian),
       ],
-   q(4477) => [
+   q(4478) => [
       q(Misima-Panaeati),
       ],
-   q(4478) => [
+   q(4479) => [
       q(Mapia),
       ],
-   q(4479) => [
+   q(4480) => [
       q(Mpi),
       ],
-   q(4480) => [
+   q(4481) => [
       q(Maba (Indonesia)),
       ],
-   q(4481) => [
+   q(4482) => [
       q(Mbuko),
       ],
-   q(4482) => [
+   q(4483) => [
       q(Mangole),
       ],
-   q(4483) => [
+   q(4484) => [
       q(Matepi),
       ],
-   q(4484) => [
+   q(4485) => [
       q(Momuna),
       ],
-   q(4485) => [
+   q(4486) => [
       q(Kota Bangun Kutai Malay),
       ],
-   q(4486) => [
+   q(4487) => [
       q(Tlazoyaltepec Mixtec),
       ],
-   q(4487) => [
+   q(4488) => [
       q(Mariri),
       ],
-   q(4488) => [
+   q(4489) => [
       q(Mamasa),
       ],
-   q(4489) => [
+   q(4490) => [
       q(Rajah Kabunsuwan Manobo),
       ],
-   q(4490) => [
+   q(4491) => [
       q(Mbelime),
       ],
-   q(4491) => [
+   q(4492) => [
       q(South Marquesan),
       ],
-   q(4492) => [
+   q(4493) => [
       q(Moronene),
       ],
-   q(4493) => [
+   q(4494) => [
       q(Modole),
       ],
-   q(4494) => [
+   q(4495) => [
       q(Manipa),
       ],
-   q(4495) => [
+   q(4496) => [
       q(Minokok),
       ],
-   q(4496) => [
+   q(4497) => [
       q(Mander),
       ],
-   q(4497) => [
+   q(4498) => [
       q(West Makian),
       ],
-   q(4498) => [
+   q(4499) => [
       q(Mok),
       ],
-   q(4499) => [
+   q(4500) => [
       q(Mandari),
       ],
-   q(4500) => [
+   q(4501) => [
       q(Mosimo),
       ],
-   q(4501) => [
+   q(4502) => [
       q(Murupi),
       ],
-   q(4502) => [
+   q(4503) => [
       q(Mamuju),
       ],
-   q(4503) => [
+   q(4504) => [
       q(Manggarai),
       ],
-   q(4504) => [
+   q(4505) => [
       q(Pano),
       ],
-   q(4505) => [
+   q(4506) => [
       q(Mlabri),
       ],
-   q(4506) => [
+   q(4507) => [
       q(Marino),
       ],
-   q(4507) => [
+   q(4508) => [
       q(Maricopa),
       ],
-   q(4508) => [
+   q(4509) => [
       q(Western Magar),
       ],
-   q(4509) => [
+   q(4510) => [
       q(Martha's Vineyard Sign Language),
       ],
-   q(4510) => [
+   q(4511) => [
       q(Elseng),
       ],
-   q(4511) => [
+   q(4512) => [
       q(Mising),
       ],
-   q(4512) => [
+   q(4513) => [
       q(Mara Chin),
       ],
-   q(4513) => [
+   q(4514) => [
       q(Western Mari),
       ],
-   q(4514) => [
+   q(4515) => [
       q(Hmwaveke),
       ],
-   q(4515) => [
+   q(4516) => [
       q(Mortlockese),
       ],
-   q(4516) => [
+   q(4517) => [
       q(Merlav),
       q(Mwerlap),
       ],
-   q(4517) => [
+   q(4518) => [
       q(Cheke Holo),
       ],
-   q(4518) => [
+   q(4519) => [
       q(Mru),
       ],
-   q(4519) => [
+   q(4520) => [
       q(Morouas),
       ],
-   q(4520) => [
+   q(4521) => [
       q(North Marquesan),
       ],
-   q(4521) => [
+   q(4522) => [
       q(Maria (India)),
       ],
-   q(4522) => [
+   q(4523) => [
       q(Maragus),
       ],
-   q(4523) => [
+   q(4524) => [
       q(Marghi Central),
       ],
-   q(4524) => [
+   q(4525) => [
       q(Mono (Cameroon)),
       ],
-   q(4525) => [
+   q(4526) => [
       q(Mangareva),
       ],
-   q(4526) => [
+   q(4527) => [
       q(Maranao),
       ],
-   q(4527) => [
+   q(4528) => [
       q(Maremgi),
       q(Dineor),
       ],
-   q(4528) => [
+   q(4529) => [
       q(Mandaya),
       ],
-   q(4529) => [
+   q(4530) => [
       q(Marind),
       ],
-   q(4530) => [
+   q(4531) => [
       q(Masbatenyo),
       ],
-   q(4531) => [
+   q(4532) => [
       q(Sankaran Maninka),
       ],
-   q(4532) => [
+   q(4533) => [
       q(Yucatec Maya Sign Language),
       ],
-   q(4533) => [
+   q(4534) => [
       q(Musey),
       ],
-   q(4534) => [
+   q(4535) => [
       q(Mekwei),
       ],
-   q(4535) => [
+   q(4536) => [
       q(Moraid),
       ],
-   q(4536) => [
+   q(4537) => [
       q(Masikoro Malagasy),
       ],
-   q(4537) => [
+   q(4538) => [
       q(Sabah Malay),
       ],
-   q(4538) => [
+   q(4539) => [
       q(Ma (Democratic Republic of Congo)),
       ],
-   q(4539) => [
+   q(4540) => [
       q(Mansaka),
       ],
-   q(4540) => [
+   q(4541) => [
       q(Molof),
       q(Poule),
       ],
-   q(4541) => [
+   q(4542) => [
       q(Agusan Manobo),
       ],
-   q(4542) => [
+   q(4543) => [
       q(Vures),
       ],
-   q(4543) => [
+   q(4544) => [
       q(Mombum),
       ],
-   q(4544) => [
+   q(4545) => [
       q(Maritsaua),
       ],
-   q(4545) => [
+   q(4546) => [
       q(Caac),
       ],
-   q(4546) => [
+   q(4547) => [
       q(Mongolian Sign Language),
       ],
-   q(4547) => [
+   q(4548) => [
       q(West Masela),
       ],
-   q(4548) => [
+   q(4549) => [
       q(Musom),
       ],
-   q(4549) => [
+   q(4550) => [
       q(Maslam),
       ],
-   q(4550) => [
+   q(4551) => [
       q(Mansoanka),
       ],
-   q(4551) => [
+   q(4552) => [
       q(Moresada),
       ],
-   q(4552) => [
+   q(4553) => [
       q(Aruamu),
       ],
-   q(4553) => [
+   q(4554) => [
       q(Momare),
       ],
-   q(4554) => [
+   q(4555) => [
       q(Cotabato Manobo),
       ],
-   q(4555) => [
+   q(4556) => [
       q(Anyin Morofo),
       ],
-   q(4556) => [
+   q(4557) => [
       q(Munit),
       ],
-   q(4557) => [
+   q(4558) => [
       q(Mualang),
       ],
-   q(4558) => [
+   q(4559) => [
       q(Mono (Solomon Islands)),
       ],
-   q(4559) => [
+   q(4560) => [
       q(Murik (Papua New Guinea)),
       ],
-   q(4560) => [
+   q(4561) => [
       q(Una),
       ],
-   q(4561) => [
+   q(4562) => [
       q(Munggui),
       ],
-   q(4562) => [
+   q(4563) => [
       q(Maiwa (Papua New Guinea)),
       ],
-   q(4563) => [
+   q(4564) => [
       q(Moskona),
       ],
-   q(4564) => [
+   q(4565) => [
       q(Mbe'),
       ],
-   q(4565) => [
+   q(4566) => [
       q(Montol),
       ],
-   q(4566) => [
+   q(4567) => [
       q(Mator),
       ],
-   q(4567) => [
+   q(4568) => [
       q(Matagalpa),
       ],
-   q(4568) => [
+   q(4569) => [
       q(Totontepec Mixe),
       ],
-   q(4569) => [
+   q(4570) => [
       q(Wichi Lhamtes Nocten),
       ],
-   q(4570) => [
+   q(4571) => [
       q(Muong),
       ],
-   q(4571) => [
+   q(4572) => [
       q(Mewari),
       ],
-   q(4572) => [
+   q(4573) => [
       q(Yora),
       ],
-   q(4573) => [
+   q(4574) => [
       q(Mota),
       ],
-   q(4574) => [
+   q(4575) => [
       q(Tututepec Mixtec),
       ],
-   q(4575) => [
+   q(4576) => [
       q(Asaro'o),
       ],
-   q(4576) => [
+   q(4577) => [
       q(Southern Binukidnon),
       ],
-   q(4577) => [
+   q(4578) => [
       q(Tidaa Mixtec),
       ],
-   q(4578) => [
+   q(4579) => [
       q(Nabi),
       ],
-   q(4579) => [
+   q(4580) => [
       q(Mundang),
       ],
-   q(4580) => [
+   q(4581) => [
       q(Mubi),
       ],
-   q(4581) => [
+   q(4582) => [
       q(Ajumbu),
       ],
-   q(4582) => [
+   q(4583) => [
       q(Mednyj Aleut),
       ],
-   q(4583) => [
+   q(4584) => [
       q(Media Lengua),
       ],
-   q(4584) => [
+   q(4585) => [
       q(Musgu),
       ],
-   q(4585) => [
+   q(4586) => [
       q(Mundu),
       ],
-   q(4586) => [
+   q(4587) => [
       q(Musi),
       ],
-   q(4587) => [
+   q(4588) => [
       q(Mabire),
       ],
-   q(4588) => [
+   q(4589) => [
       q(Mugom),
       ],
-   q(4589) => [
+   q(4590) => [
       q(Maiwala),
       ],
-   q(4590) => [
+   q(4591) => [
       q(Nyong),
       ],
-   q(4591) => [
+   q(4592) => [
       q(Malvi),
       ],
-   q(4592) => [
+   q(4593) => [
       q(Eastern Xiangxi Miao),
       ],
-   q(4593) => [
+   q(4594) => [
       q(Murle),
       ],
-   q(4594) => [
+   q(4595) => [
       q(Western Muria),
       ],
-   q(4595) => [
+   q(4596) => [
       q(Yaaku),
       ],
-   q(4596) => [
+   q(4597) => [
       q(Muthuvan),
       ],
-   q(4597) => [
+   q(4598) => [
       q(Bo-Ung),
       ],
-   q(4598) => [
+   q(4599) => [
       q(Muyang),
       ],
-   q(4599) => [
+   q(4600) => [
       q(Mursi),
       ],
-   q(4600) => [
+   q(4601) => [
       q(Manam),
       ],
-   q(4601) => [
+   q(4602) => [
       q(Mattole),
       ],
-   q(4602) => [
+   q(4603) => [
       q(Mamboru),
       ],
-   q(4603) => [
+   q(4604) => [
       q(Marwari (Pakistan)),
       ],
-   q(4604) => [
+   q(4605) => [
       q(Peripheral Mongolian),
       ],
-   q(4605) => [
+   q(4606) => [
       q(Yucuane Mixtec),
       ],
-   q(4606) => [
+   q(4607) => [
       q(Mulgi),
       ],
-   q(4607) => [
+   q(4608) => [
       q(Miyako),
       ],
-   q(4608) => [
+   q(4609) => [
       q(Mekmek),
       ],
-   q(4609) => [
+   q(4610) => [
       q(Mbara (Australia)),
       ],
-   q(4610) => [
+   q(4611) => [
       q(Muya),
       ],
-   q(4611) => [
+   q(4612) => [
       q(Minaveha),
       ],
-   q(4612) => [
+   q(4613) => [
       q(Marovo),
       ],
-   q(4613) => [
+   q(4614) => [
       q(Duri),
       ],
-   q(4614) => [
+   q(4615) => [
       q(Moere),
       ],
-   q(4615) => [
+   q(4616) => [
       q(Marau),
       ],
-   q(4616) => [
+   q(4617) => [
       q(Massep),
       ],
-   q(4617) => [
+   q(4618) => [
       q(Mpotovoro),
       ],
-   q(4618) => [
+   q(4619) => [
       q(Marfa),
       ],
-   q(4619) => [
+   q(4620) => [
       q(Tagal Murut),
       ],
-   q(4620) => [
+   q(4621) => [
       q(Machinga),
       ],
-   q(4621) => [
+   q(4622) => [
       q(Meoswar),
       ],
-   q(4622) => [
+   q(4623) => [
       q(Indus Kohistani),
       ],
-   q(4623) => [
+   q(4624) => [
       q(Mesqan),
       ],
-   q(4624) => [
+   q(4625) => [
       q(Mwatebu),
       ],
-   q(4625) => [
+   q(4626) => [
       q(Juwal),
       ],
-   q(4626) => [
+   q(4627) => [
       q(Are),
       ],
-   q(4627) => [
+   q(4628) => [
       q(Mwera (Chimwera)),
       ],
-   q(4628) => [
+   q(4629) => [
       q(Murrinh-Patha),
       ],
-   q(4629) => [
+   q(4630) => [
       q(Aiklep),
       ],
-   q(4630) => [
+   q(4631) => [
       q(Mouk-Aria),
       ],
-   q(4631) => [
+   q(4632) => [
       q(Labo),
       q(Ninde),
       ],
-   q(4632) => [
+   q(4633) => [
       q(Kita Maninkakan),
       ],
-   q(4633) => [
+   q(4634) => [
       q(Sar),
       ],
-   q(4634) => [
+   q(4635) => [
       q(Nyamwanga),
       ],
-   q(4635) => [
+   q(4636) => [
       q(Central Maewo),
       ],
-   q(4636) => [
+   q(4637) => [
       q(Kala Lagaw Ya),
       ],
-   q(4637) => [
+   q(4638) => [
       q(Mun Chin),
       ],
-   q(4638) => [
+   q(4639) => [
       q(Mwimbi-Muthambi),
       ],
-   q(4639) => [
+   q(4640) => [
       q(Moken),
       ],
-   q(4640) => [
+   q(4641) => [
       q(Mittu),
       ],
-   q(4641) => [
+   q(4642) => [
       q(Mentawai),
       ],
-   q(4642) => [
+   q(4643) => [
       q(Hmong Daw),
       ],
-   q(4643) => [
+   q(4644) => [
       q(Mediak),
       ],
-   q(4644) => [
+   q(4645) => [
       q(Mosiro),
       ],
-   q(4645) => [
+   q(4646) => [
       q(Moingi),
       ],
-   q(4646) => [
+   q(4647) => [
       q(Northwest Oaxaca Mixtec),
       ],
-   q(4647) => [
+   q(4648) => [
       q(Tezoatlan Mixtec),
       ],
-   q(4648) => [
+   q(4649) => [
       q(Manyika),
       ],
-   q(4649) => [
+   q(4650) => [
       q(Modang),
       ],
-   q(4650) => [
+   q(4651) => [
       q(Mele-Fila),
       ],
-   q(4651) => [
+   q(4652) => [
       q(Malgbe),
       ],
-   q(4652) => [
+   q(4653) => [
       q(Mbangala),
       ],
-   q(4653) => [
+   q(4654) => [
       q(Mvuba),
       ],
-   q(4654) => [
+   q(4655) => [
       q(Mozarabic),
       ],
-   q(4655) => [
+   q(4656) => [
       q(Miju-Mishmi),
       q(Geman Deng),
       ],
-   q(4656) => [
+   q(4657) => [
       q(Monumbo),
       ],
-   q(4657) => [
+   q(4658) => [
       q(Maxi Gbe),
       ],
-   q(4658) => [
+   q(4659) => [
       q(Meramera),
       ],
-   q(4659) => [
+   q(4660) => [
       q(Moi (Indonesia)),
       ],
-   q(4660) => [
+   q(4661) => [
       q(Mbowe),
       ],
-   q(4661) => [
+   q(4662) => [
       q(Tlahuitoltepec Mixe),
       ],
-   q(4662) => [
+   q(4663) => [
       q(Juquila Mixe),
       ],
-   q(4663) => [
+   q(4664) => [
       q(Murik (Malaysia)),
       ],
-   q(4664) => [
+   q(4665) => [
       q(Huitepec Mixtec),
       ],
-   q(4665) => [
+   q(4666) => [
       q(Jamiltepec Mixtec),
       ],
-   q(4666) => [
+   q(4667) => [
       q(Mada (Cameroon)),
       ],
-   q(4667) => [
+   q(4668) => [
       q(Metlatonoc Mixtec),
       ],
-   q(4668) => [
+   q(4669) => [
       q(Namo),
       ],
-   q(4669) => [
+   q(4670) => [
       q(Mahou),
       q(Mawukakan),
       ],
-   q(4670) => [
+   q(4671) => [
       q(Southeastern Nochixtlan Mixtec),
       ],
-   q(4671) => [
+   q(4672) => [
       q(Central Masela),
       ],
-   q(4672) => [
+   q(4673) => [
       q(Mbay),
       ],
-   q(4673) => [
+   q(4674) => [
       q(Mayeka),
       ],
-   q(4674) => [
+   q(4675) => [
       q(Maramba),
       ],
-   q(4675) => [
+   q(4676) => [
       q(Myene),
       ],
-   q(4676) => [
+   q(4677) => [
       q(Bambassi),
       ],
-   q(4677) => [
+   q(4678) => [
       q(Manta),
       ],
-   q(4678) => [
+   q(4679) => [
       q(Makah),
       ],
-   q(4679) => [
+   q(4680) => [
       q(Mina (India)),
       ],
-   q(4680) => [
+   q(4681) => [
       q(Mangayat),
       ],
-   q(4681) => [
+   q(4682) => [
       q(Mamara Senoufo),
       ],
-   q(4682) => [
+   q(4683) => [
       q(Moma),
       ],
-   q(4683) => [
+   q(4684) => [
       q(Me'en),
       ],
-   q(4684) => [
+   q(4685) => [
       q(Anfillo),
       ],
-   q(4685) => [
+   q(4686) => [
       q(Piraha),
       ],
-   q(4686) => [
+   q(4687) => [
       q(Muniche),
       ],
-   q(4687) => [
+   q(4688) => [
       q(Mesmes),
       ],
-   q(4688) => [
+   q(4689) => [
       q(Munduruku),
       ],
-   q(4689) => [
+   q(4690) => [
       q(Muyuw),
       ],
-   q(4690) => [
+   q(4691) => [
       q(Masaaba),
       ],
-   q(4691) => [
+   q(4692) => [
       q(Macuna),
       ],
-   q(4692) => [
+   q(4693) => [
       q(Classical Mandaic),
       ],
-   q(4693) => [
+   q(4694) => [
       q(Santa Maria Zacatepec Mixtec),
       ],
-   q(4694) => [
+   q(4695) => [
       q(Tumzabt),
       ],
-   q(4695) => [
+   q(4696) => [
       q(Madagascar Sign Language),
       ],
-   q(4696) => [
+   q(4697) => [
       q(Malimba),
       ],
-   q(4697) => [
+   q(4698) => [
       q(Morawa),
       ],
-   q(4698) => [
+   q(4699) => [
       q(Monastic Sign Language),
       ],
-   q(4699) => [
+   q(4700) => [
       q(Wichi Lhamtes Guisnay),
       ],
-   q(4700) => [
+   q(4701) => [
       q(Ixcatlan Mazatec),
       ],
-   q(4701) => [
+   q(4702) => [
       q(Manya),
       ],
-   q(4702) => [
+   q(4703) => [
       q(Nigeria Mambila),
       ],
-   q(4703) => [
+   q(4704) => [
       q(Mazatlan Mixe),
       ],
-   q(4704) => [
+   q(4705) => [
       q(Mumuye),
       ],
-   q(4705) => [
+   q(4706) => [
       q(Mazanderani),
       ],
-   q(4706) => [
+   q(4707) => [
       q(Matipuhy),
       ],
-   q(4707) => [
+   q(4708) => [
       q(Movima),
       ],
-   q(4708) => [
+   q(4709) => [
       q(Mori Atas),
       ],
-   q(4709) => [
+   q(4710) => [
       q(Marubo),
       ],
-   q(4710) => [
+   q(4711) => [
       q(Macanese),
       ],
-   q(4711) => [
+   q(4712) => [
       q(Mintil),
       ],
-   q(4712) => [
+   q(4713) => [
       q(Inapang),
       ],
-   q(4713) => [
+   q(4714) => [
       q(Manza),
       ],
-   q(4714) => [
+   q(4715) => [
       q(Deg),
       ],
-   q(4715) => [
+   q(4716) => [
       q(Mawayana),
       ],
-   q(4716) => [
+   q(4717) => [
       q(Mozambican Sign Language),
       ],
-   q(4717) => [
+   q(4718) => [
       q(Maiadomu),
       ],
-   q(4718) => [
+   q(4719) => [
       q(Namla),
       ],
-   q(4719) => [
+   q(4720) => [
       q(Southern Nambikuara),
       ],
-   q(4720) => [
+   q(4721) => [
       q(Narak),
       ],
-   q(4721) => [
+   q(4722) => [
       q(Nijadali),
       ],
-   q(4722) => [
+   q(4723) => [
       q(Naka'ela),
       ],
-   q(4723) => [
+   q(4724) => [
       q(Nabak),
       ],
-   q(4724) => [
+   q(4725) => [
       q(Naga Pidgin),
       ],
-   q(4725) => [
+   q(4726) => [
       q(Nalu),
       ],
-   q(4726) => [
+   q(4727) => [
       q(Nakanai),
       ],
-   q(4727) => [
+   q(4728) => [
       q(Nalik),
       ],
-   q(4728) => [
+   q(4729) => [
       q(Ngan'gityemerri),
       ],
-   q(4729) => [
+   q(4730) => [
       q(Min Nan Chinese),
       ],
-   q(4730) => [
+   q(4731) => [
       q(Naaba),
       ],
-   q(4731) => [
+   q(4732) => [
       q(Khoekhoe),
       q(Nama (Namibia)),
       ],
-   q(4732) => [
+   q(4733) => [
       q(Iguta),
       ],
-   q(4733) => [
+   q(4734) => [
       q(Naasioi),
       ],
-   q(4734) => [
+   q(4735) => [
       q(Cahungwarya),
       q(Hungworo),
       ],
-   q(4735) => [
+   q(4736) => [
       q(Nawuri),
       ],
-   q(4736) => [
+   q(4737) => [
       q(Nakwi),
       ],
-   q(4737) => [
+   q(4738) => [
       q(Narrinyeri),
       ],
-   q(4738) => [
+   q(4739) => [
       q(Coatepec Nahuatl),
       ],
-   q(4739) => [
+   q(4740) => [
       q(Nyemba),
       ],
-   q(4740) => [
+   q(4741) => [
       q(Ndoe),
       ],
-   q(4741) => [
+   q(4742) => [
       q(Chang Naga),
       ],
-   q(4742) => [
+   q(4743) => [
       q(Ngbinda),
       ],
-   q(4743) => [
+   q(4744) => [
       q(Konyak Naga),
       ],
-   q(4744) => [
+   q(4745) => [
       q(Nagarchal),
       ],
-   q(4745) => [
+   q(4746) => [
       q(Ngamo),
       ],
-   q(4746) => [
+   q(4747) => [
       q(Mao Naga),
       ],
-   q(4747) => [
+   q(4748) => [
       q(Ngarinman),
       ],
-   q(4748) => [
+   q(4749) => [
       q(Nake),
       ],
-   q(4749) => [
+   q(4750) => [
       q(Ngbaka Ma'bo),
       ],
-   q(4750) => [
+   q(4751) => [
       q(Kuri),
       ],
-   q(4751) => [
+   q(4752) => [
       q(Nkukoli),
       ],
-   q(4752) => [
+   q(4753) => [
       q(Nnam),
       ],
-   q(4753) => [
+   q(4754) => [
       q(Nggem),
       ],
-   q(4754) => [
+   q(4755) => [
       q(Numana-Nunku-Gbantu-Numbu),
       ],
-   q(4755) => [
+   q(4756) => [
       q(Namibian Sign Language),
       ],
-   q(4756) => [
+   q(4757) => [
       q(Na),
       ],
-   q(4757) => [
+   q(4758) => [
       q(Rongmei Naga),
       ],
-   q(4758) => [
+   q(4759) => [
       q(Ngamambo),
       ],
-   q(4759) => [
+   q(4760) => [
       q(Southern Ngbandi),
       ],
-   q(4760) => [
+   q(4761) => [
       q(Ningera),
       ],
-   q(4761) => [
+   q(4762) => [
       q(Iyo),
       ],
-   q(4762) => [
+   q(4763) => [
       q(Central Nicobarese),
       ],
-   q(4763) => [
+   q(4764) => [
       q(Ponam),
       ],
-   q(4764) => [
+   q(4765) => [
       q(Nachering),
       ],
-   q(4765) => [
+   q(4766) => [
       q(Yale),
       ],
-   q(4766) => [
+   q(4767) => [
       q(Notsi),
       ],
-   q(4767) => [
+   q(4768) => [
       q(Nisga'a),
       ],
-   q(4768) => [
+   q(4769) => [
       q(Central Huasteca Nahuatl),
       ],
-   q(4769) => [
+   q(4770) => [
       q(Classical Nahuatl),
       ],
-   q(4770) => [
+   q(4771) => [
       q(Northern Puebla Nahuatl),
       ],
-   q(4771) => [
+   q(4772) => [
       q(Nakara),
       ],
-   q(4772) => [
+   q(4773) => [
       q(Michoacan Nahuatl),
       ],
-   q(4773) => [
+   q(4774) => [
       q(Nambo),
       ],
-   q(4774) => [
+   q(4775) => [
       q(Nauna),
       ],
-   q(4775) => [
+   q(4776) => [
       q(Sibe),
       ],
-   q(4776) => [
+   q(4777) => [
       q(Ndaktup),
       ],
-   q(4777) => [
+   q(4778) => [
       q(Ncane),
       ],
-   q(4778) => [
+   q(4779) => [
       q(Nicaraguan Sign Language),
       ],
-   q(4779) => [
+   q(4780) => [
       q(Chothe Naga),
       ],
-   q(4780) => [
+   q(4781) => [
       q(Chumburung),
       ],
-   q(4781) => [
+   q(4782) => [
       q(Central Puebla Nahuatl),
       ],
-   q(4782) => [
+   q(4783) => [
       q(Natchez),
       ],
-   q(4783) => [
+   q(4784) => [
       q(Ndasa),
       ],
-   q(4784) => [
+   q(4785) => [
       q(Kenswei Nsei),
       ],
-   q(4785) => [
+   q(4786) => [
       q(Ndau),
       ],
-   q(4786) => [
+   q(4787) => [
       q(Nde-Nsele-Nta),
       ],
-   q(4787) => [
+   q(4788) => [
       q(Nadruvian),
       ],
-   q(4788) => [
+   q(4789) => [
       q(Ndengereko),
       ],
-   q(4789) => [
+   q(4790) => [
       q(Ndali),
       ],
-   q(4790) => [
+   q(4791) => [
       q(Samba Leko),
       ],
-   q(4791) => [
+   q(4792) => [
       q(Ndamba),
       ],
-   q(4792) => [
+   q(4793) => [
       q(Ndaka),
       ],
-   q(4793) => [
+   q(4794) => [
       q(Ndolo),
       ],
-   q(4794) => [
+   q(4795) => [
       q(Ndam),
       ],
-   q(4795) => [
+   q(4796) => [
       q(Ngundi),
       ],
-   q(4796) => [
+   q(4797) => [
       q(Ndo),
       ],
-   q(4797) => [
+   q(4798) => [
       q(Ndombe),
       ],
-   q(4798) => [
+   q(4799) => [
       q(Ndoola),
       ],
-   q(4799) => [
+   q(4800) => [
       q(Ndunga),
       ],
-   q(4800) => [
+   q(4801) => [
       q(Dugun),
       ],
-   q(4801) => [
+   q(4802) => [
       q(Ndut),
       ],
-   q(4802) => [
+   q(4803) => [
       q(Ndobo),
       ],
-   q(4803) => [
+   q(4804) => [
       q(Nduga),
       ],
-   q(4804) => [
+   q(4805) => [
       q(Lutos),
       ],
-   q(4805) => [
+   q(4806) => [
       q(Ndogo),
       ],
-   q(4806) => [
+   q(4807) => [
       q(Eastern Ngad'a),
       ],
-   q(4807) => [
+   q(4808) => [
       q(Toura (Cote d'Ivoire)),
       ],
-   q(4808) => [
+   q(4809) => [
       q(Nedebang),
       ],
-   q(4809) => [
+   q(4810) => [
       q(Nde-Gbite),
       ],
-   q(4810) => [
+   q(4811) => [
       q(Nelemwa-Nixumwak),
       ],
-   q(4811) => [
+   q(4812) => [
       q(Nefamese),
       ],
-   q(4812) => [
+   q(4813) => [
       q(Negidal),
       ],
-   q(4813) => [
+   q(4814) => [
       q(Nyenkha),
       ],
-   q(4814) => [
+   q(4815) => [
       q(Neo-Hittite),
       ],
-   q(4815) => [
+   q(4816) => [
       q(Neko),
       ],
-   q(4816) => [
+   q(4817) => [
       q(Neku),
       ],
-   q(4817) => [
+   q(4818) => [
       q(Nemi),
       ],
-   q(4818) => [
+   q(4819) => [
       q(Nengone),
       ],
-   q(4819) => [
+   q(4820) => [
       q(Na-Meo),
       ],
-   q(4820) => [
+   q(4821) => [
       q(North Central Mixe),
       ],
-   q(4821) => [
+   q(4822) => [
       q(Yahadian),
       ],
-   q(4822) => [
+   q(4823) => [
       q(Bhoti Kinnauri),
       ],
-   q(4823) => [
+   q(4824) => [
       q(Nete),
       ],
-   q(4824) => [
+   q(4825) => [
       q(Neo),
       ],
-   q(4825) => [
+   q(4826) => [
       q(Nyaheun),
       ],
-   q(4826) => [
+   q(4827) => [
       q(Neme),
       ],
-   q(4827) => [
+   q(4828) => [
       q(Neyo),
       ],
-   q(4828) => [
+   q(4829) => [
       q(Nez Perce),
       ],
-   q(4829) => [
+   q(4830) => [
       q(Dhao),
       ],
-   q(4830) => [
+   q(4831) => [
       q(Ahwai),
       ],
-   q(4831) => [
+   q(4832) => [
       q(Ayiwo),
       q(Aiwoo),
       ],
-   q(4832) => [
+   q(4833) => [
       q(Nafaanra),
       ],
-   q(4833) => [
+   q(4834) => [
       q(Mfumte),
       ],
-   q(4834) => [
+   q(4835) => [
       q(Ngbaka),
       ],
-   q(4835) => [
+   q(4836) => [
       q(Northern Ngbandi),
       ],
-   q(4836) => [
+   q(4837) => [
       q(Ngombe (Democratic Republic of Congo)),
       ],
-   q(4837) => [
+   q(4838) => [
       q(Ngando (Central African Republic)),
       ],
-   q(4838) => [
+   q(4839) => [
       q(Ngemba),
       ],
-   q(4839) => [
+   q(4840) => [
       q(Ngbaka Manza),
       ],
-   q(4840) => [
+   q(4841) => [
       q(N/u),
+      q(Nu),
       ],
-   q(4841) => [
+   q(4842) => [
       q(Ngizim),
       ],
-   q(4842) => [
+   q(4843) => [
       q(Ngie),
       ],
-   q(4843) => [
+   q(4844) => [
       q(Dalabon),
       ],
-   q(4844) => [
+   q(4845) => [
       q(Lomwe),
       ],
-   q(4845) => [
+   q(4846) => [
       q(Ngatik Men's Creole),
       ],
-   q(4846) => [
+   q(4847) => [
       q(Ngwo),
       ],
-   q(4847) => [
+   q(4848) => [
       q(Ngoni),
       ],
-   q(4848) => [
+   q(4849) => [
       q(Ngulu),
       ],
-   q(4849) => [
+   q(4850) => [
       q(Ngurimi),
       q(Ngoreme),
       ],
-   q(4850) => [
+   q(4851) => [
       q(Engdewu),
       ],
-   q(4851) => [
+   q(4852) => [
       q(Gvoko),
       ],
-   q(4852) => [
+   q(4853) => [
       q(Ngeq),
       ],
-   q(4853) => [
+   q(4854) => [
       q(Guerrero Nahuatl),
       ],
-   q(4854) => [
+   q(4855) => [
       q(Nagumi),
       ],
-   q(4855) => [
+   q(4856) => [
       q(Ngwaba),
       ],
-   q(4856) => [
+   q(4857) => [
       q(Nggwahyi),
       ],
-   q(4857) => [
+   q(4858) => [
       q(Tibea),
       ],
-   q(4858) => [
+   q(4859) => [
       q(Ngungwel),
       ],
-   q(4859) => [
+   q(4860) => [
       q(Nhanda),
       ],
-   q(4860) => [
+   q(4861) => [
       q(Beng),
       ],
-   q(4861) => [
+   q(4862) => [
       q(Tabasco Nahuatl),
       ],
-   q(4862) => [
+   q(4863) => [
       q(Chiripa),
       q(Ava Guarani),
       ],
-   q(4863) => [
+   q(4864) => [
       q(Eastern Huasteca Nahuatl),
       ],
-   q(4864) => [
+   q(4865) => [
       q(Nhuwala),
       ],
-   q(4865) => [
+   q(4866) => [
       q(Tetelcingo Nahuatl),
       ],
-   q(4866) => [
+   q(4867) => [
       q(Nahari),
       ],
-   q(4867) => [
+   q(4868) => [
       q(Zacatlan-Ahuacatlan-Tepetzintla Nahuatl),
       ],
-   q(4868) => [
+   q(4869) => [
       q(Isthmus-Cosoleacaque Nahuatl),
       ],
-   q(4869) => [
+   q(4870) => [
       q(Morelos Nahuatl),
       ],
-   q(4870) => [
+   q(4871) => [
       q(Central Nahuatl),
       ],
-   q(4871) => [
+   q(4872) => [
       q(Takuu),
       ],
-   q(4872) => [
+   q(4873) => [
       q(Isthmus-Pajapan Nahuatl),
       ],
-   q(4873) => [
+   q(4874) => [
       q(Huaxcaleca Nahuatl),
       ],
-   q(4874) => [
+   q(4875) => [
       q(Naro),
       ],
-   q(4875) => [
+   q(4876) => [
       q(Ometepec Nahuatl),
       ],
-   q(4876) => [
+   q(4877) => [
       q(Noone),
       ],
-   q(4877) => [
+   q(4878) => [
       q(Temascaltepec Nahuatl),
       ],
-   q(4878) => [
+   q(4879) => [
       q(Western Huasteca Nahuatl),
       ],
-   q(4879) => [
+   q(4880) => [
       q(Isthmus-Mecayapan Nahuatl),
       ],
-   q(4880) => [
+   q(4881) => [
       q(Northern Oaxaca Nahuatl),
       ],
-   q(4881) => [
+   q(4882) => [
       q(Santa Maria La Alta Nahuatl),
       ],
-   q(4882) => [
+   q(4883) => [
       q(Nakame),
       ],
-   q(4883) => [
+   q(4884) => [
       q(Ngandi),
       ],
-   q(4884) => [
+   q(4885) => [
       q(Niellim),
       ],
-   q(4885) => [
+   q(4886) => [
       q(Nek),
       ],
-   q(4886) => [
+   q(4887) => [
       q(Ngalakan),
       ],
-   q(4887) => [
+   q(4888) => [
       q(Nyiha (Tanzania)),
       ],
-   q(4888) => [
+   q(4889) => [
       q(Nii),
       ],
-   q(4889) => [
+   q(4890) => [
       q(Ngaju),
       ],
-   q(4890) => [
+   q(4891) => [
       q(Southern Nicobarese),
       ],
-   q(4891) => [
+   q(4892) => [
       q(Nila),
       ],
-   q(4892) => [
+   q(4893) => [
       q(Nilamba),
       ],
-   q(4893) => [
+   q(4894) => [
       q(Ninzo),
       ],
-   q(4894) => [
+   q(4895) => [
       q(Nganasan),
       ],
-   q(4895) => [
+   q(4896) => [
       q(Nandi),
       ],
-   q(4896) => [
+   q(4897) => [
       q(Nimboran),
       ],
-   q(4897) => [
+   q(4898) => [
       q(Nimi),
       ],
-   q(4898) => [
+   q(4899) => [
       q(Southeastern Kolami),
       ],
-   q(4899) => [
+   q(4900) => [
       q(Gilyak),
       ],
-   q(4900) => [
+   q(4901) => [
       q(Nimo),
       ],
-   q(4901) => [
+   q(4902) => [
       q(Hema),
       ],
-   q(4902) => [
+   q(4903) => [
       q(Ngiti),
       ],
-   q(4903) => [
+   q(4904) => [
       q(Ningil),
       ],
-   q(4904) => [
+   q(4905) => [
       q(Nzanyi),
       ],
-   q(4905) => [
+   q(4906) => [
       q(Nocte Naga),
       ],
-   q(4906) => [
+   q(4907) => [
       q(Ndonde Hamba),
       ],
-   q(4907) => [
+   q(4908) => [
       q(Lotha Naga),
       ],
-   q(4908) => [
+   q(4909) => [
       q(Gudanji),
       ],
-   q(4909) => [
+   q(4910) => [
       q(Njen),
       ],
-   q(4910) => [
+   q(4911) => [
       q(Njalgulgule),
       ],
-   q(4911) => [
+   q(4912) => [
       q(Angami Naga),
       ],
-   q(4912) => [
+   q(4913) => [
       q(Liangmai Naga),
       ],
-   q(4913) => [
+   q(4914) => [
       q(Ao Naga),
       ],
-   q(4914) => [
+   q(4915) => [
       q(Njerep),
       ],
-   q(4915) => [
+   q(4916) => [
       q(Nisa),
       ],
-   q(4916) => [
+   q(4917) => [
       q(Ndyuka-Trio Pidgin),
       ],
-   q(4917) => [
+   q(4918) => [
       q(Ngadjunmaya),
       ],
-   q(4918) => [
+   q(4919) => [
       q(Kunyi),
       ],
-   q(4919) => [
+   q(4920) => [
       q(Njyem),
       ],
-   q(4920) => [
+   q(4921) => [
       q(Nyishi),
       ],
-   q(4921) => [
+   q(4922) => [
       q(Nkoya),
       ],
-   q(4922) => [
+   q(4923) => [
       q(Khoibu Naga),
       ],
-   q(4923) => [
+   q(4924) => [
       q(Nkongho),
       ],
-   q(4924) => [
+   q(4925) => [
       q(Koireng),
       ],
-   q(4925) => [
+   q(4926) => [
       q(Duke),
       ],
-   q(4926) => [
+   q(4927) => [
       q(Inpui Naga),
       ],
-   q(4927) => [
+   q(4928) => [
       q(Nekgini),
       ],
-   q(4928) => [
+   q(4929) => [
       q(Khezha Naga),
       ],
-   q(4929) => [
+   q(4930) => [
       q(Thangal Naga),
       ],
-   q(4930) => [
+   q(4931) => [
       q(Nakai),
       ],
-   q(4931) => [
+   q(4932) => [
       q(Nokuku),
       ],
-   q(4932) => [
+   q(4933) => [
       q(Namat),
       ],
-   q(4933) => [
+   q(4934) => [
       q(Nkangala),
       ],
-   q(4934) => [
+   q(4935) => [
       q(Nkonya),
       ],
-   q(4935) => [
+   q(4936) => [
       q(Niuatoputapu),
       ],
-   q(4936) => [
+   q(4937) => [
       q(Nkami),
       ],
-   q(4937) => [
+   q(4938) => [
       q(Nukuoro),
       ],
-   q(4938) => [
+   q(4939) => [
       q(North Asmat),
       ],
-   q(4939) => [
+   q(4940) => [
       q(Nyika (Tanzania)),
       ],
-   q(4940) => [
+   q(4941) => [
       q(Bouna Kulango),
       ],
-   q(4941) => [
+   q(4942) => [
       q(Nyika (Malawi and Zambia)),
       ],
-   q(4942) => [
+   q(4943) => [
       q(Nkutu),
       ],
-   q(4943) => [
+   q(4944) => [
       q(Nkoroo),
       ],
-   q(4944) => [
+   q(4945) => [
       q(Nkari),
       ],
-   q(4945) => [
+   q(4946) => [
       q(Ngombale),
       ],
-   q(4946) => [
+   q(4947) => [
       q(Nalca),
       ],
-   q(4947) => [
+   q(4948) => [
       q(East Nyala),
       ],
-   q(4948) => [
+   q(4949) => [
       q(Gela),
       ],
-   q(4949) => [
+   q(4950) => [
       q(Grangali),
       ],
-   q(4950) => [
+   q(4951) => [
       q(Nyali),
       ],
-   q(4951) => [
+   q(4952) => [
       q(Ninia Yali),
       ],
-   q(4952) => [
+   q(4953) => [
       q(Nihali),
       ],
-   q(4953) => [
+   q(4954) => [
       q(Ngul),
       ],
-   q(4954) => [
+   q(4955) => [
       q(Lao Naga),
       ],
-   q(4955) => [
+   q(4956) => [
       q(Nchumbulu),
       ],
-   q(4956) => [
+   q(4957) => [
       q(Orizaba Nahuatl),
       ],
-   q(4957) => [
+   q(4958) => [
       q(Walangama),
       ],
-   q(4958) => [
+   q(4959) => [
       q(Nahali),
       ],
-   q(4959) => [
+   q(4960) => [
       q(Nyamal),
       ],
-   q(4960) => [
+   q(4961) => [
       q(Nalogo),
       ],
-   q(4961) => [
+   q(4962) => [
       q(Maram Naga),
       ],
-   q(4962) => [
+   q(4963) => [
       q(Big Nambas),
       q(V'enen Taut),
       ],
-   q(4963) => [
+   q(4964) => [
       q(Ngam),
       ],
-   q(4964) => [
+   q(4965) => [
       q(Ndumu),
       ],
-   q(4965) => [
+   q(4966) => [
       q(Mzieme Naga),
       ],
-   q(4966) => [
+   q(4967) => [
       q(Tangkhul Naga (India)),
       ],
-   q(4967) => [
+   q(4968) => [
       q(Kwasio),
       ],
-   q(4968) => [
+   q(4969) => [
       q(Monsang Naga),
       ],
-   q(4969) => [
+   q(4970) => [
       q(Nyam),
       ],
-   q(4970) => [
+   q(4971) => [
       q(Ngombe (Central African Republic)),
       ],
-   q(4971) => [
+   q(4972) => [
       q(Namakura),
       ],
-   q(4972) => [
+   q(4973) => [
       q(Ndemli),
       ],
-   q(4973) => [
+   q(4974) => [
       q(Manangba),
       ],
-   q(4974) => [
+   q(4975) => [
       q(!Xoo),
+      q(Xoo),
       ],
-   q(4975) => [
+   q(4976) => [
       q(Moyon Naga),
       ],
-   q(4976) => [
+   q(4977) => [
       q(Nimanbur),
       ],
-   q(4977) => [
+   q(4978) => [
       q(Nambya),
       ],
-   q(4978) => [
+   q(4979) => [
       q(Nimbari),
       ],
-   q(4979) => [
+   q(4980) => [
       q(Letemboi),
       ],
-   q(4980) => [
+   q(4981) => [
       q(Namonuito),
       ],
-   q(4981) => [
+   q(4982) => [
       q(Northeast Maidu),
       ],
-   q(4982) => [
+   q(4983) => [
       q(Ngamini),
       ],
-   q(4983) => [
+   q(4984) => [
       q(Nimoa),
       q(Rifao),
       ],
-   q(4984) => [
+   q(4985) => [
       q(Nama (Papua New Guinea)),
       ],
-   q(4985) => [
+   q(4986) => [
       q(Namuyi),
       ],
-   q(4986) => [
+   q(4987) => [
       q(Nawdm),
       ],
-   q(4987) => [
+   q(4988) => [
       q(Nyangumarta),
       ],
-   q(4988) => [
+   q(4989) => [
       q(Nande),
       ],
-   q(4989) => [
+   q(4990) => [
       q(Nancere),
       ],
-   q(4990) => [
+   q(4991) => [
       q(West Ambae),
       ],
-   q(4991) => [
+   q(4992) => [
       q(Ngandyera),
       ],
-   q(4992) => [
+   q(4993) => [
       q(Ngaing),
       ],
-   q(4993) => [
+   q(4994) => [
       q(Maring Naga),
       ],
-   q(4994) => [
+   q(4995) => [
       q(Ngiemboon),
       ],
-   q(4995) => [
+   q(4996) => [
       q(North Nuaulu),
       ],
-   q(4996) => [
+   q(4997) => [
       q(Nyangatom),
       ],
-   q(4997) => [
+   q(4998) => [
       q(Nankina),
       ],
-   q(4998) => [
+   q(4999) => [
       q(Northern Rengma Naga),
       ],
-   q(4999) => [
+   q(5000) => [
       q(Namia),
       ],
-   q(5000) => [
+   q(5001) => [
       q(Ngete),
       ],
-   q(5001) => [
+   q(5002) => [
       q(Wancho Naga),
       ],
-   q(5002) => [
+   q(5003) => [
       q(Ngindo),
       ],
-   q(5003) => [
+   q(5004) => [
       q(Narungga),
       ],
-   q(5004) => [
+   q(5005) => [
       q(Ningye),
       ],
-   q(5005) => [
+   q(5006) => [
       q(Nanticoke),
       ],
-   q(5006) => [
+   q(5007) => [
       q(Dwang),
       ],
-   q(5007) => [
+   q(5008) => [
       q(Nugunu (Australia)),
       ],
-   q(5008) => [
+   q(5009) => [
       q(Southern Nuni),
       ],
-   q(5009) => [
+   q(5010) => [
       q(Nyangga),
       ],
-   q(5010) => [
+   q(5011) => [
       q(Nda'nda'),
       ],
-   q(5011) => [
+   q(5012) => [
       q(Woun Meu),
       ],
-   q(5012) => [
+   q(5013) => [
       q(Nuk),
       ],
-   q(5013) => [
+   q(5014) => [
       q(Northern Thai),
       ],
-   q(5014) => [
+   q(5015) => [
       q(Nimadi),
       ],
-   q(5015) => [
+   q(5016) => [
       q(Nomane),
       ],
-   q(5016) => [
+   q(5017) => [
       q(Nomu),
       ],
-   q(5017) => [
+   q(5018) => [
       q(Noiri),
       ],
-   q(5018) => [
+   q(5019) => [
       q(Nonuya),
       ],
-   q(5019) => [
+   q(5020) => [
       q(Nooksack),
       ],
-   q(5020) => [
+   q(5021) => [
       q(Nomlaki),
       ],
-   q(5021) => [
+   q(5022) => [
       q(Nocaman),
       ],
-   q(5022) => [
+   q(5023) => [
       q(Numanggang),
       ],
-   q(5023) => [
+   q(5024) => [
       q(Ngongo),
       ],
-   q(5024) => [
+   q(5025) => [
       q(Eastern Nisu),
       ],
-   q(5025) => [
+   q(5026) => [
       q(Nomatsiguenga),
       ],
-   q(5026) => [
+   q(5027) => [
       q(Ewage-Notu),
       ],
-   q(5027) => [
+   q(5028) => [
       q(Novial),
       ],
-   q(5028) => [
+   q(5029) => [
       q(Nyambo),
       ],
-   q(5029) => [
+   q(5030) => [
       q(Noy),
       ],
-   q(5030) => [
+   q(5031) => [
       q(Nayi),
       ],
-   q(5031) => [
+   q(5032) => [
       q(Nar Phu),
       ],
-   q(5032) => [
+   q(5033) => [
       q(Nupbikha),
       ],
-   q(5033) => [
+   q(5034) => [
       q(Ponyo-Gongwang Naga),
       ],
-   q(5034) => [
+   q(5035) => [
       q(Phom Naga),
       ],
-   q(5035) => [
+   q(5036) => [
       q(Nepali (individual language)),
       ],
-   q(5036) => [
+   q(5037) => [
       q(Southeastern Puebla Nahuatl),
       ],
-   q(5037) => [
+   q(5038) => [
       q(Mondropolon),
       ],
-   q(5038) => [
+   q(5039) => [
       q(Pochuri Naga),
       ],
-   q(5039) => [
+   q(5040) => [
       q(Nipsan),
       ],
-   q(5040) => [
+   q(5041) => [
       q(Puimei Naga),
       ],
-   q(5041) => [
+   q(5042) => [
       q(Napu),
       ],
-   q(5042) => [
+   q(5043) => [
       q(Southern Nago),
       ],
-   q(5043) => [
+   q(5044) => [
       q(Kura Ede Nago),
       ],
-   q(5044) => [
+   q(5045) => [
       q(Ndom),
       ],
-   q(5045) => [
+   q(5046) => [
       q(Nen),
       ],
-   q(5046) => [
+   q(5047) => [
       q(Kyan-Karyaw Naga),
       ],
-   q(5047) => [
+   q(5048) => [
       q(Akyaung Ari Naga),
       ],
-   q(5048) => [
+   q(5049) => [
       q(Ngom),
       ],
-   q(5049) => [
+   q(5050) => [
       q(Nara),
       ],
-   q(5050) => [
+   q(5051) => [
       q(Noric),
       ],
-   q(5051) => [
+   q(5052) => [
       q(Southern Rengma Naga),
       ],
-   q(5052) => [
+   q(5053) => [
       q(Jerriais),
       q(Guernesiais),
       ],
-   q(5053) => [
+   q(5054) => [
       q(Narango),
       ],
-   q(5054) => [
+   q(5055) => [
       q(Chokri Naga),
       ],
-   q(5055) => [
+   q(5056) => [
       q(Ngarla),
       ],
-   q(5056) => [
+   q(5057) => [
       q(Ngarluma),
       ],
-   q(5057) => [
+   q(5058) => [
       q(Narom),
       ],
-   q(5058) => [
+   q(5059) => [
       q(Norn),
       ],
-   q(5059) => [
+   q(5060) => [
       q(North Picene),
       ],
-   q(5060) => [
+   q(5061) => [
       q(Norra),
       q(Nora),
       ],
-   q(5061) => [
+   q(5062) => [
       q(Northern Kalapuya),
       ],
-   q(5062) => [
+   q(5063) => [
       q(Narua),
       ],
-   q(5063) => [
+   q(5064) => [
       q(Ngurmbur),
       ],
-   q(5064) => [
+   q(5065) => [
       q(Lala),
       ],
-   q(5065) => [
+   q(5066) => [
       q(Sangtam Naga),
       ],
-   q(5066) => [
+   q(5067) => [
       q(Nshi),
       ],
-   q(5067) => [
+   q(5068) => [
       q(Southern Nisu),
       ],
-   q(5068) => [
+   q(5069) => [
       q(Nsenga),
       ],
-   q(5069) => [
+   q(5070) => [
       q(Northwestern Nisu),
       ],
-   q(5070) => [
+   q(5071) => [
       q(Ngasa),
       ],
-   q(5071) => [
+   q(5072) => [
       q(Ngoshie),
       ],
-   q(5072) => [
+   q(5073) => [
       q(Nigerian Sign Language),
       ],
-   q(5073) => [
+   q(5074) => [
       q(Naskapi),
       ],
-   q(5074) => [
+   q(5075) => [
       q(Norwegian Sign Language),
       ],
-   q(5075) => [
+   q(5076) => [
       q(Sumi Naga),
       ],
-   q(5076) => [
+   q(5077) => [
       q(Nehan),
       ],
-   q(5077) => [
+   q(5078) => [
       q(Nepalese Sign Language),
       ],
-   q(5078) => [
+   q(5079) => [
       q(Northern Sierra Miwok),
       ],
-   q(5079) => [
+   q(5080) => [
       q(Maritime Sign Language),
       ],
-   q(5080) => [
+   q(5081) => [
       q(Nali),
       ],
-   q(5081) => [
+   q(5082) => [
       q(Tase Naga),
       ],
-   q(5082) => [
+   q(5083) => [
       q(Sierra Negra Nahuatl),
       ],
-   q(5083) => [
+   q(5084) => [
       q(Southwestern Nisu),
       ],
-   q(5084) => [
+   q(5085) => [
       q(Navut),
       ],
-   q(5085) => [
+   q(5086) => [
       q(Nsongo),
       ],
-   q(5086) => [
+   q(5087) => [
       q(Nasal),
       ],
-   q(5087) => [
+   q(5088) => [
       q(Nisenan),
       ],
-   q(5088) => [
+   q(5089) => [
       q(Nathembo),
       ],
-   q(5089) => [
+   q(5090) => [
       q(Ngantangarra),
       ],
-   q(5090) => [
+   q(5091) => [
       q(Natioro),
       ],
-   q(5091) => [
+   q(5092) => [
       q(Ngaanyatjarra),
       ],
-   q(5092) => [
+   q(5093) => [
       q(Ikoma-Nata-Isenye),
       ],
-   q(5093) => [
+   q(5094) => [
       q(Nateni),
       ],
-   q(5094) => [
+   q(5095) => [
       q(Ntomba),
       ],
-   q(5095) => [
+   q(5096) => [
       q(Northern Tepehuan),
       ],
-   q(5096) => [
+   q(5097) => [
       q(Delo),
       ],
-   q(5097) => [
+   q(5098) => [
       q(Natagaimas),
       ],
-   q(5098) => [
+   q(5099) => [
       q(Natugu),
       ],
-   q(5099) => [
+   q(5100) => [
       q(Nottoway),
       ],
-   q(5100) => [
+   q(5101) => [
       q(Tangkhul Naga (Myanmar)),
       ],
-   q(5101) => [
+   q(5102) => [
       q(Mantsi),
       ],
-   q(5102) => [
+   q(5103) => [
       q(Natanzi),
       ],
-   q(5103) => [
+   q(5104) => [
       q(Yuanga),
       ],
-   q(5104) => [
+   q(5105) => [
       q(Nukuini),
       ],
-   q(5105) => [
+   q(5106) => [
       q(Ngala),
       ],
-   q(5106) => [
+   q(5107) => [
       q(Ngundu),
       ],
-   q(5107) => [
+   q(5108) => [
       q(Nusu),
       ],
-   q(5108) => [
+   q(5109) => [
       q(Nungali),
       ],
-   q(5109) => [
+   q(5110) => [
       q(Ndunda),
       ],
-   q(5110) => [
+   q(5111) => [
       q(Ngumbi),
       ],
-   q(5111) => [
+   q(5112) => [
       q(Nyole),
       ],
-   q(5112) => [
+   q(5113) => [
       q(Nuu-chah-nulth),
       q(Nuuchahnulth),
       ],
-   q(5113) => [
+   q(5114) => [
       q(Nusa Laut),
       ],
-   q(5114) => [
+   q(5115) => [
       q(Niuafo'ou),
       ],
-   q(5115) => [
+   q(5116) => [
       q(Anong),
       ],
-   q(5116) => [
+   q(5117) => [
       q(Nguon),
       ],
-   q(5117) => [
+   q(5118) => [
       q(Nupe-Nupe-Tako),
       ],
-   q(5118) => [
+   q(5119) => [
       q(Nukumanu),
       ],
-   q(5119) => [
+   q(5120) => [
       q(Nukuria),
       ],
-   q(5120) => [
+   q(5121) => [
       q(Nuer),
       ],
-   q(5121) => [
+   q(5122) => [
       q(Nung (Viet Nam)),
       ],
-   q(5122) => [
+   q(5123) => [
       q(Ngbundu),
       ],
-   q(5123) => [
+   q(5124) => [
       q(Northern Nuni),
       ],
-   q(5124) => [
+   q(5125) => [
       q(Nguluwan),
       ],
-   q(5125) => [
+   q(5126) => [
       q(Mehek),
       ],
-   q(5126) => [
+   q(5127) => [
       q(Nunggubuyu),
       ],
-   q(5127) => [
+   q(5128) => [
       q(Tlamacazapa Nahuatl),
       ],
-   q(5128) => [
+   q(5129) => [
       q(Nasarian),
       ],
-   q(5129) => [
+   q(5130) => [
       q(Namiae),
       ],
-   q(5130) => [
+   q(5131) => [
       q(Nyokon),
       ],
-   q(5131) => [
+   q(5132) => [
       q(Nawathinehena),
       ],
-   q(5132) => [
+   q(5133) => [
       q(Nyabwa),
       ],
-   q(5133) => [
+   q(5134) => [
       q(Ngwe),
       ],
-   q(5134) => [
+   q(5135) => [
       q(Ngayawung),
       ],
-   q(5135) => [
+   q(5136) => [
       q(Southwest Tanna),
       ],
-   q(5136) => [
+   q(5137) => [
       q(Nyamusa-Molo),
       ],
-   q(5137) => [
+   q(5138) => [
       q(Nauo),
       ],
-   q(5138) => [
+   q(5139) => [
       q(Nawaru),
       ],
-   q(5139) => [
+   q(5140) => [
       q(Middle Newar),
       ],
-   q(5140) => [
+   q(5141) => [
       q(Nottoway-Meherrin),
       ],
-   q(5141) => [
+   q(5142) => [
       q(Nauete),
       ],
-   q(5142) => [
+   q(5143) => [
       q(Ngando (Democratic Republic of Congo)),
       ],
-   q(5143) => [
+   q(5144) => [
       q(Nage),
       ],
-   q(5144) => [
+   q(5145) => [
       q(Ngad'a),
       ],
-   q(5145) => [
+   q(5146) => [
       q(Nindi),
       ],
-   q(5146) => [
+   q(5147) => [
       q(Koki Naga),
       ],
-   q(5147) => [
+   q(5148) => [
       q(South Nuaulu),
       ],
-   q(5148) => [
+   q(5149) => [
       q(Numidian),
       ],
-   q(5149) => [
+   q(5150) => [
       q(Ngawun),
       ],
-   q(5150) => [
+   q(5151) => [
       q(Ndambomo),
       ],
-   q(5151) => [
+   q(5152) => [
       q(Naxi),
       ],
-   q(5152) => [
+   q(5153) => [
       q(Ninggerum),
       ],
-   q(5153) => [
+   q(5154) => [
       q(Narau),
       ],
-   q(5154) => [
+   q(5155) => [
       q(Nafri),
       ],
-   q(5155) => [
+   q(5156) => [
       q(Nyangbo),
       ],
-   q(5156) => [
+   q(5157) => [
       q(Nyanga-li),
       ],
-   q(5157) => [
+   q(5158) => [
       q(Nyore),
       q(Olunyole),
       ],
-   q(5158) => [
+   q(5159) => [
       q(Nyengo),
       ],
-   q(5159) => [
+   q(5160) => [
       q(Giryama),
       q(Kigiryama),
       ],
-   q(5160) => [
+   q(5161) => [
       q(Nyindu),
       ],
-   q(5161) => [
+   q(5162) => [
       q(Nyigina),
       ],
-   q(5162) => [
+   q(5163) => [
       q(Ama (Sudan)),
       ],
-   q(5163) => [
+   q(5164) => [
       q(Nyanga),
       ],
-   q(5164) => [
+   q(5165) => [
       q(Nyaneka),
       ],
-   q(5165) => [
+   q(5166) => [
       q(Nyeu),
       ],
-   q(5166) => [
+   q(5167) => [
       q(Nyang'i),
       ],
-   q(5167) => [
+   q(5168) => [
       q(Nayini),
       ],
-   q(5168) => [
+   q(5169) => [
       q(Nyiha (Malawi)),
       ],
-   q(5169) => [
+   q(5170) => [
       q(Nyunga),
       ],
-   q(5170) => [
+   q(5171) => [
       q(Nyawaygi),
       ],
-   q(5171) => [
+   q(5172) => [
       q(Nyungwe),
       ],
-   q(5172) => [
+   q(5173) => [
       q(Nyulnyul),
       ],
-   q(5173) => [
+   q(5174) => [
       q(Nyaw),
       ],
-   q(5174) => [
+   q(5175) => [
       q(Nganyaywana),
       ],
-   q(5175) => [
+   q(5176) => [
       q(Nyakyusa-Ngonde),
       ],
-   q(5176) => [
+   q(5177) => [
       q(Tigon Mbembe),
       ],
-   q(5177) => [
+   q(5178) => [
       q(Njebi),
       ],
-   q(5178) => [
+   q(5179) => [
       q(Nzakara),
       ],
-   q(5179) => [
+   q(5180) => [
       q(Zeme Naga),
       ],
-   q(5180) => [
+   q(5181) => [
       q(New Zealand Sign Language),
       ],
-   q(5181) => [
+   q(5182) => [
       q(Teke-Nzikou),
       ],
-   q(5182) => [
+   q(5183) => [
       q(Nzakambay),
       ],
-   q(5183) => [
+   q(5184) => [
       q(Nanga Dama Dogon),
       ],
-   q(5184) => [
+   q(5185) => [
       q(Orok),
       ],
-   q(5185) => [
+   q(5186) => [
       q(Oroch),
       ],
-   q(5186) => [
+   q(5187) => [
       q(Old Aramaic (up to 700 BCE)),
       q(Ancient Aramaic (up to 700 BCE)),
       ],
-   q(5187) => [
+   q(5188) => [
       q(Old Avar),
       ],
-   q(5188) => [
+   q(5189) => [
       q(Obispeno),
       ],
-   q(5189) => [
+   q(5190) => [
       q(Southern Bontok),
       ],
-   q(5190) => [
+   q(5191) => [
       q(Oblo),
       ],
-   q(5191) => [
+   q(5192) => [
       q(Moabite),
       ],
-   q(5192) => [
+   q(5193) => [
       q(Obo Manobo),
       ],
-   q(5193) => [
+   q(5194) => [
       q(Old Burmese),
       ],
-   q(5194) => [
+   q(5195) => [
       q(Old Breton),
       ],
-   q(5195) => [
+   q(5196) => [
       q(Obulom),
       ],
-   q(5196) => [
+   q(5197) => [
       q(Ocaina),
       ],
-   q(5197) => [
+   q(5198) => [
       q(Old Chinese),
       ],
-   q(5198) => [
+   q(5199) => [
       q(Old Cornish),
       ],
-   q(5199) => [
+   q(5200) => [
       q(Atzingo Matlatzinca),
       ],
-   q(5200) => [
+   q(5201) => [
       q(Odut),
       ],
-   q(5201) => [
+   q(5202) => [
       q(Od),
       ],
-   q(5202) => [
+   q(5203) => [
       q(Old Dutch),
       ],
-   q(5203) => [
+   q(5204) => [
       q(Odual),
       ],
-   q(5204) => [
+   q(5205) => [
       q(Ofo),
       ],
-   q(5205) => [
+   q(5206) => [
       q(Old Frisian),
       ],
-   q(5206) => [
+   q(5207) => [
       q(Efutop),
       ],
-   q(5207) => [
+   q(5208) => [
       q(Ogbia),
       ],
-   q(5208) => [
+   q(5209) => [
       q(Ogbah),
       ],
-   q(5209) => [
+   q(5210) => [
       q(Old Georgian),
       ],
-   q(5210) => [
+   q(5211) => [
       q(Ogbogolo),
       ],
-   q(5211) => [
+   q(5212) => [
       q(Khana),
       ],
-   q(5212) => [
+   q(5213) => [
       q(Ogbronuagum),
       ],
-   q(5213) => [
+   q(5214) => [
       q(Old Hittite),
       ],
-   q(5214) => [
+   q(5215) => [
       q(Old Hungarian),
       ],
-   q(5215) => [
+   q(5216) => [
       q(Oirata),
       ],
-   q(5216) => [
+   q(5217) => [
       q(Inebu One),
       ],
-   q(5217) => [
+   q(5218) => [
       q(Northwestern Ojibwa),
       ],
-   q(5218) => [
+   q(5219) => [
       q(Central Ojibwa),
       ],
-   q(5219) => [
+   q(5220) => [
       q(Eastern Ojibwa),
       ],
-   q(5220) => [
+   q(5221) => [
       q(Old Japanese),
       ],
-   q(5221) => [
+   q(5222) => [
       q(Severn Ojibwa),
       ],
-   q(5222) => [
+   q(5223) => [
       q(Ontong Java),
       ],
-   q(5223) => [
+   q(5224) => [
       q(Western Ojibwa),
       ],
-   q(5224) => [
+   q(5225) => [
       q(Okanagan),
       ],
-   q(5225) => [
+   q(5226) => [
       q(Okobo),
       ],
-   q(5226) => [
+   q(5227) => [
       q(Okodia),
       ],
-   q(5227) => [
+   q(5228) => [
       q(Okpe (Southwestern Edo)),
       ],
-   q(5228) => [
+   q(5229) => [
       q(Koko Babangk),
       ],
-   q(5229) => [
+   q(5230) => [
       q(Koresh-e Rostam),
       ],
-   q(5230) => [
+   q(5231) => [
       q(Okiek),
       ],
-   q(5231) => [
+   q(5232) => [
       q(Oko-Juwoi),
       ],
-   q(5232) => [
+   q(5233) => [
       q(Kwamtim One),
       ],
-   q(5233) => [
+   q(5234) => [
       q(Old Kentish Sign Language),
       ],
-   q(5234) => [
+   q(5235) => [
       q(Middle Korean (10th-16th cent.)),
       ],
-   q(5235) => [
+   q(5236) => [
       q(Oki-No-Erabu),
       ],
-   q(5236) => [
+   q(5237) => [
       q(Old Korean (3rd-9th cent.)),
       ],
-   q(5237) => [
+   q(5238) => [
       q(Kirike),
       ],
-   q(5238) => [
+   q(5239) => [
       q(Oko-Eni-Osayen),
       ],
-   q(5239) => [
+   q(5240) => [
       q(Oku),
       ],
-   q(5240) => [
+   q(5241) => [
       q(Orokaiva),
       ],
-   q(5241) => [
+   q(5242) => [
       q(Okpe (Northwestern Edo)),
       ],
-   q(5242) => [
+   q(5243) => [
       q(Walungge),
       ],
-   q(5243) => [
+   q(5244) => [
       q(Mochi),
       ],
-   q(5244) => [
+   q(5245) => [
       q(Olekha),
       ],
-   q(5245) => [
+   q(5246) => [
       q(Olkol),
       ],
-   q(5246) => [
+   q(5247) => [
       q(Oloma),
       ],
-   q(5247) => [
+   q(5248) => [
       q(Livvi),
       ],
-   q(5248) => [
+   q(5249) => [
       q(Olrat),
       ],
-   q(5249) => [
+   q(5250) => [
       q(Old Lithuanian),
       ],
-   q(5250) => [
+   q(5251) => [
       q(Omaha-Ponca),
       ],
-   q(5251) => [
+   q(5252) => [
       q(East Ambae),
       ],
-   q(5252) => [
+   q(5253) => [
       q(Mochica),
       ],
-   q(5253) => [
+   q(5254) => [
       q(Omejes),
       ],
-   q(5254) => [
+   q(5255) => [
       q(Omagua),
       ],
-   q(5255) => [
+   q(5256) => [
       q(Omi),
       ],
-   q(5256) => [
+   q(5257) => [
       q(Omok),
       ],
-   q(5257) => [
+   q(5258) => [
       q(Ombo),
       ],
-   q(5258) => [
+   q(5259) => [
       q(Minoan),
       ],
-   q(5259) => [
+   q(5260) => [
       q(Utarmbung),
       ],
-   q(5260) => [
+   q(5261) => [
       q(Old Manipuri),
       ],
-   q(5261) => [
+   q(5262) => [
       q(Old Marathi),
       ],
-   q(5262) => [
+   q(5263) => [
       q(Omotik),
       ],
-   q(5263) => [
+   q(5264) => [
       q(Omurano),
       ],
-   q(5264) => [
+   q(5265) => [
       q(South Tairora),
       ],
-   q(5265) => [
+   q(5266) => [
       q(Old Mon),
       ],
-   q(5266) => [
+   q(5267) => [
       q(Ona),
       ],
-   q(5267) => [
+   q(5268) => [
       q(Lingao),
       ],
-   q(5268) => [
+   q(5269) => [
       q(Oneida),
       ],
-   q(5269) => [
+   q(5270) => [
       q(Olo),
       ],
-   q(5270) => [
+   q(5271) => [
       q(Onin),
       ],
-   q(5271) => [
+   q(5272) => [
       q(Onjob),
       ],
-   q(5272) => [
+   q(5273) => [
       q(Kabore One),
       ],
-   q(5273) => [
+   q(5274) => [
       q(Onobasulu),
       ],
-   q(5274) => [
+   q(5275) => [
       q(Onondaga),
       ],
-   q(5275) => [
+   q(5276) => [
       q(Sartang),
       ],
-   q(5276) => [
+   q(5277) => [
       q(Northern One),
       ],
-   q(5277) => [
+   q(5278) => [
       q(Ono),
       ],
-   q(5278) => [
+   q(5279) => [
       q(Ontenu),
       ],
-   q(5279) => [
+   q(5280) => [
       q(Unua),
       ],
-   q(5280) => [
+   q(5281) => [
       q(Old Nubian),
       ],
-   q(5281) => [
+   q(5282) => [
       q(Onin Based Pidgin),
       ],
-   q(5282) => [
+   q(5283) => [
       q(Tohono O'odham),
       ],
-   q(5283) => [
+   q(5284) => [
       q(Ong),
       ],
-   q(5284) => [
+   q(5285) => [
       q(Onge),
       ],
-   q(5285) => [
+   q(5286) => [
       q(Oorlams),
       ],
-   q(5286) => [
+   q(5287) => [
       q(Old Ossetic),
       ],
-   q(5287) => [
+   q(5288) => [
       q(Okpamheri),
       ],
-   q(5288) => [
+   q(5289) => [
       q(Kopkaka),
       ],
-   q(5289) => [
+   q(5290) => [
       q(Oksapmin),
       ],
-   q(5290) => [
+   q(5291) => [
       q(Opao),
       ],
-   q(5291) => [
+   q(5292) => [
       q(Opata),
       ],
-   q(5292) => [
+   q(5293) => [
       q(Ofaye),
       ],
-   q(5293) => [
+   q(5294) => [
       q(Oroha),
       ],
-   q(5294) => [
+   q(5295) => [
       q(Orma),
       ],
-   q(5295) => [
+   q(5296) => [
       q(Orejon),
       ],
-   q(5296) => [
+   q(5297) => [
       q(Oring),
       ],
-   q(5297) => [
+   q(5298) => [
       q(Oroqen),
       ],
-   q(5298) => [
+   q(5299) => [
       q(Orang Kanaq),
       ],
-   q(5299) => [
+   q(5300) => [
       q(Orokolo),
       ],
-   q(5300) => [
+   q(5301) => [
       q(Oruma),
       ],
-   q(5301) => [
+   q(5302) => [
       q(Orang Seletar),
       ],
-   q(5302) => [
+   q(5303) => [
       q(Adivasi Oriya),
       ],
-   q(5303) => [
+   q(5304) => [
       q(Ormuri),
       ],
-   q(5304) => [
+   q(5305) => [
       q(Old Russian),
       ],
-   q(5305) => [
+   q(5306) => [
       q(Oro Win),
       ],
-   q(5306) => [
+   q(5307) => [
       q(Oro),
       ],
-   q(5307) => [
+   q(5308) => [
       q(Oriya (individual language)),
       ],
-   q(5308) => [
+   q(5309) => [
       q(Ormu),
       ],
-   q(5309) => [
+   q(5310) => [
       q(Oscan),
       ],
-   q(5310) => [
+   q(5311) => [
       q(Osing),
       ],
-   q(5311) => [
+   q(5312) => [
       q(Ososo),
       ],
-   q(5312) => [
+   q(5313) => [
       q(Old Spanish),
       ],
-   q(5313) => [
+   q(5314) => [
       q(Osatu),
       ],
-   q(5314) => [
+   q(5315) => [
       q(Southern One),
       ],
-   q(5315) => [
+   q(5316) => [
       q(Old Saxon),
       ],
-   q(5316) => [
+   q(5317) => [
       q(Old Tibetan),
       ],
-   q(5317) => [
+   q(5318) => [
       q(Ot Danum),
       ],
-   q(5318) => [
+   q(5319) => [
       q(Mezquital Otomi),
       ],
-   q(5319) => [
+   q(5320) => [
       q(Oti),
       ],
-   q(5320) => [
+   q(5321) => [
       q(Old Turkish),
       ],
-   q(5321) => [
+   q(5322) => [
       q(Tilapa Otomi),
       ],
-   q(5322) => [
+   q(5323) => [
       q(Eastern Highland Otomi),
       ],
-   q(5323) => [
+   q(5324) => [
       q(Tenango Otomi),
       ],
-   q(5324) => [
+   q(5325) => [
       q(Queretaro Otomi),
       ],
-   q(5325) => [
+   q(5326) => [
       q(Otoro),
       ],
-   q(5326) => [
+   q(5327) => [
       q(Estado de Mexico Otomi),
       ],
-   q(5327) => [
+   q(5328) => [
       q(Temoaya Otomi),
       ],
-   q(5328) => [
+   q(5329) => [
       q(Otuke),
       ],
-   q(5329) => [
+   q(5330) => [
       q(Ottawa),
       ],
-   q(5330) => [
+   q(5331) => [
       q(Texcatepec Otomi),
       ],
-   q(5331) => [
+   q(5332) => [
       q(Old Tamil),
       ],
-   q(5332) => [
+   q(5333) => [
       q(Ixtenco Otomi),
       ],
-   q(5333) => [
+   q(5334) => [
       q(Tagargrent),
       ],
-   q(5334) => [
+   q(5335) => [
       q(Glio-Oubi),
       ],
-   q(5335) => [
+   q(5336) => [
       q(Oune),
       ],
-   q(5336) => [
+   q(5337) => [
       q(Old Uighur),
       ],
-   q(5337) => [
+   q(5338) => [
       q(Ouma),
       ],
-   q(5338) => [
+   q(5339) => [
       q(Owiniga),
       ],
-   q(5339) => [
+   q(5340) => [
       q(Old Welsh),
       ],
-   q(5340) => [
+   q(5341) => [
       q(Oy),
       ],
-   q(5341) => [
+   q(5342) => [
       q(Oyda),
       ],
-   q(5342) => [
+   q(5343) => [
       q(Wayampi),
       ],
-   q(5343) => [
+   q(5344) => [
       q(Oya'oya),
       ],
-   q(5344) => [
+   q(5345) => [
       q(Koonzime),
       ],
-   q(5345) => [
+   q(5346) => [
       q(Parecis),
       ],
-   q(5346) => [
+   q(5347) => [
       q(Pacoh),
       ],
-   q(5347) => [
+   q(5348) => [
       q(Paumari),
       ],
-   q(5348) => [
+   q(5349) => [
       q(Pagibete),
       ],
-   q(5349) => [
+   q(5350) => [
       q(Paranawat),
       ],
-   q(5350) => [
+   q(5351) => [
       q(Tenharim),
       ],
-   q(5351) => [
+   q(5352) => [
       q(Pe),
       ],
-   q(5352) => [
+   q(5353) => [
       q(Parakana),
       ],
-   q(5353) => [
+   q(5354) => [
       q(Northern Paiute),
       ],
-   q(5354) => [
+   q(5355) => [
       q(Parya),
       ],
-   q(5355) => [
+   q(5356) => [
       q(Panamint),
       q(Timbisha),
       ],
-   q(5356) => [
+   q(5357) => [
       q(Papasena),
       ],
-   q(5357) => [
+   q(5358) => [
       q(Papitalai),
       ],
-   q(5358) => [
+   q(5359) => [
       q(Pakaasnovos),
       ],
-   q(5359) => [
+   q(5360) => [
       q(Pawnee),
       ],
-   q(5360) => [
+   q(5361) => [
       q(Pankarare),
       ],
-   q(5361) => [
+   q(5362) => [
       q(Pech),
       ],
-   q(5362) => [
+   q(5363) => [
       q(Pankararu),
       ],
-   q(5363) => [
+   q(5364) => [
       q(Paez),
       ],
-   q(5364) => [
+   q(5365) => [
       q(Patamona),
       ],
-   q(5365) => [
+   q(5366) => [
       q(Mezontla Popoloca),
       ],
-   q(5366) => [
+   q(5367) => [
       q(Coyotepec Popoloca),
       ],
-   q(5367) => [
+   q(5368) => [
       q(Paraujano),
       ],
-   q(5368) => [
+   q(5369) => [
       q(E'napa Woromaipu),
       ],
-   q(5369) => [
+   q(5370) => [
       q(Parkwa),
       ],
-   q(5370) => [
+   q(5371) => [
       q(Mak (Nigeria)),
       ],
-   q(5371) => [
+   q(5372) => [
       q(Kpasam),
       ],
-   q(5372) => [
+   q(5373) => [
       q(Papel),
       ],
-   q(5373) => [
+   q(5374) => [
       q(Badyara),
       ],
-   q(5374) => [
+   q(5375) => [
       q(Pangwa),
       ],
-   q(5375) => [
+   q(5376) => [
       q(Central Pame),
       ],
-   q(5376) => [
+   q(5377) => [
       q(Southern Pashto),
       ],
-   q(5377) => [
+   q(5378) => [
       q(Northern Pashto),
       ],
-   q(5378) => [
+   q(5379) => [
       q(Pnar),
       ],
-   q(5379) => [
+   q(5380) => [
       q(Pyu (Papua New Guinea)),
       ],
-   q(5380) => [
+   q(5381) => [
       q(Santa Ines Ahuatempan Popoloca),
       ],
-   q(5381) => [
+   q(5382) => [
       q(Pear),
       ],
-   q(5382) => [
+   q(5383) => [
       q(Bouyei),
       ],
-   q(5383) => [
+   q(5384) => [
       q(Picard),
       ],
-   q(5384) => [
+   q(5385) => [
       q(Ruching Palaung),
       ],
-   q(5385) => [
+   q(5386) => [
       q(Paliyan),
       ],
-   q(5386) => [
+   q(5387) => [
       q(Paniya),
       ],
-   q(5387) => [
+   q(5388) => [
       q(Pardhan),
       ],
-   q(5388) => [
+   q(5389) => [
       q(Duruwa),
       ],
-   q(5389) => [
+   q(5390) => [
       q(Parenga),
       ],
-   q(5390) => [
+   q(5391) => [
       q(Paite Chin),
       ],
-   q(5391) => [
+   q(5392) => [
       q(Pardhi),
       ],
-   q(5392) => [
+   q(5393) => [
       q(Nigerian Pidgin),
       ],
-   q(5393) => [
+   q(5394) => [
       q(Piti),
       ],
-   q(5394) => [
+   q(5395) => [
       q(Pacahuara),
       ],
-   q(5395) => [
+   q(5396) => [
       q(Pyapun),
       ],
-   q(5396) => [
+   q(5397) => [
       q(Anam),
       ],
-   q(5397) => [
+   q(5398) => [
       q(Pennsylvania German),
       ],
-   q(5398) => [
+   q(5399) => [
       q(Pa Di),
       ],
-   q(5399) => [
+   q(5400) => [
       q(Podena),
       q(Fedan),
       ],
-   q(5400) => [
+   q(5401) => [
       q(Padoe),
       ],
-   q(5401) => [
+   q(5402) => [
       q(Plautdietsch),
       ],
-   q(5402) => [
+   q(5403) => [
       q(Kayan),
       ],
-   q(5403) => [
+   q(5404) => [
       q(Peranakan Indonesian),
       ],
-   q(5404) => [
+   q(5405) => [
       q(Eastern Pomo),
       ],
-   q(5405) => [
+   q(5406) => [
       q(Mala (Papua New Guinea)),
       ],
-   q(5406) => [
+   q(5407) => [
       q(Taje),
       ],
-   q(5407) => [
+   q(5408) => [
       q(Northeastern Pomo),
       ],
-   q(5408) => [
+   q(5409) => [
       q(Pengo),
       ],
-   q(5409) => [
+   q(5410) => [
       q(Bonan),
       ],
-   q(5410) => [
+   q(5411) => [
       q(Chichimeca-Jonaz),
       ],
-   q(5411) => [
+   q(5412) => [
       q(Northern Pomo),
       ],
-   q(5412) => [
+   q(5413) => [
       q(Penchal),
       ],
-   q(5413) => [
+   q(5414) => [
       q(Pekal),
       ],
-   q(5414) => [
+   q(5415) => [
       q(Phende),
       ],
-   q(5415) => [
+   q(5416) => [
       q(Kunja),
       ],
-   q(5416) => [
+   q(5417) => [
       q(Southern Pomo),
       ],
-   q(5417) => [
+   q(5418) => [
       q(Iranian Persian),
       ],
-   q(5418) => [
+   q(5419) => [
       q(Pemono),
       ],
-   q(5419) => [
+   q(5420) => [
       q(Petats),
       ],
-   q(5420) => [
+   q(5421) => [
       q(Petjo),
       ],
-   q(5421) => [
+   q(5422) => [
       q(Eastern Penan),
       ],
-   q(5422) => [
+   q(5423) => [
       q(Paafang),
       ],
-   q(5423) => [
+   q(5424) => [
       q(Peere),
       ],
-   q(5424) => [
+   q(5425) => [
       q(Pfaelzisch),
       ],
-   q(5425) => [
+   q(5426) => [
       q(Sudanese Creole Arabic),
       ],
-   q(5426) => [
+   q(5427) => [
       q(Gandhari),
       ],
-   q(5427) => [
+   q(5428) => [
       q(Pangwali),
       ],
-   q(5428) => [
+   q(5429) => [
       q(Pagi),
       ],
-   q(5429) => [
+   q(5430) => [
       q(Rerep),
       ],
-   q(5430) => [
+   q(5431) => [
       q(Primitive Irish),
       ],
-   q(5431) => [
+   q(5432) => [
       q(Paelignian),
       ],
-   q(5432) => [
+   q(5433) => [
       q(Pangseng),
       ],
-   q(5433) => [
+   q(5434) => [
       q(Pagu),
       ],
-   q(5434) => [
+   q(5435) => [
       q(Pa-Hng),
       ],
-   q(5435) => [
+   q(5436) => [
       q(Phudagi),
       ],
-   q(5436) => [
+   q(5437) => [
       q(Phuong),
       ],
-   q(5437) => [
+   q(5438) => [
       q(Phukha),
       ],
-   q(5438) => [
+   q(5439) => [
       q(Phake),
       ],
-   q(5439) => [
+   q(5440) => [
       q(Phalura),
       q(Palula),
       ],
-   q(5440) => [
+   q(5441) => [
       q(Phimbi),
       ],
-   q(5441) => [
+   q(5442) => [
       q(Phunoi),
       ],
-   q(5442) => [
+   q(5443) => [
       q(Phana'),
       ],
-   q(5443) => [
+   q(5444) => [
       q(Pahari-Potwari),
       ],
-   q(5444) => [
+   q(5445) => [
       q(Phu Thai),
       ],
-   q(5445) => [
+   q(5446) => [
       q(Phuan),
       ],
-   q(5446) => [
+   q(5447) => [
       q(Pahlavani),
       ],
-   q(5447) => [
+   q(5448) => [
       q(Phangduwali),
       ],
-   q(5448) => [
+   q(5449) => [
       q(Pima Bajo),
       ],
-   q(5449) => [
+   q(5450) => [
       q(Yine),
       ],
-   q(5450) => [
+   q(5451) => [
       q(Pinji),
       ],
-   q(5451) => [
+   q(5452) => [
       q(Piaroa),
       ],
-   q(5452) => [
+   q(5453) => [
       q(Piro),
       ],
-   q(5453) => [
+   q(5454) => [
       q(Pingelapese),
       ],
-   q(5454) => [
+   q(5455) => [
       q(Pisabo),
       ],
-   q(5455) => [
+   q(5456) => [
       q(Pitcairn-Norfolk),
       ],
-   q(5456) => [
+   q(5457) => [
       q(Pini),
       ],
-   q(5457) => [
+   q(5458) => [
       q(Pijao),
       ],
-   q(5458) => [
+   q(5459) => [
       q(Yom),
       ],
-   q(5459) => [
+   q(5460) => [
       q(Powhatan),
       ],
-   q(5460) => [
+   q(5461) => [
       q(Piame),
       ],
-   q(5461) => [
+   q(5462) => [
       q(Piapoco),
       ],
-   q(5462) => [
+   q(5463) => [
       q(Pero),
       ],
-   q(5463) => [
+   q(5464) => [
       q(Piratapuyo),
       ],
-   q(5464) => [
+   q(5465) => [
       q(Pijin),
       ],
-   q(5465) => [
+   q(5466) => [
       q(Pitta Pitta),
       ],
-   q(5466) => [
+   q(5467) => [
       q(Pintupi-Luritja),
       ],
-   q(5467) => [
+   q(5468) => [
       q(Pileni),
       q(Vaeakau-Taumako),
       ],
-   q(5468) => [
+   q(5469) => [
       q(Pimbwe),
       ],
-   q(5469) => [
+   q(5470) => [
       q(Piu),
       ],
-   q(5470) => [
+   q(5471) => [
       q(Piya-Kwonci),
       ],
-   q(5471) => [
+   q(5472) => [
       q(Pije),
       ],
-   q(5472) => [
+   q(5473) => [
       q(Pitjantjatjara),
       ],
-   q(5473) => [
+   q(5474) => [
       q(Ardhamagadhi Prakrit),
       ],
-   q(5474) => [
+   q(5475) => [
       q(Pokomo),
       q(Kipfokomo),
       ],
-   q(5475) => [
+   q(5476) => [
       q(Paekche),
       ],
-   q(5476) => [
+   q(5477) => [
       q(Pak-Tong),
       ],
-   q(5477) => [
+   q(5478) => [
       q(Pankhu),
       ],
-   q(5478) => [
+   q(5479) => [
       q(Pakanha),
       ],
-   q(5479) => [
+   q(5480) => [
       q(Pokoot),
       ],
-   q(5480) => [
+   q(5481) => [
       q(Pukapuka),
       ],
-   q(5481) => [
+   q(5482) => [
       q(Attapady Kurumba),
       ],
-   q(5482) => [
+   q(5483) => [
       q(Pakistan Sign Language),
       ],
-   q(5483) => [
+   q(5484) => [
       q(Maleng),
       ],
-   q(5484) => [
+   q(5485) => [
       q(Paku),
       ],
-   q(5485) => [
+   q(5486) => [
       q(Miani),
       ],
-   q(5486) => [
+   q(5487) => [
       q(Polonombauk),
       ],
-   q(5487) => [
+   q(5488) => [
       q(Central Palawano),
       ],
-   q(5488) => [
+   q(5489) => [
       q(Polari),
       ],
-   q(5489) => [
+   q(5490) => [
       q(Palu'e),
       ],
-   q(5490) => [
+   q(5491) => [
       q(Pilaga),
       ],
-   q(5491) => [
+   q(5492) => [
       q(Paulohi),
       ],
-   q(5492) => [
+   q(5493) => [
       q(Polci),
       ],
-   q(5493) => [
+   q(5494) => [
       q(Kohistani Shina),
       ],
-   q(5494) => [
+   q(5495) => [
       q(Shwe Palaung),
       ],
-   q(5495) => [
+   q(5496) => [
       q(Palenquero),
       ],
-   q(5496) => [
+   q(5497) => [
       q(Oluta Popoluca),
       ],
-   q(5497) => [
+   q(5498) => [
       q(Palpa),
       ],
-   q(5498) => [
+   q(5499) => [
       q(Palaic),
       ],
-   q(5499) => [
+   q(5500) => [
       q(Palaka Senoufo),
       ],
-   q(5500) => [
+   q(5501) => [
       q(San Marcos Tlacoyalco Popoloca),
       q(San Marcos Tlalcoyalco Popoloca),
       ],
-   q(5501) => [
+   q(5502) => [
       q(Plateau Malagasy),
       ],
-   q(5502) => [
+   q(5503) => [
       q(Palikur),
       ],
-   q(5503) => [
+   q(5504) => [
       q(Southwest Palawano),
       ],
-   q(5504) => [
+   q(5505) => [
       q(Brooke's Point Palawano),
       ],
-   q(5505) => [
+   q(5506) => [
       q(Bolyu),
       ],
-   q(5506) => [
+   q(5507) => [
       q(Paluan),
       ],
-   q(5507) => [
+   q(5508) => [
       q(Paama),
       ],
-   q(5508) => [
+   q(5509) => [
       q(Pambia),
       ],
-   q(5509) => [
+   q(5510) => [
       q(Palumata),
       ],
-   q(5510) => [
+   q(5511) => [
       q(Pallanganmiddang),
       ],
-   q(5511) => [
+   q(5512) => [
       q(Pwaamei),
       ],
-   q(5512) => [
+   q(5513) => [
       q(Pamona),
       ],
-   q(5513) => [
+   q(5514) => [
       q(Maharastri Prakrit),
       ],
-   q(5514) => [
+   q(5515) => [
       q(Northern Pumi),
       ],
-   q(5515) => [
+   q(5516) => [
       q(Southern Pumi),
       ],
-   q(5516) => [
+   q(5517) => [
       q(Pamlico),
       ],
-   q(5517) => [
+   q(5518) => [
       q(Lingua Franca),
       ],
-   q(5518) => [
+   q(5519) => [
       q(Pomo),
       ],
-   q(5519) => [
+   q(5520) => [
       q(Pam),
       ],
-   q(5520) => [
+   q(5521) => [
       q(Pom),
       ],
-   q(5521) => [
+   q(5522) => [
       q(Northern Pame),
       ],
-   q(5522) => [
+   q(5523) => [
       q(Paynamar),
       ],
-   q(5523) => [
+   q(5524) => [
       q(Piemontese),
       ],
-   q(5524) => [
+   q(5525) => [
       q(Tuamotuan),
       ],
-   q(5525) => [
+   q(5526) => [
       q(Plains Miwok),
       ],
-   q(5526) => [
+   q(5527) => [
       q(Poumei Naga),
       ],
-   q(5527) => [
+   q(5528) => [
       q(Papuan Malay),
       ],
-   q(5528) => [
+   q(5529) => [
       q(Southern Pame),
       ],
-   q(5529) => [
+   q(5530) => [
       q(Punan Bah-Biau),
       ],
-   q(5530) => [
+   q(5531) => [
       q(Western Panjabi),
       ],
-   q(5531) => [
+   q(5532) => [
       q(Pannei),
       ],
-   q(5532) => [
+   q(5533) => [
       q(Western Penan),
       ],
-   q(5533) => [
+   q(5534) => [
       q(Pongu),
       ],
-   q(5534) => [
+   q(5535) => [
       q(Penrhyn),
       ],
-   q(5535) => [
+   q(5536) => [
       q(Aoheng),
       ],
-   q(5536) => [
+   q(5537) => [
       q(Pinjarup),
       ],
-   q(5537) => [
+   q(5538) => [
       q(Paunaka),
       ],
-   q(5538) => [
+   q(5539) => [
       q(Paleni),
       ],
-   q(5539) => [
+   q(5540) => [
       q(Punan Batu 1),
       ],
-   q(5540) => [
+   q(5541) => [
       q(Pinai-Hagahai),
       ],
-   q(5541) => [
+   q(5542) => [
       q(Panobo),
       ],
-   q(5542) => [
+   q(5543) => [
       q(Pancana),
       ],
-   q(5543) => [
+   q(5544) => [
       q(Pana (Burkina Faso)),
       ],
-   q(5544) => [
+   q(5545) => [
       q(Panim),
       ],
-   q(5545) => [
+   q(5546) => [
       q(Ponosakan),
       ],
-   q(5546) => [
+   q(5547) => [
       q(Pontic),
       ],
-   q(5547) => [
+   q(5548) => [
       q(Jiongnai Bunu),
       ],
-   q(5548) => [
+   q(5549) => [
       q(Pinigura),
       ],
-   q(5549) => [
+   q(5550) => [
       q(Panytyima),
       ],
-   q(5550) => [
+   q(5551) => [
       q(Phong-Kniang),
       ],
-   q(5551) => [
+   q(5552) => [
       q(Pinyin),
       ],
-   q(5552) => [
+   q(5553) => [
       q(Pana (Central African Republic)),
       ],
-   q(5553) => [
+   q(5554) => [
       q(Poqomam),
       ],
-   q(5554) => [
+   q(5555) => [
       q(Ponares),
       ],
-   q(5555) => [
+   q(5556) => [
       q(San Juan Atzingo Popoloca),
       ],
-   q(5556) => [
+   q(5557) => [
       q(Poke),
       ],
-   q(5557) => [
+   q(5558) => [
       q(Potiguara),
       ],
-   q(5558) => [
+   q(5559) => [
       q(Poqomchi'),
       ],
-   q(5559) => [
+   q(5560) => [
       q(Highland Popoluca),
       ],
-   q(5560) => [
+   q(5561) => [
       q(Pokanga),
       ],
-   q(5561) => [
+   q(5562) => [
       q(Southeastern Pomo),
       ],
-   q(5562) => [
+   q(5563) => [
       q(Central Pomo),
       ],
-   q(5563) => [
+   q(5564) => [
       q(Pwapwa),
       ],
-   q(5564) => [
+   q(5565) => [
       q(Texistepec Popoluca),
       ],
-   q(5565) => [
+   q(5566) => [
       q(Sayula Popoluca),
       ],
-   q(5566) => [
+   q(5567) => [
       q(Potawatomi),
       ],
-   q(5567) => [
+   q(5568) => [
       q(Upper Guinea Crioulo),
       ],
-   q(5568) => [
+   q(5569) => [
       q(San Felipe Otlaltepec Popoloca),
       ],
-   q(5569) => [
+   q(5570) => [
       q(Polabian),
       ],
-   q(5570) => [
+   q(5571) => [
       q(Pogolo),
       ],
-   q(5571) => [
+   q(5572) => [
       q(Pao),
       ],
-   q(5572) => [
+   q(5573) => [
       q(Papi),
       ],
-   q(5573) => [
+   q(5574) => [
       q(Paipai),
       ],
-   q(5574) => [
+   q(5575) => [
       q(Uma),
       ],
-   q(5575) => [
+   q(5576) => [
       q(Pipil),
       q(Nicarao),
       ],
-   q(5576) => [
+   q(5577) => [
       q(Papuma),
       ],
-   q(5577) => [
+   q(5578) => [
       q(Papapana),
       ],
-   q(5578) => [
+   q(5579) => [
       q(Folopa),
       ],
-   q(5579) => [
+   q(5580) => [
       q(Pelende),
       ],
-   q(5580) => [
+   q(5581) => [
       q(Pei),
       ],
-   q(5581) => [
+   q(5582) => [
       q(San Luis Temalacayuca Popoloca),
       ],
-   q(5582) => [
+   q(5583) => [
       q(Pare),
       ],
-   q(5583) => [
+   q(5584) => [
       q(Papora),
       ],
-   q(5584) => [
+   q(5585) => [
       q(Pa'a),
       ],
-   q(5585) => [
+   q(5586) => [
       q(Malecite-Passamaquoddy),
       ],
-   q(5586) => [
+   q(5587) => [
       q(Lua'),
       ],
-   q(5587) => [
+   q(5588) => [
       q(Parachi),
       ],
-   q(5588) => [
+   q(5589) => [
       q(Parsi-Dari),
       ],
-   q(5589) => [
+   q(5590) => [
       q(Principense),
       ],
-   q(5590) => [
+   q(5591) => [
       q(Paranan),
       ],
-   q(5591) => [
+   q(5592) => [
       q(Prussian),
       ],
-   q(5592) => [
+   q(5593) => [
       q(Porohanon),
       ],
-   q(5593) => [
+   q(5594) => [
       q(Paici),
       ],
-   q(5594) => [
+   q(5595) => [
       q(Parauk),
       ],
-   q(5595) => [
+   q(5596) => [
       q(Peruvian Sign Language),
       ],
-   q(5596) => [
+   q(5597) => [
       q(Kibiri),
       ],
-   q(5597) => [
+   q(5598) => [
       q(Prasuni),
       ],
-   q(5598) => [
+   q(5599) => [
       q(Parsi),
       ],
-   q(5599) => [
+   q(5600) => [
       q(Asheninka Perene),
       ],
-   q(5600) => [
+   q(5601) => [
       q(Puri),
       ],
-   q(5601) => [
+   q(5602) => [
       q(Dari),
       q(Afghan Persian),
       ],
-   q(5602) => [
+   q(5603) => [
       q(Phai),
       ],
-   q(5603) => [
+   q(5604) => [
       q(Puragi),
       ],
-   q(5604) => [
+   q(5605) => [
       q(Parawen),
       ],
-   q(5605) => [
+   q(5606) => [
       q(Purik),
       ],
-   q(5606) => [
+   q(5607) => [
       q(Pray 3),
       ],
-   q(5607) => [
+   q(5608) => [
       q(Providencia Sign Language),
       ],
-   q(5608) => [
+   q(5609) => [
       q(Asue Awyu),
       ],
-   q(5609) => [
+   q(5610) => [
       q(Persian Sign Language),
       ],
-   q(5610) => [
+   q(5611) => [
       q(Plains Indian Sign Language),
       ],
-   q(5611) => [
+   q(5612) => [
       q(Central Malay),
       ],
-   q(5612) => [
+   q(5613) => [
       q(Penang Sign Language),
       ],
-   q(5613) => [
+   q(5614) => [
       q(Southwest Pashai),
       q(Southwest Pashayi),
       ],
-   q(5614) => [
+   q(5615) => [
       q(Southeast Pashai),
       q(Southeast Pashayi),
       ],
-   q(5615) => [
+   q(5616) => [
       q(Puerto Rican Sign Language),
       ],
-   q(5616) => [
+   q(5617) => [
       q(Pauserna),
       ],
-   q(5617) => [
+   q(5618) => [
       q(Panasuan),
       ],
-   q(5618) => [
+   q(5619) => [
       q(Polish Sign Language),
       ],
-   q(5619) => [
+   q(5620) => [
       q(Philippine Sign Language),
       ],
-   q(5620) => [
+   q(5621) => [
       q(Pasi),
       ],
-   q(5621) => [
+   q(5622) => [
       q(Portuguese Sign Language),
       ],
-   q(5622) => [
+   q(5623) => [
       q(Kaulong),
       ],
-   q(5623) => [
+   q(5624) => [
       q(Central Pashto),
       ],
-   q(5624) => [
+   q(5625) => [
       q(Sauraseni Prakrit),
       ],
-   q(5625) => [
+   q(5626) => [
       q(Port Sandwich),
       ],
-   q(5626) => [
+   q(5627) => [
       q(Piscataway),
       ],
-   q(5627) => [
+   q(5628) => [
       q(Pai Tavytera),
       ],
-   q(5628) => [
+   q(5629) => [
       q(Pataxo Ha-Ha-Hae),
       ],
-   q(5629) => [
+   q(5630) => [
       q(Pintiini),
       ],
-   q(5630) => [
+   q(5631) => [
       q(Patani),
       ],
-   q(5631) => [
+   q(5632) => [
       q(Zo'e),
       ],
-   q(5632) => [
+   q(5633) => [
       q(Patep),
       ],
-   q(5633) => [
+   q(5634) => [
       q(Pattapu),
       ],
-   q(5634) => [
+   q(5635) => [
       q(Piamatsina),
       ],
-   q(5635) => [
+   q(5636) => [
       q(Enrekang),
       ],
-   q(5636) => [
+   q(5637) => [
       q(Bambam),
       ],
-   q(5637) => [
+   q(5638) => [
       q(Port Vato),
       ],
-   q(5638) => [
+   q(5639) => [
       q(Pentlatch),
       ],
-   q(5639) => [
+   q(5640) => [
       q(Pathiya),
       ],
-   q(5640) => [
+   q(5641) => [
       q(Western Highland Purepecha),
       ],
-   q(5641) => [
+   q(5642) => [
       q(Purum),
       ],
-   q(5642) => [
+   q(5643) => [
       q(Punan Merap),
       ],
-   q(5643) => [
+   q(5644) => [
       q(Punan Aput),
       ],
-   q(5644) => [
+   q(5645) => [
       q(Puelche),
       ],
-   q(5645) => [
+   q(5646) => [
       q(Punan Merah),
       ],
-   q(5646) => [
+   q(5647) => [
       q(Phuie),
       ],
-   q(5647) => [
+   q(5648) => [
       q(Puinave),
       ],
-   q(5648) => [
+   q(5649) => [
       q(Punan Tubu),
       ],
-   q(5649) => [
+   q(5650) => [
       q(Pu Ko),
       ],
-   q(5650) => [
+   q(5651) => [
       q(Puma),
       ],
-   q(5651) => [
+   q(5652) => [
       q(Puoc),
       ],
-   q(5652) => [
+   q(5653) => [
       q(Pulabu),
       ],
-   q(5653) => [
+   q(5654) => [
       q(Puquina),
       ],
-   q(5654) => [
+   q(5655) => [
       q(Purubora),
       ],
-   q(5655) => [
+   q(5656) => [
       q(Putoh),
       ],
-   q(5656) => [
+   q(5657) => [
       q(Punu),
       ],
-   q(5657) => [
+   q(5658) => [
       q(Puluwatese),
       ],
-   q(5658) => [
+   q(5659) => [
       q(Puare),
       ],
-   q(5659) => [
+   q(5660) => [
       q(Purisimeno),
       ],
-   q(5660) => [
+   q(5661) => [
       q(Pawaia),
       ],
-   q(5661) => [
+   q(5662) => [
       q(Panawa),
       ],
-   q(5662) => [
+   q(5663) => [
       q(Gapapaiwa),
       ],
-   q(5663) => [
+   q(5664) => [
       q(Patwin),
       ],
-   q(5664) => [
+   q(5665) => [
       q(Molbog),
       ],
-   q(5665) => [
+   q(5666) => [
       q(Paiwan),
       ],
-   q(5666) => [
+   q(5667) => [
       q(Pwo Western Karen),
       ],
-   q(5667) => [
+   q(5668) => [
       q(Powari),
       ],
-   q(5668) => [
+   q(5669) => [
       q(Pwo Northern Karen),
       ],
-   q(5669) => [
+   q(5670) => [
       q(Quetzaltepec Mixe),
       ],
-   q(5670) => [
+   q(5671) => [
       q(Pye Krumen),
       ],
-   q(5671) => [
+   q(5672) => [
       q(Fyam),
       ],
-   q(5672) => [
+   q(5673) => [
       q(Poyanawa),
       ],
-   q(5673) => [
+   q(5674) => [
       q(Paraguayan Sign Language),
       q(Lengua de Senas del Paraguay),
       ],
-   q(5674) => [
+   q(5675) => [
       q(Puyuma),
       ],
-   q(5675) => [
+   q(5676) => [
       q(Pyu (Myanmar)),
       ],
-   q(5676) => [
+   q(5677) => [
       q(Pyen),
       ],
-   q(5677) => [
+   q(5678) => [
       q(Para Naga),
       ],
-   q(5678) => [
+   q(5679) => [
       q(Quapaw),
       ],
-   q(5679) => [
+   q(5680) => [
       q(Huallaga Huanuco Quechua),
       ],
-   q(5680) => [
+   q(5681) => [
       q(K'iche'),
       q(Quiche),
       ],
-   q(5681) => [
+   q(5682) => [
       q(Calderon Highland Quichua),
       ],
-   q(5682) => [
+   q(5683) => [
       q(Lambayeque Quechua),
       ],
-   q(5683) => [
+   q(5684) => [
       q(Chimborazo Highland Quichua),
       ],
-   q(5684) => [
+   q(5685) => [
       q(South Bolivian Quechua),
       ],
-   q(5685) => [
+   q(5686) => [
       q(Quileute),
       ],
-   q(5686) => [
+   q(5687) => [
       q(Chachapoyas Quechua),
       ],
-   q(5687) => [
+   q(5688) => [
       q(North Bolivian Quechua),
       ],
-   q(5688) => [
+   q(5689) => [
       q(Sipacapense),
       ],
-   q(5689) => [
+   q(5690) => [
       q(Quinault),
       ],
-   q(5690) => [
+   q(5691) => [
       q(Southern Pastaza Quechua),
       ],
-   q(5691) => [
+   q(5692) => [
       q(Quinqui),
       ],
-   q(5692) => [
+   q(5693) => [
       q(Yanahuanca Pasco Quechua),
       ],
-   q(5693) => [
+   q(5694) => [
       q(Santiago del Estero Quichua),
       ],
-   q(5694) => [
+   q(5695) => [
       q(Sacapulteco),
       ],
-   q(5695) => [
+   q(5696) => [
       q(Tena Lowland Quichua),
       ],
-   q(5696) => [
+   q(5697) => [
       q(Yauyos Quechua),
       ],
-   q(5697) => [
+   q(5698) => [
       q(Ayacucho Quechua),
       ],
-   q(5698) => [
+   q(5699) => [
       q(Cusco Quechua),
       ],
-   q(5699) => [
+   q(5700) => [
       q(Ambo-Pasco Quechua),
       ],
-   q(5700) => [
+   q(5701) => [
       q(Cajamarca Quechua),
       ],
-   q(5701) => [
+   q(5702) => [
       q(Eastern Apurimac Quechua),
       ],
-   q(5702) => [
+   q(5703) => [
       q(Huamalies-Dos de Mayo Huanuco Quechua),
       ],
-   q(5703) => [
+   q(5704) => [
       q(Imbabura Highland Quichua),
       ],
-   q(5704) => [
+   q(5705) => [
       q(Loja Highland Quichua),
       ],
-   q(5705) => [
+   q(5706) => [
       q(Cajatambo North Lima Quechua),
       ],
-   q(5706) => [
+   q(5707) => [
       q(Margos-Yarowilca-Lauricocha Quechua),
       ],
-   q(5707) => [
+   q(5708) => [
       q(North Junin Quechua),
       ],
-   q(5708) => [
+   q(5709) => [
       q(Napo Lowland Quechua),
       ],
-   q(5709) => [
+   q(5710) => [
       q(Pacaraos Quechua),
       ],
-   q(5710) => [
+   q(5711) => [
       q(San Martin Quechua),
       ],
-   q(5711) => [
+   q(5712) => [
       q(Huaylla Wanca Quechua),
       ],
-   q(5712) => [
+   q(5713) => [
       q(Queyu),
       ],
-   q(5713) => [
+   q(5714) => [
       q(Northern Pastaza Quichua),
       ],
-   q(5714) => [
+   q(5715) => [
       q(Corongo Ancash Quechua),
       ],
-   q(5715) => [
+   q(5716) => [
       q(Classical Quechua),
       ],
-   q(5716) => [
+   q(5717) => [
       q(Huaylas Ancash Quechua),
       ],
-   q(5717) => [
+   q(5718) => [
       q(Kuman (Russia)),
       ],
-   q(5718) => [
+   q(5719) => [
       q(Sihuas Ancash Quechua),
       ],
-   q(5719) => [
+   q(5720) => [
       q(Kwalhioqua-Tlatskanai),
       ],
-   q(5720) => [
+   q(5721) => [
       q(Chiquian Ancash Quechua),
       ],
-   q(5721) => [
+   q(5722) => [
       q(Chincha Quechua),
       ],
-   q(5722) => [
+   q(5723) => [
       q(Panao Huanuco Quechua),
       ],
-   q(5723) => [
+   q(5724) => [
       q(Salasaca Highland Quichua),
       ],
-   q(5724) => [
+   q(5725) => [
       q(Northern Conchucos Ancash Quechua),
       ],
-   q(5725) => [
+   q(5726) => [
       q(Southern Conchucos Ancash Quechua),
       ],
-   q(5726) => [
+   q(5727) => [
       q(Puno Quechua),
       ],
-   q(5727) => [
+   q(5728) => [
       q(Qashqa'i),
       ],
-   q(5728) => [
+   q(5729) => [
       q(Canar Highland Quichua),
       ],
-   q(5729) => [
+   q(5730) => [
       q(Southern Qiang),
       ],
-   q(5730) => [
+   q(5731) => [
       q(Santa Ana de Tusi Pasco Quechua),
       ],
-   q(5731) => [
+   q(5732) => [
       q(Arequipa-La Union Quechua),
       ],
-   q(5732) => [
+   q(5733) => [
       q(Jauja Wanca Quechua),
       ],
-   q(5733) => [
+   q(5734) => [
       q(Quenya),
       ],
-   q(5734) => [
+   q(5735) => [
       q(Quiripi),
       ],
-   q(5735) => [
+   q(5736) => [
       q(Dungmali),
       ],
-   q(5736) => [
+   q(5737) => [
       q(Camling),
       ],
-   q(5737) => [
+   q(5738) => [
       q(Rasawa),
       ],
-   q(5738) => [
+   q(5739) => [
       q(Rade),
       ],
-   q(5739) => [
+   q(5740) => [
       q(Western Meohang),
       ],
-   q(5740) => [
+   q(5741) => [
       q(Logooli),
       q(Lulogooli),
       ],
-   q(5741) => [
+   q(5742) => [
       q(Rabha),
       ],
-   q(5742) => [
+   q(5743) => [
       q(Ramoaaina),
       ],
-   q(5743) => [
+   q(5744) => [
       q(Tulu-Bohuai),
       ],
-   q(5744) => [
+   q(5745) => [
       q(Ralte),
       ],
-   q(5745) => [
+   q(5746) => [
       q(Canela),
       ],
-   q(5746) => [
+   q(5747) => [
       q(Riantana),
       ],
-   q(5747) => [
+   q(5748) => [
       q(Rao),
       ],
-   q(5748) => [
+   q(5749) => [
       q(Saam),
       ],
-   q(5749) => [
+   q(5750) => [
       q(Tegali),
       ],
-   q(5750) => [
+   q(5751) => [
       q(Razajerdi),
       ],
-   q(5751) => [
+   q(5752) => [
       q(Raute),
       ],
-   q(5752) => [
+   q(5753) => [
       q(Sampang),
       ],
-   q(5753) => [
+   q(5754) => [
       q(Rawang),
       ],
-   q(5754) => [
+   q(5755) => [
       q(Rang),
       ],
-   q(5755) => [
+   q(5756) => [
       q(Rapa),
       ],
-   q(5756) => [
+   q(5757) => [
       q(Rahambuu),
       ],
-   q(5757) => [
+   q(5758) => [
       q(Rumai Palaung),
       ],
-   q(5758) => [
+   q(5759) => [
       q(Northern Bontok),
       ],
-   q(5759) => [
+   q(5760) => [
       q(Miraya Bikol),
       ],
-   q(5760) => [
+   q(5761) => [
       q(Barababaraba),
       ],
-   q(5761) => [
+   q(5762) => [
       q(Reunion Creole French),
       ],
-   q(5762) => [
+   q(5763) => [
       q(Rudbari),
       ],
-   q(5763) => [
+   q(5764) => [
       q(Rerau),
       ],
-   q(5764) => [
+   q(5765) => [
       q(Rembong),
       ],
-   q(5765) => [
+   q(5766) => [
       q(Rejang Kayan),
       ],
-   q(5766) => [
+   q(5767) => [
       q(Kara (Tanzania)),
       ],
-   q(5767) => [
+   q(5768) => [
       q(Reli),
       ],
-   q(5768) => [
+   q(5769) => [
       q(Rejang),
       ],
-   q(5769) => [
+   q(5770) => [
       q(Rendille),
       ],
-   q(5770) => [
+   q(5771) => [
       q(Remo),
       ],
-   q(5771) => [
+   q(5772) => [
       q(Rengao),
       ],
-   q(5772) => [
+   q(5773) => [
       q(Rer Bare),
       ],
-   q(5773) => [
+   q(5774) => [
       q(Reshe),
       ],
-   q(5774) => [
+   q(5775) => [
       q(Retta),
       ],
-   q(5775) => [
+   q(5776) => [
       q(Reyesano),
       ],
-   q(5776) => [
+   q(5777) => [
       q(Roria),
       ],
-   q(5777) => [
+   q(5778) => [
       q(Romano-Greek),
       ],
-   q(5778) => [
+   q(5779) => [
       q(Rangkas),
       ],
-   q(5779) => [
+   q(5780) => [
       q(Romagnol),
       ],
-   q(5780) => [
+   q(5781) => [
       q(Resigaro),
       ],
-   q(5781) => [
+   q(5782) => [
       q(Southern Roglai),
       ],
-   q(5782) => [
+   q(5783) => [
       q(Ringgou),
       ],
-   q(5783) => [
+   q(5784) => [
       q(Rohingya),
       ],
-   q(5784) => [
+   q(5785) => [
       q(Yahang),
       ],
-   q(5785) => [
+   q(5786) => [
       q(Riang (India)),
       ],
-   q(5786) => [
+   q(5787) => [
       q(Rien),
       ],
-   q(5787) => [
+   q(5788) => [
       q(Tarifit),
       ],
-   q(5788) => [
+   q(5789) => [
       q(Riang (Myanmar)),
       ],
-   q(5789) => [
+   q(5790) => [
       q(Nyaturu),
       ],
-   q(5790) => [
+   q(5791) => [
       q(Nungu),
       ],
-   q(5791) => [
+   q(5792) => [
       q(Ribun),
       ],
-   q(5792) => [
+   q(5793) => [
       q(Ritarungo),
       ],
-   q(5793) => [
+   q(5794) => [
       q(Riung),
       ],
-   q(5794) => [
+   q(5795) => [
       q(Rajong),
       ],
-   q(5795) => [
+   q(5796) => [
       q(Raji),
       ],
-   q(5796) => [
+   q(5797) => [
       q(Rajbanshi),
       ],
-   q(5797) => [
+   q(5798) => [
       q(Kraol),
       ],
-   q(5798) => [
+   q(5799) => [
       q(Rikbaktsa),
       ],
-   q(5799) => [
+   q(5800) => [
       q(Rakahanga-Manihiki),
       ],
-   q(5800) => [
+   q(5801) => [
       q(Rakhine),
       ],
-   q(5801) => [
+   q(5802) => [
       q(Marka),
       ],
-   q(5802) => [
+   q(5803) => [
       q(Rangpuri),
       q(Kamta),
       ],
-   q(5803) => [
+   q(5804) => [
       q(Arakwal),
       ],
-   q(5804) => [
+   q(5805) => [
       q(Rama),
       ],
-   q(5805) => [
+   q(5806) => [
       q(Rembarunga),
       ],
-   q(5806) => [
+   q(5807) => [
       q(Carpathian Romani),
       ],
-   q(5807) => [
+   q(5808) => [
       q(Traveller Danish),
       ],
-   q(5808) => [
+   q(5809) => [
       q(Angloromani),
       ],
-   q(5809) => [
+   q(5810) => [
       q(Kalo Finnish Romani),
       ],
-   q(5810) => [
+   q(5811) => [
       q(Traveller Norwegian),
       ],
-   q(5811) => [
+   q(5812) => [
       q(Murkim),
       ],
-   q(5812) => [
+   q(5813) => [
       q(Lomavren),
       ],
-   q(5813) => [
+   q(5814) => [
       q(Romkun),
       ],
-   q(5814) => [
+   q(5815) => [
       q(Baltic Romani),
       ],
-   q(5815) => [
+   q(5816) => [
       q(Roma),
       ],
-   q(5816) => [
+   q(5817) => [
       q(Balkan Romani),
       ],
-   q(5817) => [
+   q(5818) => [
       q(Sinte Romani),
       ],
-   q(5818) => [
+   q(5819) => [
       q(Rempi),
       ],
-   q(5819) => [
+   q(5820) => [
       q(Calo),
       ],
-   q(5820) => [
+   q(5821) => [
       q(Romanian Sign Language),
       ],
-   q(5821) => [
+   q(5822) => [
       q(Domari),
       ],
-   q(5822) => [
+   q(5823) => [
       q(Tavringer Romani),
       ],
-   q(5823) => [
+   q(5824) => [
       q(Romanova),
       ],
-   q(5824) => [
+   q(5825) => [
       q(Welsh Romani),
       ],
-   q(5825) => [
+   q(5826) => [
       q(Romam),
       ],
-   q(5826) => [
+   q(5827) => [
       q(Vlax Romani),
       ],
-   q(5827) => [
+   q(5828) => [
       q(Marma),
       ],
-   q(5828) => [
+   q(5829) => [
       q(Runa),
       ],
-   q(5829) => [
+   q(5830) => [
       q(Ruund),
       ],
-   q(5830) => [
+   q(5831) => [
       q(Ronga),
       ],
-   q(5831) => [
+   q(5832) => [
       q(Ranglong),
       ],
-   q(5832) => [
+   q(5833) => [
       q(Roon),
       ],
-   q(5833) => [
+   q(5834) => [
       q(Rongpo),
       ],
-   q(5834) => [
+   q(5835) => [
       q(Nari Nari),
       ],
-   q(5835) => [
+   q(5836) => [
       q(Rungwa),
       ],
-   q(5836) => [
+   q(5837) => [
       q(Tae'),
       ],
-   q(5837) => [
+   q(5838) => [
       q(Cacgia Roglai),
       ],
-   q(5838) => [
+   q(5839) => [
       q(Rogo),
       ],
-   q(5839) => [
+   q(5840) => [
       q(Ronji),
       ],
-   q(5840) => [
+   q(5841) => [
       q(Rombo),
       ],
-   q(5841) => [
+   q(5842) => [
       q(Northern Roglai),
       ],
-   q(5842) => [
+   q(5843) => [
       q(Romblomanon),
       ],
-   q(5843) => [
+   q(5844) => [
       q(Rotokas),
       ],
-   q(5844) => [
+   q(5845) => [
       q(Kriol),
       ],
-   q(5845) => [
+   q(5846) => [
       q(Rongga),
       ],
-   q(5846) => [
+   q(5847) => [
       q(Runga),
       ],
-   q(5847) => [
+   q(5848) => [
       q(Dela-Oenale),
       ],
-   q(5848) => [
+   q(5849) => [
       q(Repanbitip),
       ],
-   q(5849) => [
+   q(5850) => [
       q(Rapting),
       ],
-   q(5850) => [
+   q(5851) => [
       q(Ririo),
       ],
-   q(5851) => [
+   q(5852) => [
       q(Waima),
       ],
-   q(5852) => [
+   q(5853) => [
       q(Arritinngithigh),
       ],
-   q(5853) => [
+   q(5854) => [
       q(Romano-Serbian),
       ],
-   q(5854) => [
+   q(5855) => [
       q(Rennellese Sign Language),
       ],
-   q(5855) => [
+   q(5856) => [
       q(Russian Sign Language),
       ],
-   q(5856) => [
+   q(5857) => [
       q(Rungtu Chin),
       ],
-   q(5857) => [
+   q(5858) => [
       q(Ratahan),
       ],
-   q(5858) => [
+   q(5859) => [
       q(Rotuman),
       ],
-   q(5859) => [
+   q(5860) => [
       q(Yurats),
       ],
-   q(5860) => [
+   q(5861) => [
       q(Rathawi),
       ],
-   q(5861) => [
+   q(5862) => [
       q(Gungu),
       ],
-   q(5862) => [
+   q(5863) => [
       q(Ruuli),
       ],
-   q(5863) => [
+   q(5864) => [
       q(Rusyn),
       ],
-   q(5864) => [
+   q(5865) => [
       q(Luguru),
       ],
-   q(5865) => [
+   q(5866) => [
       q(Roviana),
       ],
-   q(5866) => [
+   q(5867) => [
       q(Ruga),
       ],
-   q(5867) => [
+   q(5868) => [
       q(Rufiji),
       ],
-   q(5868) => [
+   q(5869) => [
       q(Che),
       ],
-   q(5869) => [
+   q(5870) => [
       q(Istro Romanian),
       ],
-   q(5870) => [
+   q(5871) => [
       q(Megleno Romanian),
       ],
-   q(5871) => [
+   q(5872) => [
       q(Rutul),
       ],
-   q(5872) => [
+   q(5873) => [
       q(Lanas Lobu),
       ],
-   q(5873) => [
+   q(5874) => [
       q(Mala (Nigeria)),
       ],
-   q(5874) => [
+   q(5875) => [
       q(Ruma),
       ],
-   q(5875) => [
+   q(5876) => [
       q(Rawo),
       ],
-   q(5876) => [
+   q(5877) => [
       q(Rwa),
       ],
-   q(5877) => [
+   q(5878) => [
       q(Amba (Uganda)),
       ],
-   q(5878) => [
+   q(5879) => [
       q(Rawa),
       ],
-   q(5879) => [
+   q(5880) => [
       q(Marwari (India)),
       ],
-   q(5880) => [
+   q(5881) => [
       q(Ngardi),
       ],
-   q(5881) => [
+   q(5882) => [
       q(Karuwali),
       ],
-   q(5882) => [
+   q(5883) => [
       q(Northern Amami-Oshima),
       ],
-   q(5883) => [
+   q(5884) => [
       q(Yaeyama),
       ],
-   q(5884) => [
+   q(5885) => [
       q(Central Okinawan),
       ],
-   q(5885) => [
+   q(5886) => [
       q(Saba),
       ],
-   q(5886) => [
+   q(5887) => [
       q(Buglere),
       ],
-   q(5887) => [
+   q(5888) => [
       q(Meskwaki),
       ],
-   q(5888) => [
+   q(5889) => [
       q(Sabane),
       ],
-   q(5889) => [
+   q(5890) => [
       q(Safaliba),
       ],
-   q(5890) => [
+   q(5891) => [
       q(Sahu),
       ],
-   q(5891) => [
+   q(5892) => [
       q(Sake),
       ],
-   q(5892) => [
+   q(5893) => [
       q(Sause),
       ],
-   q(5893) => [
+   q(5894) => [
       q(Samburu),
       ],
-   q(5894) => [
+   q(5895) => [
       q(Saraveca),
       ],
-   q(5895) => [
+   q(5896) => [
       q(Saleman),
       ],
-   q(5896) => [
+   q(5897) => [
       q(Saafi-Saafi),
       ],
-   q(5897) => [
+   q(5898) => [
       q(Sawi),
       ],
-   q(5898) => [
+   q(5899) => [
       q(Sa),
       ],
-   q(5899) => [
+   q(5900) => [
       q(Saya),
       ],
-   q(5900) => [
+   q(5901) => [
       q(Saurashtra),
       ],
-   q(5901) => [
+   q(5902) => [
       q(Ngambay),
       ],
-   q(5902) => [
+   q(5903) => [
       q(Simbo),
       ],
-   q(5903) => [
+   q(5904) => [
       q(Kele (Papua New Guinea)),
       ],
-   q(5904) => [
+   q(5905) => [
       q(Southern Samo),
       ],
-   q(5905) => [
+   q(5906) => [
       q(Saliba),
       ],
-   q(5906) => [
+   q(5907) => [
       q(Chabu),
       q(Shabo),
       ],
-   q(5907) => [
+   q(5908) => [
       q(Seget),
       ],
-   q(5908) => [
+   q(5909) => [
       q(Sori-Harengan),
       ],
-   q(5909) => [
+   q(5910) => [
       q(Seti),
       ],
-   q(5910) => [
+   q(5911) => [
       q(Surbakhal),
       ],
-   q(5911) => [
+   q(5912) => [
       q(Safwa),
       ],
-   q(5912) => [
+   q(5913) => [
       q(Botolan Sambal),
       ],
-   q(5913) => [
+   q(5914) => [
       q(Sagala),
       ],
-   q(5914) => [
+   q(5915) => [
       q(Sindhi Bhil),
       ],
-   q(5915) => [
+   q(5916) => [
       q(Sabum),
       ],
-   q(5916) => [
+   q(5917) => [
       q(Sangu (Tanzania)),
       ],
-   q(5917) => [
+   q(5918) => [
       q(Sileibi),
       ],
-   q(5918) => [
+   q(5919) => [
       q(Sembakung Murut),
       ],
-   q(5919) => [
+   q(5920) => [
       q(Subiya),
       ],
-   q(5920) => [
+   q(5921) => [
       q(Kimki),
       ],
-   q(5921) => [
+   q(5922) => [
       q(Stod Bhoti),
       ],
-   q(5922) => [
+   q(5923) => [
       q(Sabine),
       ],
-   q(5923) => [
+   q(5924) => [
       q(Simba),
       ],
-   q(5924) => [
+   q(5925) => [
       q(Seberuang),
       ],
-   q(5925) => [
+   q(5926) => [
       q(Soli),
       ],
-   q(5926) => [
+   q(5927) => [
       q(Sara Kaba),
       ],
-   q(5927) => [
+   q(5928) => [
       q(Chut),
       ],
-   q(5928) => [
+   q(5929) => [
       q(Dongxiang),
       ],
-   q(5929) => [
+   q(5930) => [
       q(San Miguel Creole French),
       ],
-   q(5930) => [
+   q(5931) => [
       q(Sanggau),
       ],
-   q(5931) => [
+   q(5932) => [
       q(Sakachep),
       ],
-   q(5932) => [
+   q(5933) => [
       q(Sri Lankan Creole Malay),
       ],
-   q(5933) => [
+   q(5934) => [
       q(Sadri),
       ],
-   q(5934) => [
+   q(5935) => [
       q(Shina),
       ],
-   q(5935) => [
+   q(5936) => [
       q(Helambu Sherpa),
       ],
-   q(5936) => [
+   q(5937) => [
       q(Sa'och),
       ],
-   q(5937) => [
+   q(5938) => [
       q(North Slavey),
       ],
-   q(5938) => [
+   q(5939) => [
       q(Shumcho),
       ],
-   q(5939) => [
+   q(5940) => [
       q(Sheni),
       ],
-   q(5940) => [
+   q(5941) => [
       q(Sha),
       ],
-   q(5941) => [
+   q(5942) => [
       q(Sicel),
       ],
-   q(5942) => [
+   q(5943) => [
       q(Toraja-Sa'dan),
       ],
-   q(5943) => [
+   q(5944) => [
       q(Shabak),
       ],
-   q(5944) => [
+   q(5945) => [
       q(Sassarese Sardinian),
       ],
-   q(5945) => [
+   q(5946) => [
       q(Surubu),
       ],
-   q(5946) => [
+   q(5947) => [
       q(Sarli),
       ],
-   q(5947) => [
+   q(5948) => [
       q(Savi),
       ],
-   q(5948) => [
+   q(5949) => [
       q(Southern Kurdish),
       ],
-   q(5949) => [
+   q(5950) => [
       q(Suundi),
       ],
-   q(5950) => [
+   q(5951) => [
       q(Sos Kundi),
       ],
-   q(5951) => [
+   q(5952) => [
       q(Saudi Arabian Sign Language),
       ],
-   q(5952) => [
+   q(5953) => [
       q(Semandang),
       ],
-   q(5953) => [
+   q(5954) => [
       q(Gallurese Sardinian),
       ],
-   q(5954) => [
+   q(5955) => [
       q(Bukar-Sadung Bidayuh),
       ],
-   q(5955) => [
+   q(5956) => [
       q(Sherdukpen),
       ],
-   q(5956) => [
+   q(5957) => [
       q(Oraon Sadri),
       ],
-   q(5957) => [
+   q(5958) => [
       q(Sened),
       ],
-   q(5958) => [
+   q(5959) => [
       q(Shuadit),
       ],
-   q(5959) => [
+   q(5960) => [
       q(Sarudu),
       ],
-   q(5960) => [
+   q(5961) => [
       q(Sibu Melanau),
       ],
-   q(5961) => [
+   q(5962) => [
       q(Sallands),
       ],
-   q(5962) => [
+   q(5963) => [
       q(Semai),
       ],
-   q(5963) => [
+   q(5964) => [
       q(Shempire Senoufo),
       ],
-   q(5964) => [
+   q(5965) => [
       q(Sechelt),
       ],
-   q(5965) => [
+   q(5966) => [
       q(Sedang),
       ],
-   q(5966) => [
+   q(5967) => [
       q(Seneca),
       ],
-   q(5967) => [
+   q(5968) => [
       q(Cebaara Senoufo),
       ],
-   q(5968) => [
+   q(5969) => [
       q(Segeju),
       ],
-   q(5969) => [
+   q(5970) => [
       q(Sena),
       ],
-   q(5970) => [
+   q(5971) => [
       q(Seri),
       ],
-   q(5971) => [
+   q(5972) => [
       q(Sene),
       ],
-   q(5972) => [
+   q(5973) => [
       q(Sekani),
       ],
-   q(5973) => [
+   q(5974) => [
       q(Nanerige Senoufo),
       ],
-   q(5974) => [
+   q(5975) => [
       q(Suarmin),
       ],
-   q(5975) => [
+   q(5976) => [
       q(Sicite Senoufo),
       ],
-   q(5976) => [
+   q(5977) => [
       q(Senara Senoufo),
       ],
-   q(5977) => [
+   q(5978) => [
       q(Serrano),
       ],
-   q(5978) => [
+   q(5979) => [
       q(Koyraboro Senni Songhai),
       ],
-   q(5979) => [
+   q(5980) => [
       q(Sentani),
       ],
-   q(5980) => [
+   q(5981) => [
       q(Serui-Laut),
       ],
-   q(5981) => [
+   q(5982) => [
       q(Nyarafolo Senoufo),
       ],
-   q(5982) => [
+   q(5983) => [
       q(Sewa Bay),
       ],
-   q(5983) => [
+   q(5984) => [
       q(Secoya),
       ],
-   q(5984) => [
+   q(5985) => [
       q(Senthang Chin),
       ],
-   q(5985) => [
+   q(5986) => [
       q(Langue des signes de Belgique Francophone),
       q(French Belgian Sign Language),
       ],
-   q(5986) => [
+   q(5987) => [
       q(Eastern Subanen),
       ],
-   q(5987) => [
+   q(5988) => [
       q(Small Flowery Miao),
       ],
-   q(5988) => [
+   q(5989) => [
       q(South African Sign Language),
       ],
-   q(5989) => [
+   q(5990) => [
       q(Sehwi),
       ],
-   q(5990) => [
+   q(5991) => [
       q(Mag-antsi Ayta),
       ],
-   q(5991) => [
+   q(5992) => [
       q(Kipsigis),
       ],
-   q(5992) => [
+   q(5993) => [
       q(Surigaonon),
       ],
-   q(5993) => [
+   q(5994) => [
       q(Segai),
       ],
-   q(5994) => [
+   q(5995) => [
       q(Swiss-German Sign Language),
       ],
-   q(5995) => [
+   q(5996) => [
       q(Shughni),
       ],
-   q(5996) => [
+   q(5997) => [
       q(Suga),
       ],
-   q(5997) => [
+   q(5998) => [
       q(Surgujia),
       ],
-   q(5998) => [
+   q(5999) => [
       q(Sangkong),
       ],
-   q(5999) => [
+   q(6000) => [
       q(Singa),
       ],
-   q(6000) => [
+   q(6001) => [
       q(Singpho),
       ],
-   q(6001) => [
+   q(6002) => [
       q(Sangisari),
       ],
-   q(6002) => [
+   q(6003) => [
       q(Samogitian),
       ],
-   q(6003) => [
+   q(6004) => [
       q(Brokpake),
       ],
-   q(6004) => [
+   q(6005) => [
       q(Salas),
       ],
-   q(6005) => [
+   q(6006) => [
       q(Sebat Bet Gurage),
       ],
-   q(6006) => [
+   q(6007) => [
       q(Sierra Leone Sign Language),
       ],
-   q(6007) => [
+   q(6008) => [
       q(Sanglechi),
       ],
-   q(6008) => [
+   q(6009) => [
       q(Sursurunga),
       ],
-   q(6009) => [
+   q(6010) => [
       q(Shall-Zwall),
       ],
-   q(6010) => [
+   q(6011) => [
       q(Ninam),
       ],
-   q(6011) => [
+   q(6012) => [
       q(Sonde),
       ],
-   q(6012) => [
+   q(6013) => [
       q(Kundal Shahi),
       ],
-   q(6013) => [
+   q(6014) => [
       q(Sheko),
       ],
-   q(6014) => [
+   q(6015) => [
       q(Shua),
       ],
-   q(6015) => [
+   q(6016) => [
       q(Shoshoni),
       ],
-   q(6016) => [
+   q(6017) => [
       q(Tachelhit),
       ],
-   q(6017) => [
+   q(6018) => [
       q(Shatt),
       ],
-   q(6018) => [
+   q(6019) => [
       q(Shilluk),
       ],
-   q(6019) => [
+   q(6020) => [
       q(Shendu),
       ],
-   q(6020) => [
+   q(6021) => [
       q(Shahrudi),
       ],
-   q(6021) => [
+   q(6022) => [
       q(Shanga),
       ],
-   q(6022) => [
+   q(6023) => [
       q(Shipibo-Conibo),
       ],
-   q(6023) => [
+   q(6024) => [
       q(Sala),
       ],
-   q(6024) => [
+   q(6025) => [
       q(Shi),
       ],
-   q(6025) => [
+   q(6026) => [
       q(Shuswap),
       ],
-   q(6026) => [
+   q(6027) => [
       q(Shasta),
       ],
-   q(6027) => [
+   q(6028) => [
       q(Chadian Arabic),
       ],
-   q(6028) => [
+   q(6029) => [
       q(Shehri),
       ],
-   q(6029) => [
+   q(6030) => [
       q(Shwai),
       ],
-   q(6030) => [
+   q(6031) => [
       q(She),
       ],
-   q(6031) => [
+   q(6032) => [
       q(Tachawit),
       ],
-   q(6032) => [
+   q(6033) => [
       q(Syenara Senoufo),
       ],
-   q(6033) => [
+   q(6034) => [
       q(Akkala Sami),
       ],
-   q(6034) => [
+   q(6035) => [
       q(Sebop),
       ],
-   q(6035) => [
+   q(6036) => [
       q(Simaa),
       ],
-   q(6036) => [
+   q(6037) => [
       q(Siamou),
       ],
-   q(6037) => [
+   q(6038) => [
       q(Paasaal),
       ],
-   q(6038) => [
+   q(6039) => [
       q(Zire),
       q(Sishee),
       ],
-   q(6039) => [
+   q(6040) => [
       q(Shom Peng),
       ],
-   q(6040) => [
+   q(6041) => [
       q(Numbami),
       ],
-   q(6041) => [
+   q(6042) => [
       q(Sikiana),
       ],
-   q(6042) => [
+   q(6043) => [
       q(Tumulung Sisaala),
       ],
-   q(6043) => [
+   q(6044) => [
       q(Mende (Papua New Guinea)),
       ],
-   q(6044) => [
+   q(6045) => [
       q(Sikkimese),
       ],
-   q(6045) => [
+   q(6046) => [
       q(Sonia),
       ],
-   q(6046) => [
+   q(6047) => [
       q(Siri),
       ],
-   q(6047) => [
+   q(6048) => [
       q(Siuslaw),
       ],
-   q(6048) => [
+   q(6049) => [
       q(Sinagen),
       ],
-   q(6049) => [
+   q(6050) => [
       q(Sumariup),
       ],
-   q(6050) => [
+   q(6051) => [
       q(Siwai),
       ],
-   q(6051) => [
+   q(6052) => [
       q(Sumau),
       ],
-   q(6052) => [
+   q(6053) => [
       q(Sivandi),
       ],
-   q(6053) => [
+   q(6054) => [
       q(Siwi),
       ],
-   q(6054) => [
+   q(6055) => [
       q(Epena),
       ],
-   q(6055) => [
+   q(6056) => [
       q(Sajau Basap),
       ],
-   q(6056) => [
+   q(6057) => [
       q(Kildin Sami),
       ],
-   q(6057) => [
+   q(6058) => [
       q(Pite Sami),
       ],
-   q(6058) => [
+   q(6059) => [
       q(Assangori),
       ],
-   q(6059) => [
+   q(6060) => [
       q(Kemi Sami),
       ],
-   q(6060) => [
+   q(6061) => [
       q(Sajalong),
       q(Miji),
       ],
-   q(6061) => [
+   q(6062) => [
       q(Mapun),
       ],
-   q(6062) => [
+   q(6063) => [
       q(Sindarin),
       ],
-   q(6063) => [
+   q(6064) => [
       q(Xibe),
       ],
-   q(6064) => [
+   q(6065) => [
       q(Surjapuri),
       ],
-   q(6065) => [
+   q(6066) => [
       q(Siar-Lak),
       ],
-   q(6066) => [
+   q(6067) => [
       q(Senhaja De Srair),
       ],
-   q(6067) => [
+   q(6068) => [
       q(Ter Sami),
       ],
-   q(6068) => [
+   q(6069) => [
       q(Ume Sami),
       ],
-   q(6069) => [
+   q(6070) => [
       q(Shawnee),
       ],
-   q(6070) => [
+   q(6071) => [
       q(Skagit),
       ],
-   q(6071) => [
+   q(6072) => [
       q(Saek),
       ],
-   q(6072) => [
+   q(6073) => [
       q(Ma Manda),
       ],
-   q(6073) => [
+   q(6074) => [
       q(Southern Sierra Miwok),
       ],
-   q(6074) => [
+   q(6075) => [
       q(Seke (Vanuatu)),
       ],
-   q(6075) => [
+   q(6076) => [
       q(Sakirabia),
       ],
-   q(6076) => [
+   q(6077) => [
       q(Sakalava Malagasy),
       ],
-   q(6077) => [
+   q(6078) => [
       q(Sikule),
       ],
-   q(6078) => [
+   q(6079) => [
       q(Sika),
       ],
-   q(6079) => [
+   q(6080) => [
       q(Seke (Nepal)),
       ],
-   q(6080) => [
+   q(6081) => [
       q(Sok),
       ],
-   q(6081) => [
+   q(6082) => [
       q(Kutong),
       ],
-   q(6082) => [
+   q(6083) => [
       q(Kolibugan Subanon),
       ],
-   q(6083) => [
+   q(6084) => [
       q(Seko Tengah),
       ],
-   q(6084) => [
+   q(6085) => [
       q(Sekapan),
       ],
-   q(6085) => [
+   q(6086) => [
       q(Sininkere),
       ],
-   q(6086) => [
+   q(6087) => [
       q(Saraiki),
       q(Seraiki),
       ],
-   q(6087) => [
+   q(6088) => [
       q(Maia),
       ],
-   q(6088) => [
+   q(6089) => [
       q(Sakata),
       ],
-   q(6089) => [
+   q(6090) => [
       q(Sakao),
       ],
-   q(6090) => [
+   q(6091) => [
       q(Skou),
       ],
-   q(6091) => [
+   q(6092) => [
       q(Skepi Creole Dutch),
       ],
-   q(6092) => [
+   q(6093) => [
       q(Seko Padang),
       ],
-   q(6093) => [
+   q(6094) => [
       q(Sikaiana),
       ],
-   q(6094) => [
+   q(6095) => [
       q(Sekar),
       ],
-   q(6095) => [
+   q(6096) => [
       q(Sissala),
       ],
-   q(6096) => [
+   q(6097) => [
       q(Sholaga),
       ],
-   q(6097) => [
+   q(6098) => [
       q(Swiss-Italian Sign Language),
       ],
-   q(6098) => [
+   q(6099) => [
       q(Selungai Murut),
       ],
-   q(6099) => [
+   q(6100) => [
       q(Southern Puget Sound Salish),
       ],
-   q(6100) => [
+   q(6101) => [
       q(Lower Silesian),
       ],
-   q(6101) => [
+   q(6102) => [
       q(Saluma),
       ],
-   q(6102) => [
+   q(6103) => [
       q(Salt-Yui),
       ],
-   q(6103) => [
+   q(6104) => [
       q(Pangutaran Sama),
       ],
-   q(6104) => [
+   q(6105) => [
       q(Salinan),
       ],
-   q(6105) => [
+   q(6106) => [
       q(Lamaholot),
       ],
-   q(6106) => [
+   q(6107) => [
       q(Salchuq),
       ],
-   q(6107) => [
+   q(6108) => [
       q(Salar),
       ],
-   q(6108) => [
+   q(6109) => [
       q(Singapore Sign Language),
       ],
-   q(6109) => [
+   q(6110) => [
       q(Sila),
       ],
-   q(6110) => [
+   q(6111) => [
       q(Selaru),
       ],
-   q(6111) => [
+   q(6112) => [
       q(Sialum),
       ],
-   q(6112) => [
+   q(6113) => [
       q(Salampasu),
       ],
-   q(6113) => [
+   q(6114) => [
       q(Selayar),
       ],
-   q(6114) => [
+   q(6115) => [
       q(Ma'ya),
       ],
-   q(6115) => [
+   q(6116) => [
       q(Simbari),
       ],
-   q(6116) => [
+   q(6117) => [
       q(Som),
       ],
-   q(6117) => [
+   q(6118) => [
       q(Sama),
       ],
-   q(6118) => [
+   q(6119) => [
       q(Auwe),
       ],
-   q(6119) => [
+   q(6120) => [
       q(Simbali),
       ],
-   q(6120) => [
+   q(6121) => [
       q(Samei),
       ],
-   q(6121) => [
+   q(6122) => [
       q(Bolinao),
       ],
-   q(6122) => [
+   q(6123) => [
       q(Central Sama),
       ],
-   q(6123) => [
+   q(6124) => [
       q(Musasa),
       ],
-   q(6124) => [
+   q(6125) => [
       q(Samaritan),
       ],
-   q(6125) => [
+   q(6126) => [
       q(Samo),
       ],
-   q(6126) => [
+   q(6127) => [
       q(Simeulue),
       ],
-   q(6127) => [
+   q(6128) => [
       q(Simte),
       ],
-   q(6128) => [
+   q(6129) => [
       q(Somray),
       ],
-   q(6129) => [
+   q(6130) => [
       q(Samvedi),
       ],
-   q(6130) => [
+   q(6131) => [
       q(Sumbawa),
       ],
-   q(6131) => [
+   q(6132) => [
       q(Samba),
       ],
-   q(6132) => [
+   q(6133) => [
       q(Semnani),
       ],
-   q(6133) => [
+   q(6134) => [
       q(Simeku),
       ],
-   q(6134) => [
+   q(6135) => [
       q(Sebuyau),
       ],
-   q(6135) => [
+   q(6136) => [
       q(Sinaugoro),
       ],
-   q(6136) => [
+   q(6137) => [
       q(Bau Bidayuh),
       ],
-   q(6137) => [
+   q(6138) => [
       q(Noon),
       ],
-   q(6138) => [
+   q(6139) => [
       q(Sanga (Democratic Republic of Congo)),
       ],
-   q(6139) => [
+   q(6140) => [
       q(Shinabo),
       ],
-   q(6140) => [
+   q(6141) => [
       q(Sensi),
       ],
-   q(6141) => [
+   q(6142) => [
       q(Riverain Sango),
       ],
-   q(6142) => [
+   q(6143) => [
       q(Sangil),
       ],
-   q(6143) => [
+   q(6144) => [
       q(Southern Ma'di),
       ],
-   q(6144) => [
+   q(6145) => [
       q(Siona),
       ],
-   q(6145) => [
+   q(6146) => [
       q(Snohomish),
       ],
-   q(6146) => [
+   q(6147) => [
       q(Siane),
       ],
-   q(6147) => [
+   q(6148) => [
       q(Sangu (Gabon)),
       ],
-   q(6148) => [
+   q(6149) => [
       q(Sihan),
       ],
-   q(6149) => [
+   q(6150) => [
       q(South West Bay),
       q(Nahavaq),
       ],
-   q(6150) => [
+   q(6151) => [
       q(Senggi),
       q(Viid),
       ],
-   q(6151) => [
+   q(6152) => [
       q(Sa'ban),
       ],
-   q(6152) => [
+   q(6153) => [
       q(Selee),
       ],
-   q(6153) => [
+   q(6154) => [
       q(Sam),
       ],
-   q(6154) => [
+   q(6155) => [
       q(Saniyo-Hiyewe),
       ],
-   q(6155) => [
+   q(6156) => [
       q(Sinsauru),
       ],
-   q(6156) => [
+   q(6157) => [
       q(Thai Song),
       ],
-   q(6157) => [
+   q(6158) => [
       q(Sobei),
       ],
-   q(6158) => [
+   q(6159) => [
       q(So (Democratic Republic of Congo)),
       ],
-   q(6159) => [
+   q(6160) => [
       q(Songoora),
       ],
-   q(6160) => [
+   q(6161) => [
       q(Songomeno),
       ],
-   q(6161) => [
+   q(6162) => [
       q(Aka),
       ],
-   q(6162) => [
+   q(6163) => [
       q(Sonha),
       ],
-   q(6163) => [
+   q(6164) => [
       q(Soi),
       ],
-   q(6164) => [
+   q(6165) => [
       q(Sokoro),
       ],
-   q(6165) => [
+   q(6166) => [
       q(Solos),
       ],
-   q(6166) => [
+   q(6167) => [
       q(Songo),
       ],
-   q(6167) => [
+   q(6168) => [
       q(Songe),
       ],
-   q(6168) => [
+   q(6169) => [
       q(Kanasi),
       ],
-   q(6169) => [
+   q(6170) => [
       q(Somrai),
       ],
-   q(6170) => [
+   q(6171) => [
       q(Seeku),
       ],
-   q(6171) => [
+   q(6172) => [
       q(Southern Thai),
       ],
-   q(6172) => [
+   q(6173) => [
       q(Sonsorol),
       ],
-   q(6173) => [
+   q(6174) => [
       q(Sowanda),
       ],
-   q(6174) => [
+   q(6175) => [
       q(Swo),
       ],
-   q(6175) => [
+   q(6176) => [
       q(Miyobe),
       ],
-   q(6176) => [
+   q(6177) => [
       q(Temi),
       ],
-   q(6177) => [
+   q(6178) => [
       q(Sepa (Indonesia)),
       ],
-   q(6178) => [
+   q(6179) => [
       q(Sape),
       ],
-   q(6179) => [
+   q(6180) => [
       q(Saep),
       ],
-   q(6180) => [
+   q(6181) => [
       q(Sepa (Papua New Guinea)),
       ],
-   q(6181) => [
+   q(6182) => [
       q(Sian),
       ],
-   q(6182) => [
+   q(6183) => [
       q(Saponi),
       ],
-   q(6183) => [
+   q(6184) => [
       q(Sengo),
       ],
-   q(6184) => [
+   q(6185) => [
       q(Selepet),
       ],
-   q(6185) => [
+   q(6186) => [
       q(Akukem),
       ],
-   q(6186) => [
+   q(6187) => [
       q(Sanapana),
       ],
-   q(6187) => [
+   q(6188) => [
       q(Spokane),
       ],
-   q(6188) => [
+   q(6189) => [
       q(Supyire Senoufo),
       ],
-   q(6189) => [
+   q(6190) => [
       q(Loreto-Ucayali Spanish),
       ],
-   q(6190) => [
+   q(6191) => [
       q(Saparua),
       ],
-   q(6191) => [
+   q(6192) => [
       q(Saposa),
       ],
-   q(6192) => [
+   q(6193) => [
       q(Spiti Bhoti),
       ],
-   q(6193) => [
+   q(6194) => [
       q(Sapuan),
       ],
-   q(6194) => [
+   q(6195) => [
       q(Sambalpuri),
       q(Kosli),
       ],
-   q(6195) => [
+   q(6196) => [
       q(South Picene),
       ],
-   q(6196) => [
+   q(6197) => [
       q(Sabaot),
       ],
-   q(6197) => [
+   q(6198) => [
       q(Shama-Sambuga),
       ],
-   q(6198) => [
+   q(6199) => [
       q(Shau),
       ],
-   q(6199) => [
+   q(6200) => [
       q(Albanian Sign Language),
       ],
-   q(6200) => [
+   q(6201) => [
       q(Suma),
       ],
-   q(6201) => [
+   q(6202) => [
       q(Susquehannock),
       ],
-   q(6202) => [
+   q(6203) => [
       q(Sorkhei),
       ],
-   q(6203) => [
+   q(6204) => [
       q(Sou),
       ],
-   q(6204) => [
+   q(6205) => [
       q(Siculo Arabic),
       ],
-   q(6205) => [
+   q(6206) => [
       q(Sri Lankan Sign Language),
       ],
-   q(6206) => [
+   q(6207) => [
       q(Soqotri),
       ],
-   q(6207) => [
+   q(6208) => [
       q(Squamish),
       ],
-   q(6208) => [
+   q(6209) => [
       q(Saruga),
       ],
-   q(6209) => [
+   q(6210) => [
       q(Sora),
       ],
-   q(6210) => [
+   q(6211) => [
       q(Logudorese Sardinian),
       ],
-   q(6211) => [
+   q(6212) => [
       q(Sara),
       ],
-   q(6212) => [
+   q(6213) => [
       q(Nafi),
       ],
-   q(6213) => [
+   q(6214) => [
       q(Sulod),
       ],
-   q(6214) => [
+   q(6215) => [
       q(Sarikoli),
       ],
-   q(6215) => [
+   q(6216) => [
       q(Siriano),
       ],
-   q(6216) => [
+   q(6217) => [
       q(Serudung Murut),
       ],
-   q(6217) => [
+   q(6218) => [
       q(Isirawa),
       ],
-   q(6218) => [
+   q(6219) => [
       q(Saramaccan),
       ],
-   q(6219) => [
+   q(6220) => [
       q(Campidanese Sardinian),
       ],
-   q(6220) => [
+   q(6221) => [
       q(Siriono),
       ],
-   q(6221) => [
+   q(6222) => [
       q(Sarsi),
       ],
-   q(6222) => [
+   q(6223) => [
       q(Sauri),
       ],
-   q(6223) => [
+   q(6224) => [
       q(Surui),
       ],
-   q(6224) => [
+   q(6225) => [
       q(Southern Sorsoganon),
       ],
-   q(6225) => [
+   q(6226) => [
       q(Serua),
       ],
-   q(6226) => [
+   q(6227) => [
       q(Sirmauri),
       ],
-   q(6227) => [
+   q(6228) => [
       q(Sera),
       ],
-   q(6228) => [
+   q(6229) => [
       q(Shahmirzadi),
       ],
-   q(6229) => [
+   q(6230) => [
       q(Southern Sama),
       ],
-   q(6230) => [
+   q(6231) => [
       q(Suba-Simbiti),
       ],
-   q(6231) => [
+   q(6232) => [
       q(Siroi),
       ],
-   q(6232) => [
+   q(6233) => [
       q(Balangingi),
       q(Bangingih Sama),
       ],
-   q(6233) => [
+   q(6234) => [
       q(Thao),
       ],
-   q(6234) => [
+   q(6235) => [
       q(Seimat),
       ],
-   q(6235) => [
+   q(6236) => [
       q(Shihhi Arabic),
       ],
-   q(6236) => [
+   q(6237) => [
       q(Sansi),
       ],
-   q(6237) => [
+   q(6238) => [
       q(Sausi),
       ],
-   q(6238) => [
+   q(6239) => [
       q(Sunam),
       ],
-   q(6239) => [
+   q(6240) => [
       q(Western Sisaala),
       ],
-   q(6240) => [
+   q(6241) => [
       q(Semnam),
       ],
-   q(6241) => [
+   q(6242) => [
       q(Waata),
       ],
-   q(6242) => [
+   q(6243) => [
       q(Sissano),
       ],
-   q(6243) => [
+   q(6244) => [
       q(Spanish Sign Language),
       ],
-   q(6244) => [
+   q(6245) => [
       q(So'a),
       ],
-   q(6245) => [
+   q(6246) => [
       q(Swiss-French Sign Language),
       ],
-   q(6246) => [
+   q(6247) => [
       q(So),
       ],
-   q(6247) => [
+   q(6248) => [
       q(Sinasina),
       ],
-   q(6248) => [
+   q(6249) => [
       q(Susuami),
       ],
-   q(6249) => [
+   q(6250) => [
       q(Shark Bay),
       ],
-   q(6250) => [
+   q(6251) => [
       q(Samberigi),
       ],
-   q(6251) => [
+   q(6252) => [
       q(Saho),
       ],
-   q(6252) => [
+   q(6253) => [
       q(Sengseng),
       ],
-   q(6253) => [
+   q(6254) => [
       q(Settla),
       ],
-   q(6254) => [
+   q(6255) => [
       q(Northern Subanen),
       ],
-   q(6255) => [
+   q(6256) => [
       q(Sentinel),
       ],
-   q(6256) => [
+   q(6257) => [
       q(Liana-Seti),
       ],
-   q(6257) => [
+   q(6258) => [
       q(Seta),
       ],
-   q(6258) => [
+   q(6259) => [
       q(Trieng),
       ],
-   q(6259) => [
+   q(6260) => [
       q(Shelta),
       ],
-   q(6260) => [
+   q(6261) => [
       q(Bulo Stieng),
       ],
-   q(6261) => [
+   q(6262) => [
       q(Matya Samo),
       ],
-   q(6262) => [
+   q(6263) => [
       q(Arammba),
       ],
-   q(6263) => [
+   q(6264) => [
       q(Stellingwerfs),
       ],
-   q(6264) => [
+   q(6265) => [
       q(Setaman),
       ],
-   q(6265) => [
+   q(6266) => [
       q(Owa),
       ],
-   q(6266) => [
+   q(6267) => [
       q(Stoney),
       ],
-   q(6267) => [
+   q(6268) => [
       q(Southeastern Tepehuan),
       ],
-   q(6268) => [
+   q(6269) => [
       q(Saterfriesisch),
       ],
-   q(6269) => [
+   q(6270) => [
       q(Straits Salish),
       ],
-   q(6270) => [
+   q(6271) => [
       q(Shumashti),
       ],
-   q(6271) => [
+   q(6272) => [
       q(Budeh Stieng),
       ],
-   q(6272) => [
+   q(6273) => [
       q(Samtao),
       ],
-   q(6273) => [
+   q(6274) => [
       q(Silt'e),
       ],
-   q(6274) => [
+   q(6275) => [
       q(Satawalese),
       ],
-   q(6275) => [
+   q(6276) => [
       q(Siberian Tatar),
       ],
-   q(6276) => [
+   q(6277) => [
       q(Sulka),
       ],
-   q(6277) => [
+   q(6278) => [
       q(Suku),
       ],
-   q(6278) => [
+   q(6279) => [
       q(Western Subanon),
       ],
-   q(6279) => [
+   q(6280) => [
       q(Suena),
       ],
-   q(6280) => [
+   q(6281) => [
       q(Suganga),
       ],
-   q(6281) => [
+   q(6282) => [
       q(Suki),
       ],
-   q(6282) => [
+   q(6283) => [
       q(Shubi),
       ],
-   q(6283) => [
+   q(6284) => [
       q(Suri),
       ],
-   q(6284) => [
+   q(6285) => [
       q(Mwaghavul),
       ],
-   q(6285) => [
+   q(6286) => [
       q(Subtiaba),
       ],
-   q(6286) => [
+   q(6287) => [
       q(Puroik),
       ],
-   q(6287) => [
+   q(6288) => [
       q(Sumbwa),
       ],
-   q(6288) => [
+   q(6289) => [
       q(Suya),
       ],
-   q(6289) => [
+   q(6290) => [
       q(Sunwar),
       ],
-   q(6290) => [
+   q(6291) => [
       q(Svan),
       ],
-   q(6291) => [
+   q(6292) => [
       q(Ulau-Suain),
       ],
-   q(6292) => [
+   q(6293) => [
       q(Vincentian Creole English),
       ],
-   q(6293) => [
+   q(6294) => [
       q(Serili),
       ],
-   q(6294) => [
+   q(6295) => [
       q(Slovakian Sign Language),
       ],
-   q(6295) => [
+   q(6296) => [
       q(Slavomolisano),
       ],
-   q(6296) => [
+   q(6297) => [
       q(Savara),
       ],
-   q(6297) => [
+   q(6298) => [
       q(Savosavo),
       ],
-   q(6298) => [
+   q(6299) => [
       q(Skalvian),
       ],
-   q(6299) => [
+   q(6300) => [
       q(Maore Comorian),
       ],
-   q(6300) => [
+   q(6301) => [
       q(Congo Swahili),
       ],
-   q(6301) => [
+   q(6302) => [
       q(Sere),
       ],
-   q(6302) => [
+   q(6303) => [
       q(Swabian),
       ],
-   q(6303) => [
+   q(6304) => [
       q(Swahili (individual language)),
       q(Kiswahili),
       ],
-   q(6304) => [
+   q(6305) => [
       q(Sui),
       ],
-   q(6305) => [
+   q(6306) => [
       q(Sira),
       ],
-   q(6306) => [
+   q(6307) => [
       q(Malawi Sena),
       ],
-   q(6307) => [
+   q(6308) => [
       q(Swedish Sign Language),
       ],
-   q(6308) => [
+   q(6309) => [
       q(Samosa),
       ],
-   q(6309) => [
+   q(6310) => [
       q(Sawknah),
       ],
-   q(6310) => [
+   q(6311) => [
       q(Shanenawa),
       ],
-   q(6311) => [
+   q(6312) => [
       q(Suau),
       ],
-   q(6312) => [
+   q(6313) => [
       q(Sharwa),
       ],
-   q(6313) => [
+   q(6314) => [
       q(Saweru),
       ],
-   q(6314) => [
+   q(6315) => [
       q(Seluwasan),
       ],
-   q(6315) => [
+   q(6316) => [
       q(Sawila),
       ],
-   q(6316) => [
+   q(6317) => [
       q(Suwawa),
       ],
-   q(6317) => [
+   q(6318) => [
       q(Shekhawati),
       ],
-   q(6318) => [
+   q(6319) => [
       q(Sowa),
       ],
-   q(6319) => [
+   q(6320) => [
       q(Suruaha),
       ],
-   q(6320) => [
+   q(6321) => [
       q(Sarua),
       ],
-   q(6321) => [
+   q(6322) => [
       q(Suba),
       ],
-   q(6322) => [
+   q(6323) => [
       q(Sicanian),
       ],
-   q(6323) => [
+   q(6324) => [
       q(Sighu),
       ],
-   q(6324) => [
+   q(6325) => [
       q(Shixing),
       ],
-   q(6325) => [
+   q(6326) => [
       q(Southern Kalapuya),
       ],
-   q(6326) => [
+   q(6327) => [
       q(Selian),
       ],
-   q(6327) => [
+   q(6328) => [
       q(Samre),
       ],
-   q(6328) => [
+   q(6329) => [
       q(Sangir),
       ],
-   q(6329) => [
+   q(6330) => [
       q(Sorothaptic),
       ],
-   q(6330) => [
+   q(6331) => [
       q(Saaroa),
       ],
-   q(6331) => [
+   q(6332) => [
       q(Sasaru),
       ],
-   q(6332) => [
+   q(6333) => [
       q(Upper Saxon),
       ],
-   q(6333) => [
+   q(6334) => [
       q(Saxwe Gbe),
       ],
-   q(6334) => [
+   q(6335) => [
       q(Siang),
       ],
-   q(6335) => [
+   q(6336) => [
       q(Central Subanen),
       ],
-   q(6336) => [
+   q(6337) => [
       q(Seki),
       ],
-   q(6337) => [
+   q(6338) => [
       q(Sukur),
       ],
-   q(6338) => [
+   q(6339) => [
       q(Sylheti),
       ],
-   q(6339) => [
+   q(6340) => [
       q(Maya Samo),
       ],
-   q(6340) => [
+   q(6341) => [
       q(Senaya),
       ],
-   q(6341) => [
+   q(6342) => [
       q(Suoy),
       ],
-   q(6342) => [
+   q(6343) => [
       q(Sinyar),
       ],
-   q(6343) => [
+   q(6344) => [
       q(Kagate),
       ],
-   q(6344) => [
+   q(6345) => [
       q(Samay),
       ],
-   q(6345) => [
+   q(6346) => [
       q(Al-Sayyid Bedouin Sign Language),
       ],
-   q(6346) => [
+   q(6347) => [
       q(Semelai),
       ],
-   q(6347) => [
+   q(6348) => [
       q(Ngalum),
       ],
-   q(6348) => [
+   q(6349) => [
       q(Semaq Beri),
       ],
-   q(6349) => [
+   q(6350) => [
       q(Seru),
       ],
-   q(6350) => [
+   q(6351) => [
       q(Seze),
       ],
-   q(6351) => [
+   q(6352) => [
       q(Sengele),
       ],
-   q(6352) => [
+   q(6353) => [
       q(Silesian),
       ],
-   q(6353) => [
+   q(6354) => [
       q(Sula),
       ],
-   q(6354) => [
+   q(6355) => [
       q(Suabo),
       ],
-   q(6355) => [
+   q(6356) => [
       q(Isu (Fako Division)),
       ],
-   q(6356) => [
+   q(6357) => [
       q(Sawai),
       ],
-   q(6357) => [
+   q(6358) => [
       q(Lower Tanana),
       ],
-   q(6358) => [
+   q(6359) => [
       q(Tabassaran),
       ],
-   q(6359) => [
+   q(6360) => [
       q(Lowland Tarahumara),
       ],
-   q(6360) => [
+   q(6361) => [
       q(Tause),
       ],
-   q(6361) => [
+   q(6362) => [
       q(Tariana),
       ],
-   q(6362) => [
+   q(6363) => [
       q(Tapirape),
       ],
-   q(6363) => [
+   q(6364) => [
       q(Tagoi),
       ],
-   q(6364) => [
+   q(6365) => [
       q(Eastern Tamang),
       ],
-   q(6365) => [
+   q(6366) => [
       q(Tala),
       ],
-   q(6366) => [
+   q(6367) => [
       q(Tal),
       ],
-   q(6367) => [
+   q(6368) => [
       q(Tangale),
       ],
-   q(6368) => [
+   q(6369) => [
       q(Yami),
       ],
-   q(6369) => [
+   q(6370) => [
       q(Taabwa),
       ],
-   q(6370) => [
+   q(6371) => [
       q(Tamasheq),
       ],
-   q(6371) => [
+   q(6372) => [
       q(Central Tarahumara),
       ],
-   q(6372) => [
+   q(6373) => [
       q(Tay Boi),
       ],
-   q(6373) => [
+   q(6374) => [
       q(Upper Tanana),
       ],
-   q(6374) => [
+   q(6375) => [
       q(Tatuyo),
       ],
-   q(6375) => [
+   q(6376) => [
       q(Tai),
       ],
-   q(6376) => [
+   q(6377) => [
       q(Tamki),
       ],
-   q(6377) => [
+   q(6378) => [
       q(Atayal),
       ],
-   q(6378) => [
+   q(6379) => [
       q(Tocho),
       ],
-   q(6379) => [
+   q(6380) => [
       q(Aikana),
       ],
-   q(6380) => [
+   q(6381) => [
       q(Tapeba),
       ],
-   q(6381) => [
+   q(6382) => [
       q(Takia),
       ],
-   q(6382) => [
+   q(6383) => [
       q(Kaki Ae),
       ],
-   q(6383) => [
+   q(6384) => [
       q(Tanimbili),
       ],
-   q(6384) => [
+   q(6385) => [
       q(Mandara),
       ],
-   q(6385) => [
+   q(6386) => [
       q(North Tairora),
       ],
-   q(6386) => [
+   q(6387) => [
       q(Thurawal),
       ],
-   q(6387) => [
+   q(6388) => [
       q(Gaam),
       ],
-   q(6388) => [
+   q(6389) => [
       q(Tiang),
       ],
-   q(6389) => [
+   q(6390) => [
       q(Calamian Tagbanwa),
       ],
-   q(6390) => [
+   q(6391) => [
       q(Tboli),
       ],
-   q(6391) => [
+   q(6392) => [
       q(Tagbu),
       ],
-   q(6392) => [
+   q(6393) => [
       q(Barro Negro Tunebo),
       ],
-   q(6393) => [
+   q(6394) => [
       q(Tawala),
       ],
-   q(6394) => [
+   q(6395) => [
       q(Taworta),
       q(Diebroud),
       ],
-   q(6395) => [
+   q(6396) => [
       q(Tumtum),
       ],
-   q(6396) => [
+   q(6397) => [
       q(Tanguat),
       ],
-   q(6397) => [
+   q(6398) => [
       q(Tembo (Kitembo)),
       ],
-   q(6398) => [
+   q(6399) => [
       q(Tubar),
       ],
-   q(6399) => [
+   q(6400) => [
       q(Tobo),
       ],
-   q(6400) => [
+   q(6401) => [
       q(Tagbanwa),
       ],
-   q(6401) => [
+   q(6402) => [
       q(Kapin),
       ],
-   q(6402) => [
+   q(6403) => [
       q(Tabaru),
       ],
-   q(6403) => [
+   q(6404) => [
       q(Ditammari),
       ],
-   q(6404) => [
+   q(6405) => [
       q(Ticuna),
       ],
-   q(6405) => [
+   q(6406) => [
       q(Tanacross),
       ],
-   q(6406) => [
+   q(6407) => [
       q(Datooga),
       ],
-   q(6407) => [
+   q(6408) => [
       q(Tafi),
       ],
-   q(6408) => [
+   q(6409) => [
       q(Southern Tutchone),
       ],
-   q(6409) => [
+   q(6410) => [
       q(Malinaltepec Me'phaa),
       q(Malinaltepec Tlapanec),
       ],
-   q(6410) => [
+   q(6411) => [
       q(Tamagario),
       ],
-   q(6411) => [
+   q(6412) => [
       q(Turks And Caicos Creole English),
       ],
-   q(6412) => [
+   q(6413) => [
       q(Wara),
       ],
-   q(6413) => [
+   q(6414) => [
       q(Tchitchege),
       ],
-   q(6414) => [
+   q(6415) => [
       q(Taman (Myanmar)),
       ],
-   q(6415) => [
+   q(6416) => [
       q(Tanahmerah),
       ],
-   q(6416) => [
+   q(6417) => [
       q(Tichurong),
       ],
-   q(6417) => [
+   q(6418) => [
       q(Taungyo),
       ],
-   q(6418) => [
+   q(6419) => [
       q(Tawr Chin),
       ],
-   q(6419) => [
+   q(6420) => [
       q(Kaiy),
       ],
-   q(6420) => [
+   q(6421) => [
       q(Torres Strait Creole),
       ],
-   q(6421) => [
+   q(6422) => [
       q(T'en),
       ],
-   q(6422) => [
+   q(6423) => [
       q(Southeastern Tarahumara),
       ],
-   q(6423) => [
+   q(6424) => [
       q(Tecpatlan Totonac),
       ],
-   q(6424) => [
+   q(6425) => [
       q(Toda),
       ],
-   q(6425) => [
+   q(6426) => [
       q(Tulu),
       ],
-   q(6426) => [
+   q(6427) => [
       q(Thado Chin),
       ],
-   q(6427) => [
+   q(6428) => [
       q(Tagdal),
       ],
-   q(6428) => [
+   q(6429) => [
       q(Panchpargania),
       ],
-   q(6429) => [
+   q(6430) => [
       q(Embera-Tado),
       ],
-   q(6430) => [
+   q(6431) => [
       q(Tai Nua),
       ],
-   q(6431) => [
+   q(6432) => [
       q(Tiranige Diga Dogon),
       ],
-   q(6432) => [
+   q(6433) => [
       q(Talieng),
       ],
-   q(6433) => [
+   q(6434) => [
       q(Western Tamang),
       ],
-   q(6434) => [
+   q(6435) => [
       q(Thulung),
       ],
-   q(6435) => [
+   q(6436) => [
       q(Tomadino),
       ],
-   q(6436) => [
+   q(6437) => [
       q(Tajio),
       ],
-   q(6437) => [
+   q(6438) => [
       q(Tambas),
       ],
-   q(6438) => [
+   q(6439) => [
       q(Sur),
       ],
-   q(6439) => [
+   q(6440) => [
       q(Tondano),
       ],
-   q(6440) => [
+   q(6441) => [
       q(Teme),
       ],
-   q(6441) => [
+   q(6442) => [
       q(Tita),
       ],
-   q(6442) => [
+   q(6443) => [
       q(Todrah),
       ],
-   q(6443) => [
+   q(6444) => [
       q(Doutai),
       ],
-   q(6444) => [
+   q(6445) => [
       q(Tetun Dili),
       ],
-   q(6445) => [
+   q(6446) => [
       q(Tempasuk Dusun),
       ],
-   q(6446) => [
+   q(6447) => [
       q(Toro),
       ],
-   q(6447) => [
+   q(6448) => [
       q(Tandroy-Mahafaly Malagasy),
       ],
-   q(6448) => [
+   q(6449) => [
       q(Tadyawan),
       ],
-   q(6449) => [
+   q(6450) => [
       q(Temiar),
       ],
-   q(6450) => [
+   q(6451) => [
       q(Tetete),
       ],
-   q(6451) => [
+   q(6452) => [
       q(Terik),
       ],
-   q(6452) => [
+   q(6453) => [
       q(Tepo Krumen),
       ],
-   q(6453) => [
+   q(6454) => [
       q(Huehuetla Tepehua),
       ],
-   q(6454) => [
+   q(6455) => [
       q(Teressa),
       ],
-   q(6455) => [
+   q(6456) => [
       q(Teke-Tege),
       ],
-   q(6456) => [
+   q(6457) => [
       q(Tehuelche),
       ],
-   q(6457) => [
+   q(6458) => [
       q(Torricelli),
       ],
-   q(6458) => [
+   q(6459) => [
       q(Ibali Teke),
       ],
-   q(6459) => [
+   q(6460) => [
       q(Tama (Colombia)),
       ],
-   q(6460) => [
+   q(6461) => [
       q(Teso),
       ],
-   q(6461) => [
+   q(6462) => [
       q(Tepecano),
       ],
-   q(6462) => [
+   q(6463) => [
       q(Temein),
       ],
-   q(6463) => [
+   q(6464) => [
       q(Tengger),
       ],
-   q(6464) => [
+   q(6465) => [
       q(Soo),
       ],
-   q(6465) => [
+   q(6466) => [
       q(Teor),
       ],
-   q(6466) => [
+   q(6467) => [
       q(Tewa (USA)),
       ],
-   q(6467) => [
+   q(6468) => [
       q(Tennet),
       ],
-   q(6468) => [
+   q(6469) => [
       q(Tulishi),
       ],
-   q(6469) => [
+   q(6470) => [
       q(Tofin Gbe),
       ],
-   q(6470) => [
+   q(6471) => [
       q(Tanaina),
       ],
-   q(6471) => [
+   q(6472) => [
       q(Tefaro),
       ],
-   q(6472) => [
+   q(6473) => [
       q(Teribe),
       ],
-   q(6473) => [
+   q(6474) => [
       q(Ternate),
       ],
-   q(6474) => [
+   q(6475) => [
       q(Sagalla),
       ],
-   q(6475) => [
+   q(6476) => [
       q(Tobilung),
       ],
-   q(6476) => [
+   q(6477) => [
       q(Tigak),
       ],
-   q(6477) => [
+   q(6478) => [
       q(Ciwogai),
       ],
-   q(6478) => [
+   q(6479) => [
       q(Eastern Gorkha Tamang),
       ],
-   q(6479) => [
+   q(6480) => [
       q(Chalikha),
       ],
-   q(6480) => [
+   q(6481) => [
       q(Tobagonian Creole English),
       ],
-   q(6481) => [
+   q(6482) => [
       q(Lawunuia),
       ],
-   q(6482) => [
+   q(6483) => [
       q(Tagin),
       ],
-   q(6483) => [
+   q(6484) => [
       q(Tandaganon),
       ],
-   q(6484) => [
+   q(6485) => [
       q(Sudest),
       ],
-   q(6485) => [
+   q(6486) => [
       q(Tangoa),
       ],
-   q(6486) => [
+   q(6487) => [
       q(Tring),
       ],
-   q(6487) => [
+   q(6488) => [
       q(Tareng),
       ],
-   q(6488) => [
+   q(6489) => [
       q(Nume),
       ],
-   q(6489) => [
+   q(6490) => [
       q(Central Tagbanwa),
       ],
-   q(6490) => [
+   q(6491) => [
       q(Tanggu),
       ],
-   q(6491) => [
+   q(6492) => [
       q(Tingui-Boto),
       ],
-   q(6492) => [
+   q(6493) => [
       q(Tagwana Senoufo),
       ],
-   q(6493) => [
+   q(6494) => [
       q(Tagish),
       ],
-   q(6494) => [
+   q(6495) => [
       q(Togoyo),
       ],
-   q(6495) => [
+   q(6496) => [
       q(Tagalaka),
       ],
-   q(6496) => [
+   q(6497) => [
       q(Tai Hang Tong),
       ],
-   q(6497) => [
+   q(6498) => [
       q(Thayore),
       ],
-   q(6498) => [
+   q(6499) => [
       q(Chitwania Tharu),
       ],
-   q(6499) => [
+   q(6500) => [
       q(Thangmi),
       ],
-   q(6500) => [
+   q(6501) => [
       q(Northern Tarahumara),
       ],
-   q(6501) => [
+   q(6502) => [
       q(Tai Long),
       ],
-   q(6502) => [
+   q(6503) => [
       q(Tharaka),
       q(Kitharaka),
       ],
-   q(6503) => [
+   q(6504) => [
       q(Dangaura Tharu),
       ],
-   q(6504) => [
+   q(6505) => [
       q(Aheu),
       ],
-   q(6505) => [
+   q(6506) => [
       q(Thachanadan),
       ],
-   q(6506) => [
+   q(6507) => [
       q(Thompson),
       ],
-   q(6507) => [
+   q(6508) => [
       q(Kochila Tharu),
       ],
-   q(6508) => [
+   q(6509) => [
       q(Rana Tharu),
       ],
-   q(6509) => [
+   q(6510) => [
       q(Thakali),
       ],
-   q(6510) => [
+   q(6511) => [
       q(Tahltan),
       ],
-   q(6511) => [
+   q(6512) => [
       q(Thuri),
       ],
-   q(6512) => [
+   q(6513) => [
       q(Tahaggart Tamahaq),
       ],
-   q(6513) => [
+   q(6514) => [
       q(Thudam),
       ],
-   q(6514) => [
+   q(6515) => [
       q(Tha),
       ],
-   q(6515) => [
+   q(6516) => [
       q(Tayart Tamajeq),
       ],
-   q(6516) => [
+   q(6517) => [
       q(Tidikelt Tamazight),
       ],
-   q(6517) => [
+   q(6518) => [
       q(Tira),
       ],
-   q(6518) => [
+   q(6519) => [
       q(Tidong),
       ],
-   q(6519) => [
+   q(6520) => [
       q(Tifal),
       ],
-   q(6520) => [
+   q(6521) => [
       q(Timugon Murut),
       ],
-   q(6521) => [
+   q(6522) => [
       q(Tiene),
       ],
-   q(6522) => [
+   q(6523) => [
       q(Tilung),
       ],
-   q(6523) => [
+   q(6524) => [
       q(Tikar),
       ],
-   q(6524) => [
+   q(6525) => [
       q(Tillamook),
       ],
-   q(6525) => [
+   q(6526) => [
       q(Timbe),
       ],
-   q(6526) => [
+   q(6527) => [
       q(Tindi),
       ],
-   q(6527) => [
+   q(6528) => [
       q(Teop),
       ],
-   q(6528) => [
+   q(6529) => [
       q(Trimuris),
       ],
-   q(6529) => [
+   q(6530) => [
       q(Tiefo),
       ],
-   q(6530) => [
+   q(6531) => [
       q(Masadiit Itneg),
       ],
-   q(6531) => [
+   q(6532) => [
       q(Tinigua),
       ],
-   q(6532) => [
+   q(6533) => [
       q(Adasen),
       ],
-   q(6533) => [
+   q(6534) => [
       q(Tiwi),
       ],
-   q(6534) => [
+   q(6535) => [
       q(Southern Tiwa),
       ],
-   q(6535) => [
+   q(6536) => [
       q(Tiruray),
       ],
-   q(6536) => [
+   q(6537) => [
       q(Tai Hongjin),
       ],
-   q(6537) => [
+   q(6538) => [
       q(Tajuasohn),
       ],
-   q(6538) => [
+   q(6539) => [
       q(Tunjung),
       ],
-   q(6539) => [
+   q(6540) => [
       q(Northern Tujia),
       ],
-   q(6540) => [
+   q(6541) => [
       q(Tai Laing),
       ],
-   q(6541) => [
+   q(6542) => [
       q(Timucua),
       ],
-   q(6542) => [
+   q(6543) => [
       q(Tonjon),
       ],
-   q(6543) => [
+   q(6544) => [
       q(Temacine Tamazight),
       ],
-   q(6544) => [
+   q(6545) => [
       q(Southern Tujia),
       ],
-   q(6545) => [
+   q(6546) => [
       q(Tjurruru),
       ],
-   q(6546) => [
+   q(6547) => [
       q(Djabwurrung),
       ],
-   q(6547) => [
+   q(6548) => [
       q(Truka),
       ],
-   q(6548) => [
+   q(6549) => [
       q(Buksa),
       ],
-   q(6549) => [
+   q(6550) => [
       q(Tukudede),
       ],
-   q(6550) => [
+   q(6551) => [
       q(Takwane),
       ],
-   q(6551) => [
+   q(6552) => [
       q(Tukumanfed),
       ],
-   q(6552) => [
+   q(6553) => [
       q(Tesaka Malagasy),
       ],
-   q(6553) => [
+   q(6554) => [
       q(Takelma),
       ],
-   q(6554) => [
+   q(6555) => [
       q(Toku-No-Shima),
       ],
-   q(6555) => [
+   q(6556) => [
       q(Tikopia),
       ],
-   q(6556) => [
+   q(6557) => [
       q(Tee),
       ],
-   q(6557) => [
+   q(6558) => [
       q(Tsakhur),
       ],
-   q(6558) => [
+   q(6559) => [
       q(Takestani),
       ],
-   q(6559) => [
+   q(6560) => [
       q(Kathoriya Tharu),
       ],
-   q(6560) => [
+   q(6561) => [
       q(Upper Necaxa Totonac),
       ],
-   q(6561) => [
+   q(6562) => [
       q(Mur Pano),
       ],
-   q(6562) => [
+   q(6563) => [
       q(Teanu),
       ],
-   q(6563) => [
+   q(6564) => [
       q(Tangko),
       ],
-   q(6564) => [
+   q(6565) => [
       q(Takua),
       ],
-   q(6565) => [
+   q(6566) => [
       q(Southwestern Tepehuan),
       ],
-   q(6566) => [
+   q(6567) => [
       q(Tobelo),
       ],
-   q(6567) => [
+   q(6568) => [
       q(Yecuatla Totonac),
       ],
-   q(6568) => [
+   q(6569) => [
       q(Talaud),
       ],
-   q(6569) => [
+   q(6570) => [
       q(Telefol),
       ],
-   q(6570) => [
+   q(6571) => [
       q(Tofanma),
       ],
-   q(6571) => [
+   q(6572) => [
       q(Talinga-Bwisi),
       ],
-   q(6572) => [
+   q(6573) => [
       q(Taloki),
       ],
-   q(6573) => [
+   q(6574) => [
       q(Tetela),
       ],
-   q(6574) => [
+   q(6575) => [
       q(Tolomako),
       ],
-   q(6575) => [
+   q(6576) => [
       q(Talondo'),
       ],
-   q(6576) => [
+   q(6577) => [
       q(Talodi),
       ],
-   q(6577) => [
+   q(6578) => [
       q(Filomena Mata-Coahuitlan Totonac),
       ],
-   q(6578) => [
+   q(6579) => [
       q(Tai Loi),
       ],
-   q(6579) => [
+   q(6580) => [
       q(Talise),
       ],
-   q(6580) => [
+   q(6581) => [
       q(Tambotalo),
       ],
-   q(6581) => [
+   q(6582) => [
       q(Teluti),
       ],
-   q(6582) => [
+   q(6583) => [
       q(Tulehu),
       ],
-   q(6583) => [
+   q(6584) => [
       q(Taliabu),
       ],
-   q(6584) => [
+   q(6585) => [
       q(Khehek),
       ],
-   q(6585) => [
+   q(6586) => [
       q(Talysh),
       ],
-   q(6586) => [
+   q(6587) => [
       q(Tama (Chad)),
       ],
-   q(6587) => [
+   q(6588) => [
       q(Katbol),
       q(Avava),
       ],
-   q(6588) => [
+   q(6589) => [
       q(Tumak),
       ],
-   q(6589) => [
+   q(6590) => [
       q(Haruai),
       ],
-   q(6590) => [
+   q(6591) => [
       q(Tremembe),
       ],
-   q(6591) => [
+   q(6592) => [
       q(Toba-Maskoy),
       ],
-   q(6592) => [
+   q(6593) => [
       q(Ternateno),
       ],
-   q(6593) => [
+   q(6594) => [
       q(Tutuba),
       ],
-   q(6594) => [
+   q(6595) => [
       q(Samarokena),
       ],
-   q(6595) => [
+   q(6596) => [
       q(Northwestern Tamang),
       ],
-   q(6596) => [
+   q(6597) => [
       q(Tamnim Citak),
       ],
-   q(6597) => [
+   q(6598) => [
       q(Tai Thanh),
       ],
-   q(6598) => [
+   q(6599) => [
       q(Taman (Indonesia)),
       ],
-   q(6599) => [
+   q(6600) => [
       q(Temoq),
       ],
-   q(6600) => [
+   q(6601) => [
       q(Tai Mene),
       ],
-   q(6601) => [
+   q(6602) => [
       q(Tumleo),
       ],
-   q(6602) => [
+   q(6603) => [
       q(Jewish Babylonian Aramaic (ca. 200-1200 CE)),
       ],
-   q(6603) => [
+   q(6604) => [
       q(Tima),
       ],
-   q(6604) => [
+   q(6605) => [
       q(Tasmate),
       ],
-   q(6605) => [
+   q(6606) => [
       q(Iau),
       ],
-   q(6606) => [
+   q(6607) => [
       q(Tembo (Motembo)),
       ],
-   q(6607) => [
+   q(6608) => [
       q(Temuan),
       ],
-   q(6608) => [
+   q(6609) => [
       q(Tami),
       ],
-   q(6609) => [
+   q(6610) => [
       q(Tamanaku),
       ],
-   q(6610) => [
+   q(6611) => [
       q(Tacana),
       ],
-   q(6611) => [
+   q(6612) => [
       q(Western Tunebo),
       ],
-   q(6612) => [
+   q(6613) => [
       q(Tanimuca-Retuara),
       ],
-   q(6613) => [
+   q(6614) => [
       q(Angosturas Tunebo),
       ],
-   q(6614) => [
+   q(6615) => [
       q(Tinoc Kallahan),
       ],
-   q(6615) => [
+   q(6616) => [
       q(Tobanga),
       ],
-   q(6616) => [
+   q(6617) => [
       q(Maiani),
       ],
-   q(6617) => [
+   q(6618) => [
       q(Tandia),
       ],
-   q(6618) => [
+   q(6619) => [
       q(Kwamera),
       ],
-   q(6619) => [
+   q(6620) => [
       q(Lenakel),
       ],
-   q(6620) => [
+   q(6621) => [
       q(Tabla),
       ],
-   q(6621) => [
+   q(6622) => [
       q(North Tanna),
       ],
-   q(6622) => [
+   q(6623) => [
       q(Toromono),
       ],
-   q(6623) => [
+   q(6624) => [
       q(Whitesands),
       ],
-   q(6624) => [
+   q(6625) => [
       q(Taino),
       ],
-   q(6625) => [
+   q(6626) => [
       q(Menik),
       ],
-   q(6626) => [
+   q(6627) => [
       q(Tenis),
       ],
-   q(6627) => [
+   q(6628) => [
       q(Tontemboan),
       ],
-   q(6628) => [
+   q(6629) => [
       q(Tay Khang),
       ],
-   q(6629) => [
+   q(6630) => [
       q(Tangchangya),
       ],
-   q(6630) => [
+   q(6631) => [
       q(Tonsawang),
       ],
-   q(6631) => [
+   q(6632) => [
       q(Tanema),
       ],
-   q(6632) => [
+   q(6633) => [
       q(Tongwe),
       ],
-   q(6633) => [
+   q(6634) => [
       q(Tonga (Thailand)),
       ],
-   q(6634) => [
+   q(6635) => [
       q(Toba),
       ],
-   q(6635) => [
+   q(6636) => [
       q(Coyutla Totonac),
       ],
-   q(6636) => [
+   q(6637) => [
       q(Toma),
       ],
-   q(6637) => [
+   q(6638) => [
       q(Tomedes),
       ],
-   q(6638) => [
+   q(6639) => [
       q(Gizrra),
       ],
-   q(6639) => [
+   q(6640) => [
       q(Gitonga),
       ],
-   q(6640) => [
+   q(6641) => [
       q(Tonga (Zambia)),
       ],
-   q(6641) => [
+   q(6642) => [
       q(Tojolabal),
       ],
-   q(6642) => [
+   q(6643) => [
       q(Tolowa),
       ],
-   q(6643) => [
+   q(6644) => [
       q(Tombulu),
       ],
-   q(6644) => [
+   q(6645) => [
       q(Xicotepec De Juarez Totonac),
       ],
-   q(6645) => [
+   q(6646) => [
       q(Papantla Totonac),
       ],
-   q(6646) => [
+   q(6647) => [
       q(Toposa),
       ],
-   q(6647) => [
+   q(6648) => [
       q(Togbo-Vara Banda),
       ],
-   q(6648) => [
+   q(6649) => [
       q(Highland Totonac),
       ],
-   q(6649) => [
+   q(6650) => [
       q(Tho),
       ],
-   q(6650) => [
+   q(6651) => [
       q(Upper Taromi),
       ],
-   q(6651) => [
+   q(6652) => [
       q(Jemez),
       ],
-   q(6652) => [
+   q(6653) => [
       q(Tobian),
       ],
-   q(6653) => [
+   q(6654) => [
       q(Topoiyo),
       ],
-   q(6654) => [
+   q(6655) => [
       q(To),
       ],
-   q(6655) => [
+   q(6656) => [
       q(Taupota),
       ],
-   q(6656) => [
+   q(6657) => [
       q(Azoyu Me'phaa),
       q(Azoyu Tlapanec),
       ],
-   q(6657) => [
+   q(6658) => [
       q(Tippera),
       ],
-   q(6658) => [
+   q(6659) => [
       q(Tarpia),
       ],
-   q(6659) => [
+   q(6660) => [
       q(Kula),
       ],
-   q(6660) => [
+   q(6661) => [
       q(Tapiete),
       ],
-   q(6661) => [
+   q(6662) => [
       q(Tupinikin),
       ],
-   q(6662) => [
+   q(6663) => [
       q(Tlacoapa Me'phaa),
       q(Tlacoapa Tlapanec),
       ],
-   q(6663) => [
+   q(6664) => [
       q(Tampulma),
       ],
-   q(6664) => [
+   q(6665) => [
       q(Tupinamba),
       ],
-   q(6665) => [
+   q(6666) => [
       q(Tai Pao),
       ],
-   q(6666) => [
+   q(6667) => [
       q(Pisaflores Tepehua),
       ],
-   q(6667) => [
+   q(6668) => [
       q(Tukpa),
       ],
-   q(6668) => [
+   q(6669) => [
       q(Tupari),
       ],
-   q(6669) => [
+   q(6670) => [
       q(Tlachichilco Tepehua),
       ],
-   q(6670) => [
+   q(6671) => [
       q(Tampuan),
       ],
-   q(6671) => [
+   q(6672) => [
       q(Tanapag),
       ],
-   q(6672) => [
+   q(6673) => [
       q(Tupi),
       ],
-   q(6673) => [
+   q(6674) => [
       q(Acatepec Me'phaa),
       q(Acatepec Tlapanec),
       ],
-   q(6674) => [
+   q(6675) => [
       q(Trumai),
       ],
-   q(6675) => [
+   q(6676) => [
       q(Tinputz),
       ],
-   q(6676) => [
+   q(6677) => [
       q(Tembe),
       ],
-   q(6677) => [
+   q(6678) => [
       q(Lehali),
       ],
-   q(6678) => [
+   q(6679) => [
       q(Turumsa),
       ],
-   q(6679) => [
+   q(6680) => [
       q(Tenino),
       ],
-   q(6680) => [
+   q(6681) => [
       q(Toaripi),
       ],
-   q(6681) => [
+   q(6682) => [
       q(Tomoip),
       ],
-   q(6682) => [
+   q(6683) => [
       q(Tunni),
       ],
-   q(6683) => [
+   q(6684) => [
       q(Torona),
       ],
-   q(6684) => [
+   q(6685) => [
       q(Western Totonac),
       ],
-   q(6685) => [
+   q(6686) => [
       q(Touo),
       ],
-   q(6686) => [
+   q(6687) => [
       q(Tonkawa),
       ],
-   q(6687) => [
+   q(6688) => [
       q(Tirahi),
       ],
-   q(6688) => [
+   q(6689) => [
       q(Terebu),
       ],
-   q(6689) => [
+   q(6690) => [
       q(Copala Triqui),
       ],
-   q(6690) => [
+   q(6691) => [
       q(Turi),
       ],
-   q(6691) => [
+   q(6692) => [
       q(East Tarangan),
       ],
-   q(6692) => [
+   q(6693) => [
       q(Trinidadian Creole English),
       ],
-   q(6693) => [
+   q(6694) => [
       q(Lishan Didan),
       ],
-   q(6694) => [
+   q(6695) => [
       q(Turaka),
       ],
-   q(6695) => [
+   q(6696) => [
       q(Trio),
       ],
-   q(6696) => [
+   q(6697) => [
       q(Toram),
       ],
-   q(6697) => [
+   q(6698) => [
       q(Traveller Scottish),
       ],
-   q(6698) => [
+   q(6699) => [
       q(Tregami),
       ],
-   q(6699) => [
+   q(6700) => [
       q(Trinitario),
       ],
-   q(6700) => [
+   q(6701) => [
       q(Tarao Naga),
       ],
-   q(6701) => [
+   q(6702) => [
       q(Kok Borok),
       ],
-   q(6702) => [
+   q(6703) => [
       q(San Martin Itunyoso Triqui),
       ],
-   q(6703) => [
+   q(6704) => [
       q(Taushiro),
       ],
-   q(6704) => [
+   q(6705) => [
       q(Chicahuaxtla Triqui),
       ],
-   q(6705) => [
+   q(6706) => [
       q(Tunggare),
       ],
-   q(6706) => [
+   q(6707) => [
       q(Turoyo),
       q(Surayt),
       ],
-   q(6707) => [
+   q(6708) => [
       q(Taroko),
       ],
-   q(6708) => [
+   q(6709) => [
       q(Torwali),
       ],
-   q(6709) => [
+   q(6710) => [
       q(Tringgus-Sembaan Bidayuh),
       ],
-   q(6710) => [
+   q(6711) => [
       q(Turung),
       ],
-   q(6711) => [
+   q(6712) => [
       q(Tora),
       ],
-   q(6712) => [
+   q(6713) => [
       q(Tsaangi),
       ],
-   q(6713) => [
+   q(6714) => [
       q(Tsamai),
       ],
-   q(6714) => [
+   q(6715) => [
       q(Tswa),
       ],
-   q(6715) => [
+   q(6716) => [
       q(Tsakonian),
       ],
-   q(6716) => [
+   q(6717) => [
       q(Tunisian Sign Language),
       ],
-   q(6717) => [
+   q(6718) => [
       q(Tausug),
       ],
-   q(6718) => [
+   q(6719) => [
       q(Tsuvan),
       ],
-   q(6719) => [
+   q(6720) => [
       q(Tshangla),
       ],
-   q(6720) => [
+   q(6721) => [
       q(Tseku),
       ],
-   q(6721) => [
+   q(6722) => [
       q(Ts'un-Lao),
       ],
-   q(6722) => [
+   q(6723) => [
       q(Turkish Sign Language),
       q(Turk Isaret Dili),
       ],
-   q(6723) => [
+   q(6724) => [
       q(Northern Toussian),
       ],
-   q(6724) => [
+   q(6725) => [
       q(Thai Sign Language),
       ],
-   q(6725) => [
+   q(6726) => [
       q(Akei),
       ],
-   q(6726) => [
+   q(6727) => [
       q(Taiwan Sign Language),
       ],
-   q(6727) => [
+   q(6728) => [
       q(Tondi Songway Kiini),
       ],
-   q(6728) => [
+   q(6729) => [
       q(Tsou),
       ],
-   q(6729) => [
+   q(6730) => [
       q(Tsogo),
       ],
-   q(6730) => [
+   q(6731) => [
       q(Tsishingini),
       ],
-   q(6731) => [
+   q(6732) => [
       q(Mubami),
       ],
-   q(6732) => [
+   q(6733) => [
       q(Tebul Sign Language),
       ],
-   q(6733) => [
+   q(6734) => [
       q(Purepecha),
       ],
-   q(6734) => [
+   q(6735) => [
       q(Tutelo),
       ],
-   q(6735) => [
+   q(6736) => [
       q(Gaa),
       ],
-   q(6736) => [
+   q(6737) => [
       q(Tektiteko),
       ],
-   q(6737) => [
+   q(6738) => [
       q(Tauade),
       ],
-   q(6738) => [
+   q(6739) => [
       q(Bwanabwana),
       ],
-   q(6739) => [
+   q(6740) => [
       q(Tuotomb),
       ],
-   q(6740) => [
+   q(6741) => [
       q(Tutong),
       ],
-   q(6741) => [
+   q(6742) => [
       q(Upper Ta'oih),
       ],
-   q(6742) => [
+   q(6743) => [
       q(Tobati),
       ],
-   q(6743) => [
+   q(6744) => [
       q(Tooro),
       ],
-   q(6744) => [
+   q(6745) => [
       q(Totoro),
       ],
-   q(6745) => [
+   q(6746) => [
       q(Totela),
       ],
-   q(6746) => [
+   q(6747) => [
       q(Northern Tutchone),
       ],
-   q(6747) => [
+   q(6748) => [
       q(Towei),
       ],
-   q(6748) => [
+   q(6749) => [
       q(Lower Ta'oih),
       ],
-   q(6749) => [
+   q(6750) => [
       q(Tombelala),
       ],
-   q(6750) => [
+   q(6751) => [
       q(Tawallammat Tamajaq),
       ],
-   q(6751) => [
+   q(6752) => [
       q(Tera),
       ],
-   q(6752) => [
+   q(6753) => [
       q(Northeastern Thai),
       ],
-   q(6753) => [
+   q(6754) => [
       q(Muslim Tat),
       ],
-   q(6754) => [
+   q(6755) => [
       q(Torau),
       ],
-   q(6755) => [
+   q(6756) => [
       q(Titan),
       ],
-   q(6756) => [
+   q(6757) => [
       q(Long Wat),
       ],
-   q(6757) => [
+   q(6758) => [
       q(Sikaritai),
       ],
-   q(6758) => [
+   q(6759) => [
       q(Tsum),
       ],
-   q(6759) => [
+   q(6760) => [
       q(Wiarumus),
       ],
-   q(6760) => [
+   q(6761) => [
       q(Tubatulabal),
       ],
-   q(6761) => [
+   q(6762) => [
       q(Mutu),
       ],
-   q(6762) => [
+   q(6763) => [
       q(Tuxa),
       ],
-   q(6763) => [
+   q(6764) => [
       q(Tuyuca),
       ],
-   q(6764) => [
+   q(6765) => [
       q(Central Tunebo),
       ],
-   q(6765) => [
+   q(6766) => [
       q(Tunia),
       ],
-   q(6766) => [
+   q(6767) => [
       q(Taulil),
       ],
-   q(6767) => [
+   q(6768) => [
       q(Tupuri),
       ],
-   q(6768) => [
+   q(6769) => [
       q(Tugutil),
       ],
-   q(6769) => [
+   q(6770) => [
       q(Tula),
       ],
-   q(6770) => [
+   q(6771) => [
       q(Tunica),
       ],
-   q(6771) => [
+   q(6772) => [
       q(Tucano),
       ],
-   q(6772) => [
+   q(6773) => [
       q(Tedaga),
       ],
-   q(6773) => [
+   q(6774) => [
       q(Tuscarora),
       ],
-   q(6774) => [
+   q(6775) => [
       q(Tututni),
       ],
-   q(6775) => [
+   q(6776) => [
       q(Turkana),
       ],
-   q(6776) => [
+   q(6777) => [
       q(Tuxinawa),
       ],
-   q(6777) => [
+   q(6778) => [
       q(Tugen),
       ],
-   q(6778) => [
+   q(6779) => [
       q(Turka),
       ],
-   q(6779) => [
+   q(6780) => [
       q(Vaghua),
       ],
-   q(6780) => [
+   q(6781) => [
       q(Tsuvadi),
       ],
-   q(6781) => [
+   q(6782) => [
       q(Te'un),
       ],
-   q(6782) => [
+   q(6783) => [
       q(Southeast Ambrym),
       ],
-   q(6783) => [
+   q(6784) => [
       q(Tela-Masbuar),
       ],
-   q(6784) => [
+   q(6785) => [
       q(Tavoyan),
       ],
-   q(6785) => [
+   q(6786) => [
       q(Tidore),
       ],
-   q(6786) => [
+   q(6787) => [
       q(Taveta),
       ],
-   q(6787) => [
+   q(6788) => [
       q(Tutsa Naga),
       ],
-   q(6788) => [
+   q(6789) => [
       q(Tunen),
       ],
-   q(6789) => [
+   q(6790) => [
       q(Sedoa),
       ],
-   q(6790) => [
+   q(6791) => [
       q(Timor Pidgin),
       ],
-   q(6791) => [
+   q(6792) => [
       q(Twana),
       ],
-   q(6792) => [
+   q(6793) => [
       q(Western Tawbuid),
       ],
-   q(6793) => [
+   q(6794) => [
       q(Teshenawa),
       ],
-   q(6794) => [
+   q(6795) => [
       q(Twents),
       ],
-   q(6795) => [
+   q(6796) => [
       q(Tewa (Indonesia)),
       ],
-   q(6796) => [
+   q(6797) => [
       q(Northern Tiwa),
       ],
-   q(6797) => [
+   q(6798) => [
       q(Tereweng),
       ],
-   q(6798) => [
+   q(6799) => [
       q(Tai Don),
       ],
-   q(6799) => [
+   q(6800) => [
       q(Tawara),
       ],
-   q(6800) => [
+   q(6801) => [
       q(Tawang Monpa),
       ],
-   q(6801) => [
+   q(6802) => [
       q(Twendi),
       ],
-   q(6802) => [
+   q(6803) => [
       q(Tswapong),
       ],
-   q(6803) => [
+   q(6804) => [
       q(Ere),
       ],
-   q(6804) => [
+   q(6805) => [
       q(Tasawaq),
       ],
-   q(6805) => [
+   q(6806) => [
       q(Southwestern Tarahumara),
       ],
-   q(6806) => [
+   q(6807) => [
       q(Turiwara),
       ],
-   q(6807) => [
+   q(6808) => [
       q(Termanu),
       ],
-   q(6808) => [
+   q(6809) => [
       q(Tuwari),
       ],
-   q(6809) => [
+   q(6810) => [
       q(Tewe),
       ],
-   q(6810) => [
+   q(6811) => [
       q(Tawoyan),
       ],
-   q(6811) => [
+   q(6812) => [
       q(Tombonuo),
       ],
-   q(6812) => [
+   q(6813) => [
       q(Tokharian B),
       ],
-   q(6813) => [
+   q(6814) => [
       q(Tsetsaut),
       ],
-   q(6814) => [
+   q(6815) => [
       q(Totoli),
       ],
-   q(6815) => [
+   q(6816) => [
       q(Tangut),
       ],
-   q(6816) => [
+   q(6817) => [
       q(Thracian),
       ],
-   q(6817) => [
+   q(6818) => [
       q(Ikpeng),
       ],
-   q(6818) => [
+   q(6819) => [
       q(Tarjumo),
       ],
-   q(6819) => [
+   q(6820) => [
       q(Tomini),
       ],
-   q(6820) => [
+   q(6821) => [
       q(West Tarangan),
       ],
-   q(6821) => [
+   q(6822) => [
       q(Toto),
       ],
-   q(6822) => [
+   q(6823) => [
       q(Tii),
       ],
-   q(6823) => [
+   q(6824) => [
       q(Tartessian),
       ],
-   q(6824) => [
+   q(6825) => [
       q(Tonsea),
       ],
-   q(6825) => [
+   q(6826) => [
       q(Citak),
       ],
-   q(6826) => [
+   q(6827) => [
       q(Kayapo),
       ],
-   q(6827) => [
+   q(6828) => [
       q(Tatana),
       ],
-   q(6828) => [
+   q(6829) => [
       q(Tanosy Malagasy),
       ],
-   q(6829) => [
+   q(6830) => [
       q(Tauya),
       ],
-   q(6830) => [
+   q(6831) => [
       q(Kyanga),
       ],
-   q(6831) => [
+   q(6832) => [
       q(O'du),
       ],
-   q(6832) => [
+   q(6833) => [
       q(Teke-Tsaayi),
       ],
-   q(6833) => [
+   q(6834) => [
       q(Tai Do),
       ],
-   q(6834) => [
+   q(6835) => [
       q(Thu Lao),
       ],
-   q(6835) => [
+   q(6836) => [
       q(Kombai),
       ],
-   q(6836) => [
+   q(6837) => [
       q(Thaypan),
       ],
-   q(6837) => [
+   q(6838) => [
       q(Tai Daeng),
       ],
-   q(6838) => [
+   q(6839) => [
       q(Tay Sa Pa),
       ],
-   q(6839) => [
+   q(6840) => [
       q(Tay Tac),
       ],
-   q(6840) => [
+   q(6841) => [
       q(Kua),
       ],
-   q(6841) => [
+   q(6842) => [
       q(Teke-Tyee),
       ],
-   q(6842) => [
+   q(6843) => [
       q(Tay),
       ],
-   q(6843) => [
+   q(6844) => [
       q(Tanzanian Sign Language),
       ],
-   q(6844) => [
+   q(6845) => [
       q(Tzeltal),
       ],
-   q(6845) => [
+   q(6846) => [
       q(Tz'utujil),
       ],
-   q(6846) => [
+   q(6847) => [
       q(Talossan),
       ],
-   q(6847) => [
+   q(6848) => [
       q(Central Atlas Tamazight),
       ],
-   q(6848) => [
+   q(6849) => [
       q(Tugun),
       ],
-   q(6849) => [
+   q(6850) => [
       q(Tzotzil),
       ],
-   q(6850) => [
+   q(6851) => [
       q(Tabriak),
       ],
-   q(6851) => [
+   q(6852) => [
       q(Uamue),
       ],
-   q(6852) => [
+   q(6853) => [
       q(Kuan),
       ],
-   q(6853) => [
+   q(6854) => [
       q(Tairuma),
       ],
-   q(6854) => [
+   q(6855) => [
       q(Ubang),
       ],
-   q(6855) => [
+   q(6856) => [
       q(Ubi),
       ],
-   q(6856) => [
+   q(6857) => [
       q(Buhi'non Bikol),
       ],
-   q(6857) => [
+   q(6858) => [
       q(Ubir),
       ],
-   q(6858) => [
+   q(6859) => [
       q(Umbu-Ungu),
       ],
-   q(6859) => [
+   q(6860) => [
       q(Ubykh),
       ],
-   q(6860) => [
+   q(6861) => [
       q(Uda),
       ],
-   q(6861) => [
+   q(6862) => [
       q(Udihe),
       ],
-   q(6862) => [
+   q(6863) => [
       q(Muduga),
       ],
-   q(6863) => [
+   q(6864) => [
       q(Udi),
       ],
-   q(6864) => [
+   q(6865) => [
       q(Ujir),
       ],
-   q(6865) => [
+   q(6866) => [
       q(Wuzlam),
       ],
-   q(6866) => [
+   q(6867) => [
       q(Uduk),
       ],
-   q(6867) => [
+   q(6868) => [
       q(Kioko),
       ],
-   q(6868) => [
+   q(6869) => [
       q(Ufim),
       ],
-   q(6869) => [
+   q(6870) => [
       q(Kuku-Ugbanh),
       ],
-   q(6870) => [
+   q(6871) => [
       q(Ughele),
       ],
-   q(6871) => [
+   q(6872) => [
       q(Ugandan Sign Language),
       ],
-   q(6872) => [
+   q(6873) => [
       q(Ugong),
       ],
-   q(6873) => [
+   q(6874) => [
       q(Uruguayan Sign Language),
       ],
-   q(6874) => [
+   q(6875) => [
       q(Uhami),
       ],
-   q(6875) => [
+   q(6876) => [
       q(Damal),
       ],
-   q(6876) => [
+   q(6877) => [
       q(Uisai),
       ],
-   q(6877) => [
+   q(6878) => [
       q(Iyive),
       ],
-   q(6878) => [
+   q(6879) => [
       q(Tanjijili),
       ],
-   q(6879) => [
+   q(6880) => [
       q(Kaburi),
       ],
-   q(6880) => [
+   q(6881) => [
       q(Ukuriguma),
       ],
-   q(6881) => [
+   q(6882) => [
       q(Ukhwejo),
       ],
-   q(6882) => [
+   q(6883) => [
       q(Ukrainian Sign Language),
       ],
-   q(6883) => [
+   q(6884) => [
       q(Ukpe-Bayobiri),
       ],
-   q(6884) => [
+   q(6885) => [
       q(Ukwa),
       ],
-   q(6885) => [
+   q(6886) => [
       q(Urubu-Kaapor Sign Language),
       q(Kaapor Sign Language),
       ],
-   q(6886) => [
+   q(6887) => [
       q(Ukue),
       ],
-   q(6887) => [
+   q(6888) => [
       q(Ukwuani-Aboh-Ndoni),
       ],
-   q(6888) => [
+   q(6889) => [
       q(Kuuk-Yak),
       ],
-   q(6889) => [
+   q(6890) => [
       q(Fungwa),
       ],
-   q(6890) => [
+   q(6891) => [
       q(Ulukwumi),
       ],
-   q(6891) => [
+   q(6892) => [
       q(Ulch),
       ],
-   q(6892) => [
+   q(6893) => [
       q(Lule),
       ],
-   q(6893) => [
+   q(6894) => [
       q(Usku),
       q(Afra),
       ],
-   q(6894) => [
+   q(6895) => [
       q(Ulithian),
       ],
-   q(6895) => [
+   q(6896) => [
       q(Meriam),
       ],
-   q(6896) => [
+   q(6897) => [
       q(Ullatan),
       ],
-   q(6897) => [
+   q(6898) => [
       q(Ulumanda'),
       ],
-   q(6898) => [
+   q(6899) => [
       q(Unserdeutsch),
       ],
-   q(6899) => [
+   q(6900) => [
       q(Uma' Lung),
       ],
-   q(6900) => [
+   q(6901) => [
       q(Ulwa),
       ],
-   q(6901) => [
+   q(6902) => [
       q(Umatilla),
       ],
-   q(6902) => [
+   q(6903) => [
       q(Marrucinian),
       ],
-   q(6903) => [
+   q(6904) => [
       q(Umbindhamu),
       ],
-   q(6904) => [
+   q(6905) => [
       q(Umbuygamu),
       ],
-   q(6905) => [
+   q(6906) => [
       q(Ukit),
       ],
-   q(6906) => [
+   q(6907) => [
       q(Umon),
       ],
-   q(6907) => [
+   q(6908) => [
       q(Makyan Naga),
       ],
-   q(6908) => [
+   q(6909) => [
       q(Umotina),
       ],
-   q(6909) => [
+   q(6910) => [
       q(Umpila),
       ],
-   q(6910) => [
+   q(6911) => [
       q(Umbugarla),
       ],
-   q(6911) => [
+   q(6912) => [
       q(Pendau),
       ],
-   q(6912) => [
+   q(6913) => [
       q(Munsee),
       ],
-   q(6913) => [
+   q(6914) => [
       q(North Watut),
       ],
-   q(6914) => [
+   q(6915) => [
       q(Uneme),
       ],
-   q(6915) => [
+   q(6916) => [
       q(Ngarinyin),
       ],
-   q(6916) => [
+   q(6917) => [
       q(Enawene-Nawe),
       ],
-   q(6917) => [
+   q(6918) => [
       q(Unami),
       ],
-   q(6918) => [
+   q(6919) => [
       q(Kurnai),
       ],
-   q(6919) => [
+   q(6920) => [
       q(Mundari),
       ],
-   q(6920) => [
+   q(6921) => [
       q(Unubahe),
       ],
-   q(6921) => [
+   q(6922) => [
       q(Munda),
       ],
-   q(6922) => [
+   q(6923) => [
       q(Unde Kaili),
       ],
-   q(6923) => [
+   q(6924) => [
       q(Umeda),
       ],
-   q(6924) => [
+   q(6925) => [
       q(Uripiv-Wala-Rano-Atchin),
       ],
-   q(6925) => [
+   q(6926) => [
       q(Urarina),
       ],
-   q(6926) => [
+   q(6927) => [
       q(Urubu-Kaapor),
       q(Kaapor),
       ],
-   q(6927) => [
+   q(6928) => [
       q(Urningangg),
       ],
-   q(6928) => [
+   q(6929) => [
       q(Uru),
       ],
-   q(6929) => [
+   q(6930) => [
       q(Uradhi),
       ],
-   q(6930) => [
+   q(6931) => [
       q(Urigina),
       ],
-   q(6931) => [
+   q(6932) => [
       q(Urhobo),
       ],
-   q(6932) => [
+   q(6933) => [
       q(Urim),
       ],
-   q(6933) => [
+   q(6934) => [
       q(Urak Lawoi'),
       ],
-   q(6934) => [
+   q(6935) => [
       q(Urali),
       ],
-   q(6935) => [
+   q(6936) => [
       q(Urapmin),
       ],
-   q(6936) => [
+   q(6937) => [
       q(Uruangnirin),
       ],
-   q(6937) => [
+   q(6938) => [
       q(Ura (Papua New Guinea)),
       ],
-   q(6938) => [
+   q(6939) => [
       q(Uru-Pa-In),
       ],
-   q(6939) => [
+   q(6940) => [
       q(Lehalurup),
       q(Loyop),
       ],
-   q(6940) => [
+   q(6941) => [
       q(Urat),
       ],
-   q(6941) => [
+   q(6942) => [
       q(Urumi),
       ],
-   q(6942) => [
+   q(6943) => [
       q(Uruava),
       ],
-   q(6943) => [
+   q(6944) => [
       q(Sop),
       ],
-   q(6944) => [
+   q(6945) => [
       q(Urimo),
       ],
-   q(6945) => [
+   q(6946) => [
       q(Orya),
       ],
-   q(6946) => [
+   q(6947) => [
       q(Uru-Eu-Wau-Wau),
       ],
-   q(6947) => [
+   q(6948) => [
       q(Usarufa),
       ],
-   q(6948) => [
+   q(6949) => [
       q(Ushojo),
       ],
-   q(6949) => [
+   q(6950) => [
       q(Usui),
       ],
-   q(6950) => [
+   q(6951) => [
       q(Usaghade),
       ],
-   q(6951) => [
+   q(6952) => [
       q(Uspanteco),
       ],
-   q(6952) => [
+   q(6953) => [
       q(Uya),
       ],
-   q(6953) => [
+   q(6954) => [
       q(Otank),
       ],
-   q(6954) => [
+   q(6955) => [
       q(Ute-Southern Paiute),
       ],
-   q(6955) => [
+   q(6956) => [
       q(Amba (Solomon Islands)),
       ],
-   q(6956) => [
+   q(6957) => [
       q(Etulo),
       ],
-   q(6957) => [
+   q(6958) => [
       q(Utu),
       ],
-   q(6958) => [
+   q(6959) => [
       q(Urum),
       ],
-   q(6959) => [
+   q(6960) => [
       q(Kulon-Pazeh),
       ],
-   q(6960) => [
+   q(6961) => [
       q(Ura (Vanuatu)),
       ],
-   q(6961) => [
+   q(6962) => [
       q(U),
       ],
-   q(6962) => [
+   q(6963) => [
       q(West Uvean),
       q(Fagauvea),
       ],
-   q(6963) => [
+   q(6964) => [
       q(Uri),
       ],
-   q(6964) => [
+   q(6965) => [
       q(Lote),
       ],
-   q(6965) => [
+   q(6966) => [
       q(Kuku-Uwanh),
       ],
-   q(6966) => [
+   q(6967) => [
       q(Doko-Uyanga),
       ],
-   q(6967) => [
+   q(6968) => [
       q(Northern Uzbek),
       ],
-   q(6968) => [
+   q(6969) => [
       q(Southern Uzbek),
       ],
-   q(6969) => [
+   q(6970) => [
       q(Vaagri Booli),
       ],
-   q(6970) => [
+   q(6971) => [
       q(Vale),
       ],
-   q(6971) => [
+   q(6972) => [
       q(Vafsi),
       ],
-   q(6972) => [
+   q(6973) => [
       q(Vagla),
       ],
-   q(6973) => [
+   q(6974) => [
       q(Varhadi-Nagpuri),
       ],
-   q(6974) => [
+   q(6975) => [
       q(Sekele),
       q(Northwestern Kung),
       q(Northwestern Kung),
       q(Vasekele),
       ],
-   q(6975) => [
+   q(6976) => [
       q(Vehes),
       ],
-   q(6976) => [
+   q(6977) => [
       q(Vanimo),
       ],
-   q(6977) => [
+   q(6978) => [
       q(Valman),
       ],
-   q(6978) => [
+   q(6979) => [
       q(Vao),
       ],
-   q(6979) => [
+   q(6980) => [
       q(Vaiphei),
       ],
-   q(6980) => [
+   q(6981) => [
       q(Huarijio),
       ],
-   q(6981) => [
+   q(6982) => [
       q(Vasavi),
       ],
-   q(6982) => [
+   q(6983) => [
       q(Vanuma),
       ],
-   q(6983) => [
+   q(6984) => [
       q(Varli),
       ],
-   q(6984) => [
+   q(6985) => [
       q(Wayu),
       ],
-   q(6985) => [
+   q(6986) => [
       q(Southeast Babar),
       ],
-   q(6986) => [
+   q(6987) => [
       q(Southwestern Bontok),
       ],
-   q(6987) => [
+   q(6988) => [
       q(Venetian),
       ],
-   q(6988) => [
+   q(6989) => [
       q(Veddah),
       ],
-   q(6989) => [
+   q(6990) => [
       q(Veluws),
       ],
-   q(6990) => [
+   q(6991) => [
       q(Vemgo-Mabas),
       ],
-   q(6991) => [
+   q(6992) => [
       q(Ventureno),
       ],
-   q(6992) => [
+   q(6993) => [
       q(Veps),
       ],
-   q(6993) => [
+   q(6994) => [
       q(Mom Jango),
       ],
-   q(6994) => [
+   q(6995) => [
       q(Vaghri),
       ],
-   q(6995) => [
+   q(6996) => [
       q(Vlaamse Gebarentaal),
       q(Flemish Sign Language),
       ],
-   q(6996) => [
+   q(6997) => [
       q(Virgin Islands Creole English),
       ],
-   q(6997) => [
+   q(6998) => [
       q(Vidunda),
       ],
-   q(6998) => [
+   q(6999) => [
       q(Vili),
       ],
-   q(6999) => [
+   q(7000) => [
       q(Viemo),
       ],
-   q(7000) => [
+   q(7001) => [
       q(Vilela),
       ],
-   q(7001) => [
+   q(7002) => [
       q(Vinza),
       ],
-   q(7002) => [
+   q(7003) => [
       q(Vishavan),
       ],
-   q(7003) => [
+   q(7004) => [
       q(Viti),
       ],
-   q(7004) => [
+   q(7005) => [
       q(Iduna),
       ],
-   q(7005) => [
+   q(7006) => [
       q(Kariyarra),
       ],
-   q(7006) => [
+   q(7007) => [
       q(Ija-Zuba),
       ],
-   q(7007) => [
+   q(7008) => [
       q(Kujarge),
       ],
-   q(7008) => [
+   q(7009) => [
       q(Kaur),
       ],
-   q(7009) => [
+   q(7010) => [
       q(Kulisusu),
       ],
-   q(7010) => [
+   q(7011) => [
       q(Kamakan),
       ],
-   q(7011) => [
+   q(7012) => [
       q(Kodeoha),
       ],
-   q(7012) => [
+   q(7013) => [
       q(Korlai Creole Portuguese),
       ],
-   q(7013) => [
+   q(7014) => [
       q(Tenggarong Kutai Malay),
       ],
-   q(7014) => [
+   q(7015) => [
       q(Kurrama),
       ],
-   q(7015) => [
+   q(7016) => [
       q(Valpei),
       ],
-   q(7016) => [
+   q(7017) => [
       q(Vlaams),
       ],
-   q(7017) => [
+   q(7018) => [
       q(Martuyhunira),
       ],
-   q(7018) => [
+   q(7019) => [
       q(Barbaram),
       ],
-   q(7019) => [
+   q(7020) => [
       q(Juxtlahuaca Mixtec),
       ],
-   q(7020) => [
+   q(7021) => [
       q(Mudu Koraga),
       ],
-   q(7021) => [
+   q(7022) => [
       q(East Masela),
       ],
-   q(7022) => [
+   q(7023) => [
       q(Mainfrankisch),
       ],
-   q(7023) => [
+   q(7024) => [
       q(Lungalunga),
       ],
-   q(7024) => [
+   q(7025) => [
       q(Maraghei),
       ],
-   q(7025) => [
+   q(7026) => [
       q(Miwa),
       ],
-   q(7026) => [
+   q(7027) => [
       q(Ixtayutla Mixtec),
       ],
-   q(7027) => [
+   q(7028) => [
       q(Makhuwa-Shirima),
       ],
-   q(7028) => [
+   q(7029) => [
       q(Malgana),
       ],
-   q(7029) => [
+   q(7030) => [
       q(Mitlatongo Mixtec),
       ],
-   q(7030) => [
+   q(7031) => [
       q(Soyaltepec Mazatec),
       ],
-   q(7031) => [
+   q(7032) => [
       q(Soyaltepec Mixtec),
       ],
-   q(7032) => [
+   q(7033) => [
       q(Marenje),
       ],
-   q(7033) => [
+   q(7034) => [
       q(Moksela),
       ],
-   q(7034) => [
+   q(7035) => [
       q(Muluridyi),
       ],
-   q(7035) => [
+   q(7036) => [
       q(Valley Maidu),
       ],
-   q(7036) => [
+   q(7037) => [
       q(Makhuwa),
       ],
-   q(7037) => [
+   q(7038) => [
       q(Tamazola Mixtec),
       ],
-   q(7038) => [
+   q(7039) => [
       q(Ayautla Mazatec),
       ],
-   q(7039) => [
+   q(7040) => [
       q(Mazatlan Mazatec),
       ],
-   q(7040) => [
+   q(7041) => [
       q(Vano),
       q(Lovono),
       ],
-   q(7041) => [
+   q(7042) => [
       q(Vinmavis),
       q(Neve'ei),
       ],
-   q(7042) => [
+   q(7043) => [
       q(Vunapu),
       ],
-   q(7043) => [
+   q(7044) => [
       q(Voro),
       ],
-   q(7044) => [
+   q(7045) => [
       q(Vera'a),
       ],
-   q(7045) => [
+   q(7046) => [
       q(Varisi),
       ],
-   q(7046) => [
+   q(7047) => [
       q(Burmbar),
       q(Banam Bay),
       ],
-   q(7047) => [
+   q(7048) => [
       q(Moldova Sign Language),
       ],
-   q(7048) => [
+   q(7049) => [
       q(Venezuelan Sign Language),
       ],
-   q(7049) => [
+   q(7050) => [
       q(Valencian Sign Language),
       q(Llengua de signes valenciana),
       ],
-   q(7050) => [
+   q(7051) => [
       q(Vitou),
       ],
-   q(7051) => [
+   q(7052) => [
       q(Vumbu),
       ],
-   q(7052) => [
+   q(7053) => [
       q(Vunjo),
       ],
-   q(7053) => [
+   q(7054) => [
       q(Vute),
       ],
-   q(7054) => [
+   q(7055) => [
       q(Awa (China)),
       ],
-   q(7055) => [
+   q(7056) => [
       q(Walla Walla),
       ],
-   q(7056) => [
+   q(7057) => [
       q(Wab),
       ],
-   q(7057) => [
+   q(7058) => [
       q(Wasco-Wishram),
       ],
-   q(7058) => [
+   q(7059) => [
       q(Wandamen),
       ],
-   q(7059) => [
+   q(7060) => [
       q(Walser),
       ],
-   q(7060) => [
+   q(7061) => [
       q(Wakona),
       ],
-   q(7061) => [
+   q(7062) => [
       q(Wa'ema),
       ],
-   q(7062) => [
+   q(7063) => [
       q(Watubela),
       ],
-   q(7063) => [
+   q(7064) => [
       q(Wares),
       ],
-   q(7064) => [
+   q(7065) => [
       q(Waffa),
       ],
-   q(7065) => [
+   q(7066) => [
       q(Wampanoag),
       ],
-   q(7066) => [
+   q(7067) => [
       q(Wan),
       ],
-   q(7067) => [
+   q(7068) => [
       q(Wappo),
       ],
-   q(7068) => [
+   q(7069) => [
       q(Wapishana),
       ],
-   q(7069) => [
+   q(7070) => [
       q(Wageman),
       ],
-   q(7070) => [
+   q(7071) => [
       q(Kaninuwa),
       ],
-   q(7071) => [
+   q(7072) => [
       q(Waura),
       ],
-   q(7072) => [
+   q(7073) => [
       q(Waka),
       ],
-   q(7073) => [
+   q(7074) => [
       q(Waiwai),
       ],
-   q(7074) => [
+   q(7075) => [
       q(Watam),
       q(Marangis),
       ],
-   q(7075) => [
+   q(7076) => [
       q(Wayana),
       ],
-   q(7076) => [
+   q(7077) => [
       q(Wampur),
       ],
-   q(7077) => [
+   q(7078) => [
       q(Warao),
       ],
-   q(7078) => [
+   q(7079) => [
       q(Wabo),
       ],
-   q(7079) => [
+   q(7080) => [
       q(Waritai),
       ],
-   q(7080) => [
+   q(7081) => [
       q(Wanda),
       ],
-   q(7081) => [
+   q(7082) => [
       q(Vwanji),
       ],
-   q(7082) => [
+   q(7083) => [
       q(Alagwa),
       ],
-   q(7083) => [
+   q(7084) => [
       q(Waigali),
       ],
-   q(7084) => [
+   q(7085) => [
       q(Wakhi),
       ],
-   q(7085) => [
+   q(7086) => [
       q(Wa),
       ],
-   q(7086) => [
+   q(7087) => [
       q(Warlpiri),
       ],
-   q(7087) => [
+   q(7088) => [
       q(Waddar),
       ],
-   q(7088) => [
+   q(7089) => [
       q(Wagdi),
       ],
-   q(7089) => [
+   q(7090) => [
       q(Wanman),
       ],
-   q(7090) => [
+   q(7091) => [
       q(Wajarri),
       ],
-   q(7091) => [
+   q(7092) => [
       q(Woi),
       ],
-   q(7092) => [
+   q(7093) => [
       q(Yanomami),
       ],
-   q(7093) => [
+   q(7094) => [
       q(Waci Gbe),
       ],
-   q(7094) => [
+   q(7095) => [
       q(Wandji),
       ],
-   q(7095) => [
+   q(7096) => [
       q(Wadaginam),
       ],
-   q(7096) => [
+   q(7097) => [
       q(Wadjiginy),
       ],
-   q(7097) => [
+   q(7098) => [
       q(Wadikali),
       ],
-   q(7098) => [
+   q(7099) => [
       q(Wadjigu),
       ],
-   q(7099) => [
+   q(7100) => [
       q(Wadjabangayi),
       ],
-   q(7100) => [
+   q(7101) => [
       q(Wewaw),
       ],
-   q(7101) => [
+   q(7102) => [
       q(We Western),
       ],
-   q(7102) => [
+   q(7103) => [
       q(Wedau),
       ],
-   q(7103) => [
+   q(7104) => [
       q(Wergaia),
       ],
-   q(7104) => [
+   q(7105) => [
       q(Weh),
       ],
-   q(7105) => [
+   q(7106) => [
       q(Kiunum),
       ],
-   q(7106) => [
+   q(7107) => [
       q(Weme Gbe),
       ],
-   q(7107) => [
+   q(7108) => [
       q(Wemale),
       ],
-   q(7108) => [
+   q(7109) => [
       q(Westphalien),
       ],
-   q(7109) => [
+   q(7110) => [
       q(Weri),
       ],
-   q(7110) => [
+   q(7111) => [
       q(Cameroon Pidgin),
       ],
-   q(7111) => [
+   q(7112) => [
       q(Perai),
       ],
-   q(7112) => [
+   q(7113) => [
       q(Rawngtu Chin),
       ],
-   q(7113) => [
+   q(7114) => [
       q(Wejewa),
       ],
-   q(7114) => [
+   q(7115) => [
       q(Yafi),
       q(Zorop),
       ],
-   q(7115) => [
+   q(7116) => [
       q(Wagaya),
       ],
-   q(7116) => [
+   q(7117) => [
       q(Wagawaga),
       ],
-   q(7117) => [
+   q(7118) => [
       q(Wangganguru),
       ],
-   q(7118) => [
+   q(7119) => [
       q(Wahgi),
       ],
-   q(7119) => [
+   q(7120) => [
       q(Waigeo),
       ],
-   q(7120) => [
+   q(7121) => [
       q(Wirangu),
       ],
-   q(7121) => [
+   q(7122) => [
       q(Warrgamay),
       ],
-   q(7122) => [
+   q(7123) => [
       q(Manusela),
       ],
-   q(7123) => [
+   q(7124) => [
       q(North Wahgi),
       ],
-   q(7124) => [
+   q(7125) => [
       q(Wahau Kenyah),
       ],
-   q(7125) => [
+   q(7126) => [
       q(Wahau Kayan),
       ],
-   q(7126) => [
+   q(7127) => [
       q(Southern Toussian),
       ],
-   q(7127) => [
+   q(7128) => [
       q(Wichita),
       ],
-   q(7128) => [
+   q(7129) => [
       q(Wik-Epa),
       ],
-   q(7129) => [
+   q(7130) => [
       q(Wik-Keyangan),
       ],
-   q(7130) => [
+   q(7131) => [
       q(Wik-Ngathana),
       ],
-   q(7131) => [
+   q(7132) => [
       q(Wik-Me'anha),
       ],
-   q(7132) => [
+   q(7133) => [
       q(Minidien),
       ],
-   q(7133) => [
+   q(7134) => [
       q(Wik-Iiyanh),
       ],
-   q(7134) => [
+   q(7135) => [
       q(Wikalkan),
       ],
-   q(7135) => [
+   q(7136) => [
       q(Wilawila),
       ],
-   q(7136) => [
+   q(7137) => [
       q(Wik-Mungkan),
       ],
-   q(7137) => [
+   q(7138) => [
       q(Ho-Chunk),
       ],
-   q(7138) => [
+   q(7139) => [
       q(Wirafed),
       ],
-   q(7139) => [
+   q(7140) => [
       q(Wiru),
       ],
-   q(7140) => [
+   q(7141) => [
       q(Vitu),
       ],
-   q(7141) => [
+   q(7142) => [
       q(Wiyot),
       ],
-   q(7142) => [
+   q(7143) => [
       q(Waja),
       ],
-   q(7143) => [
+   q(7144) => [
       q(Warji),
       ],
-   q(7144) => [
+   q(7145) => [
       q(Kw'adza),
       ],
-   q(7145) => [
+   q(7146) => [
       q(Kumbaran),
       ],
-   q(7146) => [
+   q(7147) => [
       q(Wakde),
       q(Mo),
       ],
-   q(7147) => [
+   q(7148) => [
       q(Kalanadi),
       ],
-   q(7148) => [
+   q(7149) => [
       q(Kunduvadi),
       ],
-   q(7149) => [
+   q(7150) => [
       q(Wakawaka),
       ],
-   q(7150) => [
+   q(7151) => [
       q(Wangkayutyuru),
       ],
-   q(7151) => [
+   q(7152) => [
       q(Walio),
       ],
-   q(7152) => [
+   q(7153) => [
       q(Mwali Comorian),
       ],
-   q(7153) => [
+   q(7154) => [
       q(Wolane),
       ],
-   q(7154) => [
+   q(7155) => [
       q(Kunbarlang),
       ],
-   q(7155) => [
+   q(7156) => [
       q(Waioli),
       ],
-   q(7156) => [
+   q(7157) => [
       q(Wailaki),
       ],
-   q(7157) => [
+   q(7158) => [
       q(Wali (Sudan)),
       ],
-   q(7158) => [
+   q(7159) => [
       q(Middle Welsh),
       ],
-   q(7159) => [
+   q(7160) => [
       q(Wolio),
       ],
-   q(7160) => [
+   q(7161) => [
       q(Wailapa),
       ],
-   q(7161) => [
+   q(7162) => [
       q(Wallisian),
       ],
-   q(7162) => [
+   q(7163) => [
       q(Wuliwuli),
       ],
-   q(7163) => [
+   q(7164) => [
       q(Wichi Lhamtes Vejoz),
       ],
-   q(7164) => [
+   q(7165) => [
       q(Walak),
       ],
-   q(7165) => [
+   q(7166) => [
       q(Wali (Ghana)),
       ],
-   q(7166) => [
+   q(7167) => [
       q(Waling),
       ],
-   q(7167) => [
+   q(7168) => [
       q(Mawa (Nigeria)),
       ],
-   q(7168) => [
+   q(7169) => [
       q(Wambaya),
       ],
-   q(7169) => [
+   q(7170) => [
       q(Wamas),
       ],
-   q(7170) => [
+   q(7171) => [
       q(Mamainde),
       ],
-   q(7171) => [
+   q(7172) => [
       q(Wambule),
       ],
-   q(7172) => [
+   q(7173) => [
       q(Waima'a),
       ],
-   q(7173) => [
+   q(7174) => [
       q(Wamin),
       ],
-   q(7174) => [
+   q(7175) => [
       q(Maiwa (Indonesia)),
       ],
-   q(7175) => [
+   q(7176) => [
       q(Waamwang),
       ],
-   q(7176) => [
+   q(7177) => [
       q(Wom (Papua New Guinea)),
       ],
-   q(7177) => [
+   q(7178) => [
       q(Wambon),
       ],
-   q(7178) => [
+   q(7179) => [
       q(Walmajarri),
       ],
-   q(7179) => [
+   q(7180) => [
       q(Mwani),
       ],
-   q(7180) => [
+   q(7181) => [
       q(Womo),
       ],
-   q(7181) => [
+   q(7182) => [
       q(Wanambre),
       ],
-   q(7182) => [
+   q(7183) => [
       q(Wantoat),
       ],
-   q(7183) => [
+   q(7184) => [
       q(Wandarang),
       ],
-   q(7184) => [
+   q(7185) => [
       q(Waneci),
       ],
-   q(7185) => [
+   q(7186) => [
       q(Wanggom),
       ],
-   q(7186) => [
+   q(7187) => [
       q(Ndzwani Comorian),
       ],
-   q(7187) => [
+   q(7188) => [
       q(Wanukaka),
       ],
-   q(7188) => [
+   q(7189) => [
       q(Wanggamala),
       ],
-   q(7189) => [
+   q(7190) => [
       q(Wunumara),
       ],
-   q(7190) => [
+   q(7191) => [
       q(Wano),
       ],
-   q(7191) => [
+   q(7192) => [
       q(Wanap),
       ],
-   q(7192) => [
+   q(7193) => [
       q(Usan),
       ],
-   q(7193) => [
+   q(7194) => [
       q(Wintu),
       ],
-   q(7194) => [
+   q(7195) => [
       q(Wanyi),
       ],
-   q(7195) => [
+   q(7196) => [
       q(Tyaraity),
       ],
-   q(7196) => [
+   q(7197) => [
       q(We Northern),
       ],
-   q(7197) => [
+   q(7198) => [
       q(Wogeo),
       ],
-   q(7198) => [
+   q(7199) => [
       q(Wolani),
       ],
-   q(7199) => [
+   q(7200) => [
       q(Woleaian),
       ],
-   q(7200) => [
+   q(7201) => [
       q(Gambian Wolof),
       ],
-   q(7201) => [
+   q(7202) => [
       q(Wogamusin),
       ],
-   q(7202) => [
+   q(7203) => [
       q(Kamang),
       ],
-   q(7203) => [
+   q(7204) => [
       q(Longto),
       ],
-   q(7204) => [
+   q(7205) => [
       q(Wom (Nigeria)),
       ],
-   q(7205) => [
+   q(7206) => [
       q(Wongo),
       ],
-   q(7206) => [
+   q(7207) => [
       q(Manombai),
       ],
-   q(7207) => [
+   q(7208) => [
       q(Woria),
       ],
-   q(7208) => [
+   q(7209) => [
       q(Hanga Hundi),
       ],
-   q(7209) => [
+   q(7210) => [
       q(Wawonii),
       ],
-   q(7210) => [
+   q(7211) => [
       q(Weyto),
       ],
-   q(7211) => [
+   q(7212) => [
       q(Maco),
       ],
-   q(7212) => [
+   q(7213) => [
       q(Warapu),
       ],
-   q(7213) => [
+   q(7214) => [
       q(Warluwara),
       ],
-   q(7214) => [
+   q(7215) => [
       q(Warduji),
       ],
-   q(7215) => [
+   q(7216) => [
       q(Warungu),
       ],
-   q(7216) => [
+   q(7217) => [
       q(Wiradhuri),
       ],
-   q(7217) => [
+   q(7218) => [
       q(Wariyangga),
       ],
-   q(7218) => [
+   q(7219) => [
       q(Garrwa),
       ],
-   q(7219) => [
+   q(7220) => [
       q(Warlmanpa),
       ],
-   q(7220) => [
+   q(7221) => [
       q(Warumungu),
       ],
-   q(7221) => [
+   q(7222) => [
       q(Warnang),
       ],
-   q(7222) => [
+   q(7223) => [
       q(Worrorra),
       ],
-   q(7223) => [
+   q(7224) => [
       q(Waropen),
       ],
-   q(7224) => [
+   q(7225) => [
       q(Wardaman),
       ],
-   q(7225) => [
+   q(7226) => [
       q(Waris),
       ],
-   q(7226) => [
+   q(7227) => [
       q(Waru),
       ],
-   q(7227) => [
+   q(7228) => [
       q(Waruna),
       ],
-   q(7228) => [
+   q(7229) => [
       q(Gugu Warra),
       ],
-   q(7229) => [
+   q(7230) => [
       q(Wae Rana),
       ],
-   q(7230) => [
+   q(7231) => [
       q(Merwari),
       ],
-   q(7231) => [
+   q(7232) => [
       q(Waray (Australia)),
       ],
-   q(7232) => [
+   q(7233) => [
       q(Warembori),
       ],
-   q(7233) => [
+   q(7234) => [
       q(Wusi),
       ],
-   q(7234) => [
+   q(7235) => [
       q(Waskia),
       ],
-   q(7235) => [
+   q(7236) => [
       q(Owenia),
       ],
-   q(7236) => [
+   q(7237) => [
       q(Wasa),
       ],
-   q(7237) => [
+   q(7238) => [
       q(Wasu),
       ],
-   q(7238) => [
+   q(7239) => [
       q(Wotapuri-Katarqalai),
       ],
-   q(7239) => [
+   q(7240) => [
       q(Watiwa),
       ],
-   q(7240) => [
+   q(7241) => [
       q(Wathawurrung),
       ],
-   q(7241) => [
+   q(7242) => [
       q(Berta),
       ],
-   q(7242) => [
+   q(7243) => [
       q(Watakataui),
       ],
-   q(7243) => [
+   q(7244) => [
       q(Mewati),
       ],
-   q(7244) => [
+   q(7245) => [
       q(Wotu),
       ],
-   q(7245) => [
+   q(7246) => [
       q(Wikngenchera),
       ],
-   q(7246) => [
+   q(7247) => [
       q(Wunambal),
       ],
-   q(7247) => [
+   q(7248) => [
       q(Wudu),
       ],
-   q(7248) => [
+   q(7249) => [
       q(Wutunhua),
       ],
-   q(7249) => [
+   q(7250) => [
       q(Silimo),
       ],
-   q(7250) => [
+   q(7251) => [
       q(Wumbvu),
       ],
-   q(7251) => [
+   q(7252) => [
       q(Bungu),
       ],
-   q(7252) => [
+   q(7253) => [
       q(Wurrugu),
       ],
-   q(7253) => [
+   q(7254) => [
       q(Wutung),
       ],
-   q(7254) => [
+   q(7255) => [
       q(Wu Chinese),
       ],
-   q(7255) => [
+   q(7256) => [
       q(Wuvulu-Aua),
       ],
-   q(7256) => [
+   q(7257) => [
       q(Wulna),
       ],
-   q(7257) => [
+   q(7258) => [
       q(Wauyai),
       ],
-   q(7258) => [
+   q(7259) => [
       q(Waama),
       ],
-   q(7259) => [
+   q(7260) => [
       q(Wakabunga),
       ],
-   q(7260) => [
+   q(7261) => [
       q(Wetamut),
       q(Dorig),
       ],
-   q(7261) => [
+   q(7262) => [
       q(Warrwa),
       ],
-   q(7262) => [
+   q(7263) => [
       q(Wawa),
       ],
-   q(7263) => [
+   q(7264) => [
       q(Waxianghua),
       ],
-   q(7264) => [
+   q(7265) => [
       q(Wardandi),
       ],
-   q(7265) => [
+   q(7266) => [
       q(Wyandot),
       ],
-   q(7266) => [
+   q(7267) => [
       q(Wangaaybuwan-Ngiyambaa),
       ],
-   q(7267) => [
+   q(7268) => [
       q(Woiwurrung),
       ],
-   q(7268) => [
+   q(7269) => [
       q(Wymysorys),
       ],
-   q(7269) => [
+   q(7270) => [
       q(Wayoro),
       ],
-   q(7270) => [
+   q(7271) => [
       q(Western Fijian),
       ],
-   q(7271) => [
+   q(7272) => [
       q(Andalusian Arabic),
       ],
-   q(7272) => [
+   q(7273) => [
       q(Sambe),
       ],
-   q(7273) => [
+   q(7274) => [
       q(Kachari),
       ],
-   q(7274) => [
+   q(7275) => [
       q(Adai),
       ],
-   q(7275) => [
+   q(7276) => [
       q(Aequian),
       ],
-   q(7276) => [
+   q(7277) => [
       q(Aghwan),
       ],
-   q(7277) => [
+   q(7278) => [
       q(Kaimbe),
       ],
-   q(7278) => [
+   q(7279) => [
       q(Ararandewara),
       ],
-   q(7279) => [
+   q(7280) => [
       q(/Xam),
+      q(Xam),
       ],
-   q(7280) => [
+   q(7281) => [
       q(Xamtanga),
       ],
-   q(7281) => [
+   q(7282) => [
       q(Khao),
       ],
-   q(7282) => [
+   q(7283) => [
       q(Apalachee),
       ],
-   q(7283) => [
+   q(7284) => [
       q(Aquitanian),
       ],
-   q(7284) => [
+   q(7285) => [
       q(Karami),
       ],
-   q(7285) => [
+   q(7286) => [
       q(Kamas),
       ],
-   q(7286) => [
+   q(7287) => [
       q(Katawixi),
       ],
-   q(7287) => [
+   q(7288) => [
       q(Kauwera),
       ],
-   q(7288) => [
+   q(7289) => [
       q(Xavante),
       ],
-   q(7289) => [
+   q(7290) => [
       q(Kawaiisu),
       ],
-   q(7290) => [
+   q(7291) => [
       q(Kayan Mahakam),
       ],
-   q(7291) => [
+   q(7292) => [
       q(Kamba (Brazil)),
       ],
-   q(7292) => [
+   q(7293) => [
       q(Lower Burdekin),
       ],
-   q(7293) => [
+   q(7294) => [
       q(Bactrian),
       ],
-   q(7294) => [
+   q(7295) => [
       q(Bindal),
       ],
-   q(7295) => [
+   q(7296) => [
       q(Bigambal),
       ],
-   q(7296) => [
+   q(7297) => [
       q(Bunganditj),
       ],
-   q(7297) => [
+   q(7298) => [
       q(Kombio),
       ],
-   q(7298) => [
+   q(7299) => [
       q(Birrpayi),
       ],
-   q(7299) => [
+   q(7300) => [
       q(Middle Breton),
       ],
-   q(7300) => [
+   q(7301) => [
       q(Kenaboi),
       ],
-   q(7301) => [
+   q(7302) => [
       q(Bolgarian),
       ],
-   q(7302) => [
+   q(7303) => [
       q(Bibbulman),
       ],
-   q(7303) => [
+   q(7304) => [
       q(Kambera),
       ],
-   q(7304) => [
+   q(7305) => [
       q(Kambiwa),
       ],
-   q(7305) => [
+   q(7306) => [
       q(Kabixi),
       ],
-   q(7306) => [
+   q(7307) => [
       q(Batyala),
       ],
-   q(7307) => [
+   q(7308) => [
       q(Cumbric),
       ],
-   q(7308) => [
+   q(7309) => [
       q(Camunic),
       ],
-   q(7309) => [
+   q(7310) => [
       q(Celtiberian),
       ],
-   q(7310) => [
+   q(7311) => [
       q(Cisalpine Gaulish),
       ],
-   q(7311) => [
+   q(7312) => [
       q(Chemakum),
       q(Chimakum),
       ],
-   q(7312) => [
+   q(7313) => [
       q(Classical Armenian),
       ],
-   q(7313) => [
+   q(7314) => [
       q(Comecrudo),
       ],
-   q(7314) => [
+   q(7315) => [
       q(Cotoname),
       ],
-   q(7315) => [
+   q(7316) => [
       q(Chorasmian),
       ],
-   q(7316) => [
+   q(7317) => [
       q(Carian),
       ],
-   q(7317) => [
+   q(7318) => [
       q(Classical Tibetan),
       ],
-   q(7318) => [
+   q(7319) => [
       q(Curonian),
       ],
-   q(7319) => [
+   q(7320) => [
       q(Chuvantsy),
       ],
-   q(7320) => [
+   q(7321) => [
       q(Coahuilteco),
       ],
-   q(7321) => [
+   q(7322) => [
       q(Cayuse),
       ],
-   q(7322) => [
+   q(7323) => [
       q(Darkinyung),
       ],
-   q(7323) => [
+   q(7324) => [
       q(Dacian),
       ],
-   q(7324) => [
+   q(7325) => [
       q(Dharuk),
       ],
-   q(7325) => [
+   q(7326) => [
       q(Edomite),
       ],
-   q(7326) => [
+   q(7327) => [
       q(Malayic Dayak),
       ],
-   q(7327) => [
+   q(7328) => [
       q(Eblan),
       ],
-   q(7328) => [
+   q(7329) => [
       q(Hdi),
       ],
-   q(7329) => [
+   q(7330) => [
       q(//Xegwi),
+      q(Xegwi),
       ],
-   q(7330) => [
+   q(7331) => [
       q(Kelo),
       ],
-   q(7331) => [
+   q(7332) => [
       q(Kembayan),
       ],
-   q(7332) => [
+   q(7333) => [
       q(Epi-Olmec),
       ],
-   q(7333) => [
+   q(7334) => [
       q(Xerente),
       ],
-   q(7334) => [
+   q(7335) => [
       q(Kesawai),
       ],
-   q(7335) => [
+   q(7336) => [
       q(Xeta),
       ],
-   q(7336) => [
+   q(7337) => [
       q(Keoru-Ahia),
       ],
-   q(7337) => [
+   q(7338) => [
       q(Faliscan),
       ],
-   q(7338) => [
+   q(7339) => [
       q(Galatian),
       ],
-   q(7339) => [
+   q(7340) => [
       q(Gbin),
       ],
-   q(7340) => [
+   q(7341) => [
       q(Gudang),
       ],
-   q(7341) => [
+   q(7342) => [
       q(Gabrielino-Fernandeno),
       ],
-   q(7342) => [
+   q(7343) => [
       q(Goreng),
       ],
-   q(7343) => [
+   q(7344) => [
       q(Garingbal),
       ],
-   q(7344) => [
+   q(7345) => [
       q(Galindan),
       ],
-   q(7345) => [
+   q(7346) => [
       q(Dharumbal),
       q(Guwinmal),
       ],
-   q(7346) => [
+   q(7347) => [
       q(Garza),
       ],
-   q(7347) => [
+   q(7348) => [
       q(Unggumi),
       ],
-   q(7348) => [
+   q(7349) => [
       q(Guwa),
       ],
-   q(7349) => [
+   q(7350) => [
       q(Harami),
       ],
-   q(7350) => [
+   q(7351) => [
       q(Hunnic),
       ],
-   q(7351) => [
+   q(7352) => [
       q(Hadrami),
       ],
-   q(7352) => [
+   q(7353) => [
       q(Khetrani),
       ],
-   q(7353) => [
+   q(7354) => [
       q(Hernican),
       ],
-   q(7354) => [
+   q(7355) => [
       q(Hattic),
       ],
-   q(7355) => [
+   q(7356) => [
       q(Hurrian),
       ],
-   q(7356) => [
+   q(7357) => [
       q(Khua),
       ],
-   q(7357) => [
+   q(7358) => [
       q(Iberian),
       ],
-   q(7358) => [
+   q(7359) => [
       q(Xiri),
       ],
-   q(7359) => [
+   q(7360) => [
       q(Illyrian),
       ],
-   q(7360) => [
+   q(7361) => [
       q(Xinca),
       ],
-   q(7361) => [
+   q(7362) => [
       q(Xipinawa),
       ],
-   q(7362) => [
+   q(7363) => [
       q(Xiriana),
       ],
-   q(7363) => [
+   q(7364) => [
       q(Kisan),
       ],
-   q(7364) => [
+   q(7365) => [
       q(Indus Valley Language),
       ],
-   q(7365) => [
+   q(7366) => [
       q(Xipaya),
       ],
-   q(7366) => [
+   q(7367) => [
       q(Minjungbal),
       ],
-   q(7367) => [
+   q(7368) => [
       q(Jaitmatang),
       ],
-   q(7368) => [
+   q(7369) => [
       q(Kalkoti),
       ],
-   q(7369) => [
+   q(7370) => [
       q(Northern Nago),
       ],
-   q(7370) => [
+   q(7371) => [
       q(Kho'ini),
       ],
-   q(7371) => [
+   q(7372) => [
       q(Mendalam Kayan),
       ],
-   q(7372) => [
+   q(7373) => [
       q(Kereho),
       ],
-   q(7373) => [
+   q(7374) => [
       q(Khengkha),
       ],
-   q(7374) => [
+   q(7375) => [
       q(Kagoro),
       ],
-   q(7375) => [
+   q(7376) => [
       q(Karahawyana),
       ],
-   q(7376) => [
+   q(7377) => [
       q(Kenyan Sign Language),
       ],
-   q(7377) => [
+   q(7378) => [
       q(Kajali),
       ],
-   q(7378) => [
+   q(7379) => [
       q(Kaco'),
       ],
-   q(7379) => [
+   q(7380) => [
       q(Mainstream Kenyah),
       ],
-   q(7380) => [
+   q(7381) => [
       q(Kayan River Kayan),
       ],
-   q(7381) => [
+   q(7382) => [
       q(Kiorr),
       ],
-   q(7382) => [
+   q(7383) => [
       q(Kabatei),
       ],
-   q(7383) => [
+   q(7384) => [
       q(Koroni),
       ],
-   q(7384) => [
+   q(7385) => [
       q(Xakriaba),
       ],
-   q(7385) => [
+   q(7386) => [
       q(Kumbewaha),
       ],
-   q(7386) => [
+   q(7387) => [
       q(Kantosi),
       ],
-   q(7387) => [
+   q(7388) => [
       q(Kaamba),
       ],
-   q(7388) => [
+   q(7389) => [
       q(Kgalagadi),
       ],
-   q(7389) => [
+   q(7390) => [
       q(Kembra),
       ],
-   q(7390) => [
+   q(7391) => [
       q(Karore),
       ],
-   q(7391) => [
+   q(7392) => [
       q(Uma' Lasan),
       ],
-   q(7392) => [
+   q(7393) => [
       q(Kurtokha),
       ],
-   q(7393) => [
+   q(7394) => [
       q(Kamula),
       ],
-   q(7394) => [
+   q(7395) => [
       q(Loup B),
       ],
-   q(7395) => [
+   q(7396) => [
       q(Lycian),
       ],
-   q(7396) => [
+   q(7397) => [
       q(Lydian),
       ],
-   q(7397) => [
+   q(7398) => [
       q(Lemnian),
       ],
-   q(7398) => [
+   q(7399) => [
       q(Ligurian (Ancient)),
       ],
-   q(7399) => [
+   q(7400) => [
       q(Liburnian),
       ],
-   q(7400) => [
+   q(7401) => [
       q(Alanic),
       ],
-   q(7401) => [
+   q(7402) => [
       q(Loup A),
       ],
-   q(7402) => [
+   q(7403) => [
       q(Lepontic),
       ],
-   q(7403) => [
+   q(7404) => [
       q(Lusitanian),
       ],
-   q(7404) => [
+   q(7405) => [
       q(Cuneiform Luwian),
       ],
-   q(7405) => [
+   q(7406) => [
       q(Elymian),
       ],
-   q(7406) => [
+   q(7407) => [
       q(Mushungulu),
       ],
-   q(7407) => [
+   q(7408) => [
       q(Mbonga),
       ],
-   q(7408) => [
+   q(7409) => [
       q(Makhuwa-Marrevone),
       ],
-   q(7409) => [
+   q(7410) => [
       q(Mbudum),
       ],
-   q(7410) => [
+   q(7411) => [
       q(Median),
       ],
-   q(7411) => [
+   q(7412) => [
       q(Mingrelian),
       ],
-   q(7412) => [
+   q(7413) => [
       q(Mengaka),
       ],
-   q(7413) => [
+   q(7414) => [
       q(Kuku-Muminh),
       ],
-   q(7414) => [
+   q(7415) => [
       q(Majera),
       ],
-   q(7415) => [
+   q(7416) => [
       q(Ancient Macedonian),
       ],
-   q(7416) => [
+   q(7417) => [
       q(Malaysian Sign Language),
       ],
-   q(7417) => [
+   q(7418) => [
       q(Manado Malay),
       ],
-   q(7418) => [
+   q(7419) => [
       q(Manichaean Middle Persian),
       ],
-   q(7419) => [
+   q(7420) => [
       q(Morerebi),
       ],
-   q(7420) => [
+   q(7421) => [
       q(Kuku-Mu'inh),
       ],
-   q(7421) => [
+   q(7422) => [
       q(Kuku-Mangk),
       ],
-   q(7422) => [
+   q(7423) => [
       q(Meroitic),
       ],
-   q(7423) => [
+   q(7424) => [
       q(Moroccan Sign Language),
       ],
-   q(7424) => [
+   q(7425) => [
       q(Matbat),
       ],
-   q(7425) => [
+   q(7426) => [
       q(Kamu),
       ],
-   q(7426) => [
+   q(7427) => [
       q(Antankarana Malagasy),
       q(Tankarana Malagasy),
       ],
-   q(7427) => [
+   q(7428) => [
       q(Tsimihety Malagasy),
       ],
-   q(7428) => [
+   q(7429) => [
       q(Maden),
       ],
-   q(7429) => [
+   q(7430) => [
       q(Mayaguduna),
       ],
-   q(7430) => [
+   q(7431) => [
       q(Mori Bawah),
       ],
-   q(7431) => [
+   q(7432) => [
       q(Ancient North Arabian),
       ],
-   q(7432) => [
+   q(7433) => [
       q(Kanakanabu),
       ],
-   q(7433) => [
+   q(7434) => [
       q(Middle Mongolian),
       ],
-   q(7434) => [
+   q(7435) => [
       q(Kuanhua),
       ],
-   q(7435) => [
+   q(7436) => [
       q(Ngarigu),
       ],
-   q(7436) => [
+   q(7437) => [
       q(Nganakarti),
       ],
-   q(7437) => [
+   q(7438) => [
       q(Northern Kankanay),
       ],
-   q(7438) => [
+   q(7439) => [
       q(Anglo-Norman),
       ],
-   q(7439) => [
+   q(7440) => [
       q(Kangri),
       ],
-   q(7440) => [
+   q(7441) => [
       q(Kanashi),
       ],
-   q(7441) => [
+   q(7442) => [
       q(Narragansett),
       ],
-   q(7442) => [
+   q(7443) => [
       q(Nukunul),
       ],
-   q(7443) => [
+   q(7444) => [
       q(Nyiyaparli),
       ],
-   q(7444) => [
+   q(7445) => [
       q(Kenzi),
       q(Mattoki),
       ],
-   q(7445) => [
+   q(7446) => [
       q(O'chi'chi'),
       ],
-   q(7446) => [
+   q(7447) => [
       q(Kokoda),
       ],
-   q(7447) => [
+   q(7448) => [
       q(Soga),
       ],
-   q(7448) => [
+   q(7449) => [
       q(Kominimung),
       ],
-   q(7449) => [
+   q(7450) => [
       q(Xokleng),
       ],
-   q(7450) => [
+   q(7451) => [
       q(Komo (Sudan)),
       ],
-   q(7451) => [
+   q(7452) => [
       q(Konkomba),
       ],
-   q(7452) => [
+   q(7453) => [
       q(Xukuru),
       ],
-   q(7453) => [
+   q(7454) => [
       q(Kopar),
       ],
-   q(7454) => [
+   q(7455) => [
       q(Korubo),
       ],
-   q(7455) => [
+   q(7456) => [
       q(Kowaki),
       ],
-   q(7456) => [
+   q(7457) => [
       q(Pirriya),
       ],
-   q(7457) => [
+   q(7458) => [
       q(Pecheneg),
       ],
-   q(7458) => [
+   q(7459) => [
       q(Liberia Kpelle),
       ],
-   q(7459) => [
+   q(7460) => [
       q(Phrygian),
       ],
-   q(7460) => [
+   q(7461) => [
       q(Pictish),
       ],
-   q(7461) => [
+   q(7462) => [
       q(Mpalitjanh),
       ],
-   q(7462) => [
+   q(7463) => [
       q(Kulina Pano),
       ],
-   q(7463) => [
+   q(7464) => [
       q(Pumpokol),
       ],
-   q(7464) => [
+   q(7465) => [
       q(Kapinawa),
       ],
-   q(7465) => [
+   q(7466) => [
       q(Pochutec),
       ],
-   q(7466) => [
+   q(7467) => [
       q(Puyo-Paekche),
       ],
-   q(7467) => [
+   q(7468) => [
       q(Mohegan-Pequot),
       ],
-   q(7468) => [
+   q(7469) => [
       q(Parthian),
       ],
-   q(7469) => [
+   q(7470) => [
       q(Pisidian),
       ],
-   q(7470) => [
+   q(7471) => [
       q(Punthamara),
       ],
-   q(7471) => [
+   q(7472) => [
       q(Punic),
       ],
-   q(7472) => [
+   q(7473) => [
       q(Puyo),
       ],
-   q(7473) => [
+   q(7474) => [
       q(Karakhanid),
       ],
-   q(7474) => [
+   q(7475) => [
       q(Qatabanian),
       ],
-   q(7475) => [
+   q(7476) => [
       q(Kraho),
       ],
-   q(7476) => [
+   q(7477) => [
       q(Eastern Karaboro),
       ],
-   q(7477) => [
+   q(7478) => [
       q(Gundungurra),
       ],
-   q(7478) => [
+   q(7479) => [
       q(Kreye),
       ],
-   q(7479) => [
+   q(7480) => [
       q(Minang),
       ],
-   q(7480) => [
+   q(7481) => [
       q(Krikati-Timbira),
       ],
-   q(7481) => [
+   q(7482) => [
       q(Armazic),
       ],
-   q(7482) => [
+   q(7483) => [
       q(Arin),
       ],
-   q(7483) => [
+   q(7484) => [
       q(Karranga),
       ],
-   q(7484) => [
+   q(7485) => [
       q(Raetic),
       ],
-   q(7485) => [
+   q(7486) => [
       q(Aranama-Tamique),
       ],
-   q(7486) => [
+   q(7487) => [
       q(Marriammu),
       ],
-   q(7487) => [
+   q(7488) => [
       q(Karawa),
       ],
-   q(7488) => [
+   q(7489) => [
       q(Sabaean),
       ],
-   q(7489) => [
+   q(7490) => [
       q(Sambal),
       ],
-   q(7490) => [
+   q(7491) => [
       q(Scythian),
       ],
-   q(7491) => [
+   q(7492) => [
       q(Sidetic),
       ],
-   q(7492) => [
+   q(7493) => [
       q(Sempan),
       ],
-   q(7493) => [
+   q(7494) => [
       q(Shamang),
       ],
-   q(7494) => [
+   q(7495) => [
       q(Sio),
       ],
-   q(7495) => [
+   q(7496) => [
       q(South Slavey),
       ],
-   q(7496) => [
+   q(7497) => [
       q(Kasem),
       ],
-   q(7497) => [
+   q(7498) => [
       q(Sanga (Nigeria)),
       ],
-   q(7498) => [
+   q(7499) => [
       q(Solano),
       ],
-   q(7499) => [
+   q(7500) => [
       q(Silopi),
       ],
-   q(7500) => [
+   q(7501) => [
       q(Makhuwa-Saka),
       ],
-   q(7501) => [
+   q(7502) => [
       q(Sherpa),
       ],
-   q(7502) => [
+   q(7503) => [
       q(Assan),
       ],
-   q(7503) => [
+   q(7504) => [
       q(Sanuma),
       ],
-   q(7504) => [
+   q(7505) => [
       q(Sudovian),
       ],
-   q(7505) => [
+   q(7506) => [
       q(Saisiyat),
       ],
-   q(7506) => [
+   q(7507) => [
       q(Alcozauca Mixtec),
       ],
-   q(7507) => [
+   q(7508) => [
       q(Chazumba Mixtec),
       ],
-   q(7508) => [
+   q(7509) => [
       q(Katcha-Kadugli-Miri),
       ],
-   q(7509) => [
+   q(7510) => [
       q(Diuxi-Tilantongo Mixtec),
       ],
-   q(7510) => [
+   q(7511) => [
       q(Ketengban),
       ],
-   q(7511) => [
+   q(7512) => [
       q(Transalpine Gaulish),
       ],
-   q(7512) => [
+   q(7513) => [
       q(Yitha Yitha),
       ],
-   q(7513) => [
+   q(7514) => [
       q(Sinicahua Mixtec),
       ],
-   q(7514) => [
+   q(7515) => [
       q(San Juan Teita Mixtec),
       ],
-   q(7515) => [
+   q(7516) => [
       q(Tijaltepec Mixtec),
       ],
-   q(7516) => [
+   q(7517) => [
       q(Magdalena Penasco Mixtec),
       ],
-   q(7517) => [
+   q(7518) => [
       q(Northern Tlaxiaco Mixtec),
       ],
-   q(7518) => [
+   q(7519) => [
       q(Tokharian A),
       ],
-   q(7519) => [
+   q(7520) => [
       q(San Miguel Piedras Mixtec),
       ],
-   q(7520) => [
+   q(7521) => [
       q(Tumshuqese),
       ],
-   q(7521) => [
+   q(7522) => [
       q(Early Tripuri),
       ],
-   q(7522) => [
+   q(7523) => [
       q(Sindihui Mixtec),
       ],
-   q(7523) => [
+   q(7524) => [
       q(Tacahua Mixtec),
       ],
-   q(7524) => [
+   q(7525) => [
       q(Cuyamecalco Mixtec),
       ],
-   q(7525) => [
+   q(7526) => [
       q(Thawa),
       ],
-   q(7526) => [
+   q(7527) => [
       q(Tawande),
       ],
-   q(7527) => [
+   q(7528) => [
       q(Yoloxochitl Mixtec),
       ],
-   q(7528) => [
+   q(7529) => [
       q(Tasmanian),
       ],
-   q(7529) => [
+   q(7530) => [
       q(Alu Kurumba),
       ],
-   q(7530) => [
+   q(7531) => [
       q(Betta Kurumba),
       ],
-   q(7531) => [
+   q(7532) => [
       q(Umiida),
       ],
-   q(7532) => [
+   q(7533) => [
       q(Kunigami),
       ],
-   q(7533) => [
+   q(7534) => [
       q(Jennu Kurumba),
       ],
-   q(7534) => [
+   q(7535) => [
       q(Ngunawal),
       ],
-   q(7535) => [
+   q(7536) => [
       q(Umbrian),
       ],
-   q(7536) => [
+   q(7537) => [
       q(Unggaranggu),
       ],
-   q(7537) => [
+   q(7538) => [
       q(Kuo),
       ],
-   q(7538) => [
+   q(7539) => [
       q(Upper Umpqua),
       ],
-   q(7539) => [
+   q(7540) => [
       q(Urartian),
       ],
-   q(7540) => [
+   q(7541) => [
       q(Kuthant),
       ],
-   q(7541) => [
+   q(7542) => [
       q(Kxoe),
       ],
-   q(7542) => [
+   q(7543) => [
       q(Venetic),
       ],
-   q(7543) => [
+   q(7544) => [
       q(Kamviri),
       ],
-   q(7544) => [
+   q(7545) => [
       q(Vandalic),
       ],
-   q(7545) => [
+   q(7546) => [
       q(Volscian),
       ],
-   q(7546) => [
+   q(7547) => [
       q(Vestinian),
       ],
-   q(7547) => [
+   q(7548) => [
       q(Kwaza),
       ],
-   q(7548) => [
+   q(7549) => [
       q(Woccon),
       ],
-   q(7549) => [
+   q(7550) => [
       q(Wadi Wadi),
       ],
-   q(7550) => [
+   q(7551) => [
       q(Xwela Gbe),
       ],
-   q(7551) => [
+   q(7552) => [
       q(Kwegu),
       ],
-   q(7552) => [
+   q(7553) => [
       q(Wajuk),
       ],
-   q(7553) => [
+   q(7554) => [
       q(Wangkumara),
       ],
-   q(7554) => [
+   q(7555) => [
       q(Western Xwla Gbe),
       ],
-   q(7555) => [
+   q(7556) => [
       q(Written Oirat),
       ],
-   q(7556) => [
+   q(7557) => [
       q(Kwerba Mamberamo),
       ],
-   q(7557) => [
+   q(7558) => [
       q(Wotjobaluk),
       ],
-   q(7558) => [
+   q(7559) => [
       q(Wemba Wemba),
       ],
-   q(7559) => [
+   q(7560) => [
       q(Boro (Ghana)),
       ],
-   q(7560) => [
+   q(7561) => [
       q(Ke'o),
       ],
-   q(7561) => [
+   q(7562) => [
       q(Minkin),
       ],
-   q(7562) => [
+   q(7563) => [
       q(Koropo),
       ],
-   q(7563) => [
+   q(7564) => [
       q(Tambora),
       ],
-   q(7564) => [
+   q(7565) => [
       q(Yaygir),
       ],
-   q(7565) => [
+   q(7566) => [
       q(Yandjibara),
       ],
-   q(7566) => [
+   q(7567) => [
       q(Mayi-Yapi),
       ],
-   q(7567) => [
+   q(7568) => [
       q(Mayi-Kulan),
       ],
-   q(7568) => [
+   q(7569) => [
       q(Yalakalore),
       ],
-   q(7569) => [
+   q(7570) => [
       q(Mayi-Thakurti),
       ],
-   q(7570) => [
+   q(7571) => [
       q(Yorta Yorta),
       ],
-   q(7571) => [
+   q(7572) => [
       q(Zhang-Zhung),
       ],
-   q(7572) => [
+   q(7573) => [
       q(Zemgalian),
       ],
-   q(7573) => [
+   q(7574) => [
       q(Ancient Zapotec),
       ],
-   q(7574) => [
+   q(7575) => [
       q(Yaminahua),
       ],
-   q(7575) => [
+   q(7576) => [
       q(Yuhup),
       ],
-   q(7576) => [
+   q(7577) => [
       q(Pass Valley Yali),
       ],
-   q(7577) => [
+   q(7578) => [
       q(Yagua),
       ],
-   q(7578) => [
+   q(7579) => [
       q(Pume),
       ],
-   q(7579) => [
+   q(7580) => [
       q(Yaka (Democratic Republic of Congo)),
       ],
-   q(7580) => [
+   q(7581) => [
       q(Yamana),
       ],
-   q(7581) => [
+   q(7582) => [
       q(Yazgulyam),
       ],
-   q(7582) => [
+   q(7583) => [
       q(Yagnobi),
       ],
-   q(7583) => [
+   q(7584) => [
       q(Banda-Yangere),
       ],
-   q(7584) => [
+   q(7585) => [
       q(Yakama),
       ],
-   q(7585) => [
+   q(7586) => [
       q(Yalunka),
       ],
-   q(7586) => [
+   q(7587) => [
       q(Yamba),
       ],
-   q(7587) => [
+   q(7588) => [
       q(Mayangna),
       ],
-   q(7588) => [
+   q(7589) => [
       q(Yaqui),
       ],
-   q(7589) => [
+   q(7590) => [
       q(Yabarana),
       ],
-   q(7590) => [
+   q(7591) => [
       q(Nugunu (Cameroon)),
       ],
-   q(7591) => [
+   q(7592) => [
       q(Yambeta),
       ],
-   q(7592) => [
+   q(7593) => [
       q(Yuwana),
       ],
-   q(7593) => [
+   q(7594) => [
       q(Yangben),
       ],
-   q(7594) => [
+   q(7595) => [
       q(Yawalapiti),
       ],
-   q(7595) => [
+   q(7596) => [
       q(Yauma),
       ],
-   q(7596) => [
+   q(7597) => [
       q(Agwagwune),
       ],
-   q(7597) => [
+   q(7598) => [
       q(Lokaa),
       ],
-   q(7598) => [
+   q(7599) => [
       q(Yala),
       ],
-   q(7599) => [
+   q(7600) => [
       q(Yemba),
       ],
-   q(7600) => [
+   q(7601) => [
       q(West Yugur),
       ],
-   q(7601) => [
+   q(7602) => [
       q(Yakha),
       ],
-   q(7602) => [
+   q(7603) => [
       q(Yamphu),
       ],
-   q(7603) => [
+   q(7604) => [
       q(Hasha),
       ],
-   q(7604) => [
+   q(7605) => [
       q(Bokha),
       ],
-   q(7605) => [
+   q(7606) => [
       q(Yukuben),
       ],
-   q(7606) => [
+   q(7607) => [
       q(Yaben),
       ],
-   q(7607) => [
+   q(7608) => [
       q(Yabaana),
       ],
-   q(7608) => [
+   q(7609) => [
       q(Yabong),
       ],
-   q(7609) => [
+   q(7610) => [
       q(Yawiyo),
       ],
-   q(7610) => [
+   q(7611) => [
       q(Yaweyuha),
       ],
-   q(7611) => [
+   q(7612) => [
       q(Chesu),
       ],
-   q(7612) => [
+   q(7613) => [
       q(Lolopo),
       ],
-   q(7613) => [
+   q(7614) => [
       q(Yucuna),
       ],
-   q(7614) => [
+   q(7615) => [
       q(Chepya),
       ],
-   q(7615) => [
+   q(7616) => [
       q(Yanda),
       ],
-   q(7616) => [
+   q(7617) => [
       q(Eastern Yiddish),
       ],
-   q(7617) => [
+   q(7618) => [
       q(Yangum Dey),
       ],
-   q(7618) => [
+   q(7619) => [
       q(Yidgha),
       ],
-   q(7619) => [
+   q(7620) => [
       q(Yoidik),
       ],
-   q(7620) => [
+   q(7621) => [
       q(Ravula),
       ],
-   q(7621) => [
+   q(7622) => [
       q(Yeniche),
       ],
-   q(7622) => [
+   q(7623) => [
       q(Yimas),
       ],
-   q(7623) => [
+   q(7624) => [
       q(Yeni),
       ],
-   q(7624) => [
+   q(7625) => [
       q(Yevanic),
       ],
-   q(7625) => [
+   q(7626) => [
       q(Yela),
       ],
-   q(7626) => [
+   q(7627) => [
       q(Tarok),
       ],
-   q(7627) => [
+   q(7628) => [
       q(Nyankpa),
       ],
-   q(7628) => [
+   q(7629) => [
       q(Yetfa),
       ],
-   q(7629) => [
+   q(7630) => [
       q(Yerukula),
       ],
-   q(7630) => [
+   q(7631) => [
       q(Yapunda),
       ],
-   q(7631) => [
+   q(7632) => [
       q(Yeyi),
       ],
-   q(7632) => [
+   q(7633) => [
       q(Malyangapa),
       ],
-   q(7633) => [
+   q(7634) => [
       q(Yiningayi),
       ],
-   q(7634) => [
+   q(7635) => [
       q(Yangum Gel),
       ],
-   q(7635) => [
+   q(7636) => [
       q(Yagomi),
       ],
-   q(7636) => [
+   q(7637) => [
       q(Gepo),
       ],
-   q(7637) => [
+   q(7638) => [
       q(Yagaria),
       ],
-   q(7638) => [
+   q(7639) => [
       q(Yolnu Sign Language),
       ],
-   q(7639) => [
+   q(7640) => [
       q(Yugul),
       ],
-   q(7640) => [
+   q(7641) => [
       q(Yagwoia),
       ],
-   q(7641) => [
+   q(7642) => [
       q(Baha Buyang),
       ],
-   q(7642) => [
+   q(7643) => [
       q(Judeo-Iraqi Arabic),
       ],
-   q(7643) => [
+   q(7644) => [
       q(Hlepho Phowa),
       ],
-   q(7644) => [
+   q(7645) => [
+      q(Yan-nhanu Sign Language),
+      ],
+   q(7646) => [
       q(Yinggarda),
       ],
-   q(7645) => [
+   q(7647) => [
       q(Wusa Nasu),
       ],
-   q(7646) => [
+   q(7648) => [
       q(Western Yiddish),
       ],
-   q(7647) => [
+   q(7649) => [
       q(Yidiny),
       ],
-   q(7648) => [
+   q(7650) => [
       q(Yindjibarndi),
       ],
-   q(7649) => [
+   q(7651) => [
       q(Dongshanba Lalo),
       ],
-   q(7650) => [
+   q(7652) => [
       q(Yindjilandji),
       ],
-   q(7651) => [
+   q(7653) => [
       q(Yimchungru Naga),
       ],
-   q(7652) => [
+   q(7654) => [
       q(Yinchia),
       ],
-   q(7653) => [
+   q(7655) => [
       q(Pholo),
       ],
-   q(7654) => [
+   q(7656) => [
       q(Miqie),
       ],
-   q(7655) => [
+   q(7657) => [
       q(North Awyu),
       ],
-   q(7656) => [
+   q(7658) => [
       q(Yis),
       ],
-   q(7657) => [
+   q(7659) => [
       q(Eastern Lalu),
       ],
-   q(7658) => [
+   q(7660) => [
       q(Awu),
       ],
-   q(7659) => [
+   q(7661) => [
       q(Northern Nisu),
       ],
-   q(7660) => [
+   q(7662) => [
       q(Axi Yi),
       ],
-   q(7661) => [
+   q(7663) => [
       q(Azhe),
       ],
-   q(7662) => [
+   q(7664) => [
       q(Yakan),
       ],
-   q(7663) => [
+   q(7665) => [
       q(Northern Yukaghir),
       ],
-   q(7664) => [
+   q(7666) => [
       q(Yoke),
       ],
-   q(7665) => [
+   q(7667) => [
       q(Yakaikeke),
       ],
-   q(7666) => [
+   q(7668) => [
       q(Khlula),
       ],
-   q(7667) => [
+   q(7669) => [
       q(Kap),
       ],
-   q(7668) => [
+   q(7670) => [
       q(Kua-nsi),
       ],
-   q(7669) => [
+   q(7671) => [
       q(Yasa),
       ],
-   q(7670) => [
+   q(7672) => [
       q(Yekora),
       ],
-   q(7671) => [
+   q(7673) => [
       q(Kathu),
       ],
-   q(7672) => [
+   q(7674) => [
       q(Kuamasi),
       ],
-   q(7673) => [
+   q(7675) => [
       q(Yakoma),
       ],
-   q(7674) => [
+   q(7676) => [
       q(Yaul),
       ],
-   q(7675) => [
+   q(7677) => [
       q(Yaleba),
       ],
-   q(7676) => [
+   q(7678) => [
       q(Yele),
       ],
-   q(7677) => [
+   q(7679) => [
       q(Yelogu),
       ],
-   q(7678) => [
+   q(7680) => [
       q(Angguruk Yali),
       ],
-   q(7679) => [
+   q(7681) => [
       q(Yil),
       ],
-   q(7680) => [
+   q(7682) => [
       q(Limi),
       ],
-   q(7681) => [
+   q(7683) => [
       q(Langnian Buyang),
       ],
-   q(7682) => [
+   q(7684) => [
       q(Naluo Yi),
       ],
-   q(7683) => [
+   q(7685) => [
       q(Yalarnnga),
       ],
-   q(7684) => [
+   q(7686) => [
       q(Aribwaung),
       ],
-   q(7685) => [
+   q(7687) => [
       q(Nyalayu),
       q(Nyelayu),
       ],
-   q(7686) => [
+   q(7688) => [
       q(Yambes),
       ],
-   q(7687) => [
+   q(7689) => [
       q(Southern Muji),
       ],
-   q(7688) => [
+   q(7690) => [
       q(Muda),
       ],
-   q(7689) => [
+   q(7691) => [
       q(Yameo),
       ],
-   q(7690) => [
+   q(7692) => [
       q(Yamongeri),
       ],
-   q(7691) => [
+   q(7693) => [
       q(Mili),
       ],
-   q(7692) => [
+   q(7694) => [
       q(Moji),
       ],
-   q(7693) => [
+   q(7695) => [
       q(Makwe),
       ],
-   q(7694) => [
+   q(7696) => [
       q(Iamalele),
       ],
-   q(7695) => [
+   q(7697) => [
       q(Maay),
       ],
-   q(7696) => [
+   q(7698) => [
       q(Yamna),
       q(Sunum),
       ],
-   q(7697) => [
+   q(7699) => [
       q(Yangum Mon),
       ],
-   q(7698) => [
+   q(7700) => [
       q(Yamap),
       ],
-   q(7699) => [
+   q(7701) => [
       q(Qila Muji),
       ],
-   q(7700) => [
+   q(7702) => [
       q(Malasar),
       ],
-   q(7701) => [
+   q(7703) => [
       q(Mysian),
       ],
-   q(7702) => [
+   q(7704) => [
       q(Northern Muji),
       ],
-   q(7703) => [
+   q(7705) => [
       q(Muzi),
       ],
-   q(7704) => [
+   q(7706) => [
       q(Aluo),
       ],
-   q(7705) => [
+   q(7707) => [
       q(Yandruwandha),
       ],
-   q(7706) => [
+   q(7708) => [
       q(Lang'e),
       ],
-   q(7707) => [
+   q(7709) => [
       q(Yango),
       ],
-   q(7708) => [
+   q(7710) => [
       q(Naukan Yupik),
       ],
-   q(7709) => [
+   q(7711) => [
       q(Yangulam),
       ],
-   q(7710) => [
+   q(7712) => [
       q(Yana),
       ],
-   q(7711) => [
+   q(7713) => [
       q(Yong),
       ],
-   q(7712) => [
+   q(7714) => [
       q(Yendang),
       ],
-   q(7713) => [
+   q(7715) => [
       q(Yansi),
       ],
-   q(7714) => [
+   q(7716) => [
       q(Yahuna),
       ],
-   q(7715) => [
+   q(7717) => [
       q(Yoba),
       ],
-   q(7716) => [
+   q(7718) => [
       q(Yogad),
       ],
-   q(7717) => [
+   q(7719) => [
       q(Yonaguni),
       ],
-   q(7718) => [
+   q(7720) => [
       q(Yokuts),
       ],
-   q(7719) => [
+   q(7721) => [
       q(Yola),
       ],
-   q(7720) => [
+   q(7722) => [
       q(Yombe),
       ],
-   q(7721) => [
+   q(7723) => [
       q(Yongkom),
       ],
-   q(7722) => [
+   q(7724) => [
       q(Yotti),
       ],
-   q(7723) => [
+   q(7725) => [
       q(Yoron),
       ],
-   q(7724) => [
+   q(7726) => [
       q(Yoy),
       ],
-   q(7725) => [
+   q(7727) => [
       q(Phala),
       ],
-   q(7726) => [
+   q(7728) => [
       q(Labo Phowa),
       ],
-   q(7727) => [
+   q(7729) => [
       q(Phola),
       ],
-   q(7728) => [
+   q(7730) => [
       q(Phupha),
       ],
-   q(7729) => [
+   q(7731) => [
       q(Phuma),
       ],
-   q(7730) => [
+   q(7732) => [
       q(Ani Phowa),
       ],
-   q(7731) => [
+   q(7733) => [
       q(Alo Phola),
       ],
-   q(7732) => [
+   q(7734) => [
       q(Phupa),
       ],
-   q(7733) => [
+   q(7735) => [
       q(Phuza),
       ],
-   q(7734) => [
+   q(7736) => [
       q(Yerakai),
       ],
-   q(7735) => [
+   q(7737) => [
       q(Yareba),
       ],
-   q(7736) => [
+   q(7738) => [
       q(Yaoure),
       ],
-   q(7737) => [
+   q(7739) => [
       q(Yari),
       ],
-   q(7738) => [
+   q(7740) => [
       q(Nenets),
       ],
-   q(7739) => [
+   q(7741) => [
       q(Nhengatu),
       ],
-   q(7740) => [
+   q(7742) => [
       q(Yirrk-Mel),
       ],
-   q(7741) => [
+   q(7743) => [
       q(Yerong),
       ],
-   q(7742) => [
+   q(7744) => [
       q(Yarsun),
       ],
-   q(7743) => [
+   q(7745) => [
       q(Yarawata),
       ],
-   q(7744) => [
+   q(7746) => [
       q(Yarluyandi),
       ],
-   q(7745) => [
+   q(7747) => [
       q(Yassic),
       ],
-   q(7746) => [
+   q(7748) => [
       q(Samatao),
       ],
-   q(7747) => [
+   q(7749) => [
       q(Sonaga),
       ],
-   q(7748) => [
+   q(7750) => [
       q(Yugoslavian Sign Language),
       ],
-   q(7749) => [
+   q(7751) => [
       q(Sani),
       ],
-   q(7750) => [
+   q(7752) => [
       q(Nisi (China)),
       ],
-   q(7751) => [
+   q(7753) => [
       q(Southern Lolopo),
       ],
-   q(7752) => [
+   q(7754) => [
       q(Sirenik Yupik),
       ],
-   q(7753) => [
+   q(7755) => [
       q(Yessan-Mayo),
       ],
-   q(7754) => [
+   q(7756) => [
       q(Sanie),
       ],
-   q(7755) => [
+   q(7757) => [
       q(Talu),
       ],
-   q(7756) => [
+   q(7758) => [
       q(Tanglang),
       ],
-   q(7757) => [
+   q(7759) => [
       q(Thopho),
       ],
-   q(7758) => [
+   q(7760) => [
       q(Yout Wam),
       ],
-   q(7759) => [
+   q(7761) => [
       q(Yatay),
       ],
-   q(7760) => [
+   q(7762) => [
       q(Yucateco),
       q(Yucatec Maya),
       ],
-   q(7761) => [
+   q(7763) => [
       q(Yugambal),
       ],
-   q(7762) => [
+   q(7764) => [
       q(Yuchi),
       ],
-   q(7763) => [
+   q(7765) => [
       q(Judeo-Tripolitanian Arabic),
       ],
-   q(7764) => [
+   q(7766) => [
       q(Yue Chinese),
       q(Cantonese),
       ],
-   q(7765) => [
+   q(7767) => [
       q(Havasupai-Walapai-Yavapai),
       ],
-   q(7766) => [
+   q(7768) => [
       q(Yug),
       ],
-   q(7767) => [
+   q(7769) => [
       q(Yuruti),
       ],
-   q(7768) => [
+   q(7770) => [
       q(Karkar-Yuri),
       ],
-   q(7769) => [
+   q(7771) => [
       q(Yuki),
       ],
-   q(7770) => [
+   q(7772) => [
       q(Yulu),
       ],
-   q(7771) => [
+   q(7773) => [
       q(Quechan),
       ],
-   q(7772) => [
+   q(7774) => [
       q(Bena (Nigeria)),
       ],
-   q(7773) => [
+   q(7775) => [
       q(Yukpa),
       ],
-   q(7774) => [
+   q(7776) => [
       q(Yuqui),
       ],
-   q(7775) => [
+   q(7777) => [
       q(Yurok),
       ],
-   q(7776) => [
+   q(7778) => [
       q(Yopno),
       ],
-   q(7777) => [
+   q(7779) => [
       q(Yau (Morobe Province)),
       ],
-   q(7778) => [
+   q(7780) => [
       q(Southern Yukaghir),
       ],
-   q(7779) => [
+   q(7781) => [
       q(East Yugur),
       ],
-   q(7780) => [
+   q(7782) => [
       q(Yuracare),
       ],
-   q(7781) => [
+   q(7783) => [
       q(Yawa),
       ],
-   q(7782) => [
+   q(7784) => [
       q(Yavitero),
       ],
-   q(7783) => [
+   q(7785) => [
       q(Kalou),
       ],
-   q(7784) => [
+   q(7786) => [
       q(Yinhawangka),
       ],
-   q(7785) => [
+   q(7787) => [
       q(Western Lalu),
       ],
-   q(7786) => [
+   q(7788) => [
       q(Yawanawa),
       ],
-   q(7787) => [
+   q(7789) => [
       q(Wuding-Luquan Yi),
       ],
-   q(7788) => [
+   q(7790) => [
       q(Yawuru),
       ],
-   q(7789) => [
+   q(7791) => [
       q(Xishanba Lalo),
       q(Central Lalo),
       ],
-   q(7790) => [
+   q(7792) => [
       q(Wumeng Nasu),
       ],
-   q(7791) => [
+   q(7793) => [
       q(Yawarawarga),
       ],
-   q(7792) => [
+   q(7794) => [
       q(Mayawali),
       ],
-   q(7793) => [
+   q(7795) => [
       q(Yagara),
       ],
-   q(7794) => [
+   q(7796) => [
       q(Yardliyawarra),
       ],
-   q(7795) => [
+   q(7797) => [
       q(Yinwum),
       ],
-   q(7796) => [
+   q(7798) => [
       q(Yuyu),
       ],
-   q(7797) => [
+   q(7799) => [
       q(Yabula Yabula),
       ],
-   q(7798) => [
+   q(7800) => [
       q(Yir Yoront),
       ],
-   q(7799) => [
+   q(7801) => [
       q(Yau (Sandaun Province)),
       ],
-   q(7800) => [
+   q(7802) => [
       q(Ayizi),
       ],
-   q(7801) => [
+   q(7803) => [
       q(E'ma Buyang),
       ],
-   q(7802) => [
+   q(7804) => [
       q(Zokhuo),
       ],
-   q(7803) => [
+   q(7805) => [
       q(Sierra de Juarez Zapotec),
       ],
-   q(7804) => [
+   q(7806) => [
       q(San Juan Guelavia Zapotec),
       ],
-   q(7805) => [
+   q(7807) => [
       q(Ocotlan Zapotec),
       ],
-   q(7806) => [
+   q(7808) => [
       q(Cajonos Zapotec),
       ],
-   q(7807) => [
+   q(7809) => [
       q(Yareni Zapotec),
       ],
-   q(7808) => [
+   q(7810) => [
       q(Ayoquesco Zapotec),
       ],
-   q(7809) => [
+   q(7811) => [
       q(Zaghawa),
       ],
-   q(7810) => [
+   q(7812) => [
       q(Zangwal),
       ],
-   q(7811) => [
+   q(7813) => [
       q(Isthmus Zapotec),
       ],
-   q(7812) => [
+   q(7814) => [
       q(Zaramo),
       ],
-   q(7813) => [
+   q(7815) => [
       q(Zanaki),
       ],
-   q(7814) => [
+   q(7816) => [
       q(Zauzou),
       ],
-   q(7815) => [
+   q(7817) => [
       q(Miahuatlan Zapotec),
       ],
-   q(7816) => [
+   q(7818) => [
       q(Ozolotepec Zapotec),
       ],
-   q(7817) => [
+   q(7819) => [
       q(Aloapam Zapotec),
       ],
-   q(7818) => [
+   q(7820) => [
       q(Rincon Zapotec),
       ],
-   q(7819) => [
+   q(7821) => [
       q(Santo Domingo Albarradas Zapotec),
       ],
-   q(7820) => [
+   q(7822) => [
       q(Tabaa Zapotec),
       ],
-   q(7821) => [
+   q(7823) => [
       q(Zangskari),
       ],
-   q(7822) => [
+   q(7824) => [
       q(Yatzachi Zapotec),
       ],
-   q(7823) => [
+   q(7825) => [
       q(Mitla Zapotec),
       ],
-   q(7824) => [
+   q(7826) => [
       q(Xadani Zapotec),
       ],
-   q(7825) => [
+   q(7827) => [
       q(Zayse-Zergulla),
       q(Zaysete),
       ],
-   q(7826) => [
+   q(7828) => [
       q(Zari),
       ],
-   q(7827) => [
+   q(7829) => [
       q(Central Berawan),
       ],
-   q(7828) => [
+   q(7830) => [
       q(East Berawan),
       ],
-   q(7829) => [
+   q(7831) => [
       q(Batui),
       ],
-   q(7830) => [
+   q(7832) => [
       q(West Berawan),
       ],
-   q(7831) => [
+   q(7833) => [
       q(Coatecas Altas Zapotec),
       ],
-   q(7832) => [
+   q(7834) => [
       q(Central Hongshuihe Zhuang),
       ],
-   q(7833) => [
+   q(7835) => [
       q(Ngazidja Comorian),
       ],
-   q(7834) => [
+   q(7836) => [
       q(Zeeuws),
       ],
-   q(7835) => [
+   q(7837) => [
       q(Zenag),
       ],
-   q(7836) => [
+   q(7838) => [
       q(Eastern Hongshuihe Zhuang),
       ],
-   q(7837) => [
+   q(7839) => [
       q(Kinga),
       ],
-   q(7838) => [
+   q(7840) => [
       q(Guibei Zhuang),
       ],
-   q(7839) => [
+   q(7841) => [
       q(Minz Zhuang),
       ],
-   q(7840) => [
+   q(7842) => [
       q(Guibian Zhuang),
       ],
-   q(7841) => [
+   q(7843) => [
       q(Magori),
       ],
-   q(7842) => [
+   q(7844) => [
       q(Zhaba),
       ],
-   q(7843) => [
+   q(7845) => [
       q(Dai Zhuang),
       ],
-   q(7844) => [
+   q(7846) => [
       q(Zhire),
       ],
-   q(7845) => [
+   q(7847) => [
       q(Nong Zhuang),
       ],
-   q(7846) => [
+   q(7848) => [
       q(Zhoa),
       ],
-   q(7847) => [
+   q(7849) => [
       q(Zia),
       ],
-   q(7848) => [
+   q(7850) => [
       q(Zimbabwe Sign Language),
       ],
-   q(7849) => [
+   q(7851) => [
       q(Zimakani),
       ],
-   q(7850) => [
+   q(7852) => [
       q(Zialo),
       ],
-   q(7851) => [
+   q(7853) => [
       q(Mesme),
       ],
-   q(7852) => [
+   q(7854) => [
       q(Zinza),
       ],
-   q(7853) => [
+   q(7855) => [
       q(Ziriya),
       ],
-   q(7854) => [
+   q(7856) => [
       q(Zigula),
       ],
-   q(7855) => [
+   q(7857) => [
       q(Zizilivakan),
       ],
-   q(7856) => [
+   q(7858) => [
       q(Kaimbulawa),
       ],
-   q(7857) => [
+   q(7859) => [
       q(Koibal),
       ],
-   q(7858) => [
+   q(7860) => [
       q(Kadu),
       ],
-   q(7859) => [
+   q(7861) => [
       q(Koguryo),
       ],
-   q(7860) => [
+   q(7862) => [
       q(Khorezmian),
       ],
-   q(7861) => [
+   q(7863) => [
       q(Karankawa),
       ],
-   q(7862) => [
+   q(7864) => [
       q(Kanan),
       ],
-   q(7863) => [
+   q(7865) => [
       q(Kott),
       ],
-   q(7864) => [
+   q(7866) => [
       q(Sao Paulo Kaingang),
       ],
-   q(7865) => [
+   q(7867) => [
       q(Zakhring),
       ],
-   q(7866) => [
+   q(7868) => [
       q(Kitan),
       ],
-   q(7867) => [
+   q(7869) => [
       q(Kaurna),
       ],
-   q(7868) => [
+   q(7870) => [
       q(Krevinian),
       ],
-   q(7869) => [
+   q(7871) => [
       q(Khazar),
       ],
-   q(7870) => [
+   q(7872) => [
       q(Liujiang Zhuang),
       ],
-   q(7871) => [
+   q(7873) => [
       q(Malay (individual language)),
       ],
-   q(7872) => [
+   q(7874) => [
       q(Lianshan Zhuang),
       ],
-   q(7873) => [
+   q(7875) => [
       q(Liuqian Zhuang),
       ],
-   q(7874) => [
+   q(7876) => [
       q(Manda (Australia)),
       ],
-   q(7875) => [
+   q(7877) => [
       q(Zimba),
       ],
-   q(7876) => [
+   q(7878) => [
       q(Margany),
       ],
-   q(7877) => [
+   q(7879) => [
       q(Maridan),
       ],
-   q(7878) => [
+   q(7880) => [
       q(Mangerr),
       ],
-   q(7879) => [
+   q(7881) => [
       q(Mfinu),
       ],
-   q(7880) => [
+   q(7882) => [
       q(Marti Ke),
       ],
-   q(7881) => [
+   q(7883) => [
       q(Makolkol),
       ],
-   q(7882) => [
+   q(7884) => [
       q(Negeri Sembilan Malay),
       ],
-   q(7883) => [
+   q(7885) => [
       q(Maridjabin),
       ],
-   q(7884) => [
+   q(7886) => [
       q(Mandandanyi),
       ],
-   q(7885) => [
+   q(7887) => [
       q(Madngele),
       ],
-   q(7886) => [
+   q(7888) => [
       q(Marimanindji),
       ],
-   q(7887) => [
+   q(7889) => [
       q(Mbangwe),
       ],
-   q(7888) => [
+   q(7890) => [
       q(Molo),
       ],
-   q(7889) => [
+   q(7891) => [
       q(Mpuono),
       ],
-   q(7890) => [
+   q(7892) => [
       q(Mituku),
       ],
-   q(7891) => [
+   q(7893) => [
       q(Maranunggu),
       ],
-   q(7892) => [
+   q(7894) => [
       q(Mbesa),
       ],
-   q(7893) => [
+   q(7895) => [
       q(Maringarr),
       ],
-   q(7894) => [
+   q(7896) => [
       q(Muruwari),
       ],
-   q(7895) => [
+   q(7897) => [
       q(Mbariman-Gudhinma),
       ],
-   q(7896) => [
+   q(7898) => [
       q(Mbo (Democratic Republic of Congo)),
       ],
-   q(7897) => [
+   q(7899) => [
       q(Bomitaba),
       ],
-   q(7898) => [
+   q(7900) => [
       q(Mariyedi),
       ],
-   q(7899) => [
+   q(7901) => [
       q(Mbandja),
       ],
-   q(7900) => [
+   q(7902) => [
       q(Zan Gula),
       ],
-   q(7901) => [
+   q(7903) => [
       q(Zande (individual language)),
       ],
-   q(7902) => [
+   q(7904) => [
       q(Mang),
       ],
-   q(7903) => [
+   q(7905) => [
       q(Manangkari),
       ],
-   q(7904) => [
+   q(7906) => [
       q(Mangas),
       ],
-   q(7905) => [
+   q(7907) => [
       q(Copainala Zoque),
       ],
-   q(7906) => [
+   q(7908) => [
       q(Chimalapa Zoque),
       ],
-   q(7907) => [
+   q(7909) => [
       q(Zou),
       ],
-   q(7908) => [
+   q(7910) => [
       q(Asuncion Mixtepec Zapotec),
       ],
-   q(7909) => [
+   q(7911) => [
       q(Tabasco Zoque),
       ],
-   q(7910) => [
+   q(7912) => [
       q(Rayon Zoque),
       ],
-   q(7911) => [
+   q(7913) => [
       q(Francisco Leon Zoque),
       ],
-   q(7912) => [
+   q(7914) => [
       q(Lachiguiri Zapotec),
       ],
-   q(7913) => [
+   q(7915) => [
       q(Yautepec Zapotec),
       ],
-   q(7914) => [
+   q(7916) => [
       q(Choapan Zapotec),
       ],
-   q(7915) => [
+   q(7917) => [
       q(Southeastern Ixtlan Zapotec),
       ],
-   q(7916) => [
+   q(7918) => [
       q(Petapa Zapotec),
       ],
-   q(7917) => [
+   q(7919) => [
       q(San Pedro Quiatoni Zapotec),
       ],
-   q(7918) => [
+   q(7920) => [
       q(Guevea De Humboldt Zapotec),
       ],
-   q(7919) => [
+   q(7921) => [
       q(Totomachapan Zapotec),
       ],
-   q(7920) => [
+   q(7922) => [
       q(Santa Maria Quiegolani Zapotec),
       ],
-   q(7921) => [
+   q(7923) => [
       q(Quiavicuzas Zapotec),
       ],
-   q(7922) => [
+   q(7924) => [
       q(Tlacolulita Zapotec),
       ],
-   q(7923) => [
+   q(7925) => [
       q(Lachixio Zapotec),
       ],
-   q(7924) => [
+   q(7926) => [
       q(Mixtepec Zapotec),
       ],
-   q(7925) => [
+   q(7927) => [
       q(Santa Ines Yatzechi Zapotec),
       ],
-   q(7926) => [
+   q(7928) => [
       q(Amatlan Zapotec),
       ],
-   q(7927) => [
+   q(7929) => [
       q(El Alto Zapotec),
       ],
-   q(7928) => [
+   q(7930) => [
       q(Zoogocho Zapotec),
       ],
-   q(7929) => [
+   q(7931) => [
       q(Santiago Xanica Zapotec),
       ],
-   q(7930) => [
+   q(7932) => [
       q(Coatlan Zapotec),
       ],
-   q(7931) => [
+   q(7933) => [
       q(San Vicente Coatlan Zapotec),
       ],
-   q(7932) => [
+   q(7934) => [
       q(Yalalag Zapotec),
       ],
-   q(7933) => [
+   q(7935) => [
       q(Chichicapan Zapotec),
       ],
-   q(7934) => [
+   q(7936) => [
       q(Zaniza Zapotec),
       ],
-   q(7935) => [
+   q(7937) => [
       q(San Baltazar Loxicha Zapotec),
       ],
-   q(7936) => [
+   q(7938) => [
       q(Mazaltepec Zapotec),
       ],
-   q(7937) => [
+   q(7939) => [
       q(Texmelucan Zapotec),
       ],
-   q(7938) => [
+   q(7940) => [
       q(Qiubei Zhuang),
       ],
-   q(7939) => [
+   q(7941) => [
       q(Kara (Korea)),
       ],
-   q(7940) => [
+   q(7942) => [
       q(Mirgan),
       ],
-   q(7941) => [
+   q(7943) => [
       q(Zerenkel),
       ],
-   q(7942) => [
+   q(7944) => [
       q(Zaparo),
       ],
-   q(7943) => [
+   q(7945) => [
       q(Zarphatic),
       ],
-   q(7944) => [
+   q(7946) => [
       q(Mairasi),
       ],
-   q(7945) => [
+   q(7947) => [
       q(Sarasira),
       ],
-   q(7946) => [
+   q(7948) => [
       q(Kaskean),
       ],
-   q(7947) => [
+   q(7949) => [
       q(Zambian Sign Language),
       ],
-   q(7948) => [
+   q(7950) => [
       q(Standard Malay),
       ],
-   q(7949) => [
+   q(7951) => [
       q(Southern Rincon Zapotec),
       ],
-   q(7950) => [
+   q(7952) => [
       q(Sukurum),
       ],
-   q(7951) => [
+   q(7953) => [
       q(Elotepec Zapotec),
       ],
-   q(7952) => [
+   q(7954) => [
       q(Xanaguia Zapotec),
       ],
-   q(7953) => [
+   q(7955) => [
       q(Lapaguia-Guivini Zapotec),
       ],
-   q(7954) => [
+   q(7956) => [
       q(San Agustin Mixtepec Zapotec),
       ],
-   q(7955) => [
+   q(7957) => [
       q(Santa Catarina Albarradas Zapotec),
       ],
-   q(7956) => [
+   q(7958) => [
       q(Loxicha Zapotec),
       ],
-   q(7957) => [
+   q(7959) => [
       q(Quioquitani-Quieri Zapotec),
       ],
-   q(7958) => [
+   q(7960) => [
       q(Tilquiapan Zapotec),
       ],
-   q(7959) => [
+   q(7961) => [
       q(Tejalapan Zapotec),
       ],
-   q(7960) => [
+   q(7962) => [
       q(Guila Zapotec),
       ],
-   q(7961) => [
+   q(7963) => [
       q(Zaachila Zapotec),
       ],
-   q(7962) => [
+   q(7964) => [
       q(Yatee Zapotec),
       ],
-   q(7963) => [
+   q(7965) => [
       q(Zeem),
       ],
-   q(7964) => [
+   q(7966) => [
       q(Tokano),
       ],
-   q(7965) => [
+   q(7967) => [
       q(Kumzari),
       ],
-   q(7966) => [
+   q(7968) => [
       q(Zumaya),
       ],
-   q(7967) => [
+   q(7969) => [
       q(Zay),
       ],
-   q(7968) => [
+   q(7970) => [
       q(Yongbei Zhuang),
       ],
-   q(7969) => [
+   q(7971) => [
       q(Yang Zhuang),
       ],
-   q(7970) => [
+   q(7972) => [
       q(Youjiang Zhuang),
       ],
-   q(7971) => [
+   q(7973) => [
       q(Yongnan Zhuang),
       ],
-   q(7972) => [
+   q(7974) => [
       q(Zyphe Chin),
       ],
-   q(7973) => [
+   q(7975) => [
       q(Zuojiang Zhuang),
       ],
 };
 
 $Locale::Codes::Data{'language'}{'alias2id'} = {
    q(!xoo) => [
-      q(4974),
+      q(4975),
       q(0),
       ],
    q('are'are) => [
@@ -24278,11 +24294,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q('auhelawa) => [
-      q(3647),
+      q(3648),
       q(0),
       ],
    q('oroe) => [
-      q(1381),
+      q(1382),
       q(1),
       ],
    q(//ani) => [
@@ -24290,11 +24306,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(//gana) => [
-      q(2574),
+      q(2575),
       q(0),
       ],
    q(//xegwi) => [
-      q(7329),
+      q(7330),
       q(0),
       ],
    q(/gwi) => [
@@ -24302,7 +24318,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(/xam) => [
-      q(7279),
+      q(7280),
       q(0),
       ],
    q(=/hua) => [
@@ -24310,7 +24326,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(=/ungkue) => [
-      q(2541),
+      q(2542),
       q(1),
       ],
    q(a'ou) => [
@@ -24338,7 +24354,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(abadi) => [
-      q(3201),
+      q(3202),
       q(0),
       ],
    q(abaga) => [
@@ -24354,7 +24370,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(abar) => [
-      q(4306),
+      q(4307),
       q(0),
       ],
    q(abau) => [
@@ -24378,11 +24394,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(abinomn) => [
-      q(1446),
+      q(1447),
       q(0),
       ],
    q(abipon) => [
-      q(0984),
+      q(0985),
       q(0),
       ],
    q(abishira) => [
@@ -24422,7 +24438,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(abun) => [
-      q(3324),
+      q(3325),
       q(0),
       ],
    q(abure) => [
@@ -24430,15 +24446,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(abureni) => [
-      q(4258),
+      q(4259),
       q(0),
       ],
    q(acatepec me'phaa) => [
-      q(6673),
+      q(6674),
       q(0),
       ],
    q(acatepec tlapanec) => [
-      q(6673),
+      q(6674),
       q(1),
       ],
    q(achagua) => [
@@ -24490,11 +24506,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(adai) => [
-      q(7274),
+      q(7275),
       q(0),
       ],
    q(adamawa fulfulde) => [
-      q(2379),
+      q(2380),
       q(0),
       ],
    q(adamorobe sign language) => [
@@ -24514,11 +24530,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(adara) => [
-      q(3170),
+      q(3171),
       q(0),
       ],
    q(adasen) => [
-      q(6532),
+      q(6533),
       q(0),
       ],
    q(adele) => [
@@ -24538,15 +24554,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(adithinngithigh) => [
-      q(2158),
+      q(2159),
       q(0),
       ],
    q(adivasi oriya) => [
-      q(5302),
+      q(5303),
       q(0),
       ],
    q(adiwasi garasia) => [
-      q(2414),
+      q(2415),
       q(0),
       ],
    q(adnyamathanha) => [
@@ -24578,11 +24594,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aekyom) => [
-      q(0971),
+      q(0972),
       q(0),
       ],
    q(aequian) => [
-      q(7275),
+      q(7276),
       q(0),
       ],
    q(aer) => [
@@ -24598,7 +24614,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(afghan persian) => [
-      q(5601),
+      q(5602),
       q(1),
       ],
    q(afghan sign language) => [
@@ -24610,7 +24626,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(afra) => [
-      q(6893),
+      q(6894),
       q(1),
       ],
    q(afrihili) => [
@@ -24642,7 +24658,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(agavotaguerra) => [
-      q(0961),
+      q(0962),
       q(0),
       ],
    q(aghem) => [
@@ -24662,7 +24678,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aghwan) => [
-      q(7276),
+      q(7277),
       q(0),
       ],
    q(agi) => [
@@ -24670,7 +24686,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(agob) => [
-      q(3370),
+      q(3371),
       q(0),
       ],
    q(agoi) => [
@@ -24690,11 +24706,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aguna) => [
-      q(0936),
+      q(0937),
       q(0),
       ],
    q(agusan manobo) => [
-      q(4541),
+      q(4542),
       q(0),
       ],
    q(agutaynen) => [
@@ -24702,7 +24718,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(agwagwune) => [
-      q(7596),
+      q(7597),
       q(0),
       ],
    q(ahan) => [
@@ -24714,7 +24730,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aheu) => [
-      q(6504),
+      q(6505),
       q(0),
       ],
    q(ahirani) => [
@@ -24730,7 +24746,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ahwai) => [
-      q(4830),
+      q(4831),
       q(0),
       ],
    q(ai-cham) => [
@@ -24742,11 +24758,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aikana) => [
-      q(6379),
+      q(6380),
       q(0),
       ],
    q(aiklep) => [
-      q(4629),
+      q(4630),
       q(0),
       ],
    q(aimaq) => [
@@ -24790,7 +24806,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aiwoo) => [
-      q(4831),
+      q(4832),
       q(1),
       ],
    q(aja (benin)) => [
@@ -24814,11 +24830,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(ajumbu) => [
-      q(4581),
+      q(4582),
       q(0),
       ],
    q(ajyininka apurucayali) => [
-      q(1832),
+      q(1833),
       q(0),
       ],
    q(ak) => [
@@ -24826,7 +24842,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aka) => [
-      q(6161),
+      q(6162),
       q(0),
       ],
    q(aka-bea) => [
@@ -24878,11 +24894,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(akebu) => [
-      q(3276),
+      q(3277),
       q(0),
       ],
    q(akei) => [
-      q(6725),
+      q(6726),
       q(0),
       ],
    q(akeu) => [
@@ -24902,7 +24918,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(akkala sami) => [
-      q(6033),
+      q(6034),
       q(0),
       ],
    q(aklanon) => [
@@ -24914,11 +24930,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(akoose) => [
-      q(1463),
+      q(1464),
       q(0),
       ],
    q(akoye) => [
-      q(4316),
+      q(4317),
       q(0),
       ],
    q(akpa) => [
@@ -24934,11 +24950,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(akukem) => [
-      q(6185),
+      q(6186),
       q(0),
       ],
    q(akuku) => [
-      q(0999),
+      q(1000),
       q(0),
       ],
    q(akum) => [
@@ -24958,11 +24974,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(akyaung ari naga) => [
-      q(5047),
+      q(5048),
       q(0),
       ],
    q(al-sayyid bedouin sign language) => [
-      q(6345),
+      q(6346),
       q(0),
       ],
    q(alaba-k'abeena) => [
@@ -24974,7 +24990,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(alabat island agta) => [
-      q(2179),
+      q(2180),
       q(0),
       ],
    q(alacalufan languages) => [
@@ -24982,7 +24998,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(alacatlatzala mixtec) => [
-      q(4309),
+      q(4310),
       q(0),
       ],
    q(alago) => [
@@ -24990,7 +25006,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(alagwa) => [
-      q(7082),
+      q(7083),
       q(0),
       ],
    q(alak) => [
@@ -25006,7 +25022,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(alanic) => [
-      q(7400),
+      q(7401),
       q(0),
       ],
    q(alapmunte) => [
@@ -25026,11 +25042,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(albanian sign language) => [
-      q(6199),
+      q(6200),
       q(0),
       ],
    q(alcozauca mixtec) => [
-      q(7506),
+      q(7507),
       q(0),
       ],
    q(alege) => [
@@ -25038,7 +25054,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(alekano) => [
-      q(2403),
+      q(2404),
       q(0),
       ],
    q(alemannic) => [
@@ -25090,11 +25106,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(alo phola) => [
-      q(7731),
+      q(7733),
       q(0),
       ],
    q(aloapam zapotec) => [
-      q(7817),
+      q(7819),
       q(0),
       ],
    q(alor) => [
@@ -25114,11 +25130,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(alu kurumba) => [
-      q(7529),
+      q(7530),
       q(0),
       ],
    q(alugu) => [
-      q(0933),
+      q(0934),
       q(0),
       ],
    q(alumu-tesu) => [
@@ -25130,7 +25146,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aluo) => [
-      q(7704),
+      q(7706),
       q(0),
       ],
    q(alur) => [
@@ -25142,7 +25158,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(alviri-vidari) => [
-      q(0955),
+      q(0956),
       q(0),
       ],
    q(alyawarr) => [
@@ -25154,7 +25170,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ama (sudan)) => [
-      q(5162),
+      q(5163),
       q(0),
       ],
    q(amahai) => [
@@ -25194,15 +25210,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(amatlan zapotec) => [
-      q(7926),
+      q(7928),
       q(0),
       ],
    q(amba (solomon islands)) => [
-      q(6955),
+      q(6956),
       q(0),
       ],
    q(amba (uganda)) => [
-      q(5877),
+      q(5878),
       q(0),
       ],
    q(ambai) => [
@@ -25234,7 +25250,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ambo-pasco quechua) => [
-      q(5699),
+      q(5700),
       q(0),
       ],
    q(ambonese malay) => [
@@ -25282,7 +25298,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(amio-gelimi) => [
-      q(3877),
+      q(3878),
       q(1),
       ],
    q(amis) => [
@@ -25298,7 +25314,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(amoltepec mixtec) => [
-      q(4151),
+      q(4152),
       q(0),
       ],
    q(ampanang) => [
@@ -25326,7 +25342,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ana tinga dogon) => [
-      q(2159),
+      q(2160),
       q(0),
       ],
    q(anaang) => [
@@ -25342,7 +25358,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(anam) => [
-      q(5396),
+      q(5397),
       q(0),
       ],
    q(anambe) => [
@@ -25354,7 +25370,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(anasi) => [
-      q(1385),
+      q(1386),
       q(0),
       ],
    q(anca) => [
@@ -25362,7 +25378,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ancient aramaic (up to 700 bce)) => [
-      q(5186),
+      q(5187),
       q(1),
       ],
    q(ancient greek (to 1453)) => [
@@ -25374,19 +25390,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ancient macedonian) => [
-      q(7415),
+      q(7416),
       q(0),
       ],
    q(ancient north arabian) => [
-      q(7431),
+      q(7432),
       q(0),
       ],
    q(ancient zapotec) => [
-      q(7573),
+      q(7574),
       q(0),
       ],
    q(andaandi) => [
-      q(2012),
+      q(2013),
       q(0),
       ],
    q(andai) => [
@@ -25398,7 +25414,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(andalusian arabic) => [
-      q(7271),
+      q(7272),
       q(0),
       ],
    q(andaman creole hindi) => [
@@ -25426,7 +25442,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(andio) => [
-      q(1613),
+      q(1614),
       q(0),
       ],
    q(andoa) => [
@@ -25442,7 +25458,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aneityum) => [
-      q(0930),
+      q(0931),
       q(0),
       ],
    q(anem) => [
@@ -25454,7 +25470,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(anfillo) => [
-      q(4684),
+      q(4685),
       q(0),
       ],
    q(angaataha) => [
@@ -25478,11 +25494,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(angami naga) => [
-      q(4911),
+      q(4912),
       q(0),
       ],
    q(angguruk yali) => [
-      q(7678),
+      q(7680),
       q(0),
       ],
    q(angika) => [
@@ -25490,15 +25506,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(angkamuthi) => [
-      q(0959),
+      q(0960),
       q(0),
       ],
    q(anglo-norman) => [
-      q(7438),
+      q(7439),
       q(0),
       ],
    q(angloromani) => [
-      q(5808),
+      q(5809),
       q(0),
       ],
    q(angolar) => [
@@ -25514,19 +25530,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(angosturas tunebo) => [
-      q(6613),
+      q(6614),
       q(0),
       ],
    q(anguthimri) => [
-      q(0969),
+      q(0970),
       q(0),
       ],
+   q(ani) => [
+      q(2803),
+      q(1),
+      ],
    q(ani phowa) => [
-      q(7730),
+      q(7732),
       q(0),
       ],
    q(anii) => [
-      q(1291),
+      q(1292),
       q(0),
       ],
    q(animere) => [
@@ -25538,7 +25558,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(anjam) => [
-      q(1358),
+      q(1359),
       q(0),
       ],
    q(ankave) => [
@@ -25550,7 +25570,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(anong) => [
-      q(5115),
+      q(5116),
       q(0),
       ],
    q(anor) => [
@@ -25570,7 +25590,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(antankarana malagasy) => [
-      q(7426),
+      q(7427),
       q(0),
       ],
    q(antigua and barbuda creole english) => [
@@ -25586,19 +25606,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(anufo) => [
-      q(1758),
+      q(1759),
       q(0),
       ],
    q(anuki) => [
-      q(0938),
+      q(0939),
       q(0),
       ],
    q(anus) => [
-      q(0946),
+      q(0947),
       q(0),
       ],
    q(anuta) => [
-      q(0935),
+      q(0936),
       q(0),
       ],
    q(anyin) => [
@@ -25606,15 +25626,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(anyin morofo) => [
-      q(4555),
+      q(4556),
       q(0),
       ],
    q(ao naga) => [
-      q(4913),
+      q(4914),
       q(0),
       ],
    q(aoheng) => [
-      q(5535),
+      q(5536),
       q(0),
       ],
    q(aore) => [
@@ -25622,7 +25642,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ap ma) => [
-      q(3205),
+      q(3206),
       q(0),
       ],
    q(apache languages) => [
@@ -25630,7 +25650,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(apalachee) => [
-      q(7282),
+      q(7283),
       q(0),
       ],
    q(apalai) => [
@@ -25638,11 +25658,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(apali) => [
-      q(2263),
+      q(2264),
       q(0),
       ],
    q(apasco-apoala mixtec) => [
-      q(4311),
+      q(4312),
       q(0),
       ],
    q(apatani) => [
@@ -25674,7 +25694,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aquitanian) => [
-      q(7283),
+      q(7284),
       q(0),
       ],
    q(arabana) => [
@@ -25698,15 +25718,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(arakwal) => [
-      q(5803),
+      q(5804),
       q(0),
       ],
    q(aralle-tabulahan) => [
-      q(0922),
+      q(0923),
       q(0),
       ],
    q(arammba) => [
-      q(6262),
+      q(6263),
       q(0),
       ],
    q(aranadan) => [
@@ -25714,7 +25734,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aranama-tamique) => [
-      q(7485),
+      q(7486),
       q(0),
       ],
    q(arandai) => [
@@ -25734,7 +25754,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ararandewara) => [
-      q(7278),
+      q(7279),
       q(0),
       ],
    q(arauan languages) => [
@@ -25754,11 +25774,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(arawete) => [
-      q(0978),
+      q(0979),
       q(0),
       ],
    q(arawum) => [
-      q(0973),
+      q(0974),
       q(0),
       ],
    q(arbereshe albanian) => [
@@ -25774,11 +25794,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ardhamagadhi prakrit) => [
-      q(5473),
+      q(5474),
       q(0),
       ],
    q(are) => [
-      q(4626),
+      q(4627),
       q(0),
       ],
    q(areba) => [
@@ -25790,7 +25810,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(arequipa-la union quechua) => [
-      q(5731),
+      q(5732),
       q(0),
       ],
    q(argentine sign language) => [
@@ -25822,11 +25842,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aribwatsa) => [
-      q(3811),
+      q(3812),
       q(0),
       ],
    q(aribwaung) => [
-      q(7684),
+      q(7686),
       q(0),
       ],
    q(arifama-miniafia) => [
@@ -25850,11 +25870,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(arin) => [
-      q(7482),
+      q(7483),
       q(0),
       ],
    q(aringa) => [
-      q(4076),
+      q(4077),
       q(0),
       ],
    q(arma) => [
@@ -25862,7 +25882,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(armazic) => [
-      q(7481),
+      q(7482),
       q(0),
       ],
    q(armenian) => [
@@ -25894,15 +25914,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(arpitan) => [
-      q(2373),
+      q(2374),
       q(0),
       ],
    q(arritinngithigh) => [
-      q(5852),
+      q(5853),
       q(0),
       ],
    q(arta) => [
-      q(0931),
+      q(0932),
       q(0),
       ],
    q(artificial languages) => [
@@ -25918,11 +25938,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(aruamu) => [
-      q(4552),
+      q(4553),
       q(0),
       ],
    q(aruek) => [
-      q(0947),
+      q(0948),
       q(0),
       ],
    q(arumanian) => [
@@ -25930,11 +25950,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(aruop) => [
-      q(4065),
+      q(4066),
       q(0),
       ],
    q(arutani) => [
-      q(0929),
+      q(0930),
       q(0),
       ],
    q(arvanitika albanian) => [
@@ -25946,7 +25966,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(asaro'o) => [
-      q(4575),
+      q(4576),
       q(0),
       ],
    q(asas) => [
@@ -25954,7 +25974,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ashaninka) => [
-      q(1799),
+      q(1800),
       q(0),
       ],
    q(ashe) => [
@@ -25962,11 +25982,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(asheninka pajonal) => [
-      q(1749),
+      q(1750),
       q(0),
       ],
    q(asheninka perene) => [
-      q(5599),
+      q(5600),
       q(0),
       ],
    q(ashkun) => [
@@ -25974,7 +25994,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(asho chin) => [
-      q(1871),
+      q(1872),
       q(0),
       ],
    q(ashtiani) => [
@@ -25986,7 +26006,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(askopan) => [
-      q(2229),
+      q(2230),
       q(0),
       ],
    q(asoa) => [
@@ -25998,11 +26018,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(assan) => [
-      q(7502),
+      q(7503),
       q(0),
       ],
    q(assangori) => [
-      q(6058),
+      q(6059),
       q(0),
       ],
    q(assiniboine) => [
@@ -26022,7 +26042,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(3),
       ],
    q(asu (nigeria)) => [
-      q(0942),
+      q(0943),
       q(0),
       ],
    q(asu (tanzania)) => [
@@ -26030,15 +26050,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(asue awyu) => [
-      q(5608),
+      q(5609),
       q(0),
       ],
    q(asumboa) => [
-      q(0932),
+      q(0933),
       q(0),
       ],
    q(asuncion mixtepec zapotec) => [
-      q(7908),
+      q(7910),
       q(0),
       ],
    q(asuri) => [
@@ -26062,11 +26082,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(atatlahuca mixtec) => [
-      q(4299),
+      q(4300),
       q(0),
       ],
    q(atayal) => [
-      q(6377),
+      q(6378),
       q(0),
       ],
    q(atemble) => [
@@ -26097,7 +26117,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0862),
       q(0),
       ],
-   q(atong) => [
+   q(atong (cameroon)) => [
+      q(0921),
+      q(0),
+      ],
+   q(atong (india)) => [
       q(0830),
       q(0),
       ],
@@ -26110,15 +26134,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(atsam) => [
-      q(1684),
+      q(1685),
       q(0),
       ],
    q(atsugewi) => [
-      q(0928),
+      q(0929),
       q(0),
       ],
    q(attapady kurumba) => [
-      q(5481),
+      q(5482),
       q(0),
       ],
    q(attie) => [
@@ -26126,31 +26150,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(atzingo matlatzinca) => [
-      q(5199),
+      q(5200),
       q(0),
       ],
    q(au) => [
-      q(0963),
+      q(0964),
       q(0),
       ],
    q(aulua) => [
-      q(0941),
+      q(0942),
       q(0),
       ],
    q(aura) => [
-      q(0951),
+      q(0952),
       q(0),
       ],
    q(aushi) => [
-      q(0937),
+      q(0938),
       q(0),
       ],
    q(aushiri) => [
-      q(0962),
+      q(0963),
       q(0),
       ],
    q(austral) => [
-      q(0948),
+      q(0949),
       q(0),
       ],
    q(australian aborigines sign language) => [
@@ -26178,23 +26202,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(auwe) => [
-      q(6118),
+      q(6119),
       q(0),
       ],
    q(auye) => [
-      q(0949),
+      q(0950),
       q(0),
       ],
    q(auyokawa) => [
-      q(0944),
+      q(0945),
       q(0),
       ],
    q(ava guarani) => [
-      q(4862),
+      q(4863),
       q(1),
       ],
    q(ava-canoeiro) => [
-      q(0965),
+      q(0966),
       q(0),
       ],
    q(avaric) => [
@@ -26202,15 +26226,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(avatime) => [
-      q(0960),
+      q(0961),
       q(0),
       ],
    q(avau) => [
-      q(0954),
+      q(0955),
       q(0),
       ],
    q(avava) => [
-      q(6587),
+      q(6588),
       q(1),
       ],
    q(avestan) => [
@@ -26218,31 +26242,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(avikam) => [
-      q(0956),
+      q(0957),
       q(0),
       ],
    q(avokaya) => [
-      q(0964),
+      q(0965),
       q(0),
       ],
    q(awa (china)) => [
-      q(7054),
+      q(7055),
       q(0),
       ],
    q(awa (papua new guinea)) => [
-      q(0966),
+      q(0967),
       q(0),
       ],
    q(awa-cuaiquer) => [
-      q(3700),
+      q(3701),
       q(0),
       ],
    q(awabakal) => [
-      q(0972),
+      q(0973),
       q(0),
       ],
    q(awad bing) => [
-      q(1083),
+      q(1084),
       q(0),
       ],
    q(awadhi) => [
@@ -26250,47 +26274,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(awak) => [
-      q(0975),
+      q(0976),
       q(0),
       ],
    q(awar) => [
-      q(0991),
+      q(0992),
       q(0),
       ],
    q(awara) => [
-      q(0982),
+      q(0983),
       q(0),
       ],
    q(awbono) => [
-      q(0970),
+      q(0971),
       q(0),
       ],
    q(aweer) => [
-      q(1352),
+      q(1353),
       q(0),
       ],
    q(awera) => [
-      q(0976),
+      q(0977),
       q(0),
       ],
    q(aweti) => [
-      q(0968),
+      q(0969),
       q(0),
       ],
    q(awing) => [
-      q(1018),
+      q(1019),
       q(0),
       ],
    q(awiyaana) => [
-      q(0952),
+      q(0953),
       q(0),
       ],
    q(awjilah) => [
-      q(0939),
+      q(0940),
       q(0),
       ],
    q(awngi) => [
-      q(0974),
+      q(0975),
       q(0),
       ],
    q(awngthim) => [
@@ -26298,15 +26322,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(awtuw) => [
-      q(3466),
+      q(3467),
       q(0),
       ],
    q(awu) => [
-      q(7658),
+      q(7660),
       q(0),
       ],
    q(awun) => [
-      q(0981),
+      q(0982),
       q(0),
       ],
    q(awutu) => [
@@ -26314,7 +26338,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(awyi) => [
-      q(0950),
+      q(0951),
       q(0),
       ],
    q(axamb) => [
@@ -26322,15 +26346,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(axi yi) => [
-      q(7660),
+      q(7662),
       q(0),
       ],
    q(ayabadhu) => [
-      q(0994),
+      q(0995),
       q(0),
       ],
    q(ayacucho quechua) => [
-      q(5697),
+      q(5698),
       q(0),
       ],
    q(ayangan ifugao) => [
@@ -26338,31 +26362,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(ayautla mazatec) => [
-      q(7038),
+      q(7039),
       q(0),
       ],
    q(ayere) => [
-      q(0995),
+      q(0996),
       q(0),
       ],
    q(ayerrerenge) => [
-      q(0985),
+      q(0986),
       q(0),
       ],
    q(ayi (papua new guinea)) => [
-      q(1004),
+      q(1005),
       q(0),
       ],
    q(ayiwo) => [
-      q(4831),
+      q(4832),
       q(0),
       ],
    q(ayizi) => [
-      q(7800),
+      q(7802),
       q(0),
       ],
    q(ayizo gbe) => [
-      q(0992),
+      q(0993),
       q(0),
       ],
    q(aymara) => [
@@ -26370,19 +26394,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ayoquesco zapotec) => [
-      q(7808),
+      q(7810),
       q(0),
       ],
    q(ayoreo) => [
-      q(1002),
+      q(1003),
       q(0),
       ],
    q(ayu) => [
-      q(1008),
+      q(1009),
       q(0),
       ],
    q(ayutla mixtec) => [
-      q(4318),
+      q(4319),
       q(0),
       ],
    q(azerbaijani) => [
@@ -26390,59 +26414,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(azha) => [
-      q(1011),
+      q(1012),
       q(0),
       ],
    q(azhe) => [
-      q(7661),
+      q(7663),
       q(0),
       ],
    q(azoyu me'phaa) => [
-      q(6656),
+      q(6657),
       q(0),
       ],
    q(azoyu tlapanec) => [
-      q(6656),
+      q(6657),
       q(1),
       ],
    q(baan) => [
-      q(1525),
+      q(1526),
       q(0),
       ],
    q(baangi) => [
-      q(1419),
+      q(1420),
       q(0),
       ],
    q(baatonum) => [
-      q(1037),
+      q(1038),
       q(0),
       ],
    q(baba) => [
-      q(1059),
+      q(1060),
       q(0),
       ],
    q(baba malay) => [
-      q(4132),
+      q(4133),
       q(0),
       ],
    q(babalia creole arabic) => [
-      q(1062),
+      q(1063),
       q(0),
       ],
    q(babango) => [
-      q(1049),
+      q(1050),
       q(0),
       ],
    q(babanki) => [
-      q(1047),
+      q(1048),
       q(0),
       ],
    q(babatana) => [
-      q(1021),
+      q(1022),
       q(0),
       ],
    q(babine) => [
-      q(1080),
+      q(1081),
       q(0),
       ],
    q(bable) => [
@@ -26450,47 +26474,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(babuza) => [
-      q(1618),
+      q(1619),
       q(0),
       ],
    q(bacama) => [
-      q(1086),
+      q(1087),
       q(0),
       ],
    q(bacanese malay) => [
-      q(1478),
+      q(1479),
       q(0),
       ],
    q(bactrian) => [
-      q(7293),
+      q(7294),
       q(0),
       ],
    q(bada (indonesia)) => [
-      q(1208),
+      q(1209),
       q(0),
       ],
    q(bada (nigeria)) => [
-      q(1032),
+      q(1033),
       q(0),
       ],
    q(badaga) => [
-      q(1151),
+      q(1152),
       q(0),
       ],
    q(bade) => [
-      q(1092),
+      q(1093),
       q(0),
       ],
    q(badeshi) => [
-      q(1113),
+      q(1114),
       q(0),
       ],
    q(badi kanum) => [
-      q(3334),
+      q(3335),
       q(0),
       ],
    q(badimaya) => [
-      q(1209),
+      q(1210),
       q(0),
       ],
    q(badjiri) => [
@@ -26498,111 +26522,111 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(badui) => [
-      q(1023),
+      q(1024),
       q(0),
       ],
    q(badyara) => [
-      q(5373),
+      q(5374),
       q(0),
       ],
    q(baeggu) => [
-      q(1519),
+      q(1520),
       q(0),
       ],
    q(baelelea) => [
-      q(1518),
+      q(1519),
       q(0),
       ],
    q(baetora) => [
-      q(1485),
+      q(1486),
       q(0),
       ],
    q(bafanji) => [
-      q(1144),
+      q(1145),
       q(0),
       ],
    q(bafaw-balong) => [
-      q(1560),
+      q(1561),
       q(0),
       ],
    q(bafia) => [
-      q(3598),
+      q(3599),
       q(0),
       ],
    q(bafut) => [
-      q(1138),
+      q(1139),
       q(0),
       ],
    q(baga binari) => [
-      q(1069),
+      q(1070),
       q(0),
       ],
    q(baga kaloum) => [
-      q(1401),
+      q(1402),
       q(0),
       ],
    q(baga koga) => [
-      q(1173),
+      q(1174),
       q(0),
       ],
    q(baga manduri) => [
-      q(1305),
+      q(1306),
       q(0),
       ],
    q(baga mboteni) => [
-      q(1171),
+      q(1172),
       q(0),
       ],
    q(baga sitemu) => [
-      q(1460),
+      q(1461),
       q(0),
       ],
    q(baga sobane) => [
-      q(1466),
+      q(1467),
       q(0),
       ],
    q(bagheli) => [
-      q(1158),
+      q(1159),
       q(0),
       ],
    q(bagirmi) => [
-      q(1310),
+      q(1311),
       q(0),
       ],
    q(bagirmi fulfulde) => [
-      q(2385),
+      q(2386),
       q(0),
       ],
    q(bago-kusuntu) => [
-      q(1402),
+      q(1403),
       q(0),
       ],
    q(bagri) => [
-      q(1175),
+      q(1176),
       q(0),
       ],
    q(bagupi) => [
-      q(1379),
+      q(1380),
       q(0),
       ],
    q(bagusa) => [
-      q(1398),
+      q(1399),
       q(0),
       ],
    q(bagvalal) => [
-      q(3666),
+      q(3667),
       q(0),
       ],
    q(baha buyang) => [
-      q(7641),
+      q(7642),
       q(0),
       ],
    q(baham) => [
-      q(1110),
+      q(1111),
       q(0),
       ],
    q(bahamas creole english) => [
-      q(1027),
+      q(1028),
       q(0),
       ],
    q(baharna arabic) => [
@@ -26610,155 +26634,155 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bahau) => [
-      q(1204),
+      q(1205),
       q(0),
       ],
    q(bahinemo) => [
-      q(1236),
+      q(1237),
       q(0),
       ],
    q(bahing) => [
-      q(1194),
+      q(1195),
       q(0),
       ],
    q(bahnar) => [
-      q(1104),
+      q(1105),
       q(0),
       ],
    q(bahonsuai) => [
-      q(1465),
+      q(1466),
       q(0),
       ],
    q(bai) => [
-      q(1097),
+      q(1098),
       q(0),
       ],
    q(baibai) => [
-      q(1042),
+      q(1043),
       q(0),
       ],
    q(baikeno) => [
-      q(1275),
+      q(1276),
       q(0),
       ],
    q(baima) => [
-      q(1403),
+      q(1404),
       q(0),
       ],
    q(baimak) => [
-      q(1325),
+      q(1326),
       q(0),
       ],
    q(bainouk-gunyaamolo) => [
-      q(1087),
+      q(1088),
       q(0),
       ],
    q(bainouk-gunyuno) => [
-      q(1022),
+      q(1023),
       q(0),
       ],
    q(bainouk-samik) => [
-      q(1064),
+      q(1065),
       q(0),
       ],
    q(baiso) => [
-      q(1467),
+      q(1468),
       q(0),
       ],
    q(baissa fali) => [
-      q(2326),
+      q(2327),
       q(0),
       ],
    q(bajan) => [
-      q(1246),
+      q(1247),
       q(0),
       ],
    q(bajelani) => [
-      q(1241),
+      q(1242),
       q(0),
       ],
    q(baka (cameroon)) => [
-      q(1255),
+      q(1256),
       q(0),
       ],
    q(baka (sudan)) => [
-      q(1095),
+      q(1096),
       q(0),
       ],
    q(bakairi) => [
-      q(1268),
+      q(1269),
       q(0),
       ],
    q(bakaka) => [
-      q(1421),
+      q(1422),
       q(0),
       ],
    q(bakhtiari) => [
-      q(1404),
+      q(1405),
       q(0),
       ],
    q(baki) => [
-      q(1260),
+      q(1261),
       q(0),
       ],
    q(bakoko) => [
-      q(1259),
+      q(1260),
       q(0),
       ],
    q(bakole) => [
-      q(3457),
+      q(3458),
       q(0),
       ],
    q(bakpinka) => [
-      q(1055),
+      q(1056),
       q(0),
       ],
    q(bakumpai) => [
-      q(1269),
+      q(1270),
       q(0),
       ],
    q(bakwe) => [
-      q(1250),
+      q(1251),
       q(0),
       ],
    q(balaesang) => [
-      q(1295),
+      q(1296),
       q(0),
       ],
    q(balangao) => [
-      q(1298),
+      q(1299),
       q(0),
       ],
    q(balangingi) => [
-      q(6232),
+      q(6233),
       q(0),
       ],
    q(balanta-ganja) => [
-      q(1247),
+      q(1248),
       q(0),
       ],
    q(balanta-kentohe) => [
-      q(1281),
+      q(1282),
       q(0),
       ],
    q(balantak) => [
-      q(1301),
+      q(1302),
       q(0),
       ],
    q(balau) => [
-      q(1283),
+      q(1284),
       q(0),
       ],
    q(baldemu) => [
-      q(1101),
+      q(1102),
       q(0),
       ],
    q(bali (democratic republic of congo)) => [
-      q(1078),
+      q(1079),
       q(0),
       ],
    q(bali (nigeria)) => [
-      q(1076),
+      q(1077),
       q(0),
       ],
    q(balinese) => [
@@ -26766,27 +26790,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(balinese malay) => [
-      q(4288),
+      q(4289),
       q(0),
       ],
    q(balkan gagauz turkish) => [
-      q(1182),
+      q(1183),
       q(0),
       ],
    q(balkan romani) => [
-      q(5816),
+      q(5817),
       q(0),
       ],
    q(balo) => [
-      q(1410),
+      q(1411),
       q(0),
       ],
    q(baloi) => [
-      q(1229),
+      q(1230),
       q(0),
       ],
    q(balti) => [
-      q(1154),
+      q(1155),
       q(0),
       ],
    q(baltic languages) => [
@@ -26794,11 +26818,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(baltic romani) => [
-      q(5814),
+      q(5815),
       q(0),
       ],
    q(baluan-pam) => [
-      q(1293),
+      q(1294),
       q(0),
       ],
    q(baluchi) => [
@@ -26806,19 +26830,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bamako sign language) => [
-      q(1355),
+      q(1356),
       q(0),
       ],
    q(bamali) => [
-      q(1053),
+      q(1054),
       q(0),
       ],
    q(bambalang) => [
-      q(1316),
+      q(1317),
       q(0),
       ],
    q(bambam) => [
-      q(5636),
+      q(5637),
       q(0),
       ],
    q(bambara) => [
@@ -26826,15 +26850,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bambassi) => [
-      q(4676),
+      q(4677),
       q(0),
       ],
    q(bambili-bambui) => [
-      q(1034),
+      q(1035),
       q(0),
       ],
    q(bamenyam) => [
-      q(1067),
+      q(1068),
       q(0),
       ],
    q(bamileke languages) => [
@@ -26842,47 +26866,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bamu) => [
-      q(1068),
+      q(1069),
       q(0),
       ],
    q(bamukumbit) => [
-      q(1415),
+      q(1416),
       q(0),
       ],
    q(bamun) => [
-      q(1035),
+      q(1036),
       q(0),
       ],
    q(bamunka) => [
-      q(1528),
+      q(1529),
       q(0),
       ],
    q(bamwe) => [
-      q(1308),
+      q(1309),
       q(0),
       ],
    q(ban khor sign language) => [
-      q(1145),
+      q(1146),
       q(0),
       ],
    q(bana) => [
-      q(1085),
+      q(1086),
       q(0),
       ],
    q(banam bay) => [
-      q(7046),
+      q(7047),
       q(1),
       ],
    q(banao itneg) => [
-      q(1251),
+      q(1252),
       q(0),
       ],
    q(banaro) => [
-      q(1611),
+      q(1612),
       q(0),
       ],
    q(banda (indonesia)) => [
-      q(1330),
+      q(1331),
       q(0),
       ],
    q(banda languages) => [
@@ -26890,103 +26914,103 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(banda malay) => [
-      q(1387),
+      q(1388),
       q(0),
       ],
    q(banda-bambari) => [
-      q(3929),
+      q(3930),
       q(0),
       ],
    q(banda-banda) => [
-      q(1376),
+      q(1377),
       q(0),
       ],
    q(banda-mbres) => [
-      q(1406),
+      q(1407),
       q(0),
       ],
    q(banda-ndele) => [
-      q(1146),
+      q(1147),
       q(0),
       ],
    q(banda-yangere) => [
-      q(7583),
+      q(7584),
       q(0),
       ],
    q(bandi) => [
-      q(1612),
+      q(1613),
       q(0),
       ],
    q(bandial) => [
-      q(1405),
+      q(1406),
       q(0),
       ],
    q(bandjalang) => [
-      q(1112),
+      q(1113),
       q(0),
       ],
    q(bangala) => [
-      q(1572),
+      q(1573),
       q(0),
       ],
    q(bangandu) => [
-      q(1165),
+      q(1166),
       q(0),
       ],
    q(bangba) => [
-      q(1041),
+      q(1042),
       q(0),
       ],
    q(banggai) => [
-      q(1184),
+      q(1185),
       q(0),
       ],
    q(banggarla) => [
-      q(1231),
+      q(1232),
       q(0),
       ],
    q(bangi) => [
-      q(1334),
+      q(1335),
       q(0),
       ],
    q(bangime) => [
-      q(1955),
+      q(1956),
       q(0),
       ],
    q(bangingih sama) => [
-      q(6232),
+      q(6233),
       q(1),
       ],
    q(bangka) => [
-      q(4225),
+      q(4226),
       q(0),
       ],
    q(bangolan) => [
-      q(1168),
+      q(1169),
       q(0),
       ],
    q(bangubangu) => [
-      q(1348),
+      q(1349),
       q(0),
       ],
    q(bangwinji) => [
-      q(1454),
+      q(1455),
       q(0),
       ],
    q(baniva) => [
-      q(1536),
+      q(1537),
       q(0),
       ],
    q(baniwa) => [
-      q(1549),
+      q(1550),
       q(0),
       ],
    q(banjar) => [
-      q(1242),
+      q(1243),
       q(0),
       ],
    q(bankagooma) => [
-      q(1587),
+      q(1588),
       q(0),
       ],
    q(bankal) => [
@@ -26994,7 +27018,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bankan tey dogon) => [
-      q(1973),
+      q(1974),
       q(0),
       ],
    q(bankon) => [
@@ -27002,23 +27026,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bannoni) => [
-      q(1075),
+      q(1076),
       q(0),
       ],
    q(bantawa) => [
-      q(1030),
+      q(1031),
       q(0),
       ],
    q(bantayanon) => [
-      q(1157),
+      q(1158),
       q(0),
       ],
    q(bantik) => [
-      q(1342),
+      q(1343),
       q(0),
       ],
    q(bantoanon) => [
-      q(1340),
+      q(1341),
       q(0),
       ],
    q(bantu (other)) => [
@@ -27030,67 +27054,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(baoule) => [
-      q(1071),
+      q(1072),
       q(0),
       ],
    q(bara malagasy) => [
-      q(1200),
+      q(1201),
       q(0),
       ],
    q(baraamu) => [
-      q(1424),
+      q(1425),
       q(0),
       ],
    q(barababaraba) => [
-      q(5760),
+      q(5761),
       q(0),
       ],
    q(barai) => [
-      q(1038),
+      q(1039),
       q(0),
       ],
    q(barakai) => [
-      q(1028),
+      q(1029),
       q(0),
       ],
    q(baram kayan) => [
-      q(3759),
+      q(3760),
       q(0),
       ],
    q(barama) => [
-      q(1043),
+      q(1044),
       q(0),
       ],
    q(barambu) => [
-      q(1432),
+      q(1433),
       q(0),
       ],
    q(baramu) => [
-      q(1326),
+      q(1327),
       q(0),
       ],
    q(barapasi) => [
-      q(1435),
+      q(1436),
       q(0),
       ],
    q(baras) => [
-      q(1438),
+      q(1439),
       q(0),
       ],
    q(barasana-eduria) => [
-      q(1458),
+      q(1459),
       q(0),
       ],
    q(barbacoas) => [
-      q(1375),
+      q(1376),
       q(0),
       ],
    q(barbaram) => [
-      q(7018),
+      q(7019),
       q(0),
       ],
    q(barbareno) => [
-      q(1357),
+      q(1358),
       q(0),
       ],
    q(barclayville grebo) => [
@@ -27098,35 +27122,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bardi) => [
-      q(1072),
+      q(1073),
       q(0),
       ],
    q(bare) => [
-      q(1024),
+      q(1025),
       q(0),
       ],
    q(barein) => [
-      q(1516),
+      q(1517),
       q(0),
       ],
    q(bargam) => [
-      q(4380),
+      q(4381),
       q(0),
       ],
    q(bari) => [
-      q(1135),
+      q(1136),
       q(0),
       ],
    q(bariai) => [
-      q(1070),
+      q(1071),
       q(0),
       ],
    q(bariji) => [
-      q(1232),
+      q(1233),
       q(0),
       ],
    q(barikanchi) => [
-      q(1580),
+      q(1581),
       q(0),
       ],
    q(barikewa) => [
@@ -27134,35 +27158,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(barok) => [
-      q(1239),
+      q(1240),
       q(0),
       ],
    q(barombi) => [
-      q(1045),
+      q(1046),
       q(0),
       ],
    q(barro negro tunebo) => [
-      q(6392),
+      q(6393),
       q(0),
       ],
    q(barrow point) => [
-      q(1390),
+      q(1391),
       q(0),
       ],
    q(baruga) => [
-      q(1253),
+      q(1254),
       q(0),
       ],
    q(baruya) => [
-      q(1605),
+      q(1606),
       q(0),
       ],
    q(barwe) => [
-      q(1547),
+      q(1548),
       q(0),
       ],
    q(barzani jewish neo-aramaic) => [
-      q(1234),
+      q(1235),
       q(0),
       ],
    q(basa) => [
@@ -27174,27 +27198,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(basa (nigeria)) => [
-      q(1634),
+      q(1635),
       q(0),
       ],
    q(basa-gumna) => [
-      q(1456),
+      q(1457),
       q(0),
       ],
    q(basa-gurmana) => [
-      q(1501),
+      q(1502),
       q(0),
       ],
    q(basap) => [
-      q(1089),
+      q(1090),
       q(0),
       ],
    q(basay) => [
-      q(1604),
+      q(1605),
       q(0),
       ],
    q(bashkardi) => [
-      q(1451),
+      q(1452),
       q(0),
       ],
    q(bashkir) => [
@@ -27202,7 +27226,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(basketo) => [
-      q(1464),
+      q(1465),
       q(0),
       ],
    q(basque) => [
@@ -27214,23 +27238,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bassa) => [
-      q(1461),
+      q(1462),
       q(0),
       ],
    q(bassa-kontagora) => [
-      q(1462),
+      q(1463),
       q(0),
       ],
    q(bassari) => [
-      q(1448),
+      q(1449),
       q(0),
       ],
    q(bassossi) => [
-      q(1453),
+      q(1454),
       q(0),
       ],
    q(bata) => [
-      q(1470),
+      q(1471),
       q(0),
       ],
    q(batad ifugao) => [
@@ -27238,11 +27262,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(batak) => [
-      q(1589),
+      q(1590),
       q(0),
       ],
    q(batak alas-kluet) => [
-      q(1493),
+      q(1494),
       q(0),
       ],
    q(batak angkola) => [
@@ -27250,11 +27274,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(batak dairi) => [
-      q(1472),
+      q(1473),
       q(0),
       ],
    q(batak karo) => [
-      q(1491),
+      q(1492),
       q(0),
       ],
    q(batak languages) => [
@@ -27262,151 +27286,151 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(batak mandailing) => [
-      q(1480),
+      q(1481),
       q(0),
       ],
    q(batak simalungun) => [
-      q(1486),
+      q(1487),
       q(0),
       ],
    q(batak toba) => [
-      q(1039),
+      q(1040),
       q(0),
       ],
    q(batanga) => [
-      q(1338),
+      q(1339),
       q(0),
       ],
    q(batek) => [
-      q(1484),
+      q(1485),
       q(0),
       ],
    q(bateri) => [
-      q(1489),
+      q(1490),
       q(0),
       ],
    q(bathari) => [
-      q(1196),
+      q(1197),
       q(0),
       ],
    q(bati (cameroon)) => [
-      q(1471),
+      q(1472),
       q(0),
       ],
    q(bati (indonesia)) => [
-      q(1534),
+      q(1535),
       q(0),
       ],
    q(bats) => [
-      q(1048),
+      q(1049),
       q(0),
       ],
    q(batu) => [
-      q(1488),
+      q(1489),
       q(0),
       ],
    q(batui) => [
-      q(7829),
+      q(7831),
       q(0),
       ],
    q(batuley) => [
-      q(1036),
+      q(1037),
       q(0),
       ],
    q(batyala) => [
-      q(7306),
+      q(7307),
       q(0),
       ],
    q(bau) => [
-      q(1040),
+      q(1041),
       q(0),
       ],
    q(bau bidayuh) => [
-      q(6136),
+      q(6137),
       q(0),
       ],
    q(bauchi) => [
-      q(1450),
+      q(1451),
       q(0),
       ],
    q(baure) => [
-      q(1426),
+      q(1427),
       q(0),
       ],
    q(bauria) => [
-      q(1164),
+      q(1165),
       q(0),
       ],
    q(bauwaki) => [
-      q(1551),
+      q(1552),
       q(0),
       ],
    q(bauzi) => [
-      q(1540),
+      q(1541),
       q(0),
       ],
    q(bavarian) => [
-      q(1031),
+      q(1032),
       q(0),
       ],
    q(bawm chin) => [
-      q(1176),
+      q(1177),
       q(0),
       ],
    q(bay miwok) => [
-      q(4357),
+      q(4358),
       q(0),
       ],
    q(bayali) => [
-      q(1252),
+      q(1253),
       q(0),
       ],
    q(baybayanon) => [
-      q(1539),
+      q(1540),
       q(0),
       ],
    q(baygo) => [
-      q(1595),
+      q(1596),
       q(0),
       ],
    q(bayono) => [
-      q(1600),
+      q(1601),
       q(0),
       ],
    q(bayot) => [
-      q(1088),
+      q(1089),
       q(0),
       ],
    q(bayungu) => [
-      q(1575),
+      q(1576),
       q(0),
       ],
    q(bazigar) => [
-      q(1152),
+      q(1153),
       q(0),
       ],
    q(beami) => [
-      q(1124),
+      q(1125),
       q(0),
       ],
    q(beaver) => [
-      q(1114),
+      q(1115),
       q(0),
       ],
    q(beba) => [
-      q(1150),
+      q(1151),
       q(0),
       ],
    q(bebele) => [
-      q(1115),
+      q(1116),
       q(0),
       ],
    q(bebeli) => [
-      q(1123),
+      q(1124),
       q(0),
       ],
    q(bebil) => [
-      q(1581),
+      q(1582),
       q(0),
       ],
    q(bedawiyet) => [
@@ -27414,35 +27438,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(bedjond) => [
-      q(1249),
+      q(1250),
       q(0),
       ],
    q(bedoanas) => [
-      q(1117),
+      q(1118),
       q(0),
       ],
    q(beeke) => [
-      q(1257),
+      q(1258),
       q(0),
       ],
    q(beele) => [
-      q(1582),
+      q(1583),
       q(0),
       ],
    q(beembe) => [
-      q(1126),
+      q(1127),
       q(0),
       ],
    q(beezen) => [
-      q(1350),
+      q(1351),
       q(0),
       ],
    q(befang) => [
-      q(1061),
+      q(1062),
       q(0),
       ],
    q(begbere-ejar) => [
-      q(1417),
+      q(1418),
       q(1),
       ],
    q(beja) => [
@@ -27450,27 +27474,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bekati') => [
-      q(1122),
+      q(1123),
       q(0),
       ],
    q(bekwarra) => [
-      q(1273),
+      q(1274),
       q(0),
       ],
    q(bekwel) => [
-      q(1274),
+      q(1275),
       q(0),
       ],
    q(belait) => [
-      q(1120),
+      q(1121),
       q(0),
       ],
    q(belanda bor) => [
-      q(1567),
+      q(1568),
       q(0),
       ],
    q(belanda viri) => [
-      q(1524),
+      q(1525),
       q(0),
       ],
    q(belarusian) => [
@@ -27478,27 +27502,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(belhariya) => [
-      q(1609),
+      q(1610),
       q(0),
       ],
    q(beli (papua new guinea)) => [
-      q(1133),
+      q(1134),
       q(0),
       ],
    q(beli (sudan)) => [
-      q(1289),
+      q(1290),
       q(0),
       ],
    q(belize kriol english) => [
-      q(1621),
+      q(1622),
       q(0),
       ],
    q(bella coola) => [
-      q(1279),
+      q(1280),
       q(0),
       ],
    q(bellari) => [
-      q(1442),
+      q(1443),
       q(0),
       ],
    q(bemba) => [
@@ -27510,47 +27534,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(bembe) => [
-      q(1303),
+      q(1304),
       q(0),
       ],
    q(ben tey dogon) => [
-      q(1970),
+      q(1971),
       q(0),
       ],
    q(bena (nigeria)) => [
-      q(7772),
+      q(7774),
       q(0),
       ],
    q(bena (tanzania)) => [
-      q(1134),
+      q(1135),
       q(0),
       ],
    q(benabena) => [
-      q(1119),
+      q(1120),
       q(0),
       ],
    q(bench) => [
-      q(1079),
+      q(1080),
       q(0),
       ],
    q(bende) => [
-      q(1103),
+      q(1104),
       q(0),
       ],
    q(bendi) => [
-      q(1082),
+      q(1083),
       q(0),
       ],
    q(beneraf) => [
-      q(1346),
+      q(1347),
       q(1),
       ],
    q(beng) => [
-      q(4860),
+      q(4861),
       q(0),
       ],
    q(benga) => [
-      q(1333),
+      q(1334),
       q(0),
       ],
    q(bengali) => [
@@ -27558,39 +27582,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(benggoi) => [
-      q(1183),
+      q(1184),
       q(0),
       ],
    q(bengkala sign language) => [
-      q(1420),
+      q(1421),
       q(0),
       ],
    q(bentong) => [
-      q(1345),
+      q(1346),
       q(0),
       ],
    q(benyadu') => [
-      q(1592),
+      q(1593),
       q(0),
       ],
    q(beothuk) => [
-      q(1497),
+      q(1498),
       q(0),
       ],
    q(bepour) => [
-      q(1213),
+      q(1214),
       q(0),
       ],
    q(bera) => [
-      q(1425),
+      q(1426),
       q(0),
       ],
    q(berakou) => [
-      q(1586),
+      q(1587),
       q(0),
       ],
    q(berau malay) => [
-      q(1520),
+      q(1521),
       q(0),
       ],
    q(berber languages) => [
@@ -27598,107 +27622,107 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(berbice creole dutch) => [
-      q(1423),
+      q(1424),
       q(0),
       ],
    q(berik) => [
-      q(1263),
+      q(1264),
       q(0),
       ],
    q(berinomo) => [
-      q(1223),
+      q(1224),
       q(0),
       ],
    q(berom) => [
-      q(1361),
+      q(1362),
       q(0),
       ],
    q(berta) => [
-      q(7241),
+      q(7242),
       q(0),
       ],
    q(berti) => [
-      q(1607),
+      q(1608),
       q(0),
       ],
    q(besisi) => [
-      q(4278),
+      q(4279),
       q(0),
       ],
    q(besme) => [
-      q(1127),
+      q(1128),
       q(0),
       ],
    q(besoa) => [
-      q(1125),
+      q(1126),
       q(0),
       ],
    q(betaf) => [
-      q(1139),
+      q(1140),
       q(0),
       ],
    q(betawi) => [
-      q(1131),
+      q(1132),
       q(0),
       ],
    q(bete) => [
-      q(1594),
+      q(1595),
       q(0),
       ],
    q(bete-bendi) => [
-      q(1487),
+      q(1488),
       q(0),
       ],
    q(beti (cote d'ivoire)) => [
-      q(2278),
+      q(2279),
       q(0),
       ],
    q(betta kurumba) => [
-      q(7530),
+      q(7531),
       q(0),
       ],
    q(bezhta) => [
-      q(3179),
+      q(3180),
       q(0),
       ],
    q(bhadrawahi) => [
-      q(1188),
+      q(1189),
       q(0),
       ],
    q(bhalay) => [
-      q(1206),
+      q(1207),
       q(0),
       ],
    q(bharia) => [
-      q(1185),
+      q(1186),
       q(0),
       ],
    q(bhatola) => [
-      q(1479),
+      q(1480),
       q(0),
       ],
    q(bhatri) => [
-      q(1181),
+      q(1182),
       q(0),
       ],
    q(bhattiyali) => [
-      q(1202),
+      q(1203),
       q(0),
       ],
    q(bhaya) => [
-      q(1189),
+      q(1190),
       q(0),
       ],
    q(bhele) => [
-      q(1207),
+      q(1208),
       q(0),
       ],
    q(bhilali) => [
-      q(1193),
+      q(1194),
       q(0),
       ],
    q(bhili) => [
-      q(1186),
+      q(1187),
       q(0),
       ],
    q(bhojpuri) => [
@@ -27706,59 +27730,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bhoti kinnauri) => [
-      q(4822),
+      q(4823),
       q(0),
       ],
    q(bhujel) => [
-      q(1596),
+      q(1597),
       q(0),
       ],
    q(bhunjia) => [
-      q(1203),
+      q(1204),
       q(0),
       ],
    q(biafada) => [
-      q(1214),
+      q(1215),
       q(0),
       ],
    q(biage) => [
-      q(1093),
+      q(1094),
       q(0),
       ],
    q(biak) => [
-      q(1205),
+      q(1206),
       q(0),
       ],
    q(biali) => [
-      q(1121),
+      q(1122),
       q(0),
       ],
    q(bian marind) => [
-      q(1392),
+      q(1393),
       q(0),
       ],
    q(biangai) => [
-      q(1215),
+      q(1216),
       q(0),
       ],
    q(biao) => [
-      q(1599),
+      q(1600),
       q(0),
       ],
    q(biao mon) => [
-      q(1321),
+      q(1322),
       q(0),
       ],
    q(biao-jiao mien) => [
-      q(1233),
+      q(1234),
       q(0),
       ],
    q(biatah bidayuh) => [
-      q(1476),
+      q(1477),
       q(0),
       ],
    q(bibbulman) => [
-      q(7302),
+      q(7303),
       q(0),
       ],
    q(bidhawal) => [
@@ -27766,43 +27790,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bidiyo) => [
-      q(1212),
+      q(1213),
       q(0),
       ],
    q(bidyara) => [
-      q(1601),
+      q(1602),
       q(0),
       ],
    q(bidyogo) => [
-      q(1235),
+      q(1236),
       q(0),
       ],
    q(biem) => [
-      q(1304),
+      q(1305),
       q(0),
       ],
    q(bierebo) => [
-      q(1336),
+      q(1337),
       q(0),
       ],
    q(bieria) => [
-      q(1429),
+      q(1430),
       q(0),
       ],
    q(biete) => [
-      q(1224),
+      q(1225),
       q(0),
       ],
    q(big nambas) => [
-      q(4962),
+      q(4963),
       q(0),
       ],
    q(biga) => [
-      q(1187),
+      q(1188),
       q(0),
       ],
    q(bigambal) => [
-      q(7295),
+      q(7296),
       q(0),
       ],
    q(bihari languages) => [
@@ -27810,11 +27834,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bijori) => [
-      q(1227),
+      q(1228),
       q(0),
       ],
    q(bikaru) => [
-      q(1211),
+      q(1212),
       q(0),
       ],
    q(bikol) => [
@@ -27822,31 +27846,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bikya) => [
-      q(1590),
+      q(1591),
       q(0),
       ],
    q(bila) => [
-      q(1220),
+      q(1221),
       q(0),
       ],
    q(bilakura) => [
-      q(1407),
+      q(1408),
       q(0),
       ],
    q(bilaspuri) => [
-      q(3300),
+      q(3301),
       q(0),
       ],
    q(bilba) => [
-      q(1396),
+      q(1397),
       q(0),
       ],
    q(bilbil) => [
-      q(1445),
+      q(1446),
       q(0),
       ],
    q(bile) => [
-      q(1217),
+      q(1218),
       q(0),
       ],
    q(bilin) => [
@@ -27854,55 +27878,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(bilma kanuri) => [
-      q(1320),
+      q(1321),
       q(0),
       ],
    q(biloxi) => [
-      q(1288),
+      q(1289),
       q(0),
       ],
    q(bilua) => [
-      q(1278),
+      q(1279),
       q(0),
       ],
    q(bilur) => [
-      q(1571),
+      q(1572),
       q(0),
       ],
    q(bima) => [
-      q(1198),
+      q(1199),
       q(0),
       ],
    q(bimin) => [
-      q(1195),
+      q(1196),
       q(0),
       ],
    q(bimoba) => [
-      q(1218),
+      q(1219),
       q(0),
       ],
    q(bina (nigeria)) => [
-      q(1598),
+      q(1599),
       q(0),
       ],
    q(bina (papua new guinea)) => [
-      q(1315),
+      q(1316),
       q(0),
       ],
    q(binahari) => [
-      q(1588),
+      q(1589),
       q(0),
       ],
    q(binandere) => [
-      q(1191),
+      q(1192),
       q(0),
       ],
    q(bindal) => [
-      q(7294),
+      q(7295),
       q(0),
       ],
    q(bine) => [
-      q(1362),
+      q(1363),
       q(0),
       ],
    q(bini) => [
@@ -27910,7 +27934,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(binji) => [
-      q(1380),
+      q(1381),
       q(0),
       ],
    q(binongan itneg) => [
@@ -27918,67 +27942,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bintauna) => [
-      q(1331),
+      q(1332),
       q(0),
       ],
    q(bintulu) => [
-      q(1349),
+      q(1350),
       q(0),
       ],
    q(binukid) => [
-      q(1256),
+      q(1257),
       q(0),
       ],
    q(binumarien) => [
-      q(1245),
+      q(1246),
       q(0),
       ],
    q(bipi) => [
-      q(1221),
+      q(1222),
       q(0),
       ],
    q(birale) => [
-      q(1570),
+      q(1571),
       q(0),
       ],
    q(birao) => [
-      q(1437),
+      q(1438),
       q(0),
       ],
    q(birgit) => [
-      q(1474),
+      q(1475),
       q(0),
       ],
    q(birhor) => [
-      q(1228),
+      q(1229),
       q(0),
       ],
    q(biri) => [
-      q(1629),
+      q(1630),
       q(0),
       ],
    q(biritai) => [
-      q(1412),
+      q(1413),
       q(0),
       ],
    q(birked) => [
-      q(1430),
+      q(1431),
       q(0),
       ],
    q(birri) => [
-      q(1532),
+      q(1533),
       q(0),
       ],
    q(birrpayi) => [
-      q(7298),
+      q(7299),
       q(0),
       ],
    q(birwa) => [
-      q(1431),
+      q(1432),
       q(0),
       ],
    q(bisa) => [
-      q(1210),
+      q(1211),
       q(1),
       ],
    q(biseni) => [
@@ -27986,15 +28010,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bishnupriya) => [
-      q(1395),
+      q(1396),
       q(0),
       ],
    q(bishuo) => [
-      q(1548),
+      q(1549),
       q(0),
       ],
    q(bisis) => [
-      q(1347),
+      q(1348),
       q(0),
       ],
    q(bislama) => [
@@ -28002,55 +28026,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bisorio) => [
-      q(1222),
+      q(1223),
       q(0),
       ],
    q(bissa) => [
-      q(1210),
+      q(1211),
       q(0),
       ],
    q(bisu) => [
-      q(1620),
+      q(1621),
       q(0),
       ],
    q(bit) => [
-      q(1169),
+      q(1170),
       q(0),
       ],
    q(bitare) => [
-      q(1439),
+      q(1440),
       q(0),
       ],
    q(bitur) => [
-      q(4154),
+      q(4155),
       q(0),
       ],
    q(biwat) => [
-      q(1553),
+      q(1554),
       q(0),
       ],
    q(biyo) => [
-      q(1602),
+      q(1603),
       q(0),
       ],
    q(biyom) => [
-      q(1383),
+      q(1384),
       q(0),
       ],
    q(blablanga) => [
-      q(1292),
+      q(1293),
       q(0),
       ],
    q(blafe) => [
-      q(1142),
+      q(1143),
       q(0),
       ],
    q(blagar) => [
-      q(1129),
+      q(1130),
       q(0),
       ],
    q(blang) => [
-      q(1294),
+      q(1295),
       q(0),
       ],
    q(blin) => [
@@ -28070,83 +28094,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bo (laos)) => [
-      q(1170),
+      q(1171),
       q(0),
       ],
    q(bo (papua new guinea)) => [
-      q(1393),
+      q(1394),
       q(0),
       ],
    q(bo-rukul) => [
-      q(4116),
+      q(4117),
       q(0),
       ],
    q(bo-ung) => [
-      q(4597),
+      q(4598),
       q(0),
       ],
    q(boano (maluku)) => [
-      q(1625),
+      q(1626),
       q(0),
       ],
    q(boano (sulawesi)) => [
-      q(1623),
+      q(1624),
       q(0),
       ],
    q(bobongko) => [
-      q(1161),
+      q(1162),
       q(0),
       ],
    q(bobot) => [
-      q(1492),
+      q(1493),
       q(0),
       ],
    q(bodo (central african republic)) => [
-      q(1372),
+      q(1373),
       q(0),
       ],
    q(bodo (india)) => [
-      q(1443),
+      q(1444),
       q(0),
       ],
    q(bodo gadaba) => [
-      q(2427),
+      q(2428),
       q(0),
       ],
    q(bodo parja) => [
-      q(1109),
+      q(1110),
       q(0),
       ],
    q(bofi) => [
-      q(1140),
+      q(1141),
       q(0),
       ],
    q(boga) => [
-      q(1537),
+      q(1538),
       q(0),
       ],
    q(bogaya) => [
-      q(1365),
+      q(1366),
       q(0),
       ],
    q(boghom) => [
-      q(1513),
+      q(1514),
       q(0),
       ],
    q(boguru) => [
-      q(1416),
+      q(1417),
       q(0),
       ],
    q(bohtan neo-aramaic) => [
-      q(1197),
+      q(1198),
       q(0),
       ],
    q(boikin) => [
-      q(1617),
+      q(1618),
       q(0),
       ],
    q(bokha) => [
-      q(7604),
+      q(7605),
       q(0),
       ],
    q(bokmal, norwegian) => [
@@ -28154,243 +28178,243 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(boko (benin)) => [
-      q(1399),
+      q(1400),
       q(0),
       ],
    q(boko (democratic republic of congo)) => [
-      q(1267),
+      q(1268),
       q(0),
       ],
    q(bokobaru) => [
-      q(1508),
+      q(1509),
       q(0),
       ],
    q(bokoto) => [
-      q(1107),
+      q(1108),
       q(0),
       ],
    q(bokyi) => [
-      q(1276),
+      q(1277),
       q(0),
       ],
    q(bola) => [
-      q(1341),
+      q(1342),
       q(0),
       ],
    q(bolango) => [
-      q(1280),
+      q(1281),
       q(0),
       ],
    q(bole) => [
-      q(1360),
+      q(1361),
       q(0),
       ],
    q(bolgarian) => [
-      q(7301),
+      q(7302),
       q(0),
       ],
    q(bolgo) => [
-      q(1530),
+      q(1531),
       q(0),
       ],
    q(bolia) => [
-      q(1285),
+      q(1286),
       q(0),
       ],
    q(bolinao) => [
-      q(6121),
+      q(6122),
       q(0),
       ],
    q(bolivian sign language) => [
-      q(1527),
+      q(1528),
       q(0),
       ],
    q(bolo) => [
-      q(1297),
+      q(1298),
       q(0),
       ],
    q(boloki) => [
-      q(1271),
+      q(1272),
       q(0),
       ],
    q(bolon) => [
-      q(1354),
+      q(1355),
       q(0),
       ],
    q(bolondo) => [
-      q(1624),
+      q(1625),
       q(0),
       ],
    q(bolongan) => [
-      q(1286),
+      q(1287),
       q(0),
       ],
    q(bolyu) => [
-      q(5505),
+      q(5506),
       q(0),
       ],
    q(bom) => [
-      q(1307),
+      q(1308),
       q(0),
       ],
    q(boma) => [
-      q(1356),
+      q(1357),
       q(0),
       ],
    q(bomboli) => [
-      q(1313),
+      q(1314),
       q(0),
       ],
    q(bomboma) => [
-      q(1559),
+      q(1560),
       q(0),
       ],
    q(bomitaba) => [
-      q(7897),
+      q(7899),
       q(0),
       ],
    q(bomu) => [
-      q(1318),
+      q(1319),
       q(0),
       ],
    q(bomwali) => [
-      q(1324),
+      q(1325),
       q(0),
       ],
    q(bon gula) => [
-      q(2542),
+      q(2543),
       q(0),
       ],
    q(bonan) => [
-      q(5409),
+      q(5410),
       q(0),
       ],
    q(bondei) => [
-      q(1368),
+      q(1369),
       q(0),
       ],
    q(bondo) => [
-      q(1156),
+      q(1157),
       q(0),
       ],
    q(bondoukou kulango) => [
-      q(3769),
+      q(3770),
       q(0),
       ],
    q(bondum dom dogon) => [
-      q(1971),
+      q(1972),
       q(0),
       ],
    q(bonerate) => [
-      q(1327),
+      q(1328),
       q(0),
       ],
    q(bonerif) => [
-      q(1346),
+      q(1347),
       q(0),
       ],
    q(bonggi) => [
-      q(1094),
+      q(1095),
       q(0),
       ],
    q(bonggo) => [
-      q(1377),
+      q(1378),
       q(0),
       ],
    q(bongili) => [
-      q(1500),
+      q(1501),
       q(0),
       ],
    q(bongo) => [
-      q(1367),
+      q(1368),
       q(0),
       ],
    q(bongu) => [
-      q(1391),
+      q(1392),
       q(0),
       ],
    q(bonjo) => [
-      q(1359),
+      q(1360),
       q(0),
       ],
    q(bonkeng) => [
-      q(1522),
+      q(1523),
       q(0),
       ],
    q(bonkiman) => [
-      q(1364),
+      q(1365),
       q(0),
       ],
    q(bontok) => [
-      q(1329),
+      q(1330),
       q(0),
       ],
    q(boo) => [
-      q(1399),
+      q(1400),
       q(1),
       ],
    q(bookan) => [
-      q(1328),
+      q(1329),
       q(0),
       ],
    q(boon) => [
-      q(1337),
+      q(1338),
       q(0),
       ],
    q(boor) => [
-      q(1521),
+      q(1522),
       q(0),
       ],
    q(bora) => [
-      q(1351),
+      q(1352),
       q(0),
       ],
    q(borana-arsi-guji oromo) => [
-      q(2418),
+      q(2419),
       q(0),
       ],
    q(border kuna) => [
-      q(3679),
+      q(3680),
       q(0),
       ],
    q(borei) => [
-      q(2404),
+      q(2405),
       q(0),
       ],
    q(borgu fulfulde) => [
-      q(2382),
+      q(2383),
       q(0),
       ],
    q(borna (ethiopia)) => [
-      q(1555),
+      q(1556),
       q(1),
       ],
    q(boro (ethiopia)) => [
-      q(1555),
+      q(1556),
       q(0),
       ],
    q(boro (ghana)) => [
-      q(7559),
+      q(7560),
       q(0),
       ],
    q(borong) => [
-      q(3610),
+      q(3611),
       q(0),
       ],
    q(bororo) => [
-      q(1366),
+      q(1367),
       q(0),
       ],
    q(boruca) => [
-      q(1433),
+      q(1434),
       q(0),
       ],
    q(boselewa) => [
-      q(1546),
+      q(1547),
       q(0),
       ],
    q(bosngun) => [
-      q(1414),
+      q(1415),
       q(0),
       ],
    q(bosnian) => [
@@ -28398,27 +28422,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bote-majhi) => [
-      q(1311),
+      q(1312),
       q(0),
       ],
    q(botlikh) => [
-      q(1378),
+      q(1379),
       q(0),
       ],
    q(botolan sambal) => [
-      q(5912),
+      q(5913),
       q(0),
       ],
    q(bouna kulango) => [
-      q(4940),
+      q(4941),
       q(0),
       ],
    q(bouyei) => [
-      q(5382),
+      q(5383),
       q(0),
       ],
    q(bozaba) => [
-      q(1626),
+      q(1627),
       q(0),
       ],
    q(bragat) => [
@@ -28426,7 +28450,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(brahui) => [
-      q(1427),
+      q(1428),
       q(0),
       ],
    q(braj) => [
@@ -28434,15 +28458,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(brazilian sign language) => [
-      q(1630),
+      q(1631),
       q(0),
       ],
    q(brem) => [
-      q(1507),
+      q(1508),
       q(0),
       ],
    q(breri) => [
-      q(1436),
+      q(1437),
       q(0),
       ],
    q(breton) => [
@@ -28450,43 +28474,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bribri) => [
-      q(1615),
+      q(1616),
       q(0),
       ],
    q(brithenig) => [
-      q(1631),
+      q(1632),
       q(0),
       ],
    q(british sign language) => [
-      q(1143),
+      q(1144),
       q(0),
       ],
    q(brokkat) => [
-      q(1434),
+      q(1435),
       q(0),
       ],
    q(brokpake) => [
-      q(6003),
+      q(6004),
       q(0),
       ],
    q(brokskat) => [
-      q(1262),
+      q(1263),
       q(0),
       ],
    q(brooke's point palawano) => [
-      q(5504),
+      q(5505),
       q(0),
       ],
    q(broome pearling lugger pidgin) => [
-      q(1382),
+      q(1383),
       q(0),
       ],
    q(brunei) => [
-      q(3720),
+      q(3721),
       q(0),
       ],
    q(brunei bisaya) => [
-      q(1447),
+      q(1448),
       q(0),
       ],
    q(bu) => [
@@ -28494,71 +28518,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bu-nao bunu) => [
-      q(1563),
+      q(1564),
       q(0),
       ],
    q(bua) => [
-      q(1494),
+      q(1495),
       q(0),
       ],
    q(bualkhaw chin) => [
-      q(1668),
+      q(1669),
       q(0),
       ],
    q(buamu) => [
-      q(1371),
+      q(1372),
       q(0),
       ],
    q(bube) => [
-      q(1517),
+      q(1518),
       q(0),
       ],
    q(bubi) => [
-      q(1512),
+      q(1513),
       q(0),
       ],
    q(bubia) => [
-      q(1060),
+      q(1061),
       q(0),
       ],
    q(budeh stieng) => [
-      q(6271),
+      q(6272),
       q(0),
       ],
    q(budibud) => [
-      q(1483),
+      q(1484),
       q(0),
       ],
    q(budong-budong) => [
-      q(1111),
+      q(1112),
       q(0),
       ],
    q(budu) => [
-      q(1510),
+      q(1511),
       q(0),
       ],
    q(budukh) => [
-      q(1098),
+      q(1099),
       q(0),
       ],
    q(buduma) => [
-      q(1100),
+      q(1101),
       q(0),
       ],
    q(budza) => [
-      q(1230),
+      q(1231),
       q(0),
       ],
    q(bugan) => [
-      q(1044),
+      q(1045),
       q(0),
       ],
    q(bugawac) => [
-      q(1502),
+      q(1503),
       q(0),
       ],
    q(bughotu) => [
-      q(1178),
+      q(1179),
       q(0),
       ],
    q(buginese) => [
@@ -28566,43 +28590,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(buglere) => [
-      q(5886),
+      q(5887),
       q(0),
       ],
    q(bugun) => [
-      q(1166),
+      q(1167),
       q(0),
       ],
    q(buhi'non bikol) => [
-      q(6856),
+      q(6857),
       q(0),
       ],
    q(buhid) => [
-      q(1272),
+      q(1273),
       q(0),
       ],
    q(buhutu) => [
-      q(1573),
+      q(1574),
       q(0),
       ],
    q(bukar-sadung bidayuh) => [
-      q(5954),
+      q(5955),
       q(0),
       ],
    q(bukat) => [
-      q(1526),
+      q(1527),
       q(0),
       ],
    q(bukharic) => [
-      q(1192),
+      q(1193),
       q(0),
       ],
    q(bukit malay) => [
-      q(1535),
+      q(1536),
       q(0),
       ],
    q(bukitan) => [
-      q(1265),
+      q(1266),
       q(0),
       ],
    q(bukiyip) => [
@@ -28610,15 +28634,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(buksa) => [
-      q(6548),
+      q(6549),
       q(0),
       ],
    q(bukusu) => [
-      q(1576),
+      q(1577),
       q(0),
       ],
    q(bukwen) => [
-      q(1515),
+      q(1516),
       q(0),
       ],
    q(bulgarian) => [
@@ -28626,47 +28650,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bulgarian sign language) => [
-      q(1409),
+      q(1410),
       q(0),
       ],
    q(bulgebi) => [
-      q(1317),
+      q(1318),
       q(0),
       ],
    q(buli (ghana)) => [
-      q(1561),
+      q(1562),
       q(0),
       ],
    q(buli (indonesia)) => [
-      q(1628),
+      q(1629),
       q(0),
       ],
    q(bullom so) => [
-      q(1514),
+      q(1515),
       q(0),
       ],
    q(bulo stieng) => [
-      q(6260),
+      q(6261),
       q(0),
       ],
    q(bulu (cameroon)) => [
-      q(1503),
+      q(1504),
       q(0),
       ],
    q(bulu (papua new guinea)) => [
-      q(1240),
+      q(1241),
       q(0),
       ],
    q(bum) => [
-      q(1323),
+      q(1324),
       q(0),
       ],
    q(bumaji) => [
-      q(1603),
+      q(1604),
       q(0),
       ],
    q(bumang) => [
-      q(1531),
+      q(1532),
       q(0),
       ],
    q(bumbita arapesh) => [
@@ -28674,91 +28698,91 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bumthangkha) => [
-      q(3401),
+      q(3402),
       q(0),
       ],
    q(bun) => [
-      q(1511),
+      q(1512),
       q(0),
       ],
    q(buna) => [
-      q(1529),
+      q(1530),
       q(0),
       ],
    q(bunaba) => [
-      q(1073),
+      q(1074),
       q(0),
       ],
    q(bunak) => [
-      q(1148),
+      q(1149),
       q(0),
       ],
    q(bunama) => [
-      q(1091),
+      q(1092),
       q(0),
       ],
    q(bundeli) => [
-      q(1344),
+      q(1345),
       q(0),
       ],
    q(bung) => [
-      q(1400),
+      q(1401),
       q(0),
       ],
    q(bungain) => [
-      q(1509),
+      q(1510),
       q(0),
       ],
    q(bunganditj) => [
-      q(7296),
+      q(7297),
       q(0),
       ],
    q(bungku) => [
-      q(1277),
+      q(1278),
       q(0),
       ],
    q(bungu) => [
-      q(7251),
+      q(7252),
       q(0),
       ],
    q(bunoge dogon) => [
-      q(2004),
+      q(2005),
       q(0),
       ],
    q(bunun) => [
-      q(1339),
+      q(1340),
       q(0),
       ],
    q(buol) => [
-      q(1282),
+      q(1283),
       q(0),
       ],
    q(bura-pabir) => [
-      q(1558),
+      q(1559),
       q(0),
       ],
    q(burak) => [
-      q(1606),
+      q(1607),
       q(0),
       ],
    q(buraka) => [
-      q(1258),
+      q(1259),
       q(0),
       ],
    q(burarra) => [
-      q(1533),
+      q(1534),
       q(0),
       ],
    q(burate) => [
-      q(1477),
+      q(1478),
       q(0),
       ],
    q(burduna) => [
-      q(1579),
+      q(1580),
       q(0),
       ],
    q(bure) => [
-      q(1523),
+      q(1524),
       q(0),
       ],
    q(buriat) => [
@@ -28766,11 +28790,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(burji) => [
-      q(1237),
+      q(1238),
       q(0),
       ],
    q(burmbar) => [
-      q(7046),
+      q(7047),
       q(0),
       ],
    q(burmese) => [
@@ -28778,19 +28802,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(burmeso) => [
-      q(1632),
+      q(1633),
       q(0),
       ],
    q(buru (indonesia)) => [
-      q(4291),
+      q(4292),
       q(0),
       ],
    q(buru (nigeria)) => [
-      q(1418),
+      q(1419),
       q(0),
       ],
    q(burui) => [
-      q(1444),
+      q(1445),
       q(0),
       ],
    q(burumakok) => [
@@ -28798,19 +28822,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(burun) => [
-      q(1096),
+      q(1097),
       q(0),
       ],
    q(burunge) => [
-      q(1106),
+      q(1107),
       q(0),
       ],
    q(burushaski) => [
-      q(1455),
+      q(1456),
       q(0),
       ],
    q(burusu) => [
-      q(1413),
+      q(1414),
       q(0),
       ],
    q(buruwai) => [
@@ -28818,71 +28842,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(busa) => [
-      q(1411),
+      q(1412),
       q(0),
       ],
    q(busam) => [
-      q(1584),
+      q(1585),
       q(0),
       ],
    q(busami) => [
-      q(1457),
+      q(1458),
       q(0),
       ],
    q(busang kayan) => [
-      q(1141),
+      q(1142),
       q(0),
       ],
    q(bushi) => [
-      q(1495),
+      q(1496),
       q(0),
       ],
    q(bushoong) => [
-      q(1498),
+      q(1499),
       q(0),
       ],
    q(businenge tongo) => [
-      q(2065),
+      q(2066),
       q(1),
       ],
    q(buso) => [
-      q(1459),
+      q(1460),
       q(0),
       ],
    q(busoa) => [
-      q(1506),
+      q(1507),
       q(0),
       ],
    q(bussa) => [
-      q(2129),
+      q(2130),
       q(0),
       ],
    q(busuu) => [
-      q(1248),
+      q(1249),
       q(0),
       ],
    q(butbut kalinga) => [
-      q(3742),
+      q(3743),
       q(0),
       ],
    q(butmas-tur) => [
-      q(1343),
+      q(1344),
       q(0),
       ],
    q(butuanon) => [
-      q(1490),
+      q(1491),
       q(0),
       ],
    q(buwal) => [
-      q(1201),
+      q(1202),
       q(0),
       ],
    q(buxinhua) => [
-      q(1169),
+      q(1170),
       q(1),
       ],
    q(buyu) => [
-      q(1597),
+      q(1598),
       q(0),
       ],
    q(buyuan jinuo) => [
@@ -28890,75 +28914,75 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(bwa) => [
-      q(1562),
+      q(1563),
       q(0),
       ],
    q(bwaidoka) => [
-      q(1544),
+      q(1545),
       q(0),
       ],
    q(bwanabwana) => [
-      q(6738),
+      q(6739),
       q(0),
       ],
    q(bwatoo) => [
-      q(1541),
+      q(1542),
       q(0),
       ],
    q(bwe karen) => [
-      q(1545),
+      q(1546),
       q(0),
       ],
    q(bwela) => [
-      q(1552),
+      q(1553),
       q(0),
       ],
    q(bwile) => [
-      q(1543),
+      q(1544),
       q(0),
       ],
    q(bwisi) => [
-      q(1565),
+      q(1566),
       q(0),
       ],
    q(byangsi) => [
-      q(1118),
+      q(1119),
       q(0),
       ],
    q(byep) => [
-      q(4351),
+      q(4352),
       q(0),
       ],
    q(c'lela) => [
-      q(2138),
+      q(2139),
       q(0),
       ],
    q(caac) => [
-      q(4545),
+      q(4546),
       q(0),
       ],
    q(cabecar) => [
-      q(1750),
+      q(1751),
       q(0),
       ],
    q(cabiyari) => [
-      q(1659),
+      q(1660),
       q(0),
       ],
    q(cacaloxtepec mixtec) => [
-      q(4315),
+      q(4316),
       q(0),
       ],
    q(cacaopera) => [
-      q(1690),
+      q(1691),
       q(0),
       ],
    q(cacgia roglai) => [
-      q(5837),
+      q(5838),
       q(0),
       ],
    q(cacua) => [
-      q(1676),
+      q(1677),
       q(0),
       ],
    q(caddo) => [
@@ -28970,175 +28994,175 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(cafundo creole) => [
-      q(1681),
+      q(1682),
       q(0),
       ],
    q(cagua) => [
-      q(1664),
+      q(1665),
       q(0),
       ],
    q(cahuarano) => [
-      q(1644),
+      q(1645),
       q(0),
       ],
    q(cahuilla) => [
-      q(1723),
+      q(1724),
       q(0),
       ],
    q(cahungwarya) => [
-      q(4734),
+      q(4735),
       q(0),
       ],
    q(cajamarca quechua) => [
-      q(5700),
+      q(5701),
       q(0),
       ],
    q(cajatambo north lima quechua) => [
-      q(5705),
+      q(5706),
       q(0),
       ],
    q(cajonos zapotec) => [
-      q(7806),
+      q(7808),
       q(0),
       ],
    q(cajun french) => [
-      q(2370),
+      q(2371),
       q(0),
       ],
    q(caka) => [
-      q(1765),
+      q(1766),
       q(0),
       ],
    q(cakchiquel) => [
-      q(1646),
+      q(1647),
       q(1),
       ],
    q(cakchiquel-quiche mixed language) => [
-      q(1767),
+      q(1768),
       q(0),
       ],
    q(cakfem-mushere) => [
-      q(1766),
+      q(1767),
       q(0),
       ],
    q(calamian tagbanwa) => [
-      q(6389),
+      q(6390),
       q(0),
       ],
    q(calderon highland quichua) => [
-      q(5681),
+      q(5682),
       q(0),
       ],
    q(callawalla) => [
-      q(1655),
+      q(1656),
       q(0),
       ],
    q(calo) => [
-      q(5819),
+      q(5820),
       q(0),
       ],
    q(caluyanun) => [
-      q(1780),
+      q(1781),
       q(0),
       ],
    q(cameroon mambila) => [
-      q(4172),
+      q(4173),
       q(0),
       ],
    q(cameroon pidgin) => [
-      q(7110),
+      q(7111),
       q(0),
       ],
    q(camling) => [
-      q(5736),
+      q(5737),
       q(0),
       ],
    q(campalagian) => [
-      q(1787),
+      q(1788),
       q(0),
       ],
    q(campidanese sardinian) => [
-      q(6219),
+      q(6220),
       q(0),
       ],
    q(camsa) => [
-      q(3189),
+      q(3190),
       q(0),
       ],
    q(camtho) => [
-      q(1793),
+      q(1794),
       q(0),
       ],
    q(camunic) => [
-      q(7308),
+      q(7309),
       q(0),
       ],
    q(canar highland quichua) => [
-      q(5728),
+      q(5729),
       q(0),
       ],
    q(candoshi-shapra) => [
-      q(1675),
+      q(1676),
       q(0),
       ],
    q(canela) => [
-      q(5745),
+      q(5746),
       q(0),
       ],
    q(canichana) => [
-      q(1658),
+      q(1659),
       q(0),
       ],
    q(cantonese) => [
-      q(7764),
+      q(7766),
       q(1),
       ],
    q(cao lan) => [
-      q(4369),
+      q(4370),
       q(0),
       ],
    q(cao miao) => [
-      q(1825),
+      q(1826),
       q(0),
       ],
    q(capanahua) => [
-      q(3180),
+      q(3181),
       q(0),
       ],
    q(capiznon) => [
-      q(1837),
+      q(1838),
       q(0),
       ],
    q(cappadocian greek) => [
-      q(1833),
+      q(1834),
       q(0),
       ],
    q(caquinte) => [
-      q(1823),
+      q(1824),
       q(0),
       ],
    q(car nicobarese) => [
-      q(1652),
+      q(1653),
       q(0),
       ],
    q(cara) => [
-      q(1711),
+      q(1712),
       q(0),
       ],
    q(carabayo) => [
-      q(1678),
+      q(1679),
       q(0),
       ],
    q(caramanta) => [
-      q(1847),
+      q(1848),
       q(0),
       ],
    q(carapana) => [
-      q(1660),
+      q(1661),
       q(0),
       ],
    q(carian) => [
-      q(7316),
+      q(7317),
       q(0),
       ],
    q(caribbean hindustani) => [
@@ -29146,39 +29170,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(caribbean javanese) => [
-      q(3165),
+      q(3166),
       q(0),
       ],
    q(carijona) => [
-      q(1661),
+      q(1662),
       q(0),
       ],
    q(carolina algonquian) => [
-      q(1857),
+      q(1858),
       q(0),
       ],
    q(carolinian) => [
-      q(1647),
+      q(1648),
       q(0),
       ],
    q(carpathian romani) => [
-      q(5806),
+      q(5807),
       q(0),
       ],
    q(carrier) => [
-      q(1862),
+      q(1863),
       q(0),
       ],
    q(cashibo-cacataibo) => [
-      q(1672),
+      q(1673),
       q(0),
       ],
    q(cashinahua) => [
-      q(1673),
+      q(1674),
       q(0),
       ],
    q(casiguran dumagat agta) => [
-      q(2005),
+      q(2006),
       q(0),
       ],
    q(castilian) => [
@@ -29194,15 +29218,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(catalan sign language) => [
-      q(1866),
+      q(1867),
       q(0),
       ],
    q(catawba) => [
-      q(1718),
+      q(1719),
       q(0),
       ],
    q(cauca) => [
-      q(1679),
+      q(1680),
       q(0),
       ],
    q(caucasian languages) => [
@@ -29210,23 +29234,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(cavinena) => [
-      q(1654),
+      q(1655),
       q(0),
       ],
    q(cayubaba) => [
-      q(1930),
+      q(1931),
       q(0),
       ],
    q(cayuga) => [
-      q(1657),
+      q(1658),
       q(0),
       ],
    q(cayuse) => [
-      q(7321),
+      q(7322),
       q(0),
       ],
    q(cebaara senoufo) => [
-      q(5967),
+      q(5968),
       q(0),
       ],
    q(cebuano) => [
@@ -29234,7 +29258,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(celtiberian) => [
-      q(7309),
+      q(7310),
       q(0),
       ],
    q(celtic languages) => [
@@ -29242,11 +29266,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(cemuhi) => [
-      q(1648),
+      q(1649),
       q(0),
       ],
    q(cen) => [
-      q(1708),
+      q(1709),
       q(0),
       ],
    q(central american indian languages) => [
@@ -29254,35 +29278,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(central asmat) => [
-      q(1803),
+      q(1804),
       q(0),
       ],
    q(central atlas tamazight) => [
-      q(6847),
+      q(6848),
       q(0),
       ],
    q(central awyu) => [
-      q(0979),
+      q(0980),
       q(0),
       ],
    q(central aymara) => [
-      q(1005),
+      q(1006),
       q(0),
       ],
    q(central bai) => [
-      q(1063),
+      q(1064),
       q(0),
       ],
    q(central berawan) => [
-      q(7827),
+      q(7829),
       q(0),
       ],
    q(central bikol) => [
-      q(1074),
+      q(1075),
       q(0),
       ],
    q(central bontok) => [
-      q(3820),
+      q(3821),
       q(0),
       ],
    q(central cagayan agta) => [
@@ -29290,7 +29314,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(central dusun) => [
-      q(2163),
+      q(2164),
       q(0),
       ],
    q(central grebo) => [
@@ -29298,11 +29322,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(central hongshuihe zhuang) => [
-      q(7832),
+      q(7834),
       q(0),
       ],
    q(central huasteca nahuatl) => [
-      q(4768),
+      q(4769),
       q(0),
       ],
    q(central huishui hmong) => [
@@ -29314,7 +29338,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(central kanuri) => [
-      q(3481),
+      q(3482),
       q(0),
       ],
    q(central khmer) => [
@@ -29322,19 +29346,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(central kurdish) => [
-      q(1754),
+      q(1755),
       q(0),
       ],
    q(central lalo) => [
-      q(7789),
+      q(7791),
       q(1),
       ],
    q(central maewo) => [
-      q(4635),
+      q(4636),
       q(0),
       ],
    q(central malay) => [
-      q(5611),
+      q(5612),
       q(0),
       ],
    q(central malayo-polynesian languages) => [
@@ -29342,7 +29366,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(central masela) => [
-      q(4671),
+      q(4672),
       q(0),
       ],
    q(central mashan hmong) => [
@@ -29354,67 +29378,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(central mazahua) => [
-      q(4126),
+      q(4127),
       q(0),
       ],
    q(central melanau) => [
-      q(4211),
+      q(4212),
       q(0),
       ],
    q(central mnong) => [
-      q(1790),
+      q(1791),
       q(0),
       ],
    q(central nahuatl) => [
-      q(4870),
+      q(4871),
       q(0),
       ],
    q(central nicobarese) => [
-      q(4762),
+      q(4763),
       q(0),
       ],
    q(central ojibwa) => [
-      q(5218),
+      q(5219),
       q(0),
       ],
    q(central okinawan) => [
-      q(5884),
+      q(5885),
       q(0),
       ],
    q(central palawano) => [
-      q(5487),
+      q(5488),
       q(0),
       ],
    q(central pame) => [
-      q(5375),
+      q(5376),
       q(0),
       ],
    q(central pashto) => [
-      q(5623),
+      q(5624),
       q(0),
       ],
    q(central pomo) => [
-      q(5562),
+      q(5563),
       q(0),
       ],
    q(central puebla nahuatl) => [
-      q(4781),
+      q(4782),
       q(0),
       ],
    q(central sama) => [
-      q(6122),
+      q(6123),
       q(0),
       ],
    q(central siberian yupik) => [
-      q(2299),
+      q(2300),
       q(0),
       ],
    q(central sierra miwok) => [
-      q(1876),
+      q(1877),
       q(0),
       ],
    q(central subanen) => [
-      q(6335),
+      q(6336),
       q(0),
       ],
    q(central sudanic languages) => [
@@ -29422,55 +29446,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(central tagbanwa) => [
-      q(6489),
+      q(6490),
       q(0),
       ],
    q(central tarahumara) => [
-      q(6371),
+      q(6372),
       q(0),
       ],
    q(central tunebo) => [
-      q(6764),
+      q(6765),
       q(0),
       ],
    q(central yupik) => [
-      q(2300),
+      q(2301),
       q(0),
       ],
    q(central-eastern niger fulfulde) => [
-      q(2389),
+      q(2390),
       q(0),
       ],
    q(centuum) => [
-      q(1709),
+      q(1710),
       q(0),
       ],
    q(cerma) => [
-      q(1784),
+      q(1785),
       q(0),
       ],
    q(chabu) => [
-      q(5906),
+      q(5907),
       q(0),
       ],
    q(chachapoyas quechua) => [
-      q(5686),
+      q(5687),
       q(0),
       ],
    q(chachi) => [
-      q(1665),
+      q(1666),
       q(0),
       ],
    q(chacobo) => [
-      q(1650),
+      q(1651),
       q(0),
       ],
    q(chadian arabic) => [
-      q(6027),
+      q(6028),
       q(0),
       ],
    q(chadian sign language) => [
-      q(1702),
+      q(1703),
       q(0),
       ],
    q(chadic languages) => [
@@ -29478,7 +29502,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chadong) => [
-      q(1703),
+      q(1704),
       q(0),
       ],
    q(chagatai) => [
@@ -29486,51 +29510,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chaima) => [
-      q(1741),
+      q(1742),
       q(0),
       ],
    q(chak) => [
-      q(1755),
+      q(1756),
       q(0),
       ],
    q(chakali) => [
-      q(1773),
+      q(1774),
       q(0),
       ],
    q(chakma) => [
-      q(1689),
+      q(1690),
       q(0),
       ],
    q(chala) => [
-      q(1776),
+      q(1777),
       q(0),
       ],
    q(chaldean neo-aramaic) => [
-      q(1770),
+      q(1771),
       q(0),
       ],
    q(chalikha) => [
-      q(6479),
+      q(6480),
       q(0),
       ],
    q(chamacoco) => [
-      q(1706),
+      q(1707),
       q(0),
       ],
    q(chamalal) => [
-      q(1745),
+      q(1746),
       q(0),
       ],
    q(chamari) => [
-      q(1694),
+      q(1695),
       q(0),
       ],
    q(chambeali) => [
-      q(1695),
+      q(1696),
       q(0),
       ],
    q(chambri) => [
-      q(1649),
+      q(1650),
       q(0),
       ],
    q(chamic languages) => [
@@ -29538,7 +29562,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chamicuro) => [
-      q(1680),
+      q(1681),
       q(0),
       ],
    q(chamorro) => [
@@ -29546,55 +29570,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chane) => [
-      q(1645),
+      q(1646),
       q(0),
       ],
    q(chang naga) => [
-      q(4741),
+      q(4742),
       q(0),
       ],
    q(changriwa) => [
-      q(1714),
+      q(1715),
       q(0),
       ],
    q(changthang) => [
-      q(1794),
+      q(1795),
       q(0),
       ],
    q(chantyal) => [
-      q(1727),
+      q(1728),
       q(0),
       ],
    q(chara) => [
-      q(1843),
+      q(1844),
       q(0),
       ],
    q(chaudangsi) => [
-      q(1699),
+      q(1700),
       q(0),
       ],
    q(chaura) => [
-      q(1860),
+      q(1861),
       q(0),
       ],
    q(chavacano) => [
-      q(1667),
+      q(1668),
       q(0),
       ],
    q(chayahuita) => [
-      q(1674),
+      q(1675),
       q(0),
       ],
    q(chayuco mixtec) => [
-      q(4304),
+      q(4305),
       q(0),
       ],
    q(chazumba mixtec) => [
-      q(7507),
+      q(7508),
       q(0),
       ],
    q(che) => [
-      q(5868),
+      q(5869),
       q(0),
       ],
    q(chechen) => [
@@ -29602,39 +29626,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(cheke holo) => [
-      q(4517),
+      q(4518),
       q(0),
       ],
    q(chemakum) => [
-      q(7311),
+      q(7312),
       q(0),
       ],
    q(chenapian) => [
-      q(1748),
+      q(1749),
       q(0),
       ],
    q(chenchu) => [
-      q(1692),
+      q(1693),
       q(0),
       ],
    q(chenoua) => [
-      q(1805),
+      q(1806),
       q(0),
       ],
    q(chepang) => [
-      q(1698),
+      q(1699),
       q(0),
       ],
    q(chepya) => [
-      q(7614),
+      q(7615),
       q(0),
       ],
    q(cheq wong) => [
-      q(1927),
+      q(1928),
       q(1),
       ],
    q(cherepon) => [
-      q(1835),
+      q(1836),
       q(0),
       ],
    q(cherokee) => [
@@ -29642,11 +29666,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chesu) => [
-      q(7611),
+      q(7612),
       q(0),
       ],
    q(chetco) => [
-      q(1888),
+      q(1889),
       q(0),
       ],
    q(chewa) => [
@@ -29654,7 +29678,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(chewong) => [
-      q(1927),
+      q(1928),
       q(0),
       ],
    q(cheyenne) => [
@@ -29666,19 +29690,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chhintange) => [
-      q(1895),
+      q(1896),
       q(0),
       ],
    q(chhulung) => [
-      q(1915),
+      q(1916),
       q(0),
       ],
    q(chiangmai sign language) => [
-      q(1867),
+      q(1868),
       q(0),
       ],
    q(chiapanec) => [
-      q(1738),
+      q(1739),
       q(0),
       ],
    q(chibcha) => [
@@ -29690,7 +29714,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chicahuaxtla triqui) => [
-      q(6704),
+      q(6705),
       q(0),
       ],
    q(chichewa) => [
@@ -29698,95 +29722,95 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chichicapan zapotec) => [
-      q(7933),
+      q(7935),
       q(0),
       ],
    q(chichimeca-jonaz) => [
-      q(5410),
+      q(5411),
       q(0),
       ],
    q(chichonyi-chidzihana-chikauma) => [
-      q(1815),
+      q(1816),
       q(1),
       ],
    q(chickasaw) => [
-      q(1731),
+      q(1732),
       q(0),
       ],
    q(chicomuceltec) => [
-      q(1809),
+      q(1810),
       q(0),
       ],
    q(chidigo) => [
-      q(2039),
+      q(2040),
       q(1),
       ],
    q(chiduruma) => [
-      q(2174),
+      q(2175),
       q(1),
       ],
    q(chiga) => [
-      q(1716),
+      q(1717),
       q(0),
       ],
    q(chigmecatitlan mixtec) => [
-      q(4305),
+      q(4306),
       q(0),
       ],
    q(chilcotin) => [
-      q(1769),
+      q(1770),
       q(0),
       ],
    q(chilean quechua) => [
-      q(1842),
+      q(1843),
       q(0),
       ],
    q(chilean sign language) => [
-      q(1870),
+      q(1871),
       q(0),
       ],
    q(chilisso) => [
-      q(1772),
+      q(1773),
       q(0),
       ],
    q(chiltepec chinantec) => [
-      q(1865),
+      q(1866),
       q(0),
       ],
    q(chimakum) => [
-      q(7311),
+      q(7312),
       q(1),
       ],
    q(chimalapa zoque) => [
-      q(7906),
+      q(7908),
       q(0),
       ],
    q(chimariko) => [
-      q(1732),
+      q(1733),
       q(0),
       ],
    q(chimborazo highland quichua) => [
-      q(5683),
+      q(5684),
       q(0),
       ],
    q(chimila) => [
-      q(1663),
+      q(1664),
       q(0),
       ],
    q(china buriat) => [
-      q(1585),
+      q(1586),
       q(0),
       ],
    q(chinali) => [
-      q(1734),
+      q(1735),
       q(0),
       ],
    q(chinbon chin) => [
-      q(1795),
+      q(1796),
       q(0),
       ],
    q(chincha quechua) => [
-      q(5721),
+      q(5722),
       q(0),
       ],
    q(chinese) => [
@@ -29798,11 +29822,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chinese pidgin english) => [
-      q(1834),
+      q(1835),
       q(0),
       ],
    q(chinese sign language) => [
-      q(1875),
+      q(1876),
       q(0),
       ],
    q(chini) => [
@@ -29810,7 +29834,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(chinook) => [
-      q(1721),
+      q(1722),
       q(0),
       ],
    q(chinook jargon) => [
@@ -29818,7 +29842,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chipaya) => [
-      q(1651),
+      q(1652),
       q(0),
       ],
    q(chipewyan) => [
@@ -29826,59 +29850,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chipiajes) => [
-      q(1662),
+      q(1663),
       q(0),
       ],
    q(chippewa) => [
-      q(1740),
+      q(1741),
       q(0),
       ],
    q(chiquian ancash quechua) => [
-      q(5720),
+      q(5721),
       q(0),
       ],
    q(chiquihuitlan mazatec) => [
-      q(4120),
+      q(4121),
       q(0),
       ],
    q(chiquitano) => [
-      q(1656),
+      q(1657),
       q(0),
       ],
    q(chiripa) => [
-      q(4862),
+      q(4863),
       q(0),
       ],
    q(chiru) => [
-      q(1693),
+      q(1694),
       q(0),
       ],
    q(chitimacha) => [
-      q(1894),
+      q(1895),
       q(0),
       ],
    q(chitkuli kinnauri) => [
-      q(1735),
+      q(1736),
       q(0),
       ],
    q(chittagonian) => [
-      q(1891),
+      q(1892),
       q(0),
       ],
    q(chitwania tharu) => [
-      q(6498),
+      q(6499),
       q(0),
       ],
    q(choapan zapotec) => [
-      q(7914),
+      q(7916),
       q(0),
       ],
    q(chocangacakha) => [
-      q(1717),
+      q(1718),
       q(0),
       ],
    q(chochotec) => [
-      q(1829),
+      q(1830),
       q(0),
       ],
    q(choctaw) => [
@@ -29886,59 +29910,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chodri) => [
-      q(1696),
+      q(1697),
       q(0),
       ],
    q(chokri naga) => [
-      q(5054),
+      q(5055),
       q(0),
       ],
    q(chokwe) => [
-      q(1746),
+      q(1747),
       q(0),
       ],
    q(chol) => [
-      q(1900),
+      q(1901),
       q(0),
       ],
    q(cholon) => [
-      q(1725),
+      q(1726),
       q(0),
       ],
    q(chong) => [
-      q(1814),
+      q(1815),
       q(0),
       ],
    q(choni) => [
-      q(1691),
+      q(1692),
       q(0),
       ],
    q(chonyi-dzihana-kauma) => [
-      q(1815),
+      q(1816),
       q(0),
       ],
    q(chopi) => [
-      q(1682),
+      q(1683),
       q(0),
       ],
    q(chorasmian) => [
-      q(7315),
+      q(7316),
       q(0),
       ],
    q(chorti) => [
-      q(1638),
+      q(1639),
       q(0),
       ],
    q(chothe naga) => [
-      q(4779),
+      q(4780),
       q(0),
       ],
    q(chrau) => [
-      q(1861),
+      q(1862),
       q(0),
       ],
    q(chru) => [
-      q(1743),
+      q(1744),
       q(0),
       ],
    q(chuang) => [
@@ -29946,43 +29970,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(chuanqiandian cluster miao) => [
-      q(1841),
+      q(1842),
       q(0),
       ],
    q(chuave) => [
-      q(1752),
+      q(1753),
       q(0),
       ],
    q(chug) => [
-      q(1921),
+      q(1922),
       q(0),
       ],
    q(chuj) => [
-      q(1640),
+      q(1641),
       q(0),
       ],
    q(chuka) => [
-      q(1906),
+      q(1907),
       q(0),
       ],
    q(chukot) => [
-      q(1762),
+      q(1763),
       q(0),
       ],
    q(chukwa) => [
-      q(1919),
+      q(1920),
       q(0),
       ],
    q(chulym) => [
-      q(1781),
+      q(1782),
       q(0),
       ],
    q(chumburung) => [
-      q(4780),
+      q(4781),
       q(0),
       ],
    q(churahi) => [
-      q(1697),
+      q(1698),
       q(0),
       ],
    q(church slavic) => [
@@ -29994,7 +30018,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(chut) => [
-      q(5927),
+      q(5928),
       q(0),
       ],
    q(chuukese) => [
@@ -30002,7 +30026,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chuvantsy) => [
-      q(7319),
+      q(7320),
       q(0),
       ],
    q(chuvash) => [
@@ -30010,43 +30034,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(chuwabu) => [
-      q(1726),
+      q(1727),
       q(0),
       ],
    q(ci gbe) => [
-      q(1730),
+      q(1731),
       q(0),
       ],
    q(cia-cia) => [
-      q(1729),
+      q(1730),
       q(0),
       ],
    q(cibak) => [
-      q(1756),
+      q(1757),
       q(0),
       ],
    q(cicipu) => [
-      q(0967),
+      q(0968),
       q(0),
       ],
    q(cimbrian) => [
-      q(1736),
+      q(1737),
       q(0),
       ],
    q(cinda-regi-tiyal) => [
-      q(1701),
+      q(1702),
       q(0),
       ],
    q(cineni) => [
-      q(1733),
+      q(1734),
       q(0),
       ],
    q(cinta larga) => [
-      q(1737),
+      q(1738),
       q(0),
       ],
    q(cisalpine gaulish) => [
-      q(7310),
+      q(7311),
       q(0),
       ],
    q(cishingini) => [
@@ -30054,31 +30078,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(citak) => [
-      q(6825),
+      q(6826),
       q(0),
       ],
    q(ciwogai) => [
-      q(6477),
+      q(6478),
       q(0),
       ],
    q(clallam) => [
-      q(1777),
+      q(1778),
       q(0),
       ],
    q(classical armenian) => [
-      q(7312),
+      q(7313),
       q(0),
       ],
    q(classical mandaic) => [
-      q(4692),
+      q(4693),
       q(0),
       ],
    q(classical mongolian) => [
-      q(1785),
+      q(1786),
       q(0),
       ],
    q(classical nahuatl) => [
-      q(4769),
+      q(4770),
       q(0),
       ],
    q(classical nepal bhasa) => [
@@ -30090,7 +30114,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(classical quechua) => [
-      q(5715),
+      q(5716),
       q(0),
       ],
    q(classical syriac) => [
@@ -30098,119 +30122,119 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(classical tibetan) => [
-      q(7317),
+      q(7318),
       q(0),
       ],
    q(coahuilteco) => [
-      q(7320),
+      q(7321),
       q(0),
       ],
    q(coast miwok) => [
-      q(1872),
+      q(1873),
       q(0),
       ],
    q(coastal kadazan) => [
-      q(3775),
+      q(3776),
       q(0),
       ],
    q(coastal konjo) => [
-      q(3379),
+      q(3380),
       q(0),
       ],
    q(coatecas altas zapotec) => [
-      q(7831),
+      q(7833),
       q(0),
       ],
    q(coatepec nahuatl) => [
-      q(4738),
+      q(4739),
       q(0),
       ],
    q(coatlan mixe) => [
-      q(4166),
+      q(4167),
       q(0),
       ],
    q(coatlan zapotec) => [
-      q(7930),
+      q(7932),
       q(0),
       ],
    q(coatzospan mixtec) => [
-      q(4319),
+      q(4320),
       q(0),
       ],
    q(cocama-cocamilla) => [
-      q(1811),
+      q(1812),
       q(0),
       ],
    q(cochimi) => [
-      q(1816),
+      q(1817),
       q(0),
       ],
    q(cocopa) => [
-      q(1810),
+      q(1811),
       q(0),
       ],
    q(cocos islands malay) => [
-      q(1808),
+      q(1809),
       q(0),
       ],
    q(coeur d'alene) => [
-      q(1846),
+      q(1847),
       q(0),
       ],
    q(cofan) => [
-      q(1820),
+      q(1821),
       q(0),
       ],
    q(cogui) => [
-      q(3509),
+      q(3510),
       q(0),
       ],
    q(col) => [
-      q(3927),
+      q(3928),
       q(0),
       ],
    q(colombian sign language) => [
-      q(1877),
+      q(1878),
       q(0),
       ],
    q(colonia tovar german) => [
-      q(2450),
+      q(2451),
       q(0),
       ],
    q(colorado) => [
-      q(1813),
+      q(1814),
       q(0),
       ],
    q(columbia-wenatchi) => [
-      q(1818),
+      q(1819),
       q(0),
       ],
    q(comaltepec chinantec) => [
-      q(1688),
+      q(1689),
       q(0),
       ],
    q(comanche) => [
-      q(1819),
+      q(1820),
       q(0),
       ],
    q(comecrudo) => [
-      q(7313),
+      q(7314),
       q(0),
       ],
    q(como karim) => [
-      q(1712),
+      q(1713),
       q(0),
       ],
    q(comox) => [
-      q(1821),
+      q(1822),
       q(0),
       ],
    q(con) => [
-      q(1802),
+      q(1803),
       q(0),
       ],
    q(congo swahili) => [
-      q(6300),
+      q(6301),
       q(0),
       ],
    q(cook islands maori) => [
@@ -30218,19 +30242,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(coong) => [
-      q(1796),
+      q(1797),
       q(0),
       ],
    q(coos) => [
-      q(1886),
+      q(1887),
       q(0),
       ],
    q(copainala zoque) => [
-      q(7905),
+      q(7907),
       q(0),
       ],
    q(copala triqui) => [
-      q(6689),
+      q(6690),
       q(0),
       ],
    q(coptic) => [
@@ -30238,11 +30262,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(coquille) => [
-      q(1822),
+      q(1823),
       q(0),
       ],
    q(cori) => [
-      q(1863),
+      q(1864),
       q(0),
       ],
    q(cornish) => [
@@ -30250,7 +30274,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(corongo ancash quechua) => [
-      q(5714),
+      q(5715),
       q(0),
       ],
    q(corsican) => [
@@ -30258,35 +30282,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(costa rican sign language) => [
-      q(1880),
+      q(1881),
       q(0),
       ],
    q(cotabato manobo) => [
-      q(4554),
+      q(4555),
       q(0),
       ],
    q(cotoname) => [
-      q(7314),
+      q(7315),
       q(0),
       ],
    q(cowlitz) => [
-      q(1826),
+      q(1827),
       q(0),
       ],
    q(coxima) => [
-      q(3520),
+      q(3521),
       q(0),
       ],
    q(coyaima) => [
-      q(1828),
+      q(1829),
       q(0),
       ],
    q(coyotepec popoloca) => [
-      q(5366),
+      q(5367),
       q(0),
       ],
    q(coyutla totonac) => [
-      q(6635),
+      q(6636),
       q(0),
       ],
    q(cree) => [
@@ -30338,7 +30362,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(croatia sign language) => [
-      q(1879),
+      q(1880),
       q(0),
       ],
    q(croatian) => [
@@ -30346,79 +30370,79 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(cross river mbembe) => [
-      q(4237),
+      q(4238),
       q(0),
       ],
    q(crow) => [
-      q(1855),
+      q(1856),
       q(0),
       ],
    q(cruzeno) => [
-      q(1864),
+      q(1865),
       q(0),
       ],
    q(cua) => [
-      q(1902),
+      q(1903),
       q(0),
       ],
    q(cuba) => [
-      q(1671),
+      q(1672),
       q(1),
       ],
    q(cuba sign language) => [
-      q(1869),
+      q(1870),
       q(0),
       ],
    q(cubeo) => [
-      q(1903),
+      q(1904),
       q(0),
       ],
    q(cuiba) => [
-      q(1907),
+      q(1908),
       q(0),
       ],
    q(culina) => [
-      q(1910),
+      q(1911),
       q(0),
       ],
    q(cumanagoto) => [
-      q(1912),
+      q(1913),
       q(0),
       ],
    q(cumbric) => [
-      q(7307),
+      q(7308),
       q(0),
       ],
    q(cumeral) => [
-      q(1911),
+      q(1912),
       q(0),
       ],
    q(cun) => [
-      q(1914),
+      q(1915),
       q(0),
       ],
    q(cuneiform luwian) => [
-      q(7404),
+      q(7405),
       q(0),
       ],
    q(cung) => [
-      q(1905),
+      q(1906),
       q(0),
       ],
    q(cupeno) => [
-      q(1913),
+      q(1914),
       q(0),
       ],
    q(curonian) => [
-      q(7318),
+      q(7319),
       q(0),
       ],
    q(curripaco) => [
-      q(3525),
+      q(3526),
       q(0),
       ],
    q(cusco quechua) => [
-      q(5698),
+      q(5699),
       q(0),
       ],
    q(cushitic languages) => [
@@ -30426,23 +30450,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(cutchi-swahili) => [
-      q(1686),
+      q(1687),
       q(0),
       ],
    q(cuvok) => [
-      q(1918),
+      q(1919),
       q(0),
       ],
    q(cuyamecalco mixtec) => [
-      q(7524),
+      q(7525),
       q(0),
       ],
    q(cuyonon) => [
-      q(1931),
+      q(1932),
       q(0),
       ],
    q(cwi bwamu) => [
-      q(1564),
+      q(1565),
       q(0),
       ],
    q(cypriot arabic) => [
@@ -30454,11 +30478,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(czech sign language) => [
-      q(1868),
+      q(1869),
       q(0),
       ],
    q(da'a kaili) => [
-      q(3772),
+      q(3773),
       q(0),
       ],
    q(da-hua miao) => [
@@ -30466,99 +30490,99 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(daai chin) => [
-      q(1947),
+      q(1948),
       q(0),
       ],
    q(daakaka) => [
-      q(1374),
+      q(1375),
       q(0),
       ],
    q(daantanai') => [
-      q(4003),
+      q(4004),
       q(0),
       ],
    q(daasanach) => [
-      q(2149),
+      q(2150),
       q(0),
       ],
    q(daba) => [
-      q(1968),
+      q(1969),
       q(0),
       ],
    q(dabarre) => [
-      q(1969),
+      q(1970),
       q(0),
       ],
    q(dabe) => [
-      q(1958),
+      q(1959),
       q(0),
       ],
    q(dacian) => [
-      q(7323),
+      q(7324),
       q(0),
       ],
    q(dadi dadi) => [
-      q(1977),
+      q(1978),
       q(0),
       ],
    q(dadibi) => [
-      q(4472),
+      q(4473),
       q(0),
       ],
    q(dadiya) => [
-      q(1957),
+      q(1958),
       q(0),
       ],
    q(daga) => [
-      q(2020),
+      q(2021),
       q(0),
       ],
    q(dagaari dioula) => [
-      q(2006),
+      q(2007),
       q(0),
       ],
    q(dagba) => [
-      q(2011),
+      q(2012),
       q(0),
       ],
    q(dagbani) => [
-      q(1941),
+      q(1942),
       q(0),
       ],
    q(dagik) => [
-      q(1988),
+      q(1989),
       q(0),
       ],
    q(dagoman) => [
-      q(2013),
+      q(2014),
       q(0),
       ],
    q(dahalik) => [
-      q(2078),
+      q(2079),
       q(0),
       ],
    q(dahalo) => [
-      q(1945),
+      q(1946),
       q(0),
       ],
    q(daho-doo) => [
-      q(1949),
+      q(1950),
       q(0),
       ],
    q(dai) => [
-      q(2042),
+      q(2043),
       q(0),
       ],
    q(dai zhuang) => [
-      q(7843),
+      q(7845),
       q(0),
       ],
    q(dair) => [
-      q(2133),
+      q(2134),
       q(0),
       ],
    q(dakka) => [
-      q(2073),
+      q(2074),
       q(0),
       ],
    q(dakota) => [
@@ -30566,67 +30590,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dakpakha) => [
-      q(2072),
+      q(2073),
       q(0),
       ],
    q(dalabon) => [
-      q(4843),
+      q(4844),
       q(0),
       ],
    q(dalmatian) => [
-      q(2079),
+      q(2080),
       q(0),
       ],
    q(daloa bete) => [
-      q(1130),
+      q(1131),
       q(0),
       ],
    q(dama) => [
-      q(2089),
+      q(2090),
       q(0),
       ],
    q(damakawa) => [
-      q(1946),
+      q(1947),
       q(0),
       ],
    q(damal) => [
-      q(6875),
+      q(6876),
       q(0),
       ],
    q(dambi) => [
-      q(1938),
+      q(1939),
       q(0),
       ],
    q(dameli) => [
-      q(2088),
+      q(2089),
       q(0),
       ],
    q(dampelas) => [
-      q(2092),
+      q(2093),
       q(0),
       ],
    q(dan) => [
-      q(2103),
+      q(2104),
       q(0),
       ],
    q(danaru) => [
-      q(2106),
+      q(2107),
       q(0),
       ],
    q(danau) => [
-      q(2108),
+      q(2109),
       q(0),
       ],
    q(dandami maria) => [
-      q(1948),
+      q(1949),
       q(0),
       ],
    q(dangaleat) => [
-      q(1937),
+      q(1938),
       q(0),
       ],
    q(dangaura tharu) => [
-      q(6503),
+      q(6504),
       q(0),
       ],
    q(danish) => [
@@ -30634,7 +30658,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(danish sign language) => [
-      q(2151),
+      q(2152),
       q(0),
       ],
    q(dano) => [
@@ -30642,35 +30666,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(danu) => [
-      q(2109),
+      q(2110),
       q(0),
       ],
    q(dao) => [
-      q(1954),
+      q(1955),
       q(0),
       ],
    q(daonda) => [
-      q(2099),
+      q(2100),
       q(0),
       ],
    q(dar daju daju) => [
-      q(2059),
+      q(2060),
       q(0),
       ],
    q(dar fur daju) => [
-      q(1944),
+      q(1945),
       q(0),
       ],
    q(dar sila daju) => [
-      q(1950),
+      q(1951),
       q(0),
       ],
    q(darai) => [
-      q(2147),
+      q(2148),
       q(0),
       ],
    q(darang deng) => [
-      q(4293),
+      q(4294),
       q(1),
       ],
    q(dargwa) => [
@@ -30678,83 +30702,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dari) => [
-      q(5601),
+      q(5602),
       q(0),
       ],
    q(darkinyung) => [
-      q(7322),
+      q(7323),
       q(0),
       ],
    q(darlong) => [
-      q(2080),
+      q(2081),
       q(0),
       ],
    q(darmiya) => [
-      q(2135),
+      q(2136),
       q(0),
       ],
    q(daro-matu melanau) => [
-      q(2141),
+      q(2142),
       q(0),
       ],
    q(dass) => [
-      q(2126),
+      q(2127),
       q(0),
       ],
    q(datooga) => [
-      q(6406),
+      q(6407),
       q(0),
       ],
    q(daungwurrung) => [
-      q(2018),
+      q(2019),
       q(0),
       ],
    q(daur) => [
-      q(2155),
+      q(2156),
       q(0),
       ],
    q(davawenyo) => [
-      q(1952),
+      q(1953),
       q(0),
       ],
    q(daw) => [
-      q(3692),
+      q(3693),
       q(0),
       ],
    q(dawawa) => [
-      q(2196),
+      q(2197),
       q(0),
       ],
    q(dawera-daweloor) => [
-      q(1987),
+      q(1988),
       q(0),
       ],
    q(dawida) => [
-      q(1951),
+      q(1952),
       q(1),
       ],
    q(dawro) => [
-      q(2194),
+      q(2195),
       q(0),
       ],
    q(day) => [
-      q(1943),
+      q(1944),
       q(0),
       ],
    q(dayi) => [
-      q(1953),
+      q(1954),
       q(0),
       ],
    q(dazaga) => [
-      q(2208),
+      q(2209),
       q(0),
       ],
    q(deccan) => [
-      q(1975),
+      q(1976),
       q(0),
       ],
    q(dedua) => [
-      q(1989),
+      q(1990),
       q(0),
       ],
    q(defaka) => [
@@ -30762,23 +30786,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(defi gbe) => [
-      q(2425),
+      q(2426),
       q(0),
       ],
    q(deg) => [
-      q(4714),
+      q(4715),
       q(0),
       ],
    q(degaru) => [
-      q(2017),
+      q(2018),
       q(0),
       ],
    q(degema) => [
-      q(1992),
+      q(1993),
       q(0),
       ],
    q(degenan) => [
-      q(2007),
+      q(2008),
       q(0),
       ],
    q(degexit'an) => [
@@ -30786,19 +30810,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dehu) => [
-      q(2031),
+      q(2032),
       q(0),
       ],
    q(dehwari) => [
-      q(1993),
+      q(1994),
       q(0),
       ],
    q(dek) => [
-      q(1995),
+      q(1996),
       q(0),
       ],
    q(dela-oenale) => [
-      q(5847),
+      q(5848),
       q(0),
       ],
    q(delaware) => [
@@ -30806,31 +30830,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(delo) => [
-      q(5096),
+      q(5097),
       q(0),
       ],
    q(dem) => [
-      q(1996),
+      q(1997),
       q(0),
       ],
    q(dema) => [
-      q(2096),
+      q(2097),
       q(0),
       ],
    q(demisa) => [
-      q(1994),
+      q(1995),
       q(0),
       ],
    q(demta) => [
-      q(2097),
+      q(2098),
       q(0),
       ],
    q(dendi (benin)) => [
-      q(1983),
+      q(1984),
       q(0),
       ],
    q(dendi (central african republic)) => [
-      q(1998),
+      q(1999),
       q(0),
       ],
    q(dene suline) => [
@@ -30838,19 +30862,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(dengese) => [
-      q(2002),
+      q(2003),
       q(0),
       ],
    q(dengka) => [
-      q(2104),
+      q(2105),
       q(0),
       ],
    q(deni) => [
-      q(2111),
+      q(2112),
       q(0),
       ],
    q(deno) => [
-      q(1956),
+      q(1957),
       q(0),
       ],
    q(denya) => [
@@ -30858,79 +30882,79 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(deori) => [
-      q(1999),
+      q(2000),
       q(0),
       ],
    q(dera (indonesia)) => [
-      q(3203),
+      q(3204),
       q(0),
       ],
    q(dera (nigeria)) => [
-      q(3479),
+      q(3480),
       q(0),
       ],
    q(desano) => [
-      q(2000),
+      q(2001),
       q(0),
       ],
    q(desiya) => [
-      q(2153),
+      q(2154),
       q(0),
       ],
    q(dewoin) => [
-      q(1990),
+      q(1991),
       q(0),
       ],
    q(dezfuli) => [
-      q(1991),
+      q(1992),
       q(0),
       ],
    q(dghwede) => [
-      q(2009),
+      q(2010),
       q(0),
       ],
    q(dhaiso) => [
-      q(2029),
+      q(2030),
       q(0),
       ],
    q(dhalandji) => [
-      q(2024),
+      q(2025),
       q(0),
       ],
    q(dhangu) => [
-      q(2022),
+      q(2023),
       q(0),
       ],
    q(dhanki) => [
-      q(2026),
+      q(2027),
       q(0),
       ],
    q(dhanwar (nepal)) => [
-      q(2032),
+      q(2033),
       q(0),
       ],
    q(dhao) => [
-      q(4829),
+      q(4830),
       q(0),
       ],
    q(dhargari) => [
-      q(2028),
+      q(2029),
       q(0),
       ],
    q(dharuk) => [
-      q(7324),
+      q(7325),
       q(0),
       ],
    q(dharumbal) => [
-      q(7345),
+      q(7346),
       q(0),
       ],
    q(dhatki) => [
-      q(4349),
+      q(4350),
       q(0),
       ],
    q(dhimal) => [
-      q(2023),
+      q(2024),
       q(0),
       ],
    q(dhivehi) => [
@@ -30938,7 +30962,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(dhodia) => [
-      q(2027),
+      q(2028),
       q(0),
       ],
    q(dhofari arabic) => [
@@ -30950,83 +30974,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(dhudhuroa) => [
-      q(1985),
+      q(1986),
       q(0),
       ],
    q(dhundari) => [
-      q(2021),
+      q(2022),
       q(0),
       ],
    q(dhungaloo) => [
-      q(2033),
+      q(2034),
       q(0),
       ],
    q(dhurga) => [
-      q(2030),
+      q(2031),
       q(0),
       ],
    q(dhuwal) => [
-      q(2177),
+      q(2178),
       q(0),
       ],
    q(dia) => [
-      q(2034),
+      q(2035),
       q(0),
       ],
    q(dibabawon manobo) => [
-      q(4130),
+      q(4131),
       q(0),
       ],
    q(dibiyaso) => [
-      q(1974),
+      q(1975),
       q(0),
       ],
    q(dibo) => [
-      q(2046),
+      q(2047),
       q(0),
       ],
    q(dibole) => [
-      q(1538),
+      q(1539),
       q(0),
       ],
    q(dicamay agta) => [
-      q(2190),
+      q(2191),
       q(0),
       ],
    q(didinga) => [
-      q(2037),
+      q(2038),
       q(0),
       ],
    q(dido) => [
-      q(1984),
+      q(1985),
       q(0),
       ],
    q(diebroud) => [
-      q(6394),
+      q(6395),
       q(1),
       ],
    q(dieri) => [
-      q(2038),
+      q(2039),
       q(0),
       ],
    q(digaro-mishmi) => [
-      q(4293),
+      q(4294),
       q(0),
       ],
    q(digo) => [
-      q(2039),
+      q(2040),
       q(0),
       ],
    q(dii) => [
-      q(2184),
+      q(2185),
       q(0),
       ],
    q(dijim-bwilim) => [
-      q(1710),
+      q(1711),
       q(0),
       ],
    q(dilling) => [
-      q(2044),
+      q(2045),
       q(0),
       ],
    q(dima) => [
@@ -31034,15 +31058,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dimasa) => [
-      q(2050),
+      q(2051),
       q(0),
       ],
    q(dimbong) => [
-      q(2041),
+      q(2042),
       q(0),
       ],
    q(dime) => [
-      q(2045),
+      q(2046),
       q(0),
       ],
    q(dimili) => [
@@ -31054,7 +31078,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(dimli (individual language)) => [
-      q(2048),
+      q(2049),
       q(0),
       ],
    q(dimli (macrolanguage)) => [
@@ -31062,11 +31086,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(6),
       ],
    q(dineor) => [
-      q(4527),
+      q(4528),
       q(1),
       ],
    q(ding) => [
-      q(2056),
+      q(2057),
       q(0),
       ],
    q(dinka) => [
@@ -31074,43 +31098,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dirari) => [
-      q(2051),
+      q(2052),
       q(0),
       ],
    q(dirasha) => [
-      q(2462),
+      q(2463),
       q(0),
       ],
    q(diri) => [
-      q(2193),
+      q(2194),
       q(0),
       ],
    q(diriku) => [
-      q(2052),
+      q(2053),
       q(0),
       ],
    q(dirim) => [
-      q(2049),
+      q(2050),
       q(0),
       ],
    q(disa) => [
-      q(2150),
+      q(2151),
       q(0),
       ],
    q(ditammari) => [
-      q(6403),
+      q(6404),
       q(0),
       ],
    q(ditidaht) => [
-      q(2157),
+      q(2158),
       q(0),
       ],
    q(diuwe) => [
-      q(2055),
+      q(2056),
       q(0),
       ],
    q(diuxi-tilantongo mixtec) => [
-      q(7509),
+      q(7510),
       q(0),
       ],
    q(divehi) => [
@@ -31118,59 +31142,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dixon reef) => [
-      q(2054),
+      q(2055),
       q(0),
       ],
    q(dizin) => [
-      q(4198),
+      q(4199),
       q(0),
       ],
    q(djabwurrung) => [
-      q(6546),
+      q(6547),
       q(0),
       ],
    q(djadjawurrung) => [
-      q(2057),
+      q(2058),
       q(0),
       ],
    q(djambarrpuyngu) => [
-      q(2069),
+      q(2070),
       q(0),
       ],
    q(djamindjung) => [
-      q(2060),
+      q(2061),
       q(0),
       ],
    q(djangu) => [
-      q(2022),
+      q(2023),
       q(1),
       ],
    q(djangun) => [
-      q(2062),
+      q(2063),
       q(0),
       ],
    q(djauan) => [
-      q(2067),
+      q(2068),
       q(0),
       ],
    q(djawi) => [
-      q(2071),
+      q(2072),
       q(0),
       ],
    q(djeebbana) => [
-      q(2064),
+      q(2065),
       q(0),
       ],
    q(djimini senoufo) => [
-      q(2201),
+      q(2202),
       q(0),
       ],
    q(djinang) => [
-      q(2063),
+      q(2064),
       q(0),
       ],
    q(djinba) => [
-      q(2058),
+      q(2059),
       q(0),
       ],
    q(djingili) => [
@@ -31178,35 +31202,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(djiwarli) => [
-      q(2207),
+      q(2208),
       q(0),
       ],
    q(dobel) => [
-      q(3680),
+      q(3681),
       q(0),
       ],
    q(dobu) => [
-      q(2113),
+      q(2114),
       q(0),
       ],
    q(doe) => [
-      q(2115),
+      q(2116),
       q(0),
       ],
    q(doga) => [
-      q(2008),
+      q(2009),
       q(0),
       ],
    q(doghoro) => [
-      q(2019),
+      q(2020),
       q(0),
       ],
    q(dogose) => [
-      q(2125),
+      q(2126),
       q(0),
       ],
    q(dogoso) => [
-      q(2015),
+      q(2016),
       q(0),
       ],
    q(dogri) => [
@@ -31214,7 +31238,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dogri (individual language)) => [
-      q(2014),
+      q(2015),
       q(0),
       ],
    q(dogri (macrolanguage)) => [
@@ -31226,127 +31250,127 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dogul dom dogon) => [
-      q(1960),
+      q(1961),
       q(0),
       ],
    q(doka) => [
-      q(1961),
+      q(1962),
       q(0),
       ],
    q(doko-uyanga) => [
-      q(6966),
+      q(6967),
       q(0),
       ],
    q(dolgan) => [
-      q(2077),
+      q(2078),
       q(0),
       ],
    q(dolpo) => [
-      q(2136),
+      q(2137),
       q(0),
       ],
    q(dom) => [
-      q(2112),
+      q(2113),
       q(0),
       ],
    q(domaaki) => [
-      q(2087),
+      q(2088),
       q(0),
       ],
    q(domari) => [
-      q(5821),
+      q(5822),
       q(0),
       ],
    q(dombe) => [
-      q(2127),
+      q(2128),
       q(0),
       ],
    q(dominican sign language) => [
-      q(2123),
+      q(2124),
       q(0),
       ],
    q(dompo) => [
-      q(2130),
+      q(2131),
       q(0),
       ],
    q(domu) => [
-      q(2116),
+      q(2117),
       q(0),
       ],
    q(domung) => [
-      q(2001),
+      q(2002),
       q(0),
       ],
    q(dondo) => [
-      q(2118),
+      q(2119),
       q(0),
       ],
    q(dong) => [
-      q(2117),
+      q(2118),
       q(0),
       ],
    q(dongo) => [
-      q(2121),
+      q(2122),
       q(0),
       ],
    q(dongolawi) => [
-      q(2012),
+      q(2013),
       q(1),
       ],
    q(dongotono) => [
-      q(1978),
+      q(1979),
       q(0),
       ],
    q(dongshanba lalo) => [
-      q(7649),
+      q(7651),
       q(0),
       ],
    q(dongxiang) => [
-      q(5928),
+      q(5929),
       q(0),
       ],
    q(donno so dogon) => [
-      q(1986),
+      q(1987),
       q(0),
       ],
    q(doondo) => [
-      q(1979),
+      q(1980),
       q(0),
       ],
    q(dori'o) => [
-      q(2124),
+      q(2125),
       q(0),
       ],
    q(dorig) => [
-      q(7260),
+      q(7261),
       q(1),
       ],
    q(doromu-koki) => [
-      q(3549),
+      q(3550),
       q(0),
       ],
    q(dororo) => [
-      q(2143),
+      q(2144),
       q(0),
       ],
    q(dorze) => [
-      q(2131),
+      q(2132),
       q(0),
       ],
    q(doso) => [
-      q(2119),
+      q(2120),
       q(0),
       ],
    q(dotyali) => [
-      q(2168),
+      q(2169),
       q(0),
       ],
    q(doutai) => [
-      q(6443),
+      q(6444),
       q(0),
       ],
    q(doyayo) => [
-      q(2128),
+      q(2129),
       q(0),
       ],
    q(dravidian languages) => [
@@ -31354,19 +31378,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(drehu) => [
-      q(2031),
+      q(2032),
       q(1),
       ],
    q(drents) => [
-      q(2145),
+      q(2146),
       q(0),
       ],
    q(drubea) => [
-      q(2173),
+      q(2174),
       q(1),
       ],
    q(drung) => [
-      q(2186),
+      q(2187),
       q(0),
       ],
    q(duala) => [
@@ -31374,127 +31398,127 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(duano) => [
-      q(2182),
+      q(2183),
       q(0),
       ],
    q(duau) => [
-      q(2192),
+      q(2193),
       q(0),
       ],
    q(dubli) => [
-      q(2169),
+      q(2170),
       q(0),
       ],
    q(dubu) => [
-      q(2093),
+      q(2094),
       q(0),
       ],
    q(dugun) => [
-      q(4800),
+      q(4801),
       q(0),
       ],
    q(duguri) => [
-      q(1964),
+      q(1965),
       q(0),
       ],
    q(dugwor) => [
-      q(2085),
+      q(2086),
       q(0),
       ],
    q(duhwa) => [
-      q(3207),
+      q(3208),
       q(0),
       ],
    q(duke) => [
-      q(4925),
+      q(4926),
       q(0),
       ],
    q(dulbu) => [
-      q(1966),
+      q(1967),
       q(0),
       ],
    q(duli) => [
-      q(2191),
+      q(2192),
       q(0),
       ],
    q(duma) => [
-      q(2081),
+      q(2082),
       q(0),
       ],
    q(dumbea) => [
-      q(2173),
+      q(2174),
       q(0),
       ],
    q(dumi) => [
-      q(2185),
+      q(2186),
       q(0),
       ],
    q(dumpas) => [
-      q(2094),
+      q(2095),
       q(0),
       ],
    q(dumun) => [
-      q(2176),
+      q(2177),
       q(0),
       ],
    q(duna) => [
-      q(2170),
+      q(2171),
       q(0),
       ],
    q(dungan) => [
-      q(2101),
+      q(2102),
       q(0),
       ],
    q(dungmali) => [
-      q(5735),
+      q(5736),
       q(0),
       ],
    q(dungra bhil) => [
-      q(2175),
+      q(2176),
       q(0),
       ],
    q(dungu) => [
-      q(1972),
+      q(1973),
       q(0),
       ],
    q(dupaninan agta) => [
-      q(2181),
+      q(2182),
       q(0),
       ],
    q(dura) => [
-      q(2142),
+      q(2143),
       q(0),
       ],
    q(duri) => [
-      q(4613),
+      q(4614),
       q(0),
       ],
    q(duriankere) => [
-      q(1965),
+      q(1966),
       q(0),
       ],
    q(duruma) => [
-      q(2174),
+      q(2175),
       q(0),
       ],
    q(duruwa) => [
-      q(5388),
+      q(5389),
       q(0),
       ],
    q(dusner) => [
-      q(2152),
+      q(2153),
       q(0),
       ],
    q(dusun deyah) => [
-      q(2180),
+      q(2181),
       q(0),
       ],
    q(dusun malang) => [
-      q(2183),
+      q(2184),
       q(0),
       ],
    q(dusun witu) => [
-      q(2188),
+      q(2189),
       q(0),
       ],
    q(dutch) => [
@@ -31502,7 +31526,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dutch sign language) => [
-      q(2148),
+      q(2149),
       q(0),
       ],
    q(dutch, middle (ca.1050-1350)) => [
@@ -31510,23 +31534,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dutton world speedwords) => [
-      q(2195),
+      q(2196),
       q(0),
       ],
    q(duungooma) => [
-      q(2189),
+      q(2190),
       q(0),
       ],
    q(duupa) => [
-      q(1940),
+      q(1941),
       q(0),
       ],
    q(duvle) => [
-      q(2187),
+      q(2188),
       q(0),
       ],
    q(duwai) => [
-      q(1967),
+      q(1968),
       q(0),
       ],
    q(duwet) => [
@@ -31534,35 +31558,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(duya) => [
-      q(3846),
+      q(3847),
       q(0),
       ],
    q(dwang) => [
-      q(5006),
+      q(5007),
       q(0),
       ],
    q(dyaabugay) => [
-      q(2205),
+      q(2206),
       q(0),
       ],
    q(dyaberdyaber) => [
-      q(2198),
+      q(2199),
       q(0),
       ],
    q(dyan) => [
-      q(2197),
+      q(2198),
       q(0),
       ],
    q(dyangadi) => [
-      q(2203),
+      q(2204),
       q(0),
       ],
    q(dyirbal) => [
-      q(1963),
+      q(1964),
       q(0),
       ],
    q(dyugun) => [
-      q(2199),
+      q(2200),
       q(0),
       ],
    q(dyula) => [
@@ -31574,15 +31598,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dzalakha) => [
-      q(2209),
+      q(2210),
       q(0),
       ],
    q(dzando) => [
-      q(2210),
+      q(2211),
       q(0),
       ],
    q(dzao min) => [
-      q(1384),
+      q(1385),
       q(0),
       ],
    q(dzodinka) => [
@@ -31594,39 +31618,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(dzuungoo) => [
-      q(2105),
+      q(2106),
       q(0),
       ],
    q(e) => [
-      q(2220),
+      q(2221),
       q(0),
       ],
    q(e'ma buyang) => [
-      q(7801),
+      q(7803),
       q(0),
       ],
    q(e'napa woromaipu) => [
-      q(5368),
+      q(5369),
       q(0),
       ],
    q(early tripuri) => [
-      q(7521),
+      q(7522),
       q(0),
       ],
    q(east ambae) => [
-      q(5251),
+      q(5252),
       q(0),
       ],
    q(east berawan) => [
-      q(7828),
+      q(7830),
       q(0),
       ],
    q(east damar) => [
-      q(2091),
+      q(2092),
       q(0),
       ],
    q(east futuna) => [
-      q(2381),
+      q(2382),
       q(0),
       ],
    q(east germanic languages) => [
@@ -31634,23 +31658,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(east kewa) => [
-      q(3395),
+      q(3396),
       q(0),
       ],
    q(east limba) => [
-      q(3975),
+      q(3976),
       q(0),
       ],
    q(east makian) => [
-      q(4365),
+      q(4366),
       q(0),
       ],
    q(east masela) => [
-      q(7021),
+      q(7022),
       q(0),
       ],
    q(east nyala) => [
-      q(4947),
+      q(4948),
       q(0),
       ],
    q(east slavic languages) => [
@@ -31658,11 +31682,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(east tarangan) => [
-      q(6691),
+      q(6692),
       q(0),
       ],
    q(east yugur) => [
-      q(7779),
+      q(7781),
       q(0),
       ],
    q(eastern abnaki) => [
@@ -31674,7 +31698,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eastern apurimac quechua) => [
-      q(5701),
+      q(5702),
       q(0),
       ],
    q(eastern arrernte) => [
@@ -31682,7 +31706,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eastern balochi) => [
-      q(1174),
+      q(1175),
       q(0),
       ],
    q(eastern bolivian guarani) => [
@@ -31690,11 +31714,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eastern bontok) => [
-      q(2213),
+      q(2214),
       q(0),
       ],
    q(eastern bru) => [
-      q(1440),
+      q(1441),
       q(0),
       ],
    q(eastern canadian inuktitut) => [
@@ -31702,15 +31726,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eastern cham) => [
-      q(1747),
+      q(1748),
       q(0),
       ],
    q(eastern durango nahuatl) => [
-      q(1013),
+      q(1014),
       q(0),
       ],
    q(eastern egyptian bedawi arabic) => [
-      q(0958),
+      q(0959),
       q(0),
       ],
    q(eastern frisian) => [
@@ -31718,27 +31742,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eastern gorkha tamang) => [
-      q(6478),
+      q(6479),
       q(0),
       ],
    q(eastern gurung) => [
-      q(2497),
+      q(2498),
       q(0),
       ],
    q(eastern highland chatino) => [
-      q(1782),
+      q(1783),
       q(0),
       ],
    q(eastern highland otomi) => [
-      q(5322),
+      q(5323),
       q(0),
       ],
    q(eastern hongshuihe zhuang) => [
-      q(7836),
+      q(7838),
       q(0),
       ],
    q(eastern huasteca nahuatl) => [
-      q(4863),
+      q(4864),
       q(0),
       ],
    q(eastern huishui hmong) => [
@@ -31750,43 +31774,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(eastern karaboro) => [
-      q(7476),
+      q(7477),
       q(0),
       ],
    q(eastern karnic) => [
-      q(2231),
+      q(2232),
       q(0),
       ],
    q(eastern katu) => [
-      q(3640),
+      q(3641),
       q(0),
       ],
    q(eastern kayah) => [
-      q(2241),
+      q(2242),
       q(0),
       ],
    q(eastern keres) => [
-      q(3260),
+      q(3261),
       q(0),
       ],
    q(eastern khumi chin) => [
-      q(1707),
+      q(1708),
       q(0),
       ],
    q(eastern krahn) => [
-      q(3561),
+      q(3562),
       q(0),
       ],
    q(eastern lalu) => [
-      q(7657),
+      q(7659),
       q(0),
       ],
    q(eastern lawa) => [
-      q(4101),
+      q(4102),
       q(0),
       ],
    q(eastern magar) => [
-      q(4264),
+      q(4265),
       q(0),
       ],
    q(eastern malayo-polynesian languages) => [
@@ -31794,39 +31818,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eastern maninkakan) => [
-      q(2254),
+      q(2255),
       q(0),
       ],
    q(eastern mari) => [
-      q(4290),
+      q(4291),
       q(0),
       ],
    q(eastern maroon creole) => [
-      q(2065),
+      q(2066),
       q(0),
       ],
    q(eastern meohang) => [
-      q(2252),
+      q(2253),
       q(0),
       ],
    q(eastern mnong) => [
-      q(4419),
+      q(4420),
       q(0),
       ],
    q(eastern muria) => [
-      q(2259),
+      q(2260),
       q(0),
       ],
    q(eastern ngad'a) => [
-      q(4806),
+      q(4807),
       q(0),
       ],
    q(eastern nisu) => [
-      q(5024),
+      q(5025),
       q(0),
       ],
    q(eastern ojibwa) => [
-      q(5219),
+      q(5220),
       q(0),
       ],
    q(eastern oromo) => [
@@ -31834,15 +31858,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eastern parbate kham) => [
-      q(3359),
+      q(3360),
       q(0),
       ],
    q(eastern penan) => [
-      q(5421),
+      q(5422),
       q(0),
       ],
    q(eastern pomo) => [
-      q(5404),
+      q(5405),
       q(0),
       ],
    q(eastern qiandong miao) => [
@@ -31850,7 +31874,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eastern subanen) => [
-      q(5986),
+      q(5987),
       q(0),
       ],
    q(eastern sudanic languages) => [
@@ -31858,23 +31882,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eastern tamang) => [
-      q(6364),
+      q(6365),
       q(0),
       ],
    q(eastern tawbuid) => [
-      q(1335),
+      q(1336),
       q(0),
       ],
    q(eastern xiangxi miao) => [
-      q(4592),
+      q(4593),
       q(0),
       ],
    q(eastern xwla gbe) => [
-      q(2440),
+      q(2441),
       q(0),
       ],
    q(eastern yiddish) => [
-      q(7616),
+      q(7617),
       q(0),
       ],
    q(ebira) => [
@@ -31882,23 +31906,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eblan) => [
-      q(7327),
+      q(7328),
       q(0),
       ],
    q(ebrie) => [
-      q(2215),
+      q(2216),
       q(0),
       ],
    q(ebughu) => [
-      q(2212),
+      q(2213),
       q(0),
       ],
    q(ecuadorian sign language) => [
-      q(2218),
+      q(2219),
       q(0),
       ],
    q(ede cabe) => [
-      q(1666),
+      q(1667),
       q(0),
       ],
    q(ede ica) => [
@@ -31914,7 +31938,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(edera awyu) => [
-      q(0983),
+      q(0984),
       q(0),
       ],
    q(edo) => [
@@ -31922,27 +31946,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(edolo) => [
-      q(2307),
+      q(2308),
       q(0),
       ],
    q(edomite) => [
-      q(7325),
+      q(7326),
       q(0),
       ],
    q(edopi) => [
-      q(1959),
+      q(1960),
       q(0),
       ],
    q(edwas) => [
-      q(1346),
+      q(1347),
       q(2),
       ],
    q(efai) => [
-      q(2221),
+      q(2222),
       q(0),
       ],
    q(efe) => [
-      q(2222),
+      q(2223),
       q(0),
       ],
    q(efik) => [
@@ -31950,19 +31974,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(efutop) => [
-      q(5206),
+      q(5207),
       q(0),
       ],
    q(ega) => [
-      q(2223),
+      q(2224),
       q(0),
       ],
    q(eggon) => [
-      q(2225),
+      q(2226),
       q(0),
       ],
    q(egypt sign language) => [
-      q(2294),
+      q(2295),
       q(0),
       ],
    q(egyptian (ancient)) => [
@@ -31978,23 +32002,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ehueun) => [
-      q(2226),
+      q(2227),
       q(0),
       ],
    q(eipomek) => [
-      q(2227),
+      q(2228),
       q(0),
       ],
    q(eitiep) => [
-      q(2228),
+      q(2229),
       q(0),
       ],
    q(ejagham) => [
-      q(2310),
+      q(2311),
       q(0),
       ],
    q(ejamat) => [
-      q(2230),
+      q(2231),
       q(0),
       ],
    q(ekajuk) => [
@@ -32002,7 +32026,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ekari) => [
-      q(2233),
+      q(2234),
       q(0),
       ],
    q(ekegusii) => [
@@ -32010,31 +32034,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(eki) => [
-      q(2234),
+      q(2235),
       q(0),
       ],
    q(ekit) => [
-      q(2232),
+      q(2233),
       q(0),
       ],
    q(ekpeye) => [
-      q(2239),
+      q(2240),
       q(0),
       ],
    q(el alto zapotec) => [
-      q(7927),
+      q(7929),
       q(0),
       ],
    q(el hugeirat) => [
-      q(2243),
+      q(2244),
       q(0),
       ],
    q(el molo) => [
-      q(2247),
+      q(2248),
       q(0),
       ],
    q(el nayar cora) => [
-      q(1854),
+      q(1855),
       q(0),
       ],
    q(elamite) => [
@@ -32042,23 +32066,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eleme) => [
-      q(2246),
+      q(2247),
       q(0),
       ],
    q(elepi) => [
-      q(2242),
+      q(2243),
       q(0),
       ],
    q(elip) => [
-      q(2237),
+      q(2238),
       q(0),
       ],
    q(elkei) => [
-      q(2245),
+      q(2246),
       q(0),
       ],
    q(elotepec zapotec) => [
-      q(7951),
+      q(7953),
       q(0),
       ],
    q(eloyi) => [
@@ -32066,99 +32090,99 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(elseng) => [
-      q(4510),
+      q(4511),
       q(0),
       ],
    q(elu) => [
-      q(2248),
+      q(2249),
       q(0),
       ],
    q(elymian) => [
-      q(7405),
+      q(7406),
       q(0),
       ],
    q(emae) => [
-      q(4410),
+      q(4411),
       q(0),
       ],
    q(emai-iuleha-ora) => [
-      q(2249),
+      q(2250),
       q(0),
       ],
    q(eman) => [
-      q(2256),
+      q(2257),
       q(0),
       ],
    q(embaloh) => [
-      q(2250),
+      q(2251),
       q(0),
       ],
    q(embera-baudo) => [
-      q(1090),
+      q(1091),
       q(0),
       ],
    q(embera-catio) => [
-      q(1896),
+      q(1897),
       q(0),
       ],
    q(embera-chami) => [
-      q(1786),
+      q(1787),
       q(0),
       ],
    q(embera-tado) => [
-      q(6429),
+      q(6430),
       q(0),
       ],
    q(embu) => [
-      q(2216),
+      q(2217),
       q(0),
       ],
    q(emem) => [
-      q(2273),
+      q(2274),
       q(1),
       ],
    q(emerillon) => [
-      q(2251),
+      q(2252),
       q(0),
       ],
    q(emilian) => [
-      q(2224),
+      q(2225),
       q(0),
       ],
    q(emplawas) => [
-      q(2260),
+      q(2261),
       q(0),
       ],
    q(emumu) => [
-      q(2273),
+      q(2274),
       q(0),
       ],
    q(en) => [
-      q(2265),
+      q(2266),
       q(0),
       ],
    q(enawene-nawe) => [
-      q(6916),
+      q(6917),
       q(0),
       ],
    q(ende) => [
-      q(2266),
+      q(2267),
       q(0),
       ],
    q(enga) => [
-      q(2272),
+      q(2273),
       q(0),
       ],
    q(engdewu) => [
-      q(4850),
+      q(4851),
       q(0),
       ],
    q(engenni) => [
-      q(2270),
+      q(2271),
       q(0),
       ],
    q(enggano) => [
-      q(2271),
+      q(2272),
       q(0),
       ],
    q(english) => [
@@ -32178,83 +32202,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(enlhet) => [
-      q(2269),
+      q(2270),
       q(0),
       ],
    q(enrekang) => [
-      q(5635),
+      q(5636),
       q(0),
       ],
    q(enu) => [
-      q(2274),
+      q(2275),
       q(0),
       ],
    q(enwan (akwa ibom state)) => [
-      q(2276),
+      q(2277),
       q(0),
       ],
    q(enwan (edu state)) => [
-      q(2275),
+      q(2276),
       q(0),
       ],
    q(enxet) => [
-      q(2277),
+      q(2278),
       q(0),
       ],
    q(enya) => [
-      q(2487),
+      q(2488),
       q(0),
       ],
    q(epena) => [
-      q(6054),
+      q(6055),
       q(0),
       ],
    q(epi-olmec) => [
-      q(7332),
+      q(7333),
       q(0),
       ],
    q(epie) => [
-      q(2279),
+      q(2280),
       q(0),
       ],
    q(epigraphic mayan) => [
-      q(2262),
+      q(2263),
       q(0),
       ],
    q(eravallan) => [
-      q(2280),
+      q(2281),
       q(0),
       ],
    q(erave) => [
-      q(3400),
+      q(3401),
       q(0),
       ],
    q(ere) => [
-      q(6803),
+      q(6804),
       q(0),
       ],
    q(eritai) => [
-      q(2288),
+      q(2289),
       q(0),
       ],
    q(erokwanas) => [
-      q(2289),
+      q(2290),
       q(0),
       ],
    q(erre) => [
-      q(2286),
+      q(2287),
       q(0),
       ],
    q(erromintxela) => [
-      q(2261),
+      q(2262),
       q(0),
       ],
    q(ersu) => [
-      q(2287),
+      q(2288),
       q(0),
       ],
    q(eruwa) => [
-      q(2282),
+      q(2283),
       q(0),
       ],
    q(erzya) => [
@@ -32266,15 +32290,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ese) => [
-      q(4168),
+      q(4169),
       q(0),
       ],
    q(ese ejja) => [
-      q(2290),
+      q(2291),
       q(0),
       ],
    q(eshtehardi) => [
-      q(2291),
+      q(2292),
       q(0),
       ],
    q(esimbi) => [
@@ -32282,7 +32306,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eskayan) => [
-      q(2301),
+      q(2302),
       q(0),
       ],
    q(eskimo-aleut languages) => [
@@ -32294,11 +32318,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(esselen) => [
-      q(2298),
+      q(2299),
       q(0),
       ],
    q(estado de mexico otomi) => [
-      q(5326),
+      q(5327),
       q(0),
       ],
    q(estonian) => [
@@ -32306,35 +32330,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(estonian sign language) => [
-      q(2297),
+      q(2298),
       q(0),
       ],
    q(esuma) => [
-      q(2295),
+      q(2296),
       q(0),
       ],
    q(etchemin) => [
-      q(2303),
+      q(2304),
       q(0),
       ],
    q(etebi) => [
-      q(2302),
+      q(2303),
       q(0),
       ],
    q(eten) => [
-      q(2311),
+      q(2312),
       q(0),
       ],
    q(eteocretan) => [
-      q(2217),
+      q(2218),
       q(0),
       ],
    q(eteocypriot) => [
-      q(2219),
+      q(2220),
       q(0),
       ],
    q(ethiopian sign language) => [
-      q(2304),
+      q(2305),
       q(0),
       ],
    q(etkywan) => [
@@ -32342,39 +32366,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(eton (cameroon)) => [
-      q(2306),
+      q(2307),
       q(0),
       ],
    q(eton (vanuatu)) => [
-      q(2305),
+      q(2306),
       q(0),
       ],
    q(etruscan) => [
-      q(2309),
+      q(2310),
       q(0),
       ],
    q(etulo) => [
-      q(6956),
+      q(6957),
       q(0),
       ],
    q(evant) => [
-      q(1637),
+      q(1638),
       q(0),
       ],
    q(even) => [
-      q(2313),
+      q(2314),
       q(0),
       ],
    q(evenki) => [
-      q(2315),
+      q(2316),
       q(0),
       ],
    q(eviya) => [
-      q(2484),
+      q(2485),
       q(0),
       ],
    q(ewage-notu) => [
-      q(5026),
+      q(5027),
       q(0),
       ],
    q(ewe) => [
@@ -32386,67 +32410,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(extremaduran) => [
-      q(2316),
+      q(2317),
       q(0),
       ],
    q(eyak) => [
-      q(2317),
+      q(2318),
       q(0),
       ],
    q(ezaa) => [
-      q(2319),
+      q(2320),
       q(0),
       ],
    q(fa d'ambu) => [
-      q(2322),
+      q(2323),
       q(0),
       ],
    q(fagani) => [
-      q(2324),
+      q(2325),
       q(0),
       ],
    q(fagauvea) => [
-      q(6962),
+      q(6963),
       q(1),
       ],
    q(faire atta) => [
-      q(1019),
+      q(1020),
       q(0),
       ],
    q(faita) => [
-      q(2328),
+      q(2329),
       q(0),
       ],
    q(faiwol) => [
-      q(2327),
+      q(2328),
       q(0),
       ],
    q(fala) => [
-      q(2335),
+      q(2336),
       q(0),
       ],
    q(falam chin) => [
-      q(1713),
+      q(1714),
       q(0),
       ],
    q(fali) => [
-      q(2354),
+      q(2355),
       q(0),
       ],
    q(faliscan) => [
-      q(7337),
+      q(7338),
       q(0),
       ],
    q(fam) => [
-      q(2331),
+      q(2332),
       q(0),
       ],
    q(fanagalo) => [
-      q(2361),
+      q(2362),
       q(0),
       ],
    q(fanamaket) => [
-      q(1244),
+      q(1245),
       q(0),
       ],
    q(fang) => [
@@ -32454,7 +32478,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(fang (cameroon)) => [
-      q(2329),
+      q(2330),
       q(0),
       ],
    q(fang (equatorial guinea)) => [
@@ -32462,7 +32486,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(fania) => [
-      q(2362),
+      q(2363),
       q(0),
       ],
    q(fanti) => [
@@ -32470,7 +32494,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(far western muria) => [
-      q(2360),
+      q(2361),
       q(0),
       ],
    q(farefare) => [
@@ -32482,31 +32506,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(fas) => [
-      q(2369),
+      q(2370),
       q(0),
       ],
    q(fasu) => [
-      q(2321),
+      q(2322),
       q(0),
       ],
    q(fataleka) => [
-      q(2333),
+      q(2334),
       q(0),
       ],
    q(fataluku) => [
-      q(1980),
+      q(1981),
       q(0),
       ],
    q(fayu) => [
-      q(2334),
+      q(2335),
       q(0),
       ],
    q(fe'fe') => [
-      q(2359),
+      q(2360),
       q(0),
       ],
    q(fedan) => [
-      q(5399),
+      q(5400),
       q(1),
       ],
    q(fembe) => [
@@ -32514,11 +32538,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(fernando po creole english) => [
-      q(2368),
+      q(2369),
       q(0),
       ],
    q(feroge) => [
-      q(2340),
+      q(2341),
       q(0),
       ],
    q(fiji hindi) => [
@@ -32534,15 +32558,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(filomena mata-coahuitlan totonac) => [
-      q(6577),
+      q(6578),
       q(0),
       ],
    q(finland-swedish sign language) => [
-      q(2378),
+      q(2379),
       q(0),
       ],
    q(finlandssvenskt teckensprak) => [
-      q(2378),
+      q(2379),
       q(1),
       ],
    q(finnish) => [
@@ -32550,7 +32574,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(finnish sign language) => [
-      q(2376),
+      q(2377),
       q(0),
       ],
    q(finno-ugrian languages) => [
@@ -32558,23 +32582,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(finongan) => [
-      q(2325),
+      q(2326),
       q(0),
       ],
    q(fipa) => [
-      q(2346),
+      q(2347),
       q(0),
       ],
    q(firan) => [
-      q(2347),
+      q(2348),
       q(0),
       ],
    q(fiwaga) => [
-      q(2349),
+      q(2350),
       q(0),
       ],
    q(flaaitaal) => [
-      q(2358),
+      q(2359),
       q(0),
       ],
    q(flemish) => [
@@ -32582,31 +32606,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(flemish sign language) => [
-      q(6995),
+      q(6996),
       q(1),
       ],
    q(flinders island) => [
-      q(2356),
+      q(2357),
       q(0),
       ],
    q(foau) => [
-      q(2353),
+      q(2354),
       q(0),
       ],
    q(foi) => [
-      q(2364),
+      q(2365),
       q(0),
       ],
    q(foia foia) => [
-      q(2341),
+      q(2342),
       q(0),
       ],
    q(folopa) => [
-      q(5578),
+      q(5579),
       q(0),
       ],
    q(foma) => [
-      q(2365),
+      q(2366),
       q(0),
       ],
    q(fon) => [
@@ -32614,27 +32638,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(fongoro) => [
-      q(2343),
+      q(2344),
       q(0),
       ],
    q(foodo) => [
-      q(2363),
+      q(2364),
       q(0),
       ],
    q(forak) => [
-      q(2374),
+      q(2375),
       q(0),
       ],
    q(fordata) => [
-      q(2371),
+      q(2372),
       q(0),
       ],
    q(fore) => [
-      q(2366),
+      q(2367),
       q(0),
       ],
    q(forest enets) => [
-      q(2267),
+      q(2268),
       q(0),
       ],
    q(formosan languages) => [
@@ -32642,19 +32666,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(fortsenal) => [
-      q(2375),
+      q(2376),
       q(0),
       ],
    q(francisco leon zoque) => [
-      q(7911),
+      q(7913),
       q(0),
       ],
    q(francoprovencal) => [
-      q(2373),
+      q(2374),
       q(1),
       ],
    q(frankish) => [
-      q(2372),
+      q(2373),
       q(0),
       ],
    q(french) => [
@@ -32662,11 +32686,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(french belgian sign language) => [
-      q(5985),
+      q(5986),
       q(1),
       ],
    q(french sign language) => [
-      q(2377),
+      q(2378),
       q(0),
       ],
    q(french, middle (ca.1400-1600)) => [
@@ -32690,51 +32714,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(fuliiru) => [
-      q(2357),
+      q(2358),
       q(0),
       ],
    q(fulnio) => [
-      q(2388),
+      q(2389),
       q(0),
       ],
    q(fum) => [
-      q(2387),
+      q(2388),
       q(0),
       ],
    q(fungwa) => [
-      q(6889),
+      q(6890),
       q(0),
       ],
    q(fur) => [
-      q(2394),
+      q(2395),
       q(0),
       ],
    q(furu) => [
-      q(2391),
+      q(2392),
       q(0),
       ],
    q(futuna-aniwa) => [
-      q(2390),
+      q(2391),
       q(0),
       ],
    q(fuyug) => [
-      q(2393),
+      q(2394),
       q(0),
       ],
    q(fwai) => [
-      q(2395),
+      q(2396),
       q(0),
       ],
    q(fwe) => [
-      q(2396),
+      q(2397),
       q(0),
       ],
    q(fyam) => [
-      q(5671),
+      q(5672),
       q(0),
       ],
    q(fyer) => [
-      q(2345),
+      q(2346),
       q(0),
       ],
    q(ga) => [
@@ -32746,55 +32770,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ga'dang) => [
-      q(2457),
+      q(2458),
       q(0),
       ],
    q(gaa) => [
-      q(6735),
+      q(6736),
       q(0),
       ],
    q(gaam) => [
-      q(6387),
+      q(6388),
       q(0),
       ],
    q(gabi-gabi) => [
-      q(2439),
+      q(2440),
       q(0),
       ],
    q(gabri) => [
-      q(2397),
+      q(2398),
       q(0),
       ],
    q(gabrielino-fernandeno) => [
-      q(7341),
+      q(7342),
       q(0),
       ],
    q(gadang) => [
-      q(2461),
+      q(2462),
       q(0),
       ],
    q(gaddang) => [
-      q(2399),
+      q(2400),
       q(0),
       ],
    q(gaddi) => [
-      q(2428),
+      q(2429),
       q(0),
       ],
    q(gade) => [
-      q(2475),
+      q(2476),
       q(0),
       ],
    q(gade lohar) => [
-      q(2451),
+      q(2452),
       q(0),
       ],
    q(gadjerawang) => [
-      q(2458),
+      q(2459),
       q(0),
       ],
    q(gadsup) => [
-      q(2405),
+      q(2406),
       q(0),
       ],
    q(gaelic) => [
@@ -32802,59 +32826,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gafat) => [
-      q(2489),
+      q(2490),
       q(0),
       ],
    q(gagadu) => [
-      q(2437),
+      q(2438),
       q(0),
       ],
    q(gagauz) => [
-      q(2402),
+      q(2403),
       q(0),
       ],
    q(gagnoa bete) => [
-      q(1475),
+      q(1476),
       q(0),
       ],
    q(gagu) => [
-      q(2500),
+      q(2501),
       q(0),
       ],
    q(gahri) => [
-      q(1155),
+      q(1156),
       q(0),
       ],
    q(gaikundi) => [
-      q(2423),
+      q(2424),
       q(0),
       ],
    q(gail) => [
-      q(2515),
+      q(2516),
       q(0),
       ],
    q(gaina) => [
-      q(2448),
+      q(2449),
       q(0),
       ],
    q(gal) => [
-      q(2411),
+      q(2412),
       q(0),
       ],
    q(galambu) => [
-      q(2549),
+      q(2550),
       q(0),
       ],
    q(galatian) => [
-      q(7338),
+      q(7339),
       q(0),
       ],
    q(galela) => [
-      q(2426),
+      q(2427),
       q(0),
       ],
    q(galeya) => [
-      q(2413),
+      q(2414),
       q(0),
       ],
    q(galibi carib) => [
@@ -32862,7 +32886,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(galice) => [
-      q(2445),
+      q(2446),
       q(0),
       ],
    q(galician) => [
@@ -32870,11 +32894,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(galindan) => [
-      q(7344),
+      q(7345),
       q(0),
       ],
    q(gallurese sardinian) => [
-      q(5953),
+      q(5954),
       q(0),
       ],
    q(galo) => [
@@ -32882,51 +32906,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(galolen) => [
-      q(2407),
+      q(2408),
       q(0),
       ],
    q(gamale kham) => [
-      q(3316),
+      q(3317),
       q(0),
       ],
    q(gambera) => [
-      q(2554),
+      q(2555),
       q(0),
       ],
    q(gambian wolof) => [
-      q(7200),
+      q(7201),
       q(0),
       ],
    q(gamilaraay) => [
-      q(3431),
+      q(3432),
       q(0),
       ],
    q(gamit) => [
-      q(2429),
+      q(2430),
       q(0),
       ],
    q(gamkonora) => [
-      q(2406),
+      q(2407),
       q(0),
       ],
    q(gamo) => [
-      q(2562),
+      q(2563),
       q(0),
       ],
    q(gamo-ningi) => [
-      q(1473),
+      q(1474),
       q(0),
       ],
    q(gan chinese) => [
-      q(2409),
+      q(2410),
       q(0),
       ],
    q(gana) => [
-      q(2579),
-      q(0),
+      q(2575),
+      q(1),
       ],
    q(ganang) => [
-      q(2570),
+      q(2571),
       q(0),
       ],
    q(ganda) => [
@@ -32934,7 +32958,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gandhari) => [
-      q(5426),
+      q(5427),
       q(0),
       ],
    q(gane) => [
@@ -32942,23 +32966,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ganggalida) => [
-      q(2444),
+      q(2445),
       q(0),
       ],
    q(ganglau) => [
-      q(2496),
+      q(2497),
       q(0),
       ],
    q(gangte) => [
-      q(2567),
+      q(2568),
       q(0),
       ],
    q(gangulu) => [
-      q(2575),
+      q(2576),
       q(0),
       ],
    q(gants) => [
-      q(2410),
+      q(2411),
       q(0),
       ],
    q(ganza) => [
@@ -32970,19 +32994,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gao) => [
-      q(2490),
+      q(2491),
       q(0),
       ],
    q(gapapaiwa) => [
-      q(5662),
+      q(5663),
       q(0),
       ],
    q(garhwali) => [
-      q(2430),
+      q(2431),
       q(0),
       ],
    q(garifuna) => [
-      q(1639),
+      q(1640),
       q(0),
       ],
    q(garig-ilgar) => [
@@ -32990,11 +33014,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(garingbal) => [
-      q(7343),
+      q(7344),
       q(0),
       ],
    q(garlali) => [
-      q(2548),
+      q(2549),
       q(0),
       ],
    q(garo) => [
@@ -33002,11 +33026,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(garre) => [
-      q(2486),
+      q(2487),
       q(0),
       ],
    q(garrwa) => [
-      q(7218),
+      q(7219),
       q(0),
       ],
    q(garus) => [
@@ -33014,15 +33038,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(garza) => [
-      q(7346),
+      q(7347),
       q(0),
       ],
    q(gata') => [
-      q(2412),
+      q(2413),
       q(0),
       ],
    q(gavak) => [
-      q(2083),
+      q(2084),
       q(0),
       ],
    q(gavar) => [
@@ -33054,23 +33078,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gbagyi) => [
-      q(2435),
+      q(2436),
       q(0),
       ],
    q(gban) => [
-      q(2500),
+      q(2501),
       q(1),
       ],
    q(gbanu) => [
-      q(2438),
+      q(2439),
       q(0),
       ],
    q(gbanziri) => [
-      q(2424),
+      q(2425),
       q(0),
       ],
    q(gbari) => [
-      q(2441),
+      q(2442),
       q(0),
       ],
    q(gbaya) => [
@@ -33082,19 +33106,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(gbaya (sudan)) => [
-      q(3586),
+      q(3587),
       q(0),
       ],
    q(gbaya-bossangoa) => [
-      q(2433),
+      q(2434),
       q(0),
       ],
    q(gbaya-bozoum) => [
-      q(2434),
+      q(2435),
       q(0),
       ],
    q(gbaya-mbodomo) => [
-      q(2559),
+      q(2560),
       q(0),
       ],
    q(gbayi) => [
@@ -33102,15 +33126,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gbesi gbe) => [
-      q(2436),
+      q(2437),
       q(0),
       ],
    q(gbii) => [
-      q(2491),
+      q(2492),
       q(0),
       ],
    q(gbin) => [
-      q(7339),
+      q(7340),
       q(0),
       ],
    q(gbiri-niragu) => [
@@ -33118,7 +33142,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gboloo grebo) => [
-      q(2474),
+      q(2475),
       q(0),
       ],
    q(ge) => [
@@ -33126,19 +33150,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(geba karen) => [
-      q(3682),
+      q(3683),
       q(0),
       ],
    q(gebe) => [
-      q(2478),
+      q(2479),
       q(0),
       ],
    q(gedaged) => [
-      q(2454),
+      q(2455),
       q(0),
       ],
    q(gedeo) => [
-      q(2144),
+      q(2145),
       q(0),
       ],
    q(geez) => [
@@ -33146,7 +33170,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(geji) => [
-      q(2531),
+      q(2532),
       q(0),
       ],
    q(gejia) => [
@@ -33154,31 +33178,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(geko karen) => [
-      q(2506),
+      q(2507),
       q(0),
       ],
    q(gela) => [
-      q(4948),
+      q(4949),
       q(0),
       ],
    q(geman deng) => [
-      q(4655),
+      q(4656),
       q(1),
       ],
    q(geme) => [
-      q(2482),
+      q(2483),
       q(0),
       ],
    q(gen) => [
-      q(2479),
+      q(2480),
       q(0),
       ],
    q(gende) => [
-      q(2401),
+      q(2402),
       q(0),
       ],
    q(gengle) => [
-      q(2476),
+      q(2477),
       q(0),
       ],
    q(georgian) => [
@@ -33186,15 +33210,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gepo) => [
-      q(7636),
+      q(7637),
       q(0),
       ],
    q(gera) => [
-      q(2485),
+      q(2486),
       q(0),
       ],
    q(gergiko) => [
-      q(4454),
+      q(4455),
       q(1),
       ],
    q(german) => [
@@ -33222,11 +33246,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(geruma) => [
-      q(2472),
+      q(2473),
       q(0),
       ],
    q(geser-gorom) => [
-      q(2483),
+      q(2484),
       q(0),
       ],
    q(gey) => [
@@ -33234,7 +33258,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ghadames) => [
-      q(2502),
+      q(2503),
       q(0),
       ],
    q(ghanaian pidgin english) => [
@@ -33246,11 +33270,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ghandruk sign language) => [
-      q(2468),
+      q(2469),
       q(0),
       ],
    q(ghanongga) => [
-      q(2508),
+      q(2509),
       q(0),
       ],
    q(ghari) => [
@@ -33258,7 +33282,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ghayavi) => [
-      q(1312),
+      q(1313),
       q(0),
       ],
    q(gheg albanian) => [
@@ -33266,19 +33290,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ghera) => [
-      q(2510),
+      q(2511),
       q(0),
       ],
    q(ghodoberi) => [
-      q(2465),
+      q(2466),
       q(0),
       ],
    q(ghomala') => [
-      q(1046),
+      q(1047),
       q(0),
       ],
    q(ghomara) => [
-      q(2509),
+      q(2510),
       q(0),
       ],
    q(ghotuo) => [
@@ -33286,27 +33310,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ghulfan) => [
-      q(2507),
+      q(2508),
       q(0),
       ],
    q(giangan) => [
-      q(1167),
+      q(1168),
       q(0),
       ],
    q(gibanawa) => [
-      q(2514),
+      q(2515),
       q(0),
       ],
    q(gichuka) => [
-      q(1906),
+      q(1907),
       q(1),
       ],
    q(gidar) => [
-      q(2516),
+      q(2517),
       q(0),
       ],
    q(giiwo) => [
-      q(3420),
+      q(3421),
       q(0),
       ],
    q(gikuyu) => [
@@ -33318,7 +33342,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gilaki) => [
-      q(2547),
+      q(2548),
       q(0),
       ],
    q(gilbertese) => [
@@ -33326,79 +33350,79 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gilima) => [
-      q(2528),
+      q(2529),
       q(0),
       ],
    q(gilyak) => [
-      q(4899),
+      q(4900),
       q(0),
       ],
    q(gimi (eastern highlands)) => [
-      q(2519),
+      q(2520),
       q(0),
       ],
    q(gimi (west new britain)) => [
-      q(2521),
+      q(2522),
       q(0),
       ],
    q(gimme) => [
-      q(3468),
+      q(3469),
       q(0),
       ],
    q(gimnime) => [
-      q(2560),
+      q(2561),
       q(0),
       ],
    q(ginuman) => [
-      q(2576),
+      q(2577),
       q(0),
       ],
    q(ginyanga) => [
-      q(0996),
+      q(0997),
       q(0),
       ],
    q(girawa) => [
-      q(1054),
+      q(1055),
       q(0),
       ],
    q(giryama) => [
-      q(5159),
+      q(5160),
       q(0),
       ],
    q(githabul) => [
-      q(2518),
+      q(2519),
       q(0),
       ],
    q(gitonga) => [
-      q(6639),
+      q(6640),
       q(0),
       ],
    q(gitua) => [
-      q(2499),
+      q(2500),
       q(0),
       ],
    q(gitxsan) => [
-      q(2525),
+      q(2526),
       q(0),
       ],
    q(giyug) => [
-      q(2529),
+      q(2530),
       q(0),
       ],
    q(gizrra) => [
-      q(6638),
+      q(6639),
       q(0),
       ],
    q(glaro-twabo) => [
-      q(2550),
+      q(2551),
       q(0),
       ],
    q(glavda) => [
-      q(2552),
+      q(2553),
       q(0),
       ],
    q(glio-oubi) => [
-      q(5334),
+      q(5335),
       q(0),
       ],
    q(gnau) => [
@@ -33410,7 +33434,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(goaria) => [
-      q(2517),
+      q(2518),
       q(0),
       ],
    q(gobasi) => [
@@ -33426,7 +33450,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(godwari) => [
-      q(2471),
+      q(2472),
       q(0),
       ],
    q(goemai) => [
@@ -33442,11 +33466,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gogodala) => [
-      q(2501),
+      q(2502),
       q(0),
       ],
    q(gokana) => [
-      q(2538),
+      q(2539),
       q(0),
       ],
    q(gola) => [
@@ -33458,7 +33482,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(golpa) => [
-      q(3931),
+      q(3932),
       q(0),
       ],
    q(gondi) => [
@@ -33474,11 +33498,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gonja) => [
-      q(2534),
+      q(2535),
       q(0),
       ],
    q(gooniyandi) => [
-      q(2573),
+      q(2574),
       q(0),
       ],
    q(gor) => [
@@ -33494,7 +33518,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(goreng) => [
-      q(7342),
+      q(7343),
       q(0),
       ],
    q(gorontalo) => [
@@ -33538,11 +33562,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(grangali) => [
-      q(4949),
+      q(4950),
       q(0),
       ],
    q(grass koiari) => [
-      q(3192),
+      q(3193),
       q(0),
       ],
    q(grebo) => [
@@ -33570,7 +33594,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(green gelao) => [
-      q(2522),
+      q(2523),
       q(0),
       ],
    q(greenlandic) => [
@@ -33578,7 +33602,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(grenadian creole english) => [
-      q(2447),
+      q(2448),
       q(0),
       ],
    q(gresi) => [
@@ -33594,7 +33618,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gros ventre) => [
-      q(0924),
+      q(0925),
       q(0),
       ],
    q(gua) => [
@@ -33602,7 +33626,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(guadeloupean creole french) => [
-      q(2446),
+      q(2447),
       q(0),
       ],
    q(guahibo) => [
@@ -33634,7 +33658,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(guanche) => [
-      q(2568),
+      q(2569),
       q(0),
       ],
    q(guanyinqiao) => [
@@ -33650,7 +33674,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(guarequena) => [
-      q(2400),
+      q(2401),
       q(0),
       ],
    q(guatemalan sign language) => [
@@ -33666,27 +33690,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gudang) => [
-      q(7340),
+      q(7341),
       q(0),
       ],
    q(gudanji) => [
-      q(4908),
+      q(4909),
       q(0),
       ],
    q(gude) => [
-      q(2455),
+      q(2456),
       q(0),
       ],
    q(gudu) => [
-      q(2470),
+      q(2471),
       q(0),
       ],
    q(guduf-gava) => [
-      q(2456),
+      q(2457),
       q(0),
       ],
    q(guernesiais) => [
-      q(5052),
+      q(5053),
       q(1),
       ],
    q(guerrero amuzgo) => [
@@ -33694,59 +33718,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(guerrero nahuatl) => [
-      q(4853),
+      q(4854),
       q(0),
       ],
    q(guevea de humboldt zapotec) => [
-      q(7918),
+      q(7920),
       q(0),
       ],
    q(gugadj) => [
-      q(2492),
+      q(2493),
       q(0),
       ],
    q(gugu badhun) => [
-      q(2453),
+      q(2454),
       q(0),
       ],
    q(gugu warra) => [
-      q(7228),
+      q(7229),
       q(0),
       ],
    q(gugubera) => [
-      q(3417),
+      q(3418),
       q(0),
       ],
    q(guguyimidjir) => [
-      q(3426),
+      q(3427),
       q(0),
       ],
    q(guhu-samane) => [
-      q(2511),
+      q(2512),
       q(0),
       ],
    q(guianese creole french) => [
-      q(2449),
+      q(2450),
       q(0),
       ],
    q(guibei zhuang) => [
-      q(7838),
+      q(7840),
       q(0),
       ],
    q(guiberoua bete) => [
-      q(1128),
+      q(1129),
       q(0),
       ],
    q(guibian zhuang) => [
-      q(7840),
+      q(7842),
       q(0),
       ],
    q(guila zapotec) => [
-      q(7960),
+      q(7962),
       q(0),
       ],
    q(guinea kpelle) => [
-      q(2540),
+      q(2541),
       q(0),
       ],
    q(guinean sign language) => [
@@ -33762,23 +33786,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gujari) => [
-      q(2535),
+      q(2536),
       q(0),
       ],
    q(gula (central african republic)) => [
-      q(3220),
+      q(3221),
       q(0),
       ],
    q(gula (chad)) => [
-      q(2551),
+      q(2552),
       q(0),
       ],
    q(gula iro) => [
-      q(2546),
+      q(2547),
       q(0),
       ],
    q(gula'alaa) => [
-      q(2555),
+      q(2556),
       q(0),
       ],
    q(gulay) => [
@@ -33786,7 +33810,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gule) => [
-      q(2553),
+      q(2554),
       q(0),
       ],
    q(gulf arabic) => [
@@ -33794,15 +33818,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(guliguli) => [
-      q(2545),
+      q(2546),
       q(0),
       ],
    q(gumalu) => [
-      q(2561),
+      q(2562),
       q(0),
       ],
    q(gumatj) => [
-      q(2577),
+      q(2578),
       q(0),
       ],
    q(gumawana) => [
@@ -33818,15 +33842,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gundi) => [
-      q(2459),
+      q(2460),
       q(0),
       ],
    q(gunditjmara) => [
-      q(2533),
+      q(2534),
       q(0),
       ],
    q(gundungurra) => [
-      q(7477),
+      q(7478),
       q(0),
       ],
    q(gungabula) => [
@@ -33834,7 +33858,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gungu) => [
-      q(5861),
+      q(5862),
       q(0),
       ],
    q(guntai) => [
@@ -33858,7 +33882,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(guragone) => [
-      q(2493),
+      q(2494),
       q(0),
       ],
    q(guramalum) => [
@@ -33870,7 +33894,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gurdjar) => [
-      q(2460),
+      q(2461),
       q(0),
       ],
    q(gureng gureng) => [
@@ -33878,7 +33902,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gurgula) => [
-      q(2494),
+      q(2495),
       q(0),
       ],
    q(guriaso) => [
@@ -33914,7 +33938,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(guwa) => [
-      q(7348),
+      q(7349),
       q(0),
       ],
    q(guwamu) => [
@@ -33922,11 +33946,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(guwinmal) => [
-      q(7345),
+      q(7346),
       q(1),
       ],
    q(guya) => [
-      q(2536),
+      q(2537),
       q(0),
       ],
    q(guyanese creole english) => [
@@ -33938,7 +33962,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gvoko) => [
-      q(4851),
+      q(4852),
       q(0),
       ],
    q(gwa) => [
@@ -33946,7 +33970,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gwahatike) => [
-      q(1942),
+      q(1943),
       q(0),
       ],
    q(gwak) => [
@@ -33954,7 +33978,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(gwamhi-wuri) => [
-      q(1160),
+      q(1161),
       q(0),
       ],
    q(gwandara) => [
@@ -33973,6 +33997,10 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2689),
       q(0),
       ],
+   q(gwi) => [
+      q(2686),
+      q(1),
+      ],
    q(gwich'in) => [
       q(0168),
       q(0),
@@ -34002,11 +34030,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hadrami) => [
-      q(7351),
+      q(7352),
       q(0),
       ],
    q(hadrami arabic) => [
-      q(0997),
+      q(0998),
       q(0),
       ],
    q(hadza) => [
@@ -34033,6 +34061,10 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2749),
       q(0),
       ],
+   q(haiom) => [
+      q(2748),
+      q(1),
+      ],
    q(haiphong sign language) => [
       q(2715),
       q(0),
@@ -34062,7 +34094,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(haka chin) => [
-      q(1798),
+      q(1799),
       q(0),
       ],
    q(hakka chinese) => [
@@ -34086,7 +34118,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(halh mongolian) => [
-      q(3340),
+      q(3341),
       q(0),
       ],
    q(halia) => [
@@ -34106,7 +34138,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hamea) => [
-      q(1739),
+      q(1740),
       q(1),
       ],
    q(hamer-banna) => [
@@ -34126,7 +34158,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hanga hundi) => [
-      q(7208),
+      q(7209),
       q(0),
       ],
    q(hangaza) => [
@@ -34138,7 +34170,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hano) => [
-      q(3986),
+      q(3987),
       q(0),
       ],
    q(hanoi sign language) => [
@@ -34150,7 +34182,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(harami) => [
-      q(7349),
+      q(7350),
       q(0),
       ],
    q(harari) => [
@@ -34158,7 +34190,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(harijan kinnauri) => [
-      q(3391),
+      q(3392),
       q(0),
       ],
    q(haroi) => [
@@ -34174,7 +34206,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(haruai) => [
-      q(6589),
+      q(6590),
       q(0),
       ],
    q(haruku) => [
@@ -34182,7 +34214,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(haryanvi) => [
-      q(1162),
+      q(1163),
       q(0),
       ],
    q(harzani) => [
@@ -34190,11 +34222,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hasha) => [
-      q(7603),
+      q(7604),
       q(0),
       ],
    q(hassaniyya) => [
-      q(4222),
+      q(4223),
       q(0),
       ],
    q(hatam) => [
@@ -34202,7 +34234,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hattic) => [
-      q(7354),
+      q(7355),
       q(0),
       ],
    q(hausa) => [
@@ -34214,7 +34246,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(havasupai-walapai-yavapai) => [
-      q(7765),
+      q(7767),
       q(0),
       ],
    q(haveke) => [
@@ -34254,7 +34286,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hdi) => [
-      q(7328),
+      q(7329),
       q(0),
       ],
    q(hebrew) => [
@@ -34274,7 +34306,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(helambu sherpa) => [
-      q(5935),
+      q(5936),
       q(0),
       ],
    q(helong) => [
@@ -34282,7 +34314,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hema) => [
-      q(4901),
+      q(4902),
       q(0),
       ],
    q(hemba) => [
@@ -34298,11 +34330,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hermit) => [
-      q(3960),
+      q(3961),
       q(0),
       ],
    q(hernican) => [
-      q(7353),
+      q(7354),
       q(0),
       ],
    q(hertevin) => [
@@ -34318,11 +34350,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(heyo) => [
-      q(0940),
+      q(0941),
       q(0),
       ],
    q(hiberno-scottish gaelic) => [
-      q(2503),
+      q(2504),
       q(0),
       ],
    q(hibito) => [
@@ -34338,27 +34370,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(higaonon) => [
-      q(4127),
+      q(4128),
       q(0),
       ],
    q(highland konjo) => [
-      q(3387),
+      q(3388),
       q(0),
       ],
    q(highland oaxaca chontal) => [
-      q(1719),
+      q(1720),
       q(0),
       ],
    q(highland popoluca) => [
-      q(5559),
+      q(5560),
       q(0),
       ],
    q(highland puebla nahuatl) => [
-      q(1020),
+      q(1021),
       q(0),
       ],
    q(highland totonac) => [
-      q(6648),
+      q(6649),
       q(0),
       ],
    q(hijazi arabic) => [
@@ -34390,7 +34422,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hinukh) => [
-      q(2520),
+      q(2521),
       q(0),
       ],
    q(hiri motu) => [
@@ -34414,11 +34446,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hlai) => [
-      q(3911),
+      q(3912),
       q(0),
       ],
    q(hlepho phowa) => [
-      q(7643),
+      q(7644),
       q(0),
       ],
    q(hlersu) => [
@@ -34434,7 +34466,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hmong daw) => [
-      q(4642),
+      q(4643),
       q(0),
       ],
    q(hmong do) => [
@@ -34458,7 +34490,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hmwaveke) => [
-      q(4514),
+      q(4515),
       q(0),
       ],
    q(ho) => [
@@ -34470,7 +34502,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ho-chunk) => [
-      q(7137),
+      q(7138),
       q(0),
       ],
    q(hoava) => [
@@ -34518,7 +34550,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hone) => [
-      q(3150),
+      q(3151),
       q(0),
       ],
    q(hong kong sign language) => [
@@ -34546,7 +34578,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(horpa) => [
-      q(2285),
+      q(2286),
       q(0),
       ],
    q(hote) => [
@@ -34589,16 +34621,20 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2864),
       q(0),
       ],
+   q(hua) => [
+      q(2853),
+      q(1),
+      ],
    q(huachipaeri) => [
       q(2857),
       q(0),
       ],
    q(huallaga huanuco quechua) => [
-      q(5679),
+      q(5680),
       q(0),
       ],
    q(huamalies-dos de mayo huanuco quechua) => [
-      q(5702),
+      q(5703),
       q(0),
       ],
    q(huambisa) => [
@@ -34606,7 +34642,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(huarijio) => [
-      q(6980),
+      q(6981),
       q(0),
       ],
    q(huastec) => [
@@ -34618,19 +34654,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(huautla mazatec) => [
-      q(4122),
+      q(4123),
       q(0),
       ],
    q(huaxcaleca nahuatl) => [
-      q(4873),
+      q(4874),
       q(0),
       ],
    q(huaylas ancash quechua) => [
-      q(5716),
+      q(5717),
       q(0),
       ],
    q(huaylla wanca quechua) => [
-      q(5711),
+      q(5712),
       q(0),
       ],
    q(huba) => [
@@ -34638,7 +34674,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(huehuetla tepehua) => [
-      q(6453),
+      q(6454),
       q(0),
       ],
    q(huichol) => [
@@ -34650,11 +34686,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(huitepec mixtec) => [
-      q(4664),
+      q(4665),
       q(0),
       ],
    q(huizhou chinese) => [
-      q(1932),
+      q(1933),
       q(0),
       ],
    q(hukumina) => [
@@ -34690,7 +34726,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hun-saare) => [
-      q(2171),
+      q(2172),
       q(0),
       ],
    q(hunde) => [
@@ -34714,7 +34750,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hungworo) => [
-      q(4734),
+      q(4735),
       q(1),
       ],
    q(hunjara-kaina ke) => [
@@ -34722,7 +34758,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hunnic) => [
-      q(7350),
+      q(7351),
       q(0),
       ],
    q(hunsrik) => [
@@ -34738,7 +34774,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hupde) => [
-      q(3157),
+      q(3158),
       q(0),
       ],
    q(hupla) => [
@@ -34746,15 +34782,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(hurrian) => [
-      q(7355),
+      q(7356),
       q(0),
       ],
    q(hutterisch) => [
-      q(2477),
+      q(2478),
       q(1),
       ],
    q(hutterite german) => [
-      q(2477),
+      q(2478),
       q(0),
       ],
    q(hwana) => [
@@ -34770,7 +34806,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(i'saka) => [
-      q(3601),
+      q(3602),
       q(1),
       ],
    q(i-wak) => [
@@ -34782,7 +34818,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(iamalele) => [
-      q(7694),
+      q(7696),
       q(0),
       ],
    q(iapama) => [
@@ -34794,11 +34830,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(iau) => [
-      q(6605),
+      q(6606),
       q(0),
       ],
    q(ibali teke) => [
-      q(6458),
+      q(6459),
       q(0),
       ],
    q(ibaloi) => [
@@ -34822,7 +34858,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(iberian) => [
-      q(7357),
+      q(7358),
       q(0),
       ],
    q(ibibio) => [
@@ -34850,11 +34886,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(iceve-maci) => [
-      q(1116),
+      q(1117),
       q(0),
       ],
    q(ida'an) => [
-      q(1962),
+      q(1963),
       q(0),
       ],
    q(idakho-isukha-tiriki) => [
@@ -34890,11 +34926,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(idu-mishmi) => [
-      q(1775),
+      q(1776),
       q(0),
       ],
    q(iduna) => [
-      q(7004),
+      q(7005),
       q(0),
       ],
    q(ife) => [
@@ -34930,7 +34966,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(iguta) => [
-      q(4732),
+      q(4733),
       q(0),
       ],
    q(igwe) => [
@@ -34950,7 +34986,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ija-zuba) => [
-      q(7006),
+      q(7007),
       q(0),
       ],
    q(ijo languages) => [
@@ -34978,15 +35014,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ikobi) => [
-      q(4202),
+      q(4203),
       q(0),
       ],
    q(ikoma-nata-isenye) => [
-      q(5092),
+      q(5093),
       q(0),
       ],
    q(ikpeng) => [
-      q(6817),
+      q(6818),
       q(0),
       ],
    q(ikpeshi) => [
@@ -34994,7 +35030,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ikposo) => [
-      q(3536),
+      q(3537),
       q(0),
       ],
    q(iku-gora-ankwa) => [
@@ -35030,11 +35066,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ilianen manobo) => [
-      q(4134),
+      q(4135),
       q(0),
       ],
    q(illyrian) => [
-      q(7359),
+      q(7360),
       q(0),
       ],
    q(iloko) => [
@@ -35050,11 +35086,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ilwana) => [
-      q(4375),
+      q(4376),
       q(0),
       ],
    q(imbabura highland quichua) => [
-      q(5703),
+      q(5704),
       q(0),
       ],
    q(imbongu) => [
@@ -35078,7 +35114,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(inapang) => [
-      q(4712),
+      q(4713),
       q(0),
       ],
    q(inapari) => [
@@ -35114,7 +35150,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(indonesian bajau) => [
-      q(1099),
+      q(1100),
       q(0),
       ],
    q(indonesian sign language) => [
@@ -35126,15 +35162,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(indus kohistani) => [
-      q(4622),
+      q(4623),
       q(0),
       ],
    q(indus valley language) => [
-      q(7364),
+      q(7365),
       q(0),
       ],
    q(inebu one) => [
-      q(5216),
+      q(5217),
       q(0),
       ],
    q(ineseno) => [
@@ -35162,7 +35198,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(inonhan) => [
-      q(4015),
+      q(4016),
       q(0),
       ],
    q(inor) => [
@@ -35170,7 +35206,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(inpui naga) => [
-      q(4926),
+      q(4927),
       q(0),
       ],
    q(interglossa) => [
@@ -35214,7 +35250,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ipalapa amuzgo) => [
-      q(1016),
+      q(1017),
       q(0),
       ],
    q(ipiko) => [
@@ -35242,7 +35278,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(iranian persian) => [
-      q(5417),
+      q(5418),
       q(0),
       ],
    q(irantxe) => [
@@ -35330,11 +35366,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(isirawa) => [
-      q(6217),
+      q(6218),
       q(0),
       ],
    q(island carib) => [
-      q(1844),
+      q(1845),
       q(0),
       ],
    q(islander creole english) => [
@@ -35354,23 +35390,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(isthmus mixe) => [
-      q(4313),
+      q(4314),
       q(0),
       ],
    q(isthmus zapotec) => [
-      q(7811),
+      q(7813),
       q(0),
       ],
    q(isthmus-cosoleacaque nahuatl) => [
-      q(4868),
+      q(4869),
       q(0),
       ],
    q(isthmus-mecayapan nahuatl) => [
-      q(4879),
+      q(4880),
       q(0),
       ],
    q(isthmus-pajapan nahuatl) => [
-      q(4872),
+      q(4873),
       q(0),
       ],
    q(istriot) => [
@@ -35378,11 +35414,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(istro romanian) => [
-      q(5869),
+      q(5870),
       q(0),
       ],
    q(isu (fako division)) => [
-      q(6355),
+      q(6356),
       q(0),
       ],
    q(isu (menchum division)) => [
@@ -35434,7 +35470,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(itundujia mixtec) => [
-      q(4156),
+      q(4157),
       q(0),
       ],
    q(itza) => [
@@ -35458,7 +35494,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(iwal) => [
-      q(3194),
+      q(3195),
       q(0),
       ],
    q(iwam) => [
@@ -35474,7 +35510,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ixcatlan mazatec) => [
-      q(4700),
+      q(4701),
       q(0),
       ],
    q(ixil) => [
@@ -35482,11 +35518,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ixtayutla mixtec) => [
-      q(7026),
+      q(7027),
       q(0),
       ],
    q(ixtenco otomi) => [
-      q(5332),
+      q(5333),
       q(0),
       ],
    q(iyayu) => [
@@ -35494,19 +35530,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(iyive) => [
-      q(6877),
+      q(6878),
       q(0),
       ],
    q(iyo) => [
-      q(4761),
+      q(4762),
       q(0),
       ],
    q(iyo'wujwa chorote) => [
-      q(1856),
+      q(1857),
       q(0),
       ],
    q(iyojwa'ja chorote) => [
-      q(1859),
+      q(1860),
       q(0),
       ],
    q(izere) => [
@@ -35522,7 +35558,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(izora) => [
-      q(1670),
+      q(1671),
       q(0),
       ],
    q(jabuti) => [
@@ -35546,11 +35582,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jair awyu) => [
-      q(0980),
+      q(0981),
       q(0),
       ],
    q(jaitmatang) => [
-      q(7367),
+      q(7368),
       q(0),
       ],
    q(jakalteko) => [
@@ -35566,11 +35602,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jalapa de diaz mazatec) => [
-      q(4118),
+      q(4119),
       q(0),
       ],
    q(jalkunan) => [
-      q(1577),
+      q(1578),
       q(0),
       ],
    q(jamaican country sign language) => [
@@ -35594,11 +35630,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jamiltepec mixtec) => [
-      q(4665),
+      q(4666),
       q(0),
       ],
    q(jamsay dogon) => [
-      q(2066),
+      q(2067),
       q(0),
       ],
    q(jandai) => [
@@ -35610,7 +35646,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jangkang) => [
-      q(2068),
+      q(2069),
       q(0),
       ],
    q(jangshung) => [
@@ -35630,15 +35666,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(japanese sign language) => [
-      q(3145),
+      q(3146),
       q(0),
       ],
    q(japreria) => [
-      q(3144),
+      q(3145),
       q(0),
       ],
    q(jaqaru) => [
-      q(3140),
+      q(3141),
       q(0),
       ],
    q(jara) => [
@@ -35646,7 +35682,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jarai) => [
-      q(3141),
+      q(3142),
       q(0),
       ],
    q(jarawa (india)) => [
@@ -35654,11 +35690,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jaru) => [
-      q(1982),
+      q(1983),
       q(0),
       ],
    q(jauja wanca quechua) => [
-      q(5732),
+      q(5733),
       q(0),
       ],
    q(jaunsari) => [
@@ -35670,7 +35706,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(javindo) => [
-      q(3164),
+      q(3165),
       q(0),
       ],
    q(jawe) => [
@@ -35678,7 +35714,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jaya) => [
-      q(3169),
+      q(3170),
       q(0),
       ],
    q(jebero) => [
@@ -35698,11 +35734,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jemez) => [
-      q(6651),
+      q(6652),
       q(0),
       ],
    q(jenaama bozo) => [
-      q(1616),
+      q(1617),
       q(0),
       ],
    q(jeng) => [
@@ -35710,7 +35746,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jennu kurumba) => [
-      q(7533),
+      q(7534),
       q(0),
       ],
    q(jere) => [
@@ -35722,7 +35758,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jerriais) => [
-      q(5052),
+      q(5053),
       q(0),
       ],
    q(jerung) => [
@@ -35730,11 +35766,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jewish babylonian aramaic (ca. 200-1200 ce)) => [
-      q(6602),
+      q(6603),
       q(0),
       ],
    q(jewish palestinian aramaic) => [
-      q(3139),
+      q(3140),
       q(0),
       ],
    q(jhankot sign language) => [
@@ -35746,11 +35782,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jiarong) => [
-      q(3167),
+      q(3168),
       q(0),
       ],
    q(jiba) => [
-      q(3156),
+      q(3157),
       q(0),
       ],
    q(jibu) => [
@@ -35790,19 +35826,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(jinyu chinese) => [
-      q(1753),
+      q(1754),
       q(0),
       ],
    q(jiongnai bunu) => [
-      q(5547),
+      q(5548),
       q(0),
       ],
    q(jirel) => [
-      q(3153),
+      q(3154),
       q(0),
       ],
    q(jiru) => [
-      q(3142),
+      q(3143),
       q(0),
       ],
    q(jita) => [
@@ -35810,7 +35846,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jju) => [
-      q(3176),
+      q(3177),
       q(0),
       ],
    q(joba) => [
@@ -35821,12 +35857,16 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(3065),
       q(0),
       ],
+   q(jogi) => [
+      q(3136),
+      q(0),
+      ],
    q(jola-fonyi) => [
-      q(2204),
+      q(2205),
       q(0),
       ],
    q(jola-kasa) => [
-      q(1874),
+      q(1875),
       q(0),
       ],
    q(jonkor bourmataguil) => [
@@ -35834,31 +35874,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(jora) => [
-      q(3136),
+      q(3137),
       q(0),
       ],
    q(jordanian sign language) => [
-      q(3137),
+      q(3138),
       q(0),
       ],
    q(jorto) => [
-      q(3143),
+      q(3144),
       q(0),
       ],
    q(jowulu) => [
-      q(3138),
+      q(3139),
       q(0),
       ],
    q(ju) => [
-      q(3161),
+      q(3162),
       q(0),
       ],
    q(ju/'hoan) => [
-      q(3644),
+      q(3645),
       q(0),
       ],
    q(juang) => [
-      q(3155),
+      q(3156),
       q(0),
       ],
    q(judeo-arabic) => [
@@ -35874,7 +35914,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(judeo-iraqi arabic) => [
-      q(7642),
+      q(7643),
       q(0),
       ],
    q(judeo-italian) => [
@@ -35894,7 +35934,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(judeo-tripolitanian arabic) => [
-      q(7763),
+      q(7765),
       q(0),
       ],
    q(judeo-tunisian arabic) => [
@@ -35902,23 +35942,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(judeo-yemeni arabic) => [
-      q(3168),
+      q(3169),
       q(0),
       ],
+   q(juhoan) => [
+      q(3645),
+      q(1),
+      ],
    q(jukun takum) => [
       q(3067),
       q(0),
       ],
    q(juma) => [
-      q(3146),
+      q(3147),
       q(0),
       ],
    q(jumjum) => [
-      q(3154),
+      q(3155),
       q(0),
       ],
    q(jumla sign language) => [
-      q(3159),
+      q(3160),
       q(0),
       ],
    q(jumli) => [
@@ -35930,75 +35974,75 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(juquila mixe) => [
-      q(4662),
+      q(4663),
       q(0),
       ],
    q(jur modo) => [
-      q(1132),
+      q(1133),
       q(0),
       ],
    q(juray) => [
-      q(3163),
+      q(3164),
       q(0),
       ],
    q(jurchen) => [
-      q(3148),
+      q(3149),
       q(0),
       ],
    q(juruna) => [
-      q(3158),
+      q(3159),
       q(0),
       ],
    q(jutish) => [
-      q(3160),
+      q(3161),
       q(0),
       ],
    q(juwal) => [
-      q(4625),
+      q(4626),
       q(0),
       ],
    q(juxtlahuaca mixtec) => [
-      q(7019),
+      q(7020),
       q(0),
       ],
    q(jwira-pepesa) => [
-      q(3166),
+      q(3167),
       q(0),
       ],
    q(k'iche') => [
-      q(5680),
+      q(5681),
       q(0),
       ],
    q(kaamba) => [
-      q(7387),
+      q(7388),
       q(0),
       ],
    q(kaan) => [
-      q(3853),
+      q(3854),
       q(0),
       ],
    q(kaang chin) => [
-      q(1757),
+      q(1758),
       q(0),
       ],
    q(kaansa) => [
-      q(2566),
+      q(2567),
       q(0),
       ],
    q(kaapor) => [
-      q(6926),
+      q(6927),
       q(1),
       ],
    q(kaapor sign language) => [
-      q(6885),
+      q(6886),
       q(1),
       ],
    q(kaba) => [
-      q(3608),
+      q(3609),
       q(0),
       ],
    q(kabalai) => [
-      q(3671),
+      q(3672),
       q(0),
       ],
    q(kabardian) => [
@@ -36006,47 +36050,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kabatei) => [
-      q(7382),
+      q(7383),
       q(0),
       ],
    q(kabixi) => [
-      q(7305),
+      q(7306),
       q(0),
       ],
    q(kabiye) => [
-      q(3197),
+      q(3198),
       q(0),
       ],
    q(kabola) => [
-      q(3453),
+      q(3454),
       q(0),
       ],
    q(kabore one) => [
-      q(5272),
+      q(5273),
       q(0),
       ],
    q(kabras) => [
-      q(3939),
+      q(3940),
       q(0),
       ],
    q(kaburi) => [
-      q(6879),
+      q(6880),
       q(0),
       ],
    q(kabutra) => [
-      q(3202),
+      q(3203),
       q(0),
       ],
    q(kabuverdianu) => [
-      q(3256),
+      q(3257),
       q(0),
       ],
    q(kabwa) => [
-      q(1923),
+      q(1924),
       q(0),
       ],
    q(kabwari) => [
-      q(3230),
+      q(3231),
       q(0),
       ],
    q(kabyle) => [
@@ -36054,19 +36098,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kachama-ganjule) => [
-      q(3231),
+      q(3232),
       q(0),
       ],
    q(kachari) => [
-      q(7273),
+      q(7274),
       q(0),
       ],
    q(kachchi) => [
-      q(3299),
+      q(3300),
       q(0),
       ],
    q(kachi koli) => [
-      q(2532),
+      q(2533),
       q(0),
       ],
    q(kachin) => [
@@ -36074,67 +36118,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kacipo-balesi) => [
-      q(3507),
+      q(3508),
       q(0),
       ],
    q(kaco') => [
-      q(7378),
+      q(7379),
       q(0),
       ],
    q(kadai) => [
-      q(3770),
+      q(3771),
       q(0),
       ],
    q(kadar) => [
-      q(3265),
+      q(3266),
       q(0),
       ],
    q(kadaru) => [
-      q(3251),
+      q(3252),
       q(0),
       ],
    q(kadiweu) => [
-      q(3186),
+      q(3187),
       q(0),
       ],
    q(kadu) => [
-      q(7858),
+      q(7860),
       q(0),
       ],
    q(kaduo) => [
-      q(3634),
+      q(3635),
       q(0),
       ],
    q(kafa) => [
-      q(3199),
+      q(3200),
       q(0),
       ],
    q(kafoa) => [
-      q(3541),
+      q(3542),
       q(0),
       ],
    q(kagan kalagan) => [
-      q(3439),
+      q(3440),
       q(0),
       ],
    q(kagate) => [
-      q(6343),
+      q(6344),
       q(0),
       ],
    q(kagayanen) => [
-      q(1715),
+      q(1716),
       q(0),
       ],
    q(kagoma) => [
-      q(3245),
+      q(3246),
       q(0),
       ],
    q(kagoro) => [
-      q(7374),
+      q(7375),
       q(0),
       ],
    q(kagulu) => [
-      q(3410),
+      q(3411),
       q(0),
       ],
    q(kahe) => [
@@ -36146,119 +36190,119 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kaian) => [
-      q(3227),
+      q(3228),
       q(0),
       ],
    q(kaibobo) => [
-      q(3768),
+      q(3769),
       q(0),
       ],
    q(kaidipang) => [
-      q(3781),
+      q(3782),
       q(0),
       ],
    q(kaiep) => [
-      q(3204),
+      q(3205),
       q(0),
       ],
    q(kaikadi) => [
-      q(3271),
+      q(3272),
       q(0),
       ],
    q(kaikavian literary language) => [
-      q(3398),
+      q(3399),
       q(0),
       ],
    q(kaike) => [
-      q(3782),
+      q(3783),
       q(0),
       ],
    q(kaiku) => [
-      q(3418),
+      q(3419),
       q(0),
       ],
    q(kaimbe) => [
-      q(7277),
+      q(7278),
       q(0),
       ],
    q(kaimbulawa) => [
-      q(7856),
+      q(7858),
       q(0),
       ],
    q(kaingang) => [
-      q(3322),
+      q(3323),
       q(0),
       ],
    q(kairak) => [
-      q(1760),
+      q(1761),
       q(0),
       ],
    q(kairiru) => [
-      q(3717),
+      q(3718),
       q(0),
       ],
    q(kairui-midiki) => [
-      q(3575),
+      q(3576),
       q(0),
       ],
    q(kais) => [
-      q(3778),
+      q(3779),
       q(0),
       ],
    q(kaivi) => [
-      q(3212),
+      q(3213),
       q(0),
       ],
    q(kaiwa) => [
-      q(3317),
+      q(3318),
       q(0),
       ],
    q(kaiy) => [
-      q(6419),
+      q(6420),
       q(0),
       ],
    q(kajakse) => [
-      q(1759),
+      q(1760),
       q(0),
       ],
    q(kajali) => [
-      q(7377),
+      q(7378),
       q(0),
       ],
    q(kajaman) => [
-      q(3173),
+      q(3174),
       q(0),
       ],
    q(kakabai) => [
-      q(3552),
+      q(3553),
       q(0),
       ],
    q(kakabe) => [
-      q(3406),
+      q(3407),
       q(0),
       ],
    q(kakanda) => [
-      q(3402),
+      q(3403),
       q(0),
       ],
    q(kaki ae) => [
-      q(6382),
+      q(6383),
       q(0),
       ],
    q(kako) => [
-      q(3411),
+      q(3412),
       q(0),
       ],
    q(kakwa) => [
-      q(3270),
+      q(3271),
       q(0),
       ],
    q(kala) => [
-      q(3219),
+      q(3220),
       q(1),
       ],
    q(kala lagaw ya) => [
-      q(4636),
+      q(4637),
       q(0),
       ],
    q(kalaallisut) => [
@@ -36266,11 +36310,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kalaamaya) => [
-      q(3947),
+      q(3948),
       q(0),
       ],
    q(kalabakan) => [
-      q(3670),
+      q(3671),
       q(0),
       ],
    q(kalabari) => [
@@ -36278,19 +36322,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kalabra) => [
-      q(3791),
+      q(3792),
       q(0),
       ],
    q(kalagan) => [
-      q(3551),
+      q(3552),
       q(0),
       ],
    q(kalaktang monpa) => [
-      q(3407),
+      q(3408),
       q(0),
       ],
    q(kalam) => [
-      q(3460),
+      q(3461),
       q(0),
       ],
    q(kalami) => [
@@ -36298,47 +36342,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kalamse) => [
-      q(3503),
+      q(3504),
       q(0),
       ],
    q(kalanadi) => [
-      q(7147),
+      q(7148),
       q(0),
       ],
    q(kalanga) => [
-      q(3218),
+      q(3219),
       q(0),
       ],
    q(kalao) => [
-      q(3452),
+      q(3453),
       q(0),
       ],
    q(kalapuya) => [
-      q(3752),
+      q(3753),
       q(0),
       ],
    q(kalarko) => [
-      q(3184),
+      q(3185),
       q(0),
       ],
    q(kalasha) => [
-      q(3446),
+      q(3447),
       q(0),
       ],
    q(kalenjin) => [
-      q(3441),
+      q(3442),
       q(0),
       ],
    q(kalispel-pend d'oreille) => [
-      q(2352),
+      q(2353),
       q(0),
       ],
    q(kalkoti) => [
-      q(7368),
+      q(7369),
       q(0),
       ],
    q(kalkutung) => [
-      q(3625),
+      q(3626),
       q(0),
       ],
    q(kalmyk) => [
@@ -36346,43 +36390,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kalo finnish romani) => [
-      q(5809),
+      q(5810),
       q(0),
       ],
    q(kalou) => [
-      q(7783),
+      q(7785),
       q(0),
       ],
    q(kaluli) => [
-      q(1077),
+      q(1078),
       q(0),
       ],
    q(kalumpang) => [
-      q(3436),
+      q(3437),
       q(0),
       ],
    q(kam) => [
-      q(3253),
+      q(3254),
       q(0),
       ],
    q(kamakan) => [
-      q(7010),
+      q(7011),
       q(0),
       ],
    q(kamang) => [
-      q(7202),
+      q(7203),
       q(0),
       ],
    q(kamano) => [
-      q(3198),
+      q(3199),
       q(0),
       ],
    q(kamantan) => [
-      q(3216),
+      q(3217),
       q(0),
       ],
    q(kamar) => [
-      q(3272),
+      q(3273),
       q(0),
       ],
    q(kamara) => [
@@ -36390,31 +36434,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kamarian) => [
-      q(3789),
+      q(3790),
       q(0),
       ],
    q(kamaru) => [
-      q(3330),
+      q(3331),
       q(0),
       ],
    q(kamas) => [
-      q(7285),
+      q(7286),
       q(0),
       ],
    q(kamasa) => [
-      q(3443),
+      q(3444),
       q(0),
       ],
    q(kamasau) => [
-      q(3471),
+      q(3472),
       q(0),
       ],
    q(kamayo) => [
-      q(3751),
+      q(3752),
       q(0),
       ],
    q(kamayura) => [
-      q(3183),
+      q(3184),
       q(0),
       ],
    q(kamba) => [
@@ -36422,7 +36466,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kamba (brazil)) => [
-      q(7291),
+      q(7292),
       q(0),
       ],
    q(kamba (kenya)) => [
@@ -36430,15 +36474,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(kambaata) => [
-      q(3620),
+      q(3621),
       q(0),
       ],
    q(kambaira) => [
-      q(3765),
+      q(3766),
       q(0),
       ],
    q(kambera) => [
-      q(7303),
+      q(7304),
       q(0),
       ],
    q(kamberau) => [
@@ -36446,39 +36490,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kambiwa) => [
-      q(7304),
+      q(7305),
       q(0),
       ],
    q(kami (nigeria)) => [
-      q(3461),
+      q(3462),
       q(0),
       ],
    q(kami (tanzania)) => [
-      q(3228),
+      q(3229),
       q(0),
       ],
    q(kamo) => [
-      q(3224),
+      q(3225),
       q(0),
       ],
    q(kamoro) => [
-      q(3323),
+      q(3324),
       q(0),
       ],
    q(kamta) => [
-      q(5802),
+      q(5803),
       q(1),
       ],
    q(kamu) => [
-      q(7425),
+      q(7426),
       q(0),
       ],
    q(kamula) => [
-      q(7393),
+      q(7394),
       q(0),
       ],
    q(kamviri) => [
-      q(7543),
+      q(7544),
       q(0),
       ],
    q(kamwe) => [
@@ -36486,55 +36530,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kanakanabu) => [
-      q(7432),
+      q(7433),
       q(0),
       ],
    q(kanamari) => [
-      q(3490),
+      q(3491),
       q(0),
       ],
    q(kanan) => [
-      q(7862),
+      q(7864),
       q(0),
       ],
    q(kanashi) => [
-      q(7440),
+      q(7441),
       q(0),
       ],
    q(kanasi) => [
-      q(6168),
+      q(6169),
       q(0),
       ],
    q(kanauji) => [
-      q(1238),
+      q(1239),
       q(0),
       ],
    q(kandas) => [
-      q(3569),
+      q(3570),
       q(0),
       ],
    q(kandawo) => [
-      q(2408),
+      q(2409),
       q(0),
       ],
    q(kande) => [
-      q(3200),
+      q(3201),
       q(0),
       ],
    q(kanembu) => [
-      q(3193),
+      q(3194),
       q(0),
       ],
    q(kang) => [
-      q(3756),
+      q(3757),
       q(0),
       ],
    q(kanga) => [
-      q(3223),
+      q(3224),
       q(0),
       ],
    q(kangean) => [
-      q(3423),
+      q(3424),
       q(0),
       ],
    q(kanggape) => [
@@ -36542,63 +36586,63 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kangjia) => [
-      q(3733),
+      q(3734),
       q(0),
       ],
    q(kango (bas-uele district)) => [
-      q(3643),
+      q(3644),
       q(0),
       ],
    q(kango (tshopo district)) => [
-      q(3790),
+      q(3791),
       q(0),
       ],
    q(kangri) => [
-      q(7439),
+      q(7440),
       q(0),
       ],
    q(kaniet) => [
-      q(3629),
+      q(3630),
       q(0),
       ],
    q(kanikkaran) => [
-      q(3277),
+      q(3278),
       q(0),
       ],
    q(kaningdon-nindem) => [
-      q(3247),
+      q(3248),
       q(0),
       ],
    q(kaningi) => [
-      q(3780),
+      q(3781),
       q(0),
       ],
    q(kaningra) => [
-      q(3495),
+      q(3496),
       q(0),
       ],
    q(kaninuwa) => [
-      q(7070),
+      q(7071),
       q(0),
       ],
    q(kanite) => [
-      q(3473),
+      q(3474),
       q(0),
       ],
    q(kanjari) => [
-      q(3301),
+      q(3302),
       q(0),
       ],
    q(kanjobal) => [
-      q(3378),
+      q(3379),
       q(1),
       ],
    q(kanju) => [
-      q(3187),
+      q(3188),
       q(0),
       ],
    q(kankanaey) => [
-      q(3483),
+      q(3484),
       q(0),
       ],
    q(kannada) => [
@@ -36606,31 +36650,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kannada kurumba) => [
-      q(3290),
+      q(3291),
       q(0),
       ],
    q(kanoe) => [
-      q(3729),
+      q(3730),
       q(0),
       ],
    q(kanowit-tanjong melanau) => [
-      q(3728),
+      q(3729),
       q(0),
       ],
    q(kansa) => [
-      q(3603),
+      q(3604),
       q(0),
       ],
    q(kantosi) => [
-      q(7386),
+      q(7387),
       q(0),
       ],
    q(kanu) => [
-      q(3351),
+      q(3352),
       q(0),
       ],
    q(kanufi) => [
-      q(3486),
+      q(3487),
       q(0),
       ],
    q(kanuri) => [
@@ -36638,19 +36682,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kanyok) => [
-      q(3502),
+      q(3503),
       q(0),
       ],
    q(kao) => [
-      q(3182),
+      q(3183),
       q(0),
       ],
    q(kaonde) => [
-      q(3560),
+      q(3561),
       q(0),
       ],
    q(kap) => [
-      q(7667),
+      q(7669),
       q(0),
       ],
    q(kapampangan) => [
@@ -36658,55 +36702,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(kapauri) => [
-      q(3343),
+      q(3344),
       q(1),
       ],
    q(kapin) => [
-      q(6401),
+      q(6402),
       q(0),
       ],
    q(kapinawa) => [
-      q(7464),
+      q(7465),
       q(0),
       ],
    q(kapingamarangi) => [
-      q(3528),
+      q(3529),
       q(0),
       ],
    q(kapori) => [
-      q(3343),
+      q(3344),
       q(0),
       ],
    q(kapriman) => [
-      q(2070),
+      q(2071),
       q(0),
       ],
    q(kaptiau) => [
-      q(3190),
+      q(3191),
       q(0),
       ],
    q(kapya) => [
-      q(3442),
+      q(3443),
       q(0),
       ],
    q(kaqchikel) => [
-      q(1646),
+      q(1647),
       q(0),
       ],
    q(kara (central african republic)) => [
-      q(3174),
+      q(3175),
       q(0),
       ],
    q(kara (korea)) => [
-      q(7939),
+      q(7941),
       q(0),
       ],
    q(kara (papua new guinea)) => [
-      q(3878),
+      q(3879),
       q(0),
       ],
    q(kara (tanzania)) => [
-      q(5766),
+      q(5767),
       q(0),
       ],
    q(kara-kalpak) => [
@@ -36718,79 +36762,79 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(karadjeri) => [
-      q(2421),
+      q(2422),
       q(0),
       ],
    q(karagas) => [
-      q(3365),
+      q(3366),
       q(0),
       ],
    q(karahawyana) => [
-      q(7375),
+      q(7376),
       q(0),
       ],
    q(karaim) => [
-      q(3249),
+      q(3250),
       q(0),
       ],
    q(karaja) => [
-      q(3531),
+      q(3532),
       q(0),
       ],
    q(karakhanid) => [
-      q(7473),
+      q(7474),
       q(0),
       ],
    q(karami) => [
-      q(7284),
+      q(7285),
       q(0),
       ],
    q(karamojong) => [
-      q(3242),
+      q(3243),
       q(0),
       ],
    q(karang) => [
-      q(3783),
+      q(3784),
       q(0),
       ],
    q(karanga) => [
-      q(3626),
+      q(3627),
       q(0),
       ],
    q(karankawa) => [
-      q(7861),
+      q(7863),
       q(0),
       ],
    q(karao) => [
-      q(3750),
+      q(3751),
       q(0),
       ],
    q(karas) => [
-      q(3328),
+      q(3329),
       q(0),
       ],
    q(karata) => [
-      q(3540),
+      q(3541),
       q(0),
       ],
    q(karawa) => [
-      q(7487),
+      q(7488),
       q(0),
       ],
    q(karbi) => [
-      q(4339),
+      q(4340),
       q(0),
       ],
    q(kare (central african republic)) => [
-      q(3195),
+      q(3196),
       q(0),
       ],
    q(kare (papua new guinea)) => [
-      q(3458),
+      q(3459),
       q(0),
       ],
    q(karekare) => [
-      q(3175),
+      q(3176),
       q(0),
       ],
    q(karelian) => [
@@ -36802,59 +36846,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(karenggapa) => [
-      q(2211),
+      q(2212),
       q(0),
       ],
    q(karey) => [
-      q(3744),
+      q(3745),
       q(0),
       ],
    q(kari) => [
-      q(3191),
+      q(3192),
       q(0),
       ],
    q(karingani) => [
-      q(3320),
+      q(3321),
       q(0),
       ],
    q(karipuna) => [
-      q(3319),
+      q(3320),
       q(0),
       ],
    q(karipuna creole french) => [
-      q(3474),
+      q(3475),
       q(0),
       ],
    q(kariri-xoco) => [
-      q(3788),
+      q(3789),
       q(0),
       ],
    q(karitiana) => [
-      q(3632),
+      q(3633),
       q(0),
       ],
    q(kariya) => [
-      q(3364),
+      q(3365),
       q(0),
       ],
    q(kariyarra) => [
-      q(7005),
+      q(7006),
       q(0),
       ],
    q(karkar-yuri) => [
-      q(7768),
+      q(7770),
       q(0),
       ],
    q(karkin) => [
-      q(3574),
+      q(3575),
       q(0),
       ],
    q(karko) => [
-      q(3416),
+      q(3417),
       q(0),
       ],
    q(karnai) => [
-      q(1058),
+      q(1059),
       q(0),
       ],
    q(karo (brazil)) => [
@@ -36862,43 +36906,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(karo (ethiopia)) => [
-      q(3722),
+      q(3723),
       q(0),
       ],
    q(karok) => [
-      q(3748),
+      q(3749),
       q(0),
       ],
    q(karon) => [
-      q(3590),
+      q(3591),
       q(0),
       ],
    q(karon dori) => [
-      q(3329),
+      q(3330),
       q(0),
       ],
    q(karore) => [
-      q(7390),
+      q(7391),
       q(0),
       ],
    q(karranga) => [
-      q(7483),
+      q(7484),
       q(0),
       ],
    q(karuwali) => [
-      q(5881),
+      q(5882),
       q(0),
       ],
    q(kasanga) => [
-      q(1685),
+      q(1686),
       q(0),
       ],
    q(kasem) => [
-      q(7496),
+      q(7497),
       q(0),
       ],
    q(kashaya) => [
-      q(3397),
+      q(3398),
       q(0),
       ],
    q(kashmiri) => [
@@ -36910,123 +36954,123 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kasiguranin) => [
-      q(3606),
+      q(3607),
       q(0),
       ],
    q(kaska) => [
-      q(3427),
+      q(3428),
       q(0),
       ],
    q(kaskean) => [
-      q(7946),
+      q(7948),
       q(0),
       ],
    q(kasseng) => [
-      q(3310),
+      q(3311),
       q(0),
       ],
    q(kasua) => [
-      q(3346),
+      q(3347),
       q(0),
       ],
    q(kataang) => [
-      q(3311),
+      q(3312),
       q(0),
       ],
    q(katabaga) => [
-      q(3635),
+      q(3636),
       q(0),
       ],
    q(katawixi) => [
-      q(7286),
+      q(7287),
       q(0),
       ],
    q(katbol) => [
-      q(6587),
+      q(6588),
       q(0),
       ],
    q(katcha-kadugli-miri) => [
-      q(7508),
+      q(7509),
       q(0),
       ],
    q(kate) => [
-      q(3459),
+      q(3460),
       q(0),
       ],
    q(kathoriya tharu) => [
-      q(6559),
+      q(6560),
       q(0),
       ],
    q(kathu) => [
-      q(7671),
+      q(7673),
       q(0),
       ],
    q(kati) => [
-      q(1452),
+      q(1453),
       q(0),
       ],
    q(katkari) => [
-      q(3302),
+      q(3303),
       q(0),
       ],
    q(katla) => [
-      q(3225),
+      q(3226),
       q(0),
       ],
    q(kato) => [
-      q(3641),
+      q(3642),
       q(0),
       ],
    q(katso) => [
-      q(3172),
+      q(3173),
       q(0),
       ],
    q(katua) => [
-      q(3619),
+      q(3620),
       q(0),
       ],
    q(katukina) => [
-      q(3181),
+      q(3182),
       q(0),
       ],
    q(kaulong) => [
-      q(5622),
+      q(5623),
       q(0),
       ],
    q(kaur) => [
-      q(7008),
+      q(7009),
       q(0),
       ],
    q(kaure) => [
-      q(1386),
+      q(1387),
       q(0),
       ],
    q(kaurna) => [
-      q(7867),
+      q(7869),
       q(0),
       ],
    q(kauwera) => [
-      q(7287),
+      q(7288),
       q(0),
       ],
    q(kavalan) => [
-      q(1764),
+      q(1765),
       q(0),
       ],
    q(kavet) => [
-      q(3588),
+      q(3589),
       q(0),
       ],
    q(kawacha) => [
-      q(3209),
+      q(3210),
       q(0),
       ],
    q(kawaiisu) => [
-      q(7289),
+      q(7290),
       q(0),
       ],
    q(kawe) => [
-      q(3309),
+      q(3310),
       q(0),
       ],
    q(kawi) => [
@@ -37034,39 +37078,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kaxarari) => [
-      q(3642),
+      q(3643),
       q(0),
       ],
    q(kaxuiana) => [
-      q(3185),
+      q(3186),
       q(0),
       ],
    q(kayabi) => [
-      q(3766),
+      q(3767),
       q(0),
       ],
    q(kayagar) => [
-      q(3760),
+      q(3761),
       q(0),
       ],
    q(kayan) => [
-      q(5402),
+      q(5403),
       q(0),
       ],
    q(kayan mahakam) => [
-      q(7290),
+      q(7291),
       q(0),
       ],
    q(kayan river kayan) => [
-      q(7380),
+      q(7381),
       q(0),
       ],
    q(kayapa kallahan) => [
-      q(3177),
+      q(3178),
       q(0),
       ],
    q(kayapo) => [
-      q(6826),
+      q(6827),
       q(0),
       ],
    q(kayardild) => [
@@ -37074,27 +37118,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kayaw) => [
-      q(3677),
+      q(3678),
       q(0),
       ],
    q(kayeli) => [
-      q(3777),
+      q(3778),
       q(0),
       ],
    q(kayong) => [
-      q(3739),
+      q(3740),
       q(0),
       ],
    q(kayort) => [
-      q(3762),
+      q(3763),
       q(0),
       ],
    q(kaytetye) => [
-      q(2420),
+      q(2421),
       q(0),
       ],
    q(kayupulau) => [
-      q(3786),
+      q(3787),
       q(0),
       ],
    q(kazakh) => [
@@ -37102,87 +37146,87 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kazukuru) => [
-      q(3776),
+      q(3777),
       q(0),
       ],
    q(ke'o) => [
-      q(7560),
+      q(7561),
       q(0),
       ],
    q(keak) => [
-      q(3263),
+      q(3264),
       q(0),
       ],
    q(keapara) => [
-      q(3353),
+      q(3354),
       q(0),
       ],
    q(kedah malay) => [
-      q(4213),
+      q(4214),
       q(0),
       ],
    q(kedang) => [
-      q(3616),
+      q(3617),
       q(0),
       ],
    q(keder) => [
-      q(3254),
+      q(3255),
       q(0),
       ],
    q(kehu) => [
-      q(3338),
+      q(3339),
       q(0),
       ],
    q(kei) => [
-      q(3264),
+      q(3265),
       q(0),
       ],
    q(keiga) => [
-      q(3258),
+      q(3259),
       q(0),
       ],
    q(keijar) => [
-      q(3254),
+      q(3255),
       q(1),
       ],
    q(kein) => [
-      q(1309),
+      q(1310),
       q(0),
       ],
    q(keiyo) => [
-      q(2318),
+      q(2319),
       q(0),
       ],
    q(kekchi) => [
-      q(3266),
+      q(3267),
       q(0),
       ],
    q(kela (democratic republic of congo)) => [
-      q(3267),
+      q(3268),
       q(0),
       ],
    q(kela (papua new guinea)) => [
-      q(3219),
+      q(3220),
       q(0),
       ],
    q(kelabit) => [
-      q(3774),
+      q(3775),
       q(0),
       ],
    q(kele) => [
-      q(3257),
+      q(3258),
       q(0),
       ],
    q(kele (democratic republic of congo)) => [
-      q(3352),
+      q(3353),
       q(0),
       ],
    q(kele (papua new guinea)) => [
-      q(5903),
+      q(5904),
       q(0),
       ],
    q(kelengazxo bozo) => [
-      q(1635),
+      q(1636),
       q(0),
       ],
    q(keley-i kallahan) => [
@@ -37190,119 +37234,119 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(keliko) => [
-      q(3196),
+      q(3197),
       q(0),
       ],
    q(kelo) => [
-      q(7330),
+      q(7331),
       q(0),
       ],
    q(kelon) => [
-      q(3755),
+      q(3756),
       q(0),
       ],
    q(kemak) => [
-      q(3268),
+      q(3269),
       q(0),
       ],
    q(kembayan) => [
-      q(7331),
+      q(7332),
       q(0),
       ],
    q(kemberano) => [
-      q(1627),
+      q(1628),
       q(0),
       ],
    q(kembra) => [
-      q(7389),
+      q(7390),
       q(0),
       ],
    q(kemedzung) => [
-      q(2090),
+      q(2091),
       q(0),
       ],
    q(kemi sami) => [
-      q(6059),
+      q(6060),
       q(0),
       ],
    q(kemiehua) => [
-      q(3291),
+      q(3292),
       q(0),
       ],
    q(kemtuik) => [
-      q(3472),
+      q(3473),
       q(0),
       ],
    q(kenaboi) => [
-      q(7300),
+      q(7301),
       q(0),
       ],
    q(kenati) => [
-      q(2415),
+      q(2416),
       q(0),
       ],
    q(kendayan) => [
-      q(3501),
+      q(3502),
       q(0),
       ],
    q(kendeje) => [
-      q(3433),
+      q(3434),
       q(0),
       ],
    q(kendem) => [
-      q(3678),
+      q(3679),
       q(0),
       ],
    q(kenga) => [
-      q(3757),
+      q(3758),
       q(0),
       ],
    q(keningau murut) => [
-      q(3723),
+      q(3724),
       q(0),
       ],
    q(keninjal) => [
-      q(3489),
+      q(3490),
       q(0),
       ],
    q(kensiu) => [
-      q(3496),
+      q(3497),
       q(0),
       ],
    q(kenswei nsei) => [
-      q(4784),
+      q(4785),
       q(0),
       ],
    q(kenyan sign language) => [
-      q(7376),
+      q(7377),
       q(0),
       ],
    q(kenyang) => [
-      q(3269),
+      q(3270),
       q(0),
       ],
    q(kenyi) => [
-      q(3942),
+      q(3943),
       q(0),
       ],
    q(kenzi) => [
-      q(7444),
+      q(7445),
       q(0),
       ],
    q(keoru-ahia) => [
-      q(7336),
+      q(7337),
       q(0),
       ],
    q(kepkiriwat) => [
-      q(3535),
+      q(3536),
       q(0),
       ],
    q(kepo') => [
-      q(3654),
+      q(3655),
       q(0),
       ],
    q(kera) => [
-      q(3273),
+      q(3274),
       q(0),
       ],
    q(kerak) => [
@@ -37310,115 +37354,115 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kereho) => [
-      q(7372),
+      q(7373),
       q(0),
       ],
    q(kerek) => [
-      q(3581),
+      q(3582),
       q(0),
       ],
    q(kerewe) => [
-      q(3259),
+      q(3260),
       q(0),
       ],
    q(kerewo) => [
-      q(3740),
+      q(3741),
       q(0),
       ],
    q(kerinci) => [
-      q(3683),
+      q(3684),
       q(0),
       ],
    q(kesawai) => [
-      q(7334),
+      q(7335),
       q(0),
       ],
    q(ket) => [
-      q(3275),
+      q(3276),
       q(0),
       ],
    q(ketangalan) => [
-      q(3171),
+      q(3172),
       q(0),
       ],
    q(kete) => [
-      q(3229),
+      q(3230),
       q(0),
       ],
    q(ketengban) => [
-      q(7510),
+      q(7511),
       q(0),
       ],
    q(ketum) => [
-      q(3638),
+      q(3639),
       q(0),
       ],
    q(keyagana) => [
-      q(3747),
+      q(3748),
       q(0),
       ],
    q(kgalagadi) => [
-      q(7388),
+      q(7389),
       q(0),
       ],
    q(khakas) => [
-      q(3384),
+      q(3385),
       q(0),
       ],
    q(khalaj) => [
-      q(3382),
+      q(3383),
       q(0),
       ],
    q(khaling) => [
-      q(3445),
+      q(3446),
       q(0),
       ],
    q(khamba) => [
-      q(3188),
+      q(3189),
       q(0),
       ],
    q(khams tibetan) => [
-      q(3337),
+      q(3338),
       q(0),
       ],
    q(khamti) => [
-      q(3347),
+      q(3348),
       q(0),
       ],
    q(khamyang) => [
-      q(3613),
+      q(3614),
       q(0),
       ],
    q(khana) => [
-      q(5211),
+      q(5212),
       q(0),
       ],
    q(khandesi) => [
-      q(3342),
+      q(3343),
       q(0),
       ],
    q(khang) => [
-      q(3389),
+      q(3390),
       q(0),
       ],
    q(khanty) => [
-      q(3208),
+      q(3209),
       q(0),
       ],
    q(khao) => [
-      q(7281),
+      q(7282),
       q(0),
       ],
    q(kharam naga) => [
-      q(3304),
+      q(3305),
       q(0),
       ],
    q(kharia) => [
-      q(3345),
+      q(3346),
       q(0),
       ],
    q(kharia thar) => [
-      q(3617),
+      q(3618),
       q(0),
       ],
    q(khasi) => [
@@ -37426,71 +37470,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(khayo) => [
-      q(3949),
+      q(3950),
       q(0),
       ],
    q(khazar) => [
-      q(7869),
+      q(7871),
       q(0),
       ],
    q(khe) => [
-      q(3553),
+      q(3554),
       q(0),
       ],
    q(khehek) => [
-      q(6584),
+      q(6585),
       q(0),
       ],
    q(khengkha) => [
-      q(7373),
+      q(7374),
       q(0),
       ],
    q(khetrani) => [
-      q(7352),
+      q(7353),
       q(0),
       ],
    q(khezha naga) => [
-      q(4928),
+      q(4929),
       q(0),
       ],
    q(khiamniungan naga) => [
-      q(3374),
+      q(3375),
       q(0),
       ],
    q(khinalugh) => [
-      q(3386),
+      q(3387),
       q(0),
       ],
    q(khirwar) => [
-      q(3714),
+      q(3715),
       q(0),
       ],
    q(khisa) => [
-      q(3559),
+      q(3560),
       q(0),
       ],
    q(khlor) => [
-      q(3969),
+      q(3970),
       q(0),
       ],
    q(khlula) => [
-      q(7666),
+      q(7668),
       q(0),
       ],
    q(khmu) => [
-      q(3383),
+      q(3384),
       q(0),
       ],
    q(kho'ini) => [
-      q(7370),
+      q(7371),
       q(0),
       ],
    q(khoekhoe) => [
-      q(4731),
+      q(4732),
       q(0),
       ],
    q(khoibu naga) => [
-      q(4922),
+      q(4923),
       q(0),
       ],
    q(khoisan languages) => [
@@ -37498,19 +37542,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kholok) => [
-      q(3621),
+      q(3622),
       q(0),
       ],
    q(khonso) => [
-      q(3719),
+      q(3720),
       q(1),
       ],
    q(khorasani turkish) => [
-      q(3478),
+      q(3479),
       q(0),
       ],
    q(khorezmian) => [
-      q(7860),
+      q(7862),
       q(0),
       ],
    q(khotanese) => [
@@ -37518,55 +37562,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(khowar) => [
-      q(3350),
+      q(3351),
       q(0),
       ],
    q(khua) => [
-      q(7356),
+      q(7357),
       q(0),
       ],
    q(khuen) => [
-      q(3336),
+      q(3337),
       q(0),
       ],
    q(khumi chin) => [
-      q(1800),
+      q(1801),
       q(0),
       ],
    q(khun) => [
-      q(3409),
+      q(3410),
       q(0),
       ],
    q(khunsari) => [
-      q(3294),
+      q(3295),
       q(0),
       ],
    q(khvarshi) => [
-      q(3349),
+      q(3350),
       q(0),
       ],
    q(kibet) => [
-      q(3358),
+      q(3359),
       q(0),
       ],
    q(kibiri) => [
-      q(5596),
+      q(5597),
       q(0),
       ],
    q(kickapoo) => [
-      q(3356),
+      q(3357),
       q(0),
       ],
    q(kiembu) => [
-      q(2216),
+      q(2217),
       q(1),
       ],
    q(kigiryama) => [
-      q(5159),
+      q(5160),
       q(1),
       ],
    q(kikai) => [
-      q(3773),
+      q(3774),
       q(0),
       ],
    q(kikuyu) => [
@@ -37574,43 +37618,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kildin sami) => [
-      q(6056),
+      q(6057),
       q(0),
       ],
    q(kilivila) => [
-      q(3363),
+      q(3364),
       q(0),
       ],
    q(kiliwa) => [
-      q(3429),
+      q(3430),
       q(0),
       ],
    q(kilmeri) => [
-      q(3361),
+      q(3362),
       q(0),
       ],
    q(kim) => [
-      q(3354),
+      q(3355),
       q(0),
       ],
    q(kim mun) => [
-      q(4325),
+      q(4326),
       q(0),
       ],
    q(kimaama) => [
-      q(3360),
+      q(3361),
       q(0),
       ],
    q(kimaghima) => [
-      q(3360),
+      q(3361),
       q(1),
       ],
    q(kimaragang) => [
-      q(3564),
+      q(3565),
       q(0),
       ],
    q(kimbu) => [
-      q(3372),
+      q(3373),
       q(0),
       ],
    q(kimbundu) => [
@@ -37618,43 +37662,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kimki) => [
-      q(5920),
+      q(5921),
       q(0),
       ],
    q(kimre) => [
-      q(3562),
+      q(3563),
       q(0),
       ],
    q(kinabalian) => [
-      q(1677),
+      q(1678),
       q(0),
       ],
    q(kinalakna) => [
-      q(3222),
+      q(3223),
       q(0),
       ],
    q(kinamiging manobo) => [
-      q(4364),
+      q(4365),
       q(0),
       ],
    q(kinaray-a) => [
-      q(3580),
+      q(3581),
       q(0),
       ],
    q(kinga) => [
-      q(7837),
+      q(7839),
       q(0),
       ],
    q(kinnauri) => [
-      q(3292),
+      q(3293),
       q(0),
       ],
    q(kintaq) => [
-      q(3494),
+      q(3495),
       q(0),
       ],
    q(kinuku) => [
-      q(3405),
+      q(3406),
       q(0),
       ],
    q(kinyarwanda) => [
@@ -37662,19 +37706,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kioko) => [
-      q(6867),
+      q(6868),
       q(0),
       ],
    q(kiong) => [
-      q(3414),
+      q(3415),
       q(0),
       ],
    q(kiorr) => [
-      q(7381),
+      q(7382),
       q(0),
       ],
    q(kiowa) => [
-      q(3366),
+      q(3367),
       q(0),
       ],
    q(kiowa apache) => [
@@ -37682,19 +37726,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kipfokomo) => [
-      q(5474),
+      q(5475),
       q(1),
       ],
    q(kipsigis) => [
-      q(5991),
+      q(5992),
       q(0),
       ],
    q(kiput) => [
-      q(3749),
+      q(3750),
       q(0),
       ],
    q(kir-balar) => [
-      q(3419),
+      q(3420),
       q(0),
       ],
    q(kirdki) => [
@@ -37702,7 +37746,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(3),
       ],
    q(kire) => [
-      q(2473),
+      q(2474),
       q(0),
       ],
    q(kirghiz) => [
@@ -37710,11 +37754,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kirike) => [
-      q(5237),
+      q(5238),
       q(0),
       ],
    q(kirikiri) => [
-      q(3375),
+      q(3376),
       q(0),
       ],
    q(kirmanjki) => [
@@ -37722,7 +37766,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(4),
       ],
    q(kirmanjki (individual language)) => [
-      q(3371),
+      q(3372),
       q(0),
       ],
    q(kirmanjki (macrolanguage)) => [
@@ -37730,31 +37774,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(7),
       ],
    q(kirya-konzel) => [
-      q(2350),
+      q(2351),
       q(0),
       ],
    q(kis) => [
-      q(3369),
+      q(3370),
       q(0),
       ],
    q(kisa) => [
-      q(3951),
+      q(3952),
       q(0),
       ],
    q(kisan) => [
-      q(7363),
+      q(7364),
       q(0),
       ],
    q(kisankasa) => [
-      q(3554),
+      q(3555),
       q(0),
       ],
    q(kisar) => [
-      q(3381),
+      q(3382),
       q(0),
       ],
    q(kisi) => [
-      q(3376),
+      q(3377),
       q(0),
       ],
    q(kistane) => [
@@ -37762,59 +37806,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kiswahili) => [
-      q(6303),
+      q(6304),
       q(1),
       ],
    q(kita maninkakan) => [
-      q(4632),
+      q(4633),
       q(0),
       ],
    q(kitan) => [
-      q(7866),
+      q(7868),
       q(0),
       ],
    q(kitharaka) => [
-      q(6502),
+      q(6503),
       q(1),
       ],
    q(kitja) => [
-      q(2513),
+      q(2514),
       q(0),
       ],
    q(kitsai) => [
-      q(3362),
+      q(3363),
       q(0),
       ],
    q(kituba (congo)) => [
-      q(4363),
+      q(4364),
       q(0),
       ],
    q(kituba (democratic republic of congo)) => [
-      q(3639),
+      q(3640),
       q(0),
       ],
    q(kiunum) => [
-      q(7105),
+      q(7106),
       q(0),
       ],
    q(kiwilwana) => [
-      q(4375),
+      q(4376),
       q(1),
       ],
    q(kla-dan) => [
-      q(3845),
+      q(3846),
       q(0),
       ],
    q(klamath-modoc) => [
-      q(3428),
+      q(3429),
       q(0),
       ],
    q(klao) => [
-      q(3448),
+      q(3449),
       q(0),
       ],
    q(klias river kadazan) => [
-      q(3566),
+      q(3567),
       q(0),
       ],
    q(klingon) => [
@@ -37822,227 +37866,227 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(knaanic) => [
-      q(1933),
+      q(1934),
       q(0),
       ],
    q(ko) => [
-      q(2386),
+      q(2387),
       q(0),
       ],
    q(koalib) => [
-      q(3355),
+      q(3356),
       q(0),
       ],
    q(koasati) => [
-      q(1763),
+      q(1764),
       q(0),
       ],
    q(koba) => [
-      q(3526),
+      q(3527),
       q(0),
       ],
    q(kobiana) => [
-      q(3217),
+      q(3218),
       q(0),
       ],
    q(kobol) => [
-      q(3327),
+      q(3328),
       q(0),
       ],
    q(kobon) => [
-      q(3543),
+      q(3544),
       q(0),
       ],
    q(koch) => [
-      q(3248),
+      q(3249),
       q(0),
       ],
    q(kochila tharu) => [
-      q(6507),
+      q(6508),
       q(0),
       ],
    q(koda) => [
-      q(1704),
+      q(1705),
       q(0),
       ],
    q(kodaku) => [
-      q(3618),
+      q(3619),
       q(0),
       ],
    q(kodava) => [
-      q(3282),
+      q(3283),
       q(0),
       ],
    q(kodeoha) => [
-      q(7011),
+      q(7012),
       q(0),
       ],
    q(kodi) => [
-      q(3506),
+      q(3507),
       q(0),
       ],
    q(kodia) => [
-      q(3707),
+      q(3708),
       q(0),
       ],
    q(koenoem) => [
-      q(3226),
+      q(3227),
       q(0),
       ],
    q(kofa) => [
-      q(3607),
+      q(3608),
       q(0),
       ],
    q(kofei) => [
-      q(3530),
+      q(3531),
       q(0),
       ],
    q(kofyar) => [
-      q(3703),
+      q(3704),
       q(0),
       ],
    q(kogi) => [
-      q(3509),
+      q(3510),
       q(1),
       ],
    q(koguryo) => [
-      q(7859),
+      q(7861),
       q(0),
       ],
    q(kohin) => [
-      q(3425),
+      q(3426),
       q(0),
       ],
    q(kohistani shina) => [
-      q(5493),
+      q(5494),
       q(0),
       ],
    q(koho) => [
-      q(3534),
+      q(3535),
       q(0),
       ],
    q(kohumono) => [
-      q(1081),
+      q(1082),
       q(0),
       ],
    q(koi) => [
-      q(3421),
+      q(3422),
       q(0),
       ],
    q(koibal) => [
-      q(7857),
+      q(7859),
       q(0),
       ],
    q(koireng) => [
-      q(4924),
+      q(4925),
       q(0),
       ],
    q(koitabu) => [
-      q(3555),
+      q(3556),
       q(0),
       ],
    q(koiwat) => [
-      q(3734),
+      q(3735),
       q(0),
       ],
    q(kok borok) => [
-      q(6701),
+      q(6702),
       q(0),
       ],
    q(kok-nar) => [
-      q(2539),
+      q(2540),
       q(0),
       ],
    q(kokata) => [
-      q(3622),
+      q(3623),
       q(0),
       ],
    q(koke) => [
-      q(3517),
+      q(3518),
       q(0),
       ],
    q(koki naga) => [
-      q(5146),
+      q(5147),
       q(0),
       ],
    q(koko babangk) => [
-      q(5228),
+      q(5229),
       q(0),
       ],
    q(kokoda) => [
-      q(7446),
+      q(7447),
       q(0),
       ],
    q(kokola) => [
-      q(3779),
+      q(3780),
       q(0),
       ],
    q(kokota) => [
-      q(3412),
+      q(3413),
       q(0),
       ],
    q(kol) => [
-      q(2236),
+      q(2237),
       q(1),
       ],
    q(kol (bangladesh)) => [
-      q(2236),
+      q(2237),
       q(0),
       ],
    q(kol (cameroon)) => [
-      q(1226),
+      q(1227),
       q(0),
       ],
    q(kol (papua new guinea)) => [
-      q(3512),
+      q(3513),
       q(0),
       ],
    q(kola) => [
-      q(3687),
+      q(3688),
       q(0),
       ],
    q(kolbila) => [
-      q(3430),
+      q(3431),
       q(0),
       ],
    q(kolibugan subanon) => [
-      q(6082),
+      q(6083),
       q(0),
       ],
    q(kolsch) => [
-      q(3600),
+      q(3601),
       q(0),
       ],
    q(koluwawa) => [
-      q(3451),
+      q(3452),
       q(0),
       ],
    q(kom (cameroon)) => [
-      q(1264),
+      q(1265),
       q(0),
       ],
    q(kom (india)) => [
-      q(3465),
+      q(3466),
       q(0),
       ],
    q(koma) => [
-      q(3477),
+      q(3478),
       q(0),
       ],
    q(komba) => [
-      q(3527),
+      q(3528),
       q(0),
       ],
    q(kombai) => [
-      q(6835),
+      q(6836),
       q(0),
       ],
    q(kombio) => [
-      q(7297),
+      q(7298),
       q(0),
       ],
    q(komering) => [
-      q(3312),
+      q(3313),
       q(0),
       ],
    q(komi) => [
@@ -38050,59 +38094,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(komi-permyak) => [
-      q(3511),
+      q(3512),
       q(0),
       ],
    q(komi-zyrian) => [
-      q(3542),
+      q(3543),
       q(0),
       ],
    q(kominimung) => [
-      q(7448),
+      q(7449),
       q(0),
       ],
    q(komo (democratic republic of congo)) => [
-      q(3475),
+      q(3476),
       q(0),
       ],
    q(komo (sudan)) => [
-      q(7450),
+      q(7451),
       q(0),
       ],
    q(komodo) => [
-      q(3673),
+      q(3674),
       q(0),
       ],
    q(kompane) => [
-      q(3681),
+      q(3682),
       q(0),
       ],
    q(komyandaret) => [
-      q(3787),
+      q(3788),
       q(0),
       ],
    q(kon keu) => [
-      q(3415),
+      q(3416),
       q(0),
       ],
    q(konabere) => [
-      q(1051),
+      q(1052),
       q(1),
       ],
    q(konai) => [
-      q(3737),
+      q(3738),
       q(0),
       ],
    q(konda) => [
-      q(3482),
+      q(3483),
       q(0),
       ],
    q(konda-dora) => [
-      q(3284),
+      q(3285),
       q(0),
       ],
    q(koneraw) => [
-      q(3252),
+      q(3253),
       q(0),
       ],
    q(kongo) => [
@@ -38114,7 +38158,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(konkani (individual language)) => [
-      q(3491),
+      q(3492),
       q(0),
       ],
    q(konkani (macrolanguage)) => [
@@ -38122,83 +38166,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(konkomba) => [
-      q(7451),
+      q(7452),
       q(0),
       ],
    q(konni) => [
-      q(3454),
+      q(3455),
       q(0),
       ],
    q(kono (guinea)) => [
-      q(3498),
+      q(3499),
       q(0),
       ],
    q(kono (nigeria)) => [
-      q(3438),
+      q(3439),
       q(0),
       ],
    q(kono (sierra leone)) => [
-      q(3492),
+      q(3493),
       q(0),
       ],
    q(konomala) => [
-      q(3504),
+      q(3505),
       q(0),
       ],
    q(konongo) => [
-      q(3233),
+      q(3234),
       q(0),
       ],
    q(konso) => [
-      q(3719),
+      q(3720),
       q(0),
       ],
    q(konyak naga) => [
-      q(4743),
+      q(4744),
       q(0),
       ],
    q(konyanka maninka) => [
-      q(4361),
+      q(4362),
       q(0),
       ],
    q(konzo) => [
-      q(3513),
+      q(3514),
       q(0),
       ],
    q(koongo) => [
-      q(3485),
+      q(3486),
       q(0),
       ],
    q(koonzime) => [
-      q(5344),
+      q(5345),
       q(0),
       ],
    q(koorete) => [
-      q(3571),
+      q(3572),
       q(0),
       ],
    q(kopar) => [
-      q(7453),
+      q(7454),
       q(0),
       ],
    q(kopkaka) => [
-      q(5288),
+      q(5289),
       q(0),
       ],
    q(korafe-yegha) => [
-      q(3538),
+      q(3539),
       q(0),
       ],
    q(korak) => [
-      q(3522),
+      q(3523),
       q(0),
       ],
    q(korana) => [
-      q(3572),
+      q(3573),
       q(0),
       ],
    q(korandje) => [
-      q(3232),
+      q(3233),
       q(0),
       ],
    q(kordofanian languages) => [
@@ -38210,27 +38254,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(korean sign language) => [
-      q(3676),
+      q(3677),
       q(0),
       ],
    q(koreguaje) => [
-      q(1812),
+      q(1813),
       q(0),
       ],
    q(koresh-e rostam) => [
-      q(5229),
+      q(5230),
       q(0),
       ],
    q(korku) => [
-      q(3298),
+      q(3299),
       q(0),
       ],
    q(korlai creole portuguese) => [
-      q(7012),
+      q(7013),
       q(0),
       ],
    q(koro (cote d'ivoire)) => [
-      q(3296),
+      q(3297),
       q(0),
       ],
    q(koro (india)) => [
@@ -38238,95 +38282,95 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(koro (papua new guinea)) => [
-      q(3732),
+      q(3733),
       q(0),
       ],
    q(koro (vanuatu)) => [
-      q(3577),
+      q(3578),
       q(0),
       ],
    q(koro wachi) => [
-      q(1417),
+      q(1418),
       q(0),
       ],
    q(koromfe) => [
-      q(3307),
+      q(3308),
       q(0),
       ],
    q(koromira) => [
-      q(3556),
+      q(3557),
       q(0),
       ],
    q(koronadal blaan) => [
-      q(1388),
+      q(1389),
       q(0),
       ],
    q(koroni) => [
-      q(7383),
+      q(7384),
       q(0),
       ],
    q(korop) => [
-      q(3584),
+      q(3585),
       q(0),
       ],
    q(koropo) => [
-      q(7562),
+      q(7563),
       q(0),
       ],
    q(koroshi) => [
-      q(3630),
+      q(3631),
       q(0),
       ],
    q(korowai) => [
-      q(3335),
+      q(3336),
       q(0),
       ],
    q(korra koraga) => [
-      q(3285),
+      q(3286),
       q(0),
       ],
    q(korubo) => [
-      q(7454),
+      q(7455),
       q(0),
       ],
    q(korupun-sela) => [
-      q(3537),
+      q(3538),
       q(0),
       ],
    q(korur) => [
-      q(0946),
+      q(0947),
       q(1),
       ],
    q(korwa) => [
-      q(3297),
+      q(3298),
       q(0),
       ],
    q(koryak) => [
-      q(3545),
+      q(3546),
       q(0),
       ],
    q(kosadle) => [
-      q(3368),
+      q(3369),
       q(0),
       ],
    q(kosare) => [
-      q(3368),
+      q(3369),
       q(1),
       ],
    q(kosarek yale) => [
-      q(3413),
+      q(3414),
       q(0),
       ],
    q(kosena) => [
-      q(3771),
+      q(3772),
       q(0),
       ],
    q(koshin) => [
-      q(3357),
+      q(3358),
       q(0),
       ],
    q(kosli) => [
-      q(6194),
+      q(6195),
       q(1),
       ],
    q(kosraean) => [
@@ -38334,15 +38378,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kota (gabon)) => [
-      q(3515),
+      q(3516),
       q(0),
       ],
    q(kota (india)) => [
-      q(3286),
+      q(3287),
       q(0),
       ],
    q(kota bangun kutai malay) => [
-      q(4485),
+      q(4486),
       q(0),
       ],
    q(kota marudu talantang) => [
@@ -38350,99 +38394,99 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kota marudu tinagas) => [
-      q(3636),
+      q(3637),
       q(0),
       ],
    q(kotafon gbe) => [
-      q(3557),
+      q(3558),
       q(0),
       ],
    q(kotava) => [
-      q(0957),
+      q(0958),
       q(0),
       ],
    q(koti) => [
-      q(2238),
+      q(2239),
       q(0),
       ],
    q(kott) => [
-      q(7863),
+      q(7865),
       q(0),
       ],
    q(kouya) => [
-      q(3746),
+      q(3747),
       q(0),
       ],
    q(kovai) => [
-      q(3548),
+      q(3549),
       q(0),
       ],
    q(kove) => [
-      q(3668),
+      q(3669),
       q(0),
       ],
    q(kowaki) => [
-      q(7455),
+      q(7456),
       q(0),
       ],
    q(kowiai) => [
-      q(3699),
+      q(3700),
       q(0),
       ],
    q(koy sanjaq surat) => [
-      q(3550),
+      q(3551),
       q(0),
       ],
    q(koya) => [
-      q(3287),
+      q(3288),
       q(0),
       ],
    q(koyaga) => [
-      q(3308),
+      q(3309),
       q(0),
       ],
    q(koyo) => [
-      q(3510),
+      q(3511),
       q(0),
       ],
    q(koyra chiini songhay) => [
-      q(3344),
+      q(3345),
       q(0),
       ],
    q(koyraboro senni songhai) => [
-      q(5978),
+      q(5979),
       q(0),
       ],
    q(koyukon) => [
-      q(3521),
+      q(3522),
       q(0),
       ],
    q(kpagua) => [
-      q(3662),
+      q(3663),
       q(0),
       ],
    q(kpala) => [
-      q(3533),
+      q(3534),
       q(0),
       ],
    q(kpan) => [
-      q(3532),
+      q(3533),
       q(0),
       ],
    q(kpasam) => [
-      q(5371),
+      q(5372),
       q(0),
       ],
    q(kpati) => [
-      q(3505),
+      q(3506),
       q(0),
       ],
    q(kpatili) => [
-      q(3753),
+      q(3754),
       q(0),
       ],
    q(kpeego) => [
-      q(1836),
+      q(1837),
       q(0),
       ],
    q(kpelle) => [
@@ -38450,63 +38494,63 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kpessi) => [
-      q(3261),
+      q(3262),
       q(0),
       ],
    q(kplang) => [
-      q(3529),
+      q(3530),
       q(0),
       ],
    q(krache) => [
-      q(3745),
+      q(3746),
       q(0),
       ],
    q(kraho) => [
-      q(7475),
+      q(7476),
       q(0),
       ],
    q(kraol) => [
-      q(5797),
+      q(5798),
       q(0),
       ],
    q(krenak) => [
-      q(3563),
+      q(3564),
       q(0),
       ],
    q(krevinian) => [
-      q(7868),
+      q(7870),
       q(0),
       ],
    q(kreye) => [
-      q(7478),
+      q(7479),
       q(0),
       ],
    q(krikati-timbira) => [
-      q(7480),
+      q(7481),
       q(0),
       ],
    q(krim) => [
-      q(3582),
+      q(3583),
       q(0),
       ],
    q(krio) => [
-      q(3579),
+      q(3580),
       q(0),
       ],
    q(kriol) => [
-      q(5844),
+      q(5845),
       q(0),
       ],
    q(krisa) => [
-      q(3601),
+      q(3602),
       q(0),
       ],
    q(krobu) => [
-      q(3718),
+      q(3719),
       q(0),
       ],
    q(krongo) => [
-      q(3321),
+      q(3322),
       q(0),
       ],
    q(kru languages) => [
@@ -38514,7 +38558,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kru'ng 2) => [
-      q(3585),
+      q(3586),
       q(0),
       ],
    q(krymchak) => [
@@ -38522,31 +38566,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kryts) => [
-      q(3591),
+      q(3592),
       q(0),
       ],
    q(kua) => [
-      q(6840),
+      q(6841),
       q(0),
       ],
    q(kua-nsi) => [
-      q(7668),
+      q(7670),
       q(0),
       ],
    q(kuamasi) => [
-      q(7672),
+      q(7674),
       q(0),
       ],
    q(kuan) => [
-      q(6852),
+      q(6853),
       q(0),
       ],
    q(kuanhua) => [
-      q(7434),
+      q(7435),
       q(0),
       ],
    q(kuanua) => [
-      q(3596),
+      q(3597),
       q(0),
       ],
    q(kuanyama) => [
@@ -38554,11 +38598,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kube) => [
-      q(3313),
+      q(3314),
       q(0),
       ],
    q(kubi) => [
-      q(3508),
+      q(3509),
       q(0),
       ],
    q(kubo) => [
@@ -38566,91 +38610,91 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kubu) => [
-      q(3667),
+      q(3668),
       q(0),
       ],
    q(kucong) => [
-      q(3940),
+      q(3941),
       q(0),
       ],
    q(kudiya) => [
-      q(3288),
+      q(3289),
       q(0),
       ],
    q(kudmali) => [
-      q(3763),
+      q(3764),
       q(0),
       ],
    q(kudu-camo) => [
-      q(3518),
+      q(3519),
       q(0),
       ],
    q(kugama) => [
-      q(3519),
+      q(3520),
       q(0),
       ],
    q(kugbo) => [
-      q(3274),
+      q(3275),
       q(0),
       ],
    q(kui (india)) => [
-      q(3735),
+      q(3736),
       q(0),
       ],
    q(kui (indonesia)) => [
-      q(3669),
+      q(3670),
       q(0),
       ],
    q(kuijau) => [
-      q(2074),
+      q(2075),
       q(0),
       ],
    q(kuikuro-kalapalo) => [
-      q(3652),
+      q(3653),
       q(0),
       ],
    q(kujarge) => [
-      q(7007),
+      q(7008),
       q(0),
       ],
    q(kuk) => [
-      q(3295),
+      q(3296),
       q(0),
       ],
    q(kukatja) => [
-      q(3663),
+      q(3664),
       q(0),
       ],
    q(kuke) => [
-      q(2512),
+      q(2513),
       q(0),
       ],
    q(kukele) => [
-      q(3281),
+      q(3282),
       q(0),
       ],
    q(kukna) => [
-      q(3279),
+      q(3280),
       q(0),
       ],
    q(kuku-mangk) => [
-      q(7421),
+      q(7422),
       q(0),
       ],
    q(kuku-mu'inh) => [
-      q(7420),
+      q(7421),
       q(0),
       ],
    q(kuku-muminh) => [
-      q(7413),
+      q(7414),
       q(0),
       ],
    q(kuku-ugbanh) => [
-      q(6869),
+      q(6870),
       q(0),
       ],
    q(kuku-uwanh) => [
-      q(6965),
+      q(6966),
       q(0),
       ],
    q(kuku-yalanji) => [
@@ -38658,95 +38702,95 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kula) => [
-      q(6659),
+      q(6660),
       q(0),
       ],
    q(kulere) => [
-      q(3655),
+      q(3656),
       q(0),
       ],
    q(kulfa) => [
-      q(3724),
+      q(3725),
       q(0),
       ],
    q(kulina) => [
-      q(1910),
+      q(1911),
       q(1),
       ],
    q(kulina pano) => [
-      q(7462),
+      q(7463),
       q(0),
       ],
    q(kulisusu) => [
-      q(7009),
+      q(7010),
       q(0),
       ],
    q(kullu pahari) => [
-      q(3305),
+      q(3306),
       q(0),
       ],
    q(kulon-pazeh) => [
-      q(6959),
+      q(6960),
       q(0),
       ],
    q(kulung (nepal)) => [
-      q(3432),
+      q(3433),
       q(0),
       ],
    q(kulung (nigeria)) => [
-      q(1057),
+      q(1058),
       q(0),
       ],
    q(kumalu) => [
-      q(3604),
+      q(3605),
       q(0),
       ],
    q(kumam) => [
-      q(3241),
+      q(3242),
       q(0),
       ],
    q(kuman (papua new guinea)) => [
-      q(3648),
+      q(3649),
       q(0),
       ],
    q(kuman (russia)) => [
-      q(5717),
+      q(5718),
       q(0),
       ],
    q(kumaoni) => [
-      q(3306),
+      q(3307),
       q(0),
       ],
    q(kumarbhag paharia) => [
-      q(3462),
+      q(3463),
       q(0),
       ],
    q(kumba) => [
-      q(3605),
+      q(3606),
       q(0),
       ],
    q(kumbainggar) => [
-      q(3325),
+      q(3326),
       q(0),
       ],
    q(kumbaran) => [
-      q(7145),
+      q(7146),
       q(0),
       ],
    q(kumbewaha) => [
-      q(7385),
+      q(7386),
       q(0),
       ],
    q(kumhali) => [
-      q(3573),
+      q(3574),
       q(0),
       ],
    q(kumiai) => [
-      q(2040),
+      q(2041),
       q(0),
       ],
    q(kumukio) => [
-      q(3657),
+      q(3658),
       q(0),
       ],
    q(kumyk) => [
@@ -38754,127 +38798,127 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kumzari) => [
-      q(7965),
+      q(7967),
       q(0),
       ],
    q(kunama) => [
-      q(3656),
+      q(3657),
       q(0),
       ],
    q(kunbarlang) => [
-      q(7154),
+      q(7155),
       q(0),
       ],
    q(kunda) => [
-      q(3246),
+      q(3247),
       q(0),
       ],
    q(kundal shahi) => [
-      q(6012),
+      q(6013),
       q(0),
       ],
    q(kunduvadi) => [
-      q(7148),
+      q(7149),
       q(0),
       ],
    q(kung) => [
-      q(3293),
+      q(3294),
       q(0),
       ],
    q(kung-ekoka) => [
-      q(3500),
+      q(3501),
       q(0),
       ],
    q(kungarakany) => [
-      q(2495),
+      q(2496),
       q(0),
       ],
    q(kungardutyi) => [
-      q(2469),
+      q(2470),
       q(0),
       ],
    q(kunggara) => [
-      q(3684),
+      q(3685),
       q(0),
       ],
    q(kunggari) => [
-      q(3318),
+      q(3319),
       q(0),
       ],
    q(kungkari) => [
-      q(3953),
+      q(3954),
       q(0),
       ],
    q(kuni) => [
-      q(3597),
+      q(3598),
       q(0),
       ],
    q(kuni-boazi) => [
-      q(3672),
+      q(3673),
       q(0),
       ],
    q(kunigami) => [
-      q(7532),
+      q(7533),
       q(0),
       ],
    q(kunimaipa) => [
-      q(3658),
+      q(3659),
       q(0),
       ],
    q(kunja) => [
-      q(5415),
+      q(5416),
       q(0),
       ],
    q(kunjen) => [
-      q(3390),
+      q(3391),
       q(0),
       ],
    q(kunyi) => [
-      q(4918),
+      q(4919),
       q(0),
       ],
    q(kunza) => [
-      q(3665),
+      q(3666),
       q(0),
       ],
    q(kuo) => [
-      q(7537),
+      q(7538),
       q(0),
       ],
    q(kuot) => [
-      q(3633),
+      q(3634),
       q(0),
       ],
    q(kupa) => [
-      q(3650),
+      q(3651),
       q(0),
       ],
    q(kupang malay) => [
-      q(4354),
+      q(4355),
       q(0),
       ],
    q(kupia) => [
-      q(3280),
+      q(3281),
       q(0),
       ],
    q(kupsabiny) => [
-      q(3546),
+      q(3547),
       q(0),
       ],
    q(kur) => [
-      q(3661),
+      q(3662),
       q(0),
       ],
    q(kura ede nago) => [
-      q(5043),
+      q(5044),
       q(0),
       ],
    q(kurama) => [
-      q(3578),
+      q(3579),
       q(0),
       ],
    q(kuranko) => [
-      q(3488),
+      q(3489),
       q(0),
       ],
    q(kurdish) => [
@@ -38882,43 +38926,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kuri) => [
-      q(4750),
+      q(4751),
       q(0),
       ],
    q(kuria) => [
-      q(3653),
+      q(3654),
       q(0),
       ],
    q(kurichiya) => [
-      q(3289),
+      q(3290),
       q(0),
       ],
    q(kurmukar) => [
-      q(3303),
+      q(3304),
       q(0),
       ],
    q(kurnai) => [
-      q(6918),
+      q(6919),
       q(0),
       ],
    q(kurrama) => [
-      q(7014),
+      q(7015),
       q(0),
       ],
    q(kurti) => [
-      q(3631),
+      q(3632),
       q(0),
       ],
    q(kurtokha) => [
-      q(7392),
+      q(7393),
       q(0),
       ],
    q(kuruaya) => [
-      q(3758),
+      q(3759),
       q(0),
       ],
    q(kurudu) => [
-      q(3394),
+      q(3395),
       q(0),
       ],
    q(kurukh) => [
@@ -38926,27 +38970,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kusaal) => [
-      q(3659),
+      q(3660),
       q(0),
       ],
    q(kusaghe) => [
-      q(3599),
+      q(3600),
       q(0),
       ],
    q(kushi) => [
-      q(3651),
+      q(3652),
       q(0),
       ],
    q(kusu) => [
-      q(3614),
+      q(3615),
       q(0),
       ],
    q(kusunda) => [
-      q(3314),
+      q(3315),
       q(0),
       ],
    q(kutang ghale) => [
-      q(2512),
+      q(2513),
       q(1),
       ],
    q(kutenai) => [
@@ -38954,131 +38998,131 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kutep) => [
-      q(3645),
+      q(3646),
       q(0),
       ],
    q(kuthant) => [
-      q(7540),
+      q(7541),
       q(0),
       ],
    q(kutong) => [
-      q(6081),
+      q(6082),
       q(0),
       ],
    q(kutto) => [
-      q(3523),
+      q(3524),
       q(0),
       ],
    q(kutu) => [
-      q(3235),
+      q(3236),
       q(0),
       ],
    q(kuturmi) => [
-      q(3339),
+      q(3340),
       q(0),
       ],
    q(kuuk-yak) => [
-      q(6888),
+      q(6889),
       q(0),
       ],
    q(kuuku-ya'u) => [
-      q(3664),
+      q(3665),
       q(0),
       ],
    q(kuvi) => [
-      q(3736),
+      q(3737),
       q(0),
       ],
    q(kuwaa) => [
-      q(1284),
+      q(1285),
       q(0),
       ],
    q(kuwaataay) => [
-      q(1928),
+      q(1929),
       q(0),
       ],
    q(kuy) => [
-      q(3250),
+      q(3251),
       q(0),
       ],
    q(kven finnish) => [
-      q(2351),
+      q(2352),
       q(0),
       ],
    q(kw'adza) => [
-      q(7144),
+      q(7145),
       q(0),
       ],
    q(kwa) => [
-      q(3693),
+      q(3694),
       q(0),
       ],
    q(kwa') => [
-      q(1266),
+      q(1267),
       q(0),
       ],
    q(kwaami) => [
-      q(3609),
+      q(3610),
       q(0),
       ],
    q(kwadi) => [
-      q(3716),
+      q(3717),
       q(0),
       ],
    q(kwaio) => [
-      q(3695),
+      q(3696),
       q(0),
       ],
    q(kwaja) => [
-      q(3255),
+      q(3256),
       q(0),
       ],
    q(kwakiutl) => [
-      q(3702),
+      q(3703),
       q(0),
       ],
    q(kwakum) => [
-      q(3711),
+      q(3712),
       q(0),
       ],
    q(kwalhioqua-tlatskanai) => [
-      q(5719),
+      q(5720),
       q(0),
       ],
    q(kwama) => [
-      q(3469),
+      q(3470),
       q(0),
       ],
    q(kwambi) => [
-      q(3704),
+      q(3705),
       q(0),
       ],
    q(kwamera) => [
-      q(6618),
+      q(6619),
       q(0),
       ],
    q(kwami) => [
-      q(3624),
+      q(3625),
       q(0),
       ],
    q(kwamtim one) => [
-      q(5232),
+      q(5233),
       q(0),
       ],
    q(kwang) => [
-      q(3674),
+      q(3675),
       q(0),
       ],
    q(kwanga) => [
-      q(3701),
+      q(3702),
       q(0),
       ],
    q(kwangali) => [
-      q(3705),
+      q(3706),
       q(0),
       ],
    q(kwanja) => [
-      q(3493),
+      q(3494),
       q(0),
       ],
    q(kwanyama) => [
@@ -39086,55 +39130,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(kwara'ae) => [
-      q(3697),
+      q(3698),
       q(0),
       ],
    q(kwasio) => [
-      q(4967),
+      q(4968),
       q(0),
       ],
    q(kwaya) => [
-      q(3741),
+      q(3742),
       q(0),
       ],
    q(kwaza) => [
-      q(7547),
+      q(7548),
       q(0),
       ],
    q(kwegu) => [
-      q(7551),
+      q(7552),
       q(0),
       ],
    q(kwenyi) => [
-      q(3243),
+      q(3244),
       q(1),
       ],
    q(kwer) => [
-      q(3708),
+      q(3709),
       q(0),
       ],
    q(kwerba) => [
-      q(3696),
+      q(3697),
       q(0),
       ],
    q(kwerba mamberamo) => [
-      q(7556),
+      q(7557),
       q(0),
       ],
    q(kwere) => [
-      q(1926),
+      q(1927),
       q(0),
       ],
    q(kwerisa) => [
-      q(3403),
+      q(3404),
       q(0),
       ],
    q(kwese) => [
-      q(3709),
+      q(3710),
       q(0),
       ],
    q(kwesten) => [
-      q(3710),
+      q(3711),
       q(0),
       ],
    q(kwini) => [
@@ -39142,47 +39186,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(kwinsu) => [
-      q(3646),
+      q(3647),
       q(0),
       ],
    q(kwinti) => [
-      q(3713),
+      q(3714),
       q(0),
       ],
    q(kwoma) => [
-      q(3467),
+      q(3468),
       q(0),
       ],
    q(kwomtari) => [
-      q(3706),
+      q(3707),
       q(0),
       ],
    q(kxoe) => [
-      q(7541),
+      q(7542),
       q(0),
       ],
    q(kyak) => [
-      q(1254),
+      q(1255),
       q(0),
       ],
    q(kyaka) => [
-      q(3743),
+      q(3744),
       q(0),
       ],
    q(kyan-karyaw naga) => [
-      q(5046),
+      q(5047),
       q(0),
       ],
    q(kyanga) => [
-      q(6830),
+      q(6831),
       q(0),
       ],
    q(kyenele) => [
-      q(3558),
+      q(3559),
       q(0),
       ],
    q(kyerung) => [
-      q(3331),
+      q(3332),
       q(0),
       ],
    q(kyrgyz) => [
@@ -39190,35 +39234,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(la'bi) => [
-      q(3818),
+      q(3819),
       q(0),
       ],
    q(laa laa bwamu) => [
-      q(1550),
+      q(1551),
       q(0),
       ],
    q(laadan) => [
-      q(3855),
+      q(3856),
       q(0),
       ],
    q(laal) => [
-      q(2463),
+      q(2464),
       q(0),
       ],
    q(laalaa) => [
-      q(1641),
+      q(1642),
       q(1),
       ],
    q(laari) => [
-      q(3850),
+      q(3851),
       q(0),
       ],
    q(laba) => [
-      q(3807),
+      q(3808),
       q(0),
       ],
    q(label) => [
-      q(3813),
+      q(3814),
       q(0),
       ],
    q(labir) => [
@@ -39226,43 +39270,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(labo) => [
-      q(4631),
+      q(4632),
       q(0),
       ],
    q(labo phowa) => [
-      q(7726),
+      q(7728),
       q(0),
       ],
    q(labu) => [
-      q(3829),
+      q(3830),
       q(0),
       ],
    q(labuk-kinabatangan kadazan) => [
-      q(2156),
+      q(2157),
       q(0),
       ],
    q(lacandon) => [
-      q(3794),
+      q(3795),
       q(0),
       ],
    q(lachi) => [
-      q(3828),
+      q(3829),
       q(0),
       ],
    q(lachiguiri zapotec) => [
-      q(7912),
+      q(7914),
       q(0),
       ],
    q(lachixio zapotec) => [
-      q(7923),
+      q(7925),
       q(0),
       ],
    q(ladakhi) => [
-      q(3819),
+      q(3820),
       q(0),
       ],
    q(ladin) => [
-      q(3958),
+      q(3959),
       q(0),
       ],
    q(ladino) => [
@@ -39270,39 +39314,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ladji ladji) => [
-      q(3964),
+      q(3965),
       q(0),
       ],
    q(laeko-libuat) => [
-      q(3946),
+      q(3947),
       q(0),
       ],
    q(lafofa) => [
-      q(3796),
+      q(3797),
       q(0),
       ],
    q(laghu) => [
-      q(3886),
+      q(3887),
       q(0),
       ],
    q(laghuu) => [
-      q(3888),
+      q(3889),
       q(0),
       ],
    q(lagwan) => [
-      q(3516),
+      q(3517),
       q(0),
       ],
    q(laha (indonesia)) => [
-      q(3900),
+      q(3901),
       q(0),
       ],
    q(laha (viet nam)) => [
-      q(3899),
+      q(3900),
       q(0),
       ],
    q(lahanan) => [
-      q(3904),
+      q(3905),
       q(0),
       ],
    q(lahnda) => [
@@ -39310,119 +39354,119 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lahta) => [
-      q(3685),
+      q(3686),
       q(1),
       ],
    q(lahta karen) => [
-      q(3685),
+      q(3686),
       q(0),
       ],
    q(lahu) => [
-      q(3908),
+      q(3909),
       q(0),
       ],
    q(lahu shi) => [
-      q(3901),
+      q(3902),
       q(0),
       ],
    q(lahul lohar) => [
-      q(3902),
+      q(3903),
       q(0),
       ],
    q(laimbue) => [
-      q(3995),
+      q(3996),
       q(0),
       ],
    q(laitu chin) => [
-      q(1774),
+      q(1775),
       q(0),
       ],
    q(laiyolo) => [
-      q(3933),
+      q(3934),
       q(0),
       ],
    q(lak) => [
-      q(3815),
+      q(3816),
       q(0),
       ],
    q(laka (chad)) => [
-      q(3803),
+      q(3804),
       q(0),
       ],
    q(laka (nigeria)) => [
-      q(3800),
+      q(3801),
       q(0),
       ],
    q(lakalei) => [
-      q(3938),
+      q(3939),
       q(0),
       ],
    q(lake miwok) => [
-      q(3994),
+      q(3995),
       q(0),
       ],
    q(lakha) => [
-      q(3943),
+      q(3944),
       q(0),
       ],
    q(laki) => [
-      q(3944),
+      q(3945),
       q(0),
       ],
    q(lakkia) => [
-      q(3814),
+      q(3815),
       q(0),
       ],
    q(lakon) => [
-      q(3948),
+      q(3949),
       q(0),
       ],
    q(lakonde) => [
-      q(3941),
+      q(3942),
       q(0),
       ],
    q(lakota) => [
-      q(3952),
+      q(3953),
       q(0),
       ],
    q(lakota dida) => [
-      q(2036),
+      q(2037),
       q(0),
       ],
    q(lala) => [
-      q(5064),
+      q(5065),
       q(0),
       ],
    q(lala-bisa) => [
-      q(3860),
+      q(3861),
       q(0),
       ],
    q(lala-roba) => [
-      q(3955),
+      q(3956),
       q(0),
       ],
    q(lalana chinantec) => [
-      q(1801),
+      q(1802),
       q(0),
       ],
    q(lalia) => [
-      q(3801),
+      q(3802),
       q(0),
       ],
    q(lama (togo)) => [
-      q(3806),
+      q(3807),
       q(0),
       ],
    q(lama bai) => [
-      q(3810),
+      q(3811),
       q(0),
       ],
    q(lamaholot) => [
-      q(6105),
+      q(6106),
       q(0),
       ],
    q(lamalera) => [
-      q(3991),
+      q(3992),
       q(0),
       ],
    q(lamang) => [
@@ -39430,7 +39474,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lamatuka) => [
-      q(3990),
+      q(3991),
       q(0),
       ],
    q(lamba) => [
@@ -39438,59 +39482,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lambadi) => [
-      q(3987),
+      q(3988),
       q(0),
       ],
    q(lambayeque quechua) => [
-      q(5682),
+      q(5683),
       q(0),
       ],
    q(lambichhong) => [
-      q(3982),
+      q(3983),
       q(0),
       ],
    q(lamboya) => [
-      q(3996),
+      q(3997),
       q(0),
       ],
    q(lambya) => [
-      q(3798),
+      q(3799),
       q(0),
       ],
    q(lame) => [
-      q(1302),
+      q(1303),
       q(0),
       ],
    q(lamenu) => [
-      q(3992),
+      q(3993),
       q(0),
       ],
    q(lamet) => [
-      q(3823),
+      q(3824),
       q(0),
       ],
    q(lamja-dengsa-tola) => [
-      q(3849),
+      q(3850),
       q(0),
       ],
    q(lamkang) => [
-      q(3985),
+      q(3986),
       q(0),
       ],
    q(lamma) => [
-      q(3879),
+      q(3880),
       q(0),
       ],
    q(lamnso') => [
-      q(4009),
+      q(4010),
       q(0),
       ],
    q(lamogai) => [
-      q(3981),
+      q(3982),
       q(0),
       ],
    q(lampung api) => [
-      q(3935),
+      q(3936),
       q(0),
       ],
    q(lampung nyo) => [
@@ -39498,15 +39542,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lamu) => [
-      q(3962),
+      q(3963),
       q(0),
       ],
    q(lamu-lamu) => [
-      q(3833),
+      q(3834),
       q(0),
       ],
    q(lanas lobu) => [
-      q(5872),
+      q(5873),
       q(0),
       ],
    q(land dayak languages) => [
@@ -39514,51 +39558,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(landoma) => [
-      q(3854),
+      q(3855),
       q(0),
       ],
    q(lang'e) => [
-      q(7706),
+      q(7708),
       q(0),
       ],
    q(langam) => [
-      q(4006),
+      q(4007),
       q(0),
       ],
    q(langbashe) => [
-      q(3998),
+      q(3999),
       q(0),
       ],
    q(langi) => [
-      q(3797),
+      q(3798),
       q(0),
       ],
    q(langnian buyang) => [
-      q(7681),
+      q(7683),
       q(0),
       ],
    q(lango (sudan)) => [
-      q(4008),
+      q(4009),
       q(0),
       ],
    q(lango (uganda)) => [
-      q(3799),
+      q(3800),
       q(0),
       ],
    q(langobardic) => [
-      q(4001),
+      q(4002),
       q(0),
       ],
    q(langue des signes de belgique francophone) => [
-      q(5985),
+      q(5986),
       q(0),
       ],
    q(lanima) => [
-      q(4011),
+      q(4012),
       q(0),
       ],
    q(lanoh) => [
-      q(4002),
+      q(4003),
       q(0),
       ],
    q(lao) => [
@@ -39566,39 +39610,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lao naga) => [
-      q(4954),
+      q(4955),
       q(0),
       ],
    q(laomian) => [
-      q(4102),
+      q(4103),
       q(0),
       ],
    q(laopang) => [
-      q(3817),
+      q(3818),
       q(0),
       ],
    q(laos sign language) => [
-      q(4063),
+      q(4064),
       q(0),
       ],
    q(lapaguia-guivini zapotec) => [
-      q(7953),
+      q(7955),
       q(0),
       ],
    q(laragia) => [
-      q(4044),
+      q(4045),
       q(0),
       ],
    q(larantuka malay) => [
-      q(4052),
+      q(4053),
       q(0),
       ],
    q(lardil) => [
-      q(3834),
+      q(3835),
       q(0),
       ],
    q(larevat) => [
-      q(4053),
+      q(4054),
       q(0),
       ],
    q(large flowery miao) => [
@@ -39606,7 +39650,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lari) => [
-      q(4047),
+      q(4048),
       q(0),
       ],
    q(larike-wakasihu) => [
@@ -39614,39 +39658,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(laro) => [
-      q(4050),
+      q(4051),
       q(0),
       ],
    q(larteh) => [
-      q(3805),
+      q(3806),
       q(0),
       ],
    q(laru) => [
-      q(3802),
+      q(3803),
       q(0),
       ],
    q(lasalimu) => [
-      q(3967),
+      q(3968),
       q(0),
       ],
    q(lasgerdi) => [
-      q(4055),
+      q(4056),
       q(0),
       ],
    q(lashi) => [
-      q(4060),
+      q(4061),
       q(0),
       ],
    q(lasi) => [
-      q(4066),
+      q(4067),
       q(0),
       ],
    q(late middle chinese) => [
-      q(4069),
+      q(4070),
       q(0),
       ],
    q(latgalian) => [
-      q(4070),
+      q(4071),
       q(0),
       ],
    q(latin) => [
@@ -39654,11 +39698,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(latu) => [
-      q(4075),
+      q(4076),
       q(0),
       ],
    q(latunde) => [
-      q(4072),
+      q(4073),
       q(0),
       ],
    q(latvian) => [
@@ -39666,47 +39710,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(latvian sign language) => [
-      q(4061),
+      q(4062),
       q(0),
       ],
    q(lau) => [
-      q(3973),
+      q(3974),
       q(0),
       ],
    q(laua) => [
-      q(4079),
+      q(4080),
       q(0),
       ],
    q(lauan) => [
-      q(3974),
+      q(3975),
       q(0),
       ],
    q(lauje) => [
-      q(3808),
+      q(3809),
       q(0),
       ],
    q(laura) => [
-      q(4086),
+      q(4087),
       q(0),
       ],
    q(laurentian) => [
-      q(4043),
+      q(4044),
       q(0),
       ],
    q(lautu chin) => [
-      q(1779),
+      q(1780),
       q(0),
       ],
    q(lavatbura-lamusong) => [
-      q(3830),
+      q(3831),
       q(0),
       ],
    q(lave) => [
-      q(1422),
+      q(1423),
       q(0),
       ],
    q(laven) => [
-      q(3824),
+      q(3825),
       q(0),
       ],
    q(lavrung) => [
@@ -39714,55 +39758,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(lavukaleve) => [
-      q(4094),
+      q(4095),
       q(0),
       ],
    q(lawangan) => [
-      q(3832),
+      q(3833),
       q(0),
       ],
    q(lawu) => [
-      q(4105),
+      q(4106),
       q(0),
       ],
    q(lawunuia) => [
-      q(6481),
+      q(6482),
       q(0),
       ],
    q(layakha) => [
-      q(4107),
+      q(4108),
       q(0),
       ],
    q(laz) => [
-      q(4113),
+      q(4114),
       q(0),
       ],
    q(lealao chinantec) => [
-      q(1771),
+      q(1772),
       q(0),
       ],
    q(leco) => [
-      q(3861),
+      q(3862),
       q(0),
       ],
    q(ledo kaili) => [
-      q(3880),
+      q(3881),
       q(0),
       ],
    q(leelau) => [
-      q(3852),
+      q(3853),
       q(0),
       ],
    q(lefa) => [
-      q(3883),
+      q(3884),
       q(0),
       ],
    q(lega-mwenga) => [
-      q(3892),
+      q(3893),
       q(0),
       ],
    q(lega-shabunda) => [
-      q(3859),
+      q(3860),
       q(0),
       ],
    q(legbo) => [
@@ -39770,131 +39814,131 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(legenyem) => [
-      q(3835),
+      q(3836),
       q(0),
       ],
    q(lehali) => [
-      q(6677),
+      q(6678),
       q(0),
       ],
    q(lehalurup) => [
-      q(6939),
+      q(6940),
       q(0),
       ],
    q(lehar) => [
-      q(1641),
+      q(1642),
       q(0),
       ],
    q(leinong naga) => [
-      q(4112),
+      q(4113),
       q(0),
       ],
    q(leipon) => [
-      q(3868),
+      q(3869),
       q(0),
       ],
    q(lelak) => [
-      q(3965),
+      q(3966),
       q(0),
       ],
    q(lele (chad)) => [
-      q(3968),
+      q(3969),
       q(0),
       ],
    q(lele (democratic republic of congo)) => [
-      q(3869),
+      q(3870),
       q(0),
       ],
    q(lele (guinea)) => [
-      q(3957),
+      q(3958),
       q(0),
       ],
    q(lele (papua new guinea)) => [
-      q(3959),
+      q(3960),
       q(0),
       ],
    q(lelemi) => [
-      q(3864),
+      q(3865),
       q(0),
       ],
    q(lelepa) => [
-      q(4036),
+      q(4037),
       q(0),
       ],
    q(lembena) => [
-      q(3874),
+      q(3875),
       q(0),
       ],
    q(lemerig) => [
-      q(4054),
+      q(4055),
       q(0),
       ],
    q(lemio) => [
-      q(3866),
+      q(3867),
       q(0),
       ],
    q(lemnian) => [
-      q(7397),
+      q(7398),
       q(0),
       ],
    q(lemolang) => [
-      q(3882),
+      q(3883),
       q(0),
       ],
    q(lemoro) => [
-      q(3851),
+      q(3852),
       q(0),
       ],
    q(lenakel) => [
-      q(6619),
+      q(6620),
       q(0),
       ],
    q(lenca) => [
-      q(3871),
+      q(3872),
       q(0),
       ],
    q(lendu) => [
-      q(3862),
+      q(3863),
       q(0),
       ],
    q(lengilu) => [
-      q(3889),
+      q(3890),
       q(0),
       ],
    q(lengo) => [
-      q(3895),
+      q(3896),
       q(0),
       ],
    q(lengola) => [
-      q(3867),
+      q(3868),
       q(0),
       ],
    q(lengua de senas catalana) => [
-      q(1866),
+      q(1867),
       q(1),
       ],
    q(lengua de senas del paraguay) => [
-      q(5673),
+      q(5674),
       q(1),
       ],
    q(lengua de senas panamenas) => [
-      q(4064),
+      q(4065),
       q(1),
       ],
    q(leningitij) => [
-      q(4004),
+      q(4005),
       q(0),
       ],
    q(lenje) => [
-      q(3865),
+      q(3866),
       q(0),
       ],
    q(lenkau) => [
-      q(3875),
+      q(3876),
       q(0),
       ],
    q(lenyima) => [
-      q(3848),
+      q(3849),
       q(0),
       ],
    q(leonese) => [
@@ -39902,39 +39946,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(lepcha) => [
-      q(3873),
+      q(3874),
       q(0),
       ],
    q(lepki) => [
-      q(4037),
+      q(4038),
       q(0),
       ],
    q(lepontic) => [
-      q(7402),
+      q(7403),
       q(0),
       ],
    q(lere) => [
-      q(2572),
+      q(2573),
       q(0),
       ],
    q(lese) => [
-      q(3876),
+      q(3877),
       q(0),
       ],
    q(lesing-gelimi) => [
-      q(3877),
+      q(3878),
       q(0),
       ],
    q(letemboi) => [
-      q(4979),
+      q(4980),
       q(0),
       ],
    q(leti (cameroon)) => [
-      q(3872),
+      q(3873),
       q(0),
       ],
    q(leti (indonesia)) => [
-      q(4071),
+      q(4072),
       q(0),
       ],
    q(letzeburgesch) => [
@@ -39942,23 +39986,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(levuka) => [
-      q(4096),
+      q(4097),
       q(0),
       ],
    q(lewo) => [
-      q(4106),
+      q(4107),
       q(0),
       ],
    q(lewo eleng) => [
-      q(4098),
+      q(4099),
       q(0),
       ],
    q(lewotobi) => [
-      q(4104),
+      q(4105),
       q(0),
       ],
    q(leyigha) => [
-      q(0998),
+      q(0999),
       q(0),
       ],
    q(lezghian) => [
@@ -39966,135 +40010,135 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lhaovo) => [
-      q(4295),
+      q(4296),
       q(1),
       ],
    q(lhokpu) => [
-      q(3905),
+      q(3906),
       q(0),
       ],
    q(lhomi) => [
-      q(3903),
+      q(3904),
       q(0),
       ],
    q(li'o) => [
-      q(3934),
+      q(3935),
       q(0),
       ],
    q(liabuku) => [
-      q(3928),
+      q(3929),
       q(0),
       ],
    q(liana-seti) => [
-      q(6256),
+      q(6257),
       q(0),
       ],
    q(liangmai naga) => [
-      q(4912),
+      q(4913),
       q(0),
       ],
    q(lianshan zhuang) => [
-      q(7872),
+      q(7874),
       q(0),
       ],
    q(liberia kpelle) => [
-      q(7458),
+      q(7459),
       q(0),
       ],
    q(liberian english) => [
-      q(3923),
+      q(3924),
       q(0),
       ],
    q(libido) => [
-      q(3922),
+      q(3923),
       q(0),
       ],
    q(libinza) => [
-      q(3930),
+      q(3931),
       q(0),
       ],
    q(libon bikol) => [
-      q(3821),
+      q(3822),
       q(0),
       ],
    q(liburnian) => [
-      q(7399),
+      q(7400),
       q(0),
       ],
    q(libyan arabic) => [
-      q(1000),
+      q(1001),
       q(0),
       ],
    q(libyan sign language) => [
-      q(3827),
+      q(3828),
       q(0),
       ],
    q(ligbi) => [
-      q(3915),
+      q(3916),
       q(0),
       ],
    q(ligenza) => [
-      q(3898),
+      q(3899),
       q(0),
       ],
    q(ligurian) => [
-      q(3917),
+      q(3918),
       q(0),
       ],
    q(ligurian (ancient)) => [
-      q(7398),
+      q(7399),
       q(0),
       ],
    q(lihir) => [
-      q(3916),
+      q(3917),
       q(0),
       ],
    q(lijili) => [
-      q(4257),
+      q(4258),
       q(0),
       ],
    q(lika) => [
-      q(3918),
+      q(3919),
       q(0),
       ],
    q(liki) => [
-      q(3920),
+      q(3921),
       q(0),
       ],
    q(likila) => [
-      q(3913),
+      q(3914),
       q(0),
       ],
    q(likuba) => [
-      q(3738),
+      q(3739),
       q(0),
       ],
    q(likum) => [
-      q(3910),
+      q(3911),
       q(0),
       ],
    q(likwala) => [
-      q(3694),
+      q(3695),
       q(0),
       ],
    q(lilau) => [
-      q(3966),
+      q(3967),
       q(0),
       ],
    q(lillooet) => [
-      q(3919),
+      q(3920),
       q(0),
       ],
    q(limassa) => [
-      q(1306),
+      q(1307),
       q(0),
       ],
    q(limbu) => [
-      q(3914),
+      q(3915),
       q(0),
       ],
    q(limbum) => [
-      q(3989),
+      q(3990),
       q(0),
       ],
    q(limburgan) => [
@@ -40110,23 +40154,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(limi) => [
-      q(7680),
+      q(7682),
       q(0),
       ],
    q(limilngan) => [
-      q(3977),
+      q(3978),
       q(0),
       ],
    q(limos kalinga) => [
-      q(3463),
+      q(3464),
       q(0),
       ],
    q(lindu) => [
-      q(3450),
+      q(3451),
       q(0),
       ],
    q(linear a) => [
-      q(3793),
+      q(3794),
       q(0),
       ],
    q(lingala) => [
@@ -40134,19 +40178,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lingao) => [
-      q(5267),
+      q(5268),
       q(0),
       ],
    q(lingarak) => [
-      q(3890),
+      q(3891),
       q(0),
       ],
    q(lingua franca) => [
-      q(5517),
+      q(5518),
       q(0),
       ],
    q(lingua franca nova) => [
-      q(3884),
+      q(3885),
       q(0),
       ],
    q(lipan apache) => [
@@ -40154,27 +40198,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lipo) => [
-      q(4039),
+      q(4040),
       q(0),
       ],
    q(lisabata-nuniali) => [
-      q(3844),
+      q(3845),
       q(0),
       ],
    q(lisela) => [
-      q(3840),
+      q(3841),
       q(0),
       ],
    q(lish) => [
-      q(4059),
+      q(4060),
       q(0),
       ],
    q(lishan didan) => [
-      q(6693),
+      q(6694),
       q(0),
       ],
    q(lishana deni) => [
-      q(4056),
+      q(4057),
       q(0),
       ],
    q(lishanid noshan) => [
@@ -40182,11 +40226,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lisu) => [
-      q(3924),
+      q(3925),
       q(0),
       ],
    q(literary chinese) => [
-      q(4110),
+      q(4111),
       q(0),
       ],
    q(lithuanian) => [
@@ -40194,87 +40238,87 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lithuanian sign language) => [
-      q(3972),
+      q(3973),
       q(0),
       ],
    q(litzlitz) => [
-      q(4111),
+      q(4112),
       q(0),
       ],
    q(liujiang zhuang) => [
-      q(7870),
+      q(7872),
       q(0),
       ],
    q(liuqian zhuang) => [
-      q(7873),
+      q(7875),
       q(0),
       ],
    q(liv) => [
-      q(3926),
+      q(3927),
       q(0),
       ],
    q(livvi) => [
-      q(5247),
+      q(5248),
       q(0),
       ],
    q(llengua de signes catalana) => [
-      q(1866),
+      q(1867),
       q(2),
       ],
    q(llengua de signes valenciana) => [
-      q(7049),
+      q(7050),
       q(1),
       ],
    q(lo-toga) => [
-      q(3907),
+      q(3908),
       q(0),
       ],
    q(loarki) => [
-      q(4046),
+      q(4047),
       q(0),
       ],
    q(lobala) => [
-      q(4027),
+      q(4028),
       q(0),
       ],
    q(lobi) => [
-      q(4014),
+      q(4015),
       q(0),
       ],
    q(lodhi) => [
-      q(3822),
+      q(3823),
       q(0),
       ],
    q(logba) => [
-      q(3894),
+      q(3895),
       q(0),
       ],
    q(logo) => [
-      q(4018),
+      q(4019),
       q(0),
       ],
    q(logol) => [
-      q(4017),
+      q(4018),
       q(0),
       ],
    q(logooli) => [
-      q(5740),
+      q(5741),
       q(0),
       ],
    q(logorik) => [
-      q(3925),
+      q(3926),
       q(0),
       ],
    q(logudorese sardinian) => [
-      q(6210),
+      q(6211),
       q(0),
       ],
    q(lohorung) => [
-      q(3826),
+      q(3827),
       q(0),
       ],
    q(loja highland quichua) => [
-      q(5704),
+      q(5705),
       q(0),
       ],
    q(lojban) => [
@@ -40282,175 +40326,175 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lokaa) => [
-      q(7597),
+      q(7598),
       q(0),
       ],
    q(loke) => [
-      q(4035),
+      q(4036),
       q(0),
       ],
    q(loko) => [
-      q(4022),
+      q(4023),
       q(0),
       ],
    q(lokoya) => [
-      q(3954),
+      q(3955),
       q(0),
       ],
    q(lola) => [
-      q(3836),
+      q(3837),
       q(0),
       ],
    q(lolak) => [
-      q(3971),
+      q(3972),
       q(0),
       ],
    q(lole) => [
-      q(3961),
+      q(3962),
       q(0),
       ],
    q(lolo) => [
-      q(3956),
+      q(3957),
       q(0),
       ],
    q(loloda) => [
-      q(4013),
+      q(4014),
       q(0),
       ],
    q(lolopo) => [
-      q(7612),
+      q(7613),
       q(0),
       ],
    q(loma (cote d'ivoire)) => [
-      q(4020),
+      q(4021),
       q(0),
       ],
    q(loma (liberia)) => [
-      q(4023),
+      q(4024),
       q(0),
       ],
    q(lomaiviti) => [
-      q(3993),
+      q(3994),
       q(0),
       ],
    q(lomavren) => [
-      q(5812),
+      q(5813),
       q(0),
       ],
    q(lombard) => [
-      q(3988),
+      q(3989),
       q(0),
       ],
    q(lombi) => [
-      q(3983),
+      q(3984),
       q(0),
       ],
    q(lombo) => [
-      q(4025),
+      q(4026),
       q(0),
       ],
    q(lomwe) => [
-      q(4844),
+      q(4845),
       q(0),
       ],
    q(loncong) => [
-      q(3837),
+      q(3838),
       q(0),
       ],
    q(long phuri naga) => [
-      q(4038),
+      q(4039),
       q(0),
       ],
    q(long wat) => [
-      q(6756),
+      q(6757),
       q(0),
       ],
    q(longgu) => [
-      q(3897),
+      q(3898),
       q(0),
       ],
    q(longto) => [
-      q(7203),
+      q(7204),
       q(0),
       ],
    q(longuda) => [
-      q(4010),
+      q(4011),
       q(0),
       ],
    q(loniu) => [
-      q(4029),
+      q(4030),
       q(0),
       ],
    q(lonwolwol) => [
-      q(1845),
+      q(1846),
       q(0),
       ],
    q(lonzo) => [
-      q(4012),
+      q(4013),
       q(0),
       ],
    q(loo) => [
-      q(3856),
+      q(3857),
       q(0),
       ],
    q(lopa) => [
-      q(4026),
+      q(4027),
       q(0),
       ],
    q(lopi) => [
-      q(4032),
+      q(4033),
       q(0),
       ],
    q(lopit) => [
-      q(4040),
+      q(4041),
       q(0),
       ],
    q(lorang) => [
-      q(4049),
+      q(4050),
       q(0),
       ],
    q(lorediakarkar) => [
-      q(4007),
+      q(4008),
       q(0),
       ],
    q(loreto-ucayali spanish) => [
-      q(6189),
+      q(6190),
       q(0),
       ],
    q(lote) => [
-      q(6964),
+      q(6965),
       q(0),
       ],
    q(lotha naga) => [
-      q(4907),
+      q(4908),
       q(0),
       ],
    q(lotud) => [
-      q(2164),
+      q(2165),
       q(0),
       ],
    q(lou) => [
-      q(4021),
+      q(4022),
       q(0),
       ],
    q(louisiana creole french) => [
-      q(4031),
+      q(4032),
       q(0),
       ],
    q(loun) => [
-      q(4034),
+      q(4035),
       q(0),
       ],
    q(loup a) => [
-      q(7401),
+      q(7402),
       q(0),
       ],
    q(loup b) => [
-      q(7394),
+      q(7395),
       q(0),
       ],
    q(lovono) => [
-      q(7040),
+      q(7041),
       q(1),
       ],
    q(low german) => [
@@ -40462,19 +40506,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(lower burdekin) => [
-      q(7292),
+      q(7293),
       q(0),
       ],
    q(lower chehalis) => [
-      q(1705),
+      q(1706),
       q(0),
       ],
    q(lower grand valley dani) => [
-      q(2102),
+      q(2103),
       q(0),
       ],
    q(lower silesian) => [
-      q(6100),
+      q(6101),
       q(0),
       ],
    q(lower sorbian) => [
@@ -40482,31 +40526,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lower southern aranda) => [
-      q(0988),
+      q(0989),
       q(0),
       ],
    q(lower ta'oih) => [
-      q(6748),
+      q(6749),
       q(0),
       ],
    q(lower tanana) => [
-      q(6357),
+      q(6358),
       q(0),
       ],
    q(lowland oaxaca chontal) => [
-      q(1778),
+      q(1779),
       q(0),
       ],
    q(lowland tarahumara) => [
-      q(6359),
+      q(6360),
       q(0),
       ],
    q(loxicha zapotec) => [
-      q(7956),
+      q(7958),
       q(0),
       ],
    q(loyop) => [
-      q(6939),
+      q(6940),
       q(1),
       ],
    q(lozi) => [
@@ -40514,15 +40558,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lu) => [
-      q(3332),
+      q(3333),
       q(0),
       ],
    q(lua') => [
-      q(5586),
+      q(5587),
       q(0),
       ],
    q(luang) => [
-      q(3881),
+      q(3882),
       q(0),
       ],
    q(luba-katanga) => [
@@ -40534,51 +40578,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lubila) => [
-      q(3210),
+      q(3211),
       q(0),
       ],
    q(lubu) => [
-      q(3838),
+      q(3839),
       q(0),
       ],
    q(lubuagan kalinga) => [
-      q(3480),
+      q(3481),
       q(0),
       ],
    q(lubukusu) => [
-      q(1576),
+      q(1577),
       q(1),
       ],
    q(luchazi) => [
-      q(3839),
+      q(3840),
       q(0),
       ],
    q(lucumi) => [
-      q(4085),
+      q(4086),
       q(0),
       ],
    q(ludian) => [
-      q(4077),
+      q(4078),
       q(0),
       ],
    q(lufu) => [
-      q(3858),
+      q(3859),
       q(0),
       ],
    q(lugbara) => [
-      q(3887),
+      q(3888),
       q(0),
       ],
    q(luguru) => [
-      q(5864),
+      q(5865),
       q(0),
       ],
    q(luhu) => [
-      q(3843),
+      q(3844),
       q(0),
       ],
    q(lui) => [
-      q(3812),
+      q(3813),
       q(0),
       ],
    q(luidakho-luisukha-lutirichi) => [
@@ -40586,7 +40630,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(luimbi) => [
-      q(4083),
+      q(4084),
       q(0),
       ],
    q(luiseno) => [
@@ -40594,15 +40638,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lukabaras) => [
-      q(3939),
+      q(3940),
       q(1),
       ],
    q(lukpa) => [
-      q(2122),
+      q(2123),
       q(0),
       ],
    q(lule) => [
-      q(6892),
+      q(6893),
       q(0),
       ],
    q(lule sami) => [
@@ -40610,35 +40654,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lulogooli) => [
-      q(5740),
+      q(5741),
       q(1),
       ],
    q(lumba-yakkha) => [
-      q(4088),
+      q(4089),
       q(0),
       ],
    q(lumbee) => [
-      q(3997),
+      q(3998),
       q(0),
       ],
    q(lumbu) => [
-      q(4084),
+      q(4085),
       q(0),
       ],
    q(lumun) => [
-      q(3978),
+      q(3979),
       q(0),
       ],
    q(lun bawang) => [
-      q(4000),
+      q(4001),
       q(1),
       ],
    q(luna) => [
-      q(4080),
+      q(4081),
       q(0),
       ],
    q(lunanakha) => [
-      q(4081),
+      q(4082),
       q(0),
       ],
    q(lunda) => [
@@ -40646,19 +40690,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lundayeh) => [
-      q(4000),
+      q(4001),
       q(0),
       ],
    q(lungalunga) => [
-      q(7023),
+      q(7024),
       q(0),
       ],
    q(lungga) => [
-      q(3885),
+      q(3886),
       q(0),
       ],
    q(luo (cameroon)) => [
-      q(4090),
+      q(4091),
       q(0),
       ],
    q(luo (kenya and tanzania)) => [
@@ -40674,11 +40718,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(luri) => [
-      q(3847),
+      q(3848),
       q(0),
       ],
    q(lusengo) => [
-      q(4057),
+      q(4058),
       q(0),
       ],
    q(lushai) => [
@@ -40686,35 +40730,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(lushootseed) => [
-      q(4087),
+      q(4088),
       q(0),
       ],
    q(lusi) => [
-      q(3341),
+      q(3342),
       q(0),
       ],
    q(lusitanian) => [
-      q(7403),
+      q(7404),
       q(0),
       ],
    q(lutachoni) => [
-      q(4074),
+      q(4075),
       q(1),
       ],
    q(lutos) => [
-      q(4804),
+      q(4805),
       q(0),
       ],
    q(luvale) => [
-      q(4078),
+      q(4079),
       q(0),
       ],
    q(luwati) => [
-      q(4089),
+      q(4090),
       q(0),
       ],
    q(luwo) => [
-      q(4103),
+      q(4104),
       q(0),
       ],
    q(luxembourgish) => [
@@ -40722,115 +40766,115 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(luyana) => [
-      q(4109),
+      q(4110),
       q(0),
       ],
    q(luyia) => [
-      q(4091),
+      q(4092),
       q(0),
       ],
    q(lwalu) => [
-      q(4097),
+      q(4098),
       q(0),
       ],
    q(lycian) => [
-      q(7395),
+      q(7396),
       q(0),
       ],
    q(lydian) => [
-      q(7396),
+      q(7397),
       q(0),
       ],
    q(lyele) => [
-      q(3863),
+      q(3864),
       q(0),
       ],
    q(lyngngam) => [
-      q(4108),
+      q(4109),
       q(0),
       ],
    q(lyons sign language) => [
-      q(4058),
+      q(4059),
       q(0),
       ],
    q(ma (democratic republic of congo)) => [
-      q(4538),
+      q(4539),
       q(0),
       ],
    q(ma (papua new guinea)) => [
-      q(4330),
+      q(4331),
       q(0),
       ],
    q(ma manda) => [
-      q(6072),
+      q(6073),
       q(0),
       ],
    q(ma'anyan) => [
-      q(4296),
+      q(4297),
       q(0),
       ],
    q(ma'di) => [
-      q(4281),
+      q(4282),
       q(0),
       ],
    q(ma'ya) => [
-      q(6114),
+      q(6115),
       q(0),
       ],
    q(maa) => [
-      q(1783),
+      q(1784),
       q(0),
       ],
    q(maaka) => [
-      q(4221),
+      q(4222),
       q(0),
       ],
    q(maasina fulfulde) => [
-      q(2342),
+      q(2343),
       q(0),
       ],
    q(maay) => [
-      q(7695),
+      q(7697),
       q(0),
       ],
    q(maba (chad)) => [
-      q(4182),
+      q(4183),
       q(0),
       ],
    q(maba (indonesia)) => [
-      q(4480),
+      q(4481),
       q(0),
       ],
    q(mabaale) => [
-      q(4413),
+      q(4414),
       q(0),
       ],
    q(mabaan) => [
-      q(4249),
+      q(4250),
       q(0),
       ],
    q(mabaka valley kalinga) => [
-      q(3408),
+      q(3409),
       q(0),
       ],
    q(mabire) => [
-      q(4587),
+      q(4588),
       q(0),
       ],
    q(maca) => [
-      q(4152),
+      q(4153),
       q(0),
       ],
    q(macaguaje) => [
-      q(4163),
+      q(4164),
       q(0),
       ],
    q(macaguan) => [
-      q(4139),
+      q(4140),
       q(0),
       ],
    q(macanese) => [
-      q(4710),
+      q(4711),
       q(0),
       ],
    q(macedo-romanian) => [
@@ -40846,51 +40890,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(machiguenga) => [
-      q(4153),
+      q(4154),
       q(0),
       ],
    q(machinere) => [
-      q(4458),
+      q(4459),
       q(0),
       ],
    q(machinga) => [
-      q(4620),
+      q(4621),
       q(0),
       ],
    q(maco) => [
-      q(7211),
+      q(7212),
       q(0),
       ],
    q(macuna) => [
-      q(4691),
+      q(4692),
       q(0),
       ],
    q(macushi) => [
-      q(4129),
+      q(4130),
       q(0),
       ],
    q(mada (cameroon)) => [
-      q(4666),
+      q(4667),
       q(0),
       ],
    q(mada (nigeria)) => [
-      q(4178),
+      q(4179),
       q(0),
       ],
    q(madagascar sign language) => [
-      q(4695),
+      q(4696),
       q(0),
       ],
    q(madak) => [
-      q(4411),
+      q(4412),
       q(0),
       ],
    q(maden) => [
-      q(7428),
+      q(7429),
       q(0),
       ],
    q(madhi madhi) => [
-      q(2084),
+      q(2085),
       q(0),
       ],
    q(madi) => [
@@ -40898,7 +40942,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(madngele) => [
-      q(7885),
+      q(7887),
       q(0),
       ],
    q(madurese) => [
@@ -40906,7 +40950,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mae) => [
-      q(4393),
+      q(4394),
       q(0),
       ],
    q(maek) => [
@@ -40918,19 +40962,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mafa) => [
-      q(4117),
+      q(4118),
       q(0),
       ],
    q(mafea) => [
-      q(4362),
+      q(4363),
       q(0),
       ],
    q(mag-antsi ayta) => [
-      q(5990),
+      q(5991),
       q(0),
       ],
    q(mag-indi ayta) => [
-      q(1299),
+      q(1300),
       q(0),
       ],
    q(magahi) => [
@@ -40938,103 +40982,103 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(magbukun ayta) => [
-      q(1007),
+      q(1008),
       q(0),
       ],
    q(magdalena penasco mixtec) => [
-      q(7516),
+      q(7517),
       q(0),
       ],
    q(maghdi) => [
-      q(2556),
+      q(2557),
       q(0),
       ],
    q(magoma) => [
-      q(2563),
+      q(2564),
       q(0),
       ],
    q(magori) => [
-      q(7841),
+      q(7843),
       q(0),
       ],
    q(maguindanaon) => [
-      q(4184),
+      q(4185),
       q(0),
       ],
    q(magyi) => [
-      q(2557),
+      q(2558),
       q(0),
       ],
    q(mah meri) => [
-      q(4278),
+      q(4279),
       q(1),
       ],
    q(mahali) => [
-      q(4340),
+      q(4341),
       q(0),
       ],
    q(maharastri prakrit) => [
-      q(5513),
+      q(5514),
       q(0),
       ],
    q(mahasu pahari) => [
-      q(1159),
+      q(1160),
       q(0),
       ],
    q(mahican) => [
-      q(4341),
+      q(4342),
       q(0),
       ],
    q(mahongwe) => [
-      q(4275),
+      q(4276),
       q(0),
       ],
    q(mahou) => [
-      q(4669),
+      q(4670),
       q(0),
       ],
    q(mai brat) => [
-      q(1010),
+      q(1011),
       q(0),
       ],
    q(maia) => [
-      q(6087),
+      q(6088),
       q(0),
       ],
    q(maiadomu) => [
-      q(4717),
+      q(4718),
       q(0),
       ],
    q(maiani) => [
-      q(6616),
+      q(6617),
       q(0),
       ],
    q(maii) => [
-      q(4401),
+      q(4402),
       q(0),
       ],
    q(mailu) => [
-      q(4269),
+      q(4270),
       q(0),
       ],
    q(maindo) => [
-      q(1924),
+      q(1925),
       q(0),
       ],
    q(mainfrankisch) => [
-      q(7022),
+      q(7023),
       q(0),
       ],
    q(mainstream kenyah) => [
-      q(7379),
+      q(7380),
       q(0),
       ],
    q(mairasi) => [
-      q(7944),
+      q(7946),
       q(0),
       ],
    q(maisin) => [
-      q(4142),
+      q(4143),
       q(0),
       ],
    q(maithili) => [
@@ -41042,55 +41086,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(maiwa (indonesia)) => [
-      q(7174),
+      q(7175),
       q(0),
       ],
    q(maiwa (papua new guinea)) => [
-      q(4562),
+      q(4563),
       q(0),
       ],
    q(maiwala) => [
-      q(4589),
+      q(4590),
       q(0),
       ],
    q(majang) => [
-      q(4459),
+      q(4460),
       q(0),
       ],
    q(majera) => [
-      q(7414),
+      q(7415),
       q(0),
       ],
    q(majhi) => [
-      q(4342),
+      q(4343),
       q(0),
       ],
    q(majhwar) => [
-      q(4398),
+      q(4399),
       q(0),
       ],
    q(majukayang kalinga) => [
-      q(3456),
+      q(3457),
       q(0),
       ],
    q(mak (china)) => [
-      q(4348),
+      q(4349),
       q(0),
       ],
    q(mak (nigeria)) => [
-      q(5370),
+      q(5371),
       q(0),
       ],
    q(makaa) => [
-      q(4167),
+      q(4168),
       q(0),
       ],
    q(makah) => [
-      q(4678),
+      q(4679),
       q(0),
       ],
    q(makasae) => [
-      q(4366),
+      q(4367),
       q(0),
       ],
    q(makasar) => [
@@ -41098,55 +41142,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(makassar malay) => [
-      q(4239),
+      q(4240),
       q(0),
       ],
    q(makayam) => [
-      q(0945),
+      q(0946),
       q(0),
       ],
    q(makhuwa) => [
-      q(7036),
+      q(7037),
       q(0),
       ],
    q(makhuwa-marrevone) => [
-      q(7408),
+      q(7409),
       q(0),
       ],
    q(makhuwa-meetto) => [
-      q(4256),
+      q(4257),
       q(0),
       ],
    q(makhuwa-moniga) => [
-      q(4285),
+      q(4286),
       q(0),
       ],
    q(makhuwa-saka) => [
-      q(7500),
+      q(7501),
       q(0),
       ],
    q(makhuwa-shirima) => [
-      q(7027),
+      q(7028),
       q(0),
       ],
    q(maklew) => [
-      q(4254),
+      q(4255),
       q(0),
       ],
    q(makolkol) => [
-      q(7881),
+      q(7883),
       q(0),
       ],
    q(makonde) => [
-      q(3237),
+      q(3238),
       q(0),
       ],
    q(maku'a) => [
-      q(4093),
+      q(4094),
       q(0),
       ],
    q(makurap) => [
-      q(4474),
+      q(4475),
       q(0),
       ],
    q(makuri naga) => [
@@ -41154,27 +41198,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(makwe) => [
-      q(7693),
+      q(7695),
       q(0),
       ],
    q(makyan naga) => [
-      q(6907),
+      q(6908),
       q(0),
       ],
    q(mal) => [
-      q(4371),
+      q(4372),
       q(0),
       ],
    q(mal paharia) => [
-      q(4344),
+      q(4345),
       q(0),
       ],
    q(mala (nigeria)) => [
-      q(5873),
+      q(5874),
       q(0),
       ],
    q(mala (papua new guinea)) => [
-      q(5405),
+      q(5406),
       q(0),
       ],
    q(mala malasar) => [
@@ -41182,11 +41226,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(malaccan creole malay) => [
-      q(1687),
+      q(1688),
       q(0),
       ],
    q(malaccan creole portuguese) => [
-      q(4164),
+      q(4165),
       q(0),
       ],
    q(malagasy) => [
@@ -41194,43 +41238,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(malalamai) => [
-      q(4407),
+      q(4408),
       q(0),
       ],
    q(malango) => [
-      q(4378),
+      q(4379),
       q(0),
       ],
    q(malankuravan) => [
-      q(4331),
+      q(4332),
       q(0),
       ],
    q(malapandaram) => [
-      q(4332),
+      q(4333),
       q(0),
       ],
    q(malaryan) => [
-      q(4333),
+      q(4334),
       q(0),
       ],
    q(malas) => [
-      q(4358),
+      q(4359),
       q(0),
       ],
    q(malasar) => [
-      q(7700),
+      q(7702),
       q(0),
       ],
    q(malavedan) => [
-      q(4334),
+      q(4335),
       q(0),
       ],
    q(malawi lomwe) => [
-      q(4024),
+      q(4025),
       q(0),
       ],
    q(malawi sena) => [
-      q(6306),
+      q(6307),
       q(0),
       ],
    q(malay) => [
@@ -41238,7 +41282,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(malay (individual language)) => [
-      q(7871),
+      q(7873),
       q(0),
       ],
    q(malay (macrolanguage)) => [
@@ -41250,15 +41294,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(malayic dayak) => [
-      q(7326),
+      q(7327),
       q(0),
       ],
    q(malaynon) => [
-      q(4388),
+      q(4389),
       q(0),
       ],
    q(malayo) => [
-      q(4141),
+      q(4142),
       q(0),
       ],
    q(malayo-polynesian languages) => [
@@ -41266,11 +41310,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(malaysian sign language) => [
-      q(7416),
+      q(7417),
       q(0),
       ],
    q(malba birifor) => [
-      q(1149),
+      q(1150),
       q(0),
       ],
    q(maldivian) => [
@@ -41282,15 +41326,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(male (ethiopia)) => [
-      q(4199),
+      q(4200),
       q(0),
       ],
    q(male (papua new guinea)) => [
-      q(4180),
+      q(4181),
       q(0),
       ],
    q(malecite-passamaquoddy) => [
-      q(5585),
+      q(5586),
       q(0),
       ],
    q(maleku jaika) => [
@@ -41298,55 +41342,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(maleng) => [
-      q(5483),
+      q(5484),
       q(0),
       ],
    q(maleu-kilenge) => [
-      q(4260),
+      q(4261),
       q(0),
       ],
    q(malfaxal) => [
-      q(4387),
+      q(4388),
       q(0),
       ],
    q(malgana) => [
-      q(7028),
+      q(7029),
       q(0),
       ],
    q(malgbe) => [
-      q(4651),
+      q(4652),
       q(0),
       ],
    q(mali) => [
-      q(2443),
+      q(2444),
       q(0),
       ],
    q(malila) => [
-      q(4265),
+      q(4266),
       q(0),
       ],
    q(malimba) => [
-      q(4696),
+      q(4697),
       q(0),
       ],
    q(malimpung) => [
-      q(4373),
+      q(4374),
       q(0),
       ],
    q(malinaltepec me'phaa) => [
-      q(6409),
+      q(6410),
       q(0),
       ],
    q(malinaltepec tlapanec) => [
-      q(6409),
+      q(6410),
       q(1),
       ],
    q(malo) => [
-      q(4367),
+      q(4368),
       q(0),
       ],
    q(malol) => [
-      q(4136),
+      q(4137),
       q(0),
       ],
    q(maltese) => [
@@ -41354,107 +41398,107 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(maltese sign language) => [
-      q(4188),
+      q(4189),
       q(0),
       ],
    q(malua bay) => [
-      q(4376),
+      q(4377),
       q(0),
       ],
    q(malvi) => [
-      q(4591),
+      q(4592),
       q(0),
       ],
    q(malyangapa) => [
-      q(7632),
+      q(7633),
       q(0),
       ],
    q(mam) => [
-      q(4119),
+      q(4120),
       q(0),
       ],
    q(mama) => [
-      q(4389),
+      q(4390),
       q(0),
       ],
    q(mamaa) => [
-      q(4279),
+      q(4280),
       q(0),
       ],
    q(mamainde) => [
-      q(7170),
+      q(7171),
       q(0),
       ],
    q(mamanwa) => [
-      q(4402),
+      q(4403),
       q(0),
       ],
    q(mamara senoufo) => [
-      q(4681),
+      q(4682),
       q(0),
       ],
    q(mamasa) => [
-      q(4488),
+      q(4489),
       q(0),
       ],
    q(mambae) => [
-      q(4261),
+      q(4262),
       q(0),
       ],
    q(mambai) => [
-      q(4170),
+      q(4171),
       q(0),
       ],
    q(mamboru) => [
-      q(4602),
+      q(4603),
       q(0),
       ],
    q(mambwe-lungu) => [
-      q(4266),
+      q(4267),
       q(0),
       ],
    q(mampruli) => [
-      q(4124),
+      q(4125),
       q(0),
       ],
    q(mamuju) => [
-      q(4502),
+      q(4503),
       q(0),
       ],
    q(mamulique) => [
-      q(2255),
+      q(2256),
       q(0),
       ],
    q(mamusi) => [
-      q(3238),
+      q(3239),
       q(0),
       ],
    q(mamvu) => [
-      q(4185),
+      q(4186),
       q(0),
       ],
    q(man met) => [
-      q(4400),
+      q(4401),
       q(0),
       ],
    q(manado malay) => [
-      q(7417),
+      q(7418),
       q(0),
       ],
    q(manam) => [
-      q(4600),
+      q(4601),
       q(0),
       ],
    q(manambu) => [
-      q(4370),
+      q(4371),
       q(0),
       ],
    q(manangba) => [
-      q(4973),
+      q(4974),
       q(0),
       ],
    q(manangkari) => [
-      q(7903),
+      q(7905),
       q(0),
       ],
    q(manchu) => [
@@ -41462,31 +41506,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(manda (australia)) => [
-      q(7874),
+      q(7876),
       q(0),
       ],
    q(manda (india)) => [
-      q(4274),
+      q(4275),
       q(0),
       ],
    q(manda (tanzania)) => [
-      q(4267),
+      q(4268),
       q(0),
       ],
    q(mandahuaca) => [
-      q(4292),
+      q(4293),
       q(0),
       ],
    q(mandaic) => [
-      q(4300),
+      q(4301),
       q(0),
       ],
    q(mandan) => [
-      q(4289),
+      q(4290),
       q(0),
       ],
    q(mandandanyi) => [
-      q(7884),
+      q(7886),
       q(0),
       ],
    q(mandar) => [
@@ -41494,19 +41538,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mandara) => [
-      q(6384),
+      q(6385),
       q(0),
       ],
    q(mandari) => [
-      q(4499),
+      q(4500),
       q(0),
       ],
    q(mandarin chinese) => [
-      q(1789),
+      q(1790),
       q(0),
       ],
    q(mandaya) => [
-      q(4528),
+      q(4529),
       q(0),
       ],
    q(mande languages) => [
@@ -41514,11 +41558,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mandeali) => [
-      q(4328),
+      q(4329),
       q(0),
       ],
    q(mander) => [
-      q(4496),
+      q(4497),
       q(0),
       ],
    q(manding) => [
@@ -41530,11 +41574,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mandinka) => [
-      q(4422),
+      q(4423),
       q(0),
       ],
    q(mandjak) => [
-      q(4245),
+      q(4246),
       q(0),
       ],
    q(mandobo atas) => [
@@ -41542,7 +41586,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mandobo bawah) => [
-      q(1556),
+      q(1557),
       q(0),
       ],
    q(manem) => [
@@ -41550,71 +41594,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mang) => [
-      q(7902),
+      q(7904),
       q(0),
       ],
    q(manga kanuri) => [
-      q(3206),
+      q(3207),
       q(0),
       ],
    q(mangala) => [
-      q(4212),
+      q(4213),
       q(0),
       ],
    q(mangarayi) => [
-      q(4457),
+      q(4458),
       q(0),
       ],
    q(mangareva) => [
-      q(4525),
+      q(4526),
       q(0),
       ],
    q(mangas) => [
-      q(7904),
+      q(7906),
       q(0),
       ],
    q(mangayat) => [
-      q(4680),
+      q(4681),
       q(0),
       ],
    q(mangbetu) => [
-      q(4186),
+      q(4187),
       q(0),
       ],
    q(mangbutu) => [
-      q(4187),
+      q(4188),
       q(0),
       ],
    q(mangerr) => [
-      q(7878),
+      q(7880),
       q(0),
       ],
    q(mangga buang) => [
-      q(4403),
+      q(4404),
       q(0),
       ],
    q(manggarai) => [
-      q(4503),
+      q(4504),
       q(0),
       ],
    q(mango) => [
-      q(4253),
+      q(4254),
       q(0),
       ],
    q(mangole) => [
-      q(4482),
+      q(4483),
       q(0),
       ],
    q(mangseng) => [
-      q(4133),
+      q(4134),
       q(0),
       ],
    q(mangue) => [
-      q(4444),
+      q(4445),
       q(0),
       ],
    q(manichaean middle persian) => [
-      q(7418),
+      q(7419),
       q(0),
       ],
    q(manide) => [
@@ -41622,11 +41666,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(manikion) => [
-      q(4433),
+      q(4434),
       q(0),
       ],
    q(manipa) => [
-      q(4494),
+      q(4495),
       q(0),
       ],
    q(manipuri) => [
@@ -41634,19 +41678,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mankanya) => [
-      q(3484),
+      q(3485),
       q(0),
       ],
    q(manna-dora) => [
-      q(4337),
+      q(4338),
       q(0),
       ],
    q(mannan) => [
-      q(4338),
+      q(4339),
       q(0),
       ],
    q(mano) => [
-      q(4220),
+      q(4221),
       q(0),
       ],
    q(manobo languages) => [
@@ -41654,39 +41698,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(manombai) => [
-      q(7206),
+      q(7207),
       q(0),
       ],
    q(mansaka) => [
-      q(4539),
+      q(4540),
       q(0),
       ],
    q(mansi) => [
-      q(4429),
+      q(4430),
       q(0),
       ],
    q(mansoanka) => [
-      q(4550),
+      q(4551),
       q(0),
       ],
    q(manta) => [
-      q(4677),
+      q(4678),
       q(0),
       ],
    q(mantsi) => [
-      q(5101),
+      q(5102),
       q(0),
       ],
    q(manumanaw) => [
-      q(3721),
+      q(3722),
       q(1),
       ],
    q(manumanaw karen) => [
-      q(3721),
+      q(3722),
       q(0),
       ],
    q(manusela) => [
-      q(7122),
+      q(7123),
       q(0),
       ],
    q(manx) => [
@@ -41694,31 +41738,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(manya) => [
-      q(4701),
+      q(4702),
       q(0),
       ],
    q(manyawa) => [
-      q(4434),
+      q(4435),
       q(0),
       ],
    q(manyika) => [
-      q(4648),
+      q(4649),
       q(0),
       ],
    q(manza) => [
-      q(4713),
+      q(4714),
       q(0),
       ],
    q(mao naga) => [
-      q(4746),
+      q(4747),
       q(0),
       ],
    q(maonan) => [
-      q(4392),
+      q(4393),
       q(0),
       ],
    q(maore comorian) => [
-      q(6299),
+      q(6300),
       q(0),
       ],
    q(maori) => [
@@ -41726,27 +41770,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mape) => [
-      q(4372),
+      q(4373),
       q(0),
       ],
    q(mapena) => [
-      q(4424),
+      q(4425),
       q(0),
       ],
    q(mapia) => [
-      q(4478),
+      q(4479),
       q(0),
       ],
    q(mapidian) => [
-      q(4476),
+      q(4477),
       q(0),
       ],
    q(mapos buang) => [
-      q(1619),
+      q(1620),
       q(0),
       ],
    q(mapoyo) => [
-      q(4158),
+      q(4159),
       q(0),
       ],
    q(mapuche) => [
@@ -41758,59 +41802,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mapun) => [
-      q(6061),
+      q(6062),
       q(0),
       ],
    q(maquiritari) => [
-      q(4159),
+      q(4160),
       q(0),
       ],
    q(mara) => [
-      q(4203),
+      q(4204),
       q(0),
       ],
    q(mara chin) => [
-      q(4512),
+      q(4513),
       q(0),
       ],
    q(marachi) => [
-      q(4045),
+      q(4046),
       q(0),
       ],
    q(maraghei) => [
-      q(7024),
+      q(7025),
       q(0),
       ],
    q(maragus) => [
-      q(4522),
+      q(4523),
       q(0),
       ],
    q(maram naga) => [
-      q(4961),
+      q(4962),
       q(0),
       ],
    q(marama) => [
-      q(4048),
+      q(4049),
       q(0),
       ],
    q(maramba) => [
-      q(4674),
+      q(4675),
       q(0),
       ],
    q(maranao) => [
-      q(4526),
+      q(4527),
       q(0),
       ],
    q(marangis) => [
-      q(7074),
+      q(7075),
       q(1),
       ],
    q(maranunggu) => [
-      q(7891),
+      q(7893),
       q(0),
       ],
    q(mararit) => [
-      q(4250),
+      q(4251),
       q(0),
       ],
    q(marathi) => [
@@ -41818,43 +41862,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(marau) => [
-      q(4615),
+      q(4616),
       q(0),
       ],
    q(marba) => [
-      q(4460),
+      q(4461),
       q(0),
       ],
    q(maremgi) => [
-      q(4527),
+      q(4528),
       q(0),
       ],
    q(marenje) => [
-      q(7032),
+      q(7033),
       q(0),
       ],
    q(marfa) => [
-      q(4618),
+      q(4619),
       q(0),
       ],
    q(margany) => [
-      q(7876),
+      q(7878),
       q(0),
       ],
    q(marghi central) => [
-      q(4523),
+      q(4524),
       q(0),
       ],
    q(marghi south) => [
-      q(4236),
+      q(4237),
       q(0),
       ],
    q(margos-yarowilca-lauricocha quechua) => [
-      q(5706),
+      q(5707),
       q(0),
       ],
    q(margu) => [
-      q(4280),
+      q(4281),
       q(0),
       ],
    q(mari) => [
@@ -41862,7 +41906,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mari (east sepik province)) => [
-      q(4149),
+      q(4150),
       q(0),
       ],
    q(mari (madang province)) => [
@@ -41874,95 +41918,95 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(maria (india)) => [
-      q(4521),
+      q(4522),
       q(0),
       ],
    q(maria (papua new guinea)) => [
-      q(4193),
+      q(4194),
       q(0),
       ],
    q(maricopa) => [
-      q(4507),
+      q(4508),
       q(0),
       ],
    q(maridan) => [
-      q(7877),
+      q(7879),
       q(0),
       ],
    q(maridjabin) => [
-      q(7883),
+      q(7885),
       q(0),
       ],
    q(marik) => [
-      q(1939),
+      q(1940),
       q(0),
       ],
    q(marimanindji) => [
-      q(7886),
+      q(7888),
       q(0),
       ],
    q(marind) => [
-      q(4529),
+      q(4530),
       q(0),
       ],
    q(maring) => [
-      q(4148),
+      q(4149),
       q(0),
       ],
    q(maring naga) => [
-      q(4993),
+      q(4994),
       q(0),
       ],
    q(maringarr) => [
-      q(7893),
+      q(7895),
       q(0),
       ],
    q(marino) => [
-      q(4506),
+      q(4507),
       q(0),
       ],
    q(mariri) => [
-      q(4487),
+      q(4488),
       q(0),
       ],
    q(marithiel) => [
-      q(4241),
+      q(4242),
       q(0),
       ],
    q(maritime sign language) => [
-      q(5079),
+      q(5080),
       q(0),
       ],
    q(maritsaua) => [
-      q(4544),
+      q(4545),
       q(0),
       ],
    q(mariyedi) => [
-      q(7898),
+      q(7900),
       q(0),
       ],
    q(marka) => [
-      q(5801),
+      q(5802),
       q(0),
       ],
    q(markweeta) => [
-      q(2264),
+      q(2265),
       q(0),
       ],
    q(marma) => [
-      q(5827),
+      q(5828),
       q(0),
       ],
    q(marovo) => [
-      q(4612),
+      q(4613),
       q(0),
       ],
    q(marriammu) => [
-      q(7486),
+      q(7487),
       q(0),
       ],
    q(marrucinian) => [
-      q(6902),
+      q(6903),
       q(0),
       ],
    q(marshallese) => [
@@ -41974,27 +42018,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(martha's vineyard sign language) => [
-      q(4509),
+      q(4510),
       q(0),
       ],
    q(marti ke) => [
-      q(7880),
+      q(7882),
       q(0),
       ],
    q(martu wangka) => [
-      q(4463),
+      q(4464),
       q(0),
       ],
    q(martuyhunira) => [
-      q(7017),
+      q(7018),
       q(0),
       ],
    q(maru) => [
-      q(4295),
+      q(4296),
       q(0),
       ],
    q(marubo) => [
-      q(4709),
+      q(4710),
       q(0),
       ],
    q(marwari) => [
@@ -42002,19 +42046,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(marwari (india)) => [
-      q(5879),
+      q(5880),
       q(0),
       ],
    q(marwari (pakistan)) => [
-      q(4603),
+      q(4604),
       q(0),
       ],
    q(masaaba) => [
-      q(4690),
+      q(4691),
       q(0),
       ],
    q(masadiit itneg) => [
-      q(6530),
+      q(6531),
       q(0),
       ],
    q(masai) => [
@@ -42022,19 +42066,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(masalit) => [
-      q(4383),
+      q(4384),
       q(0),
       ],
    q(masana) => [
-      q(4165),
+      q(4166),
       q(0),
       ],
    q(masbatenyo) => [
-      q(4530),
+      q(4531),
       q(0),
       ],
    q(mashco piro) => [
-      q(1908),
+      q(1909),
       q(0),
       ],
    q(mashi (nigeria)) => [
@@ -42042,11 +42086,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mashi (zambia)) => [
-      q(4287),
+      q(4288),
       q(0),
       ],
    q(masikoro malagasy) => [
-      q(4536),
+      q(4537),
       q(0),
       ],
    q(masimasi) => [
@@ -42054,83 +42098,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(masiwang) => [
-      q(1332),
+      q(1333),
       q(0),
       ],
    q(maskelynes) => [
-      q(3449),
+      q(3450),
       q(0),
       ],
    q(maslam) => [
-      q(4549),
+      q(4550),
       q(0),
       ],
    q(masmaje) => [
-      q(4217),
+      q(4218),
       q(0),
       ],
    q(massalat) => [
-      q(4183),
+      q(4184),
       q(0),
       ],
    q(massep) => [
-      q(4616),
+      q(4617),
       q(0),
       ],
    q(matagalpa) => [
-      q(4567),
+      q(4568),
       q(0),
       ],
    q(matal) => [
-      q(4231),
+      q(4232),
       q(0),
       ],
    q(matbat) => [
-      q(7424),
+      q(7425),
       q(0),
       ],
    q(matengo) => [
-      q(4270),
+      q(4271),
       q(0),
       ],
    q(matepi) => [
-      q(4483),
+      q(4484),
       q(0),
       ],
    q(matigsalug manobo) => [
-      q(4145),
+      q(4146),
       q(0),
       ],
    q(matipuhy) => [
-      q(4706),
+      q(4707),
       q(0),
       ],
    q(matis) => [
-      q(4470),
+      q(4471),
       q(0),
       ],
    q(mato) => [
-      q(4218),
+      q(4219),
       q(0),
       ],
    q(mato grosso arara) => [
-      q(0986),
+      q(0987),
       q(0),
       ],
    q(mator) => [
-      q(4566),
+      q(4567),
       q(0),
       ],
    q(matses) => [
-      q(4157),
+      q(4158),
       q(0),
       ],
    q(mattoki) => [
-      q(7444),
+      q(7445),
       q(1),
       ],
    q(mattole) => [
-      q(4601),
+      q(4602),
       q(0),
       ],
    q(matu chin) => [
@@ -42138,75 +42182,75 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(matukar) => [
-      q(4327),
+      q(4328),
       q(0),
       ],
    q(matumbi) => [
-      q(4271),
+      q(4272),
       q(0),
       ],
    q(matya samo) => [
-      q(6261),
+      q(6262),
       q(0),
       ],
    q(maung) => [
-      q(4461),
+      q(4462),
       q(0),
       ],
    q(mauritian sign language) => [
-      q(4068),
+      q(4069),
       q(0),
       ],
    q(mauwake) => [
-      q(4284),
+      q(4285),
       q(0),
       ],
    q(mawa (chad)) => [
-      q(4174),
+      q(4175),
       q(0),
       ],
    q(mawa (nigeria)) => [
-      q(7167),
+      q(7168),
       q(0),
       ],
    q(mawak) => [
-      q(4326),
+      q(4327),
       q(0),
       ],
    q(mawan) => [
-      q(4177),
+      q(4178),
       q(0),
       ],
    q(mawayana) => [
-      q(4715),
+      q(4716),
       q(0),
       ],
    q(mawchi) => [
-      q(4346),
+      q(4347),
       q(0),
       ],
    q(mawes) => [
-      q(4259),
+      q(4260),
       q(0),
       ],
    q(mawukakan) => [
-      q(4669),
+      q(4670),
       q(1),
       ],
    q(maxakali) => [
-      q(4137),
+      q(4138),
       q(0),
       ],
    q(maxi gbe) => [
-      q(4657),
+      q(4658),
       q(0),
       ],
    q(maya samo) => [
-      q(6339),
+      q(6340),
       q(0),
       ],
    q(mayaguduna) => [
-      q(7429),
+      q(7430),
       q(0),
       ],
    q(mayan languages) => [
@@ -42214,35 +42258,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mayangna) => [
-      q(7587),
+      q(7588),
       q(0),
       ],
    q(mayawali) => [
-      q(7792),
+      q(7794),
       q(0),
       ],
    q(mayeka) => [
-      q(4673),
+      q(4674),
       q(0),
       ],
    q(mayi-kulan) => [
-      q(7567),
+      q(7568),
       q(0),
       ],
    q(mayi-thakurti) => [
-      q(7569),
+      q(7570),
       q(0),
       ],
    q(mayi-yapi) => [
-      q(7566),
+      q(7567),
       q(0),
       ],
    q(mayo) => [
-      q(4248),
+      q(4249),
       q(0),
       ],
    q(mayogo) => [
-      q(4189),
+      q(4190),
       q(0),
       ],
    q(mayoyao ifugao) => [
@@ -42250,67 +42294,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mazagway) => [
-      q(2076),
+      q(2077),
       q(0),
       ],
    q(mazaltepec zapotec) => [
-      q(7936),
+      q(7938),
       q(0),
       ],
    q(mazanderani) => [
-      q(4705),
+      q(4706),
       q(0),
       ],
    q(mazatlan mazatec) => [
-      q(7039),
+      q(7040),
       q(0),
       ],
    q(mazatlan mixe) => [
-      q(4703),
+      q(4704),
       q(0),
       ],
    q(mba) => [
-      q(4226),
+      q(4227),
       q(0),
       ],
    q(mbala) => [
-      q(4191),
+      q(4192),
       q(0),
       ],
    q(mbalanhu) => [
-      q(3999),
+      q(4000),
       q(0),
       ],
    q(mbandja) => [
-      q(7899),
+      q(7901),
       q(0),
       ],
    q(mbangala) => [
-      q(4652),
+      q(4653),
       q(0),
       ],
    q(mbangi) => [
-      q(4262),
+      q(4263),
       q(0),
       ],
    q(mbangwe) => [
-      q(7887),
+      q(7889),
       q(0),
       ],
    q(mbara (australia)) => [
-      q(4609),
+      q(4610),
       q(0),
       ],
    q(mbara (chad)) => [
-      q(4464),
+      q(4465),
       q(0),
       ],
    q(mbariman-gudhinma) => [
-      q(7895),
+      q(7897),
       q(0),
       ],
    q(mbati) => [
-      q(4190),
+      q(4191),
       q(0),
       ],
    q(mbato) => [
@@ -42318,123 +42362,123 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mbay) => [
-      q(4672),
+      q(4673),
       q(0),
       ],
    q(mbe) => [
-      q(4238),
+      q(4239),
       q(0),
       ],
    q(mbe') => [
-      q(4564),
+      q(4565),
       q(0),
       ],
    q(mbelime) => [
-      q(4490),
+      q(4491),
       q(0),
       ],
    q(mbere) => [
-      q(4194),
+      q(4195),
       q(0),
       ],
    q(mbesa) => [
-      q(7892),
+      q(7894),
       q(0),
       ],
    q(mbo (cameroon)) => [
-      q(4140),
+      q(4141),
       q(0),
       ],
    q(mbo (democratic republic of congo)) => [
-      q(7896),
+      q(7898),
       q(0),
       ],
    q(mboi) => [
-      q(4441),
+      q(4442),
       q(0),
       ],
    q(mboko) => [
-      q(4195),
+      q(4196),
       q(0),
       ],
    q(mbole) => [
-      q(4192),
+      q(4193),
       q(0),
       ],
    q(mbonga) => [
-      q(7407),
+      q(7408),
       q(0),
       ],
    q(mbongno) => [
-      q(1179),
+      q(1180),
       q(0),
       ],
    q(mbosi) => [
-      q(4197),
+      q(4198),
       q(0),
       ],
    q(mbowe) => [
-      q(4660),
+      q(4661),
       q(0),
       ],
    q(mbre) => [
-      q(4343),
+      q(4344),
       q(0),
       ],
    q(mbudum) => [
-      q(7409),
+      q(7410),
       q(0),
       ],
    q(mbugu) => [
-      q(4277),
+      q(4278),
       q(0),
       ],
    q(mbugwe) => [
-      q(4273),
+      q(4274),
       q(0),
       ],
    q(mbuko) => [
-      q(4481),
+      q(4482),
       q(0),
       ],
    q(mbukushu) => [
-      q(4294),
+      q(4295),
       q(0),
       ],
    q(mbula) => [
-      q(4414),
+      q(4415),
       q(0),
       ],
    q(mbula-bwazza) => [
-      q(4146),
+      q(4147),
       q(0),
       ],
    q(mbule) => [
-      q(4368),
+      q(4369),
       q(0),
       ],
    q(mbulungish) => [
-      q(4147),
+      q(4148),
       q(0),
       ],
    q(mbum) => [
-      q(4181),
+      q(4182),
       q(0),
       ],
    q(mbunda) => [
-      q(4162),
+      q(4163),
       q(0),
       ],
    q(mbunga) => [
-      q(4272),
+      q(4273),
       q(0),
       ],
    q(mburku) => [
-      q(1056),
+      q(1057),
       q(0),
       ],
    q(mbwela) => [
-      q(4244),
+      q(4245),
       q(0),
       ],
    q(mbya guarani) => [
@@ -42442,95 +42486,95 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(me'en) => [
-      q(4683),
+      q(4684),
       q(0),
       ],
    q(mea) => [
-      q(1739),
+      q(1740),
       q(2),
       ],
    q(medebur) => [
-      q(4329),
+      q(4330),
       q(0),
       ],
    q(media lengua) => [
-      q(4583),
+      q(4584),
       q(0),
       ],
    q(mediak) => [
-      q(4643),
+      q(4644),
       q(0),
       ],
    q(median) => [
-      q(7410),
+      q(7411),
       q(0),
       ],
    q(mednyj aleut) => [
-      q(4582),
+      q(4583),
       q(0),
       ],
    q(medumba) => [
-      q(1608),
+      q(1609),
       q(0),
       ],
    q(mefele) => [
-      q(4233),
+      q(4234),
       q(0),
       ],
    q(megam) => [
-      q(4206),
+      q(4207),
       q(0),
       ],
    q(megleno romanian) => [
-      q(5870),
+      q(5871),
       q(0),
       ],
    q(mehek) => [
-      q(5125),
+      q(5126),
       q(0),
       ],
    q(mehinaku) => [
-      q(4396),
+      q(4397),
       q(0),
       ],
    q(mehri) => [
-      q(2466),
+      q(2467),
       q(0),
       ],
    q(mekeo) => [
-      q(4210),
+      q(4211),
       q(0),
       ],
    q(mekmek) => [
-      q(4608),
+      q(4609),
       q(0),
       ],
    q(mekwei) => [
-      q(4534),
+      q(4535),
       q(0),
       ],
    q(mele-fila) => [
-      q(4650),
+      q(4651),
       q(0),
       ],
    q(melo) => [
-      q(4247),
+      q(4248),
       q(0),
       ],
    q(melpa) => [
-      q(4204),
+      q(4205),
       q(0),
       ],
    q(memoni) => [
-      q(4150),
+      q(4151),
       q(0),
       ],
    q(mendalam kayan) => [
-      q(7371),
+      q(7372),
       q(0),
       ],
    q(mendankwe-nkwen) => [
-      q(4227),
+      q(4228),
       q(0),
       ],
    q(mende) => [
@@ -42538,7 +42582,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mende (papua new guinea)) => [
-      q(6043),
+      q(6044),
       q(0),
       ],
    q(mende (sierra leone)) => [
@@ -42546,75 +42590,75 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(mengaka) => [
-      q(7412),
+      q(7413),
       q(0),
       ],
    q(mengen) => [
-      q(4205),
+      q(4206),
       q(0),
       ],
    q(mengisa) => [
-      q(4171),
+      q(4172),
       q(0),
       ],
    q(menik) => [
-      q(6625),
+      q(6626),
       q(0),
       ],
    q(menka) => [
-      q(4201),
+      q(4202),
       q(0),
       ],
    q(menominee) => [
-      q(4223),
+      q(4224),
       q(0),
       ],
    q(mentawai) => [
-      q(4641),
+      q(4642),
       q(0),
       ],
    q(menya) => [
-      q(4169),
+      q(4170),
       q(0),
       ],
    q(meoswar) => [
-      q(4621),
+      q(4622),
       q(0),
       ],
    q(mer) => [
-      q(4430),
+      q(4431),
       q(0),
       ],
    q(meramera) => [
-      q(4658),
+      q(4659),
       q(0),
       ],
    q(merei) => [
-      q(3976),
+      q(3977),
       q(0),
       ],
    q(merey) => [
-      q(4215),
+      q(4216),
       q(0),
       ],
    q(meriam) => [
-      q(6895),
+      q(6896),
       q(0),
       ],
    q(merlav) => [
-      q(4516),
+      q(4517),
       q(0),
       ],
    q(meroitic) => [
-      q(7422),
+      q(7423),
       q(0),
       ],
    q(meru) => [
-      q(4216),
+      q(4217),
       q(0),
       ],
    q(merwari) => [
-      q(7230),
+      q(7231),
       q(0),
       ],
    q(mesaka) => [
@@ -42626,19 +42670,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mese) => [
-      q(4160),
+      q(4161),
       q(0),
       ],
    q(meskwaki) => [
-      q(5887),
+      q(5888),
       q(0),
       ],
    q(mesme) => [
-      q(7851),
+      q(7853),
       q(0),
       ],
    q(mesmes) => [
-      q(4687),
+      q(4688),
       q(0),
       ],
    q(mesopotamian arabic) => [
@@ -42646,55 +42690,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mesqan) => [
-      q(4623),
+      q(4624),
       q(0),
       ],
    q(messapic) => [
-      q(1792),
+      q(1793),
       q(0),
       ],
    q(meta') => [
-      q(4263),
+      q(4264),
       q(0),
       ],
    q(metlatonoc mixtec) => [
-      q(4667),
+      q(4668),
       q(0),
       ],
    q(mewari) => [
-      q(4571),
+      q(4572),
       q(0),
       ],
    q(mewati) => [
-      q(7243),
+      q(7244),
       q(0),
       ],
    q(mexican sign language) => [
-      q(4242),
+      q(4243),
       q(0),
       ],
    q(meyah) => [
-      q(4209),
+      q(4210),
       q(0),
       ],
    q(mezontla popoloca) => [
-      q(5365),
+      q(5366),
       q(0),
       ],
    q(mezquital otomi) => [
-      q(5318),
+      q(5319),
       q(0),
       ],
    q(mfinu) => [
-      q(7879),
+      q(7881),
       q(0),
       ],
    q(mfumte) => [
-      q(4833),
+      q(4834),
       q(0),
       ],
    q(mgbolizhia) => [
-      q(2565),
+      q(2566),
       q(0),
       ],
    q(mi'kmaq) => [
@@ -42702,35 +42746,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(miahuatlan zapotec) => [
-      q(7815),
+      q(7817),
       q(0),
       ],
    q(miami) => [
-      q(4298),
+      q(4299),
       q(0),
       ],
    q(mian) => [
-      q(4473),
+      q(4474),
       q(0),
       ],
    q(miani) => [
-      q(5485),
+      q(5486),
       q(0),
       ],
    q(michif) => [
-      q(1848),
+      q(1849),
       q(0),
       ],
    q(michigamea) => [
-      q(1788),
+      q(1789),
       q(0),
       ],
    q(michoacan mazahua) => [
-      q(4391),
+      q(4392),
       q(0),
       ],
    q(michoacan nahuatl) => [
-      q(4772),
+      q(4773),
       q(0),
       ],
    q(micmac) => [
@@ -42738,23 +42782,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(mid grand valley dani) => [
-      q(2107),
+      q(2108),
       q(0),
       ],
    q(mid-southern banda) => [
-      q(1243),
+      q(1244),
       q(0),
       ],
    q(middle armenian) => [
-      q(0989),
+      q(0990),
       q(0),
       ],
    q(middle breton) => [
-      q(7299),
+      q(7300),
       q(0),
       ],
    q(middle cornish) => [
-      q(1807),
+      q(1808),
       q(0),
       ],
    q(middle dutch (ca. 1050-1350)) => [
@@ -42782,63 +42826,63 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(middle korean (10th-16th cent.)) => [
-      q(5234),
+      q(5235),
       q(0),
       ],
    q(middle low german) => [
-      q(2558),
+      q(2559),
       q(0),
       ],
    q(middle mongolian) => [
-      q(7433),
+      q(7434),
       q(0),
       ],
    q(middle newar) => [
-      q(5139),
+      q(5140),
       q(0),
       ],
    q(middle watut) => [
-      q(4465),
+      q(4466),
       q(0),
       ],
    q(middle welsh) => [
-      q(7158),
+      q(7159),
       q(0),
       ],
    q(midob) => [
-      q(4208),
+      q(4209),
       q(0),
       ],
    q(migaama) => [
-      q(4412),
+      q(4413),
       q(0),
       ],
    q(migabac) => [
-      q(4469),
+      q(4470),
       q(0),
       ],
    q(migum) => [
-      q(3440),
+      q(3441),
       q(0),
       ],
    q(miji) => [
-      q(6060),
+      q(6061),
       q(1),
       ],
    q(miju-mishmi) => [
-      q(4655),
+      q(4656),
       q(0),
       ],
    q(mikasuki) => [
-      q(4307),
+      q(4308),
       q(0),
       ],
    q(mili) => [
-      q(7691),
+      q(7693),
       q(0),
       ],
    q(miltu) => [
-      q(4374),
+      q(4375),
       q(0),
       ],
    q(miluk) => [
@@ -42850,19 +42894,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(min bei chinese) => [
-      q(4426),
+      q(4427),
       q(0),
       ],
    q(min dong chinese) => [
-      q(1700),
+      q(1701),
       q(0),
       ],
    q(min nan chinese) => [
-      q(4729),
+      q(4730),
       q(0),
       ],
    q(min zhong chinese) => [
-      q(1935),
+      q(1936),
       q(0),
       ],
    q(mina (cameroon)) => [
@@ -42870,7 +42914,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mina (india)) => [
-      q(4679),
+      q(4680),
       q(0),
       ],
    q(minaean) => [
@@ -42878,7 +42922,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(minang) => [
-      q(7479),
+      q(7480),
       q(0),
       ],
    q(minangkabau) => [
@@ -42886,27 +42930,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(minanibai) => [
-      q(4173),
+      q(4174),
       q(0),
       ],
    q(minaveha) => [
-      q(4611),
+      q(4612),
       q(0),
       ],
    q(minderico) => [
-      q(2134),
+      q(2135),
       q(0),
       ],
    q(mindiri) => [
-      q(4467),
+      q(4468),
       q(0),
       ],
    q(mingang doso) => [
-      q(4355),
+      q(4356),
       q(0),
       ],
    q(mingrelian) => [
-      q(7411),
+      q(7412),
       q(0),
       ],
    q(minica huitoto) => [
@@ -42914,43 +42958,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(minidien) => [
-      q(7132),
+      q(7133),
       q(0),
       ],
    q(minigir) => [
-      q(1571),
+      q(1572),
       q(1),
       ],
    q(minjungbal) => [
-      q(7366),
+      q(7367),
       q(0),
       ],
    q(minkin) => [
-      q(7561),
+      q(7562),
       q(0),
       ],
    q(minoan) => [
-      q(5258),
+      q(5259),
       q(0),
       ],
    q(minokok) => [
-      q(4495),
+      q(4496),
       q(0),
       ],
    q(minriq) => [
-      q(4427),
+      q(4428),
       q(0),
       ],
    q(mintil) => [
-      q(4711),
+      q(4712),
       q(0),
       ],
    q(minz zhuang) => [
-      q(7839),
+      q(7841),
       q(0),
       ],
    q(miqie) => [
-      q(7654),
+      q(7656),
       q(0),
       ],
    q(mirandese) => [
@@ -42958,127 +43002,127 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(miraya bikol) => [
-      q(5759),
+      q(5760),
       q(0),
       ],
    q(mirgan) => [
-      q(7940),
+      q(7942),
       q(0),
       ],
    q(miriti) => [
-      q(4409),
+      q(4410),
       q(0),
       ],
    q(miriwung) => [
-      q(4214),
+      q(4215),
       q(0),
       ],
    q(miship) => [
-      q(4335),
+      q(4336),
       q(0),
       ],
    q(misima-panaeati) => [
-      q(4477),
+      q(4478),
       q(0),
       ],
    q(mising) => [
-      q(4511),
+      q(4512),
       q(0),
       ],
    q(miskito) => [
-      q(4312),
+      q(4313),
       q(0),
       ],
    q(mitla zapotec) => [
-      q(7823),
+      q(7825),
       q(0),
       ],
    q(mitlatongo mixtec) => [
-      q(7029),
+      q(7030),
       q(0),
       ],
    q(mittu) => [
-      q(4640),
+      q(4641),
       q(0),
       ],
    q(mituku) => [
-      q(7890),
+      q(7892),
       q(0),
       ],
    q(miu) => [
-      q(4468),
+      q(4469),
       q(0),
       ],
    q(miwa) => [
-      q(7025),
+      q(7026),
       q(0),
       ],
    q(mixed great andamanese) => [
-      q(2398),
+      q(2399),
       q(0),
       ],
    q(mixtepec mixtec) => [
-      q(4317),
+      q(4318),
       q(0),
       ],
    q(mixtepec zapotec) => [
-      q(7924),
+      q(7926),
       q(0),
       ],
    q(miya) => [
-      q(4347),
+      q(4348),
       q(0),
       ],
    q(miyako) => [
-      q(4607),
+      q(4608),
       q(0),
       ],
    q(miyobe) => [
-      q(6175),
+      q(6176),
       q(0),
       ],
    q(mlabri) => [
-      q(4505),
+      q(4506),
       q(0),
       ],
    q(mlahso) => [
-      q(3906),
+      q(3907),
       q(0),
       ],
    q(mlap) => [
-      q(3377),
+      q(3378),
       q(0),
       ],
    q(mlomp) => [
-      q(4379),
+      q(4380),
       q(0),
       ],
    q(mmaala) => [
-      q(4408),
+      q(4409),
       q(0),
       ],
    q(mmen) => [
-      q(1147),
+      q(1148),
       q(0),
       ],
    q(mo) => [
-      q(7146),
+      q(7147),
       q(1),
       ],
    q(mo'da) => [
-      q(2431),
+      q(2432),
       q(0),
       ],
    q(moabite) => [
-      q(5191),
+      q(5192),
       q(0),
       ],
    q(moba) => [
-      q(4240),
+      q(4241),
       q(0),
       ],
    q(mobilian) => [
-      q(4438),
+      q(4439),
       q(0),
       ],
    q(mobumrin aizi) => [
@@ -43090,27 +43134,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mocheno) => [
-      q(4286),
+      q(4287),
       q(0),
       ],
    q(mochi) => [
-      q(5243),
+      q(5244),
       q(0),
       ],
    q(mochica) => [
-      q(5252),
+      q(5253),
       q(0),
       ],
    q(mocho) => [
-      q(4276),
+      q(4277),
       q(0),
       ],
    q(mocovi) => [
-      q(4437),
+      q(4438),
       q(0),
       ],
    q(modang) => [
-      q(4649),
+      q(4650),
       q(0),
       ],
    q(modern greek (1453-)) => [
@@ -43118,31 +43162,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(modole) => [
-      q(4493),
+      q(4494),
       q(0),
       ],
    q(moere) => [
-      q(4614),
+      q(4615),
       q(0),
       ],
    q(mofu-gudur) => [
-      q(4302),
+      q(4303),
       q(0),
       ],
    q(mogholi) => [
-      q(4282),
+      q(4283),
       q(0),
       ],
    q(mogofin) => [
-      q(4230),
+      q(4231),
       q(0),
       ],
    q(mogum) => [
-      q(4449),
+      q(4450),
       q(0),
       ],
    q(mohave) => [
-      q(4450),
+      q(4451),
       q(0),
       ],
    q(mohawk) => [
@@ -43150,59 +43194,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mohegan-pequot) => [
-      q(7467),
+      q(7468),
       q(0),
       ],
    q(moi (congo)) => [
-      q(4451),
+      q(4452),
       q(0),
       ],
    q(moi (indonesia)) => [
-      q(4659),
+      q(4660),
       q(0),
       ],
    q(moikodi) => [
-      q(4356),
+      q(4357),
       q(0),
       ],
    q(moingi) => [
-      q(4645),
+      q(4646),
       q(0),
       ],
    q(moji) => [
-      q(7692),
+      q(7694),
       q(0),
       ],
    q(mok) => [
-      q(4498),
+      q(4499),
       q(0),
       ],
    q(moken) => [
-      q(4639),
+      q(4640),
       q(0),
       ],
    q(mokerang) => [
-      q(4243),
+      q(4244),
       q(0),
       ],
    q(mokilese) => [
-      q(4350),
+      q(4351),
       q(0),
       ],
    q(moklen) => [
-      q(4353),
+      q(4354),
       q(0),
       ],
    q(mokole) => [
-      q(4352),
+      q(4353),
       q(0),
       ],
    q(mokpwe) => [
-      q(1428),
+      q(1429),
       q(0),
       ],
    q(moksela) => [
-      q(7033),
+      q(7034),
       q(0),
       ],
    q(moksha) => [
@@ -43210,11 +43254,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(molale) => [
-      q(4131),
+      q(4132),
       q(0),
       ],
    q(molbog) => [
-      q(5664),
+      q(5665),
       q(0),
       ],
    q(moldavian) => [
@@ -43222,7 +43266,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(moldova sign language) => [
-      q(7047),
+      q(7048),
       q(0),
       ],
    q(moldovan) => [
@@ -43230,59 +43274,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(molengue) => [
-      q(1568),
+      q(1569),
       q(0),
       ],
    q(molima) => [
-      q(4452),
+      q(4453),
       q(0),
       ],
    q(molmo one) => [
-      q(0943),
+      q(0944),
       q(0),
       ],
    q(molo) => [
-      q(7888),
+      q(7890),
       q(0),
       ],
    q(molof) => [
-      q(4540),
+      q(4541),
       q(0),
       ],
    q(moloko) => [
-      q(4386),
+      q(4387),
       q(0),
       ],
    q(mom jango) => [
-      q(6993),
+      q(6994),
       q(0),
       ],
    q(moma) => [
-      q(4682),
+      q(4683),
       q(0),
       ],
    q(momare) => [
-      q(4553),
+      q(4554),
       q(0),
       ],
    q(mombo dogon) => [
-      q(2082),
+      q(2083),
       q(0),
       ],
    q(mombum) => [
-      q(4543),
+      q(4544),
       q(0),
       ],
    q(momina) => [
-      q(4390),
+      q(4391),
       q(0),
       ],
    q(momuna) => [
-      q(4484),
+      q(4485),
       q(0),
       ],
    q(mon) => [
-      q(4432),
+      q(4433),
       q(0),
       ],
    q(mon-khmer languages) => [
@@ -43290,15 +43334,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(monastic sign language) => [
-      q(4698),
+      q(4699),
       q(0),
       ],
    q(monde) => [
-      q(4416),
+      q(4417),
       q(0),
       ],
    q(mondropolon) => [
-      q(5037),
+      q(5038),
       q(0),
       ],
    q(mong) => [
@@ -43318,11 +43362,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mongol) => [
-      q(4268),
+      q(4269),
       q(0),
       ],
    q(mongolia buriat) => [
-      q(1578),
+      q(1579),
       q(0),
       ],
    q(mongolian) => [
@@ -43334,55 +43378,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mongolian sign language) => [
-      q(4546),
+      q(4547),
       q(0),
       ],
    q(mongondow) => [
-      q(4440),
+      q(4441),
       q(0),
       ],
    q(moni) => [
-      q(4435),
+      q(4436),
       q(0),
       ],
    q(mono (cameroon)) => [
-      q(4524),
+      q(4525),
       q(0),
       ],
    q(mono (democratic republic of congo)) => [
-      q(4420),
+      q(4421),
       q(0),
       ],
    q(mono (solomon islands)) => [
-      q(4558),
+      q(4559),
       q(0),
       ],
    q(mono (usa)) => [
-      q(4428),
+      q(4429),
       q(0),
       ],
    q(monom) => [
-      q(4445),
+      q(4446),
       q(0),
       ],
    q(monsang naga) => [
-      q(4968),
+      q(4969),
       q(0),
       ],
    q(montagnais) => [
-      q(4439),
+      q(4440),
       q(0),
       ],
    q(montol) => [
-      q(4565),
+      q(4566),
       q(0),
       ],
    q(monumbo) => [
-      q(4656),
+      q(4657),
       q(0),
       ],
    q(monzombo) => [
-      q(4442),
+      q(4443),
       q(0),
       ],
    q(moo) => [
@@ -43390,59 +43434,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(moose cree) => [
-      q(1853),
+      q(1854),
       q(0),
       ],
    q(mopan maya) => [
-      q(4446),
+      q(4447),
       q(0),
       ],
    q(mor (bomberai peninsula)) => [
-      q(4447),
+      q(4448),
       q(0),
       ],
    q(mor (mor islands)) => [
-      q(4297),
+      q(4298),
       q(0),
       ],
    q(moraid) => [
-      q(4535),
+      q(4536),
       q(0),
       ],
    q(morawa) => [
-      q(4697),
+      q(4698),
       q(0),
       ],
    q(morelos nahuatl) => [
-      q(4869),
+      q(4870),
       q(0),
       ],
    q(morerebi) => [
-      q(7419),
+      q(7420),
       q(0),
       ],
    q(moresada) => [
-      q(4551),
+      q(4552),
       q(0),
       ],
    q(mori atas) => [
-      q(4708),
+      q(4709),
       q(0),
       ],
    q(mori bawah) => [
-      q(7430),
+      q(7431),
       q(0),
       ],
    q(morigi) => [
-      q(4179),
+      q(4180),
       q(0),
       ],
    q(morisyen) => [
-      q(4228),
+      q(4229),
       q(0),
       ],
    q(moro) => [
-      q(4448),
+      q(4449),
       q(0),
       ],
    q(moroccan arabic) => [
@@ -43450,47 +43494,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(moroccan sign language) => [
-      q(7423),
+      q(7424),
       q(0),
       ],
    q(morokodo) => [
-      q(4251),
+      q(4252),
       q(0),
       ],
    q(morom) => [
-      q(1102),
+      q(1103),
       q(0),
       ],
    q(moronene) => [
-      q(4492),
+      q(4493),
       q(0),
       ],
    q(morori) => [
-      q(4443),
+      q(4444),
       q(0),
       ],
    q(morouas) => [
-      q(4519),
+      q(4520),
       q(0),
       ],
    q(mortlockese) => [
-      q(4515),
+      q(4516),
       q(0),
       ],
    q(moru) => [
-      q(4252),
+      q(4253),
       q(0),
       ],
    q(mosimo) => [
-      q(4500),
+      q(4501),
       q(0),
       ],
    q(mosiro) => [
-      q(4644),
+      q(4645),
       q(0),
       ],
    q(moskona) => [
-      q(4563),
+      q(4564),
       q(0),
       ],
    q(mossi) => [
@@ -43498,23 +43542,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mota) => [
-      q(4573),
+      q(4574),
       q(0),
       ],
    q(motlav) => [
-      q(4385),
+      q(4386),
       q(0),
       ],
    q(motu) => [
-      q(4219),
+      q(4220),
       q(0),
       ],
    q(mouk-aria) => [
-      q(4630),
+      q(4631),
       q(0),
       ],
    q(mountain koiali) => [
-      q(3544),
+      q(3545),
       q(0),
       ],
    q(mouwase) => [
@@ -43522,7 +43566,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(movima) => [
-      q(4707),
+      q(4708),
       q(0),
       ],
    q(moyadan itneg) => [
@@ -43530,47 +43574,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(moyon naga) => [
-      q(4975),
+      q(4976),
       q(0),
       ],
    q(mozambican sign language) => [
-      q(4716),
+      q(4717),
       q(0),
       ],
    q(mozarabic) => [
-      q(4654),
+      q(4655),
       q(0),
       ],
    q(mpade) => [
-      q(4462),
+      q(4463),
       q(0),
       ],
    q(mpalitjanh) => [
-      q(7461),
+      q(7462),
       q(0),
       ],
    q(mpi) => [
-      q(4479),
+      q(4480),
       q(0),
       ],
    q(mpiemo) => [
-      q(4175),
+      q(4176),
       q(0),
       ],
    q(mpoto) => [
-      q(4455),
+      q(4456),
       q(0),
       ],
    q(mpotovoro) => [
-      q(4617),
+      q(4618),
       q(0),
       ],
    q(mpumpong) => [
-      q(4255),
+      q(4256),
       q(0),
       ],
    q(mpuono) => [
-      q(7889),
+      q(7891),
       q(0),
       ],
    q(mpur) => [
@@ -43578,15 +43622,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mro-khimi chin) => [
-      q(1791),
+      q(1792),
       q(0),
       ],
    q(mru) => [
-      q(4518),
+      q(4519),
       q(0),
       ],
    q(mser) => [
-      q(3570),
+      q(3571),
       q(0),
       ],
    q(mt. iraya agta) => [
@@ -43598,35 +43642,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mualang) => [
-      q(4557),
+      q(4558),
       q(0),
       ],
    q(mubami) => [
-      q(6731),
+      q(6732),
       q(0),
       ],
    q(mubi) => [
-      q(4580),
+      q(4581),
       q(0),
       ],
    q(muda) => [
-      q(7688),
+      q(7690),
       q(0),
       ],
    q(mudburra) => [
-      q(2095),
+      q(2096),
       q(0),
       ],
    q(mudhili gadaba) => [
-      q(2416),
+      q(2417),
       q(0),
       ],
    q(mudu koraga) => [
-      q(7020),
+      q(7021),
       q(0),
       ],
    q(muduga) => [
-      q(6862),
+      q(6863),
       q(0),
       ],
    q(mufian) => [
@@ -43634,43 +43678,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mugom) => [
-      q(4588),
+      q(4589),
       q(0),
       ],
    q(muinane) => [
-      q(1319),
+      q(1320),
       q(0),
       ],
    q(mukha-dora) => [
-      q(4399),
+      q(4400),
       q(0),
       ],
    q(mukulu) => [
-      q(4454),
+      q(4455),
       q(0),
       ],
    q(mulaha) => [
-      q(4246),
+      q(4247),
       q(0),
       ],
    q(mulam) => [
-      q(4377),
+      q(4378),
       q(0),
       ],
    q(mulao) => [
-      q(2526),
+      q(2527),
       q(0),
       ],
    q(mulgi) => [
-      q(4606),
+      q(4607),
       q(0),
       ],
    q(mullu kurumba) => [
-      q(3524),
+      q(3525),
       q(0),
       ],
    q(mullukmulluk) => [
-      q(4456),
+      q(4457),
       q(0),
       ],
    q(multiple languages) => [
@@ -43678,27 +43722,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(muluridyi) => [
-      q(7034),
+      q(7035),
       q(0),
       ],
    q(mum) => [
-      q(3547),
+      q(3548),
       q(0),
       ],
    q(mumuye) => [
-      q(4704),
+      q(4705),
       q(0),
       ],
    q(mun chin) => [
-      q(4637),
+      q(4638),
       q(0),
       ],
    q(muna) => [
-      q(4415),
+      q(4416),
       q(0),
       ],
    q(munda) => [
-      q(6921),
+      q(6922),
       q(0),
       ],
    q(munda languages) => [
@@ -43706,71 +43750,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(mundabli) => [
-      q(1353),
+      q(1354),
       q(0),
       ],
    q(mundang) => [
-      q(4579),
+      q(4580),
       q(0),
       ],
    q(mundani) => [
-      q(4418),
+      q(4419),
       q(0),
       ],
    q(mundari) => [
-      q(6919),
+      q(6920),
       q(0),
       ],
    q(mundat) => [
-      q(4394),
+      q(4395),
       q(0),
       ],
    q(mundu) => [
-      q(4585),
+      q(4586),
       q(0),
       ],
    q(munduruku) => [
-      q(4688),
+      q(4689),
       q(0),
       ],
    q(mungaka) => [
-      q(4283),
+      q(4284),
       q(0),
       ],
    q(mungbam) => [
-      q(4306),
+      q(4307),
       q(1),
       ],
    q(munggui) => [
-      q(4561),
+      q(4562),
       q(0),
       ],
    q(mungkip) => [
-      q(4475),
+      q(4476),
       q(0),
       ],
    q(muniche) => [
-      q(4686),
+      q(4687),
       q(0),
       ],
    q(munit) => [
-      q(4556),
+      q(4557),
       q(0),
       ],
    q(munji) => [
-      q(4421),
+      q(4422),
       q(0),
       ],
    q(munsee) => [
-      q(6912),
+      q(6913),
       q(0),
       ],
    q(muong) => [
-      q(4570),
+      q(4571),
       q(0),
       ],
    q(mur pano) => [
-      q(6561),
+      q(6562),
       q(0),
       ],
    q(muratayak) => [
@@ -43778,27 +43822,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(murik (malaysia)) => [
-      q(4663),
+      q(4664),
       q(0),
       ],
    q(murik (papua new guinea)) => [
-      q(4559),
+      q(4560),
       q(0),
       ],
    q(murkim) => [
-      q(5811),
+      q(5812),
       q(0),
       ],
    q(murle) => [
-      q(4593),
+      q(4594),
       q(0),
       ],
    q(murrinh-patha) => [
-      q(4628),
+      q(4629),
       q(0),
       ],
    q(mursi) => [
-      q(4599),
+      q(4600),
       q(0),
       ],
    q(murui huitoto) => [
@@ -43806,143 +43850,143 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(murupi) => [
-      q(4501),
+      q(4502),
       q(0),
       ],
    q(muruwari) => [
-      q(7894),
+      q(7896),
       q(0),
       ],
    q(musak) => [
-      q(4405),
+      q(4406),
       q(0),
       ],
    q(musar) => [
-      q(4397),
+      q(4398),
       q(0),
       ],
    q(musasa) => [
-      q(6123),
+      q(6124),
       q(0),
       ],
    q(musey) => [
-      q(4533),
+      q(4534),
       q(0),
       ],
    q(musgu) => [
-      q(4584),
+      q(4585),
       q(0),
       ],
    q(mushungulu) => [
-      q(7406),
+      q(7407),
       q(0),
       ],
    q(musi) => [
-      q(4586),
+      q(4587),
       q(0),
       ],
    q(muskum) => [
-      q(4322),
+      q(4323),
       q(0),
       ],
    q(muslim tat) => [
-      q(6753),
+      q(6754),
       q(0),
       ],
    q(musom) => [
-      q(4548),
+      q(4549),
       q(0),
       ],
    q(mussau-emira) => [
-      q(2253),
+      q(2254),
       q(0),
       ],
    q(muthuvan) => [
-      q(4596),
+      q(4597),
       q(0),
       ],
    q(mutu) => [
-      q(6761),
+      q(6762),
       q(0),
       ],
    q(muya) => [
-      q(4610),
+      q(4611),
       q(0),
       ],
    q(muyang) => [
-      q(4598),
+      q(4599),
       q(0),
       ],
    q(muyuw) => [
-      q(4689),
+      q(4690),
       q(0),
       ],
    q(muzi) => [
-      q(7703),
+      q(7705),
       q(0),
       ],
    q(mvanip) => [
-      q(4161),
+      q(4162),
       q(0),
       ],
    q(mvuba) => [
-      q(4653),
+      q(4654),
       q(0),
       ],
    q(mwaghavul) => [
-      q(6284),
+      q(6285),
       q(0),
       ],
    q(mwali comorian) => [
-      q(7152),
+      q(7153),
       q(0),
       ],
    q(mwan) => [
-      q(4436),
+      q(4437),
       q(0),
       ],
    q(mwani) => [
-      q(7179),
+      q(7180),
       q(0),
       ],
    q(mwatebu) => [
-      q(4624),
+      q(4625),
       q(0),
       ],
    q(mwera (chimwera)) => [
-      q(4627),
+      q(4628),
       q(0),
       ],
    q(mwera (nyasa)) => [
-      q(4324),
+      q(4325),
       q(0),
       ],
    q(mwerlap) => [
-      q(4516),
+      q(4517),
       q(1),
       ],
    q(mwimbi-muthambi) => [
-      q(4638),
+      q(4639),
       q(0),
       ],
    q(mwotlap) => [
-      q(4385),
+      q(4386),
       q(1),
       ],
    q(mycenaean greek) => [
-      q(2564),
+      q(2565),
       q(0),
       ],
    q(myene) => [
-      q(4675),
+      q(4676),
       q(0),
       ],
    q(mysian) => [
-      q(7701),
+      q(7703),
       q(0),
       ],
    q(mzieme naga) => [
-      q(4965),
+      q(4966),
       q(0),
       ],
    q(n'ko) => [
@@ -43950,11 +43994,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(n/u) => [
-      q(4840),
+      q(4841),
       q(0),
       ],
    q(na) => [
-      q(4756),
+      q(4757),
       q(0),
       ],
    q(na-dene languages) => [
@@ -43962,55 +44006,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(na-meo) => [
-      q(4819),
+      q(4820),
       q(0),
       ],
    q(naaba) => [
-      q(4730),
+      q(4731),
       q(0),
       ],
    q(naami) => [
-      q(1633),
+      q(1634),
       q(0),
       ],
    q(naasioi) => [
-      q(4733),
+      q(4734),
       q(0),
       ],
    q(naba) => [
-      q(4417),
+      q(4418),
       q(0),
       ],
    q(nabak) => [
-      q(4723),
+      q(4724),
       q(0),
       ],
    q(nabi) => [
-      q(4578),
+      q(4579),
       q(0),
       ],
    q(nachering) => [
-      q(4764),
+      q(4765),
       q(0),
       ],
    q(nadeb) => [
-      q(4135),
+      q(4136),
       q(0),
       ],
    q(nadruvian) => [
-      q(4787),
+      q(4788),
       q(0),
       ],
    q(nafaanra) => [
-      q(4832),
+      q(4833),
       q(0),
       ],
    q(nafi) => [
-      q(6212),
+      q(6213),
       q(0),
       ],
    q(nafri) => [
-      q(5154),
+      q(5155),
       q(0),
       ],
    q(nafusi) => [
@@ -44018,35 +44062,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(naga pidgin) => [
-      q(4724),
+      q(4725),
       q(0),
       ],
    q(nagarchal) => [
-      q(4744),
+      q(4745),
       q(0),
       ],
    q(nage) => [
-      q(5143),
+      q(5144),
       q(0),
       ],
    q(nagumi) => [
-      q(4854),
+      q(4855),
       q(0),
       ],
    q(naha'ai) => [
-      q(4387),
+      q(4388),
       q(1),
       ],
    q(nahali) => [
-      q(4958),
+      q(4959),
       q(0),
       ],
    q(nahari) => [
-      q(4866),
+      q(4867),
       q(0),
       ],
    q(nahavaq) => [
-      q(6149),
+      q(6150),
       q(1),
       ],
    q(nahuatl languages) => [
@@ -44054,7 +44098,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nai) => [
-      q(1219),
+      q(1220),
       q(0),
       ],
    q(najdi arabic) => [
@@ -44062,151 +44106,151 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(naka'ela) => [
-      q(4722),
+      q(4723),
       q(0),
       ],
    q(nakai) => [
-      q(4930),
+      q(4931),
       q(0),
       ],
    q(nakame) => [
-      q(4882),
+      q(4883),
       q(0),
       ],
    q(nakanai) => [
-      q(4726),
+      q(4727),
       q(0),
       ],
    q(nakara) => [
-      q(4771),
+      q(4772),
       q(0),
       ],
    q(nake) => [
-      q(4748),
+      q(4749),
       q(0),
       ],
    q(naki) => [
-      q(4229),
+      q(4230),
       q(0),
       ],
    q(nakwi) => [
-      q(4736),
+      q(4737),
       q(0),
       ],
    q(nalca) => [
-      q(4946),
+      q(4947),
       q(0),
       ],
    q(nali) => [
-      q(5080),
+      q(5081),
       q(0),
       ],
    q(nalik) => [
-      q(4727),
+      q(4728),
       q(0),
       ],
    q(nalogo) => [
-      q(4960),
+      q(4961),
       q(0),
       ],
    q(nalu) => [
-      q(4725),
+      q(4726),
       q(0),
       ],
    q(naluo yi) => [
-      q(7682),
+      q(7684),
       q(0),
       ],
    q(nama (namibia)) => [
-      q(4731),
+      q(4732),
       q(1),
       ],
    q(nama (papua new guinea)) => [
-      q(4984),
+      q(4985),
       q(0),
       ],
    q(namakura) => [
-      q(4971),
+      q(4972),
       q(0),
       ],
    q(namat) => [
-      q(4932),
+      q(4933),
       q(0),
       ],
    q(nambo) => [
-      q(4773),
+      q(4774),
       q(0),
       ],
    q(nambya) => [
-      q(4977),
+      q(4978),
       q(0),
       ],
    q(namia) => [
-      q(4999),
+      q(5000),
       q(0),
       ],
    q(namiae) => [
-      q(5129),
+      q(5130),
       q(0),
       ],
    q(namibian sign language) => [
-      q(4755),
+      q(4756),
       q(0),
       ],
    q(namla) => [
-      q(4718),
+      q(4719),
       q(0),
       ],
    q(namo) => [
-      q(4668),
+      q(4669),
       q(0),
       ],
    q(namonuito) => [
-      q(4980),
+      q(4981),
       q(0),
       ],
    q(namosi-naitasiri-serua) => [
-      q(1542),
+      q(1543),
       q(0),
       ],
    q(namuyi) => [
-      q(4985),
+      q(4986),
       q(0),
       ],
    q(nanai) => [
-      q(2543),
+      q(2544),
       q(0),
       ],
    q(nancere) => [
-      q(4989),
+      q(4990),
       q(0),
       ],
    q(nande) => [
-      q(4988),
+      q(4989),
       q(0),
       ],
    q(nandi) => [
-      q(4895),
+      q(4896),
       q(0),
       ],
    q(nanerige senoufo) => [
-      q(5973),
+      q(5974),
       q(0),
       ],
    q(nanga dama dogon) => [
-      q(5183),
+      q(5184),
       q(0),
       ],
    q(nankina) => [
-      q(4997),
+      q(4998),
       q(0),
       ],
    q(nanti) => [
-      q(1827),
+      q(1828),
       q(0),
       ],
    q(nanticoke) => [
-      q(5005),
+      q(5006),
       q(0),
       ],
    q(nanubae) => [
@@ -44214,83 +44258,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(napo lowland quechua) => [
-      q(5708),
+      q(5709),
       q(0),
       ],
    q(napu) => [
-      q(5041),
+      q(5042),
       q(0),
       ],
    q(nar phu) => [
-      q(5031),
+      q(5032),
       q(0),
       ],
    q(nara) => [
-      q(5049),
+      q(5050),
       q(0),
       ],
    q(narak) => [
-      q(4720),
+      q(4721),
       q(0),
       ],
    q(narango) => [
-      q(5053),
+      q(5054),
       q(0),
       ],
    q(narau) => [
-      q(5153),
+      q(5154),
       q(0),
       ],
    q(nari nari) => [
-      q(5834),
+      q(5835),
       q(0),
       ],
    q(narim) => [
-      q(4019),
+      q(4020),
       q(0),
       ],
    q(naro) => [
-      q(4874),
+      q(4875),
       q(0),
       ],
    q(narom) => [
-      q(5057),
+      q(5058),
       q(0),
       ],
    q(narragansett) => [
-      q(7441),
+      q(7442),
       q(0),
       ],
    q(narrinyeri) => [
-      q(4737),
+      q(4738),
       q(0),
       ],
    q(narua) => [
-      q(5062),
+      q(5063),
       q(0),
       ],
    q(narungga) => [
-      q(5003),
+      q(5004),
       q(0),
       ],
    q(nasal) => [
-      q(5086),
+      q(5087),
       q(0),
       ],
    q(nasarian) => [
-      q(5128),
+      q(5129),
       q(0),
       ],
    q(naskapi) => [
-      q(5073),
+      q(5074),
       q(0),
       ],
    q(natagaimas) => [
-      q(5097),
+      q(5098),
       q(0),
       ],
    q(natanzi) => [
-      q(5102),
+      q(5103),
       q(0),
       ],
    q(nataoran amis) => [
@@ -44298,39 +44342,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(natchez) => [
-      q(4782),
+      q(4783),
       q(0),
       ],
    q(nateni) => [
-      q(5093),
+      q(5094),
       q(0),
       ],
    q(nathembo) => [
-      q(5088),
+      q(5089),
       q(0),
       ],
    q(natioro) => [
-      q(5090),
+      q(5091),
       q(0),
       ],
    q(natugu) => [
-      q(5098),
+      q(5099),
       q(0),
       ],
    q(nauete) => [
-      q(5141),
+      q(5142),
       q(0),
       ],
    q(naukan yupik) => [
-      q(7708),
+      q(7710),
       q(0),
       ],
    q(nauna) => [
-      q(4774),
+      q(4775),
       q(0),
       ],
    q(nauo) => [
-      q(5137),
+      q(5138),
       q(0),
       ],
    q(nauru) => [
@@ -44346,91 +44390,91 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(navut) => [
-      q(5084),
+      q(5085),
       q(0),
       ],
    q(nawaru) => [
-      q(5138),
+      q(5139),
       q(0),
       ],
    q(nawathinehena) => [
-      q(5131),
+      q(5132),
       q(0),
       ],
    q(nawdm) => [
-      q(4986),
+      q(4987),
       q(0),
       ],
    q(nawuri) => [
-      q(4735),
+      q(4736),
       q(0),
       ],
    q(naxi) => [
-      q(5151),
+      q(5152),
       q(0),
       ],
    q(nayi) => [
-      q(5030),
+      q(5031),
       q(0),
       ],
    q(nayini) => [
-      q(5167),
+      q(5168),
       q(0),
       ],
    q(ncane) => [
-      q(4777),
+      q(4778),
       q(0),
       ],
    q(nchumbulu) => [
-      q(4955),
+      q(4956),
       q(0),
       ],
    q(nda'nda') => [
-      q(5010),
+      q(5011),
       q(0),
       ],
    q(ndai) => [
-      q(2537),
+      q(2538),
       q(0),
       ],
    q(ndaka) => [
-      q(4792),
+      q(4793),
       q(0),
       ],
    q(ndaktup) => [
-      q(4776),
+      q(4777),
       q(0),
       ],
    q(ndali) => [
-      q(4789),
+      q(4790),
       q(0),
       ],
    q(ndam) => [
-      q(4794),
+      q(4795),
       q(0),
       ],
    q(ndamba) => [
-      q(4791),
+      q(4792),
       q(0),
       ],
    q(ndambomo) => [
-      q(5150),
+      q(5151),
       q(0),
       ],
    q(ndasa) => [
-      q(4783),
+      q(4784),
       q(0),
       ],
    q(ndau) => [
-      q(4785),
+      q(4786),
       q(0),
       ],
    q(nde-gbite) => [
-      q(4809),
+      q(4810),
       q(0),
       ],
    q(nde-nsele-nta) => [
-      q(4786),
+      q(4787),
       q(0),
       ],
    q(ndebele, north) => [
@@ -44442,51 +44486,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ndemli) => [
-      q(4972),
+      q(4973),
       q(0),
       ],
    q(ndendeule) => [
-      q(2100),
+      q(2101),
       q(0),
       ],
    q(ndengereko) => [
-      q(4788),
+      q(4789),
       q(0),
       ],
    q(nding) => [
-      q(2244),
+      q(2245),
       q(0),
       ],
    q(ndo) => [
-      q(4796),
+      q(4797),
       q(0),
       ],
    q(ndobo) => [
-      q(4802),
+      q(4803),
       q(0),
       ],
    q(ndoe) => [
-      q(4740),
+      q(4741),
       q(0),
       ],
    q(ndogo) => [
-      q(4805),
+      q(4806),
       q(0),
       ],
    q(ndolo) => [
-      q(4793),
+      q(4794),
       q(0),
       ],
    q(ndom) => [
-      q(5044),
+      q(5045),
       q(0),
       ],
    q(ndombe) => [
-      q(4797),
+      q(4798),
       q(0),
       ],
    q(ndonde hamba) => [
-      q(4906),
+      q(4907),
       q(0),
       ],
    q(ndonga) => [
@@ -44494,39 +44538,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ndoola) => [
-      q(4798),
+      q(4799),
       q(0),
       ],
    q(ndra'ngith) => [
-      q(2016),
+      q(2017),
       q(0),
       ],
    q(nduga) => [
-      q(4803),
+      q(4804),
       q(0),
       ],
    q(ndumu) => [
-      q(4964),
+      q(4965),
       q(0),
       ],
    q(ndunda) => [
-      q(5109),
+      q(5110),
       q(0),
       ],
    q(ndunga) => [
-      q(4799),
+      q(4800),
       q(0),
       ],
    q(ndut) => [
-      q(4801),
+      q(4802),
       q(0),
       ],
    q(ndyuka-trio pidgin) => [
-      q(4916),
+      q(4917),
       q(0),
       ],
    q(ndzwani comorian) => [
-      q(7186),
+      q(7187),
       q(0),
       ],
    q(neapolitan) => [
@@ -44534,59 +44578,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nedebang) => [
-      q(4808),
+      q(4809),
       q(0),
       ],
    q(nefamese) => [
-      q(4811),
+      q(4812),
       q(0),
       ],
    q(negerhollands) => [
-      q(1976),
+      q(1977),
       q(0),
       ],
    q(negeri sembilan malay) => [
-      q(7882),
+      q(7884),
       q(0),
       ],
    q(negidal) => [
-      q(4812),
+      q(4813),
       q(0),
       ],
    q(nehan) => [
-      q(5076),
+      q(5077),
       q(0),
       ],
    q(nek) => [
-      q(4885),
+      q(4886),
       q(0),
       ],
    q(nekgini) => [
-      q(4927),
+      q(4928),
       q(0),
       ],
    q(neko) => [
-      q(4815),
+      q(4816),
       q(0),
       ],
    q(neku) => [
-      q(4816),
+      q(4817),
       q(0),
       ],
    q(nelemwa-nixumwak) => [
-      q(4810),
+      q(4811),
       q(0),
       ],
    q(neme) => [
-      q(4826),
+      q(4827),
       q(0),
       ],
    q(nemi) => [
-      q(4817),
+      q(4818),
       q(0),
       ],
    q(nen) => [
-      q(5045),
+      q(5046),
       q(0),
       ],
    q(nend) => [
@@ -44594,23 +44638,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nenets) => [
-      q(7738),
+      q(7740),
       q(0),
       ],
    q(nenge) => [
-      q(2065),
+      q(2066),
       q(2),
       ],
    q(nengone) => [
-      q(4818),
+      q(4819),
       q(0),
       ],
    q(neo) => [
-      q(4824),
+      q(4825),
       q(0),
       ],
    q(neo-hittite) => [
-      q(4814),
+      q(4815),
       q(0),
       ],
    q(nepal bhasa) => [
@@ -44618,7 +44662,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nepalese sign language) => [
-      q(5077),
+      q(5078),
       q(0),
       ],
    q(nepali) => [
@@ -44626,7 +44670,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nepali (individual language)) => [
-      q(5035),
+      q(5036),
       q(0),
       ],
    q(nepali (macrolanguage)) => [
@@ -44634,19 +44678,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(nepali kurux) => [
-      q(3726),
+      q(3727),
       q(0),
       ],
    q(nete) => [
-      q(4823),
+      q(4824),
       q(0),
       ],
    q(neve'ei) => [
-      q(7041),
+      q(7042),
       q(1),
       ],
    q(neverver) => [
-      q(3890),
+      q(3891),
       q(1),
       ],
    q(new caledonian javanese) => [
@@ -44654,7 +44698,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(new zealand sign language) => [
-      q(5180),
+      q(5181),
       q(0),
       ],
    q(newari) => [
@@ -44662,15 +44706,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(neyo) => [
-      q(4827),
+      q(4828),
       q(0),
       ],
    q(nez perce) => [
-      q(4828),
+      q(4829),
       q(0),
       ],
    q(ngaanyatjarra) => [
-      q(5091),
+      q(5092),
       q(0),
       ],
    q(ngabere) => [
@@ -44678,119 +44722,119 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ngad'a) => [
-      q(5144),
+      q(5145),
       q(0),
       ],
    q(ngadjunmaya) => [
-      q(4917),
+      q(4918),
       q(0),
       ],
    q(ngadjuri) => [
-      q(3151),
+      q(3152),
       q(0),
       ],
    q(ngaing) => [
-      q(4992),
+      q(4993),
       q(0),
       ],
    q(ngaju) => [
-      q(4889),
+      q(4890),
       q(0),
       ],
    q(ngala) => [
-      q(5105),
+      q(5106),
       q(0),
       ],
    q(ngalakan) => [
-      q(4886),
+      q(4887),
       q(0),
       ],
    q(ngalum) => [
-      q(6347),
+      q(6348),
       q(0),
       ],
    q(ngam) => [
-      q(4963),
+      q(4964),
       q(0),
       ],
    q(ngamambo) => [
-      q(4758),
+      q(4759),
       q(0),
       ],
    q(ngambay) => [
-      q(5901),
+      q(5902),
       q(0),
       ],
    q(ngamini) => [
-      q(4982),
+      q(4983),
       q(0),
       ],
    q(ngamo) => [
-      q(4745),
+      q(4746),
       q(0),
       ],
    q(ngan'gityemerri) => [
-      q(4728),
+      q(4729),
       q(0),
       ],
    q(nganakarti) => [
-      q(7436),
+      q(7437),
       q(0),
       ],
    q(nganasan) => [
-      q(4894),
+      q(4895),
       q(0),
       ],
    q(ngandi) => [
-      q(4883),
+      q(4884),
       q(0),
       ],
    q(ngando (central african republic)) => [
-      q(4837),
+      q(4838),
       q(0),
       ],
    q(ngando (democratic republic of congo)) => [
-      q(5142),
+      q(5143),
       q(0),
       ],
    q(ngandyera) => [
-      q(4991),
+      q(4992),
       q(0),
       ],
    q(ngangam) => [
-      q(2571),
+      q(2572),
       q(0),
       ],
    q(ngantangarra) => [
-      q(5089),
+      q(5090),
       q(0),
       ],
    q(nganyaywana) => [
-      q(5174),
+      q(5175),
       q(0),
       ],
    q(ngardi) => [
-      q(5880),
+      q(5881),
       q(0),
       ],
    q(ngarigu) => [
-      q(7435),
+      q(7436),
       q(0),
       ],
    q(ngarinman) => [
-      q(4747),
+      q(4748),
       q(0),
       ],
    q(ngarinyin) => [
-      q(6915),
+      q(6916),
       q(0),
       ],
    q(ngarla) => [
-      q(5055),
+      q(5056),
       q(0),
       ],
    q(ngarluma) => [
-      q(5056),
+      q(5057),
       q(0),
       ],
    q(ngas) => [
@@ -44798,39 +44842,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ngasa) => [
-      q(5070),
+      q(5071),
       q(0),
       ],
    q(ngatik men's creole) => [
-      q(4845),
+      q(4846),
       q(0),
       ],
    q(ngawn chin) => [
-      q(1806),
+      q(1807),
       q(0),
       ],
    q(ngawun) => [
-      q(5149),
+      q(5150),
       q(0),
       ],
    q(ngayawung) => [
-      q(5134),
+      q(5135),
       q(0),
       ],
    q(ngazidja comorian) => [
-      q(7833),
+      q(7835),
       q(0),
       ],
    q(ngbaka) => [
-      q(4834),
+      q(4835),
       q(0),
       ],
    q(ngbaka ma'bo) => [
-      q(4749),
+      q(4750),
       q(0),
       ],
    q(ngbaka manza) => [
-      q(4839),
+      q(4840),
       q(0),
       ],
    q(ngbee) => [
@@ -44838,11 +44882,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ngbinda) => [
-      q(4742),
+      q(4743),
       q(0),
       ],
    q(ngbundu) => [
-      q(5122),
+      q(5123),
       q(0),
       ],
    q(ngelima) => [
@@ -44850,31 +44894,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ngemba) => [
-      q(4838),
+      q(4839),
       q(0),
       ],
    q(ngeq) => [
-      q(4852),
+      q(4853),
       q(0),
       ],
    q(ngete) => [
-      q(5000),
+      q(5001),
       q(0),
       ],
    q(nggem) => [
-      q(4753),
+      q(4754),
       q(0),
       ],
    q(nggwahyi) => [
-      q(4856),
+      q(4857),
       q(0),
       ],
    q(ngie) => [
-      q(4842),
+      q(4843),
       q(0),
       ],
    q(ngiemboon) => [
-      q(4994),
+      q(4995),
       q(0),
       ],
    q(ngile) => [
@@ -44882,23 +44926,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ngindo) => [
-      q(5002),
+      q(5003),
       q(0),
       ],
    q(ngiti) => [
-      q(4902),
+      q(4903),
       q(0),
       ],
    q(ngizim) => [
-      q(4841),
+      q(4842),
       q(0),
       ],
    q(ngkalmpw kanum) => [
-      q(3211),
+      q(3212),
       q(0),
       ],
    q(ngom) => [
-      q(5048),
+      q(5049),
       q(0),
       ],
    q(ngomba) => [
@@ -44906,95 +44950,95 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ngombale) => [
-      q(4945),
+      q(4946),
       q(0),
       ],
    q(ngombe (central african republic)) => [
-      q(4970),
+      q(4971),
       q(0),
       ],
    q(ngombe (democratic republic of congo)) => [
-      q(4836),
+      q(4837),
       q(0),
       ],
    q(ngongo) => [
-      q(5023),
+      q(5024),
       q(0),
       ],
    q(ngoni) => [
-      q(4847),
+      q(4848),
       q(0),
       ],
    q(ngoreme) => [
-      q(4849),
+      q(4850),
       q(1),
       ],
    q(ngoshie) => [
-      q(5071),
+      q(5072),
       q(0),
       ],
    q(ngul) => [
-      q(4953),
+      q(4954),
       q(0),
       ],
    q(ngulu) => [
-      q(4848),
+      q(4849),
       q(0),
       ],
    q(nguluwan) => [
-      q(5124),
+      q(5125),
       q(0),
       ],
    q(ngumbi) => [
-      q(5110),
+      q(5111),
       q(0),
       ],
    q(ngunawal) => [
-      q(7534),
+      q(7535),
       q(0),
       ],
    q(ngundi) => [
-      q(4795),
+      q(4796),
       q(0),
       ],
    q(ngundu) => [
-      q(5106),
+      q(5107),
       q(0),
       ],
    q(ngungwel) => [
-      q(4858),
+      q(4859),
       q(0),
       ],
    q(nguon) => [
-      q(5116),
+      q(5117),
       q(0),
       ],
    q(ngurimi) => [
-      q(4849),
+      q(4850),
       q(0),
       ],
    q(ngurmbur) => [
-      q(5063),
+      q(5064),
       q(0),
       ],
    q(ngwaba) => [
-      q(4855),
+      q(4856),
       q(0),
       ],
    q(ngwe) => [
-      q(5133),
+      q(5134),
       q(0),
       ],
    q(ngwo) => [
-      q(4846),
+      q(4847),
       q(0),
       ],
    q(nhanda) => [
-      q(4859),
+      q(4860),
       q(0),
       ],
    q(nhengatu) => [
-      q(7739),
+      q(7741),
       q(0),
       ],
    q(nhirrpi) => [
@@ -45002,7 +45046,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nhuwala) => [
-      q(4864),
+      q(4865),
       q(0),
       ],
    q(nias) => [
@@ -45010,19 +45054,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nicaragua creole english) => [
-      q(1622),
+      q(1623),
       q(0),
       ],
    q(nicaraguan sign language) => [
-      q(4778),
+      q(4779),
       q(0),
       ],
    q(nicarao) => [
-      q(5575),
+      q(5576),
       q(1),
       ],
    q(niellim) => [
-      q(4884),
+      q(4885),
       q(0),
       ],
    q(niger-kordofanian languages) => [
@@ -45030,43 +45074,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nigeria mambila) => [
-      q(4702),
+      q(4703),
       q(0),
       ],
    q(nigerian fulfulde) => [
-      q(2392),
+      q(2393),
       q(0),
       ],
    q(nigerian pidgin) => [
-      q(5392),
+      q(5393),
       q(0),
       ],
    q(nigerian sign language) => [
-      q(5072),
+      q(5073),
       q(0),
       ],
    q(nihali) => [
-      q(4952),
+      q(4953),
       q(0),
       ],
    q(nii) => [
-      q(4888),
+      q(4889),
       q(0),
       ],
    q(nijadali) => [
-      q(4721),
+      q(4722),
       q(0),
       ],
    q(niksek) => [
-      q(2422),
+      q(2423),
       q(0),
       ],
    q(nila) => [
-      q(4891),
+      q(4892),
       q(0),
       ],
    q(nilamba) => [
-      q(4892),
+      q(4893),
       q(0),
       ],
    q(nilo-saharan languages) => [
@@ -45074,95 +45118,95 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nimadi) => [
-      q(5014),
+      q(5015),
       q(0),
       ],
    q(nimanbur) => [
-      q(4976),
+      q(4977),
       q(0),
       ],
    q(nimbari) => [
-      q(4978),
+      q(4979),
       q(0),
       ],
    q(nimboran) => [
-      q(4896),
+      q(4897),
       q(0),
       ],
    q(nimi) => [
-      q(4897),
+      q(4898),
       q(0),
       ],
    q(nimo) => [
-      q(4900),
+      q(4901),
       q(0),
       ],
    q(nimoa) => [
-      q(4983),
+      q(4984),
       q(0),
       ],
    q(ninam) => [
-      q(6010),
+      q(6011),
       q(0),
       ],
    q(ninde) => [
-      q(4631),
+      q(4632),
       q(1),
       ],
    q(nindi) => [
-      q(5145),
+      q(5146),
       q(0),
       ],
    q(ningera) => [
-      q(4760),
+      q(4761),
       q(0),
       ],
    q(ninggerum) => [
-      q(5152),
+      q(5153),
       q(0),
       ],
    q(ningil) => [
-      q(4903),
+      q(4904),
       q(0),
       ],
    q(ningye) => [
-      q(5004),
+      q(5005),
       q(0),
       ],
    q(ninia yali) => [
-      q(4951),
+      q(4952),
       q(0),
       ],
    q(ninzo) => [
-      q(4893),
+      q(4894),
       q(0),
       ],
    q(nipsan) => [
-      q(5039),
+      q(5040),
       q(0),
       ],
    q(nisa) => [
-      q(4915),
+      q(4916),
       q(0),
       ],
    q(nisenan) => [
-      q(5087),
+      q(5088),
       q(0),
       ],
    q(nisga'a) => [
-      q(4767),
+      q(4768),
       q(0),
       ],
    q(nisi (china)) => [
-      q(7750),
+      q(7752),
       q(0),
       ],
    q(niuafo'ou) => [
-      q(5114),
+      q(5115),
       q(0),
       ],
    q(niuatoputapu) => [
-      q(4935),
+      q(4936),
       q(0),
       ],
    q(niuean) => [
@@ -45170,7 +45214,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nivacle) => [
-      q(1643),
+      q(1644),
       q(0),
       ],
    q(niwer mil) => [
@@ -45178,35 +45222,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(njalgulgule) => [
-      q(4910),
+      q(4911),
       q(0),
       ],
    q(njebi) => [
-      q(5177),
+      q(5178),
       q(0),
       ],
    q(njen) => [
-      q(4909),
+      q(4910),
       q(0),
       ],
    q(njerep) => [
-      q(4914),
+      q(4915),
       q(0),
       ],
    q(njyem) => [
-      q(4919),
+      q(4920),
       q(0),
       ],
    q(nkami) => [
-      q(4936),
+      q(4937),
       q(0),
       ],
    q(nkangala) => [
-      q(4933),
+      q(4934),
       q(0),
       ],
    q(nkari) => [
-      q(4944),
+      q(4945),
       q(0),
       ],
    q(nkem-nkum) => [
@@ -45214,35 +45258,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nkhumbi) => [
-      q(3348),
+      q(3349),
       q(0),
       ],
    q(nkongho) => [
-      q(4923),
+      q(4924),
       q(0),
       ],
    q(nkonya) => [
-      q(4934),
+      q(4935),
       q(0),
       ],
    q(nkoroo) => [
-      q(4943),
+      q(4944),
       q(0),
       ],
    q(nkoya) => [
-      q(4921),
+      q(4922),
       q(0),
       ],
    q(nkukoli) => [
-      q(4751),
+      q(4752),
       q(0),
       ],
    q(nkutu) => [
-      q(4942),
+      q(4943),
       q(0),
       ],
    q(nnam) => [
-      q(4752),
+      q(4753),
       q(0),
       ],
    q(no linguistic content) => [
@@ -45250,19 +45294,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nobiin) => [
-      q(2344),
+      q(2345),
       q(0),
       ],
    q(nobonob) => [
-      q(2417),
+      q(2418),
       q(0),
       ],
    q(nocaman) => [
-      q(5021),
+      q(5022),
       q(0),
       ],
    q(nocte naga) => [
-      q(4905),
+      q(4906),
       q(0),
       ],
    q(nogai) => [
@@ -45270,71 +45314,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(noiri) => [
-      q(5017),
+      q(5018),
       q(0),
       ],
    q(nokuku) => [
-      q(4931),
+      q(4932),
       q(0),
       ],
    q(nomaande) => [
-      q(3870),
+      q(3871),
       q(0),
       ],
    q(nomane) => [
-      q(5015),
+      q(5016),
       q(0),
       ],
    q(nomatsiguenga) => [
-      q(5025),
+      q(5026),
       q(0),
       ],
    q(nomlaki) => [
-      q(5020),
+      q(5021),
       q(0),
       ],
    q(nomu) => [
-      q(5016),
+      q(5017),
       q(0),
       ],
    q(nong zhuang) => [
-      q(7845),
+      q(7847),
       q(0),
       ],
    q(nonuya) => [
-      q(5018),
+      q(5019),
       q(0),
       ],
    q(nooksack) => [
-      q(5019),
+      q(5020),
       q(0),
       ],
    q(noon) => [
-      q(6137),
+      q(6138),
       q(0),
       ],
    q(noone) => [
-      q(4876),
+      q(4877),
       q(0),
       ],
    q(nopala chatino) => [
-      q(1929),
+      q(1930),
       q(0),
       ],
    q(nora) => [
-      q(5060),
+      q(5061),
       q(1),
       ],
    q(noric) => [
-      q(5050),
+      q(5051),
       q(0),
       ],
    q(norn) => [
-      q(5058),
+      q(5059),
       q(0),
       ],
    q(norra) => [
-      q(5060),
+      q(5061),
       q(0),
       ],
    q(norse, old) => [
@@ -45342,11 +45386,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(north alaskan inupiatun) => [
-      q(2292),
+      q(2293),
       q(0),
       ],
    q(north ambrym) => [
-      q(4395),
+      q(4396),
       q(0),
       ],
    q(north american indian languages) => [
@@ -45354,23 +45398,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(north asmat) => [
-      q(4938),
+      q(4939),
       q(0),
       ],
    q(north awyu) => [
-      q(7655),
+      q(7657),
       q(0),
       ],
    q(north azerbaijani) => [
-      q(1015),
+      q(1016),
       q(0),
       ],
    q(north babar) => [
-      q(1066),
+      q(1067),
       q(0),
       ],
    q(north bolivian quechua) => [
-      q(5687),
+      q(5688),
       q(0),
       ],
    q(north caucasian languages) => [
@@ -45378,15 +45422,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(north central mixe) => [
-      q(4820),
+      q(4821),
       q(0),
       ],
    q(north efate) => [
-      q(3970),
+      q(3971),
       q(0),
       ],
    q(north fali) => [
-      q(2355),
+      q(2356),
       q(0),
       ],
    q(north germanic languages) => [
@@ -45394,11 +45438,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(north giziga) => [
-      q(2524),
+      q(2525),
       q(0),
       ],
    q(north junin quechua) => [
-      q(5707),
+      q(5708),
       q(0),
       ],
    q(north levantine arabic) => [
@@ -45406,23 +45450,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(north marquesan) => [
-      q(4520),
+      q(4521),
       q(0),
       ],
    q(north mesopotamian arabic) => [
-      q(1003),
+      q(1004),
       q(0),
       ],
    q(north mofu) => [
-      q(4234),
+      q(4235),
       q(0),
       ],
    q(north moluccan malay) => [
-      q(4125),
+      q(4126),
       q(0),
       ],
    q(north muyu) => [
-      q(3627),
+      q(3628),
       q(0),
       ],
    q(north ndebele) => [
@@ -45430,39 +45474,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(north nuaulu) => [
-      q(4995),
+      q(4996),
       q(0),
       ],
    q(north picene) => [
-      q(5059),
+      q(5060),
       q(0),
       ],
    q(north slavey) => [
-      q(5937),
+      q(5938),
       q(0),
       ],
    q(north tairora) => [
-      q(6385),
+      q(6386),
       q(0),
       ],
    q(north tanna) => [
-      q(6621),
+      q(6622),
       q(0),
       ],
    q(north wahgi) => [
-      q(7123),
+      q(7124),
       q(0),
       ],
    q(north watut) => [
-      q(6913),
+      q(6914),
       q(0),
       ],
    q(northeast kiwai) => [
-      q(3373),
+      q(3374),
       q(0),
       ],
    q(northeast maidu) => [
-      q(4981),
+      q(4982),
       q(0),
       ],
    q(northeast pashai) => [
@@ -45474,15 +45518,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(northeastern dinka) => [
-      q(2047),
+      q(2048),
       q(0),
       ],
    q(northeastern pomo) => [
-      q(5407),
+      q(5408),
       q(0),
       ],
    q(northeastern thai) => [
-      q(6752),
+      q(6753),
       q(0),
       ],
    q(northern alta) => [
@@ -45490,55 +45534,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(northern altai) => [
-      q(0927),
+      q(0928),
       q(0),
       ],
    q(northern amami-oshima) => [
-      q(5882),
+      q(5883),
       q(0),
       ],
    q(northern bai) => [
-      q(1137),
+      q(1138),
       q(1),
       ],
    q(northern betsimisaraka malagasy) => [
-      q(1314),
+      q(1315),
       q(0),
       ],
    q(northern binukidnon) => [
-      q(3754),
+      q(3755),
       q(0),
       ],
    q(northern bobo madare) => [
-      q(1051),
+      q(1052),
       q(0),
       ],
    q(northern bontok) => [
-      q(5758),
+      q(5759),
       q(0),
       ],
    q(northern catanduanes bikol) => [
-      q(1898),
+      q(1899),
       q(0),
       ],
    q(northern conchucos ancash quechua) => [
-      q(5724),
+      q(5725),
       q(0),
       ],
    q(northern dagara) => [
-      q(2010),
+      q(2011),
       q(0),
       ],
    q(northern dong) => [
-      q(2114),
+      q(2115),
       q(0),
       ],
    q(northern east cree) => [
-      q(1852),
+      q(1853),
       q(0),
       ],
    q(northern embera) => [
-      q(2257),
+      q(2258),
       q(0),
       ],
    q(northern frisian) => [
@@ -45546,15 +45590,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(northern ghale) => [
-      q(2505),
+      q(2506),
       q(0),
       ],
    q(northern gondi) => [
-      q(2578),
+      q(2579),
       q(0),
       ],
    q(northern grebo) => [
-      q(2432),
+      q(2433),
       q(0),
       ],
    q(northern guiyang hmong) => [
@@ -45582,27 +45626,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(northern kalapuya) => [
-      q(5061),
+      q(5062),
       q(0),
       ],
    q(northern kankanay) => [
-      q(7437),
+      q(7438),
       q(0),
       ],
    q(northern khmer) => [
-      q(3727),
+      q(3728),
       q(0),
       ],
    q(northern kissi) => [
-      q(3565),
+      q(3566),
       q(0),
       ],
    q(northern kurdish) => [
-      q(3470),
+      q(3471),
       q(0),
       ],
    q(northern luri) => [
-      q(4042),
+      q(4043),
       q(0),
       ],
    q(northern mashan hmong) => [
@@ -45614,63 +45658,63 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(northern muji) => [
-      q(7702),
+      q(7704),
       q(0),
       ],
    q(northern nago) => [
-      q(7369),
+      q(7370),
       q(0),
       ],
    q(northern ngbandi) => [
-      q(4835),
+      q(4836),
       q(0),
       ],
    q(northern nisu) => [
-      q(7659),
+      q(7661),
       q(0),
       ],
    q(northern nuni) => [
-      q(5123),
+      q(5124),
       q(0),
       ],
    q(northern oaxaca nahuatl) => [
-      q(4880),
+      q(4881),
       q(0),
       ],
    q(northern ohlone) => [
-      q(1882),
+      q(1883),
       q(0),
       ],
    q(northern one) => [
-      q(5276),
+      q(5277),
       q(0),
       ],
    q(northern paiute) => [
-      q(5353),
+      q(5354),
       q(0),
       ],
    q(northern pame) => [
-      q(5521),
+      q(5522),
       q(0),
       ],
    q(northern pashto) => [
-      q(5377),
+      q(5378),
       q(0),
       ],
    q(northern pastaza quichua) => [
-      q(5713),
+      q(5714),
       q(0),
       ],
    q(northern pomo) => [
-      q(5411),
+      q(5412),
       q(0),
       ],
    q(northern puebla nahuatl) => [
-      q(4770),
+      q(4771),
       q(0),
       ],
    q(northern pumi) => [
-      q(5514),
+      q(5515),
       q(0),
       ],
    q(northern qiandong miao) => [
@@ -45678,15 +45722,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(northern qiang) => [
-      q(1797),
+      q(1798),
       q(0),
       ],
    q(northern rengma naga) => [
-      q(4998),
+      q(4999),
       q(0),
       ],
    q(northern roglai) => [
-      q(5841),
+      q(5842),
       q(0),
       ],
    q(northern sami) => [
@@ -45694,11 +45738,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(northern sierra miwok) => [
-      q(5078),
+      q(5079),
       q(0),
       ],
    q(northern sorsoganon) => [
-      q(1270),
+      q(1271),
       q(0),
       ],
    q(northern sotho) => [
@@ -45706,51 +45750,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(northern subanen) => [
-      q(6254),
+      q(6255),
       q(0),
       ],
    q(northern tarahumara) => [
-      q(6500),
+      q(6501),
       q(0),
       ],
    q(northern tepehuan) => [
-      q(5095),
+      q(5096),
       q(0),
       ],
    q(northern thai) => [
-      q(5013),
+      q(5014),
       q(0),
       ],
    q(northern tiwa) => [
-      q(6796),
+      q(6797),
       q(0),
       ],
    q(northern tlaxiaco mixtec) => [
-      q(7517),
+      q(7518),
       q(0),
       ],
    q(northern toussian) => [
-      q(6723),
+      q(6724),
       q(0),
       ],
    q(northern tujia) => [
-      q(6539),
+      q(6540),
       q(0),
       ],
    q(northern tutchone) => [
-      q(6746),
+      q(6747),
       q(0),
       ],
    q(northern uzbek) => [
-      q(6967),
+      q(6968),
       q(0),
       ],
    q(northern yukaghir) => [
-      q(7663),
+      q(7665),
       q(0),
       ],
    q(northwest alaska inupiatun) => [
-      q(2293),
+      q(2294),
       q(0),
       ],
    q(northwest gbaya) => [
@@ -45758,47 +45802,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(northwest maidu) => [
-      q(4321),
+      q(4322),
       q(0),
       ],
    q(northwest oaxaca mixtec) => [
-      q(4646),
+      q(4647),
       q(0),
       ],
    q(northwest pashai) => [
-      q(2544),
+      q(2545),
       q(0),
       ],
    q(northwest pashayi) => [
-      q(2544),
+      q(2545),
       q(1),
       ],
    q(northwestern dinka) => [
-      q(2053),
+      q(2054),
       q(0),
       ],
    q(northwestern fars) => [
-      q(2337),
+      q(2338),
       q(0),
       ],
    q(northwestern kolami) => [
-      q(3283),
+      q(3284),
       q(0),
       ],
    q(northwestern kung) => [
-      q(6974),
+      q(6975),
       q(2),
       ],
    q(northwestern nisu) => [
-      q(5069),
+      q(5070),
       q(0),
       ],
    q(northwestern ojibwa) => [
-      q(5217),
+      q(5218),
       q(0),
       ],
    q(northwestern tamang) => [
-      q(6595),
+      q(6596),
       q(0),
       ],
    q(norwegian) => [
@@ -45814,7 +45858,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(norwegian sign language) => [
-      q(5074),
+      q(5075),
       q(0),
       ],
    q(not applicable) => [
@@ -45822,55 +45866,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(notre) => [
-      q(1300),
+      q(1301),
       q(0),
       ],
    q(notsi) => [
-      q(4766),
+      q(4767),
       q(0),
       ],
    q(nottoway) => [
-      q(5099),
+      q(5100),
       q(0),
       ],
    q(nottoway-meherrin) => [
-      q(5140),
+      q(5141),
       q(0),
       ],
    q(novial) => [
-      q(5027),
+      q(5028),
       q(0),
       ],
    q(noy) => [
-      q(5029),
+      q(5030),
       q(0),
       ],
    q(nsenga) => [
-      q(5068),
+      q(5069),
       q(0),
       ],
    q(nshi) => [
-      q(5066),
+      q(5067),
       q(0),
       ],
    q(nsongo) => [
-      q(5085),
+      q(5086),
       q(0),
       ],
    q(ntcham) => [
-      q(1496),
+      q(1497),
       q(0),
       ],
    q(ntomba) => [
-      q(5094),
+      q(5095),
       q(0),
       ],
+   q(nu) => [
+      q(4841),
+      q(1),
+      ],
    q(nubaca) => [
-      q(1025),
+      q(1026),
       q(0),
       ],
    q(nubi) => [
-      q(3221),
+      q(3222),
       q(0),
       ],
    q(nubian languages) => [
@@ -45878,91 +45926,91 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nubri) => [
-      q(3623),
+      q(3624),
       q(0),
       ],
    q(nuer) => [
-      q(5120),
+      q(5121),
       q(0),
       ],
    q(nugunu (australia)) => [
-      q(5007),
+      q(5008),
       q(0),
       ],
    q(nugunu (cameroon)) => [
-      q(7590),
+      q(7591),
       q(0),
       ],
    q(nuk) => [
-      q(5012),
+      q(5013),
       q(0),
       ],
    q(nukak maku) => [
-      q(4143),
+      q(4144),
       q(0),
       ],
    q(nukna) => [
-      q(3447),
+      q(3448),
       q(0),
       ],
    q(nukuini) => [
-      q(5104),
+      q(5105),
       q(0),
       ],
    q(nukumanu) => [
-      q(5118),
+      q(5119),
       q(0),
       ],
    q(nukunul) => [
-      q(7442),
+      q(7443),
       q(0),
       ],
    q(nukuoro) => [
-      q(4937),
+      q(4938),
       q(0),
       ],
    q(nukuria) => [
-      q(5119),
+      q(5120),
       q(0),
       ],
    q(numana-nunku-gbantu-numbu) => [
-      q(4754),
+      q(4755),
       q(0),
       ],
    q(numanggang) => [
-      q(5022),
+      q(5023),
       q(0),
       ],
    q(numbami) => [
-      q(6040),
+      q(6041),
       q(0),
       ],
    q(nume) => [
-      q(6488),
+      q(6489),
       q(0),
       ],
    q(numee) => [
-      q(3243),
+      q(3244),
       q(0),
       ],
    q(numidian) => [
-      q(5148),
+      q(5149),
       q(0),
       ],
    q(nung (viet nam)) => [
-      q(5121),
+      q(5122),
       q(0),
       ],
    q(nungali) => [
-      q(5108),
+      q(5109),
       q(0),
       ],
    q(nunggubuyu) => [
-      q(5126),
+      q(5127),
       q(0),
       ],
    q(nungu) => [
-      q(5790),
+      q(5791),
       q(0),
       ],
    q(nuosu) => [
@@ -45970,11 +46018,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(nupbikha) => [
-      q(5032),
+      q(5033),
       q(0),
       ],
    q(nupe-nupe-tako) => [
-      q(5117),
+      q(5118),
       q(0),
       ],
    q(nupode huitoto) => [
@@ -45982,63 +46030,63 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nusa laut) => [
-      q(5113),
+      q(5114),
       q(0),
       ],
    q(nusu) => [
-      q(5107),
+      q(5108),
       q(0),
       ],
    q(nuu-chah-nulth) => [
-      q(5112),
+      q(5113),
       q(0),
       ],
    q(nuuchahnulth) => [
-      q(5112),
+      q(5113),
       q(1),
       ],
    q(nyabwa) => [
-      q(5132),
+      q(5133),
       q(0),
       ],
    q(nyaheun) => [
-      q(4825),
+      q(4826),
       q(0),
       ],
    q(nyahkur) => [
-      q(1669),
+      q(1670),
       q(0),
       ],
    q(nyakyusa-ngonde) => [
-      q(5175),
+      q(5176),
       q(0),
       ],
    q(nyalayu) => [
-      q(7685),
+      q(7687),
       q(0),
       ],
    q(nyali) => [
-      q(4950),
+      q(4951),
       q(0),
       ],
    q(nyam) => [
-      q(4969),
+      q(4970),
       q(0),
       ],
    q(nyamal) => [
-      q(4959),
+      q(4960),
       q(0),
       ],
    q(nyambo) => [
-      q(5028),
+      q(5029),
       q(0),
       ],
    q(nyamusa-molo) => [
-      q(5136),
+      q(5137),
       q(0),
       ],
    q(nyamwanga) => [
-      q(4634),
+      q(4635),
       q(0),
       ],
    q(nyamwezi) => [
@@ -46046,35 +46094,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nyaneka) => [
-      q(5164),
+      q(5165),
       q(0),
       ],
    q(nyang'i) => [
-      q(5166),
+      q(5167),
       q(0),
       ],
    q(nyanga) => [
-      q(5163),
+      q(5164),
       q(0),
       ],
    q(nyanga-li) => [
-      q(5156),
+      q(5157),
       q(0),
       ],
    q(nyangatom) => [
-      q(4996),
+      q(4997),
       q(0),
       ],
    q(nyangbo) => [
-      q(5155),
+      q(5156),
       q(0),
       ],
    q(nyangga) => [
-      q(5009),
+      q(5010),
       q(0),
       ],
    q(nyangumarta) => [
-      q(4987),
+      q(4988),
       q(0),
       ],
    q(nyanja) => [
@@ -46086,79 +46134,79 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nyankpa) => [
-      q(7627),
+      q(7628),
       q(0),
       ],
    q(nyarafolo senoufo) => [
-      q(5981),
+      q(5982),
       q(0),
       ],
    q(nyaturu) => [
-      q(5789),
+      q(5790),
       q(0),
       ],
    q(nyaw) => [
-      q(5173),
+      q(5174),
       q(0),
       ],
    q(nyawaygi) => [
-      q(5170),
+      q(5171),
       q(0),
       ],
    q(nyelayu) => [
-      q(7685),
+      q(7687),
       q(1),
       ],
    q(nyemba) => [
-      q(4739),
+      q(4740),
       q(0),
       ],
    q(nyengo) => [
-      q(5158),
+      q(5159),
       q(0),
       ],
    q(nyenkha) => [
-      q(4813),
+      q(4814),
       q(0),
       ],
    q(nyeu) => [
-      q(5165),
+      q(5166),
       q(0),
       ],
    q(nyigina) => [
-      q(5161),
+      q(5162),
       q(0),
       ],
    q(nyiha (malawi)) => [
-      q(5168),
+      q(5169),
       q(0),
       ],
    q(nyiha (tanzania)) => [
-      q(4887),
+      q(4888),
       q(0),
       ],
    q(nyika (malawi and zambia)) => [
-      q(4941),
+      q(4942),
       q(0),
       ],
    q(nyika (tanzania)) => [
-      q(4939),
+      q(4940),
       q(0),
       ],
    q(nyindrou) => [
-      q(3912),
+      q(3913),
       q(0),
       ],
    q(nyindu) => [
-      q(5160),
+      q(5161),
       q(0),
       ],
    q(nyishi) => [
-      q(4920),
+      q(4921),
       q(0),
       ],
    q(nyiyaparli) => [
-      q(7443),
+      q(7444),
       q(0),
       ],
    q(nynorsk, norwegian) => [
@@ -46166,19 +46214,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(nyokon) => [
-      q(5130),
+      q(5131),
       q(0),
       ],
    q(nyole) => [
-      q(5111),
+      q(5112),
       q(0),
       ],
    q(nyong) => [
-      q(4590),
+      q(4591),
       q(0),
       ],
    q(nyore) => [
-      q(5157),
+      q(5158),
       q(0),
       ],
    q(nyoro) => [
@@ -46186,27 +46234,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(nyulnyul) => [
-      q(5172),
+      q(5173),
       q(0),
       ],
    q(nyunga) => [
-      q(5169),
+      q(5170),
       q(0),
       ],
    q(nyungwe) => [
-      q(5171),
+      q(5172),
       q(0),
       ],
    q(nzakambay) => [
-      q(5182),
+      q(5183),
       q(0),
       ],
    q(nzakara) => [
-      q(5178),
+      q(5179),
       q(0),
       ],
    q(nzanyi) => [
-      q(4904),
+      q(4905),
       q(0),
       ],
    q(nzima) => [
@@ -46214,27 +46262,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(o'chi'chi') => [
-      q(7445),
+      q(7446),
       q(0),
       ],
    q(o'du) => [
-      q(6831),
+      q(6832),
       q(0),
       ],
    q(obanliku) => [
-      q(1636),
+      q(1637),
       q(0),
       ],
    q(obispeno) => [
-      q(5188),
+      q(5189),
       q(0),
       ],
    q(oblo) => [
-      q(5190),
+      q(5191),
       q(0),
       ],
    q(obo manobo) => [
-      q(5192),
+      q(5193),
       q(0),
       ],
    q(obokuitai) => [
@@ -46246,11 +46294,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(obulom) => [
-      q(5195),
+      q(5196),
       q(0),
       ],
    q(ocaina) => [
-      q(5196),
+      q(5197),
       q(0),
       ],
    q(occidental) => [
@@ -46262,35 +46310,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ocotepec mixtec) => [
-      q(4301),
+      q(4302),
       q(0),
       ],
    q(ocotlan zapotec) => [
-      q(7805),
+      q(7807),
       q(0),
       ],
    q(od) => [
-      q(5201),
+      q(5202),
       q(0),
       ],
    q(odiai) => [
-      q(1190),
+      q(1191),
       q(0),
       ],
    q(odoodee) => [
-      q(3404),
+      q(3405),
       q(0),
       ],
    q(odual) => [
-      q(5203),
+      q(5204),
       q(0),
       ],
    q(odut) => [
-      q(5200),
+      q(5201),
       q(0),
       ],
    q(ofaye) => [
-      q(5292),
+      q(5293),
       q(0),
       ],
    q(official aramaic (700-300 bce)) => [
@@ -46298,27 +46346,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ofo) => [
-      q(5204),
+      q(5205),
       q(0),
       ],
    q(ogbah) => [
-      q(5208),
+      q(5209),
       q(0),
       ],
    q(ogbia) => [
-      q(5207),
+      q(5208),
       q(0),
       ],
    q(ogbogolo) => [
-      q(5210),
+      q(5211),
       q(0),
       ],
    q(ogbronuagum) => [
-      q(5212),
+      q(5213),
       q(0),
       ],
    q(ogea) => [
-      q(2283),
+      q(2284),
       q(0),
       ],
    q(oirat) => [
@@ -46326,7 +46374,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(oirata) => [
-      q(5215),
+      q(5216),
       q(0),
       ],
    q(ojibwa) => [
@@ -46334,71 +46382,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ojitlan chinantec) => [
-      q(1722),
+      q(1723),
       q(0),
       ],
    q(okanagan) => [
-      q(5224),
+      q(5225),
       q(0),
       ],
    q(oki-no-erabu) => [
-      q(5235),
+      q(5236),
       q(0),
       ],
    q(okiek) => [
-      q(5230),
+      q(5231),
       q(0),
       ],
    q(oko-eni-osayen) => [
-      q(5238),
+      q(5239),
       q(0),
       ],
    q(oko-juwoi) => [
-      q(5231),
+      q(5232),
       q(0),
       ],
    q(okobo) => [
-      q(5225),
+      q(5226),
       q(0),
       ],
    q(okodia) => [
-      q(5226),
+      q(5227),
       q(0),
       ],
    q(okolod) => [
-      q(3568),
+      q(3569),
       q(0),
       ],
    q(okpamheri) => [
-      q(5287),
+      q(5288),
       q(0),
       ],
    q(okpe (northwestern edo)) => [
-      q(5241),
+      q(5242),
       q(0),
       ],
    q(okpe (southwestern edo)) => [
-      q(5227),
+      q(5228),
       q(0),
       ],
    q(oksapmin) => [
-      q(5289),
+      q(5290),
       q(0),
       ],
    q(oku) => [
-      q(5239),
+      q(5240),
       q(0),
       ],
    q(old aramaic (up to 700 bce)) => [
-      q(5186),
+      q(5187),
       q(0),
       ],
    q(old avar) => [
-      q(5187),
+      q(5188),
       q(0),
       ],
    q(old breton) => [
-      q(5194),
+      q(5195),
       q(0),
       ],
    q(old bulgarian) => [
@@ -46406,11 +46454,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(3),
       ],
    q(old burmese) => [
-      q(5193),
+      q(5194),
       q(0),
       ],
    q(old chinese) => [
-      q(5197),
+      q(5198),
       q(0),
       ],
    q(old church slavonic) => [
@@ -46418,11 +46466,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(4),
       ],
    q(old cornish) => [
-      q(5198),
+      q(5199),
       q(0),
       ],
    q(old dutch) => [
-      q(5202),
+      q(5203),
       q(0),
       ],
    q(old english (ca. 450-1100)) => [
@@ -46434,11 +46482,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(old frisian) => [
-      q(5205),
+      q(5206),
       q(0),
       ],
    q(old georgian) => [
-      q(5209),
+      q(5210),
       q(0),
       ],
    q(old high german (ca. 750-1050)) => [
@@ -46446,11 +46494,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(old hittite) => [
-      q(5213),
+      q(5214),
       q(0),
       ],
    q(old hungarian) => [
-      q(5214),
+      q(5215),
       q(0),
       ],
    q(old irish (to 900)) => [
@@ -46458,31 +46506,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(old japanese) => [
-      q(5220),
+      q(5221),
       q(0),
       ],
    q(old kentish sign language) => [
-      q(5233),
+      q(5234),
       q(0),
       ],
    q(old korean (3rd-9th cent.)) => [
-      q(5236),
+      q(5237),
       q(0),
       ],
    q(old lithuanian) => [
-      q(5249),
+      q(5250),
       q(0),
       ],
    q(old manipuri) => [
-      q(5260),
+      q(5261),
       q(0),
       ],
    q(old marathi) => [
-      q(5261),
+      q(5262),
       q(0),
       ],
    q(old mon) => [
-      q(5265),
+      q(5266),
       q(0),
       ],
    q(old newari) => [
@@ -46494,7 +46542,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(old nubian) => [
-      q(5280),
+      q(5281),
       q(0),
       ],
    q(old occitan (to 1500)) => [
@@ -46502,7 +46550,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(old ossetic) => [
-      q(5286),
+      q(5287),
       q(0),
       ],
    q(old persian (ca. 600-400 b.c.)) => [
@@ -46514,11 +46562,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(old russian) => [
-      q(5304),
+      q(5305),
       q(0),
       ],
    q(old saxon) => [
-      q(5315),
+      q(5316),
       q(0),
       ],
    q(old slavonic) => [
@@ -46526,55 +46574,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(old spanish) => [
-      q(5312),
+      q(5313),
       q(0),
       ],
    q(old tamil) => [
-      q(5331),
+      q(5332),
       q(0),
       ],
    q(old tibetan) => [
-      q(5316),
+      q(5317),
       q(0),
       ],
    q(old turkish) => [
-      q(5320),
+      q(5321),
       q(0),
       ],
    q(old uighur) => [
-      q(5336),
+      q(5337),
       q(0),
       ],
    q(old welsh) => [
-      q(5339),
+      q(5340),
       q(0),
       ],
    q(olekha) => [
-      q(5244),
+      q(5245),
       q(0),
       ],
    q(olkol) => [
-      q(5245),
+      q(5246),
       q(0),
       ],
    q(olo) => [
-      q(5269),
+      q(5270),
       q(0),
       ],
    q(oloma) => [
-      q(5246),
+      q(5247),
       q(0),
       ],
    q(olrat) => [
-      q(5248),
+      q(5249),
       q(0),
       ],
    q(olu'bo) => [
-      q(4082),
+      q(4083),
       q(0),
       ],
    q(olukhayo) => [
-      q(3949),
+      q(3950),
       q(1),
       ],
    q(olulumo-ikom) => [
@@ -46582,47 +46630,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(oluluyia) => [
-      q(4091),
+      q(4092),
       q(1),
       ],
    q(olumarachi) => [
-      q(4045),
+      q(4046),
       q(1),
       ],
    q(olumarama) => [
-      q(4048),
+      q(4049),
       q(1),
       ],
    q(olunyole) => [
-      q(5157),
+      q(5158),
       q(1),
       ],
    q(olusamia) => [
-      q(4062),
+      q(4063),
       q(1),
       ],
    q(olushisa) => [
-      q(3951),
+      q(3952),
       q(1),
       ],
    q(oluta popoluca) => [
-      q(5496),
+      q(5497),
       q(0),
       ],
    q(olutsotso) => [
-      q(4073),
+      q(4074),
       q(1),
       ],
    q(oluwanga) => [
-      q(4099),
+      q(4100),
       q(1),
       ],
    q(omagua) => [
-      q(5254),
+      q(5255),
       q(0),
       ],
    q(omaha-ponca) => [
-      q(5250),
+      q(5251),
       q(0),
       ],
    q(omani arabic) => [
@@ -46630,23 +46678,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ombamba) => [
-      q(4138),
+      q(4139),
       q(0),
       ],
    q(ombo) => [
-      q(5257),
+      q(5258),
       q(0),
       ],
    q(omejes) => [
-      q(5253),
+      q(5254),
       q(0),
       ],
    q(ometepec nahuatl) => [
-      q(4875),
+      q(4876),
       q(0),
       ],
    q(omi) => [
-      q(5255),
+      q(5256),
       q(0),
       ],
    q(omie) => [
@@ -46654,7 +46702,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(omok) => [
-      q(5256),
+      q(5257),
       q(0),
       ],
    q(omotic languages) => [
@@ -46662,99 +46710,99 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(omotik) => [
-      q(5262),
+      q(5263),
       q(0),
       ],
    q(omurano) => [
-      q(5263),
+      q(5264),
       q(0),
       ],
    q(ona) => [
-      q(5266),
+      q(5267),
       q(0),
       ],
    q(oneida) => [
-      q(5268),
+      q(5269),
       q(0),
       ],
    q(ong) => [
-      q(5283),
+      q(5284),
       q(0),
       ],
    q(onge) => [
-      q(5284),
+      q(5285),
       q(0),
       ],
    q(onin) => [
-      q(5270),
+      q(5271),
       q(0),
       ],
    q(onin based pidgin) => [
-      q(5281),
+      q(5282),
       q(0),
       ],
    q(oniyan) => [
-      q(1448),
+      q(1449),
       q(1),
       ],
    q(onjob) => [
-      q(5271),
+      q(5272),
       q(0),
       ],
    q(ono) => [
-      q(5277),
+      q(5278),
       q(0),
       ],
    q(onobasulu) => [
-      q(5273),
+      q(5274),
       q(0),
       ],
    q(onondaga) => [
-      q(5274),
+      q(5275),
       q(0),
       ],
    q(ontenu) => [
-      q(5278),
+      q(5279),
       q(0),
       ],
    q(ontong java) => [
-      q(5222),
+      q(5223),
       q(0),
       ],
    q(oorlams) => [
-      q(5285),
+      q(5286),
       q(0),
       ],
    q(opao) => [
-      q(5290),
+      q(5291),
       q(0),
       ],
    q(opata) => [
-      q(5291),
+      q(5292),
       q(0),
       ],
    q(opuuo) => [
-      q(3893),
+      q(3894),
       q(0),
       ],
    q(orang kanaq) => [
-      q(5298),
+      q(5299),
       q(0),
       ],
    q(orang seletar) => [
-      q(5301),
+      q(5302),
       q(0),
       ],
    q(oraon sadri) => [
-      q(5956),
+      q(5957),
       q(0),
       ],
    q(orejon) => [
-      q(5295),
+      q(5296),
       q(0),
       ],
    q(oring) => [
-      q(5296),
+      q(5297),
       q(0),
       ],
    q(oriya) => [
@@ -46762,7 +46810,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(oriya (individual language)) => [
-      q(5307),
+      q(5308),
       q(0),
       ],
    q(oriya (macrolanguage)) => [
@@ -46770,51 +46818,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(orizaba nahuatl) => [
-      q(4956),
+      q(4957),
       q(0),
       ],
    q(orma) => [
-      q(5294),
+      q(5295),
       q(0),
       ],
    q(ormu) => [
-      q(5308),
+      q(5309),
       q(0),
       ],
    q(ormuri) => [
-      q(5303),
+      q(5304),
       q(0),
       ],
    q(oro) => [
-      q(5306),
+      q(5307),
       q(0),
       ],
    q(oro win) => [
-      q(5305),
+      q(5306),
       q(0),
       ],
    q(oroch) => [
-      q(5185),
+      q(5186),
       q(0),
       ],
    q(oroha) => [
-      q(5293),
+      q(5294),
       q(0),
       ],
    q(orok) => [
-      q(5184),
+      q(5185),
       q(0),
       ],
    q(orokaiva) => [
-      q(5240),
+      q(5241),
       q(0),
       ],
    q(oroko) => [
-      q(1108),
+      q(1109),
       q(0),
       ],
    q(orokolo) => [
-      q(5299),
+      q(5300),
       q(0),
       ],
    q(oromo) => [
@@ -46822,19 +46870,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(oroqen) => [
-      q(5297),
+      q(5298),
       q(0),
       ],
    q(orowe) => [
-      q(1381),
+      q(1382),
       q(0),
       ],
    q(oruma) => [
-      q(5300),
+      q(5301),
       q(0),
       ],
    q(orya) => [
-      q(6945),
+      q(6946),
       q(0),
       ],
    q(osage) => [
@@ -46842,19 +46890,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(osatu) => [
-      q(5313),
+      q(5314),
       q(0),
       ],
    q(oscan) => [
-      q(5309),
+      q(5310),
       q(0),
       ],
    q(osing) => [
-      q(5310),
+      q(5311),
       q(0),
       ],
    q(ososo) => [
-      q(5311),
+      q(5312),
       q(0),
       ],
    q(ossetian) => [
@@ -46866,15 +46914,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(ot danum) => [
-      q(5317),
+      q(5318),
       q(0),
       ],
    q(otank) => [
-      q(6953),
+      q(6954),
       q(0),
       ],
    q(oti) => [
-      q(5319),
+      q(5320),
       q(0),
       ],
    q(oto-manguean languages) => [
@@ -46886,11 +46934,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(otoro) => [
-      q(5325),
+      q(5326),
       q(0),
       ],
    q(ottawa) => [
-      q(5329),
+      q(5330),
       q(0),
       ],
    q(ottoman turkish (1500-1928)) => [
@@ -46898,131 +46946,131 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(otuho) => [
-      q(4030),
+      q(4031),
       q(0),
       ],
    q(otuke) => [
-      q(5328),
+      q(5329),
       q(0),
       ],
    q(ouma) => [
-      q(5337),
+      q(5338),
       q(0),
       ],
    q(oune) => [
-      q(5335),
+      q(5336),
       q(0),
       ],
    q(owa) => [
-      q(6265),
+      q(6266),
       q(0),
       ],
    q(owenia) => [
-      q(7235),
+      q(7236),
       q(0),
       ],
    q(owiniga) => [
-      q(5338),
+      q(5339),
       q(0),
       ],
    q(oy) => [
-      q(5340),
+      q(5341),
       q(0),
       ],
    q(oya'oya) => [
-      q(5343),
+      q(5344),
       q(0),
       ],
    q(oyda) => [
-      q(5341),
+      q(5342),
       q(0),
       ],
    q(ozolotepec zapotec) => [
-      q(7816),
+      q(7818),
       q(0),
       ],
    q(ozumacin chinantec) => [
-      q(1728),
+      q(1729),
       q(0),
       ],
    q(pa di) => [
-      q(5398),
+      q(5399),
       q(0),
       ],
    q(pa'a) => [
-      q(5584),
+      q(5585),
       q(0),
       ],
    q(pa'o) => [
-      q(1287),
+      q(1288),
       q(1),
       ],
    q(pa'o karen) => [
-      q(1287),
+      q(1288),
       q(0),
       ],
    q(pa-hng) => [
-      q(5434),
+      q(5435),
       q(0),
       ],
    q(paafang) => [
-      q(5422),
+      q(5423),
       q(0),
       ],
    q(paakantyi) => [
-      q(2139),
+      q(2140),
       q(0),
       ],
    q(paama) => [
-      q(5507),
+      q(5508),
       q(0),
       ],
    q(paasaal) => [
-      q(6037),
+      q(6038),
       q(0),
       ],
    q(pacahuara) => [
-      q(5394),
+      q(5395),
       q(0),
       ],
    q(pacaraos quechua) => [
-      q(5709),
+      q(5710),
       q(0),
       ],
    q(pacific gulf yupik) => [
-      q(2258),
+      q(2259),
       q(0),
       ],
    q(pacoh) => [
-      q(5346),
+      q(5347),
       q(0),
       ],
    q(padoe) => [
-      q(5400),
+      q(5401),
       q(0),
       ],
    q(paekche) => [
-      q(5475),
+      q(5476),
       q(0),
       ],
    q(paelignian) => [
-      q(5431),
+      q(5432),
       q(0),
       ],
    q(paez) => [
-      q(5363),
+      q(5364),
       q(0),
       ],
    q(pagi) => [
-      q(5428),
+      q(5429),
       q(0),
       ],
    q(pagibete) => [
-      q(5348),
+      q(5349),
       q(0),
       ],
    q(pagu) => [
-      q(5433),
+      q(5434),
       q(0),
       ],
    q(pahanan agta) => [
@@ -47030,15 +47078,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(pahari-potwari) => [
-      q(5443),
+      q(5444),
       q(0),
       ],
    q(pahi) => [
-      q(3896),
+      q(3897),
       q(0),
       ],
    q(pahlavani) => [
-      q(5446),
+      q(5447),
       q(0),
       ],
    q(pahlavi) => [
@@ -47046,43 +47094,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(pai tavytera) => [
-      q(5627),
+      q(5628),
       q(0),
       ],
    q(paici) => [
-      q(5593),
+      q(5594),
       q(0),
       ],
    q(paipai) => [
-      q(5573),
+      q(5574),
       q(0),
       ],
    q(paite chin) => [
-      q(5390),
+      q(5391),
       q(0),
       ],
    q(paiwan) => [
-      q(5665),
+      q(5666),
       q(0),
       ],
    q(pak-tong) => [
-      q(5476),
+      q(5477),
       q(0),
       ],
    q(pakaasnovos) => [
-      q(5358),
+      q(5359),
       q(0),
       ],
    q(pakanha) => [
-      q(5478),
+      q(5479),
       q(0),
       ],
    q(pakistan sign language) => [
-      q(5482),
+      q(5483),
       q(0),
       ],
    q(paku) => [
-      q(5484),
+      q(5485),
       q(0),
       ],
    q(paku karen) => [
@@ -47094,15 +47142,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(palaic) => [
-      q(5498),
+      q(5499),
       q(0),
       ],
    q(palaka senoufo) => [
-      q(5499),
+      q(5500),
       q(0),
       ],
    q(palantla chinantec) => [
-      q(1830),
+      q(1831),
       q(0),
       ],
    q(palauan) => [
@@ -47110,11 +47158,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(paleni) => [
-      q(5538),
+      q(5539),
       q(0),
       ],
    q(palenquero) => [
-      q(5495),
+      q(5496),
       q(0),
       ],
    q(pali) => [
@@ -47122,59 +47170,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(palikur) => [
-      q(5502),
+      q(5503),
       q(0),
       ],
    q(paliyan) => [
-      q(5385),
+      q(5386),
       q(0),
       ],
    q(pallanganmiddang) => [
-      q(5510),
+      q(5511),
       q(0),
       ],
    q(palor) => [
-      q(2332),
+      q(2333),
       q(0),
       ],
    q(palpa) => [
-      q(5497),
+      q(5498),
       q(0),
       ],
    q(palu'e) => [
-      q(5489),
+      q(5490),
       q(0),
       ],
    q(paluan) => [
-      q(5506),
+      q(5507),
       q(0),
       ],
    q(palula) => [
-      q(5439),
+      q(5440),
       q(1),
       ],
    q(palumata) => [
-      q(5509),
+      q(5510),
       q(0),
       ],
    q(palya bareli) => [
-      q(1394),
+      q(1395),
       q(0),
       ],
    q(pam) => [
-      q(5519),
+      q(5520),
       q(0),
       ],
    q(pambia) => [
-      q(5508),
+      q(5509),
       q(0),
       ],
    q(pamlico) => [
-      q(5516),
+      q(5517),
       q(0),
       ],
    q(pamona) => [
-      q(5512),
+      q(5513),
       q(0),
       ],
    q(pamosu) => [
@@ -47186,51 +47234,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(pamplona atta) => [
-      q(0925),
+      q(0926),
       q(0),
       ],
    q(pana (burkina faso)) => [
-      q(5543),
+      q(5544),
       q(0),
       ],
    q(pana (central african republic)) => [
-      q(5552),
+      q(5553),
       q(0),
       ],
    q(panamanian sign language) => [
-      q(4064),
+      q(4065),
       q(0),
       ],
    q(panamint) => [
-      q(5355),
+      q(5356),
       q(0),
       ],
    q(panao huanuco quechua) => [
-      q(5722),
+      q(5723),
       q(0),
       ],
    q(panara) => [
-      q(3576),
+      q(3577),
       q(0),
       ],
    q(panasuan) => [
-      q(5617),
+      q(5618),
       q(0),
       ],
    q(panawa) => [
-      q(5661),
+      q(5662),
       q(0),
       ],
    q(pancana) => [
-      q(5542),
+      q(5543),
       q(0),
       ],
    q(panchpargania) => [
-      q(6428),
+      q(6429),
       q(0),
       ],
    q(pande) => [
-      q(1261),
+      q(1262),
       q(0),
       ],
    q(pangasinan) => [
@@ -47238,27 +47286,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(pangseng) => [
-      q(5432),
+      q(5433),
       q(0),
       ],
    q(pangutaran sama) => [
-      q(6103),
+      q(6104),
       q(0),
       ],
    q(pangwa) => [
-      q(5374),
+      q(5375),
       q(0),
       ],
    q(pangwali) => [
-      q(5427),
+      q(5428),
       q(0),
       ],
    q(panim) => [
-      q(5544),
+      q(5545),
       q(0),
       ],
    q(paniya) => [
-      q(5386),
+      q(5387),
       q(0),
       ],
    q(panjabi) => [
@@ -47266,67 +47314,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(pankarare) => [
-      q(5360),
+      q(5361),
       q(0),
       ],
    q(pankararu) => [
-      q(5362),
+      q(5363),
       q(0),
       ],
    q(pankhu) => [
-      q(5477),
+      q(5478),
       q(0),
       ],
    q(pannei) => [
-      q(5531),
+      q(5532),
       q(0),
       ],
    q(pano) => [
-      q(4504),
+      q(4505),
       q(0),
       ],
    q(panoan katukina) => [
-      q(3497),
+      q(3498),
       q(0),
       ],
    q(panobo) => [
-      q(5541),
+      q(5542),
       q(0),
       ],
    q(panyi bai) => [
-      q(1137),
+      q(1138),
       q(0),
       ],
    q(panytyima) => [
-      q(5549),
+      q(5550),
       q(0),
       ],
    q(pao) => [
-      q(5571),
+      q(5572),
       q(0),
       ],
    q(papantla totonac) => [
-      q(6645),
+      q(6646),
       q(0),
       ],
    q(papapana) => [
-      q(5577),
+      q(5578),
       q(0),
       ],
    q(papar) => [
-      q(2132),
+      q(2133),
       q(0),
       ],
    q(papasena) => [
-      q(5356),
+      q(5357),
       q(0),
       ],
    q(papel) => [
-      q(5372),
+      q(5373),
       q(0),
       ],
    q(papi) => [
-      q(5572),
+      q(5573),
       q(0),
       ],
    q(papiamento) => [
@@ -47334,11 +47382,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(papitalai) => [
-      q(5357),
+      q(5358),
       q(0),
       ],
    q(papora) => [
-      q(5583),
+      q(5584),
       q(0),
       ],
    q(papuan languages) => [
@@ -47346,11 +47394,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(papuan malay) => [
-      q(5527),
+      q(5528),
       q(0),
       ],
    q(papuma) => [
-      q(5576),
+      q(5577),
       q(0),
       ],
    q(para arara) => [
@@ -47362,11 +47410,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(para naga) => [
-      q(5677),
+      q(5678),
       q(0),
       ],
    q(parachi) => [
-      q(5587),
+      q(5588),
       q(0),
       ],
    q(paraguayan guarani) => [
@@ -47374,79 +47422,79 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(paraguayan sign language) => [
-      q(5673),
+      q(5674),
       q(0),
       ],
    q(parakana) => [
-      q(5352),
+      q(5353),
       q(0),
       ],
    q(paranan) => [
-      q(5590),
+      q(5591),
       q(0),
       ],
    q(paranawat) => [
-      q(5349),
+      q(5350),
       q(0),
       ],
    q(paraujano) => [
-      q(5367),
+      q(5368),
       q(0),
       ],
    q(parauk) => [
-      q(5594),
+      q(5595),
       q(0),
       ],
    q(parawen) => [
-      q(5604),
+      q(5605),
       q(0),
       ],
    q(pardhan) => [
-      q(5387),
+      q(5388),
       q(0),
       ],
    q(pardhi) => [
-      q(5391),
+      q(5392),
       q(0),
       ],
    q(pare) => [
-      q(5582),
+      q(5583),
       q(0),
       ],
    q(parecis) => [
-      q(5345),
+      q(5346),
       q(0),
       ],
    q(parenga) => [
-      q(5389),
+      q(5390),
       q(0),
       ],
    q(pari) => [
-      q(3950),
+      q(3951),
       q(0),
       ],
    q(parkari koli) => [
-      q(3689),
+      q(3690),
       q(0),
       ],
    q(parkwa) => [
-      q(5369),
+      q(5370),
       q(0),
       ],
    q(parsi) => [
-      q(5598),
+      q(5599),
       q(0),
       ],
    q(parsi-dari) => [
-      q(5588),
+      q(5589),
       q(0),
       ],
    q(parthian) => [
-      q(7468),
+      q(7469),
       q(0),
       ],
    q(parya) => [
-      q(5354),
+      q(5355),
       q(0),
       ],
    q(pashto) => [
@@ -47454,99 +47502,99 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(pasi) => [
-      q(5620),
+      q(5621),
       q(0),
       ],
    q(pass valley yali) => [
-      q(7576),
+      q(7577),
       q(0),
       ],
    q(patamona) => [
-      q(5364),
+      q(5365),
       q(0),
       ],
    q(patani) => [
-      q(5630),
+      q(5631),
       q(0),
       ],
    q(pataxo ha-ha-hae) => [
-      q(5628),
+      q(5629),
       q(0),
       ],
    q(patep) => [
-      q(5632),
+      q(5633),
       q(0),
       ],
    q(pathiya) => [
-      q(5639),
+      q(5640),
       q(0),
       ],
    q(patpatar) => [
-      q(2488),
+      q(2489),
       q(0),
       ],
    q(pattani) => [
-      q(3795),
+      q(3796),
       q(0),
       ],
    q(pattani malay) => [
-      q(4224),
+      q(4225),
       q(0),
       ],
    q(pattapu) => [
-      q(5633),
+      q(5634),
       q(0),
       ],
    q(patwin) => [
-      q(5663),
+      q(5664),
       q(0),
       ],
    q(paulohi) => [
-      q(5491),
+      q(5492),
       q(0),
       ],
    q(paumari) => [
-      q(5347),
+      q(5348),
       q(0),
       ],
    q(paunaka) => [
-      q(5537),
+      q(5538),
       q(0),
       ],
    q(pauri bareli) => [
-      q(1136),
+      q(1137),
       q(0),
       ],
    q(pauserna) => [
-      q(5616),
+      q(5617),
       q(0),
       ],
    q(pawaia) => [
-      q(5660),
+      q(5661),
       q(0),
       ],
    q(pawnee) => [
-      q(5359),
+      q(5360),
       q(0),
       ],
    q(paynamar) => [
-      q(5522),
+      q(5523),
       q(0),
       ],
    q(pe) => [
-      q(5351),
+      q(5352),
       q(0),
       ],
    q(pear) => [
-      q(5381),
+      q(5382),
       q(0),
       ],
    q(pech) => [
-      q(5361),
+      q(5362),
       q(0),
       ],
    q(pecheneg) => [
-      q(7457),
+      q(7458),
       q(0),
       ],
    q(pedi) => [
@@ -47554,19 +47602,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(peere) => [
-      q(5423),
+      q(5424),
       q(0),
       ],
    q(pei) => [
-      q(5580),
+      q(5581),
       q(0),
       ],
    q(pekal) => [
-      q(5413),
+      q(5414),
       q(0),
       ],
    q(pela) => [
-      q(1569),
+      q(1570),
       q(0),
       ],
    q(pele-ata) => [
@@ -47574,7 +47622,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(pelende) => [
-      q(5579),
+      q(5580),
       q(0),
       ],
    q(pemon) => [
@@ -47582,55 +47630,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(pemono) => [
-      q(5418),
+      q(5419),
       q(0),
       ],
    q(penang sign language) => [
-      q(5612),
+      q(5613),
       q(0),
       ],
    q(penchal) => [
-      q(5412),
+      q(5413),
       q(0),
       ],
    q(pendau) => [
-      q(6911),
+      q(6912),
       q(0),
       ],
    q(pengo) => [
-      q(5408),
+      q(5409),
       q(0),
       ],
    q(pennsylvania german) => [
-      q(5397),
+      q(5398),
       q(0),
       ],
    q(penoles mixtec) => [
-      q(4308),
+      q(4309),
       q(0),
       ],
    q(penrhyn) => [
-      q(5534),
+      q(5535),
       q(0),
       ],
    q(pentlatch) => [
-      q(5638),
+      q(5639),
       q(0),
       ],
    q(perai) => [
-      q(7111),
+      q(7112),
       q(0),
       ],
    q(peranakan indonesian) => [
-      q(5403),
+      q(5404),
       q(0),
       ],
    q(peripheral mongolian) => [
-      q(4604),
+      q(4605),
       q(0),
       ],
    q(pero) => [
-      q(5462),
+      q(5463),
       q(0),
       ],
    q(persian) => [
@@ -47638,7 +47686,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(persian sign language) => [
-      q(5609),
+      q(5610),
       q(0),
       ],
    q(persian, old (ca.600-400 b.c.)) => [
@@ -47646,55 +47694,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(peruvian sign language) => [
-      q(5595),
+      q(5596),
       q(0),
       ],
    q(petapa zapotec) => [
-      q(7916),
+      q(7918),
       q(0),
       ],
    q(petats) => [
-      q(5419),
+      q(5420),
       q(0),
       ],
    q(petjo) => [
-      q(5420),
+      q(5421),
       q(0),
       ],
    q(peve) => [
-      q(3979),
+      q(3980),
       q(0),
       ],
    q(pfaelzisch) => [
-      q(5424),
+      q(5425),
       q(0),
       ],
    q(phai) => [
-      q(5602),
+      q(5603),
       q(0),
       ],
    q(phake) => [
-      q(5438),
+      q(5439),
       q(0),
       ],
    q(phala) => [
-      q(7725),
+      q(7727),
       q(0),
       ],
    q(phalura) => [
-      q(5439),
+      q(5440),
       q(0),
       ],
    q(phana') => [
-      q(5442),
+      q(5443),
       q(0),
       ],
    q(phangduwali) => [
-      q(5447),
+      q(5448),
       q(0),
       ],
    q(phende) => [
-      q(5414),
+      q(5415),
       q(0),
       ],
    q(philippine languages) => [
@@ -47702,11 +47750,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(philippine sign language) => [
-      q(5619),
+      q(5620),
       q(0),
       ],
    q(phimbi) => [
-      q(5440),
+      q(5441),
       q(0),
       ],
    q(phoenician) => [
@@ -47714,127 +47762,127 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(phola) => [
-      q(7727),
+      q(7729),
       q(0),
       ],
    q(pholo) => [
-      q(7653),
+      q(7655),
       q(0),
       ],
    q(phom naga) => [
-      q(5034),
+      q(5035),
       q(0),
       ],
    q(phong-kniang) => [
-      q(5550),
+      q(5551),
       q(0),
       ],
    q(phrae pwo karen) => [
-      q(3396),
+      q(3397),
       q(0),
       ],
    q(phrygian) => [
-      q(7459),
+      q(7460),
       q(0),
       ],
    q(phu thai) => [
-      q(5444),
+      q(5445),
       q(0),
       ],
    q(phuan) => [
-      q(5445),
+      q(5446),
       q(0),
       ],
    q(phudagi) => [
-      q(5435),
+      q(5436),
       q(0),
       ],
    q(phuie) => [
-      q(5646),
+      q(5647),
       q(0),
       ],
    q(phukha) => [
-      q(5437),
+      q(5438),
       q(0),
       ],
    q(phuma) => [
-      q(7729),
+      q(7731),
       q(0),
       ],
    q(phunoi) => [
-      q(5441),
+      q(5442),
       q(0),
       ],
    q(phuong) => [
-      q(5436),
+      q(5437),
       q(0),
       ],
    q(phupa) => [
-      q(7732),
+      q(7734),
       q(0),
       ],
    q(phupha) => [
-      q(7728),
+      q(7730),
       q(0),
       ],
    q(phuza) => [
-      q(7733),
+      q(7735),
       q(0),
       ],
    q(piamatsina) => [
-      q(5634),
+      q(5635),
       q(0),
       ],
    q(piame) => [
-      q(5460),
+      q(5461),
       q(0),
       ],
    q(piapoco) => [
-      q(5461),
+      q(5462),
       q(0),
       ],
    q(piaroa) => [
-      q(5451),
+      q(5452),
       q(0),
       ],
    q(picard) => [
-      q(5383),
+      q(5384),
       q(0),
       ],
    q(pichis asheninka) => [
-      q(1838),
+      q(1839),
       q(0),
       ],
    q(pictish) => [
-      q(7460),
+      q(7461),
       q(0),
       ],
    q(pidgin delaware) => [
-      q(1997),
+      q(1998),
       q(0),
       ],
    q(piemontese) => [
-      q(5523),
+      q(5524),
       q(0),
       ],
    q(pijao) => [
-      q(5457),
+      q(5458),
       q(0),
       ],
    q(pije) => [
-      q(5471),
+      q(5472),
       q(0),
       ],
    q(pijin) => [
-      q(5464),
+      q(5465),
       q(0),
       ],
    q(pilaga) => [
-      q(5490),
+      q(5491),
       q(0),
       ],
    q(pileni) => [
-      q(5467),
+      q(5468),
       q(0),
       ],
    q(pilipino) => [
@@ -47842,143 +47890,143 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(pima bajo) => [
-      q(5448),
+      q(5449),
       q(0),
       ],
    q(pimbwe) => [
-      q(5468),
+      q(5469),
       q(0),
       ],
    q(pinai-hagahai) => [
-      q(5540),
+      q(5541),
       q(0),
       ],
    q(pingelapese) => [
-      q(5453),
+      q(5454),
       q(0),
       ],
    q(pini) => [
-      q(5456),
+      q(5457),
       q(0),
       ],
    q(pinigura) => [
-      q(5548),
+      q(5549),
       q(0),
       ],
    q(pinjarup) => [
-      q(5536),
+      q(5537),
       q(0),
       ],
    q(pinji) => [
-      q(5450),
+      q(5451),
       q(0),
       ],
    q(pinotepa nacional mixtec) => [
-      q(4310),
+      q(4311),
       q(0),
       ],
    q(pintiini) => [
-      q(5629),
+      q(5630),
       q(0),
       ],
    q(pintupi-luritja) => [
-      q(5466),
+      q(5467),
       q(0),
       ],
    q(pinyin) => [
-      q(5551),
+      q(5552),
       q(0),
       ],
    q(pipil) => [
-      q(5575),
+      q(5576),
       q(0),
       ],
    q(piraha) => [
-      q(4685),
+      q(4686),
       q(0),
       ],
    q(piratapuyo) => [
-      q(5463),
+      q(5464),
       q(0),
       ],
    q(pirlatapa) => [
-      q(1574),
+      q(1575),
       q(0),
       ],
    q(piro) => [
-      q(5452),
+      q(5453),
       q(0),
       ],
    q(pirriya) => [
-      q(7456),
+      q(7457),
       q(0),
       ],
    q(pisabo) => [
-      q(5454),
+      q(5455),
       q(0),
       ],
    q(pisaflores tepehua) => [
-      q(6666),
+      q(6667),
       q(0),
       ],
    q(piscataway) => [
-      q(5626),
+      q(5627),
       q(0),
       ],
    q(pisidian) => [
-      q(7469),
+      q(7470),
       q(0),
       ],
    q(pitcairn-norfolk) => [
-      q(5455),
+      q(5456),
       q(0),
       ],
    q(pite sami) => [
-      q(6057),
+      q(6058),
       q(0),
       ],
    q(piti) => [
-      q(5393),
+      q(5394),
       q(0),
       ],
    q(pitjantjatjara) => [
-      q(5472),
+      q(5473),
       q(0),
       ],
    q(pitta pitta) => [
-      q(5465),
+      q(5466),
       q(0),
       ],
    q(piu) => [
-      q(5469),
+      q(5470),
       q(0),
       ],
    q(piya-kwonci) => [
-      q(5470),
+      q(5471),
       q(0),
       ],
    q(plains cree) => [
-      q(1851),
+      q(1852),
       q(0),
       ],
    q(plains indian sign language) => [
-      q(5610),
+      q(5611),
       q(0),
       ],
    q(plains miwok) => [
-      q(5525),
+      q(5526),
       q(0),
       ],
    q(plapo krumen) => [
-      q(3628),
+      q(3629),
       q(0),
       ],
    q(plateau malagasy) => [
-      q(5501),
+      q(5502),
       q(0),
       ],
    q(plautdietsch) => [
-      q(5401),
+      q(5402),
       q(0),
       ],
    q(playero) => [
@@ -47986,23 +48034,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(pnar) => [
-      q(5378),
+      q(5379),
       q(0),
       ],
    q(pochuri naga) => [
-      q(5038),
+      q(5039),
       q(0),
       ],
    q(pochutec) => [
-      q(7465),
+      q(7466),
       q(0),
       ],
    q(podena) => [
-      q(5399),
+      q(5400),
       q(0),
       ],
    q(pogolo) => [
-      q(5570),
+      q(5571),
       q(0),
       ],
    q(pohnpeian) => [
@@ -48010,31 +48058,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(pokanga) => [
-      q(5560),
+      q(5561),
       q(0),
       ],
    q(poke) => [
-      q(5556),
+      q(5557),
       q(0),
       ],
    q(pokomo) => [
-      q(5474),
+      q(5475),
       q(0),
       ],
    q(pokoot) => [
-      q(5479),
+      q(5480),
       q(0),
       ],
    q(polabian) => [
-      q(5569),
+      q(5570),
       q(0),
       ],
    q(polari) => [
-      q(5488),
+      q(5489),
       q(0),
       ],
    q(polci) => [
-      q(5492),
+      q(5493),
       q(0),
       ],
    q(polish) => [
@@ -48042,43 +48090,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(polish sign language) => [
-      q(5618),
+      q(5619),
       q(0),
       ],
    q(polonombauk) => [
-      q(5486),
+      q(5487),
       q(0),
       ],
    q(pom) => [
-      q(5520),
+      q(5521),
       q(0),
       ],
    q(pomo) => [
-      q(5518),
+      q(5519),
       q(0),
       ],
    q(ponam) => [
-      q(4763),
+      q(4764),
       q(0),
       ],
    q(ponares) => [
-      q(5554),
+      q(5555),
       q(0),
       ],
    q(pongu) => [
-      q(5533),
+      q(5534),
       q(0),
       ],
    q(ponosakan) => [
-      q(5545),
+      q(5546),
       q(0),
       ],
    q(pontic) => [
-      q(5546),
+      q(5547),
       q(0),
       ],
    q(ponyo-gongwang naga) => [
-      q(5033),
+      q(5034),
       q(0),
       ],
    q(popti') => [
@@ -48086,23 +48134,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(poqomam) => [
-      q(5553),
+      q(5554),
       q(0),
       ],
    q(poqomchi') => [
-      q(5558),
+      q(5559),
       q(0),
       ],
    q(porohanon) => [
-      q(5592),
+      q(5593),
       q(0),
       ],
    q(port sandwich) => [
-      q(5625),
+      q(5626),
       q(0),
       ],
    q(port vato) => [
-      q(5637),
+      q(5638),
       q(0),
       ],
    q(portuguese) => [
@@ -48110,7 +48158,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(portuguese sign language) => [
-      q(5621),
+      q(5622),
       q(0),
       ],
    q(portuguese-based creoles and pidgins) => [
@@ -48118,39 +48166,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(potawatomi) => [
-      q(5566),
+      q(5567),
       q(0),
       ],
    q(potiguara) => [
-      q(5557),
+      q(5558),
       q(0),
       ],
    q(pottangi ollar gadaba) => [
-      q(2452),
+      q(2453),
       q(0),
       ],
    q(poule) => [
-      q(4540),
+      q(4541),
       q(1),
       ],
    q(poumei naga) => [
-      q(5526),
+      q(5527),
       q(0),
       ],
    q(pouye) => [
-      q(1593),
+      q(1594),
       q(0),
       ],
    q(powari) => [
-      q(5667),
+      q(5668),
       q(0),
       ],
    q(powhatan) => [
-      q(5459),
+      q(5460),
       q(0),
       ],
    q(poyanawa) => [
-      q(5672),
+      q(5673),
       q(0),
       ],
    q(prakrit languages) => [
@@ -48158,19 +48206,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(prasuni) => [
-      q(5597),
+      q(5598),
       q(0),
       ],
    q(pray 3) => [
-      q(5606),
+      q(5607),
       q(0),
       ],
    q(primitive irish) => [
-      q(5430),
+      q(5431),
       q(0),
       ],
    q(principense) => [
-      q(5589),
+      q(5590),
       q(0),
       ],
    q(provencal) => [
@@ -48182,107 +48230,107 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(providencia sign language) => [
-      q(5607),
+      q(5608),
       q(0),
       ],
    q(prussian) => [
-      q(5591),
+      q(5592),
       q(0),
       ],
    q(psikye) => [
-      q(3675),
+      q(3676),
       q(0),
       ],
    q(pu ko) => [
-      q(5649),
+      q(5650),
       q(0),
       ],
    q(pu-xian chinese) => [
-      q(1839),
+      q(1840),
       q(0),
       ],
    q(puare) => [
-      q(5658),
+      q(5659),
       q(0),
       ],
    q(pudtol atta) => [
-      q(0921),
+      q(0922),
       q(0),
       ],
    q(puelche) => [
-      q(5644),
+      q(5645),
       q(0),
       ],
    q(puerto rican sign language) => [
-      q(5615),
+      q(5616),
       q(0),
       ],
    q(puimei naga) => [
-      q(5040),
+      q(5041),
       q(0),
       ],
    q(puinave) => [
-      q(5647),
+      q(5648),
       q(0),
       ],
    q(pukapuka) => [
-      q(5480),
+      q(5481),
       q(0),
       ],
    q(pulaar) => [
-      q(2380),
+      q(2381),
       q(0),
       ],
    q(pulabu) => [
-      q(5652),
+      q(5653),
       q(0),
       ],
    q(pular) => [
-      q(2383),
+      q(2384),
       q(0),
       ],
    q(puluwatese) => [
-      q(5657),
+      q(5658),
       q(0),
       ],
    q(puma) => [
-      q(5650),
+      q(5651),
       q(0),
       ],
    q(pume) => [
-      q(7578),
+      q(7579),
       q(0),
       ],
    q(pumpokol) => [
-      q(7463),
+      q(7464),
       q(0),
       ],
    q(punan aput) => [
-      q(5643),
+      q(5644),
       q(0),
       ],
    q(punan bah-biau) => [
-      q(5529),
+      q(5530),
       q(0),
       ],
    q(punan batu 1) => [
-      q(5539),
+      q(5540),
       q(0),
       ],
    q(punan merah) => [
-      q(5645),
+      q(5646),
       q(0),
       ],
    q(punan merap) => [
-      q(5642),
+      q(5643),
       q(0),
       ],
    q(punan tubu) => [
-      q(5648),
+      q(5649),
       q(0),
       ],
    q(punic) => [
-      q(7471),
+      q(7472),
       q(0),
       ],
    q(punjabi) => [
@@ -48290,27 +48338,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(puno quechua) => [
-      q(5726),
+      q(5727),
       q(0),
       ],
    q(punthamara) => [
-      q(7470),
+      q(7471),
       q(0),
       ],
    q(punu) => [
-      q(5656),
+      q(5657),
       q(0),
       ],
    q(puoc) => [
-      q(5651),
+      q(5652),
       q(0),
       ],
    q(puquina) => [
-      q(5653),
+      q(5654),
       q(0),
       ],
    q(puragi) => [
-      q(5603),
+      q(5604),
       q(0),
       ],
    q(purari) => [
@@ -48318,31 +48366,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(purepecha) => [
-      q(6733),
+      q(6734),
       q(0),
       ],
    q(puri) => [
-      q(5600),
+      q(5601),
       q(0),
       ],
    q(purik) => [
-      q(5605),
+      q(5606),
       q(0),
       ],
    q(purisimeno) => [
-      q(5659),
+      q(5660),
       q(0),
       ],
    q(puroik) => [
-      q(6286),
+      q(6287),
       q(0),
       ],
    q(purubora) => [
-      q(5654),
+      q(5655),
       q(0),
       ],
    q(purum) => [
-      q(5641),
+      q(5642),
       q(0),
       ],
    q(pushto) => [
@@ -48350,11 +48398,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(putai) => [
-      q(4235),
+      q(4236),
       q(0),
       ],
    q(putoh) => [
-      q(5655),
+      q(5656),
       q(0),
       ],
    q(putukwam) => [
@@ -48362,75 +48410,75 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(puyo) => [
-      q(7472),
+      q(7473),
       q(0),
       ],
    q(puyo-paekche) => [
-      q(7466),
+      q(7467),
       q(0),
       ],
    q(puyuma) => [
-      q(5674),
+      q(5675),
       q(0),
       ],
    q(pwaamei) => [
-      q(5511),
+      q(5512),
       q(0),
       ],
    q(pwapwa) => [
-      q(5563),
+      q(5564),
       q(0),
       ],
    q(pwo eastern karen) => [
-      q(3392),
+      q(3393),
       q(0),
       ],
    q(pwo northern karen) => [
-      q(5668),
+      q(5669),
       q(0),
       ],
    q(pwo western karen) => [
-      q(5666),
+      q(5667),
       q(0),
       ],
    q(pyapun) => [
-      q(5395),
+      q(5396),
       q(0),
       ],
    q(pye krumen) => [
-      q(5670),
+      q(5671),
       q(0),
       ],
    q(pyen) => [
-      q(5676),
+      q(5677),
       q(0),
       ],
    q(pyu (myanmar)) => [
-      q(5675),
+      q(5676),
       q(0),
       ],
    q(pyu (papua new guinea)) => [
-      q(5379),
+      q(5380),
       q(0),
       ],
    q(q'anjob'al) => [
-      q(3378),
+      q(3379),
       q(0),
       ],
    q(qabiao) => [
-      q(3804),
+      q(3805),
       q(0),
       ],
    q(qaqet) => [
-      q(1610),
+      q(1611),
       q(0),
       ],
    q(qashqa'i) => [
-      q(5727),
+      q(5728),
       q(0),
       ],
    q(qatabanian) => [
-      q(7474),
+      q(7475),
       q(0),
       ],
    q(qau) => [
@@ -48442,7 +48490,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(qila muji) => [
-      q(7699),
+      q(7701),
       q(0),
       ],
    q(qimant) => [
@@ -48450,19 +48498,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(qiubei zhuang) => [
-      q(7938),
+      q(7940),
       q(0),
       ],
    q(quapaw) => [
-      q(5678),
+      q(5679),
       q(0),
       ],
    q(quebec sign language) => [
-      q(2339),
+      q(2340),
       q(0),
       ],
    q(quechan) => [
-      q(7771),
+      q(7773),
       q(0),
       ],
    q(quechua) => [
@@ -48474,71 +48522,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(quenya) => [
-      q(5733),
+      q(5734),
       q(0),
       ],
    q(queretaro otomi) => [
-      q(5324),
+      q(5325),
       q(0),
       ],
    q(quetzaltepec mixe) => [
-      q(5669),
+      q(5670),
       q(0),
       ],
    q(queyu) => [
-      q(5712),
+      q(5713),
       q(0),
       ],
    q(quiavicuzas zapotec) => [
-      q(7921),
+      q(7923),
       q(0),
       ],
    q(quiche) => [
-      q(5680),
+      q(5681),
       q(1),
       ],
    q(quileute) => [
-      q(5685),
+      q(5686),
       q(0),
       ],
    q(quinault) => [
-      q(5689),
+      q(5690),
       q(0),
       ],
    q(quinqui) => [
-      q(5691),
+      q(5692),
       q(0),
       ],
    q(quioquitani-quieri zapotec) => [
-      q(7957),
+      q(7959),
       q(0),
       ],
    q(quiotepec chinantec) => [
-      q(1724),
+      q(1725),
       q(0),
       ],
    q(quiripi) => [
-      q(5734),
+      q(5735),
       q(0),
       ],
    q(rabha) => [
-      q(5741),
+      q(5742),
       q(0),
       ],
    q(rade) => [
-      q(5738),
+      q(5739),
       q(0),
       ],
    q(raetic) => [
-      q(7484),
+      q(7485),
       q(0),
       ],
    q(rahambuu) => [
-      q(5756),
+      q(5757),
       q(0),
       ],
    q(rajah kabunsuwan manobo) => [
-      q(4489),
+      q(4490),
       q(0),
       ],
    q(rajasthani) => [
@@ -48546,15 +48594,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(rajbanshi) => [
-      q(5796),
+      q(5797),
       q(0),
       ],
    q(raji) => [
-      q(5795),
+      q(5796),
       q(0),
       ],
    q(rajong) => [
-      q(5794),
+      q(5795),
       q(0),
       ],
    q(rajput garasia) => [
@@ -48562,59 +48610,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(rakahanga-manihiki) => [
-      q(5799),
+      q(5800),
       q(0),
       ],
    q(rakhine) => [
-      q(5800),
+      q(5801),
       q(0),
       ],
    q(ralte) => [
-      q(5744),
+      q(5745),
       q(0),
       ],
    q(rama) => [
-      q(5804),
+      q(5805),
       q(0),
       ],
    q(ramoaaina) => [
-      q(5742),
+      q(5743),
       q(0),
       ],
    q(ramopa) => [
-      q(3399),
+      q(3400),
       q(0),
       ],
    q(rampi) => [
-      q(3932),
+      q(3933),
       q(0),
       ],
    q(rana tharu) => [
-      q(6508),
+      q(6509),
       q(0),
       ],
    q(rang) => [
-      q(5754),
+      q(5755),
       q(0),
       ],
    q(rangkas) => [
-      q(5778),
+      q(5779),
       q(0),
       ],
    q(ranglong) => [
-      q(5831),
+      q(5832),
       q(0),
       ],
    q(rangpuri) => [
-      q(5802),
+      q(5803),
       q(0),
       ],
    q(rao) => [
-      q(5747),
+      q(5748),
       q(0),
       ],
    q(rapa) => [
-      q(5755),
+      q(5756),
       q(0),
       ],
    q(rapanui) => [
@@ -48622,15 +48670,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(rapoisi) => [
-      q(3764),
+      q(3765),
       q(0),
       ],
    q(rapting) => [
-      q(5849),
+      q(5850),
       q(0),
       ],
    q(rara bakati') => [
-      q(4041),
+      q(4042),
       q(0),
       ],
    q(rarotongan) => [
@@ -48638,39 +48686,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(rasawa) => [
-      q(5737),
+      q(5738),
       q(0),
       ],
    q(ratagnon) => [
-      q(1481),
+      q(1482),
       q(0),
       ],
    q(ratahan) => [
-      q(5857),
+      q(5858),
       q(0),
       ],
    q(rathawi) => [
-      q(5860),
+      q(5861),
       q(0),
       ],
    q(rathwi bareli) => [
-      q(1163),
+      q(1164),
       q(0),
       ],
    q(raute) => [
-      q(5751),
+      q(5752),
       q(0),
       ],
    q(ravula) => [
-      q(7620),
+      q(7621),
       q(0),
       ],
    q(rawa) => [
-      q(5878),
+      q(5879),
       q(0),
       ],
    q(rawang) => [
-      q(5753),
+      q(5754),
       q(0),
       ],
    q(rawat) => [
@@ -48678,55 +48726,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(rawngtu chin) => [
-      q(7112),
+      q(7113),
       q(0),
       ],
    q(rawo) => [
-      q(5875),
+      q(5876),
       q(0),
       ],
    q(rayon zoque) => [
-      q(7910),
+      q(7912),
       q(0),
       ],
    q(razajerdi) => [
-      q(5750),
+      q(5751),
       q(0),
       ],
    q(red gelao) => [
-      q(2523),
+      q(2524),
       q(0),
       ],
    q(reel) => [
-      q(0926),
+      q(0927),
       q(0),
       ],
    q(rejang) => [
-      q(5768),
+      q(5769),
       q(0),
       ],
    q(rejang kayan) => [
-      q(5765),
+      q(5766),
       q(0),
       ],
    q(reli) => [
-      q(5767),
+      q(5768),
       q(0),
       ],
    q(rema) => [
-      q(1370),
+      q(1371),
       q(0),
       ],
    q(rembarunga) => [
-      q(5805),
+      q(5806),
       q(0),
       ],
    q(rembong) => [
-      q(5764),
+      q(5765),
       q(0),
       ],
    q(remo) => [
-      q(5770),
+      q(5771),
       q(0),
       ],
    q(remontado dumagat) => [
@@ -48734,43 +48782,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(rempi) => [
-      q(5818),
+      q(5819),
       q(0),
       ],
    q(remun) => [
-      q(3945),
+      q(3946),
       q(0),
       ],
    q(rendille) => [
-      q(5769),
+      q(5770),
       q(0),
       ],
    q(rengao) => [
-      q(5771),
+      q(5772),
       q(0),
       ],
    q(rennell-bellona) => [
-      q(4431),
+      q(4432),
       q(0),
       ],
    q(rennellese sign language) => [
-      q(5854),
+      q(5855),
       q(0),
       ],
    q(repanbitip) => [
-      q(5848),
+      q(5849),
       q(0),
       ],
    q(rer bare) => [
-      q(5772),
+      q(5773),
       q(0),
       ],
    q(rerau) => [
-      q(5763),
+      q(5764),
       q(0),
       ],
    q(rerep) => [
-      q(5429),
+      q(5430),
       q(0),
       ],
    q(reserved for local use) => [
@@ -48778,99 +48826,99 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(reshe) => [
-      q(5773),
+      q(5774),
       q(0),
       ],
    q(resigaro) => [
-      q(5780),
+      q(5781),
       q(0),
       ],
    q(retta) => [
-      q(5774),
+      q(5775),
       q(0),
       ],
    q(reunion creole french) => [
-      q(5761),
+      q(5762),
       q(0),
       ],
    q(reyesano) => [
-      q(5775),
+      q(5776),
       q(0),
       ],
    q(riang (india)) => [
-      q(5785),
+      q(5786),
       q(0),
       ],
    q(riang (myanmar)) => [
-      q(5788),
+      q(5789),
       q(0),
       ],
    q(riantana) => [
-      q(5746),
+      q(5747),
       q(0),
       ],
    q(ribun) => [
-      q(5791),
+      q(5792),
       q(0),
       ],
    q(rien) => [
-      q(5786),
+      q(5787),
       q(0),
       ],
    q(rifao) => [
-      q(4983),
+      q(4984),
       q(1),
       ],
    q(rikbaktsa) => [
-      q(5798),
+      q(5799),
       q(0),
       ],
    q(rincon zapotec) => [
-      q(7818),
+      q(7820),
       q(0),
       ],
    q(rinconada bikol) => [
-      q(1482),
+      q(1483),
       q(0),
       ],
    q(ringgou) => [
-      q(5782),
+      q(5783),
       q(0),
       ],
    q(ririo) => [
-      q(5850),
+      q(5851),
       q(0),
       ],
    q(ritarungo) => [
-      q(5792),
+      q(5793),
       q(0),
       ],
    q(riung) => [
-      q(5793),
+      q(5794),
       q(0),
       ],
    q(riverain sango) => [
-      q(6141),
+      q(6142),
       q(0),
       ],
    q(rogo) => [
-      q(5838),
+      q(5839),
       q(0),
       ],
    q(rohingya) => [
-      q(5783),
+      q(5784),
       q(0),
       ],
    q(roma) => [
-      q(5815),
+      q(5816),
       q(0),
       ],
    q(romagnol) => [
-      q(5779),
+      q(5780),
       q(0),
       ],
    q(romam) => [
-      q(5825),
+      q(5826),
       q(0),
       ],
    q(romance languages) => [
@@ -48882,19 +48930,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(romanian sign language) => [
-      q(5820),
+      q(5821),
       q(0),
       ],
    q(romano-greek) => [
-      q(5777),
+      q(5778),
       q(0),
       ],
    q(romano-serbian) => [
-      q(5853),
+      q(5854),
       q(0),
       ],
    q(romanova) => [
-      q(5823),
+      q(5824),
       q(0),
       ],
    q(romansh) => [
@@ -48906,95 +48954,95 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(romblomanon) => [
-      q(5842),
+      q(5843),
       q(0),
       ],
    q(rombo) => [
-      q(5840),
+      q(5841),
       q(0),
       ],
    q(romkun) => [
-      q(5813),
+      q(5814),
       q(0),
       ],
    q(ron) => [
-      q(1768),
+      q(1769),
       q(0),
       ],
    q(ronga) => [
-      q(5830),
+      q(5831),
       q(0),
       ],
    q(rongga) => [
-      q(5845),
+      q(5846),
       q(0),
       ],
    q(rongmei naga) => [
-      q(4757),
+      q(4758),
       q(0),
       ],
    q(rongpo) => [
-      q(5833),
+      q(5834),
       q(0),
       ],
    q(ronji) => [
-      q(5839),
+      q(5840),
       q(0),
       ],
    q(roon) => [
-      q(5832),
+      q(5833),
       q(0),
       ],
    q(roria) => [
-      q(5776),
+      q(5777),
       q(0),
       ],
    q(rotokas) => [
-      q(5843),
+      q(5844),
       q(0),
       ],
    q(rotuman) => [
-      q(5858),
+      q(5859),
       q(0),
       ],
    q(roviana) => [
-      q(5865),
+      q(5866),
       q(0),
       ],
    q(ruching palaung) => [
-      q(5384),
+      q(5385),
       q(0),
       ],
    q(rudbari) => [
-      q(5762),
+      q(5763),
       q(0),
       ],
    q(rufiji) => [
-      q(5867),
+      q(5868),
       q(0),
       ],
    q(ruga) => [
-      q(5866),
+      q(5867),
       q(0),
       ],
    q(rukai) => [
-      q(2146),
+      q(2147),
       q(0),
       ],
    q(ruma) => [
-      q(5874),
+      q(5875),
       q(0),
       ],
    q(rumai palaung) => [
-      q(5757),
+      q(5758),
       q(0),
       ],
    q(rumu) => [
-      q(3444),
+      q(3445),
       q(0),
       ],
    q(runa) => [
-      q(5828),
+      q(5829),
       q(0),
       ],
    q(rundi) => [
@@ -49002,23 +49050,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(runga) => [
-      q(5846),
+      q(5847),
       q(0),
       ],
    q(rungtu chin) => [
-      q(5856),
+      q(5857),
       q(0),
       ],
    q(rungus) => [
-      q(2137),
+      q(2138),
       q(0),
       ],
    q(rungwa) => [
-      q(5835),
+      q(5836),
       q(0),
       ],
    q(russia buriat) => [
-      q(1583),
+      q(1584),
       q(0),
       ],
    q(russian) => [
@@ -49026,35 +49074,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(russian sign language) => [
-      q(5855),
+      q(5856),
       q(0),
       ],
    q(rusyn) => [
-      q(5863),
+      q(5864),
       q(0),
       ],
    q(rutul) => [
-      q(5871),
+      q(5872),
       q(0),
       ],
    q(ruuli) => [
-      q(5862),
+      q(5863),
       q(0),
       ],
    q(ruund) => [
-      q(5829),
+      q(5830),
       q(0),
       ],
    q(rwa) => [
-      q(5876),
+      q(5877),
       q(0),
       ],
    q(s'gaw karen) => [
-      q(3615),
+      q(3616),
       q(0),
       ],
    q(sa) => [
-      q(5898),
+      q(5899),
       q(0),
       ],
    q(sa'a) => [
@@ -49062,55 +49110,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sa'ban) => [
-      q(6151),
+      q(6152),
       q(0),
       ],
    q(sa'och) => [
-      q(5936),
+      q(5937),
       q(0),
       ],
    q(saafi-saafi) => [
-      q(5896),
+      q(5897),
       q(0),
       ],
    q(saam) => [
-      q(5748),
+      q(5749),
       q(0),
       ],
    q(saamia) => [
-      q(4062),
+      q(4063),
       q(0),
       ],
    q(saaroa) => [
-      q(6330),
+      q(6331),
       q(0),
       ],
    q(saba) => [
-      q(5885),
+      q(5886),
       q(0),
       ],
    q(sabaean) => [
-      q(7488),
+      q(7489),
       q(0),
       ],
    q(sabah bisaya) => [
-      q(1469),
+      q(1470),
       q(0),
       ],
    q(sabah malay) => [
-      q(4537),
+      q(4538),
       q(0),
       ],
    q(sabane) => [
-      q(5888),
+      q(5889),
       q(0),
       ],
    q(sabaot) => [
-      q(6196),
+      q(6197),
       q(0),
       ],
    q(sabine) => [
-      q(5922),
+      q(5923),
       q(0),
       ],
    q(sabu) => [
@@ -49118,27 +49166,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sabum) => [
-      q(5915),
+      q(5916),
       q(0),
       ],
    q(sacapulteco) => [
-      q(5694),
+      q(5695),
       q(0),
       ],
    q(sadri) => [
-      q(5933),
+      q(5934),
       q(0),
       ],
    q(saek) => [
-      q(6071),
+      q(6072),
       q(0),
       ],
    q(saep) => [
-      q(6179),
+      q(6180),
       q(0),
       ],
    q(safaliba) => [
-      q(5889),
+      q(5890),
       q(0),
       ],
    q(safeyoka) => [
@@ -49146,23 +49194,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(safwa) => [
-      q(5911),
+      q(5912),
       q(0),
       ],
    q(sagala) => [
-      q(5913),
+      q(5914),
       q(0),
       ],
    q(sagalla) => [
-      q(6474),
+      q(6475),
       q(0),
       ],
    q(saho) => [
-      q(6251),
+      q(6252),
       q(0),
       ],
    q(sahu) => [
-      q(5890),
+      q(5891),
       q(0),
       ],
    q(saidi arabic) => [
@@ -49174,23 +49222,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(saisiyat) => [
-      q(7505),
+      q(7506),
       q(0),
       ],
    q(sajalong) => [
-      q(6060),
+      q(6061),
       q(0),
       ],
    q(sajau basap) => [
-      q(6055),
+      q(6056),
       q(0),
       ],
    q(sakachep) => [
-      q(5931),
+      q(5932),
       q(0),
       ],
    q(sakalava malagasy) => [
-      q(6076),
+      q(6077),
       q(0),
       ],
    q(sakan) => [
@@ -49198,59 +49246,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(sakao) => [
-      q(6089),
+      q(6090),
       q(0),
       ],
    q(sakata) => [
-      q(6088),
+      q(6089),
       q(0),
       ],
    q(sake) => [
-      q(5891),
+      q(5892),
       q(0),
       ],
    q(sakirabia) => [
-      q(6075),
+      q(6076),
       q(0),
       ],
    q(sala) => [
-      q(6023),
+      q(6024),
       q(0),
       ],
    q(salako) => [
-      q(3501),
+      q(3502),
       q(1),
       ],
    q(salampasu) => [
-      q(6112),
+      q(6113),
       q(0),
       ],
    q(salar) => [
-      q(6107),
+      q(6108),
       q(0),
       ],
    q(salas) => [
-      q(6004),
+      q(6005),
       q(0),
       ],
    q(salasaca highland quichua) => [
-      q(5723),
+      q(5724),
       q(0),
       ],
    q(salchuq) => [
-      q(6106),
+      q(6107),
       q(0),
       ],
    q(saleman) => [
-      q(5895),
+      q(5896),
       q(0),
       ],
    q(saliba) => [
-      q(5905),
+      q(5906),
       q(0),
       ],
    q(salinan) => [
-      q(6104),
+      q(6105),
       q(0),
       ],
    q(salishan languages) => [
@@ -49258,35 +49306,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sallands) => [
-      q(5961),
+      q(5962),
       q(0),
       ],
    q(salt-yui) => [
-      q(6102),
+      q(6103),
       q(0),
       ],
    q(saluan) => [
-      q(4016),
+      q(4017),
       q(0),
       ],
    q(saluma) => [
-      q(6101),
+      q(6102),
       q(0),
       ],
    q(salvadoran sign language) => [
-      q(2296),
+      q(2297),
       q(0),
       ],
    q(sam) => [
-      q(6153),
+      q(6154),
       q(0),
       ],
    q(sama) => [
-      q(6117),
+      q(6118),
       q(0),
       ],
    q(samaritan) => [
-      q(6124),
+      q(6125),
       q(0),
       ],
    q(samaritan aramaic) => [
@@ -49294,51 +49342,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(samarokena) => [
-      q(6594),
+      q(6595),
       q(0),
       ],
    q(samatao) => [
-      q(7746),
+      q(7748),
       q(0),
       ],
    q(samay) => [
-      q(6344),
+      q(6345),
       q(0),
       ],
    q(samba) => [
-      q(6131),
+      q(6132),
       q(0),
       ],
    q(samba daka) => [
-      q(1683),
+      q(1684),
       q(0),
       ],
    q(samba leko) => [
-      q(4790),
+      q(4791),
       q(0),
       ],
    q(sambal) => [
-      q(7489),
+      q(7490),
       q(0),
       ],
    q(sambalpuri) => [
-      q(6194),
+      q(6195),
       q(0),
       ],
    q(sambe) => [
-      q(7272),
+      q(7273),
       q(0),
       ],
    q(samberigi) => [
-      q(6250),
+      q(6251),
       q(0),
       ],
    q(samburu) => [
-      q(5893),
+      q(5894),
       q(0),
       ],
    q(samei) => [
-      q(6120),
+      q(6121),
       q(0),
       ],
    q(sami languages) => [
@@ -49346,7 +49394,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(samo) => [
-      q(6125),
+      q(6126),
       q(0),
       ],
    q(samoan) => [
@@ -49354,11 +49402,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(samogitian) => [
-      q(6002),
+      q(6003),
       q(0),
       ],
    q(samosa) => [
-      q(6308),
+      q(6309),
       q(0),
       ],
    q(samoyedic languages) => [
@@ -49366,31 +49414,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sampang) => [
-      q(5752),
+      q(5753),
       q(0),
       ],
    q(samre) => [
-      q(6327),
+      q(6328),
       q(0),
       ],
    q(samtao) => [
-      q(6272),
+      q(6273),
       q(0),
       ],
    q(samvedi) => [
-      q(6129),
+      q(6130),
       q(0),
       ],
    q(san agustin mixtepec zapotec) => [
-      q(7954),
+      q(7956),
       q(0),
       ],
    q(san baltazar loxicha zapotec) => [
-      q(7935),
+      q(7937),
       q(0),
       ],
    q(san blas kuna) => [
-      q(1909),
+      q(1910),
       q(0),
       ],
    q(san dionisio del mar huave) => [
@@ -49398,7 +49446,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(san felipe otlaltepec popoloca) => [
-      q(5568),
+      q(5569),
       q(0),
       ],
    q(san francisco del mar huave) => [
@@ -49406,47 +49454,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(san francisco matlatzinca) => [
-      q(4121),
+      q(4122),
       q(0),
       ],
    q(san jeronimo tecoatl mazatec) => [
-      q(4114),
+      q(4115),
       q(0),
       ],
    q(san juan atzingo popoloca) => [
-      q(5555),
+      q(5556),
       q(0),
       ],
    q(san juan colorado mixtec) => [
-      q(4320),
+      q(4321),
       q(0),
       ],
    q(san juan guelavia zapotec) => [
-      q(7804),
+      q(7806),
       q(0),
       ],
    q(san juan teita mixtec) => [
-      q(7514),
+      q(7515),
       q(0),
       ],
    q(san luis temalacayuca popoloca) => [
-      q(5581),
+      q(5582),
       q(0),
       ],
    q(san marcos tlacoyalco popoloca) => [
-      q(5500),
+      q(5501),
       q(0),
       ],
    q(san marcos tlalcoyalco popoloca) => [
-      q(5500),
+      q(5501),
       q(1),
       ],
    q(san martin itunyoso triqui) => [
-      q(6702),
+      q(6703),
       q(0),
       ],
    q(san martin quechua) => [
-      q(5710),
+      q(5711),
       q(0),
       ],
    q(san mateo del mar huave) => [
@@ -49454,39 +49502,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(san miguel creole french) => [
-      q(5929),
+      q(5930),
       q(0),
       ],
    q(san miguel el grande mixtec) => [
-      q(4303),
+      q(4304),
       q(0),
       ],
    q(san miguel piedras mixtec) => [
-      q(7519),
+      q(7520),
       q(0),
       ],
    q(san pedro amuzgos amuzgo) => [
-      q(1014),
+      q(1015),
       q(0),
       ],
    q(san pedro quiatoni zapotec) => [
-      q(7917),
+      q(7919),
       q(0),
       ],
    q(san salvador kongo) => [
-      q(3715),
+      q(3716),
       q(0),
       ],
    q(san vicente coatlan zapotec) => [
-      q(7931),
+      q(7933),
       q(0),
       ],
    q(sanaani arabic) => [
-      q(1001),
+      q(1002),
       q(0),
       ],
    q(sanapana) => [
-      q(6186),
+      q(6187),
       q(0),
       ],
    q(sandawe) => [
@@ -49494,35 +49542,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sanga (democratic republic of congo)) => [
-      q(6138),
+      q(6139),
       q(0),
       ],
    q(sanga (nigeria)) => [
-      q(7497),
+      q(7498),
       q(0),
       ],
    q(sanggau) => [
-      q(5930),
+      q(5931),
       q(0),
       ],
    q(sangil) => [
-      q(6142),
+      q(6143),
       q(0),
       ],
    q(sangir) => [
-      q(6328),
+      q(6329),
       q(0),
       ],
    q(sangisari) => [
-      q(6001),
+      q(6002),
       q(0),
       ],
    q(sangkong) => [
-      q(5998),
+      q(5999),
       q(0),
       ],
    q(sanglechi) => [
-      q(6007),
+      q(6008),
       q(0),
       ],
    q(sango) => [
@@ -49530,35 +49578,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sangtam naga) => [
-      q(5065),
+      q(5066),
       q(0),
       ],
    q(sangu (gabon)) => [
-      q(6147),
+      q(6148),
       q(0),
       ],
    q(sangu (tanzania)) => [
-      q(5916),
+      q(5917),
       q(0),
       ],
    q(sani) => [
-      q(7749),
+      q(7751),
       q(0),
       ],
    q(sanie) => [
-      q(7754),
+      q(7756),
       q(0),
       ],
    q(saniyo-hiyewe) => [
-      q(6154),
+      q(6155),
       q(0),
       ],
    q(sankaran maninka) => [
-      q(4531),
+      q(4532),
       q(0),
       ],
    q(sansi) => [
-      q(6236),
+      q(6237),
       q(0),
       ],
    q(sanskrit) => [
@@ -49566,23 +49614,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(santa ana de tusi pasco quechua) => [
-      q(5730),
+      q(5731),
       q(0),
       ],
    q(santa catarina albarradas zapotec) => [
-      q(7955),
+      q(7957),
       q(0),
       ],
    q(santa ines ahuatempan popoloca) => [
-      q(5380),
+      q(5381),
       q(0),
       ],
    q(santa ines yatzechi zapotec) => [
-      q(7925),
+      q(7927),
       q(0),
       ],
    q(santa lucia monteverde mixtec) => [
-      q(4196),
+      q(4197),
       q(0),
       ],
    q(santa maria del mar huave) => [
@@ -49590,19 +49638,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(santa maria la alta nahuatl) => [
-      q(4881),
+      q(4882),
       q(0),
       ],
    q(santa maria quiegolani zapotec) => [
-      q(7920),
+      q(7922),
       q(0),
       ],
    q(santa maria zacatepec mixtec) => [
-      q(4693),
+      q(4694),
       q(0),
       ],
    q(santa teresa cora) => [
-      q(1817),
+      q(1818),
       q(0),
       ],
    q(santali) => [
@@ -49610,95 +49658,95 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(santiago del estero quichua) => [
-      q(5693),
+      q(5694),
       q(0),
       ],
    q(santiago xanica zapotec) => [
-      q(7929),
+      q(7931),
       q(0),
       ],
    q(santo domingo albarradas zapotec) => [
-      q(7819),
+      q(7821),
       q(0),
       ],
    q(sanuma) => [
-      q(7503),
+      q(7504),
       q(0),
       ],
    q(sao paulo kaingang) => [
-      q(7864),
+      q(7866),
       q(0),
       ],
    q(saotomense) => [
-      q(1849),
+      q(1850),
       q(0),
       ],
    q(saparua) => [
-      q(6190),
+      q(6191),
       q(0),
       ],
    q(sape) => [
-      q(6178),
+      q(6179),
       q(0),
       ],
    q(sapo) => [
-      q(3583),
+      q(3584),
       q(0),
       ],
    q(saponi) => [
-      q(6182),
+      q(6183),
       q(0),
       ],
    q(saposa) => [
-      q(6191),
+      q(6192),
       q(0),
       ],
    q(sapuan) => [
-      q(6193),
+      q(6194),
       q(0),
       ],
    q(sar) => [
-      q(4633),
+      q(4634),
       q(0),
       ],
    q(sara) => [
-      q(6211),
+      q(6212),
       q(0),
       ],
    q(sara kaba) => [
-      q(5926),
+      q(5927),
       q(0),
       ],
    q(sara kaba deme) => [
-      q(3698),
+      q(3699),
       q(0),
       ],
    q(sara kaba naa) => [
-      q(3712),
+      q(3713),
       q(0),
       ],
    q(saraiki) => [
-      q(6086),
+      q(6087),
       q(0),
       ],
    q(saramaccan) => [
-      q(6218),
+      q(6219),
       q(0),
       ],
    q(sarangani blaan) => [
-      q(1389),
+      q(1390),
       q(0),
       ],
    q(sarangani manobo) => [
-      q(4144),
+      q(4145),
       q(0),
       ],
    q(sarasira) => [
-      q(7945),
+      q(7947),
       q(0),
       ],
    q(saraveca) => [
-      q(5894),
+      q(5895),
       q(0),
       ],
    q(sardinian) => [
@@ -49710,31 +49758,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sarikoli) => [
-      q(6214),
+      q(6215),
       q(0),
       ],
    q(sarli) => [
-      q(5946),
+      q(5947),
       q(0),
       ],
    q(sarsi) => [
-      q(6221),
+      q(6222),
       q(0),
       ],
    q(sartang) => [
-      q(5275),
+      q(5276),
       q(0),
       ],
    q(sarua) => [
-      q(6320),
+      q(6321),
       q(0),
       ],
    q(sarudu) => [
-      q(5959),
+      q(5960),
       q(0),
       ],
    q(saruga) => [
-      q(6208),
+      q(6209),
       q(0),
       ],
    q(sasak) => [
@@ -49742,83 +49790,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sasaru) => [
-      q(6331),
+      q(6332),
       q(0),
       ],
    q(sassarese sardinian) => [
-      q(5944),
+      q(5945),
       q(0),
       ],
    q(satawalese) => [
-      q(6274),
+      q(6275),
       q(0),
       ],
    q(satere-mawe) => [
-      q(4123),
+      q(4124),
       q(0),
       ],
    q(saterfriesisch) => [
-      q(6268),
+      q(6269),
       q(0),
       ],
    q(saudi arabian sign language) => [
-      q(5951),
+      q(5952),
       q(0),
       ],
    q(sauraseni prakrit) => [
-      q(5624),
+      q(5625),
       q(0),
       ],
    q(saurashtra) => [
-      q(5900),
+      q(5901),
       q(0),
       ],
    q(sauri) => [
-      q(6222),
+      q(6223),
       q(0),
       ],
    q(sauria paharia) => [
-      q(4336),
+      q(4337),
       q(0),
       ],
    q(sause) => [
-      q(5892),
+      q(5893),
       q(0),
       ],
    q(sausi) => [
-      q(6237),
+      q(6238),
       q(0),
       ],
    q(savara) => [
-      q(6296),
+      q(6297),
       q(0),
       ],
    q(savi) => [
-      q(5947),
+      q(5948),
       q(0),
       ],
    q(savosavo) => [
-      q(6297),
+      q(6298),
       q(0),
       ],
    q(sawai) => [
-      q(6356),
+      q(6357),
       q(0),
       ],
    q(saweru) => [
-      q(6313),
+      q(6314),
       q(0),
       ],
    q(sawi) => [
-      q(5897),
+      q(5898),
       q(0),
       ],
    q(sawila) => [
-      q(6315),
+      q(6316),
       q(0),
       ],
    q(sawknah) => [
-      q(6309),
+      q(6310),
       q(0),
       ],
    q(saxon, low) => [
@@ -49826,15 +49874,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(3),
       ],
    q(saxwe gbe) => [
-      q(6333),
+      q(6334),
       q(0),
       ],
    q(saya) => [
-      q(5899),
+      q(5900),
       q(0),
       ],
    q(sayula popoluca) => [
-      q(5565),
+      q(5566),
       q(0),
       ],
    q(scots) => [
@@ -49846,7 +49894,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(scythian) => [
-      q(7490),
+      q(7491),
       q(0),
       ],
    q(sea island creole english) => [
@@ -49854,63 +49902,63 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(seba) => [
-      q(3239),
+      q(3240),
       q(0),
       ],
    q(sebat bet gurage) => [
-      q(6005),
+      q(6006),
       q(0),
       ],
    q(seberuang) => [
-      q(5924),
+      q(5925),
       q(0),
       ],
    q(sebop) => [
-      q(6034),
+      q(6035),
       q(0),
       ],
    q(sebuyau) => [
-      q(6134),
+      q(6135),
       q(0),
       ],
    q(sechelt) => [
-      q(5964),
+      q(5965),
       q(0),
       ],
    q(secoya) => [
-      q(5983),
+      q(5984),
       q(0),
       ],
    q(sedang) => [
-      q(5965),
+      q(5966),
       q(0),
       ],
    q(sedoa) => [
-      q(6789),
+      q(6790),
       q(0),
       ],
    q(seeku) => [
-      q(6170),
+      q(6171),
       q(0),
       ],
    q(segai) => [
-      q(5993),
+      q(5994),
       q(0),
       ],
    q(segeju) => [
-      q(5968),
+      q(5969),
       q(0),
       ],
    q(seget) => [
-      q(5907),
+      q(5908),
       q(0),
       ],
    q(sehwi) => [
-      q(5989),
+      q(5990),
       q(0),
       ],
    q(seimat) => [
-      q(6234),
+      q(6235),
       q(0),
       ],
    q(seit-kaitetu) => [
@@ -49918,67 +49966,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sekani) => [
-      q(5972),
+      q(5973),
       q(0),
       ],
    q(sekapan) => [
-      q(6084),
+      q(6085),
       q(0),
       ],
    q(sekar) => [
-      q(6094),
+      q(6095),
       q(0),
       ],
    q(seke (nepal)) => [
-      q(6079),
+      q(6080),
       q(0),
       ],
    q(seke (vanuatu)) => [
-      q(6074),
+      q(6075),
       q(0),
       ],
    q(sekele) => [
-      q(6974),
+      q(6975),
       q(0),
       ],
    q(seki) => [
-      q(6336),
+      q(6337),
       q(0),
       ],
    q(seko padang) => [
-      q(6092),
+      q(6093),
       q(0),
       ],
    q(seko tengah) => [
-      q(6083),
+      q(6084),
       q(0),
       ],
    q(sekpele) => [
-      q(3921),
+      q(3922),
       q(0),
       ],
    q(selangor sign language) => [
-      q(3315),
+      q(3316),
       q(0),
       ],
    q(selaru) => [
-      q(6110),
+      q(6111),
       q(0),
       ],
    q(selayar) => [
-      q(6113),
+      q(6114),
       q(0),
       ],
    q(selee) => [
-      q(6152),
+      q(6153),
       q(0),
       ],
    q(selepet) => [
-      q(6184),
+      q(6185),
       q(0),
       ],
    q(selian) => [
-      q(6326),
+      q(6327),
       q(0),
       ],
    q(selkup) => [
@@ -49986,35 +50034,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(selungai murut) => [
-      q(6098),
+      q(6099),
       q(0),
       ],
    q(seluwasan) => [
-      q(6314),
+      q(6315),
       q(0),
       ],
    q(semai) => [
-      q(5962),
+      q(5963),
       q(0),
       ],
    q(semandang) => [
-      q(5952),
+      q(5953),
       q(0),
       ],
    q(semaq beri) => [
-      q(6348),
+      q(6349),
       q(0),
       ],
    q(sembakung murut) => [
-      q(5918),
+      q(5919),
       q(0),
       ],
    q(semelai) => [
-      q(6346),
+      q(6347),
       q(0),
       ],
    q(semimi) => [
-      q(2312),
+      q(2313),
       q(0),
       ],
    q(semitic languages) => [
@@ -50022,83 +50070,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(semnam) => [
-      q(6240),
+      q(6241),
       q(0),
       ],
    q(semnani) => [
-      q(6132),
+      q(6133),
       q(0),
       ],
    q(sempan) => [
-      q(7492),
+      q(7493),
       q(0),
       ],
    q(sena) => [
-      q(5969),
+      q(5970),
       q(0),
       ],
    q(senara senoufo) => [
-      q(5976),
+      q(5977),
       q(0),
       ],
    q(senaya) => [
-      q(6340),
+      q(6341),
       q(0),
       ],
    q(sene) => [
-      q(5971),
+      q(5972),
       q(0),
       ],
    q(seneca) => [
-      q(5966),
+      q(5967),
       q(0),
       ],
    q(sened) => [
-      q(5957),
+      q(5958),
       q(0),
       ],
    q(sengele) => [
-      q(6351),
+      q(6352),
       q(0),
       ],
    q(senggi) => [
-      q(6150),
+      q(6151),
       q(0),
       ],
    q(sengo) => [
-      q(6183),
+      q(6184),
       q(0),
       ],
    q(sengseng) => [
-      q(6252),
+      q(6253),
       q(0),
       ],
    q(senhaja de srair) => [
-      q(6066),
+      q(6067),
       q(0),
       ],
    q(sensi) => [
-      q(6140),
+      q(6141),
       q(0),
       ],
    q(sentani) => [
-      q(5979),
+      q(5980),
       q(0),
       ],
    q(senthang chin) => [
-      q(5984),
+      q(5985),
       q(0),
       ],
    q(sentinel) => [
-      q(6255),
+      q(6256),
       q(0),
       ],
    q(sepa (indonesia)) => [
-      q(6177),
+      q(6178),
       q(0),
       ],
    q(sepa (papua new guinea)) => [
-      q(6180),
+      q(6181),
       q(0),
       ],
    q(sepedi) => [
@@ -50110,11 +50158,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sera) => [
-      q(6227),
+      q(6228),
       q(0),
       ],
    q(seraiki) => [
-      q(6086),
+      q(6087),
       q(1),
       ],
    q(serbian) => [
@@ -50126,7 +50174,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sere) => [
-      q(6301),
+      q(6302),
       q(0),
       ],
    q(serer) => [
@@ -50134,103 +50182,103 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(seri) => [
-      q(5970),
+      q(5971),
       q(0),
       ],
    q(serili) => [
-      q(6293),
+      q(6294),
       q(0),
       ],
    q(seroa) => [
-      q(3567),
+      q(3568),
       q(0),
       ],
    q(serrano) => [
-      q(5977),
+      q(5978),
       q(0),
       ],
    q(seru) => [
-      q(6349),
+      q(6350),
       q(0),
       ],
    q(serua) => [
-      q(6225),
+      q(6226),
       q(0),
       ],
    q(serudung murut) => [
-      q(6216),
+      q(6217),
       q(0),
       ],
    q(serui-laut) => [
-      q(5980),
+      q(5981),
       q(0),
       ],
    q(seselwa creole french) => [
-      q(1858),
+      q(1859),
       q(0),
       ],
    q(seta) => [
-      q(6257),
+      q(6258),
       q(0),
       ],
    q(setaman) => [
-      q(6264),
+      q(6265),
       q(0),
       ],
    q(seti) => [
-      q(5909),
+      q(5910),
       q(0),
       ],
    q(settla) => [
-      q(6253),
+      q(6254),
       q(0),
       ],
    q(severn ojibwa) => [
-      q(5221),
+      q(5222),
       q(0),
       ],
    q(sewa bay) => [
-      q(5982),
+      q(5983),
       q(0),
       ],
    q(seze) => [
-      q(6350),
+      q(6351),
       q(0),
       ],
    q(sha) => [
-      q(5940),
+      q(5941),
       q(0),
       ],
    q(shabak) => [
-      q(5943),
+      q(5944),
       q(0),
       ],
    q(shabo) => [
-      q(5906),
+      q(5907),
       q(1),
       ],
    q(shahmirzadi) => [
-      q(6228),
+      q(6229),
       q(0),
       ],
    q(shahrudi) => [
-      q(6020),
+      q(6021),
       q(0),
       ],
    q(shall-zwall) => [
-      q(6009),
+      q(6010),
       q(0),
       ],
    q(shama-sambuga) => [
-      q(6197),
+      q(6198),
       q(0),
       ],
    q(shamang) => [
-      q(7493),
+      q(7494),
       q(0),
       ],
    q(shambala) => [
-      q(3594),
+      q(3595),
       q(0),
       ],
    q(shan) => [
@@ -50238,11 +50286,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(shanenawa) => [
-      q(6310),
+      q(6311),
       q(0),
       ],
    q(shanga) => [
-      q(6021),
+      q(6022),
       q(0),
       ],
    q(shangzhai) => [
@@ -50250,91 +50298,91 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(sharanahua) => [
-      q(4155),
+      q(4156),
       q(0),
       ],
    q(shark bay) => [
-      q(6249),
+      q(6250),
       q(0),
       ],
    q(sharwa) => [
-      q(6312),
+      q(6313),
       q(0),
       ],
    q(shasta) => [
-      q(6026),
+      q(6027),
       q(0),
       ],
    q(shatt) => [
-      q(6017),
+      q(6018),
       q(0),
       ],
    q(shau) => [
-      q(6198),
+      q(6199),
       q(0),
       ],
    q(shawnee) => [
-      q(6069),
+      q(6070),
       q(0),
       ],
    q(she) => [
-      q(6030),
+      q(6031),
       q(0),
       ],
    q(shehri) => [
-      q(6028),
+      q(6029),
       q(0),
       ],
    q(shekhawati) => [
-      q(6317),
+      q(6318),
       q(0),
       ],
    q(shekkacho) => [
-      q(4453),
+      q(4454),
       q(0),
       ],
    q(sheko) => [
-      q(6013),
+      q(6014),
       q(0),
       ],
    q(shelta) => [
-      q(6259),
+      q(6260),
       q(0),
       ],
    q(shempire senoufo) => [
-      q(5963),
+      q(5964),
       q(0),
       ],
    q(shendu) => [
-      q(6019),
+      q(6020),
       q(0),
       ],
    q(sheni) => [
-      q(5939),
+      q(5940),
       q(0),
       ],
    q(sherbro) => [
-      q(1504),
+      q(1505),
       q(0),
       ],
    q(sherdukpen) => [
-      q(5955),
+      q(5956),
       q(0),
       ],
    q(sherpa) => [
-      q(7501),
+      q(7502),
       q(0),
       ],
    q(sheshi kham) => [
-      q(3367),
+      q(3368),
       q(0),
       ],
    q(shi) => [
-      q(6024),
+      q(6025),
       q(0),
       ],
    q(shihhi arabic) => [
-      q(6235),
+      q(6236),
       q(0),
       ],
    q(shiki) => [
@@ -50342,31 +50390,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(shilluk) => [
-      q(6018),
+      q(6019),
       q(0),
       ],
    q(shina) => [
-      q(5934),
+      q(5935),
       q(0),
       ],
    q(shinabo) => [
-      q(6139),
+      q(6140),
       q(0),
       ],
    q(shipibo-conibo) => [
-      q(6022),
+      q(6023),
       q(0),
       ],
    q(shixing) => [
-      q(6324),
+      q(6325),
       q(0),
       ],
    q(sholaga) => [
-      q(6096),
+      q(6097),
       q(0),
       ],
    q(shom peng) => [
-      q(6039),
+      q(6040),
       q(0),
       ],
    q(shona) => [
@@ -50374,23 +50422,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(shoo-minda-nye) => [
-      q(1084),
+      q(1085),
       q(0),
       ],
    q(shor) => [
-      q(1751),
+      q(1752),
       q(0),
       ],
    q(shoshoni) => [
-      q(6015),
+      q(6016),
       q(0),
       ],
    q(shua) => [
-      q(6014),
+      q(6015),
       q(0),
       ],
    q(shuadit) => [
-      q(5958),
+      q(5959),
       q(0),
       ],
    q(shuar) => [
@@ -50398,83 +50446,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(shubi) => [
-      q(6282),
+      q(6283),
       q(0),
       ],
    q(shughni) => [
-      q(5995),
+      q(5996),
       q(0),
       ],
    q(shumashti) => [
-      q(6270),
+      q(6271),
       q(0),
       ],
    q(shumcho) => [
-      q(5938),
+      q(5939),
       q(0),
       ],
    q(shuswap) => [
-      q(6025),
+      q(6026),
       q(0),
       ],
    q(shuwa-zamani) => [
-      q(3593),
+      q(3594),
       q(0),
       ],
    q(shwai) => [
-      q(6029),
+      q(6030),
       q(0),
       ],
    q(shwe palaung) => [
-      q(5494),
+      q(5495),
       q(0),
       ],
    q(sialum) => [
-      q(6111),
+      q(6112),
       q(0),
       ],
    q(siamou) => [
-      q(6036),
+      q(6037),
       q(0),
       ],
    q(sian) => [
-      q(6181),
+      q(6182),
       q(0),
       ],
    q(siane) => [
-      q(6146),
+      q(6147),
       q(0),
       ],
    q(siang) => [
-      q(6334),
+      q(6335),
       q(0),
       ],
    q(siar-lak) => [
-      q(6065),
+      q(6066),
       q(0),
       ],
    q(siawi) => [
-      q(4404),
+      q(4405),
       q(0),
       ],
    q(sibe) => [
-      q(4775),
+      q(4776),
       q(0),
       ],
    q(siberian tatar) => [
-      q(6275),
+      q(6276),
       q(0),
       ],
    q(sibu melanau) => [
-      q(5960),
+      q(5961),
       q(0),
       ],
    q(sicanian) => [
-      q(6322),
+      q(6323),
       q(0),
       ],
    q(sicel) => [
-      q(5941),
+      q(5942),
       q(0),
       ],
    q(sichuan yi) => [
@@ -50486,11 +50534,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sicite senoufo) => [
-      q(5975),
+      q(5976),
       q(0),
       ],
    q(siculo arabic) => [
-      q(6204),
+      q(6205),
       q(0),
       ],
    q(sidamo) => [
@@ -50498,27 +50546,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sidetic) => [
-      q(7491),
+      q(7492),
       q(0),
       ],
    q(sie) => [
-      q(2281),
+      q(2282),
       q(0),
       ],
    q(sierra de juarez zapotec) => [
-      q(7803),
+      q(7805),
       q(0),
       ],
    q(sierra leone sign language) => [
-      q(6006),
+      q(6007),
       q(0),
       ],
    q(sierra negra nahuatl) => [
-      q(5082),
+      q(5083),
       q(0),
       ],
    q(sighu) => [
-      q(6323),
+      q(6324),
       q(0),
       ],
    q(sign languages) => [
@@ -50526,31 +50574,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sihan) => [
-      q(6148),
+      q(6149),
       q(0),
       ],
    q(sihuas ancash quechua) => [
-      q(5718),
+      q(5719),
       q(0),
       ],
    q(sika) => [
-      q(6078),
+      q(6079),
       q(0),
       ],
    q(sikaiana) => [
-      q(6093),
+      q(6094),
       q(0),
       ],
    q(sikaritai) => [
-      q(6757),
+      q(6758),
       q(0),
       ],
    q(sikiana) => [
-      q(6041),
+      q(6042),
       q(0),
       ],
    q(sikkimese) => [
-      q(6044),
+      q(6045),
       q(0),
       ],
    q(siksika) => [
@@ -50558,87 +50606,87 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sikule) => [
-      q(6077),
+      q(6078),
       q(0),
       ],
    q(sila) => [
-      q(6109),
+      q(6110),
       q(0),
       ],
    q(silacayoapan mixtec) => [
-      q(4359),
+      q(4360),
       q(0),
       ],
    q(sileibi) => [
-      q(5917),
+      q(5918),
       q(0),
       ],
    q(silesian) => [
-      q(6352),
+      q(6353),
       q(0),
       ],
    q(silimo) => [
-      q(7249),
+      q(7250),
       q(0),
       ],
    q(siliput) => [
-      q(4345),
+      q(4346),
       q(0),
       ],
    q(silopi) => [
-      q(7499),
+      q(7500),
       q(0),
       ],
    q(silt'e) => [
-      q(6273),
+      q(6274),
       q(0),
       ],
    q(simaa) => [
-      q(6035),
+      q(6036),
       q(0),
       ],
    q(simba) => [
-      q(5923),
+      q(5924),
       q(0),
       ],
    q(simbali) => [
-      q(6119),
+      q(6120),
       q(0),
       ],
    q(simbari) => [
-      q(6115),
+      q(6116),
       q(0),
       ],
    q(simbo) => [
-      q(5902),
+      q(5903),
       q(0),
       ],
    q(simeku) => [
-      q(6133),
+      q(6134),
       q(0),
       ],
    q(simeulue) => [
-      q(6126),
+      q(6127),
       q(0),
       ],
    q(simte) => [
-      q(6127),
+      q(6128),
       q(0),
       ],
    q(sinagen) => [
-      q(6048),
+      q(6049),
       q(0),
       ],
    q(sinasina) => [
-      q(6247),
+      q(6248),
       q(0),
       ],
    q(sinaugoro) => [
-      q(6135),
+      q(6136),
       q(0),
       ],
    q(sindarin) => [
-      q(6062),
+      q(6063),
       q(0),
       ],
    q(sindhi) => [
@@ -50646,23 +50694,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sindhi bhil) => [
-      q(5914),
+      q(5915),
       q(0),
       ],
    q(sindihui mixtec) => [
-      q(7522),
+      q(7523),
       q(0),
       ],
    q(singa) => [
-      q(5999),
+      q(6000),
       q(0),
       ],
    q(singapore sign language) => [
-      q(6108),
+      q(6109),
       q(0),
       ],
    q(singpho) => [
-      q(6000),
+      q(6001),
       q(0),
       ],
    q(sinhala) => [
@@ -50674,7 +50722,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(sinicahua mixtec) => [
-      q(7513),
+      q(7514),
       q(0),
       ],
    q(sinicized miao) => [
@@ -50682,7 +50730,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(sininkere) => [
-      q(6085),
+      q(6086),
       q(0),
       ],
    q(sino-tibetan languages) => [
@@ -50690,23 +50738,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sinsauru) => [
-      q(6155),
+      q(6156),
       q(0),
       ],
    q(sinte romani) => [
-      q(5817),
+      q(5818),
       q(0),
       ],
    q(sinyar) => [
-      q(6342),
+      q(6343),
       q(0),
       ],
    q(sio) => [
-      q(7494),
+      q(7495),
       q(0),
       ],
    q(siona) => [
-      q(6144),
+      q(6145),
       q(0),
       ],
    q(siouan languages) => [
@@ -50714,67 +50762,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sipacapense) => [
-      q(5688),
+      q(5689),
       q(0),
       ],
    q(sira) => [
-      q(6305),
+      q(6306),
       q(0),
       ],
    q(siraya) => [
-      q(2367),
+      q(2368),
       q(0),
       ],
    q(sirenik yupik) => [
-      q(7752),
+      q(7754),
       q(0),
       ],
    q(siri) => [
-      q(6046),
+      q(6047),
       q(0),
       ],
    q(siriano) => [
-      q(6215),
+      q(6216),
       q(0),
       ],
    q(siriono) => [
-      q(6220),
+      q(6221),
       q(0),
       ],
    q(sirmauri) => [
-      q(6226),
+      q(6227),
       q(0),
       ],
    q(siroi) => [
-      q(6231),
+      q(6232),
       q(0),
       ],
    q(sishee) => [
-      q(6038),
+      q(6039),
       q(1),
       ],
    q(sissala) => [
-      q(6095),
+      q(6096),
       q(0),
       ],
    q(sissano) => [
-      q(6242),
+      q(6243),
       q(0),
       ],
    q(siuslaw) => [
-      q(6047),
+      q(6048),
       q(0),
       ],
    q(sivandi) => [
-      q(6052),
+      q(6053),
       q(0),
       ],
    q(siwai) => [
-      q(6050),
+      q(6051),
       q(0),
       ],
    q(siwi) => [
-      q(6053),
+      q(6054),
       q(0),
       ],
    q(siwu) => [
@@ -50782,19 +50830,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(siyin chin) => [
-      q(1885),
+      q(1886),
       q(0),
       ],
    q(skagit) => [
-      q(6070),
+      q(6071),
       q(0),
       ],
    q(skalvian) => [
-      q(6298),
+      q(6299),
       q(0),
       ],
    q(skepi creole dutch) => [
-      q(6091),
+      q(6092),
       q(0),
       ],
    q(skolt sami) => [
@@ -50802,7 +50850,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(skou) => [
-      q(6090),
+      q(6091),
       q(0),
       ],
    q(slave (athapascan)) => [
@@ -50814,7 +50862,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(slavomolisano) => [
-      q(6295),
+      q(6296),
       q(0),
       ],
    q(slovak) => [
@@ -50822,7 +50870,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(slovakian sign language) => [
-      q(6294),
+      q(6295),
       q(0),
       ],
    q(slovenian) => [
@@ -50830,43 +50878,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(small flowery miao) => [
-      q(5987),
+      q(5988),
       q(0),
       ],
    q(smarky kanum) => [
-      q(3731),
+      q(3732),
       q(0),
       ],
    q(snohomish) => [
-      q(6145),
+      q(6146),
       q(0),
       ],
    q(so) => [
-      q(6246),
+      q(6247),
       q(0),
       ],
    q(so (democratic republic of congo)) => [
-      q(6158),
+      q(6159),
       q(0),
       ],
    q(so'a) => [
-      q(6244),
+      q(6245),
       q(0),
       ],
    q(sobei) => [
-      q(6157),
+      q(6158),
       q(0),
       ],
    q(sochiapam chinantec) => [
-      q(1878),
+      q(1879),
       q(0),
       ],
    q(sochiapan chinantec) => [
-      q(1878),
+      q(1879),
       q(1),
       ],
    q(soga) => [
-      q(7447),
+      q(7448),
       q(0),
       ],
    q(sogdian) => [
@@ -50874,23 +50922,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(soi) => [
-      q(6163),
+      q(6164),
       q(0),
       ],
    q(sok) => [
-      q(6080),
+      q(6081),
       q(0),
       ],
    q(sokoro) => [
-      q(6164),
+      q(6165),
       q(0),
       ],
    q(solano) => [
-      q(7498),
+      q(7499),
       q(0),
       ],
    q(soli) => [
-      q(5925),
+      q(5926),
       q(0),
       ],
    q(solong) => [
@@ -50898,11 +50946,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(solos) => [
-      q(6165),
+      q(6166),
       q(0),
       ],
    q(som) => [
-      q(6116),
+      q(6117),
       q(0),
       ],
    q(somali) => [
@@ -50910,31 +50958,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(somba-siawari) => [
-      q(1322),
+      q(1323),
       q(0),
       ],
    q(somrai) => [
-      q(6169),
+      q(6170),
       q(0),
       ],
    q(somray) => [
-      q(6128),
+      q(6129),
       q(0),
       ],
    q(somyev) => [
-      q(3326),
+      q(3327),
       q(0),
       ],
    q(sonaga) => [
-      q(7747),
+      q(7749),
       q(0),
       ],
    q(sonde) => [
-      q(6011),
+      q(6012),
       q(0),
       ],
    q(songe) => [
-      q(6167),
+      q(6168),
       q(0),
       ],
    q(songhai languages) => [
@@ -50942,27 +50990,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(songlai chin) => [
-      q(1873),
+      q(1874),
       q(0),
       ],
    q(songo) => [
-      q(6166),
+      q(6167),
       q(0),
       ],
    q(songomeno) => [
-      q(6160),
+      q(6161),
       q(0),
       ],
    q(songoora) => [
-      q(6159),
+      q(6160),
       q(0),
       ],
    q(sonha) => [
-      q(6162),
+      q(6163),
       q(0),
       ],
    q(sonia) => [
-      q(6045),
+      q(6046),
       q(0),
       ],
    q(soninke) => [
@@ -50970,23 +51018,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sonsorol) => [
-      q(6172),
+      q(6173),
       q(0),
       ],
    q(soo) => [
-      q(6464),
+      q(6465),
       q(0),
       ],
    q(sop) => [
-      q(6943),
+      q(6944),
       q(0),
       ],
    q(soqotri) => [
-      q(6206),
+      q(6207),
       q(0),
       ],
    q(sora) => [
-      q(6209),
+      q(6210),
       q(0),
       ],
    q(sorbian languages) => [
@@ -50994,27 +51042,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sori-harengan) => [
-      q(5908),
+      q(5909),
       q(0),
       ],
    q(sorkhei) => [
-      q(6202),
+      q(6203),
       q(0),
       ],
    q(sorothaptic) => [
-      q(6329),
+      q(6330),
       q(0),
       ],
    q(sorsogon ayta) => [
-      q(1006),
+      q(1007),
       q(0),
       ],
    q(sos kundi) => [
-      q(5950),
+      q(5951),
       q(0),
       ],
    q(sota kanum) => [
-      q(3592),
+      q(3593),
       q(0),
       ],
    q(sotho, southern) => [
@@ -51022,11 +51070,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sou) => [
-      q(6203),
+      q(6204),
       q(0),
       ],
    q(south african sign language) => [
-      q(5988),
+      q(5989),
       q(0),
       ],
    q(south american indian (other)) => [
@@ -51038,15 +51086,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(south awyu) => [
-      q(0977),
+      q(0978),
       q(0),
       ],
    q(south azerbaijani) => [
-      q(1012),
+      q(1013),
       q(0),
       ],
    q(south bolivian quechua) => [
-      q(5684),
+      q(5685),
       q(0),
       ],
    q(south caucasian languages) => [
@@ -51054,27 +51102,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(south central banda) => [
-      q(4005),
+      q(4006),
       q(0),
       ],
    q(south central dinka) => [
-      q(2035),
+      q(2036),
       q(0),
       ],
    q(south efate) => [
-      q(2284),
+      q(2285),
       q(0),
       ],
    q(south fali) => [
-      q(2330),
+      q(2331),
       q(0),
       ],
    q(south giziga) => [
-      q(2530),
+      q(2531),
       q(0),
       ],
    q(south lembata) => [
-      q(3980),
+      q(3981),
       q(0),
       ],
    q(south levantine arabic) => [
@@ -51082,11 +51130,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(south marquesan) => [
-      q(4491),
+      q(4492),
       q(0),
       ],
    q(south muyu) => [
-      q(3637),
+      q(3638),
       q(0),
       ],
    q(south ndebele) => [
@@ -51094,15 +51142,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(south nuaulu) => [
-      q(5147),
+      q(5148),
       q(0),
       ],
    q(south picene) => [
-      q(6195),
+      q(6196),
       q(0),
       ],
    q(south slavey) => [
-      q(7495),
+      q(7496),
       q(0),
       ],
    q(south slavic languages) => [
@@ -51110,27 +51158,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(south tairora) => [
-      q(5264),
+      q(5265),
       q(0),
       ],
    q(south ucayali asheninka) => [
-      q(1840),
+      q(1841),
       q(0),
       ],
    q(south watut) => [
-      q(4176),
+      q(4177),
       q(0),
       ],
    q(south west bay) => [
-      q(6149),
+      q(6150),
       q(0),
       ],
    q(southeast ambrym) => [
-      q(6782),
+      q(6783),
       q(0),
       ],
    q(southeast babar) => [
-      q(6985),
+      q(6986),
       q(0),
       ],
    q(southeast ijo) => [
@@ -51138,43 +51186,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(southeast pashai) => [
-      q(5614),
+      q(5615),
       q(0),
       ],
    q(southeast pashayi) => [
-      q(5614),
+      q(5615),
       q(1),
       ],
    q(southeastern dinka) => [
-      q(2075),
+      q(2076),
       q(0),
       ],
    q(southeastern ixtlan zapotec) => [
-      q(7915),
+      q(7917),
       q(0),
       ],
    q(southeastern kolami) => [
-      q(4898),
+      q(4899),
       q(0),
       ],
    q(southeastern nochixtlan mixtec) => [
-      q(4670),
+      q(4671),
       q(0),
       ],
    q(southeastern pomo) => [
-      q(5561),
+      q(5562),
       q(0),
       ],
    q(southeastern puebla nahuatl) => [
-      q(5036),
+      q(5037),
       q(0),
       ],
    q(southeastern tarahumara) => [
-      q(6422),
+      q(6423),
       q(0),
       ],
    q(southeastern tepehuan) => [
-      q(6267),
+      q(6268),
       q(0),
       ],
    q(southern alta) => [
@@ -51190,67 +51238,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(southern aymara) => [
-      q(0993),
+      q(0994),
       q(0),
       ],
    q(southern bai) => [
-      q(1153),
+      q(1154),
       q(0),
       ],
    q(southern balochi) => [
-      q(1065),
+      q(1066),
       q(0),
       ],
    q(southern betsimisaraka malagasy) => [
-      q(1614),
+      q(1615),
       q(0),
       ],
    q(southern binukidnon) => [
-      q(4576),
+      q(4577),
       q(0),
       ],
    q(southern birifor) => [
-      q(1225),
+      q(1226),
       q(0),
       ],
    q(southern bobo madare) => [
-      q(1557),
+      q(1558),
       q(0),
       ],
    q(southern bontok) => [
-      q(5189),
+      q(5190),
       q(0),
       ],
    q(southern carrier) => [
-      q(1642),
+      q(1643),
       q(0),
       ],
    q(southern catanduanes bikol) => [
-      q(1290),
+      q(1291),
       q(0),
       ],
    q(southern conchucos ancash quechua) => [
-      q(5725),
+      q(5726),
       q(0),
       ],
    q(southern dagaare) => [
-      q(2003),
+      q(2004),
       q(0),
       ],
    q(southern dong) => [
-      q(3455),
+      q(3456),
       q(0),
       ],
    q(southern east cree) => [
-      q(1850),
+      q(1851),
       q(0),
       ],
    q(southern ghale) => [
-      q(2504),
+      q(2505),
       q(0),
       ],
    q(southern gondi) => [
-      q(2498),
+      q(2499),
       q(0),
       ],
    q(southern grebo) => [
@@ -51274,35 +51322,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(southern kalapuya) => [
-      q(6325),
+      q(6326),
       q(0),
       ],
    q(southern kalinga) => [
-      q(3595),
+      q(3596),
       q(0),
       ],
    q(southern kisi) => [
-      q(3611),
+      q(3612),
       q(0),
       ],
    q(southern kiwai) => [
-      q(3380),
+      q(3381),
       q(0),
       ],
    q(southern kurdish) => [
-      q(5948),
+      q(5949),
       q(0),
       ],
    q(southern lolopo) => [
-      q(7751),
+      q(7753),
       q(0),
       ],
    q(southern luri) => [
-      q(4092),
+      q(4093),
       q(0),
       ],
    q(southern ma'di) => [
-      q(6143),
+      q(6144),
       q(0),
       ],
    q(southern mashan hmong) => [
@@ -51314,71 +51362,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(southern mnong) => [
-      q(4425),
+      q(4426),
       q(0),
       ],
    q(southern muji) => [
-      q(7687),
+      q(7689),
       q(0),
       ],
    q(southern nago) => [
-      q(5042),
+      q(5043),
       q(0),
       ],
    q(southern nambikuara) => [
-      q(4719),
+      q(4720),
       q(0),
       ],
    q(southern ngbandi) => [
-      q(4759),
+      q(4760),
       q(0),
       ],
    q(southern nicobarese) => [
-      q(4890),
+      q(4891),
       q(0),
       ],
    q(southern nisu) => [
-      q(5067),
+      q(5068),
       q(0),
       ],
    q(southern nuni) => [
-      q(5008),
+      q(5009),
       q(0),
       ],
    q(southern ohlone) => [
-      q(1881),
+      q(1882),
       q(0),
       ],
    q(southern one) => [
-      q(5314),
+      q(5315),
       q(0),
       ],
    q(southern pame) => [
-      q(5528),
+      q(5529),
       q(0),
       ],
    q(southern pashto) => [
-      q(5376),
+      q(5377),
       q(0),
       ],
    q(southern pastaza quechua) => [
-      q(5690),
+      q(5691),
       q(0),
       ],
    q(southern pomo) => [
-      q(5416),
+      q(5417),
       q(0),
       ],
    q(southern puebla mixtec) => [
-      q(4314),
+      q(4315),
       q(0),
       ],
    q(southern puget sound salish) => [
-      q(6099),
+      q(6100),
       q(0),
       ],
    q(southern pumi) => [
-      q(5515),
+      q(5516),
       q(0),
       ],
    q(southern qiandong miao) => [
@@ -51386,23 +51434,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(southern qiang) => [
-      q(5729),
+      q(5730),
       q(0),
       ],
    q(southern rengma naga) => [
-      q(5051),
+      q(5052),
       q(0),
       ],
    q(southern rincon zapotec) => [
-      q(7949),
+      q(7951),
       q(0),
       ],
    q(southern roglai) => [
-      q(5781),
+      q(5782),
       q(0),
       ],
    q(southern sama) => [
-      q(6229),
+      q(6230),
       q(0),
       ],
    q(southern sami) => [
@@ -51410,15 +51458,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(southern samo) => [
-      q(5904),
+      q(5905),
       q(0),
       ],
    q(southern sierra miwok) => [
-      q(6073),
+      q(6074),
       q(0),
       ],
    q(southern sorsoganon) => [
-      q(6224),
+      q(6225),
       q(0),
       ],
    q(southern sotho) => [
@@ -51426,39 +51474,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(southern subanen) => [
-      q(3792),
+      q(3793),
       q(0),
       ],
    q(southern thai) => [
-      q(6171),
+      q(6172),
       q(0),
       ],
    q(southern tiwa) => [
-      q(6534),
+      q(6535),
       q(0),
       ],
    q(southern toussian) => [
-      q(7126),
+      q(7127),
       q(0),
       ],
    q(southern tujia) => [
-      q(6544),
+      q(6545),
       q(0),
       ],
    q(southern tutchone) => [
-      q(6408),
+      q(6409),
       q(0),
       ],
    q(southern uzbek) => [
-      q(6968),
+      q(6969),
       q(0),
       ],
    q(southern yamphu) => [
-      q(4051),
+      q(4052),
       q(0),
       ],
    q(southern yukaghir) => [
-      q(7778),
+      q(7780),
       q(0),
       ],
    q(southwest gbaya) => [
@@ -51466,31 +51514,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(southwest palawano) => [
-      q(5503),
+      q(5504),
       q(0),
       ],
    q(southwest pashai) => [
-      q(5613),
+      q(5614),
       q(0),
       ],
    q(southwest pashayi) => [
-      q(5613),
+      q(5614),
       q(1),
       ],
    q(southwest tanna) => [
-      q(5135),
+      q(5136),
       q(0),
       ],
    q(southwestern bontok) => [
-      q(6986),
+      q(6987),
       q(0),
       ],
    q(southwestern dinka) => [
-      q(2043),
+      q(2044),
       q(0),
       ],
    q(southwestern fars) => [
-      q(2336),
+      q(2337),
       q(0),
       ],
    q(southwestern guiyang hmong) => [
@@ -51506,39 +51554,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(southwestern nisu) => [
-      q(5083),
+      q(5084),
       q(0),
       ],
    q(southwestern tarahumara) => [
-      q(6805),
+      q(6806),
       q(0),
       ],
    q(southwestern tepehuan) => [
-      q(6565),
+      q(6566),
       q(0),
       ],
    q(southwestern tlaxiaco mixtec) => [
-      q(4207),
+      q(4208),
       q(0),
       ],
    q(sowa) => [
-      q(6318),
+      q(6319),
       q(0),
       ],
    q(sowanda) => [
-      q(6173),
+      q(6174),
       q(0),
       ],
    q(sowari) => [
-      q(2097),
+      q(2098),
       q(1),
       ],
    q(soyaltepec mazatec) => [
-      q(7030),
+      q(7031),
       q(0),
       ],
    q(soyaltepec mixtec) => [
-      q(7031),
+      q(7032),
       q(0),
       ],
    q(spanish) => [
@@ -51546,19 +51594,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(spanish sign language) => [
-      q(6243),
+      q(6244),
       q(0),
       ],
    q(spiti bhoti) => [
-      q(6192),
+      q(6193),
       q(0),
       ],
    q(spokane) => [
-      q(6187),
+      q(6188),
       q(0),
       ],
    q(squamish) => [
-      q(6207),
+      q(6208),
       q(0),
       ],
    q(sranan tongo) => [
@@ -51566,11 +51614,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sri lankan creole malay) => [
-      q(5932),
+      q(5933),
       q(0),
       ],
    q(sri lankan sign language) => [
-      q(6205),
+      q(6206),
       q(0),
       ],
    q(standard arabic) => [
@@ -51578,15 +51626,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(standard estonian) => [
-      q(2235),
+      q(2236),
       q(0),
       ],
    q(standard latvian) => [
-      q(4095),
+      q(4096),
       q(0),
       ],
    q(standard malay) => [
-      q(7948),
+      q(7950),
       q(0),
       ],
    q(standard moroccan tamazight) => [
@@ -51594,11 +51642,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(stellingwerfs) => [
-      q(6263),
+      q(6264),
       q(0),
       ],
    q(stod bhoti) => [
-      q(5921),
+      q(5922),
       q(0),
       ],
    q(stodsde) => [
@@ -51606,39 +51654,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(stoney) => [
-      q(6266),
+      q(6267),
       q(0),
       ],
    q(straits salish) => [
-      q(6269),
+      q(6270),
       q(0),
       ],
    q(suabo) => [
-      q(6354),
+      q(6355),
       q(0),
       ],
    q(suarmin) => [
-      q(5974),
+      q(5975),
       q(0),
       ],
    q(suau) => [
-      q(6311),
+      q(6312),
       q(0),
       ],
    q(suba) => [
-      q(6321),
+      q(6322),
       q(0),
       ],
    q(suba-simbiti) => [
-      q(6230),
+      q(6231),
       q(0),
       ],
    q(subiya) => [
-      q(5919),
+      q(5920),
       q(0),
       ],
    q(subtiaba) => [
-      q(6285),
+      q(6286),
       q(0),
       ],
    q(sudanese arabic) => [
@@ -51646,43 +51694,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sudanese creole arabic) => [
-      q(5425),
+      q(5426),
       q(0),
       ],
    q(sudest) => [
-      q(6484),
+      q(6485),
       q(0),
       ],
    q(sudovian) => [
-      q(7504),
+      q(7505),
       q(0),
       ],
    q(suena) => [
-      q(6279),
+      q(6280),
       q(0),
       ],
    q(suga) => [
-      q(5996),
+      q(5997),
       q(0),
       ],
    q(suganga) => [
-      q(6280),
+      q(6281),
       q(0),
       ],
    q(sugut dusun) => [
-      q(3784),
+      q(3785),
       q(0),
       ],
    q(sui) => [
-      q(6304),
+      q(6305),
       q(0),
       ],
    q(suki) => [
-      q(6281),
+      q(6282),
       q(0),
       ],
    q(suku) => [
-      q(6277),
+      q(6278),
       q(0),
       ],
    q(sukuma) => [
@@ -51690,43 +51738,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sukur) => [
-      q(6337),
+      q(6338),
       q(0),
       ],
    q(sukurum) => [
-      q(7950),
+      q(7952),
       q(0),
       ],
    q(sula) => [
-      q(6353),
+      q(6354),
       q(0),
       ],
    q(sulka) => [
-      q(6276),
+      q(6277),
       q(0),
       ],
    q(sulod) => [
-      q(6213),
+      q(6214),
       q(0),
       ],
    q(suma) => [
-      q(6200),
+      q(6201),
       q(0),
       ],
    q(sumariup) => [
-      q(6049),
+      q(6050),
       q(0),
       ],
    q(sumau) => [
-      q(6051),
+      q(6052),
       q(0),
       ],
    q(sumbawa) => [
-      q(6130),
+      q(6131),
       q(0),
       ],
    q(sumbwa) => [
-      q(6287),
+      q(6288),
       q(0),
       ],
    q(sumerian) => [
@@ -51734,15 +51782,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sumi naga) => [
-      q(5075),
+      q(5076),
       q(0),
       ],
    q(sumtu chin) => [
-      q(1883),
+      q(1884),
       q(0),
       ],
    q(sunam) => [
-      q(6238),
+      q(6239),
       q(0),
       ],
    q(sundanese) => [
@@ -51750,75 +51798,75 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(sunum) => [
-      q(7696),
+      q(7698),
       q(1),
       ],
    q(sunwar) => [
-      q(6289),
+      q(6290),
       q(0),
       ],
    q(suomenruotsalainen viittomakieli) => [
-      q(2378),
+      q(2379),
       q(2),
       ],
    q(suoy) => [
-      q(6341),
+      q(6342),
       q(0),
       ],
    q(supyire senoufo) => [
-      q(6188),
+      q(6189),
       q(0),
       ],
    q(sur) => [
-      q(6438),
+      q(6439),
       q(0),
       ],
    q(surayt) => [
-      q(6706),
+      q(6707),
       q(1),
       ],
    q(surbakhal) => [
-      q(5910),
+      q(5911),
       q(0),
       ],
    q(surgujia) => [
-      q(5997),
+      q(5998),
       q(0),
       ],
    q(suri) => [
-      q(6283),
+      q(6284),
       q(0),
       ],
    q(surigaonon) => [
-      q(5992),
+      q(5993),
       q(0),
       ],
    q(surjapuri) => [
-      q(6064),
+      q(6065),
       q(0),
       ],
    q(sursurunga) => [
-      q(6008),
+      q(6009),
       q(0),
       ],
    q(suruaha) => [
-      q(6319),
+      q(6320),
       q(0),
       ],
    q(surubu) => [
-      q(5945),
+      q(5946),
       q(0),
       ],
    q(surui) => [
-      q(6223),
+      q(6224),
       q(0),
       ],
    q(surui do para) => [
-      q(4200),
+      q(4201),
       q(0),
       ],
    q(susquehannock) => [
-      q(6201),
+      q(6202),
       q(0),
       ],
    q(susu) => [
@@ -51826,27 +51874,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(susuami) => [
-      q(6248),
+      q(6249),
       q(0),
       ],
    q(suundi) => [
-      q(5949),
+      q(5950),
       q(0),
       ],
    q(suwawa) => [
-      q(6316),
+      q(6317),
       q(0),
       ],
    q(suya) => [
-      q(6288),
+      q(6289),
       q(0),
       ],
    q(svan) => [
-      q(6290),
+      q(6291),
       q(0),
       ],
    q(swabian) => [
-      q(6302),
+      q(6303),
       q(0),
       ],
    q(swahili) => [
@@ -51854,7 +51902,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(swahili (individual language)) => [
-      q(6303),
+      q(6304),
       q(0),
       ],
    q(swahili (macrolanguage)) => [
@@ -51862,7 +51910,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(swampy cree) => [
-      q(1884),
+      q(1885),
       q(0),
       ],
    q(swati) => [
@@ -51874,7 +51922,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(swedish sign language) => [
-      q(6307),
+      q(6308),
       q(0),
       ],
    q(swiss german) => [
@@ -51882,27 +51930,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(swiss-french sign language) => [
-      q(6245),
+      q(6246),
       q(0),
       ],
    q(swiss-german sign language) => [
-      q(5994),
+      q(5995),
       q(0),
       ],
    q(swiss-italian sign language) => [
-      q(6097),
+      q(6098),
       q(0),
       ],
    q(swo) => [
-      q(6174),
+      q(6175),
       q(0),
       ],
    q(syenara senoufo) => [
-      q(6032),
+      q(6033),
       q(0),
       ],
    q(sylheti) => [
-      q(6338),
+      q(6339),
       q(0),
       ],
    q(syriac) => [
@@ -51910,7 +51958,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(t'en) => [
-      q(6421),
+      q(6422),
       q(0),
       ],
    q(ta'izzi-adeni arabic) => [
@@ -51918,95 +51966,95 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(taabwa) => [
-      q(6369),
+      q(6370),
       q(0),
       ],
    q(tabaa zapotec) => [
-      q(7820),
+      q(7822),
       q(0),
       ],
    q(tabaru) => [
-      q(6402),
+      q(6403),
       q(0),
       ],
    q(tabasco chontal) => [
-      q(1720),
+      q(1721),
       q(0),
       ],
    q(tabasco nahuatl) => [
-      q(4861),
+      q(4862),
       q(0),
       ],
    q(tabasco zoque) => [
-      q(7909),
+      q(7911),
       q(0),
       ],
    q(tabassaran) => [
-      q(6358),
+      q(6359),
       q(0),
       ],
    q(tabla) => [
-      q(6620),
+      q(6621),
       q(0),
       ],
    q(tabo) => [
-      q(3499),
+      q(3500),
       q(0),
       ],
    q(tabriak) => [
-      q(6850),
+      q(6851),
       q(0),
       ],
    q(tacahua mixtec) => [
-      q(7523),
+      q(7524),
       q(0),
       ],
    q(tacana) => [
-      q(6610),
+      q(6611),
       q(0),
       ],
    q(tachawit) => [
-      q(6031),
+      q(6032),
       q(0),
       ],
    q(tachelhit) => [
-      q(6016),
+      q(6017),
       q(0),
       ],
    q(tachoni) => [
-      q(4074),
+      q(4075),
       q(0),
       ],
    q(tadaksahak) => [
-      q(2154),
+      q(2155),
       q(0),
       ],
    q(tadyawan) => [
-      q(6448),
+      q(6449),
       q(0),
       ],
    q(tae') => [
-      q(5836),
+      q(5837),
       q(0),
       ],
    q(tafi) => [
-      q(6407),
+      q(6408),
       q(0),
       ],
    q(tagabawa) => [
-      q(1177),
+      q(1178),
       q(0),
       ],
    q(tagakaulo) => [
-      q(3434),
+      q(3435),
       q(0),
       ],
    q(tagal murut) => [
-      q(4619),
+      q(4620),
       q(0),
       ],
    q(tagalaka) => [
-      q(6495),
+      q(6496),
       q(0),
       ],
    q(tagalog) => [
@@ -52014,39 +52062,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tagargrent) => [
-      q(5333),
+      q(5334),
       q(0),
       ],
    q(tagbanwa) => [
-      q(6400),
+      q(6401),
       q(0),
       ],
    q(tagbu) => [
-      q(6391),
+      q(6392),
       q(0),
       ],
    q(tagdal) => [
-      q(6427),
+      q(6428),
       q(0),
       ],
    q(tagin) => [
-      q(6482),
+      q(6483),
       q(0),
       ],
    q(tagish) => [
-      q(6493),
+      q(6494),
       q(0),
       ],
    q(tagoi) => [
-      q(6363),
+      q(6364),
       q(0),
       ],
    q(tagwana senoufo) => [
-      q(6492),
+      q(6493),
       q(0),
       ],
    q(tahaggart tamahaq) => [
-      q(6512),
+      q(6513),
       q(0),
       ],
    q(tahitian) => [
@@ -52054,39 +52102,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tahltan) => [
-      q(6510),
+      q(6511),
       q(0),
       ],
    q(tai) => [
-      q(6375),
+      q(6376),
       q(0),
       ],
    q(tai daeng) => [
-      q(6837),
+      q(6838),
       q(0),
       ],
    q(tai dam) => [
-      q(1296),
+      q(1297),
       q(0),
       ],
    q(tai do) => [
-      q(6833),
+      q(6834),
       q(0),
       ],
    q(tai don) => [
-      q(6798),
+      q(6799),
       q(0),
       ],
    q(tai hang tong) => [
-      q(6496),
+      q(6497),
       q(0),
       ],
    q(tai hongjin) => [
-      q(6536),
+      q(6537),
       q(0),
       ],
    q(tai laing) => [
-      q(6540),
+      q(6541),
       q(0),
       ],
    q(tai languages) => [
@@ -52094,31 +52142,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tai loi) => [
-      q(6578),
+      q(6579),
       q(0),
       ],
    q(tai long) => [
-      q(6501),
+      q(6502),
       q(0),
       ],
    q(tai mene) => [
-      q(6600),
+      q(6601),
       q(0),
       ],
    q(tai nua) => [
-      q(6430),
+      q(6431),
       q(0),
       ],
    q(tai pao) => [
-      q(6665),
+      q(6666),
       q(0),
       ],
    q(tai thanh) => [
-      q(6597),
+      q(6598),
       q(0),
       ],
    q(tai ya) => [
-      q(1917),
+      q(1918),
       q(0),
       ],
    q(taiap) => [
@@ -52134,27 +52182,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(taino) => [
-      q(6624),
+      q(6625),
       q(0),
       ],
    q(tairaha) => [
-      q(1566),
+      q(1567),
       q(0),
       ],
    q(tairuma) => [
-      q(6853),
+      q(6854),
       q(0),
       ],
    q(taita) => [
-      q(1951),
+      q(1952),
       q(0),
       ],
    q(taiwan sign language) => [
-      q(6726),
+      q(6727),
       q(0),
       ],
    q(taje) => [
-      q(5406),
+      q(5407),
       q(0),
       ],
    q(tajik) => [
@@ -52166,115 +52214,115 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tajio) => [
-      q(6436),
+      q(6437),
       q(0),
       ],
    q(tajuasohn) => [
-      q(6537),
+      q(6538),
       q(0),
       ],
    q(takelma) => [
-      q(6553),
+      q(6554),
       q(0),
       ],
    q(takestani) => [
-      q(6558),
+      q(6559),
       q(0),
       ],
    q(takia) => [
-      q(6381),
+      q(6382),
       q(0),
       ],
    q(takua) => [
-      q(6564),
+      q(6565),
       q(0),
       ],
    q(takuu) => [
-      q(4871),
+      q(4872),
       q(0),
       ],
    q(takwane) => [
-      q(6550),
+      q(6551),
       q(0),
       ],
    q(tal) => [
-      q(6366),
+      q(6367),
       q(0),
       ],
    q(tala) => [
-      q(6365),
+      q(6366),
       q(0),
       ],
    q(talaandig) => [
-      q(1256),
+      q(1257),
       q(1),
       ],
    q(talaud) => [
-      q(6568),
+      q(6569),
       q(0),
       ],
    q(taliabu) => [
-      q(6583),
+      q(6584),
       q(0),
       ],
    q(talieng) => [
-      q(6432),
+      q(6433),
       q(0),
       ],
    q(talinga-bwisi) => [
-      q(6571),
+      q(6572),
       q(0),
       ],
    q(talise) => [
-      q(6579),
+      q(6580),
       q(0),
       ],
    q(talodi) => [
-      q(6576),
+      q(6577),
       q(0),
       ],
    q(taloki) => [
-      q(6572),
+      q(6573),
       q(0),
       ],
    q(talondo') => [
-      q(6575),
+      q(6576),
       q(0),
       ],
    q(talossan) => [
-      q(6846),
+      q(6847),
       q(0),
       ],
    q(talu) => [
-      q(7755),
+      q(7757),
       q(0),
       ],
    q(talysh) => [
-      q(6585),
+      q(6586),
       q(0),
       ],
    q(tama (chad)) => [
-      q(6586),
+      q(6587),
       q(0),
       ],
    q(tama (colombia)) => [
-      q(6459),
+      q(6460),
       q(0),
       ],
    q(tamagario) => [
-      q(6410),
+      q(6411),
       q(0),
       ],
    q(taman (indonesia)) => [
-      q(6598),
+      q(6599),
       q(0),
       ],
    q(taman (myanmar)) => [
-      q(6414),
+      q(6415),
       q(0),
       ],
    q(tamanaku) => [
-      q(6609),
+      q(6610),
       q(0),
       ],
    q(tamashek) => [
@@ -52282,31 +52330,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tamasheq) => [
-      q(6370),
+      q(6371),
       q(0),
       ],
    q(tamazola mixtec) => [
-      q(7037),
+      q(7038),
       q(0),
       ],
    q(tambas) => [
-      q(6437),
+      q(6438),
       q(0),
       ],
    q(tambora) => [
-      q(7563),
+      q(7564),
       q(0),
       ],
    q(tambotalo) => [
-      q(6580),
+      q(6581),
       q(0),
       ],
    q(tambunan dusun) => [
-      q(3785),
+      q(3786),
       q(0),
       ],
    q(tami) => [
-      q(6608),
+      q(6609),
       q(0),
       ],
    q(tamil) => [
@@ -52314,127 +52362,127 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tamki) => [
-      q(6376),
+      q(6377),
       q(0),
       ],
    q(tamnim citak) => [
-      q(6596),
+      q(6597),
       q(0),
       ],
    q(tampias lobu) => [
-      q(4033),
+      q(4034),
       q(0),
       ],
    q(tampuan) => [
-      q(6670),
+      q(6671),
       q(0),
       ],
    q(tampulma) => [
-      q(6663),
+      q(6664),
       q(0),
       ],
    q(tanacross) => [
-      q(6405),
+      q(6406),
       q(0),
       ],
    q(tanahmerah) => [
-      q(6415),
+      q(6416),
       q(0),
       ],
    q(tanaina) => [
-      q(6470),
+      q(6471),
       q(0),
       ],
    q(tanapag) => [
-      q(6671),
+      q(6672),
       q(0),
       ],
    q(tandaganon) => [
-      q(6483),
+      q(6484),
       q(0),
       ],
    q(tandia) => [
-      q(6617),
+      q(6618),
       q(0),
       ],
    q(tandroy-mahafaly malagasy) => [
-      q(6447),
+      q(6448),
       q(0),
       ],
    q(tanema) => [
-      q(6631),
+      q(6632),
       q(0),
       ],
    q(tangale) => [
-      q(6367),
+      q(6368),
       q(0),
       ],
    q(tangchangya) => [
-      q(6629),
+      q(6630),
       q(0),
       ],
    q(tanggu) => [
-      q(6490),
+      q(6491),
       q(0),
       ],
    q(tangkhul naga (india)) => [
-      q(4966),
+      q(4967),
       q(0),
       ],
    q(tangkhul naga (myanmar)) => [
-      q(5100),
+      q(5101),
       q(0),
       ],
    q(tangko) => [
-      q(6563),
+      q(6564),
       q(0),
       ],
    q(tanglang) => [
-      q(7756),
+      q(7758),
       q(0),
       ],
    q(tangoa) => [
-      q(6485),
+      q(6486),
       q(0),
       ],
    q(tanguat) => [
-      q(6396),
+      q(6397),
       q(0),
       ],
    q(tangut) => [
-      q(6815),
+      q(6816),
       q(0),
       ],
    q(tanimbili) => [
-      q(6383),
+      q(6384),
       q(0),
       ],
    q(tanimuca-retuara) => [
-      q(6612),
+      q(6613),
       q(0),
       ],
    q(tanjijili) => [
-      q(6878),
+      q(6879),
       q(0),
       ],
    q(tankarana malagasy) => [
-      q(7426),
+      q(7427),
       q(1),
       ],
    q(tanosy malagasy) => [
-      q(6828),
+      q(6829),
       q(0),
       ],
    q(tanudan kalinga) => [
-      q(3464),
+      q(3465),
       q(0),
       ],
    q(tanzanian sign language) => [
-      q(6843),
+      q(6844),
       q(0),
       ],
    q(tapeba) => [
-      q(6380),
+      q(6381),
       q(0),
       ],
    q(tapei) => [
@@ -52442,71 +52490,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tapiete) => [
-      q(6660),
+      q(6661),
       q(0),
       ],
    q(tapirape) => [
-      q(6362),
+      q(6363),
       q(0),
       ],
    q(tarao naga) => [
-      q(6700),
+      q(6701),
       q(0),
       ],
    q(tareng) => [
-      q(6487),
+      q(6488),
       q(0),
       ],
    q(tariana) => [
-      q(6361),
+      q(6362),
       q(0),
       ],
    q(tarifit) => [
-      q(5787),
+      q(5788),
       q(0),
       ],
    q(tarjumo) => [
-      q(6818),
+      q(6819),
       q(0),
       ],
    q(tarok) => [
-      q(7626),
+      q(7627),
       q(0),
       ],
    q(taroko) => [
-      q(6707),
+      q(6708),
       q(0),
       ],
    q(tarpia) => [
-      q(6658),
+      q(6659),
       q(0),
       ],
    q(tartessian) => [
-      q(6823),
+      q(6824),
       q(0),
       ],
    q(tasawaq) => [
-      q(6804),
+      q(6805),
       q(0),
       ],
    q(tase naga) => [
-      q(5081),
+      q(5082),
       q(0),
       ],
    q(tasmanian) => [
-      q(7528),
+      q(7529),
       q(0),
       ],
    q(tasmate) => [
-      q(6604),
+      q(6605),
       q(0),
       ],
    q(tataltepec chatino) => [
-      q(1887),
+      q(1888),
       q(0),
       ],
    q(tatana) => [
-      q(6827),
+      q(6828),
       q(0),
       ],
    q(tatar) => [
@@ -52514,115 +52562,115 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tatuyo) => [
-      q(6374),
+      q(6375),
       q(0),
       ],
    q(tauade) => [
-      q(6737),
+      q(6738),
       q(0),
       ],
    q(taulil) => [
-      q(6766),
+      q(6767),
       q(0),
       ],
    q(taungyo) => [
-      q(6417),
+      q(6418),
       q(0),
       ],
    q(taupota) => [
-      q(6655),
+      q(6656),
       q(0),
       ],
    q(tause) => [
-      q(6360),
+      q(6361),
       q(0),
       ],
    q(taushiro) => [
-      q(6703),
+      q(6704),
       q(0),
       ],
    q(tausug) => [
-      q(6717),
+      q(6718),
       q(0),
       ],
    q(tauya) => [
-      q(6829),
+      q(6830),
       q(0),
       ],
    q(taveta) => [
-      q(6786),
+      q(6787),
       q(0),
       ],
    q(tavoyan) => [
-      q(6784),
+      q(6785),
       q(0),
       ],
    q(tavringer romani) => [
-      q(5822),
+      q(5823),
       q(0),
       ],
    q(tawala) => [
-      q(6393),
+      q(6394),
       q(0),
       ],
    q(tawallammat tamajaq) => [
-      q(6750),
+      q(6751),
       q(0),
       ],
    q(tawande) => [
-      q(7526),
+      q(7527),
       q(0),
       ],
    q(tawang monpa) => [
-      q(6800),
+      q(6801),
       q(0),
       ],
    q(tawara) => [
-      q(6799),
+      q(6800),
       q(0),
       ],
    q(taworta) => [
-      q(6394),
+      q(6395),
       q(0),
       ],
    q(tawoyan) => [
-      q(6810),
+      q(6811),
       q(0),
       ],
    q(tawr chin) => [
-      q(6418),
+      q(6419),
       q(0),
       ],
    q(tay) => [
-      q(6842),
+      q(6843),
       q(0),
       ],
    q(tay boi) => [
-      q(6372),
+      q(6373),
       q(0),
       ],
    q(tay khang) => [
-      q(6628),
+      q(6629),
       q(0),
       ],
    q(tay sa pa) => [
-      q(6838),
+      q(6839),
       q(0),
       ],
    q(tay tac) => [
-      q(6839),
+      q(6840),
       q(0),
       ],
    q(tayabas ayta) => [
-      q(1009),
+      q(1010),
       q(0),
       ],
    q(tayart tamajeq) => [
-      q(6515),
+      q(6516),
       q(0),
       ],
    q(tayo) => [
-      q(1761),
+      q(1762),
       q(0),
       ],
    q(taznatit) => [
@@ -52630,79 +52678,79 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tboli) => [
-      q(6390),
+      q(6391),
       q(0),
       ],
    q(tchitchege) => [
-      q(6413),
+      q(6414),
       q(0),
       ],
    q(tchumbuli) => [
-      q(1397),
+      q(1398),
       q(0),
       ],
    q(te'un) => [
-      q(6781),
+      q(6782),
       q(0),
       ],
    q(teanu) => [
-      q(6562),
+      q(6563),
       q(0),
       ],
    q(tebi) => [
-      q(2093),
+      q(2094),
       q(1),
       ],
    q(tebul sign language) => [
-      q(6732),
+      q(6733),
       q(0),
       ],
    q(tebul ure dogon) => [
-      q(2167),
+      q(2168),
       q(0),
       ],
    q(tecpatlan totonac) => [
-      q(6423),
+      q(6424),
       q(0),
       ],
    q(tedaga) => [
-      q(6772),
+      q(6773),
       q(0),
       ],
    q(tedim chin) => [
-      q(1889),
+      q(1890),
       q(0),
       ],
    q(tee) => [
-      q(6556),
+      q(6557),
       q(0),
       ],
    q(teen) => [
-      q(4028),
+      q(4029),
       q(0),
       ],
    q(tefaro) => [
-      q(6471),
+      q(6472),
       q(0),
       ],
    q(tegali) => [
-      q(5749),
+      q(5750),
       q(0),
       ],
    q(tehit) => [
-      q(3539),
+      q(3540),
       q(0),
       ],
    q(tehuelche) => [
-      q(6456),
+      q(6457),
       q(0),
       ],
    q(tejalapan zapotec) => [
-      q(7959),
+      q(7961),
       q(0),
       ],
    q(teke-ebo) => [
-      q(2214),
+      q(2215),
       q(0),
       ],
    q(teke-fuumu) => [
@@ -52710,39 +52758,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(teke-kukuya) => [
-      q(3424),
+      q(3425),
       q(0),
       ],
    q(teke-laali) => [
-      q(3963),
+      q(3964),
       q(0),
       ],
    q(teke-nzikou) => [
-      q(5181),
+      q(5182),
       q(0),
       ],
    q(teke-tege) => [
-      q(6455),
+      q(6456),
       q(0),
       ],
    q(teke-tsaayi) => [
-      q(6832),
+      q(6833),
       q(0),
       ],
    q(teke-tyee) => [
-      q(6841),
+      q(6842),
       q(0),
       ],
    q(tektiteko) => [
-      q(6736),
+      q(6737),
       q(0),
       ],
    q(tela-masbuar) => [
-      q(6783),
+      q(6784),
       q(0),
       ],
    q(telefol) => [
-      q(6569),
+      q(6570),
       q(0),
       ],
    q(telugu) => [
@@ -52750,147 +52798,147 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(teluti) => [
-      q(6581),
+      q(6582),
       q(0),
       ],
    q(tem) => [
-      q(3240),
+      q(3241),
       q(0),
       ],
    q(temacine tamazight) => [
-      q(6543),
+      q(6544),
       q(0),
       ],
    q(temascaltepec nahuatl) => [
-      q(4877),
+      q(4878),
       q(0),
       ],
    q(tembe) => [
-      q(6676),
+      q(6677),
       q(0),
       ],
    q(tembo (kitembo)) => [
-      q(6397),
+      q(6398),
       q(0),
       ],
    q(tembo (motembo)) => [
-      q(6606),
+      q(6607),
       q(0),
       ],
    q(teme) => [
-      q(6440),
+      q(6441),
       q(0),
       ],
    q(temein) => [
-      q(6462),
+      q(6463),
       q(0),
       ],
    q(temi) => [
-      q(6176),
+      q(6177),
       q(0),
       ],
    q(temiar) => [
-      q(6449),
+      q(6450),
       q(0),
       ],
    q(temoaya otomi) => [
-      q(5327),
+      q(5328),
       q(0),
       ],
    q(temoq) => [
-      q(6599),
+      q(6600),
       q(0),
       ],
    q(tempasuk dusun) => [
-      q(6445),
+      q(6446),
       q(0),
       ],
    q(temuan) => [
-      q(6607),
+      q(6608),
       q(0),
       ],
    q(tena) => [
-      q(1139),
+      q(1140),
       q(1),
       ],
    q(tena lowland quichua) => [
-      q(5695),
+      q(5696),
       q(0),
       ],
    q(tenango otomi) => [
-      q(5323),
+      q(5324),
       q(0),
       ],
    q(tene kan dogon) => [
-      q(2160),
+      q(2161),
       q(0),
       ],
    q(tenggarong kutai malay) => [
-      q(7013),
+      q(7014),
       q(0),
       ],
    q(tengger) => [
-      q(6463),
+      q(6464),
       q(0),
       ],
    q(tenharim) => [
-      q(5350),
+      q(5351),
       q(0),
       ],
    q(tenino) => [
-      q(6679),
+      q(6680),
       q(0),
       ],
    q(tenis) => [
-      q(6626),
+      q(6627),
       q(0),
       ],
    q(tennet) => [
-      q(6467),
+      q(6468),
       q(0),
       ],
    q(teop) => [
-      q(6527),
+      q(6528),
       q(0),
       ],
    q(teor) => [
-      q(6465),
+      q(6466),
       q(0),
       ],
    q(tepecano) => [
-      q(6461),
+      q(6462),
       q(0),
       ],
    q(tepetotutla chinantec) => [
-      q(1804),
+      q(1805),
       q(0),
       ],
    q(tepeuxila cuicatec) => [
-      q(1920),
+      q(1921),
       q(0),
       ],
    q(tepinapa chinantec) => [
-      q(1890),
+      q(1891),
       q(0),
       ],
    q(tepo krumen) => [
-      q(6452),
+      q(6453),
       q(0),
       ],
    q(ter sami) => [
-      q(6067),
+      q(6068),
       q(0),
       ],
    q(tera) => [
-      q(6751),
+      q(6752),
       q(0),
       ],
    q(terebu) => [
-      q(6688),
+      q(6689),
       q(0),
       ],
    q(terei) => [
-      q(1505),
+      q(1506),
       q(0),
       ],
    q(tereno) => [
@@ -52898,59 +52946,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(teressa) => [
-      q(6454),
+      q(6455),
       q(0),
       ],
    q(tereweng) => [
-      q(6797),
+      q(6798),
       q(0),
       ],
    q(teribe) => [
-      q(6472),
+      q(6473),
       q(0),
       ],
    q(terik) => [
-      q(6451),
+      q(6452),
       q(0),
       ],
    q(termanu) => [
-      q(6807),
+      q(6808),
       q(0),
       ],
    q(ternate) => [
-      q(6473),
+      q(6474),
       q(0),
       ],
    q(ternateno) => [
-      q(6592),
+      q(6593),
       q(0),
       ],
    q(tesaka malagasy) => [
-      q(6552),
+      q(6553),
       q(0),
       ],
    q(tese) => [
-      q(3262),
+      q(3263),
       q(0),
       ],
    q(teshenawa) => [
-      q(6793),
+      q(6794),
       q(0),
       ],
    q(teso) => [
-      q(6460),
+      q(6461),
       q(0),
       ],
    q(tetela) => [
-      q(6573),
+      q(6574),
       q(0),
       ],
    q(tetelcingo nahuatl) => [
-      q(4865),
+      q(4866),
       q(0),
       ],
    q(tetete) => [
-      q(6450),
+      q(6451),
       q(0),
       ],
    q(tetum) => [
@@ -52958,51 +53006,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tetun dili) => [
-      q(6444),
+      q(6445),
       q(0),
       ],
    q(teutila cuicatec) => [
-      q(1916),
+      q(1917),
       q(0),
       ],
    q(tewa (indonesia)) => [
-      q(6795),
+      q(6796),
       q(0),
       ],
    q(tewa (usa)) => [
-      q(6466),
+      q(6467),
       q(0),
       ],
    q(tewe) => [
-      q(6809),
+      q(6810),
       q(0),
       ],
    q(texcatepec otomi) => [
-      q(5330),
+      q(5331),
       q(0),
       ],
    q(texistepec popoluca) => [
-      q(5564),
+      q(5565),
       q(0),
       ],
    q(texmelucan zapotec) => [
-      q(7937),
+      q(7939),
       q(0),
       ],
    q(tezoatlan mixtec) => [
-      q(4647),
+      q(4648),
       q(0),
       ],
    q(tha) => [
-      q(6514),
+      q(6515),
       q(0),
       ],
    q(thachanadan) => [
-      q(6505),
+      q(6506),
       q(0),
       ],
    q(thado chin) => [
-      q(6426),
+      q(6427),
       q(0),
       ],
    q(thai) => [
@@ -53010,47 +53058,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(thai sign language) => [
-      q(6724),
+      q(6725),
       q(0),
       ],
    q(thai song) => [
-      q(6156),
+      q(6157),
       q(0),
       ],
    q(thaiphum chin) => [
-      q(1892),
+      q(1893),
       q(0),
       ],
    q(thakali) => [
-      q(6509),
+      q(6510),
       q(0),
       ],
    q(thangal naga) => [
-      q(4929),
+      q(4930),
       q(0),
       ],
    q(thangmi) => [
-      q(6499),
+      q(6500),
       q(0),
       ],
    q(thao) => [
-      q(6233),
+      q(6234),
       q(0),
       ],
    q(tharaka) => [
-      q(6502),
+      q(6503),
       q(0),
       ],
    q(thawa) => [
-      q(7525),
+      q(7526),
       q(0),
       ],
    q(thayore) => [
-      q(6497),
+      q(6498),
       q(0),
       ],
    q(thaypan) => [
-      q(6836),
+      q(6837),
       q(0),
       ],
    q(thiin) => [
@@ -53058,39 +53106,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tho) => [
-      q(6649),
+      q(6650),
       q(0),
       ],
    q(thompson) => [
-      q(6506),
+      q(6507),
       q(0),
       ],
    q(thopho) => [
-      q(7757),
+      q(7759),
       q(0),
       ],
    q(thracian) => [
-      q(6816),
+      q(6817),
       q(0),
       ],
    q(thu lao) => [
-      q(6834),
+      q(6835),
       q(0),
       ],
    q(thudam) => [
-      q(6513),
+      q(6514),
       q(0),
       ],
    q(thulung) => [
-      q(6434),
+      q(6435),
       q(0),
       ],
    q(thurawal) => [
-      q(6386),
+      q(6387),
       q(0),
       ],
    q(thuri) => [
-      q(6511),
+      q(6512),
       q(0),
       ],
    q(tiagbamrin aizi) => [
@@ -53098,15 +53146,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tiale) => [
-      q(4423),
+      q(4424),
       q(0),
       ],
    q(tiang) => [
-      q(6388),
+      q(6389),
       q(0),
       ],
    q(tibea) => [
-      q(4857),
+      q(4858),
       q(0),
       ],
    q(tibetan) => [
@@ -53118,55 +53166,55 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tichurong) => [
-      q(6416),
+      q(6417),
       q(0),
       ],
    q(ticuna) => [
-      q(6404),
+      q(6405),
       q(0),
       ],
    q(tidaa mixtec) => [
-      q(4577),
+      q(4578),
       q(0),
       ],
    q(tidikelt tamazight) => [
-      q(6516),
+      q(6517),
       q(0),
       ],
    q(tidong) => [
-      q(6518),
+      q(6519),
       q(0),
       ],
    q(tidore) => [
-      q(6785),
+      q(6786),
       q(0),
       ],
    q(tiefo) => [
-      q(6529),
+      q(6530),
       q(0),
       ],
    q(tiemacewe bozo) => [
-      q(1363),
+      q(1364),
       q(0),
       ],
    q(tiene) => [
-      q(6521),
+      q(6522),
       q(0),
       ],
    q(tieyaxo bozo) => [
-      q(1373),
+      q(1374),
       q(0),
       ],
    q(tifal) => [
-      q(6519),
+      q(6520),
       q(0),
       ],
    q(tigak) => [
-      q(6476),
+      q(6477),
       q(0),
       ],
    q(tigon mbembe) => [
-      q(5176),
+      q(5177),
       q(0),
       ],
    q(tigre) => [
@@ -53178,47 +53226,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tii) => [
-      q(6822),
+      q(6823),
       q(0),
       ],
    q(tijaltepec mixtec) => [
-      q(7515),
+      q(7516),
       q(0),
       ],
    q(tikar) => [
-      q(6523),
+      q(6524),
       q(0),
       ],
    q(tikopia) => [
-      q(6555),
+      q(6556),
       q(0),
       ],
    q(tilapa otomi) => [
-      q(5321),
+      q(5322),
       q(0),
       ],
    q(tillamook) => [
-      q(6524),
+      q(6525),
       q(0),
       ],
    q(tilquiapan zapotec) => [
-      q(7958),
+      q(7960),
       q(0),
       ],
    q(tilung) => [
-      q(6522),
+      q(6523),
       q(0),
       ],
    q(tima) => [
-      q(6603),
+      q(6604),
       q(0),
       ],
    q(timbe) => [
-      q(6525),
+      q(6526),
       q(0),
       ],
    q(timbisha) => [
-      q(5355),
+      q(5356),
       q(1),
       ],
    q(timne) => [
@@ -53226,71 +53274,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(timor pidgin) => [
-      q(6790),
+      q(6791),
       q(0),
       ],
    q(timucua) => [
-      q(6541),
+      q(6542),
       q(0),
       ],
    q(timugon murut) => [
-      q(6520),
+      q(6521),
       q(0),
       ],
    q(tinani) => [
-      q(3816),
+      q(3817),
       q(0),
       ],
    q(tindi) => [
-      q(6526),
+      q(6527),
       q(0),
       ],
    q(tingui-boto) => [
-      q(6491),
+      q(6492),
       q(0),
       ],
    q(tinigua) => [
-      q(6531),
+      q(6532),
       q(0),
       ],
    q(tinoc kallahan) => [
-      q(6614),
+      q(6615),
       q(0),
       ],
    q(tinputz) => [
-      q(6675),
+      q(6676),
       q(0),
       ],
    q(tippera) => [
-      q(6657),
+      q(6658),
       q(0),
       ],
    q(tira) => [
-      q(6517),
+      q(6518),
       q(0),
       ],
    q(tirahi) => [
-      q(6687),
+      q(6688),
       q(0),
       ],
    q(tiranige diga dogon) => [
-      q(6431),
+      q(6432),
       q(0),
       ],
    q(tiri) => [
-      q(1739),
+      q(1740),
       q(0),
       ],
    q(tiruray) => [
-      q(6535),
+      q(6536),
       q(0),
       ],
    q(tita) => [
-      q(6441),
+      q(6442),
       q(0),
       ],
    q(titan) => [
-      q(6755),
+      q(6756),
       q(0),
       ],
    q(tiv) => [
@@ -53298,47 +53346,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tiwa) => [
-      q(3809),
+      q(3810),
       q(0),
       ],
    q(tiwi) => [
-      q(6533),
+      q(6534),
       q(0),
       ],
    q(tjurruru) => [
-      q(6545),
+      q(6546),
       q(0),
       ],
    q(tlachichilco tepehua) => [
-      q(6669),
+      q(6670),
       q(0),
       ],
    q(tlacoapa me'phaa) => [
-      q(6662),
+      q(6663),
       q(0),
       ],
    q(tlacoapa tlapanec) => [
-      q(6662),
+      q(6663),
       q(1),
       ],
    q(tlacoatzintepec chinantec) => [
-      q(1893),
+      q(1894),
       q(0),
       ],
    q(tlacolulita zapotec) => [
-      q(7922),
+      q(7924),
       q(0),
       ],
    q(tlahuitoltepec mixe) => [
-      q(4661),
+      q(4662),
       q(0),
       ],
    q(tlamacazapa nahuatl) => [
-      q(5127),
+      q(5128),
       q(0),
       ],
    q(tlazoyaltepec mixtec) => [
-      q(4486),
+      q(4487),
       q(0),
       ],
    q(tlhingan-hol) => [
@@ -53350,51 +53398,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(to) => [
-      q(6654),
+      q(6655),
       q(0),
       ],
    q(to'abaita) => [
-      q(4384),
+      q(4385),
       q(0),
       ],
    q(toaripi) => [
-      q(6680),
+      q(6681),
       q(0),
       ],
    q(toba) => [
-      q(6634),
+      q(6635),
       q(0),
       ],
    q(toba-maskoy) => [
-      q(6591),
+      q(6592),
       q(0),
       ],
    q(tobagonian creole english) => [
-      q(6480),
+      q(6481),
       q(0),
       ],
    q(tobanga) => [
-      q(6615),
+      q(6616),
       q(0),
       ],
    q(tobati) => [
-      q(6742),
+      q(6743),
       q(0),
       ],
    q(tobelo) => [
-      q(6566),
+      q(6567),
       q(0),
       ],
    q(tobian) => [
-      q(6652),
+      q(6653),
       q(0),
       ],
    q(tobilung) => [
-      q(6475),
+      q(6476),
       q(0),
       ],
    q(tobo) => [
-      q(6399),
+      q(6400),
       q(0),
       ],
    q(tocantins asurini) => [
@@ -53402,39 +53450,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tocho) => [
-      q(6378),
+      q(6379),
       q(0),
       ],
    q(toda) => [
-      q(6424),
+      q(6425),
       q(0),
       ],
    q(todrah) => [
-      q(6442),
+      q(6443),
       q(0),
       ],
    q(tofanma) => [
-      q(6570),
+      q(6571),
       q(0),
       ],
    q(tofin gbe) => [
-      q(6469),
+      q(6470),
       q(0),
       ],
    q(togbo-vara banda) => [
-      q(6647),
+      q(6648),
       q(0),
       ],
    q(togoyo) => [
-      q(6494),
+      q(6495),
       q(0),
       ],
    q(tohono o'odham) => [
-      q(5282),
+      q(5283),
       q(0),
       ],
    q(tojolabal) => [
-      q(6641),
+      q(6642),
       q(0),
       ],
    q(tok pisin) => [
@@ -53442,7 +53490,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tokano) => [
-      q(7964),
+      q(7966),
       q(0),
       ],
    q(tokelau) => [
@@ -53450,15 +53498,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tokharian a) => [
-      q(7518),
+      q(7519),
       q(0),
       ],
    q(tokharian b) => [
-      q(6812),
+      q(6813),
       q(0),
       ],
    q(toku-no-shima) => [
-      q(6554),
+      q(6555),
       q(0),
       ],
    q(tol) => [
@@ -53466,63 +53514,63 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tolaki) => [
-      q(3831),
+      q(3832),
       q(0),
       ],
    q(tolomako) => [
-      q(6574),
+      q(6575),
       q(0),
       ],
    q(tolowa) => [
-      q(6642),
+      q(6643),
       q(0),
       ],
    q(toma) => [
-      q(6636),
+      q(6637),
       q(0),
       ],
    q(tomadino) => [
-      q(6435),
+      q(6436),
       q(0),
       ],
    q(tombelala) => [
-      q(6749),
+      q(6750),
       q(0),
       ],
    q(tombonuo) => [
-      q(6811),
+      q(6812),
       q(0),
       ],
    q(tombulu) => [
-      q(6643),
+      q(6644),
       q(0),
       ],
    q(tomedes) => [
-      q(6637),
+      q(6638),
       q(0),
       ],
    q(tomini) => [
-      q(6819),
+      q(6820),
       q(0),
       ],
    q(tommo so dogon) => [
-      q(2162),
+      q(2163),
       q(0),
       ],
    q(tomo kan dogon) => [
-      q(2161),
+      q(2162),
       q(0),
       ],
    q(tomoip) => [
-      q(6681),
+      q(6682),
       q(0),
       ],
    q(tondano) => [
-      q(6439),
+      q(6440),
       q(0),
       ],
    q(tondi songway kiini) => [
-      q(6727),
+      q(6728),
       q(0),
       ],
    q(tonga) => [
@@ -53534,7 +53582,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tonga (thailand)) => [
-      q(6633),
+      q(6634),
       q(0),
       ],
    q(tonga (tonga islands)) => [
@@ -53542,95 +53590,95 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tonga (zambia)) => [
-      q(6640),
+      q(6641),
       q(0),
       ],
    q(tongwe) => [
-      q(6632),
+      q(6633),
       q(0),
       ],
    q(tonjon) => [
-      q(6542),
+      q(6543),
       q(0),
       ],
    q(tonkawa) => [
-      q(6686),
+      q(6687),
       q(0),
       ],
    q(tonsawang) => [
-      q(6630),
+      q(6631),
       q(0),
       ],
    q(tonsea) => [
-      q(6824),
+      q(6825),
       q(0),
       ],
    q(tontemboan) => [
-      q(6627),
+      q(6628),
       q(0),
       ],
    q(tooro) => [
-      q(6743),
+      q(6744),
       q(0),
       ],
    q(topoiyo) => [
-      q(6653),
+      q(6654),
       q(0),
       ],
    q(toposa) => [
-      q(6646),
+      q(6647),
       q(0),
       ],
    q(tora) => [
-      q(6711),
+      q(6712),
       q(0),
       ],
    q(toraja-sa'dan) => [
-      q(5942),
+      q(5943),
       q(0),
       ],
    q(toram) => [
-      q(6696),
+      q(6697),
       q(0),
       ],
    q(torau) => [
-      q(6754),
+      q(6755),
       q(0),
       ],
    q(tornedalen finnish) => [
-      q(2348),
+      q(2349),
       q(0),
       ],
    q(toro) => [
-      q(6446),
+      q(6447),
       q(0),
       ],
    q(toro so dogon) => [
-      q(2165),
+      q(2166),
       q(0),
       ],
    q(toro tegu dogon) => [
-      q(2166),
+      q(2167),
       q(0),
       ],
    q(toromono) => [
-      q(6622),
+      q(6623),
       q(0),
       ],
    q(torona) => [
-      q(6683),
+      q(6684),
       q(0),
       ],
    q(torres strait creole) => [
-      q(6420),
+      q(6421),
       q(0),
       ],
    q(torricelli) => [
-      q(6457),
+      q(6458),
       q(0),
       ],
    q(torwali) => [
-      q(6708),
+      q(6709),
       q(0),
       ],
    q(tosk albanian) => [
@@ -53638,43 +53686,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(totela) => [
-      q(6745),
+      q(6746),
       q(0),
       ],
    q(toto) => [
-      q(6821),
+      q(6822),
       q(0),
       ],
    q(totoli) => [
-      q(6814),
+      q(6815),
       q(0),
       ],
    q(totomachapan zapotec) => [
-      q(7919),
+      q(7921),
       q(0),
       ],
    q(totontepec mixe) => [
-      q(4568),
+      q(4569),
       q(0),
       ],
    q(totoro) => [
-      q(6744),
+      q(6745),
       q(0),
       ],
    q(touo) => [
-      q(6685),
+      q(6686),
       q(0),
       ],
    q(toura (cote d'ivoire)) => [
-      q(4807),
+      q(4808),
       q(0),
       ],
    q(toura (papua new guinea)) => [
-      q(2120),
+      q(2121),
       q(0),
       ],
    q(towei) => [
-      q(6747),
+      q(6748),
       q(0),
       ],
    q(trans-new guinea languages) => [
@@ -53682,91 +53730,91 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(transalpine gaulish) => [
-      q(7511),
+      q(7512),
       q(0),
       ],
    q(traveller danish) => [
-      q(5807),
+      q(5808),
       q(0),
       ],
    q(traveller norwegian) => [
-      q(5810),
+      q(5811),
       q(0),
       ],
    q(traveller scottish) => [
-      q(6697),
+      q(6698),
       q(0),
       ],
    q(tregami) => [
-      q(6698),
+      q(6699),
       q(0),
       ],
    q(tremembe) => [
-      q(6590),
+      q(6591),
       q(0),
       ],
    q(trieng) => [
-      q(6258),
+      q(6259),
       q(0),
       ],
    q(trimuris) => [
-      q(6528),
+      q(6529),
       q(0),
       ],
    q(tring) => [
-      q(6486),
+      q(6487),
       q(0),
       ],
    q(tringgus-sembaan bidayuh) => [
-      q(6709),
+      q(6710),
       q(0),
       ],
    q(trinidad and tobago sign language) => [
-      q(4067),
+      q(4068),
       q(0),
       ],
    q(trinidadian creole english) => [
-      q(6692),
+      q(6693),
       q(0),
       ],
    q(trinitario) => [
-      q(6699),
+      q(6700),
       q(0),
       ],
    q(trio) => [
-      q(6695),
+      q(6696),
       q(0),
       ],
    q(truka) => [
-      q(6547),
+      q(6548),
       q(0),
       ],
    q(trumai) => [
-      q(6674),
+      q(6675),
       q(0),
       ],
    q(ts'un-lao) => [
-      q(6721),
+      q(6722),
       q(0),
       ],
    q(tsaangi) => [
-      q(6712),
+      q(6713),
       q(0),
       ],
    q(tsakhur) => [
-      q(6557),
+      q(6558),
       q(0),
       ],
    q(tsakonian) => [
-      q(6715),
+      q(6716),
       q(0),
       ],
    q(tsakwambo) => [
-      q(3691),
+      q(3692),
       q(0),
       ],
    q(tsamai) => [
-      q(6713),
+      q(6714),
       q(0),
       ],
    q(tsat) => [
@@ -53774,31 +53822,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tsaukambo) => [
-      q(3691),
+      q(3692),
       q(1),
       ],
    q(tseku) => [
-      q(6720),
+      q(6721),
       q(0),
       ],
    q(tsetsaut) => [
-      q(6813),
+      q(6814),
       q(0),
       ],
    q(tshangla) => [
-      q(6719),
+      q(6720),
       q(0),
       ],
    q(tsikimba) => [
-      q(3244),
+      q(3245),
       q(0),
       ],
    q(tsimane) => [
-      q(1653),
+      q(1654),
       q(0),
       ],
    q(tsimihety malagasy) => [
-      q(7427),
+      q(7428),
       q(0),
       ],
    q(tsimshian) => [
@@ -53806,11 +53854,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tsishingini) => [
-      q(6730),
+      q(6731),
       q(0),
       ],
    q(tso) => [
-      q(3857),
+      q(3858),
       q(0),
       ],
    q(tsoa) => [
@@ -53818,7 +53866,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tsogo) => [
-      q(6729),
+      q(6730),
       q(0),
       ],
    q(tsonga) => [
@@ -53826,35 +53874,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tsotsitaal) => [
-      q(2358),
+      q(2359),
       q(1),
       ],
    q(tsotso) => [
-      q(4073),
+      q(4074),
       q(0),
       ],
    q(tsou) => [
-      q(6728),
+      q(6729),
       q(0),
       ],
    q(tsucuba) => [
-      q(1671),
+      q(1672),
       q(0),
       ],
    q(tsum) => [
-      q(6758),
+      q(6759),
       q(0),
       ],
    q(tsuvadi) => [
-      q(6780),
+      q(6781),
       q(0),
       ],
    q(tsuvan) => [
-      q(6718),
+      q(6719),
       q(0),
       ],
    q(tswa) => [
-      q(6714),
+      q(6715),
       q(0),
       ],
    q(tswana) => [
@@ -53862,83 +53910,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tswapong) => [
-      q(6802),
+      q(6803),
       q(0),
       ],
    q(tu) => [
-      q(4323),
+      q(4324),
       q(0),
       ],
    q(tuamotuan) => [
-      q(5524),
+      q(5525),
       q(0),
       ],
    q(tubar) => [
-      q(6398),
+      q(6399),
       q(0),
       ],
    q(tubatulabal) => [
-      q(6760),
+      q(6761),
       q(0),
       ],
    q(tucano) => [
-      q(6771),
+      q(6772),
       q(0),
       ],
    q(tugen) => [
-      q(6777),
+      q(6778),
       q(0),
       ],
    q(tugun) => [
-      q(6848),
+      q(6849),
       q(0),
       ],
    q(tugutil) => [
-      q(6768),
+      q(6769),
       q(0),
       ],
    q(tukang besi north) => [
-      q(3333),
+      q(3334),
       q(0),
       ],
    q(tukang besi south) => [
-      q(1199),
+      q(1200),
       q(0),
       ],
    q(tuki) => [
-      q(1026),
+      q(1027),
       q(0),
       ],
    q(tukpa) => [
-      q(6667),
+      q(6668),
       q(0),
       ],
    q(tukudede) => [
-      q(6549),
+      q(6550),
       q(0),
       ],
    q(tukumanfed) => [
-      q(6551),
+      q(6552),
       q(0),
       ],
    q(tula) => [
-      q(6769),
+      q(6770),
       q(0),
       ],
    q(tulehu) => [
-      q(6582),
+      q(6583),
       q(0),
       ],
    q(tulishi) => [
-      q(6468),
+      q(6469),
       q(0),
       ],
    q(tulu) => [
-      q(6425),
+      q(6426),
       q(0),
       ],
    q(tulu-bohuai) => [
-      q(5743),
+      q(5744),
       q(0),
       ],
    q(tuma-irumu) => [
@@ -53946,11 +53994,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tumak) => [
-      q(6588),
+      q(6589),
       q(0),
       ],
    q(tumari kanuri) => [
-      q(3587),
+      q(3588),
       q(0),
       ],
    q(tumbuka) => [
@@ -53958,43 +54006,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tumi) => [
-      q(3422),
+      q(3423),
       q(0),
       ],
    q(tumleo) => [
-      q(6601),
+      q(6602),
       q(0),
       ],
    q(tumshuqese) => [
-      q(7520),
+      q(7521),
       q(0),
       ],
    q(tumtum) => [
-      q(6395),
+      q(6396),
       q(0),
       ],
    q(tumulung sisaala) => [
-      q(6042),
+      q(6043),
       q(0),
       ],
    q(tumzabt) => [
-      q(4694),
+      q(4695),
       q(0),
       ],
    q(tundra enets) => [
-      q(2268),
+      q(2269),
       q(0),
       ],
    q(tunen) => [
-      q(6788),
+      q(6789),
       q(0),
       ],
    q(tungag) => [
-      q(3841),
+      q(3842),
       q(0),
       ],
    q(tunggare) => [
-      q(6705),
+      q(6706),
       q(0),
       ],
    q(tungus languages) => [
@@ -54002,11 +54050,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tunia) => [
-      q(6765),
+      q(6766),
       q(0),
       ],
    q(tunica) => [
-      q(6770),
+      q(6771),
       q(0),
       ],
    q(tunisian arabic) => [
@@ -54014,31 +54062,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tunisian sign language) => [
-      q(6716),
+      q(6717),
       q(0),
       ],
    q(tunjung) => [
-      q(6538),
+      q(6539),
       q(0),
       ],
    q(tunni) => [
-      q(6682),
+      q(6683),
       q(0),
       ],
    q(tunzu) => [
-      q(2206),
+      q(2207),
       q(0),
       ],
    q(tuotomb) => [
-      q(6739),
+      q(6740),
       q(0),
       ],
    q(tupari) => [
-      q(6668),
+      q(6669),
       q(0),
       ],
    q(tupi) => [
-      q(6672),
+      q(6673),
       q(0),
       ],
    q(tupi languages) => [
@@ -54046,43 +54094,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tupinamba) => [
-      q(6664),
+      q(6665),
       q(0),
       ],
    q(tupinikin) => [
-      q(6661),
+      q(6662),
       q(0),
       ],
    q(tupuri) => [
-      q(6767),
+      q(6768),
       q(0),
       ],
    q(turaka) => [
-      q(6694),
+      q(6695),
       q(0),
       ],
    q(turi) => [
-      q(6690),
+      q(6691),
       q(0),
       ],
    q(turiwara) => [
-      q(6806),
+      q(6807),
       q(0),
       ],
    q(turk isaret dili) => [
-      q(6722),
+      q(6723),
       q(1),
       ],
    q(turka) => [
-      q(6778),
+      q(6779),
       q(0),
       ],
    q(turkana) => [
-      q(6775),
+      q(6776),
       q(0),
       ],
    q(turkic khalaj) => [
-      q(3437),
+      q(3438),
       q(0),
       ],
    q(turkic languages) => [
@@ -54094,7 +54142,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(turkish sign language) => [
-      q(6722),
+      q(6723),
       q(0),
       ],
    q(turkish, ottoman (1500-1928)) => [
@@ -54106,47 +54154,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(turks and caicos creole english) => [
-      q(6411),
+      q(6412),
       q(0),
       ],
    q(turoyo) => [
-      q(6706),
+      q(6707),
       q(0),
       ],
    q(turumsa) => [
-      q(6678),
+      q(6679),
       q(0),
       ],
    q(turung) => [
-      q(6710),
+      q(6711),
       q(0),
       ],
    q(tuscarora) => [
-      q(6773),
+      q(6774),
       q(0),
       ],
    q(tutelo) => [
-      q(6734),
+      q(6735),
       q(0),
       ],
    q(tutong) => [
-      q(6740),
+      q(6741),
       q(0),
       ],
    q(tutsa naga) => [
-      q(6787),
+      q(6788),
       q(0),
       ],
    q(tutuba) => [
-      q(6593),
+      q(6594),
       q(0),
       ],
    q(tututepec mixtec) => [
-      q(4574),
+      q(4575),
       q(0),
       ],
    q(tututni) => [
-      q(6774),
+      q(6775),
       q(0),
       ],
    q(tuvalu) => [
@@ -54162,35 +54210,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tuwari) => [
-      q(6808),
+      q(6809),
       q(0),
       ],
    q(tuwuli) => [
-      q(1369),
+      q(1370),
       q(0),
       ],
    q(tuxa) => [
-      q(6762),
+      q(6763),
       q(0),
       ],
    q(tuxinawa) => [
-      q(6776),
+      q(6777),
       q(0),
       ],
    q(tuyuca) => [
-      q(6763),
+      q(6764),
       q(0),
       ],
    q(twana) => [
-      q(6791),
+      q(6792),
       q(0),
       ],
    q(twendi) => [
-      q(6801),
+      q(6802),
       q(0),
       ],
    q(twents) => [
-      q(6794),
+      q(6795),
       q(0),
       ],
    q(twi) => [
@@ -54198,27 +54246,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(tyap) => [
-      q(3214),
+      q(3215),
       q(0),
       ],
    q(tyaraity) => [
-      q(7195),
+      q(7196),
       q(0),
       ],
    q(tz'utujil) => [
-      q(6845),
+      q(6846),
       q(0),
       ],
    q(tzeltal) => [
-      q(6844),
+      q(6845),
       q(0),
       ],
    q(tzotzil) => [
-      q(6849),
+      q(6850),
       q(0),
       ],
    q(u) => [
-      q(6961),
+      q(6962),
       q(0),
       ],
    q(uab meto) => [
@@ -54226,47 +54274,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(uamue) => [
-      q(6851),
+      q(6852),
       q(0),
       ],
    q(uare) => [
-      q(3602),
+      q(3603),
       q(0),
       ],
    q(ubaghara) => [
-      q(1591),
+      q(1592),
       q(0),
       ],
    q(ubang) => [
-      q(6854),
+      q(6855),
       q(0),
       ],
    q(ubi) => [
-      q(6855),
+      q(6856),
       q(0),
       ],
    q(ubir) => [
-      q(6857),
+      q(6858),
       q(0),
       ],
    q(ubykh) => [
-      q(6859),
+      q(6860),
       q(0),
       ],
    q(ucayali-yurua asheninka) => [
-      q(1831),
+      q(1832),
       q(0),
       ],
    q(uda) => [
-      q(6860),
+      q(6861),
       q(0),
       ],
    q(udi) => [
-      q(6863),
+      q(6864),
       q(0),
       ],
    q(udihe) => [
-      q(6861),
+      q(6862),
       q(0),
       ],
    q(udmurt) => [
@@ -54274,15 +54322,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(uduk) => [
-      q(6866),
+      q(6867),
       q(0),
       ],
    q(ufim) => [
-      q(6868),
+      q(6869),
       q(0),
       ],
    q(ugandan sign language) => [
-      q(6871),
+      q(6872),
       q(0),
       ],
    q(ugaritic) => [
@@ -54290,15 +54338,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ughele) => [
-      q(6870),
+      q(6871),
       q(0),
       ],
    q(ugong) => [
-      q(6872),
+      q(6873),
       q(0),
       ],
    q(uhami) => [
-      q(6874),
+      q(6875),
       q(0),
       ],
    q(uighur) => [
@@ -54306,27 +54354,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(uisai) => [
-      q(6876),
+      q(6877),
       q(0),
       ],
    q(ujir) => [
-      q(6864),
+      q(6865),
       q(0),
       ],
    q(ukaan) => [
-      q(3213),
+      q(3214),
       q(0),
       ],
    q(ukhwejo) => [
-      q(6881),
+      q(6882),
       q(0),
       ],
    q(ukit) => [
-      q(6905),
+      q(6906),
       q(0),
       ],
    q(ukpe-bayobiri) => [
-      q(6883),
+      q(6884),
       q(0),
       ],
    q(ukpet-ehom) => [
@@ -54338,87 +54386,87 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(ukrainian sign language) => [
-      q(6882),
+      q(6883),
       q(0),
       ],
    q(ukue) => [
-      q(6886),
+      q(6887),
       q(0),
       ],
    q(ukuriguma) => [
-      q(6880),
+      q(6881),
       q(0),
       ],
    q(ukwa) => [
-      q(6884),
+      q(6885),
       q(0),
       ],
    q(ukwuani-aboh-ndoni) => [
-      q(6887),
+      q(6888),
       q(0),
       ],
    q(ulau-suain) => [
-      q(6291),
+      q(6292),
       q(0),
       ],
    q(ulch) => [
-      q(6891),
+      q(6892),
       q(0),
       ],
    q(ulithian) => [
-      q(6894),
+      q(6895),
       q(0),
       ],
    q(ullatan) => [
-      q(6896),
+      q(6897),
       q(0),
       ],
    q(ulukwumi) => [
-      q(6890),
+      q(6891),
       q(0),
       ],
    q(ulumanda') => [
-      q(6897),
+      q(6898),
       q(0),
       ],
    q(ulwa) => [
-      q(6900),
+      q(6901),
       q(0),
       ],
    q(uma) => [
-      q(5574),
+      q(5575),
       q(0),
       ],
    q(uma' lasan) => [
-      q(7391),
+      q(7392),
       q(0),
       ],
    q(uma' lung) => [
-      q(6899),
+      q(6900),
       q(0),
       ],
    q(umanakaina) => [
-      q(2464),
+      q(2465),
       q(0),
       ],
    q(umatilla) => [
-      q(6901),
+      q(6902),
       q(0),
       ],
    q(umbindhamu) => [
-      q(6903),
+      q(6904),
       q(0),
       ],
    q(umbrian) => [
-      q(7535),
+      q(7536),
       q(0),
       ],
    q(umbu-ungu) => [
-      q(6858),
+      q(6859),
       q(0),
       ],
    q(umbugarla) => [
-      q(6910),
+      q(6911),
       q(0),
       ],
    q(umbundu) => [
@@ -54426,43 +54474,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(umbuygamu) => [
-      q(6904),
+      q(6905),
       q(0),
       ],
    q(ume sami) => [
-      q(6068),
+      q(6069),
       q(0),
       ],
    q(umeda) => [
-      q(6923),
+      q(6924),
       q(0),
       ],
    q(umiida) => [
-      q(7531),
+      q(7532),
       q(0),
       ],
    q(umiray dumaget agta) => [
-      q(2172),
+      q(2173),
       q(0),
       ],
    q(umon) => [
-      q(6906),
+      q(6907),
       q(0),
       ],
    q(umotina) => [
-      q(6908),
+      q(6909),
       q(0),
       ],
    q(umpila) => [
-      q(6909),
+      q(6910),
       q(0),
       ],
    q(una) => [
-      q(4560),
+      q(4561),
       q(0),
       ],
    q(unami) => [
-      q(6917),
+      q(6918),
       q(0),
       ],
    q(uncoded languages) => [
@@ -54470,7 +54518,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(unde kaili) => [
-      q(6922),
+      q(6923),
       q(0),
       ],
    q(undetermined) => [
@@ -54478,63 +54526,63 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(uneapa) => [
-      q(1050),
+      q(1051),
       q(0),
       ],
    q(uneme) => [
-      q(6914),
+      q(6915),
       q(0),
       ],
    q(unggaranggu) => [
-      q(7536),
+      q(7537),
       q(0),
       ],
    q(unggumi) => [
-      q(7347),
+      q(7348),
       q(0),
       ],
    q(ungkue) => [
-      q(2541),
+      q(2542),
       q(0),
       ],
    q(unserdeutsch) => [
-      q(6898),
+      q(6899),
       q(0),
       ],
    q(unua) => [
-      q(5279),
+      q(5280),
       q(0),
       ],
    q(unubahe) => [
-      q(6920),
+      q(6921),
       q(0),
       ],
    q(upper chehalis) => [
-      q(1744),
+      q(1745),
       q(0),
       ],
    q(upper grand valley dani) => [
-      q(2098),
+      q(2099),
       q(0),
       ],
    q(upper guinea crioulo) => [
-      q(5567),
+      q(5568),
       q(0),
       ],
    q(upper kinabatangan) => [
-      q(2086),
+      q(2087),
       q(0),
       ],
    q(upper kuskokwim) => [
-      q(3660),
+      q(3661),
       q(0),
       ],
    q(upper necaxa totonac) => [
-      q(6560),
+      q(6561),
       q(0),
       ],
    q(upper saxon) => [
-      q(6332),
+      q(6333),
       q(0),
       ],
    q(upper sorbian) => [
@@ -54542,39 +54590,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(upper ta'oih) => [
-      q(6741),
+      q(6742),
       q(0),
       ],
    q(upper tanana) => [
-      q(6373),
+      q(6374),
       q(0),
       ],
    q(upper taromi) => [
-      q(6650),
+      q(6651),
       q(0),
       ],
    q(upper umpqua) => [
-      q(7538),
+      q(7539),
       q(0),
       ],
    q(ura (papua new guinea)) => [
-      q(6937),
+      q(6938),
       q(0),
       ],
    q(ura (vanuatu)) => [
-      q(6960),
+      q(6961),
       q(0),
       ],
    q(uradhi) => [
-      q(6929),
+      q(6930),
       q(0),
       ],
    q(urak lawoi') => [
-      q(6933),
+      q(6934),
       q(0),
       ],
    q(urali) => [
-      q(6934),
+      q(6935),
       q(0),
       ],
    q(uralic languages) => [
@@ -54582,19 +54630,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(urapmin) => [
-      q(6935),
+      q(6936),
       q(0),
       ],
    q(urarina) => [
-      q(6925),
+      q(6926),
       q(0),
       ],
    q(urartian) => [
-      q(7539),
+      q(7540),
       q(0),
       ],
    q(urat) => [
-      q(6940),
+      q(6941),
       q(0),
       ],
    q(urdu) => [
@@ -54602,115 +54650,115 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(urhobo) => [
-      q(6931),
+      q(6932),
       q(0),
       ],
    q(uri) => [
-      q(6963),
+      q(6964),
       q(0),
       ],
    q(urigina) => [
-      q(6930),
+      q(6931),
       q(0),
       ],
    q(urim) => [
-      q(6932),
+      q(6933),
       q(0),
       ],
    q(urimo) => [
-      q(6944),
+      q(6945),
       q(0),
       ],
    q(uripiv-wala-rano-atchin) => [
-      q(6924),
+      q(6925),
       q(0),
       ],
    q(urningangg) => [
-      q(6927),
+      q(6928),
       q(0),
       ],
    q(uru) => [
-      q(6928),
+      q(6929),
       q(0),
       ],
    q(uru-eu-wau-wau) => [
-      q(6946),
+      q(6947),
       q(0),
       ],
    q(uru-pa-in) => [
-      q(6938),
+      q(6939),
       q(0),
       ],
    q(uruangnirin) => [
-      q(6936),
+      q(6937),
       q(0),
       ],
    q(uruava) => [
-      q(6942),
+      q(6943),
       q(0),
       ],
    q(urubu-kaapor) => [
-      q(6926),
+      q(6927),
       q(0),
       ],
    q(urubu-kaapor sign language) => [
-      q(6885),
+      q(6886),
       q(0),
       ],
    q(uruguayan sign language) => [
-      q(6873),
+      q(6874),
       q(0),
       ],
    q(urum) => [
-      q(6958),
+      q(6959),
       q(0),
       ],
    q(urumi) => [
-      q(6941),
+      q(6942),
       q(0),
       ],
    q(usaghade) => [
-      q(6950),
+      q(6951),
       q(0),
       ],
    q(usan) => [
-      q(7192),
+      q(7193),
       q(0),
       ],
    q(usarufa) => [
-      q(6947),
+      q(6948),
       q(0),
       ],
    q(ushojo) => [
-      q(6948),
+      q(6949),
       q(0),
       ],
    q(usila chinantec) => [
-      q(1904),
+      q(1905),
       q(0),
       ],
    q(usku) => [
-      q(6893),
+      q(6894),
       q(0),
       ],
    q(uspanteco) => [
-      q(6951),
+      q(6952),
       q(0),
       ],
    q(usui) => [
-      q(6949),
+      q(6950),
       q(0),
       ],
    q(ut-ma'in) => [
-      q(2481),
+      q(2482),
       q(0),
       ],
    q(utarmbung) => [
-      q(5259),
+      q(5260),
       q(0),
       ],
    q(ute-southern paiute) => [
-      q(6954),
+      q(6955),
       q(0),
       ],
    q(uto-aztecan languages) => [
@@ -54718,19 +54766,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(utu) => [
-      q(6957),
+      q(6958),
       q(0),
       ],
    q(uvbie) => [
-      q(2314),
+      q(2315),
       q(0),
       ],
    q(uya) => [
-      q(6952),
+      q(6953),
       q(0),
       ],
    q(uyajitaya) => [
-      q(2178),
+      q(2179),
       q(0),
       ],
    q(uyghur) => [
@@ -54742,43 +54790,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(uzbeki arabic) => [
-      q(0953),
+      q(0954),
       q(0),
       ],
    q(uzekwe) => [
-      q(2320),
+      q(2321),
       q(0),
       ],
    q(v'enen taut) => [
-      q(4962),
+      q(4963),
       q(1),
       ],
    q(vaagri booli) => [
-      q(6969),
+      q(6970),
       q(0),
       ],
    q(vaeakau-taumako) => [
-      q(5467),
+      q(5468),
       q(1),
       ],
    q(vafsi) => [
-      q(6971),
+      q(6972),
       q(0),
       ],
    q(vaghat-ya-bijim-legeri) => [
-      q(1216),
+      q(1217),
       q(0),
       ],
    q(vaghri) => [
-      q(6994),
+      q(6995),
       q(0),
       ],
    q(vaghua) => [
-      q(6779),
+      q(6780),
       q(0),
       ],
    q(vagla) => [
-      q(6972),
+      q(6973),
       q(0),
       ],
    q(vai) => [
@@ -54786,11 +54834,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(vaiphei) => [
-      q(6979),
+      q(6980),
       q(0),
       ],
    q(vale) => [
-      q(6970),
+      q(6971),
       q(0),
       ],
    q(valencian) => [
@@ -54798,91 +54846,91 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(valencian sign language) => [
-      q(7049),
+      q(7050),
       q(0),
       ],
    q(valle nacional chinantec) => [
-      q(1922),
+      q(1923),
       q(0),
       ],
    q(valley maidu) => [
-      q(7035),
+      q(7036),
       q(0),
       ],
    q(valman) => [
-      q(6977),
+      q(6978),
       q(0),
       ],
    q(valpei) => [
-      q(7015),
+      q(7016),
       q(0),
       ],
    q(vamale) => [
-      q(4360),
+      q(4361),
       q(0),
       ],
    q(vame) => [
-      q(4382),
+      q(4383),
       q(0),
       ],
    q(vandalic) => [
-      q(7544),
+      q(7545),
       q(0),
       ],
    q(vangunu) => [
-      q(4471),
+      q(4472),
       q(0),
       ],
    q(vanimo) => [
-      q(6976),
+      q(6977),
       q(0),
       ],
    q(vano) => [
-      q(7040),
+      q(7041),
       q(0),
       ],
    q(vanuma) => [
-      q(6982),
+      q(6983),
       q(0),
       ],
    q(vao) => [
-      q(6978),
+      q(6979),
       q(0),
       ],
    q(varhadi-nagpuri) => [
-      q(6973),
+      q(6974),
       q(0),
       ],
    q(varisi) => [
-      q(7045),
+      q(7046),
       q(0),
       ],
    q(varli) => [
-      q(6983),
+      q(6984),
       q(0),
       ],
    q(vasavi) => [
-      q(6981),
+      q(6982),
       q(0),
       ],
    q(vasekele) => [
-      q(6974),
+      q(6975),
       q(3),
       ],
    q(veddah) => [
-      q(6988),
+      q(6989),
       q(0),
       ],
    q(vehes) => [
-      q(6975),
+      q(6976),
       q(0),
       ],
    q(veluws) => [
-      q(6989),
+      q(6990),
       q(0),
       ],
    q(vemgo-mabas) => [
-      q(6990),
+      q(6991),
       q(0),
       ],
    q(venda) => [
@@ -54890,43 +54938,43 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(venetian) => [
-      q(6987),
+      q(6988),
       q(0),
       ],
    q(venetic) => [
-      q(7542),
+      q(7543),
       q(0),
       ],
    q(venezuelan sign language) => [
-      q(7048),
+      q(7049),
       q(0),
       ],
    q(vengo) => [
-      q(1033),
+      q(1034),
       q(0),
       ],
    q(ventureno) => [
-      q(6991),
+      q(6992),
       q(0),
       ],
    q(veps) => [
-      q(6992),
+      q(6993),
       q(0),
       ],
    q(vera'a) => [
-      q(7044),
+      q(7045),
       q(0),
       ],
    q(vestinian) => [
-      q(7546),
+      q(7547),
       q(0),
       ],
    q(vidunda) => [
-      q(6997),
+      q(6998),
       q(0),
       ],
    q(viemo) => [
-      q(6999),
+      q(7000),
       q(0),
       ],
    q(vietnamese) => [
@@ -54934,63 +54982,63 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(viid) => [
-      q(6150),
+      q(6151),
       q(1),
       ],
    q(vilela) => [
-      q(7000),
+      q(7001),
       q(0),
       ],
    q(vili) => [
-      q(6998),
+      q(6999),
       q(0),
       ],
    q(villa viciosa agta) => [
-      q(2200),
+      q(2201),
       q(0),
       ],
    q(vincentian creole english) => [
-      q(6292),
+      q(6293),
       q(0),
       ],
    q(vinmavis) => [
-      q(7041),
+      q(7042),
       q(0),
       ],
    q(vinza) => [
-      q(7001),
+      q(7002),
       q(0),
       ],
    q(virgin islands creole english) => [
-      q(6996),
+      q(6997),
       q(0),
       ],
    q(vishavan) => [
-      q(7002),
+      q(7003),
       q(0),
       ],
    q(viti) => [
-      q(7003),
+      q(7004),
       q(0),
       ],
    q(vitou) => [
-      q(7050),
+      q(7051),
       q(0),
       ],
    q(vitu) => [
-      q(7140),
+      q(7141),
       q(0),
       ],
    q(vlaams) => [
-      q(7016),
+      q(7017),
       q(0),
       ],
    q(vlaamse gebarentaal) => [
-      q(6995),
+      q(6996),
       q(0),
       ],
    q(vlax romani) => [
-      q(5826),
+      q(5827),
       q(0),
       ],
    q(volapuk) => [
@@ -54998,15 +55046,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(volscian) => [
-      q(7545),
+      q(7546),
       q(0),
       ],
    q(vono) => [
-      q(3215),
+      q(3216),
       q(0),
       ],
    q(voro) => [
-      q(7043),
+      q(7044),
       q(0),
       ],
    q(votic) => [
@@ -55014,199 +55062,199 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(vumbu) => [
-      q(7051),
+      q(7052),
       q(0),
       ],
    q(vunapu) => [
-      q(7042),
+      q(7043),
       q(0),
       ],
    q(vunjo) => [
-      q(7052),
+      q(7053),
       q(0),
       ],
    q(vure) => [
-      q(3948),
+      q(3949),
       q(1),
       ],
    q(vures) => [
-      q(4542),
+      q(4543),
       q(0),
       ],
    q(vute) => [
-      q(7053),
+      q(7054),
       q(0),
       ],
    q(vwanji) => [
-      q(7081),
+      q(7082),
       q(0),
       ],
    q(wa) => [
-      q(7085),
+      q(7086),
       q(0),
       ],
    q(wa'ema) => [
-      q(7061),
+      q(7062),
       q(0),
       ],
    q(waama) => [
-      q(7258),
+      q(7259),
       q(0),
       ],
    q(waamwang) => [
-      q(7175),
+      q(7176),
       q(0),
       ],
    q(waata) => [
-      q(6241),
+      q(6242),
       q(0),
       ],
    q(wab) => [
-      q(7056),
+      q(7057),
       q(0),
       ],
    q(wabo) => [
-      q(7078),
+      q(7079),
       q(0),
       ],
    q(waboda) => [
-      q(3476),
+      q(3477),
       q(0),
       ],
    q(waci gbe) => [
-      q(7093),
+      q(7094),
       q(0),
       ],
    q(wadaginam) => [
-      q(7095),
+      q(7096),
       q(0),
       ],
    q(waddar) => [
-      q(7087),
+      q(7088),
       q(0),
       ],
    q(wadi wadi) => [
-      q(7549),
+      q(7550),
       q(0),
       ],
    q(wadikali) => [
-      q(7097),
+      q(7098),
       q(0),
       ],
    q(wadiyara koli) => [
-      q(3730),
+      q(3731),
       q(0),
       ],
    q(wadjabangayi) => [
-      q(7099),
+      q(7100),
       q(0),
       ],
    q(wadjiginy) => [
-      q(7096),
+      q(7097),
       q(0),
       ],
    q(wadjigu) => [
-      q(7098),
+      q(7099),
       q(0),
       ],
    q(wae rana) => [
-      q(7229),
+      q(7230),
       q(0),
       ],
    q(waffa) => [
-      q(7064),
+      q(7065),
       q(0),
       ],
    q(wagawaga) => [
-      q(7116),
+      q(7117),
       q(0),
       ],
    q(wagaya) => [
-      q(7115),
+      q(7116),
       q(0),
       ],
    q(wagdi) => [
-      q(7088),
+      q(7089),
       q(0),
       ],
    q(wageman) => [
-      q(7069),
+      q(7070),
       q(0),
       ],
    q(wagi) => [
-      q(2323),
+      q(2324),
       q(0),
       ],
    q(wahau kayan) => [
-      q(7125),
+      q(7126),
       q(0),
       ],
    q(wahau kenyah) => [
-      q(7124),
+      q(7125),
       q(0),
       ],
    q(wahgi) => [
-      q(7118),
+      q(7119),
       q(0),
       ],
    q(waigali) => [
-      q(7083),
+      q(7084),
       q(0),
       ],
    q(waigeo) => [
-      q(7119),
+      q(7120),
       q(0),
       ],
    q(wailaki) => [
-      q(7156),
+      q(7157),
       q(0),
       ],
    q(wailapa) => [
-      q(7160),
+      q(7161),
       q(0),
       ],
    q(waima) => [
-      q(5851),
+      q(5852),
       q(0),
       ],
    q(waima'a) => [
-      q(7172),
+      q(7173),
       q(0),
       ],
    q(waimaha) => [
-      q(1029),
+      q(1030),
       q(0),
       ],
    q(waimiri-atroari) => [
-      q(0923),
+      q(0924),
       q(0),
       ],
    q(waioli) => [
-      q(7155),
+      q(7156),
       q(0),
       ],
    q(waiwai) => [
-      q(7073),
+      q(7074),
       q(0),
       ],
    q(waja) => [
-      q(7142),
+      q(7143),
       q(0),
       ],
    q(wajarri) => [
-      q(7090),
+      q(7091),
       q(0),
       ],
    q(wajuk) => [
-      q(7552),
+      q(7553),
       q(0),
       ],
    q(waka) => [
-      q(7072),
+      q(7073),
       q(0),
       ],
    q(wakabunga) => [
-      q(7259),
+      q(7260),
       q(0),
       ],
    q(wakashan languages) => [
@@ -55214,27 +55262,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(wakawaka) => [
-      q(7149),
+      q(7150),
       q(0),
       ],
    q(wakde) => [
-      q(7146),
+      q(7147),
       q(0),
       ],
    q(wakhi) => [
-      q(7084),
+      q(7085),
       q(0),
       ],
    q(wakona) => [
-      q(7060),
+      q(7061),
       q(0),
       ],
    q(wala) => [
-      q(3891),
+      q(3892),
       q(0),
       ],
    q(walak) => [
-      q(7164),
+      q(7165),
       q(0),
       ],
    q(walamo) => [
@@ -55242,31 +55290,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(walangama) => [
-      q(4957),
+      q(4958),
       q(0),
       ],
    q(wali (ghana)) => [
-      q(7165),
+      q(7166),
       q(0),
       ],
    q(wali (sudan)) => [
-      q(7157),
+      q(7158),
       q(0),
       ],
    q(waling) => [
-      q(7166),
+      q(7167),
       q(0),
       ],
    q(walio) => [
-      q(7151),
+      q(7152),
       q(0),
       ],
    q(walla walla) => [
-      q(7055),
+      q(7056),
       q(0),
       ],
    q(wallisian) => [
-      q(7161),
+      q(7162),
       q(0),
       ],
    q(walloon) => [
@@ -55274,63 +55322,63 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(walmajarri) => [
-      q(7178),
+      q(7179),
       q(0),
       ],
    q(walser) => [
-      q(7059),
+      q(7060),
       q(0),
       ],
    q(walungge) => [
-      q(5242),
+      q(5243),
       q(0),
       ],
    q(wamas) => [
-      q(7169),
+      q(7170),
       q(0),
       ],
    q(wambaya) => [
-      q(7168),
+      q(7169),
       q(0),
       ],
    q(wambon) => [
-      q(7177),
+      q(7178),
       q(0),
       ],
    q(wambule) => [
-      q(7171),
+      q(7172),
       q(0),
       ],
    q(wamey) => [
-      q(1824),
+      q(1825),
       q(0),
       ],
    q(wamin) => [
-      q(7173),
+      q(7174),
       q(0),
       ],
    q(wampanoag) => [
-      q(7065),
+      q(7066),
       q(0),
       ],
    q(wampar) => [
-      q(3825),
+      q(3826),
       q(0),
       ],
    q(wampur) => [
-      q(7076),
+      q(7077),
       q(0),
       ],
    q(wan) => [
-      q(7066),
+      q(7067),
       q(0),
       ],
    q(wanambre) => [
-      q(7181),
+      q(7182),
       q(0),
       ],
    q(wanap) => [
-      q(7191),
+      q(7192),
       q(0),
       ],
    q(wanbasana) => [
@@ -55338,27 +55386,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(wancho naga) => [
-      q(5001),
+      q(5002),
       q(0),
       ],
    q(wanda) => [
-      q(7080),
+      q(7081),
       q(0),
       ],
    q(wandala) => [
-      q(4232),
+      q(4233),
       q(0),
       ],
    q(wandamen) => [
-      q(7058),
+      q(7059),
       q(0),
       ],
    q(wandarang) => [
-      q(7183),
+      q(7184),
       q(0),
       ],
    q(wandji) => [
-      q(7094),
+      q(7095),
       q(0),
       ],
    q(wane) => [
@@ -55366,79 +55414,79 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(waneci) => [
-      q(7184),
+      q(7185),
       q(0),
       ],
    q(wanga) => [
-      q(4099),
+      q(4100),
       q(0),
       ],
    q(wangaaybuwan-ngiyambaa) => [
-      q(7266),
+      q(7267),
       q(0),
       ],
    q(wanggamala) => [
-      q(7188),
+      q(7189),
       q(0),
       ],
    q(wangganguru) => [
-      q(7117),
+      q(7118),
       q(0),
       ],
    q(wanggom) => [
-      q(7185),
+      q(7186),
       q(0),
       ],
    q(wangkayutyuru) => [
-      q(7150),
+      q(7151),
       q(0),
       ],
    q(wangkumara) => [
-      q(7553),
+      q(7554),
       q(0),
       ],
    q(wanman) => [
-      q(7089),
+      q(7090),
       q(0),
       ],
    q(wannu) => [
-      q(3147),
+      q(3148),
       q(0),
       ],
    q(wano) => [
-      q(7190),
+      q(7191),
       q(0),
       ],
    q(wantoat) => [
-      q(7182),
+      q(7183),
       q(0),
       ],
    q(wanukaka) => [
-      q(7187),
+      q(7188),
       q(0),
       ],
    q(wanyi) => [
-      q(7194),
+      q(7195),
       q(0),
       ],
    q(waorani) => [
-      q(0934),
+      q(0935),
       q(0),
       ],
    q(wapan) => [
-      q(3152),
+      q(3153),
       q(0),
       ],
    q(wapha) => [
-      q(3162),
+      q(3163),
       q(0),
       ],
    q(wapishana) => [
-      q(7068),
+      q(7069),
       q(0),
       ],
    q(wappo) => [
-      q(7067),
+      q(7068),
       q(0),
       ],
    q(war-jaintia) => [
@@ -55446,15 +55494,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(wara) => [
-      q(6412),
+      q(6413),
       q(0),
       ],
    q(warao) => [
-      q(7077),
+      q(7078),
       q(0),
       ],
    q(warapu) => [
-      q(7212),
+      q(7213),
       q(0),
       ],
    q(waray) => [
@@ -55462,7 +55510,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(waray (australia)) => [
-      q(7231),
+      q(7232),
       q(0),
       ],
    q(waray (philippines)) => [
@@ -55470,87 +55518,87 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(wardaman) => [
-      q(7224),
+      q(7225),
       q(0),
       ],
    q(wardandi) => [
-      q(7264),
+      q(7265),
       q(0),
       ],
    q(warduji) => [
-      q(7214),
+      q(7215),
       q(0),
       ],
    q(warembori) => [
-      q(7232),
+      q(7233),
       q(0),
       ],
    q(wares) => [
-      q(7063),
+      q(7064),
       q(0),
       ],
    q(waris) => [
-      q(7225),
+      q(7226),
       q(0),
       ],
    q(waritai) => [
-      q(7079),
+      q(7080),
       q(0),
       ],
    q(wariyangga) => [
-      q(7217),
+      q(7218),
       q(0),
       ],
    q(warji) => [
-      q(7143),
+      q(7144),
       q(0),
       ],
    q(warkay-bipim) => [
-      q(1180),
+      q(1181),
       q(0),
       ],
    q(warlmanpa) => [
-      q(7219),
+      q(7220),
       q(0),
       ],
    q(warlpiri) => [
-      q(7086),
+      q(7087),
       q(0),
       ],
    q(warluwara) => [
-      q(7213),
+      q(7214),
       q(0),
       ],
    q(warnang) => [
-      q(7221),
+      q(7222),
       q(0),
       ],
    q(waropen) => [
-      q(7223),
+      q(7224),
       q(0),
       ],
    q(warrgamay) => [
-      q(7121),
+      q(7122),
       q(0),
       ],
    q(warrwa) => [
-      q(7261),
+      q(7262),
       q(0),
       ],
    q(waru) => [
-      q(7226),
+      q(7227),
       q(0),
       ],
    q(warumungu) => [
-      q(7220),
+      q(7221),
       q(0),
       ],
    q(waruna) => [
-      q(7227),
+      q(7228),
       q(0),
       ],
    q(warungu) => [
-      q(7215),
+      q(7216),
       q(0),
       ],
    q(warwar feni) => [
@@ -55558,11 +55606,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(wasa) => [
-      q(7236),
+      q(7237),
       q(0),
       ],
    q(wasco-wishram) => [
-      q(7057),
+      q(7058),
       q(0),
       ],
    q(wasembo) => [
@@ -55574,75 +55622,75 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(waskia) => [
-      q(7234),
+      q(7235),
       q(0),
       ],
    q(wasu) => [
-      q(7237),
+      q(7238),
       q(0),
       ],
    q(watakataui) => [
-      q(7242),
+      q(7243),
       q(0),
       ],
    q(watam) => [
-      q(7074),
+      q(7075),
       q(0),
       ],
    q(wathawurrung) => [
-      q(7240),
+      q(7241),
       q(0),
       ],
    q(watiwa) => [
-      q(7239),
+      q(7240),
       q(0),
       ],
    q(watubela) => [
-      q(7062),
+      q(7063),
       q(0),
       ],
    q(waube) => [
-      q(3514),
+      q(3515),
       q(0),
       ],
    q(waura) => [
-      q(7071),
+      q(7072),
       q(0),
       ],
    q(wauyai) => [
-      q(7257),
+      q(7258),
       q(0),
       ],
    q(wawa) => [
-      q(7262),
+      q(7263),
       q(0),
       ],
    q(wawonii) => [
-      q(7209),
+      q(7210),
       q(0),
       ],
    q(waxianghua) => [
-      q(7263),
+      q(7264),
       q(0),
       ],
    q(wayampi) => [
-      q(5342),
+      q(5343),
       q(0),
       ],
    q(wayana) => [
-      q(7075),
+      q(7076),
       q(0),
       ],
    q(wayanad chetti) => [
-      q(1899),
+      q(1900),
       q(0),
       ],
    q(wayoro) => [
-      q(7269),
+      q(7270),
       q(0),
       ],
    q(wayu) => [
-      q(6984),
+      q(6985),
       q(0),
       ],
    q(wayuu) => [
@@ -55650,7 +55698,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(we northern) => [
-      q(7196),
+      q(7197),
       q(0),
       ],
    q(we southern) => [
@@ -55658,23 +55706,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(we western) => [
-      q(7101),
+      q(7102),
       q(0),
       ],
    q(wedau) => [
-      q(7102),
+      q(7103),
       q(0),
       ],
    q(weh) => [
-      q(7104),
+      q(7105),
       q(0),
       ],
    q(wejewa) => [
-      q(7113),
+      q(7114),
       q(0),
       ],
    q(weliki) => [
-      q(3435),
+      q(3436),
       q(0),
       ],
    q(welsh) => [
@@ -55682,59 +55730,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(welsh romani) => [
-      q(5824),
+      q(5825),
       q(0),
       ],
    q(wemale) => [
-      q(7107),
+      q(7108),
       q(0),
       ],
    q(wemba wemba) => [
-      q(7558),
+      q(7559),
       q(0),
       ],
    q(weme gbe) => [
-      q(7106),
+      q(7107),
       q(0),
       ],
    q(wergaia) => [
-      q(7103),
+      q(7104),
       q(0),
       ],
    q(weri) => [
-      q(7109),
+      q(7110),
       q(0),
       ],
    q(wersing) => [
-      q(3688),
+      q(3689),
       q(0),
       ],
    q(west albay bikol) => [
-      q(2338),
+      q(2339),
       q(0),
       ],
    q(west ambae) => [
-      q(4990),
+      q(4991),
       q(0),
       ],
    q(west berawan) => [
-      q(7830),
+      q(7832),
       q(0),
       ],
    q(west central banda) => [
-      q(1052),
+      q(1053),
       q(0),
       ],
    q(west central oromo) => [
-      q(2419),
+      q(2420),
       q(0),
       ],
    q(west coast bajau) => [
-      q(1105),
+      q(1106),
       q(0),
       ],
    q(west damar) => [
-      q(2140),
+      q(2141),
       q(0),
       ],
    q(west germanic languages) => [
@@ -55742,23 +55790,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(west goodenough) => [
-      q(1981),
+      q(1982),
       q(0),
       ],
    q(west kewa) => [
-      q(3278),
+      q(3279),
       q(0),
       ],
    q(west lembata) => [
-      q(3984),
+      q(3985),
       q(0),
       ],
    q(west makian) => [
-      q(4497),
+      q(4498),
       q(0),
       ],
    q(west masela) => [
-      q(4547),
+      q(4548),
       q(0),
       ],
    q(west slavic languages) => [
@@ -55766,19 +55814,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(west tarangan) => [
-      q(6820),
+      q(6821),
       q(0),
       ],
    q(west uvean) => [
-      q(6962),
+      q(6963),
       q(0),
       ],
    q(west yugur) => [
-      q(7600),
+      q(7601),
       q(0),
       ],
    q(west-central limba) => [
-      q(3909),
+      q(3910),
       q(0),
       ],
    q(western abnaki) => [
@@ -55794,7 +55842,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(western balochi) => [
-      q(1172),
+      q(1173),
       q(0),
       ],
    q(western bolivian guarani) => [
@@ -55802,11 +55850,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(western bru) => [
-      q(1441),
+      q(1442),
       q(0),
       ],
    q(western bukidnon manobo) => [
-      q(4128),
+      q(4129),
       q(0),
       ],
    q(western canadian inuktitut) => [
@@ -55814,19 +55862,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(western cham) => [
-      q(1742),
+      q(1743),
       q(0),
       ],
    q(western dani) => [
-      q(2110),
+      q(2111),
       q(0),
       ],
    q(western durango nahuatl) => [
-      q(1017),
+      q(1018),
       q(0),
       ],
    q(western fijian) => [
-      q(7270),
+      q(7271),
       q(0),
       ],
    q(western frisian) => [
@@ -55838,15 +55886,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(western highland chatino) => [
-      q(1897),
+      q(1898),
       q(0),
       ],
    q(western highland purepecha) => [
-      q(5640),
+      q(5641),
       q(0),
       ],
    q(western huasteca nahuatl) => [
-      q(4878),
+      q(4879),
       q(0),
       ],
    q(western juxtlahuaca mixtec) => [
@@ -55854,39 +55902,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(western kanjobal) => [
-      q(3487),
+      q(3488),
       q(0),
       ],
    q(western karaboro) => [
-      q(3767),
+      q(3768),
       q(0),
       ],
    q(western katu) => [
-      q(3649),
+      q(3650),
       q(0),
       ],
    q(western kayah) => [
-      q(3761),
+      q(3762),
       q(0),
       ],
    q(western keres) => [
-      q(3393),
+      q(3394),
       q(0),
       ],
    q(western krahn) => [
-      q(3589),
+      q(3590),
       q(0),
       ],
    q(western lalu) => [
-      q(7785),
+      q(7787),
       q(0),
       ],
    q(western lawa) => [
-      q(3842),
+      q(3843),
       q(0),
       ],
    q(western magar) => [
-      q(4508),
+      q(4509),
       q(0),
       ],
    q(western malayo-polynesian languages) => [
@@ -55894,11 +55942,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(western maninkakan) => [
-      q(4381),
+      q(4382),
       q(0),
       ],
    q(western mari) => [
-      q(4513),
+      q(4514),
       q(0),
       ],
    q(western mashan hmong) => [
@@ -55910,11 +55958,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(western meohang) => [
-      q(5739),
+      q(5740),
       q(0),
       ],
    q(western muria) => [
-      q(4594),
+      q(4595),
       q(0),
       ],
    q(western neo-aramaic) => [
@@ -55922,11 +55970,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(western niger fulfulde) => [
-      q(2384),
+      q(2385),
       q(0),
       ],
    q(western ojibwa) => [
-      q(5223),
+      q(5224),
       q(0),
       ],
    q(western pahari languages) => [
@@ -55934,187 +55982,187 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(western panjabi) => [
-      q(5530),
+      q(5531),
       q(0),
       ],
    q(western parbate kham) => [
-      q(3388),
+      q(3389),
       q(0),
       ],
    q(western penan) => [
-      q(5532),
+      q(5533),
       q(0),
       ],
    q(western sisaala) => [
-      q(6239),
+      q(6240),
       q(0),
       ],
    q(western subanon) => [
-      q(6278),
+      q(6279),
       q(0),
       ],
    q(western tamang) => [
-      q(6433),
+      q(6434),
       q(0),
       ],
    q(western tawbuid) => [
-      q(6792),
+      q(6793),
       q(0),
       ],
    q(western totonac) => [
-      q(6684),
+      q(6685),
       q(0),
       ],
    q(western tunebo) => [
-      q(6611),
+      q(6612),
       q(0),
       ],
    q(western xiangxi miao) => [
-      q(4406),
+      q(4407),
       q(0),
       ],
    q(western xwla gbe) => [
-      q(7554),
+      q(7555),
       q(0),
       ],
    q(western yiddish) => [
-      q(7646),
+      q(7648),
       q(0),
       ],
    q(westphalien) => [
-      q(7108),
+      q(7109),
       q(0),
       ],
    q(wetamut) => [
-      q(7260),
+      q(7261),
       q(0),
       ],
    q(wewaw) => [
-      q(7100),
+      q(7101),
       q(0),
       ],
    q(weyto) => [
-      q(7210),
+      q(7211),
       q(0),
       ],
    q(white gelao) => [
-      q(2527),
+      q(2528),
       q(0),
       ],
    q(white lachi) => [
-      q(4100),
+      q(4101),
       q(0),
       ],
    q(whitesands) => [
-      q(6623),
+      q(6624),
       q(0),
       ],
    q(wiarumus) => [
-      q(6759),
+      q(6760),
       q(0),
       ],
    q(wichi lhamtes guisnay) => [
-      q(4699),
+      q(4700),
       q(0),
       ],
    q(wichi lhamtes nocten) => [
-      q(4569),
+      q(4570),
       q(0),
       ],
    q(wichi lhamtes vejoz) => [
-      q(7163),
+      q(7164),
       q(0),
       ],
    q(wichita) => [
-      q(7127),
+      q(7128),
       q(0),
       ],
    q(wik-epa) => [
-      q(7128),
+      q(7129),
       q(0),
       ],
    q(wik-iiyanh) => [
-      q(7133),
+      q(7134),
       q(0),
       ],
    q(wik-keyangan) => [
-      q(7129),
+      q(7130),
       q(0),
       ],
    q(wik-me'anha) => [
-      q(7131),
+      q(7132),
       q(0),
       ],
    q(wik-mungkan) => [
-      q(7136),
+      q(7137),
       q(0),
       ],
    q(wik-ngathana) => [
-      q(7130),
+      q(7131),
       q(0),
       ],
    q(wikalkan) => [
-      q(7134),
+      q(7135),
       q(0),
       ],
    q(wikngenchera) => [
-      q(7245),
+      q(7246),
       q(0),
       ],
    q(wilawila) => [
-      q(7135),
+      q(7136),
       q(0),
       ],
    q(wintu) => [
-      q(7193),
+      q(7194),
       q(0),
       ],
    q(winye) => [
-      q(3612),
+      q(3613),
       q(0),
       ],
    q(wipi) => [
-      q(2467),
+      q(2468),
       q(0),
       ],
    q(wiradhuri) => [
-      q(7216),
+      q(7217),
       q(0),
       ],
    q(wirafed) => [
-      q(7138),
+      q(7139),
       q(0),
       ],
    q(wirangu) => [
-      q(7120),
+      q(7121),
       q(0),
       ],
    q(wiru) => [
-      q(7139),
+      q(7140),
       q(0),
       ],
    q(wiyot) => [
-      q(7141),
+      q(7142),
       q(0),
       ],
    q(woccon) => [
-      q(7548),
+      q(7549),
       q(0),
       ],
    q(wogamusin) => [
-      q(7201),
+      q(7202),
       q(0),
       ],
    q(wogeo) => [
-      q(7197),
+      q(7198),
       q(0),
       ],
    q(woi) => [
-      q(7091),
+      q(7092),
       q(0),
       ],
    q(woiwurrung) => [
-      q(7267),
+      q(7268),
       q(0),
       ],
    q(wojenaka) => [
@@ -56126,11 +56174,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(2),
       ],
    q(wolane) => [
-      q(7153),
+      q(7154),
       q(0),
       ],
    q(wolani) => [
-      q(7198),
+      q(7199),
       q(0),
       ],
    q(wolaytta) => [
@@ -56138,11 +56186,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(1),
       ],
    q(woleaian) => [
-      q(7199),
+      q(7200),
       q(0),
       ],
    q(wolio) => [
-      q(7159),
+      q(7160),
       q(0),
       ],
    q(wolof) => [
@@ -56150,163 +56198,167 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(wom (nigeria)) => [
-      q(7204),
+      q(7205),
       q(0),
       ],
    q(wom (papua new guinea)) => [
-      q(7176),
+      q(7177),
       q(0),
       ],
    q(womo) => [
-      q(7180),
+      q(7181),
       q(0),
       ],
    q(wongo) => [
-      q(7205),
+      q(7206),
       q(0),
       ],
    q(woods cree) => [
-      q(1925),
+      q(1926),
       q(0),
       ],
    q(woria) => [
-      q(7207),
+      q(7208),
       q(0),
       ],
    q(worimi) => [
-      q(3234),
+      q(3235),
       q(0),
       ],
    q(worodougou) => [
-      q(3149),
+      q(3150),
       q(0),
       ],
    q(worrorra) => [
-      q(7222),
+      q(7223),
       q(0),
       ],
    q(wotapuri-katarqalai) => [
-      q(7238),
+      q(7239),
       q(0),
       ],
    q(wotjobaluk) => [
-      q(7557),
+      q(7558),
       q(0),
       ],
    q(wotu) => [
-      q(7244),
+      q(7245),
       q(0),
       ],
    q(woun meu) => [
-      q(5011),
+      q(5012),
       q(0),
       ],
    q(written oirat) => [
-      q(7555),
+      q(7556),
       q(0),
       ],
    q(wu chinese) => [
-      q(7254),
+      q(7255),
       q(0),
       ],
    q(wuding-luquan yi) => [
-      q(7787),
+      q(7789),
       q(0),
       ],
    q(wudu) => [
-      q(7247),
+      q(7248),
       q(0),
       ],
    q(wuliwuli) => [
-      q(7162),
+      q(7163),
       q(0),
       ],
    q(wulna) => [
-      q(7256),
+      q(7257),
       q(0),
       ],
    q(wumboko) => [
-      q(1408),
+      q(1409),
       q(0),
       ],
    q(wumbvu) => [
-      q(7250),
+      q(7251),
       q(0),
       ],
    q(wumeng nasu) => [
-      q(7790),
+      q(7792),
       q(0),
       ],
    q(wunai bunu) => [
-      q(1554),
+      q(1555),
       q(0),
       ],
    q(wunambal) => [
-      q(7246),
+      q(7247),
       q(0),
       ],
    q(wunumara) => [
-      q(7189),
+      q(7190),
       q(0),
       ],
    q(wurrugu) => [
-      q(7252),
+      q(7253),
       q(0),
       ],
    q(wusa nasu) => [
-      q(7645),
+      q(7647),
       q(0),
       ],
    q(wushi) => [
-      q(1449),
+      q(1450),
       q(0),
       ],
    q(wusi) => [
-      q(7233),
+      q(7234),
       q(0),
       ],
    q(wutung) => [
-      q(7253),
+      q(7254),
       q(0),
       ],
    q(wutunhua) => [
-      q(7248),
+      q(7249),
       q(0),
       ],
    q(wuvulu-aua) => [
-      q(7255),
+      q(7256),
       q(0),
       ],
    q(wuzlam) => [
-      q(6865),
+      q(6866),
       q(0),
       ],
    q(wyandot) => [
-      q(7265),
+      q(7266),
       q(0),
       ],
    q(wymysorys) => [
-      q(7268),
+      q(7269),
       q(0),
       ],
    q(xaasongaxango) => [
-      q(3178),
+      q(3179),
       q(0),
       ],
    q(xadani zapotec) => [
-      q(7824),
+      q(7826),
       q(0),
       ],
    q(xakriaba) => [
-      q(7384),
+      q(7385),
       q(0),
       ],
-   q(xamtanga) => [
+   q(xam) => [
       q(7280),
+      q(1),
+      ],
+   q(xamtanga) => [
+      q(7281),
       q(0),
       ],
    q(xanaguia zapotec) => [
-      q(7952),
+      q(7954),
       q(0),
       ],
    q(xaracuu) => [
@@ -56314,19 +56366,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(xaragure) => [
-      q(0990),
+      q(0991),
       q(0),
       ],
    q(xavante) => [
-      q(7288),
+      q(7289),
       q(0),
       ],
+   q(xegwi) => [
+      q(7330),
+      q(1),
+      ],
    q(xerente) => [
-      q(7333),
+      q(7334),
       q(0),
       ],
    q(xeta) => [
-      q(7335),
+      q(7336),
       q(0),
       ],
    q(xhosa) => [
@@ -56338,15 +56394,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(xibe) => [
-      q(6063),
+      q(6064),
       q(0),
       ],
    q(xicotepec de juarez totonac) => [
-      q(6644),
+      q(6645),
       q(0),
       ],
    q(xinca) => [
-      q(7360),
+      q(7361),
       q(0),
       ],
    q(xingu asurini) => [
@@ -56354,47 +56410,51 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(xipaya) => [
-      q(7365),
+      q(7366),
       q(0),
       ],
    q(xipinawa) => [
-      q(7361),
+      q(7362),
       q(0),
       ],
    q(xiri) => [
-      q(7358),
+      q(7359),
       q(0),
       ],
    q(xiriana) => [
-      q(7362),
+      q(7363),
       q(0),
       ],
    q(xishanba lalo) => [
-      q(7789),
+      q(7791),
       q(0),
       ],
    q(xokleng) => [
-      q(7449),
+      q(7450),
       q(0),
       ],
+   q(xoo) => [
+      q(4975),
+      q(1),
+      ],
    q(xukuru) => [
-      q(7452),
+      q(7453),
       q(0),
       ],
    q(xwela gbe) => [
-      q(7550),
+      q(7551),
       q(0),
       ],
    q(yaaku) => [
-      q(4595),
+      q(4596),
       q(0),
       ],
    q(yabaana) => [
-      q(7607),
+      q(7608),
       q(0),
       ],
    q(yabarana) => [
-      q(7589),
+      q(7590),
       q(0),
       ],
    q(yabem) => [
@@ -56402,67 +56462,67 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yaben) => [
-      q(7606),
+      q(7607),
       q(0),
       ],
    q(yabong) => [
-      q(7608),
+      q(7609),
       q(0),
       ],
    q(yabula yabula) => [
-      q(7797),
+      q(7799),
       q(0),
       ],
    q(yace) => [
-      q(2240),
+      q(2241),
       q(0),
       ],
    q(yaeyama) => [
-      q(5883),
+      q(5884),
       q(0),
       ],
    q(yafi) => [
-      q(7114),
+      q(7115),
       q(0),
       ],
    q(yagara) => [
-      q(7793),
+      q(7795),
       q(0),
       ],
    q(yagaria) => [
-      q(7637),
+      q(7638),
       q(0),
       ],
    q(yagnobi) => [
-      q(7582),
+      q(7583),
       q(0),
       ],
    q(yagomi) => [
-      q(7635),
+      q(7636),
       q(0),
       ],
    q(yagua) => [
-      q(7577),
+      q(7578),
       q(0),
       ],
    q(yagwoia) => [
-      q(7640),
+      q(7641),
       q(0),
       ],
    q(yahadian) => [
-      q(4821),
+      q(4822),
       q(0),
       ],
    q(yahang) => [
-      q(5784),
+      q(5785),
       q(0),
       ],
    q(yahuna) => [
-      q(7714),
+      q(7716),
       q(0),
       ],
    q(yaka (central african republic)) => [
-      q(0987),
+      q(0988),
       q(0),
       ],
    q(yaka (congo)) => [
@@ -56470,27 +56530,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yaka (democratic republic of congo)) => [
-      q(7579),
+      q(7580),
       q(0),
       ],
    q(yakaikeke) => [
-      q(7665),
+      q(7667),
       q(0),
       ],
    q(yakama) => [
-      q(7584),
+      q(7585),
       q(0),
       ],
    q(yakan) => [
-      q(7662),
+      q(7664),
       q(0),
       ],
    q(yakha) => [
-      q(7601),
+      q(7602),
       q(0),
       ],
    q(yakoma) => [
-      q(7673),
+      q(7675),
       q(0),
       ],
    q(yakut) => [
@@ -56498,7 +56558,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yala) => [
-      q(7598),
+      q(7599),
       q(0),
       ],
    q(yalahatan) => [
@@ -56506,47 +56566,47 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yalakalore) => [
-      q(7568),
+      q(7569),
       q(0),
       ],
    q(yalalag zapotec) => [
-      q(7932),
+      q(7934),
       q(0),
       ],
    q(yalarnnga) => [
-      q(7683),
+      q(7685),
       q(0),
       ],
    q(yale) => [
-      q(4765),
+      q(4766),
       q(0),
       ],
    q(yaleba) => [
-      q(7675),
+      q(7677),
       q(0),
       ],
    q(yalunka) => [
-      q(7585),
+      q(7586),
       q(0),
       ],
    q(yamana) => [
-      q(7580),
+      q(7581),
       q(0),
       ],
    q(yamap) => [
-      q(7698),
+      q(7700),
       q(0),
       ],
    q(yamba) => [
-      q(7586),
+      q(7587),
       q(0),
       ],
    q(yambes) => [
-      q(7686),
+      q(7688),
       q(0),
       ],
    q(yambeta) => [
-      q(7591),
+      q(7592),
       q(0),
       ],
    q(yamdena) => [
@@ -56554,55 +56614,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yameo) => [
-      q(7689),
+      q(7691),
       q(0),
       ],
    q(yami) => [
-      q(6368),
+      q(6369),
       q(0),
       ],
    q(yaminahua) => [
-      q(7574),
+      q(7575),
       q(0),
       ],
    q(yamna) => [
-      q(7696),
+      q(7698),
       q(0),
       ],
    q(yamongeri) => [
-      q(7690),
+      q(7692),
       q(0),
       ],
    q(yamphu) => [
-      q(7602),
+      q(7603),
       q(0),
       ],
    q(yan-nhangu) => [
       q(3058),
       q(0),
       ],
+   q(yan-nhanu sign language) => [
+      q(7645),
+      q(0),
+      ],
    q(yana) => [
-      q(7710),
+      q(7712),
       q(0),
       ],
    q(yanahuanca pasco quechua) => [
-      q(5692),
+      q(5693),
       q(0),
       ],
    q(yanda) => [
-      q(7615),
+      q(7616),
       q(0),
       ],
    q(yanda dom dogon) => [
-      q(2202),
+      q(2203),
       q(0),
       ],
    q(yandjibara) => [
-      q(7565),
+      q(7566),
       q(0),
       ],
    q(yandruwandha) => [
-      q(7705),
+      q(7707),
       q(0),
       ],
    q(yanesha') => [
@@ -56610,15 +56674,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yang zhuang) => [
-      q(7969),
+      q(7971),
       q(0),
       ],
    q(yangben) => [
-      q(7593),
+      q(7594),
       q(0),
       ],
    q(yangkam) => [
-      q(1468),
+      q(1469),
       q(0),
       ],
    q(yangman) => [
@@ -56626,31 +56690,31 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yango) => [
-      q(7707),
+      q(7709),
       q(0),
       ],
    q(yangulam) => [
-      q(7709),
+      q(7711),
       q(0),
       ],
    q(yangum dey) => [
-      q(7617),
+      q(7618),
       q(0),
       ],
    q(yangum gel) => [
-      q(7634),
+      q(7635),
       q(0),
       ],
    q(yangum mon) => [
-      q(7697),
+      q(7699),
       q(0),
       ],
    q(yankunytjatjara) => [
-      q(3236),
+      q(3237),
       q(0),
       ],
    q(yanomami) => [
-      q(7092),
+      q(7093),
       q(0),
       ],
    q(yanomamo) => [
@@ -56658,7 +56722,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yansi) => [
-      q(7713),
+      q(7715),
       q(0),
       ],
    q(yanyuwa) => [
@@ -56674,7 +56738,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yaoure) => [
-      q(7736),
+      q(7738),
       q(0),
       ],
    q(yapese) => [
@@ -56682,7 +56746,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yapunda) => [
-      q(7630),
+      q(7631),
       q(0),
       ],
    q(yaqay) => [
@@ -56690,71 +56754,71 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yaqui) => [
-      q(7588),
+      q(7589),
       q(0),
       ],
    q(yarawata) => [
-      q(7743),
+      q(7745),
       q(0),
       ],
    q(yardliyawarra) => [
-      q(7794),
+      q(7796),
       q(0),
       ],
    q(yareba) => [
-      q(7735),
+      q(7737),
       q(0),
       ],
    q(yareni zapotec) => [
-      q(7807),
+      q(7809),
       q(0),
       ],
    q(yari) => [
-      q(7737),
+      q(7739),
       q(0),
       ],
    q(yarluyandi) => [
-      q(7744),
+      q(7746),
       q(0),
       ],
    q(yarsun) => [
-      q(7742),
+      q(7744),
       q(0),
       ],
    q(yasa) => [
-      q(7669),
+      q(7671),
       q(0),
       ],
    q(yassic) => [
-      q(7745),
+      q(7747),
       q(0),
       ],
    q(yatay) => [
-      q(7759),
+      q(7761),
       q(0),
       ],
    q(yatee zapotec) => [
-      q(7962),
+      q(7964),
       q(0),
       ],
    q(yatzachi zapotec) => [
-      q(7822),
+      q(7824),
       q(0),
       ],
    q(yau (morobe province)) => [
-      q(7777),
+      q(7779),
       q(0),
       ],
    q(yau (sandaun province)) => [
-      q(7799),
+      q(7801),
       q(0),
       ],
    q(yaul) => [
-      q(7674),
+      q(7676),
       q(0),
       ],
    q(yauma) => [
-      q(7595),
+      q(7596),
       q(0),
       ],
    q(yaur) => [
@@ -56762,35 +56826,35 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yautepec zapotec) => [
-      q(7913),
+      q(7915),
       q(0),
       ],
    q(yauyos quechua) => [
-      q(5696),
+      q(5697),
       q(0),
       ],
    q(yavitero) => [
-      q(7782),
+      q(7784),
       q(0),
       ],
    q(yawa) => [
-      q(7781),
+      q(7783),
       q(0),
       ],
    q(yawalapiti) => [
-      q(7594),
+      q(7595),
       q(0),
       ],
    q(yawanawa) => [
-      q(7786),
+      q(7788),
       q(0),
       ],
    q(yawarawarga) => [
-      q(7791),
+      q(7793),
       q(0),
       ],
    q(yaweyuha) => [
-      q(7610),
+      q(7611),
       q(0),
       ],
    q(yawijibaya) => [
@@ -56798,23 +56862,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yawiyo) => [
-      q(7609),
+      q(7610),
       q(0),
       ],
    q(yawuru) => [
-      q(7788),
+      q(7790),
       q(0),
       ],
    q(yaygir) => [
-      q(7564),
+      q(7565),
       q(0),
       ],
    q(yazgulyam) => [
-      q(7581),
+      q(7582),
       q(0),
       ],
    q(yecuatla totonac) => [
-      q(6567),
+      q(6568),
       q(0),
       ],
    q(yei) => [
@@ -56822,19 +56886,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yekhee) => [
-      q(2308),
+      q(2309),
       q(0),
       ],
    q(yekora) => [
-      q(7670),
+      q(7672),
       q(0),
       ],
    q(yela) => [
-      q(7625),
+      q(7626),
       q(0),
       ],
    q(yele) => [
-      q(7676),
+      q(7678),
       q(0),
       ],
    q(yelmek) => [
@@ -56842,11 +56906,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yelogu) => [
-      q(7677),
+      q(7679),
       q(0),
       ],
    q(yemba) => [
-      q(7599),
+      q(7600),
       q(0),
       ],
    q(yemsa) => [
@@ -56854,19 +56918,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yendang) => [
-      q(7712),
+      q(7714),
       q(0),
       ],
    q(yeni) => [
-      q(7623),
+      q(7624),
       q(0),
       ],
    q(yeniche) => [
-      q(7621),
+      q(7622),
       q(0),
       ],
    q(yerakai) => [
-      q(7734),
+      q(7736),
       q(0),
       ],
    q(yeretuar) => [
@@ -56874,27 +56938,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yerong) => [
-      q(7741),
+      q(7743),
       q(0),
       ],
    q(yerukula) => [
-      q(7629),
+      q(7630),
       q(0),
       ],
    q(yessan-mayo) => [
-      q(7753),
+      q(7755),
       q(0),
       ],
    q(yetfa) => [
-      q(7628),
+      q(7629),
       q(0),
       ],
    q(yevanic) => [
-      q(7624),
+      q(7625),
       q(0),
       ],
    q(yeyi) => [
-      q(7631),
+      q(7632),
       q(0),
       ],
    q(yiddish) => [
@@ -56902,99 +56966,99 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yidgha) => [
-      q(7618),
+      q(7619),
       q(0),
       ],
    q(yidiny) => [
-      q(7647),
+      q(7649),
       q(0),
       ],
    q(yil) => [
-      q(7679),
+      q(7681),
       q(0),
       ],
    q(yimas) => [
-      q(7622),
+      q(7623),
       q(0),
       ],
    q(yimchungru naga) => [
-      q(7651),
+      q(7653),
       q(0),
       ],
    q(yinbaw karen) => [
-      q(3686),
+      q(3687),
       q(0),
       ],
    q(yinchia) => [
-      q(7652),
+      q(7654),
       q(0),
       ],
    q(yindjibarndi) => [
-      q(7648),
+      q(7650),
       q(0),
       ],
    q(yindjilandji) => [
-      q(7650),
+      q(7652),
       q(0),
       ],
    q(yine) => [
-      q(5449),
+      q(5450),
       q(0),
       ],
    q(yinggarda) => [
-      q(7644),
+      q(7646),
       q(0),
       ],
    q(yinhawangka) => [
-      q(7784),
+      q(7786),
       q(0),
       ],
    q(yiningayi) => [
-      q(7633),
+      q(7634),
       q(0),
       ],
    q(yintale) => [
-      q(3690),
+      q(3691),
       q(1),
       ],
    q(yintale karen) => [
-      q(3690),
+      q(3691),
       q(0),
       ],
    q(yinwum) => [
-      q(7795),
+      q(7797),
       q(0),
       ],
    q(yipma) => [
-      q(1605),
+      q(1606),
       q(1),
       ],
    q(yir yoront) => [
-      q(7798),
+      q(7800),
       q(0),
       ],
    q(yirandali) => [
-      q(3936),
+      q(3937),
       q(0),
       ],
    q(yirrk-mel) => [
-      q(7740),
+      q(7742),
       q(0),
       ],
    q(yis) => [
-      q(7656),
+      q(7658),
       q(0),
       ],
    q(yitha yitha) => [
-      q(7512),
+      q(7513),
       q(0),
       ],
    q(yiwom) => [
-      q(2480),
+      q(2481),
       q(0),
       ],
    q(yoba) => [
-      q(7715),
+      q(7717),
       q(0),
       ],
    q(yocoboue dida) => [
@@ -57002,75 +57066,75 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yogad) => [
-      q(7716),
+      q(7718),
       q(0),
       ],
    q(yoidik) => [
-      q(7619),
+      q(7620),
       q(0),
       ],
    q(yoke) => [
-      q(7664),
+      q(7666),
       q(0),
       ],
    q(yokuts) => [
-      q(7718),
+      q(7720),
       q(0),
       ],
    q(yola) => [
-      q(7719),
+      q(7721),
       q(0),
       ],
    q(yolnu sign language) => [
-      q(7638),
+      q(7639),
       q(0),
       ],
    q(yoloxochitl mixtec) => [
-      q(7527),
+      q(7528),
       q(0),
       ],
    q(yom) => [
-      q(5458),
+      q(5459),
       q(0),
       ],
    q(yombe) => [
-      q(7720),
+      q(7722),
       q(0),
       ],
    q(yonaguni) => [
-      q(7717),
+      q(7719),
       q(0),
       ],
    q(yong) => [
-      q(7711),
+      q(7713),
       q(0),
       ],
    q(yongbei zhuang) => [
-      q(7968),
+      q(7970),
       q(0),
       ],
    q(yongkom) => [
-      q(7721),
+      q(7723),
       q(0),
       ],
    q(yongnan zhuang) => [
-      q(7971),
+      q(7973),
       q(0),
       ],
    q(yopno) => [
-      q(7776),
+      q(7778),
       q(0),
       ],
    q(yora) => [
-      q(4572),
+      q(4573),
       q(0),
       ],
    q(yoron) => [
-      q(7723),
+      q(7725),
       q(0),
       ],
    q(yorta yorta) => [
-      q(7570),
+      q(7571),
       q(0),
       ],
    q(yoruba) => [
@@ -57078,15 +57142,15 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yosondua mixtec) => [
-      q(4466),
+      q(4467),
       q(0),
       ],
    q(yotti) => [
-      q(7722),
+      q(7724),
       q(0),
       ],
    q(youjiang zhuang) => [
-      q(7970),
+      q(7972),
       q(0),
       ],
    q(youle jinuo) => [
@@ -57094,83 +57158,83 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(younuo bunu) => [
-      q(1499),
+      q(1500),
       q(0),
       ],
    q(yout wam) => [
-      q(7758),
+      q(7760),
       q(0),
       ],
    q(yoy) => [
-      q(7724),
+      q(7726),
       q(0),
       ],
    q(yuanga) => [
-      q(5103),
+      q(5104),
       q(0),
       ],
    q(yucatec maya) => [
-      q(7760),
+      q(7762),
       q(1),
       ],
    q(yucatec maya sign language) => [
-      q(4532),
+      q(4533),
       q(0),
       ],
    q(yucateco) => [
-      q(7760),
+      q(7762),
       q(0),
       ],
    q(yuchi) => [
-      q(7762),
+      q(7764),
       q(0),
       ],
    q(yucuane mixtec) => [
-      q(4605),
+      q(4606),
       q(0),
       ],
    q(yucuna) => [
-      q(7613),
+      q(7614),
       q(0),
       ],
    q(yue chinese) => [
-      q(7764),
+      q(7766),
       q(0),
       ],
    q(yug) => [
-      q(7766),
+      q(7768),
       q(0),
       ],
    q(yugambal) => [
-      q(7761),
+      q(7763),
       q(0),
       ],
    q(yugoslavian sign language) => [
-      q(7748),
+      q(7750),
       q(0),
       ],
    q(yugul) => [
-      q(7639),
+      q(7640),
       q(0),
       ],
    q(yuhup) => [
-      q(7575),
+      q(7576),
       q(0),
       ],
    q(yuki) => [
-      q(7769),
+      q(7771),
       q(0),
       ],
    q(yukpa) => [
-      q(7773),
+      q(7775),
       q(0),
       ],
    q(yukuben) => [
-      q(7605),
+      q(7606),
       q(0),
       ],
    q(yulu) => [
-      q(7770),
+      q(7772),
       q(0),
       ],
    q(yupik languages) => [
@@ -57178,59 +57242,59 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(yuqui) => [
-      q(7774),
+      q(7776),
       q(0),
       ],
    q(yuracare) => [
-      q(7780),
+      q(7782),
       q(0),
       ],
    q(yurats) => [
-      q(5859),
+      q(5860),
       q(0),
       ],
    q(yurok) => [
-      q(7775),
+      q(7777),
       q(0),
       ],
    q(yuru) => [
-      q(3937),
+      q(3938),
       q(0),
       ],
    q(yuruti) => [
-      q(7767),
+      q(7769),
       q(0),
       ],
    q(yutanduchi mixtec) => [
-      q(4115),
+      q(4116),
       q(0),
       ],
    q(yuwana) => [
-      q(7592),
+      q(7593),
       q(0),
       ],
    q(yuyu) => [
-      q(7796),
+      q(7798),
       q(0),
       ],
    q(zaachila zapotec) => [
-      q(7961),
+      q(7963),
       q(0),
       ],
    q(zabana) => [
-      q(3385),
+      q(3386),
       q(0),
       ],
    q(zacatepec chatino) => [
-      q(1901),
+      q(1902),
       q(0),
       ],
    q(zacatlan-ahuacatlan-tepetzintla nahuatl) => [
-      q(4867),
+      q(4868),
       q(0),
       ],
    q(zaghawa) => [
-      q(7809),
+      q(7811),
       q(0),
       ],
    q(zaiwa) => [
@@ -57238,23 +57302,23 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(zakhring) => [
-      q(7865),
+      q(7867),
       q(0),
       ],
    q(zambian sign language) => [
-      q(7947),
+      q(7949),
       q(0),
       ],
    q(zan gula) => [
-      q(7900),
+      q(7902),
       q(0),
       ],
    q(zanaki) => [
-      q(7813),
+      q(7815),
       q(0),
       ],
    q(zande (individual language)) => [
-      q(7901),
+      q(7903),
       q(0),
       ],
    q(zande languages) => [
@@ -57262,19 +57326,19 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(zangskari) => [
-      q(7821),
+      q(7823),
       q(0),
       ],
    q(zangwal) => [
-      q(7810),
+      q(7812),
       q(0),
       ],
    q(zaniza zapotec) => [
-      q(7934),
+      q(7936),
       q(0),
       ],
    q(zaparo) => [
-      q(7942),
+      q(7944),
       q(0),
       ],
    q(zapotec) => [
@@ -57282,39 +57346,39 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(zaramo) => [
-      q(7812),
+      q(7814),
       q(0),
       ],
    q(zari) => [
-      q(7826),
+      q(7828),
       q(0),
       ],
    q(zarma) => [
-      q(2061),
+      q(2062),
       q(0),
       ],
    q(zarphatic) => [
-      q(7943),
+      q(7945),
       q(0),
       ],
    q(zauzou) => [
-      q(7814),
+      q(7816),
       q(0),
       ],
    q(zay) => [
-      q(7967),
+      q(7969),
       q(0),
       ],
    q(zayein karen) => [
-      q(3725),
+      q(3726),
       q(0),
       ],
    q(zayse-zergulla) => [
-      q(7825),
+      q(7827),
       q(0),
       ],
    q(zaysete) => [
-      q(7825),
+      q(7827),
       q(1),
       ],
    q(zaza) => [
@@ -57330,27 +57394,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(zeem) => [
-      q(7963),
+      q(7965),
       q(0),
       ],
    q(zeeuws) => [
-      q(7834),
+      q(7836),
       q(0),
       ],
    q(zemba) => [
-      q(2025),
+      q(2026),
       q(0),
       ],
    q(zeme naga) => [
-      q(5179),
+      q(5180),
       q(0),
       ],
    q(zemgalian) => [
-      q(7572),
+      q(7573),
       q(0),
       ],
    q(zenag) => [
-      q(7835),
+      q(7837),
       q(0),
       ],
    q(zenaga) => [
@@ -57358,27 +57422,27 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(zenzontepec chatino) => [
-      q(1934),
+      q(1935),
       q(0),
       ],
    q(zerenkel) => [
-      q(7941),
+      q(7943),
       q(0),
       ],
    q(zhaba) => [
-      q(7842),
+      q(7844),
       q(0),
       ],
    q(zhang-zhung) => [
-      q(7571),
+      q(7572),
       q(0),
       ],
    q(zhire) => [
-      q(7844),
+      q(7846),
       q(0),
       ],
    q(zhoa) => [
-      q(7846),
+      q(7848),
       q(0),
       ],
    q(zhuang) => [
@@ -57386,75 +57450,75 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(zia) => [
-      q(7847),
+      q(7849),
       q(0),
       ],
    q(zialo) => [
-      q(7850),
+      q(7852),
       q(0),
       ],
    q(zigula) => [
-      q(7854),
+      q(7856),
       q(0),
       ],
    q(zimakani) => [
-      q(7849),
+      q(7851),
       q(0),
       ],
    q(zimba) => [
-      q(7875),
+      q(7877),
       q(0),
       ],
    q(zimbabwe sign language) => [
-      q(7848),
+      q(7850),
       q(0),
       ],
    q(zinza) => [
-      q(7852),
+      q(7854),
       q(0),
       ],
    q(zire) => [
-      q(6038),
+      q(6039),
       q(0),
       ],
    q(ziriya) => [
-      q(7853),
+      q(7855),
       q(0),
       ],
    q(zizilivakan) => [
-      q(7855),
+      q(7857),
       q(0),
       ],
    q(zo'e) => [
-      q(5631),
+      q(5632),
       q(0),
       ],
    q(zokhuo) => [
-      q(7802),
+      q(7804),
       q(0),
       ],
    q(zoogocho zapotec) => [
-      q(7928),
+      q(7930),
       q(0),
       ],
    q(zoroastrian dari) => [
-      q(2442),
+      q(2443),
       q(0),
       ],
    q(zorop) => [
-      q(7114),
+      q(7115),
       q(1),
       ],
    q(zotung chin) => [
-      q(1936),
+      q(1937),
       q(0),
       ],
    q(zou) => [
-      q(7907),
+      q(7909),
       q(0),
       ],
    q(zulgo-gemzek) => [
-      q(2569),
+      q(2570),
       q(0),
       ],
    q(zulu) => [
@@ -57462,7 +57526,7 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(zumaya) => [
-      q(7966),
+      q(7968),
       q(0),
       ],
    q(zumbun) => [
@@ -57474,11 +57538,11 @@ $Locale::Codes::Data{'language'}{'alias2id'} = {
       q(0),
       ],
    q(zuojiang zhuang) => [
-      q(7973),
+      q(7975),
       q(0),
       ],
    q(zyphe chin) => [
-      q(7972),
+      q(7974),
       q(0),
       ],
 };
@@ -59900,67 +59964,67 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ato) => [
-         q(0830),
+         q(0921),
          q(0),
          ],
       q(atp) => [
-         q(0921),
+         q(0922),
          q(0),
          ],
       q(atq) => [
-         q(0922),
+         q(0923),
          q(0),
          ],
       q(atr) => [
-         q(0923),
+         q(0924),
          q(0),
          ],
       q(ats) => [
-         q(0924),
+         q(0925),
          q(0),
          ],
       q(att) => [
-         q(0925),
+         q(0926),
          q(0),
          ],
       q(atu) => [
-         q(0926),
+         q(0927),
          q(0),
          ],
       q(atv) => [
-         q(0927),
+         q(0928),
          q(0),
          ],
       q(atw) => [
-         q(0928),
+         q(0929),
          q(0),
          ],
       q(atx) => [
-         q(0929),
+         q(0930),
          q(0),
          ],
       q(aty) => [
-         q(0930),
+         q(0931),
          q(0),
          ],
       q(atz) => [
-         q(0931),
+         q(0932),
          q(0),
          ],
       q(aua) => [
-         q(0932),
+         q(0933),
          q(0),
          ],
       q(aub) => [
-         q(0933),
+         q(0934),
          q(0),
          ],
       q(auc) => [
-         q(0934),
+         q(0935),
          q(0),
          ],
       q(aud) => [
-         q(0935),
+         q(0936),
          q(0),
          ],
       q(auf) => [
@@ -59968,51 +60032,51 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(aug) => [
-         q(0936),
+         q(0937),
          q(0),
          ],
       q(auh) => [
-         q(0937),
+         q(0938),
          q(0),
          ],
       q(aui) => [
-         q(0938),
+         q(0939),
          q(0),
          ],
       q(auj) => [
-         q(0939),
+         q(0940),
          q(0),
          ],
       q(auk) => [
-         q(0940),
+         q(0941),
          q(0),
          ],
       q(aul) => [
-         q(0941),
+         q(0942),
          q(0),
          ],
       q(aum) => [
-         q(0942),
+         q(0943),
          q(0),
          ],
       q(aun) => [
-         q(0943),
+         q(0944),
          q(0),
          ],
       q(auo) => [
-         q(0944),
+         q(0945),
          q(0),
          ],
       q(aup) => [
-         q(0945),
+         q(0946),
          q(0),
          ],
       q(auq) => [
-         q(0946),
+         q(0947),
          q(0),
          ],
       q(aur) => [
-         q(0947),
+         q(0948),
          q(0),
          ],
       q(aus) => [
@@ -60020,27 +60084,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(aut) => [
-         q(0948),
+         q(0949),
          q(0),
          ],
       q(auu) => [
-         q(0949),
+         q(0950),
          q(0),
          ],
       q(auw) => [
-         q(0950),
+         q(0951),
          q(0),
          ],
       q(aux) => [
-         q(0951),
+         q(0952),
          q(0),
          ],
       q(auy) => [
-         q(0952),
+         q(0953),
          q(0),
          ],
       q(auz) => [
-         q(0953),
+         q(0954),
          q(0),
          ],
       q(ava) => [
@@ -60048,11 +60112,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(avb) => [
-         q(0954),
+         q(0955),
          q(0),
          ],
       q(avd) => [
-         q(0955),
+         q(0956),
          q(0),
          ],
       q(ave) => [
@@ -60060,43 +60124,43 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(avi) => [
-         q(0956),
+         q(0957),
          q(0),
          ],
       q(avk) => [
-         q(0957),
+         q(0958),
          q(0),
          ],
       q(avl) => [
-         q(0958),
+         q(0959),
          q(0),
          ],
       q(avm) => [
-         q(0959),
+         q(0960),
          q(0),
          ],
       q(avn) => [
-         q(0960),
+         q(0961),
          q(0),
          ],
       q(avo) => [
-         q(0961),
+         q(0962),
          q(0),
          ],
       q(avs) => [
-         q(0962),
+         q(0963),
          q(0),
          ],
       q(avt) => [
-         q(0963),
+         q(0964),
          q(0),
          ],
       q(avu) => [
-         q(0964),
+         q(0965),
          q(0),
          ],
       q(avv) => [
-         q(0965),
+         q(0966),
          q(0),
          ],
       q(awa) => [
@@ -60104,11 +60168,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(awb) => [
-         q(0966),
+         q(0967),
          q(0),
          ],
       q(awc) => [
-         q(0967),
+         q(0968),
          q(0),
          ],
       q(awd) => [
@@ -60116,135 +60180,135 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(awe) => [
-         q(0968),
+         q(0969),
          q(0),
          ],
       q(awg) => [
-         q(0969),
+         q(0970),
          q(0),
          ],
       q(awh) => [
-         q(0970),
+         q(0971),
          q(0),
          ],
       q(awi) => [
-         q(0971),
+         q(0972),
          q(0),
          ],
       q(awk) => [
-         q(0972),
+         q(0973),
          q(0),
          ],
       q(awm) => [
-         q(0973),
+         q(0974),
          q(0),
          ],
       q(awn) => [
-         q(0974),
+         q(0975),
          q(0),
          ],
       q(awo) => [
-         q(0975),
+         q(0976),
          q(0),
          ],
       q(awr) => [
-         q(0976),
+         q(0977),
          q(0),
          ],
       q(aws) => [
-         q(0977),
+         q(0978),
          q(0),
          ],
       q(awt) => [
-         q(0978),
+         q(0979),
          q(0),
          ],
       q(awu) => [
-         q(0979),
+         q(0980),
          q(0),
          ],
       q(awv) => [
-         q(0980),
+         q(0981),
          q(0),
          ],
       q(aww) => [
-         q(0981),
+         q(0982),
          q(0),
          ],
       q(awx) => [
-         q(0982),
+         q(0983),
          q(0),
          ],
       q(awy) => [
-         q(0983),
+         q(0984),
          q(0),
          ],
       q(axb) => [
-         q(0984),
+         q(0985),
          q(0),
          ],
       q(axe) => [
-         q(0985),
+         q(0986),
          q(0),
          ],
       q(axg) => [
-         q(0986),
+         q(0987),
          q(0),
          ],
       q(axk) => [
-         q(0987),
+         q(0988),
          q(0),
          ],
       q(axl) => [
-         q(0988),
+         q(0989),
          q(0),
          ],
       q(axm) => [
-         q(0989),
+         q(0990),
          q(0),
          ],
       q(axx) => [
-         q(0990),
+         q(0991),
          q(0),
          ],
       q(aya) => [
-         q(0991),
+         q(0992),
          q(0),
          ],
       q(ayb) => [
-         q(0992),
+         q(0993),
          q(0),
          ],
       q(ayc) => [
-         q(0993),
+         q(0994),
          q(0),
          ],
       q(ayd) => [
-         q(0994),
+         q(0995),
          q(0),
          ],
       q(aye) => [
-         q(0995),
+         q(0996),
          q(0),
          ],
       q(ayg) => [
-         q(0996),
+         q(0997),
          q(0),
          ],
       q(ayh) => [
-         q(0997),
+         q(0998),
          q(0),
          ],
       q(ayi) => [
-         q(0998),
+         q(0999),
          q(0),
          ],
       q(ayk) => [
-         q(0999),
+         q(1000),
          q(0),
          ],
       q(ayl) => [
-         q(1000),
+         q(1001),
          q(0),
          ],
       q(aym) => [
@@ -60252,51 +60316,51 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ayn) => [
-         q(1001),
+         q(1002),
          q(0),
          ],
       q(ayo) => [
-         q(1002),
+         q(1003),
          q(0),
          ],
       q(ayp) => [
-         q(1003),
+         q(1004),
          q(0),
          ],
       q(ayq) => [
-         q(1004),
+         q(1005),
          q(0),
          ],
       q(ayr) => [
-         q(1005),
+         q(1006),
          q(0),
          ],
       q(ays) => [
-         q(1006),
+         q(1007),
          q(0),
          ],
       q(ayt) => [
-         q(1007),
+         q(1008),
          q(0),
          ],
       q(ayu) => [
-         q(1008),
+         q(1009),
          q(0),
          ],
       q(ayy) => [
-         q(1009),
+         q(1010),
          q(0),
          ],
       q(ayz) => [
-         q(1010),
+         q(1011),
          q(0),
          ],
       q(aza) => [
-         q(1011),
+         q(1012),
          q(0),
          ],
       q(azb) => [
-         q(1012),
+         q(1013),
          q(0),
          ],
       q(azc) => [
@@ -60304,7 +60368,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(azd) => [
-         q(1013),
+         q(1014),
          q(0),
          ],
       q(aze) => [
@@ -60312,43 +60376,43 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(azg) => [
-         q(1014),
+         q(1015),
          q(0),
          ],
       q(azj) => [
-         q(1015),
+         q(1016),
          q(0),
          ],
       q(azm) => [
-         q(1016),
+         q(1017),
          q(0),
          ],
       q(azn) => [
-         q(1017),
+         q(1018),
          q(0),
          ],
       q(azo) => [
-         q(1018),
+         q(1019),
          q(0),
          ],
       q(azt) => [
-         q(1019),
+         q(1020),
          q(0),
          ],
       q(azz) => [
-         q(1020),
+         q(1021),
          q(0),
          ],
       q(baa) => [
-         q(1021),
+         q(1022),
          q(0),
          ],
       q(bab) => [
-         q(1022),
+         q(1023),
          q(0),
          ],
       q(bac) => [
-         q(1023),
+         q(1024),
          q(0),
          ],
       q(bad) => [
@@ -60356,19 +60420,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bae) => [
-         q(1024),
+         q(1025),
          q(0),
          ],
       q(baf) => [
-         q(1025),
+         q(1026),
          q(0),
          ],
       q(bag) => [
-         q(1026),
+         q(1027),
          q(0),
          ],
       q(bah) => [
-         q(1027),
+         q(1028),
          q(0),
          ],
       q(bai) => [
@@ -60376,7 +60440,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(baj) => [
-         q(1028),
+         q(1029),
          q(0),
          ],
       q(bak) => [
@@ -60396,11 +60460,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bao) => [
-         q(1029),
+         q(1030),
          q(0),
          ],
       q(bap) => [
-         q(1030),
+         q(1031),
          q(0),
          ],
       q(baq) => [
@@ -60408,7 +60472,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bar) => [
-         q(1031),
+         q(1032),
          q(0),
          ],
       q(bas) => [
@@ -60420,367 +60484,367 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bau) => [
-         q(1032),
+         q(1033),
          q(0),
          ],
       q(bav) => [
-         q(1033),
+         q(1034),
          q(0),
          ],
       q(baw) => [
-         q(1034),
+         q(1035),
          q(0),
          ],
       q(bax) => [
-         q(1035),
+         q(1036),
          q(0),
          ],
       q(bay) => [
-         q(1036),
+         q(1037),
          q(0),
          ],
       q(bba) => [
-         q(1037),
+         q(1038),
          q(0),
          ],
       q(bbb) => [
-         q(1038),
+         q(1039),
          q(0),
          ],
       q(bbc) => [
-         q(1039),
+         q(1040),
          q(0),
          ],
       q(bbd) => [
-         q(1040),
+         q(1041),
          q(0),
          ],
       q(bbe) => [
-         q(1041),
+         q(1042),
          q(0),
          ],
       q(bbf) => [
-         q(1042),
+         q(1043),
          q(0),
          ],
       q(bbg) => [
-         q(1043),
+         q(1044),
          q(0),
          ],
       q(bbh) => [
-         q(1044),
+         q(1045),
          q(0),
          ],
       q(bbi) => [
-         q(1045),
+         q(1046),
          q(0),
          ],
       q(bbj) => [
-         q(1046),
+         q(1047),
          q(0),
          ],
       q(bbk) => [
-         q(1047),
+         q(1048),
          q(0),
          ],
       q(bbl) => [
-         q(1048),
+         q(1049),
          q(0),
          ],
       q(bbm) => [
-         q(1049),
+         q(1050),
          q(0),
          ],
       q(bbn) => [
-         q(1050),
+         q(1051),
          q(0),
          ],
       q(bbo) => [
-         q(1051),
+         q(1052),
          q(0),
          ],
       q(bbp) => [
-         q(1052),
+         q(1053),
          q(0),
          ],
       q(bbq) => [
-         q(1053),
+         q(1054),
          q(0),
          ],
       q(bbr) => [
-         q(1054),
+         q(1055),
          q(0),
          ],
       q(bbs) => [
-         q(1055),
+         q(1056),
          q(0),
          ],
       q(bbt) => [
-         q(1056),
+         q(1057),
          q(0),
          ],
       q(bbu) => [
-         q(1057),
+         q(1058),
          q(0),
          ],
       q(bbv) => [
-         q(1058),
+         q(1059),
          q(0),
          ],
       q(bbw) => [
-         q(1059),
+         q(1060),
          q(0),
          ],
       q(bbx) => [
-         q(1060),
+         q(1061),
          q(0),
          ],
       q(bby) => [
-         q(1061),
+         q(1062),
          q(0),
          ],
       q(bbz) => [
-         q(1062),
+         q(1063),
          q(0),
          ],
       q(bca) => [
-         q(1063),
+         q(1064),
          q(0),
          ],
       q(bcb) => [
-         q(1064),
+         q(1065),
          q(0),
          ],
       q(bcc) => [
-         q(1065),
+         q(1066),
          q(0),
          ],
       q(bcd) => [
-         q(1066),
+         q(1067),
          q(0),
          ],
       q(bce) => [
-         q(1067),
+         q(1068),
          q(0),
          ],
       q(bcf) => [
-         q(1068),
+         q(1069),
          q(0),
          ],
       q(bcg) => [
-         q(1069),
+         q(1070),
          q(0),
          ],
       q(bch) => [
-         q(1070),
+         q(1071),
          q(0),
          ],
       q(bci) => [
-         q(1071),
+         q(1072),
          q(0),
          ],
       q(bcj) => [
-         q(1072),
+         q(1073),
          q(0),
          ],
       q(bck) => [
-         q(1073),
+         q(1074),
          q(0),
          ],
       q(bcl) => [
-         q(1074),
+         q(1075),
          q(0),
          ],
       q(bcm) => [
-         q(1075),
+         q(1076),
          q(0),
          ],
       q(bcn) => [
-         q(1076),
+         q(1077),
          q(0),
          ],
       q(bco) => [
-         q(1077),
+         q(1078),
          q(0),
          ],
       q(bcp) => [
-         q(1078),
+         q(1079),
          q(0),
          ],
       q(bcq) => [
-         q(1079),
+         q(1080),
          q(0),
          ],
       q(bcr) => [
-         q(1080),
+         q(1081),
          q(0),
          ],
       q(bcs) => [
-         q(1081),
+         q(1082),
          q(0),
          ],
       q(bct) => [
-         q(1082),
+         q(1083),
          q(0),
          ],
       q(bcu) => [
-         q(1083),
+         q(1084),
          q(0),
          ],
       q(bcv) => [
-         q(1084),
+         q(1085),
          q(0),
          ],
       q(bcw) => [
-         q(1085),
+         q(1086),
          q(0),
          ],
       q(bcy) => [
-         q(1086),
+         q(1087),
          q(0),
          ],
       q(bcz) => [
-         q(1087),
+         q(1088),
          q(0),
          ],
       q(bda) => [
-         q(1088),
+         q(1089),
          q(0),
          ],
       q(bdb) => [
-         q(1089),
+         q(1090),
          q(0),
          ],
       q(bdc) => [
-         q(1090),
+         q(1091),
          q(0),
          ],
       q(bdd) => [
-         q(1091),
+         q(1092),
          q(0),
          ],
       q(bde) => [
-         q(1092),
+         q(1093),
          q(0),
          ],
       q(bdf) => [
-         q(1093),
+         q(1094),
          q(0),
          ],
       q(bdg) => [
-         q(1094),
+         q(1095),
          q(0),
          ],
       q(bdh) => [
-         q(1095),
+         q(1096),
          q(0),
          ],
       q(bdi) => [
-         q(1096),
+         q(1097),
          q(0),
          ],
       q(bdj) => [
-         q(1097),
+         q(1098),
          q(0),
          ],
       q(bdk) => [
-         q(1098),
+         q(1099),
          q(0),
          ],
       q(bdl) => [
-         q(1099),
+         q(1100),
          q(0),
          ],
       q(bdm) => [
-         q(1100),
+         q(1101),
          q(0),
          ],
       q(bdn) => [
-         q(1101),
+         q(1102),
          q(0),
          ],
       q(bdo) => [
-         q(1102),
+         q(1103),
          q(0),
          ],
       q(bdp) => [
-         q(1103),
+         q(1104),
          q(0),
          ],
       q(bdq) => [
-         q(1104),
+         q(1105),
          q(0),
          ],
       q(bdr) => [
-         q(1105),
+         q(1106),
          q(0),
          ],
       q(bds) => [
-         q(1106),
+         q(1107),
          q(0),
          ],
       q(bdt) => [
-         q(1107),
+         q(1108),
          q(0),
          ],
       q(bdu) => [
-         q(1108),
+         q(1109),
          q(0),
          ],
       q(bdv) => [
-         q(1109),
+         q(1110),
          q(0),
          ],
       q(bdw) => [
-         q(1110),
+         q(1111),
          q(0),
          ],
       q(bdx) => [
-         q(1111),
+         q(1112),
          q(0),
          ],
       q(bdy) => [
-         q(1112),
+         q(1113),
          q(0),
          ],
       q(bdz) => [
-         q(1113),
+         q(1114),
          q(0),
          ],
       q(bea) => [
-         q(1114),
+         q(1115),
          q(0),
          ],
       q(beb) => [
-         q(1115),
+         q(1116),
          q(0),
          ],
       q(bec) => [
-         q(1116),
+         q(1117),
          q(0),
          ],
       q(bed) => [
-         q(1117),
+         q(1118),
          q(0),
          ],
       q(bee) => [
-         q(1118),
+         q(1119),
          q(0),
          ],
       q(bef) => [
-         q(1119),
+         q(1120),
          q(0),
          ],
       q(beg) => [
-         q(1120),
+         q(1121),
          q(0),
          ],
       q(beh) => [
-         q(1121),
+         q(1122),
          q(0),
          ],
       q(bei) => [
-         q(1122),
+         q(1123),
          q(0),
          ],
       q(bej) => [
@@ -60788,7 +60852,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bek) => [
-         q(1123),
+         q(1124),
          q(0),
          ],
       q(bel) => [
@@ -60804,15 +60868,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(beo) => [
-         q(1124),
+         q(1125),
          q(0),
          ],
       q(bep) => [
-         q(1125),
+         q(1126),
          q(0),
          ],
       q(beq) => [
-         q(1126),
+         q(1127),
          q(0),
          ],
       q(ber) => [
@@ -60820,287 +60884,287 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bes) => [
-         q(1127),
+         q(1128),
          q(0),
          ],
       q(bet) => [
-         q(1128),
+         q(1129),
          q(0),
          ],
       q(beu) => [
-         q(1129),
+         q(1130),
          q(0),
          ],
       q(bev) => [
-         q(1130),
+         q(1131),
          q(0),
          ],
       q(bew) => [
-         q(1131),
+         q(1132),
          q(0),
          ],
       q(bex) => [
-         q(1132),
+         q(1133),
          q(0),
          ],
       q(bey) => [
-         q(1133),
+         q(1134),
          q(0),
          ],
       q(bez) => [
-         q(1134),
+         q(1135),
          q(0),
          ],
       q(bfa) => [
-         q(1135),
+         q(1136),
          q(0),
          ],
       q(bfb) => [
-         q(1136),
+         q(1137),
          q(0),
          ],
       q(bfc) => [
-         q(1137),
+         q(1138),
          q(0),
          ],
       q(bfd) => [
-         q(1138),
+         q(1139),
          q(0),
          ],
       q(bfe) => [
-         q(1139),
+         q(1140),
          q(0),
          ],
       q(bff) => [
-         q(1140),
+         q(1141),
          q(0),
          ],
       q(bfg) => [
-         q(1141),
+         q(1142),
          q(0),
          ],
       q(bfh) => [
-         q(1142),
+         q(1143),
          q(0),
          ],
       q(bfi) => [
-         q(1143),
+         q(1144),
          q(0),
          ],
       q(bfj) => [
-         q(1144),
+         q(1145),
          q(0),
          ],
       q(bfk) => [
-         q(1145),
+         q(1146),
          q(0),
          ],
       q(bfl) => [
-         q(1146),
+         q(1147),
          q(0),
          ],
       q(bfm) => [
-         q(1147),
+         q(1148),
          q(0),
          ],
       q(bfn) => [
-         q(1148),
+         q(1149),
          q(0),
          ],
       q(bfo) => [
-         q(1149),
+         q(1150),
          q(0),
          ],
       q(bfp) => [
-         q(1150),
+         q(1151),
          q(0),
          ],
       q(bfq) => [
-         q(1151),
+         q(1152),
          q(0),
          ],
       q(bfr) => [
-         q(1152),
+         q(1153),
          q(0),
          ],
       q(bfs) => [
-         q(1153),
+         q(1154),
          q(0),
          ],
       q(bft) => [
-         q(1154),
+         q(1155),
          q(0),
          ],
       q(bfu) => [
-         q(1155),
+         q(1156),
          q(0),
          ],
       q(bfw) => [
-         q(1156),
+         q(1157),
          q(0),
          ],
       q(bfx) => [
-         q(1157),
+         q(1158),
          q(0),
          ],
       q(bfy) => [
-         q(1158),
+         q(1159),
          q(0),
          ],
       q(bfz) => [
-         q(1159),
+         q(1160),
          q(0),
          ],
       q(bga) => [
-         q(1160),
+         q(1161),
          q(0),
          ],
       q(bgb) => [
-         q(1161),
+         q(1162),
          q(0),
          ],
       q(bgc) => [
-         q(1162),
+         q(1163),
          q(0),
          ],
       q(bgd) => [
-         q(1163),
+         q(1164),
          q(0),
          ],
       q(bge) => [
-         q(1164),
+         q(1165),
          q(0),
          ],
       q(bgf) => [
-         q(1165),
+         q(1166),
          q(0),
          ],
       q(bgg) => [
-         q(1166),
+         q(1167),
          q(0),
          ],
       q(bgi) => [
-         q(1167),
+         q(1168),
          q(0),
          ],
       q(bgj) => [
-         q(1168),
+         q(1169),
          q(0),
          ],
       q(bgk) => [
-         q(1169),
+         q(1170),
          q(0),
          ],
       q(bgl) => [
-         q(1170),
+         q(1171),
          q(0),
          ],
       q(bgm) => [
-         q(1171),
+         q(1172),
          q(0),
          ],
       q(bgn) => [
-         q(1172),
+         q(1173),
          q(0),
          ],
       q(bgo) => [
-         q(1173),
+         q(1174),
          q(0),
          ],
       q(bgp) => [
-         q(1174),
+         q(1175),
          q(0),
          ],
       q(bgq) => [
-         q(1175),
+         q(1176),
          q(0),
          ],
       q(bgr) => [
-         q(1176),
+         q(1177),
          q(0),
          ],
       q(bgs) => [
-         q(1177),
+         q(1178),
          q(0),
          ],
       q(bgt) => [
-         q(1178),
+         q(1179),
          q(0),
          ],
       q(bgu) => [
-         q(1179),
+         q(1180),
          q(0),
          ],
       q(bgv) => [
-         q(1180),
+         q(1181),
          q(0),
          ],
       q(bgw) => [
-         q(1181),
+         q(1182),
          q(0),
          ],
       q(bgx) => [
-         q(1182),
+         q(1183),
          q(0),
          ],
       q(bgy) => [
-         q(1183),
+         q(1184),
          q(0),
          ],
       q(bgz) => [
-         q(1184),
+         q(1185),
          q(0),
          ],
       q(bha) => [
-         q(1185),
+         q(1186),
          q(0),
          ],
       q(bhb) => [
-         q(1186),
+         q(1187),
          q(0),
          ],
       q(bhc) => [
-         q(1187),
+         q(1188),
          q(0),
          ],
       q(bhd) => [
-         q(1188),
+         q(1189),
          q(0),
          ],
       q(bhe) => [
-         q(1189),
+         q(1190),
          q(0),
          ],
       q(bhf) => [
-         q(1190),
+         q(1191),
          q(0),
          ],
       q(bhg) => [
-         q(1191),
+         q(1192),
          q(0),
          ],
       q(bhh) => [
-         q(1192),
+         q(1193),
          q(0),
          ],
       q(bhi) => [
-         q(1193),
+         q(1194),
          q(0),
          ],
       q(bhj) => [
-         q(1194),
+         q(1195),
          q(0),
          ],
       q(bhl) => [
-         q(1195),
+         q(1196),
          q(0),
          ],
       q(bhm) => [
-         q(1196),
+         q(1197),
          q(0),
          ],
       q(bhn) => [
-         q(1197),
+         q(1198),
          q(0),
          ],
       q(bho) => [
@@ -61108,75 +61172,75 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bhp) => [
-         q(1198),
+         q(1199),
          q(0),
          ],
       q(bhq) => [
-         q(1199),
+         q(1200),
          q(0),
          ],
       q(bhr) => [
-         q(1200),
+         q(1201),
          q(0),
          ],
       q(bhs) => [
-         q(1201),
+         q(1202),
          q(0),
          ],
       q(bht) => [
-         q(1202),
+         q(1203),
          q(0),
          ],
       q(bhu) => [
-         q(1203),
+         q(1204),
          q(0),
          ],
       q(bhv) => [
-         q(1204),
+         q(1205),
          q(0),
          ],
       q(bhw) => [
-         q(1205),
+         q(1206),
          q(0),
          ],
       q(bhx) => [
-         q(1206),
+         q(1207),
          q(0),
          ],
       q(bhy) => [
-         q(1207),
+         q(1208),
          q(0),
          ],
       q(bhz) => [
-         q(1208),
+         q(1209),
          q(0),
          ],
       q(bia) => [
-         q(1209),
+         q(1210),
          q(0),
          ],
       q(bib) => [
-         q(1210),
+         q(1211),
          q(0),
          ],
       q(bic) => [
-         q(1211),
+         q(1212),
          q(0),
          ],
       q(bid) => [
-         q(1212),
+         q(1213),
          q(0),
          ],
       q(bie) => [
-         q(1213),
+         q(1214),
          q(0),
          ],
       q(bif) => [
-         q(1214),
+         q(1215),
          q(0),
          ],
       q(big) => [
-         q(1215),
+         q(1216),
          q(0),
          ],
       q(bih) => [
@@ -61184,7 +61248,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bij) => [
-         q(1216),
+         q(1217),
          q(0),
          ],
       q(bik) => [
@@ -61192,11 +61256,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bil) => [
-         q(1217),
+         q(1218),
          q(0),
          ],
       q(bim) => [
-         q(1218),
+         q(1219),
          q(0),
          ],
       q(bin) => [
@@ -61204,19 +61268,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bio) => [
-         q(1219),
+         q(1220),
          q(0),
          ],
       q(bip) => [
-         q(1220),
+         q(1221),
          q(0),
          ],
       q(biq) => [
-         q(1221),
+         q(1222),
          q(0),
          ],
       q(bir) => [
-         q(1222),
+         q(1223),
          q(0),
          ],
       q(bis) => [
@@ -61224,223 +61288,223 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bit) => [
-         q(1223),
+         q(1224),
          q(0),
          ],
       q(biu) => [
-         q(1224),
+         q(1225),
          q(0),
          ],
       q(biv) => [
-         q(1225),
+         q(1226),
          q(0),
          ],
       q(biw) => [
-         q(1226),
+         q(1227),
          q(0),
          ],
       q(bix) => [
-         q(1227),
+         q(1228),
          q(0),
          ],
       q(biy) => [
-         q(1228),
+         q(1229),
          q(0),
          ],
       q(biz) => [
-         q(1229),
+         q(1230),
          q(0),
          ],
       q(bja) => [
-         q(1230),
+         q(1231),
          q(0),
          ],
       q(bjb) => [
-         q(1231),
+         q(1232),
          q(0),
          ],
       q(bjc) => [
-         q(1232),
+         q(1233),
          q(0),
          ],
       q(bje) => [
-         q(1233),
+         q(1234),
          q(0),
          ],
       q(bjf) => [
-         q(1234),
+         q(1235),
          q(0),
          ],
       q(bjg) => [
-         q(1235),
+         q(1236),
          q(0),
          ],
       q(bjh) => [
-         q(1236),
+         q(1237),
          q(0),
          ],
       q(bji) => [
-         q(1237),
+         q(1238),
          q(0),
          ],
       q(bjj) => [
-         q(1238),
+         q(1239),
          q(0),
          ],
       q(bjk) => [
-         q(1239),
+         q(1240),
          q(0),
          ],
       q(bjl) => [
-         q(1240),
+         q(1241),
          q(0),
          ],
       q(bjm) => [
-         q(1241),
+         q(1242),
          q(0),
          ],
       q(bjn) => [
-         q(1242),
+         q(1243),
          q(0),
          ],
       q(bjo) => [
-         q(1243),
+         q(1244),
          q(0),
          ],
       q(bjp) => [
-         q(1244),
+         q(1245),
          q(0),
          ],
       q(bjr) => [
-         q(1245),
+         q(1246),
          q(0),
          ],
       q(bjs) => [
-         q(1246),
+         q(1247),
          q(0),
          ],
       q(bjt) => [
-         q(1247),
+         q(1248),
          q(0),
          ],
       q(bju) => [
-         q(1248),
+         q(1249),
          q(0),
          ],
       q(bjv) => [
-         q(1249),
+         q(1250),
          q(0),
          ],
       q(bjw) => [
-         q(1250),
+         q(1251),
          q(0),
          ],
       q(bjx) => [
-         q(1251),
+         q(1252),
          q(0),
          ],
       q(bjy) => [
-         q(1252),
+         q(1253),
          q(0),
          ],
       q(bjz) => [
-         q(1253),
+         q(1254),
          q(0),
          ],
       q(bka) => [
-         q(1254),
+         q(1255),
          q(0),
          ],
       q(bkc) => [
-         q(1255),
+         q(1256),
          q(0),
          ],
       q(bkd) => [
-         q(1256),
+         q(1257),
          q(0),
          ],
       q(bkf) => [
-         q(1257),
+         q(1258),
          q(0),
          ],
       q(bkg) => [
-         q(1258),
+         q(1259),
          q(0),
          ],
       q(bkh) => [
-         q(1259),
+         q(1260),
          q(0),
          ],
       q(bki) => [
-         q(1260),
+         q(1261),
          q(0),
          ],
       q(bkj) => [
-         q(1261),
+         q(1262),
          q(0),
          ],
       q(bkk) => [
-         q(1262),
+         q(1263),
          q(0),
          ],
       q(bkl) => [
-         q(1263),
+         q(1264),
          q(0),
          ],
       q(bkm) => [
-         q(1264),
+         q(1265),
          q(0),
          ],
       q(bkn) => [
-         q(1265),
+         q(1266),
          q(0),
          ],
       q(bko) => [
-         q(1266),
+         q(1267),
          q(0),
          ],
       q(bkp) => [
-         q(1267),
+         q(1268),
          q(0),
          ],
       q(bkq) => [
-         q(1268),
+         q(1269),
          q(0),
          ],
       q(bkr) => [
-         q(1269),
+         q(1270),
          q(0),
          ],
       q(bks) => [
-         q(1270),
+         q(1271),
          q(0),
          ],
       q(bkt) => [
-         q(1271),
+         q(1272),
          q(0),
          ],
       q(bku) => [
-         q(1272),
+         q(1273),
          q(0),
          ],
       q(bkv) => [
-         q(1273),
+         q(1274),
          q(0),
          ],
       q(bkw) => [
-         q(1274),
+         q(1275),
          q(0),
          ],
       q(bkx) => [
-         q(1275),
+         q(1276),
          q(0),
          ],
       q(bky) => [
-         q(1276),
+         q(1277),
          q(0),
          ],
       q(bkz) => [
-         q(1277),
+         q(1278),
          q(0),
          ],
       q(bla) => [
@@ -61448,271 +61512,271 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(blb) => [
-         q(1278),
+         q(1279),
          q(0),
          ],
       q(blc) => [
-         q(1279),
+         q(1280),
          q(0),
          ],
       q(bld) => [
-         q(1280),
+         q(1281),
          q(0),
          ],
       q(ble) => [
-         q(1281),
+         q(1282),
          q(0),
          ],
       q(blf) => [
-         q(1282),
+         q(1283),
          q(0),
          ],
       q(blg) => [
-         q(1283),
+         q(1284),
          q(0),
          ],
       q(blh) => [
-         q(1284),
+         q(1285),
          q(0),
          ],
       q(bli) => [
-         q(1285),
+         q(1286),
          q(0),
          ],
       q(blj) => [
-         q(1286),
+         q(1287),
          q(0),
          ],
       q(blk) => [
-         q(1287),
+         q(1288),
          q(0),
          ],
       q(bll) => [
-         q(1288),
+         q(1289),
          q(0),
          ],
       q(blm) => [
-         q(1289),
+         q(1290),
          q(0),
          ],
       q(bln) => [
-         q(1290),
+         q(1291),
          q(0),
          ],
       q(blo) => [
-         q(1291),
+         q(1292),
          q(0),
          ],
       q(blp) => [
-         q(1292),
+         q(1293),
          q(0),
          ],
       q(blq) => [
-         q(1293),
+         q(1294),
          q(0),
          ],
       q(blr) => [
-         q(1294),
+         q(1295),
          q(0),
          ],
       q(bls) => [
-         q(1295),
+         q(1296),
          q(0),
          ],
       q(blt) => [
-         q(1296),
+         q(1297),
          q(0),
          ],
       q(blv) => [
-         q(1297),
+         q(1298),
          q(0),
          ],
       q(blw) => [
-         q(1298),
+         q(1299),
          q(0),
          ],
       q(blx) => [
-         q(1299),
+         q(1300),
          q(0),
          ],
       q(bly) => [
-         q(1300),
+         q(1301),
          q(0),
          ],
       q(blz) => [
-         q(1301),
+         q(1302),
          q(0),
          ],
       q(bma) => [
-         q(1302),
+         q(1303),
          q(0),
          ],
       q(bmb) => [
-         q(1303),
+         q(1304),
          q(0),
          ],
       q(bmc) => [
-         q(1304),
+         q(1305),
          q(0),
          ],
       q(bmd) => [
-         q(1305),
+         q(1306),
          q(0),
          ],
       q(bme) => [
-         q(1306),
+         q(1307),
          q(0),
          ],
       q(bmf) => [
-         q(1307),
+         q(1308),
          q(0),
          ],
       q(bmg) => [
-         q(1308),
+         q(1309),
          q(0),
          ],
       q(bmh) => [
-         q(1309),
+         q(1310),
          q(0),
          ],
       q(bmi) => [
-         q(1310),
+         q(1311),
          q(0),
          ],
       q(bmj) => [
-         q(1311),
+         q(1312),
          q(0),
          ],
       q(bmk) => [
-         q(1312),
+         q(1313),
          q(0),
          ],
       q(bml) => [
-         q(1313),
+         q(1314),
          q(0),
          ],
       q(bmm) => [
-         q(1314),
+         q(1315),
          q(0),
          ],
       q(bmn) => [
-         q(1315),
+         q(1316),
          q(0),
          ],
       q(bmo) => [
-         q(1316),
+         q(1317),
          q(0),
          ],
       q(bmp) => [
-         q(1317),
+         q(1318),
          q(0),
          ],
       q(bmq) => [
-         q(1318),
+         q(1319),
          q(0),
          ],
       q(bmr) => [
-         q(1319),
+         q(1320),
          q(0),
          ],
       q(bms) => [
-         q(1320),
+         q(1321),
          q(0),
          ],
       q(bmt) => [
-         q(1321),
+         q(1322),
          q(0),
          ],
       q(bmu) => [
-         q(1322),
+         q(1323),
          q(0),
          ],
       q(bmv) => [
-         q(1323),
+         q(1324),
          q(0),
          ],
       q(bmw) => [
-         q(1324),
+         q(1325),
          q(0),
          ],
       q(bmx) => [
-         q(1325),
+         q(1326),
          q(0),
          ],
       q(bmz) => [
-         q(1326),
+         q(1327),
          q(0),
          ],
       q(bna) => [
-         q(1327),
+         q(1328),
          q(0),
          ],
       q(bnb) => [
-         q(1328),
+         q(1329),
          q(0),
          ],
       q(bnc) => [
-         q(1329),
+         q(1330),
          q(0),
          ],
       q(bnd) => [
-         q(1330),
+         q(1331),
          q(0),
          ],
       q(bne) => [
-         q(1331),
+         q(1332),
          q(0),
          ],
       q(bnf) => [
-         q(1332),
+         q(1333),
          q(0),
          ],
       q(bng) => [
-         q(1333),
+         q(1334),
          q(0),
          ],
       q(bni) => [
-         q(1334),
+         q(1335),
          q(0),
          ],
       q(bnj) => [
-         q(1335),
+         q(1336),
          q(0),
          ],
       q(bnk) => [
-         q(1336),
+         q(1337),
          q(0),
          ],
       q(bnl) => [
-         q(1337),
+         q(1338),
          q(0),
          ],
       q(bnm) => [
-         q(1338),
+         q(1339),
          q(0),
          ],
       q(bnn) => [
-         q(1339),
+         q(1340),
          q(0),
          ],
       q(bno) => [
-         q(1340),
+         q(1341),
          q(0),
          ],
       q(bnp) => [
-         q(1341),
+         q(1342),
          q(0),
          ],
       q(bnq) => [
-         q(1342),
+         q(1343),
          q(0),
          ],
       q(bnr) => [
-         q(1343),
+         q(1344),
          q(0),
          ],
       q(bns) => [
-         q(1344),
+         q(1345),
          q(0),
          ],
       q(bnt) => [
@@ -61720,91 +61784,91 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(bnu) => [
-         q(1345),
+         q(1346),
          q(0),
          ],
       q(bnv) => [
-         q(1346),
+         q(1347),
          q(0),
          ],
       q(bnw) => [
-         q(1347),
+         q(1348),
          q(0),
          ],
       q(bnx) => [
-         q(1348),
+         q(1349),
          q(0),
          ],
       q(bny) => [
-         q(1349),
+         q(1350),
          q(0),
          ],
       q(bnz) => [
-         q(1350),
+         q(1351),
          q(0),
          ],
       q(boa) => [
-         q(1351),
+         q(1352),
          q(0),
          ],
       q(bob) => [
-         q(1352),
+         q(1353),
          q(0),
          ],
       q(boe) => [
-         q(1353),
+         q(1354),
          q(0),
          ],
       q(bof) => [
-         q(1354),
+         q(1355),
          q(0),
          ],
       q(bog) => [
-         q(1355),
+         q(1356),
          q(0),
          ],
       q(boh) => [
-         q(1356),
+         q(1357),
          q(0),
          ],
       q(boi) => [
-         q(1357),
+         q(1358),
          q(0),
          ],
       q(boj) => [
-         q(1358),
+         q(1359),
          q(0),
          ],
       q(bok) => [
-         q(1359),
+         q(1360),
          q(0),
          ],
       q(bol) => [
-         q(1360),
+         q(1361),
          q(0),
          ],
       q(bom) => [
-         q(1361),
+         q(1362),
          q(0),
          ],
       q(bon) => [
-         q(1362),
+         q(1363),
          q(0),
          ],
       q(boo) => [
-         q(1363),
+         q(1364),
          q(0),
          ],
       q(bop) => [
-         q(1364),
+         q(1365),
          q(0),
          ],
       q(boq) => [
-         q(1365),
+         q(1366),
          q(0),
          ],
       q(bor) => [
-         q(1366),
+         q(1367),
          q(0),
          ],
       q(bos) => [
@@ -61812,223 +61876,223 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bot) => [
-         q(1367),
+         q(1368),
          q(0),
          ],
       q(bou) => [
-         q(1368),
+         q(1369),
          q(0),
          ],
       q(bov) => [
-         q(1369),
+         q(1370),
          q(0),
          ],
       q(bow) => [
-         q(1370),
+         q(1371),
          q(0),
          ],
       q(box) => [
-         q(1371),
+         q(1372),
          q(0),
          ],
       q(boy) => [
-         q(1372),
+         q(1373),
          q(0),
          ],
       q(boz) => [
-         q(1373),
+         q(1374),
          q(0),
          ],
       q(bpa) => [
-         q(1374),
+         q(1375),
          q(0),
          ],
       q(bpb) => [
-         q(1375),
+         q(1376),
          q(0),
          ],
       q(bpd) => [
-         q(1376),
+         q(1377),
          q(0),
          ],
       q(bpg) => [
-         q(1377),
+         q(1378),
          q(0),
          ],
       q(bph) => [
-         q(1378),
+         q(1379),
          q(0),
          ],
       q(bpi) => [
-         q(1379),
+         q(1380),
          q(0),
          ],
       q(bpj) => [
-         q(1380),
+         q(1381),
          q(0),
          ],
       q(bpk) => [
-         q(1381),
+         q(1382),
          q(0),
          ],
       q(bpl) => [
-         q(1382),
+         q(1383),
          q(0),
          ],
       q(bpm) => [
-         q(1383),
+         q(1384),
          q(0),
          ],
       q(bpn) => [
-         q(1384),
+         q(1385),
          q(0),
          ],
       q(bpo) => [
-         q(1385),
+         q(1386),
          q(0),
          ],
       q(bpp) => [
-         q(1386),
+         q(1387),
          q(0),
          ],
       q(bpq) => [
-         q(1387),
+         q(1388),
          q(0),
          ],
       q(bpr) => [
-         q(1388),
+         q(1389),
          q(0),
          ],
       q(bps) => [
-         q(1389),
+         q(1390),
          q(0),
          ],
       q(bpt) => [
-         q(1390),
+         q(1391),
          q(0),
          ],
       q(bpu) => [
-         q(1391),
+         q(1392),
          q(0),
          ],
       q(bpv) => [
-         q(1392),
+         q(1393),
          q(0),
          ],
       q(bpw) => [
-         q(1393),
+         q(1394),
          q(0),
          ],
       q(bpx) => [
-         q(1394),
+         q(1395),
          q(0),
          ],
       q(bpy) => [
-         q(1395),
+         q(1396),
          q(0),
          ],
       q(bpz) => [
-         q(1396),
+         q(1397),
          q(0),
          ],
       q(bqa) => [
-         q(1397),
+         q(1398),
          q(0),
          ],
       q(bqb) => [
-         q(1398),
+         q(1399),
          q(0),
          ],
       q(bqc) => [
-         q(1399),
+         q(1400),
          q(0),
          ],
       q(bqd) => [
-         q(1400),
+         q(1401),
          q(0),
          ],
       q(bqf) => [
-         q(1401),
+         q(1402),
          q(0),
          ],
       q(bqg) => [
-         q(1402),
+         q(1403),
          q(0),
          ],
       q(bqh) => [
-         q(1403),
+         q(1404),
          q(0),
          ],
       q(bqi) => [
-         q(1404),
+         q(1405),
          q(0),
          ],
       q(bqj) => [
-         q(1405),
+         q(1406),
          q(0),
          ],
       q(bqk) => [
-         q(1406),
+         q(1407),
          q(0),
          ],
       q(bql) => [
-         q(1407),
+         q(1408),
          q(0),
          ],
       q(bqm) => [
-         q(1408),
+         q(1409),
          q(0),
          ],
       q(bqn) => [
-         q(1409),
+         q(1410),
          q(0),
          ],
       q(bqo) => [
-         q(1410),
+         q(1411),
          q(0),
          ],
       q(bqp) => [
-         q(1411),
+         q(1412),
          q(0),
          ],
       q(bqq) => [
-         q(1412),
+         q(1413),
          q(0),
          ],
       q(bqr) => [
-         q(1413),
+         q(1414),
          q(0),
          ],
       q(bqs) => [
-         q(1414),
+         q(1415),
          q(0),
          ],
       q(bqt) => [
-         q(1415),
+         q(1416),
          q(0),
          ],
       q(bqu) => [
-         q(1416),
+         q(1417),
          q(0),
          ],
       q(bqv) => [
-         q(1417),
+         q(1418),
          q(0),
          ],
       q(bqw) => [
-         q(1418),
+         q(1419),
          q(0),
          ],
       q(bqx) => [
-         q(1419),
+         q(1420),
          q(0),
          ],
       q(bqy) => [
-         q(1420),
+         q(1421),
          q(0),
          ],
       q(bqz) => [
-         q(1421),
+         q(1422),
          q(0),
          ],
       q(bra) => [
@@ -62036,15 +62100,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(brb) => [
-         q(1422),
+         q(1423),
          q(0),
          ],
       q(brc) => [
-         q(1423),
+         q(1424),
          q(0),
          ],
       q(brd) => [
-         q(1424),
+         q(1425),
          q(0),
          ],
       q(bre) => [
@@ -62052,219 +62116,219 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(brf) => [
-         q(1425),
+         q(1426),
          q(0),
          ],
       q(brg) => [
-         q(1426),
+         q(1427),
          q(0),
          ],
       q(brh) => [
-         q(1427),
+         q(1428),
          q(0),
          ],
       q(bri) => [
-         q(1428),
+         q(1429),
          q(0),
          ],
       q(brj) => [
-         q(1429),
+         q(1430),
          q(0),
          ],
       q(brk) => [
-         q(1430),
+         q(1431),
          q(0),
          ],
       q(brl) => [
-         q(1431),
+         q(1432),
          q(0),
          ],
       q(brm) => [
-         q(1432),
+         q(1433),
          q(0),
          ],
       q(brn) => [
-         q(1433),
+         q(1434),
          q(0),
          ],
       q(bro) => [
-         q(1434),
+         q(1435),
          q(0),
          ],
       q(brp) => [
-         q(1435),
+         q(1436),
          q(0),
          ],
       q(brq) => [
-         q(1436),
+         q(1437),
          q(0),
          ],
       q(brr) => [
-         q(1437),
+         q(1438),
          q(0),
          ],
       q(brs) => [
-         q(1438),
+         q(1439),
          q(0),
          ],
       q(brt) => [
-         q(1439),
+         q(1440),
          q(0),
          ],
       q(bru) => [
-         q(1440),
+         q(1441),
          q(0),
          ],
       q(brv) => [
-         q(1441),
+         q(1442),
          q(0),
          ],
       q(brw) => [
-         q(1442),
+         q(1443),
          q(0),
          ],
       q(brx) => [
-         q(1443),
+         q(1444),
          q(0),
          ],
       q(bry) => [
-         q(1444),
+         q(1445),
          q(0),
          ],
       q(brz) => [
-         q(1445),
+         q(1446),
          q(0),
          ],
       q(bsa) => [
-         q(1446),
+         q(1447),
          q(0),
          ],
       q(bsb) => [
-         q(1447),
+         q(1448),
          q(0),
          ],
       q(bsc) => [
-         q(1448),
+         q(1449),
          q(0),
          ],
       q(bse) => [
-         q(1449),
+         q(1450),
          q(0),
          ],
       q(bsf) => [
-         q(1450),
+         q(1451),
          q(0),
          ],
       q(bsg) => [
-         q(1451),
+         q(1452),
          q(0),
          ],
       q(bsh) => [
-         q(1452),
+         q(1453),
          q(0),
          ],
       q(bsi) => [
-         q(1453),
+         q(1454),
          q(0),
          ],
       q(bsj) => [
-         q(1454),
+         q(1455),
          q(0),
          ],
       q(bsk) => [
-         q(1455),
+         q(1456),
          q(0),
          ],
       q(bsl) => [
-         q(1456),
+         q(1457),
          q(0),
          ],
       q(bsm) => [
-         q(1457),
+         q(1458),
          q(0),
          ],
       q(bsn) => [
-         q(1458),
+         q(1459),
          q(0),
          ],
       q(bso) => [
-         q(1459),
+         q(1460),
          q(0),
          ],
       q(bsp) => [
-         q(1460),
+         q(1461),
          q(0),
          ],
       q(bsq) => [
-         q(1461),
+         q(1462),
          q(0),
          ],
       q(bsr) => [
-         q(1462),
+         q(1463),
          q(0),
          ],
       q(bss) => [
-         q(1463),
+         q(1464),
          q(0),
          ],
       q(bst) => [
-         q(1464),
+         q(1465),
          q(0),
          ],
       q(bsu) => [
-         q(1465),
+         q(1466),
          q(0),
          ],
       q(bsv) => [
-         q(1466),
+         q(1467),
          q(0),
          ],
       q(bsw) => [
-         q(1467),
+         q(1468),
          q(0),
          ],
       q(bsx) => [
-         q(1468),
+         q(1469),
          q(0),
          ],
       q(bsy) => [
-         q(1469),
+         q(1470),
          q(0),
          ],
       q(bta) => [
-         q(1470),
+         q(1471),
          q(0),
          ],
       q(btc) => [
-         q(1471),
+         q(1472),
          q(0),
          ],
       q(btd) => [
-         q(1472),
+         q(1473),
          q(0),
          ],
       q(bte) => [
-         q(1473),
+         q(1474),
          q(0),
          ],
       q(btf) => [
-         q(1474),
+         q(1475),
          q(0),
          ],
       q(btg) => [
-         q(1475),
+         q(1476),
          q(0),
          ],
       q(bth) => [
-         q(1476),
+         q(1477),
          q(0),
          ],
       q(bti) => [
-         q(1477),
+         q(1478),
          q(0),
          ],
       q(btj) => [
-         q(1478),
+         q(1479),
          q(0),
          ],
       q(btk) => [
@@ -62272,63 +62336,63 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(btl) => [
-         q(1479),
+         q(1480),
          q(0),
          ],
       q(btm) => [
-         q(1480),
+         q(1481),
          q(0),
          ],
       q(btn) => [
-         q(1481),
+         q(1482),
          q(0),
          ],
       q(bto) => [
-         q(1482),
+         q(1483),
          q(0),
          ],
       q(btp) => [
-         q(1483),
+         q(1484),
          q(0),
          ],
       q(btq) => [
-         q(1484),
+         q(1485),
          q(0),
          ],
       q(btr) => [
-         q(1485),
+         q(1486),
          q(0),
          ],
       q(bts) => [
-         q(1486),
+         q(1487),
          q(0),
          ],
       q(btt) => [
-         q(1487),
+         q(1488),
          q(0),
          ],
       q(btu) => [
-         q(1488),
+         q(1489),
          q(0),
          ],
       q(btv) => [
-         q(1489),
+         q(1490),
          q(0),
          ],
       q(btw) => [
-         q(1490),
+         q(1491),
          q(0),
          ],
       q(btx) => [
-         q(1491),
+         q(1492),
          q(0),
          ],
       q(bty) => [
-         q(1492),
+         q(1493),
          q(0),
          ],
       q(btz) => [
-         q(1493),
+         q(1494),
          q(0),
          ],
       q(bua) => [
@@ -62336,23 +62400,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bub) => [
-         q(1494),
+         q(1495),
          q(0),
          ],
       q(buc) => [
-         q(1495),
+         q(1496),
          q(0),
          ],
       q(bud) => [
-         q(1496),
+         q(1497),
          q(0),
          ],
       q(bue) => [
-         q(1497),
+         q(1498),
          q(0),
          ],
       q(buf) => [
-         q(1498),
+         q(1499),
          q(0),
          ],
       q(bug) => [
@@ -62360,19 +62424,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(buh) => [
-         q(1499),
+         q(1500),
          q(0),
          ],
       q(bui) => [
-         q(1500),
+         q(1501),
          q(0),
          ],
       q(buj) => [
-         q(1501),
+         q(1502),
          q(0),
          ],
       q(buk) => [
-         q(1502),
+         q(1503),
          q(0),
          ],
       q(bul) => [
@@ -62380,23 +62444,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bum) => [
-         q(1503),
+         q(1504),
          q(0),
          ],
       q(bun) => [
-         q(1504),
+         q(1505),
          q(0),
          ],
       q(buo) => [
-         q(1505),
+         q(1506),
          q(0),
          ],
       q(bup) => [
-         q(1506),
+         q(1507),
          q(0),
          ],
       q(buq) => [
-         q(1507),
+         q(1508),
          q(0),
          ],
       q(bur) => [
@@ -62404,379 +62468,379 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(bus) => [
-         q(1508),
+         q(1509),
          q(0),
          ],
       q(but) => [
-         q(1509),
+         q(1510),
          q(0),
          ],
       q(buu) => [
-         q(1510),
+         q(1511),
          q(0),
          ],
       q(buv) => [
-         q(1511),
+         q(1512),
          q(0),
          ],
       q(buw) => [
-         q(1512),
+         q(1513),
          q(0),
          ],
       q(bux) => [
-         q(1513),
+         q(1514),
          q(0),
          ],
       q(buy) => [
-         q(1514),
+         q(1515),
          q(0),
          ],
       q(buz) => [
-         q(1515),
+         q(1516),
          q(0),
          ],
       q(bva) => [
-         q(1516),
+         q(1517),
          q(0),
          ],
       q(bvb) => [
-         q(1517),
+         q(1518),
          q(0),
          ],
       q(bvc) => [
-         q(1518),
+         q(1519),
          q(0),
          ],
       q(bvd) => [
-         q(1519),
+         q(1520),
          q(0),
          ],
       q(bve) => [
-         q(1520),
+         q(1521),
          q(0),
          ],
       q(bvf) => [
-         q(1521),
+         q(1522),
          q(0),
          ],
       q(bvg) => [
-         q(1522),
+         q(1523),
          q(0),
          ],
       q(bvh) => [
-         q(1523),
+         q(1524),
          q(0),
          ],
       q(bvi) => [
-         q(1524),
+         q(1525),
          q(0),
          ],
       q(bvj) => [
-         q(1525),
+         q(1526),
          q(0),
          ],
       q(bvk) => [
-         q(1526),
+         q(1527),
          q(0),
          ],
       q(bvl) => [
-         q(1527),
+         q(1528),
          q(0),
          ],
       q(bvm) => [
-         q(1528),
+         q(1529),
          q(0),
          ],
       q(bvn) => [
-         q(1529),
+         q(1530),
          q(0),
          ],
       q(bvo) => [
-         q(1530),
+         q(1531),
          q(0),
          ],
       q(bvp) => [
-         q(1531),
+         q(1532),
          q(0),
          ],
       q(bvq) => [
-         q(1532),
+         q(1533),
          q(0),
          ],
       q(bvr) => [
-         q(1533),
+         q(1534),
          q(0),
          ],
       q(bvt) => [
-         q(1534),
+         q(1535),
          q(0),
          ],
       q(bvu) => [
-         q(1535),
+         q(1536),
          q(0),
          ],
       q(bvv) => [
-         q(1536),
+         q(1537),
          q(0),
          ],
       q(bvw) => [
-         q(1537),
+         q(1538),
          q(0),
          ],
       q(bvx) => [
-         q(1538),
+         q(1539),
          q(0),
          ],
       q(bvy) => [
-         q(1539),
+         q(1540),
          q(0),
          ],
       q(bvz) => [
-         q(1540),
+         q(1541),
          q(0),
          ],
       q(bwa) => [
-         q(1541),
+         q(1542),
          q(0),
          ],
       q(bwb) => [
-         q(1542),
+         q(1543),
          q(0),
          ],
       q(bwc) => [
-         q(1543),
+         q(1544),
          q(0),
          ],
       q(bwd) => [
-         q(1544),
+         q(1545),
          q(0),
          ],
       q(bwe) => [
-         q(1545),
+         q(1546),
          q(0),
          ],
       q(bwf) => [
-         q(1546),
+         q(1547),
          q(0),
          ],
       q(bwg) => [
-         q(1547),
+         q(1548),
          q(0),
          ],
       q(bwh) => [
-         q(1548),
+         q(1549),
          q(0),
          ],
       q(bwi) => [
-         q(1549),
+         q(1550),
          q(0),
          ],
       q(bwj) => [
-         q(1550),
+         q(1551),
          q(0),
          ],
       q(bwk) => [
-         q(1551),
+         q(1552),
          q(0),
          ],
       q(bwl) => [
-         q(1552),
+         q(1553),
          q(0),
          ],
       q(bwm) => [
-         q(1553),
+         q(1554),
          q(0),
          ],
       q(bwn) => [
-         q(1554),
+         q(1555),
          q(0),
          ],
       q(bwo) => [
-         q(1555),
+         q(1556),
          q(0),
          ],
       q(bwp) => [
-         q(1556),
+         q(1557),
          q(0),
          ],
       q(bwq) => [
-         q(1557),
+         q(1558),
          q(0),
          ],
       q(bwr) => [
-         q(1558),
+         q(1559),
          q(0),
          ],
       q(bws) => [
-         q(1559),
+         q(1560),
          q(0),
          ],
       q(bwt) => [
-         q(1560),
+         q(1561),
          q(0),
          ],
       q(bwu) => [
-         q(1561),
+         q(1562),
          q(0),
          ],
       q(bww) => [
-         q(1562),
+         q(1563),
          q(0),
          ],
       q(bwx) => [
-         q(1563),
+         q(1564),
          q(0),
          ],
       q(bwy) => [
-         q(1564),
+         q(1565),
          q(0),
          ],
       q(bwz) => [
-         q(1565),
+         q(1566),
          q(0),
          ],
       q(bxa) => [
-         q(1566),
+         q(1567),
          q(0),
          ],
       q(bxb) => [
-         q(1567),
+         q(1568),
          q(0),
          ],
       q(bxc) => [
-         q(1568),
+         q(1569),
          q(0),
          ],
       q(bxd) => [
-         q(1569),
+         q(1570),
          q(0),
          ],
       q(bxe) => [
-         q(1570),
+         q(1571),
          q(0),
          ],
       q(bxf) => [
-         q(1571),
+         q(1572),
          q(0),
          ],
       q(bxg) => [
-         q(1572),
+         q(1573),
          q(0),
          ],
       q(bxh) => [
-         q(1573),
+         q(1574),
          q(0),
          ],
       q(bxi) => [
-         q(1574),
+         q(1575),
          q(0),
          ],
       q(bxj) => [
-         q(1575),
+         q(1576),
          q(0),
          ],
       q(bxk) => [
-         q(1576),
+         q(1577),
          q(0),
          ],
       q(bxl) => [
-         q(1577),
+         q(1578),
          q(0),
          ],
       q(bxm) => [
-         q(1578),
+         q(1579),
          q(0),
          ],
       q(bxn) => [
-         q(1579),
+         q(1580),
          q(0),
          ],
       q(bxo) => [
-         q(1580),
+         q(1581),
          q(0),
          ],
       q(bxp) => [
-         q(1581),
+         q(1582),
          q(0),
          ],
       q(bxq) => [
-         q(1582),
+         q(1583),
          q(0),
          ],
       q(bxr) => [
-         q(1583),
+         q(1584),
          q(0),
          ],
       q(bxs) => [
-         q(1584),
+         q(1585),
          q(0),
          ],
       q(bxu) => [
-         q(1585),
+         q(1586),
          q(0),
          ],
       q(bxv) => [
-         q(1586),
+         q(1587),
          q(0),
          ],
       q(bxw) => [
-         q(1587),
+         q(1588),
          q(0),
          ],
       q(bxz) => [
-         q(1588),
+         q(1589),
          q(0),
          ],
       q(bya) => [
-         q(1589),
+         q(1590),
          q(0),
          ],
       q(byb) => [
-         q(1590),
+         q(1591),
          q(0),
          ],
       q(byc) => [
-         q(1591),
+         q(1592),
          q(0),
          ],
       q(byd) => [
-         q(1592),
+         q(1593),
          q(0),
          ],
       q(bye) => [
-         q(1593),
+         q(1594),
          q(0),
          ],
       q(byf) => [
-         q(1594),
+         q(1595),
          q(0),
          ],
       q(byg) => [
-         q(1595),
+         q(1596),
          q(0),
          ],
       q(byh) => [
-         q(1596),
+         q(1597),
          q(0),
          ],
       q(byi) => [
-         q(1597),
+         q(1598),
          q(0),
          ],
       q(byj) => [
-         q(1598),
+         q(1599),
          q(0),
          ],
       q(byk) => [
-         q(1599),
+         q(1600),
          q(0),
          ],
       q(byl) => [
-         q(1600),
+         q(1601),
          q(0),
          ],
       q(bym) => [
-         q(1601),
+         q(1602),
          q(0),
          ],
       q(byn) => [
@@ -62784,159 +62848,159 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(byo) => [
-         q(1602),
+         q(1603),
          q(0),
          ],
       q(byp) => [
-         q(1603),
+         q(1604),
          q(0),
          ],
       q(byq) => [
-         q(1604),
+         q(1605),
          q(0),
          ],
       q(byr) => [
-         q(1605),
+         q(1606),
          q(0),
          ],
       q(bys) => [
-         q(1606),
+         q(1607),
          q(0),
          ],
       q(byt) => [
-         q(1607),
+         q(1608),
          q(0),
          ],
       q(byv) => [
-         q(1608),
+         q(1609),
          q(0),
          ],
       q(byw) => [
-         q(1609),
+         q(1610),
          q(0),
          ],
       q(byx) => [
-         q(1610),
+         q(1611),
          q(0),
          ],
       q(byz) => [
-         q(1611),
+         q(1612),
          q(0),
          ],
       q(bza) => [
-         q(1612),
+         q(1613),
          q(0),
          ],
       q(bzb) => [
-         q(1613),
+         q(1614),
          q(0),
          ],
       q(bzc) => [
-         q(1614),
+         q(1615),
          q(0),
          ],
       q(bzd) => [
-         q(1615),
+         q(1616),
          q(0),
          ],
       q(bze) => [
-         q(1616),
+         q(1617),
          q(0),
          ],
       q(bzf) => [
-         q(1617),
+         q(1618),
          q(0),
          ],
       q(bzg) => [
-         q(1618),
+         q(1619),
          q(0),
          ],
       q(bzh) => [
-         q(1619),
+         q(1620),
          q(0),
          ],
       q(bzi) => [
-         q(1620),
+         q(1621),
          q(0),
          ],
       q(bzj) => [
-         q(1621),
+         q(1622),
          q(0),
          ],
       q(bzk) => [
-         q(1622),
+         q(1623),
          q(0),
          ],
       q(bzl) => [
-         q(1623),
+         q(1624),
          q(0),
          ],
       q(bzm) => [
-         q(1624),
+         q(1625),
          q(0),
          ],
       q(bzn) => [
-         q(1625),
+         q(1626),
          q(0),
          ],
       q(bzo) => [
-         q(1626),
+         q(1627),
          q(0),
          ],
       q(bzp) => [
-         q(1627),
+         q(1628),
          q(0),
          ],
       q(bzq) => [
-         q(1628),
+         q(1629),
          q(0),
          ],
       q(bzr) => [
-         q(1629),
+         q(1630),
          q(0),
          ],
       q(bzs) => [
-         q(1630),
+         q(1631),
          q(0),
          ],
       q(bzt) => [
-         q(1631),
+         q(1632),
          q(0),
          ],
       q(bzu) => [
-         q(1632),
+         q(1633),
          q(0),
          ],
       q(bzv) => [
-         q(1633),
+         q(1634),
          q(0),
          ],
       q(bzw) => [
-         q(1634),
+         q(1635),
          q(0),
          ],
       q(bzx) => [
-         q(1635),
+         q(1636),
          q(0),
          ],
       q(bzy) => [
-         q(1636),
+         q(1637),
          q(0),
          ],
       q(bzz) => [
-         q(1637),
+         q(1638),
          q(0),
          ],
       q(caa) => [
-         q(1638),
+         q(1639),
          q(0),
          ],
       q(cab) => [
-         q(1639),
+         q(1640),
          q(0),
          ],
       q(cac) => [
-         q(1640),
+         q(1641),
          q(0),
          ],
       q(cad) => [
@@ -62944,19 +63008,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cae) => [
-         q(1641),
+         q(1642),
          q(0),
          ],
       q(caf) => [
-         q(1642),
+         q(1643),
          q(0),
          ],
       q(cag) => [
-         q(1643),
+         q(1644),
          q(0),
          ],
       q(cah) => [
-         q(1644),
+         q(1645),
          q(0),
          ],
       q(cai) => [
@@ -62964,35 +63028,35 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(caj) => [
-         q(1645),
+         q(1646),
          q(0),
          ],
       q(cak) => [
-         q(1646),
+         q(1647),
          q(0),
          ],
       q(cal) => [
-         q(1647),
+         q(1648),
          q(0),
          ],
       q(cam) => [
-         q(1648),
+         q(1649),
          q(0),
          ],
       q(can) => [
-         q(1649),
+         q(1650),
          q(0),
          ],
       q(cao) => [
-         q(1650),
+         q(1651),
          q(0),
          ],
       q(cap) => [
-         q(1651),
+         q(1652),
          q(0),
          ],
       q(caq) => [
-         q(1652),
+         q(1653),
          q(0),
          ],
       q(car) => [
@@ -63000,7 +63064,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cas) => [
-         q(1653),
+         q(1654),
          q(0),
          ],
       q(cat) => [
@@ -63012,23 +63076,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cav) => [
-         q(1654),
+         q(1655),
          q(0),
          ],
       q(caw) => [
-         q(1655),
+         q(1656),
          q(0),
          ],
       q(cax) => [
-         q(1656),
+         q(1657),
          q(0),
          ],
       q(cay) => [
-         q(1657),
+         q(1658),
          q(0),
          ],
       q(caz) => [
-         q(1658),
+         q(1659),
          q(0),
          ],
       q(cba) => [
@@ -63036,119 +63100,119 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cbb) => [
-         q(1659),
+         q(1660),
          q(0),
          ],
       q(cbc) => [
-         q(1660),
+         q(1661),
          q(0),
          ],
       q(cbd) => [
-         q(1661),
+         q(1662),
          q(0),
          ],
       q(cbe) => [
-         q(1662),
+         q(1663),
          q(0),
          ],
       q(cbg) => [
-         q(1663),
+         q(1664),
          q(0),
          ],
       q(cbh) => [
-         q(1664),
+         q(1665),
          q(0),
          ],
       q(cbi) => [
-         q(1665),
+         q(1666),
          q(0),
          ],
       q(cbj) => [
-         q(1666),
+         q(1667),
          q(0),
          ],
       q(cbk) => [
-         q(1667),
+         q(1668),
          q(0),
          ],
       q(cbl) => [
-         q(1668),
+         q(1669),
          q(0),
          ],
       q(cbn) => [
-         q(1669),
+         q(1670),
          q(0),
          ],
       q(cbo) => [
-         q(1670),
+         q(1671),
          q(0),
          ],
       q(cbq) => [
-         q(1671),
+         q(1672),
          q(0),
          ],
       q(cbr) => [
-         q(1672),
+         q(1673),
          q(0),
          ],
       q(cbs) => [
-         q(1673),
+         q(1674),
          q(0),
          ],
       q(cbt) => [
-         q(1674),
+         q(1675),
          q(0),
          ],
       q(cbu) => [
-         q(1675),
+         q(1676),
          q(0),
          ],
       q(cbv) => [
-         q(1676),
+         q(1677),
          q(0),
          ],
       q(cbw) => [
-         q(1677),
+         q(1678),
          q(0),
          ],
       q(cby) => [
-         q(1678),
+         q(1679),
          q(0),
          ],
       q(cca) => [
-         q(1679),
+         q(1680),
          q(0),
          ],
       q(ccc) => [
-         q(1680),
+         q(1681),
          q(0),
          ],
       q(ccd) => [
-         q(1681),
+         q(1682),
          q(0),
          ],
       q(cce) => [
-         q(1682),
+         q(1683),
          q(0),
          ],
       q(ccg) => [
-         q(1683),
+         q(1684),
          q(0),
          ],
       q(cch) => [
-         q(1684),
+         q(1685),
          q(0),
          ],
       q(ccj) => [
-         q(1685),
+         q(1686),
          q(0),
          ],
       q(ccl) => [
-         q(1686),
+         q(1687),
          q(0),
          ],
       q(ccm) => [
-         q(1687),
+         q(1688),
          q(0),
          ],
       q(ccn) => [
@@ -63156,15 +63220,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cco) => [
-         q(1688),
+         q(1689),
          q(0),
          ],
       q(ccp) => [
-         q(1689),
+         q(1690),
          q(0),
          ],
       q(ccr) => [
-         q(1690),
+         q(1691),
          q(0),
          ],
       q(ccs) => [
@@ -63172,7 +63236,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cda) => [
-         q(1691),
+         q(1692),
          q(0),
          ],
       q(cdc) => [
@@ -63184,59 +63248,59 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cde) => [
-         q(1692),
+         q(1693),
          q(0),
          ],
       q(cdf) => [
-         q(1693),
+         q(1694),
          q(0),
          ],
       q(cdg) => [
-         q(1694),
+         q(1695),
          q(0),
          ],
       q(cdh) => [
-         q(1695),
+         q(1696),
          q(0),
          ],
       q(cdi) => [
-         q(1696),
+         q(1697),
          q(0),
          ],
       q(cdj) => [
-         q(1697),
+         q(1698),
          q(0),
          ],
       q(cdm) => [
-         q(1698),
+         q(1699),
          q(0),
          ],
       q(cdn) => [
-         q(1699),
+         q(1700),
          q(0),
          ],
       q(cdo) => [
-         q(1700),
+         q(1701),
          q(0),
          ],
       q(cdr) => [
-         q(1701),
+         q(1702),
          q(0),
          ],
       q(cds) => [
-         q(1702),
+         q(1703),
          q(0),
          ],
       q(cdy) => [
-         q(1703),
+         q(1704),
          q(0),
          ],
       q(cdz) => [
-         q(1704),
+         q(1705),
          q(0),
          ],
       q(cea) => [
-         q(1705),
+         q(1706),
          q(0),
          ],
       q(ceb) => [
@@ -63244,11 +63308,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ceg) => [
-         q(1706),
+         q(1707),
          q(0),
          ],
       q(cek) => [
-         q(1707),
+         q(1708),
          q(0),
          ],
       q(cel) => [
@@ -63256,43 +63320,43 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cen) => [
-         q(1708),
+         q(1709),
          q(0),
          ],
       q(cet) => [
-         q(1709),
+         q(1710),
          q(0),
          ],
       q(cfa) => [
-         q(1710),
+         q(1711),
          q(0),
          ],
       q(cfd) => [
-         q(1711),
+         q(1712),
          q(0),
          ],
       q(cfg) => [
-         q(1712),
+         q(1713),
          q(0),
          ],
       q(cfm) => [
-         q(1713),
+         q(1714),
          q(0),
          ],
       q(cga) => [
-         q(1714),
+         q(1715),
          q(0),
          ],
       q(cgc) => [
-         q(1715),
+         q(1716),
          q(0),
          ],
       q(cgg) => [
-         q(1716),
+         q(1717),
          q(0),
          ],
       q(cgk) => [
-         q(1717),
+         q(1718),
          q(0),
          ],
       q(cha) => [
@@ -63304,11 +63368,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(chc) => [
-         q(1718),
+         q(1719),
          q(0),
          ],
       q(chd) => [
-         q(1719),
+         q(1720),
          q(0),
          ],
       q(che) => [
@@ -63316,7 +63380,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(chf) => [
-         q(1720),
+         q(1721),
          q(0),
          ],
       q(chg) => [
@@ -63324,7 +63388,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(chh) => [
-         q(1721),
+         q(1722),
          q(0),
          ],
       q(chi) => [
@@ -63332,7 +63396,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(chj) => [
-         q(1722),
+         q(1723),
          q(0),
          ],
       q(chk) => [
@@ -63340,7 +63404,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(chl) => [
-         q(1723),
+         q(1724),
          q(0),
          ],
       q(chm) => [
@@ -63360,7 +63424,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(chq) => [
-         q(1724),
+         q(1725),
          q(0),
          ],
       q(chr) => [
@@ -63368,7 +63432,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cht) => [
-         q(1725),
+         q(1726),
          q(0),
          ],
       q(chu) => [
@@ -63380,11 +63444,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(chw) => [
-         q(1726),
+         q(1727),
          q(0),
          ],
       q(chx) => [
-         q(1727),
+         q(1728),
          q(0),
          ],
       q(chy) => [
@@ -63392,227 +63456,227 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(chz) => [
-         q(1728),
+         q(1729),
          q(0),
          ],
       q(cia) => [
-         q(1729),
+         q(1730),
          q(0),
          ],
       q(cib) => [
-         q(1730),
+         q(1731),
          q(0),
          ],
       q(cic) => [
-         q(1731),
+         q(1732),
          q(0),
          ],
       q(cid) => [
-         q(1732),
+         q(1733),
          q(0),
          ],
       q(cie) => [
-         q(1733),
+         q(1734),
          q(0),
          ],
       q(cih) => [
-         q(1734),
+         q(1735),
          q(0),
          ],
       q(cik) => [
-         q(1735),
+         q(1736),
          q(0),
          ],
       q(cim) => [
-         q(1736),
+         q(1737),
          q(0),
          ],
       q(cin) => [
-         q(1737),
+         q(1738),
          q(0),
          ],
       q(cip) => [
-         q(1738),
+         q(1739),
          q(0),
          ],
       q(cir) => [
-         q(1739),
+         q(1740),
          q(0),
          ],
       q(ciw) => [
-         q(1740),
+         q(1741),
          q(0),
          ],
       q(ciy) => [
-         q(1741),
+         q(1742),
          q(0),
          ],
       q(cja) => [
-         q(1742),
+         q(1743),
          q(0),
          ],
       q(cje) => [
-         q(1743),
+         q(1744),
          q(0),
          ],
       q(cjh) => [
-         q(1744),
+         q(1745),
          q(0),
          ],
       q(cji) => [
-         q(1745),
+         q(1746),
          q(0),
          ],
       q(cjk) => [
-         q(1746),
+         q(1747),
          q(0),
          ],
       q(cjm) => [
-         q(1747),
+         q(1748),
          q(0),
          ],
       q(cjn) => [
-         q(1748),
+         q(1749),
          q(0),
          ],
       q(cjo) => [
-         q(1749),
+         q(1750),
          q(0),
          ],
       q(cjp) => [
-         q(1750),
+         q(1751),
          q(0),
          ],
       q(cjs) => [
-         q(1751),
+         q(1752),
          q(0),
          ],
       q(cjv) => [
-         q(1752),
+         q(1753),
          q(0),
          ],
       q(cjy) => [
-         q(1753),
+         q(1754),
          q(0),
          ],
       q(ckb) => [
-         q(1754),
+         q(1755),
          q(0),
          ],
       q(ckh) => [
-         q(1755),
+         q(1756),
          q(0),
          ],
       q(ckl) => [
-         q(1756),
+         q(1757),
          q(0),
          ],
       q(ckn) => [
-         q(1757),
+         q(1758),
          q(0),
          ],
       q(cko) => [
-         q(1758),
+         q(1759),
          q(0),
          ],
       q(ckq) => [
-         q(1759),
+         q(1760),
          q(0),
          ],
       q(ckr) => [
-         q(1760),
+         q(1761),
          q(0),
          ],
       q(cks) => [
-         q(1761),
+         q(1762),
          q(0),
          ],
       q(ckt) => [
-         q(1762),
+         q(1763),
          q(0),
          ],
       q(cku) => [
-         q(1763),
+         q(1764),
          q(0),
          ],
       q(ckv) => [
-         q(1764),
+         q(1765),
          q(0),
          ],
       q(ckx) => [
-         q(1765),
+         q(1766),
          q(0),
          ],
       q(cky) => [
-         q(1766),
+         q(1767),
          q(0),
          ],
       q(ckz) => [
-         q(1767),
+         q(1768),
          q(0),
          ],
       q(cla) => [
-         q(1768),
+         q(1769),
          q(0),
          ],
       q(clc) => [
-         q(1769),
+         q(1770),
          q(0),
          ],
       q(cld) => [
-         q(1770),
+         q(1771),
          q(0),
          ],
       q(cle) => [
-         q(1771),
+         q(1772),
          q(0),
          ],
       q(clh) => [
-         q(1772),
+         q(1773),
          q(0),
          ],
       q(cli) => [
-         q(1773),
+         q(1774),
          q(0),
          ],
       q(clj) => [
-         q(1774),
+         q(1775),
          q(0),
          ],
       q(clk) => [
-         q(1775),
+         q(1776),
          q(0),
          ],
       q(cll) => [
-         q(1776),
+         q(1777),
          q(0),
          ],
       q(clm) => [
-         q(1777),
+         q(1778),
          q(0),
          ],
       q(clo) => [
-         q(1778),
+         q(1779),
          q(0),
          ],
       q(clt) => [
-         q(1779),
+         q(1780),
          q(0),
          ],
       q(clu) => [
-         q(1780),
+         q(1781),
          q(0),
          ],
       q(clw) => [
-         q(1781),
+         q(1782),
          q(0),
          ],
       q(cly) => [
-         q(1782),
+         q(1783),
          q(0),
          ],
       q(cma) => [
-         q(1783),
+         q(1784),
          q(0),
          ],
       q(cmc) => [
@@ -63620,155 +63684,155 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cme) => [
-         q(1784),
+         q(1785),
          q(0),
          ],
       q(cmg) => [
-         q(1785),
+         q(1786),
          q(0),
          ],
       q(cmi) => [
-         q(1786),
+         q(1787),
          q(0),
          ],
       q(cml) => [
-         q(1787),
+         q(1788),
          q(0),
          ],
       q(cmm) => [
-         q(1788),
+         q(1789),
          q(0),
          ],
       q(cmn) => [
-         q(1789),
+         q(1790),
          q(0),
          ],
       q(cmo) => [
-         q(1790),
+         q(1791),
          q(0),
          ],
       q(cmr) => [
-         q(1791),
+         q(1792),
          q(0),
          ],
       q(cms) => [
-         q(1792),
+         q(1793),
          q(0),
          ],
       q(cmt) => [
-         q(1793),
+         q(1794),
          q(0),
          ],
       q(cna) => [
-         q(1794),
+         q(1795),
          q(0),
          ],
       q(cnb) => [
-         q(1795),
+         q(1796),
          q(0),
          ],
       q(cnc) => [
-         q(1796),
+         q(1797),
          q(0),
          ],
       q(cng) => [
-         q(1797),
+         q(1798),
          q(0),
          ],
       q(cnh) => [
-         q(1798),
+         q(1799),
          q(0),
          ],
       q(cni) => [
-         q(1799),
+         q(1800),
          q(0),
          ],
       q(cnk) => [
-         q(1800),
+         q(1801),
          q(0),
          ],
       q(cnl) => [
-         q(1801),
+         q(1802),
          q(0),
          ],
       q(cno) => [
-         q(1802),
+         q(1803),
          q(0),
          ],
       q(cns) => [
-         q(1803),
+         q(1804),
          q(0),
          ],
       q(cnt) => [
-         q(1804),
+         q(1805),
          q(0),
          ],
       q(cnu) => [
-         q(1805),
+         q(1806),
          q(0),
          ],
       q(cnw) => [
-         q(1806),
+         q(1807),
          q(0),
          ],
       q(cnx) => [
-         q(1807),
+         q(1808),
          q(0),
          ],
       q(coa) => [
-         q(1808),
+         q(1809),
          q(0),
          ],
       q(cob) => [
-         q(1809),
+         q(1810),
          q(0),
          ],
       q(coc) => [
-         q(1810),
+         q(1811),
          q(0),
          ],
       q(cod) => [
-         q(1811),
+         q(1812),
          q(0),
          ],
       q(coe) => [
-         q(1812),
+         q(1813),
          q(0),
          ],
       q(cof) => [
-         q(1813),
+         q(1814),
          q(0),
          ],
       q(cog) => [
-         q(1814),
+         q(1815),
          q(0),
          ],
       q(coh) => [
-         q(1815),
+         q(1816),
          q(0),
          ],
       q(coj) => [
-         q(1816),
+         q(1817),
          q(0),
          ],
       q(cok) => [
-         q(1817),
+         q(1818),
          q(0),
          ],
       q(col) => [
-         q(1818),
+         q(1819),
          q(0),
          ],
       q(com) => [
-         q(1819),
+         q(1820),
          q(0),
          ],
       q(con) => [
-         q(1820),
+         q(1821),
          q(0),
          ],
       q(coo) => [
-         q(1821),
+         q(1822),
          q(0),
          ],
       q(cop) => [
@@ -63776,7 +63840,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(coq) => [
-         q(1822),
+         q(1823),
          q(0),
          ],
       q(cor) => [
@@ -63788,43 +63852,43 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cot) => [
-         q(1823),
+         q(1824),
          q(0),
          ],
       q(cou) => [
-         q(1824),
+         q(1825),
          q(0),
          ],
       q(cov) => [
-         q(1825),
+         q(1826),
          q(0),
          ],
       q(cow) => [
-         q(1826),
+         q(1827),
          q(0),
          ],
       q(cox) => [
-         q(1827),
+         q(1828),
          q(0),
          ],
       q(coy) => [
-         q(1828),
+         q(1829),
          q(0),
          ],
       q(coz) => [
-         q(1829),
+         q(1830),
          q(0),
          ],
       q(cpa) => [
-         q(1830),
+         q(1831),
          q(0),
          ],
       q(cpb) => [
-         q(1831),
+         q(1832),
          q(0),
          ],
       q(cpc) => [
-         q(1832),
+         q(1833),
          q(0),
          ],
       q(cpe) => [
@@ -63836,19 +63900,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(2),
          ],
       q(cpg) => [
-         q(1833),
+         q(1834),
          q(0),
          ],
       q(cpi) => [
-         q(1834),
+         q(1835),
          q(0),
          ],
       q(cpn) => [
-         q(1835),
+         q(1836),
          q(0),
          ],
       q(cpo) => [
-         q(1836),
+         q(1837),
          q(0),
          ],
       q(cpp) => [
@@ -63856,43 +63920,43 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(2),
          ],
       q(cps) => [
-         q(1837),
+         q(1838),
          q(0),
          ],
       q(cpu) => [
-         q(1838),
+         q(1839),
          q(0),
          ],
       q(cpx) => [
-         q(1839),
+         q(1840),
          q(0),
          ],
       q(cpy) => [
-         q(1840),
+         q(1841),
          q(0),
          ],
       q(cqd) => [
-         q(1841),
+         q(1842),
          q(0),
          ],
       q(cqu) => [
-         q(1842),
+         q(1843),
          q(0),
          ],
       q(cra) => [
-         q(1843),
+         q(1844),
          q(0),
          ],
       q(crb) => [
-         q(1844),
+         q(1845),
          q(0),
          ],
       q(crc) => [
-         q(1845),
+         q(1846),
          q(0),
          ],
       q(crd) => [
-         q(1846),
+         q(1847),
          q(0),
          ],
       q(cre) => [
@@ -63900,11 +63964,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(crf) => [
-         q(1847),
+         q(1848),
          q(0),
          ],
       q(crg) => [
-         q(1848),
+         q(1849),
          q(0),
          ],
       q(crh) => [
@@ -63912,31 +63976,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cri) => [
-         q(1849),
+         q(1850),
          q(0),
          ],
       q(crj) => [
-         q(1850),
+         q(1851),
          q(0),
          ],
       q(crk) => [
-         q(1851),
+         q(1852),
          q(0),
          ],
       q(crl) => [
-         q(1852),
+         q(1853),
          q(0),
          ],
       q(crm) => [
-         q(1853),
+         q(1854),
          q(0),
          ],
       q(crn) => [
-         q(1854),
+         q(1855),
          q(0),
          ],
       q(cro) => [
-         q(1855),
+         q(1856),
          q(0),
          ],
       q(crp) => [
@@ -63944,43 +64008,43 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(crq) => [
-         q(1856),
+         q(1857),
          q(0),
          ],
       q(crr) => [
-         q(1857),
+         q(1858),
          q(0),
          ],
       q(crs) => [
-         q(1858),
+         q(1859),
          q(0),
          ],
       q(crt) => [
-         q(1859),
+         q(1860),
          q(0),
          ],
       q(crv) => [
-         q(1860),
+         q(1861),
          q(0),
          ],
       q(crw) => [
-         q(1861),
+         q(1862),
          q(0),
          ],
       q(crx) => [
-         q(1862),
+         q(1863),
          q(0),
          ],
       q(cry) => [
-         q(1863),
+         q(1864),
          q(0),
          ],
       q(crz) => [
-         q(1864),
+         q(1865),
          q(0),
          ],
       q(csa) => [
-         q(1865),
+         q(1866),
          q(0),
          ],
       q(csb) => [
@@ -63988,71 +64052,71 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(csc) => [
-         q(1866),
+         q(1867),
          q(0),
          ],
       q(csd) => [
-         q(1867),
+         q(1868),
          q(0),
          ],
       q(cse) => [
-         q(1868),
+         q(1869),
          q(0),
          ],
       q(csf) => [
-         q(1869),
+         q(1870),
          q(0),
          ],
       q(csg) => [
-         q(1870),
+         q(1871),
          q(0),
          ],
       q(csh) => [
-         q(1871),
+         q(1872),
          q(0),
          ],
       q(csi) => [
-         q(1872),
+         q(1873),
          q(0),
          ],
       q(csj) => [
-         q(1873),
+         q(1874),
          q(0),
          ],
       q(csk) => [
-         q(1874),
+         q(1875),
          q(0),
          ],
       q(csl) => [
-         q(1875),
+         q(1876),
          q(0),
          ],
       q(csm) => [
-         q(1876),
+         q(1877),
          q(0),
          ],
       q(csn) => [
-         q(1877),
+         q(1878),
          q(0),
          ],
       q(cso) => [
-         q(1878),
+         q(1879),
          q(0),
          ],
       q(csq) => [
-         q(1879),
+         q(1880),
          q(0),
          ],
       q(csr) => [
-         q(1880),
+         q(1881),
          q(0),
          ],
       q(css) => [
-         q(1881),
+         q(1882),
          q(0),
          ],
       q(cst) => [
-         q(1882),
+         q(1883),
          q(0),
          ],
       q(csu) => [
@@ -64060,135 +64124,135 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(csv) => [
-         q(1883),
+         q(1884),
          q(0),
          ],
       q(csw) => [
-         q(1884),
+         q(1885),
          q(0),
          ],
       q(csy) => [
-         q(1885),
+         q(1886),
          q(0),
          ],
       q(csz) => [
-         q(1886),
+         q(1887),
          q(0),
          ],
       q(cta) => [
-         q(1887),
+         q(1888),
          q(0),
          ],
       q(ctc) => [
-         q(1888),
+         q(1889),
          q(0),
          ],
       q(ctd) => [
-         q(1889),
+         q(1890),
          q(0),
          ],
       q(cte) => [
-         q(1890),
+         q(1891),
          q(0),
          ],
       q(ctg) => [
-         q(1891),
+         q(1892),
          q(0),
          ],
       q(cth) => [
-         q(1892),
+         q(1893),
          q(0),
          ],
       q(ctl) => [
-         q(1893),
+         q(1894),
          q(0),
          ],
       q(ctm) => [
-         q(1894),
+         q(1895),
          q(0),
          ],
       q(ctn) => [
-         q(1895),
+         q(1896),
          q(0),
          ],
       q(cto) => [
-         q(1896),
+         q(1897),
          q(0),
          ],
       q(ctp) => [
-         q(1897),
+         q(1898),
          q(0),
          ],
       q(cts) => [
-         q(1898),
+         q(1899),
          q(0),
          ],
       q(ctt) => [
-         q(1899),
+         q(1900),
          q(0),
          ],
       q(ctu) => [
-         q(1900),
+         q(1901),
          q(0),
          ],
       q(ctz) => [
-         q(1901),
+         q(1902),
          q(0),
          ],
       q(cua) => [
-         q(1902),
+         q(1903),
          q(0),
          ],
       q(cub) => [
-         q(1903),
+         q(1904),
          q(0),
          ],
       q(cuc) => [
-         q(1904),
+         q(1905),
          q(0),
          ],
       q(cug) => [
-         q(1905),
+         q(1906),
          q(0),
          ],
       q(cuh) => [
-         q(1906),
+         q(1907),
          q(0),
          ],
       q(cui) => [
-         q(1907),
+         q(1908),
          q(0),
          ],
       q(cuj) => [
-         q(1908),
+         q(1909),
          q(0),
          ],
       q(cuk) => [
-         q(1909),
+         q(1910),
          q(0),
          ],
       q(cul) => [
-         q(1910),
+         q(1911),
          q(0),
          ],
       q(cum) => [
-         q(1911),
+         q(1912),
          q(0),
          ],
       q(cuo) => [
-         q(1912),
+         q(1913),
          q(0),
          ],
       q(cup) => [
-         q(1913),
+         q(1914),
          q(0),
          ],
       q(cuq) => [
-         q(1914),
+         q(1915),
          q(0),
          ],
       q(cur) => [
-         q(1915),
+         q(1916),
          q(0),
          ],
       q(cus) => [
@@ -64196,67 +64260,67 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(cut) => [
-         q(1916),
+         q(1917),
          q(0),
          ],
       q(cuu) => [
-         q(1917),
+         q(1918),
          q(0),
          ],
       q(cuv) => [
-         q(1918),
+         q(1919),
          q(0),
          ],
       q(cuw) => [
-         q(1919),
+         q(1920),
          q(0),
          ],
       q(cux) => [
-         q(1920),
+         q(1921),
          q(0),
          ],
       q(cvg) => [
-         q(1921),
+         q(1922),
          q(0),
          ],
       q(cvn) => [
-         q(1922),
+         q(1923),
          q(0),
          ],
       q(cwa) => [
-         q(1923),
+         q(1924),
          q(0),
          ],
       q(cwb) => [
-         q(1924),
+         q(1925),
          q(0),
          ],
       q(cwd) => [
-         q(1925),
+         q(1926),
          q(0),
          ],
       q(cwe) => [
-         q(1926),
+         q(1927),
          q(0),
          ],
       q(cwg) => [
-         q(1927),
+         q(1928),
          q(0),
          ],
       q(cwt) => [
-         q(1928),
+         q(1929),
          q(0),
          ],
       q(cya) => [
-         q(1929),
+         q(1930),
          q(0),
          ],
       q(cyb) => [
-         q(1930),
+         q(1931),
          q(0),
          ],
       q(cyo) => [
-         q(1931),
+         q(1932),
          q(0),
          ],
       q(cze) => [
@@ -64264,55 +64328,55 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(czh) => [
-         q(1932),
+         q(1933),
          q(0),
          ],
       q(czk) => [
-         q(1933),
+         q(1934),
          q(0),
          ],
       q(czn) => [
-         q(1934),
+         q(1935),
          q(0),
          ],
       q(czo) => [
-         q(1935),
+         q(1936),
          q(0),
          ],
       q(czt) => [
-         q(1936),
+         q(1937),
          q(0),
          ],
       q(daa) => [
-         q(1937),
+         q(1938),
          q(0),
          ],
       q(dac) => [
-         q(1938),
+         q(1939),
          q(0),
          ],
       q(dad) => [
-         q(1939),
+         q(1940),
          q(0),
          ],
       q(dae) => [
-         q(1940),
+         q(1941),
          q(0),
          ],
       q(dag) => [
-         q(1941),
+         q(1942),
          q(0),
          ],
       q(dah) => [
-         q(1942),
+         q(1943),
          q(0),
          ],
       q(dai) => [
-         q(1943),
+         q(1944),
          q(0),
          ],
       q(daj) => [
-         q(1944),
+         q(1945),
          q(0),
          ],
       q(dak) => [
@@ -64320,11 +64384,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(dal) => [
-         q(1945),
+         q(1946),
          q(0),
          ],
       q(dam) => [
-         q(1946),
+         q(1947),
          q(0),
          ],
       q(dan) => [
@@ -64332,11 +64396,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(dao) => [
-         q(1947),
+         q(1948),
          q(0),
          ],
       q(daq) => [
-         q(1948),
+         q(1949),
          q(0),
          ],
       q(dar) => [
@@ -64344,23 +64408,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(das) => [
-         q(1949),
+         q(1950),
          q(0),
          ],
       q(dau) => [
-         q(1950),
+         q(1951),
          q(0),
          ],
       q(dav) => [
-         q(1951),
+         q(1952),
          q(0),
          ],
       q(daw) => [
-         q(1952),
+         q(1953),
          q(0),
          ],
       q(dax) => [
-         q(1953),
+         q(1954),
          q(0),
          ],
       q(day) => [
@@ -64368,171 +64432,171 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(daz) => [
-         q(1954),
+         q(1955),
          q(0),
          ],
       q(dba) => [
-         q(1955),
+         q(1956),
          q(0),
          ],
       q(dbb) => [
-         q(1956),
+         q(1957),
          q(0),
          ],
       q(dbd) => [
-         q(1957),
+         q(1958),
          q(0),
          ],
       q(dbe) => [
-         q(1958),
+         q(1959),
          q(0),
          ],
       q(dbf) => [
-         q(1959),
+         q(1960),
          q(0),
          ],
       q(dbg) => [
-         q(1960),
+         q(1961),
          q(0),
          ],
       q(dbi) => [
-         q(1961),
+         q(1962),
          q(0),
          ],
       q(dbj) => [
-         q(1962),
+         q(1963),
          q(0),
          ],
       q(dbl) => [
-         q(1963),
+         q(1964),
          q(0),
          ],
       q(dbm) => [
-         q(1964),
+         q(1965),
          q(0),
          ],
       q(dbn) => [
-         q(1965),
+         q(1966),
          q(0),
          ],
       q(dbo) => [
-         q(1966),
+         q(1967),
          q(0),
          ],
       q(dbp) => [
-         q(1967),
+         q(1968),
          q(0),
          ],
       q(dbq) => [
-         q(1968),
+         q(1969),
          q(0),
          ],
       q(dbr) => [
-         q(1969),
+         q(1970),
          q(0),
          ],
       q(dbt) => [
-         q(1970),
+         q(1971),
          q(0),
          ],
       q(dbu) => [
-         q(1971),
+         q(1972),
          q(0),
          ],
       q(dbv) => [
-         q(1972),
+         q(1973),
          q(0),
          ],
       q(dbw) => [
-         q(1973),
+         q(1974),
          q(0),
          ],
       q(dby) => [
-         q(1974),
+         q(1975),
          q(0),
          ],
       q(dcc) => [
-         q(1975),
+         q(1976),
          q(0),
          ],
       q(dcr) => [
-         q(1976),
+         q(1977),
          q(0),
          ],
       q(dda) => [
-         q(1977),
+         q(1978),
          q(0),
          ],
       q(ddd) => [
-         q(1978),
+         q(1979),
          q(0),
          ],
       q(dde) => [
-         q(1979),
+         q(1980),
          q(0),
          ],
       q(ddg) => [
-         q(1980),
+         q(1981),
          q(0),
          ],
       q(ddi) => [
-         q(1981),
+         q(1982),
          q(0),
          ],
       q(ddj) => [
-         q(1982),
+         q(1983),
          q(0),
          ],
       q(ddn) => [
-         q(1983),
+         q(1984),
          q(0),
          ],
       q(ddo) => [
-         q(1984),
+         q(1985),
          q(0),
          ],
       q(ddr) => [
-         q(1985),
+         q(1986),
          q(0),
          ],
       q(dds) => [
-         q(1986),
+         q(1987),
          q(0),
          ],
       q(ddw) => [
-         q(1987),
+         q(1988),
          q(0),
          ],
       q(dec) => [
-         q(1988),
+         q(1989),
          q(0),
          ],
       q(ded) => [
-         q(1989),
+         q(1990),
          q(0),
          ],
       q(dee) => [
-         q(1990),
+         q(1991),
          q(0),
          ],
       q(def) => [
-         q(1991),
+         q(1992),
          q(0),
          ],
       q(deg) => [
-         q(1992),
+         q(1993),
          q(0),
          ],
       q(deh) => [
-         q(1993),
+         q(1994),
          q(0),
          ],
       q(dei) => [
-         q(1994),
+         q(1995),
          q(0),
          ],
       q(dek) => [
-         q(1995),
+         q(1996),
          q(0),
          ],
       q(del) => [
@@ -64540,7 +64604,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(dem) => [
-         q(1996),
+         q(1997),
          q(0),
          ],
       q(den) => [
@@ -64548,75 +64612,75 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(dep) => [
-         q(1997),
+         q(1998),
          q(0),
          ],
       q(deq) => [
-         q(1998),
+         q(1999),
          q(0),
          ],
       q(der) => [
-         q(1999),
+         q(2000),
          q(0),
          ],
       q(des) => [
-         q(2000),
+         q(2001),
          q(0),
          ],
       q(dev) => [
-         q(2001),
+         q(2002),
          q(0),
          ],
       q(dez) => [
-         q(2002),
+         q(2003),
          q(0),
          ],
       q(dga) => [
-         q(2003),
+         q(2004),
          q(0),
          ],
       q(dgb) => [
-         q(2004),
+         q(2005),
          q(0),
          ],
       q(dgc) => [
-         q(2005),
+         q(2006),
          q(0),
          ],
       q(dgd) => [
-         q(2006),
+         q(2007),
          q(0),
          ],
       q(dge) => [
-         q(2007),
+         q(2008),
          q(0),
          ],
       q(dgg) => [
-         q(2008),
+         q(2009),
          q(0),
          ],
       q(dgh) => [
-         q(2009),
+         q(2010),
          q(0),
          ],
       q(dgi) => [
-         q(2010),
+         q(2011),
          q(0),
          ],
       q(dgk) => [
-         q(2011),
+         q(2012),
          q(0),
          ],
       q(dgl) => [
-         q(2012),
+         q(2013),
          q(0),
          ],
       q(dgn) => [
-         q(2013),
+         q(2014),
          q(0),
          ],
       q(dgo) => [
-         q(2014),
+         q(2015),
          q(0),
          ],
       q(dgr) => [
@@ -64624,127 +64688,127 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(dgs) => [
-         q(2015),
+         q(2016),
          q(0),
          ],
       q(dgt) => [
-         q(2016),
+         q(2017),
          q(0),
          ],
       q(dgu) => [
-         q(2017),
+         q(2018),
          q(0),
          ],
       q(dgw) => [
-         q(2018),
+         q(2019),
          q(0),
          ],
       q(dgx) => [
-         q(2019),
+         q(2020),
          q(0),
          ],
       q(dgz) => [
-         q(2020),
+         q(2021),
          q(0),
          ],
       q(dhd) => [
-         q(2021),
+         q(2022),
          q(0),
          ],
       q(dhg) => [
-         q(2022),
+         q(2023),
          q(0),
          ],
       q(dhi) => [
-         q(2023),
+         q(2024),
          q(0),
          ],
       q(dhl) => [
-         q(2024),
+         q(2025),
          q(0),
          ],
       q(dhm) => [
-         q(2025),
+         q(2026),
          q(0),
          ],
       q(dhn) => [
-         q(2026),
+         q(2027),
          q(0),
          ],
       q(dho) => [
-         q(2027),
+         q(2028),
          q(0),
          ],
       q(dhr) => [
-         q(2028),
+         q(2029),
          q(0),
          ],
       q(dhs) => [
-         q(2029),
+         q(2030),
          q(0),
          ],
       q(dhu) => [
-         q(2030),
+         q(2031),
          q(0),
          ],
       q(dhv) => [
-         q(2031),
+         q(2032),
          q(0),
          ],
       q(dhw) => [
-         q(2032),
+         q(2033),
          q(0),
          ],
       q(dhx) => [
-         q(2033),
+         q(2034),
          q(0),
          ],
       q(dia) => [
-         q(2034),
+         q(2035),
          q(0),
          ],
       q(dib) => [
-         q(2035),
+         q(2036),
          q(0),
          ],
       q(dic) => [
-         q(2036),
+         q(2037),
          q(0),
          ],
       q(did) => [
-         q(2037),
+         q(2038),
          q(0),
          ],
       q(dif) => [
-         q(2038),
+         q(2039),
          q(0),
          ],
       q(dig) => [
-         q(2039),
+         q(2040),
          q(0),
          ],
       q(dih) => [
-         q(2040),
+         q(2041),
          q(0),
          ],
       q(dii) => [
-         q(2041),
+         q(2042),
          q(0),
          ],
       q(dij) => [
-         q(2042),
+         q(2043),
          q(0),
          ],
       q(dik) => [
-         q(2043),
+         q(2044),
          q(0),
          ],
       q(dil) => [
-         q(2044),
+         q(2045),
          q(0),
          ],
       q(dim) => [
-         q(2045),
+         q(2046),
          q(0),
          ],
       q(din) => [
@@ -64752,31 +64816,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(dio) => [
-         q(2046),
+         q(2047),
          q(0),
          ],
       q(dip) => [
-         q(2047),
+         q(2048),
          q(0),
          ],
       q(diq) => [
-         q(2048),
+         q(2049),
          q(0),
          ],
       q(dir) => [
-         q(2049),
+         q(2050),
          q(0),
          ],
       q(dis) => [
-         q(2050),
+         q(2051),
          q(0),
          ],
       q(dit) => [
-         q(2051),
+         q(2052),
          q(0),
          ],
       q(diu) => [
-         q(2052),
+         q(2053),
          q(0),
          ],
       q(div) => [
@@ -64784,151 +64848,151 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(diw) => [
-         q(2053),
+         q(2054),
          q(0),
          ],
       q(dix) => [
-         q(2054),
+         q(2055),
          q(0),
          ],
       q(diy) => [
-         q(2055),
+         q(2056),
          q(0),
          ],
       q(diz) => [
-         q(2056),
+         q(2057),
          q(0),
          ],
       q(dja) => [
-         q(2057),
+         q(2058),
          q(0),
          ],
       q(djb) => [
-         q(2058),
+         q(2059),
          q(0),
          ],
       q(djc) => [
-         q(2059),
+         q(2060),
          q(0),
          ],
       q(djd) => [
-         q(2060),
+         q(2061),
          q(0),
          ],
       q(dje) => [
-         q(2061),
+         q(2062),
          q(0),
          ],
       q(djf) => [
-         q(2062),
+         q(2063),
          q(0),
          ],
       q(dji) => [
-         q(2063),
+         q(2064),
          q(0),
          ],
       q(djj) => [
-         q(2064),
+         q(2065),
          q(0),
          ],
       q(djk) => [
-         q(2065),
+         q(2066),
          q(0),
          ],
       q(djm) => [
-         q(2066),
+         q(2067),
          q(0),
          ],
       q(djn) => [
-         q(2067),
+         q(2068),
          q(0),
          ],
       q(djo) => [
-         q(2068),
+         q(2069),
          q(0),
          ],
       q(djr) => [
-         q(2069),
+         q(2070),
          q(0),
          ],
       q(dju) => [
-         q(2070),
+         q(2071),
          q(0),
          ],
       q(djw) => [
-         q(2071),
+         q(2072),
          q(0),
          ],
       q(dka) => [
-         q(2072),
+         q(2073),
          q(0),
          ],
       q(dkk) => [
-         q(2073),
+         q(2074),
          q(0),
          ],
       q(dkr) => [
-         q(2074),
+         q(2075),
          q(0),
          ],
       q(dks) => [
-         q(2075),
+         q(2076),
          q(0),
          ],
       q(dkx) => [
-         q(2076),
+         q(2077),
          q(0),
          ],
       q(dlg) => [
-         q(2077),
+         q(2078),
          q(0),
          ],
       q(dlk) => [
-         q(2078),
+         q(2079),
          q(0),
          ],
       q(dlm) => [
-         q(2079),
+         q(2080),
          q(0),
          ],
       q(dln) => [
-         q(2080),
+         q(2081),
          q(0),
          ],
       q(dma) => [
-         q(2081),
+         q(2082),
          q(0),
          ],
       q(dmb) => [
-         q(2082),
+         q(2083),
          q(0),
          ],
       q(dmc) => [
-         q(2083),
+         q(2084),
          q(0),
          ],
       q(dmd) => [
-         q(2084),
+         q(2085),
          q(0),
          ],
       q(dme) => [
-         q(2085),
+         q(2086),
          q(0),
          ],
       q(dmg) => [
-         q(2086),
+         q(2087),
          q(0),
          ],
       q(dmk) => [
-         q(2087),
+         q(2088),
          q(0),
          ],
       q(dml) => [
-         q(2088),
+         q(2089),
          q(0),
          ],
       q(dmm) => [
-         q(2089),
+         q(2090),
          q(0),
          ],
       q(dmn) => [
@@ -64936,115 +65000,115 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(dmo) => [
-         q(2090),
+         q(2091),
          q(0),
          ],
       q(dmr) => [
-         q(2091),
+         q(2092),
          q(0),
          ],
       q(dms) => [
-         q(2092),
+         q(2093),
          q(0),
          ],
       q(dmu) => [
-         q(2093),
+         q(2094),
          q(0),
          ],
       q(dmv) => [
-         q(2094),
+         q(2095),
          q(0),
          ],
       q(dmw) => [
-         q(2095),
+         q(2096),
          q(0),
          ],
       q(dmx) => [
-         q(2096),
+         q(2097),
          q(0),
          ],
       q(dmy) => [
-         q(2097),
+         q(2098),
          q(0),
          ],
       q(dna) => [
-         q(2098),
+         q(2099),
          q(0),
          ],
       q(dnd) => [
-         q(2099),
+         q(2100),
          q(0),
          ],
       q(dne) => [
-         q(2100),
+         q(2101),
          q(0),
          ],
       q(dng) => [
-         q(2101),
+         q(2102),
          q(0),
          ],
       q(dni) => [
-         q(2102),
+         q(2103),
          q(0),
          ],
       q(dnj) => [
-         q(2103),
+         q(2104),
          q(0),
          ],
       q(dnk) => [
-         q(2104),
+         q(2105),
          q(0),
          ],
       q(dnn) => [
-         q(2105),
+         q(2106),
          q(0),
          ],
       q(dnr) => [
-         q(2106),
+         q(2107),
          q(0),
          ],
       q(dnt) => [
-         q(2107),
+         q(2108),
          q(0),
          ],
       q(dnu) => [
-         q(2108),
+         q(2109),
          q(0),
          ],
       q(dnv) => [
-         q(2109),
+         q(2110),
          q(0),
          ],
       q(dnw) => [
-         q(2110),
+         q(2111),
          q(0),
          ],
       q(dny) => [
-         q(2111),
+         q(2112),
          q(0),
          ],
       q(doa) => [
-         q(2112),
+         q(2113),
          q(0),
          ],
       q(dob) => [
-         q(2113),
+         q(2114),
          q(0),
          ],
       q(doc) => [
-         q(2114),
+         q(2115),
          q(0),
          ],
       q(doe) => [
-         q(2115),
+         q(2116),
          q(0),
          ],
       q(dof) => [
-         q(2116),
+         q(2117),
          q(0),
          ],
       q(doh) => [
-         q(2117),
+         q(2118),
          q(0),
          ],
       q(doi) => [
@@ -65052,63 +65116,63 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(dok) => [
-         q(2118),
+         q(2119),
          q(0),
          ],
       q(dol) => [
-         q(2119),
+         q(2120),
          q(0),
          ],
       q(don) => [
-         q(2120),
+         q(2121),
          q(0),
          ],
       q(doo) => [
-         q(2121),
+         q(2122),
          q(0),
          ],
       q(dop) => [
-         q(2122),
+         q(2123),
          q(0),
          ],
       q(doq) => [
-         q(2123),
+         q(2124),
          q(0),
          ],
       q(dor) => [
-         q(2124),
+         q(2125),
          q(0),
          ],
       q(dos) => [
-         q(2125),
+         q(2126),
          q(0),
          ],
       q(dot) => [
-         q(2126),
+         q(2127),
          q(0),
          ],
       q(dov) => [
-         q(2127),
+         q(2128),
          q(0),
          ],
       q(dow) => [
-         q(2128),
+         q(2129),
          q(0),
          ],
       q(dox) => [
-         q(2129),
+         q(2130),
          q(0),
          ],
       q(doy) => [
-         q(2130),
+         q(2131),
          q(0),
          ],
       q(doz) => [
-         q(2131),
+         q(2132),
          q(0),
          ],
       q(dpp) => [
-         q(2132),
+         q(2133),
          q(0),
          ],
       q(dra) => [
@@ -65116,63 +65180,63 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(drb) => [
-         q(2133),
+         q(2134),
          q(0),
          ],
       q(drc) => [
-         q(2134),
+         q(2135),
          q(0),
          ],
       q(drd) => [
-         q(2135),
+         q(2136),
          q(0),
          ],
       q(dre) => [
-         q(2136),
+         q(2137),
          q(0),
          ],
       q(drg) => [
-         q(2137),
+         q(2138),
          q(0),
          ],
       q(dri) => [
-         q(2138),
+         q(2139),
          q(0),
          ],
       q(drl) => [
-         q(2139),
+         q(2140),
          q(0),
          ],
       q(drn) => [
-         q(2140),
+         q(2141),
          q(0),
          ],
       q(dro) => [
-         q(2141),
+         q(2142),
          q(0),
          ],
       q(drq) => [
-         q(2142),
+         q(2143),
          q(0),
          ],
       q(drr) => [
-         q(2143),
+         q(2144),
          q(0),
          ],
       q(drs) => [
-         q(2144),
+         q(2145),
          q(0),
          ],
       q(drt) => [
-         q(2145),
+         q(2146),
          q(0),
          ],
       q(dru) => [
-         q(2146),
+         q(2147),
          q(0),
          ],
       q(dry) => [
-         q(2147),
+         q(2148),
          q(0),
          ],
       q(dsb) => [
@@ -65180,87 +65244,87 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(dse) => [
-         q(2148),
+         q(2149),
          q(0),
          ],
       q(dsh) => [
-         q(2149),
+         q(2150),
          q(0),
          ],
       q(dsi) => [
-         q(2150),
+         q(2151),
          q(0),
          ],
       q(dsl) => [
-         q(2151),
+         q(2152),
          q(0),
          ],
       q(dsn) => [
-         q(2152),
+         q(2153),
          q(0),
          ],
       q(dso) => [
-         q(2153),
+         q(2154),
          q(0),
          ],
       q(dsq) => [
-         q(2154),
+         q(2155),
          q(0),
          ],
       q(dta) => [
-         q(2155),
+         q(2156),
          q(0),
          ],
       q(dtb) => [
-         q(2156),
+         q(2157),
          q(0),
          ],
       q(dtd) => [
-         q(2157),
+         q(2158),
          q(0),
          ],
       q(dth) => [
-         q(2158),
+         q(2159),
          q(0),
          ],
       q(dti) => [
-         q(2159),
+         q(2160),
          q(0),
          ],
       q(dtk) => [
-         q(2160),
+         q(2161),
          q(0),
          ],
       q(dtm) => [
-         q(2161),
+         q(2162),
          q(0),
          ],
       q(dto) => [
-         q(2162),
+         q(2163),
          q(0),
          ],
       q(dtp) => [
-         q(2163),
+         q(2164),
          q(0),
          ],
       q(dtr) => [
-         q(2164),
+         q(2165),
          q(0),
          ],
       q(dts) => [
-         q(2165),
+         q(2166),
          q(0),
          ],
       q(dtt) => [
-         q(2166),
+         q(2167),
          q(0),
          ],
       q(dtu) => [
-         q(2167),
+         q(2168),
          q(0),
          ],
       q(dty) => [
-         q(2168),
+         q(2169),
          q(0),
          ],
       q(dua) => [
@@ -65268,47 +65332,47 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(dub) => [
-         q(2169),
+         q(2170),
          q(0),
          ],
       q(duc) => [
-         q(2170),
+         q(2171),
          q(0),
          ],
       q(dud) => [
-         q(2171),
+         q(2172),
          q(0),
          ],
       q(due) => [
-         q(2172),
+         q(2173),
          q(0),
          ],
       q(duf) => [
-         q(2173),
+         q(2174),
          q(0),
          ],
       q(dug) => [
-         q(2174),
+         q(2175),
          q(0),
          ],
       q(duh) => [
-         q(2175),
+         q(2176),
          q(0),
          ],
       q(dui) => [
-         q(2176),
+         q(2177),
          q(0),
          ],
       q(duj) => [
-         q(2177),
+         q(2178),
          q(0),
          ],
       q(duk) => [
-         q(2178),
+         q(2179),
          q(0),
          ],
       q(dul) => [
-         q(2179),
+         q(2180),
          q(0),
          ],
       q(dum) => [
@@ -65316,27 +65380,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(dun) => [
-         q(2180),
+         q(2181),
          q(0),
          ],
       q(duo) => [
-         q(2181),
+         q(2182),
          q(0),
          ],
       q(dup) => [
-         q(2182),
+         q(2183),
          q(0),
          ],
       q(duq) => [
-         q(2183),
+         q(2184),
          q(0),
          ],
       q(dur) => [
-         q(2184),
+         q(2185),
          q(0),
          ],
       q(dus) => [
-         q(2185),
+         q(2186),
          q(0),
          ],
       q(dut) => [
@@ -65344,79 +65408,79 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(duu) => [
-         q(2186),
+         q(2187),
          q(0),
          ],
       q(duv) => [
-         q(2187),
+         q(2188),
          q(0),
          ],
       q(duw) => [
-         q(2188),
+         q(2189),
          q(0),
          ],
       q(dux) => [
-         q(2189),
+         q(2190),
          q(0),
          ],
       q(duy) => [
-         q(2190),
+         q(2191),
          q(0),
          ],
       q(duz) => [
-         q(2191),
+         q(2192),
          q(0),
          ],
       q(dva) => [
-         q(2192),
+         q(2193),
          q(0),
          ],
       q(dwa) => [
-         q(2193),
+         q(2194),
          q(0),
          ],
       q(dwr) => [
-         q(2194),
+         q(2195),
          q(0),
          ],
       q(dws) => [
-         q(2195),
+         q(2196),
          q(0),
          ],
       q(dww) => [
-         q(2196),
+         q(2197),
          q(0),
          ],
       q(dya) => [
-         q(2197),
+         q(2198),
          q(0),
          ],
       q(dyb) => [
-         q(2198),
+         q(2199),
          q(0),
          ],
       q(dyd) => [
-         q(2199),
+         q(2200),
          q(0),
          ],
       q(dyg) => [
-         q(2200),
+         q(2201),
          q(0),
          ],
       q(dyi) => [
-         q(2201),
+         q(2202),
          q(0),
          ],
       q(dym) => [
-         q(2202),
+         q(2203),
          q(0),
          ],
       q(dyn) => [
-         q(2203),
+         q(2204),
          q(0),
          ],
       q(dyo) => [
-         q(2204),
+         q(2205),
          q(0),
          ],
       q(dyu) => [
@@ -65424,27 +65488,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(dyy) => [
-         q(2205),
+         q(2206),
          q(0),
          ],
       q(dza) => [
-         q(2206),
+         q(2207),
          q(0),
          ],
       q(dze) => [
-         q(2207),
+         q(2208),
          q(0),
          ],
       q(dzg) => [
-         q(2208),
+         q(2209),
          q(0),
          ],
       q(dzl) => [
-         q(2209),
+         q(2210),
          q(0),
          ],
       q(dzn) => [
-         q(2210),
+         q(2211),
          q(0),
          ],
       q(dzo) => [
@@ -65452,51 +65516,51 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(eaa) => [
-         q(2211),
+         q(2212),
          q(0),
          ],
       q(ebg) => [
-         q(2212),
+         q(2213),
          q(0),
          ],
       q(ebk) => [
-         q(2213),
+         q(2214),
          q(0),
          ],
       q(ebo) => [
-         q(2214),
+         q(2215),
          q(0),
          ],
       q(ebr) => [
-         q(2215),
+         q(2216),
          q(0),
          ],
       q(ebu) => [
-         q(2216),
+         q(2217),
          q(0),
          ],
       q(ecr) => [
-         q(2217),
+         q(2218),
          q(0),
          ],
       q(ecs) => [
-         q(2218),
+         q(2219),
          q(0),
          ],
       q(ecy) => [
-         q(2219),
+         q(2220),
          q(0),
          ],
       q(eee) => [
-         q(2220),
+         q(2221),
          q(0),
          ],
       q(efa) => [
-         q(2221),
+         q(2222),
          q(0),
          ],
       q(efe) => [
-         q(2222),
+         q(2223),
          q(0),
          ],
       q(efi) => [
@@ -65504,15 +65568,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ega) => [
-         q(2223),
+         q(2224),
          q(0),
          ],
       q(egl) => [
-         q(2224),
+         q(2225),
          q(0),
          ],
       q(ego) => [
-         q(2225),
+         q(2226),
          q(0),
          ],
       q(egx) => [
@@ -65524,23 +65588,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ehu) => [
-         q(2226),
+         q(2227),
          q(0),
          ],
       q(eip) => [
-         q(2227),
+         q(2228),
          q(0),
          ],
       q(eit) => [
-         q(2228),
+         q(2229),
          q(0),
          ],
       q(eiv) => [
-         q(2229),
+         q(2230),
          q(0),
          ],
       q(eja) => [
-         q(2230),
+         q(2231),
          q(0),
          ],
       q(eka) => [
@@ -65548,75 +65612,75 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ekc) => [
-         q(2231),
+         q(2232),
          q(0),
          ],
       q(eke) => [
-         q(2232),
+         q(2233),
          q(0),
          ],
       q(ekg) => [
-         q(2233),
+         q(2234),
          q(0),
          ],
       q(eki) => [
-         q(2234),
+         q(2235),
          q(0),
          ],
       q(ekk) => [
-         q(2235),
+         q(2236),
          q(0),
          ],
       q(ekl) => [
-         q(2236),
+         q(2237),
          q(0),
          ],
       q(ekm) => [
-         q(2237),
+         q(2238),
          q(0),
          ],
       q(eko) => [
-         q(2238),
+         q(2239),
          q(0),
          ],
       q(ekp) => [
-         q(2239),
+         q(2240),
          q(0),
          ],
       q(ekr) => [
-         q(2240),
+         q(2241),
          q(0),
          ],
       q(eky) => [
-         q(2241),
+         q(2242),
          q(0),
          ],
       q(ele) => [
-         q(2242),
+         q(2243),
          q(0),
          ],
       q(elh) => [
-         q(2243),
+         q(2244),
          q(0),
          ],
       q(eli) => [
-         q(2244),
+         q(2245),
          q(0),
          ],
       q(elk) => [
-         q(2245),
+         q(2246),
          q(0),
          ],
       q(elm) => [
-         q(2246),
+         q(2247),
          q(0),
          ],
       q(elo) => [
-         q(2247),
+         q(2248),
          q(0),
          ],
       q(elu) => [
-         q(2248),
+         q(2249),
          q(0),
          ],
       q(elx) => [
@@ -65624,79 +65688,79 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ema) => [
-         q(2249),
+         q(2250),
          q(0),
          ],
       q(emb) => [
-         q(2250),
+         q(2251),
          q(0),
          ],
       q(eme) => [
-         q(2251),
+         q(2252),
          q(0),
          ],
       q(emg) => [
-         q(2252),
+         q(2253),
          q(0),
          ],
       q(emi) => [
-         q(2253),
+         q(2254),
          q(0),
          ],
       q(emk) => [
-         q(2254),
+         q(2255),
          q(0),
          ],
       q(emm) => [
-         q(2255),
+         q(2256),
          q(0),
          ],
       q(emn) => [
-         q(2256),
+         q(2257),
          q(0),
          ],
       q(emp) => [
-         q(2257),
+         q(2258),
          q(0),
          ],
       q(ems) => [
-         q(2258),
+         q(2259),
          q(0),
          ],
       q(emu) => [
-         q(2259),
+         q(2260),
          q(0),
          ],
       q(emw) => [
-         q(2260),
+         q(2261),
          q(0),
          ],
       q(emx) => [
-         q(2261),
+         q(2262),
          q(0),
          ],
       q(emy) => [
-         q(2262),
+         q(2263),
          q(0),
          ],
       q(ena) => [
-         q(2263),
+         q(2264),
          q(0),
          ],
       q(enb) => [
-         q(2264),
+         q(2265),
          q(0),
          ],
       q(enc) => [
-         q(2265),
+         q(2266),
          q(0),
          ],
       q(end) => [
-         q(2266),
+         q(2267),
          q(0),
          ],
       q(enf) => [
-         q(2267),
+         q(2268),
          q(0),
          ],
       q(eng) => [
@@ -65704,11 +65768,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(enh) => [
-         q(2268),
+         q(2269),
          q(0),
          ],
       q(enl) => [
-         q(2269),
+         q(2270),
          q(0),
          ],
       q(enm) => [
@@ -65716,43 +65780,43 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(enn) => [
-         q(2270),
+         q(2271),
          q(0),
          ],
       q(eno) => [
-         q(2271),
+         q(2272),
          q(0),
          ],
       q(enq) => [
-         q(2272),
+         q(2273),
          q(0),
          ],
       q(enr) => [
-         q(2273),
+         q(2274),
          q(0),
          ],
       q(enu) => [
-         q(2274),
+         q(2275),
          q(0),
          ],
       q(env) => [
-         q(2275),
+         q(2276),
          q(0),
          ],
       q(enw) => [
-         q(2276),
+         q(2277),
          q(0),
          ],
       q(enx) => [
-         q(2277),
+         q(2278),
          q(0),
          ],
       q(eot) => [
-         q(2278),
+         q(2279),
          q(0),
          ],
       q(epi) => [
-         q(2279),
+         q(2280),
          q(0),
          ],
       q(epo) => [
@@ -65760,83 +65824,83 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(era) => [
-         q(2280),
+         q(2281),
          q(0),
          ],
       q(erg) => [
-         q(2281),
+         q(2282),
          q(0),
          ],
       q(erh) => [
-         q(2282),
+         q(2283),
          q(0),
          ],
       q(eri) => [
-         q(2283),
+         q(2284),
          q(0),
          ],
       q(erk) => [
-         q(2284),
+         q(2285),
          q(0),
          ],
       q(ero) => [
-         q(2285),
+         q(2286),
          q(0),
          ],
       q(err) => [
-         q(2286),
+         q(2287),
          q(0),
          ],
       q(ers) => [
-         q(2287),
+         q(2288),
          q(0),
          ],
       q(ert) => [
-         q(2288),
+         q(2289),
          q(0),
          ],
       q(erw) => [
-         q(2289),
+         q(2290),
          q(0),
          ],
       q(ese) => [
-         q(2290),
+         q(2291),
          q(0),
          ],
       q(esh) => [
-         q(2291),
+         q(2292),
          q(0),
          ],
       q(esi) => [
-         q(2292),
+         q(2293),
          q(0),
          ],
       q(esk) => [
-         q(2293),
+         q(2294),
          q(0),
          ],
       q(esl) => [
-         q(2294),
+         q(2295),
          q(0),
          ],
       q(esm) => [
-         q(2295),
+         q(2296),
          q(0),
          ],
       q(esn) => [
-         q(2296),
+         q(2297),
          q(0),
          ],
       q(eso) => [
-         q(2297),
+         q(2298),
          q(0),
          ],
       q(esq) => [
-         q(2298),
+         q(2299),
          q(0),
          ],
       q(ess) => [
-         q(2299),
+         q(2300),
          q(0),
          ],
       q(est) => [
@@ -65844,7 +65908,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(esu) => [
-         q(2300),
+         q(2301),
          q(0),
          ],
       q(esx) => [
@@ -65852,51 +65916,51 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(esy) => [
-         q(2301),
+         q(2302),
          q(0),
          ],
       q(etb) => [
-         q(2302),
+         q(2303),
          q(0),
          ],
       q(etc) => [
-         q(2303),
+         q(2304),
          q(0),
          ],
       q(eth) => [
-         q(2304),
+         q(2305),
          q(0),
          ],
       q(etn) => [
-         q(2305),
+         q(2306),
          q(0),
          ],
       q(eto) => [
-         q(2306),
+         q(2307),
          q(0),
          ],
       q(etr) => [
-         q(2307),
+         q(2308),
          q(0),
          ],
       q(ets) => [
-         q(2308),
+         q(2309),
          q(0),
          ],
       q(ett) => [
-         q(2309),
+         q(2310),
          q(0),
          ],
       q(etu) => [
-         q(2310),
+         q(2311),
          q(0),
          ],
       q(etx) => [
-         q(2311),
+         q(2312),
          q(0),
          ],
       q(etz) => [
-         q(2312),
+         q(2313),
          q(0),
          ],
       q(euq) => [
@@ -65904,15 +65968,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(eve) => [
-         q(2313),
+         q(2314),
          q(0),
          ],
       q(evh) => [
-         q(2314),
+         q(2315),
          q(0),
          ],
       q(evn) => [
-         q(2315),
+         q(2316),
          q(0),
          ],
       q(ewe) => [
@@ -65924,67 +65988,67 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ext) => [
-         q(2316),
+         q(2317),
          q(0),
          ],
       q(eya) => [
-         q(2317),
+         q(2318),
          q(0),
          ],
       q(eyo) => [
-         q(2318),
+         q(2319),
          q(0),
          ],
       q(eza) => [
-         q(2319),
+         q(2320),
          q(0),
          ],
       q(eze) => [
-         q(2320),
+         q(2321),
          q(0),
          ],
       q(faa) => [
-         q(2321),
+         q(2322),
          q(0),
          ],
       q(fab) => [
-         q(2322),
+         q(2323),
          q(0),
          ],
       q(fad) => [
-         q(2323),
+         q(2324),
          q(0),
          ],
       q(faf) => [
-         q(2324),
+         q(2325),
          q(0),
          ],
       q(fag) => [
-         q(2325),
+         q(2326),
          q(0),
          ],
       q(fah) => [
-         q(2326),
+         q(2327),
          q(0),
          ],
       q(fai) => [
-         q(2327),
+         q(2328),
          q(0),
          ],
       q(faj) => [
-         q(2328),
+         q(2329),
          q(0),
          ],
       q(fak) => [
-         q(2329),
+         q(2330),
          q(0),
          ],
       q(fal) => [
-         q(2330),
+         q(2331),
          q(0),
          ],
       q(fam) => [
-         q(2331),
+         q(2332),
          q(0),
          ],
       q(fan) => [
@@ -65996,11 +66060,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(fap) => [
-         q(2332),
+         q(2333),
          q(0),
          ],
       q(far) => [
-         q(2333),
+         q(2334),
          q(0),
          ],
       q(fat) => [
@@ -66008,51 +66072,51 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(fau) => [
-         q(2334),
+         q(2335),
          q(0),
          ],
       q(fax) => [
-         q(2335),
+         q(2336),
          q(0),
          ],
       q(fay) => [
-         q(2336),
+         q(2337),
          q(0),
          ],
       q(faz) => [
-         q(2337),
+         q(2338),
          q(0),
          ],
       q(fbl) => [
-         q(2338),
+         q(2339),
          q(0),
          ],
       q(fcs) => [
-         q(2339),
+         q(2340),
          q(0),
          ],
       q(fer) => [
-         q(2340),
+         q(2341),
          q(0),
          ],
       q(ffi) => [
-         q(2341),
+         q(2342),
          q(0),
          ],
       q(ffm) => [
-         q(2342),
+         q(2343),
          q(0),
          ],
       q(fgr) => [
-         q(2343),
+         q(2344),
          q(0),
          ],
       q(fia) => [
-         q(2344),
+         q(2345),
          q(0),
          ],
       q(fie) => [
-         q(2345),
+         q(2346),
          q(0),
          ],
       q(fij) => [
@@ -66068,15 +66132,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(fip) => [
-         q(2346),
+         q(2347),
          q(0),
          ],
       q(fir) => [
-         q(2347),
+         q(2348),
          q(0),
          ],
       q(fit) => [
-         q(2348),
+         q(2349),
          q(0),
          ],
       q(fiu) => [
@@ -66084,71 +66148,71 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(fiw) => [
-         q(2349),
+         q(2350),
          q(0),
          ],
       q(fkk) => [
-         q(2350),
+         q(2351),
          q(0),
          ],
       q(fkv) => [
-         q(2351),
+         q(2352),
          q(0),
          ],
       q(fla) => [
-         q(2352),
+         q(2353),
          q(0),
          ],
       q(flh) => [
-         q(2353),
+         q(2354),
          q(0),
          ],
       q(fli) => [
-         q(2354),
+         q(2355),
          q(0),
          ],
       q(fll) => [
-         q(2355),
+         q(2356),
          q(0),
          ],
       q(fln) => [
-         q(2356),
+         q(2357),
          q(0),
          ],
       q(flr) => [
-         q(2357),
+         q(2358),
          q(0),
          ],
       q(fly) => [
-         q(2358),
+         q(2359),
          q(0),
          ],
       q(fmp) => [
-         q(2359),
+         q(2360),
          q(0),
          ],
       q(fmu) => [
-         q(2360),
+         q(2361),
          q(0),
          ],
       q(fng) => [
-         q(2361),
+         q(2362),
          q(0),
          ],
       q(fni) => [
-         q(2362),
+         q(2363),
          q(0),
          ],
       q(fod) => [
-         q(2363),
+         q(2364),
          q(0),
          ],
       q(foi) => [
-         q(2364),
+         q(2365),
          q(0),
          ],
       q(fom) => [
-         q(2365),
+         q(2366),
          q(0),
          ],
       q(fon) => [
@@ -66156,11 +66220,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(for) => [
-         q(2366),
+         q(2367),
          q(0),
          ],
       q(fos) => [
-         q(2367),
+         q(2368),
          q(0),
          ],
       q(fox) => [
@@ -66168,19 +66232,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(fpe) => [
-         q(2368),
+         q(2369),
          q(0),
          ],
       q(fqs) => [
-         q(2369),
+         q(2370),
          q(0),
          ],
       q(frc) => [
-         q(2370),
+         q(2371),
          q(0),
          ],
       q(frd) => [
-         q(2371),
+         q(2372),
          q(0),
          ],
       q(fre) => [
@@ -66188,7 +66252,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(frk) => [
-         q(2372),
+         q(2373),
          q(0),
          ],
       q(frm) => [
@@ -66200,11 +66264,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(frp) => [
-         q(2373),
+         q(2374),
          q(0),
          ],
       q(frq) => [
-         q(2374),
+         q(2375),
          q(0),
          ],
       q(frr) => [
@@ -66216,7 +66280,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(frt) => [
-         q(2375),
+         q(2376),
          q(0),
          ],
       q(fry) => [
@@ -66224,47 +66288,47 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(fse) => [
-         q(2376),
+         q(2377),
          q(0),
          ],
       q(fsl) => [
-         q(2377),
+         q(2378),
          q(0),
          ],
       q(fss) => [
-         q(2378),
+         q(2379),
          q(0),
          ],
       q(fub) => [
-         q(2379),
+         q(2380),
          q(0),
          ],
       q(fuc) => [
-         q(2380),
+         q(2381),
          q(0),
          ],
       q(fud) => [
-         q(2381),
+         q(2382),
          q(0),
          ],
       q(fue) => [
-         q(2382),
+         q(2383),
          q(0),
          ],
       q(fuf) => [
-         q(2383),
+         q(2384),
          q(0),
          ],
       q(fuh) => [
-         q(2384),
+         q(2385),
          q(0),
          ],
       q(fui) => [
-         q(2385),
+         q(2386),
          q(0),
          ],
       q(fuj) => [
-         q(2386),
+         q(2387),
          q(0),
          ],
       q(ful) => [
@@ -66272,15 +66336,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(fum) => [
-         q(2387),
+         q(2388),
          q(0),
          ],
       q(fun) => [
-         q(2388),
+         q(2389),
          q(0),
          ],
       q(fuq) => [
-         q(2389),
+         q(2390),
          q(0),
          ],
       q(fur) => [
@@ -66288,31 +66352,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(fut) => [
-         q(2390),
+         q(2391),
          q(0),
          ],
       q(fuu) => [
-         q(2391),
+         q(2392),
          q(0),
          ],
       q(fuv) => [
-         q(2392),
+         q(2393),
          q(0),
          ],
       q(fuy) => [
-         q(2393),
+         q(2394),
          q(0),
          ],
       q(fvr) => [
-         q(2394),
+         q(2395),
          q(0),
          ],
       q(fwa) => [
-         q(2395),
+         q(2396),
          q(0),
          ],
       q(fwe) => [
-         q(2396),
+         q(2397),
          q(0),
          ],
       q(gaa) => [
@@ -66320,91 +66384,91 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(gab) => [
-         q(2397),
+         q(2398),
          q(0),
          ],
       q(gac) => [
-         q(2398),
+         q(2399),
          q(0),
          ],
       q(gad) => [
-         q(2399),
+         q(2400),
          q(0),
          ],
       q(gae) => [
-         q(2400),
+         q(2401),
          q(0),
          ],
       q(gaf) => [
-         q(2401),
+         q(2402),
          q(0),
          ],
       q(gag) => [
-         q(2402),
+         q(2403),
          q(0),
          ],
       q(gah) => [
-         q(2403),
+         q(2404),
          q(0),
          ],
       q(gai) => [
-         q(2404),
+         q(2405),
          q(0),
          ],
       q(gaj) => [
-         q(2405),
+         q(2406),
          q(0),
          ],
       q(gak) => [
-         q(2406),
+         q(2407),
          q(0),
          ],
       q(gal) => [
-         q(2407),
+         q(2408),
          q(0),
          ],
       q(gam) => [
-         q(2408),
+         q(2409),
          q(0),
          ],
       q(gan) => [
-         q(2409),
+         q(2410),
          q(0),
          ],
       q(gao) => [
-         q(2410),
+         q(2411),
          q(0),
          ],
       q(gap) => [
-         q(2411),
+         q(2412),
          q(0),
          ],
       q(gaq) => [
-         q(2412),
+         q(2413),
          q(0),
          ],
       q(gar) => [
-         q(2413),
+         q(2414),
          q(0),
          ],
       q(gas) => [
-         q(2414),
+         q(2415),
          q(0),
          ],
       q(gat) => [
-         q(2415),
+         q(2416),
          q(0),
          ],
       q(gau) => [
-         q(2416),
+         q(2417),
          q(0),
          ],
       q(gaw) => [
-         q(2417),
+         q(2418),
          q(0),
          ],
       q(gax) => [
-         q(2418),
+         q(2419),
          q(0),
          ],
       q(gay) => [
@@ -66412,7 +66476,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(gaz) => [
-         q(2419),
+         q(2420),
          q(0),
          ],
       q(gba) => [
@@ -66420,251 +66484,251 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(gbb) => [
-         q(2420),
+         q(2421),
          q(0),
          ],
       q(gbd) => [
-         q(2421),
+         q(2422),
          q(0),
          ],
       q(gbe) => [
-         q(2422),
+         q(2423),
          q(0),
          ],
       q(gbf) => [
-         q(2423),
+         q(2424),
          q(0),
          ],
       q(gbg) => [
-         q(2424),
+         q(2425),
          q(0),
          ],
       q(gbh) => [
-         q(2425),
+         q(2426),
          q(0),
          ],
       q(gbi) => [
-         q(2426),
+         q(2427),
          q(0),
          ],
       q(gbj) => [
-         q(2427),
+         q(2428),
          q(0),
          ],
       q(gbk) => [
-         q(2428),
+         q(2429),
          q(0),
          ],
       q(gbl) => [
-         q(2429),
+         q(2430),
          q(0),
          ],
       q(gbm) => [
-         q(2430),
+         q(2431),
          q(0),
          ],
       q(gbn) => [
-         q(2431),
+         q(2432),
          q(0),
          ],
       q(gbo) => [
-         q(2432),
+         q(2433),
          q(0),
          ],
       q(gbp) => [
-         q(2433),
+         q(2434),
          q(0),
          ],
       q(gbq) => [
-         q(2434),
+         q(2435),
          q(0),
          ],
       q(gbr) => [
-         q(2435),
+         q(2436),
          q(0),
          ],
       q(gbs) => [
-         q(2436),
+         q(2437),
          q(0),
          ],
       q(gbu) => [
-         q(2437),
+         q(2438),
          q(0),
          ],
       q(gbv) => [
-         q(2438),
+         q(2439),
          q(0),
          ],
       q(gbw) => [
-         q(2439),
+         q(2440),
          q(0),
          ],
       q(gbx) => [
-         q(2440),
+         q(2441),
          q(0),
          ],
       q(gby) => [
-         q(2441),
+         q(2442),
          q(0),
          ],
       q(gbz) => [
-         q(2442),
+         q(2443),
          q(0),
          ],
       q(gcc) => [
-         q(2443),
+         q(2444),
          q(0),
          ],
       q(gcd) => [
-         q(2444),
+         q(2445),
          q(0),
          ],
       q(gce) => [
-         q(2445),
+         q(2446),
          q(0),
          ],
       q(gcf) => [
-         q(2446),
+         q(2447),
          q(0),
          ],
       q(gcl) => [
-         q(2447),
+         q(2448),
          q(0),
          ],
       q(gcn) => [
-         q(2448),
+         q(2449),
          q(0),
          ],
       q(gcr) => [
-         q(2449),
+         q(2450),
          q(0),
          ],
       q(gct) => [
-         q(2450),
+         q(2451),
          q(0),
          ],
       q(gda) => [
-         q(2451),
+         q(2452),
          q(0),
          ],
       q(gdb) => [
-         q(2452),
+         q(2453),
          q(0),
          ],
       q(gdc) => [
-         q(2453),
+         q(2454),
          q(0),
          ],
       q(gdd) => [
-         q(2454),
+         q(2455),
          q(0),
          ],
       q(gde) => [
-         q(2455),
+         q(2456),
          q(0),
          ],
       q(gdf) => [
-         q(2456),
+         q(2457),
          q(0),
          ],
       q(gdg) => [
-         q(2457),
+         q(2458),
          q(0),
          ],
       q(gdh) => [
-         q(2458),
+         q(2459),
          q(0),
          ],
       q(gdi) => [
-         q(2459),
+         q(2460),
          q(0),
          ],
       q(gdj) => [
-         q(2460),
+         q(2461),
          q(0),
          ],
       q(gdk) => [
-         q(2461),
+         q(2462),
          q(0),
          ],
       q(gdl) => [
-         q(2462),
+         q(2463),
          q(0),
          ],
       q(gdm) => [
-         q(2463),
+         q(2464),
          q(0),
          ],
       q(gdn) => [
-         q(2464),
+         q(2465),
          q(0),
          ],
       q(gdo) => [
-         q(2465),
+         q(2466),
          q(0),
          ],
       q(gdq) => [
-         q(2466),
+         q(2467),
          q(0),
          ],
       q(gdr) => [
-         q(2467),
+         q(2468),
          q(0),
          ],
       q(gds) => [
-         q(2468),
+         q(2469),
          q(0),
          ],
       q(gdt) => [
-         q(2469),
+         q(2470),
          q(0),
          ],
       q(gdu) => [
-         q(2470),
+         q(2471),
          q(0),
          ],
       q(gdx) => [
-         q(2471),
+         q(2472),
          q(0),
          ],
       q(gea) => [
-         q(2472),
+         q(2473),
          q(0),
          ],
       q(geb) => [
-         q(2473),
+         q(2474),
          q(0),
          ],
       q(gec) => [
-         q(2474),
+         q(2475),
          q(0),
          ],
       q(ged) => [
-         q(2475),
+         q(2476),
          q(0),
          ],
       q(geg) => [
-         q(2476),
+         q(2477),
          q(0),
          ],
       q(geh) => [
-         q(2477),
+         q(2478),
          q(0),
          ],
       q(gei) => [
-         q(2478),
+         q(2479),
          q(0),
          ],
       q(gej) => [
-         q(2479),
+         q(2480),
          q(0),
          ],
       q(gek) => [
-         q(2480),
+         q(2481),
          q(0),
          ],
       q(gel) => [
-         q(2481),
+         q(2482),
          q(0),
          ],
       q(gem) => [
@@ -66676,7 +66740,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(geq) => [
-         q(2482),
+         q(2483),
          q(0),
          ],
       q(ger) => [
@@ -66684,23 +66748,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ges) => [
-         q(2483),
+         q(2484),
          q(0),
          ],
       q(gev) => [
-         q(2484),
+         q(2485),
          q(0),
          ],
       q(gew) => [
-         q(2485),
+         q(2486),
          q(0),
          ],
       q(gex) => [
-         q(2486),
+         q(2487),
          q(0),
          ],
       q(gey) => [
-         q(2487),
+         q(2488),
          q(0),
          ],
       q(gez) => [
@@ -66708,127 +66772,127 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(gfk) => [
-         q(2488),
+         q(2489),
          q(0),
          ],
       q(gft) => [
-         q(2489),
+         q(2490),
          q(0),
          ],
       q(gga) => [
-         q(2490),
+         q(2491),
          q(0),
          ],
       q(ggb) => [
-         q(2491),
+         q(2492),
          q(0),
          ],
       q(ggd) => [
-         q(2492),
+         q(2493),
          q(0),
          ],
       q(gge) => [
-         q(2493),
+         q(2494),
          q(0),
          ],
       q(ggg) => [
-         q(2494),
+         q(2495),
          q(0),
          ],
       q(ggk) => [
-         q(2495),
+         q(2496),
          q(0),
          ],
       q(ggl) => [
-         q(2496),
+         q(2497),
          q(0),
          ],
       q(ggn) => [
-         q(2497),
+         q(2498),
          q(0),
          ],
       q(ggo) => [
-         q(2498),
+         q(2499),
          q(0),
          ],
       q(ggt) => [
-         q(2499),
+         q(2500),
          q(0),
          ],
       q(ggu) => [
-         q(2500),
+         q(2501),
          q(0),
          ],
       q(ggw) => [
-         q(2501),
+         q(2502),
          q(0),
          ],
       q(gha) => [
-         q(2502),
+         q(2503),
          q(0),
          ],
       q(ghc) => [
-         q(2503),
+         q(2504),
          q(0),
          ],
       q(ghe) => [
-         q(2504),
+         q(2505),
          q(0),
          ],
       q(ghh) => [
-         q(2505),
+         q(2506),
          q(0),
          ],
       q(ghk) => [
-         q(2506),
+         q(2507),
          q(0),
          ],
       q(ghl) => [
-         q(2507),
+         q(2508),
          q(0),
          ],
       q(ghn) => [
-         q(2508),
+         q(2509),
          q(0),
          ],
       q(gho) => [
-         q(2509),
+         q(2510),
          q(0),
          ],
       q(ghr) => [
-         q(2510),
+         q(2511),
          q(0),
          ],
       q(ghs) => [
-         q(2511),
+         q(2512),
          q(0),
          ],
       q(ght) => [
-         q(2512),
+         q(2513),
          q(0),
          ],
       q(gia) => [
-         q(2513),
+         q(2514),
          q(0),
          ],
       q(gib) => [
-         q(2514),
+         q(2515),
          q(0),
          ],
       q(gic) => [
-         q(2515),
+         q(2516),
          q(0),
          ],
       q(gid) => [
-         q(2516),
+         q(2517),
          q(0),
          ],
       q(gig) => [
-         q(2517),
+         q(2518),
          q(0),
          ],
       q(gih) => [
-         q(2518),
+         q(2519),
          q(0),
          ],
       q(gil) => [
@@ -66836,95 +66900,95 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(gim) => [
-         q(2519),
+         q(2520),
          q(0),
          ],
       q(gin) => [
-         q(2520),
+         q(2521),
          q(0),
          ],
       q(gip) => [
-         q(2521),
+         q(2522),
          q(0),
          ],
       q(giq) => [
-         q(2522),
+         q(2523),
          q(0),
          ],
       q(gir) => [
-         q(2523),
+         q(2524),
          q(0),
          ],
       q(gis) => [
-         q(2524),
+         q(2525),
          q(0),
          ],
       q(git) => [
-         q(2525),
+         q(2526),
          q(0),
          ],
       q(giu) => [
-         q(2526),
+         q(2527),
          q(0),
          ],
       q(giw) => [
-         q(2527),
+         q(2528),
          q(0),
          ],
       q(gix) => [
-         q(2528),
+         q(2529),
          q(0),
          ],
       q(giy) => [
-         q(2529),
+         q(2530),
          q(0),
          ],
       q(giz) => [
-         q(2530),
+         q(2531),
          q(0),
          ],
       q(gji) => [
-         q(2531),
+         q(2532),
          q(0),
          ],
       q(gjk) => [
-         q(2532),
+         q(2533),
          q(0),
          ],
       q(gjm) => [
-         q(2533),
+         q(2534),
          q(0),
          ],
       q(gjn) => [
-         q(2534),
+         q(2535),
          q(0),
          ],
       q(gju) => [
-         q(2535),
+         q(2536),
          q(0),
          ],
       q(gka) => [
-         q(2536),
+         q(2537),
          q(0),
          ],
       q(gke) => [
-         q(2537),
+         q(2538),
          q(0),
          ],
       q(gkn) => [
-         q(2538),
+         q(2539),
          q(0),
          ],
       q(gko) => [
-         q(2539),
+         q(2540),
          q(0),
          ],
       q(gkp) => [
-         q(2540),
+         q(2541),
          q(0),
          ],
       q(gku) => [
-         q(2541),
+         q(2542),
          q(0),
          ],
       q(gla) => [
@@ -66932,11 +66996,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(glc) => [
-         q(2542),
+         q(2543),
          q(0),
          ],
       q(gld) => [
-         q(2543),
+         q(2544),
          q(0),
          ],
       q(gle) => [
@@ -66948,35 +67012,35 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(glh) => [
-         q(2544),
+         q(2545),
          q(0),
          ],
       q(gli) => [
-         q(2545),
+         q(2546),
          q(0),
          ],
       q(glj) => [
-         q(2546),
+         q(2547),
          q(0),
          ],
       q(glk) => [
-         q(2547),
+         q(2548),
          q(0),
          ],
       q(gll) => [
-         q(2548),
+         q(2549),
          q(0),
          ],
       q(glo) => [
-         q(2549),
+         q(2550),
          q(0),
          ],
       q(glr) => [
-         q(2550),
+         q(2551),
          q(0),
          ],
       q(glu) => [
-         q(2551),
+         q(2552),
          q(0),
          ],
       q(glv) => [
@@ -66984,23 +67048,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(glw) => [
-         q(2552),
+         q(2553),
          q(0),
          ],
       q(gly) => [
-         q(2553),
+         q(2554),
          q(0),
          ],
       q(gma) => [
-         q(2554),
+         q(2555),
          q(0),
          ],
       q(gmb) => [
-         q(2555),
+         q(2556),
          q(0),
          ],
       q(gmd) => [
-         q(2556),
+         q(2557),
          q(0),
          ],
       q(gme) => [
@@ -67008,7 +67072,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(gmg) => [
-         q(2557),
+         q(2558),
          q(0),
          ],
       q(gmh) => [
@@ -67016,15 +67080,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(gml) => [
-         q(2558),
+         q(2559),
          q(0),
          ],
       q(gmm) => [
-         q(2559),
+         q(2560),
          q(0),
          ],
       q(gmn) => [
-         q(2560),
+         q(2561),
          q(0),
          ],
       q(gmq) => [
@@ -67032,11 +67096,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(gmu) => [
-         q(2561),
+         q(2562),
          q(0),
          ],
       q(gmv) => [
-         q(2562),
+         q(2563),
          q(0),
          ],
       q(gmw) => [
@@ -67044,72 +67108,72 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(gmx) => [
-         q(2563),
+         q(2564),
          q(0),
          ],
       q(gmy) => [
-         q(2564),
+         q(2565),
          q(0),
          ],
       q(gmz) => [
-         q(2565),
+         q(2566),
          q(0),
          ],
       q(gna) => [
-         q(2566),
+         q(2567),
          q(0),
          ],
       q(gnb) => [
-         q(2567),
+         q(2568),
          q(0),
          ],
       q(gnc) => [
-         q(2568),
+         q(2569),
          q(0),
          ],
       q(gnd) => [
-         q(2569),
+         q(2570),
          q(0),
          ],
       q(gne) => [
-         q(2570),
+         q(2571),
          q(0),
          ],
       q(gng) => [
-         q(2571),
+         q(2572),
          q(0),
          ],
       q(gnh) => [
-         q(2572),
+         q(2573),
          q(0),
          ],
       q(gni) => [
-         q(2573),
+         q(2574),
          q(0),
          ],
       q(gnk) => [
-         q(2574),
+         q(2575),
          q(0),
          ],
       q(gnl) => [
-         q(2575),
+         q(2576),
          q(0),
          ],
       q(gnm) => [
-         q(2576),
+         q(2577),
          q(0),
          ],
       q(gnn) => [
-         q(2577),
+         q(2578),
          q(0),
          ],
       q(gno) => [
-         q(2578),
+         q(2579),
          q(0),
          ],
       q(gnq) => [
-         q(2579),
-         q(0),
+         q(2575),
+         q(1),
          ],
       q(gnr) => [
          q(2580),
@@ -69547,22 +69611,26 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(3135),
          q(0),
          ],
-      q(jor) => [
+      q(jog) => [
          q(3136),
          q(0),
          ],
-      q(jos) => [
+      q(jor) => [
          q(3137),
          q(0),
          ],
-      q(jow) => [
+      q(jos) => [
          q(3138),
          q(0),
          ],
-      q(jpa) => [
+      q(jow) => [
          q(3139),
          q(0),
          ],
+      q(jpa) => [
+         q(3140),
+         q(0),
+         ],
       q(jpn) => [
          q(0205),
          q(0),
@@ -69576,11 +69644,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(jqr) => [
-         q(3140),
+         q(3141),
          q(0),
          ],
       q(jra) => [
-         q(3141),
+         q(3142),
          q(0),
          ],
       q(jrb) => [
@@ -69588,115 +69656,115 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(jrr) => [
-         q(3142),
+         q(3143),
          q(0),
          ],
       q(jrt) => [
-         q(3143),
+         q(3144),
          q(0),
          ],
       q(jru) => [
-         q(3144),
+         q(3145),
          q(0),
          ],
       q(jsl) => [
-         q(3145),
+         q(3146),
          q(0),
          ],
       q(jua) => [
-         q(3146),
+         q(3147),
          q(0),
          ],
       q(jub) => [
-         q(3147),
+         q(3148),
          q(0),
          ],
       q(juc) => [
-         q(3148),
+         q(3149),
          q(0),
          ],
       q(jud) => [
-         q(3149),
+         q(3150),
          q(0),
          ],
       q(juh) => [
-         q(3150),
+         q(3151),
          q(0),
          ],
       q(jui) => [
-         q(3151),
+         q(3152),
          q(0),
          ],
       q(juk) => [
-         q(3152),
+         q(3153),
          q(0),
          ],
       q(jul) => [
-         q(3153),
+         q(3154),
          q(0),
          ],
       q(jum) => [
-         q(3154),
+         q(3155),
          q(0),
          ],
       q(jun) => [
-         q(3155),
+         q(3156),
          q(0),
          ],
       q(juo) => [
-         q(3156),
+         q(3157),
          q(0),
          ],
       q(jup) => [
-         q(3157),
+         q(3158),
          q(0),
          ],
       q(jur) => [
-         q(3158),
+         q(3159),
          q(0),
          ],
       q(jus) => [
-         q(3159),
+         q(3160),
          q(0),
          ],
       q(jut) => [
-         q(3160),
+         q(3161),
          q(0),
          ],
       q(juu) => [
-         q(3161),
+         q(3162),
          q(0),
          ],
       q(juw) => [
-         q(3162),
+         q(3163),
          q(0),
          ],
       q(juy) => [
-         q(3163),
+         q(3164),
          q(0),
          ],
       q(jvd) => [
-         q(3164),
+         q(3165),
          q(0),
          ],
       q(jvn) => [
-         q(3165),
+         q(3166),
          q(0),
          ],
       q(jwi) => [
-         q(3166),
+         q(3167),
          q(0),
          ],
       q(jya) => [
-         q(3167),
+         q(3168),
          q(0),
          ],
       q(jye) => [
-         q(3168),
+         q(3169),
          q(0),
          ],
       q(jyy) => [
-         q(3169),
+         q(3170),
          q(0),
          ],
       q(kaa) => [
@@ -69712,35 +69780,35 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kad) => [
-         q(3170),
+         q(3171),
          q(0),
          ],
       q(kae) => [
-         q(3171),
+         q(3172),
          q(0),
          ],
       q(kaf) => [
-         q(3172),
+         q(3173),
          q(0),
          ],
       q(kag) => [
-         q(3173),
+         q(3174),
          q(0),
          ],
       q(kah) => [
-         q(3174),
+         q(3175),
          q(0),
          ],
       q(kai) => [
-         q(3175),
+         q(3176),
          q(0),
          ],
       q(kaj) => [
-         q(3176),
+         q(3177),
          q(0),
          ],
       q(kak) => [
-         q(3177),
+         q(3178),
          q(0),
          ],
       q(kal) => [
@@ -69756,15 +69824,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kao) => [
-         q(3178),
+         q(3179),
          q(0),
          ],
       q(kap) => [
-         q(3179),
+         q(3180),
          q(0),
          ],
       q(kaq) => [
-         q(3180),
+         q(3181),
          q(0),
          ],
       q(kar) => [
@@ -69780,7 +69848,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kav) => [
-         q(3181),
+         q(3182),
          q(0),
          ],
       q(kaw) => [
@@ -69788,11 +69856,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kax) => [
-         q(3182),
+         q(3183),
          q(0),
          ],
       q(kay) => [
-         q(3183),
+         q(3184),
          q(0),
          ],
       q(kaz) => [
@@ -69800,15 +69868,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kba) => [
-         q(3184),
+         q(3185),
          q(0),
          ],
       q(kbb) => [
-         q(3185),
+         q(3186),
          q(0),
          ],
       q(kbc) => [
-         q(3186),
+         q(3187),
          q(0),
          ],
       q(kbd) => [
@@ -69816,243 +69884,243 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kbe) => [
-         q(3187),
+         q(3188),
          q(0),
          ],
       q(kbg) => [
-         q(3188),
+         q(3189),
          q(0),
          ],
       q(kbh) => [
-         q(3189),
+         q(3190),
          q(0),
          ],
       q(kbi) => [
-         q(3190),
+         q(3191),
          q(0),
          ],
       q(kbj) => [
-         q(3191),
+         q(3192),
          q(0),
          ],
       q(kbk) => [
-         q(3192),
+         q(3193),
          q(0),
          ],
       q(kbl) => [
-         q(3193),
+         q(3194),
          q(0),
          ],
       q(kbm) => [
-         q(3194),
+         q(3195),
          q(0),
          ],
       q(kbn) => [
-         q(3195),
+         q(3196),
          q(0),
          ],
       q(kbo) => [
-         q(3196),
+         q(3197),
          q(0),
          ],
       q(kbp) => [
-         q(3197),
+         q(3198),
          q(0),
          ],
       q(kbq) => [
-         q(3198),
+         q(3199),
          q(0),
          ],
       q(kbr) => [
-         q(3199),
+         q(3200),
          q(0),
          ],
       q(kbs) => [
-         q(3200),
+         q(3201),
          q(0),
          ],
       q(kbt) => [
-         q(3201),
+         q(3202),
          q(0),
          ],
       q(kbu) => [
-         q(3202),
+         q(3203),
          q(0),
          ],
       q(kbv) => [
-         q(3203),
+         q(3204),
          q(0),
          ],
       q(kbw) => [
-         q(3204),
+         q(3205),
          q(0),
          ],
       q(kbx) => [
-         q(3205),
+         q(3206),
          q(0),
          ],
       q(kby) => [
-         q(3206),
+         q(3207),
          q(0),
          ],
       q(kbz) => [
-         q(3207),
+         q(3208),
          q(0),
          ],
       q(kca) => [
-         q(3208),
+         q(3209),
          q(0),
          ],
       q(kcb) => [
-         q(3209),
+         q(3210),
          q(0),
          ],
       q(kcc) => [
-         q(3210),
+         q(3211),
          q(0),
          ],
       q(kcd) => [
-         q(3211),
+         q(3212),
          q(0),
          ],
       q(kce) => [
-         q(3212),
+         q(3213),
          q(0),
          ],
       q(kcf) => [
-         q(3213),
+         q(3214),
          q(0),
          ],
       q(kcg) => [
-         q(3214),
+         q(3215),
          q(0),
          ],
       q(kch) => [
-         q(3215),
+         q(3216),
          q(0),
          ],
       q(kci) => [
-         q(3216),
+         q(3217),
          q(0),
          ],
       q(kcj) => [
-         q(3217),
+         q(3218),
          q(0),
          ],
       q(kck) => [
-         q(3218),
+         q(3219),
          q(0),
          ],
       q(kcl) => [
-         q(3219),
+         q(3220),
          q(0),
          ],
       q(kcm) => [
-         q(3220),
+         q(3221),
          q(0),
          ],
       q(kcn) => [
-         q(3221),
+         q(3222),
          q(0),
          ],
       q(kco) => [
-         q(3222),
+         q(3223),
          q(0),
          ],
       q(kcp) => [
-         q(3223),
+         q(3224),
          q(0),
          ],
       q(kcq) => [
-         q(3224),
+         q(3225),
          q(0),
          ],
       q(kcr) => [
-         q(3225),
+         q(3226),
          q(0),
          ],
       q(kcs) => [
-         q(3226),
+         q(3227),
          q(0),
          ],
       q(kct) => [
-         q(3227),
+         q(3228),
          q(0),
          ],
       q(kcu) => [
-         q(3228),
+         q(3229),
          q(0),
          ],
       q(kcv) => [
-         q(3229),
+         q(3230),
          q(0),
          ],
       q(kcw) => [
-         q(3230),
+         q(3231),
          q(0),
          ],
       q(kcx) => [
-         q(3231),
+         q(3232),
          q(0),
          ],
       q(kcy) => [
-         q(3232),
+         q(3233),
          q(0),
          ],
       q(kcz) => [
-         q(3233),
+         q(3234),
          q(0),
          ],
       q(kda) => [
-         q(3234),
+         q(3235),
          q(0),
          ],
       q(kdc) => [
-         q(3235),
+         q(3236),
          q(0),
          ],
       q(kdd) => [
-         q(3236),
+         q(3237),
          q(0),
          ],
       q(kde) => [
-         q(3237),
+         q(3238),
          q(0),
          ],
       q(kdf) => [
-         q(3238),
+         q(3239),
          q(0),
          ],
       q(kdg) => [
-         q(3239),
+         q(3240),
          q(0),
          ],
       q(kdh) => [
-         q(3240),
+         q(3241),
          q(0),
          ],
       q(kdi) => [
-         q(3241),
+         q(3242),
          q(0),
          ],
       q(kdj) => [
-         q(3242),
+         q(3243),
          q(0),
          ],
       q(kdk) => [
-         q(3243),
+         q(3244),
          q(0),
          ],
       q(kdl) => [
-         q(3244),
+         q(3245),
          q(0),
          ],
       q(kdm) => [
-         q(3245),
+         q(3246),
          q(0),
          ],
       q(kdn) => [
-         q(3246),
+         q(3247),
          q(0),
          ],
       q(kdo) => [
@@ -70060,343 +70128,343 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kdp) => [
-         q(3247),
+         q(3248),
          q(0),
          ],
       q(kdq) => [
-         q(3248),
+         q(3249),
          q(0),
          ],
       q(kdr) => [
-         q(3249),
+         q(3250),
          q(0),
          ],
       q(kdt) => [
-         q(3250),
+         q(3251),
          q(0),
          ],
       q(kdu) => [
-         q(3251),
+         q(3252),
          q(0),
          ],
       q(kdw) => [
-         q(3252),
+         q(3253),
          q(0),
          ],
       q(kdx) => [
-         q(3253),
+         q(3254),
          q(0),
          ],
       q(kdy) => [
-         q(3254),
+         q(3255),
          q(0),
          ],
       q(kdz) => [
-         q(3255),
+         q(3256),
          q(0),
          ],
       q(kea) => [
-         q(3256),
+         q(3257),
          q(0),
          ],
       q(keb) => [
-         q(3257),
+         q(3258),
          q(0),
          ],
       q(kec) => [
-         q(3258),
+         q(3259),
          q(0),
          ],
       q(ked) => [
-         q(3259),
+         q(3260),
          q(0),
          ],
       q(kee) => [
-         q(3260),
+         q(3261),
          q(0),
          ],
       q(kef) => [
-         q(3261),
+         q(3262),
          q(0),
          ],
       q(keg) => [
-         q(3262),
+         q(3263),
          q(0),
          ],
       q(keh) => [
-         q(3263),
+         q(3264),
          q(0),
          ],
       q(kei) => [
-         q(3264),
+         q(3265),
          q(0),
          ],
       q(kej) => [
-         q(3265),
+         q(3266),
          q(0),
          ],
       q(kek) => [
-         q(3266),
+         q(3267),
          q(0),
          ],
       q(kel) => [
-         q(3267),
+         q(3268),
          q(0),
          ],
       q(kem) => [
-         q(3268),
+         q(3269),
          q(0),
          ],
       q(ken) => [
-         q(3269),
+         q(3270),
          q(0),
          ],
       q(keo) => [
-         q(3270),
+         q(3271),
          q(0),
          ],
       q(kep) => [
-         q(3271),
+         q(3272),
          q(0),
          ],
       q(keq) => [
-         q(3272),
+         q(3273),
          q(0),
          ],
       q(ker) => [
-         q(3273),
+         q(3274),
          q(0),
          ],
       q(kes) => [
-         q(3274),
+         q(3275),
          q(0),
          ],
       q(ket) => [
-         q(3275),
+         q(3276),
          q(0),
          ],
       q(keu) => [
-         q(3276),
+         q(3277),
          q(0),
          ],
       q(kev) => [
-         q(3277),
+         q(3278),
          q(0),
          ],
       q(kew) => [
-         q(3278),
+         q(3279),
          q(0),
          ],
       q(kex) => [
-         q(3279),
+         q(3280),
          q(0),
          ],
       q(key) => [
-         q(3280),
+         q(3281),
          q(0),
          ],
       q(kez) => [
-         q(3281),
+         q(3282),
          q(0),
          ],
       q(kfa) => [
-         q(3282),
+         q(3283),
          q(0),
          ],
       q(kfb) => [
-         q(3283),
+         q(3284),
          q(0),
          ],
       q(kfc) => [
-         q(3284),
+         q(3285),
          q(0),
          ],
       q(kfd) => [
-         q(3285),
+         q(3286),
          q(0),
          ],
       q(kfe) => [
-         q(3286),
+         q(3287),
          q(0),
          ],
       q(kff) => [
-         q(3287),
+         q(3288),
          q(0),
          ],
       q(kfg) => [
-         q(3288),
+         q(3289),
          q(0),
          ],
       q(kfh) => [
-         q(3289),
+         q(3290),
          q(0),
          ],
       q(kfi) => [
-         q(3290),
+         q(3291),
          q(0),
          ],
       q(kfj) => [
-         q(3291),
+         q(3292),
          q(0),
          ],
       q(kfk) => [
-         q(3292),
+         q(3293),
          q(0),
          ],
       q(kfl) => [
-         q(3293),
+         q(3294),
          q(0),
          ],
       q(kfm) => [
-         q(3294),
+         q(3295),
          q(0),
          ],
       q(kfn) => [
-         q(3295),
+         q(3296),
          q(0),
          ],
       q(kfo) => [
-         q(3296),
+         q(3297),
          q(0),
          ],
       q(kfp) => [
-         q(3297),
+         q(3298),
          q(0),
          ],
       q(kfq) => [
-         q(3298),
+         q(3299),
          q(0),
          ],
       q(kfr) => [
-         q(3299),
+         q(3300),
          q(0),
          ],
       q(kfs) => [
-         q(3300),
+         q(3301),
          q(0),
          ],
       q(kft) => [
-         q(3301),
+         q(3302),
          q(0),
          ],
       q(kfu) => [
-         q(3302),
+         q(3303),
          q(0),
          ],
       q(kfv) => [
-         q(3303),
+         q(3304),
          q(0),
          ],
       q(kfw) => [
-         q(3304),
+         q(3305),
          q(0),
          ],
       q(kfx) => [
-         q(3305),
+         q(3306),
          q(0),
          ],
       q(kfy) => [
-         q(3306),
+         q(3307),
          q(0),
          ],
       q(kfz) => [
-         q(3307),
+         q(3308),
          q(0),
          ],
       q(kga) => [
-         q(3308),
+         q(3309),
          q(0),
          ],
       q(kgb) => [
-         q(3309),
+         q(3310),
          q(0),
          ],
       q(kgc) => [
-         q(3310),
+         q(3311),
          q(0),
          ],
       q(kgd) => [
-         q(3311),
+         q(3312),
          q(0),
          ],
       q(kge) => [
-         q(3312),
+         q(3313),
          q(0),
          ],
       q(kgf) => [
-         q(3313),
+         q(3314),
          q(0),
          ],
       q(kgg) => [
-         q(3314),
+         q(3315),
          q(0),
          ],
       q(kgi) => [
-         q(3315),
+         q(3316),
          q(0),
          ],
       q(kgj) => [
-         q(3316),
+         q(3317),
          q(0),
          ],
       q(kgk) => [
-         q(3317),
+         q(3318),
          q(0),
          ],
       q(kgl) => [
-         q(3318),
+         q(3319),
          q(0),
          ],
       q(kgm) => [
-         q(3319),
+         q(3320),
          q(0),
          ],
       q(kgn) => [
-         q(3320),
+         q(3321),
          q(0),
          ],
       q(kgo) => [
-         q(3321),
+         q(3322),
          q(0),
          ],
       q(kgp) => [
-         q(3322),
+         q(3323),
          q(0),
          ],
       q(kgq) => [
-         q(3323),
+         q(3324),
          q(0),
          ],
       q(kgr) => [
-         q(3324),
+         q(3325),
          q(0),
          ],
       q(kgs) => [
-         q(3325),
+         q(3326),
          q(0),
          ],
       q(kgt) => [
-         q(3326),
+         q(3327),
          q(0),
          ],
       q(kgu) => [
-         q(3327),
+         q(3328),
          q(0),
          ],
       q(kgv) => [
-         q(3328),
+         q(3329),
          q(0),
          ],
       q(kgw) => [
-         q(3329),
+         q(3330),
          q(0),
          ],
       q(kgx) => [
-         q(3330),
+         q(3331),
          q(0),
          ],
       q(kgy) => [
-         q(3331),
+         q(3332),
          q(0),
          ],
       q(kha) => [
@@ -70404,31 +70472,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(khb) => [
-         q(3332),
+         q(3333),
          q(0),
          ],
       q(khc) => [
-         q(3333),
+         q(3334),
          q(0),
          ],
       q(khd) => [
-         q(3334),
+         q(3335),
          q(0),
          ],
       q(khe) => [
-         q(3335),
+         q(3336),
          q(0),
          ],
       q(khf) => [
-         q(3336),
+         q(3337),
          q(0),
          ],
       q(khg) => [
-         q(3337),
+         q(3338),
          q(0),
          ],
       q(khh) => [
-         q(3338),
+         q(3339),
          q(0),
          ],
       q(khi) => [
@@ -70436,15 +70504,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(khj) => [
-         q(3339),
+         q(3340),
          q(0),
          ],
       q(khk) => [
-         q(3340),
+         q(3341),
          q(0),
          ],
       q(khl) => [
-         q(3341),
+         q(3342),
          q(0),
          ],
       q(khm) => [
@@ -70452,7 +70520,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(khn) => [
-         q(3342),
+         q(3343),
          q(0),
          ],
       q(kho) => [
@@ -70460,87 +70528,87 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(khp) => [
-         q(3343),
+         q(3344),
          q(0),
          ],
       q(khq) => [
-         q(3344),
+         q(3345),
          q(0),
          ],
       q(khr) => [
-         q(3345),
+         q(3346),
          q(0),
          ],
       q(khs) => [
-         q(3346),
+         q(3347),
          q(0),
          ],
       q(kht) => [
-         q(3347),
+         q(3348),
          q(0),
          ],
       q(khu) => [
-         q(3348),
+         q(3349),
          q(0),
          ],
       q(khv) => [
-         q(3349),
+         q(3350),
          q(0),
          ],
       q(khw) => [
-         q(3350),
+         q(3351),
          q(0),
          ],
       q(khx) => [
-         q(3351),
+         q(3352),
          q(0),
          ],
       q(khy) => [
-         q(3352),
+         q(3353),
          q(0),
          ],
       q(khz) => [
-         q(3353),
+         q(3354),
          q(0),
          ],
       q(kia) => [
-         q(3354),
+         q(3355),
          q(0),
          ],
       q(kib) => [
-         q(3355),
+         q(3356),
          q(0),
          ],
       q(kic) => [
-         q(3356),
+         q(3357),
          q(0),
          ],
       q(kid) => [
-         q(3357),
+         q(3358),
          q(0),
          ],
       q(kie) => [
-         q(3358),
+         q(3359),
          q(0),
          ],
       q(kif) => [
-         q(3359),
+         q(3360),
          q(0),
          ],
       q(kig) => [
-         q(3360),
+         q(3361),
          q(0),
          ],
       q(kih) => [
-         q(3361),
+         q(3362),
          q(0),
          ],
       q(kii) => [
-         q(3362),
+         q(3363),
          q(0),
          ],
       q(kij) => [
-         q(3363),
+         q(3364),
          q(0),
          ],
       q(kik) => [
@@ -70548,11 +70616,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kil) => [
-         q(3364),
+         q(3365),
          q(0),
          ],
       q(kim) => [
-         q(3365),
+         q(3366),
          q(0),
          ],
       q(kin) => [
@@ -70560,15 +70628,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kio) => [
-         q(3366),
+         q(3367),
          q(0),
          ],
       q(kip) => [
-         q(3367),
+         q(3368),
          q(0),
          ],
       q(kiq) => [
-         q(3368),
+         q(3369),
          q(0),
          ],
       q(kir) => [
@@ -70576,347 +70644,347 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kis) => [
-         q(3369),
+         q(3370),
          q(0),
          ],
       q(kit) => [
-         q(3370),
+         q(3371),
          q(0),
          ],
       q(kiu) => [
-         q(3371),
+         q(3372),
          q(0),
          ],
       q(kiv) => [
-         q(3372),
+         q(3373),
          q(0),
          ],
       q(kiw) => [
-         q(3373),
+         q(3374),
          q(0),
          ],
       q(kix) => [
-         q(3374),
+         q(3375),
          q(0),
          ],
       q(kiy) => [
-         q(3375),
+         q(3376),
          q(0),
          ],
       q(kiz) => [
-         q(3376),
+         q(3377),
          q(0),
          ],
       q(kja) => [
-         q(3377),
+         q(3378),
          q(0),
          ],
       q(kjb) => [
-         q(3378),
+         q(3379),
          q(0),
          ],
       q(kjc) => [
-         q(3379),
+         q(3380),
          q(0),
          ],
       q(kjd) => [
-         q(3380),
+         q(3381),
          q(0),
          ],
       q(kje) => [
-         q(3381),
+         q(3382),
          q(0),
          ],
       q(kjf) => [
-         q(3382),
+         q(3383),
          q(0),
          ],
       q(kjg) => [
-         q(3383),
+         q(3384),
          q(0),
          ],
       q(kjh) => [
-         q(3384),
+         q(3385),
          q(0),
          ],
       q(kji) => [
-         q(3385),
+         q(3386),
          q(0),
          ],
       q(kjj) => [
-         q(3386),
+         q(3387),
          q(0),
          ],
       q(kjk) => [
-         q(3387),
+         q(3388),
          q(0),
          ],
       q(kjl) => [
-         q(3388),
+         q(3389),
          q(0),
          ],
       q(kjm) => [
-         q(3389),
+         q(3390),
          q(0),
          ],
       q(kjn) => [
-         q(3390),
+         q(3391),
          q(0),
          ],
       q(kjo) => [
-         q(3391),
+         q(3392),
          q(0),
          ],
       q(kjp) => [
-         q(3392),
+         q(3393),
          q(0),
          ],
       q(kjq) => [
-         q(3393),
+         q(3394),
          q(0),
          ],
       q(kjr) => [
-         q(3394),
+         q(3395),
          q(0),
          ],
       q(kjs) => [
-         q(3395),
+         q(3396),
          q(0),
          ],
       q(kjt) => [
-         q(3396),
+         q(3397),
          q(0),
          ],
       q(kju) => [
-         q(3397),
+         q(3398),
          q(0),
          ],
       q(kjv) => [
-         q(3398),
+         q(3399),
          q(0),
          ],
       q(kjx) => [
-         q(3399),
+         q(3400),
          q(0),
          ],
       q(kjy) => [
-         q(3400),
+         q(3401),
          q(0),
          ],
       q(kjz) => [
-         q(3401),
+         q(3402),
          q(0),
          ],
       q(kka) => [
-         q(3402),
+         q(3403),
          q(0),
          ],
       q(kkb) => [
-         q(3403),
+         q(3404),
          q(0),
          ],
       q(kkc) => [
-         q(3404),
+         q(3405),
          q(0),
          ],
       q(kkd) => [
-         q(3405),
+         q(3406),
          q(0),
          ],
       q(kke) => [
-         q(3406),
+         q(3407),
          q(0),
          ],
       q(kkf) => [
-         q(3407),
+         q(3408),
          q(0),
          ],
       q(kkg) => [
-         q(3408),
+         q(3409),
          q(0),
          ],
       q(kkh) => [
-         q(3409),
+         q(3410),
          q(0),
          ],
       q(kki) => [
-         q(3410),
+         q(3411),
          q(0),
          ],
       q(kkj) => [
-         q(3411),
+         q(3412),
          q(0),
          ],
       q(kkk) => [
-         q(3412),
+         q(3413),
          q(0),
          ],
       q(kkl) => [
-         q(3413),
+         q(3414),
          q(0),
          ],
       q(kkm) => [
-         q(3414),
+         q(3415),
          q(0),
          ],
       q(kkn) => [
-         q(3415),
+         q(3416),
          q(0),
          ],
       q(kko) => [
-         q(3416),
+         q(3417),
          q(0),
          ],
       q(kkp) => [
-         q(3417),
+         q(3418),
          q(0),
          ],
       q(kkq) => [
-         q(3418),
+         q(3419),
          q(0),
          ],
       q(kkr) => [
-         q(3419),
+         q(3420),
          q(0),
          ],
       q(kks) => [
-         q(3420),
+         q(3421),
          q(0),
          ],
       q(kkt) => [
-         q(3421),
+         q(3422),
          q(0),
          ],
       q(kku) => [
-         q(3422),
+         q(3423),
          q(0),
          ],
       q(kkv) => [
-         q(3423),
+         q(3424),
          q(0),
          ],
       q(kkw) => [
-         q(3424),
+         q(3425),
          q(0),
          ],
       q(kkx) => [
-         q(3425),
+         q(3426),
          q(0),
          ],
       q(kky) => [
-         q(3426),
+         q(3427),
          q(0),
          ],
       q(kkz) => [
-         q(3427),
+         q(3428),
          q(0),
          ],
       q(kla) => [
-         q(3428),
+         q(3429),
          q(0),
          ],
       q(klb) => [
-         q(3429),
+         q(3430),
          q(0),
          ],
       q(klc) => [
-         q(3430),
+         q(3431),
          q(0),
          ],
       q(kld) => [
-         q(3431),
+         q(3432),
          q(0),
          ],
       q(kle) => [
-         q(3432),
+         q(3433),
          q(0),
          ],
       q(klf) => [
-         q(3433),
+         q(3434),
          q(0),
          ],
       q(klg) => [
-         q(3434),
+         q(3435),
          q(0),
          ],
       q(klh) => [
-         q(3435),
+         q(3436),
          q(0),
          ],
       q(kli) => [
-         q(3436),
+         q(3437),
          q(0),
          ],
       q(klj) => [
-         q(3437),
+         q(3438),
          q(0),
          ],
       q(klk) => [
-         q(3438),
+         q(3439),
          q(0),
          ],
       q(kll) => [
-         q(3439),
+         q(3440),
          q(0),
          ],
       q(klm) => [
-         q(3440),
+         q(3441),
          q(0),
          ],
       q(kln) => [
-         q(3441),
+         q(3442),
          q(0),
          ],
       q(klo) => [
-         q(3442),
+         q(3443),
          q(0),
          ],
       q(klp) => [
-         q(3443),
+         q(3444),
          q(0),
          ],
       q(klq) => [
-         q(3444),
+         q(3445),
          q(0),
          ],
       q(klr) => [
-         q(3445),
+         q(3446),
          q(0),
          ],
       q(kls) => [
-         q(3446),
+         q(3447),
          q(0),
          ],
       q(klt) => [
-         q(3447),
+         q(3448),
          q(0),
          ],
       q(klu) => [
-         q(3448),
+         q(3449),
          q(0),
          ],
       q(klv) => [
-         q(3449),
+         q(3450),
          q(0),
          ],
       q(klw) => [
-         q(3450),
+         q(3451),
          q(0),
          ],
       q(klx) => [
-         q(3451),
+         q(3452),
          q(0),
          ],
       q(kly) => [
-         q(3452),
+         q(3453),
          q(0),
          ],
       q(klz) => [
-         q(3453),
+         q(3454),
          q(0),
          ],
       q(kma) => [
-         q(3454),
+         q(3455),
          q(0),
          ],
       q(kmb) => [
@@ -70924,231 +70992,231 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kmc) => [
-         q(3455),
+         q(3456),
          q(0),
          ],
       q(kmd) => [
-         q(3456),
+         q(3457),
          q(0),
          ],
       q(kme) => [
-         q(3457),
+         q(3458),
          q(0),
          ],
       q(kmf) => [
-         q(3458),
+         q(3459),
          q(0),
          ],
       q(kmg) => [
-         q(3459),
+         q(3460),
          q(0),
          ],
       q(kmh) => [
-         q(3460),
+         q(3461),
          q(0),
          ],
       q(kmi) => [
-         q(3461),
+         q(3462),
          q(0),
          ],
       q(kmj) => [
-         q(3462),
+         q(3463),
          q(0),
          ],
       q(kmk) => [
-         q(3463),
+         q(3464),
          q(0),
          ],
       q(kml) => [
-         q(3464),
+         q(3465),
          q(0),
          ],
       q(kmm) => [
-         q(3465),
+         q(3466),
          q(0),
          ],
       q(kmn) => [
-         q(3466),
+         q(3467),
          q(0),
          ],
       q(kmo) => [
-         q(3467),
+         q(3468),
          q(0),
          ],
       q(kmp) => [
-         q(3468),
+         q(3469),
          q(0),
          ],
       q(kmq) => [
-         q(3469),
+         q(3470),
          q(0),
          ],
       q(kmr) => [
-         q(3470),
+         q(3471),
          q(0),
          ],
       q(kms) => [
-         q(3471),
+         q(3472),
          q(0),
          ],
       q(kmt) => [
-         q(3472),
+         q(3473),
          q(0),
          ],
       q(kmu) => [
-         q(3473),
+         q(3474),
          q(0),
          ],
       q(kmv) => [
-         q(3474),
+         q(3475),
          q(0),
          ],
       q(kmw) => [
-         q(3475),
+         q(3476),
          q(0),
          ],
       q(kmx) => [
-         q(3476),
+         q(3477),
          q(0),
          ],
       q(kmy) => [
-         q(3477),
+         q(3478),
          q(0),
          ],
       q(kmz) => [
-         q(3478),
+         q(3479),
          q(0),
          ],
       q(kna) => [
-         q(3479),
+         q(3480),
          q(0),
          ],
       q(knb) => [
-         q(3480),
+         q(3481),
          q(0),
          ],
       q(knc) => [
-         q(3481),
+         q(3482),
          q(0),
          ],
       q(knd) => [
-         q(3482),
+         q(3483),
          q(0),
          ],
       q(kne) => [
-         q(3483),
+         q(3484),
          q(0),
          ],
       q(knf) => [
-         q(3484),
+         q(3485),
          q(0),
          ],
       q(kng) => [
-         q(3485),
+         q(3486),
          q(0),
          ],
       q(kni) => [
-         q(3486),
+         q(3487),
          q(0),
          ],
       q(knj) => [
-         q(3487),
+         q(3488),
          q(0),
          ],
       q(knk) => [
-         q(3488),
+         q(3489),
          q(0),
          ],
       q(knl) => [
-         q(3489),
+         q(3490),
          q(0),
          ],
       q(knm) => [
-         q(3490),
+         q(3491),
          q(0),
          ],
       q(knn) => [
-         q(3491),
+         q(3492),
          q(0),
          ],
       q(kno) => [
-         q(3492),
+         q(3493),
          q(0),
          ],
       q(knp) => [
-         q(3493),
+         q(3494),
          q(0),
          ],
       q(knq) => [
-         q(3494),
+         q(3495),
          q(0),
          ],
       q(knr) => [
-         q(3495),
+         q(3496),
          q(0),
          ],
       q(kns) => [
-         q(3496),
+         q(3497),
          q(0),
          ],
       q(knt) => [
-         q(3497),
+         q(3498),
          q(0),
          ],
       q(knu) => [
-         q(3498),
+         q(3499),
          q(0),
          ],
       q(knv) => [
-         q(3499),
+         q(3500),
          q(0),
          ],
       q(knw) => [
-         q(3500),
+         q(3501),
          q(0),
          ],
       q(knx) => [
-         q(3501),
+         q(3502),
          q(0),
          ],
       q(kny) => [
-         q(3502),
+         q(3503),
          q(0),
          ],
       q(knz) => [
-         q(3503),
+         q(3504),
          q(0),
          ],
       q(koa) => [
-         q(3504),
+         q(3505),
          q(0),
          ],
       q(koc) => [
-         q(3505),
+         q(3506),
          q(0),
          ],
       q(kod) => [
-         q(3506),
+         q(3507),
          q(0),
          ],
       q(koe) => [
-         q(3507),
+         q(3508),
          q(0),
          ],
       q(kof) => [
-         q(3508),
+         q(3509),
          q(0),
          ],
       q(kog) => [
-         q(3509),
+         q(3510),
          q(0),
          ],
       q(koh) => [
-         q(3510),
+         q(3511),
          q(0),
          ],
       q(koi) => [
-         q(3511),
+         q(3512),
          q(0),
          ],
       q(kok) => [
@@ -71156,7 +71224,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(kol) => [
-         q(3512),
+         q(3513),
          q(0),
          ],
       q(kom) => [
@@ -71168,15 +71236,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(koo) => [
-         q(3513),
+         q(3514),
          q(0),
          ],
       q(kop) => [
-         q(3514),
+         q(3515),
          q(0),
          ],
       q(koq) => [
-         q(3515),
+         q(3516),
          q(0),
          ],
       q(kor) => [
@@ -71188,47 +71256,47 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kot) => [
-         q(3516),
+         q(3517),
          q(0),
          ],
       q(kou) => [
-         q(3517),
+         q(3518),
          q(0),
          ],
       q(kov) => [
-         q(3518),
+         q(3519),
          q(0),
          ],
       q(kow) => [
-         q(3519),
+         q(3520),
          q(0),
          ],
       q(kox) => [
-         q(3520),
+         q(3521),
          q(0),
          ],
       q(koy) => [
-         q(3521),
+         q(3522),
          q(0),
          ],
       q(koz) => [
-         q(3522),
+         q(3523),
          q(0),
          ],
       q(kpa) => [
-         q(3523),
+         q(3524),
          q(0),
          ],
       q(kpb) => [
-         q(3524),
+         q(3525),
          q(0),
          ],
       q(kpc) => [
-         q(3525),
+         q(3526),
          q(0),
          ],
       q(kpd) => [
-         q(3526),
+         q(3527),
          q(0),
          ],
       q(kpe) => [
@@ -71236,195 +71304,195 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kpf) => [
-         q(3527),
+         q(3528),
          q(0),
          ],
       q(kpg) => [
-         q(3528),
+         q(3529),
          q(0),
          ],
       q(kph) => [
-         q(3529),
+         q(3530),
          q(0),
          ],
       q(kpi) => [
-         q(3530),
+         q(3531),
          q(0),
          ],
       q(kpj) => [
-         q(3531),
+         q(3532),
          q(0),
          ],
       q(kpk) => [
-         q(3532),
+         q(3533),
          q(0),
          ],
       q(kpl) => [
-         q(3533),
+         q(3534),
          q(0),
          ],
       q(kpm) => [
-         q(3534),
+         q(3535),
          q(0),
          ],
       q(kpn) => [
-         q(3535),
+         q(3536),
          q(0),
          ],
       q(kpo) => [
-         q(3536),
+         q(3537),
          q(0),
          ],
       q(kpq) => [
-         q(3537),
+         q(3538),
          q(0),
          ],
       q(kpr) => [
-         q(3538),
+         q(3539),
          q(0),
          ],
       q(kps) => [
-         q(3539),
+         q(3540),
          q(0),
          ],
       q(kpt) => [
-         q(3540),
+         q(3541),
          q(0),
          ],
       q(kpu) => [
-         q(3541),
+         q(3542),
          q(0),
          ],
       q(kpv) => [
-         q(3542),
+         q(3543),
          q(0),
          ],
       q(kpw) => [
-         q(3543),
+         q(3544),
          q(0),
          ],
       q(kpx) => [
-         q(3544),
+         q(3545),
          q(0),
          ],
       q(kpy) => [
-         q(3545),
+         q(3546),
          q(0),
          ],
       q(kpz) => [
-         q(3546),
+         q(3547),
          q(0),
          ],
       q(kqa) => [
-         q(3547),
+         q(3548),
          q(0),
          ],
       q(kqb) => [
-         q(3548),
+         q(3549),
          q(0),
          ],
       q(kqc) => [
-         q(3549),
+         q(3550),
          q(0),
          ],
       q(kqd) => [
-         q(3550),
+         q(3551),
          q(0),
          ],
       q(kqe) => [
-         q(3551),
+         q(3552),
          q(0),
          ],
       q(kqf) => [
-         q(3552),
+         q(3553),
          q(0),
          ],
       q(kqg) => [
-         q(3553),
+         q(3554),
          q(0),
          ],
       q(kqh) => [
-         q(3554),
+         q(3555),
          q(0),
          ],
       q(kqi) => [
-         q(3555),
+         q(3556),
          q(0),
          ],
       q(kqj) => [
-         q(3556),
+         q(3557),
          q(0),
          ],
       q(kqk) => [
-         q(3557),
+         q(3558),
          q(0),
          ],
       q(kql) => [
-         q(3558),
+         q(3559),
          q(0),
          ],
       q(kqm) => [
-         q(3559),
+         q(3560),
          q(0),
          ],
       q(kqn) => [
-         q(3560),
+         q(3561),
          q(0),
          ],
       q(kqo) => [
-         q(3561),
+         q(3562),
          q(0),
          ],
       q(kqp) => [
-         q(3562),
+         q(3563),
          q(0),
          ],
       q(kqq) => [
-         q(3563),
+         q(3564),
          q(0),
          ],
       q(kqr) => [
-         q(3564),
+         q(3565),
          q(0),
          ],
       q(kqs) => [
-         q(3565),
+         q(3566),
          q(0),
          ],
       q(kqt) => [
-         q(3566),
+         q(3567),
          q(0),
          ],
       q(kqu) => [
-         q(3567),
+         q(3568),
          q(0),
          ],
       q(kqv) => [
-         q(3568),
+         q(3569),
          q(0),
          ],
       q(kqw) => [
-         q(3569),
+         q(3570),
          q(0),
          ],
       q(kqx) => [
-         q(3570),
+         q(3571),
          q(0),
          ],
       q(kqy) => [
-         q(3571),
+         q(3572),
          q(0),
          ],
       q(kqz) => [
-         q(3572),
+         q(3573),
          q(0),
          ],
       q(kra) => [
-         q(3573),
+         q(3574),
          q(0),
          ],
       q(krb) => [
-         q(3574),
+         q(3575),
          q(0),
          ],
       q(krc) => [
@@ -71432,31 +71500,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(krd) => [
-         q(3575),
+         q(3576),
          q(0),
          ],
       q(kre) => [
-         q(3576),
+         q(3577),
          q(0),
          ],
       q(krf) => [
-         q(3577),
+         q(3578),
          q(0),
          ],
       q(krh) => [
-         q(3578),
+         q(3579),
          q(0),
          ],
       q(kri) => [
-         q(3579),
+         q(3580),
          q(0),
          ],
       q(krj) => [
-         q(3580),
+         q(3581),
          q(0),
          ],
       q(krk) => [
-         q(3581),
+         q(3582),
          q(0),
          ],
       q(krl) => [
@@ -71464,11 +71532,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(krm) => [
-         q(3582),
+         q(3583),
          q(0),
          ],
       q(krn) => [
-         q(3583),
+         q(3584),
          q(0),
          ],
       q(kro) => [
@@ -71476,19 +71544,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(krp) => [
-         q(3584),
+         q(3585),
          q(0),
          ],
       q(krr) => [
-         q(3585),
+         q(3586),
          q(0),
          ],
       q(krs) => [
-         q(3586),
+         q(3587),
          q(0),
          ],
       q(krt) => [
-         q(3587),
+         q(3588),
          q(0),
          ],
       q(kru) => [
@@ -71496,231 +71564,231 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(krv) => [
-         q(3588),
+         q(3589),
          q(0),
          ],
       q(krw) => [
-         q(3589),
+         q(3590),
          q(0),
          ],
       q(krx) => [
-         q(3590),
+         q(3591),
          q(0),
          ],
       q(kry) => [
-         q(3591),
+         q(3592),
          q(0),
          ],
       q(krz) => [
-         q(3592),
+         q(3593),
          q(0),
          ],
       q(ksa) => [
-         q(3593),
+         q(3594),
          q(0),
          ],
       q(ksb) => [
-         q(3594),
+         q(3595),
          q(0),
          ],
       q(ksc) => [
-         q(3595),
+         q(3596),
          q(0),
          ],
       q(ksd) => [
-         q(3596),
+         q(3597),
          q(0),
          ],
       q(kse) => [
-         q(3597),
+         q(3598),
          q(0),
          ],
       q(ksf) => [
-         q(3598),
+         q(3599),
          q(0),
          ],
       q(ksg) => [
-         q(3599),
+         q(3600),
          q(0),
          ],
       q(ksh) => [
-         q(3600),
+         q(3601),
          q(0),
          ],
       q(ksi) => [
-         q(3601),
+         q(3602),
          q(0),
          ],
       q(ksj) => [
-         q(3602),
+         q(3603),
          q(0),
          ],
       q(ksk) => [
-         q(3603),
+         q(3604),
          q(0),
          ],
       q(ksl) => [
-         q(3604),
+         q(3605),
          q(0),
          ],
       q(ksm) => [
-         q(3605),
+         q(3606),
          q(0),
          ],
       q(ksn) => [
-         q(3606),
+         q(3607),
          q(0),
          ],
       q(kso) => [
-         q(3607),
+         q(3608),
          q(0),
          ],
       q(ksp) => [
-         q(3608),
+         q(3609),
          q(0),
          ],
       q(ksq) => [
-         q(3609),
+         q(3610),
          q(0),
          ],
       q(ksr) => [
-         q(3610),
+         q(3611),
          q(0),
          ],
       q(kss) => [
-         q(3611),
+         q(3612),
          q(0),
          ],
       q(kst) => [
-         q(3612),
+         q(3613),
          q(0),
          ],
       q(ksu) => [
-         q(3613),
+         q(3614),
          q(0),
          ],
       q(ksv) => [
-         q(3614),
+         q(3615),
          q(0),
          ],
       q(ksw) => [
-         q(3615),
+         q(3616),
          q(0),
          ],
       q(ksx) => [
-         q(3616),
+         q(3617),
          q(0),
          ],
       q(ksy) => [
-         q(3617),
+         q(3618),
          q(0),
          ],
       q(ksz) => [
-         q(3618),
+         q(3619),
          q(0),
          ],
       q(kta) => [
-         q(3619),
+         q(3620),
          q(0),
          ],
       q(ktb) => [
-         q(3620),
+         q(3621),
          q(0),
          ],
       q(ktc) => [
-         q(3621),
+         q(3622),
          q(0),
          ],
       q(ktd) => [
-         q(3622),
+         q(3623),
          q(0),
          ],
       q(kte) => [
-         q(3623),
+         q(3624),
          q(0),
          ],
       q(ktf) => [
-         q(3624),
+         q(3625),
          q(0),
          ],
       q(ktg) => [
-         q(3625),
+         q(3626),
          q(0),
          ],
       q(kth) => [
-         q(3626),
+         q(3627),
          q(0),
          ],
       q(kti) => [
-         q(3627),
+         q(3628),
          q(0),
          ],
       q(ktj) => [
-         q(3628),
+         q(3629),
          q(0),
          ],
       q(ktk) => [
-         q(3629),
+         q(3630),
          q(0),
          ],
       q(ktl) => [
-         q(3630),
+         q(3631),
          q(0),
          ],
       q(ktm) => [
-         q(3631),
+         q(3632),
          q(0),
          ],
       q(ktn) => [
-         q(3632),
+         q(3633),
          q(0),
          ],
       q(kto) => [
-         q(3633),
+         q(3634),
          q(0),
          ],
       q(ktp) => [
-         q(3634),
+         q(3635),
          q(0),
          ],
       q(ktq) => [
-         q(3635),
+         q(3636),
          q(0),
          ],
       q(ktr) => [
-         q(3636),
+         q(3637),
          q(0),
          ],
       q(kts) => [
-         q(3637),
+         q(3638),
          q(0),
          ],
       q(ktt) => [
-         q(3638),
+         q(3639),
          q(0),
          ],
       q(ktu) => [
-         q(3639),
+         q(3640),
          q(0),
          ],
       q(ktv) => [
-         q(3640),
+         q(3641),
          q(0),
          ],
       q(ktw) => [
-         q(3641),
+         q(3642),
          q(0),
          ],
       q(ktx) => [
-         q(3642),
+         q(3643),
          q(0),
          ],
       q(kty) => [
-         q(3643),
+         q(3644),
          q(0),
          ],
       q(ktz) => [
-         q(3644),
+         q(3645),
          q(0),
          ],
       q(kua) => [
@@ -71728,47 +71796,47 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kub) => [
-         q(3645),
+         q(3646),
          q(0),
          ],
       q(kuc) => [
-         q(3646),
+         q(3647),
          q(0),
          ],
       q(kud) => [
-         q(3647),
+         q(3648),
          q(0),
          ],
       q(kue) => [
-         q(3648),
+         q(3649),
          q(0),
          ],
       q(kuf) => [
-         q(3649),
+         q(3650),
          q(0),
          ],
       q(kug) => [
-         q(3650),
+         q(3651),
          q(0),
          ],
       q(kuh) => [
-         q(3651),
+         q(3652),
          q(0),
          ],
       q(kui) => [
-         q(3652),
+         q(3653),
          q(0),
          ],
       q(kuj) => [
-         q(3653),
+         q(3654),
          q(0),
          ],
       q(kuk) => [
-         q(3654),
+         q(3655),
          q(0),
          ],
       q(kul) => [
-         q(3655),
+         q(3656),
          q(0),
          ],
       q(kum) => [
@@ -71776,19 +71844,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kun) => [
-         q(3656),
+         q(3657),
          q(0),
          ],
       q(kuo) => [
-         q(3657),
+         q(3658),
          q(0),
          ],
       q(kup) => [
-         q(3658),
+         q(3659),
          q(0),
          ],
       q(kuq) => [
-         q(3319),
+         q(3320),
          q(0),
          ],
       q(kur) => [
@@ -71796,7 +71864,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kus) => [
-         q(3659),
+         q(3660),
          q(0),
          ],
       q(kut) => [
@@ -71804,543 +71872,543 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(kuu) => [
-         q(3660),
+         q(3661),
          q(0),
          ],
       q(kuv) => [
-         q(3661),
+         q(3662),
          q(0),
          ],
       q(kuw) => [
-         q(3662),
+         q(3663),
          q(0),
          ],
       q(kux) => [
-         q(3663),
+         q(3664),
          q(0),
          ],
       q(kuy) => [
-         q(3664),
+         q(3665),
          q(0),
          ],
       q(kuz) => [
-         q(3665),
+         q(3666),
          q(0),
          ],
       q(kva) => [
-         q(3666),
+         q(3667),
          q(0),
          ],
       q(kvb) => [
-         q(3667),
+         q(3668),
          q(0),
          ],
       q(kvc) => [
-         q(3668),
+         q(3669),
          q(0),
          ],
       q(kvd) => [
-         q(3669),
+         q(3670),
          q(0),
          ],
       q(kve) => [
-         q(3670),
+         q(3671),
          q(0),
          ],
       q(kvf) => [
-         q(3671),
+         q(3672),
          q(0),
          ],
       q(kvg) => [
-         q(3672),
+         q(3673),
          q(0),
          ],
       q(kvh) => [
-         q(3673),
+         q(3674),
          q(0),
          ],
       q(kvi) => [
-         q(3674),
+         q(3675),
          q(0),
          ],
       q(kvj) => [
-         q(3675),
+         q(3676),
          q(0),
          ],
       q(kvk) => [
-         q(3676),
+         q(3677),
          q(0),
          ],
       q(kvl) => [
-         q(3677),
+         q(3678),
          q(0),
          ],
       q(kvm) => [
-         q(3678),
+         q(3679),
          q(0),
          ],
       q(kvn) => [
-         q(3679),
+         q(3680),
          q(0),
          ],
       q(kvo) => [
-         q(3680),
+         q(3681),
          q(0),
          ],
       q(kvp) => [
-         q(3681),
+         q(3682),
          q(0),
          ],
       q(kvq) => [
-         q(3682),
+         q(3683),
          q(0),
          ],
       q(kvr) => [
-         q(3683),
+         q(3684),
          q(0),
          ],
       q(kvs) => [
-         q(3684),
+         q(3685),
          q(0),
          ],
       q(kvt) => [
-         q(3685),
+         q(3686),
          q(0),
          ],
       q(kvu) => [
-         q(3686),
+         q(3687),
          q(0),
          ],
       q(kvv) => [
-         q(3687),
+         q(3688),
          q(0),
          ],
       q(kvw) => [
-         q(3688),
+         q(3689),
          q(0),
          ],
       q(kvx) => [
-         q(3689),
+         q(3690),
          q(0),
          ],
       q(kvy) => [
-         q(3690),
+         q(3691),
          q(0),
          ],
       q(kvz) => [
-         q(3691),
+         q(3692),
          q(0),
          ],
       q(kwa) => [
-         q(3692),
+         q(3693),
          q(0),
          ],
       q(kwb) => [
-         q(3693),
+         q(3694),
          q(0),
          ],
       q(kwc) => [
-         q(3694),
+         q(3695),
          q(0),
          ],
       q(kwd) => [
-         q(3695),
+         q(3696),
          q(0),
          ],
       q(kwe) => [
-         q(3696),
+         q(3697),
          q(0),
          ],
       q(kwf) => [
-         q(3697),
+         q(3698),
          q(0),
          ],
       q(kwg) => [
-         q(3698),
+         q(3699),
          q(0),
          ],
       q(kwh) => [
-         q(3699),
+         q(3700),
          q(0),
          ],
       q(kwi) => [
-         q(3700),
+         q(3701),
          q(0),
          ],
       q(kwj) => [
-         q(3701),
+         q(3702),
          q(0),
          ],
       q(kwk) => [
-         q(3702),
+         q(3703),
          q(0),
          ],
       q(kwl) => [
-         q(3703),
+         q(3704),
          q(0),
          ],
       q(kwm) => [
-         q(3704),
+         q(3705),
          q(0),
          ],
       q(kwn) => [
-         q(3705),
+         q(3706),
          q(0),
          ],
       q(kwo) => [
-         q(3706),
+         q(3707),
          q(0),
          ],
       q(kwp) => [
-         q(3707),
+         q(3708),
          q(0),
          ],
       q(kwr) => [
-         q(3708),
+         q(3709),
          q(0),
          ],
       q(kws) => [
-         q(3709),
+         q(3710),
          q(0),
          ],
       q(kwt) => [
-         q(3710),
+         q(3711),
          q(0),
          ],
       q(kwu) => [
-         q(3711),
+         q(3712),
          q(0),
          ],
       q(kwv) => [
-         q(3712),
+         q(3713),
          q(0),
          ],
       q(kww) => [
-         q(3713),
+         q(3714),
          q(0),
          ],
       q(kwx) => [
-         q(3714),
+         q(3715),
          q(0),
          ],
       q(kwy) => [
-         q(3715),
+         q(3716),
          q(0),
          ],
       q(kwz) => [
-         q(3716),
+         q(3717),
          q(0),
          ],
       q(kxa) => [
-         q(3717),
+         q(3718),
          q(0),
          ],
       q(kxb) => [
-         q(3718),
+         q(3719),
          q(0),
          ],
       q(kxc) => [
-         q(3719),
+         q(3720),
          q(0),
          ],
       q(kxd) => [
-         q(3720),
+         q(3721),
          q(0),
          ],
       q(kxf) => [
-         q(3721),
+         q(3722),
          q(0),
          ],
       q(kxh) => [
-         q(3722),
+         q(3723),
          q(0),
          ],
       q(kxi) => [
-         q(3723),
+         q(3724),
          q(0),
          ],
       q(kxj) => [
-         q(3724),
+         q(3725),
          q(0),
          ],
       q(kxk) => [
-         q(3725),
+         q(3726),
          q(0),
          ],
       q(kxl) => [
-         q(3726),
+         q(3727),
          q(0),
          ],
       q(kxm) => [
-         q(3727),
+         q(3728),
          q(0),
          ],
       q(kxn) => [
-         q(3728),
+         q(3729),
          q(0),
          ],
       q(kxo) => [
-         q(3729),
+         q(3730),
          q(0),
          ],
       q(kxp) => [
-         q(3730),
+         q(3731),
          q(0),
          ],
       q(kxq) => [
-         q(3731),
+         q(3732),
          q(0),
          ],
       q(kxr) => [
-         q(3732),
+         q(3733),
          q(0),
          ],
       q(kxs) => [
-         q(3733),
+         q(3734),
          q(0),
          ],
       q(kxt) => [
-         q(3734),
+         q(3735),
          q(0),
          ],
       q(kxu) => [
-         q(3735),
+         q(3736),
          q(0),
          ],
       q(kxv) => [
-         q(3736),
+         q(3737),
          q(0),
          ],
       q(kxw) => [
-         q(3737),
+         q(3738),
          q(0),
          ],
       q(kxx) => [
-         q(3738),
+         q(3739),
          q(0),
          ],
       q(kxy) => [
-         q(3739),
+         q(3740),
          q(0),
          ],
       q(kxz) => [
-         q(3740),
+         q(3741),
          q(0),
          ],
       q(kya) => [
-         q(3741),
+         q(3742),
          q(0),
          ],
       q(kyb) => [
-         q(3742),
+         q(3743),
          q(0),
          ],
       q(kyc) => [
-         q(3743),
+         q(3744),
          q(0),
          ],
       q(kyd) => [
-         q(3744),
+         q(3745),
          q(0),
          ],
       q(kye) => [
-         q(3745),
+         q(3746),
          q(0),
          ],
       q(kyf) => [
-         q(3746),
+         q(3747),
          q(0),
          ],
       q(kyg) => [
-         q(3747),
+         q(3748),
          q(0),
          ],
       q(kyh) => [
-         q(3748),
+         q(3749),
          q(0),
          ],
       q(kyi) => [
-         q(3749),
+         q(3750),
          q(0),
          ],
       q(kyj) => [
-         q(3750),
+         q(3751),
          q(0),
          ],
       q(kyk) => [
-         q(3751),
+         q(3752),
          q(0),
          ],
       q(kyl) => [
-         q(3752),
+         q(3753),
          q(0),
          ],
       q(kym) => [
-         q(3753),
+         q(3754),
          q(0),
          ],
       q(kyn) => [
-         q(3754),
+         q(3755),
          q(0),
          ],
       q(kyo) => [
-         q(3755),
+         q(3756),
          q(0),
          ],
       q(kyp) => [
-         q(3756),
+         q(3757),
          q(0),
          ],
       q(kyq) => [
-         q(3757),
+         q(3758),
          q(0),
          ],
       q(kyr) => [
-         q(3758),
+         q(3759),
          q(0),
          ],
       q(kys) => [
-         q(3759),
+         q(3760),
          q(0),
          ],
       q(kyt) => [
-         q(3760),
+         q(3761),
          q(0),
          ],
       q(kyu) => [
-         q(3761),
+         q(3762),
          q(0),
          ],
       q(kyv) => [
-         q(3762),
+         q(3763),
          q(0),
          ],
       q(kyw) => [
-         q(3763),
+         q(3764),
          q(0),
          ],
       q(kyx) => [
-         q(3764),
+         q(3765),
          q(0),
          ],
       q(kyy) => [
-         q(3765),
+         q(3766),
          q(0),
          ],
       q(kyz) => [
-         q(3766),
+         q(3767),
          q(0),
          ],
       q(kza) => [
-         q(3767),
+         q(3768),
          q(0),
          ],
       q(kzb) => [
-         q(3768),
+         q(3769),
          q(0),
          ],
       q(kzc) => [
-         q(3769),
+         q(3770),
          q(0),
          ],
       q(kzd) => [
-         q(3770),
+         q(3771),
          q(0),
          ],
       q(kze) => [
-         q(3771),
+         q(3772),
          q(0),
          ],
       q(kzf) => [
-         q(3772),
+         q(3773),
          q(0),
          ],
       q(kzg) => [
-         q(3773),
+         q(3774),
          q(0),
          ],
       q(kzi) => [
-         q(3774),
+         q(3775),
          q(0),
          ],
       q(kzj) => [
-         q(3775),
+         q(3776),
          q(0),
          ],
       q(kzk) => [
-         q(3776),
+         q(3777),
          q(0),
          ],
       q(kzl) => [
-         q(3777),
+         q(3778),
          q(0),
          ],
       q(kzm) => [
-         q(3778),
+         q(3779),
          q(0),
          ],
       q(kzn) => [
-         q(3779),
+         q(3780),
          q(0),
          ],
       q(kzo) => [
-         q(3780),
+         q(3781),
          q(0),
          ],
       q(kzp) => [
-         q(3781),
+         q(3782),
          q(0),
          ],
       q(kzq) => [
-         q(3782),
+         q(3783),
          q(0),
          ],
       q(kzr) => [
-         q(3783),
+         q(3784),
          q(0),
          ],
       q(kzs) => [
-         q(3784),
+         q(3785),
          q(0),
          ],
       q(kzt) => [
-         q(3785),
+         q(3786),
          q(0),
          ],
       q(kzu) => [
-         q(3786),
+         q(3787),
          q(0),
          ],
       q(kzv) => [
-         q(3787),
+         q(3788),
          q(0),
          ],
       q(kzw) => [
-         q(3788),
+         q(3789),
          q(0),
          ],
       q(kzx) => [
-         q(3789),
+         q(3790),
          q(0),
          ],
       q(kzy) => [
-         q(3790),
+         q(3791),
          q(0),
          ],
       q(kzz) => [
-         q(3791),
+         q(3792),
          q(0),
          ],
       q(laa) => [
-         q(3792),
+         q(3793),
          q(0),
          ],
       q(lab) => [
-         q(3793),
+         q(3794),
          q(0),
          ],
       q(lac) => [
-         q(3794),
+         q(3795),
          q(0),
          ],
       q(lad) => [
@@ -72348,15 +72416,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(lae) => [
-         q(3795),
+         q(3796),
          q(0),
          ],
       q(laf) => [
-         q(3796),
+         q(3797),
          q(0),
          ],
       q(lag) => [
-         q(3797),
+         q(3798),
          q(0),
          ],
       q(lah) => [
@@ -72364,19 +72432,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(lai) => [
-         q(3798),
+         q(3799),
          q(0),
          ],
       q(laj) => [
-         q(3799),
+         q(3800),
          q(0),
          ],
       q(lak) => [
-         q(3800),
+         q(3801),
          q(0),
          ],
       q(lal) => [
-         q(3801),
+         q(3802),
          q(0),
          ],
       q(lam) => [
@@ -72384,7 +72452,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(lan) => [
-         q(3802),
+         q(3803),
          q(0),
          ],
       q(lao) => [
@@ -72392,19 +72460,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(lap) => [
-         q(3803),
+         q(3804),
          q(0),
          ],
       q(laq) => [
-         q(3804),
+         q(3805),
          q(0),
          ],
       q(lar) => [
-         q(3805),
+         q(3806),
          q(0),
          ],
       q(las) => [
-         q(3806),
+         q(3807),
          q(0),
          ],
       q(lat) => [
@@ -72412,7 +72480,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(lau) => [
-         q(3807),
+         q(3808),
          q(0),
          ],
       q(lav) => [
@@ -72420,303 +72488,303 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(law) => [
-         q(3808),
+         q(3809),
          q(0),
          ],
       q(lax) => [
-         q(3809),
+         q(3810),
          q(0),
          ],
       q(lay) => [
-         q(3810),
+         q(3811),
          q(0),
          ],
       q(laz) => [
-         q(3811),
+         q(3812),
          q(0),
          ],
       q(lba) => [
-         q(3812),
+         q(3813),
          q(0),
          ],
       q(lbb) => [
-         q(3813),
+         q(3814),
          q(0),
          ],
       q(lbc) => [
-         q(3814),
+         q(3815),
          q(0),
          ],
       q(lbe) => [
-         q(3815),
+         q(3816),
          q(0),
          ],
       q(lbf) => [
-         q(3816),
+         q(3817),
          q(0),
          ],
       q(lbg) => [
-         q(3817),
+         q(3818),
          q(0),
          ],
       q(lbi) => [
-         q(3818),
+         q(3819),
          q(0),
          ],
       q(lbj) => [
-         q(3819),
+         q(3820),
          q(0),
          ],
       q(lbk) => [
-         q(3820),
+         q(3821),
          q(0),
          ],
       q(lbl) => [
-         q(3821),
+         q(3822),
          q(0),
          ],
       q(lbm) => [
-         q(3822),
+         q(3823),
          q(0),
          ],
       q(lbn) => [
-         q(3823),
+         q(3824),
          q(0),
          ],
       q(lbo) => [
-         q(3824),
+         q(3825),
          q(0),
          ],
       q(lbq) => [
-         q(3825),
+         q(3826),
          q(0),
          ],
       q(lbr) => [
-         q(3826),
+         q(3827),
          q(0),
          ],
       q(lbs) => [
-         q(3827),
+         q(3828),
          q(0),
          ],
       q(lbt) => [
-         q(3828),
+         q(3829),
          q(0),
          ],
       q(lbu) => [
-         q(3829),
+         q(3830),
          q(0),
          ],
       q(lbv) => [
-         q(3830),
+         q(3831),
          q(0),
          ],
       q(lbw) => [
-         q(3831),
+         q(3832),
          q(0),
          ],
       q(lbx) => [
-         q(3832),
+         q(3833),
          q(0),
          ],
       q(lby) => [
-         q(3833),
+         q(3834),
          q(0),
          ],
       q(lbz) => [
-         q(3834),
+         q(3835),
          q(0),
          ],
       q(lcc) => [
-         q(3835),
+         q(3836),
          q(0),
          ],
       q(lcd) => [
-         q(3836),
+         q(3837),
          q(0),
          ],
       q(lce) => [
-         q(3837),
+         q(3838),
          q(0),
          ],
       q(lcf) => [
-         q(3838),
+         q(3839),
          q(0),
          ],
       q(lch) => [
-         q(3839),
+         q(3840),
          q(0),
          ],
       q(lcl) => [
-         q(3840),
+         q(3841),
          q(0),
          ],
       q(lcm) => [
-         q(3841),
+         q(3842),
          q(0),
          ],
       q(lcp) => [
-         q(3842),
+         q(3843),
          q(0),
          ],
       q(lcq) => [
-         q(3843),
+         q(3844),
          q(0),
          ],
       q(lcs) => [
-         q(3844),
+         q(3845),
          q(0),
          ],
       q(lda) => [
-         q(3845),
+         q(3846),
          q(0),
          ],
       q(ldb) => [
-         q(3846),
+         q(3847),
          q(0),
          ],
       q(ldd) => [
-         q(3847),
+         q(3848),
          q(0),
          ],
       q(ldg) => [
-         q(3848),
+         q(3849),
          q(0),
          ],
       q(ldh) => [
-         q(3849),
+         q(3850),
          q(0),
          ],
       q(ldi) => [
-         q(3850),
+         q(3851),
          q(0),
          ],
       q(ldj) => [
-         q(3851),
+         q(3852),
          q(0),
          ],
       q(ldk) => [
-         q(3852),
+         q(3853),
          q(0),
          ],
       q(ldl) => [
-         q(3853),
+         q(3854),
          q(0),
          ],
       q(ldm) => [
-         q(3854),
+         q(3855),
          q(0),
          ],
       q(ldn) => [
-         q(3855),
+         q(3856),
          q(0),
          ],
       q(ldo) => [
-         q(3856),
+         q(3857),
          q(0),
          ],
       q(ldp) => [
-         q(3857),
+         q(3858),
          q(0),
          ],
       q(ldq) => [
-         q(3858),
+         q(3859),
          q(0),
          ],
       q(lea) => [
-         q(3859),
+         q(3860),
          q(0),
          ],
       q(leb) => [
-         q(3860),
+         q(3861),
          q(0),
          ],
       q(lec) => [
-         q(3861),
+         q(3862),
          q(0),
          ],
       q(led) => [
-         q(3862),
+         q(3863),
          q(0),
          ],
       q(lee) => [
-         q(3863),
+         q(3864),
          q(0),
          ],
       q(lef) => [
-         q(3864),
+         q(3865),
          q(0),
          ],
       q(leh) => [
-         q(3865),
+         q(3866),
          q(0),
          ],
       q(lei) => [
-         q(3866),
+         q(3867),
          q(0),
          ],
       q(lej) => [
-         q(3867),
+         q(3868),
          q(0),
          ],
       q(lek) => [
-         q(3868),
+         q(3869),
          q(0),
          ],
       q(lel) => [
-         q(3869),
+         q(3870),
          q(0),
          ],
       q(lem) => [
-         q(3870),
+         q(3871),
          q(0),
          ],
       q(len) => [
-         q(3871),
+         q(3872),
          q(0),
          ],
       q(leo) => [
-         q(3872),
+         q(3873),
          q(0),
          ],
       q(lep) => [
-         q(3873),
+         q(3874),
          q(0),
          ],
       q(leq) => [
-         q(3874),
+         q(3875),
          q(0),
          ],
       q(ler) => [
-         q(3875),
+         q(3876),
          q(0),
          ],
       q(les) => [
-         q(3876),
+         q(3877),
          q(0),
          ],
       q(let) => [
-         q(3877),
+         q(3878),
          q(0),
          ],
       q(leu) => [
-         q(3878),
+         q(3879),
          q(0),
          ],
       q(lev) => [
-         q(3879),
+         q(3880),
          q(0),
          ],
       q(lew) => [
-         q(3880),
+         q(3881),
          q(0),
          ],
       q(lex) => [
-         q(3881),
+         q(3882),
          q(0),
          ],
       q(ley) => [
-         q(3882),
+         q(3883),
          q(0),
          ],
       q(lez) => [
@@ -72724,151 +72792,151 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(lfa) => [
-         q(3883),
+         q(3884),
          q(0),
          ],
       q(lfn) => [
-         q(3884),
+         q(3885),
          q(0),
          ],
       q(lga) => [
-         q(3885),
+         q(3886),
          q(0),
          ],
       q(lgb) => [
-         q(3886),
+         q(3887),
          q(0),
          ],
       q(lgg) => [
-         q(3887),
+         q(3888),
          q(0),
          ],
       q(lgh) => [
-         q(3888),
+         q(3889),
          q(0),
          ],
       q(lgi) => [
-         q(3889),
+         q(3890),
          q(0),
          ],
       q(lgk) => [
-         q(3890),
+         q(3891),
          q(0),
          ],
       q(lgl) => [
-         q(3891),
+         q(3892),
          q(0),
          ],
       q(lgm) => [
-         q(3892),
+         q(3893),
          q(0),
          ],
       q(lgn) => [
-         q(3893),
+         q(3894),
          q(0),
          ],
       q(lgq) => [
-         q(3894),
+         q(3895),
          q(0),
          ],
       q(lgr) => [
-         q(3895),
+         q(3896),
          q(0),
          ],
       q(lgt) => [
-         q(3896),
+         q(3897),
          q(0),
          ],
       q(lgu) => [
-         q(3897),
+         q(3898),
          q(0),
          ],
       q(lgz) => [
-         q(3898),
+         q(3899),
          q(0),
          ],
       q(lha) => [
-         q(3899),
+         q(3900),
          q(0),
          ],
       q(lhh) => [
-         q(3900),
+         q(3901),
          q(0),
          ],
       q(lhi) => [
-         q(3901),
+         q(3902),
          q(0),
          ],
       q(lhl) => [
-         q(3902),
+         q(3903),
          q(0),
          ],
       q(lhm) => [
-         q(3903),
+         q(3904),
          q(0),
          ],
       q(lhn) => [
-         q(3904),
+         q(3905),
          q(0),
          ],
       q(lhp) => [
-         q(3905),
+         q(3906),
          q(0),
          ],
       q(lhs) => [
-         q(3906),
+         q(3907),
          q(0),
          ],
       q(lht) => [
-         q(3907),
+         q(3908),
          q(0),
          ],
       q(lhu) => [
-         q(3908),
+         q(3909),
          q(0),
          ],
       q(lia) => [
-         q(3909),
+         q(3910),
          q(0),
          ],
       q(lib) => [
-         q(3910),
+         q(3911),
          q(0),
          ],
       q(lic) => [
-         q(3911),
+         q(3912),
          q(0),
          ],
       q(lid) => [
-         q(3912),
+         q(3913),
          q(0),
          ],
       q(lie) => [
-         q(3913),
+         q(3914),
          q(0),
          ],
       q(lif) => [
-         q(3914),
+         q(3915),
          q(0),
          ],
       q(lig) => [
-         q(3915),
+         q(3916),
          q(0),
          ],
       q(lih) => [
-         q(3916),
+         q(3917),
          q(0),
          ],
       q(lij) => [
-         q(3917),
+         q(3918),
          q(0),
          ],
       q(lik) => [
-         q(3918),
+         q(3919),
          q(0),
          ],
       q(lil) => [
-         q(3919),
+         q(3920),
          q(0),
          ],
       q(lim) => [
@@ -72880,23 +72948,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(lio) => [
-         q(3920),
+         q(3921),
          q(0),
          ],
       q(lip) => [
-         q(3921),
+         q(3922),
          q(0),
          ],
       q(liq) => [
-         q(3922),
+         q(3923),
          q(0),
          ],
       q(lir) => [
-         q(3923),
+         q(3924),
          q(0),
          ],
       q(lis) => [
-         q(3924),
+         q(3925),
          q(0),
          ],
       q(lit) => [
@@ -72904,395 +72972,395 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(liu) => [
-         q(3925),
+         q(3926),
          q(0),
          ],
       q(liv) => [
-         q(3926),
+         q(3927),
          q(0),
          ],
       q(liw) => [
-         q(3927),
+         q(3928),
          q(0),
          ],
       q(lix) => [
-         q(3928),
+         q(3929),
          q(0),
          ],
       q(liy) => [
-         q(3929),
+         q(3930),
          q(0),
          ],
       q(liz) => [
-         q(3930),
+         q(3931),
          q(0),
          ],
       q(lja) => [
-         q(3931),
+         q(3932),
          q(0),
          ],
       q(lje) => [
-         q(3932),
+         q(3933),
          q(0),
          ],
       q(lji) => [
-         q(3933),
+         q(3934),
          q(0),
          ],
       q(ljl) => [
-         q(3934),
+         q(3935),
          q(0),
          ],
       q(ljp) => [
-         q(3935),
+         q(3936),
          q(0),
          ],
       q(ljw) => [
-         q(3936),
+         q(3937),
          q(0),
          ],
       q(ljx) => [
-         q(3937),
+         q(3938),
          q(0),
          ],
       q(lka) => [
-         q(3938),
+         q(3939),
          q(0),
          ],
       q(lkb) => [
-         q(3939),
+         q(3940),
          q(0),
          ],
       q(lkc) => [
-         q(3940),
+         q(3941),
          q(0),
          ],
       q(lkd) => [
-         q(3941),
+         q(3942),
          q(0),
          ],
       q(lke) => [
-         q(3942),
+         q(3943),
          q(0),
          ],
       q(lkh) => [
-         q(3943),
+         q(3944),
          q(0),
          ],
       q(lki) => [
-         q(3944),
+         q(3945),
          q(0),
          ],
       q(lkj) => [
-         q(3945),
+         q(3946),
          q(0),
          ],
       q(lkl) => [
-         q(3946),
+         q(3947),
          q(0),
          ],
       q(lkm) => [
-         q(3947),
+         q(3948),
          q(0),
          ],
       q(lkn) => [
-         q(3948),
+         q(3949),
          q(0),
          ],
       q(lko) => [
-         q(3949),
+         q(3950),
          q(0),
          ],
       q(lkr) => [
-         q(3950),
+         q(3951),
          q(0),
          ],
       q(lks) => [
-         q(3951),
+         q(3952),
          q(0),
          ],
       q(lkt) => [
-         q(3952),
+         q(3953),
          q(0),
          ],
       q(lku) => [
-         q(3953),
+         q(3954),
          q(0),
          ],
       q(lky) => [
-         q(3954),
+         q(3955),
          q(0),
          ],
       q(lla) => [
-         q(3955),
+         q(3956),
          q(0),
          ],
       q(llb) => [
-         q(3956),
+         q(3957),
          q(0),
          ],
       q(llc) => [
-         q(3957),
+         q(3958),
          q(0),
          ],
       q(lld) => [
-         q(3958),
+         q(3959),
          q(0),
          ],
       q(lle) => [
-         q(3959),
+         q(3960),
          q(0),
          ],
       q(llf) => [
-         q(3960),
+         q(3961),
          q(0),
          ],
       q(llg) => [
-         q(3961),
+         q(3962),
          q(0),
          ],
       q(llh) => [
-         q(3962),
+         q(3963),
          q(0),
          ],
       q(lli) => [
-         q(3963),
+         q(3964),
          q(0),
          ],
       q(llj) => [
-         q(3964),
+         q(3965),
          q(0),
          ],
       q(llk) => [
-         q(3965),
+         q(3966),
          q(0),
          ],
       q(lll) => [
-         q(3966),
+         q(3967),
          q(0),
          ],
       q(llm) => [
-         q(3967),
+         q(3968),
          q(0),
          ],
       q(lln) => [
-         q(3968),
+         q(3969),
          q(0),
          ],
       q(llo) => [
-         q(3969),
+         q(3970),
          q(0),
          ],
       q(llp) => [
-         q(3970),
+         q(3971),
          q(0),
          ],
       q(llq) => [
-         q(3971),
+         q(3972),
          q(0),
          ],
       q(lls) => [
-         q(3972),
+         q(3973),
          q(0),
          ],
       q(llu) => [
-         q(3973),
+         q(3974),
          q(0),
          ],
       q(llx) => [
-         q(3974),
+         q(3975),
          q(0),
          ],
       q(lma) => [
-         q(3975),
+         q(3976),
          q(0),
          ],
       q(lmb) => [
-         q(3976),
+         q(3977),
          q(0),
          ],
       q(lmc) => [
-         q(3977),
+         q(3978),
          q(0),
          ],
       q(lmd) => [
-         q(3978),
+         q(3979),
          q(0),
          ],
       q(lme) => [
-         q(3979),
+         q(3980),
          q(0),
          ],
       q(lmf) => [
-         q(3980),
+         q(3981),
          q(0),
          ],
       q(lmg) => [
-         q(3981),
+         q(3982),
          q(0),
          ],
       q(lmh) => [
-         q(3982),
+         q(3983),
          q(0),
          ],
       q(lmi) => [
-         q(3983),
+         q(3984),
          q(0),
          ],
       q(lmj) => [
-         q(3984),
+         q(3985),
          q(0),
          ],
       q(lmk) => [
-         q(3985),
+         q(3986),
          q(0),
          ],
       q(lml) => [
-         q(3986),
+         q(3987),
          q(0),
          ],
       q(lmn) => [
-         q(3987),
+         q(3988),
          q(0),
          ],
       q(lmo) => [
-         q(3988),
+         q(3989),
          q(0),
          ],
       q(lmp) => [
-         q(3989),
+         q(3990),
          q(0),
          ],
       q(lmq) => [
-         q(3990),
+         q(3991),
          q(0),
          ],
       q(lmr) => [
-         q(3991),
+         q(3992),
          q(0),
          ],
       q(lmu) => [
-         q(3992),
+         q(3993),
          q(0),
          ],
       q(lmv) => [
-         q(3993),
+         q(3994),
          q(0),
          ],
       q(lmw) => [
-         q(3994),
+         q(3995),
          q(0),
          ],
       q(lmx) => [
-         q(3995),
+         q(3996),
          q(0),
          ],
       q(lmy) => [
-         q(3996),
+         q(3997),
          q(0),
          ],
       q(lmz) => [
-         q(3997),
+         q(3998),
          q(0),
          ],
       q(lna) => [
-         q(3998),
+         q(3999),
          q(0),
          ],
       q(lnb) => [
-         q(3999),
+         q(4000),
          q(0),
          ],
       q(lnd) => [
-         q(4000),
+         q(4001),
          q(0),
          ],
       q(lng) => [
-         q(4001),
+         q(4002),
          q(0),
          ],
       q(lnh) => [
-         q(4002),
+         q(4003),
          q(0),
          ],
       q(lni) => [
-         q(4003),
+         q(4004),
          q(0),
          ],
       q(lnj) => [
-         q(4004),
+         q(4005),
          q(0),
          ],
       q(lnl) => [
-         q(4005),
+         q(4006),
          q(0),
          ],
       q(lnm) => [
-         q(4006),
+         q(4007),
          q(0),
          ],
       q(lnn) => [
-         q(4007),
+         q(4008),
          q(0),
          ],
       q(lno) => [
-         q(4008),
+         q(4009),
          q(0),
          ],
       q(lns) => [
-         q(4009),
+         q(4010),
          q(0),
          ],
       q(lnu) => [
-         q(4010),
+         q(4011),
          q(0),
          ],
       q(lnw) => [
-         q(4011),
+         q(4012),
          q(0),
          ],
       q(lnz) => [
-         q(4012),
+         q(4013),
          q(0),
          ],
       q(loa) => [
-         q(4013),
+         q(4014),
          q(0),
          ],
       q(lob) => [
-         q(4014),
+         q(4015),
          q(0),
          ],
       q(loc) => [
-         q(4015),
+         q(4016),
          q(0),
          ],
       q(loe) => [
-         q(4016),
+         q(4017),
          q(0),
          ],
       q(lof) => [
-         q(4017),
+         q(4018),
          q(0),
          ],
       q(log) => [
-         q(4018),
+         q(4019),
          q(0),
          ],
       q(loh) => [
-         q(4019),
+         q(4020),
          q(0),
          ],
       q(loi) => [
-         q(4020),
+         q(4021),
          q(0),
          ],
       q(loj) => [
-         q(4021),
+         q(4022),
          q(0),
          ],
       q(lok) => [
-         q(4022),
+         q(4023),
          q(0),
          ],
       q(lol) => [
@@ -73300,55 +73368,55 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(lom) => [
-         q(4023),
+         q(4024),
          q(0),
          ],
       q(lon) => [
-         q(4024),
+         q(4025),
          q(0),
          ],
       q(loo) => [
-         q(4025),
+         q(4026),
          q(0),
          ],
       q(lop) => [
-         q(4026),
+         q(4027),
          q(0),
          ],
       q(loq) => [
-         q(4027),
+         q(4028),
          q(0),
          ],
       q(lor) => [
-         q(4028),
+         q(4029),
          q(0),
          ],
       q(los) => [
-         q(4029),
+         q(4030),
          q(0),
          ],
       q(lot) => [
-         q(4030),
+         q(4031),
          q(0),
          ],
       q(lou) => [
-         q(4031),
+         q(4032),
          q(0),
          ],
       q(lov) => [
-         q(4032),
+         q(4033),
          q(0),
          ],
       q(low) => [
-         q(4033),
+         q(4034),
          q(0),
          ],
       q(lox) => [
-         q(4034),
+         q(4035),
          q(0),
          ],
       q(loy) => [
-         q(4035),
+         q(4036),
          q(0),
          ],
       q(loz) => [
@@ -73356,163 +73424,163 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(lpa) => [
-         q(4036),
+         q(4037),
          q(0),
          ],
       q(lpe) => [
-         q(4037),
+         q(4038),
          q(0),
          ],
       q(lpn) => [
-         q(4038),
+         q(4039),
          q(0),
          ],
       q(lpo) => [
-         q(4039),
+         q(4040),
          q(0),
          ],
       q(lpx) => [
-         q(4040),
+         q(4041),
          q(0),
          ],
       q(lra) => [
-         q(4041),
+         q(4042),
          q(0),
          ],
       q(lrc) => [
-         q(4042),
+         q(4043),
          q(0),
          ],
       q(lre) => [
-         q(4043),
+         q(4044),
          q(0),
          ],
       q(lrg) => [
-         q(4044),
+         q(4045),
          q(0),
          ],
       q(lri) => [
-         q(4045),
+         q(4046),
          q(0),
          ],
       q(lrk) => [
-         q(4046),
+         q(4047),
          q(0),
          ],
       q(lrl) => [
-         q(4047),
+         q(4048),
          q(0),
          ],
       q(lrm) => [
-         q(4048),
+         q(4049),
          q(0),
          ],
       q(lrn) => [
-         q(4049),
+         q(4050),
          q(0),
          ],
       q(lro) => [
-         q(4050),
+         q(4051),
          q(0),
          ],
       q(lrr) => [
-         q(4051),
+         q(4052),
          q(0),
          ],
       q(lrt) => [
-         q(4052),
+         q(4053),
          q(0),
          ],
       q(lrv) => [
-         q(4053),
+         q(4054),
          q(0),
          ],
       q(lrz) => [
-         q(4054),
+         q(4055),
          q(0),
          ],
       q(lsa) => [
-         q(4055),
+         q(4056),
          q(0),
          ],
       q(lsd) => [
-         q(4056),
+         q(4057),
          q(0),
          ],
       q(lse) => [
-         q(4057),
+         q(4058),
          q(0),
          ],
       q(lsg) => [
-         q(4058),
+         q(4059),
          q(0),
          ],
       q(lsh) => [
-         q(4059),
+         q(4060),
          q(0),
          ],
       q(lsi) => [
-         q(4060),
+         q(4061),
          q(0),
          ],
       q(lsl) => [
-         q(4061),
+         q(4062),
          q(0),
          ],
       q(lsm) => [
-         q(4062),
+         q(4063),
          q(0),
          ],
       q(lso) => [
-         q(4063),
+         q(4064),
          q(0),
          ],
       q(lsp) => [
-         q(4064),
+         q(4065),
          q(0),
          ],
       q(lsr) => [
-         q(4065),
+         q(4066),
          q(0),
          ],
       q(lss) => [
-         q(4066),
+         q(4067),
          q(0),
          ],
       q(lst) => [
-         q(4067),
+         q(4068),
          q(0),
          ],
       q(lsy) => [
-         q(4068),
+         q(4069),
          q(0),
          ],
       q(ltc) => [
-         q(4069),
+         q(4070),
          q(0),
          ],
       q(ltg) => [
-         q(4070),
+         q(4071),
          q(0),
          ],
       q(lti) => [
-         q(4071),
+         q(4072),
          q(0),
          ],
       q(ltn) => [
-         q(4072),
+         q(4073),
          q(0),
          ],
       q(lto) => [
-         q(4073),
+         q(4074),
          q(0),
          ],
       q(lts) => [
-         q(4074),
+         q(4075),
          q(0),
          ],
       q(ltu) => [
-         q(4075),
+         q(4076),
          q(0),
          ],
       q(ltz) => [
@@ -73528,19 +73596,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(luc) => [
-         q(4076),
+         q(4077),
          q(0),
          ],
       q(lud) => [
-         q(4077),
+         q(4078),
          q(0),
          ],
       q(lue) => [
-         q(4078),
+         q(4079),
          q(0),
          ],
       q(luf) => [
-         q(4079),
+         q(4080),
          q(0),
          ],
       q(lug) => [
@@ -73552,19 +73620,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(luj) => [
-         q(4080),
+         q(4081),
          q(0),
          ],
       q(luk) => [
-         q(4081),
+         q(4082),
          q(0),
          ],
       q(lul) => [
-         q(4082),
+         q(4083),
          q(0),
          ],
       q(lum) => [
-         q(4083),
+         q(4084),
          q(0),
          ],
       q(lun) => [
@@ -73576,15 +73644,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(lup) => [
-         q(4084),
+         q(4085),
          q(0),
          ],
       q(luq) => [
-         q(4085),
+         q(4086),
          q(0),
          ],
       q(lur) => [
-         q(4086),
+         q(4087),
          q(0),
          ],
       q(lus) => [
@@ -73592,119 +73660,119 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(lut) => [
-         q(4087),
+         q(4088),
          q(0),
          ],
       q(luu) => [
-         q(4088),
+         q(4089),
          q(0),
          ],
       q(luv) => [
-         q(4089),
+         q(4090),
          q(0),
          ],
       q(luw) => [
-         q(4090),
+         q(4091),
          q(0),
          ],
       q(luy) => [
-         q(4091),
+         q(4092),
          q(0),
          ],
       q(luz) => [
-         q(4092),
+         q(4093),
          q(0),
          ],
       q(lva) => [
-         q(4093),
+         q(4094),
          q(0),
          ],
       q(lvk) => [
-         q(4094),
+         q(4095),
          q(0),
          ],
       q(lvs) => [
-         q(4095),
+         q(4096),
          q(0),
          ],
       q(lvu) => [
-         q(4096),
+         q(4097),
          q(0),
          ],
       q(lwa) => [
-         q(4097),
+         q(4098),
          q(0),
          ],
       q(lwe) => [
-         q(4098),
+         q(4099),
          q(0),
          ],
       q(lwg) => [
-         q(4099),
+         q(4100),
          q(0),
          ],
       q(lwh) => [
-         q(4100),
+         q(4101),
          q(0),
          ],
       q(lwl) => [
-         q(4101),
+         q(4102),
          q(0),
          ],
       q(lwm) => [
-         q(4102),
+         q(4103),
          q(0),
          ],
       q(lwo) => [
-         q(4103),
+         q(4104),
          q(0),
          ],
       q(lwt) => [
-         q(4104),
+         q(4105),
          q(0),
          ],
       q(lwu) => [
-         q(4105),
+         q(4106),
          q(0),
          ],
       q(lww) => [
-         q(4106),
+         q(4107),
          q(0),
          ],
       q(lya) => [
-         q(4107),
+         q(4108),
          q(0),
          ],
       q(lyg) => [
-         q(4108),
+         q(4109),
          q(0),
          ],
       q(lyn) => [
-         q(4109),
+         q(4110),
          q(0),
          ],
       q(lzh) => [
-         q(4110),
+         q(4111),
          q(0),
          ],
       q(lzl) => [
-         q(4111),
+         q(4112),
          q(0),
          ],
       q(lzn) => [
-         q(4112),
+         q(4113),
          q(0),
          ],
       q(lzz) => [
-         q(4113),
+         q(4114),
          q(0),
          ],
       q(maa) => [
-         q(4114),
+         q(4115),
          q(0),
          ],
       q(mab) => [
-         q(4115),
+         q(4116),
          q(0),
          ],
       q(mac) => [
@@ -73716,11 +73784,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mae) => [
-         q(4116),
+         q(4117),
          q(0),
          ],
       q(maf) => [
-         q(4117),
+         q(4118),
          q(0),
          ],
       q(mag) => [
@@ -73736,7 +73804,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(maj) => [
-         q(4118),
+         q(4119),
          q(0),
          ],
       q(mak) => [
@@ -73748,7 +73816,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mam) => [
-         q(4119),
+         q(4120),
          q(0),
          ],
       q(man) => [
@@ -73764,7 +73832,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(maq) => [
-         q(4120),
+         q(4121),
          q(0),
          ],
       q(mar) => [
@@ -73776,23 +73844,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mat) => [
-         q(4121),
+         q(4122),
          q(0),
          ],
       q(mau) => [
-         q(4122),
+         q(4123),
          q(0),
          ],
       q(mav) => [
-         q(4123),
+         q(4124),
          q(0),
          ],
       q(maw) => [
-         q(4124),
+         q(4125),
          q(0),
          ],
       q(max) => [
-         q(4125),
+         q(4126),
          q(0),
          ],
       q(may) => [
@@ -73800,231 +73868,231 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(maz) => [
-         q(4126),
+         q(4127),
          q(0),
          ],
       q(mba) => [
-         q(4127),
+         q(4128),
          q(0),
          ],
       q(mbb) => [
-         q(4128),
+         q(4129),
          q(0),
          ],
       q(mbc) => [
-         q(4129),
+         q(4130),
          q(0),
          ],
       q(mbd) => [
-         q(4130),
+         q(4131),
          q(0),
          ],
       q(mbe) => [
-         q(4131),
+         q(4132),
          q(0),
          ],
       q(mbf) => [
-         q(4132),
+         q(4133),
          q(0),
          ],
       q(mbh) => [
-         q(4133),
+         q(4134),
          q(0),
          ],
       q(mbi) => [
-         q(4134),
+         q(4135),
          q(0),
          ],
       q(mbj) => [
-         q(4135),
+         q(4136),
          q(0),
          ],
       q(mbk) => [
-         q(4136),
+         q(4137),
          q(0),
          ],
       q(mbl) => [
-         q(4137),
+         q(4138),
          q(0),
          ],
       q(mbm) => [
-         q(4138),
+         q(4139),
          q(0),
          ],
       q(mbn) => [
-         q(4139),
+         q(4140),
          q(0),
          ],
       q(mbo) => [
-         q(4140),
+         q(4141),
          q(0),
          ],
       q(mbp) => [
-         q(4141),
+         q(4142),
          q(0),
          ],
       q(mbq) => [
-         q(4142),
+         q(4143),
          q(0),
          ],
       q(mbr) => [
-         q(4143),
+         q(4144),
          q(0),
          ],
       q(mbs) => [
-         q(4144),
+         q(4145),
          q(0),
          ],
       q(mbt) => [
-         q(4145),
+         q(4146),
          q(0),
          ],
       q(mbu) => [
-         q(4146),
+         q(4147),
          q(0),
          ],
       q(mbv) => [
-         q(4147),
+         q(4148),
          q(0),
          ],
       q(mbw) => [
-         q(4148),
+         q(4149),
          q(0),
          ],
       q(mbx) => [
-         q(4149),
+         q(4150),
          q(0),
          ],
       q(mby) => [
-         q(4150),
+         q(4151),
          q(0),
          ],
       q(mbz) => [
-         q(4151),
+         q(4152),
          q(0),
          ],
       q(mca) => [
-         q(4152),
+         q(4153),
          q(0),
          ],
       q(mcb) => [
-         q(4153),
+         q(4154),
          q(0),
          ],
       q(mcc) => [
-         q(4154),
+         q(4155),
          q(0),
          ],
       q(mcd) => [
-         q(4155),
+         q(4156),
          q(0),
          ],
       q(mce) => [
-         q(4156),
+         q(4157),
          q(0),
          ],
       q(mcf) => [
-         q(4157),
+         q(4158),
          q(0),
          ],
       q(mcg) => [
-         q(4158),
+         q(4159),
          q(0),
          ],
       q(mch) => [
-         q(4159),
+         q(4160),
          q(0),
          ],
       q(mci) => [
-         q(4160),
+         q(4161),
          q(0),
          ],
       q(mcj) => [
-         q(4161),
+         q(4162),
          q(0),
          ],
       q(mck) => [
-         q(4162),
+         q(4163),
          q(0),
          ],
       q(mcl) => [
-         q(4163),
+         q(4164),
          q(0),
          ],
       q(mcm) => [
-         q(4164),
+         q(4165),
          q(0),
          ],
       q(mcn) => [
-         q(4165),
+         q(4166),
          q(0),
          ],
       q(mco) => [
-         q(4166),
+         q(4167),
          q(0),
          ],
       q(mcp) => [
-         q(4167),
+         q(4168),
          q(0),
          ],
       q(mcq) => [
-         q(4168),
+         q(4169),
          q(0),
          ],
       q(mcr) => [
-         q(4169),
+         q(4170),
          q(0),
          ],
       q(mcs) => [
-         q(4170),
+         q(4171),
          q(0),
          ],
       q(mct) => [
-         q(4171),
+         q(4172),
          q(0),
          ],
       q(mcu) => [
-         q(4172),
+         q(4173),
          q(0),
          ],
       q(mcv) => [
-         q(4173),
+         q(4174),
          q(0),
          ],
       q(mcw) => [
-         q(4174),
+         q(4175),
          q(0),
          ],
       q(mcx) => [
-         q(4175),
+         q(4176),
          q(0),
          ],
       q(mcy) => [
-         q(4176),
+         q(4177),
          q(0),
          ],
       q(mcz) => [
-         q(4177),
+         q(4178),
          q(0),
          ],
       q(mda) => [
-         q(4178),
+         q(4179),
          q(0),
          ],
       q(mdb) => [
-         q(4179),
+         q(4180),
          q(0),
          ],
       q(mdc) => [
-         q(4180),
+         q(4181),
          q(0),
          ],
       q(mdd) => [
-         q(4181),
+         q(4182),
          q(0),
          ],
       q(mde) => [
-         q(4182),
+         q(4183),
          q(0),
          ],
       q(mdf) => [
@@ -74032,43 +74100,43 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mdg) => [
-         q(4183),
+         q(4184),
          q(0),
          ],
       q(mdh) => [
-         q(4184),
+         q(4185),
          q(0),
          ],
       q(mdi) => [
-         q(4185),
+         q(4186),
          q(0),
          ],
       q(mdj) => [
-         q(4186),
+         q(4187),
          q(0),
          ],
       q(mdk) => [
-         q(4187),
+         q(4188),
          q(0),
          ],
       q(mdl) => [
-         q(4188),
+         q(4189),
          q(0),
          ],
       q(mdm) => [
-         q(4189),
+         q(4190),
          q(0),
          ],
       q(mdn) => [
-         q(4190),
+         q(4191),
          q(0),
          ],
       q(mdp) => [
-         q(4191),
+         q(4192),
          q(0),
          ],
       q(mdq) => [
-         q(4192),
+         q(4193),
          q(0),
          ],
       q(mdr) => [
@@ -74076,83 +74144,83 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mds) => [
-         q(4193),
+         q(4194),
          q(0),
          ],
       q(mdt) => [
-         q(4194),
+         q(4195),
          q(0),
          ],
       q(mdu) => [
-         q(4195),
+         q(4196),
          q(0),
          ],
       q(mdv) => [
-         q(4196),
+         q(4197),
          q(0),
          ],
       q(mdw) => [
-         q(4197),
+         q(4198),
          q(0),
          ],
       q(mdx) => [
-         q(4198),
+         q(4199),
          q(0),
          ],
       q(mdy) => [
-         q(4199),
+         q(4200),
          q(0),
          ],
       q(mdz) => [
-         q(4200),
+         q(4201),
          q(0),
          ],
       q(mea) => [
-         q(4201),
+         q(4202),
          q(0),
          ],
       q(meb) => [
-         q(4202),
+         q(4203),
          q(0),
          ],
       q(mec) => [
-         q(4203),
+         q(4204),
          q(0),
          ],
       q(med) => [
-         q(4204),
+         q(4205),
          q(0),
          ],
       q(mee) => [
-         q(4205),
+         q(4206),
          q(0),
          ],
       q(mef) => [
-         q(4206),
+         q(4207),
          q(0),
          ],
       q(meh) => [
-         q(4207),
+         q(4208),
          q(0),
          ],
       q(mei) => [
-         q(4208),
+         q(4209),
          q(0),
          ],
       q(mej) => [
-         q(4209),
+         q(4210),
          q(0),
          ],
       q(mek) => [
-         q(4210),
+         q(4211),
          q(0),
          ],
       q(mel) => [
-         q(4211),
+         q(4212),
          q(0),
          ],
       q(mem) => [
-         q(4212),
+         q(4213),
          q(0),
          ],
       q(men) => [
@@ -74160,151 +74228,151 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(meo) => [
-         q(4213),
+         q(4214),
          q(0),
          ],
       q(mep) => [
-         q(4214),
+         q(4215),
          q(0),
          ],
       q(meq) => [
-         q(4215),
+         q(4216),
          q(0),
          ],
       q(mer) => [
-         q(4216),
+         q(4217),
          q(0),
          ],
       q(mes) => [
-         q(4217),
+         q(4218),
          q(0),
          ],
       q(met) => [
-         q(4218),
+         q(4219),
          q(0),
          ],
       q(meu) => [
-         q(4219),
+         q(4220),
          q(0),
          ],
       q(mev) => [
-         q(4220),
+         q(4221),
          q(0),
          ],
       q(mew) => [
-         q(4221),
+         q(4222),
          q(0),
          ],
       q(mey) => [
-         q(4222),
+         q(4223),
          q(0),
          ],
       q(mez) => [
-         q(4223),
+         q(4224),
          q(0),
          ],
       q(mfa) => [
-         q(4224),
+         q(4225),
          q(0),
          ],
       q(mfb) => [
-         q(4225),
+         q(4226),
          q(0),
          ],
       q(mfc) => [
-         q(4226),
+         q(4227),
          q(0),
          ],
       q(mfd) => [
-         q(4227),
+         q(4228),
          q(0),
          ],
       q(mfe) => [
-         q(4228),
+         q(4229),
          q(0),
          ],
       q(mff) => [
-         q(4229),
+         q(4230),
          q(0),
          ],
       q(mfg) => [
-         q(4230),
+         q(4231),
          q(0),
          ],
       q(mfh) => [
-         q(4231),
+         q(4232),
          q(0),
          ],
       q(mfi) => [
-         q(4232),
+         q(4233),
          q(0),
          ],
       q(mfj) => [
-         q(4233),
+         q(4234),
          q(0),
          ],
       q(mfk) => [
-         q(4234),
+         q(4235),
          q(0),
          ],
       q(mfl) => [
-         q(4235),
+         q(4236),
          q(0),
          ],
       q(mfm) => [
-         q(4236),
+         q(4237),
          q(0),
          ],
       q(mfn) => [
-         q(4237),
+         q(4238),
          q(0),
          ],
       q(mfo) => [
-         q(4238),
+         q(4239),
          q(0),
          ],
       q(mfp) => [
-         q(4239),
+         q(4240),
          q(0),
          ],
       q(mfq) => [
-         q(4240),
+         q(4241),
          q(0),
          ],
       q(mfr) => [
-         q(4241),
+         q(4242),
          q(0),
          ],
       q(mfs) => [
-         q(4242),
+         q(4243),
          q(0),
          ],
       q(mft) => [
-         q(4243),
+         q(4244),
          q(0),
          ],
       q(mfu) => [
-         q(4244),
+         q(4245),
          q(0),
          ],
       q(mfv) => [
-         q(4245),
+         q(4246),
          q(0),
          ],
       q(mfw) => [
-         q(4246),
+         q(4247),
          q(0),
          ],
       q(mfx) => [
-         q(4247),
+         q(4248),
          q(0),
          ],
       q(mfy) => [
-         q(4248),
+         q(4249),
          q(0),
          ],
       q(mfz) => [
-         q(4249),
+         q(4250),
          q(0),
          ],
       q(mga) => [
@@ -74312,203 +74380,203 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(mgb) => [
-         q(4250),
+         q(4251),
          q(0),
          ],
       q(mgc) => [
-         q(4251),
+         q(4252),
          q(0),
          ],
       q(mgd) => [
-         q(4252),
+         q(4253),
          q(0),
          ],
       q(mge) => [
-         q(4253),
+         q(4254),
          q(0),
          ],
       q(mgf) => [
-         q(4254),
+         q(4255),
          q(0),
          ],
       q(mgg) => [
-         q(4255),
+         q(4256),
          q(0),
          ],
       q(mgh) => [
-         q(4256),
+         q(4257),
          q(0),
          ],
       q(mgi) => [
-         q(4257),
+         q(4258),
          q(0),
          ],
       q(mgj) => [
-         q(4258),
+         q(4259),
          q(0),
          ],
       q(mgk) => [
-         q(4259),
+         q(4260),
          q(0),
          ],
       q(mgl) => [
-         q(4260),
+         q(4261),
          q(0),
          ],
       q(mgm) => [
-         q(4261),
+         q(4262),
          q(0),
          ],
       q(mgn) => [
-         q(4262),
+         q(4263),
          q(0),
          ],
       q(mgo) => [
-         q(4263),
+         q(4264),
          q(0),
          ],
       q(mgp) => [
-         q(4264),
+         q(4265),
          q(0),
          ],
       q(mgq) => [
-         q(4265),
+         q(4266),
          q(0),
          ],
       q(mgr) => [
-         q(4266),
+         q(4267),
          q(0),
          ],
       q(mgs) => [
-         q(4267),
+         q(4268),
          q(0),
          ],
       q(mgt) => [
-         q(4268),
+         q(4269),
          q(0),
          ],
       q(mgu) => [
-         q(4269),
+         q(4270),
          q(0),
          ],
       q(mgv) => [
-         q(4270),
+         q(4271),
          q(0),
          ],
       q(mgw) => [
-         q(4271),
+         q(4272),
          q(0),
          ],
       q(mgy) => [
-         q(4272),
+         q(4273),
          q(0),
          ],
       q(mgz) => [
-         q(4273),
+         q(4274),
          q(0),
          ],
       q(mha) => [
-         q(4274),
+         q(4275),
          q(0),
          ],
       q(mhb) => [
-         q(4275),
+         q(4276),
          q(0),
          ],
       q(mhc) => [
-         q(4276),
+         q(4277),
          q(0),
          ],
       q(mhd) => [
-         q(4277),
+         q(4278),
          q(0),
          ],
       q(mhe) => [
-         q(4278),
+         q(4279),
          q(0),
          ],
       q(mhf) => [
-         q(4279),
+         q(4280),
          q(0),
          ],
       q(mhg) => [
-         q(4280),
+         q(4281),
          q(0),
          ],
       q(mhi) => [
-         q(4281),
+         q(4282),
          q(0),
          ],
       q(mhj) => [
-         q(4282),
+         q(4283),
          q(0),
          ],
       q(mhk) => [
-         q(4283),
+         q(4284),
          q(0),
          ],
       q(mhl) => [
-         q(4284),
+         q(4285),
          q(0),
          ],
       q(mhm) => [
-         q(4285),
+         q(4286),
          q(0),
          ],
       q(mhn) => [
-         q(4286),
+         q(4287),
          q(0),
          ],
       q(mho) => [
-         q(4287),
+         q(4288),
          q(0),
          ],
       q(mhp) => [
-         q(4288),
+         q(4289),
          q(0),
          ],
       q(mhq) => [
-         q(4289),
+         q(4290),
          q(0),
          ],
       q(mhr) => [
-         q(4290),
+         q(4291),
          q(0),
          ],
       q(mhs) => [
-         q(4291),
+         q(4292),
          q(0),
          ],
       q(mht) => [
-         q(4292),
+         q(4293),
          q(0),
          ],
       q(mhu) => [
-         q(4293),
+         q(4294),
          q(0),
          ],
       q(mhw) => [
-         q(4294),
+         q(4295),
          q(0),
          ],
       q(mhx) => [
-         q(4295),
+         q(4296),
          q(0),
          ],
       q(mhy) => [
-         q(4296),
+         q(4297),
          q(0),
          ],
       q(mhz) => [
-         q(4297),
+         q(4298),
          q(0),
          ],
       q(mia) => [
-         q(4298),
+         q(4299),
          q(0),
          ],
       q(mib) => [
-         q(4299),
+         q(4300),
          q(0),
          ],
       q(mic) => [
@@ -74516,43 +74584,43 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mid) => [
-         q(4300),
+         q(4301),
          q(0),
          ],
       q(mie) => [
-         q(4301),
+         q(4302),
          q(0),
          ],
       q(mif) => [
-         q(4302),
+         q(4303),
          q(0),
          ],
       q(mig) => [
-         q(4303),
+         q(4304),
          q(0),
          ],
       q(mih) => [
-         q(4304),
+         q(4305),
          q(0),
          ],
       q(mii) => [
-         q(4305),
+         q(4306),
          q(0),
          ],
       q(mij) => [
-         q(4306),
+         q(4307),
          q(0),
          ],
       q(mik) => [
-         q(4307),
+         q(4308),
          q(0),
          ],
       q(mil) => [
-         q(4308),
+         q(4309),
          q(0),
          ],
       q(mim) => [
-         q(4309),
+         q(4310),
          q(0),
          ],
       q(min) => [
@@ -74560,19 +74628,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mio) => [
-         q(4310),
+         q(4311),
          q(0),
          ],
       q(mip) => [
-         q(4311),
+         q(4312),
          q(0),
          ],
       q(miq) => [
-         q(4312),
+         q(4313),
          q(0),
          ],
       q(mir) => [
-         q(4313),
+         q(4314),
          q(0),
          ],
       q(mis) => [
@@ -74580,143 +74648,143 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mit) => [
-         q(4314),
+         q(4315),
          q(0),
          ],
       q(miu) => [
-         q(4315),
+         q(4316),
          q(0),
          ],
       q(miw) => [
-         q(4316),
+         q(4317),
          q(0),
          ],
       q(mix) => [
-         q(4317),
+         q(4318),
          q(0),
          ],
       q(miy) => [
-         q(4318),
+         q(4319),
          q(0),
          ],
       q(miz) => [
-         q(4319),
+         q(4320),
          q(0),
          ],
       q(mjc) => [
-         q(4320),
+         q(4321),
          q(0),
          ],
       q(mjd) => [
-         q(4321),
+         q(4322),
          q(0),
          ],
       q(mje) => [
-         q(4322),
+         q(4323),
          q(0),
          ],
       q(mjg) => [
-         q(4323),
+         q(4324),
          q(0),
          ],
       q(mjh) => [
-         q(4324),
+         q(4325),
          q(0),
          ],
       q(mji) => [
-         q(4325),
+         q(4326),
          q(0),
          ],
       q(mjj) => [
-         q(4326),
+         q(4327),
          q(0),
          ],
       q(mjk) => [
-         q(4327),
+         q(4328),
          q(0),
          ],
       q(mjl) => [
-         q(4328),
+         q(4329),
          q(0),
          ],
       q(mjm) => [
-         q(4329),
+         q(4330),
          q(0),
          ],
       q(mjn) => [
-         q(4330),
+         q(4331),
          q(0),
          ],
       q(mjo) => [
-         q(4331),
+         q(4332),
          q(0),
          ],
       q(mjp) => [
-         q(4332),
+         q(4333),
          q(0),
          ],
       q(mjq) => [
-         q(4333),
+         q(4334),
          q(0),
          ],
       q(mjr) => [
-         q(4334),
+         q(4335),
          q(0),
          ],
       q(mjs) => [
-         q(4335),
+         q(4336),
          q(0),
          ],
       q(mjt) => [
-         q(4336),
+         q(4337),
          q(0),
          ],
       q(mju) => [
-         q(4337),
+         q(4338),
          q(0),
          ],
       q(mjv) => [
-         q(4338),
+         q(4339),
          q(0),
          ],
       q(mjw) => [
-         q(4339),
+         q(4340),
          q(0),
          ],
       q(mjx) => [
-         q(4340),
+         q(4341),
          q(0),
          ],
       q(mjy) => [
-         q(4341),
+         q(4342),
          q(0),
          ],
       q(mjz) => [
-         q(4342),
+         q(4343),
          q(0),
          ],
       q(mka) => [
-         q(4343),
+         q(4344),
          q(0),
          ],
       q(mkb) => [
-         q(4344),
+         q(4345),
          q(0),
          ],
       q(mkc) => [
-         q(4345),
+         q(4346),
          q(0),
          ],
       q(mke) => [
-         q(4346),
+         q(4347),
          q(0),
          ],
       q(mkf) => [
-         q(4347),
+         q(4348),
          q(0),
          ],
       q(mkg) => [
-         q(4348),
+         q(4349),
          q(0),
          ],
       q(mkh) => [
@@ -74724,95 +74792,95 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mki) => [
-         q(4349),
+         q(4350),
          q(0),
          ],
       q(mkj) => [
-         q(4350),
+         q(4351),
          q(0),
          ],
       q(mkk) => [
-         q(4351),
+         q(4352),
          q(0),
          ],
       q(mkl) => [
-         q(4352),
+         q(4353),
          q(0),
          ],
       q(mkm) => [
-         q(4353),
+         q(4354),
          q(0),
          ],
       q(mkn) => [
-         q(4354),
+         q(4355),
          q(0),
          ],
       q(mko) => [
-         q(4355),
+         q(4356),
          q(0),
          ],
       q(mkp) => [
-         q(4356),
+         q(4357),
          q(0),
          ],
       q(mkq) => [
-         q(4357),
+         q(4358),
          q(0),
          ],
       q(mkr) => [
-         q(4358),
+         q(4359),
          q(0),
          ],
       q(mks) => [
-         q(4359),
+         q(4360),
          q(0),
          ],
       q(mkt) => [
-         q(4360),
+         q(4361),
          q(0),
          ],
       q(mku) => [
-         q(4361),
+         q(4362),
          q(0),
          ],
       q(mkv) => [
-         q(4362),
+         q(4363),
          q(0),
          ],
       q(mkw) => [
-         q(4363),
+         q(4364),
          q(0),
          ],
       q(mkx) => [
-         q(4364),
+         q(4365),
          q(0),
          ],
       q(mky) => [
-         q(4365),
+         q(4366),
          q(0),
          ],
       q(mkz) => [
-         q(4366),
+         q(4367),
          q(0),
          ],
       q(mla) => [
-         q(4367),
+         q(4368),
          q(0),
          ],
       q(mlb) => [
-         q(4368),
+         q(4369),
          q(0),
          ],
       q(mlc) => [
-         q(4369),
+         q(4370),
          q(0),
          ],
       q(mle) => [
-         q(4370),
+         q(4371),
          q(0),
          ],
       q(mlf) => [
-         q(4371),
+         q(4372),
          q(0),
          ],
       q(mlg) => [
@@ -74820,51 +74888,51 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mlh) => [
-         q(4372),
+         q(4373),
          q(0),
          ],
       q(mli) => [
-         q(4373),
+         q(4374),
          q(0),
          ],
       q(mlj) => [
-         q(4374),
+         q(4375),
          q(0),
          ],
       q(mlk) => [
-         q(4375),
+         q(4376),
          q(0),
          ],
       q(mll) => [
-         q(4376),
+         q(4377),
          q(0),
          ],
       q(mlm) => [
-         q(4377),
+         q(4378),
          q(0),
          ],
       q(mln) => [
-         q(4378),
+         q(4379),
          q(0),
          ],
       q(mlo) => [
-         q(4379),
+         q(4380),
          q(0),
          ],
       q(mlp) => [
-         q(4380),
+         q(4381),
          q(0),
          ],
       q(mlq) => [
-         q(4381),
+         q(4382),
          q(0),
          ],
       q(mlr) => [
-         q(4382),
+         q(4383),
          q(0),
          ],
       q(mls) => [
-         q(4383),
+         q(4384),
          q(0),
          ],
       q(mlt) => [
@@ -74872,131 +74940,131 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mlu) => [
-         q(4384),
+         q(4385),
          q(0),
          ],
       q(mlv) => [
-         q(4385),
+         q(4386),
          q(0),
          ],
       q(mlw) => [
-         q(4386),
+         q(4387),
          q(0),
          ],
       q(mlx) => [
-         q(4387),
+         q(4388),
          q(0),
          ],
       q(mlz) => [
-         q(4388),
+         q(4389),
          q(0),
          ],
       q(mma) => [
-         q(4389),
+         q(4390),
          q(0),
          ],
       q(mmb) => [
-         q(4390),
+         q(4391),
          q(0),
          ],
       q(mmc) => [
-         q(4391),
+         q(4392),
          q(0),
          ],
       q(mmd) => [
-         q(4392),
+         q(4393),
          q(0),
          ],
       q(mme) => [
-         q(4393),
+         q(4394),
          q(0),
          ],
       q(mmf) => [
-         q(4394),
+         q(4395),
          q(0),
          ],
       q(mmg) => [
-         q(4395),
+         q(4396),
          q(0),
          ],
       q(mmh) => [
-         q(4396),
+         q(4397),
          q(0),
          ],
       q(mmi) => [
-         q(4397),
+         q(4398),
          q(0),
          ],
       q(mmj) => [
-         q(4398),
+         q(4399),
          q(0),
          ],
       q(mmk) => [
-         q(4399),
+         q(4400),
          q(0),
          ],
       q(mml) => [
-         q(4400),
+         q(4401),
          q(0),
          ],
       q(mmm) => [
-         q(4401),
+         q(4402),
          q(0),
          ],
       q(mmn) => [
-         q(4402),
+         q(4403),
          q(0),
          ],
       q(mmo) => [
-         q(4403),
+         q(4404),
          q(0),
          ],
       q(mmp) => [
-         q(4404),
+         q(4405),
          q(0),
          ],
       q(mmq) => [
-         q(4405),
+         q(4406),
          q(0),
          ],
       q(mmr) => [
-         q(4406),
+         q(4407),
          q(0),
          ],
       q(mmt) => [
-         q(4407),
+         q(4408),
          q(0),
          ],
       q(mmu) => [
-         q(4408),
+         q(4409),
          q(0),
          ],
       q(mmv) => [
-         q(4409),
+         q(4410),
          q(0),
          ],
       q(mmw) => [
-         q(4410),
+         q(4411),
          q(0),
          ],
       q(mmx) => [
-         q(4411),
+         q(4412),
          q(0),
          ],
       q(mmy) => [
-         q(4412),
+         q(4413),
          q(0),
          ],
       q(mmz) => [
-         q(4413),
+         q(4414),
          q(0),
          ],
       q(mna) => [
-         q(4414),
+         q(4415),
          q(0),
          ],
       q(mnb) => [
-         q(4415),
+         q(4416),
          q(0),
          ],
       q(mnc) => [
@@ -75004,23 +75072,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mnd) => [
-         q(4416),
+         q(4417),
          q(0),
          ],
       q(mne) => [
-         q(4417),
+         q(4418),
          q(0),
          ],
       q(mnf) => [
-         q(4418),
+         q(4419),
          q(0),
          ],
       q(mng) => [
-         q(4419),
+         q(4420),
          q(0),
          ],
       q(mnh) => [
-         q(4420),
+         q(4421),
          q(0),
          ],
       q(mni) => [
@@ -75028,23 +75096,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mnj) => [
-         q(4421),
+         q(4422),
          q(0),
          ],
       q(mnk) => [
-         q(4422),
+         q(4423),
          q(0),
          ],
       q(mnl) => [
-         q(4423),
+         q(4424),
          q(0),
          ],
       q(mnm) => [
-         q(4424),
+         q(4425),
          q(0),
          ],
       q(mnn) => [
-         q(4425),
+         q(4426),
          q(0),
          ],
       q(mno) => [
@@ -75052,63 +75120,63 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mnp) => [
-         q(4426),
+         q(4427),
          q(0),
          ],
       q(mnq) => [
-         q(4427),
+         q(4428),
          q(0),
          ],
       q(mnr) => [
-         q(4428),
+         q(4429),
          q(0),
          ],
       q(mns) => [
-         q(4429),
+         q(4430),
          q(0),
          ],
       q(mnu) => [
-         q(4430),
+         q(4431),
          q(0),
          ],
       q(mnv) => [
-         q(4431),
+         q(4432),
          q(0),
          ],
       q(mnw) => [
-         q(4432),
+         q(4433),
          q(0),
          ],
       q(mnx) => [
-         q(4433),
+         q(4434),
          q(0),
          ],
       q(mny) => [
-         q(4434),
+         q(4435),
          q(0),
          ],
       q(mnz) => [
-         q(4435),
+         q(4436),
          q(0),
          ],
       q(moa) => [
-         q(4436),
+         q(4437),
          q(0),
          ],
       q(moc) => [
-         q(4437),
+         q(4438),
          q(0),
          ],
       q(mod) => [
-         q(4438),
+         q(4439),
          q(0),
          ],
       q(moe) => [
-         q(4439),
+         q(4440),
          q(0),
          ],
       q(mog) => [
-         q(4440),
+         q(4441),
          q(0),
          ],
       q(moh) => [
@@ -75116,19 +75184,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(moi) => [
-         q(4441),
+         q(4442),
          q(0),
          ],
       q(moj) => [
-         q(4442),
+         q(4443),
          q(0),
          ],
       q(mok) => [
-         q(4443),
+         q(4444),
          q(0),
          ],
       q(mom) => [
-         q(4444),
+         q(4445),
          q(0),
          ],
       q(mon) => [
@@ -75136,19 +75204,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(moo) => [
-         q(4445),
+         q(4446),
          q(0),
          ],
       q(mop) => [
-         q(4446),
+         q(4447),
          q(0),
          ],
       q(moq) => [
-         q(4447),
+         q(4448),
          q(0),
          ],
       q(mor) => [
-         q(4448),
+         q(4449),
          q(0),
          ],
       q(mos) => [
@@ -75156,567 +75224,567 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mot) => [
-         q(1135),
+         q(1136),
          q(0),
          ],
       q(mou) => [
-         q(4449),
+         q(4450),
          q(0),
          ],
       q(mov) => [
-         q(4450),
+         q(4451),
          q(0),
          ],
       q(mow) => [
-         q(4451),
+         q(4452),
          q(0),
          ],
       q(mox) => [
-         q(4452),
+         q(4453),
          q(0),
          ],
       q(moy) => [
-         q(4453),
+         q(4454),
          q(0),
          ],
       q(moz) => [
-         q(4454),
+         q(4455),
          q(0),
          ],
       q(mpa) => [
-         q(4455),
+         q(4456),
          q(0),
          ],
       q(mpb) => [
-         q(4456),
+         q(4457),
          q(0),
          ],
       q(mpc) => [
-         q(4457),
+         q(4458),
          q(0),
          ],
       q(mpd) => [
-         q(4458),
+         q(4459),
          q(0),
          ],
       q(mpe) => [
-         q(4459),
+         q(4460),
          q(0),
          ],
       q(mpg) => [
-         q(4460),
+         q(4461),
          q(0),
          ],
       q(mph) => [
-         q(4461),
+         q(4462),
          q(0),
          ],
       q(mpi) => [
-         q(4462),
+         q(4463),
          q(0),
          ],
       q(mpj) => [
-         q(4463),
+         q(4464),
          q(0),
          ],
       q(mpk) => [
-         q(4464),
+         q(4465),
          q(0),
          ],
       q(mpl) => [
-         q(4465),
+         q(4466),
          q(0),
          ],
       q(mpm) => [
-         q(4466),
+         q(4467),
          q(0),
          ],
       q(mpn) => [
-         q(4467),
+         q(4468),
          q(0),
          ],
       q(mpo) => [
-         q(4468),
+         q(4469),
          q(0),
          ],
       q(mpp) => [
-         q(4469),
+         q(4470),
          q(0),
          ],
       q(mpq) => [
-         q(4470),
+         q(4471),
          q(0),
          ],
       q(mpr) => [
-         q(4471),
+         q(4472),
          q(0),
          ],
       q(mps) => [
-         q(4472),
+         q(4473),
          q(0),
          ],
       q(mpt) => [
-         q(4473),
+         q(4474),
          q(0),
          ],
       q(mpu) => [
-         q(4474),
+         q(4475),
          q(0),
          ],
       q(mpv) => [
-         q(4475),
+         q(4476),
          q(0),
          ],
       q(mpw) => [
-         q(4476),
+         q(4477),
          q(0),
          ],
       q(mpx) => [
-         q(4477),
+         q(4478),
          q(0),
          ],
       q(mpy) => [
-         q(4478),
+         q(4479),
          q(0),
          ],
       q(mpz) => [
-         q(4479),
+         q(4480),
          q(0),
          ],
       q(mqa) => [
-         q(4480),
+         q(4481),
          q(0),
          ],
       q(mqb) => [
-         q(4481),
+         q(4482),
          q(0),
          ],
       q(mqc) => [
-         q(4482),
+         q(4483),
          q(0),
          ],
       q(mqe) => [
-         q(4483),
+         q(4484),
          q(0),
          ],
       q(mqf) => [
-         q(4484),
+         q(4485),
          q(0),
          ],
       q(mqg) => [
-         q(4485),
+         q(4486),
          q(0),
          ],
       q(mqh) => [
-         q(4486),
+         q(4487),
          q(0),
          ],
       q(mqi) => [
-         q(4487),
+         q(4488),
          q(0),
          ],
       q(mqj) => [
-         q(4488),
+         q(4489),
          q(0),
          ],
       q(mqk) => [
-         q(4489),
+         q(4490),
          q(0),
          ],
       q(mql) => [
-         q(4490),
+         q(4491),
          q(0),
          ],
       q(mqm) => [
-         q(4491),
+         q(4492),
          q(0),
          ],
       q(mqn) => [
-         q(4492),
+         q(4493),
          q(0),
          ],
       q(mqo) => [
-         q(4493),
+         q(4494),
          q(0),
          ],
       q(mqp) => [
-         q(4494),
+         q(4495),
          q(0),
          ],
       q(mqq) => [
-         q(4495),
+         q(4496),
          q(0),
          ],
       q(mqr) => [
-         q(4496),
+         q(4497),
          q(0),
          ],
       q(mqs) => [
-         q(4497),
+         q(4498),
          q(0),
          ],
       q(mqt) => [
-         q(4498),
+         q(4499),
          q(0),
          ],
       q(mqu) => [
-         q(4499),
+         q(4500),
          q(0),
          ],
       q(mqv) => [
-         q(4500),
+         q(4501),
          q(0),
          ],
       q(mqw) => [
-         q(4501),
+         q(4502),
          q(0),
          ],
       q(mqx) => [
-         q(4502),
+         q(4503),
          q(0),
          ],
       q(mqy) => [
-         q(4503),
+         q(4504),
          q(0),
          ],
       q(mqz) => [
-         q(4504),
+         q(4505),
          q(0),
          ],
       q(mra) => [
-         q(4505),
+         q(4506),
          q(0),
          ],
       q(mrb) => [
-         q(4506),
+         q(4507),
          q(0),
          ],
       q(mrc) => [
-         q(4507),
+         q(4508),
          q(0),
          ],
       q(mrd) => [
-         q(4508),
+         q(4509),
          q(0),
          ],
       q(mre) => [
-         q(4509),
+         q(4510),
          q(0),
          ],
       q(mrf) => [
-         q(4510),
+         q(4511),
          q(0),
          ],
       q(mrg) => [
-         q(4511),
+         q(4512),
          q(0),
          ],
       q(mrh) => [
-         q(4512),
+         q(4513),
          q(0),
          ],
       q(mrj) => [
-         q(4513),
+         q(4514),
          q(0),
          ],
       q(mrk) => [
-         q(4514),
+         q(4515),
          q(0),
          ],
       q(mrl) => [
-         q(4515),
+         q(4516),
          q(0),
          ],
       q(mrm) => [
-         q(4516),
+         q(4517),
          q(0),
          ],
       q(mrn) => [
-         q(4517),
+         q(4518),
          q(0),
          ],
       q(mro) => [
-         q(4518),
+         q(4519),
          q(0),
          ],
       q(mrp) => [
-         q(4519),
+         q(4520),
          q(0),
          ],
       q(mrq) => [
-         q(4520),
+         q(4521),
          q(0),
          ],
       q(mrr) => [
-         q(4521),
+         q(4522),
          q(0),
          ],
       q(mrs) => [
-         q(4522),
+         q(4523),
          q(0),
          ],
       q(mrt) => [
-         q(4523),
+         q(4524),
          q(0),
          ],
       q(mru) => [
-         q(4524),
+         q(4525),
          q(0),
          ],
       q(mrv) => [
-         q(4525),
+         q(4526),
          q(0),
          ],
       q(mrw) => [
-         q(4526),
+         q(4527),
          q(0),
          ],
       q(mrx) => [
-         q(4527),
+         q(4528),
          q(0),
          ],
       q(mry) => [
-         q(4528),
+         q(4529),
          q(0),
          ],
       q(mrz) => [
-         q(4529),
+         q(4530),
          q(0),
          ],
       q(msb) => [
-         q(4530),
+         q(4531),
          q(0),
          ],
       q(msc) => [
-         q(4531),
+         q(4532),
          q(0),
          ],
       q(msd) => [
-         q(4532),
+         q(4533),
          q(0),
          ],
       q(mse) => [
-         q(4533),
+         q(4534),
          q(0),
          ],
       q(msf) => [
-         q(4534),
+         q(4535),
          q(0),
          ],
       q(msg) => [
-         q(4535),
+         q(4536),
          q(0),
          ],
       q(msh) => [
-         q(4536),
+         q(4537),
          q(0),
          ],
       q(msi) => [
-         q(4537),
+         q(4538),
          q(0),
          ],
       q(msj) => [
-         q(4538),
+         q(4539),
          q(0),
          ],
       q(msk) => [
-         q(4539),
+         q(4540),
          q(0),
          ],
       q(msl) => [
-         q(4540),
+         q(4541),
          q(0),
          ],
       q(msm) => [
-         q(4541),
+         q(4542),
          q(0),
          ],
       q(msn) => [
-         q(4542),
+         q(4543),
          q(0),
          ],
       q(mso) => [
-         q(4543),
+         q(4544),
          q(0),
          ],
       q(msp) => [
-         q(4544),
+         q(4545),
          q(0),
          ],
       q(msq) => [
-         q(4545),
+         q(4546),
          q(0),
          ],
       q(msr) => [
-         q(4546),
+         q(4547),
          q(0),
          ],
       q(mss) => [
-         q(4547),
+         q(4548),
          q(0),
          ],
       q(msu) => [
-         q(4548),
+         q(4549),
          q(0),
          ],
       q(msv) => [
-         q(4549),
+         q(4550),
          q(0),
          ],
       q(msw) => [
-         q(4550),
+         q(4551),
          q(0),
          ],
       q(msx) => [
-         q(4551),
+         q(4552),
          q(0),
          ],
       q(msy) => [
-         q(4552),
+         q(4553),
          q(0),
          ],
       q(msz) => [
-         q(4553),
+         q(4554),
          q(0),
          ],
       q(mta) => [
-         q(4554),
+         q(4555),
          q(0),
          ],
       q(mtb) => [
-         q(4555),
+         q(4556),
          q(0),
          ],
       q(mtc) => [
-         q(4556),
+         q(4557),
          q(0),
          ],
       q(mtd) => [
-         q(4557),
+         q(4558),
          q(0),
          ],
       q(mte) => [
-         q(4558),
+         q(4559),
          q(0),
          ],
       q(mtf) => [
-         q(4559),
+         q(4560),
          q(0),
          ],
       q(mtg) => [
-         q(4560),
+         q(4561),
          q(0),
          ],
       q(mth) => [
-         q(4561),
+         q(4562),
          q(0),
          ],
       q(mti) => [
-         q(4562),
+         q(4563),
          q(0),
          ],
       q(mtj) => [
-         q(4563),
+         q(4564),
          q(0),
          ],
       q(mtk) => [
-         q(4564),
+         q(4565),
          q(0),
          ],
       q(mtl) => [
-         q(4565),
+         q(4566),
          q(0),
          ],
       q(mtm) => [
-         q(4566),
+         q(4567),
          q(0),
          ],
       q(mtn) => [
-         q(4567),
+         q(4568),
          q(0),
          ],
       q(mto) => [
-         q(4568),
+         q(4569),
          q(0),
          ],
       q(mtp) => [
-         q(4569),
+         q(4570),
          q(0),
          ],
       q(mtq) => [
-         q(4570),
+         q(4571),
          q(0),
          ],
       q(mtr) => [
-         q(4571),
+         q(4572),
          q(0),
          ],
       q(mts) => [
-         q(4572),
+         q(4573),
          q(0),
          ],
       q(mtt) => [
-         q(4573),
+         q(4574),
          q(0),
          ],
       q(mtu) => [
-         q(4574),
+         q(4575),
          q(0),
          ],
       q(mtv) => [
-         q(4575),
+         q(4576),
          q(0),
          ],
       q(mtw) => [
-         q(4576),
+         q(4577),
          q(0),
          ],
       q(mtx) => [
-         q(4577),
+         q(4578),
          q(0),
          ],
       q(mty) => [
-         q(4578),
+         q(4579),
          q(0),
          ],
       q(mua) => [
-         q(4579),
+         q(4580),
          q(0),
          ],
       q(mub) => [
-         q(4580),
+         q(4581),
          q(0),
          ],
       q(muc) => [
-         q(4581),
+         q(4582),
          q(0),
          ],
       q(mud) => [
-         q(4582),
+         q(4583),
          q(0),
          ],
       q(mue) => [
-         q(4583),
+         q(4584),
          q(0),
          ],
       q(mug) => [
-         q(4584),
+         q(4585),
          q(0),
          ],
       q(muh) => [
-         q(4585),
+         q(4586),
          q(0),
          ],
       q(mui) => [
-         q(4586),
+         q(4587),
          q(0),
          ],
       q(muj) => [
-         q(4587),
+         q(4588),
          q(0),
          ],
       q(muk) => [
-         q(4588),
+         q(4589),
          q(0),
          ],
       q(mul) => [
@@ -75724,7 +75792,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mum) => [
-         q(4589),
+         q(4590),
          q(0),
          ],
       q(mun) => [
@@ -75732,19 +75800,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(muo) => [
-         q(4590),
+         q(4591),
          q(0),
          ],
       q(mup) => [
-         q(4591),
+         q(4592),
          q(0),
          ],
       q(muq) => [
-         q(4592),
+         q(4593),
          q(0),
          ],
       q(mur) => [
-         q(4593),
+         q(4594),
          q(0),
          ],
       q(mus) => [
@@ -75752,159 +75820,159 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mut) => [
-         q(4594),
+         q(4595),
          q(0),
          ],
       q(muu) => [
-         q(4595),
+         q(4596),
          q(0),
          ],
       q(muv) => [
-         q(4596),
+         q(4597),
          q(0),
          ],
       q(mux) => [
-         q(4597),
+         q(4598),
          q(0),
          ],
       q(muy) => [
-         q(4598),
+         q(4599),
          q(0),
          ],
       q(muz) => [
-         q(4599),
+         q(4600),
          q(0),
          ],
       q(mva) => [
-         q(4600),
+         q(4601),
          q(0),
          ],
       q(mvb) => [
-         q(4601),
+         q(4602),
          q(0),
          ],
       q(mvd) => [
-         q(4602),
+         q(4603),
          q(0),
          ],
       q(mve) => [
-         q(4603),
+         q(4604),
          q(0),
          ],
       q(mvf) => [
-         q(4604),
+         q(4605),
          q(0),
          ],
       q(mvg) => [
-         q(4605),
+         q(4606),
          q(0),
          ],
       q(mvh) => [
-         q(4606),
+         q(4607),
          q(0),
          ],
       q(mvi) => [
-         q(4607),
+         q(4608),
          q(0),
          ],
       q(mvk) => [
-         q(4608),
+         q(4609),
          q(0),
          ],
       q(mvl) => [
-         q(4609),
+         q(4610),
          q(0),
          ],
       q(mvm) => [
-         q(4610),
+         q(4611),
          q(0),
          ],
       q(mvn) => [
-         q(4611),
+         q(4612),
          q(0),
          ],
       q(mvo) => [
-         q(4612),
+         q(4613),
          q(0),
          ],
       q(mvp) => [
-         q(4613),
+         q(4614),
          q(0),
          ],
       q(mvq) => [
-         q(4614),
+         q(4615),
          q(0),
          ],
       q(mvr) => [
-         q(4615),
+         q(4616),
          q(0),
          ],
       q(mvs) => [
-         q(4616),
+         q(4617),
          q(0),
          ],
       q(mvt) => [
-         q(4617),
+         q(4618),
          q(0),
          ],
       q(mvu) => [
-         q(4618),
+         q(4619),
          q(0),
          ],
       q(mvv) => [
-         q(4619),
+         q(4620),
          q(0),
          ],
       q(mvw) => [
-         q(4620),
+         q(4621),
          q(0),
          ],
       q(mvx) => [
-         q(4621),
+         q(4622),
          q(0),
          ],
       q(mvy) => [
-         q(4622),
+         q(4623),
          q(0),
          ],
       q(mvz) => [
-         q(4623),
+         q(4624),
          q(0),
          ],
       q(mwa) => [
-         q(4624),
+         q(4625),
          q(0),
          ],
       q(mwb) => [
-         q(4625),
+         q(4626),
          q(0),
          ],
       q(mwc) => [
-         q(4626),
+         q(4627),
          q(0),
          ],
       q(mwe) => [
-         q(4627),
+         q(4628),
          q(0),
          ],
       q(mwf) => [
-         q(4628),
+         q(4629),
          q(0),
          ],
       q(mwg) => [
-         q(4629),
+         q(4630),
          q(0),
          ],
       q(mwh) => [
-         q(4630),
+         q(4631),
          q(0),
          ],
       q(mwi) => [
-         q(4631),
+         q(4632),
          q(0),
          ],
       q(mwk) => [
-         q(4632),
+         q(4633),
          q(0),
          ],
       q(mwl) => [
@@ -75912,23 +75980,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mwm) => [
-         q(4633),
+         q(4634),
          q(0),
          ],
       q(mwn) => [
-         q(4634),
+         q(4635),
          q(0),
          ],
       q(mwo) => [
-         q(4635),
+         q(4636),
          q(0),
          ],
       q(mwp) => [
-         q(4636),
+         q(4637),
          q(0),
          ],
       q(mwq) => [
-         q(4637),
+         q(4638),
          q(0),
          ],
       q(mwr) => [
@@ -75936,187 +76004,187 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(mws) => [
-         q(4638),
+         q(4639),
          q(0),
          ],
       q(mwt) => [
-         q(4639),
+         q(4640),
          q(0),
          ],
       q(mwu) => [
-         q(4640),
+         q(4641),
          q(0),
          ],
       q(mwv) => [
-         q(4641),
+         q(4642),
          q(0),
          ],
       q(mww) => [
-         q(4642),
+         q(4643),
          q(0),
          ],
       q(mwx) => [
-         q(4643),
+         q(4644),
          q(0),
          ],
       q(mwy) => [
-         q(4644),
+         q(4645),
          q(0),
          ],
       q(mwz) => [
-         q(4645),
+         q(4646),
          q(0),
          ],
       q(mxa) => [
-         q(4646),
+         q(4647),
          q(0),
          ],
       q(mxb) => [
-         q(4647),
+         q(4648),
          q(0),
          ],
       q(mxc) => [
-         q(4648),
+         q(4649),
          q(0),
          ],
       q(mxd) => [
-         q(4649),
+         q(4650),
          q(0),
          ],
       q(mxe) => [
-         q(4650),
+         q(4651),
          q(0),
          ],
       q(mxf) => [
-         q(4651),
+         q(4652),
          q(0),
          ],
       q(mxg) => [
-         q(4652),
+         q(4653),
          q(0),
          ],
       q(mxh) => [
-         q(4653),
+         q(4654),
          q(0),
          ],
       q(mxi) => [
-         q(4654),
+         q(4655),
          q(0),
          ],
       q(mxj) => [
-         q(4655),
+         q(4656),
          q(0),
          ],
       q(mxk) => [
-         q(4656),
+         q(4657),
          q(0),
          ],
       q(mxl) => [
-         q(4657),
+         q(4658),
          q(0),
          ],
       q(mxm) => [
-         q(4658),
+         q(4659),
          q(0),
          ],
       q(mxn) => [
-         q(4659),
+         q(4660),
          q(0),
          ],
       q(mxo) => [
-         q(4660),
+         q(4661),
          q(0),
          ],
       q(mxp) => [
-         q(4661),
+         q(4662),
          q(0),
          ],
       q(mxq) => [
-         q(4662),
+         q(4663),
          q(0),
          ],
       q(mxr) => [
-         q(4663),
+         q(4664),
          q(0),
          ],
       q(mxs) => [
-         q(4664),
+         q(4665),
          q(0),
          ],
       q(mxt) => [
-         q(4665),
+         q(4666),
          q(0),
          ],
       q(mxu) => [
-         q(4666),
+         q(4667),
          q(0),
          ],
       q(mxv) => [
-         q(4667),
+         q(4668),
          q(0),
          ],
       q(mxw) => [
-         q(4668),
+         q(4669),
          q(0),
          ],
       q(mxx) => [
-         q(4669),
+         q(4670),
          q(0),
          ],
       q(mxy) => [
-         q(4670),
+         q(4671),
          q(0),
          ],
       q(mxz) => [
-         q(4671),
+         q(4672),
          q(0),
          ],
       q(myb) => [
-         q(4672),
+         q(4673),
          q(0),
          ],
       q(myc) => [
-         q(4673),
+         q(4674),
          q(0),
          ],
       q(myd) => [
-         q(4674),
+         q(4675),
          q(0),
          ],
       q(mye) => [
-         q(4675),
+         q(4676),
          q(0),
          ],
       q(myf) => [
-         q(4676),
+         q(4677),
          q(0),
          ],
       q(myg) => [
-         q(4677),
+         q(4678),
          q(0),
          ],
       q(myh) => [
-         q(4678),
+         q(4679),
          q(0),
          ],
       q(myi) => [
-         q(4679),
+         q(4680),
          q(0),
          ],
       q(myj) => [
-         q(4680),
+         q(4681),
          q(0),
          ],
       q(myk) => [
-         q(4681),
+         q(4682),
          q(0),
          ],
       q(myl) => [
-         q(4682),
+         q(4683),
          q(0),
          ],
       q(mym) => [
-         q(4683),
+         q(4684),
          q(0),
          ],
       q(myn) => [
@@ -76124,23 +76192,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(myo) => [
-         q(4684),
+         q(4685),
          q(0),
          ],
       q(myp) => [
-         q(4685),
+         q(4686),
          q(0),
          ],
       q(myr) => [
-         q(4686),
+         q(4687),
          q(0),
          ],
       q(mys) => [
-         q(4687),
+         q(4688),
          q(0),
          ],
       q(myu) => [
-         q(4688),
+         q(4689),
          q(0),
          ],
       q(myv) => [
@@ -76148,147 +76216,147 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(myw) => [
-         q(4689),
+         q(4690),
          q(0),
          ],
       q(myx) => [
-         q(4690),
+         q(4691),
          q(0),
          ],
       q(myy) => [
-         q(4691),
+         q(4692),
          q(0),
          ],
       q(myz) => [
-         q(4692),
+         q(4693),
          q(0),
          ],
       q(mza) => [
-         q(4693),
+         q(4694),
          q(0),
          ],
       q(mzb) => [
-         q(4694),
+         q(4695),
          q(0),
          ],
       q(mzc) => [
-         q(4695),
+         q(4696),
          q(0),
          ],
       q(mzd) => [
-         q(4696),
+         q(4697),
          q(0),
          ],
       q(mze) => [
-         q(4697),
+         q(4698),
          q(0),
          ],
       q(mzg) => [
-         q(4698),
+         q(4699),
          q(0),
          ],
       q(mzh) => [
-         q(4699),
+         q(4700),
          q(0),
          ],
       q(mzi) => [
-         q(4700),
+         q(4701),
          q(0),
          ],
       q(mzj) => [
-         q(4701),
+         q(4702),
          q(0),
          ],
       q(mzk) => [
-         q(4702),
+         q(4703),
          q(0),
          ],
       q(mzl) => [
-         q(4703),
+         q(4704),
          q(0),
          ],
       q(mzm) => [
-         q(4704),
+         q(4705),
          q(0),
          ],
       q(mzn) => [
-         q(4705),
+         q(4706),
          q(0),
          ],
       q(mzo) => [
-         q(4706),
+         q(4707),
          q(0),
          ],
       q(mzp) => [
-         q(4707),
+         q(4708),
          q(0),
          ],
       q(mzq) => [
-         q(4708),
+         q(4709),
          q(0),
          ],
       q(mzr) => [
-         q(4709),
+         q(4710),
          q(0),
          ],
       q(mzs) => [
-         q(4710),
+         q(4711),
          q(0),
          ],
       q(mzt) => [
-         q(4711),
+         q(4712),
          q(0),
          ],
       q(mzu) => [
-         q(4712),
+         q(4713),
          q(0),
          ],
       q(mzv) => [
-         q(4713),
+         q(4714),
          q(0),
          ],
       q(mzw) => [
-         q(4714),
+         q(4715),
          q(0),
          ],
       q(mzx) => [
-         q(4715),
+         q(4716),
          q(0),
          ],
       q(mzy) => [
-         q(4716),
+         q(4717),
          q(0),
          ],
       q(mzz) => [
-         q(4717),
+         q(4718),
          q(0),
          ],
       q(naa) => [
-         q(4718),
+         q(4719),
          q(0),
          ],
       q(nab) => [
-         q(4719),
+         q(4720),
          q(0),
          ],
       q(nac) => [
-         q(4720),
+         q(4721),
          q(0),
          ],
       q(nad) => [
-         q(4721),
+         q(4722),
          q(0),
          ],
       q(nae) => [
-         q(4722),
+         q(4723),
          q(0),
          ],
       q(naf) => [
-         q(4723),
+         q(4724),
          q(0),
          ],
       q(nag) => [
-         q(4724),
+         q(4725),
          q(0),
          ],
       q(nah) => [
@@ -76300,27 +76368,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(naj) => [
-         q(4725),
+         q(4726),
          q(0),
          ],
       q(nak) => [
-         q(4726),
+         q(4727),
          q(0),
          ],
       q(nal) => [
-         q(4727),
+         q(4728),
          q(0),
          ],
       q(nam) => [
-         q(4728),
+         q(4729),
          q(0),
          ],
       q(nan) => [
-         q(4729),
+         q(4730),
          q(0),
          ],
       q(nao) => [
-         q(4730),
+         q(4731),
          q(0),
          ],
       q(nap) => [
@@ -76328,19 +76396,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(naq) => [
-         q(4731),
+         q(4732),
          q(0),
          ],
       q(nar) => [
-         q(4732),
+         q(4733),
          q(0),
          ],
       q(nas) => [
-         q(4733),
+         q(4734),
          q(0),
          ],
       q(nat) => [
-         q(4734),
+         q(4735),
          q(0),
          ],
       q(nau) => [
@@ -76352,59 +76420,59 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(naw) => [
-         q(4735),
+         q(4736),
          q(0),
          ],
       q(nax) => [
-         q(4736),
+         q(4737),
          q(0),
          ],
       q(nay) => [
-         q(4737),
+         q(4738),
          q(0),
          ],
       q(naz) => [
-         q(4738),
+         q(4739),
          q(0),
          ],
       q(nba) => [
-         q(4739),
+         q(4740),
          q(0),
          ],
       q(nbb) => [
-         q(4740),
+         q(4741),
          q(0),
          ],
       q(nbc) => [
-         q(4741),
+         q(4742),
          q(0),
          ],
       q(nbd) => [
-         q(4742),
+         q(4743),
          q(0),
          ],
       q(nbe) => [
-         q(4743),
+         q(4744),
          q(0),
          ],
       q(nbg) => [
-         q(4744),
+         q(4745),
          q(0),
          ],
       q(nbh) => [
-         q(4745),
+         q(4746),
          q(0),
          ],
       q(nbi) => [
-         q(4746),
+         q(4747),
          q(0),
          ],
       q(nbj) => [
-         q(4747),
+         q(4748),
          q(0),
          ],
       q(nbk) => [
-         q(4748),
+         q(4749),
          q(0),
          ],
       q(nbl) => [
@@ -76412,155 +76480,155 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nbm) => [
-         q(4749),
+         q(4750),
          q(0),
          ],
       q(nbn) => [
-         q(4750),
+         q(4751),
          q(0),
          ],
       q(nbo) => [
-         q(4751),
+         q(4752),
          q(0),
          ],
       q(nbp) => [
-         q(4752),
+         q(4753),
          q(0),
          ],
       q(nbq) => [
-         q(4753),
+         q(4754),
          q(0),
          ],
       q(nbr) => [
-         q(4754),
+         q(4755),
          q(0),
          ],
       q(nbs) => [
-         q(4755),
+         q(4756),
          q(0),
          ],
       q(nbt) => [
-         q(4756),
+         q(4757),
          q(0),
          ],
       q(nbu) => [
-         q(4757),
+         q(4758),
          q(0),
          ],
       q(nbv) => [
-         q(4758),
+         q(4759),
          q(0),
          ],
       q(nbw) => [
-         q(4759),
+         q(4760),
          q(0),
          ],
       q(nby) => [
-         q(4760),
+         q(4761),
          q(0),
          ],
       q(nca) => [
-         q(4761),
+         q(4762),
          q(0),
          ],
       q(ncb) => [
-         q(4762),
+         q(4763),
          q(0),
          ],
       q(ncc) => [
-         q(4763),
+         q(4764),
          q(0),
          ],
       q(ncd) => [
-         q(4764),
+         q(4765),
          q(0),
          ],
       q(nce) => [
-         q(4765),
+         q(4766),
          q(0),
          ],
       q(ncf) => [
-         q(4766),
+         q(4767),
          q(0),
          ],
       q(ncg) => [
-         q(4767),
+         q(4768),
          q(0),
          ],
       q(nch) => [
-         q(4768),
+         q(4769),
          q(0),
          ],
       q(nci) => [
-         q(4769),
+         q(4770),
          q(0),
          ],
       q(ncj) => [
-         q(4770),
+         q(4771),
          q(0),
          ],
       q(nck) => [
-         q(4771),
+         q(4772),
          q(0),
          ],
       q(ncl) => [
-         q(4772),
+         q(4773),
          q(0),
          ],
       q(ncm) => [
-         q(4773),
+         q(4774),
          q(0),
          ],
       q(ncn) => [
-         q(4774),
+         q(4775),
          q(0),
          ],
       q(nco) => [
-         q(4775),
+         q(4776),
          q(0),
          ],
       q(ncp) => [
-         q(4776),
+         q(4777),
          q(0),
          ],
       q(ncr) => [
-         q(4777),
+         q(4778),
          q(0),
          ],
       q(ncs) => [
-         q(4778),
+         q(4779),
          q(0),
          ],
       q(nct) => [
-         q(4779),
+         q(4780),
          q(0),
          ],
       q(ncu) => [
-         q(4780),
+         q(4781),
          q(0),
          ],
       q(ncx) => [
-         q(4781),
+         q(4782),
          q(0),
          ],
       q(ncz) => [
-         q(4782),
+         q(4783),
          q(0),
          ],
       q(nda) => [
-         q(4783),
+         q(4784),
          q(0),
          ],
       q(ndb) => [
-         q(4784),
+         q(4785),
          q(0),
          ],
       q(ndc) => [
-         q(4785),
+         q(4786),
          q(0),
          ],
       q(ndd) => [
-         q(4786),
+         q(4787),
          q(0),
          ],
       q(nde) => [
@@ -76568,39 +76636,39 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ndf) => [
-         q(4787),
+         q(4788),
          q(0),
          ],
       q(ndg) => [
-         q(4788),
+         q(4789),
          q(0),
          ],
       q(ndh) => [
-         q(4789),
+         q(4790),
          q(0),
          ],
       q(ndi) => [
-         q(4790),
+         q(4791),
          q(0),
          ],
       q(ndj) => [
-         q(4791),
+         q(4792),
          q(0),
          ],
       q(ndk) => [
-         q(4792),
+         q(4793),
          q(0),
          ],
       q(ndl) => [
-         q(4793),
+         q(4794),
          q(0),
          ],
       q(ndm) => [
-         q(4794),
+         q(4795),
          q(0),
          ],
       q(ndn) => [
-         q(4795),
+         q(4796),
          q(0),
          ],
       q(ndo) => [
@@ -76608,15 +76676,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ndp) => [
-         q(4796),
+         q(4797),
          q(0),
          ],
       q(ndq) => [
-         q(4797),
+         q(4798),
          q(0),
          ],
       q(ndr) => [
-         q(4798),
+         q(4799),
          q(0),
          ],
       q(nds) => [
@@ -76624,87 +76692,87 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ndt) => [
-         q(4799),
+         q(4800),
          q(0),
          ],
       q(ndu) => [
-         q(4800),
+         q(4801),
          q(0),
          ],
       q(ndv) => [
-         q(4801),
+         q(4802),
          q(0),
          ],
       q(ndw) => [
-         q(4802),
+         q(4803),
          q(0),
          ],
       q(ndx) => [
-         q(4803),
+         q(4804),
          q(0),
          ],
       q(ndy) => [
-         q(4804),
+         q(4805),
          q(0),
          ],
       q(ndz) => [
-         q(4805),
+         q(4806),
          q(0),
          ],
       q(nea) => [
-         q(4806),
+         q(4807),
          q(0),
          ],
       q(neb) => [
-         q(4807),
+         q(4808),
          q(0),
          ],
       q(nec) => [
-         q(4808),
+         q(4809),
          q(0),
          ],
       q(ned) => [
-         q(4809),
+         q(4810),
          q(0),
          ],
       q(nee) => [
-         q(4810),
+         q(4811),
          q(0),
          ],
       q(nef) => [
-         q(4811),
+         q(4812),
          q(0),
          ],
       q(neg) => [
-         q(4812),
+         q(4813),
          q(0),
          ],
       q(neh) => [
-         q(4813),
+         q(4814),
          q(0),
          ],
       q(nei) => [
-         q(4814),
+         q(4815),
          q(0),
          ],
       q(nej) => [
-         q(4815),
+         q(4816),
          q(0),
          ],
       q(nek) => [
-         q(4816),
+         q(4817),
          q(0),
          ],
       q(nem) => [
-         q(4817),
+         q(4818),
          q(0),
          ],
       q(nen) => [
-         q(4818),
+         q(4819),
          q(0),
          ],
       q(neo) => [
-         q(4819),
+         q(4820),
          q(0),
          ],
       q(nep) => [
@@ -76712,27 +76780,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(neq) => [
-         q(4820),
+         q(4821),
          q(0),
          ],
       q(ner) => [
-         q(4821),
+         q(4822),
          q(0),
          ],
       q(nes) => [
-         q(4822),
+         q(4823),
          q(0),
          ],
       q(net) => [
-         q(4823),
+         q(4824),
          q(0),
          ],
       q(neu) => [
-         q(4824),
+         q(4825),
          q(0),
          ],
       q(nev) => [
-         q(4825),
+         q(4826),
          q(0),
          ],
       q(new) => [
@@ -76740,55 +76808,55 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(nex) => [
-         q(4826),
+         q(4827),
          q(0),
          ],
       q(ney) => [
-         q(4827),
+         q(4828),
          q(0),
          ],
       q(nez) => [
-         q(4828),
+         q(4829),
          q(0),
          ],
       q(nfa) => [
-         q(4829),
+         q(4830),
          q(0),
          ],
       q(nfd) => [
-         q(4830),
+         q(4831),
          q(0),
          ],
       q(nfl) => [
-         q(4831),
+         q(4832),
          q(0),
          ],
       q(nfr) => [
-         q(4832),
+         q(4833),
          q(0),
          ],
       q(nfu) => [
-         q(4833),
+         q(4834),
          q(0),
          ],
       q(nga) => [
-         q(4834),
+         q(4835),
          q(0),
          ],
       q(ngb) => [
-         q(4835),
+         q(4836),
          q(0),
          ],
       q(ngc) => [
-         q(4836),
+         q(4837),
          q(0),
          ],
       q(ngd) => [
-         q(4837),
+         q(4838),
          q(0),
          ],
       q(nge) => [
-         q(4838),
+         q(4839),
          q(0),
          ],
       q(ngf) => [
@@ -76796,175 +76864,175 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ngg) => [
-         q(4839),
+         q(4840),
          q(0),
          ],
       q(ngh) => [
-         q(4840),
+         q(4841),
          q(0),
          ],
       q(ngi) => [
-         q(4841),
+         q(4842),
          q(0),
          ],
       q(ngj) => [
-         q(4842),
+         q(4843),
          q(0),
          ],
       q(ngk) => [
-         q(4843),
+         q(4844),
          q(0),
          ],
       q(ngl) => [
-         q(4844),
+         q(4845),
          q(0),
          ],
       q(ngm) => [
-         q(4845),
+         q(4846),
          q(0),
          ],
       q(ngn) => [
-         q(4846),
+         q(4847),
          q(0),
          ],
       q(ngo) => [
-         q(4847),
+         q(4848),
          q(0),
          ],
       q(ngp) => [
-         q(4848),
+         q(4849),
          q(0),
          ],
       q(ngq) => [
-         q(4849),
+         q(4850),
          q(0),
          ],
       q(ngr) => [
-         q(4850),
+         q(4851),
          q(0),
          ],
       q(ngs) => [
-         q(4851),
+         q(4852),
          q(0),
          ],
       q(ngt) => [
-         q(4852),
+         q(4853),
          q(0),
          ],
       q(ngu) => [
-         q(4853),
+         q(4854),
          q(0),
          ],
       q(ngv) => [
-         q(4854),
+         q(4855),
          q(0),
          ],
       q(ngw) => [
-         q(4855),
+         q(4856),
          q(0),
          ],
       q(ngx) => [
-         q(4856),
+         q(4857),
          q(0),
          ],
       q(ngy) => [
-         q(4857),
+         q(4858),
          q(0),
          ],
       q(ngz) => [
-         q(4858),
+         q(4859),
          q(0),
          ],
       q(nha) => [
-         q(4859),
+         q(4860),
          q(0),
          ],
       q(nhb) => [
-         q(4860),
+         q(4861),
          q(0),
          ],
       q(nhc) => [
-         q(4861),
+         q(4862),
          q(0),
          ],
       q(nhd) => [
-         q(4862),
+         q(4863),
          q(0),
          ],
       q(nhe) => [
-         q(4863),
+         q(4864),
          q(0),
          ],
       q(nhf) => [
-         q(4864),
+         q(4865),
          q(0),
          ],
       q(nhg) => [
-         q(4865),
+         q(4866),
          q(0),
          ],
       q(nhh) => [
-         q(4866),
+         q(4867),
          q(0),
          ],
       q(nhi) => [
-         q(4867),
+         q(4868),
          q(0),
          ],
       q(nhk) => [
-         q(4868),
+         q(4869),
          q(0),
          ],
       q(nhm) => [
-         q(4869),
+         q(4870),
          q(0),
          ],
       q(nhn) => [
-         q(4870),
+         q(4871),
          q(0),
          ],
       q(nho) => [
-         q(4871),
+         q(4872),
          q(0),
          ],
       q(nhp) => [
-         q(4872),
+         q(4873),
          q(0),
          ],
       q(nhq) => [
-         q(4873),
+         q(4874),
          q(0),
          ],
       q(nhr) => [
-         q(4874),
+         q(4875),
          q(0),
          ],
       q(nht) => [
-         q(4875),
+         q(4876),
          q(0),
          ],
       q(nhu) => [
-         q(4876),
+         q(4877),
          q(0),
          ],
       q(nhv) => [
-         q(4877),
+         q(4878),
          q(0),
          ],
       q(nhw) => [
-         q(4878),
+         q(4879),
          q(0),
          ],
       q(nhx) => [
-         q(4879),
+         q(4880),
          q(0),
          ],
       q(nhy) => [
-         q(4880),
+         q(4881),
          q(0),
          ],
       q(nhz) => [
-         q(4881),
+         q(4882),
          q(0),
          ],
       q(nia) => [
@@ -76972,7 +77040,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nib) => [
-         q(4882),
+         q(4883),
          q(0),
          ],
       q(nic) => [
@@ -76980,67 +77048,67 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nid) => [
-         q(4883),
+         q(4884),
          q(0),
          ],
       q(nie) => [
-         q(4884),
+         q(4885),
          q(0),
          ],
       q(nif) => [
-         q(4885),
+         q(4886),
          q(0),
          ],
       q(nig) => [
-         q(4886),
+         q(4887),
          q(0),
          ],
       q(nih) => [
-         q(4887),
+         q(4888),
          q(0),
          ],
       q(nii) => [
-         q(4888),
+         q(4889),
          q(0),
          ],
       q(nij) => [
-         q(4889),
+         q(4890),
          q(0),
          ],
       q(nik) => [
-         q(4890),
+         q(4891),
          q(0),
          ],
       q(nil) => [
-         q(4891),
+         q(4892),
          q(0),
          ],
       q(nim) => [
-         q(4892),
+         q(4893),
          q(0),
          ],
       q(nin) => [
-         q(4893),
+         q(4894),
          q(0),
          ],
       q(nio) => [
-         q(4894),
+         q(4895),
          q(0),
          ],
       q(niq) => [
-         q(4895),
+         q(4896),
          q(0),
          ],
       q(nir) => [
-         q(4896),
+         q(4897),
          q(0),
          ],
       q(nis) => [
-         q(4897),
+         q(4898),
          q(0),
          ],
       q(nit) => [
-         q(4898),
+         q(4899),
          q(0),
          ],
       q(niu) => [
@@ -77048,411 +77116,411 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(niv) => [
-         q(4899),
+         q(4900),
          q(0),
          ],
       q(niw) => [
-         q(4900),
+         q(4901),
          q(0),
          ],
       q(nix) => [
-         q(4901),
+         q(4902),
          q(0),
          ],
       q(niy) => [
-         q(4902),
+         q(4903),
          q(0),
          ],
       q(niz) => [
-         q(4903),
+         q(4904),
          q(0),
          ],
       q(nja) => [
-         q(4904),
+         q(4905),
          q(0),
          ],
       q(njb) => [
-         q(4905),
+         q(4906),
          q(0),
          ],
       q(njd) => [
-         q(4906),
+         q(4907),
          q(0),
          ],
       q(njh) => [
-         q(4907),
+         q(4908),
          q(0),
          ],
       q(nji) => [
-         q(4908),
+         q(4909),
          q(0),
          ],
       q(njj) => [
-         q(4909),
+         q(4910),
          q(0),
          ],
       q(njl) => [
-         q(4910),
+         q(4911),
          q(0),
          ],
       q(njm) => [
-         q(4911),
+         q(4912),
          q(0),
          ],
       q(njn) => [
-         q(4912),
+         q(4913),
          q(0),
          ],
       q(njo) => [
-         q(4913),
+         q(4914),
          q(0),
          ],
       q(njr) => [
-         q(4914),
+         q(4915),
          q(0),
          ],
       q(njs) => [
-         q(4915),
+         q(4916),
          q(0),
          ],
       q(njt) => [
-         q(4916),
+         q(4917),
          q(0),
          ],
       q(nju) => [
-         q(4917),
+         q(4918),
          q(0),
          ],
       q(njx) => [
-         q(4918),
+         q(4919),
          q(0),
          ],
       q(njy) => [
-         q(4919),
+         q(4920),
          q(0),
          ],
       q(njz) => [
-         q(4920),
+         q(4921),
          q(0),
          ],
       q(nka) => [
-         q(4921),
+         q(4922),
          q(0),
          ],
       q(nkb) => [
-         q(4922),
+         q(4923),
          q(0),
          ],
       q(nkc) => [
-         q(4923),
+         q(4924),
          q(0),
          ],
       q(nkd) => [
-         q(4924),
+         q(4925),
          q(0),
          ],
       q(nke) => [
-         q(4925),
+         q(4926),
          q(0),
          ],
       q(nkf) => [
-         q(4926),
+         q(4927),
          q(0),
          ],
       q(nkg) => [
-         q(4927),
+         q(4928),
          q(0),
          ],
       q(nkh) => [
-         q(4928),
+         q(4929),
          q(0),
          ],
       q(nki) => [
-         q(4929),
+         q(4930),
          q(0),
          ],
       q(nkj) => [
-         q(4930),
+         q(4931),
          q(0),
          ],
       q(nkk) => [
-         q(4931),
+         q(4932),
          q(0),
          ],
       q(nkm) => [
-         q(4932),
+         q(4933),
          q(0),
          ],
       q(nkn) => [
-         q(4933),
+         q(4934),
          q(0),
          ],
       q(nko) => [
-         q(4934),
+         q(4935),
          q(0),
          ],
       q(nkp) => [
-         q(4935),
+         q(4936),
          q(0),
          ],
       q(nkq) => [
-         q(4936),
+         q(4937),
          q(0),
          ],
       q(nkr) => [
-         q(4937),
+         q(4938),
          q(0),
          ],
       q(nks) => [
-         q(4938),
+         q(4939),
          q(0),
          ],
       q(nkt) => [
-         q(4939),
+         q(4940),
          q(0),
          ],
       q(nku) => [
-         q(4940),
+         q(4941),
          q(0),
          ],
       q(nkv) => [
-         q(4941),
+         q(4942),
          q(0),
          ],
       q(nkw) => [
-         q(4942),
+         q(4943),
          q(0),
          ],
       q(nkx) => [
-         q(4943),
+         q(4944),
          q(0),
          ],
       q(nkz) => [
-         q(4944),
+         q(4945),
          q(0),
          ],
       q(nla) => [
-         q(4945),
+         q(4946),
          q(0),
          ],
       q(nlc) => [
-         q(4946),
+         q(4947),
          q(0),
          ],
       q(nle) => [
-         q(4947),
+         q(4948),
          q(0),
          ],
       q(nlg) => [
-         q(4948),
+         q(4949),
          q(0),
          ],
       q(nli) => [
-         q(4949),
+         q(4950),
          q(0),
          ],
       q(nlj) => [
-         q(4950),
+         q(4951),
          q(0),
          ],
       q(nlk) => [
-         q(4951),
+         q(4952),
          q(0),
          ],
       q(nll) => [
-         q(4952),
+         q(4953),
          q(0),
          ],
       q(nlo) => [
-         q(4953),
+         q(4954),
          q(0),
          ],
       q(nlq) => [
-         q(4954),
+         q(4955),
          q(0),
          ],
       q(nlu) => [
-         q(4955),
+         q(4956),
          q(0),
          ],
       q(nlv) => [
-         q(4956),
+         q(4957),
          q(0),
          ],
       q(nlw) => [
-         q(4957),
+         q(4958),
          q(0),
          ],
       q(nlx) => [
-         q(4958),
+         q(4959),
          q(0),
          ],
       q(nly) => [
-         q(4959),
+         q(4960),
          q(0),
          ],
       q(nlz) => [
-         q(4960),
+         q(4961),
          q(0),
          ],
       q(nma) => [
-         q(4961),
+         q(4962),
          q(0),
          ],
       q(nmb) => [
-         q(4962),
+         q(4963),
          q(0),
          ],
       q(nmc) => [
-         q(4963),
+         q(4964),
          q(0),
          ],
       q(nmd) => [
-         q(4964),
+         q(4965),
          q(0),
          ],
       q(nme) => [
-         q(4965),
+         q(4966),
          q(0),
          ],
       q(nmf) => [
-         q(4966),
+         q(4967),
          q(0),
          ],
       q(nmg) => [
-         q(4967),
+         q(4968),
          q(0),
          ],
       q(nmh) => [
-         q(4968),
+         q(4969),
          q(0),
          ],
       q(nmi) => [
-         q(4969),
+         q(4970),
          q(0),
          ],
       q(nmj) => [
-         q(4970),
+         q(4971),
          q(0),
          ],
       q(nmk) => [
-         q(4971),
+         q(4972),
          q(0),
          ],
       q(nml) => [
-         q(4972),
+         q(4973),
          q(0),
          ],
       q(nmm) => [
-         q(4973),
+         q(4974),
          q(0),
          ],
       q(nmn) => [
-         q(4974),
+         q(4975),
          q(0),
          ],
       q(nmo) => [
-         q(4975),
+         q(4976),
          q(0),
          ],
       q(nmp) => [
-         q(4976),
+         q(4977),
          q(0),
          ],
       q(nmq) => [
-         q(4977),
+         q(4978),
          q(0),
          ],
       q(nmr) => [
-         q(4978),
+         q(4979),
          q(0),
          ],
       q(nms) => [
-         q(4979),
+         q(4980),
          q(0),
          ],
       q(nmt) => [
-         q(4980),
+         q(4981),
          q(0),
          ],
       q(nmu) => [
-         q(4981),
+         q(4982),
          q(0),
          ],
       q(nmv) => [
-         q(4982),
+         q(4983),
          q(0),
          ],
       q(nmw) => [
-         q(4983),
+         q(4984),
          q(0),
          ],
       q(nmx) => [
-         q(4984),
+         q(4985),
          q(0),
          ],
       q(nmy) => [
-         q(4985),
+         q(4986),
          q(0),
          ],
       q(nmz) => [
-         q(4986),
+         q(4987),
          q(0),
          ],
       q(nna) => [
-         q(4987),
+         q(4988),
          q(0),
          ],
       q(nnb) => [
-         q(4988),
+         q(4989),
          q(0),
          ],
       q(nnc) => [
-         q(4989),
+         q(4990),
          q(0),
          ],
       q(nnd) => [
-         q(4990),
+         q(4991),
          q(0),
          ],
       q(nne) => [
-         q(4991),
+         q(4992),
          q(0),
          ],
       q(nnf) => [
-         q(4992),
+         q(4993),
          q(0),
          ],
       q(nng) => [
-         q(4993),
+         q(4994),
          q(0),
          ],
       q(nnh) => [
-         q(4994),
+         q(4995),
          q(0),
          ],
       q(nni) => [
-         q(4995),
+         q(4996),
          q(0),
          ],
       q(nnj) => [
-         q(4996),
+         q(4997),
          q(0),
          ],
       q(nnk) => [
-         q(4997),
+         q(4998),
          q(0),
          ],
       q(nnl) => [
-         q(4998),
+         q(4999),
          q(0),
          ],
       q(nnm) => [
-         q(4999),
+         q(5000),
          q(0),
          ],
       q(nnn) => [
-         q(5000),
+         q(5001),
          q(0),
          ],
       q(nno) => [
@@ -77460,47 +77528,47 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nnp) => [
-         q(5001),
+         q(5002),
          q(0),
          ],
       q(nnq) => [
-         q(5002),
+         q(5003),
          q(0),
          ],
       q(nnr) => [
-         q(5003),
+         q(5004),
          q(0),
          ],
       q(nns) => [
-         q(5004),
+         q(5005),
          q(0),
          ],
       q(nnt) => [
-         q(5005),
+         q(5006),
          q(0),
          ],
       q(nnu) => [
-         q(5006),
+         q(5007),
          q(0),
          ],
       q(nnv) => [
-         q(5007),
+         q(5008),
          q(0),
          ],
       q(nnw) => [
-         q(5008),
+         q(5009),
          q(0),
          ],
       q(nny) => [
-         q(5009),
+         q(5010),
          q(0),
          ],
       q(nnz) => [
-         q(5010),
+         q(5011),
          q(0),
          ],
       q(noa) => [
-         q(5011),
+         q(5012),
          q(0),
          ],
       q(nob) => [
@@ -77508,19 +77576,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(noc) => [
-         q(5012),
+         q(5013),
          q(0),
          ],
       q(nod) => [
-         q(5013),
+         q(5014),
          q(0),
          ],
       q(noe) => [
-         q(5014),
+         q(5015),
          q(0),
          ],
       q(nof) => [
-         q(5015),
+         q(5016),
          q(0),
          ],
       q(nog) => [
@@ -77528,27 +77596,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(noh) => [
-         q(5016),
+         q(5017),
          q(0),
          ],
       q(noi) => [
-         q(5017),
+         q(5018),
          q(0),
          ],
       q(noj) => [
-         q(5018),
+         q(5019),
          q(0),
          ],
       q(nok) => [
-         q(5019),
+         q(5020),
          q(0),
          ],
       q(nol) => [
-         q(5020),
+         q(5021),
          q(0),
          ],
       q(nom) => [
-         q(5021),
+         q(5022),
          q(0),
          ],
       q(non) => [
@@ -77556,11 +77624,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(nop) => [
-         q(5022),
+         q(5023),
          q(0),
          ],
       q(noq) => [
-         q(5023),
+         q(5024),
          q(0),
          ],
       q(nor) => [
@@ -77568,91 +77636,91 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nos) => [
-         q(5024),
+         q(5025),
          q(0),
          ],
       q(not) => [
-         q(5025),
+         q(5026),
          q(0),
          ],
       q(nou) => [
-         q(5026),
+         q(5027),
          q(0),
          ],
       q(nov) => [
-         q(5027),
+         q(5028),
          q(0),
          ],
       q(now) => [
-         q(5028),
+         q(5029),
          q(0),
          ],
       q(noy) => [
-         q(5029),
+         q(5030),
          q(0),
          ],
       q(noz) => [
-         q(5030),
+         q(5031),
          q(0),
          ],
       q(npa) => [
-         q(5031),
+         q(5032),
          q(0),
          ],
       q(npb) => [
-         q(5032),
+         q(5033),
          q(0),
          ],
       q(npg) => [
-         q(5033),
+         q(5034),
          q(0),
          ],
       q(nph) => [
-         q(5034),
+         q(5035),
          q(0),
          ],
       q(npi) => [
-         q(5035),
+         q(5036),
          q(0),
          ],
       q(npl) => [
-         q(5036),
+         q(5037),
          q(0),
          ],
       q(npn) => [
-         q(5037),
+         q(5038),
          q(0),
          ],
       q(npo) => [
-         q(5038),
+         q(5039),
          q(0),
          ],
       q(nps) => [
-         q(5039),
+         q(5040),
          q(0),
          ],
       q(npu) => [
-         q(5040),
+         q(5041),
          q(0),
          ],
       q(npy) => [
-         q(5041),
+         q(5042),
          q(0),
          ],
       q(nqg) => [
-         q(5042),
+         q(5043),
          q(0),
          ],
       q(nqk) => [
-         q(5043),
+         q(5044),
          q(0),
          ],
       q(nqm) => [
-         q(5044),
+         q(5045),
          q(0),
          ],
       q(nqn) => [
-         q(5045),
+         q(5046),
          q(0),
          ],
       q(nqo) => [
@@ -77660,127 +77728,127 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nqq) => [
-         q(5046),
+         q(5047),
          q(0),
          ],
       q(nqy) => [
-         q(5047),
+         q(5048),
          q(0),
          ],
       q(nra) => [
-         q(5048),
+         q(5049),
          q(0),
          ],
       q(nrb) => [
-         q(5049),
+         q(5050),
          q(0),
          ],
       q(nrc) => [
-         q(5050),
+         q(5051),
          q(0),
          ],
       q(nre) => [
-         q(5051),
+         q(5052),
          q(0),
          ],
       q(nrf) => [
-         q(5052),
+         q(5053),
          q(0),
          ],
       q(nrg) => [
-         q(5053),
+         q(5054),
          q(0),
          ],
       q(nri) => [
-         q(5054),
+         q(5055),
          q(0),
          ],
       q(nrk) => [
-         q(5055),
+         q(5056),
          q(0),
          ],
       q(nrl) => [
-         q(5056),
+         q(5057),
          q(0),
          ],
       q(nrm) => [
-         q(5057),
+         q(5058),
          q(0),
          ],
       q(nrn) => [
-         q(5058),
+         q(5059),
          q(0),
          ],
       q(nrp) => [
-         q(5059),
+         q(5060),
          q(0),
          ],
       q(nrr) => [
-         q(5060),
+         q(5061),
          q(0),
          ],
       q(nrt) => [
-         q(5061),
+         q(5062),
          q(0),
          ],
       q(nru) => [
-         q(5062),
+         q(5063),
          q(0),
          ],
       q(nrx) => [
-         q(5063),
+         q(5064),
          q(0),
          ],
       q(nrz) => [
-         q(5064),
+         q(5065),
          q(0),
          ],
       q(nsa) => [
-         q(5065),
+         q(5066),
          q(0),
          ],
       q(nsc) => [
-         q(5066),
+         q(5067),
          q(0),
          ],
       q(nsd) => [
-         q(5067),
+         q(5068),
          q(0),
          ],
       q(nse) => [
-         q(5068),
+         q(5069),
          q(0),
          ],
       q(nsf) => [
-         q(5069),
+         q(5070),
          q(0),
          ],
       q(nsg) => [
-         q(5070),
+         q(5071),
          q(0),
          ],
       q(nsh) => [
-         q(5071),
+         q(5072),
          q(0),
          ],
       q(nsi) => [
-         q(5072),
+         q(5073),
          q(0),
          ],
       q(nsk) => [
-         q(5073),
+         q(5074),
          q(0),
          ],
       q(nsl) => [
-         q(5074),
+         q(5075),
          q(0),
          ],
       q(nsm) => [
-         q(5075),
+         q(5076),
          q(0),
          ],
       q(nsn) => [
-         q(5076),
+         q(5077),
          q(0),
          ],
       q(nso) => [
@@ -77788,111 +77856,111 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nsp) => [
-         q(5077),
+         q(5078),
          q(0),
          ],
       q(nsq) => [
-         q(5078),
+         q(5079),
          q(0),
          ],
       q(nsr) => [
-         q(5079),
+         q(5080),
          q(0),
          ],
       q(nss) => [
-         q(5080),
+         q(5081),
          q(0),
          ],
       q(nst) => [
-         q(5081),
+         q(5082),
          q(0),
          ],
       q(nsu) => [
-         q(5082),
+         q(5083),
          q(0),
          ],
       q(nsv) => [
-         q(5083),
+         q(5084),
          q(0),
          ],
       q(nsw) => [
-         q(5084),
+         q(5085),
          q(0),
          ],
       q(nsx) => [
-         q(5085),
+         q(5086),
          q(0),
          ],
       q(nsy) => [
-         q(5086),
+         q(5087),
          q(0),
          ],
       q(nsz) => [
-         q(5087),
+         q(5088),
          q(0),
          ],
       q(nte) => [
-         q(5088),
+         q(5089),
          q(0),
          ],
       q(ntg) => [
-         q(5089),
+         q(5090),
          q(0),
          ],
       q(nti) => [
-         q(5090),
+         q(5091),
          q(0),
          ],
       q(ntj) => [
-         q(5091),
+         q(5092),
          q(0),
          ],
       q(ntk) => [
-         q(5092),
+         q(5093),
          q(0),
          ],
       q(ntm) => [
-         q(5093),
+         q(5094),
          q(0),
          ],
       q(nto) => [
-         q(5094),
+         q(5095),
          q(0),
          ],
       q(ntp) => [
-         q(5095),
+         q(5096),
          q(0),
          ],
       q(ntr) => [
-         q(5096),
+         q(5097),
          q(0),
          ],
       q(nts) => [
-         q(5097),
+         q(5098),
          q(0),
          ],
       q(ntu) => [
-         q(5098),
+         q(5099),
          q(0),
          ],
       q(ntw) => [
-         q(5099),
+         q(5100),
          q(0),
          ],
       q(ntx) => [
-         q(5100),
+         q(5101),
          q(0),
          ],
       q(nty) => [
-         q(5101),
+         q(5102),
          q(0),
          ],
       q(ntz) => [
-         q(5102),
+         q(5103),
          q(0),
          ],
       q(nua) => [
-         q(5103),
+         q(5104),
          q(0),
          ],
       q(nub) => [
@@ -77900,119 +77968,119 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nuc) => [
-         q(5104),
+         q(5105),
          q(0),
          ],
       q(nud) => [
-         q(5105),
+         q(5106),
          q(0),
          ],
       q(nue) => [
-         q(5106),
+         q(5107),
          q(0),
          ],
       q(nuf) => [
-         q(5107),
+         q(5108),
          q(0),
          ],
       q(nug) => [
-         q(5108),
+         q(5109),
          q(0),
          ],
       q(nuh) => [
-         q(5109),
+         q(5110),
          q(0),
          ],
       q(nui) => [
-         q(5110),
+         q(5111),
          q(0),
          ],
       q(nuj) => [
-         q(5111),
+         q(5112),
          q(0),
          ],
       q(nuk) => [
-         q(5112),
+         q(5113),
          q(0),
          ],
       q(nul) => [
-         q(5113),
+         q(5114),
          q(0),
          ],
       q(num) => [
-         q(5114),
+         q(5115),
          q(0),
          ],
       q(nun) => [
-         q(5115),
+         q(5116),
          q(0),
          ],
       q(nuo) => [
-         q(5116),
+         q(5117),
          q(0),
          ],
       q(nup) => [
-         q(5117),
+         q(5118),
          q(0),
          ],
       q(nuq) => [
-         q(5118),
+         q(5119),
          q(0),
          ],
       q(nur) => [
-         q(5119),
+         q(5120),
          q(0),
          ],
       q(nus) => [
-         q(5120),
+         q(5121),
          q(0),
          ],
       q(nut) => [
-         q(5121),
+         q(5122),
          q(0),
          ],
       q(nuu) => [
-         q(5122),
+         q(5123),
          q(0),
          ],
       q(nuv) => [
-         q(5123),
+         q(5124),
          q(0),
          ],
       q(nuw) => [
-         q(5124),
+         q(5125),
          q(0),
          ],
       q(nux) => [
-         q(5125),
+         q(5126),
          q(0),
          ],
       q(nuy) => [
-         q(5126),
+         q(5127),
          q(0),
          ],
       q(nuz) => [
-         q(5127),
+         q(5128),
          q(0),
          ],
       q(nvh) => [
-         q(5128),
+         q(5129),
          q(0),
          ],
       q(nvm) => [
-         q(5129),
+         q(5130),
          q(0),
          ],
       q(nvo) => [
-         q(5130),
+         q(5131),
          q(0),
          ],
       q(nwa) => [
-         q(5131),
+         q(5132),
          q(0),
          ],
       q(nwb) => [
-         q(5132),
+         q(5133),
          q(0),
          ],
       q(nwc) => [
@@ -78020,91 +78088,91 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nwe) => [
-         q(5133),
+         q(5134),
          q(0),
          ],
       q(nwg) => [
-         q(5134),
+         q(5135),
          q(0),
          ],
       q(nwi) => [
-         q(5135),
+         q(5136),
          q(0),
          ],
       q(nwm) => [
-         q(5136),
+         q(5137),
          q(0),
          ],
       q(nwo) => [
-         q(5137),
+         q(5138),
          q(0),
          ],
       q(nwr) => [
-         q(5138),
+         q(5139),
          q(0),
          ],
       q(nwx) => [
-         q(5139),
+         q(5140),
          q(0),
          ],
       q(nwy) => [
-         q(5140),
+         q(5141),
          q(0),
          ],
       q(nxa) => [
-         q(5141),
+         q(5142),
          q(0),
          ],
       q(nxd) => [
-         q(5142),
+         q(5143),
          q(0),
          ],
       q(nxe) => [
-         q(5143),
+         q(5144),
          q(0),
          ],
       q(nxg) => [
-         q(5144),
+         q(5145),
          q(0),
          ],
       q(nxi) => [
-         q(5145),
+         q(5146),
          q(0),
          ],
       q(nxk) => [
-         q(5146),
+         q(5147),
          q(0),
          ],
       q(nxl) => [
-         q(5147),
+         q(5148),
          q(0),
          ],
       q(nxm) => [
-         q(5148),
+         q(5149),
          q(0),
          ],
       q(nxn) => [
-         q(5149),
+         q(5150),
          q(0),
          ],
       q(nxo) => [
-         q(5150),
+         q(5151),
          q(0),
          ],
       q(nxq) => [
-         q(5151),
+         q(5152),
          q(0),
          ],
       q(nxr) => [
-         q(5152),
+         q(5153),
          q(0),
          ],
       q(nxu) => [
-         q(5153),
+         q(5154),
          q(0),
          ],
       q(nxx) => [
-         q(5154),
+         q(5155),
          q(0),
          ],
       q(nya) => [
@@ -78112,47 +78180,47 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nyb) => [
-         q(5155),
+         q(5156),
          q(0),
          ],
       q(nyc) => [
-         q(5156),
+         q(5157),
          q(0),
          ],
       q(nyd) => [
-         q(5157),
+         q(5158),
          q(0),
          ],
       q(nye) => [
-         q(5158),
+         q(5159),
          q(0),
          ],
       q(nyf) => [
-         q(5159),
+         q(5160),
          q(0),
          ],
       q(nyg) => [
-         q(5160),
+         q(5161),
          q(0),
          ],
       q(nyh) => [
-         q(5161),
+         q(5162),
          q(0),
          ],
       q(nyi) => [
-         q(5162),
+         q(5163),
          q(0),
          ],
       q(nyj) => [
-         q(5163),
+         q(5164),
          q(0),
          ],
       q(nyk) => [
-         q(5164),
+         q(5165),
          q(0),
          ],
       q(nyl) => [
-         q(5165),
+         q(5166),
          q(0),
          ],
       q(nym) => [
@@ -78168,51 +78236,51 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nyp) => [
-         q(5166),
+         q(5167),
          q(0),
          ],
       q(nyq) => [
-         q(5167),
+         q(5168),
          q(0),
          ],
       q(nyr) => [
-         q(5168),
+         q(5169),
          q(0),
          ],
       q(nys) => [
-         q(5169),
+         q(5170),
          q(0),
          ],
       q(nyt) => [
-         q(5170),
+         q(5171),
          q(0),
          ],
       q(nyu) => [
-         q(5171),
+         q(5172),
          q(0),
          ],
       q(nyv) => [
-         q(5172),
+         q(5173),
          q(0),
          ],
       q(nyw) => [
-         q(5173),
+         q(5174),
          q(0),
          ],
       q(nyx) => [
-         q(5174),
+         q(5175),
          q(0),
          ],
       q(nyy) => [
-         q(5175),
+         q(5176),
          q(0),
          ],
       q(nza) => [
-         q(5176),
+         q(5177),
          q(0),
          ],
       q(nzb) => [
-         q(5177),
+         q(5178),
          q(0),
          ],
       q(nzi) => [
@@ -78220,83 +78288,83 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(nzk) => [
-         q(5178),
+         q(5179),
          q(0),
          ],
       q(nzm) => [
-         q(5179),
+         q(5180),
          q(0),
          ],
       q(nzs) => [
-         q(5180),
+         q(5181),
          q(0),
          ],
       q(nzu) => [
-         q(5181),
+         q(5182),
          q(0),
          ],
       q(nzy) => [
-         q(5182),
+         q(5183),
          q(0),
          ],
       q(nzz) => [
-         q(5183),
+         q(5184),
          q(0),
          ],
       q(oaa) => [
-         q(5184),
+         q(5185),
          q(0),
          ],
       q(oac) => [
-         q(5185),
+         q(5186),
          q(0),
          ],
       q(oar) => [
-         q(5186),
+         q(5187),
          q(0),
          ],
       q(oav) => [
-         q(5187),
+         q(5188),
          q(0),
          ],
       q(obi) => [
-         q(5188),
+         q(5189),
          q(0),
          ],
       q(obk) => [
-         q(5189),
+         q(5190),
          q(0),
          ],
       q(obl) => [
-         q(5190),
+         q(5191),
          q(0),
          ],
       q(obm) => [
-         q(5191),
+         q(5192),
          q(0),
          ],
       q(obo) => [
-         q(5192),
+         q(5193),
          q(0),
          ],
       q(obr) => [
-         q(5193),
+         q(5194),
          q(0),
          ],
       q(obt) => [
-         q(5194),
+         q(5195),
          q(0),
          ],
       q(obu) => [
-         q(5195),
+         q(5196),
          q(0),
          ],
       q(oca) => [
-         q(5196),
+         q(5197),
          q(0),
          ],
       q(och) => [
-         q(5197),
+         q(5198),
          q(0),
          ],
       q(oci) => [
@@ -78304,91 +78372,91 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(oco) => [
-         q(5198),
+         q(5199),
          q(0),
          ],
       q(ocu) => [
-         q(5199),
+         q(5200),
          q(0),
          ],
       q(oda) => [
-         q(5200),
+         q(5201),
          q(0),
          ],
       q(odk) => [
-         q(5201),
+         q(5202),
          q(0),
          ],
       q(odt) => [
-         q(5202),
+         q(5203),
          q(0),
          ],
       q(odu) => [
-         q(5203),
+         q(5204),
          q(0),
          ],
       q(ofo) => [
-         q(5204),
+         q(5205),
          q(0),
          ],
       q(ofs) => [
-         q(5205),
+         q(5206),
          q(0),
          ],
       q(ofu) => [
-         q(5206),
+         q(5207),
          q(0),
          ],
       q(ogb) => [
-         q(5207),
+         q(5208),
          q(0),
          ],
       q(ogc) => [
-         q(5208),
+         q(5209),
          q(0),
          ],
       q(oge) => [
-         q(5209),
+         q(5210),
          q(0),
          ],
       q(ogg) => [
-         q(5210),
+         q(5211),
          q(0),
          ],
       q(ogo) => [
-         q(5211),
+         q(5212),
          q(0),
          ],
       q(ogu) => [
-         q(5212),
+         q(5213),
          q(0),
          ],
       q(oht) => [
-         q(5213),
+         q(5214),
          q(0),
          ],
       q(ohu) => [
-         q(5214),
+         q(5215),
          q(0),
          ],
       q(oia) => [
-         q(5215),
+         q(5216),
          q(0),
          ],
       q(oin) => [
-         q(5216),
+         q(5217),
          q(0),
          ],
       q(ojb) => [
-         q(5217),
+         q(5218),
          q(0),
          ],
       q(ojc) => [
-         q(5218),
+         q(5219),
          q(0),
          ],
       q(ojg) => [
-         q(5219),
+         q(5220),
          q(0),
          ],
       q(oji) => [
@@ -78396,167 +78464,167 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ojp) => [
-         q(5220),
+         q(5221),
          q(0),
          ],
       q(ojs) => [
-         q(5221),
+         q(5222),
          q(0),
          ],
       q(ojv) => [
-         q(5222),
+         q(5223),
          q(0),
          ],
       q(ojw) => [
-         q(5223),
+         q(5224),
          q(0),
          ],
       q(oka) => [
-         q(5224),
+         q(5225),
          q(0),
          ],
       q(okb) => [
-         q(5225),
+         q(5226),
          q(0),
          ],
       q(okd) => [
-         q(5226),
+         q(5227),
          q(0),
          ],
       q(oke) => [
-         q(5227),
+         q(5228),
          q(0),
          ],
       q(okg) => [
-         q(5228),
+         q(5229),
          q(0),
          ],
       q(okh) => [
-         q(5229),
+         q(5230),
          q(0),
          ],
       q(oki) => [
-         q(5230),
+         q(5231),
          q(0),
          ],
       q(okj) => [
-         q(5231),
+         q(5232),
          q(0),
          ],
       q(okk) => [
-         q(5232),
+         q(5233),
          q(0),
          ],
       q(okl) => [
-         q(5233),
+         q(5234),
          q(0),
          ],
       q(okm) => [
-         q(5234),
+         q(5235),
          q(0),
          ],
       q(okn) => [
-         q(5235),
+         q(5236),
          q(0),
          ],
       q(oko) => [
-         q(5236),
+         q(5237),
          q(0),
          ],
       q(okr) => [
-         q(5237),
+         q(5238),
          q(0),
          ],
       q(oks) => [
-         q(5238),
+         q(5239),
          q(0),
          ],
       q(oku) => [
-         q(5239),
+         q(5240),
          q(0),
          ],
       q(okv) => [
-         q(5240),
+         q(5241),
          q(0),
          ],
       q(okx) => [
-         q(5241),
+         q(5242),
          q(0),
          ],
       q(ola) => [
-         q(5242),
+         q(5243),
          q(0),
          ],
       q(old) => [
-         q(5243),
+         q(5244),
          q(0),
          ],
       q(ole) => [
-         q(5244),
+         q(5245),
          q(0),
          ],
       q(olk) => [
-         q(5245),
+         q(5246),
          q(0),
          ],
       q(olm) => [
-         q(5246),
+         q(5247),
          q(0),
          ],
       q(olo) => [
-         q(5247),
+         q(5248),
          q(0),
          ],
       q(olr) => [
-         q(5248),
+         q(5249),
          q(0),
          ],
       q(olt) => [
-         q(5249),
+         q(5250),
          q(0),
          ],
       q(oma) => [
-         q(5250),
+         q(5251),
          q(0),
          ],
       q(omb) => [
-         q(5251),
+         q(5252),
          q(0),
          ],
       q(omc) => [
-         q(5252),
+         q(5253),
          q(0),
          ],
       q(ome) => [
-         q(5253),
+         q(5254),
          q(0),
          ],
       q(omg) => [
-         q(5254),
+         q(5255),
          q(0),
          ],
       q(omi) => [
-         q(5255),
+         q(5256),
          q(0),
          ],
       q(omk) => [
-         q(5256),
+         q(5257),
          q(0),
          ],
       q(oml) => [
-         q(5257),
+         q(5258),
          q(0),
          ],
       q(omn) => [
-         q(5258),
+         q(5259),
          q(0),
          ],
       q(omo) => [
-         q(5259),
+         q(5260),
          q(0),
          ],
       q(omp) => [
-         q(5260),
+         q(5261),
          q(0),
          ],
       q(omq) => [
@@ -78564,15 +78632,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(omr) => [
-         q(5261),
+         q(5262),
          q(0),
          ],
       q(omt) => [
-         q(5262),
+         q(5263),
          q(0),
          ],
       q(omu) => [
-         q(5263),
+         q(5264),
          q(0),
          ],
       q(omv) => [
@@ -78580,139 +78648,139 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(omw) => [
-         q(5264),
+         q(5265),
          q(0),
          ],
       q(omx) => [
-         q(5265),
+         q(5266),
          q(0),
          ],
       q(ona) => [
-         q(5266),
+         q(5267),
          q(0),
          ],
       q(onb) => [
-         q(5267),
+         q(5268),
          q(0),
          ],
       q(one) => [
-         q(5268),
+         q(5269),
          q(0),
          ],
       q(ong) => [
-         q(5269),
+         q(5270),
          q(0),
          ],
       q(oni) => [
-         q(5270),
+         q(5271),
          q(0),
          ],
       q(onj) => [
-         q(5271),
+         q(5272),
          q(0),
          ],
       q(onk) => [
-         q(5272),
+         q(5273),
          q(0),
          ],
       q(onn) => [
-         q(5273),
+         q(5274),
          q(0),
          ],
       q(ono) => [
-         q(5274),
+         q(5275),
          q(0),
          ],
       q(onp) => [
-         q(5275),
+         q(5276),
          q(0),
          ],
       q(onr) => [
-         q(5276),
+         q(5277),
          q(0),
          ],
       q(ons) => [
-         q(5277),
+         q(5278),
          q(0),
          ],
       q(ont) => [
-         q(5278),
+         q(5279),
          q(0),
          ],
       q(onu) => [
-         q(5279),
+         q(5280),
          q(0),
          ],
       q(onw) => [
-         q(5280),
+         q(5281),
          q(0),
          ],
       q(onx) => [
-         q(5281),
+         q(5282),
          q(0),
          ],
       q(ood) => [
-         q(5282),
+         q(5283),
          q(0),
          ],
       q(oog) => [
-         q(5283),
+         q(5284),
          q(0),
          ],
       q(oon) => [
-         q(5284),
+         q(5285),
          q(0),
          ],
       q(oor) => [
-         q(5285),
+         q(5286),
          q(0),
          ],
       q(oos) => [
-         q(5286),
+         q(5287),
          q(0),
          ],
       q(opa) => [
-         q(5287),
+         q(5288),
          q(0),
          ],
       q(opk) => [
-         q(5288),
+         q(5289),
          q(0),
          ],
       q(opm) => [
-         q(5289),
+         q(5290),
          q(0),
          ],
       q(opo) => [
-         q(5290),
+         q(5291),
          q(0),
          ],
       q(opt) => [
-         q(5291),
+         q(5292),
          q(0),
          ],
       q(opy) => [
-         q(5292),
+         q(5293),
          q(0),
          ],
       q(ora) => [
-         q(5293),
+         q(5294),
          q(0),
          ],
       q(orc) => [
-         q(5294),
+         q(5295),
          q(0),
          ],
       q(ore) => [
-         q(5295),
+         q(5296),
          q(0),
          ],
       q(org) => [
-         q(5296),
+         q(5297),
          q(0),
          ],
       q(orh) => [
-         q(5297),
+         q(5298),
          q(0),
          ],
       q(ori) => [
@@ -78724,47 +78792,47 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(orn) => [
-         q(5298),
+         q(5299),
          q(0),
          ],
       q(oro) => [
-         q(5299),
+         q(5300),
          q(0),
          ],
       q(orr) => [
-         q(5300),
+         q(5301),
          q(0),
          ],
       q(ors) => [
-         q(5301),
+         q(5302),
          q(0),
          ],
       q(ort) => [
-         q(5302),
+         q(5303),
          q(0),
          ],
       q(oru) => [
-         q(5303),
+         q(5304),
          q(0),
          ],
       q(orv) => [
-         q(5304),
+         q(5305),
          q(0),
          ],
       q(orw) => [
-         q(5305),
+         q(5306),
          q(0),
          ],
       q(orx) => [
-         q(5306),
+         q(5307),
          q(0),
          ],
       q(ory) => [
-         q(5307),
+         q(5308),
          q(0),
          ],
       q(orz) => [
-         q(5308),
+         q(5309),
          q(0),
          ],
       q(osa) => [
@@ -78772,19 +78840,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(osc) => [
-         q(5309),
+         q(5310),
          q(0),
          ],
       q(osi) => [
-         q(5310),
+         q(5311),
          q(0),
          ],
       q(oso) => [
-         q(5311),
+         q(5312),
          q(0),
          ],
       q(osp) => [
-         q(5312),
+         q(5313),
          q(0),
          ],
       q(oss) => [
@@ -78792,15 +78860,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ost) => [
-         q(5313),
+         q(5314),
          q(0),
          ],
       q(osu) => [
-         q(5314),
+         q(5315),
          q(0),
          ],
       q(osx) => [
-         q(5315),
+         q(5316),
          q(0),
          ],
       q(ota) => [
@@ -78808,35 +78876,35 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(otb) => [
-         q(5316),
+         q(5317),
          q(0),
          ],
       q(otd) => [
-         q(5317),
+         q(5318),
          q(0),
          ],
       q(ote) => [
-         q(5318),
+         q(5319),
          q(0),
          ],
       q(oti) => [
-         q(5319),
+         q(5320),
          q(0),
          ],
       q(otk) => [
-         q(5320),
+         q(5321),
          q(0),
          ],
       q(otl) => [
-         q(5321),
+         q(5322),
          q(0),
          ],
       q(otm) => [
-         q(5322),
+         q(5323),
          q(0),
          ],
       q(otn) => [
-         q(5323),
+         q(5324),
          q(0),
          ],
       q(oto) => [
@@ -78844,87 +78912,87 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(otq) => [
-         q(5324),
+         q(5325),
          q(0),
          ],
       q(otr) => [
-         q(5325),
+         q(5326),
          q(0),
          ],
       q(ots) => [
-         q(5326),
+         q(5327),
          q(0),
          ],
       q(ott) => [
-         q(5327),
+         q(5328),
          q(0),
          ],
       q(otu) => [
-         q(5328),
+         q(5329),
          q(0),
          ],
       q(otw) => [
-         q(5329),
+         q(5330),
          q(0),
          ],
       q(otx) => [
-         q(5330),
+         q(5331),
          q(0),
          ],
       q(oty) => [
-         q(5331),
+         q(5332),
          q(0),
          ],
       q(otz) => [
-         q(5332),
+         q(5333),
          q(0),
          ],
       q(oua) => [
-         q(5333),
+         q(5334),
          q(0),
          ],
       q(oub) => [
-         q(5334),
+         q(5335),
          q(0),
          ],
       q(oue) => [
-         q(5335),
+         q(5336),
          q(0),
          ],
       q(oui) => [
-         q(5336),
+         q(5337),
          q(0),
          ],
       q(oum) => [
-         q(5337),
+         q(5338),
          q(0),
          ],
       q(owi) => [
-         q(5338),
+         q(5339),
          q(0),
          ],
       q(owl) => [
-         q(5339),
+         q(5340),
          q(0),
          ],
       q(oyb) => [
-         q(5340),
+         q(5341),
          q(0),
          ],
       q(oyd) => [
-         q(5341),
+         q(5342),
          q(0),
          ],
       q(oym) => [
-         q(5342),
+         q(5343),
          q(0),
          ],
       q(oyy) => [
-         q(5343),
+         q(5344),
          q(0),
          ],
       q(ozm) => [
-         q(5344),
+         q(5345),
          q(0),
          ],
       q(paa) => [
@@ -78932,23 +79000,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(pab) => [
-         q(5345),
+         q(5346),
          q(0),
          ],
       q(pac) => [
-         q(5346),
+         q(5347),
          q(0),
          ],
       q(pad) => [
-         q(5347),
+         q(5348),
          q(0),
          ],
       q(pae) => [
-         q(5348),
+         q(5349),
          q(0),
          ],
       q(paf) => [
-         q(5349),
+         q(5350),
          q(0),
          ],
       q(pag) => [
@@ -78956,15 +79024,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(pah) => [
-         q(5350),
+         q(5351),
          q(0),
          ],
       q(pai) => [
-         q(5351),
+         q(5352),
          q(0),
          ],
       q(pak) => [
-         q(5352),
+         q(5353),
          q(0),
          ],
       q(pal) => [
@@ -78980,7 +79048,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(pao) => [
-         q(5353),
+         q(5354),
          q(0),
          ],
       q(pap) => [
@@ -78988,19 +79056,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(paq) => [
-         q(5354),
+         q(5355),
          q(0),
          ],
       q(par) => [
-         q(5355),
+         q(5356),
          q(0),
          ],
       q(pas) => [
-         q(5356),
+         q(5357),
          q(0),
          ],
       q(pat) => [
-         q(5357),
+         q(5358),
          q(0),
          ],
       q(pau) => [
@@ -79008,231 +79076,231 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(pav) => [
-         q(5358),
+         q(5359),
          q(0),
          ],
       q(paw) => [
-         q(5359),
+         q(5360),
          q(0),
          ],
       q(pax) => [
-         q(5360),
+         q(5361),
          q(0),
          ],
       q(pay) => [
-         q(5361),
+         q(5362),
          q(0),
          ],
       q(paz) => [
-         q(5362),
+         q(5363),
          q(0),
          ],
       q(pbb) => [
-         q(5363),
+         q(5364),
          q(0),
          ],
       q(pbc) => [
-         q(5364),
+         q(5365),
          q(0),
          ],
       q(pbe) => [
-         q(5365),
+         q(5366),
          q(0),
          ],
       q(pbf) => [
-         q(5366),
+         q(5367),
          q(0),
          ],
       q(pbg) => [
-         q(5367),
+         q(5368),
          q(0),
          ],
       q(pbh) => [
-         q(5368),
+         q(5369),
          q(0),
          ],
       q(pbi) => [
-         q(5369),
+         q(5370),
          q(0),
          ],
       q(pbl) => [
-         q(5370),
+         q(5371),
          q(0),
          ],
       q(pbn) => [
-         q(5371),
+         q(5372),
          q(0),
          ],
       q(pbo) => [
-         q(5372),
+         q(5373),
          q(0),
          ],
       q(pbp) => [
-         q(5373),
+         q(5374),
          q(0),
          ],
       q(pbr) => [
-         q(5374),
+         q(5375),
          q(0),
          ],
       q(pbs) => [
-         q(5375),
+         q(5376),
          q(0),
          ],
       q(pbt) => [
-         q(5376),
+         q(5377),
          q(0),
          ],
       q(pbu) => [
-         q(5377),
+         q(5378),
          q(0),
          ],
       q(pbv) => [
-         q(5378),
+         q(5379),
          q(0),
          ],
       q(pby) => [
-         q(5379),
+         q(5380),
          q(0),
          ],
       q(pca) => [
-         q(5380),
+         q(5381),
          q(0),
          ],
       q(pcb) => [
-         q(5381),
+         q(5382),
          q(0),
          ],
       q(pcc) => [
-         q(5382),
+         q(5383),
          q(0),
          ],
       q(pcd) => [
-         q(5383),
+         q(5384),
          q(0),
          ],
       q(pce) => [
-         q(5384),
+         q(5385),
          q(0),
          ],
       q(pcf) => [
-         q(5385),
+         q(5386),
          q(0),
          ],
       q(pcg) => [
-         q(5386),
+         q(5387),
          q(0),
          ],
       q(pch) => [
-         q(5387),
+         q(5388),
          q(0),
          ],
       q(pci) => [
-         q(5388),
+         q(5389),
          q(0),
          ],
       q(pcj) => [
-         q(5389),
+         q(5390),
          q(0),
          ],
       q(pck) => [
-         q(5390),
+         q(5391),
          q(0),
          ],
       q(pcl) => [
-         q(5391),
+         q(5392),
          q(0),
          ],
       q(pcm) => [
-         q(5392),
+         q(5393),
          q(0),
          ],
       q(pcn) => [
-         q(5393),
+         q(5394),
          q(0),
          ],
       q(pcp) => [
-         q(5394),
+         q(5395),
          q(0),
          ],
       q(pcw) => [
-         q(5395),
+         q(5396),
          q(0),
          ],
       q(pda) => [
-         q(5396),
+         q(5397),
          q(0),
          ],
       q(pdc) => [
-         q(5397),
+         q(5398),
          q(0),
          ],
       q(pdi) => [
-         q(5398),
+         q(5399),
          q(0),
          ],
       q(pdn) => [
-         q(5399),
+         q(5400),
          q(0),
          ],
       q(pdo) => [
-         q(5400),
+         q(5401),
          q(0),
          ],
       q(pdt) => [
-         q(5401),
+         q(5402),
          q(0),
          ],
       q(pdu) => [
-         q(5402),
+         q(5403),
          q(0),
          ],
       q(pea) => [
-         q(5403),
+         q(5404),
          q(0),
          ],
       q(peb) => [
-         q(5404),
+         q(5405),
          q(0),
          ],
       q(ped) => [
-         q(5405),
+         q(5406),
          q(0),
          ],
       q(pee) => [
-         q(5406),
+         q(5407),
          q(0),
          ],
       q(pef) => [
-         q(5407),
+         q(5408),
          q(0),
          ],
       q(peg) => [
-         q(5408),
+         q(5409),
          q(0),
          ],
       q(peh) => [
-         q(5409),
+         q(5410),
          q(0),
          ],
       q(pei) => [
-         q(5410),
+         q(5411),
          q(0),
          ],
       q(pej) => [
-         q(5411),
+         q(5412),
          q(0),
          ],
       q(pek) => [
-         q(5412),
+         q(5413),
          q(0),
          ],
       q(pel) => [
-         q(5413),
+         q(5414),
          q(0),
          ],
       q(pem) => [
-         q(5414),
+         q(5415),
          q(0),
          ],
       q(peo) => [
@@ -79240,11 +79308,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(pep) => [
-         q(5415),
+         q(5416),
          q(0),
          ],
       q(peq) => [
-         q(5416),
+         q(5417),
          q(0),
          ],
       q(per) => [
@@ -79252,87 +79320,87 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(pes) => [
-         q(5417),
+         q(5418),
          q(0),
          ],
       q(pev) => [
-         q(5418),
+         q(5419),
          q(0),
          ],
       q(pex) => [
-         q(5419),
+         q(5420),
          q(0),
          ],
       q(pey) => [
-         q(5420),
+         q(5421),
          q(0),
          ],
       q(pez) => [
-         q(5421),
+         q(5422),
          q(0),
          ],
       q(pfa) => [
-         q(5422),
+         q(5423),
          q(0),
          ],
       q(pfe) => [
-         q(5423),
+         q(5424),
          q(0),
          ],
       q(pfl) => [
-         q(5424),
+         q(5425),
          q(0),
          ],
       q(pga) => [
-         q(5425),
+         q(5426),
          q(0),
          ],
       q(pgd) => [
-         q(5426),
+         q(5427),
          q(0),
          ],
       q(pgg) => [
-         q(5427),
+         q(5428),
          q(0),
          ],
       q(pgi) => [
-         q(5428),
+         q(5429),
          q(0),
          ],
       q(pgk) => [
-         q(5429),
+         q(5430),
          q(0),
          ],
       q(pgl) => [
-         q(5430),
+         q(5431),
          q(0),
          ],
       q(pgn) => [
-         q(5431),
+         q(5432),
          q(0),
          ],
       q(pgs) => [
-         q(5432),
+         q(5433),
          q(0),
          ],
       q(pgu) => [
-         q(5433),
+         q(5434),
          q(0),
          ],
       q(pha) => [
-         q(5434),
+         q(5435),
          q(0),
          ],
       q(phd) => [
-         q(5435),
+         q(5436),
          q(0),
          ],
       q(phg) => [
-         q(5436),
+         q(5437),
          q(0),
          ],
       q(phh) => [
-         q(5437),
+         q(5438),
          q(0),
          ],
       q(phi) => [
@@ -79340,15 +79408,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(phk) => [
-         q(5438),
+         q(5439),
          q(0),
          ],
       q(phl) => [
-         q(5439),
+         q(5440),
          q(0),
          ],
       q(phm) => [
-         q(5440),
+         q(5441),
          q(0),
          ],
       q(phn) => [
@@ -79356,199 +79424,199 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(pho) => [
-         q(5441),
+         q(5442),
          q(0),
          ],
       q(phq) => [
-         q(5442),
+         q(5443),
          q(0),
          ],
       q(phr) => [
-         q(5443),
+         q(5444),
          q(0),
          ],
       q(pht) => [
-         q(5444),
+         q(5445),
          q(0),
          ],
       q(phu) => [
-         q(5445),
+         q(5446),
          q(0),
          ],
       q(phv) => [
-         q(5446),
+         q(5447),
          q(0),
          ],
       q(phw) => [
-         q(5447),
+         q(5448),
          q(0),
          ],
       q(pia) => [
-         q(5448),
+         q(5449),
          q(0),
          ],
       q(pib) => [
-         q(5449),
+         q(5450),
          q(0),
          ],
       q(pic) => [
-         q(5450),
+         q(5451),
          q(0),
          ],
       q(pid) => [
-         q(5451),
+         q(5452),
          q(0),
          ],
       q(pie) => [
-         q(5452),
+         q(5453),
          q(0),
          ],
       q(pif) => [
-         q(5453),
+         q(5454),
          q(0),
          ],
       q(pig) => [
-         q(5454),
+         q(5455),
          q(0),
          ],
       q(pih) => [
-         q(5455),
+         q(5456),
          q(0),
          ],
       q(pii) => [
-         q(5456),
+         q(5457),
          q(0),
          ],
       q(pij) => [
-         q(5457),
+         q(5458),
          q(0),
          ],
       q(pil) => [
-         q(5458),
+         q(5459),
          q(0),
          ],
       q(pim) => [
-         q(5459),
+         q(5460),
          q(0),
          ],
       q(pin) => [
-         q(5460),
+         q(5461),
          q(0),
          ],
       q(pio) => [
-         q(5461),
+         q(5462),
          q(0),
          ],
       q(pip) => [
-         q(5462),
+         q(5463),
          q(0),
          ],
       q(pir) => [
-         q(5463),
+         q(5464),
          q(0),
          ],
       q(pis) => [
-         q(5464),
+         q(5465),
          q(0),
          ],
       q(pit) => [
-         q(5465),
+         q(5466),
          q(0),
          ],
       q(piu) => [
-         q(5466),
+         q(5467),
          q(0),
          ],
       q(piv) => [
-         q(5467),
+         q(5468),
          q(0),
          ],
       q(piw) => [
-         q(5468),
+         q(5469),
          q(0),
          ],
       q(pix) => [
-         q(5469),
+         q(5470),
          q(0),
          ],
       q(piy) => [
-         q(5470),
+         q(5471),
          q(0),
          ],
       q(piz) => [
-         q(5471),
+         q(5472),
          q(0),
          ],
       q(pjt) => [
-         q(5472),
+         q(5473),
          q(0),
          ],
       q(pka) => [
-         q(5473),
+         q(5474),
          q(0),
          ],
       q(pkb) => [
-         q(5474),
+         q(5475),
          q(0),
          ],
       q(pkc) => [
-         q(5475),
+         q(5476),
          q(0),
          ],
       q(pkg) => [
-         q(5476),
+         q(5477),
          q(0),
          ],
       q(pkh) => [
-         q(5477),
+         q(5478),
          q(0),
          ],
       q(pkn) => [
-         q(5478),
+         q(5479),
          q(0),
          ],
       q(pko) => [
-         q(5479),
+         q(5480),
          q(0),
          ],
       q(pkp) => [
-         q(5480),
+         q(5481),
          q(0),
          ],
       q(pkr) => [
-         q(5481),
+         q(5482),
          q(0),
          ],
       q(pks) => [
-         q(5482),
+         q(5483),
          q(0),
          ],
       q(pkt) => [
-         q(5483),
+         q(5484),
          q(0),
          ],
       q(pku) => [
-         q(5484),
+         q(5485),
          q(0),
          ],
       q(pla) => [
-         q(5485),
+         q(5486),
          q(0),
          ],
       q(plb) => [
-         q(5486),
+         q(5487),
          q(0),
          ],
       q(plc) => [
-         q(5487),
+         q(5488),
          q(0),
          ],
       q(pld) => [
-         q(5488),
+         q(5489),
          q(0),
          ],
       q(ple) => [
-         q(5489),
+         q(5490),
          q(0),
          ],
       q(plf) => [
@@ -79556,11 +79624,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(plg) => [
-         q(5490),
+         q(5491),
          q(0),
          ],
       q(plh) => [
-         q(5491),
+         q(5492),
          q(0),
          ],
       q(pli) => [
@@ -79568,279 +79636,279 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(plj) => [
-         q(5492),
+         q(5493),
          q(0),
          ],
       q(plk) => [
-         q(5493),
+         q(5494),
          q(0),
          ],
       q(pll) => [
-         q(5494),
+         q(5495),
          q(0),
          ],
       q(pln) => [
-         q(5495),
+         q(5496),
          q(0),
          ],
       q(plo) => [
-         q(5496),
+         q(5497),
          q(0),
          ],
       q(plp) => [
-         q(5497),
+         q(5498),
          q(0),
          ],
       q(plq) => [
-         q(5498),
+         q(5499),
          q(0),
          ],
       q(plr) => [
-         q(5499),
+         q(5500),
          q(0),
          ],
       q(pls) => [
-         q(5500),
+         q(5501),
          q(0),
          ],
       q(plt) => [
-         q(5501),
+         q(5502),
          q(0),
          ],
       q(plu) => [
-         q(5502),
+         q(5503),
          q(0),
          ],
       q(plv) => [
-         q(5503),
+         q(5504),
          q(0),
          ],
       q(plw) => [
-         q(5504),
+         q(5505),
          q(0),
          ],
       q(ply) => [
-         q(5505),
+         q(5506),
          q(0),
          ],
       q(plz) => [
-         q(5506),
+         q(5507),
          q(0),
          ],
       q(pma) => [
-         q(5507),
+         q(5508),
          q(0),
          ],
       q(pmb) => [
-         q(5508),
+         q(5509),
          q(0),
          ],
       q(pmc) => [
-         q(5509),
+         q(5510),
          q(0),
          ],
       q(pmd) => [
-         q(5510),
+         q(5511),
          q(0),
          ],
       q(pme) => [
-         q(5511),
+         q(5512),
          q(0),
          ],
       q(pmf) => [
-         q(5512),
+         q(5513),
          q(0),
          ],
       q(pmh) => [
-         q(5513),
+         q(5514),
          q(0),
          ],
       q(pmi) => [
-         q(5514),
+         q(5515),
          q(0),
          ],
       q(pmj) => [
-         q(5515),
+         q(5516),
          q(0),
          ],
       q(pmk) => [
-         q(5516),
+         q(5517),
          q(0),
          ],
       q(pml) => [
-         q(5517),
+         q(5518),
          q(0),
          ],
       q(pmm) => [
-         q(5518),
+         q(5519),
          q(0),
          ],
       q(pmn) => [
-         q(5519),
+         q(5520),
          q(0),
          ],
       q(pmo) => [
-         q(5520),
+         q(5521),
          q(0),
          ],
       q(pmq) => [
-         q(5521),
+         q(5522),
          q(0),
          ],
       q(pmr) => [
-         q(5522),
+         q(5523),
          q(0),
          ],
       q(pms) => [
-         q(5523),
+         q(5524),
          q(0),
          ],
       q(pmt) => [
-         q(5524),
+         q(5525),
          q(0),
          ],
       q(pmw) => [
-         q(5525),
+         q(5526),
          q(0),
          ],
       q(pmx) => [
-         q(5526),
+         q(5527),
          q(0),
          ],
       q(pmy) => [
-         q(5527),
+         q(5528),
          q(0),
          ],
       q(pmz) => [
-         q(5528),
+         q(5529),
          q(0),
          ],
       q(pna) => [
-         q(5529),
+         q(5530),
          q(0),
          ],
       q(pnb) => [
-         q(5530),
+         q(5531),
          q(0),
          ],
       q(pnc) => [
-         q(5531),
+         q(5532),
          q(0),
          ],
       q(pne) => [
-         q(5532),
+         q(5533),
          q(0),
          ],
       q(png) => [
-         q(5533),
+         q(5534),
          q(0),
          ],
       q(pnh) => [
-         q(5534),
+         q(5535),
          q(0),
          ],
       q(pni) => [
-         q(5535),
+         q(5536),
          q(0),
          ],
       q(pnj) => [
-         q(5536),
+         q(5537),
          q(0),
          ],
       q(pnk) => [
-         q(5537),
+         q(5538),
          q(0),
          ],
       q(pnl) => [
-         q(5538),
+         q(5539),
          q(0),
          ],
       q(pnm) => [
-         q(5539),
+         q(5540),
          q(0),
          ],
       q(pnn) => [
-         q(5540),
+         q(5541),
          q(0),
          ],
       q(pno) => [
-         q(5541),
+         q(5542),
          q(0),
          ],
       q(pnp) => [
-         q(5542),
+         q(5543),
          q(0),
          ],
       q(pnq) => [
-         q(5543),
+         q(5544),
          q(0),
          ],
       q(pnr) => [
-         q(5544),
+         q(5545),
          q(0),
          ],
       q(pns) => [
-         q(5545),
+         q(5546),
          q(0),
          ],
       q(pnt) => [
-         q(5546),
+         q(5547),
          q(0),
          ],
       q(pnu) => [
-         q(5547),
+         q(5548),
          q(0),
          ],
       q(pnv) => [
-         q(5548),
+         q(5549),
          q(0),
          ],
       q(pnw) => [
-         q(5549),
+         q(5550),
          q(0),
          ],
       q(pnx) => [
-         q(5550),
+         q(5551),
          q(0),
          ],
       q(pny) => [
-         q(5551),
+         q(5552),
          q(0),
          ],
       q(pnz) => [
-         q(5552),
+         q(5553),
          q(0),
          ],
       q(poc) => [
-         q(5553),
+         q(5554),
          q(0),
          ],
       q(pod) => [
-         q(5554),
+         q(5555),
          q(0),
          ],
       q(poe) => [
-         q(5555),
+         q(5556),
          q(0),
          ],
       q(pof) => [
-         q(5556),
+         q(5557),
          q(0),
          ],
       q(pog) => [
-         q(5557),
+         q(5558),
          q(0),
          ],
       q(poh) => [
-         q(5558),
+         q(5559),
          q(0),
          ],
       q(poi) => [
-         q(5559),
+         q(5560),
          q(0),
          ],
       q(pok) => [
-         q(5560),
+         q(5561),
          q(0),
          ],
       q(pol) => [
@@ -79848,7 +79916,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(pom) => [
-         q(5561),
+         q(5562),
          q(0),
          ],
       q(pon) => [
@@ -79856,15 +79924,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(poo) => [
-         q(5562),
+         q(5563),
          q(0),
          ],
       q(pop) => [
-         q(5563),
+         q(5564),
          q(0),
          ],
       q(poq) => [
-         q(5564),
+         q(5565),
          q(0),
          ],
       q(por) => [
@@ -79872,27 +79940,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(pos) => [
-         q(5565),
+         q(5566),
          q(0),
          ],
       q(pot) => [
-         q(5566),
+         q(5567),
          q(0),
          ],
       q(pov) => [
-         q(5567),
+         q(5568),
          q(0),
          ],
       q(pow) => [
-         q(5568),
+         q(5569),
          q(0),
          ],
       q(pox) => [
-         q(5569),
+         q(5570),
          q(0),
          ],
       q(poy) => [
-         q(5570),
+         q(5571),
          q(0),
          ],
       q(poz) => [
@@ -79900,59 +79968,59 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ppa) => [
-         q(5571),
+         q(5572),
          q(0),
          ],
       q(ppe) => [
-         q(5572),
+         q(5573),
          q(0),
          ],
       q(ppi) => [
-         q(5573),
+         q(5574),
          q(0),
          ],
       q(ppk) => [
-         q(5574),
+         q(5575),
          q(0),
          ],
       q(ppl) => [
-         q(5575),
+         q(5576),
          q(0),
          ],
       q(ppm) => [
-         q(5576),
+         q(5577),
          q(0),
          ],
       q(ppn) => [
-         q(5577),
+         q(5578),
          q(0),
          ],
       q(ppo) => [
-         q(5578),
+         q(5579),
          q(0),
          ],
       q(ppp) => [
-         q(5579),
+         q(5580),
          q(0),
          ],
       q(ppq) => [
-         q(5580),
+         q(5581),
          q(0),
          ],
       q(pps) => [
-         q(5581),
+         q(5582),
          q(0),
          ],
       q(ppt) => [
-         q(5582),
+         q(5583),
          q(0),
          ],
       q(ppu) => [
-         q(5583),
+         q(5584),
          q(0),
          ],
       q(pqa) => [
-         q(5584),
+         q(5585),
          q(0),
          ],
       q(pqe) => [
@@ -79960,7 +80028,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(pqm) => [
-         q(5585),
+         q(5586),
          q(0),
          ],
       q(pqw) => [
@@ -79972,51 +80040,51 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(prb) => [
-         q(5586),
+         q(5587),
          q(0),
          ],
       q(prc) => [
-         q(5587),
+         q(5588),
          q(0),
          ],
       q(prd) => [
-         q(5588),
+         q(5589),
          q(0),
          ],
       q(pre) => [
-         q(5589),
+         q(5590),
          q(0),
          ],
       q(prf) => [
-         q(5590),
+         q(5591),
          q(0),
          ],
       q(prg) => [
-         q(5591),
+         q(5592),
          q(0),
          ],
       q(prh) => [
-         q(5592),
+         q(5593),
          q(0),
          ],
       q(pri) => [
-         q(5593),
+         q(5594),
          q(0),
          ],
       q(prk) => [
-         q(5594),
+         q(5595),
          q(0),
          ],
       q(prl) => [
-         q(5595),
+         q(5596),
          q(0),
          ],
       q(prm) => [
-         q(5596),
+         q(5597),
          q(0),
          ],
       q(prn) => [
-         q(5597),
+         q(5598),
          q(0),
          ],
       q(pro) => [
@@ -80024,231 +80092,231 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(prp) => [
-         q(5598),
+         q(5599),
          q(0),
          ],
       q(prq) => [
-         q(5599),
+         q(5600),
          q(0),
          ],
       q(prr) => [
-         q(5600),
+         q(5601),
          q(0),
          ],
       q(prs) => [
-         q(5601),
+         q(5602),
          q(0),
          ],
       q(prt) => [
-         q(5602),
+         q(5603),
          q(0),
          ],
       q(pru) => [
-         q(5603),
+         q(5604),
          q(0),
          ],
       q(prw) => [
-         q(5604),
+         q(5605),
          q(0),
          ],
       q(prx) => [
-         q(5605),
+         q(5606),
          q(0),
          ],
       q(pry) => [
-         q(5606),
+         q(5607),
          q(0),
          ],
       q(prz) => [
-         q(5607),
+         q(5608),
          q(0),
          ],
       q(psa) => [
-         q(5608),
+         q(5609),
          q(0),
          ],
       q(psc) => [
-         q(5609),
+         q(5610),
          q(0),
          ],
       q(psd) => [
-         q(5610),
+         q(5611),
          q(0),
          ],
       q(pse) => [
-         q(5611),
+         q(5612),
          q(0),
          ],
       q(psg) => [
-         q(5612),
+         q(5613),
          q(0),
          ],
       q(psh) => [
-         q(5613),
+         q(5614),
          q(0),
          ],
       q(psi) => [
-         q(5614),
+         q(5615),
          q(0),
          ],
       q(psl) => [
-         q(5615),
+         q(5616),
          q(0),
          ],
       q(psm) => [
-         q(5616),
+         q(5617),
          q(0),
          ],
       q(psn) => [
-         q(5617),
+         q(5618),
          q(0),
          ],
       q(pso) => [
-         q(5618),
+         q(5619),
          q(0),
          ],
       q(psp) => [
-         q(5619),
+         q(5620),
          q(0),
          ],
       q(psq) => [
-         q(5620),
+         q(5621),
          q(0),
          ],
       q(psr) => [
-         q(5621),
+         q(5622),
          q(0),
          ],
       q(pss) => [
-         q(5622),
+         q(5623),
          q(0),
          ],
       q(pst) => [
-         q(5623),
+         q(5624),
          q(0),
          ],
       q(psu) => [
-         q(5624),
+         q(5625),
          q(0),
          ],
       q(psw) => [
-         q(5625),
+         q(5626),
          q(0),
          ],
       q(psy) => [
-         q(5626),
+         q(5627),
          q(0),
          ],
       q(pta) => [
-         q(5627),
+         q(5628),
          q(0),
          ],
       q(pth) => [
-         q(5628),
+         q(5629),
          q(0),
          ],
       q(pti) => [
-         q(5629),
+         q(5630),
          q(0),
          ],
       q(ptn) => [
-         q(5630),
+         q(5631),
          q(0),
          ],
       q(pto) => [
-         q(5631),
+         q(5632),
          q(0),
          ],
       q(ptp) => [
-         q(5632),
+         q(5633),
          q(0),
          ],
       q(ptq) => [
-         q(5633),
+         q(5634),
          q(0),
          ],
       q(ptr) => [
-         q(5634),
+         q(5635),
          q(0),
          ],
       q(ptt) => [
-         q(5635),
+         q(5636),
          q(0),
          ],
       q(ptu) => [
-         q(5636),
+         q(5637),
          q(0),
          ],
       q(ptv) => [
-         q(5637),
+         q(5638),
          q(0),
          ],
       q(ptw) => [
-         q(5638),
+         q(5639),
          q(0),
          ],
       q(pty) => [
-         q(5639),
+         q(5640),
          q(0),
          ],
       q(pua) => [
-         q(5640),
+         q(5641),
          q(0),
          ],
       q(pub) => [
-         q(5641),
+         q(5642),
          q(0),
          ],
       q(puc) => [
-         q(5642),
+         q(5643),
          q(0),
          ],
       q(pud) => [
-         q(5643),
+         q(5644),
          q(0),
          ],
       q(pue) => [
-         q(5644),
+         q(5645),
          q(0),
          ],
       q(puf) => [
-         q(5645),
+         q(5646),
          q(0),
          ],
       q(pug) => [
-         q(5646),
+         q(5647),
          q(0),
          ],
       q(pui) => [
-         q(5647),
+         q(5648),
          q(0),
          ],
       q(puj) => [
-         q(5648),
+         q(5649),
          q(0),
          ],
       q(puk) => [
-         q(5649),
+         q(5650),
          q(0),
          ],
       q(pum) => [
-         q(5650),
+         q(5651),
          q(0),
          ],
       q(puo) => [
-         q(5651),
+         q(5652),
          q(0),
          ],
       q(pup) => [
-         q(5652),
+         q(5653),
          q(0),
          ],
       q(puq) => [
-         q(5653),
+         q(5654),
          q(0),
          ],
       q(pur) => [
-         q(5654),
+         q(5655),
          q(0),
          ],
       q(pus) => [
@@ -80256,95 +80324,95 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(put) => [
-         q(5655),
+         q(5656),
          q(0),
          ],
       q(puu) => [
-         q(5656),
+         q(5657),
          q(0),
          ],
       q(puw) => [
-         q(5657),
+         q(5658),
          q(0),
          ],
       q(pux) => [
-         q(5658),
+         q(5659),
          q(0),
          ],
       q(puy) => [
-         q(5659),
+         q(5660),
          q(0),
          ],
       q(pwa) => [
-         q(5660),
+         q(5661),
          q(0),
          ],
       q(pwb) => [
-         q(5661),
+         q(5662),
          q(0),
          ],
       q(pwg) => [
-         q(5662),
+         q(5663),
          q(0),
          ],
       q(pwi) => [
-         q(5663),
+         q(5664),
          q(0),
          ],
       q(pwm) => [
-         q(5664),
+         q(5665),
          q(0),
          ],
       q(pwn) => [
-         q(5665),
+         q(5666),
          q(0),
          ],
       q(pwo) => [
-         q(5666),
+         q(5667),
          q(0),
          ],
       q(pwr) => [
-         q(5667),
+         q(5668),
          q(0),
          ],
       q(pww) => [
-         q(5668),
+         q(5669),
          q(0),
          ],
       q(pxm) => [
-         q(5669),
+         q(5670),
          q(0),
          ],
       q(pye) => [
-         q(5670),
+         q(5671),
          q(0),
          ],
       q(pym) => [
-         q(5671),
+         q(5672),
          q(0),
          ],
       q(pyn) => [
-         q(5672),
+         q(5673),
          q(0),
          ],
       q(pys) => [
-         q(5673),
+         q(5674),
          q(0),
          ],
       q(pyu) => [
-         q(5674),
+         q(5675),
          q(0),
          ],
       q(pyx) => [
-         q(5675),
+         q(5676),
          q(0),
          ],
       q(pyy) => [
-         q(5676),
+         q(5677),
          q(0),
          ],
       q(pzn) => [
-         q(5677),
+         q(5678),
          q(0),
          ],
       q(qtz) => [
@@ -80352,19 +80420,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(qua) => [
-         q(5678),
+         q(5679),
          q(0),
          ],
       q(qub) => [
-         q(5679),
+         q(5680),
          q(0),
          ],
       q(quc) => [
-         q(5680),
+         q(5681),
          q(0),
          ],
       q(qud) => [
-         q(5681),
+         q(5682),
          q(0),
          ],
       q(que) => [
@@ -80372,139 +80440,139 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(quf) => [
-         q(5682),
+         q(5683),
          q(0),
          ],
       q(qug) => [
-         q(5683),
+         q(5684),
          q(0),
          ],
       q(quh) => [
-         q(5684),
+         q(5685),
          q(0),
          ],
       q(qui) => [
-         q(5685),
+         q(5686),
          q(0),
          ],
       q(quk) => [
-         q(5686),
+         q(5687),
          q(0),
          ],
       q(qul) => [
-         q(5687),
+         q(5688),
          q(0),
          ],
       q(qum) => [
-         q(5688),
+         q(5689),
          q(0),
          ],
       q(qun) => [
-         q(5689),
+         q(5690),
          q(0),
          ],
       q(qup) => [
-         q(5690),
+         q(5691),
          q(0),
          ],
       q(quq) => [
-         q(5691),
+         q(5692),
          q(0),
          ],
       q(qur) => [
-         q(5692),
+         q(5693),
          q(0),
          ],
       q(qus) => [
-         q(5693),
+         q(5694),
          q(0),
          ],
       q(quv) => [
-         q(5694),
+         q(5695),
          q(0),
          ],
       q(quw) => [
-         q(5695),
+         q(5696),
          q(0),
          ],
       q(qux) => [
-         q(5696),
+         q(5697),
          q(0),
          ],
       q(quy) => [
-         q(5697),
+         q(5698),
          q(0),
          ],
       q(quz) => [
-         q(5698),
+         q(5699),
          q(0),
          ],
       q(qva) => [
-         q(5699),
+         q(5700),
          q(0),
          ],
       q(qvc) => [
-         q(5700),
+         q(5701),
          q(0),
          ],
       q(qve) => [
-         q(5701),
+         q(5702),
          q(0),
          ],
       q(qvh) => [
-         q(5702),
+         q(5703),
          q(0),
          ],
       q(qvi) => [
-         q(5703),
+         q(5704),
          q(0),
          ],
       q(qvj) => [
-         q(5704),
+         q(5705),
          q(0),
          ],
       q(qvl) => [
-         q(5705),
+         q(5706),
          q(0),
          ],
       q(qvm) => [
-         q(5706),
+         q(5707),
          q(0),
          ],
       q(qvn) => [
-         q(5707),
+         q(5708),
          q(0),
          ],
       q(qvo) => [
-         q(5708),
+         q(5709),
          q(0),
          ],
       q(qvp) => [
-         q(5709),
+         q(5710),
          q(0),
          ],
       q(qvs) => [
-         q(5710),
+         q(5711),
          q(0),
          ],
       q(qvw) => [
-         q(5711),
+         q(5712),
          q(0),
          ],
       q(qvy) => [
-         q(5712),
+         q(5713),
          q(0),
          ],
       q(qvz) => [
-         q(5713),
+         q(5714),
          q(0),
          ],
       q(qwa) => [
-         q(5714),
+         q(5715),
          q(0),
          ],
       q(qwc) => [
-         q(5715),
+         q(5716),
          q(0),
          ],
       q(qwe) => [
@@ -80512,111 +80580,111 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(qwh) => [
-         q(5716),
+         q(5717),
          q(0),
          ],
       q(qwm) => [
-         q(5717),
+         q(5718),
          q(0),
          ],
       q(qws) => [
-         q(5718),
+         q(5719),
          q(0),
          ],
       q(qwt) => [
-         q(5719),
+         q(5720),
          q(0),
          ],
       q(qxa) => [
-         q(5720),
+         q(5721),
          q(0),
          ],
       q(qxc) => [
-         q(5721),
+         q(5722),
          q(0),
          ],
       q(qxh) => [
-         q(5722),
+         q(5723),
          q(0),
          ],
       q(qxl) => [
-         q(5723),
+         q(5724),
          q(0),
          ],
       q(qxn) => [
-         q(5724),
+         q(5725),
          q(0),
          ],
       q(qxo) => [
-         q(5725),
+         q(5726),
          q(0),
          ],
       q(qxp) => [
-         q(5726),
+         q(5727),
          q(0),
          ],
       q(qxq) => [
-         q(5727),
+         q(5728),
          q(0),
          ],
       q(qxr) => [
-         q(5728),
+         q(5729),
          q(0),
          ],
       q(qxs) => [
-         q(5729),
+         q(5730),
          q(0),
          ],
       q(qxt) => [
-         q(5730),
+         q(5731),
          q(0),
          ],
       q(qxu) => [
-         q(5731),
+         q(5732),
          q(0),
          ],
       q(qxw) => [
-         q(5732),
+         q(5733),
          q(0),
          ],
       q(qya) => [
-         q(5733),
+         q(5734),
          q(0),
          ],
       q(qyp) => [
-         q(5734),
+         q(5735),
          q(0),
          ],
       q(raa) => [
-         q(5735),
+         q(5736),
          q(0),
          ],
       q(rab) => [
-         q(5736),
+         q(5737),
          q(0),
          ],
       q(rac) => [
-         q(5737),
+         q(5738),
          q(0),
          ],
       q(rad) => [
-         q(5738),
+         q(5739),
          q(0),
          ],
       q(raf) => [
-         q(5739),
+         q(5740),
          q(0),
          ],
       q(rag) => [
-         q(5740),
+         q(5741),
          q(0),
          ],
       q(rah) => [
-         q(5741),
+         q(5742),
          q(0),
          ],
       q(rai) => [
-         q(5742),
+         q(5743),
          q(0),
          ],
       q(raj) => [
@@ -80624,23 +80692,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(rak) => [
-         q(5743),
+         q(5744),
          q(0),
          ],
       q(ral) => [
-         q(5744),
+         q(5745),
          q(0),
          ],
       q(ram) => [
-         q(5745),
+         q(5746),
          q(0),
          ],
       q(ran) => [
-         q(5746),
+         q(5747),
          q(0),
          ],
       q(rao) => [
-         q(5747),
+         q(5748),
          q(0),
          ],
       q(rap) => [
@@ -80648,7 +80716,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(raq) => [
-         q(5748),
+         q(5749),
          q(0),
          ],
       q(rar) => [
@@ -80656,351 +80724,351 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ras) => [
-         q(5749),
+         q(5750),
          q(0),
          ],
       q(rat) => [
-         q(5750),
+         q(5751),
          q(0),
          ],
       q(rau) => [
-         q(5751),
+         q(5752),
          q(0),
          ],
       q(rav) => [
-         q(5752),
+         q(5753),
          q(0),
          ],
       q(raw) => [
-         q(5753),
+         q(5754),
          q(0),
          ],
       q(rax) => [
-         q(5754),
+         q(5755),
          q(0),
          ],
       q(ray) => [
-         q(5755),
+         q(5756),
          q(0),
          ],
       q(raz) => [
-         q(5756),
+         q(5757),
          q(0),
          ],
       q(rbb) => [
-         q(5757),
+         q(5758),
          q(0),
          ],
       q(rbk) => [
-         q(5758),
+         q(5759),
          q(0),
          ],
       q(rbl) => [
-         q(5759),
+         q(5760),
          q(0),
          ],
       q(rbp) => [
-         q(5760),
+         q(5761),
          q(0),
          ],
       q(rcf) => [
-         q(5761),
+         q(5762),
          q(0),
          ],
       q(rdb) => [
-         q(5762),
+         q(5763),
          q(0),
          ],
       q(rea) => [
-         q(5763),
+         q(5764),
          q(0),
          ],
       q(reb) => [
-         q(5764),
+         q(5765),
          q(0),
          ],
       q(ree) => [
-         q(5765),
+         q(5766),
          q(0),
          ],
       q(reg) => [
-         q(5766),
+         q(5767),
          q(0),
          ],
       q(rei) => [
-         q(5767),
+         q(5768),
          q(0),
          ],
       q(rej) => [
-         q(5768),
+         q(5769),
          q(0),
          ],
       q(rel) => [
-         q(5769),
+         q(5770),
          q(0),
          ],
       q(rem) => [
-         q(5770),
+         q(5771),
          q(0),
          ],
       q(ren) => [
-         q(5771),
+         q(5772),
          q(0),
          ],
       q(rer) => [
-         q(5772),
+         q(5773),
          q(0),
          ],
       q(res) => [
-         q(5773),
+         q(5774),
          q(0),
          ],
       q(ret) => [
-         q(5774),
+         q(5775),
          q(0),
          ],
       q(rey) => [
-         q(5775),
+         q(5776),
          q(0),
          ],
       q(rga) => [
-         q(5776),
+         q(5777),
          q(0),
          ],
       q(rge) => [
-         q(5777),
+         q(5778),
          q(0),
          ],
       q(rgk) => [
-         q(5778),
+         q(5779),
          q(0),
          ],
       q(rgn) => [
-         q(5779),
+         q(5780),
          q(0),
          ],
       q(rgr) => [
-         q(5780),
+         q(5781),
          q(0),
          ],
       q(rgs) => [
-         q(5781),
+         q(5782),
          q(0),
          ],
       q(rgu) => [
-         q(5782),
+         q(5783),
          q(0),
          ],
       q(rhg) => [
-         q(5783),
+         q(5784),
          q(0),
          ],
       q(rhp) => [
-         q(5784),
+         q(5785),
          q(0),
          ],
       q(ria) => [
-         q(5785),
+         q(5786),
          q(0),
          ],
       q(rie) => [
-         q(5786),
+         q(5787),
          q(0),
          ],
       q(rif) => [
-         q(5787),
+         q(5788),
          q(0),
          ],
       q(ril) => [
-         q(5788),
+         q(5789),
          q(0),
          ],
       q(rim) => [
-         q(5789),
+         q(5790),
          q(0),
          ],
       q(rin) => [
-         q(5790),
+         q(5791),
          q(0),
          ],
       q(rir) => [
-         q(5791),
+         q(5792),
          q(0),
          ],
       q(rit) => [
-         q(5792),
+         q(5793),
          q(0),
          ],
       q(riu) => [
-         q(5793),
+         q(5794),
          q(0),
          ],
       q(rjg) => [
-         q(5794),
+         q(5795),
          q(0),
          ],
       q(rji) => [
-         q(5795),
+         q(5796),
          q(0),
          ],
       q(rjs) => [
-         q(5796),
+         q(5797),
          q(0),
          ],
       q(rka) => [
-         q(5797),
+         q(5798),
          q(0),
          ],
       q(rkb) => [
-         q(5798),
+         q(5799),
          q(0),
          ],
       q(rkh) => [
-         q(5799),
+         q(5800),
          q(0),
          ],
       q(rki) => [
-         q(5800),
+         q(5801),
          q(0),
          ],
       q(rkm) => [
-         q(5801),
+         q(5802),
          q(0),
          ],
       q(rkt) => [
-         q(5802),
+         q(5803),
          q(0),
          ],
       q(rkw) => [
-         q(5803),
+         q(5804),
          q(0),
          ],
       q(rma) => [
-         q(5804),
+         q(5805),
          q(0),
          ],
       q(rmb) => [
-         q(5805),
+         q(5806),
          q(0),
          ],
       q(rmc) => [
-         q(5806),
+         q(5807),
          q(0),
          ],
       q(rmd) => [
-         q(5807),
+         q(5808),
          q(0),
          ],
       q(rme) => [
-         q(5808),
+         q(5809),
          q(0),
          ],
       q(rmf) => [
-         q(5809),
+         q(5810),
          q(0),
          ],
       q(rmg) => [
-         q(5810),
+         q(5811),
          q(0),
          ],
       q(rmh) => [
-         q(5811),
+         q(5812),
          q(0),
          ],
       q(rmi) => [
-         q(5812),
+         q(5813),
          q(0),
          ],
       q(rmk) => [
-         q(5813),
+         q(5814),
          q(0),
          ],
       q(rml) => [
-         q(5814),
+         q(5815),
          q(0),
          ],
       q(rmm) => [
-         q(5815),
+         q(5816),
          q(0),
          ],
       q(rmn) => [
-         q(5816),
+         q(5817),
          q(0),
          ],
       q(rmo) => [
-         q(5817),
+         q(5818),
          q(0),
          ],
       q(rmp) => [
-         q(5818),
+         q(5819),
          q(0),
          ],
       q(rmq) => [
-         q(5819),
+         q(5820),
          q(0),
          ],
       q(rms) => [
-         q(5820),
+         q(5821),
          q(0),
          ],
       q(rmt) => [
-         q(5821),
+         q(5822),
          q(0),
          ],
       q(rmu) => [
-         q(5822),
+         q(5823),
          q(0),
          ],
       q(rmv) => [
-         q(5823),
+         q(5824),
          q(0),
          ],
       q(rmw) => [
-         q(5824),
+         q(5825),
          q(0),
          ],
       q(rmx) => [
-         q(5825),
+         q(5826),
          q(0),
          ],
       q(rmy) => [
-         q(5826),
+         q(5827),
          q(0),
          ],
       q(rmz) => [
-         q(5827),
+         q(5828),
          q(0),
          ],
       q(rna) => [
-         q(5828),
+         q(5829),
          q(0),
          ],
       q(rnd) => [
-         q(5829),
+         q(5830),
          q(0),
          ],
       q(rng) => [
-         q(5830),
+         q(5831),
          q(0),
          ],
       q(rnl) => [
-         q(5831),
+         q(5832),
          q(0),
          ],
       q(rnn) => [
-         q(5832),
+         q(5833),
          q(0),
          ],
       q(rnp) => [
-         q(5833),
+         q(5834),
          q(0),
          ],
       q(rnr) => [
-         q(5834),
+         q(5835),
          q(0),
          ],
       q(rnw) => [
-         q(5835),
+         q(5836),
          q(0),
          ],
       q(roa) => [
@@ -81008,27 +81076,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(rob) => [
-         q(5836),
+         q(5837),
          q(0),
          ],
       q(roc) => [
-         q(5837),
+         q(5838),
          q(0),
          ],
       q(rod) => [
-         q(5838),
+         q(5839),
          q(0),
          ],
       q(roe) => [
-         q(5839),
+         q(5840),
          q(0),
          ],
       q(rof) => [
-         q(5840),
+         q(5841),
          q(0),
          ],
       q(rog) => [
-         q(5841),
+         q(5842),
          q(0),
          ],
       q(roh) => [
@@ -81036,7 +81104,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(rol) => [
-         q(5842),
+         q(5843),
          q(0),
          ],
       q(rom) => [
@@ -81044,107 +81112,107 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(roo) => [
-         q(5843),
+         q(5844),
          q(0),
          ],
       q(rop) => [
-         q(5844),
+         q(5845),
          q(0),
          ],
       q(ror) => [
-         q(5845),
+         q(5846),
          q(0),
          ],
       q(rou) => [
-         q(5846),
+         q(5847),
          q(0),
          ],
       q(row) => [
-         q(5847),
+         q(5848),
          q(0),
          ],
       q(rpn) => [
-         q(5848),
+         q(5849),
          q(0),
          ],
       q(rpt) => [
-         q(5849),
+         q(5850),
          q(0),
          ],
       q(rri) => [
-         q(5850),
+         q(5851),
          q(0),
          ],
       q(rro) => [
-         q(5851),
+         q(5852),
          q(0),
          ],
       q(rrt) => [
-         q(5852),
+         q(5853),
          q(0),
          ],
       q(rsb) => [
-         q(5853),
+         q(5854),
          q(0),
          ],
       q(rsi) => [
-         q(5854),
+         q(5855),
          q(0),
          ],
       q(rsl) => [
-         q(5855),
+         q(5856),
          q(0),
          ],
       q(rtc) => [
-         q(5856),
+         q(5857),
          q(0),
          ],
       q(rth) => [
-         q(5857),
+         q(5858),
          q(0),
          ],
       q(rtm) => [
-         q(5858),
+         q(5859),
          q(0),
          ],
       q(rts) => [
-         q(5859),
+         q(5860),
          q(0),
          ],
       q(rtw) => [
-         q(5860),
+         q(5861),
          q(0),
          ],
       q(rub) => [
-         q(5861),
+         q(5862),
          q(0),
          ],
       q(ruc) => [
-         q(5862),
+         q(5863),
          q(0),
          ],
       q(rue) => [
-         q(5863),
+         q(5864),
          q(0),
          ],
       q(ruf) => [
-         q(5864),
+         q(5865),
          q(0),
          ],
       q(rug) => [
-         q(5865),
+         q(5866),
          q(0),
          ],
       q(ruh) => [
-         q(5866),
+         q(5867),
          q(0),
          ],
       q(rui) => [
-         q(5867),
+         q(5868),
          q(0),
          ],
       q(ruk) => [
-         q(5868),
+         q(5869),
          q(0),
          ],
       q(rum) => [
@@ -81156,7 +81224,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ruo) => [
-         q(5869),
+         q(5870),
          q(0),
          ],
       q(rup) => [
@@ -81164,7 +81232,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(2),
          ],
       q(ruq) => [
-         q(5870),
+         q(5871),
          q(0),
          ],
       q(rus) => [
@@ -81172,71 +81240,71 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(rut) => [
-         q(5871),
+         q(5872),
          q(0),
          ],
       q(ruu) => [
-         q(5872),
+         q(5873),
          q(0),
          ],
       q(ruy) => [
-         q(5873),
+         q(5874),
          q(0),
          ],
       q(ruz) => [
-         q(5874),
+         q(5875),
          q(0),
          ],
       q(rwa) => [
-         q(5875),
+         q(5876),
          q(0),
          ],
       q(rwk) => [
-         q(5876),
+         q(5877),
          q(0),
          ],
       q(rwm) => [
-         q(5877),
+         q(5878),
          q(0),
          ],
       q(rwo) => [
-         q(5878),
+         q(5879),
          q(0),
          ],
       q(rwr) => [
-         q(5879),
+         q(5880),
          q(0),
          ],
       q(rxd) => [
-         q(5880),
+         q(5881),
          q(0),
          ],
       q(rxw) => [
-         q(5881),
+         q(5882),
          q(0),
          ],
       q(ryn) => [
-         q(5882),
+         q(5883),
          q(0),
          ],
       q(rys) => [
-         q(5883),
+         q(5884),
          q(0),
          ],
       q(ryu) => [
-         q(5884),
+         q(5885),
          q(0),
          ],
       q(saa) => [
-         q(5885),
+         q(5886),
          q(0),
          ],
       q(sab) => [
-         q(5886),
+         q(5887),
          q(0),
          ],
       q(sac) => [
-         q(5887),
+         q(5888),
          q(0),
          ],
       q(sad) => [
@@ -81244,11 +81312,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sae) => [
-         q(5888),
+         q(5889),
          q(0),
          ],
       q(saf) => [
-         q(5889),
+         q(5890),
          q(0),
          ],
       q(sag) => [
@@ -81264,11 +81332,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(saj) => [
-         q(5890),
+         q(5891),
          q(0),
          ],
       q(sak) => [
-         q(5891),
+         q(5892),
          q(0),
          ],
       q(sal) => [
@@ -81284,15 +81352,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sao) => [
-         q(5892),
+         q(5893),
          q(0),
          ],
       q(saq) => [
-         q(5893),
+         q(5894),
          q(0),
          ],
       q(sar) => [
-         q(5894),
+         q(5895),
          q(0),
          ],
       q(sas) => [
@@ -81304,163 +81372,163 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sau) => [
-         q(5895),
+         q(5896),
          q(0),
          ],
       q(sav) => [
-         q(5896),
+         q(5897),
          q(0),
          ],
       q(saw) => [
-         q(5897),
+         q(5898),
          q(0),
          ],
       q(sax) => [
-         q(5898),
+         q(5899),
          q(0),
          ],
       q(say) => [
-         q(5899),
+         q(5900),
          q(0),
          ],
       q(saz) => [
-         q(5900),
+         q(5901),
          q(0),
          ],
       q(sba) => [
-         q(5901),
+         q(5902),
          q(0),
          ],
       q(sbb) => [
-         q(5902),
+         q(5903),
          q(0),
          ],
       q(sbc) => [
-         q(5903),
+         q(5904),
          q(0),
          ],
       q(sbd) => [
-         q(5904),
+         q(5905),
          q(0),
          ],
       q(sbe) => [
-         q(5905),
+         q(5906),
          q(0),
          ],
       q(sbf) => [
-         q(5906),
+         q(5907),
          q(0),
          ],
       q(sbg) => [
-         q(5907),
+         q(5908),
          q(0),
          ],
       q(sbh) => [
-         q(5908),
+         q(5909),
          q(0),
          ],
       q(sbi) => [
-         q(5909),
+         q(5910),
          q(0),
          ],
       q(sbj) => [
-         q(5910),
+         q(5911),
          q(0),
          ],
       q(sbk) => [
-         q(5911),
+         q(5912),
          q(0),
          ],
       q(sbl) => [
-         q(5912),
+         q(5913),
          q(0),
          ],
       q(sbm) => [
-         q(5913),
+         q(5914),
          q(0),
          ],
       q(sbn) => [
-         q(5914),
+         q(5915),
          q(0),
          ],
       q(sbo) => [
-         q(5915),
+         q(5916),
          q(0),
          ],
       q(sbp) => [
-         q(5916),
+         q(5917),
          q(0),
          ],
       q(sbq) => [
-         q(5917),
+         q(5918),
          q(0),
          ],
       q(sbr) => [
-         q(5918),
+         q(5919),
          q(0),
          ],
       q(sbs) => [
-         q(5919),
+         q(5920),
          q(0),
          ],
       q(sbt) => [
-         q(5920),
+         q(5921),
          q(0),
          ],
       q(sbu) => [
-         q(5921),
+         q(5922),
          q(0),
          ],
       q(sbv) => [
-         q(5922),
+         q(5923),
          q(0),
          ],
       q(sbw) => [
-         q(5923),
+         q(5924),
          q(0),
          ],
       q(sbx) => [
-         q(5924),
+         q(5925),
          q(0),
          ],
       q(sby) => [
-         q(5925),
+         q(5926),
          q(0),
          ],
       q(sbz) => [
-         q(5926),
+         q(5927),
          q(0),
          ],
       q(scb) => [
-         q(5927),
+         q(5928),
          q(0),
          ],
       q(sce) => [
-         q(5928),
+         q(5929),
          q(0),
          ],
       q(scf) => [
-         q(5929),
+         q(5930),
          q(0),
          ],
       q(scg) => [
-         q(5930),
+         q(5931),
          q(0),
          ],
       q(sch) => [
-         q(5931),
+         q(5932),
          q(0),
          ],
       q(sci) => [
-         q(5932),
+         q(5933),
          q(0),
          ],
       q(sck) => [
-         q(5933),
+         q(5934),
          q(0),
          ],
       q(scl) => [
-         q(5934),
+         q(5935),
          q(0),
          ],
       q(scn) => [
@@ -81472,103 +81540,103 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(scp) => [
-         q(5935),
+         q(5936),
          q(0),
          ],
       q(scq) => [
-         q(5936),
+         q(5937),
          q(0),
          ],
       q(scs) => [
-         q(5937),
+         q(5938),
          q(0),
          ],
       q(scu) => [
-         q(5938),
+         q(5939),
          q(0),
          ],
       q(scv) => [
-         q(5939),
+         q(5940),
          q(0),
          ],
       q(scw) => [
-         q(5940),
+         q(5941),
          q(0),
          ],
       q(scx) => [
-         q(5941),
+         q(5942),
          q(0),
          ],
       q(sda) => [
-         q(5942),
+         q(5943),
          q(0),
          ],
       q(sdb) => [
-         q(5943),
+         q(5944),
          q(0),
          ],
       q(sdc) => [
-         q(5944),
+         q(5945),
          q(0),
          ],
       q(sde) => [
-         q(5945),
+         q(5946),
          q(0),
          ],
       q(sdf) => [
-         q(5946),
+         q(5947),
          q(0),
          ],
       q(sdg) => [
-         q(5947),
+         q(5948),
          q(0),
          ],
       q(sdh) => [
-         q(5948),
+         q(5949),
          q(0),
          ],
       q(sdj) => [
-         q(5949),
+         q(5950),
          q(0),
          ],
       q(sdk) => [
-         q(5950),
+         q(5951),
          q(0),
          ],
       q(sdl) => [
-         q(5951),
+         q(5952),
          q(0),
          ],
       q(sdm) => [
-         q(5952),
+         q(5953),
          q(0),
          ],
       q(sdn) => [
-         q(5953),
+         q(5954),
          q(0),
          ],
       q(sdo) => [
-         q(5954),
+         q(5955),
          q(0),
          ],
       q(sdp) => [
-         q(5955),
+         q(5956),
          q(0),
          ],
       q(sdr) => [
-         q(5956),
+         q(5957),
          q(0),
          ],
       q(sds) => [
-         q(5957),
+         q(5958),
          q(0),
          ],
       q(sdt) => [
-         q(5958),
+         q(5959),
          q(0),
          ],
       q(sdu) => [
-         q(5959),
+         q(5960),
          q(0),
          ],
       q(sdv) => [
@@ -81576,55 +81644,55 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sdx) => [
-         q(5960),
+         q(5961),
          q(0),
          ],
       q(sdz) => [
-         q(5961),
+         q(5962),
          q(0),
          ],
       q(sea) => [
-         q(5962),
+         q(5963),
          q(0),
          ],
       q(seb) => [
-         q(5963),
+         q(5964),
          q(0),
          ],
       q(sec) => [
-         q(5964),
+         q(5965),
          q(0),
          ],
       q(sed) => [
-         q(5965),
+         q(5966),
          q(0),
          ],
       q(see) => [
-         q(5966),
+         q(5967),
          q(0),
          ],
       q(sef) => [
-         q(5967),
+         q(5968),
          q(0),
          ],
       q(seg) => [
-         q(5968),
+         q(5969),
          q(0),
          ],
       q(seh) => [
-         q(5969),
+         q(5970),
          q(0),
          ],
       q(sei) => [
-         q(5970),
+         q(5971),
          q(0),
          ],
       q(sej) => [
-         q(5971),
+         q(5972),
          q(0),
          ],
       q(sek) => [
-         q(5972),
+         q(5973),
          q(0),
          ],
       q(sel) => [
@@ -81636,71 +81704,71 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sen) => [
-         q(5973),
+         q(5974),
          q(0),
          ],
       q(seo) => [
-         q(5974),
+         q(5975),
          q(0),
          ],
       q(sep) => [
-         q(5975),
+         q(5976),
          q(0),
          ],
       q(seq) => [
-         q(5976),
+         q(5977),
          q(0),
          ],
       q(ser) => [
-         q(5977),
+         q(5978),
          q(0),
          ],
       q(ses) => [
-         q(5978),
+         q(5979),
          q(0),
          ],
       q(set) => [
-         q(5979),
+         q(5980),
          q(0),
          ],
       q(seu) => [
-         q(5980),
+         q(5981),
          q(0),
          ],
       q(sev) => [
-         q(5981),
+         q(5982),
          q(0),
          ],
       q(sew) => [
-         q(5982),
+         q(5983),
          q(0),
          ],
       q(sey) => [
-         q(5983),
+         q(5984),
          q(0),
          ],
       q(sez) => [
-         q(5984),
+         q(5985),
          q(0),
          ],
       q(sfb) => [
-         q(5985),
+         q(5986),
          q(0),
          ],
       q(sfe) => [
-         q(5986),
+         q(5987),
          q(0),
          ],
       q(sfm) => [
-         q(5987),
+         q(5988),
          q(0),
          ],
       q(sfs) => [
-         q(5988),
+         q(5989),
          q(0),
          ],
       q(sfw) => [
-         q(5989),
+         q(5990),
          q(0),
          ],
       q(sga) => [
@@ -81708,43 +81776,43 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(sgb) => [
-         q(5990),
+         q(5991),
          q(0),
          ],
       q(sgc) => [
-         q(5991),
+         q(5992),
          q(0),
          ],
       q(sgd) => [
-         q(5992),
+         q(5993),
          q(0),
          ],
       q(sge) => [
-         q(5993),
+         q(5994),
          q(0),
          ],
       q(sgg) => [
-         q(5994),
+         q(5995),
          q(0),
          ],
       q(sgh) => [
-         q(5995),
+         q(5996),
          q(0),
          ],
       q(sgi) => [
-         q(5996),
+         q(5997),
          q(0),
          ],
       q(sgj) => [
-         q(5997),
+         q(5998),
          q(0),
          ],
       q(sgk) => [
-         q(5998),
+         q(5999),
          q(0),
          ],
       q(sgm) => [
-         q(5999),
+         q(6000),
          q(0),
          ],
       q(sgn) => [
@@ -81752,87 +81820,87 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sgp) => [
-         q(6000),
+         q(6001),
          q(0),
          ],
       q(sgr) => [
-         q(6001),
+         q(6002),
          q(0),
          ],
       q(sgs) => [
-         q(6002),
+         q(6003),
          q(0),
          ],
       q(sgt) => [
-         q(6003),
+         q(6004),
          q(0),
          ],
       q(sgu) => [
-         q(6004),
+         q(6005),
          q(0),
          ],
       q(sgw) => [
-         q(6005),
+         q(6006),
          q(0),
          ],
       q(sgx) => [
-         q(6006),
+         q(6007),
          q(0),
          ],
       q(sgy) => [
-         q(6007),
+         q(6008),
          q(0),
          ],
       q(sgz) => [
-         q(6008),
+         q(6009),
          q(0),
          ],
       q(sha) => [
-         q(6009),
+         q(6010),
          q(0),
          ],
       q(shb) => [
-         q(6010),
+         q(6011),
          q(0),
          ],
       q(shc) => [
-         q(6011),
+         q(6012),
          q(0),
          ],
       q(shd) => [
-         q(6012),
+         q(6013),
          q(0),
          ],
       q(she) => [
-         q(6013),
+         q(6014),
          q(0),
          ],
       q(shg) => [
-         q(6014),
+         q(6015),
          q(0),
          ],
       q(shh) => [
-         q(6015),
+         q(6016),
          q(0),
          ],
       q(shi) => [
-         q(6016),
+         q(6017),
          q(0),
          ],
       q(shj) => [
-         q(6017),
+         q(6018),
          q(0),
          ],
       q(shk) => [
-         q(6018),
+         q(6019),
          q(0),
          ],
       q(shl) => [
-         q(6019),
+         q(6020),
          q(0),
          ],
       q(shm) => [
-         q(6020),
+         q(6021),
          q(0),
          ],
       q(shn) => [
@@ -81840,59 +81908,59 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sho) => [
-         q(6021),
+         q(6022),
          q(0),
          ],
       q(shp) => [
-         q(6022),
+         q(6023),
          q(0),
          ],
       q(shq) => [
-         q(6023),
+         q(6024),
          q(0),
          ],
       q(shr) => [
-         q(6024),
+         q(6025),
          q(0),
          ],
       q(shs) => [
-         q(6025),
+         q(6026),
          q(0),
          ],
       q(sht) => [
-         q(6026),
+         q(6027),
          q(0),
          ],
       q(shu) => [
-         q(6027),
+         q(6028),
          q(0),
          ],
       q(shv) => [
-         q(6028),
+         q(6029),
          q(0),
          ],
       q(shw) => [
-         q(6029),
+         q(6030),
          q(0),
          ],
       q(shx) => [
-         q(6030),
+         q(6031),
          q(0),
          ],
       q(shy) => [
-         q(6031),
+         q(6032),
          q(0),
          ],
       q(shz) => [
-         q(6032),
+         q(6033),
          q(0),
          ],
       q(sia) => [
-         q(6033),
+         q(6034),
          q(0),
          ],
       q(sib) => [
-         q(6034),
+         q(6035),
          q(0),
          ],
       q(sid) => [
@@ -81900,39 +81968,39 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sie) => [
-         q(6035),
+         q(6036),
          q(0),
          ],
       q(sif) => [
-         q(6036),
+         q(6037),
          q(0),
          ],
       q(sig) => [
-         q(6037),
+         q(6038),
          q(0),
          ],
       q(sih) => [
-         q(6038),
+         q(6039),
          q(0),
          ],
       q(sii) => [
-         q(6039),
+         q(6040),
          q(0),
          ],
       q(sij) => [
-         q(6040),
+         q(6041),
          q(0),
          ],
       q(sik) => [
-         q(6041),
+         q(6042),
          q(0),
          ],
       q(sil) => [
-         q(6042),
+         q(6043),
          q(0),
          ],
       q(sim) => [
-         q(6043),
+         q(6044),
          q(0),
          ],
       q(sin) => [
@@ -81944,19 +82012,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sip) => [
-         q(6044),
+         q(6045),
          q(0),
          ],
       q(siq) => [
-         q(6045),
+         q(6046),
          q(0),
          ],
       q(sir) => [
-         q(6046),
+         q(6047),
          q(0),
          ],
       q(sis) => [
-         q(6047),
+         q(6048),
          q(0),
          ],
       q(sit) => [
@@ -81964,191 +82032,191 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(siu) => [
-         q(6048),
+         q(6049),
          q(0),
          ],
       q(siv) => [
-         q(6049),
+         q(6050),
          q(0),
          ],
       q(siw) => [
-         q(6050),
+         q(6051),
          q(0),
          ],
       q(six) => [
-         q(6051),
+         q(6052),
          q(0),
          ],
       q(siy) => [
-         q(6052),
+         q(6053),
          q(0),
          ],
       q(siz) => [
-         q(6053),
+         q(6054),
          q(0),
          ],
       q(sja) => [
-         q(6054),
+         q(6055),
          q(0),
          ],
       q(sjb) => [
-         q(6055),
+         q(6056),
          q(0),
          ],
       q(sjd) => [
-         q(6056),
+         q(6057),
          q(0),
          ],
       q(sje) => [
-         q(6057),
+         q(6058),
          q(0),
          ],
       q(sjg) => [
-         q(6058),
+         q(6059),
          q(0),
          ],
       q(sjk) => [
-         q(6059),
+         q(6060),
          q(0),
          ],
       q(sjl) => [
-         q(6060),
+         q(6061),
          q(0),
          ],
       q(sjm) => [
-         q(6061),
+         q(6062),
          q(0),
          ],
       q(sjn) => [
-         q(6062),
+         q(6063),
          q(0),
          ],
       q(sjo) => [
-         q(6063),
+         q(6064),
          q(0),
          ],
       q(sjp) => [
-         q(6064),
+         q(6065),
          q(0),
          ],
       q(sjr) => [
-         q(6065),
+         q(6066),
          q(0),
          ],
       q(sjs) => [
-         q(6066),
+         q(6067),
          q(0),
          ],
       q(sjt) => [
-         q(6067),
+         q(6068),
          q(0),
          ],
       q(sju) => [
-         q(6068),
+         q(6069),
          q(0),
          ],
       q(sjw) => [
-         q(6069),
+         q(6070),
          q(0),
          ],
       q(ska) => [
-         q(6070),
+         q(6071),
          q(0),
          ],
       q(skb) => [
-         q(6071),
+         q(6072),
          q(0),
          ],
       q(skc) => [
-         q(6072),
+         q(6073),
          q(0),
          ],
       q(skd) => [
-         q(6073),
+         q(6074),
          q(0),
          ],
       q(ske) => [
-         q(6074),
+         q(6075),
          q(0),
          ],
       q(skf) => [
-         q(6075),
+         q(6076),
          q(0),
          ],
       q(skg) => [
-         q(6076),
+         q(6077),
          q(0),
          ],
       q(skh) => [
-         q(6077),
+         q(6078),
          q(0),
          ],
       q(ski) => [
-         q(6078),
+         q(6079),
          q(0),
          ],
       q(skj) => [
-         q(6079),
+         q(6080),
          q(0),
          ],
       q(skk) => [
-         q(6080),
+         q(6081),
          q(0),
          ],
       q(skm) => [
-         q(6081),
+         q(6082),
          q(0),
          ],
       q(skn) => [
-         q(6082),
+         q(6083),
          q(0),
          ],
       q(sko) => [
-         q(6083),
+         q(6084),
          q(0),
          ],
       q(skp) => [
-         q(6084),
+         q(6085),
          q(0),
          ],
       q(skq) => [
-         q(6085),
+         q(6086),
          q(0),
          ],
       q(skr) => [
-         q(6086),
+         q(6087),
          q(0),
          ],
       q(sks) => [
-         q(6087),
+         q(6088),
          q(0),
          ],
       q(skt) => [
-         q(6088),
+         q(6089),
          q(0),
          ],
       q(sku) => [
-         q(6089),
+         q(6090),
          q(0),
          ],
       q(skv) => [
-         q(6090),
+         q(6091),
          q(0),
          ],
       q(skw) => [
-         q(6091),
+         q(6092),
          q(0),
          ],
       q(skx) => [
-         q(6092),
+         q(6093),
          q(0),
          ],
       q(sky) => [
-         q(6093),
+         q(6094),
          q(0),
          ],
       q(skz) => [
-         q(6094),
+         q(6095),
          q(0),
          ],
       q(sla) => [
@@ -82156,47 +82224,47 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(slc) => [
-         q(5905),
+         q(5906),
          q(0),
          ],
       q(sld) => [
-         q(6095),
+         q(6096),
          q(0),
          ],
       q(sle) => [
-         q(6096),
+         q(6097),
          q(0),
          ],
       q(slf) => [
-         q(6097),
+         q(6098),
          q(0),
          ],
       q(slg) => [
-         q(6098),
+         q(6099),
          q(0),
          ],
       q(slh) => [
-         q(6099),
+         q(6100),
          q(0),
          ],
       q(sli) => [
-         q(6100),
+         q(6101),
          q(0),
          ],
       q(slj) => [
-         q(6101),
+         q(6102),
          q(0),
          ],
       q(sll) => [
-         q(6102),
+         q(6103),
          q(0),
          ],
       q(slm) => [
-         q(6103),
+         q(6104),
          q(0),
          ],
       q(sln) => [
-         q(6104),
+         q(6105),
          q(0),
          ],
       q(slo) => [
@@ -82204,27 +82272,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(slp) => [
-         q(6105),
+         q(6106),
          q(0),
          ],
       q(slq) => [
-         q(6106),
+         q(6107),
          q(0),
          ],
       q(slr) => [
-         q(6107),
+         q(6108),
          q(0),
          ],
       q(sls) => [
-         q(6108),
+         q(6109),
          q(0),
          ],
       q(slt) => [
-         q(6109),
+         q(6110),
          q(0),
          ],
       q(slu) => [
-         q(6110),
+         q(6111),
          q(0),
          ],
       q(slv) => [
@@ -82232,19 +82300,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(slw) => [
-         q(6111),
+         q(6112),
          q(0),
          ],
       q(slx) => [
-         q(6112),
+         q(6113),
          q(0),
          ],
       q(sly) => [
-         q(6113),
+         q(6114),
          q(0),
          ],
       q(slz) => [
-         q(6114),
+         q(6115),
          q(0),
          ],
       q(sma) => [
@@ -82252,15 +82320,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(smb) => [
-         q(6115),
+         q(6116),
          q(0),
          ],
       q(smc) => [
-         q(6116),
+         q(6117),
          q(0),
          ],
       q(smd) => [
-         q(6117),
+         q(6118),
          q(0),
          ],
       q(sme) => [
@@ -82268,15 +82336,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(smf) => [
-         q(6118),
+         q(6119),
          q(0),
          ],
       q(smg) => [
-         q(6119),
+         q(6120),
          q(0),
          ],
       q(smh) => [
-         q(6120),
+         q(6121),
          q(0),
          ],
       q(smi) => [
@@ -82288,15 +82356,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(smk) => [
-         q(6121),
+         q(6122),
          q(0),
          ],
       q(sml) => [
-         q(6122),
+         q(6123),
          q(0),
          ],
       q(smm) => [
-         q(6123),
+         q(6124),
          q(0),
          ],
       q(smn) => [
@@ -82308,15 +82376,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(smp) => [
-         q(6124),
+         q(6125),
          q(0),
          ],
       q(smq) => [
-         q(6125),
+         q(6126),
          q(0),
          ],
       q(smr) => [
-         q(6126),
+         q(6127),
          q(0),
          ],
       q(sms) => [
@@ -82324,31 +82392,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(smt) => [
-         q(6127),
+         q(6128),
          q(0),
          ],
       q(smu) => [
-         q(6128),
+         q(6129),
          q(0),
          ],
       q(smv) => [
-         q(6129),
+         q(6130),
          q(0),
          ],
       q(smw) => [
-         q(6130),
+         q(6131),
          q(0),
          ],
       q(smx) => [
-         q(6131),
+         q(6132),
          q(0),
          ],
       q(smy) => [
-         q(6132),
+         q(6133),
          q(0),
          ],
       q(smz) => [
-         q(6133),
+         q(6134),
          q(0),
          ],
       q(sna) => [
@@ -82356,11 +82424,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(snb) => [
-         q(6134),
+         q(6135),
          q(0),
          ],
       q(snc) => [
-         q(6135),
+         q(6136),
          q(0),
          ],
       q(snd) => [
@@ -82368,27 +82436,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sne) => [
-         q(6136),
+         q(6137),
          q(0),
          ],
       q(snf) => [
-         q(6137),
+         q(6138),
          q(0),
          ],
       q(sng) => [
-         q(6138),
+         q(6139),
          q(0),
          ],
       q(snh) => [
-         q(6139),
+         q(6140),
          q(0),
          ],
       q(sni) => [
-         q(6140),
+         q(6141),
          q(0),
          ],
       q(snj) => [
-         q(6141),
+         q(6142),
          q(0),
          ],
       q(snk) => [
@@ -82396,79 +82464,79 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(snl) => [
-         q(6142),
+         q(6143),
          q(0),
          ],
       q(snm) => [
-         q(6143),
+         q(6144),
          q(0),
          ],
       q(snn) => [
-         q(6144),
+         q(6145),
          q(0),
          ],
       q(sno) => [
-         q(6145),
+         q(6146),
          q(0),
          ],
       q(snp) => [
-         q(6146),
+         q(6147),
          q(0),
          ],
       q(snq) => [
-         q(6147),
+         q(6148),
          q(0),
          ],
       q(snr) => [
-         q(6148),
+         q(6149),
          q(0),
          ],
       q(sns) => [
-         q(6149),
+         q(6150),
          q(0),
          ],
       q(snu) => [
-         q(6150),
+         q(6151),
          q(0),
          ],
       q(snv) => [
-         q(6151),
+         q(6152),
          q(0),
          ],
       q(snw) => [
-         q(6152),
+         q(6153),
          q(0),
          ],
       q(snx) => [
-         q(6153),
+         q(6154),
          q(0),
          ],
       q(sny) => [
-         q(6154),
+         q(6155),
          q(0),
          ],
       q(snz) => [
-         q(6155),
+         q(6156),
          q(0),
          ],
       q(soa) => [
-         q(6156),
+         q(6157),
          q(0),
          ],
       q(sob) => [
-         q(6157),
+         q(6158),
          q(0),
          ],
       q(soc) => [
-         q(6158),
+         q(6159),
          q(0),
          ],
       q(sod) => [
-         q(6159),
+         q(6160),
          q(0),
          ],
       q(soe) => [
-         q(6160),
+         q(6161),
          q(0),
          ],
       q(sog) => [
@@ -82476,23 +82544,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(soh) => [
-         q(6161),
+         q(6162),
          q(0),
          ],
       q(soi) => [
-         q(6162),
+         q(6163),
          q(0),
          ],
       q(soj) => [
-         q(6163),
+         q(6164),
          q(0),
          ],
       q(sok) => [
-         q(6164),
+         q(6165),
          q(0),
          ],
       q(sol) => [
-         q(6165),
+         q(6166),
          q(0),
          ],
       q(som) => [
@@ -82504,23 +82572,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(soo) => [
-         q(6166),
+         q(6167),
          q(0),
          ],
       q(sop) => [
-         q(6167),
+         q(6168),
          q(0),
          ],
       q(soq) => [
-         q(6168),
+         q(6169),
          q(0),
          ],
       q(sor) => [
-         q(6169),
+         q(6170),
          q(0),
          ],
       q(sos) => [
-         q(6170),
+         q(6171),
          q(0),
          ],
       q(sot) => [
@@ -82528,27 +82596,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sou) => [
-         q(6171),
+         q(6172),
          q(0),
          ],
       q(sov) => [
-         q(6172),
+         q(6173),
          q(0),
          ],
       q(sow) => [
-         q(6173),
+         q(6174),
          q(0),
          ],
       q(sox) => [
-         q(6174),
+         q(6175),
          q(0),
          ],
       q(soy) => [
-         q(6175),
+         q(6176),
          q(0),
          ],
       q(soz) => [
-         q(6176),
+         q(6177),
          q(0),
          ],
       q(spa) => [
@@ -82556,91 +82624,91 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(spb) => [
-         q(6177),
+         q(6178),
          q(0),
          ],
       q(spc) => [
-         q(6178),
+         q(6179),
          q(0),
          ],
       q(spd) => [
-         q(6179),
+         q(6180),
          q(0),
          ],
       q(spe) => [
-         q(6180),
+         q(6181),
          q(0),
          ],
       q(spg) => [
-         q(6181),
+         q(6182),
          q(0),
          ],
       q(spi) => [
-         q(6182),
+         q(6183),
          q(0),
          ],
       q(spk) => [
-         q(6183),
+         q(6184),
          q(0),
          ],
       q(spl) => [
-         q(6184),
+         q(6185),
          q(0),
          ],
       q(spm) => [
-         q(6185),
+         q(6186),
          q(0),
          ],
       q(spn) => [
-         q(6186),
+         q(6187),
          q(0),
          ],
       q(spo) => [
-         q(6187),
+         q(6188),
          q(0),
          ],
       q(spp) => [
-         q(6188),
+         q(6189),
          q(0),
          ],
       q(spq) => [
-         q(6189),
+         q(6190),
          q(0),
          ],
       q(spr) => [
-         q(6190),
+         q(6191),
          q(0),
          ],
       q(sps) => [
-         q(6191),
+         q(6192),
          q(0),
          ],
       q(spt) => [
-         q(6192),
+         q(6193),
          q(0),
          ],
       q(spu) => [
-         q(6193),
+         q(6194),
          q(0),
          ],
       q(spv) => [
-         q(6194),
+         q(6195),
          q(0),
          ],
       q(spx) => [
-         q(6195),
+         q(6196),
          q(0),
          ],
       q(spy) => [
-         q(6196),
+         q(6197),
          q(0),
          ],
       q(sqa) => [
-         q(6197),
+         q(6198),
          q(0),
          ],
       q(sqh) => [
-         q(6198),
+         q(6199),
          q(0),
          ],
       q(sqj) => [
@@ -82648,51 +82716,51 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sqk) => [
-         q(6199),
+         q(6200),
          q(0),
          ],
       q(sqm) => [
-         q(6200),
+         q(6201),
          q(0),
          ],
       q(sqn) => [
-         q(6201),
+         q(6202),
          q(0),
          ],
       q(sqo) => [
-         q(6202),
+         q(6203),
          q(0),
          ],
       q(sqq) => [
-         q(6203),
+         q(6204),
          q(0),
          ],
       q(sqr) => [
-         q(6204),
+         q(6205),
          q(0),
          ],
       q(sqs) => [
-         q(6205),
+         q(6206),
          q(0),
          ],
       q(sqt) => [
-         q(6206),
+         q(6207),
          q(0),
          ],
       q(squ) => [
-         q(6207),
+         q(6208),
          q(0),
          ],
       q(sra) => [
-         q(6208),
+         q(6209),
          q(0),
          ],
       q(srb) => [
-         q(6209),
+         q(6210),
          q(0),
          ],
       q(src) => [
-         q(6210),
+         q(6211),
          q(0),
          ],
       q(srd) => [
@@ -82700,35 +82768,35 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sre) => [
-         q(6211),
+         q(6212),
          q(0),
          ],
       q(srf) => [
-         q(6212),
+         q(6213),
          q(0),
          ],
       q(srg) => [
-         q(6213),
+         q(6214),
          q(0),
          ],
       q(srh) => [
-         q(6214),
+         q(6215),
          q(0),
          ],
       q(sri) => [
-         q(6215),
+         q(6216),
          q(0),
          ],
       q(srk) => [
-         q(6216),
+         q(6217),
          q(0),
          ],
       q(srl) => [
-         q(6217),
+         q(6218),
          q(0),
          ],
       q(srm) => [
-         q(6218),
+         q(6219),
          q(0),
          ],
       q(srn) => [
@@ -82736,7 +82804,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sro) => [
-         q(6219),
+         q(6220),
          q(0),
          ],
       q(srp) => [
@@ -82744,7 +82812,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(srq) => [
-         q(6220),
+         q(6221),
          q(0),
          ],
       q(srr) => [
@@ -82752,35 +82820,35 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(srs) => [
-         q(6221),
+         q(6222),
          q(0),
          ],
       q(srt) => [
-         q(6222),
+         q(6223),
          q(0),
          ],
       q(sru) => [
-         q(6223),
+         q(6224),
          q(0),
          ],
       q(srv) => [
-         q(6224),
+         q(6225),
          q(0),
          ],
       q(srw) => [
-         q(6225),
+         q(6226),
          q(0),
          ],
       q(srx) => [
-         q(6226),
+         q(6227),
          q(0),
          ],
       q(sry) => [
-         q(6227),
+         q(6228),
          q(0),
          ],
       q(srz) => [
-         q(6228),
+         q(6229),
          q(0),
          ],
       q(ssa) => [
@@ -82788,87 +82856,87 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ssb) => [
-         q(6229),
+         q(6230),
          q(0),
          ],
       q(ssc) => [
-         q(6230),
+         q(6231),
          q(0),
          ],
       q(ssd) => [
-         q(6231),
+         q(6232),
          q(0),
          ],
       q(sse) => [
-         q(6232),
+         q(6233),
          q(0),
          ],
       q(ssf) => [
-         q(6233),
+         q(6234),
          q(0),
          ],
       q(ssg) => [
-         q(6234),
+         q(6235),
          q(0),
          ],
       q(ssh) => [
-         q(6235),
+         q(6236),
          q(0),
          ],
       q(ssi) => [
-         q(6236),
+         q(6237),
          q(0),
          ],
       q(ssj) => [
-         q(6237),
+         q(6238),
          q(0),
          ],
       q(ssk) => [
-         q(6238),
+         q(6239),
          q(0),
          ],
       q(ssl) => [
-         q(6239),
+         q(6240),
          q(0),
          ],
       q(ssm) => [
-         q(6240),
+         q(6241),
          q(0),
          ],
       q(ssn) => [
-         q(6241),
+         q(6242),
          q(0),
          ],
       q(sso) => [
-         q(6242),
+         q(6243),
          q(0),
          ],
       q(ssp) => [
-         q(6243),
+         q(6244),
          q(0),
          ],
       q(ssq) => [
-         q(6244),
+         q(6245),
          q(0),
          ],
       q(ssr) => [
-         q(6245),
+         q(6246),
          q(0),
          ],
       q(sss) => [
-         q(6246),
+         q(6247),
          q(0),
          ],
       q(sst) => [
-         q(6247),
+         q(6248),
          q(0),
          ],
       q(ssu) => [
-         q(6248),
+         q(6249),
          q(0),
          ],
       q(ssv) => [
-         q(6249),
+         q(6250),
          q(0),
          ],
       q(ssw) => [
@@ -82876,135 +82944,135 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ssx) => [
-         q(6250),
+         q(6251),
          q(0),
          ],
       q(ssy) => [
-         q(6251),
+         q(6252),
          q(0),
          ],
       q(ssz) => [
-         q(6252),
+         q(6253),
          q(0),
          ],
       q(sta) => [
-         q(6253),
+         q(6254),
          q(0),
          ],
       q(stb) => [
-         q(6254),
+         q(6255),
          q(0),
          ],
       q(std) => [
-         q(6255),
+         q(6256),
          q(0),
          ],
       q(ste) => [
-         q(6256),
+         q(6257),
          q(0),
          ],
       q(stf) => [
-         q(6257),
+         q(6258),
          q(0),
          ],
       q(stg) => [
-         q(6258),
+         q(6259),
          q(0),
          ],
       q(sth) => [
-         q(6259),
+         q(6260),
          q(0),
          ],
       q(sti) => [
-         q(6260),
+         q(6261),
          q(0),
          ],
       q(stj) => [
-         q(6261),
+         q(6262),
          q(0),
          ],
       q(stk) => [
-         q(6262),
+         q(6263),
          q(0),
          ],
       q(stl) => [
-         q(6263),
+         q(6264),
          q(0),
          ],
       q(stm) => [
-         q(6264),
+         q(6265),
          q(0),
          ],
       q(stn) => [
-         q(6265),
+         q(6266),
          q(0),
          ],
       q(sto) => [
-         q(6266),
+         q(6267),
          q(0),
          ],
       q(stp) => [
-         q(6267),
+         q(6268),
          q(0),
          ],
       q(stq) => [
-         q(6268),
+         q(6269),
          q(0),
          ],
       q(str) => [
-         q(6269),
+         q(6270),
          q(0),
          ],
       q(sts) => [
-         q(6270),
+         q(6271),
          q(0),
          ],
       q(stt) => [
-         q(6271),
+         q(6272),
          q(0),
          ],
       q(stu) => [
-         q(6272),
+         q(6273),
          q(0),
          ],
       q(stv) => [
-         q(6273),
+         q(6274),
          q(0),
          ],
       q(stw) => [
-         q(6274),
+         q(6275),
          q(0),
          ],
       q(sty) => [
-         q(6275),
+         q(6276),
          q(0),
          ],
       q(sua) => [
-         q(6276),
+         q(6277),
          q(0),
          ],
       q(sub) => [
-         q(6277),
+         q(6278),
          q(0),
          ],
       q(suc) => [
-         q(6278),
+         q(6279),
          q(0),
          ],
       q(sue) => [
-         q(6279),
+         q(6280),
          q(0),
          ],
       q(sug) => [
-         q(6280),
+         q(6281),
          q(0),
          ],
       q(sui) => [
-         q(6281),
+         q(6282),
          q(0),
          ],
       q(suj) => [
-         q(6282),
+         q(6283),
          q(0),
          ],
       q(suk) => [
@@ -83016,11 +83084,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(suq) => [
-         q(6283),
+         q(6284),
          q(0),
          ],
       q(sur) => [
-         q(6284),
+         q(6285),
          q(0),
          ],
       q(sus) => [
@@ -83028,15 +83096,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sut) => [
-         q(6285),
+         q(6286),
          q(0),
          ],
       q(suv) => [
-         q(6286),
+         q(6287),
          q(0),
          ],
       q(suw) => [
-         q(6287),
+         q(6288),
          q(0),
          ],
       q(sux) => [
@@ -83044,47 +83112,47 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(suy) => [
-         q(6288),
+         q(6289),
          q(0),
          ],
       q(suz) => [
-         q(6289),
+         q(6290),
          q(0),
          ],
       q(sva) => [
-         q(6290),
+         q(6291),
          q(0),
          ],
       q(svb) => [
-         q(6291),
+         q(6292),
          q(0),
          ],
       q(svc) => [
-         q(6292),
+         q(6293),
          q(0),
          ],
       q(sve) => [
-         q(6293),
+         q(6294),
          q(0),
          ],
       q(svk) => [
-         q(6294),
+         q(6295),
          q(0),
          ],
       q(svm) => [
-         q(6295),
+         q(6296),
          q(0),
          ],
       q(svr) => [
-         q(6296),
+         q(6297),
          q(0),
          ],
       q(svs) => [
-         q(6297),
+         q(6298),
          q(0),
          ],
       q(svx) => [
-         q(6298),
+         q(6299),
          q(0),
          ],
       q(swa) => [
@@ -83092,11 +83160,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(swb) => [
-         q(6299),
+         q(6300),
          q(0),
          ],
       q(swc) => [
-         q(6300),
+         q(6301),
          q(0),
          ],
       q(swe) => [
@@ -83104,143 +83172,143 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(swf) => [
-         q(6301),
+         q(6302),
          q(0),
          ],
       q(swg) => [
-         q(6302),
+         q(6303),
          q(0),
          ],
       q(swh) => [
-         q(6303),
+         q(6304),
          q(0),
          ],
       q(swi) => [
-         q(6304),
+         q(6305),
          q(0),
          ],
       q(swj) => [
-         q(6305),
+         q(6306),
          q(0),
          ],
       q(swk) => [
-         q(6306),
+         q(6307),
          q(0),
          ],
       q(swl) => [
-         q(6307),
+         q(6308),
          q(0),
          ],
       q(swm) => [
-         q(6308),
+         q(6309),
          q(0),
          ],
       q(swn) => [
-         q(6309),
+         q(6310),
          q(0),
          ],
       q(swo) => [
-         q(6310),
+         q(6311),
          q(0),
          ],
       q(swp) => [
-         q(6311),
+         q(6312),
          q(0),
          ],
       q(swq) => [
-         q(6312),
+         q(6313),
          q(0),
          ],
       q(swr) => [
-         q(6313),
+         q(6314),
          q(0),
          ],
       q(sws) => [
-         q(6314),
+         q(6315),
          q(0),
          ],
       q(swt) => [
-         q(6315),
+         q(6316),
          q(0),
          ],
       q(swu) => [
-         q(6316),
+         q(6317),
          q(0),
          ],
       q(swv) => [
-         q(6317),
+         q(6318),
          q(0),
          ],
       q(sww) => [
-         q(6318),
+         q(6319),
          q(0),
          ],
       q(swx) => [
-         q(6319),
+         q(6320),
          q(0),
          ],
       q(swy) => [
-         q(6320),
+         q(6321),
          q(0),
          ],
       q(sxb) => [
-         q(6321),
+         q(6322),
          q(0),
          ],
       q(sxc) => [
-         q(6322),
+         q(6323),
          q(0),
          ],
       q(sxe) => [
-         q(6323),
+         q(6324),
          q(0),
          ],
       q(sxg) => [
-         q(6324),
+         q(6325),
          q(0),
          ],
       q(sxk) => [
-         q(6325),
+         q(6326),
          q(0),
          ],
       q(sxl) => [
-         q(6326),
+         q(6327),
          q(0),
          ],
       q(sxm) => [
-         q(6327),
+         q(6328),
          q(0),
          ],
       q(sxn) => [
-         q(6328),
+         q(6329),
          q(0),
          ],
       q(sxo) => [
-         q(6329),
+         q(6330),
          q(0),
          ],
       q(sxr) => [
-         q(6330),
+         q(6331),
          q(0),
          ],
       q(sxs) => [
-         q(6331),
+         q(6332),
          q(0),
          ],
       q(sxu) => [
-         q(6332),
+         q(6333),
          q(0),
          ],
       q(sxw) => [
-         q(6333),
+         q(6334),
          q(0),
          ],
       q(sya) => [
-         q(6334),
+         q(6335),
          q(0),
          ],
       q(syb) => [
-         q(6335),
+         q(6336),
          q(0),
          ],
       q(syc) => [
@@ -83252,27 +83320,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(syi) => [
-         q(6336),
+         q(6337),
          q(0),
          ],
       q(syk) => [
-         q(6337),
+         q(6338),
          q(0),
          ],
       q(syl) => [
-         q(6338),
+         q(6339),
          q(0),
          ],
       q(sym) => [
-         q(6339),
+         q(6340),
          q(0),
          ],
       q(syn) => [
-         q(6340),
+         q(6341),
          q(0),
          ],
       q(syo) => [
-         q(6341),
+         q(6342),
          q(0),
          ],
       q(syr) => [
@@ -83280,91 +83348,91 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(sys) => [
-         q(6342),
+         q(6343),
          q(0),
          ],
       q(syw) => [
-         q(6343),
+         q(6344),
          q(0),
          ],
       q(syx) => [
-         q(6344),
+         q(6345),
          q(0),
          ],
       q(syy) => [
-         q(6345),
+         q(6346),
          q(0),
          ],
       q(sza) => [
-         q(6346),
+         q(6347),
          q(0),
          ],
       q(szb) => [
-         q(6347),
+         q(6348),
          q(0),
          ],
       q(szc) => [
-         q(6348),
+         q(6349),
          q(0),
          ],
       q(szd) => [
-         q(6349),
+         q(6350),
          q(0),
          ],
       q(sze) => [
-         q(6350),
+         q(6351),
          q(0),
          ],
       q(szg) => [
-         q(6351),
+         q(6352),
          q(0),
          ],
       q(szl) => [
-         q(6352),
+         q(6353),
          q(0),
          ],
       q(szn) => [
-         q(6353),
+         q(6354),
          q(0),
          ],
       q(szp) => [
-         q(6354),
+         q(6355),
          q(0),
          ],
       q(szv) => [
-         q(6355),
+         q(6356),
          q(0),
          ],
       q(szw) => [
-         q(6356),
+         q(6357),
          q(0),
          ],
       q(taa) => [
-         q(6357),
+         q(6358),
          q(0),
          ],
       q(tab) => [
-         q(6358),
+         q(6359),
          q(0),
          ],
       q(tac) => [
-         q(6359),
+         q(6360),
          q(0),
          ],
       q(tad) => [
-         q(6360),
+         q(6361),
          q(0),
          ],
       q(tae) => [
-         q(6361),
+         q(6362),
          q(0),
          ],
       q(taf) => [
-         q(6362),
+         q(6363),
          q(0),
          ],
       q(tag) => [
-         q(6363),
+         q(6364),
          q(0),
          ],
       q(tah) => [
@@ -83376,15 +83444,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(taj) => [
-         q(6364),
+         q(6365),
          q(0),
          ],
       q(tak) => [
-         q(6365),
+         q(6366),
          q(0),
          ],
       q(tal) => [
-         q(6366),
+         q(6367),
          q(0),
          ],
       q(tam) => [
@@ -83392,27 +83460,27 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tan) => [
-         q(6367),
+         q(6368),
          q(0),
          ],
       q(tao) => [
-         q(6368),
+         q(6369),
          q(0),
          ],
       q(tap) => [
-         q(6369),
+         q(6370),
          q(0),
          ],
       q(taq) => [
-         q(6370),
+         q(6371),
          q(0),
          ],
       q(tar) => [
-         q(6371),
+         q(6372),
          q(0),
          ],
       q(tas) => [
-         q(6372),
+         q(6373),
          q(0),
          ],
       q(tat) => [
@@ -83420,91 +83488,91 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tau) => [
-         q(6373),
+         q(6374),
          q(0),
          ],
       q(tav) => [
-         q(6374),
+         q(6375),
          q(0),
          ],
       q(taw) => [
-         q(6375),
+         q(6376),
          q(0),
          ],
       q(tax) => [
-         q(6376),
+         q(6377),
          q(0),
          ],
       q(tay) => [
-         q(6377),
+         q(6378),
          q(0),
          ],
       q(taz) => [
-         q(6378),
+         q(6379),
          q(0),
          ],
       q(tba) => [
-         q(6379),
+         q(6380),
          q(0),
          ],
       q(tbb) => [
-         q(6380),
+         q(6381),
          q(0),
          ],
       q(tbc) => [
-         q(6381),
+         q(6382),
          q(0),
          ],
       q(tbd) => [
-         q(6382),
+         q(6383),
          q(0),
          ],
       q(tbe) => [
-         q(6383),
+         q(6384),
          q(0),
          ],
       q(tbf) => [
-         q(6384),
+         q(6385),
          q(0),
          ],
       q(tbg) => [
-         q(6385),
+         q(6386),
          q(0),
          ],
       q(tbh) => [
-         q(6386),
+         q(6387),
          q(0),
          ],
       q(tbi) => [
-         q(6387),
+         q(6388),
          q(0),
          ],
       q(tbj) => [
-         q(6388),
+         q(6389),
          q(0),
          ],
       q(tbk) => [
-         q(6389),
+         q(6390),
          q(0),
          ],
       q(tbl) => [
-         q(6390),
+         q(6391),
          q(0),
          ],
       q(tbm) => [
-         q(6391),
+         q(6392),
          q(0),
          ],
       q(tbn) => [
-         q(6392),
+         q(6393),
          q(0),
          ],
       q(tbo) => [
-         q(6393),
+         q(6394),
          q(0),
          ],
       q(tbp) => [
-         q(6394),
+         q(6395),
          q(0),
          ],
       q(tbq) => [
@@ -83512,259 +83580,259 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tbr) => [
-         q(6395),
+         q(6396),
          q(0),
          ],
       q(tbs) => [
-         q(6396),
+         q(6397),
          q(0),
          ],
       q(tbt) => [
-         q(6397),
+         q(6398),
          q(0),
          ],
       q(tbu) => [
-         q(6398),
+         q(6399),
          q(0),
          ],
       q(tbv) => [
-         q(6399),
+         q(6400),
          q(0),
          ],
       q(tbw) => [
-         q(6400),
+         q(6401),
          q(0),
          ],
       q(tbx) => [
-         q(6401),
+         q(6402),
          q(0),
          ],
       q(tby) => [
-         q(6402),
+         q(6403),
          q(0),
          ],
       q(tbz) => [
-         q(6403),
+         q(6404),
          q(0),
          ],
       q(tca) => [
-         q(6404),
+         q(6405),
          q(0),
          ],
       q(tcb) => [
-         q(6405),
+         q(6406),
          q(0),
          ],
       q(tcc) => [
-         q(6406),
+         q(6407),
          q(0),
          ],
       q(tcd) => [
-         q(6407),
+         q(6408),
          q(0),
          ],
       q(tce) => [
-         q(6408),
+         q(6409),
          q(0),
          ],
       q(tcf) => [
-         q(6409),
+         q(6410),
          q(0),
          ],
       q(tcg) => [
-         q(6410),
+         q(6411),
          q(0),
          ],
       q(tch) => [
-         q(6411),
+         q(6412),
          q(0),
          ],
       q(tci) => [
-         q(6412),
+         q(6413),
          q(0),
          ],
       q(tck) => [
-         q(6413),
+         q(6414),
          q(0),
          ],
       q(tcl) => [
-         q(6414),
+         q(6415),
          q(0),
          ],
       q(tcm) => [
-         q(6415),
+         q(6416),
          q(0),
          ],
       q(tcn) => [
-         q(6416),
+         q(6417),
          q(0),
          ],
       q(tco) => [
-         q(6417),
+         q(6418),
          q(0),
          ],
       q(tcp) => [
-         q(6418),
+         q(6419),
          q(0),
          ],
       q(tcq) => [
-         q(6419),
+         q(6420),
          q(0),
          ],
       q(tcs) => [
-         q(6420),
+         q(6421),
          q(0),
          ],
       q(tct) => [
-         q(6421),
+         q(6422),
          q(0),
          ],
       q(tcu) => [
-         q(6422),
+         q(6423),
          q(0),
          ],
       q(tcw) => [
-         q(6423),
+         q(6424),
          q(0),
          ],
       q(tcx) => [
-         q(6424),
+         q(6425),
          q(0),
          ],
       q(tcy) => [
-         q(6425),
+         q(6426),
          q(0),
          ],
       q(tcz) => [
-         q(6426),
+         q(6427),
          q(0),
          ],
       q(tda) => [
-         q(6427),
+         q(6428),
          q(0),
          ],
       q(tdb) => [
-         q(6428),
+         q(6429),
          q(0),
          ],
       q(tdc) => [
-         q(6429),
+         q(6430),
          q(0),
          ],
       q(tdd) => [
-         q(6430),
+         q(6431),
          q(0),
          ],
       q(tde) => [
-         q(6431),
+         q(6432),
          q(0),
          ],
       q(tdf) => [
-         q(6432),
+         q(6433),
          q(0),
          ],
       q(tdg) => [
-         q(6433),
+         q(6434),
          q(0),
          ],
       q(tdh) => [
-         q(6434),
+         q(6435),
          q(0),
          ],
       q(tdi) => [
-         q(6435),
+         q(6436),
          q(0),
          ],
       q(tdj) => [
-         q(6436),
+         q(6437),
          q(0),
          ],
       q(tdk) => [
-         q(6437),
+         q(6438),
          q(0),
          ],
       q(tdl) => [
-         q(6438),
+         q(6439),
          q(0),
          ],
       q(tdn) => [
-         q(6439),
+         q(6440),
          q(0),
          ],
       q(tdo) => [
-         q(6440),
+         q(6441),
          q(0),
          ],
       q(tdq) => [
-         q(6441),
+         q(6442),
          q(0),
          ],
       q(tdr) => [
-         q(6442),
+         q(6443),
          q(0),
          ],
       q(tds) => [
-         q(6443),
+         q(6444),
          q(0),
          ],
       q(tdt) => [
-         q(6444),
+         q(6445),
          q(0),
          ],
       q(tdu) => [
-         q(6445),
+         q(6446),
          q(0),
          ],
       q(tdv) => [
-         q(6446),
+         q(6447),
          q(0),
          ],
       q(tdx) => [
-         q(6447),
+         q(6448),
          q(0),
          ],
       q(tdy) => [
-         q(6448),
+         q(6449),
          q(0),
          ],
       q(tea) => [
-         q(6449),
+         q(6450),
          q(0),
          ],
       q(teb) => [
-         q(6450),
+         q(6451),
          q(0),
          ],
       q(tec) => [
-         q(6451),
+         q(6452),
          q(0),
          ],
       q(ted) => [
-         q(6452),
+         q(6453),
          q(0),
          ],
       q(tee) => [
-         q(6453),
+         q(6454),
          q(0),
          ],
       q(tef) => [
-         q(6454),
+         q(6455),
          q(0),
          ],
       q(teg) => [
-         q(6455),
+         q(6456),
          q(0),
          ],
       q(teh) => [
-         q(6456),
+         q(6457),
          q(0),
          ],
       q(tei) => [
-         q(6457),
+         q(6458),
          q(0),
          ],
       q(tek) => [
-         q(6458),
+         q(6459),
          q(0),
          ],
       q(tel) => [
@@ -83776,19 +83844,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ten) => [
-         q(6459),
+         q(6460),
          q(0),
          ],
       q(teo) => [
-         q(6460),
+         q(6461),
          q(0),
          ],
       q(tep) => [
-         q(6461),
+         q(6462),
          q(0),
          ],
       q(teq) => [
-         q(6462),
+         q(6463),
          q(0),
          ],
       q(ter) => [
@@ -83796,7 +83864,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tes) => [
-         q(6463),
+         q(6464),
          q(0),
          ],
       q(tet) => [
@@ -83804,79 +83872,79 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(teu) => [
-         q(6464),
+         q(6465),
          q(0),
          ],
       q(tev) => [
-         q(6465),
+         q(6466),
          q(0),
          ],
       q(tew) => [
-         q(6466),
+         q(6467),
          q(0),
          ],
       q(tex) => [
-         q(6467),
+         q(6468),
          q(0),
          ],
       q(tey) => [
-         q(6468),
+         q(6469),
          q(0),
          ],
       q(tfi) => [
-         q(6469),
+         q(6470),
          q(0),
          ],
       q(tfn) => [
-         q(6470),
+         q(6471),
          q(0),
          ],
       q(tfo) => [
-         q(6471),
+         q(6472),
          q(0),
          ],
       q(tfr) => [
-         q(6472),
+         q(6473),
          q(0),
          ],
       q(tft) => [
-         q(6473),
+         q(6474),
          q(0),
          ],
       q(tga) => [
-         q(6474),
+         q(6475),
          q(0),
          ],
       q(tgb) => [
-         q(6475),
+         q(6476),
          q(0),
          ],
       q(tgc) => [
-         q(6476),
+         q(6477),
          q(0),
          ],
       q(tgd) => [
-         q(6477),
+         q(6478),
          q(0),
          ],
       q(tge) => [
-         q(6478),
+         q(6479),
          q(0),
          ],
       q(tgf) => [
-         q(6479),
+         q(6480),
          q(0),
          ],
       q(tgh) => [
-         q(6480),
+         q(6481),
          q(0),
          ],
       q(tgi) => [
-         q(6481),
+         q(6482),
          q(0),
          ],
       q(tgj) => [
-         q(6482),
+         q(6483),
          q(0),
          ],
       q(tgk) => [
@@ -83888,55 +83956,55 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tgn) => [
-         q(6483),
+         q(6484),
          q(0),
          ],
       q(tgo) => [
-         q(6484),
+         q(6485),
          q(0),
          ],
       q(tgp) => [
-         q(6485),
+         q(6486),
          q(0),
          ],
       q(tgq) => [
-         q(6486),
+         q(6487),
          q(0),
          ],
       q(tgr) => [
-         q(6487),
+         q(6488),
          q(0),
          ],
       q(tgs) => [
-         q(6488),
+         q(6489),
          q(0),
          ],
       q(tgt) => [
-         q(6489),
+         q(6490),
          q(0),
          ],
       q(tgu) => [
-         q(6490),
+         q(6491),
          q(0),
          ],
       q(tgv) => [
-         q(6491),
+         q(6492),
          q(0),
          ],
       q(tgw) => [
-         q(6492),
+         q(6493),
          q(0),
          ],
       q(tgx) => [
-         q(6493),
+         q(6494),
          q(0),
          ],
       q(tgy) => [
-         q(6494),
+         q(6495),
          q(0),
          ],
       q(tgz) => [
-         q(6495),
+         q(6496),
          q(0),
          ],
       q(tha) => [
@@ -83944,87 +84012,87 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(thc) => [
-         q(6496),
+         q(6497),
          q(0),
          ],
       q(thd) => [
-         q(6497),
+         q(6498),
          q(0),
          ],
       q(the) => [
-         q(6498),
+         q(6499),
          q(0),
          ],
       q(thf) => [
-         q(6499),
+         q(6500),
          q(0),
          ],
       q(thh) => [
-         q(6500),
+         q(6501),
          q(0),
          ],
       q(thi) => [
-         q(6501),
+         q(6502),
          q(0),
          ],
       q(thk) => [
-         q(6502),
+         q(6503),
          q(0),
          ],
       q(thl) => [
-         q(6503),
+         q(6504),
          q(0),
          ],
       q(thm) => [
-         q(6504),
+         q(6505),
          q(0),
          ],
       q(thn) => [
-         q(6505),
+         q(6506),
          q(0),
          ],
       q(thp) => [
-         q(6506),
+         q(6507),
          q(0),
          ],
       q(thq) => [
-         q(6507),
+         q(6508),
          q(0),
          ],
       q(thr) => [
-         q(6508),
+         q(6509),
          q(0),
          ],
       q(ths) => [
-         q(6509),
+         q(6510),
          q(0),
          ],
       q(tht) => [
-         q(6510),
+         q(6511),
          q(0),
          ],
       q(thu) => [
-         q(6511),
+         q(6512),
          q(0),
          ],
       q(thv) => [
-         q(6512),
+         q(6513),
          q(0),
          ],
       q(thw) => [
-         q(6513),
+         q(6514),
          q(0),
          ],
       q(thy) => [
-         q(6514),
+         q(6515),
          q(0),
          ],
       q(thz) => [
-         q(6515),
+         q(6516),
          q(0),
          ],
       q(tia) => [
-         q(6516),
+         q(6517),
          q(0),
          ],
       q(tib) => [
@@ -84032,15 +84100,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tic) => [
-         q(6517),
+         q(6518),
          q(0),
          ],
       q(tid) => [
-         q(6518),
+         q(6519),
          q(0),
          ],
       q(tif) => [
-         q(6519),
+         q(6520),
          q(0),
          ],
       q(tig) => [
@@ -84048,43 +84116,43 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tih) => [
-         q(6520),
+         q(6521),
          q(0),
          ],
       q(tii) => [
-         q(6521),
+         q(6522),
          q(0),
          ],
       q(tij) => [
-         q(6522),
+         q(6523),
          q(0),
          ],
       q(tik) => [
-         q(6523),
+         q(6524),
          q(0),
          ],
       q(til) => [
-         q(6524),
+         q(6525),
          q(0),
          ],
       q(tim) => [
-         q(6525),
+         q(6526),
          q(0),
          ],
       q(tin) => [
-         q(6526),
+         q(6527),
          q(0),
          ],
       q(tio) => [
-         q(6527),
+         q(6528),
          q(0),
          ],
       q(tip) => [
-         q(6528),
+         q(6529),
          q(0),
          ],
       q(tiq) => [
-         q(6529),
+         q(6530),
          q(0),
          ],
       q(tir) => [
@@ -84092,15 +84160,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tis) => [
-         q(6530),
+         q(6531),
          q(0),
          ],
       q(tit) => [
-         q(6531),
+         q(6532),
          q(0),
          ],
       q(tiu) => [
-         q(6532),
+         q(6533),
          q(0),
          ],
       q(tiv) => [
@@ -84108,83 +84176,83 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tiw) => [
-         q(6533),
+         q(6534),
          q(0),
          ],
       q(tix) => [
-         q(6534),
+         q(6535),
          q(0),
          ],
       q(tiy) => [
-         q(6535),
+         q(6536),
          q(0),
          ],
       q(tiz) => [
-         q(6536),
+         q(6537),
          q(0),
          ],
       q(tja) => [
-         q(6537),
+         q(6538),
          q(0),
          ],
       q(tjg) => [
-         q(6538),
+         q(6539),
          q(0),
          ],
       q(tji) => [
-         q(6539),
+         q(6540),
          q(0),
          ],
       q(tjl) => [
-         q(6540),
+         q(6541),
          q(0),
          ],
       q(tjm) => [
-         q(6541),
+         q(6542),
          q(0),
          ],
       q(tjn) => [
-         q(6542),
+         q(6543),
          q(0),
          ],
       q(tjo) => [
-         q(6543),
+         q(6544),
          q(0),
          ],
       q(tjs) => [
-         q(6544),
+         q(6545),
          q(0),
          ],
       q(tju) => [
-         q(6545),
+         q(6546),
          q(0),
          ],
       q(tjw) => [
-         q(6546),
+         q(6547),
          q(0),
          ],
       q(tka) => [
-         q(6547),
+         q(6548),
          q(0),
          ],
       q(tkb) => [
-         q(6548),
+         q(6549),
          q(0),
          ],
       q(tkd) => [
-         q(6549),
+         q(6550),
          q(0),
          ],
       q(tke) => [
-         q(6550),
+         q(6551),
          q(0),
          ],
       q(tkf) => [
-         q(6551),
+         q(6552),
          q(0),
          ],
       q(tkg) => [
-         q(6552),
+         q(6553),
          q(0),
          ],
       q(tkl) => [
@@ -84192,75 +84260,75 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tkm) => [
-         q(6553),
+         q(6554),
          q(0),
          ],
       q(tkn) => [
-         q(6554),
+         q(6555),
          q(0),
          ],
       q(tkp) => [
-         q(6555),
+         q(6556),
          q(0),
          ],
       q(tkq) => [
-         q(6556),
+         q(6557),
          q(0),
          ],
       q(tkr) => [
-         q(6557),
+         q(6558),
          q(0),
          ],
       q(tks) => [
-         q(6558),
+         q(6559),
          q(0),
          ],
       q(tkt) => [
-         q(6559),
+         q(6560),
          q(0),
          ],
       q(tku) => [
-         q(6560),
+         q(6561),
          q(0),
          ],
       q(tkv) => [
-         q(6561),
+         q(6562),
          q(0),
          ],
       q(tkw) => [
-         q(6562),
+         q(6563),
          q(0),
          ],
       q(tkx) => [
-         q(6563),
+         q(6564),
          q(0),
          ],
       q(tkz) => [
-         q(6564),
+         q(6565),
          q(0),
          ],
       q(tla) => [
-         q(6565),
+         q(6566),
          q(0),
          ],
       q(tlb) => [
-         q(6566),
+         q(6567),
          q(0),
          ],
       q(tlc) => [
-         q(6567),
+         q(6568),
          q(0),
          ],
       q(tld) => [
-         q(6568),
+         q(6569),
          q(0),
          ],
       q(tlf) => [
-         q(6569),
+         q(6570),
          q(0),
          ],
       q(tlg) => [
-         q(6570),
+         q(6571),
          q(0),
          ],
       q(tlh) => [
@@ -84272,91 +84340,91 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tlj) => [
-         q(6571),
+         q(6572),
          q(0),
          ],
       q(tlk) => [
-         q(6572),
+         q(6573),
          q(0),
          ],
       q(tll) => [
-         q(6573),
+         q(6574),
          q(0),
          ],
       q(tlm) => [
-         q(6574),
+         q(6575),
          q(0),
          ],
       q(tln) => [
-         q(6575),
+         q(6576),
          q(0),
          ],
       q(tlo) => [
-         q(6576),
+         q(6577),
          q(0),
          ],
       q(tlp) => [
-         q(6577),
+         q(6578),
          q(0),
          ],
       q(tlq) => [
-         q(6578),
+         q(6579),
          q(0),
          ],
       q(tlr) => [
-         q(6579),
+         q(6580),
          q(0),
          ],
       q(tls) => [
-         q(6580),
+         q(6581),
          q(0),
          ],
       q(tlt) => [
-         q(6581),
+         q(6582),
          q(0),
          ],
       q(tlu) => [
-         q(6582),
+         q(6583),
          q(0),
          ],
       q(tlv) => [
-         q(6583),
+         q(6584),
          q(0),
          ],
       q(tlx) => [
-         q(6584),
+         q(6585),
          q(0),
          ],
       q(tly) => [
-         q(6585),
+         q(6586),
          q(0),
          ],
       q(tma) => [
-         q(6586),
+         q(6587),
          q(0),
          ],
       q(tmb) => [
-         q(6587),
+         q(6588),
          q(0),
          ],
       q(tmc) => [
-         q(6588),
+         q(6589),
          q(0),
          ],
       q(tmd) => [
-         q(6589),
+         q(6590),
          q(0),
          ],
       q(tme) => [
-         q(6590),
+         q(6591),
          q(0),
          ],
       q(tmf) => [
-         q(6591),
+         q(6592),
          q(0),
          ],
       q(tmg) => [
-         q(6592),
+         q(6593),
          q(0),
          ],
       q(tmh) => [
@@ -84364,187 +84432,187 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tmi) => [
-         q(6593),
+         q(6594),
          q(0),
          ],
       q(tmj) => [
-         q(6594),
+         q(6595),
          q(0),
          ],
       q(tmk) => [
-         q(6595),
+         q(6596),
          q(0),
          ],
       q(tml) => [
-         q(6596),
+         q(6597),
          q(0),
          ],
       q(tmm) => [
-         q(6597),
+         q(6598),
          q(0),
          ],
       q(tmn) => [
-         q(6598),
+         q(6599),
          q(0),
          ],
       q(tmo) => [
-         q(6599),
+         q(6600),
          q(0),
          ],
       q(tmp) => [
-         q(6600),
+         q(6601),
          q(0),
          ],
       q(tmq) => [
-         q(6601),
+         q(6602),
          q(0),
          ],
       q(tmr) => [
-         q(6602),
+         q(6603),
          q(0),
          ],
       q(tms) => [
-         q(6603),
+         q(6604),
          q(0),
          ],
       q(tmt) => [
-         q(6604),
+         q(6605),
          q(0),
          ],
       q(tmu) => [
-         q(6605),
+         q(6606),
          q(0),
          ],
       q(tmv) => [
-         q(6606),
+         q(6607),
          q(0),
          ],
       q(tmw) => [
-         q(6607),
+         q(6608),
          q(0),
          ],
       q(tmy) => [
-         q(6608),
+         q(6609),
          q(0),
          ],
       q(tmz) => [
-         q(6609),
+         q(6610),
          q(0),
          ],
       q(tna) => [
-         q(6610),
+         q(6611),
          q(0),
          ],
       q(tnb) => [
-         q(6611),
+         q(6612),
          q(0),
          ],
       q(tnc) => [
-         q(6612),
+         q(6613),
          q(0),
          ],
       q(tnd) => [
-         q(6613),
+         q(6614),
          q(0),
          ],
       q(tne) => [
-         q(6614),
+         q(6615),
          q(0),
          ],
       q(tng) => [
-         q(6615),
+         q(6616),
          q(0),
          ],
       q(tnh) => [
-         q(6616),
+         q(6617),
          q(0),
          ],
       q(tni) => [
-         q(6617),
+         q(6618),
          q(0),
          ],
       q(tnk) => [
-         q(6618),
+         q(6619),
          q(0),
          ],
       q(tnl) => [
-         q(6619),
+         q(6620),
          q(0),
          ],
       q(tnm) => [
-         q(6620),
+         q(6621),
          q(0),
          ],
       q(tnn) => [
-         q(6621),
+         q(6622),
          q(0),
          ],
       q(tno) => [
-         q(6622),
+         q(6623),
          q(0),
          ],
       q(tnp) => [
-         q(6623),
+         q(6624),
          q(0),
          ],
       q(tnq) => [
-         q(6624),
+         q(6625),
          q(0),
          ],
       q(tnr) => [
-         q(6625),
+         q(6626),
          q(0),
          ],
       q(tns) => [
-         q(6626),
+         q(6627),
          q(0),
          ],
       q(tnt) => [
-         q(6627),
+         q(6628),
          q(0),
          ],
       q(tnu) => [
-         q(6628),
+         q(6629),
          q(0),
          ],
       q(tnv) => [
-         q(6629),
+         q(6630),
          q(0),
          ],
       q(tnw) => [
-         q(6630),
+         q(6631),
          q(0),
          ],
       q(tnx) => [
-         q(6631),
+         q(6632),
          q(0),
          ],
       q(tny) => [
-         q(6632),
+         q(6633),
          q(0),
          ],
       q(tnz) => [
-         q(6633),
+         q(6634),
          q(0),
          ],
       q(tob) => [
-         q(6634),
+         q(6635),
          q(0),
          ],
       q(toc) => [
-         q(6635),
+         q(6636),
          q(0),
          ],
       q(tod) => [
-         q(6636),
+         q(6637),
          q(0),
          ],
       q(toe) => [
-         q(6637),
+         q(6638),
          q(0),
          ],
       q(tof) => [
-         q(6638),
+         q(6639),
          q(0),
          ],
       q(tog) => [
@@ -84552,23 +84620,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(toh) => [
-         q(6639),
+         q(6640),
          q(0),
          ],
       q(toi) => [
-         q(6640),
+         q(6641),
          q(0),
          ],
       q(toj) => [
-         q(6641),
+         q(6642),
          q(0),
          ],
       q(tol) => [
-         q(6642),
+         q(6643),
          q(0),
          ],
       q(tom) => [
-         q(6643),
+         q(6644),
          q(0),
          ],
       q(ton) => [
@@ -84576,67 +84644,67 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(too) => [
-         q(6644),
+         q(6645),
          q(0),
          ],
       q(top) => [
-         q(6645),
+         q(6646),
          q(0),
          ],
       q(toq) => [
-         q(6646),
+         q(6647),
          q(0),
          ],
       q(tor) => [
-         q(6647),
+         q(6648),
          q(0),
          ],
       q(tos) => [
-         q(6648),
+         q(6649),
          q(0),
          ],
       q(tou) => [
-         q(6649),
+         q(6650),
          q(0),
          ],
       q(tov) => [
-         q(6650),
+         q(6651),
          q(0),
          ],
       q(tow) => [
-         q(6651),
+         q(6652),
          q(0),
          ],
       q(tox) => [
-         q(6652),
+         q(6653),
          q(0),
          ],
       q(toy) => [
-         q(6653),
+         q(6654),
          q(0),
          ],
       q(toz) => [
-         q(6654),
+         q(6655),
          q(0),
          ],
       q(tpa) => [
-         q(6655),
+         q(6656),
          q(0),
          ],
       q(tpc) => [
-         q(6656),
+         q(6657),
          q(0),
          ],
       q(tpe) => [
-         q(6657),
+         q(6658),
          q(0),
          ],
       q(tpf) => [
-         q(6658),
+         q(6659),
          q(0),
          ],
       q(tpg) => [
-         q(6659),
+         q(6660),
          q(0),
          ],
       q(tpi) => [
@@ -84644,151 +84712,151 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tpj) => [
-         q(6660),
+         q(6661),
          q(0),
          ],
       q(tpk) => [
-         q(6661),
+         q(6662),
          q(0),
          ],
       q(tpl) => [
-         q(6662),
+         q(6663),
          q(0),
          ],
       q(tpm) => [
-         q(6663),
+         q(6664),
          q(0),
          ],
       q(tpn) => [
-         q(6664),
+         q(6665),
          q(0),
          ],
       q(tpo) => [
-         q(6665),
+         q(6666),
          q(0),
          ],
       q(tpp) => [
-         q(6666),
+         q(6667),
          q(0),
          ],
       q(tpq) => [
-         q(6667),
+         q(6668),
          q(0),
          ],
       q(tpr) => [
-         q(6668),
+         q(6669),
          q(0),
          ],
       q(tpt) => [
-         q(6669),
+         q(6670),
          q(0),
          ],
       q(tpu) => [
-         q(6670),
+         q(6671),
          q(0),
          ],
       q(tpv) => [
-         q(6671),
+         q(6672),
          q(0),
          ],
       q(tpw) => [
-         q(6672),
+         q(6673),
          q(0),
          ],
       q(tpx) => [
-         q(6673),
+         q(6674),
          q(0),
          ],
       q(tpy) => [
-         q(6674),
+         q(6675),
          q(0),
          ],
       q(tpz) => [
-         q(6675),
+         q(6676),
          q(0),
          ],
       q(tqb) => [
-         q(6676),
+         q(6677),
          q(0),
          ],
       q(tql) => [
-         q(6677),
+         q(6678),
          q(0),
          ],
       q(tqm) => [
-         q(6678),
+         q(6679),
          q(0),
          ],
       q(tqn) => [
-         q(6679),
+         q(6680),
          q(0),
          ],
       q(tqo) => [
-         q(6680),
+         q(6681),
          q(0),
          ],
       q(tqp) => [
-         q(6681),
+         q(6682),
          q(0),
          ],
       q(tqq) => [
-         q(6682),
+         q(6683),
          q(0),
          ],
       q(tqr) => [
-         q(6683),
+         q(6684),
          q(0),
          ],
       q(tqt) => [
-         q(6684),
+         q(6685),
          q(0),
          ],
       q(tqu) => [
-         q(6685),
+         q(6686),
          q(0),
          ],
       q(tqw) => [
-         q(6686),
+         q(6687),
          q(0),
          ],
       q(tra) => [
-         q(6687),
+         q(6688),
          q(0),
          ],
       q(trb) => [
-         q(6688),
+         q(6689),
          q(0),
          ],
       q(trc) => [
-         q(6689),
+         q(6690),
          q(0),
          ],
       q(trd) => [
-         q(6690),
+         q(6691),
          q(0),
          ],
       q(tre) => [
-         q(6691),
+         q(6692),
          q(0),
          ],
       q(trf) => [
-         q(6692),
+         q(6693),
          q(0),
          ],
       q(trg) => [
-         q(6693),
+         q(6694),
          q(0),
          ],
       q(trh) => [
-         q(6694),
+         q(6695),
          q(0),
          ],
       q(tri) => [
-         q(6695),
+         q(6696),
          q(0),
          ],
       q(trj) => [
-         q(6696),
+         q(6697),
          q(0),
          ],
       q(trk) => [
@@ -84796,91 +84864,91 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(trl) => [
-         q(6697),
+         q(6698),
          q(0),
          ],
       q(trm) => [
-         q(6698),
+         q(6699),
          q(0),
          ],
       q(trn) => [
-         q(6699),
+         q(6700),
          q(0),
          ],
       q(tro) => [
-         q(6700),
+         q(6701),
          q(0),
          ],
       q(trp) => [
-         q(6701),
+         q(6702),
          q(0),
          ],
       q(trq) => [
-         q(6702),
+         q(6703),
          q(0),
          ],
       q(trr) => [
-         q(6703),
+         q(6704),
          q(0),
          ],
       q(trs) => [
-         q(6704),
+         q(6705),
          q(0),
          ],
       q(trt) => [
-         q(6705),
+         q(6706),
          q(0),
          ],
       q(tru) => [
-         q(6706),
+         q(6707),
          q(0),
          ],
       q(trv) => [
-         q(6707),
+         q(6708),
          q(0),
          ],
       q(trw) => [
-         q(6708),
+         q(6709),
          q(0),
          ],
       q(trx) => [
-         q(6709),
+         q(6710),
          q(0),
          ],
       q(try) => [
-         q(6710),
+         q(6711),
          q(0),
          ],
       q(trz) => [
-         q(6711),
+         q(6712),
          q(0),
          ],
       q(tsa) => [
-         q(6712),
+         q(6713),
          q(0),
          ],
       q(tsb) => [
-         q(6713),
+         q(6714),
          q(0),
          ],
       q(tsc) => [
-         q(6714),
+         q(6715),
          q(0),
          ],
       q(tsd) => [
-         q(6715),
+         q(6716),
          q(0),
          ],
       q(tse) => [
-         q(6716),
+         q(6717),
          q(0),
          ],
       q(tsg) => [
-         q(6717),
+         q(6718),
          q(0),
          ],
       q(tsh) => [
-         q(6718),
+         q(6719),
          q(0),
          ],
       q(tsi) => [
@@ -84888,19 +84956,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tsj) => [
-         q(6719),
+         q(6720),
          q(0),
          ],
       q(tsk) => [
-         q(6720),
+         q(6721),
          q(0),
          ],
       q(tsl) => [
-         q(6721),
+         q(6722),
          q(0),
          ],
       q(tsm) => [
-         q(6722),
+         q(6723),
          q(0),
          ],
       q(tsn) => [
@@ -84912,187 +84980,187 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tsp) => [
-         q(6723),
+         q(6724),
          q(0),
          ],
       q(tsq) => [
-         q(6724),
+         q(6725),
          q(0),
          ],
       q(tsr) => [
-         q(6725),
+         q(6726),
          q(0),
          ],
       q(tss) => [
-         q(6726),
+         q(6727),
          q(0),
          ],
       q(tst) => [
-         q(6727),
+         q(6728),
          q(0),
          ],
       q(tsu) => [
-         q(6728),
+         q(6729),
          q(0),
          ],
       q(tsv) => [
-         q(6729),
+         q(6730),
          q(0),
          ],
       q(tsw) => [
-         q(6730),
+         q(6731),
          q(0),
          ],
       q(tsx) => [
-         q(6731),
+         q(6732),
          q(0),
          ],
       q(tsy) => [
-         q(6732),
+         q(6733),
          q(0),
          ],
       q(tsz) => [
-         q(6733),
+         q(6734),
          q(0),
          ],
       q(tta) => [
-         q(6734),
+         q(6735),
          q(0),
          ],
       q(ttb) => [
-         q(6735),
+         q(6736),
          q(0),
          ],
       q(ttc) => [
-         q(6736),
+         q(6737),
          q(0),
          ],
       q(ttd) => [
-         q(6737),
+         q(6738),
          q(0),
          ],
       q(tte) => [
-         q(6738),
+         q(6739),
          q(0),
          ],
       q(ttf) => [
-         q(6739),
+         q(6740),
          q(0),
          ],
       q(ttg) => [
-         q(6740),
+         q(6741),
          q(0),
          ],
       q(tth) => [
-         q(6741),
+         q(6742),
          q(0),
          ],
       q(tti) => [
-         q(6742),
+         q(6743),
          q(0),
          ],
       q(ttj) => [
-         q(6743),
+         q(6744),
          q(0),
          ],
       q(ttk) => [
-         q(6744),
+         q(6745),
          q(0),
          ],
       q(ttl) => [
-         q(6745),
+         q(6746),
          q(0),
          ],
       q(ttm) => [
-         q(6746),
+         q(6747),
          q(0),
          ],
       q(ttn) => [
-         q(6747),
+         q(6748),
          q(0),
          ],
       q(tto) => [
-         q(6748),
+         q(6749),
          q(0),
          ],
       q(ttp) => [
-         q(6749),
+         q(6750),
          q(0),
          ],
       q(ttq) => [
-         q(6750),
+         q(6751),
          q(0),
          ],
       q(ttr) => [
-         q(6751),
+         q(6752),
          q(0),
          ],
       q(tts) => [
-         q(6752),
+         q(6753),
          q(0),
          ],
       q(ttt) => [
-         q(6753),
+         q(6754),
          q(0),
          ],
       q(ttu) => [
-         q(6754),
+         q(6755),
          q(0),
          ],
       q(ttv) => [
-         q(6755),
+         q(6756),
          q(0),
          ],
       q(ttw) => [
-         q(6756),
+         q(6757),
          q(0),
          ],
       q(tty) => [
-         q(6757),
+         q(6758),
          q(0),
          ],
       q(ttz) => [
-         q(6758),
+         q(6759),
          q(0),
          ],
       q(tua) => [
-         q(6759),
+         q(6760),
          q(0),
          ],
       q(tub) => [
-         q(6760),
+         q(6761),
          q(0),
          ],
       q(tuc) => [
-         q(6761),
+         q(6762),
          q(0),
          ],
       q(tud) => [
-         q(6762),
+         q(6763),
          q(0),
          ],
       q(tue) => [
-         q(6763),
+         q(6764),
          q(0),
          ],
       q(tuf) => [
-         q(6764),
+         q(6765),
          q(0),
          ],
       q(tug) => [
-         q(6765),
+         q(6766),
          q(0),
          ],
       q(tuh) => [
-         q(6766),
+         q(6767),
          q(0),
          ],
       q(tui) => [
-         q(6767),
+         q(6768),
          q(0),
          ],
       q(tuj) => [
-         q(6768),
+         q(6769),
          q(0),
          ],
       q(tuk) => [
@@ -85100,7 +85168,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tul) => [
-         q(6769),
+         q(6770),
          q(0),
          ],
       q(tum) => [
@@ -85108,11 +85176,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tun) => [
-         q(6770),
+         q(6771),
          q(0),
          ],
       q(tuo) => [
-         q(6771),
+         q(6772),
          q(0),
          ],
       q(tup) => [
@@ -85120,7 +85188,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tuq) => [
-         q(6772),
+         q(6773),
          q(0),
          ],
       q(tur) => [
@@ -85128,7 +85196,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tus) => [
-         q(6773),
+         q(6774),
          q(0),
          ],
       q(tut) => [
@@ -85136,11 +85204,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tuu) => [
-         q(6774),
+         q(6775),
          q(0),
          ],
       q(tuv) => [
-         q(6775),
+         q(6776),
          q(0),
          ],
       q(tuw) => [
@@ -85148,31 +85216,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tux) => [
-         q(6776),
+         q(6777),
          q(0),
          ],
       q(tuy) => [
-         q(6777),
+         q(6778),
          q(0),
          ],
       q(tuz) => [
-         q(6778),
+         q(6779),
          q(0),
          ],
       q(tva) => [
-         q(6779),
+         q(6780),
          q(0),
          ],
       q(tvd) => [
-         q(6780),
+         q(6781),
          q(0),
          ],
       q(tve) => [
-         q(6781),
+         q(6782),
          q(0),
          ],
       q(tvk) => [
-         q(6782),
+         q(6783),
          q(0),
          ],
       q(tvl) => [
@@ -85180,67 +85248,67 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tvm) => [
-         q(6783),
+         q(6784),
          q(0),
          ],
       q(tvn) => [
-         q(6784),
+         q(6785),
          q(0),
          ],
       q(tvo) => [
-         q(6785),
+         q(6786),
          q(0),
          ],
       q(tvs) => [
-         q(6786),
+         q(6787),
          q(0),
          ],
       q(tvt) => [
-         q(6787),
+         q(6788),
          q(0),
          ],
       q(tvu) => [
-         q(6788),
+         q(6789),
          q(0),
          ],
       q(tvw) => [
-         q(6789),
+         q(6790),
          q(0),
          ],
       q(tvy) => [
-         q(6790),
+         q(6791),
          q(0),
          ],
       q(twa) => [
-         q(6791),
+         q(6792),
          q(0),
          ],
       q(twb) => [
-         q(6792),
+         q(6793),
          q(0),
          ],
       q(twc) => [
-         q(6793),
+         q(6794),
          q(0),
          ],
       q(twd) => [
-         q(6794),
+         q(6795),
          q(0),
          ],
       q(twe) => [
-         q(6795),
+         q(6796),
          q(0),
          ],
       q(twf) => [
-         q(6796),
+         q(6797),
          q(0),
          ],
       q(twg) => [
-         q(6797),
+         q(6798),
          q(0),
          ],
       q(twh) => [
-         q(6798),
+         q(6799),
          q(0),
          ],
       q(twi) => [
@@ -85248,171 +85316,171 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(twl) => [
-         q(6799),
+         q(6800),
          q(0),
          ],
       q(twm) => [
-         q(6800),
+         q(6801),
          q(0),
          ],
       q(twn) => [
-         q(6801),
+         q(6802),
          q(0),
          ],
       q(two) => [
-         q(6802),
+         q(6803),
          q(0),
          ],
       q(twp) => [
-         q(6803),
+         q(6804),
          q(0),
          ],
       q(twq) => [
-         q(6804),
+         q(6805),
          q(0),
          ],
       q(twr) => [
-         q(6805),
+         q(6806),
          q(0),
          ],
       q(twt) => [
-         q(6806),
+         q(6807),
          q(0),
          ],
       q(twu) => [
-         q(6807),
+         q(6808),
          q(0),
          ],
       q(tww) => [
-         q(6808),
+         q(6809),
          q(0),
          ],
       q(twx) => [
-         q(6809),
+         q(6810),
          q(0),
          ],
       q(twy) => [
-         q(6810),
+         q(6811),
          q(0),
          ],
       q(txa) => [
-         q(6811),
+         q(6812),
          q(0),
          ],
       q(txb) => [
-         q(6812),
+         q(6813),
          q(0),
          ],
       q(txc) => [
-         q(6813),
+         q(6814),
          q(0),
          ],
       q(txe) => [
-         q(6814),
+         q(6815),
          q(0),
          ],
       q(txg) => [
-         q(6815),
+         q(6816),
          q(0),
          ],
       q(txh) => [
-         q(6816),
+         q(6817),
          q(0),
          ],
       q(txi) => [
-         q(6817),
+         q(6818),
          q(0),
          ],
       q(txj) => [
-         q(6818),
+         q(6819),
          q(0),
          ],
       q(txm) => [
-         q(6819),
+         q(6820),
          q(0),
          ],
       q(txn) => [
-         q(6820),
+         q(6821),
          q(0),
          ],
       q(txo) => [
-         q(6821),
+         q(6822),
          q(0),
          ],
       q(txq) => [
-         q(6822),
+         q(6823),
          q(0),
          ],
       q(txr) => [
-         q(6823),
+         q(6824),
          q(0),
          ],
       q(txs) => [
-         q(6824),
+         q(6825),
          q(0),
          ],
       q(txt) => [
-         q(6825),
+         q(6826),
          q(0),
          ],
       q(txu) => [
-         q(6826),
+         q(6827),
          q(0),
          ],
       q(txx) => [
-         q(6827),
+         q(6828),
          q(0),
          ],
       q(txy) => [
-         q(6828),
+         q(6829),
          q(0),
          ],
       q(tya) => [
-         q(6829),
+         q(6830),
          q(0),
          ],
       q(tye) => [
-         q(6830),
+         q(6831),
          q(0),
          ],
       q(tyh) => [
-         q(6831),
+         q(6832),
          q(0),
          ],
       q(tyi) => [
-         q(6832),
+         q(6833),
          q(0),
          ],
       q(tyj) => [
-         q(6833),
+         q(6834),
          q(0),
          ],
       q(tyl) => [
-         q(6834),
+         q(6835),
          q(0),
          ],
       q(tyn) => [
-         q(6835),
+         q(6836),
          q(0),
          ],
       q(typ) => [
-         q(6836),
+         q(6837),
          q(0),
          ],
       q(tyr) => [
-         q(6837),
+         q(6838),
          q(0),
          ],
       q(tys) => [
-         q(6838),
+         q(6839),
          q(0),
          ],
       q(tyt) => [
-         q(6839),
+         q(6840),
          q(0),
          ],
       q(tyu) => [
-         q(6840),
+         q(6841),
          q(0),
          ],
       q(tyv) => [
@@ -85420,103 +85488,103 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(tyx) => [
-         q(6841),
+         q(6842),
          q(0),
          ],
       q(tyz) => [
-         q(6842),
+         q(6843),
          q(0),
          ],
       q(tza) => [
-         q(6843),
+         q(6844),
          q(0),
          ],
       q(tzh) => [
-         q(6844),
+         q(6845),
          q(0),
          ],
       q(tzj) => [
-         q(6845),
+         q(6846),
          q(0),
          ],
       q(tzl) => [
-         q(6846),
+         q(6847),
          q(0),
          ],
       q(tzm) => [
-         q(6847),
+         q(6848),
          q(0),
          ],
       q(tzn) => [
-         q(6848),
+         q(6849),
          q(0),
          ],
       q(tzo) => [
-         q(6849),
+         q(6850),
          q(0),
          ],
       q(tzx) => [
-         q(6850),
+         q(6851),
          q(0),
          ],
       q(uam) => [
-         q(6851),
+         q(6852),
          q(0),
          ],
       q(uan) => [
-         q(6852),
+         q(6853),
          q(0),
          ],
       q(uar) => [
-         q(6853),
+         q(6854),
          q(0),
          ],
       q(uba) => [
-         q(6854),
+         q(6855),
          q(0),
          ],
       q(ubi) => [
-         q(6855),
+         q(6856),
          q(0),
          ],
       q(ubl) => [
-         q(6856),
+         q(6857),
          q(0),
          ],
       q(ubr) => [
-         q(6857),
+         q(6858),
          q(0),
          ],
       q(ubu) => [
-         q(6858),
+         q(6859),
          q(0),
          ],
       q(uby) => [
-         q(6859),
+         q(6860),
          q(0),
          ],
       q(uda) => [
-         q(6860),
+         q(6861),
          q(0),
          ],
       q(ude) => [
-         q(6861),
+         q(6862),
          q(0),
          ],
       q(udg) => [
-         q(6862),
+         q(6863),
          q(0),
          ],
       q(udi) => [
-         q(6863),
+         q(6864),
          q(0),
          ],
       q(udj) => [
-         q(6864),
+         q(6865),
          q(0),
          ],
       q(udl) => [
-         q(6865),
+         q(6866),
          q(0),
          ],
       q(udm) => [
@@ -85524,15 +85592,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(udu) => [
-         q(6866),
+         q(6867),
          q(0),
          ],
       q(ues) => [
-         q(6867),
+         q(6868),
          q(0),
          ],
       q(ufi) => [
-         q(6868),
+         q(6869),
          q(0),
          ],
       q(uga) => [
@@ -85540,31 +85608,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ugb) => [
-         q(6869),
+         q(6870),
          q(0),
          ],
       q(uge) => [
-         q(6870),
+         q(6871),
          q(0),
          ],
       q(ugn) => [
-         q(6871),
+         q(6872),
          q(0),
          ],
       q(ugo) => [
-         q(6872),
+         q(6873),
          q(0),
          ],
       q(ugy) => [
-         q(6873),
+         q(6874),
          q(0),
          ],
       q(uha) => [
-         q(6874),
+         q(6875),
          q(0),
          ],
       q(uhn) => [
-         q(6875),
+         q(6876),
          q(0),
          ],
       q(uig) => [
@@ -85572,39 +85640,39 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(uis) => [
-         q(6876),
+         q(6877),
          q(0),
          ],
       q(uiv) => [
-         q(6877),
+         q(6878),
          q(0),
          ],
       q(uji) => [
-         q(6878),
+         q(6879),
          q(0),
          ],
       q(uka) => [
-         q(6879),
+         q(6880),
          q(0),
          ],
       q(ukg) => [
-         q(6880),
+         q(6881),
          q(0),
          ],
       q(ukh) => [
-         q(6881),
+         q(6882),
          q(0),
          ],
       q(ukl) => [
-         q(6882),
+         q(6883),
          q(0),
          ],
       q(ukp) => [
-         q(6883),
+         q(6884),
          q(0),
          ],
       q(ukq) => [
-         q(6884),
+         q(6885),
          q(0),
          ],
       q(ukr) => [
@@ -85612,71 +85680,71 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(uks) => [
-         q(6885),
+         q(6886),
          q(0),
          ],
       q(uku) => [
-         q(6886),
+         q(6887),
          q(0),
          ],
       q(ukw) => [
-         q(6887),
+         q(6888),
          q(0),
          ],
       q(uky) => [
-         q(6888),
+         q(6889),
          q(0),
          ],
       q(ula) => [
-         q(6889),
+         q(6890),
          q(0),
          ],
       q(ulb) => [
-         q(6890),
+         q(6891),
          q(0),
          ],
       q(ulc) => [
-         q(6891),
+         q(6892),
          q(0),
          ],
       q(ule) => [
-         q(6892),
+         q(6893),
          q(0),
          ],
       q(ulf) => [
-         q(6893),
+         q(6894),
          q(0),
          ],
       q(uli) => [
-         q(6894),
+         q(6895),
          q(0),
          ],
       q(ulk) => [
-         q(6895),
+         q(6896),
          q(0),
          ],
       q(ull) => [
-         q(6896),
+         q(6897),
          q(0),
          ],
       q(ulm) => [
-         q(6897),
+         q(6898),
          q(0),
          ],
       q(uln) => [
-         q(6898),
+         q(6899),
          q(0),
          ],
       q(ulu) => [
-         q(6899),
+         q(6900),
          q(0),
          ],
       q(ulw) => [
-         q(6900),
+         q(6901),
          q(0),
          ],
       q(uma) => [
-         q(6901),
+         q(6902),
          q(0),
          ],
       q(umb) => [
@@ -85684,51 +85752,51 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(umc) => [
-         q(6902),
+         q(6903),
          q(0),
          ],
       q(umd) => [
-         q(6903),
+         q(6904),
          q(0),
          ],
       q(umg) => [
-         q(6904),
+         q(6905),
          q(0),
          ],
       q(umi) => [
-         q(6905),
+         q(6906),
          q(0),
          ],
       q(umm) => [
-         q(6906),
+         q(6907),
          q(0),
          ],
       q(umn) => [
-         q(6907),
+         q(6908),
          q(0),
          ],
       q(umo) => [
-         q(6908),
+         q(6909),
          q(0),
          ],
       q(ump) => [
-         q(6909),
+         q(6910),
          q(0),
          ],
       q(umr) => [
-         q(6910),
+         q(6911),
          q(0),
          ],
       q(ums) => [
-         q(6911),
+         q(6912),
          q(0),
          ],
       q(umu) => [
-         q(6912),
+         q(6913),
          q(0),
          ],
       q(una) => [
-         q(6913),
+         q(6914),
          q(0),
          ],
       q(und) => [
@@ -85736,59 +85804,59 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(une) => [
-         q(6914),
+         q(6915),
          q(0),
          ],
       q(ung) => [
-         q(6915),
+         q(6916),
          q(0),
          ],
       q(unk) => [
-         q(6916),
+         q(6917),
          q(0),
          ],
       q(unm) => [
-         q(6917),
+         q(6918),
          q(0),
          ],
       q(unn) => [
-         q(6918),
+         q(6919),
          q(0),
          ],
       q(unr) => [
-         q(6919),
+         q(6920),
          q(0),
          ],
       q(unu) => [
-         q(6920),
+         q(6921),
          q(0),
          ],
       q(unx) => [
-         q(6921),
+         q(6922),
          q(0),
          ],
       q(unz) => [
-         q(6922),
+         q(6923),
          q(0),
          ],
       q(upi) => [
-         q(6923),
+         q(6924),
          q(0),
          ],
       q(upv) => [
-         q(6924),
+         q(6925),
          q(0),
          ],
       q(ura) => [
-         q(6925),
+         q(6926),
          q(0),
          ],
       q(urb) => [
-         q(6926),
+         q(6927),
          q(0),
          ],
       q(urc) => [
-         q(6927),
+         q(6928),
          q(0),
          ],
       q(urd) => [
@@ -85796,23 +85864,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ure) => [
-         q(6928),
+         q(6929),
          q(0),
          ],
       q(urf) => [
-         q(6929),
+         q(6930),
          q(0),
          ],
       q(urg) => [
-         q(6930),
+         q(6931),
          q(0),
          ],
       q(urh) => [
-         q(6931),
+         q(6932),
          q(0),
          ],
       q(uri) => [
-         q(6932),
+         q(6933),
          q(0),
          ],
       q(urj) => [
@@ -85820,139 +85888,139 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(urk) => [
-         q(6933),
+         q(6934),
          q(0),
          ],
       q(url) => [
-         q(6934),
+         q(6935),
          q(0),
          ],
       q(urm) => [
-         q(6935),
+         q(6936),
          q(0),
          ],
       q(urn) => [
-         q(6936),
+         q(6937),
          q(0),
          ],
       q(uro) => [
-         q(6937),
+         q(6938),
          q(0),
          ],
       q(urp) => [
-         q(6938),
+         q(6939),
          q(0),
          ],
       q(urr) => [
-         q(6939),
+         q(6940),
          q(0),
          ],
       q(urt) => [
-         q(6940),
+         q(6941),
          q(0),
          ],
       q(uru) => [
-         q(6941),
+         q(6942),
          q(0),
          ],
       q(urv) => [
-         q(6942),
+         q(6943),
          q(0),
          ],
       q(urw) => [
-         q(6943),
+         q(6944),
          q(0),
          ],
       q(urx) => [
-         q(6944),
+         q(6945),
          q(0),
          ],
       q(ury) => [
-         q(6945),
+         q(6946),
          q(0),
          ],
       q(urz) => [
-         q(6946),
+         q(6947),
          q(0),
          ],
       q(usa) => [
-         q(6947),
+         q(6948),
          q(0),
          ],
       q(ush) => [
-         q(6948),
+         q(6949),
          q(0),
          ],
       q(usi) => [
-         q(6949),
+         q(6950),
          q(0),
          ],
       q(usk) => [
-         q(6950),
+         q(6951),
          q(0),
          ],
       q(usp) => [
-         q(6951),
+         q(6952),
          q(0),
          ],
       q(usu) => [
-         q(6952),
+         q(6953),
          q(0),
          ],
       q(uta) => [
-         q(6953),
+         q(6954),
          q(0),
          ],
       q(ute) => [
-         q(6954),
+         q(6955),
          q(0),
          ],
       q(utp) => [
-         q(6955),
+         q(6956),
          q(0),
          ],
       q(utr) => [
-         q(6956),
+         q(6957),
          q(0),
          ],
       q(utu) => [
-         q(6957),
+         q(6958),
          q(0),
          ],
       q(uum) => [
-         q(6958),
+         q(6959),
          q(0),
          ],
       q(uun) => [
-         q(6959),
+         q(6960),
          q(0),
          ],
       q(uur) => [
-         q(6960),
+         q(6961),
          q(0),
          ],
       q(uuu) => [
-         q(6961),
+         q(6962),
          q(0),
          ],
       q(uve) => [
-         q(6962),
+         q(6963),
          q(0),
          ],
       q(uvh) => [
-         q(6963),
+         q(6964),
          q(0),
          ],
       q(uvl) => [
-         q(6964),
+         q(6965),
          q(0),
          ],
       q(uwa) => [
-         q(6965),
+         q(6966),
          q(0),
          ],
       q(uya) => [
-         q(6966),
+         q(6967),
          q(0),
          ],
       q(uzb) => [
@@ -85960,31 +86028,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(uzn) => [
-         q(6967),
+         q(6968),
          q(0),
          ],
       q(uzs) => [
-         q(6968),
+         q(6969),
          q(0),
          ],
       q(vaa) => [
-         q(6969),
+         q(6970),
          q(0),
          ],
       q(vae) => [
-         q(6970),
+         q(6971),
          q(0),
          ],
       q(vaf) => [
-         q(6971),
+         q(6972),
          q(0),
          ],
       q(vag) => [
-         q(6972),
+         q(6973),
          q(0),
          ],
       q(vah) => [
-         q(6973),
+         q(6974),
          q(0),
          ],
       q(vai) => [
@@ -85992,71 +86060,71 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(vaj) => [
-         q(6974),
+         q(6975),
          q(0),
          ],
       q(val) => [
-         q(6975),
+         q(6976),
          q(0),
          ],
       q(vam) => [
-         q(6976),
+         q(6977),
          q(0),
          ],
       q(van) => [
-         q(6977),
+         q(6978),
          q(0),
          ],
       q(vao) => [
-         q(6978),
+         q(6979),
          q(0),
          ],
       q(vap) => [
-         q(6979),
+         q(6980),
          q(0),
          ],
       q(var) => [
-         q(6980),
+         q(6981),
          q(0),
          ],
       q(vas) => [
-         q(6981),
+         q(6982),
          q(0),
          ],
       q(vau) => [
-         q(6982),
+         q(6983),
          q(0),
          ],
       q(vav) => [
-         q(6983),
+         q(6984),
          q(0),
          ],
       q(vay) => [
-         q(6984),
+         q(6985),
          q(0),
          ],
       q(vbb) => [
-         q(6985),
+         q(6986),
          q(0),
          ],
       q(vbk) => [
-         q(6986),
+         q(6987),
          q(0),
          ],
       q(vec) => [
-         q(6987),
+         q(6988),
          q(0),
          ],
       q(ved) => [
-         q(6988),
+         q(6989),
          q(0),
          ],
       q(vel) => [
-         q(6989),
+         q(6990),
          q(0),
          ],
       q(vem) => [
-         q(6990),
+         q(6991),
          q(0),
          ],
       q(ven) => [
@@ -86064,31 +86132,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(veo) => [
-         q(6991),
+         q(6992),
          q(0),
          ],
       q(vep) => [
-         q(6992),
+         q(6993),
          q(0),
          ],
       q(ver) => [
-         q(6993),
+         q(6994),
          q(0),
          ],
       q(vgr) => [
-         q(6994),
+         q(6995),
          q(0),
          ],
       q(vgt) => [
-         q(6995),
+         q(6996),
          q(0),
          ],
       q(vic) => [
-         q(6996),
+         q(6997),
          q(0),
          ],
       q(vid) => [
-         q(6997),
+         q(6998),
          q(0),
          ],
       q(vie) => [
@@ -86096,183 +86164,183 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(vif) => [
-         q(6998),
+         q(6999),
          q(0),
          ],
       q(vig) => [
-         q(6999),
+         q(7000),
          q(0),
          ],
       q(vil) => [
-         q(7000),
+         q(7001),
          q(0),
          ],
       q(vin) => [
-         q(7001),
+         q(7002),
          q(0),
          ],
       q(vis) => [
-         q(7002),
+         q(7003),
          q(0),
          ],
       q(vit) => [
-         q(7003),
+         q(7004),
          q(0),
          ],
       q(viv) => [
-         q(7004),
+         q(7005),
          q(0),
          ],
       q(vka) => [
-         q(7005),
+         q(7006),
          q(0),
          ],
       q(vki) => [
-         q(7006),
+         q(7007),
          q(0),
          ],
       q(vkj) => [
-         q(7007),
+         q(7008),
          q(0),
          ],
       q(vkk) => [
-         q(7008),
+         q(7009),
          q(0),
          ],
       q(vkl) => [
-         q(7009),
+         q(7010),
          q(0),
          ],
       q(vkm) => [
-         q(7010),
+         q(7011),
          q(0),
          ],
       q(vko) => [
-         q(7011),
+         q(7012),
          q(0),
          ],
       q(vkp) => [
-         q(7012),
+         q(7013),
          q(0),
          ],
       q(vkt) => [
-         q(7013),
+         q(7014),
          q(0),
          ],
       q(vku) => [
-         q(7014),
+         q(7015),
          q(0),
          ],
       q(vlp) => [
-         q(7015),
+         q(7016),
          q(0),
          ],
       q(vls) => [
-         q(7016),
+         q(7017),
          q(0),
          ],
       q(vma) => [
-         q(7017),
+         q(7018),
          q(0),
          ],
       q(vmb) => [
-         q(7018),
+         q(7019),
          q(0),
          ],
       q(vmc) => [
-         q(7019),
+         q(7020),
          q(0),
          ],
       q(vmd) => [
-         q(7020),
+         q(7021),
          q(0),
          ],
       q(vme) => [
-         q(7021),
+         q(7022),
          q(0),
          ],
       q(vmf) => [
-         q(7022),
+         q(7023),
          q(0),
          ],
       q(vmg) => [
-         q(7023),
+         q(7024),
          q(0),
          ],
       q(vmh) => [
-         q(7024),
+         q(7025),
          q(0),
          ],
       q(vmi) => [
-         q(7025),
+         q(7026),
          q(0),
          ],
       q(vmj) => [
-         q(7026),
+         q(7027),
          q(0),
          ],
       q(vmk) => [
-         q(7027),
+         q(7028),
          q(0),
          ],
       q(vml) => [
-         q(7028),
+         q(7029),
          q(0),
          ],
       q(vmm) => [
-         q(7029),
+         q(7030),
          q(0),
          ],
       q(vmp) => [
-         q(7030),
+         q(7031),
          q(0),
          ],
       q(vmq) => [
-         q(7031),
+         q(7032),
          q(0),
          ],
       q(vmr) => [
-         q(7032),
+         q(7033),
          q(0),
          ],
       q(vms) => [
-         q(7033),
+         q(7034),
          q(0),
          ],
       q(vmu) => [
-         q(7034),
+         q(7035),
          q(0),
          ],
       q(vmv) => [
-         q(7035),
+         q(7036),
          q(0),
          ],
       q(vmw) => [
-         q(7036),
+         q(7037),
          q(0),
          ],
       q(vmx) => [
-         q(7037),
+         q(7038),
          q(0),
          ],
       q(vmy) => [
-         q(7038),
+         q(7039),
          q(0),
          ],
       q(vmz) => [
-         q(7039),
+         q(7040),
          q(0),
          ],
       q(vnk) => [
-         q(7040),
+         q(7041),
          q(0),
          ],
       q(vnm) => [
-         q(7041),
+         q(7042),
          q(0),
          ],
       q(vnp) => [
-         q(7042),
+         q(7043),
          q(0),
          ],
       q(vol) => [
@@ -86280,7 +86348,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(vor) => [
-         q(7043),
+         q(7044),
          q(0),
          ],
       q(vot) => [
@@ -86288,91 +86356,91 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(vra) => [
-         q(7044),
+         q(7045),
          q(0),
          ],
       q(vro) => [
-         q(7043),
+         q(7044),
          q(0),
          ],
       q(vrs) => [
-         q(7045),
+         q(7046),
          q(0),
          ],
       q(vrt) => [
-         q(7046),
+         q(7047),
          q(0),
          ],
       q(vsi) => [
-         q(7047),
+         q(7048),
          q(0),
          ],
       q(vsl) => [
-         q(7048),
+         q(7049),
          q(0),
          ],
       q(vsv) => [
-         q(7049),
+         q(7050),
          q(0),
          ],
       q(vto) => [
-         q(7050),
+         q(7051),
          q(0),
          ],
       q(vum) => [
-         q(7051),
+         q(7052),
          q(0),
          ],
       q(vun) => [
-         q(7052),
+         q(7053),
          q(0),
          ],
       q(vut) => [
-         q(7053),
+         q(7054),
          q(0),
          ],
       q(vwa) => [
-         q(7054),
+         q(7055),
          q(0),
          ],
       q(waa) => [
-         q(7055),
+         q(7056),
          q(0),
          ],
       q(wab) => [
-         q(7056),
+         q(7057),
          q(0),
          ],
       q(wac) => [
-         q(7057),
+         q(7058),
          q(0),
          ],
       q(wad) => [
-         q(7058),
+         q(7059),
          q(0),
          ],
       q(wae) => [
-         q(7059),
+         q(7060),
          q(0),
          ],
       q(waf) => [
-         q(7060),
+         q(7061),
          q(0),
          ],
       q(wag) => [
-         q(7061),
+         q(7062),
          q(0),
          ],
       q(wah) => [
-         q(7062),
+         q(7063),
          q(0),
          ],
       q(wai) => [
-         q(7063),
+         q(7064),
          q(0),
          ],
       q(waj) => [
-         q(7064),
+         q(7065),
          q(0),
          ],
       q(wak) => [
@@ -86384,23 +86452,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(1),
          ],
       q(wam) => [
-         q(7065),
+         q(7066),
          q(0),
          ],
       q(wan) => [
-         q(7066),
+         q(7067),
          q(0),
          ],
       q(wao) => [
-         q(7067),
+         q(7068),
          q(0),
          ],
       q(wap) => [
-         q(7068),
+         q(7069),
          q(0),
          ],
       q(waq) => [
-         q(7069),
+         q(7070),
          q(0),
          ],
       q(war) => [
@@ -86412,151 +86480,151 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(wat) => [
-         q(7070),
+         q(7071),
          q(0),
          ],
       q(wau) => [
-         q(7071),
+         q(7072),
          q(0),
          ],
       q(wav) => [
-         q(7072),
+         q(7073),
          q(0),
          ],
       q(waw) => [
-         q(7073),
+         q(7074),
          q(0),
          ],
       q(wax) => [
-         q(7074),
+         q(7075),
          q(0),
          ],
       q(way) => [
-         q(7075),
+         q(7076),
          q(0),
          ],
       q(waz) => [
-         q(7076),
+         q(7077),
          q(0),
          ],
       q(wba) => [
-         q(7077),
+         q(7078),
          q(0),
          ],
       q(wbb) => [
-         q(7078),
+         q(7079),
          q(0),
          ],
       q(wbe) => [
-         q(7079),
+         q(7080),
          q(0),
          ],
       q(wbf) => [
-         q(6412),
+         q(6413),
          q(0),
          ],
       q(wbh) => [
-         q(7080),
+         q(7081),
          q(0),
          ],
       q(wbi) => [
-         q(7081),
+         q(7082),
          q(0),
          ],
       q(wbj) => [
-         q(7082),
+         q(7083),
          q(0),
          ],
       q(wbk) => [
-         q(7083),
+         q(7084),
          q(0),
          ],
       q(wbl) => [
-         q(7084),
+         q(7085),
          q(0),
          ],
       q(wbm) => [
-         q(7085),
+         q(7086),
          q(0),
          ],
       q(wbp) => [
-         q(7086),
+         q(7087),
          q(0),
          ],
       q(wbq) => [
-         q(7087),
+         q(7088),
          q(0),
          ],
       q(wbr) => [
-         q(7088),
+         q(7089),
          q(0),
          ],
       q(wbt) => [
-         q(7089),
+         q(7090),
          q(0),
          ],
       q(wbv) => [
-         q(7090),
+         q(7091),
          q(0),
          ],
       q(wbw) => [
-         q(7091),
+         q(7092),
          q(0),
          ],
       q(wca) => [
-         q(7092),
+         q(7093),
          q(0),
          ],
       q(wci) => [
-         q(7093),
+         q(7094),
          q(0),
          ],
       q(wdd) => [
-         q(7094),
+         q(7095),
          q(0),
          ],
       q(wdg) => [
-         q(7095),
+         q(7096),
          q(0),
          ],
       q(wdj) => [
-         q(7096),
+         q(7097),
          q(0),
          ],
       q(wdk) => [
-         q(7097),
+         q(7098),
          q(0),
          ],
       q(wdu) => [
-         q(7098),
+         q(7099),
          q(0),
          ],
       q(wdy) => [
-         q(7099),
+         q(7100),
          q(0),
          ],
       q(wea) => [
-         q(7100),
+         q(7101),
          q(0),
          ],
       q(wec) => [
-         q(7101),
+         q(7102),
          q(0),
          ],
       q(wed) => [
-         q(7102),
+         q(7103),
          q(0),
          ],
       q(weg) => [
-         q(7103),
+         q(7104),
          q(0),
          ],
       q(weh) => [
-         q(7104),
+         q(7105),
          q(0),
          ],
       q(wei) => [
-         q(7105),
+         q(7106),
          q(0),
          ],
       q(wel) => [
@@ -86564,7 +86632,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(wem) => [
-         q(7106),
+         q(7107),
          q(0),
          ],
       q(wen) => [
@@ -86572,211 +86640,211 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(weo) => [
-         q(7107),
+         q(7108),
          q(0),
          ],
       q(wep) => [
-         q(7108),
+         q(7109),
          q(0),
          ],
       q(wer) => [
-         q(7109),
+         q(7110),
          q(0),
          ],
       q(wes) => [
-         q(7110),
+         q(7111),
          q(0),
          ],
       q(wet) => [
-         q(7111),
+         q(7112),
          q(0),
          ],
       q(weu) => [
-         q(7112),
+         q(7113),
          q(0),
          ],
       q(wew) => [
-         q(7113),
+         q(7114),
          q(0),
          ],
       q(wfg) => [
-         q(7114),
+         q(7115),
          q(0),
          ],
       q(wga) => [
-         q(7115),
+         q(7116),
          q(0),
          ],
       q(wgb) => [
-         q(7116),
+         q(7117),
          q(0),
          ],
       q(wgg) => [
-         q(7117),
+         q(7118),
          q(0),
          ],
       q(wgi) => [
-         q(7118),
+         q(7119),
          q(0),
          ],
       q(wgo) => [
-         q(7119),
+         q(7120),
          q(0),
          ],
       q(wgu) => [
-         q(7120),
+         q(7121),
          q(0),
          ],
       q(wgy) => [
-         q(7121),
+         q(7122),
          q(0),
          ],
       q(wha) => [
-         q(7122),
+         q(7123),
          q(0),
          ],
       q(whg) => [
-         q(7123),
+         q(7124),
          q(0),
          ],
       q(whk) => [
-         q(7124),
+         q(7125),
          q(0),
          ],
       q(whu) => [
-         q(7125),
+         q(7126),
          q(0),
          ],
       q(wib) => [
-         q(7126),
+         q(7127),
          q(0),
          ],
       q(wic) => [
-         q(7127),
+         q(7128),
          q(0),
          ],
       q(wie) => [
-         q(7128),
+         q(7129),
          q(0),
          ],
       q(wif) => [
-         q(7129),
+         q(7130),
          q(0),
          ],
       q(wig) => [
-         q(7130),
+         q(7131),
          q(0),
          ],
       q(wih) => [
-         q(7131),
+         q(7132),
          q(0),
          ],
       q(wii) => [
-         q(7132),
+         q(7133),
          q(0),
          ],
       q(wij) => [
-         q(7133),
+         q(7134),
          q(0),
          ],
       q(wik) => [
-         q(7134),
+         q(7135),
          q(0),
          ],
       q(wil) => [
-         q(7135),
+         q(7136),
          q(0),
          ],
       q(wim) => [
-         q(7136),
+         q(7137),
          q(0),
          ],
       q(win) => [
-         q(7137),
+         q(7138),
          q(0),
          ],
       q(wir) => [
-         q(7138),
+         q(7139),
          q(0),
          ],
       q(wiu) => [
-         q(7139),
+         q(7140),
          q(0),
          ],
       q(wiv) => [
-         q(7140),
+         q(7141),
          q(0),
          ],
       q(wiy) => [
-         q(7141),
+         q(7142),
          q(0),
          ],
       q(wja) => [
-         q(7142),
+         q(7143),
          q(0),
          ],
       q(wji) => [
-         q(7143),
+         q(7144),
          q(0),
          ],
       q(wka) => [
-         q(7144),
+         q(7145),
          q(0),
          ],
       q(wkb) => [
-         q(7145),
+         q(7146),
          q(0),
          ],
       q(wkd) => [
-         q(7146),
+         q(7147),
          q(0),
          ],
       q(wkl) => [
-         q(7147),
+         q(7148),
          q(0),
          ],
       q(wku) => [
-         q(7148),
+         q(7149),
          q(0),
          ],
       q(wkw) => [
-         q(7149),
+         q(7150),
          q(0),
          ],
       q(wky) => [
-         q(7150),
+         q(7151),
          q(0),
          ],
       q(wla) => [
-         q(7151),
+         q(7152),
          q(0),
          ],
       q(wlc) => [
-         q(7152),
+         q(7153),
          q(0),
          ],
       q(wle) => [
-         q(7153),
+         q(7154),
          q(0),
          ],
       q(wlg) => [
-         q(7154),
+         q(7155),
          q(0),
          ],
       q(wli) => [
-         q(7155),
+         q(7156),
          q(0),
          ],
       q(wlk) => [
-         q(7156),
+         q(7157),
          q(0),
          ],
       q(wll) => [
-         q(7157),
+         q(7158),
          q(0),
          ],
       q(wlm) => [
-         q(7158),
+         q(7159),
          q(0),
          ],
       q(wln) => [
@@ -86784,183 +86852,183 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(wlo) => [
-         q(7159),
+         q(7160),
          q(0),
          ],
       q(wlr) => [
-         q(7160),
+         q(7161),
          q(0),
          ],
       q(wls) => [
-         q(7161),
+         q(7162),
          q(0),
          ],
       q(wlu) => [
-         q(7162),
+         q(7163),
          q(0),
          ],
       q(wlv) => [
-         q(7163),
+         q(7164),
          q(0),
          ],
       q(wlw) => [
-         q(7164),
+         q(7165),
          q(0),
          ],
       q(wlx) => [
-         q(7165),
+         q(7166),
          q(0),
          ],
       q(wly) => [
-         q(7166),
+         q(7167),
          q(0),
          ],
       q(wma) => [
-         q(7167),
+         q(7168),
          q(0),
          ],
       q(wmb) => [
-         q(7168),
+         q(7169),
          q(0),
          ],
       q(wmc) => [
-         q(7169),
+         q(7170),
          q(0),
          ],
       q(wmd) => [
-         q(7170),
+         q(7171),
          q(0),
          ],
       q(wme) => [
-         q(7171),
+         q(7172),
          q(0),
          ],
       q(wmh) => [
-         q(7172),
+         q(7173),
          q(0),
          ],
       q(wmi) => [
-         q(7173),
+         q(7174),
          q(0),
          ],
       q(wmm) => [
-         q(7174),
+         q(7175),
          q(0),
          ],
       q(wmn) => [
-         q(7175),
+         q(7176),
          q(0),
          ],
       q(wmo) => [
-         q(7176),
+         q(7177),
          q(0),
          ],
       q(wms) => [
-         q(7177),
+         q(7178),
          q(0),
          ],
       q(wmt) => [
-         q(7178),
+         q(7179),
          q(0),
          ],
       q(wmw) => [
-         q(7179),
+         q(7180),
          q(0),
          ],
       q(wmx) => [
-         q(7180),
+         q(7181),
          q(0),
          ],
       q(wnb) => [
-         q(7181),
+         q(7182),
          q(0),
          ],
       q(wnc) => [
-         q(7182),
+         q(7183),
          q(0),
          ],
       q(wnd) => [
-         q(7183),
+         q(7184),
          q(0),
          ],
       q(wne) => [
-         q(7184),
+         q(7185),
          q(0),
          ],
       q(wng) => [
-         q(7185),
+         q(7186),
          q(0),
          ],
       q(wni) => [
-         q(7186),
+         q(7187),
          q(0),
          ],
       q(wnk) => [
-         q(7187),
+         q(7188),
          q(0),
          ],
       q(wnm) => [
-         q(7188),
+         q(7189),
          q(0),
          ],
       q(wnn) => [
-         q(7189),
+         q(7190),
          q(0),
          ],
       q(wno) => [
-         q(7190),
+         q(7191),
          q(0),
          ],
       q(wnp) => [
-         q(7191),
+         q(7192),
          q(0),
          ],
       q(wnu) => [
-         q(7192),
+         q(7193),
          q(0),
          ],
       q(wnw) => [
-         q(7193),
+         q(7194),
          q(0),
          ],
       q(wny) => [
-         q(7194),
+         q(7195),
          q(0),
          ],
       q(woa) => [
-         q(7195),
+         q(7196),
          q(0),
          ],
       q(wob) => [
-         q(7196),
+         q(7197),
          q(0),
          ],
       q(woc) => [
-         q(7197),
+         q(7198),
          q(0),
          ],
       q(wod) => [
-         q(7198),
+         q(7199),
          q(0),
          ],
       q(woe) => [
-         q(7199),
+         q(7200),
          q(0),
          ],
       q(wof) => [
-         q(7200),
+         q(7201),
          q(0),
          ],
       q(wog) => [
-         q(7201),
+         q(7202),
          q(0),
          ],
       q(woi) => [
-         q(7202),
+         q(7203),
          q(0),
          ],
       q(wok) => [
-         q(7203),
+         q(7204),
          q(0),
          ],
       q(wol) => [
@@ -86968,303 +87036,303 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(wom) => [
-         q(7204),
+         q(7205),
          q(0),
          ],
       q(won) => [
-         q(7205),
+         q(7206),
          q(0),
          ],
       q(woo) => [
-         q(7206),
+         q(7207),
          q(0),
          ],
       q(wor) => [
-         q(7207),
+         q(7208),
          q(0),
          ],
       q(wos) => [
-         q(7208),
+         q(7209),
          q(0),
          ],
       q(wow) => [
-         q(7209),
+         q(7210),
          q(0),
          ],
       q(woy) => [
-         q(7210),
+         q(7211),
          q(0),
          ],
       q(wpc) => [
-         q(7211),
+         q(7212),
          q(0),
          ],
       q(wra) => [
-         q(7212),
+         q(7213),
          q(0),
          ],
       q(wrb) => [
-         q(7213),
+         q(7214),
          q(0),
          ],
       q(wrd) => [
-         q(7214),
+         q(7215),
          q(0),
          ],
       q(wrg) => [
-         q(7215),
+         q(7216),
          q(0),
          ],
       q(wrh) => [
-         q(7216),
+         q(7217),
          q(0),
          ],
       q(wri) => [
-         q(7217),
+         q(7218),
          q(0),
          ],
       q(wrk) => [
-         q(7218),
+         q(7219),
          q(0),
          ],
       q(wrl) => [
-         q(7219),
+         q(7220),
          q(0),
          ],
       q(wrm) => [
-         q(7220),
+         q(7221),
          q(0),
          ],
       q(wrn) => [
-         q(7221),
+         q(7222),
          q(0),
          ],
       q(wro) => [
-         q(7222),
+         q(7223),
          q(0),
          ],
       q(wrp) => [
-         q(7223),
+         q(7224),
          q(0),
          ],
       q(wrr) => [
-         q(7224),
+         q(7225),
          q(0),
          ],
       q(wrs) => [
-         q(7225),
+         q(7226),
          q(0),
          ],
       q(wru) => [
-         q(7226),
+         q(7227),
          q(0),
          ],
       q(wrv) => [
-         q(7227),
+         q(7228),
          q(0),
          ],
       q(wrw) => [
-         q(7228),
+         q(7229),
          q(0),
          ],
       q(wrx) => [
-         q(7229),
+         q(7230),
          q(0),
          ],
       q(wry) => [
-         q(7230),
+         q(7231),
          q(0),
          ],
       q(wrz) => [
-         q(7231),
+         q(7232),
          q(0),
          ],
       q(wsa) => [
-         q(7232),
+         q(7233),
          q(0),
          ],
       q(wsi) => [
-         q(7233),
+         q(7234),
          q(0),
          ],
       q(wsk) => [
-         q(7234),
+         q(7235),
          q(0),
          ],
       q(wsr) => [
-         q(7235),
+         q(7236),
          q(0),
          ],
       q(wss) => [
-         q(7236),
+         q(7237),
          q(0),
          ],
       q(wsu) => [
-         q(7237),
+         q(7238),
          q(0),
          ],
       q(wsv) => [
-         q(7238),
+         q(7239),
          q(0),
          ],
       q(wtf) => [
-         q(7239),
+         q(7240),
          q(0),
          ],
       q(wth) => [
-         q(7240),
+         q(7241),
          q(0),
          ],
       q(wti) => [
-         q(7241),
+         q(7242),
          q(0),
          ],
       q(wtk) => [
-         q(7242),
+         q(7243),
          q(0),
          ],
       q(wtm) => [
-         q(7243),
+         q(7244),
          q(0),
          ],
       q(wtw) => [
-         q(7244),
+         q(7245),
          q(0),
          ],
       q(wua) => [
-         q(7245),
+         q(7246),
          q(0),
          ],
       q(wub) => [
-         q(7246),
+         q(7247),
          q(0),
          ],
       q(wud) => [
-         q(7247),
+         q(7248),
          q(0),
          ],
       q(wuh) => [
-         q(7248),
+         q(7249),
          q(0),
          ],
       q(wul) => [
-         q(7249),
+         q(7250),
          q(0),
          ],
       q(wum) => [
-         q(7250),
+         q(7251),
          q(0),
          ],
       q(wun) => [
-         q(7251),
+         q(7252),
          q(0),
          ],
       q(wur) => [
-         q(7252),
+         q(7253),
          q(0),
          ],
       q(wut) => [
-         q(7253),
+         q(7254),
          q(0),
          ],
       q(wuu) => [
-         q(7254),
+         q(7255),
          q(0),
          ],
       q(wuv) => [
-         q(7255),
+         q(7256),
          q(0),
          ],
       q(wux) => [
-         q(7256),
+         q(7257),
          q(0),
          ],
       q(wuy) => [
-         q(7257),
+         q(7258),
          q(0),
          ],
       q(wwa) => [
-         q(7258),
+         q(7259),
          q(0),
          ],
       q(wwb) => [
-         q(7259),
+         q(7260),
          q(0),
          ],
       q(wwo) => [
-         q(7260),
+         q(7261),
          q(0),
          ],
       q(wwr) => [
-         q(7261),
+         q(7262),
          q(0),
          ],
       q(www) => [
-         q(7262),
+         q(7263),
          q(0),
          ],
       q(wxa) => [
-         q(7263),
+         q(7264),
          q(0),
          ],
       q(wxw) => [
-         q(7264),
+         q(7265),
          q(0),
          ],
       q(wya) => [
-         q(7265),
+         q(7266),
          q(0),
          ],
       q(wyb) => [
-         q(7266),
+         q(7267),
          q(0),
          ],
       q(wyi) => [
-         q(7267),
+         q(7268),
          q(0),
          ],
       q(wym) => [
-         q(7268),
+         q(7269),
          q(0),
          ],
       q(wyr) => [
-         q(7269),
+         q(7270),
          q(0),
          ],
       q(wyy) => [
-         q(7270),
+         q(7271),
          q(0),
          ],
       q(xaa) => [
-         q(7271),
+         q(7272),
          q(0),
          ],
       q(xab) => [
-         q(7272),
+         q(7273),
          q(0),
          ],
       q(xac) => [
-         q(7273),
+         q(7274),
          q(0),
          ],
       q(xad) => [
-         q(7274),
+         q(7275),
          q(0),
          ],
       q(xae) => [
-         q(7275),
+         q(7276),
          q(0),
          ],
       q(xag) => [
-         q(7276),
+         q(7277),
          q(0),
          ],
       q(xai) => [
-         q(7277),
+         q(7278),
          q(0),
          ],
       q(xaj) => [
-         q(7278),
+         q(7279),
          q(0),
          ],
       q(xal) => [
@@ -87272,271 +87340,271 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(xam) => [
-         q(7279),
+         q(7280),
          q(0),
          ],
       q(xan) => [
-         q(7280),
+         q(7281),
          q(0),
          ],
       q(xao) => [
-         q(7281),
+         q(7282),
          q(0),
          ],
       q(xap) => [
-         q(7282),
+         q(7283),
          q(0),
          ],
       q(xaq) => [
-         q(7283),
+         q(7284),
          q(0),
          ],
       q(xar) => [
-         q(7284),
+         q(7285),
          q(0),
          ],
       q(xas) => [
-         q(7285),
+         q(7286),
          q(0),
          ],
       q(xat) => [
-         q(7286),
+         q(7287),
          q(0),
          ],
       q(xau) => [
-         q(7287),
+         q(7288),
          q(0),
          ],
       q(xav) => [
-         q(7288),
+         q(7289),
          q(0),
          ],
       q(xaw) => [
-         q(7289),
+         q(7290),
          q(0),
          ],
       q(xay) => [
-         q(7290),
+         q(7291),
          q(0),
          ],
       q(xba) => [
-         q(7291),
+         q(7292),
          q(0),
          ],
       q(xbb) => [
-         q(7292),
+         q(7293),
          q(0),
          ],
       q(xbc) => [
-         q(7293),
+         q(7294),
          q(0),
          ],
       q(xbd) => [
-         q(7294),
+         q(7295),
          q(0),
          ],
       q(xbe) => [
-         q(7295),
+         q(7296),
          q(0),
          ],
       q(xbg) => [
-         q(7296),
+         q(7297),
          q(0),
          ],
       q(xbi) => [
-         q(7297),
+         q(7298),
          q(0),
          ],
       q(xbj) => [
-         q(7298),
+         q(7299),
          q(0),
          ],
       q(xbm) => [
-         q(7299),
+         q(7300),
          q(0),
          ],
       q(xbn) => [
-         q(7300),
+         q(7301),
          q(0),
          ],
       q(xbo) => [
-         q(7301),
+         q(7302),
          q(0),
          ],
       q(xbp) => [
-         q(7302),
+         q(7303),
          q(0),
          ],
       q(xbr) => [
-         q(7303),
+         q(7304),
          q(0),
          ],
       q(xbw) => [
-         q(7304),
+         q(7305),
          q(0),
          ],
       q(xbx) => [
-         q(7305),
+         q(7306),
          q(0),
          ],
       q(xby) => [
-         q(7306),
+         q(7307),
          q(0),
          ],
       q(xcb) => [
-         q(7307),
+         q(7308),
          q(0),
          ],
       q(xcc) => [
-         q(7308),
+         q(7309),
          q(0),
          ],
       q(xce) => [
-         q(7309),
+         q(7310),
          q(0),
          ],
       q(xcg) => [
-         q(7310),
+         q(7311),
          q(0),
          ],
       q(xch) => [
-         q(7311),
+         q(7312),
          q(0),
          ],
       q(xcl) => [
-         q(7312),
+         q(7313),
          q(0),
          ],
       q(xcm) => [
-         q(7313),
+         q(7314),
          q(0),
          ],
       q(xcn) => [
-         q(7314),
+         q(7315),
          q(0),
          ],
       q(xco) => [
-         q(7315),
+         q(7316),
          q(0),
          ],
       q(xcr) => [
-         q(7316),
+         q(7317),
          q(0),
          ],
       q(xct) => [
-         q(7317),
+         q(7318),
          q(0),
          ],
       q(xcu) => [
-         q(7318),
+         q(7319),
          q(0),
          ],
       q(xcv) => [
-         q(7319),
+         q(7320),
          q(0),
          ],
       q(xcw) => [
-         q(7320),
+         q(7321),
          q(0),
          ],
       q(xcy) => [
-         q(7321),
+         q(7322),
          q(0),
          ],
       q(xda) => [
-         q(7322),
+         q(7323),
          q(0),
          ],
       q(xdc) => [
-         q(7323),
+         q(7324),
          q(0),
          ],
       q(xdk) => [
-         q(7324),
+         q(7325),
          q(0),
          ],
       q(xdm) => [
-         q(7325),
+         q(7326),
          q(0),
          ],
       q(xdy) => [
-         q(7326),
+         q(7327),
          q(0),
          ],
       q(xeb) => [
-         q(7327),
+         q(7328),
          q(0),
          ],
       q(xed) => [
-         q(7328),
+         q(7329),
          q(0),
          ],
       q(xeg) => [
-         q(7329),
+         q(7330),
          q(0),
          ],
       q(xel) => [
-         q(7330),
+         q(7331),
          q(0),
          ],
       q(xem) => [
-         q(7331),
+         q(7332),
          q(0),
          ],
       q(xep) => [
-         q(7332),
+         q(7333),
          q(0),
          ],
       q(xer) => [
-         q(7333),
+         q(7334),
          q(0),
          ],
       q(xes) => [
-         q(7334),
+         q(7335),
          q(0),
          ],
       q(xet) => [
-         q(7335),
+         q(7336),
          q(0),
          ],
       q(xeu) => [
-         q(7336),
+         q(7337),
          q(0),
          ],
       q(xfa) => [
-         q(7337),
+         q(7338),
          q(0),
          ],
       q(xga) => [
-         q(7338),
+         q(7339),
          q(0),
          ],
       q(xgb) => [
-         q(7339),
+         q(7340),
          q(0),
          ],
       q(xgd) => [
-         q(7340),
+         q(7341),
          q(0),
          ],
       q(xgf) => [
-         q(7341),
+         q(7342),
          q(0),
          ],
       q(xgg) => [
-         q(7342),
+         q(7343),
          q(0),
          ],
       q(xgi) => [
-         q(7343),
+         q(7344),
          q(0),
          ],
       q(xgl) => [
-         q(7344),
+         q(7345),
          q(0),
          ],
       q(xgm) => [
-         q(7345),
+         q(7346),
          q(0),
          ],
       q(xgn) => [
@@ -87544,31 +87612,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(xgr) => [
-         q(7346),
+         q(7347),
          q(0),
          ],
       q(xgu) => [
-         q(7347),
+         q(7348),
          q(0),
          ],
       q(xgw) => [
-         q(7348),
+         q(7349),
          q(0),
          ],
       q(xha) => [
-         q(7349),
+         q(7350),
          q(0),
          ],
       q(xhc) => [
-         q(7350),
+         q(7351),
          q(0),
          ],
       q(xhd) => [
-         q(7351),
+         q(7352),
          q(0),
          ],
       q(xhe) => [
-         q(7352),
+         q(7353),
          q(0),
          ],
       q(xho) => [
@@ -87576,323 +87644,323 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(xhr) => [
-         q(7353),
+         q(7354),
          q(0),
          ],
       q(xht) => [
-         q(7354),
+         q(7355),
          q(0),
          ],
       q(xhu) => [
-         q(7355),
+         q(7356),
          q(0),
          ],
       q(xhv) => [
-         q(7356),
+         q(7357),
          q(0),
          ],
       q(xib) => [
-         q(7357),
+         q(7358),
          q(0),
          ],
       q(xii) => [
-         q(7358),
+         q(7359),
          q(0),
          ],
       q(xil) => [
-         q(7359),
+         q(7360),
          q(0),
          ],
       q(xin) => [
-         q(7360),
+         q(7361),
          q(0),
          ],
       q(xip) => [
-         q(7361),
+         q(7362),
          q(0),
          ],
       q(xir) => [
-         q(7362),
+         q(7363),
          q(0),
          ],
       q(xis) => [
-         q(7363),
+         q(7364),
          q(0),
          ],
       q(xiv) => [
-         q(7364),
+         q(7365),
          q(0),
          ],
       q(xiy) => [
-         q(7365),
+         q(7366),
          q(0),
          ],
       q(xjb) => [
-         q(7366),
+         q(7367),
          q(0),
          ],
       q(xjt) => [
-         q(7367),
+         q(7368),
          q(0),
          ],
       q(xka) => [
-         q(7368),
+         q(7369),
          q(0),
          ],
       q(xkb) => [
-         q(7369),
+         q(7370),
          q(0),
          ],
       q(xkc) => [
-         q(7370),
+         q(7371),
          q(0),
          ],
       q(xkd) => [
-         q(7371),
+         q(7372),
          q(0),
          ],
       q(xke) => [
-         q(7372),
+         q(7373),
          q(0),
          ],
       q(xkf) => [
-         q(7373),
+         q(7374),
          q(0),
          ],
       q(xkg) => [
-         q(7374),
+         q(7375),
          q(0),
          ],
       q(xkh) => [
-         q(7375),
+         q(7376),
          q(0),
          ],
       q(xki) => [
-         q(7376),
+         q(7377),
          q(0),
          ],
       q(xkj) => [
-         q(7377),
+         q(7378),
          q(0),
          ],
       q(xkk) => [
-         q(7378),
+         q(7379),
          q(0),
          ],
       q(xkl) => [
-         q(7379),
+         q(7380),
          q(0),
          ],
       q(xkn) => [
-         q(7380),
+         q(7381),
          q(0),
          ],
       q(xko) => [
-         q(7381),
+         q(7382),
          q(0),
          ],
       q(xkp) => [
-         q(7382),
+         q(7383),
          q(0),
          ],
       q(xkq) => [
-         q(7383),
+         q(7384),
          q(0),
          ],
       q(xkr) => [
-         q(7384),
+         q(7385),
          q(0),
          ],
       q(xks) => [
-         q(7385),
+         q(7386),
          q(0),
          ],
       q(xkt) => [
-         q(7386),
+         q(7387),
          q(0),
          ],
       q(xku) => [
-         q(7387),
+         q(7388),
          q(0),
          ],
       q(xkv) => [
-         q(7388),
+         q(7389),
          q(0),
          ],
       q(xkw) => [
-         q(7389),
+         q(7390),
          q(0),
          ],
       q(xkx) => [
-         q(7390),
+         q(7391),
          q(0),
          ],
       q(xky) => [
-         q(7391),
+         q(7392),
          q(0),
          ],
       q(xkz) => [
-         q(7392),
+         q(7393),
          q(0),
          ],
       q(xla) => [
-         q(7393),
+         q(7394),
          q(0),
          ],
       q(xlb) => [
-         q(7394),
+         q(7395),
          q(0),
          ],
       q(xlc) => [
-         q(7395),
+         q(7396),
          q(0),
          ],
       q(xld) => [
-         q(7396),
+         q(7397),
          q(0),
          ],
       q(xle) => [
-         q(7397),
+         q(7398),
          q(0),
          ],
       q(xlg) => [
-         q(7398),
+         q(7399),
          q(0),
          ],
       q(xli) => [
-         q(7399),
+         q(7400),
          q(0),
          ],
       q(xln) => [
-         q(7400),
+         q(7401),
          q(0),
          ],
       q(xlo) => [
-         q(7401),
+         q(7402),
          q(0),
          ],
       q(xlp) => [
-         q(7402),
+         q(7403),
          q(0),
          ],
       q(xls) => [
-         q(7403),
+         q(7404),
          q(0),
          ],
       q(xlu) => [
-         q(7404),
+         q(7405),
          q(0),
          ],
       q(xly) => [
-         q(7405),
+         q(7406),
          q(0),
          ],
       q(xma) => [
-         q(7406),
+         q(7407),
          q(0),
          ],
       q(xmb) => [
-         q(7407),
+         q(7408),
          q(0),
          ],
       q(xmc) => [
-         q(7408),
+         q(7409),
          q(0),
          ],
       q(xmd) => [
-         q(7409),
+         q(7410),
          q(0),
          ],
       q(xme) => [
-         q(7410),
+         q(7411),
          q(0),
          ],
       q(xmf) => [
-         q(7411),
+         q(7412),
          q(0),
          ],
       q(xmg) => [
-         q(7412),
+         q(7413),
          q(0),
          ],
       q(xmh) => [
-         q(7413),
+         q(7414),
          q(0),
          ],
       q(xmj) => [
-         q(7414),
+         q(7415),
          q(0),
          ],
       q(xmk) => [
-         q(7415),
+         q(7416),
          q(0),
          ],
       q(xml) => [
-         q(7416),
+         q(7417),
          q(0),
          ],
       q(xmm) => [
-         q(7417),
+         q(7418),
          q(0),
          ],
       q(xmn) => [
-         q(7418),
+         q(7419),
          q(0),
          ],
       q(xmo) => [
-         q(7419),
+         q(7420),
          q(0),
          ],
       q(xmp) => [
-         q(7420),
+         q(7421),
          q(0),
          ],
       q(xmq) => [
-         q(7421),
+         q(7422),
          q(0),
          ],
       q(xmr) => [
-         q(7422),
+         q(7423),
          q(0),
          ],
       q(xms) => [
-         q(7423),
+         q(7424),
          q(0),
          ],
       q(xmt) => [
-         q(7424),
+         q(7425),
          q(0),
          ],
       q(xmu) => [
-         q(7425),
+         q(7426),
          q(0),
          ],
       q(xmv) => [
-         q(7426),
+         q(7427),
          q(0),
          ],
       q(xmw) => [
-         q(7427),
+         q(7428),
          q(0),
          ],
       q(xmx) => [
-         q(7428),
+         q(7429),
          q(0),
          ],
       q(xmy) => [
-         q(7429),
+         q(7430),
          q(0),
          ],
       q(xmz) => [
-         q(7430),
+         q(7431),
          q(0),
          ],
       q(xna) => [
-         q(7431),
+         q(7432),
          q(0),
          ],
       q(xnb) => [
-         q(7432),
+         q(7433),
          q(0),
          ],
       q(xnd) => [
@@ -87900,623 +87968,623 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(xng) => [
-         q(7433),
+         q(7434),
          q(0),
          ],
       q(xnh) => [
-         q(7434),
+         q(7435),
          q(0),
          ],
       q(xni) => [
-         q(7435),
+         q(7436),
          q(0),
          ],
       q(xnk) => [
-         q(7436),
+         q(7437),
          q(0),
          ],
       q(xnn) => [
-         q(7437),
+         q(7438),
          q(0),
          ],
       q(xno) => [
-         q(7438),
+         q(7439),
          q(0),
          ],
       q(xnr) => [
-         q(7439),
+         q(7440),
          q(0),
          ],
       q(xns) => [
-         q(7440),
+         q(7441),
          q(0),
          ],
       q(xnt) => [
-         q(7441),
+         q(7442),
          q(0),
          ],
       q(xnu) => [
-         q(7442),
+         q(7443),
          q(0),
          ],
       q(xny) => [
-         q(7443),
+         q(7444),
          q(0),
          ],
       q(xnz) => [
-         q(7444),
+         q(7445),
          q(0),
          ],
       q(xoc) => [
-         q(7445),
+         q(7446),
          q(0),
          ],
       q(xod) => [
-         q(7446),
+         q(7447),
          q(0),
          ],
       q(xog) => [
-         q(7447),
+         q(7448),
          q(0),
          ],
       q(xoi) => [
-         q(7448),
+         q(7449),
          q(0),
          ],
       q(xok) => [
-         q(7449),
+         q(7450),
          q(0),
          ],
       q(xom) => [
-         q(7450),
+         q(7451),
          q(0),
          ],
       q(xon) => [
-         q(7451),
+         q(7452),
          q(0),
          ],
       q(xoo) => [
-         q(7452),
+         q(7453),
          q(0),
          ],
       q(xop) => [
-         q(7453),
+         q(7454),
          q(0),
          ],
       q(xor) => [
-         q(7454),
+         q(7455),
          q(0),
          ],
       q(xow) => [
-         q(7455),
+         q(7456),
          q(0),
          ],
       q(xpa) => [
-         q(7456),
+         q(7457),
          q(0),
          ],
       q(xpc) => [
-         q(7457),
+         q(7458),
          q(0),
          ],
       q(xpe) => [
-         q(7458),
+         q(7459),
          q(0),
          ],
       q(xpg) => [
-         q(7459),
+         q(7460),
          q(0),
          ],
       q(xpi) => [
-         q(7460),
+         q(7461),
          q(0),
          ],
       q(xpj) => [
-         q(7461),
+         q(7462),
          q(0),
          ],
       q(xpk) => [
-         q(7462),
+         q(7463),
          q(0),
          ],
       q(xpm) => [
-         q(7463),
+         q(7464),
          q(0),
          ],
       q(xpn) => [
-         q(7464),
+         q(7465),
          q(0),
          ],
       q(xpo) => [
-         q(7465),
+         q(7466),
          q(0),
          ],
       q(xpp) => [
-         q(7466),
+         q(7467),
          q(0),
          ],
       q(xpq) => [
-         q(7467),
+         q(7468),
          q(0),
          ],
       q(xpr) => [
-         q(7468),
+         q(7469),
          q(0),
          ],
       q(xps) => [
-         q(7469),
+         q(7470),
          q(0),
          ],
       q(xpt) => [
-         q(7470),
+         q(7471),
          q(0),
          ],
       q(xpu) => [
-         q(7471),
+         q(7472),
          q(0),
          ],
       q(xpy) => [
-         q(7472),
+         q(7473),
          q(0),
          ],
       q(xqa) => [
-         q(7473),
+         q(7474),
          q(0),
          ],
       q(xqt) => [
-         q(7474),
+         q(7475),
          q(0),
          ],
       q(xra) => [
-         q(7475),
+         q(7476),
          q(0),
          ],
       q(xrb) => [
-         q(7476),
+         q(7477),
          q(0),
          ],
       q(xrd) => [
-         q(7477),
+         q(7478),
          q(0),
          ],
       q(xre) => [
-         q(7478),
+         q(7479),
          q(0),
          ],
       q(xrg) => [
-         q(7479),
+         q(7480),
          q(0),
          ],
       q(xri) => [
-         q(7480),
+         q(7481),
          q(0),
          ],
       q(xrm) => [
-         q(7481),
+         q(7482),
          q(0),
          ],
       q(xrn) => [
-         q(7482),
+         q(7483),
          q(0),
          ],
       q(xrq) => [
-         q(7483),
+         q(7484),
          q(0),
          ],
       q(xrr) => [
-         q(7484),
+         q(7485),
          q(0),
          ],
       q(xrt) => [
-         q(7485),
+         q(7486),
          q(0),
          ],
       q(xru) => [
-         q(7486),
+         q(7487),
          q(0),
          ],
       q(xrw) => [
-         q(7487),
+         q(7488),
          q(0),
          ],
       q(xsa) => [
-         q(7488),
+         q(7489),
          q(0),
          ],
       q(xsb) => [
-         q(7489),
+         q(7490),
          q(0),
          ],
       q(xsc) => [
-         q(7490),
+         q(7491),
          q(0),
          ],
       q(xsd) => [
-         q(7491),
+         q(7492),
          q(0),
          ],
       q(xse) => [
-         q(7492),
+         q(7493),
          q(0),
          ],
       q(xsh) => [
-         q(7493),
+         q(7494),
          q(0),
          ],
       q(xsi) => [
-         q(7494),
+         q(7495),
          q(0),
          ],
       q(xsl) => [
-         q(7495),
+         q(7496),
          q(0),
          ],
       q(xsm) => [
-         q(7496),
+         q(7497),
          q(0),
          ],
       q(xsn) => [
-         q(7497),
+         q(7498),
          q(0),
          ],
       q(xso) => [
-         q(7498),
+         q(7499),
          q(0),
          ],
       q(xsp) => [
-         q(7499),
+         q(7500),
          q(0),
          ],
       q(xsq) => [
-         q(7500),
+         q(7501),
          q(0),
          ],
       q(xsr) => [
-         q(7501),
+         q(7502),
          q(0),
          ],
       q(xss) => [
-         q(7502),
+         q(7503),
          q(0),
          ],
       q(xsu) => [
-         q(7503),
+         q(7504),
          q(0),
          ],
       q(xsv) => [
-         q(7504),
+         q(7505),
          q(0),
          ],
       q(xsy) => [
-         q(7505),
+         q(7506),
          q(0),
          ],
       q(xta) => [
-         q(7506),
+         q(7507),
          q(0),
          ],
       q(xtb) => [
-         q(7507),
+         q(7508),
          q(0),
          ],
       q(xtc) => [
-         q(7508),
+         q(7509),
          q(0),
          ],
       q(xtd) => [
-         q(7509),
+         q(7510),
          q(0),
          ],
       q(xte) => [
-         q(7510),
+         q(7511),
          q(0),
          ],
       q(xtg) => [
-         q(7511),
+         q(7512),
          q(0),
          ],
       q(xth) => [
-         q(7512),
+         q(7513),
          q(0),
          ],
       q(xti) => [
-         q(7513),
+         q(7514),
          q(0),
          ],
       q(xtj) => [
-         q(7514),
+         q(7515),
          q(0),
          ],
       q(xtl) => [
-         q(7515),
+         q(7516),
          q(0),
          ],
       q(xtm) => [
-         q(7516),
+         q(7517),
          q(0),
          ],
       q(xtn) => [
-         q(7517),
+         q(7518),
          q(0),
          ],
       q(xto) => [
-         q(7518),
+         q(7519),
          q(0),
          ],
       q(xtp) => [
-         q(7519),
+         q(7520),
          q(0),
          ],
       q(xtq) => [
-         q(7520),
+         q(7521),
          q(0),
          ],
       q(xtr) => [
-         q(7521),
+         q(7522),
          q(0),
          ],
       q(xts) => [
-         q(7522),
+         q(7523),
          q(0),
          ],
       q(xtt) => [
-         q(7523),
+         q(7524),
          q(0),
          ],
       q(xtu) => [
-         q(7524),
+         q(7525),
          q(0),
          ],
       q(xtv) => [
-         q(7525),
+         q(7526),
          q(0),
          ],
       q(xtw) => [
-         q(7526),
+         q(7527),
          q(0),
          ],
       q(xty) => [
-         q(7527),
+         q(7528),
          q(0),
          ],
       q(xtz) => [
-         q(7528),
+         q(7529),
          q(0),
          ],
       q(xua) => [
-         q(7529),
+         q(7530),
          q(0),
          ],
       q(xub) => [
-         q(7530),
+         q(7531),
          q(0),
          ],
       q(xud) => [
-         q(7531),
+         q(7532),
          q(0),
          ],
       q(xug) => [
-         q(7532),
+         q(7533),
          q(0),
          ],
       q(xuj) => [
-         q(7533),
+         q(7534),
          q(0),
          ],
       q(xul) => [
-         q(7534),
+         q(7535),
          q(0),
          ],
       q(xum) => [
-         q(7535),
+         q(7536),
          q(0),
          ],
       q(xun) => [
-         q(7536),
+         q(7537),
          q(0),
          ],
       q(xuo) => [
-         q(7537),
+         q(7538),
          q(0),
          ],
       q(xup) => [
-         q(7538),
+         q(7539),
          q(0),
          ],
       q(xur) => [
-         q(7539),
+         q(7540),
          q(0),
          ],
       q(xut) => [
-         q(7540),
+         q(7541),
          q(0),
          ],
       q(xuu) => [
-         q(7541),
+         q(7542),
          q(0),
          ],
       q(xve) => [
-         q(7542),
+         q(7543),
          q(0),
          ],
       q(xvi) => [
-         q(7543),
+         q(7544),
          q(0),
          ],
       q(xvn) => [
-         q(7544),
+         q(7545),
          q(0),
          ],
       q(xvo) => [
-         q(7545),
+         q(7546),
          q(0),
          ],
       q(xvs) => [
-         q(7546),
+         q(7547),
          q(0),
          ],
       q(xwa) => [
-         q(7547),
+         q(7548),
          q(0),
          ],
       q(xwc) => [
-         q(7548),
+         q(7549),
          q(0),
          ],
       q(xwd) => [
-         q(7549),
+         q(7550),
          q(0),
          ],
       q(xwe) => [
-         q(7550),
+         q(7551),
          q(0),
          ],
       q(xwg) => [
-         q(7551),
+         q(7552),
          q(0),
          ],
       q(xwj) => [
-         q(7552),
+         q(7553),
          q(0),
          ],
       q(xwk) => [
-         q(7553),
+         q(7554),
          q(0),
          ],
       q(xwl) => [
-         q(7554),
+         q(7555),
          q(0),
          ],
       q(xwo) => [
-         q(7555),
+         q(7556),
          q(0),
          ],
       q(xwr) => [
-         q(7556),
+         q(7557),
          q(0),
          ],
       q(xwt) => [
-         q(7557),
+         q(7558),
          q(0),
          ],
       q(xww) => [
-         q(7558),
+         q(7559),
          q(0),
          ],
       q(xxb) => [
-         q(7559),
+         q(7560),
          q(0),
          ],
       q(xxk) => [
-         q(7560),
+         q(7561),
          q(0),
          ],
       q(xxm) => [
-         q(7561),
+         q(7562),
          q(0),
          ],
       q(xxr) => [
-         q(7562),
+         q(7563),
          q(0),
          ],
       q(xxt) => [
-         q(7563),
+         q(7564),
          q(0),
          ],
       q(xya) => [
-         q(7564),
+         q(7565),
          q(0),
          ],
       q(xyb) => [
-         q(7565),
+         q(7566),
          q(0),
          ],
       q(xyj) => [
-         q(7566),
+         q(7567),
          q(0),
          ],
       q(xyk) => [
-         q(7567),
+         q(7568),
          q(0),
          ],
       q(xyl) => [
-         q(7568),
+         q(7569),
          q(0),
          ],
       q(xyt) => [
-         q(7569),
+         q(7570),
          q(0),
          ],
       q(xyy) => [
-         q(7570),
+         q(7571),
          q(0),
          ],
       q(xzh) => [
-         q(7571),
+         q(7572),
          q(0),
          ],
       q(xzm) => [
-         q(7572),
+         q(7573),
          q(0),
          ],
       q(xzp) => [
-         q(7573),
+         q(7574),
          q(0),
          ],
       q(yaa) => [
-         q(7574),
+         q(7575),
          q(0),
          ],
       q(yab) => [
-         q(7575),
+         q(7576),
          q(0),
          ],
       q(yac) => [
-         q(7576),
+         q(7577),
          q(0),
          ],
       q(yad) => [
-         q(7577),
+         q(7578),
          q(0),
          ],
       q(yae) => [
-         q(7578),
+         q(7579),
          q(0),
          ],
       q(yaf) => [
-         q(7579),
+         q(7580),
          q(0),
          ],
       q(yag) => [
-         q(7580),
+         q(7581),
          q(0),
          ],
       q(yah) => [
-         q(7581),
+         q(7582),
          q(0),
          ],
       q(yai) => [
-         q(7582),
+         q(7583),
          q(0),
          ],
       q(yaj) => [
-         q(7583),
+         q(7584),
          q(0),
          ],
       q(yak) => [
-         q(7584),
+         q(7585),
          q(0),
          ],
       q(yal) => [
-         q(7585),
+         q(7586),
          q(0),
          ],
       q(yam) => [
-         q(7586),
+         q(7587),
          q(0),
          ],
       q(yan) => [
-         q(7587),
+         q(7588),
          q(0),
          ],
       q(yao) => [
@@ -88528,231 +88596,235 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(yaq) => [
-         q(7588),
+         q(7589),
          q(0),
          ],
       q(yar) => [
-         q(7589),
+         q(7590),
          q(0),
          ],
       q(yas) => [
-         q(7590),
+         q(7591),
          q(0),
          ],
       q(yat) => [
-         q(7591),
+         q(7592),
          q(0),
          ],
       q(yau) => [
-         q(7592),
+         q(7593),
          q(0),
          ],
       q(yav) => [
-         q(7593),
+         q(7594),
          q(0),
          ],
       q(yaw) => [
-         q(7594),
+         q(7595),
          q(0),
          ],
       q(yax) => [
-         q(7595),
+         q(7596),
          q(0),
          ],
       q(yay) => [
-         q(7596),
+         q(7597),
          q(0),
          ],
       q(yaz) => [
-         q(7597),
+         q(7598),
          q(0),
          ],
       q(yba) => [
-         q(7598),
+         q(7599),
          q(0),
          ],
       q(ybb) => [
-         q(7599),
+         q(7600),
          q(0),
          ],
       q(ybe) => [
-         q(7600),
+         q(7601),
          q(0),
          ],
       q(ybh) => [
-         q(7601),
+         q(7602),
          q(0),
          ],
       q(ybi) => [
-         q(7602),
+         q(7603),
          q(0),
          ],
       q(ybj) => [
-         q(7603),
+         q(7604),
          q(0),
          ],
       q(ybk) => [
-         q(7604),
+         q(7605),
          q(0),
          ],
       q(ybl) => [
-         q(7605),
+         q(7606),
          q(0),
          ],
       q(ybm) => [
-         q(7606),
+         q(7607),
          q(0),
          ],
       q(ybn) => [
-         q(7607),
+         q(7608),
          q(0),
          ],
       q(ybo) => [
-         q(7608),
+         q(7609),
          q(0),
          ],
       q(ybx) => [
-         q(7609),
+         q(7610),
          q(0),
          ],
       q(yby) => [
-         q(7610),
+         q(7611),
          q(0),
          ],
       q(ych) => [
-         q(7611),
+         q(7612),
          q(0),
          ],
       q(ycl) => [
-         q(7612),
+         q(7613),
          q(0),
          ],
       q(ycn) => [
-         q(7613),
+         q(7614),
          q(0),
          ],
       q(ycp) => [
-         q(7614),
+         q(7615),
          q(0),
          ],
       q(yda) => [
-         q(7615),
+         q(7616),
          q(0),
          ],
       q(ydd) => [
-         q(7616),
+         q(7617),
          q(0),
          ],
       q(yde) => [
-         q(7617),
+         q(7618),
          q(0),
          ],
       q(ydg) => [
-         q(7618),
+         q(7619),
          q(0),
          ],
       q(ydk) => [
-         q(7619),
+         q(7620),
          q(0),
          ],
       q(yea) => [
-         q(7620),
+         q(7621),
          q(0),
          ],
       q(yec) => [
-         q(7621),
+         q(7622),
          q(0),
          ],
       q(yee) => [
-         q(7622),
+         q(7623),
          q(0),
          ],
       q(yei) => [
-         q(7623),
+         q(7624),
          q(0),
          ],
       q(yej) => [
-         q(7624),
+         q(7625),
          q(0),
          ],
       q(yel) => [
-         q(7625),
+         q(7626),
          q(0),
          ],
       q(yer) => [
-         q(7626),
+         q(7627),
          q(0),
          ],
       q(yes) => [
-         q(7627),
+         q(7628),
          q(0),
          ],
       q(yet) => [
-         q(7628),
+         q(7629),
          q(0),
          ],
       q(yeu) => [
-         q(7629),
+         q(7630),
          q(0),
          ],
       q(yev) => [
-         q(7630),
+         q(7631),
          q(0),
          ],
       q(yey) => [
-         q(7631),
+         q(7632),
          q(0),
          ],
       q(yga) => [
-         q(7632),
+         q(7633),
          q(0),
          ],
       q(ygi) => [
-         q(7633),
+         q(7634),
          q(0),
          ],
       q(ygl) => [
-         q(7634),
+         q(7635),
          q(0),
          ],
       q(ygm) => [
-         q(7635),
+         q(7636),
          q(0),
          ],
       q(ygp) => [
-         q(7636),
+         q(7637),
          q(0),
          ],
       q(ygr) => [
-         q(7637),
+         q(7638),
          q(0),
          ],
       q(ygs) => [
-         q(7638),
+         q(7639),
          q(0),
          ],
       q(ygu) => [
-         q(7639),
+         q(7640),
          q(0),
          ],
       q(ygw) => [
-         q(7640),
+         q(7641),
          q(0),
          ],
       q(yha) => [
-         q(7641),
+         q(7642),
          q(0),
          ],
       q(yhd) => [
-         q(7642),
+         q(7643),
          q(0),
          ],
       q(yhl) => [
-         q(7643),
+         q(7644),
+         q(0),
+         ],
+      q(yhs) => [
+         q(7645),
          q(0),
          ],
       q(yia) => [
-         q(7644),
+         q(7646),
          q(0),
          ],
       q(yid) => [
@@ -88764,311 +88836,311 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(yig) => [
-         q(7645),
+         q(7647),
          q(0),
          ],
       q(yih) => [
-         q(7646),
+         q(7648),
          q(0),
          ],
       q(yii) => [
-         q(7647),
+         q(7649),
          q(0),
          ],
       q(yij) => [
-         q(7648),
+         q(7650),
          q(0),
          ],
       q(yik) => [
-         q(7649),
+         q(7651),
          q(0),
          ],
       q(yil) => [
-         q(7650),
+         q(7652),
          q(0),
          ],
       q(yim) => [
-         q(7651),
+         q(7653),
          q(0),
          ],
       q(yin) => [
-         q(7652),
+         q(7654),
          q(0),
          ],
       q(yip) => [
-         q(7653),
+         q(7655),
          q(0),
          ],
       q(yiq) => [
-         q(7654),
+         q(7656),
          q(0),
          ],
       q(yir) => [
-         q(7655),
+         q(7657),
          q(0),
          ],
       q(yis) => [
-         q(7656),
+         q(7658),
          q(0),
          ],
       q(yit) => [
-         q(7657),
+         q(7659),
          q(0),
          ],
       q(yiu) => [
-         q(7658),
+         q(7660),
          q(0),
          ],
       q(yiv) => [
-         q(7659),
+         q(7661),
          q(0),
          ],
       q(yix) => [
-         q(7660),
+         q(7662),
          q(0),
          ],
       q(yiz) => [
-         q(7661),
+         q(7663),
          q(0),
          ],
       q(yka) => [
-         q(7662),
+         q(7664),
          q(0),
          ],
       q(ykg) => [
-         q(7663),
+         q(7665),
          q(0),
          ],
       q(yki) => [
-         q(7664),
+         q(7666),
          q(0),
          ],
       q(ykk) => [
-         q(7665),
+         q(7667),
          q(0),
          ],
       q(ykl) => [
-         q(7666),
+         q(7668),
          q(0),
          ],
       q(ykm) => [
-         q(7667),
+         q(7669),
          q(0),
          ],
       q(ykn) => [
-         q(7668),
+         q(7670),
          q(0),
          ],
       q(yko) => [
-         q(7669),
+         q(7671),
          q(0),
          ],
       q(ykr) => [
-         q(7670),
+         q(7672),
          q(0),
          ],
       q(ykt) => [
-         q(7671),
+         q(7673),
          q(0),
          ],
       q(yku) => [
-         q(7672),
+         q(7674),
          q(0),
          ],
       q(yky) => [
-         q(7673),
+         q(7675),
          q(0),
          ],
       q(yla) => [
-         q(7674),
+         q(7676),
          q(0),
          ],
       q(ylb) => [
-         q(7675),
+         q(7677),
          q(0),
          ],
       q(yle) => [
-         q(7676),
+         q(7678),
          q(0),
          ],
       q(ylg) => [
-         q(7677),
+         q(7679),
          q(0),
          ],
       q(yli) => [
-         q(7678),
+         q(7680),
          q(0),
          ],
       q(yll) => [
-         q(7679),
+         q(7681),
          q(0),
          ],
       q(ylm) => [
-         q(7680),
+         q(7682),
          q(0),
          ],
       q(yln) => [
-         q(7681),
+         q(7683),
          q(0),
          ],
       q(ylo) => [
-         q(7682),
+         q(7684),
          q(0),
          ],
       q(ylr) => [
-         q(7683),
+         q(7685),
          q(0),
          ],
       q(ylu) => [
-         q(7684),
+         q(7686),
          q(0),
          ],
       q(yly) => [
-         q(7685),
+         q(7687),
          q(0),
          ],
       q(ymb) => [
-         q(7686),
+         q(7688),
          q(0),
          ],
       q(ymc) => [
-         q(7687),
+         q(7689),
          q(0),
          ],
       q(ymd) => [
-         q(7688),
+         q(7690),
          q(0),
          ],
       q(yme) => [
-         q(7689),
+         q(7691),
          q(0),
          ],
       q(ymg) => [
-         q(7690),
+         q(7692),
          q(0),
          ],
       q(ymh) => [
-         q(7691),
+         q(7693),
          q(0),
          ],
       q(ymi) => [
-         q(7692),
+         q(7694),
          q(0),
          ],
       q(ymk) => [
-         q(7693),
+         q(7695),
          q(0),
          ],
       q(yml) => [
-         q(7694),
+         q(7696),
          q(0),
          ],
       q(ymm) => [
-         q(7695),
+         q(7697),
          q(0),
          ],
       q(ymn) => [
-         q(7696),
+         q(7698),
          q(0),
          ],
       q(ymo) => [
-         q(7697),
+         q(7699),
          q(0),
          ],
       q(ymp) => [
-         q(7698),
+         q(7700),
          q(0),
          ],
       q(ymq) => [
-         q(7699),
+         q(7701),
          q(0),
          ],
       q(ymr) => [
-         q(7700),
+         q(7702),
          q(0),
          ],
       q(yms) => [
-         q(7701),
+         q(7703),
          q(0),
          ],
       q(ymx) => [
-         q(7702),
+         q(7704),
          q(0),
          ],
       q(ymz) => [
-         q(7703),
+         q(7705),
          q(0),
          ],
       q(yna) => [
-         q(7704),
+         q(7706),
          q(0),
          ],
       q(ynd) => [
-         q(7705),
+         q(7707),
          q(0),
          ],
       q(yne) => [
-         q(7706),
+         q(7708),
          q(0),
          ],
       q(yng) => [
-         q(7707),
+         q(7709),
          q(0),
          ],
       q(ynk) => [
-         q(7708),
+         q(7710),
          q(0),
          ],
       q(ynl) => [
-         q(7709),
+         q(7711),
          q(0),
          ],
       q(ynn) => [
-         q(7710),
+         q(7712),
          q(0),
          ],
       q(yno) => [
-         q(7711),
+         q(7713),
          q(0),
          ],
       q(ynq) => [
-         q(7712),
+         q(7714),
          q(0),
          ],
       q(yns) => [
-         q(7713),
+         q(7715),
          q(0),
          ],
       q(ynu) => [
-         q(7714),
+         q(7716),
          q(0),
          ],
       q(yob) => [
-         q(7715),
+         q(7717),
          q(0),
          ],
       q(yog) => [
-         q(7716),
+         q(7718),
          q(0),
          ],
       q(yoi) => [
-         q(7717),
+         q(7719),
          q(0),
          ],
       q(yok) => [
-         q(7718),
+         q(7720),
          q(0),
          ],
       q(yol) => [
-         q(7719),
+         q(7721),
          q(0),
          ],
       q(yom) => [
-         q(7720),
+         q(7722),
          q(0),
          ],
       q(yon) => [
-         q(7721),
+         q(7723),
          q(0),
          ],
       q(yor) => [
@@ -89076,31 +89148,31 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(yot) => [
-         q(7722),
+         q(7724),
          q(0),
          ],
       q(yox) => [
-         q(7723),
+         q(7725),
          q(0),
          ],
       q(yoy) => [
-         q(7724),
+         q(7726),
          q(0),
          ],
       q(ypa) => [
-         q(7725),
+         q(7727),
          q(0),
          ],
       q(ypb) => [
-         q(7726),
+         q(7728),
          q(0),
          ],
       q(ypg) => [
-         q(7727),
+         q(7729),
          q(0),
          ],
       q(yph) => [
-         q(7728),
+         q(7730),
          q(0),
          ],
       q(ypk) => [
@@ -89108,355 +89180,355 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(ypm) => [
-         q(7729),
+         q(7731),
          q(0),
          ],
       q(ypn) => [
-         q(7730),
+         q(7732),
          q(0),
          ],
       q(ypo) => [
-         q(7731),
+         q(7733),
          q(0),
          ],
       q(ypp) => [
-         q(7732),
+         q(7734),
          q(0),
          ],
       q(ypz) => [
-         q(7733),
+         q(7735),
          q(0),
          ],
       q(yra) => [
-         q(7734),
+         q(7736),
          q(0),
          ],
       q(yrb) => [
-         q(7735),
+         q(7737),
          q(0),
          ],
       q(yre) => [
-         q(7736),
+         q(7738),
          q(0),
          ],
       q(yri) => [
-         q(7737),
+         q(7739),
          q(0),
          ],
       q(yrk) => [
-         q(7738),
+         q(7740),
          q(0),
          ],
       q(yrl) => [
-         q(7739),
+         q(7741),
          q(0),
          ],
       q(yrm) => [
-         q(7740),
+         q(7742),
          q(0),
          ],
       q(yrn) => [
-         q(7741),
+         q(7743),
          q(0),
          ],
       q(yrs) => [
-         q(7742),
+         q(7744),
          q(0),
          ],
       q(yrw) => [
-         q(7743),
+         q(7745),
          q(0),
          ],
       q(yry) => [
-         q(7744),
+         q(7746),
          q(0),
          ],
       q(ysc) => [
-         q(7745),
+         q(7747),
          q(0),
          ],
       q(ysd) => [
-         q(7746),
+         q(7748),
          q(0),
          ],
       q(ysg) => [
-         q(7747),
+         q(7749),
          q(0),
          ],
       q(ysl) => [
-         q(7748),
+         q(7750),
          q(0),
          ],
       q(ysn) => [
-         q(7749),
+         q(7751),
          q(0),
          ],
       q(yso) => [
-         q(7750),
+         q(7752),
          q(0),
          ],
       q(ysp) => [
-         q(7751),
+         q(7753),
          q(0),
          ],
       q(ysr) => [
-         q(7752),
+         q(7754),
          q(0),
          ],
       q(yss) => [
-         q(7753),
+         q(7755),
          q(0),
          ],
       q(ysy) => [
-         q(7754),
+         q(7756),
          q(0),
          ],
       q(yta) => [
-         q(7755),
+         q(7757),
          q(0),
          ],
       q(ytl) => [
-         q(7756),
+         q(7758),
          q(0),
          ],
       q(ytp) => [
-         q(7757),
+         q(7759),
          q(0),
          ],
       q(ytw) => [
-         q(7758),
+         q(7760),
          q(0),
          ],
       q(yty) => [
-         q(7759),
+         q(7761),
          q(0),
          ],
       q(yua) => [
-         q(7760),
+         q(7762),
          q(0),
          ],
       q(yub) => [
-         q(7761),
+         q(7763),
          q(0),
          ],
       q(yuc) => [
-         q(7762),
+         q(7764),
          q(0),
          ],
       q(yud) => [
-         q(7763),
+         q(7765),
          q(0),
          ],
       q(yue) => [
-         q(7764),
+         q(7766),
          q(0),
          ],
       q(yuf) => [
-         q(7765),
+         q(7767),
          q(0),
          ],
       q(yug) => [
-         q(7766),
+         q(7768),
          q(0),
          ],
       q(yui) => [
-         q(7767),
+         q(7769),
          q(0),
          ],
       q(yuj) => [
-         q(7768),
+         q(7770),
          q(0),
          ],
       q(yuk) => [
-         q(7769),
+         q(7771),
          q(0),
          ],
       q(yul) => [
-         q(7770),
+         q(7772),
          q(0),
          ],
       q(yum) => [
-         q(7771),
+         q(7773),
          q(0),
          ],
       q(yun) => [
-         q(7772),
+         q(7774),
          q(0),
          ],
       q(yup) => [
-         q(7773),
+         q(7775),
          q(0),
          ],
       q(yuq) => [
-         q(7774),
+         q(7776),
          q(0),
          ],
       q(yur) => [
-         q(7775),
+         q(7777),
          q(0),
          ],
       q(yut) => [
-         q(7776),
+         q(7778),
          q(0),
          ],
       q(yuw) => [
-         q(7777),
+         q(7779),
          q(0),
          ],
       q(yux) => [
-         q(7778),
+         q(7780),
          q(0),
          ],
       q(yuy) => [
-         q(7779),
+         q(7781),
          q(0),
          ],
       q(yuz) => [
-         q(7780),
+         q(7782),
          q(0),
          ],
       q(yva) => [
-         q(7781),
+         q(7783),
          q(0),
          ],
       q(yvt) => [
-         q(7782),
+         q(7784),
          q(0),
          ],
       q(ywa) => [
-         q(7783),
+         q(7785),
          q(0),
          ],
       q(ywg) => [
-         q(7784),
+         q(7786),
          q(0),
          ],
       q(ywl) => [
-         q(7785),
+         q(7787),
          q(0),
          ],
       q(ywn) => [
-         q(7786),
+         q(7788),
          q(0),
          ],
       q(ywq) => [
-         q(7787),
+         q(7789),
          q(0),
          ],
       q(ywr) => [
-         q(7788),
+         q(7790),
          q(0),
          ],
       q(ywt) => [
-         q(7789),
+         q(7791),
          q(0),
          ],
       q(ywu) => [
-         q(7790),
+         q(7792),
          q(0),
          ],
       q(yww) => [
-         q(7791),
+         q(7793),
          q(0),
          ],
       q(yxa) => [
-         q(7792),
+         q(7794),
          q(0),
          ],
       q(yxg) => [
-         q(7793),
+         q(7795),
          q(0),
          ],
       q(yxl) => [
-         q(7794),
+         q(7796),
          q(0),
          ],
       q(yxm) => [
-         q(7795),
+         q(7797),
          q(0),
          ],
       q(yxu) => [
-         q(7796),
+         q(7798),
          q(0),
          ],
       q(yxy) => [
-         q(7797),
+         q(7799),
          q(0),
          ],
       q(yyr) => [
-         q(7798),
+         q(7800),
          q(0),
          ],
       q(yyu) => [
-         q(7799),
+         q(7801),
          q(0),
          ],
       q(yyz) => [
-         q(7800),
+         q(7802),
          q(0),
          ],
       q(yzg) => [
-         q(7801),
+         q(7803),
          q(0),
          ],
       q(yzk) => [
-         q(7802),
+         q(7804),
          q(0),
          ],
       q(zaa) => [
-         q(7803),
+         q(7805),
          q(0),
          ],
       q(zab) => [
-         q(7804),
+         q(7806),
          q(0),
          ],
       q(zac) => [
-         q(7805),
+         q(7807),
          q(0),
          ],
       q(zad) => [
-         q(7806),
+         q(7808),
          q(0),
          ],
       q(zae) => [
-         q(7807),
+         q(7809),
          q(0),
          ],
       q(zaf) => [
-         q(7808),
+         q(7810),
          q(0),
          ],
       q(zag) => [
-         q(7809),
+         q(7811),
          q(0),
          ],
       q(zah) => [
-         q(7810),
+         q(7812),
          q(0),
          ],
       q(zai) => [
-         q(7811),
+         q(7813),
          q(0),
          ],
       q(zaj) => [
-         q(7812),
+         q(7814),
          q(0),
          ],
       q(zak) => [
-         q(7813),
+         q(7815),
          q(0),
          ],
       q(zal) => [
-         q(7814),
+         q(7816),
          q(0),
          ],
       q(zam) => [
-         q(7815),
+         q(7817),
          q(0),
          ],
       q(zao) => [
-         q(7816),
+         q(7818),
          q(0),
          ],
       q(zap) => [
@@ -89464,51 +89536,51 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zaq) => [
-         q(7817),
+         q(7819),
          q(0),
          ],
       q(zar) => [
-         q(7818),
+         q(7820),
          q(0),
          ],
       q(zas) => [
-         q(7819),
+         q(7821),
          q(0),
          ],
       q(zat) => [
-         q(7820),
+         q(7822),
          q(0),
          ],
       q(zau) => [
-         q(7821),
+         q(7823),
          q(0),
          ],
       q(zav) => [
-         q(7822),
+         q(7824),
          q(0),
          ],
       q(zaw) => [
-         q(7823),
+         q(7825),
          q(0),
          ],
       q(zax) => [
-         q(7824),
+         q(7826),
          q(0),
          ],
       q(zay) => [
-         q(7825),
+         q(7827),
          q(0),
          ],
       q(zaz) => [
-         q(7826),
+         q(7828),
          q(0),
          ],
       q(zbc) => [
-         q(7827),
+         q(7829),
          q(0),
          ],
       q(zbe) => [
-         q(7828),
+         q(7830),
          q(0),
          ],
       q(zbl) => [
@@ -89516,35 +89588,35 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zbt) => [
-         q(7829),
+         q(7831),
          q(0),
          ],
       q(zbw) => [
-         q(7830),
+         q(7832),
          q(0),
          ],
       q(zca) => [
-         q(7831),
+         q(7833),
          q(0),
          ],
       q(zch) => [
-         q(7832),
+         q(7834),
          q(0),
          ],
       q(zdj) => [
-         q(7833),
+         q(7835),
          q(0),
          ],
       q(zea) => [
-         q(7834),
+         q(7836),
          q(0),
          ],
       q(zeg) => [
-         q(7835),
+         q(7837),
          q(0),
          ],
       q(zeh) => [
-         q(7836),
+         q(7838),
          q(0),
          ],
       q(zen) => [
@@ -89552,11 +89624,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zga) => [
-         q(7837),
+         q(7839),
          q(0),
          ],
       q(zgb) => [
-         q(7838),
+         q(7840),
          q(0),
          ],
       q(zgh) => [
@@ -89564,15 +89636,15 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zgm) => [
-         q(7839),
+         q(7841),
          q(0),
          ],
       q(zgn) => [
-         q(7840),
+         q(7842),
          q(0),
          ],
       q(zgr) => [
-         q(7841),
+         q(7843),
          q(0),
          ],
       q(zha) => [
@@ -89580,23 +89652,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zhb) => [
-         q(7842),
+         q(7844),
          q(0),
          ],
       q(zhd) => [
-         q(7843),
+         q(7845),
          q(0),
          ],
       q(zhi) => [
-         q(7844),
+         q(7846),
          q(0),
          ],
       q(zhn) => [
-         q(7845),
+         q(7847),
          q(0),
          ],
       q(zhw) => [
-         q(7846),
+         q(7848),
          q(0),
          ],
       q(zhx) => [
@@ -89604,95 +89676,95 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zia) => [
-         q(7847),
+         q(7849),
          q(0),
          ],
       q(zib) => [
-         q(7848),
+         q(7850),
          q(0),
          ],
       q(zik) => [
-         q(7849),
+         q(7851),
          q(0),
          ],
       q(zil) => [
-         q(7850),
+         q(7852),
          q(0),
          ],
       q(zim) => [
-         q(7851),
+         q(7853),
          q(0),
          ],
       q(zin) => [
-         q(7852),
+         q(7854),
          q(0),
          ],
       q(zir) => [
-         q(7853),
+         q(7855),
          q(0),
          ],
       q(ziw) => [
-         q(7854),
+         q(7856),
          q(0),
          ],
       q(ziz) => [
-         q(7855),
+         q(7857),
          q(0),
          ],
       q(zka) => [
-         q(7856),
+         q(7858),
          q(0),
          ],
       q(zkb) => [
-         q(7857),
+         q(7859),
          q(0),
          ],
       q(zkd) => [
-         q(7858),
+         q(7860),
          q(0),
          ],
       q(zkg) => [
-         q(7859),
+         q(7861),
          q(0),
          ],
       q(zkh) => [
-         q(7860),
+         q(7862),
          q(0),
          ],
       q(zkk) => [
-         q(7861),
+         q(7863),
          q(0),
          ],
       q(zkn) => [
-         q(7862),
+         q(7864),
          q(0),
          ],
       q(zko) => [
-         q(7863),
+         q(7865),
          q(0),
          ],
       q(zkp) => [
-         q(7864),
+         q(7866),
          q(0),
          ],
       q(zkr) => [
-         q(7865),
+         q(7867),
          q(0),
          ],
       q(zkt) => [
-         q(7866),
+         q(7868),
          q(0),
          ],
       q(zku) => [
-         q(7867),
+         q(7869),
          q(0),
          ],
       q(zkv) => [
-         q(7868),
+         q(7870),
          q(0),
          ],
       q(zkz) => [
-         q(7869),
+         q(7871),
          q(0),
          ],
       q(zle) => [
@@ -89700,19 +89772,19 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zlj) => [
-         q(7870),
+         q(7872),
          q(0),
          ],
       q(zlm) => [
-         q(7871),
+         q(7873),
          q(0),
          ],
       q(zln) => [
-         q(7872),
+         q(7874),
          q(0),
          ],
       q(zlq) => [
-         q(7873),
+         q(7875),
          q(0),
          ],
       q(zls) => [
@@ -89724,111 +89796,111 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zma) => [
-         q(7874),
+         q(7876),
          q(0),
          ],
       q(zmb) => [
-         q(7875),
+         q(7877),
          q(0),
          ],
       q(zmc) => [
-         q(7876),
+         q(7878),
          q(0),
          ],
       q(zmd) => [
-         q(7877),
+         q(7879),
          q(0),
          ],
       q(zme) => [
-         q(7878),
+         q(7880),
          q(0),
          ],
       q(zmf) => [
-         q(7879),
+         q(7881),
          q(0),
          ],
       q(zmg) => [
-         q(7880),
+         q(7882),
          q(0),
          ],
       q(zmh) => [
-         q(7881),
+         q(7883),
          q(0),
          ],
       q(zmi) => [
-         q(7882),
+         q(7884),
          q(0),
          ],
       q(zmj) => [
-         q(7883),
+         q(7885),
          q(0),
          ],
       q(zmk) => [
-         q(7884),
+         q(7886),
          q(0),
          ],
       q(zml) => [
-         q(7885),
+         q(7887),
          q(0),
          ],
       q(zmm) => [
-         q(7886),
+         q(7888),
          q(0),
          ],
       q(zmn) => [
-         q(7887),
+         q(7889),
          q(0),
          ],
       q(zmo) => [
-         q(7888),
+         q(7890),
          q(0),
          ],
       q(zmp) => [
-         q(7889),
+         q(7891),
          q(0),
          ],
       q(zmq) => [
-         q(7890),
+         q(7892),
          q(0),
          ],
       q(zmr) => [
-         q(7891),
+         q(7893),
          q(0),
          ],
       q(zms) => [
-         q(7892),
+         q(7894),
          q(0),
          ],
       q(zmt) => [
-         q(7893),
+         q(7895),
          q(0),
          ],
       q(zmu) => [
-         q(7894),
+         q(7896),
          q(0),
          ],
       q(zmv) => [
-         q(7895),
+         q(7897),
          q(0),
          ],
       q(zmw) => [
-         q(7896),
+         q(7898),
          q(0),
          ],
       q(zmx) => [
-         q(7897),
+         q(7899),
          q(0),
          ],
       q(zmy) => [
-         q(7898),
+         q(7900),
          q(0),
          ],
       q(zmz) => [
-         q(7899),
+         q(7901),
          q(0),
          ],
       q(zna) => [
-         q(7900),
+         q(7902),
          q(0),
          ],
       q(znd) => [
@@ -89836,259 +89908,259 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zne) => [
-         q(7901),
+         q(7903),
          q(0),
          ],
       q(zng) => [
-         q(7902),
+         q(7904),
          q(0),
          ],
       q(znk) => [
-         q(7903),
+         q(7905),
          q(0),
          ],
       q(zns) => [
-         q(7904),
+         q(7906),
          q(0),
          ],
       q(zoc) => [
-         q(7905),
+         q(7907),
          q(0),
          ],
       q(zoh) => [
-         q(7906),
+         q(7908),
          q(0),
          ],
       q(zom) => [
-         q(7907),
+         q(7909),
          q(0),
          ],
       q(zoo) => [
-         q(7908),
+         q(7910),
          q(0),
          ],
       q(zoq) => [
-         q(7909),
+         q(7911),
          q(0),
          ],
       q(zor) => [
-         q(7910),
+         q(7912),
          q(0),
          ],
       q(zos) => [
-         q(7911),
+         q(7913),
          q(0),
          ],
       q(zpa) => [
-         q(7912),
+         q(7914),
          q(0),
          ],
       q(zpb) => [
-         q(7913),
+         q(7915),
          q(0),
          ],
       q(zpc) => [
-         q(7914),
+         q(7916),
          q(0),
          ],
       q(zpd) => [
-         q(7915),
+         q(7917),
          q(0),
          ],
       q(zpe) => [
-         q(7916),
+         q(7918),
          q(0),
          ],
       q(zpf) => [
-         q(7917),
+         q(7919),
          q(0),
          ],
       q(zpg) => [
-         q(7918),
+         q(7920),
          q(0),
          ],
       q(zph) => [
-         q(7919),
+         q(7921),
          q(0),
          ],
       q(zpi) => [
-         q(7920),
+         q(7922),
          q(0),
          ],
       q(zpj) => [
-         q(7921),
+         q(7923),
          q(0),
          ],
       q(zpk) => [
-         q(7922),
+         q(7924),
          q(0),
          ],
       q(zpl) => [
-         q(7923),
+         q(7925),
          q(0),
          ],
       q(zpm) => [
-         q(7924),
+         q(7926),
          q(0),
          ],
       q(zpn) => [
-         q(7925),
+         q(7927),
          q(0),
          ],
       q(zpo) => [
-         q(7926),
+         q(7928),
          q(0),
          ],
       q(zpp) => [
-         q(7927),
+         q(7929),
          q(0),
          ],
       q(zpq) => [
-         q(7928),
+         q(7930),
          q(0),
          ],
       q(zpr) => [
-         q(7929),
+         q(7931),
          q(0),
          ],
       q(zps) => [
-         q(7930),
+         q(7932),
          q(0),
          ],
       q(zpt) => [
-         q(7931),
+         q(7933),
          q(0),
          ],
       q(zpu) => [
-         q(7932),
+         q(7934),
          q(0),
          ],
       q(zpv) => [
-         q(7933),
+         q(7935),
          q(0),
          ],
       q(zpw) => [
-         q(7934),
+         q(7936),
          q(0),
          ],
       q(zpx) => [
-         q(7935),
+         q(7937),
          q(0),
          ],
       q(zpy) => [
-         q(7936),
+         q(7938),
          q(0),
          ],
       q(zpz) => [
-         q(7937),
+         q(7939),
          q(0),
          ],
       q(zqe) => [
-         q(7938),
+         q(7940),
          q(0),
          ],
       q(zra) => [
-         q(7939),
+         q(7941),
          q(0),
          ],
       q(zrg) => [
-         q(7940),
+         q(7942),
          q(0),
          ],
       q(zrn) => [
-         q(7941),
+         q(7943),
          q(0),
          ],
       q(zro) => [
-         q(7942),
+         q(7944),
          q(0),
          ],
       q(zrp) => [
-         q(7943),
+         q(7945),
          q(0),
          ],
       q(zrs) => [
-         q(7944),
+         q(7946),
          q(0),
          ],
       q(zsa) => [
-         q(7945),
+         q(7947),
          q(0),
          ],
       q(zsk) => [
-         q(7946),
+         q(7948),
          q(0),
          ],
       q(zsl) => [
-         q(7947),
+         q(7949),
          q(0),
          ],
       q(zsm) => [
-         q(7948),
+         q(7950),
          q(0),
          ],
       q(zsr) => [
-         q(7949),
+         q(7951),
          q(0),
          ],
       q(zsu) => [
-         q(7950),
+         q(7952),
          q(0),
          ],
       q(zte) => [
-         q(7951),
+         q(7953),
          q(0),
          ],
       q(ztg) => [
-         q(7952),
+         q(7954),
          q(0),
          ],
       q(ztl) => [
-         q(7953),
+         q(7955),
          q(0),
          ],
       q(ztm) => [
-         q(7954),
+         q(7956),
          q(0),
          ],
       q(ztn) => [
-         q(7955),
+         q(7957),
          q(0),
          ],
       q(ztp) => [
-         q(7956),
+         q(7958),
          q(0),
          ],
       q(ztq) => [
-         q(7957),
+         q(7959),
          q(0),
          ],
       q(zts) => [
-         q(7958),
+         q(7960),
          q(0),
          ],
       q(ztt) => [
-         q(7959),
+         q(7961),
          q(0),
          ],
       q(ztu) => [
-         q(7960),
+         q(7962),
          q(0),
          ],
       q(ztx) => [
-         q(7961),
+         q(7963),
          q(0),
          ],
       q(zty) => [
-         q(7962),
+         q(7964),
          q(0),
          ],
       q(zua) => [
-         q(7963),
+         q(7965),
          q(0),
          ],
       q(zuh) => [
-         q(7964),
+         q(7966),
          q(0),
          ],
       q(zul) => [
@@ -90096,7 +90168,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zum) => [
-         q(7965),
+         q(7967),
          q(0),
          ],
       q(zun) => [
@@ -90104,11 +90176,11 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zuy) => [
-         q(7966),
+         q(7968),
          q(0),
          ],
       q(zwa) => [
-         q(7967),
+         q(7969),
          q(0),
          ],
       q(zxx) => [
@@ -90116,23 +90188,23 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zyb) => [
-         q(7968),
+         q(7970),
          q(0),
          ],
       q(zyg) => [
-         q(7969),
+         q(7971),
          q(0),
          ],
       q(zyj) => [
-         q(7970),
+         q(7972),
          q(0),
          ],
       q(zyn) => [
-         q(7971),
+         q(7973),
          q(0),
          ],
       q(zyp) => [
-         q(7972),
+         q(7974),
          q(0),
          ],
       q(zza) => [
@@ -90140,7 +90212,7 @@ $Locale::Codes::Data{'language'}{'code2id'} = {
          q(0),
          ],
       q(zzj) => [
-         q(7973),
+         q(7975),
          q(0),
          ],
       },
@@ -93109,7 +93181,7 @@ $Locale::Codes::Data{'language'}{'id2code'} = {
       q(0827) => q(aon),
       q(0828) => q(aor),
       q(0829) => q(aos),
-      q(0830) => q(ato),
+      q(0830) => q(aot),
       q(0831) => q(aou),
       q(0832) => q(aox),
       q(0833) => q(aoz),
@@ -93200,1665 +93272,1665 @@ $Locale::Codes::Data{'language'}{'id2code'} = {
       q(0918) => q(atl),
       q(0919) => q(atm),
       q(0920) => q(atn),
-      q(0921) => q(atp),
-      q(0922) => q(atq),
-      q(0923) => q(atr),
-      q(0924) => q(ats),
-      q(0925) => q(att),
-      q(0926) => q(atu),
-      q(0927) => q(atv),
-      q(0928) => q(atw),
-      q(0929) => q(atx),
-      q(0930) => q(aty),
-      q(0931) => q(atz),
-      q(0932) => q(aua),
-      q(0933) => q(aub),
-      q(0934) => q(auc),
-      q(0935) => q(aud),
-      q(0936) => q(aug),
-      q(0937) => q(auh),
-      q(0938) => q(aui),
-      q(0939) => q(auj),
-      q(0940) => q(auk),
-      q(0941) => q(aul),
-      q(0942) => q(aum),
-      q(0943) => q(aun),
-      q(0944) => q(auo),
-      q(0945) => q(aup),
-      q(0946) => q(auq),
-      q(0947) => q(aur),
-      q(0948) => q(aut),
-      q(0949) => q(auu),
-      q(0950) => q(auw),
-      q(0951) => q(aux),
-      q(0952) => q(auy),
-      q(0953) => q(auz),
-      q(0954) => q(avb),
-      q(0955) => q(avd),
-      q(0956) => q(avi),
-      q(0957) => q(avk),
-      q(0958) => q(avl),
-      q(0959) => q(avm),
-      q(0960) => q(avn),
-      q(0961) => q(avo),
-      q(0962) => q(avs),
-      q(0963) => q(avt),
-      q(0964) => q(avu),
-      q(0965) => q(avv),
-      q(0966) => q(awb),
-      q(0967) => q(awc),
-      q(0968) => q(awe),
-      q(0969) => q(awg),
-      q(0970) => q(awh),
-      q(0971) => q(awi),
-      q(0972) => q(awk),
-      q(0973) => q(awm),
-      q(0974) => q(awn),
-      q(0975) => q(awo),
-      q(0976) => q(awr),
-      q(0977) => q(aws),
-      q(0978) => q(awt),
-      q(0979) => q(awu),
-      q(0980) => q(awv),
-      q(0981) => q(aww),
-      q(0982) => q(awx),
-      q(0983) => q(awy),
-      q(0984) => q(axb),
-      q(0985) => q(axe),
-      q(0986) => q(axg),
-      q(0987) => q(axk),
-      q(0988) => q(axl),
-      q(0989) => q(axm),
-      q(0990) => q(axx),
-      q(0991) => q(aya),
-      q(0992) => q(ayb),
-      q(0993) => q(ayc),
-      q(0994) => q(ayd),
-      q(0995) => q(aye),
-      q(0996) => q(ayg),
-      q(0997) => q(ayh),
-      q(0998) => q(ayi),
-      q(0999) => q(ayk),
-      q(1000) => q(ayl),
-      q(1001) => q(ayn),
-      q(1002) => q(ayo),
-      q(1003) => q(ayp),
-      q(1004) => q(ayq),
-      q(1005) => q(ayr),
-      q(1006) => q(ays),
-      q(1007) => q(ayt),
-      q(1008) => q(ayu),
-      q(1009) => q(ayy),
-      q(1010) => q(ayz),
-      q(1011) => q(aza),
-      q(1012) => q(azb),
-      q(1013) => q(azd),
-      q(1014) => q(azg),
-      q(1015) => q(azj),
-      q(1016) => q(azm),
-      q(1017) => q(azn),
-      q(1018) => q(azo),
-      q(1019) => q(azt),
-      q(1020) => q(azz),
-      q(1021) => q(baa),
-      q(1022) => q(bab),
-      q(1023) => q(bac),
-      q(1024) => q(bae),
-      q(1025) => q(baf),
-      q(1026) => q(bag),
-      q(1027) => q(bah),
-      q(1028) => q(baj),
-      q(1029) => q(bao),
-      q(1030) => q(bap),
-      q(1031) => q(bar),
-      q(1032) => q(bau),
-      q(1033) => q(bav),
-      q(1034) => q(baw),
-      q(1035) => q(bax),
-      q(1036) => q(bay),
-      q(1037) => q(bba),
-      q(1038) => q(bbb),
-      q(1039) => q(bbc),
-      q(1040) => q(bbd),
-      q(1041) => q(bbe),
-      q(1042) => q(bbf),
-      q(1043) => q(bbg),
-      q(1044) => q(bbh),
-      q(1045) => q(bbi),
-      q(1046) => q(bbj),
-      q(1047) => q(bbk),
-      q(1048) => q(bbl),
-      q(1049) => q(bbm),
-      q(1050) => q(bbn),
-      q(1051) => q(bbo),
-      q(1052) => q(bbp),
-      q(1053) => q(bbq),
-      q(1054) => q(bbr),
-      q(1055) => q(bbs),
-      q(1056) => q(bbt),
-      q(1057) => q(bbu),
-      q(1058) => q(bbv),
-      q(1059) => q(bbw),
-      q(1060) => q(bbx),
-      q(1061) => q(bby),
-      q(1062) => q(bbz),
-      q(1063) => q(bca),
-      q(1064) => q(bcb),
-      q(1065) => q(bcc),
-      q(1066) => q(bcd),
-      q(1067) => q(bce),
-      q(1068) => q(bcf),
-      q(1069) => q(bcg),
-      q(1070) => q(bch),
-      q(1071) => q(bci),
-      q(1072) => q(bcj),
-      q(1073) => q(bck),
-      q(1074) => q(bcl),
-      q(1075) => q(bcm),
-      q(1076) => q(bcn),
-      q(1077) => q(bco),
-      q(1078) => q(bcp),
-      q(1079) => q(bcq),
-      q(1080) => q(bcr),
-      q(1081) => q(bcs),
-      q(1082) => q(bct),
-      q(1083) => q(bcu),
-      q(1084) => q(bcv),
-      q(1085) => q(bcw),
-      q(1086) => q(bcy),
-      q(1087) => q(bcz),
-      q(1088) => q(bda),
-      q(1089) => q(bdb),
-      q(1090) => q(bdc),
-      q(1091) => q(bdd),
-      q(1092) => q(bde),
-      q(1093) => q(bdf),
-      q(1094) => q(bdg),
-      q(1095) => q(bdh),
-      q(1096) => q(bdi),
-      q(1097) => q(bdj),
-      q(1098) => q(bdk),
-      q(1099) => q(bdl),
-      q(1100) => q(bdm),
-      q(1101) => q(bdn),
-      q(1102) => q(bdo),
-      q(1103) => q(bdp),
-      q(1104) => q(bdq),
-      q(1105) => q(bdr),
-      q(1106) => q(bds),
-      q(1107) => q(bdt),
-      q(1108) => q(bdu),
-      q(1109) => q(bdv),
-      q(1110) => q(bdw),
-      q(1111) => q(bdx),
-      q(1112) => q(bdy),
-      q(1113) => q(bdz),
-      q(1114) => q(bea),
-      q(1115) => q(beb),
-      q(1116) => q(bec),
-      q(1117) => q(bed),
-      q(1118) => q(bee),
-      q(1119) => q(bef),
-      q(1120) => q(beg),
-      q(1121) => q(beh),
-      q(1122) => q(bei),
-      q(1123) => q(bek),
-      q(1124) => q(beo),
-      q(1125) => q(bep),
-      q(1126) => q(beq),
-      q(1127) => q(bes),
-      q(1128) => q(bet),
-      q(1129) => q(beu),
-      q(1130) => q(bev),
-      q(1131) => q(bew),
-      q(1132) => q(bex),
-      q(1133) => q(bey),
-      q(1134) => q(bez),
-      q(1135) => q(mot),
-      q(1136) => q(bfb),
-      q(1137) => q(bfc),
-      q(1138) => q(bfd),
-      q(1139) => q(bfe),
-      q(1140) => q(bff),
-      q(1141) => q(bfg),
-      q(1142) => q(bfh),
-      q(1143) => q(bfi),
-      q(1144) => q(bfj),
-      q(1145) => q(bfk),
-      q(1146) => q(bfl),
-      q(1147) => q(bfm),
-      q(1148) => q(bfn),
-      q(1149) => q(bfo),
-      q(1150) => q(bfp),
-      q(1151) => q(bfq),
-      q(1152) => q(bfr),
-      q(1153) => q(bfs),
-      q(1154) => q(bft),
-      q(1155) => q(bfu),
-      q(1156) => q(bfw),
-      q(1157) => q(bfx),
-      q(1158) => q(bfy),
-      q(1159) => q(bfz),
-      q(1160) => q(bga),
-      q(1161) => q(bgb),
-      q(1162) => q(bgc),
-      q(1163) => q(bgd),
-      q(1164) => q(bge),
-      q(1165) => q(bgf),
-      q(1166) => q(bgg),
-      q(1167) => q(bgi),
-      q(1168) => q(bgj),
-      q(1169) => q(bgk),
-      q(1170) => q(bgl),
-      q(1171) => q(bgm),
-      q(1172) => q(bgn),
-      q(1173) => q(bgo),
-      q(1174) => q(bgp),
-      q(1175) => q(bgq),
-      q(1176) => q(bgr),
-      q(1177) => q(bgs),
-      q(1178) => q(bgt),
-      q(1179) => q(bgu),
-      q(1180) => q(bgv),
-      q(1181) => q(bgw),
-      q(1182) => q(bgx),
-      q(1183) => q(bgy),
-      q(1184) => q(bgz),
-      q(1185) => q(bha),
-      q(1186) => q(bhb),
-      q(1187) => q(bhc),
-      q(1188) => q(bhd),
-      q(1189) => q(bhe),
-      q(1190) => q(bhf),
-      q(1191) => q(bhg),
-      q(1192) => q(bhh),
-      q(1193) => q(bhi),
-      q(1194) => q(bhj),
-      q(1195) => q(bhl),
-      q(1196) => q(bhm),
-      q(1197) => q(bhn),
-      q(1198) => q(bhp),
-      q(1199) => q(bhq),
-      q(1200) => q(bhr),
-      q(1201) => q(bhs),
-      q(1202) => q(bht),
-      q(1203) => q(bhu),
-      q(1204) => q(bhv),
-      q(1205) => q(bhw),
-      q(1206) => q(bhx),
-      q(1207) => q(bhy),
-      q(1208) => q(bhz),
-      q(1209) => q(bia),
-      q(1210) => q(bib),
-      q(1211) => q(bic),
-      q(1212) => q(bid),
-      q(1213) => q(bie),
-      q(1214) => q(bif),
-      q(1215) => q(big),
-      q(1216) => q(bij),
-      q(1217) => q(bil),
-      q(1218) => q(bim),
-      q(1219) => q(bio),
-      q(1220) => q(bip),
-      q(1221) => q(biq),
-      q(1222) => q(bir),
-      q(1223) => q(bit),
-      q(1224) => q(biu),
-      q(1225) => q(biv),
-      q(1226) => q(biw),
-      q(1227) => q(bix),
-      q(1228) => q(biy),
-      q(1229) => q(biz),
-      q(1230) => q(bja),
-      q(1231) => q(bjb),
-      q(1232) => q(bjc),
-      q(1233) => q(bje),
-      q(1234) => q(bjf),
-      q(1235) => q(bjg),
-      q(1236) => q(bjh),
-      q(1237) => q(bji),
-      q(1238) => q(bjj),
-      q(1239) => q(bjk),
-      q(1240) => q(bjl),
-      q(1241) => q(bjm),
-      q(1242) => q(bjn),
-      q(1243) => q(bjo),
-      q(1244) => q(bjp),
-      q(1245) => q(bjr),
-      q(1246) => q(bjs),
-      q(1247) => q(bjt),
-      q(1248) => q(bju),
-      q(1249) => q(bjv),
-      q(1250) => q(bjw),
-      q(1251) => q(bjx),
-      q(1252) => q(bjy),
-      q(1253) => q(bjz),
-      q(1254) => q(bka),
-      q(1255) => q(bkc),
-      q(1256) => q(bkd),
-      q(1257) => q(bkf),
-      q(1258) => q(bkg),
-      q(1259) => q(bkh),
-      q(1260) => q(bki),
-      q(1261) => q(bkj),
-      q(1262) => q(bkk),
-      q(1263) => q(bkl),
-      q(1264) => q(bkm),
-      q(1265) => q(bkn),
-      q(1266) => q(bko),
-      q(1267) => q(bkp),
-      q(1268) => q(bkq),
-      q(1269) => q(bkr),
-      q(1270) => q(bks),
-      q(1271) => q(bkt),
-      q(1272) => q(bku),
-      q(1273) => q(bkv),
-      q(1274) => q(bkw),
-      q(1275) => q(bkx),
-      q(1276) => q(bky),
-      q(1277) => q(bkz),
-      q(1278) => q(blb),
-      q(1279) => q(blc),
-      q(1280) => q(bld),
-      q(1281) => q(ble),
-      q(1282) => q(blf),
-      q(1283) => q(blg),
-      q(1284) => q(blh),
-      q(1285) => q(bli),
-      q(1286) => q(blj),
-      q(1287) => q(blk),
-      q(1288) => q(bll),
-      q(1289) => q(blm),
-      q(1290) => q(bln),
-      q(1291) => q(blo),
-      q(1292) => q(blp),
-      q(1293) => q(blq),
-      q(1294) => q(blr),
-      q(1295) => q(bls),
-      q(1296) => q(blt),
-      q(1297) => q(blv),
-      q(1298) => q(blw),
-      q(1299) => q(blx),
-      q(1300) => q(bly),
-      q(1301) => q(blz),
-      q(1302) => q(bma),
-      q(1303) => q(bmb),
-      q(1304) => q(bmc),
-      q(1305) => q(bmd),
-      q(1306) => q(bme),
-      q(1307) => q(bmf),
-      q(1308) => q(bmg),
-      q(1309) => q(bmh),
-      q(1310) => q(bmi),
-      q(1311) => q(bmj),
-      q(1312) => q(bmk),
-      q(1313) => q(bml),
-      q(1314) => q(bmm),
-      q(1315) => q(bmn),
-      q(1316) => q(bmo),
-      q(1317) => q(bmp),
-      q(1318) => q(bmq),
-      q(1319) => q(bmr),
-      q(1320) => q(bms),
-      q(1321) => q(bmt),
-      q(1322) => q(bmu),
-      q(1323) => q(bmv),
-      q(1324) => q(bmw),
-      q(1325) => q(bmx),
-      q(1326) => q(bmz),
-      q(1327) => q(bna),
-      q(1328) => q(bnb),
-      q(1329) => q(bnc),
-      q(1330) => q(bnd),
-      q(1331) => q(bne),
-      q(1332) => q(bnf),
-      q(1333) => q(bng),
-      q(1334) => q(bni),
-      q(1335) => q(bnj),
-      q(1336) => q(bnk),
-      q(1337) => q(bnl),
-      q(1338) => q(bnm),
-      q(1339) => q(bnn),
-      q(1340) => q(bno),
-      q(1341) => q(bnp),
-      q(1342) => q(bnq),
-      q(1343) => q(bnr),
-      q(1344) => q(bns),
-      q(1345) => q(bnu),
-      q(1346) => q(bnv),
-      q(1347) => q(bnw),
-      q(1348) => q(bnx),
-      q(1349) => q(bny),
-      q(1350) => q(bnz),
-      q(1351) => q(boa),
-      q(1352) => q(bob),
-      q(1353) => q(boe),
-      q(1354) => q(bof),
-      q(1355) => q(bog),
-      q(1356) => q(boh),
-      q(1357) => q(boi),
-      q(1358) => q(boj),
-      q(1359) => q(bok),
-      q(1360) => q(bol),
-      q(1361) => q(bom),
-      q(1362) => q(bon),
-      q(1363) => q(boo),
-      q(1364) => q(bop),
-      q(1365) => q(boq),
-      q(1366) => q(bor),
-      q(1367) => q(bot),
-      q(1368) => q(bou),
-      q(1369) => q(bov),
-      q(1370) => q(bow),
-      q(1371) => q(box),
-      q(1372) => q(boy),
-      q(1373) => q(boz),
-      q(1374) => q(bpa),
-      q(1375) => q(bpb),
-      q(1376) => q(bpd),
-      q(1377) => q(bpg),
-      q(1378) => q(bph),
-      q(1379) => q(bpi),
-      q(1380) => q(bpj),
-      q(1381) => q(bpk),
-      q(1382) => q(bpl),
-      q(1383) => q(bpm),
-      q(1384) => q(bpn),
-      q(1385) => q(bpo),
-      q(1386) => q(bpp),
-      q(1387) => q(bpq),
-      q(1388) => q(bpr),
-      q(1389) => q(bps),
-      q(1390) => q(bpt),
-      q(1391) => q(bpu),
-      q(1392) => q(bpv),
-      q(1393) => q(bpw),
-      q(1394) => q(bpx),
-      q(1395) => q(bpy),
-      q(1396) => q(bpz),
-      q(1397) => q(bqa),
-      q(1398) => q(bqb),
-      q(1399) => q(bqc),
-      q(1400) => q(bqd),
-      q(1401) => q(bqf),
-      q(1402) => q(bqg),
-      q(1403) => q(bqh),
-      q(1404) => q(bqi),
-      q(1405) => q(bqj),
-      q(1406) => q(bqk),
-      q(1407) => q(bql),
-      q(1408) => q(bqm),
-      q(1409) => q(bqn),
-      q(1410) => q(bqo),
-      q(1411) => q(bqp),
-      q(1412) => q(bqq),
-      q(1413) => q(bqr),
-      q(1414) => q(bqs),
-      q(1415) => q(bqt),
-      q(1416) => q(bqu),
-      q(1417) => q(bqv),
-      q(1418) => q(bqw),
-      q(1419) => q(bqx),
-      q(1420) => q(bqy),
-      q(1421) => q(bqz),
-      q(1422) => q(brb),
-      q(1423) => q(brc),
-      q(1424) => q(brd),
-      q(1425) => q(brf),
-      q(1426) => q(brg),
-      q(1427) => q(brh),
-      q(1428) => q(bri),
-      q(1429) => q(brj),
-      q(1430) => q(brk),
-      q(1431) => q(brl),
-      q(1432) => q(brm),
-      q(1433) => q(brn),
-      q(1434) => q(bro),
-      q(1435) => q(brp),
-      q(1436) => q(brq),
-      q(1437) => q(brr),
-      q(1438) => q(brs),
-      q(1439) => q(brt),
-      q(1440) => q(bru),
-      q(1441) => q(brv),
-      q(1442) => q(brw),
-      q(1443) => q(brx),
-      q(1444) => q(bry),
-      q(1445) => q(brz),
-      q(1446) => q(bsa),
-      q(1447) => q(bsb),
-      q(1448) => q(bsc),
-      q(1449) => q(bse),
-      q(1450) => q(bsf),
-      q(1451) => q(bsg),
-      q(1452) => q(bsh),
-      q(1453) => q(bsi),
-      q(1454) => q(bsj),
-      q(1455) => q(bsk),
-      q(1456) => q(bsl),
-      q(1457) => q(bsm),
-      q(1458) => q(bsn),
-      q(1459) => q(bso),
-      q(1460) => q(bsp),
-      q(1461) => q(bsq),
-      q(1462) => q(bsr),
-      q(1463) => q(bss),
-      q(1464) => q(bst),
-      q(1465) => q(bsu),
-      q(1466) => q(bsv),
-      q(1467) => q(bsw),
-      q(1468) => q(bsx),
-      q(1469) => q(bsy),
-      q(1470) => q(bta),
-      q(1471) => q(btc),
-      q(1472) => q(btd),
-      q(1473) => q(bte),
-      q(1474) => q(btf),
-      q(1475) => q(btg),
-      q(1476) => q(bth),
-      q(1477) => q(bti),
-      q(1478) => q(btj),
-      q(1479) => q(btl),
-      q(1480) => q(btm),
-      q(1481) => q(btn),
-      q(1482) => q(bto),
-      q(1483) => q(btp),
-      q(1484) => q(btq),
-      q(1485) => q(btr),
-      q(1486) => q(bts),
-      q(1487) => q(btt),
-      q(1488) => q(btu),
-      q(1489) => q(btv),
-      q(1490) => q(btw),
-      q(1491) => q(btx),
-      q(1492) => q(bty),
-      q(1493) => q(btz),
-      q(1494) => q(bub),
-      q(1495) => q(buc),
-      q(1496) => q(bud),
-      q(1497) => q(bue),
-      q(1498) => q(buf),
-      q(1499) => q(buh),
-      q(1500) => q(bui),
-      q(1501) => q(buj),
-      q(1502) => q(buk),
-      q(1503) => q(bum),
-      q(1504) => q(bun),
-      q(1505) => q(buo),
-      q(1506) => q(bup),
-      q(1507) => q(buq),
-      q(1508) => q(bus),
-      q(1509) => q(but),
-      q(1510) => q(buu),
-      q(1511) => q(buv),
-      q(1512) => q(buw),
-      q(1513) => q(bux),
-      q(1514) => q(buy),
-      q(1515) => q(buz),
-      q(1516) => q(bva),
-      q(1517) => q(bvb),
-      q(1518) => q(bvc),
-      q(1519) => q(bvd),
-      q(1520) => q(bve),
-      q(1521) => q(bvf),
-      q(1522) => q(bvg),
-      q(1523) => q(bvh),
-      q(1524) => q(bvi),
-      q(1525) => q(bvj),
-      q(1526) => q(bvk),
-      q(1527) => q(bvl),
-      q(1528) => q(bvm),
-      q(1529) => q(bvn),
-      q(1530) => q(bvo),
-      q(1531) => q(bvp),
-      q(1532) => q(bvq),
-      q(1533) => q(bvr),
-      q(1534) => q(bvt),
-      q(1535) => q(bvu),
-      q(1536) => q(bvv),
-      q(1537) => q(bvw),
-      q(1538) => q(bvx),
-      q(1539) => q(bvy),
-      q(1540) => q(bvz),
-      q(1541) => q(bwa),
-      q(1542) => q(bwb),
-      q(1543) => q(bwc),
-      q(1544) => q(bwd),
-      q(1545) => q(bwe),
-      q(1546) => q(bwf),
-      q(1547) => q(bwg),
-      q(1548) => q(bwh),
-      q(1549) => q(bwi),
-      q(1550) => q(bwj),
-      q(1551) => q(bwk),
-      q(1552) => q(bwl),
-      q(1553) => q(bwm),
-      q(1554) => q(bwn),
-      q(1555) => q(bwo),
-      q(1556) => q(bwp),
-      q(1557) => q(bwq),
-      q(1558) => q(bwr),
-      q(1559) => q(bws),
-      q(1560) => q(bwt),
-      q(1561) => q(bwu),
-      q(1562) => q(bww),
-      q(1563) => q(bwx),
-      q(1564) => q(bwy),
-      q(1565) => q(bwz),
-      q(1566) => q(bxa),
-      q(1567) => q(bxb),
-      q(1568) => q(bxc),
-      q(1569) => q(bxd),
-      q(1570) => q(bxe),
-      q(1571) => q(bxf),
-      q(1572) => q(bxg),
-      q(1573) => q(bxh),
-      q(1574) => q(bxi),
-      q(1575) => q(bxj),
-      q(1576) => q(bxk),
-      q(1577) => q(bxl),
-      q(1578) => q(bxm),
-      q(1579) => q(bxn),
-      q(1580) => q(bxo),
-      q(1581) => q(bxp),
-      q(1582) => q(bxq),
-      q(1583) => q(bxr),
-      q(1584) => q(bxs),
-      q(1585) => q(bxu),
-      q(1586) => q(bxv),
-      q(1587) => q(bxw),
-      q(1588) => q(bxz),
-      q(1589) => q(bya),
-      q(1590) => q(byb),
-      q(1591) => q(byc),
-      q(1592) => q(byd),
-      q(1593) => q(bye),
-      q(1594) => q(byf),
-      q(1595) => q(byg),
-      q(1596) => q(byh),
-      q(1597) => q(byi),
-      q(1598) => q(byj),
-      q(1599) => q(byk),
-      q(1600) => q(byl),
-      q(1601) => q(bym),
-      q(1602) => q(byo),
-      q(1603) => q(byp),
-      q(1604) => q(byq),
-      q(1605) => q(byr),
-      q(1606) => q(bys),
-      q(1607) => q(byt),
-      q(1608) => q(byv),
-      q(1609) => q(byw),
-      q(1610) => q(byx),
-      q(1611) => q(byz),
-      q(1612) => q(bza),
-      q(1613) => q(bzb),
-      q(1614) => q(bzc),
-      q(1615) => q(bzd),
-      q(1616) => q(bze),
-      q(1617) => q(bzf),
-      q(1618) => q(bzg),
-      q(1619) => q(bzh),
-      q(1620) => q(bzi),
-      q(1621) => q(bzj),
-      q(1622) => q(bzk),
-      q(1623) => q(bzl),
-      q(1624) => q(bzm),
-      q(1625) => q(bzn),
-      q(1626) => q(bzo),
-      q(1627) => q(bzp),
-      q(1628) => q(bzq),
-      q(1629) => q(bzr),
-      q(1630) => q(bzs),
-      q(1631) => q(bzt),
-      q(1632) => q(bzu),
-      q(1633) => q(bzv),
-      q(1634) => q(bzw),
-      q(1635) => q(bzx),
-      q(1636) => q(bzy),
-      q(1637) => q(bzz),
-      q(1638) => q(caa),
-      q(1639) => q(cab),
-      q(1640) => q(cac),
-      q(1641) => q(cae),
-      q(1642) => q(caf),
-      q(1643) => q(cag),
-      q(1644) => q(cah),
-      q(1645) => q(caj),
-      q(1646) => q(cak),
-      q(1647) => q(cal),
-      q(1648) => q(cam),
-      q(1649) => q(can),
-      q(1650) => q(cao),
-      q(1651) => q(cap),
-      q(1652) => q(caq),
-      q(1653) => q(cas),
-      q(1654) => q(cav),
-      q(1655) => q(caw),
-      q(1656) => q(cax),
-      q(1657) => q(cay),
-      q(1658) => q(caz),
-      q(1659) => q(cbb),
-      q(1660) => q(cbc),
-      q(1661) => q(cbd),
-      q(1662) => q(cbe),
-      q(1663) => q(cbg),
-      q(1664) => q(cbh),
-      q(1665) => q(cbi),
-      q(1666) => q(cbj),
-      q(1667) => q(cbk),
-      q(1668) => q(cbl),
-      q(1669) => q(cbn),
-      q(1670) => q(cbo),
-      q(1671) => q(cbq),
-      q(1672) => q(cbr),
-      q(1673) => q(cbs),
-      q(1674) => q(cbt),
-      q(1675) => q(cbu),
-      q(1676) => q(cbv),
-      q(1677) => q(cbw),
-      q(1678) => q(cby),
-      q(1679) => q(cca),
-      q(1680) => q(ccc),
-      q(1681) => q(ccd),
-      q(1682) => q(cce),
-      q(1683) => q(ccg),
-      q(1684) => q(cch),
-      q(1685) => q(ccj),
-      q(1686) => q(ccl),
-      q(1687) => q(ccm),
-      q(1688) => q(cco),
-      q(1689) => q(ccp),
-      q(1690) => q(ccr),
-      q(1691) => q(cda),
-      q(1692) => q(cde),
-      q(1693) => q(cdf),
-      q(1694) => q(cdg),
-      q(1695) => q(cdh),
-      q(1696) => q(cdi),
-      q(1697) => q(cdj),
-      q(1698) => q(cdm),
-      q(1699) => q(cdn),
-      q(1700) => q(cdo),
-      q(1701) => q(cdr),
-      q(1702) => q(cds),
-      q(1703) => q(cdy),
-      q(1704) => q(cdz),
-      q(1705) => q(cea),
-      q(1706) => q(ceg),
-      q(1707) => q(cek),
-      q(1708) => q(cen),
-      q(1709) => q(cet),
-      q(1710) => q(cfa),
-      q(1711) => q(cfd),
-      q(1712) => q(cfg),
-      q(1713) => q(cfm),
-      q(1714) => q(cga),
-      q(1715) => q(cgc),
-      q(1716) => q(cgg),
-      q(1717) => q(cgk),
-      q(1718) => q(chc),
-      q(1719) => q(chd),
-      q(1720) => q(chf),
-      q(1721) => q(chh),
-      q(1722) => q(chj),
-      q(1723) => q(chl),
-      q(1724) => q(chq),
-      q(1725) => q(cht),
-      q(1726) => q(chw),
-      q(1727) => q(chx),
-      q(1728) => q(chz),
-      q(1729) => q(cia),
-      q(1730) => q(cib),
-      q(1731) => q(cic),
-      q(1732) => q(cid),
-      q(1733) => q(cie),
-      q(1734) => q(cih),
-      q(1735) => q(cik),
-      q(1736) => q(cim),
-      q(1737) => q(cin),
-      q(1738) => q(cip),
-      q(1739) => q(cir),
-      q(1740) => q(ciw),
-      q(1741) => q(ciy),
-      q(1742) => q(cja),
-      q(1743) => q(cje),
-      q(1744) => q(cjh),
-      q(1745) => q(cji),
-      q(1746) => q(cjk),
-      q(1747) => q(cjm),
-      q(1748) => q(cjn),
-      q(1749) => q(cjo),
-      q(1750) => q(cjp),
-      q(1751) => q(cjs),
-      q(1752) => q(cjv),
-      q(1753) => q(cjy),
-      q(1754) => q(ckb),
-      q(1755) => q(ckh),
-      q(1756) => q(ckl),
-      q(1757) => q(ckn),
-      q(1758) => q(cko),
-      q(1759) => q(ckq),
-      q(1760) => q(ckr),
-      q(1761) => q(cks),
-      q(1762) => q(ckt),
-      q(1763) => q(cku),
-      q(1764) => q(ckv),
-      q(1765) => q(ckx),
-      q(1766) => q(cky),
-      q(1767) => q(ckz),
-      q(1768) => q(cla),
-      q(1769) => q(clc),
-      q(1770) => q(cld),
-      q(1771) => q(cle),
-      q(1772) => q(clh),
-      q(1773) => q(cli),
-      q(1774) => q(clj),
-      q(1775) => q(clk),
-      q(1776) => q(cll),
-      q(1777) => q(clm),
-      q(1778) => q(clo),
-      q(1779) => q(clt),
-      q(1780) => q(clu),
-      q(1781) => q(clw),
-      q(1782) => q(cly),
-      q(1783) => q(cma),
-      q(1784) => q(cme),
-      q(1785) => q(cmg),
-      q(1786) => q(cmi),
-      q(1787) => q(cml),
-      q(1788) => q(cmm),
-      q(1789) => q(cmn),
-      q(1790) => q(cmo),
-      q(1791) => q(cmr),
-      q(1792) => q(cms),
-      q(1793) => q(cmt),
-      q(1794) => q(cna),
-      q(1795) => q(cnb),
-      q(1796) => q(cnc),
-      q(1797) => q(cng),
-      q(1798) => q(cnh),
-      q(1799) => q(cni),
-      q(1800) => q(cnk),
-      q(1801) => q(cnl),
-      q(1802) => q(cno),
-      q(1803) => q(cns),
-      q(1804) => q(cnt),
-      q(1805) => q(cnu),
-      q(1806) => q(cnw),
-      q(1807) => q(cnx),
-      q(1808) => q(coa),
-      q(1809) => q(cob),
-      q(1810) => q(coc),
-      q(1811) => q(cod),
-      q(1812) => q(coe),
-      q(1813) => q(cof),
-      q(1814) => q(cog),
-      q(1815) => q(coh),
-      q(1816) => q(coj),
-      q(1817) => q(cok),
-      q(1818) => q(col),
-      q(1819) => q(com),
-      q(1820) => q(con),
-      q(1821) => q(coo),
-      q(1822) => q(coq),
-      q(1823) => q(cot),
-      q(1824) => q(cou),
-      q(1825) => q(cov),
-      q(1826) => q(cow),
-      q(1827) => q(cox),
-      q(1828) => q(coy),
-      q(1829) => q(coz),
-      q(1830) => q(cpa),
-      q(1831) => q(cpb),
-      q(1832) => q(cpc),
-      q(1833) => q(cpg),
-      q(1834) => q(cpi),
-      q(1835) => q(cpn),
-      q(1836) => q(cpo),
-      q(1837) => q(cps),
-      q(1838) => q(cpu),
-      q(1839) => q(cpx),
-      q(1840) => q(cpy),
-      q(1841) => q(cqd),
-      q(1842) => q(cqu),
-      q(1843) => q(cra),
-      q(1844) => q(crb),
-      q(1845) => q(crc),
-      q(1846) => q(crd),
-      q(1847) => q(crf),
-      q(1848) => q(crg),
-      q(1849) => q(cri),
-      q(1850) => q(crj),
-      q(1851) => q(crk),
-      q(1852) => q(crl),
-      q(1853) => q(crm),
-      q(1854) => q(crn),
-      q(1855) => q(cro),
-      q(1856) => q(crq),
-      q(1857) => q(crr),
-      q(1858) => q(crs),
-      q(1859) => q(crt),
-      q(1860) => q(crv),
-      q(1861) => q(crw),
-      q(1862) => q(crx),
-      q(1863) => q(cry),
-      q(1864) => q(crz),
-      q(1865) => q(csa),
-      q(1866) => q(csc),
-      q(1867) => q(csd),
-      q(1868) => q(cse),
-      q(1869) => q(csf),
-      q(1870) => q(csg),
-      q(1871) => q(csh),
-      q(1872) => q(csi),
-      q(1873) => q(csj),
-      q(1874) => q(csk),
-      q(1875) => q(csl),
-      q(1876) => q(csm),
-      q(1877) => q(csn),
-      q(1878) => q(cso),
-      q(1879) => q(csq),
-      q(1880) => q(csr),
-      q(1881) => q(css),
-      q(1882) => q(cst),
-      q(1883) => q(csv),
-      q(1884) => q(csw),
-      q(1885) => q(csy),
-      q(1886) => q(csz),
-      q(1887) => q(cta),
-      q(1888) => q(ctc),
-      q(1889) => q(ctd),
-      q(1890) => q(cte),
-      q(1891) => q(ctg),
-      q(1892) => q(cth),
-      q(1893) => q(ctl),
-      q(1894) => q(ctm),
-      q(1895) => q(ctn),
-      q(1896) => q(cto),
-      q(1897) => q(ctp),
-      q(1898) => q(cts),
-      q(1899) => q(ctt),
-      q(1900) => q(ctu),
-      q(1901) => q(ctz),
-      q(1902) => q(cua),
-      q(1903) => q(cub),
-      q(1904) => q(cuc),
-      q(1905) => q(cug),
-      q(1906) => q(cuh),
-      q(1907) => q(cui),
-      q(1908) => q(cuj),
-      q(1909) => q(cuk),
-      q(1910) => q(cul),
-      q(1911) => q(cum),
-      q(1912) => q(cuo),
-      q(1913) => q(cup),
-      q(1914) => q(cuq),
-      q(1915) => q(cur),
-      q(1916) => q(cut),
-      q(1917) => q(cuu),
-      q(1918) => q(cuv),
-      q(1919) => q(cuw),
-      q(1920) => q(cux),
-      q(1921) => q(cvg),
-      q(1922) => q(cvn),
-      q(1923) => q(cwa),
-      q(1924) => q(cwb),
-      q(1925) => q(cwd),
-      q(1926) => q(cwe),
-      q(1927) => q(cwg),
-      q(1928) => q(cwt),
-      q(1929) => q(cya),
-      q(1930) => q(cyb),
-      q(1931) => q(cyo),
-      q(1932) => q(czh),
-      q(1933) => q(czk),
-      q(1934) => q(czn),
-      q(1935) => q(czo),
-      q(1936) => q(czt),
-      q(1937) => q(daa),
-      q(1938) => q(dac),
-      q(1939) => q(dad),
-      q(1940) => q(dae),
-      q(1941) => q(dag),
-      q(1942) => q(dah),
-      q(1943) => q(dai),
-      q(1944) => q(daj),
-      q(1945) => q(dal),
-      q(1946) => q(dam),
-      q(1947) => q(dao),
-      q(1948) => q(daq),
-      q(1949) => q(das),
-      q(1950) => q(dau),
-      q(1951) => q(dav),
-      q(1952) => q(daw),
-      q(1953) => q(dax),
-      q(1954) => q(daz),
-      q(1955) => q(dba),
-      q(1956) => q(dbb),
-      q(1957) => q(dbd),
-      q(1958) => q(dbe),
-      q(1959) => q(dbf),
-      q(1960) => q(dbg),
-      q(1961) => q(dbi),
-      q(1962) => q(dbj),
-      q(1963) => q(dbl),
-      q(1964) => q(dbm),
-      q(1965) => q(dbn),
-      q(1966) => q(dbo),
-      q(1967) => q(dbp),
-      q(1968) => q(dbq),
-      q(1969) => q(dbr),
-      q(1970) => q(dbt),
-      q(1971) => q(dbu),
-      q(1972) => q(dbv),
-      q(1973) => q(dbw),
-      q(1974) => q(dby),
-      q(1975) => q(dcc),
-      q(1976) => q(dcr),
-      q(1977) => q(dda),
-      q(1978) => q(ddd),
-      q(1979) => q(dde),
-      q(1980) => q(ddg),
-      q(1981) => q(ddi),
-      q(1982) => q(ddj),
-      q(1983) => q(ddn),
-      q(1984) => q(ddo),
-      q(1985) => q(ddr),
-      q(1986) => q(dds),
-      q(1987) => q(ddw),
-      q(1988) => q(dec),
-      q(1989) => q(ded),
-      q(1990) => q(dee),
-      q(1991) => q(def),
-      q(1992) => q(deg),
-      q(1993) => q(deh),
-      q(1994) => q(dei),
-      q(1995) => q(dek),
-      q(1996) => q(dem),
-      q(1997) => q(dep),
-      q(1998) => q(deq),
-      q(1999) => q(der),
-      q(2000) => q(des),
-      q(2001) => q(dev),
-      q(2002) => q(dez),
-      q(2003) => q(dga),
-      q(2004) => q(dgb),
-      q(2005) => q(dgc),
-      q(2006) => q(dgd),
-      q(2007) => q(dge),
-      q(2008) => q(dgg),
-      q(2009) => q(dgh),
-      q(2010) => q(dgi),
-      q(2011) => q(dgk),
-      q(2012) => q(dgl),
-      q(2013) => q(dgn),
-      q(2014) => q(dgo),
-      q(2015) => q(dgs),
-      q(2016) => q(dgt),
-      q(2017) => q(dgu),
-      q(2018) => q(dgw),
-      q(2019) => q(dgx),
-      q(2020) => q(dgz),
-      q(2021) => q(dhd),
-      q(2022) => q(dhg),
-      q(2023) => q(dhi),
-      q(2024) => q(dhl),
-      q(2025) => q(dhm),
-      q(2026) => q(dhn),
-      q(2027) => q(dho),
-      q(2028) => q(dhr),
-      q(2029) => q(dhs),
-      q(2030) => q(dhu),
-      q(2031) => q(dhv),
-      q(2032) => q(dhw),
-      q(2033) => q(dhx),
-      q(2034) => q(dia),
-      q(2035) => q(dib),
-      q(2036) => q(dic),
-      q(2037) => q(did),
-      q(2038) => q(dif),
-      q(2039) => q(dig),
-      q(2040) => q(dih),
-      q(2041) => q(dii),
-      q(2042) => q(dij),
-      q(2043) => q(dik),
-      q(2044) => q(dil),
-      q(2045) => q(dim),
-      q(2046) => q(dio),
-      q(2047) => q(dip),
-      q(2048) => q(diq),
-      q(2049) => q(dir),
-      q(2050) => q(dis),
-      q(2051) => q(dit),
-      q(2052) => q(diu),
-      q(2053) => q(diw),
-      q(2054) => q(dix),
-      q(2055) => q(diy),
-      q(2056) => q(diz),
-      q(2057) => q(dja),
-      q(2058) => q(djb),
-      q(2059) => q(djc),
-      q(2060) => q(djd),
-      q(2061) => q(dje),
-      q(2062) => q(djf),
-      q(2063) => q(dji),
-      q(2064) => q(djj),
-      q(2065) => q(djk),
-      q(2066) => q(djm),
-      q(2067) => q(djn),
-      q(2068) => q(djo),
-      q(2069) => q(djr),
-      q(2070) => q(dju),
-      q(2071) => q(djw),
-      q(2072) => q(dka),
-      q(2073) => q(dkk),
-      q(2074) => q(dkr),
-      q(2075) => q(dks),
-      q(2076) => q(dkx),
-      q(2077) => q(dlg),
-      q(2078) => q(dlk),
-      q(2079) => q(dlm),
-      q(2080) => q(dln),
-      q(2081) => q(dma),
-      q(2082) => q(dmb),
-      q(2083) => q(dmc),
-      q(2084) => q(dmd),
-      q(2085) => q(dme),
-      q(2086) => q(dmg),
-      q(2087) => q(dmk),
-      q(2088) => q(dml),
-      q(2089) => q(dmm),
-      q(2090) => q(dmo),
-      q(2091) => q(dmr),
-      q(2092) => q(dms),
-      q(2093) => q(dmu),
-      q(2094) => q(dmv),
-      q(2095) => q(dmw),
-      q(2096) => q(dmx),
-      q(2097) => q(dmy),
-      q(2098) => q(dna),
-      q(2099) => q(dnd),
-      q(2100) => q(dne),
-      q(2101) => q(dng),
-      q(2102) => q(dni),
-      q(2103) => q(dnj),
-      q(2104) => q(dnk),
-      q(2105) => q(dnn),
-      q(2106) => q(dnr),
-      q(2107) => q(dnt),
-      q(2108) => q(dnu),
-      q(2109) => q(dnv),
-      q(2110) => q(dnw),
-      q(2111) => q(dny),
-      q(2112) => q(doa),
-      q(2113) => q(dob),
-      q(2114) => q(doc),
-      q(2115) => q(doe),
-      q(2116) => q(dof),
-      q(2117) => q(doh),
-      q(2118) => q(dok),
-      q(2119) => q(dol),
-      q(2120) => q(don),
-      q(2121) => q(doo),
-      q(2122) => q(dop),
-      q(2123) => q(doq),
-      q(2124) => q(dor),
-      q(2125) => q(dos),
-      q(2126) => q(dot),
-      q(2127) => q(dov),
-      q(2128) => q(dow),
-      q(2129) => q(dox),
-      q(2130) => q(doy),
-      q(2131) => q(doz),
-      q(2132) => q(dpp),
-      q(2133) => q(drb),
-      q(2134) => q(drc),
-      q(2135) => q(drd),
-      q(2136) => q(dre),
-      q(2137) => q(drg),
-      q(2138) => q(dri),
-      q(2139) => q(drl),
-      q(2140) => q(drn),
-      q(2141) => q(dro),
-      q(2142) => q(drq),
-      q(2143) => q(drr),
-      q(2144) => q(drs),
-      q(2145) => q(drt),
-      q(2146) => q(dru),
-      q(2147) => q(dry),
-      q(2148) => q(dse),
-      q(2149) => q(dsh),
-      q(2150) => q(dsi),
-      q(2151) => q(dsl),
-      q(2152) => q(dsn),
-      q(2153) => q(dso),
-      q(2154) => q(dsq),
-      q(2155) => q(dta),
-      q(2156) => q(dtb),
-      q(2157) => q(dtd),
-      q(2158) => q(dth),
-      q(2159) => q(dti),
-      q(2160) => q(dtk),
-      q(2161) => q(dtm),
-      q(2162) => q(dto),
-      q(2163) => q(dtp),
-      q(2164) => q(dtr),
-      q(2165) => q(dts),
-      q(2166) => q(dtt),
-      q(2167) => q(dtu),
-      q(2168) => q(dty),
-      q(2169) => q(dub),
-      q(2170) => q(duc),
-      q(2171) => q(dud),
-      q(2172) => q(due),
-      q(2173) => q(duf),
-      q(2174) => q(dug),
-      q(2175) => q(duh),
-      q(2176) => q(dui),
-      q(2177) => q(duj),
-      q(2178) => q(duk),
-      q(2179) => q(dul),
-      q(2180) => q(dun),
-      q(2181) => q(duo),
-      q(2182) => q(dup),
-      q(2183) => q(duq),
-      q(2184) => q(dur),
-      q(2185) => q(dus),
-      q(2186) => q(duu),
-      q(2187) => q(duv),
-      q(2188) => q(duw),
-      q(2189) => q(dux),
-      q(2190) => q(duy),
-      q(2191) => q(duz),
-      q(2192) => q(dva),
-      q(2193) => q(dwa),
-      q(2194) => q(dwr),
-      q(2195) => q(dws),
-      q(2196) => q(dww),
-      q(2197) => q(dya),
-      q(2198) => q(dyb),
-      q(2199) => q(dyd),
-      q(2200) => q(dyg),
-      q(2201) => q(dyi),
-      q(2202) => q(dym),
-      q(2203) => q(dyn),
-      q(2204) => q(dyo),
-      q(2205) => q(dyy),
-      q(2206) => q(dza),
-      q(2207) => q(dze),
-      q(2208) => q(dzg),
-      q(2209) => q(dzl),
-      q(2210) => q(dzn),
-      q(2211) => q(eaa),
-      q(2212) => q(ebg),
-      q(2213) => q(ebk),
-      q(2214) => q(ebo),
-      q(2215) => q(ebr),
-      q(2216) => q(ebu),
-      q(2217) => q(ecr),
-      q(2218) => q(ecs),
-      q(2219) => q(ecy),
-      q(2220) => q(eee),
-      q(2221) => q(efa),
-      q(2222) => q(efe),
-      q(2223) => q(ega),
-      q(2224) => q(egl),
-      q(2225) => q(ego),
-      q(2226) => q(ehu),
-      q(2227) => q(eip),
-      q(2228) => q(eit),
-      q(2229) => q(eiv),
-      q(2230) => q(eja),
-      q(2231) => q(ekc),
-      q(2232) => q(eke),
-      q(2233) => q(ekg),
-      q(2234) => q(eki),
-      q(2235) => q(ekk),
-      q(2236) => q(ekl),
-      q(2237) => q(ekm),
-      q(2238) => q(eko),
-      q(2239) => q(ekp),
-      q(2240) => q(ekr),
-      q(2241) => q(eky),
-      q(2242) => q(ele),
-      q(2243) => q(elh),
-      q(2244) => q(eli),
-      q(2245) => q(elk),
-      q(2246) => q(elm),
-      q(2247) => q(elo),
-      q(2248) => q(elu),
-      q(2249) => q(ema),
-      q(2250) => q(emb),
-      q(2251) => q(eme),
-      q(2252) => q(emg),
-      q(2253) => q(emi),
-      q(2254) => q(emk),
-      q(2255) => q(emm),
-      q(2256) => q(emn),
-      q(2257) => q(emp),
-      q(2258) => q(ems),
-      q(2259) => q(emu),
-      q(2260) => q(emw),
-      q(2261) => q(emx),
-      q(2262) => q(emy),
-      q(2263) => q(ena),
-      q(2264) => q(enb),
-      q(2265) => q(enc),
-      q(2266) => q(end),
-      q(2267) => q(enf),
-      q(2268) => q(enh),
-      q(2269) => q(enl),
-      q(2270) => q(enn),
-      q(2271) => q(eno),
-      q(2272) => q(enq),
-      q(2273) => q(enr),
-      q(2274) => q(enu),
-      q(2275) => q(env),
-      q(2276) => q(enw),
-      q(2277) => q(enx),
-      q(2278) => q(eot),
-      q(2279) => q(epi),
-      q(2280) => q(era),
-      q(2281) => q(erg),
-      q(2282) => q(erh),
-      q(2283) => q(eri),
-      q(2284) => q(erk),
-      q(2285) => q(ero),
-      q(2286) => q(err),
-      q(2287) => q(ers),
-      q(2288) => q(ert),
-      q(2289) => q(erw),
-      q(2290) => q(ese),
-      q(2291) => q(esh),
-      q(2292) => q(esi),
-      q(2293) => q(esk),
-      q(2294) => q(esl),
-      q(2295) => q(esm),
-      q(2296) => q(esn),
-      q(2297) => q(eso),
-      q(2298) => q(esq),
-      q(2299) => q(ess),
-      q(2300) => q(esu),
-      q(2301) => q(esy),
-      q(2302) => q(etb),
-      q(2303) => q(etc),
-      q(2304) => q(eth),
-      q(2305) => q(etn),
-      q(2306) => q(eto),
-      q(2307) => q(etr),
-      q(2308) => q(ets),
-      q(2309) => q(ett),
-      q(2310) => q(etu),
-      q(2311) => q(etx),
-      q(2312) => q(etz),
-      q(2313) => q(eve),
-      q(2314) => q(evh),
-      q(2315) => q(evn),
-      q(2316) => q(ext),
-      q(2317) => q(eya),
-      q(2318) => q(eyo),
-      q(2319) => q(eza),
-      q(2320) => q(eze),
-      q(2321) => q(faa),
-      q(2322) => q(fab),
-      q(2323) => q(fad),
-      q(2324) => q(faf),
-      q(2325) => q(fag),
-      q(2326) => q(fah),
-      q(2327) => q(fai),
-      q(2328) => q(faj),
-      q(2329) => q(fak),
-      q(2330) => q(fal),
-      q(2331) => q(fam),
-      q(2332) => q(fap),
-      q(2333) => q(far),
-      q(2334) => q(fau),
-      q(2335) => q(fax),
-      q(2336) => q(fay),
-      q(2337) => q(faz),
-      q(2338) => q(fbl),
-      q(2339) => q(fcs),
-      q(2340) => q(fer),
-      q(2341) => q(ffi),
-      q(2342) => q(ffm),
-      q(2343) => q(fgr),
-      q(2344) => q(fia),
-      q(2345) => q(fie),
-      q(2346) => q(fip),
-      q(2347) => q(fir),
-      q(2348) => q(fit),
-      q(2349) => q(fiw),
-      q(2350) => q(fkk),
-      q(2351) => q(fkv),
-      q(2352) => q(fla),
-      q(2353) => q(flh),
-      q(2354) => q(fli),
-      q(2355) => q(fll),
-      q(2356) => q(fln),
-      q(2357) => q(flr),
-      q(2358) => q(fly),
-      q(2359) => q(fmp),
-      q(2360) => q(fmu),
-      q(2361) => q(fng),
-      q(2362) => q(fni),
-      q(2363) => q(fod),
-      q(2364) => q(foi),
-      q(2365) => q(fom),
-      q(2366) => q(for),
-      q(2367) => q(fos),
-      q(2368) => q(fpe),
-      q(2369) => q(fqs),
-      q(2370) => q(frc),
-      q(2371) => q(frd),
-      q(2372) => q(frk),
-      q(2373) => q(frp),
-      q(2374) => q(frq),
-      q(2375) => q(frt),
-      q(2376) => q(fse),
-      q(2377) => q(fsl),
-      q(2378) => q(fss),
-      q(2379) => q(fub),
-      q(2380) => q(fuc),
-      q(2381) => q(fud),
-      q(2382) => q(fue),
-      q(2383) => q(fuf),
-      q(2384) => q(fuh),
-      q(2385) => q(fui),
-      q(2386) => q(fuj),
-      q(2387) => q(fum),
-      q(2388) => q(fun),
-      q(2389) => q(fuq),
-      q(2390) => q(fut),
-      q(2391) => q(fuu),
-      q(2392) => q(fuv),
-      q(2393) => q(fuy),
-      q(2394) => q(fvr),
-      q(2395) => q(fwa),
-      q(2396) => q(fwe),
-      q(2397) => q(gab),
-      q(2398) => q(gac),
-      q(2399) => q(gad),
-      q(2400) => q(gae),
-      q(2401) => q(gaf),
-      q(2402) => q(gag),
-      q(2403) => q(gah),
-      q(2404) => q(gai),
-      q(2405) => q(gaj),
-      q(2406) => q(gak),
-      q(2407) => q(gal),
-      q(2408) => q(gam),
-      q(2409) => q(gan),
-      q(2410) => q(gao),
-      q(2411) => q(gap),
-      q(2412) => q(gaq),
-      q(2413) => q(gar),
-      q(2414) => q(gas),
-      q(2415) => q(gat),
-      q(2416) => q(gau),
-      q(2417) => q(gaw),
-      q(2418) => q(gax),
-      q(2419) => q(gaz),
-      q(2420) => q(gbb),
-      q(2421) => q(gbd),
-      q(2422) => q(gbe),
-      q(2423) => q(gbf),
-      q(2424) => q(gbg),
-      q(2425) => q(gbh),
-      q(2426) => q(gbi),
-      q(2427) => q(gbj),
-      q(2428) => q(gbk),
-      q(2429) => q(gbl),
-      q(2430) => q(gbm),
-      q(2431) => q(gbn),
-      q(2432) => q(gbo),
-      q(2433) => q(gbp),
-      q(2434) => q(gbq),
-      q(2435) => q(gbr),
-      q(2436) => q(gbs),
-      q(2437) => q(gbu),
-      q(2438) => q(gbv),
-      q(2439) => q(gbw),
-      q(2440) => q(gbx),
-      q(2441) => q(gby),
-      q(2442) => q(gbz),
-      q(2443) => q(gcc),
-      q(2444) => q(gcd),
-      q(2445) => q(gce),
-      q(2446) => q(gcf),
-      q(2447) => q(gcl),
-      q(2448) => q(gcn),
-      q(2449) => q(gcr),
-      q(2450) => q(gct),
-      q(2451) => q(gda),
-      q(2452) => q(gdb),
-      q(2453) => q(gdc),
-      q(2454) => q(gdd),
-      q(2455) => q(gde),
-      q(2456) => q(gdf),
-      q(2457) => q(gdg),
-      q(2458) => q(gdh),
-      q(2459) => q(gdi),
-      q(2460) => q(gdj),
-      q(2461) => q(gdk),
-      q(2462) => q(gdl),
-      q(2463) => q(gdm),
-      q(2464) => q(gdn),
-      q(2465) => q(gdo),
-      q(2466) => q(gdq),
-      q(2467) => q(gdr),
-      q(2468) => q(gds),
-      q(2469) => q(gdt),
-      q(2470) => q(gdu),
-      q(2471) => q(gdx),
-      q(2472) => q(gea),
-      q(2473) => q(geb),
-      q(2474) => q(gec),
-      q(2475) => q(ged),
-      q(2476) => q(geg),
-      q(2477) => q(geh),
-      q(2478) => q(gei),
-      q(2479) => q(gej),
-      q(2480) => q(gek),
-      q(2481) => q(gel),
-      q(2482) => q(geq),
-      q(2483) => q(ges),
-      q(2484) => q(gev),
-      q(2485) => q(gew),
-      q(2486) => q(gex),
-      q(2487) => q(gey),
-      q(2488) => q(gfk),
-      q(2489) => q(gft),
-      q(2490) => q(gga),
-      q(2491) => q(ggb),
-      q(2492) => q(ggd),
-      q(2493) => q(gge),
-      q(2494) => q(ggg),
-      q(2495) => q(ggk),
-      q(2496) => q(ggl),
-      q(2497) => q(ggn),
-      q(2498) => q(ggo),
-      q(2499) => q(ggt),
-      q(2500) => q(ggu),
-      q(2501) => q(ggw),
-      q(2502) => q(gha),
-      q(2503) => q(ghc),
-      q(2504) => q(ghe),
-      q(2505) => q(ghh),
-      q(2506) => q(ghk),
-      q(2507) => q(ghl),
-      q(2508) => q(ghn),
-      q(2509) => q(gho),
-      q(2510) => q(ghr),
-      q(2511) => q(ghs),
-      q(2512) => q(ght),
-      q(2513) => q(gia),
-      q(2514) => q(gib),
-      q(2515) => q(gic),
-      q(2516) => q(gid),
-      q(2517) => q(gig),
-      q(2518) => q(gih),
-      q(2519) => q(gim),
-      q(2520) => q(gin),
-      q(2521) => q(gip),
-      q(2522) => q(giq),
-      q(2523) => q(gir),
-      q(2524) => q(gis),
-      q(2525) => q(git),
-      q(2526) => q(giu),
-      q(2527) => q(giw),
-      q(2528) => q(gix),
-      q(2529) => q(giy),
-      q(2530) => q(giz),
-      q(2531) => q(gji),
-      q(2532) => q(gjk),
-      q(2533) => q(gjm),
-      q(2534) => q(gjn),
-      q(2535) => q(gju),
-      q(2536) => q(gka),
-      q(2537) => q(gke),
-      q(2538) => q(gkn),
-      q(2539) => q(gko),
-      q(2540) => q(gkp),
-      q(2541) => q(gku),
-      q(2542) => q(glc),
-      q(2543) => q(gld),
-      q(2544) => q(glh),
-      q(2545) => q(gli),
-      q(2546) => q(glj),
-      q(2547) => q(glk),
-      q(2548) => q(gll),
-      q(2549) => q(glo),
-      q(2550) => q(glr),
-      q(2551) => q(glu),
-      q(2552) => q(glw),
-      q(2553) => q(gly),
-      q(2554) => q(gma),
-      q(2555) => q(gmb),
-      q(2556) => q(gmd),
-      q(2557) => q(gmg),
-      q(2558) => q(gml),
-      q(2559) => q(gmm),
-      q(2560) => q(gmn),
-      q(2561) => q(gmu),
-      q(2562) => q(gmv),
-      q(2563) => q(gmx),
-      q(2564) => q(gmy),
-      q(2565) => q(gmz),
-      q(2566) => q(gna),
-      q(2567) => q(gnb),
-      q(2568) => q(gnc),
-      q(2569) => q(gnd),
-      q(2570) => q(gne),
-      q(2571) => q(gng),
-      q(2572) => q(gnh),
-      q(2573) => q(gni),
-      q(2574) => q(gnk),
-      q(2575) => q(gnl),
-      q(2576) => q(gnm),
-      q(2577) => q(gnn),
-      q(2578) => q(gno),
-      q(2579) => q(gnq),
+      q(0921) => q(ato),
+      q(0922) => q(atp),
+      q(0923) => q(atq),
+      q(0924) => q(atr),
+      q(0925) => q(ats),
+      q(0926) => q(att),
+      q(0927) => q(atu),
+      q(0928) => q(atv),
+      q(0929) => q(atw),
+      q(0930) => q(atx),
+      q(0931) => q(aty),
+      q(0932) => q(atz),
+      q(0933) => q(aua),
+      q(0934) => q(aub),
+      q(0935) => q(auc),
+      q(0936) => q(aud),
+      q(0937) => q(aug),
+      q(0938) => q(auh),
+      q(0939) => q(aui),
+      q(0940) => q(auj),
+      q(0941) => q(auk),
+      q(0942) => q(aul),
+      q(0943) => q(aum),
+      q(0944) => q(aun),
+      q(0945) => q(auo),
+      q(0946) => q(aup),
+      q(0947) => q(auq),
+      q(0948) => q(aur),
+      q(0949) => q(aut),
+      q(0950) => q(auu),
+      q(0951) => q(auw),
+      q(0952) => q(aux),
+      q(0953) => q(auy),
+      q(0954) => q(auz),
+      q(0955) => q(avb),
+      q(0956) => q(avd),
+      q(0957) => q(avi),
+      q(0958) => q(avk),
+      q(0959) => q(avl),
+      q(0960) => q(avm),
+      q(0961) => q(avn),
+      q(0962) => q(avo),
+      q(0963) => q(avs),
+      q(0964) => q(avt),
+      q(0965) => q(avu),
+      q(0966) => q(avv),
+      q(0967) => q(awb),
+      q(0968) => q(awc),
+      q(0969) => q(awe),
+      q(0970) => q(awg),
+      q(0971) => q(awh),
+      q(0972) => q(awi),
+      q(0973) => q(awk),
+      q(0974) => q(awm),
+      q(0975) => q(awn),
+      q(0976) => q(awo),
+      q(0977) => q(awr),
+      q(0978) => q(aws),
+      q(0979) => q(awt),
+      q(0980) => q(awu),
+      q(0981) => q(awv),
+      q(0982) => q(aww),
+      q(0983) => q(awx),
+      q(0984) => q(awy),
+      q(0985) => q(axb),
+      q(0986) => q(axe),
+      q(0987) => q(axg),
+      q(0988) => q(axk),
+      q(0989) => q(axl),
+      q(0990) => q(axm),
+      q(0991) => q(axx),
+      q(0992) => q(aya),
+      q(0993) => q(ayb),
+      q(0994) => q(ayc),
+      q(0995) => q(ayd),
+      q(0996) => q(aye),
+      q(0997) => q(ayg),
+      q(0998) => q(ayh),
+      q(0999) => q(ayi),
+      q(1000) => q(ayk),
+      q(1001) => q(ayl),
+      q(1002) => q(ayn),
+      q(1003) => q(ayo),
+      q(1004) => q(ayp),
+      q(1005) => q(ayq),
+      q(1006) => q(ayr),
+      q(1007) => q(ays),
+      q(1008) => q(ayt),
+      q(1009) => q(ayu),
+      q(1010) => q(ayy),
+      q(1011) => q(ayz),
+      q(1012) => q(aza),
+      q(1013) => q(azb),
+      q(1014) => q(azd),
+      q(1015) => q(azg),
+      q(1016) => q(azj),
+      q(1017) => q(azm),
+      q(1018) => q(azn),
+      q(1019) => q(azo),
+      q(1020) => q(azt),
+      q(1021) => q(azz),
+      q(1022) => q(baa),
+      q(1023) => q(bab),
+      q(1024) => q(bac),
+      q(1025) => q(bae),
+      q(1026) => q(baf),
+      q(1027) => q(bag),
+      q(1028) => q(bah),
+      q(1029) => q(baj),
+      q(1030) => q(bao),
+      q(1031) => q(bap),
+      q(1032) => q(bar),
+      q(1033) => q(bau),
+      q(1034) => q(bav),
+      q(1035) => q(baw),
+      q(1036) => q(bax),
+      q(1037) => q(bay),
+      q(1038) => q(bba),
+      q(1039) => q(bbb),
+      q(1040) => q(bbc),
+      q(1041) => q(bbd),
+      q(1042) => q(bbe),
+      q(1043) => q(bbf),
+      q(1044) => q(bbg),
+      q(1045) => q(bbh),
+      q(1046) => q(bbi),
+      q(1047) => q(bbj),
+      q(1048) => q(bbk),
+      q(1049) => q(bbl),
+      q(1050) => q(bbm),
+      q(1051) => q(bbn),
+      q(1052) => q(bbo),
+      q(1053) => q(bbp),
+      q(1054) => q(bbq),
+      q(1055) => q(bbr),
+      q(1056) => q(bbs),
+      q(1057) => q(bbt),
+      q(1058) => q(bbu),
+      q(1059) => q(bbv),
+      q(1060) => q(bbw),
+      q(1061) => q(bbx),
+      q(1062) => q(bby),
+      q(1063) => q(bbz),
+      q(1064) => q(bca),
+      q(1065) => q(bcb),
+      q(1066) => q(bcc),
+      q(1067) => q(bcd),
+      q(1068) => q(bce),
+      q(1069) => q(bcf),
+      q(1070) => q(bcg),
+      q(1071) => q(bch),
+      q(1072) => q(bci),
+      q(1073) => q(bcj),
+      q(1074) => q(bck),
+      q(1075) => q(bcl),
+      q(1076) => q(bcm),
+      q(1077) => q(bcn),
+      q(1078) => q(bco),
+      q(1079) => q(bcp),
+      q(1080) => q(bcq),
+      q(1081) => q(bcr),
+      q(1082) => q(bcs),
+      q(1083) => q(bct),
+      q(1084) => q(bcu),
+      q(1085) => q(bcv),
+      q(1086) => q(bcw),
+      q(1087) => q(bcy),
+      q(1088) => q(bcz),
+      q(1089) => q(bda),
+      q(1090) => q(bdb),
+      q(1091) => q(bdc),
+      q(1092) => q(bdd),
+      q(1093) => q(bde),
+      q(1094) => q(bdf),
+      q(1095) => q(bdg),
+      q(1096) => q(bdh),
+      q(1097) => q(bdi),
+      q(1098) => q(bdj),
+      q(1099) => q(bdk),
+      q(1100) => q(bdl),
+      q(1101) => q(bdm),
+      q(1102) => q(bdn),
+      q(1103) => q(bdo),
+      q(1104) => q(bdp),
+      q(1105) => q(bdq),
+      q(1106) => q(bdr),
+      q(1107) => q(bds),
+      q(1108) => q(bdt),
+      q(1109) => q(bdu),
+      q(1110) => q(bdv),
+      q(1111) => q(bdw),
+      q(1112) => q(bdx),
+      q(1113) => q(bdy),
+      q(1114) => q(bdz),
+      q(1115) => q(bea),
+      q(1116) => q(beb),
+      q(1117) => q(bec),
+      q(1118) => q(bed),
+      q(1119) => q(bee),
+      q(1120) => q(bef),
+      q(1121) => q(beg),
+      q(1122) => q(beh),
+      q(1123) => q(bei),
+      q(1124) => q(bek),
+      q(1125) => q(beo),
+      q(1126) => q(bep),
+      q(1127) => q(beq),
+      q(1128) => q(bes),
+      q(1129) => q(bet),
+      q(1130) => q(beu),
+      q(1131) => q(bev),
+      q(1132) => q(bew),
+      q(1133) => q(bex),
+      q(1134) => q(bey),
+      q(1135) => q(bez),
+      q(1136) => q(mot),
+      q(1137) => q(bfb),
+      q(1138) => q(bfc),
+      q(1139) => q(bfd),
+      q(1140) => q(bfe),
+      q(1141) => q(bff),
+      q(1142) => q(bfg),
+      q(1143) => q(bfh),
+      q(1144) => q(bfi),
+      q(1145) => q(bfj),
+      q(1146) => q(bfk),
+      q(1147) => q(bfl),
+      q(1148) => q(bfm),
+      q(1149) => q(bfn),
+      q(1150) => q(bfo),
+      q(1151) => q(bfp),
+      q(1152) => q(bfq),
+      q(1153) => q(bfr),
+      q(1154) => q(bfs),
+      q(1155) => q(bft),
+      q(1156) => q(bfu),
+      q(1157) => q(bfw),
+      q(1158) => q(bfx),
+      q(1159) => q(bfy),
+      q(1160) => q(bfz),
+      q(1161) => q(bga),
+      q(1162) => q(bgb),
+      q(1163) => q(bgc),
+      q(1164) => q(bgd),
+      q(1165) => q(bge),
+      q(1166) => q(bgf),
+      q(1167) => q(bgg),
+      q(1168) => q(bgi),
+      q(1169) => q(bgj),
+      q(1170) => q(bgk),
+      q(1171) => q(bgl),
+      q(1172) => q(bgm),
+      q(1173) => q(bgn),
+      q(1174) => q(bgo),
+      q(1175) => q(bgp),
+      q(1176) => q(bgq),
+      q(1177) => q(bgr),
+      q(1178) => q(bgs),
+      q(1179) => q(bgt),
+      q(1180) => q(bgu),
+      q(1181) => q(bgv),
+      q(1182) => q(bgw),
+      q(1183) => q(bgx),
+      q(1184) => q(bgy),
+      q(1185) => q(bgz),
+      q(1186) => q(bha),
+      q(1187) => q(bhb),
+      q(1188) => q(bhc),
+      q(1189) => q(bhd),
+      q(1190) => q(bhe),
+      q(1191) => q(bhf),
+      q(1192) => q(bhg),
+      q(1193) => q(bhh),
+      q(1194) => q(bhi),
+      q(1195) => q(bhj),
+      q(1196) => q(bhl),
+      q(1197) => q(bhm),
+      q(1198) => q(bhn),
+      q(1199) => q(bhp),
+      q(1200) => q(bhq),
+      q(1201) => q(bhr),
+      q(1202) => q(bhs),
+      q(1203) => q(bht),
+      q(1204) => q(bhu),
+      q(1205) => q(bhv),
+      q(1206) => q(bhw),
+      q(1207) => q(bhx),
+      q(1208) => q(bhy),
+      q(1209) => q(bhz),
+      q(1210) => q(bia),
+      q(1211) => q(bib),
+      q(1212) => q(bic),
+      q(1213) => q(bid),
+      q(1214) => q(bie),
+      q(1215) => q(bif),
+      q(1216) => q(big),
+      q(1217) => q(bij),
+      q(1218) => q(bil),
+      q(1219) => q(bim),
+      q(1220) => q(bio),
+      q(1221) => q(bip),
+      q(1222) => q(biq),
+      q(1223) => q(bir),
+      q(1224) => q(bit),
+      q(1225) => q(biu),
+      q(1226) => q(biv),
+      q(1227) => q(biw),
+      q(1228) => q(bix),
+      q(1229) => q(biy),
+      q(1230) => q(biz),
+      q(1231) => q(bja),
+      q(1232) => q(bjb),
+      q(1233) => q(bjc),
+      q(1234) => q(bje),
+      q(1235) => q(bjf),
+      q(1236) => q(bjg),
+      q(1237) => q(bjh),
+      q(1238) => q(bji),
+      q(1239) => q(bjj),
+      q(1240) => q(bjk),
+      q(1241) => q(bjl),
+      q(1242) => q(bjm),
+      q(1243) => q(bjn),
+      q(1244) => q(bjo),
+      q(1245) => q(bjp),
+      q(1246) => q(bjr),
+      q(1247) => q(bjs),
+      q(1248) => q(bjt),
+      q(1249) => q(bju),
+      q(1250) => q(bjv),
+      q(1251) => q(bjw),
+      q(1252) => q(bjx),
+      q(1253) => q(bjy),
+      q(1254) => q(bjz),
+      q(1255) => q(bka),
+      q(1256) => q(bkc),
+      q(1257) => q(bkd),
+      q(1258) => q(bkf),
+      q(1259) => q(bkg),
+      q(1260) => q(bkh),
+      q(1261) => q(bki),
+      q(1262) => q(bkj),
+      q(1263) => q(bkk),
+      q(1264) => q(bkl),
+      q(1265) => q(bkm),
+      q(1266) => q(bkn),
+      q(1267) => q(bko),
+      q(1268) => q(bkp),
+      q(1269) => q(bkq),
+      q(1270) => q(bkr),
+      q(1271) => q(bks),
+      q(1272) => q(bkt),
+      q(1273) => q(bku),
+      q(1274) => q(bkv),
+      q(1275) => q(bkw),
+      q(1276) => q(bkx),
+      q(1277) => q(bky),
+      q(1278) => q(bkz),
+      q(1279) => q(blb),
+      q(1280) => q(blc),
+      q(1281) => q(bld),
+      q(1282) => q(ble),
+      q(1283) => q(blf),
+      q(1284) => q(blg),
+      q(1285) => q(blh),
+      q(1286) => q(bli),
+      q(1287) => q(blj),
+      q(1288) => q(blk),
+      q(1289) => q(bll),
+      q(1290) => q(blm),
+      q(1291) => q(bln),
+      q(1292) => q(blo),
+      q(1293) => q(blp),
+      q(1294) => q(blq),
+      q(1295) => q(blr),
+      q(1296) => q(bls),
+      q(1297) => q(blt),
+      q(1298) => q(blv),
+      q(1299) => q(blw),
+      q(1300) => q(blx),
+      q(1301) => q(bly),
+      q(1302) => q(blz),
+      q(1303) => q(bma),
+      q(1304) => q(bmb),
+      q(1305) => q(bmc),
+      q(1306) => q(bmd),
+      q(1307) => q(bme),
+      q(1308) => q(bmf),
+      q(1309) => q(bmg),
+      q(1310) => q(bmh),
+      q(1311) => q(bmi),
+      q(1312) => q(bmj),
+      q(1313) => q(bmk),
+      q(1314) => q(bml),
+      q(1315) => q(bmm),
+      q(1316) => q(bmn),
+      q(1317) => q(bmo),
+      q(1318) => q(bmp),
+      q(1319) => q(bmq),
+      q(1320) => q(bmr),
+      q(1321) => q(bms),
+      q(1322) => q(bmt),
+      q(1323) => q(bmu),
+      q(1324) => q(bmv),
+      q(1325) => q(bmw),
+      q(1326) => q(bmx),
+      q(1327) => q(bmz),
+      q(1328) => q(bna),
+      q(1329) => q(bnb),
+      q(1330) => q(bnc),
+      q(1331) => q(bnd),
+      q(1332) => q(bne),
+      q(1333) => q(bnf),
+      q(1334) => q(bng),
+      q(1335) => q(bni),
+      q(1336) => q(bnj),
+      q(1337) => q(bnk),
+      q(1338) => q(bnl),
+      q(1339) => q(bnm),
+      q(1340) => q(bnn),
+      q(1341) => q(bno),
+      q(1342) => q(bnp),
+      q(1343) => q(bnq),
+      q(1344) => q(bnr),
+      q(1345) => q(bns),
+      q(1346) => q(bnu),
+      q(1347) => q(bnv),
+      q(1348) => q(bnw),
+      q(1349) => q(bnx),
+      q(1350) => q(bny),
+      q(1351) => q(bnz),
+      q(1352) => q(boa),
+      q(1353) => q(bob),
+      q(1354) => q(boe),
+      q(1355) => q(bof),
+      q(1356) => q(bog),
+      q(1357) => q(boh),
+      q(1358) => q(boi),
+      q(1359) => q(boj),
+      q(1360) => q(bok),
+      q(1361) => q(bol),
+      q(1362) => q(bom),
+      q(1363) => q(bon),
+      q(1364) => q(boo),
+      q(1365) => q(bop),
+      q(1366) => q(boq),
+      q(1367) => q(bor),
+      q(1368) => q(bot),
+      q(1369) => q(bou),
+      q(1370) => q(bov),
+      q(1371) => q(bow),
+      q(1372) => q(box),
+      q(1373) => q(boy),
+      q(1374) => q(boz),
+      q(1375) => q(bpa),
+      q(1376) => q(bpb),
+      q(1377) => q(bpd),
+      q(1378) => q(bpg),
+      q(1379) => q(bph),
+      q(1380) => q(bpi),
+      q(1381) => q(bpj),
+      q(1382) => q(bpk),
+      q(1383) => q(bpl),
+      q(1384) => q(bpm),
+      q(1385) => q(bpn),
+      q(1386) => q(bpo),
+      q(1387) => q(bpp),
+      q(1388) => q(bpq),
+      q(1389) => q(bpr),
+      q(1390) => q(bps),
+      q(1391) => q(bpt),
+      q(1392) => q(bpu),
+      q(1393) => q(bpv),
+      q(1394) => q(bpw),
+      q(1395) => q(bpx),
+      q(1396) => q(bpy),
+      q(1397) => q(bpz),
+      q(1398) => q(bqa),
+      q(1399) => q(bqb),
+      q(1400) => q(bqc),
+      q(1401) => q(bqd),
+      q(1402) => q(bqf),
+      q(1403) => q(bqg),
+      q(1404) => q(bqh),
+      q(1405) => q(bqi),
+      q(1406) => q(bqj),
+      q(1407) => q(bqk),
+      q(1408) => q(bql),
+      q(1409) => q(bqm),
+      q(1410) => q(bqn),
+      q(1411) => q(bqo),
+      q(1412) => q(bqp),
+      q(1413) => q(bqq),
+      q(1414) => q(bqr),
+      q(1415) => q(bqs),
+      q(1416) => q(bqt),
+      q(1417) => q(bqu),
+      q(1418) => q(bqv),
+      q(1419) => q(bqw),
+      q(1420) => q(bqx),
+      q(1421) => q(bqy),
+      q(1422) => q(bqz),
+      q(1423) => q(brb),
+      q(1424) => q(brc),
+      q(1425) => q(brd),
+      q(1426) => q(brf),
+      q(1427) => q(brg),
+      q(1428) => q(brh),
+      q(1429) => q(bri),
+      q(1430) => q(brj),
+      q(1431) => q(brk),
+      q(1432) => q(brl),
+      q(1433) => q(brm),
+      q(1434) => q(brn),
+      q(1435) => q(bro),
+      q(1436) => q(brp),
+      q(1437) => q(brq),
+      q(1438) => q(brr),
+      q(1439) => q(brs),
+      q(1440) => q(brt),
+      q(1441) => q(bru),
+      q(1442) => q(brv),
+      q(1443) => q(brw),
+      q(1444) => q(brx),
+      q(1445) => q(bry),
+      q(1446) => q(brz),
+      q(1447) => q(bsa),
+      q(1448) => q(bsb),
+      q(1449) => q(bsc),
+      q(1450) => q(bse),
+      q(1451) => q(bsf),
+      q(1452) => q(bsg),
+      q(1453) => q(bsh),
+      q(1454) => q(bsi),
+      q(1455) => q(bsj),
+      q(1456) => q(bsk),
+      q(1457) => q(bsl),
+      q(1458) => q(bsm),
+      q(1459) => q(bsn),
+      q(1460) => q(bso),
+      q(1461) => q(bsp),
+      q(1462) => q(bsq),
+      q(1463) => q(bsr),
+      q(1464) => q(bss),
+      q(1465) => q(bst),
+      q(1466) => q(bsu),
+      q(1467) => q(bsv),
+      q(1468) => q(bsw),
+      q(1469) => q(bsx),
+      q(1470) => q(bsy),
+      q(1471) => q(bta),
+      q(1472) => q(btc),
+      q(1473) => q(btd),
+      q(1474) => q(bte),
+      q(1475) => q(btf),
+      q(1476) => q(btg),
+      q(1477) => q(bth),
+      q(1478) => q(bti),
+      q(1479) => q(btj),
+      q(1480) => q(btl),
+      q(1481) => q(btm),
+      q(1482) => q(btn),
+      q(1483) => q(bto),
+      q(1484) => q(btp),
+      q(1485) => q(btq),
+      q(1486) => q(btr),
+      q(1487) => q(bts),
+      q(1488) => q(btt),
+      q(1489) => q(btu),
+      q(1490) => q(btv),
+      q(1491) => q(btw),
+      q(1492) => q(btx),
+      q(1493) => q(bty),
+      q(1494) => q(btz),
+      q(1495) => q(bub),
+      q(1496) => q(buc),
+      q(1497) => q(bud),
+      q(1498) => q(bue),
+      q(1499) => q(buf),
+      q(1500) => q(buh),
+      q(1501) => q(bui),
+      q(1502) => q(buj),
+      q(1503) => q(buk),
+      q(1504) => q(bum),
+      q(1505) => q(bun),
+      q(1506) => q(buo),
+      q(1507) => q(bup),
+      q(1508) => q(buq),
+      q(1509) => q(bus),
+      q(1510) => q(but),
+      q(1511) => q(buu),
+      q(1512) => q(buv),
+      q(1513) => q(buw),
+      q(1514) => q(bux),
+      q(1515) => q(buy),
+      q(1516) => q(buz),
+      q(1517) => q(bva),
+      q(1518) => q(bvb),
+      q(1519) => q(bvc),
+      q(1520) => q(bvd),
+      q(1521) => q(bve),
+      q(1522) => q(bvf),
+      q(1523) => q(bvg),
+      q(1524) => q(bvh),
+      q(1525) => q(bvi),
+      q(1526) => q(bvj),
+      q(1527) => q(bvk),
+      q(1528) => q(bvl),
+      q(1529) => q(bvm),
+      q(1530) => q(bvn),
+      q(1531) => q(bvo),
+      q(1532) => q(bvp),
+      q(1533) => q(bvq),
+      q(1534) => q(bvr),
+      q(1535) => q(bvt),
+      q(1536) => q(bvu),
+      q(1537) => q(bvv),
+      q(1538) => q(bvw),
+      q(1539) => q(bvx),
+      q(1540) => q(bvy),
+      q(1541) => q(bvz),
+      q(1542) => q(bwa),
+      q(1543) => q(bwb),
+      q(1544) => q(bwc),
+      q(1545) => q(bwd),
+      q(1546) => q(bwe),
+      q(1547) => q(bwf),
+      q(1548) => q(bwg),
+      q(1549) => q(bwh),
+      q(1550) => q(bwi),
+      q(1551) => q(bwj),
+      q(1552) => q(bwk),
+      q(1553) => q(bwl),
+      q(1554) => q(bwm),
+      q(1555) => q(bwn),
+      q(1556) => q(bwo),
+      q(1557) => q(bwp),
+      q(1558) => q(bwq),
+      q(1559) => q(bwr),
+      q(1560) => q(bws),
+      q(1561) => q(bwt),
+      q(1562) => q(bwu),
+      q(1563) => q(bww),
+      q(1564) => q(bwx),
+      q(1565) => q(bwy),
+      q(1566) => q(bwz),
+      q(1567) => q(bxa),
+      q(1568) => q(bxb),
+      q(1569) => q(bxc),
+      q(1570) => q(bxd),
+      q(1571) => q(bxe),
+      q(1572) => q(bxf),
+      q(1573) => q(bxg),
+      q(1574) => q(bxh),
+      q(1575) => q(bxi),
+      q(1576) => q(bxj),
+      q(1577) => q(bxk),
+      q(1578) => q(bxl),
+      q(1579) => q(bxm),
+      q(1580) => q(bxn),
+      q(1581) => q(bxo),
+      q(1582) => q(bxp),
+      q(1583) => q(bxq),
+      q(1584) => q(bxr),
+      q(1585) => q(bxs),
+      q(1586) => q(bxu),
+      q(1587) => q(bxv),
+      q(1588) => q(bxw),
+      q(1589) => q(bxz),
+      q(1590) => q(bya),
+      q(1591) => q(byb),
+      q(1592) => q(byc),
+      q(1593) => q(byd),
+      q(1594) => q(bye),
+      q(1595) => q(byf),
+      q(1596) => q(byg),
+      q(1597) => q(byh),
+      q(1598) => q(byi),
+      q(1599) => q(byj),
+      q(1600) => q(byk),
+      q(1601) => q(byl),
+      q(1602) => q(bym),
+      q(1603) => q(byo),
+      q(1604) => q(byp),
+      q(1605) => q(byq),
+      q(1606) => q(byr),
+      q(1607) => q(bys),
+      q(1608) => q(byt),
+      q(1609) => q(byv),
+      q(1610) => q(byw),
+      q(1611) => q(byx),
+      q(1612) => q(byz),
+      q(1613) => q(bza),
+      q(1614) => q(bzb),
+      q(1615) => q(bzc),
+      q(1616) => q(bzd),
+      q(1617) => q(bze),
+      q(1618) => q(bzf),
+      q(1619) => q(bzg),
+      q(1620) => q(bzh),
+      q(1621) => q(bzi),
+      q(1622) => q(bzj),
+      q(1623) => q(bzk),
+      q(1624) => q(bzl),
+      q(1625) => q(bzm),
+      q(1626) => q(bzn),
+      q(1627) => q(bzo),
+      q(1628) => q(bzp),
+      q(1629) => q(bzq),
+      q(1630) => q(bzr),
+      q(1631) => q(bzs),
+      q(1632) => q(bzt),
+      q(1633) => q(bzu),
+      q(1634) => q(bzv),
+      q(1635) => q(bzw),
+      q(1636) => q(bzx),
+      q(1637) => q(bzy),
+      q(1638) => q(bzz),
+      q(1639) => q(caa),
+      q(1640) => q(cab),
+      q(1641) => q(cac),
+      q(1642) => q(cae),
+      q(1643) => q(caf),
+      q(1644) => q(cag),
+      q(1645) => q(cah),
+      q(1646) => q(caj),
+      q(1647) => q(cak),
+      q(1648) => q(cal),
+      q(1649) => q(cam),
+      q(1650) => q(can),
+      q(1651) => q(cao),
+      q(1652) => q(cap),
+      q(1653) => q(caq),
+      q(1654) => q(cas),
+      q(1655) => q(cav),
+      q(1656) => q(caw),
+      q(1657) => q(cax),
+      q(1658) => q(cay),
+      q(1659) => q(caz),
+      q(1660) => q(cbb),
+      q(1661) => q(cbc),
+      q(1662) => q(cbd),
+      q(1663) => q(cbe),
+      q(1664) => q(cbg),
+      q(1665) => q(cbh),
+      q(1666) => q(cbi),
+      q(1667) => q(cbj),
+      q(1668) => q(cbk),
+      q(1669) => q(cbl),
+      q(1670) => q(cbn),
+      q(1671) => q(cbo),
+      q(1672) => q(cbq),
+      q(1673) => q(cbr),
+      q(1674) => q(cbs),
+      q(1675) => q(cbt),
+      q(1676) => q(cbu),
+      q(1677) => q(cbv),
+      q(1678) => q(cbw),
+      q(1679) => q(cby),
+      q(1680) => q(cca),
+      q(1681) => q(ccc),
+      q(1682) => q(ccd),
+      q(1683) => q(cce),
+      q(1684) => q(ccg),
+      q(1685) => q(cch),
+      q(1686) => q(ccj),
+      q(1687) => q(ccl),
+      q(1688) => q(ccm),
+      q(1689) => q(cco),
+      q(1690) => q(ccp),
+      q(1691) => q(ccr),
+      q(1692) => q(cda),
+      q(1693) => q(cde),
+      q(1694) => q(cdf),
+      q(1695) => q(cdg),
+      q(1696) => q(cdh),
+      q(1697) => q(cdi),
+      q(1698) => q(cdj),
+      q(1699) => q(cdm),
+      q(1700) => q(cdn),
+      q(1701) => q(cdo),
+      q(1702) => q(cdr),
+      q(1703) => q(cds),
+      q(1704) => q(cdy),
+      q(1705) => q(cdz),
+      q(1706) => q(cea),
+      q(1707) => q(ceg),
+      q(1708) => q(cek),
+      q(1709) => q(cen),
+      q(1710) => q(cet),
+      q(1711) => q(cfa),
+      q(1712) => q(cfd),
+      q(1713) => q(cfg),
+      q(1714) => q(cfm),
+      q(1715) => q(cga),
+      q(1716) => q(cgc),
+      q(1717) => q(cgg),
+      q(1718) => q(cgk),
+      q(1719) => q(chc),
+      q(1720) => q(chd),
+      q(1721) => q(chf),
+      q(1722) => q(chh),
+      q(1723) => q(chj),
+      q(1724) => q(chl),
+      q(1725) => q(chq),
+      q(1726) => q(cht),
+      q(1727) => q(chw),
+      q(1728) => q(chx),
+      q(1729) => q(chz),
+      q(1730) => q(cia),
+      q(1731) => q(cib),
+      q(1732) => q(cic),
+      q(1733) => q(cid),
+      q(1734) => q(cie),
+      q(1735) => q(cih),
+      q(1736) => q(cik),
+      q(1737) => q(cim),
+      q(1738) => q(cin),
+      q(1739) => q(cip),
+      q(1740) => q(cir),
+      q(1741) => q(ciw),
+      q(1742) => q(ciy),
+      q(1743) => q(cja),
+      q(1744) => q(cje),
+      q(1745) => q(cjh),
+      q(1746) => q(cji),
+      q(1747) => q(cjk),
+      q(1748) => q(cjm),
+      q(1749) => q(cjn),
+      q(1750) => q(cjo),
+      q(1751) => q(cjp),
+      q(1752) => q(cjs),
+      q(1753) => q(cjv),
+      q(1754) => q(cjy),
+      q(1755) => q(ckb),
+      q(1756) => q(ckh),
+      q(1757) => q(ckl),
+      q(1758) => q(ckn),
+      q(1759) => q(cko),
+      q(1760) => q(ckq),
+      q(1761) => q(ckr),
+      q(1762) => q(cks),
+      q(1763) => q(ckt),
+      q(1764) => q(cku),
+      q(1765) => q(ckv),
+      q(1766) => q(ckx),
+      q(1767) => q(cky),
+      q(1768) => q(ckz),
+      q(1769) => q(cla),
+      q(1770) => q(clc),
+      q(1771) => q(cld),
+      q(1772) => q(cle),
+      q(1773) => q(clh),
+      q(1774) => q(cli),
+      q(1775) => q(clj),
+      q(1776) => q(clk),
+      q(1777) => q(cll),
+      q(1778) => q(clm),
+      q(1779) => q(clo),
+      q(1780) => q(clt),
+      q(1781) => q(clu),
+      q(1782) => q(clw),
+      q(1783) => q(cly),
+      q(1784) => q(cma),
+      q(1785) => q(cme),
+      q(1786) => q(cmg),
+      q(1787) => q(cmi),
+      q(1788) => q(cml),
+      q(1789) => q(cmm),
+      q(1790) => q(cmn),
+      q(1791) => q(cmo),
+      q(1792) => q(cmr),
+      q(1793) => q(cms),
+      q(1794) => q(cmt),
+      q(1795) => q(cna),
+      q(1796) => q(cnb),
+      q(1797) => q(cnc),
+      q(1798) => q(cng),
+      q(1799) => q(cnh),
+      q(1800) => q(cni),
+      q(1801) => q(cnk),
+      q(1802) => q(cnl),
+      q(1803) => q(cno),
+      q(1804) => q(cns),
+      q(1805) => q(cnt),
+      q(1806) => q(cnu),
+      q(1807) => q(cnw),
+      q(1808) => q(cnx),
+      q(1809) => q(coa),
+      q(1810) => q(cob),
+      q(1811) => q(coc),
+      q(1812) => q(cod),
+      q(1813) => q(coe),
+      q(1814) => q(cof),
+      q(1815) => q(cog),
+      q(1816) => q(coh),
+      q(1817) => q(coj),
+      q(1818) => q(cok),
+      q(1819) => q(col),
+      q(1820) => q(com),
+      q(1821) => q(con),
+      q(1822) => q(coo),
+      q(1823) => q(coq),
+      q(1824) => q(cot),
+      q(1825) => q(cou),
+      q(1826) => q(cov),
+      q(1827) => q(cow),
+      q(1828) => q(cox),
+      q(1829) => q(coy),
+      q(1830) => q(coz),
+      q(1831) => q(cpa),
+      q(1832) => q(cpb),
+      q(1833) => q(cpc),
+      q(1834) => q(cpg),
+      q(1835) => q(cpi),
+      q(1836) => q(cpn),
+      q(1837) => q(cpo),
+      q(1838) => q(cps),
+      q(1839) => q(cpu),
+      q(1840) => q(cpx),
+      q(1841) => q(cpy),
+      q(1842) => q(cqd),
+      q(1843) => q(cqu),
+      q(1844) => q(cra),
+      q(1845) => q(crb),
+      q(1846) => q(crc),
+      q(1847) => q(crd),
+      q(1848) => q(crf),
+      q(1849) => q(crg),
+      q(1850) => q(cri),
+      q(1851) => q(crj),
+      q(1852) => q(crk),
+      q(1853) => q(crl),
+      q(1854) => q(crm),
+      q(1855) => q(crn),
+      q(1856) => q(cro),
+      q(1857) => q(crq),
+      q(1858) => q(crr),
+      q(1859) => q(crs),
+      q(1860) => q(crt),
+      q(1861) => q(crv),
+      q(1862) => q(crw),
+      q(1863) => q(crx),
+      q(1864) => q(cry),
+      q(1865) => q(crz),
+      q(1866) => q(csa),
+      q(1867) => q(csc),
+      q(1868) => q(csd),
+      q(1869) => q(cse),
+      q(1870) => q(csf),
+      q(1871) => q(csg),
+      q(1872) => q(csh),
+      q(1873) => q(csi),
+      q(1874) => q(csj),
+      q(1875) => q(csk),
+      q(1876) => q(csl),
+      q(1877) => q(csm),
+      q(1878) => q(csn),
+      q(1879) => q(cso),
+      q(1880) => q(csq),
+      q(1881) => q(csr),
+      q(1882) => q(css),
+      q(1883) => q(cst),
+      q(1884) => q(csv),
+      q(1885) => q(csw),
+      q(1886) => q(csy),
+      q(1887) => q(csz),
+      q(1888) => q(cta),
+      q(1889) => q(ctc),
+      q(1890) => q(ctd),
+      q(1891) => q(cte),
+      q(1892) => q(ctg),
+      q(1893) => q(cth),
+      q(1894) => q(ctl),
+      q(1895) => q(ctm),
+      q(1896) => q(ctn),
+      q(1897) => q(cto),
+      q(1898) => q(ctp),
+      q(1899) => q(cts),
+      q(1900) => q(ctt),
+      q(1901) => q(ctu),
+      q(1902) => q(ctz),
+      q(1903) => q(cua),
+      q(1904) => q(cub),
+      q(1905) => q(cuc),
+      q(1906) => q(cug),
+      q(1907) => q(cuh),
+      q(1908) => q(cui),
+      q(1909) => q(cuj),
+      q(1910) => q(cuk),
+      q(1911) => q(cul),
+      q(1912) => q(cum),
+      q(1913) => q(cuo),
+      q(1914) => q(cup),
+      q(1915) => q(cuq),
+      q(1916) => q(cur),
+      q(1917) => q(cut),
+      q(1918) => q(cuu),
+      q(1919) => q(cuv),
+      q(1920) => q(cuw),
+      q(1921) => q(cux),
+      q(1922) => q(cvg),
+      q(1923) => q(cvn),
+      q(1924) => q(cwa),
+      q(1925) => q(cwb),
+      q(1926) => q(cwd),
+      q(1927) => q(cwe),
+      q(1928) => q(cwg),
+      q(1929) => q(cwt),
+      q(1930) => q(cya),
+      q(1931) => q(cyb),
+      q(1932) => q(cyo),
+      q(1933) => q(czh),
+      q(1934) => q(czk),
+      q(1935) => q(czn),
+      q(1936) => q(czo),
+      q(1937) => q(czt),
+      q(1938) => q(daa),
+      q(1939) => q(dac),
+      q(1940) => q(dad),
+      q(1941) => q(dae),
+      q(1942) => q(dag),
+      q(1943) => q(dah),
+      q(1944) => q(dai),
+      q(1945) => q(daj),
+      q(1946) => q(dal),
+      q(1947) => q(dam),
+      q(1948) => q(dao),
+      q(1949) => q(daq),
+      q(1950) => q(das),
+      q(1951) => q(dau),
+      q(1952) => q(dav),
+      q(1953) => q(daw),
+      q(1954) => q(dax),
+      q(1955) => q(daz),
+      q(1956) => q(dba),
+      q(1957) => q(dbb),
+      q(1958) => q(dbd),
+      q(1959) => q(dbe),
+      q(1960) => q(dbf),
+      q(1961) => q(dbg),
+      q(1962) => q(dbi),
+      q(1963) => q(dbj),
+      q(1964) => q(dbl),
+      q(1965) => q(dbm),
+      q(1966) => q(dbn),
+      q(1967) => q(dbo),
+      q(1968) => q(dbp),
+      q(1969) => q(dbq),
+      q(1970) => q(dbr),
+      q(1971) => q(dbt),
+      q(1972) => q(dbu),
+      q(1973) => q(dbv),
+      q(1974) => q(dbw),
+      q(1975) => q(dby),
+      q(1976) => q(dcc),
+      q(1977) => q(dcr),
+      q(1978) => q(dda),
+      q(1979) => q(ddd),
+      q(1980) => q(dde),
+      q(1981) => q(ddg),
+      q(1982) => q(ddi),
+      q(1983) => q(ddj),
+      q(1984) => q(ddn),
+      q(1985) => q(ddo),
+      q(1986) => q(ddr),
+      q(1987) => q(dds),
+      q(1988) => q(ddw),
+      q(1989) => q(dec),
+      q(1990) => q(ded),
+      q(1991) => q(dee),
+      q(1992) => q(def),
+      q(1993) => q(deg),
+      q(1994) => q(deh),
+      q(1995) => q(dei),
+      q(1996) => q(dek),
+      q(1997) => q(dem),
+      q(1998) => q(dep),
+      q(1999) => q(deq),
+      q(2000) => q(der),
+      q(2001) => q(des),
+      q(2002) => q(dev),
+      q(2003) => q(dez),
+      q(2004) => q(dga),
+      q(2005) => q(dgb),
+      q(2006) => q(dgc),
+      q(2007) => q(dgd),
+      q(2008) => q(dge),
+      q(2009) => q(dgg),
+      q(2010) => q(dgh),
+      q(2011) => q(dgi),
+      q(2012) => q(dgk),
+      q(2013) => q(dgl),
+      q(2014) => q(dgn),
+      q(2015) => q(dgo),
+      q(2016) => q(dgs),
+      q(2017) => q(dgt),
+      q(2018) => q(dgu),
+      q(2019) => q(dgw),
+      q(2020) => q(dgx),
+      q(2021) => q(dgz),
+      q(2022) => q(dhd),
+      q(2023) => q(dhg),
+      q(2024) => q(dhi),
+      q(2025) => q(dhl),
+      q(2026) => q(dhm),
+      q(2027) => q(dhn),
+      q(2028) => q(dho),
+      q(2029) => q(dhr),
+      q(2030) => q(dhs),
+      q(2031) => q(dhu),
+      q(2032) => q(dhv),
+      q(2033) => q(dhw),
+      q(2034) => q(dhx),
+      q(2035) => q(dia),
+      q(2036) => q(dib),
+      q(2037) => q(dic),
+      q(2038) => q(did),
+      q(2039) => q(dif),
+      q(2040) => q(dig),
+      q(2041) => q(dih),
+      q(2042) => q(dii),
+      q(2043) => q(dij),
+      q(2044) => q(dik),
+      q(2045) => q(dil),
+      q(2046) => q(dim),
+      q(2047) => q(dio),
+      q(2048) => q(dip),
+      q(2049) => q(diq),
+      q(2050) => q(dir),
+      q(2051) => q(dis),
+      q(2052) => q(dit),
+      q(2053) => q(diu),
+      q(2054) => q(diw),
+      q(2055) => q(dix),
+      q(2056) => q(diy),
+      q(2057) => q(diz),
+      q(2058) => q(dja),
+      q(2059) => q(djb),
+      q(2060) => q(djc),
+      q(2061) => q(djd),
+      q(2062) => q(dje),
+      q(2063) => q(djf),
+      q(2064) => q(dji),
+      q(2065) => q(djj),
+      q(2066) => q(djk),
+      q(2067) => q(djm),
+      q(2068) => q(djn),
+      q(2069) => q(djo),
+      q(2070) => q(djr),
+      q(2071) => q(dju),
+      q(2072) => q(djw),
+      q(2073) => q(dka),
+      q(2074) => q(dkk),
+      q(2075) => q(dkr),
+      q(2076) => q(dks),
+      q(2077) => q(dkx),
+      q(2078) => q(dlg),
+      q(2079) => q(dlk),
+      q(2080) => q(dlm),
+      q(2081) => q(dln),
+      q(2082) => q(dma),
+      q(2083) => q(dmb),
+      q(2084) => q(dmc),
+      q(2085) => q(dmd),
+      q(2086) => q(dme),
+      q(2087) => q(dmg),
+      q(2088) => q(dmk),
+      q(2089) => q(dml),
+      q(2090) => q(dmm),
+      q(2091) => q(dmo),
+      q(2092) => q(dmr),
+      q(2093) => q(dms),
+      q(2094) => q(dmu),
+      q(2095) => q(dmv),
+      q(2096) => q(dmw),
+      q(2097) => q(dmx),
+      q(2098) => q(dmy),
+      q(2099) => q(dna),
+      q(2100) => q(dnd),
+      q(2101) => q(dne),
+      q(2102) => q(dng),
+      q(2103) => q(dni),
+      q(2104) => q(dnj),
+      q(2105) => q(dnk),
+      q(2106) => q(dnn),
+      q(2107) => q(dnr),
+      q(2108) => q(dnt),
+      q(2109) => q(dnu),
+      q(2110) => q(dnv),
+      q(2111) => q(dnw),
+      q(2112) => q(dny),
+      q(2113) => q(doa),
+      q(2114) => q(dob),
+      q(2115) => q(doc),
+      q(2116) => q(doe),
+      q(2117) => q(dof),
+      q(2118) => q(doh),
+      q(2119) => q(dok),
+      q(2120) => q(dol),
+      q(2121) => q(don),
+      q(2122) => q(doo),
+      q(2123) => q(dop),
+      q(2124) => q(doq),
+      q(2125) => q(dor),
+      q(2126) => q(dos),
+      q(2127) => q(dot),
+      q(2128) => q(dov),
+      q(2129) => q(dow),
+      q(2130) => q(dox),
+      q(2131) => q(doy),
+      q(2132) => q(doz),
+      q(2133) => q(dpp),
+      q(2134) => q(drb),
+      q(2135) => q(drc),
+      q(2136) => q(drd),
+      q(2137) => q(dre),
+      q(2138) => q(drg),
+      q(2139) => q(dri),
+      q(2140) => q(drl),
+      q(2141) => q(drn),
+      q(2142) => q(dro),
+      q(2143) => q(drq),
+      q(2144) => q(drr),
+      q(2145) => q(drs),
+      q(2146) => q(drt),
+      q(2147) => q(dru),
+      q(2148) => q(dry),
+      q(2149) => q(dse),
+      q(2150) => q(dsh),
+      q(2151) => q(dsi),
+      q(2152) => q(dsl),
+      q(2153) => q(dsn),
+      q(2154) => q(dso),
+      q(2155) => q(dsq),
+      q(2156) => q(dta),
+      q(2157) => q(dtb),
+      q(2158) => q(dtd),
+      q(2159) => q(dth),
+      q(2160) => q(dti),
+      q(2161) => q(dtk),
+      q(2162) => q(dtm),
+      q(2163) => q(dto),
+      q(2164) => q(dtp),
+      q(2165) => q(dtr),
+      q(2166) => q(dts),
+      q(2167) => q(dtt),
+      q(2168) => q(dtu),
+      q(2169) => q(dty),
+      q(2170) => q(dub),
+      q(2171) => q(duc),
+      q(2172) => q(dud),
+      q(2173) => q(due),
+      q(2174) => q(duf),
+      q(2175) => q(dug),
+      q(2176) => q(duh),
+      q(2177) => q(dui),
+      q(2178) => q(duj),
+      q(2179) => q(duk),
+      q(2180) => q(dul),
+      q(2181) => q(dun),
+      q(2182) => q(duo),
+      q(2183) => q(dup),
+      q(2184) => q(duq),
+      q(2185) => q(dur),
+      q(2186) => q(dus),
+      q(2187) => q(duu),
+      q(2188) => q(duv),
+      q(2189) => q(duw),
+      q(2190) => q(dux),
+      q(2191) => q(duy),
+      q(2192) => q(duz),
+      q(2193) => q(dva),
+      q(2194) => q(dwa),
+      q(2195) => q(dwr),
+      q(2196) => q(dws),
+      q(2197) => q(dww),
+      q(2198) => q(dya),
+      q(2199) => q(dyb),
+      q(2200) => q(dyd),
+      q(2201) => q(dyg),
+      q(2202) => q(dyi),
+      q(2203) => q(dym),
+      q(2204) => q(dyn),
+      q(2205) => q(dyo),
+      q(2206) => q(dyy),
+      q(2207) => q(dza),
+      q(2208) => q(dze),
+      q(2209) => q(dzg),
+      q(2210) => q(dzl),
+      q(2211) => q(dzn),
+      q(2212) => q(eaa),
+      q(2213) => q(ebg),
+      q(2214) => q(ebk),
+      q(2215) => q(ebo),
+      q(2216) => q(ebr),
+      q(2217) => q(ebu),
+      q(2218) => q(ecr),
+      q(2219) => q(ecs),
+      q(2220) => q(ecy),
+      q(2221) => q(eee),
+      q(2222) => q(efa),
+      q(2223) => q(efe),
+      q(2224) => q(ega),
+      q(2225) => q(egl),
+      q(2226) => q(ego),
+      q(2227) => q(ehu),
+      q(2228) => q(eip),
+      q(2229) => q(eit),
+      q(2230) => q(eiv),
+      q(2231) => q(eja),
+      q(2232) => q(ekc),
+      q(2233) => q(eke),
+      q(2234) => q(ekg),
+      q(2235) => q(eki),
+      q(2236) => q(ekk),
+      q(2237) => q(ekl),
+      q(2238) => q(ekm),
+      q(2239) => q(eko),
+      q(2240) => q(ekp),
+      q(2241) => q(ekr),
+      q(2242) => q(eky),
+      q(2243) => q(ele),
+      q(2244) => q(elh),
+      q(2245) => q(eli),
+      q(2246) => q(elk),
+      q(2247) => q(elm),
+      q(2248) => q(elo),
+      q(2249) => q(elu),
+      q(2250) => q(ema),
+      q(2251) => q(emb),
+      q(2252) => q(eme),
+      q(2253) => q(emg),
+      q(2254) => q(emi),
+      q(2255) => q(emk),
+      q(2256) => q(emm),
+      q(2257) => q(emn),
+      q(2258) => q(emp),
+      q(2259) => q(ems),
+      q(2260) => q(emu),
+      q(2261) => q(emw),
+      q(2262) => q(emx),
+      q(2263) => q(emy),
+      q(2264) => q(ena),
+      q(2265) => q(enb),
+      q(2266) => q(enc),
+      q(2267) => q(end),
+      q(2268) => q(enf),
+      q(2269) => q(enh),
+      q(2270) => q(enl),
+      q(2271) => q(enn),
+      q(2272) => q(eno),
+      q(2273) => q(enq),
+      q(2274) => q(enr),
+      q(2275) => q(enu),
+      q(2276) => q(env),
+      q(2277) => q(enw),
+      q(2278) => q(enx),
+      q(2279) => q(eot),
+      q(2280) => q(epi),
+      q(2281) => q(era),
+      q(2282) => q(erg),
+      q(2283) => q(erh),
+      q(2284) => q(eri),
+      q(2285) => q(erk),
+      q(2286) => q(ero),
+      q(2287) => q(err),
+      q(2288) => q(ers),
+      q(2289) => q(ert),
+      q(2290) => q(erw),
+      q(2291) => q(ese),
+      q(2292) => q(esh),
+      q(2293) => q(esi),
+      q(2294) => q(esk),
+      q(2295) => q(esl),
+      q(2296) => q(esm),
+      q(2297) => q(esn),
+      q(2298) => q(eso),
+      q(2299) => q(esq),
+      q(2300) => q(ess),
+      q(2301) => q(esu),
+      q(2302) => q(esy),
+      q(2303) => q(etb),
+      q(2304) => q(etc),
+      q(2305) => q(eth),
+      q(2306) => q(etn),
+      q(2307) => q(eto),
+      q(2308) => q(etr),
+      q(2309) => q(ets),
+      q(2310) => q(ett),
+      q(2311) => q(etu),
+      q(2312) => q(etx),
+      q(2313) => q(etz),
+      q(2314) => q(eve),
+      q(2315) => q(evh),
+      q(2316) => q(evn),
+      q(2317) => q(ext),
+      q(2318) => q(eya),
+      q(2319) => q(eyo),
+      q(2320) => q(eza),
+      q(2321) => q(eze),
+      q(2322) => q(faa),
+      q(2323) => q(fab),
+      q(2324) => q(fad),
+      q(2325) => q(faf),
+      q(2326) => q(fag),
+      q(2327) => q(fah),
+      q(2328) => q(fai),
+      q(2329) => q(faj),
+      q(2330) => q(fak),
+      q(2331) => q(fal),
+      q(2332) => q(fam),
+      q(2333) => q(fap),
+      q(2334) => q(far),
+      q(2335) => q(fau),
+      q(2336) => q(fax),
+      q(2337) => q(fay),
+      q(2338) => q(faz),
+      q(2339) => q(fbl),
+      q(2340) => q(fcs),
+      q(2341) => q(fer),
+      q(2342) => q(ffi),
+      q(2343) => q(ffm),
+      q(2344) => q(fgr),
+      q(2345) => q(fia),
+      q(2346) => q(fie),
+      q(2347) => q(fip),
+      q(2348) => q(fir),
+      q(2349) => q(fit),
+      q(2350) => q(fiw),
+      q(2351) => q(fkk),
+      q(2352) => q(fkv),
+      q(2353) => q(fla),
+      q(2354) => q(flh),
+      q(2355) => q(fli),
+      q(2356) => q(fll),
+      q(2357) => q(fln),
+      q(2358) => q(flr),
+      q(2359) => q(fly),
+      q(2360) => q(fmp),
+      q(2361) => q(fmu),
+      q(2362) => q(fng),
+      q(2363) => q(fni),
+      q(2364) => q(fod),
+      q(2365) => q(foi),
+      q(2366) => q(fom),
+      q(2367) => q(for),
+      q(2368) => q(fos),
+      q(2369) => q(fpe),
+      q(2370) => q(fqs),
+      q(2371) => q(frc),
+      q(2372) => q(frd),
+      q(2373) => q(frk),
+      q(2374) => q(frp),
+      q(2375) => q(frq),
+      q(2376) => q(frt),
+      q(2377) => q(fse),
+      q(2378) => q(fsl),
+      q(2379) => q(fss),
+      q(2380) => q(fub),
+      q(2381) => q(fuc),
+      q(2382) => q(fud),
+      q(2383) => q(fue),
+      q(2384) => q(fuf),
+      q(2385) => q(fuh),
+      q(2386) => q(fui),
+      q(2387) => q(fuj),
+      q(2388) => q(fum),
+      q(2389) => q(fun),
+      q(2390) => q(fuq),
+      q(2391) => q(fut),
+      q(2392) => q(fuu),
+      q(2393) => q(fuv),
+      q(2394) => q(fuy),
+      q(2395) => q(fvr),
+      q(2396) => q(fwa),
+      q(2397) => q(fwe),
+      q(2398) => q(gab),
+      q(2399) => q(gac),
+      q(2400) => q(gad),
+      q(2401) => q(gae),
+      q(2402) => q(gaf),
+      q(2403) => q(gag),
+      q(2404) => q(gah),
+      q(2405) => q(gai),
+      q(2406) => q(gaj),
+      q(2407) => q(gak),
+      q(2408) => q(gal),
+      q(2409) => q(gam),
+      q(2410) => q(gan),
+      q(2411) => q(gao),
+      q(2412) => q(gap),
+      q(2413) => q(gaq),
+      q(2414) => q(gar),
+      q(2415) => q(gas),
+      q(2416) => q(gat),
+      q(2417) => q(gau),
+      q(2418) => q(gaw),
+      q(2419) => q(gax),
+      q(2420) => q(gaz),
+      q(2421) => q(gbb),
+      q(2422) => q(gbd),
+      q(2423) => q(gbe),
+      q(2424) => q(gbf),
+      q(2425) => q(gbg),
+      q(2426) => q(gbh),
+      q(2427) => q(gbi),
+      q(2428) => q(gbj),
+      q(2429) => q(gbk),
+      q(2430) => q(gbl),
+      q(2431) => q(gbm),
+      q(2432) => q(gbn),
+      q(2433) => q(gbo),
+      q(2434) => q(gbp),
+      q(2435) => q(gbq),
+      q(2436) => q(gbr),
+      q(2437) => q(gbs),
+      q(2438) => q(gbu),
+      q(2439) => q(gbv),
+      q(2440) => q(gbw),
+      q(2441) => q(gbx),
+      q(2442) => q(gby),
+      q(2443) => q(gbz),
+      q(2444) => q(gcc),
+      q(2445) => q(gcd),
+      q(2446) => q(gce),
+      q(2447) => q(gcf),
+      q(2448) => q(gcl),
+      q(2449) => q(gcn),
+      q(2450) => q(gcr),
+      q(2451) => q(gct),
+      q(2452) => q(gda),
+      q(2453) => q(gdb),
+      q(2454) => q(gdc),
+      q(2455) => q(gdd),
+      q(2456) => q(gde),
+      q(2457) => q(gdf),
+      q(2458) => q(gdg),
+      q(2459) => q(gdh),
+      q(2460) => q(gdi),
+      q(2461) => q(gdj),
+      q(2462) => q(gdk),
+      q(2463) => q(gdl),
+      q(2464) => q(gdm),
+      q(2465) => q(gdn),
+      q(2466) => q(gdo),
+      q(2467) => q(gdq),
+      q(2468) => q(gdr),
+      q(2469) => q(gds),
+      q(2470) => q(gdt),
+      q(2471) => q(gdu),
+      q(2472) => q(gdx),
+      q(2473) => q(gea),
+      q(2474) => q(geb),
+      q(2475) => q(gec),
+      q(2476) => q(ged),
+      q(2477) => q(geg),
+      q(2478) => q(geh),
+      q(2479) => q(gei),
+      q(2480) => q(gej),
+      q(2481) => q(gek),
+      q(2482) => q(gel),
+      q(2483) => q(geq),
+      q(2484) => q(ges),
+      q(2485) => q(gev),
+      q(2486) => q(gew),
+      q(2487) => q(gex),
+      q(2488) => q(gey),
+      q(2489) => q(gfk),
+      q(2490) => q(gft),
+      q(2491) => q(gga),
+      q(2492) => q(ggb),
+      q(2493) => q(ggd),
+      q(2494) => q(gge),
+      q(2495) => q(ggg),
+      q(2496) => q(ggk),
+      q(2497) => q(ggl),
+      q(2498) => q(ggn),
+      q(2499) => q(ggo),
+      q(2500) => q(ggt),
+      q(2501) => q(ggu),
+      q(2502) => q(ggw),
+      q(2503) => q(gha),
+      q(2504) => q(ghc),
+      q(2505) => q(ghe),
+      q(2506) => q(ghh),
+      q(2507) => q(ghk),
+      q(2508) => q(ghl),
+      q(2509) => q(ghn),
+      q(2510) => q(gho),
+      q(2511) => q(ghr),
+      q(2512) => q(ghs),
+      q(2513) => q(ght),
+      q(2514) => q(gia),
+      q(2515) => q(gib),
+      q(2516) => q(gic),
+      q(2517) => q(gid),
+      q(2518) => q(gig),
+      q(2519) => q(gih),
+      q(2520) => q(gim),
+      q(2521) => q(gin),
+      q(2522) => q(gip),
+      q(2523) => q(giq),
+      q(2524) => q(gir),
+      q(2525) => q(gis),
+      q(2526) => q(git),
+      q(2527) => q(giu),
+      q(2528) => q(giw),
+      q(2529) => q(gix),
+      q(2530) => q(giy),
+      q(2531) => q(giz),
+      q(2532) => q(gji),
+      q(2533) => q(gjk),
+      q(2534) => q(gjm),
+      q(2535) => q(gjn),
+      q(2536) => q(gju),
+      q(2537) => q(gka),
+      q(2538) => q(gke),
+      q(2539) => q(gkn),
+      q(2540) => q(gko),
+      q(2541) => q(gkp),
+      q(2542) => q(gku),
+      q(2543) => q(glc),
+      q(2544) => q(gld),
+      q(2545) => q(glh),
+      q(2546) => q(gli),
+      q(2547) => q(glj),
+      q(2548) => q(glk),
+      q(2549) => q(gll),
+      q(2550) => q(glo),
+      q(2551) => q(glr),
+      q(2552) => q(glu),
+      q(2553) => q(glw),
+      q(2554) => q(gly),
+      q(2555) => q(gma),
+      q(2556) => q(gmb),
+      q(2557) => q(gmd),
+      q(2558) => q(gmg),
+      q(2559) => q(gml),
+      q(2560) => q(gmm),
+      q(2561) => q(gmn),
+      q(2562) => q(gmu),
+      q(2563) => q(gmv),
+      q(2564) => q(gmx),
+      q(2565) => q(gmy),
+      q(2566) => q(gmz),
+      q(2567) => q(gna),
+      q(2568) => q(gnb),
+      q(2569) => q(gnc),
+      q(2570) => q(gnd),
+      q(2571) => q(gne),
+      q(2572) => q(gng),
+      q(2573) => q(gnh),
+      q(2574) => q(gni),
+      q(2575) => q(gnq),
+      q(2576) => q(gnl),
+      q(2577) => q(gnm),
+      q(2578) => q(gnn),
+      q(2579) => q(gno),
       q(2580) => q(gnr),
       q(2581) => q(gnt),
       q(2582) => q(gnu),
@@ -95415,4844 +95487,4846 @@ $Locale::Codes::Data{'language'}{'id2code'} = {
       q(3133) => q(jns),
       q(3134) => q(job),
       q(3135) => q(jod),
-      q(3136) => q(jor),
-      q(3137) => q(jos),
-      q(3138) => q(jow),
-      q(3139) => q(jpa),
-      q(3140) => q(jqr),
-      q(3141) => q(jra),
-      q(3142) => q(jrr),
-      q(3143) => q(jrt),
-      q(3144) => q(jru),
-      q(3145) => q(jsl),
-      q(3146) => q(jua),
-      q(3147) => q(jub),
-      q(3148) => q(juc),
-      q(3149) => q(jud),
-      q(3150) => q(juh),
-      q(3151) => q(jui),
-      q(3152) => q(juk),
-      q(3153) => q(jul),
-      q(3154) => q(jum),
-      q(3155) => q(jun),
-      q(3156) => q(juo),
-      q(3157) => q(jup),
-      q(3158) => q(jur),
-      q(3159) => q(jus),
-      q(3160) => q(jut),
-      q(3161) => q(juu),
-      q(3162) => q(juw),
-      q(3163) => q(juy),
-      q(3164) => q(jvd),
-      q(3165) => q(jvn),
-      q(3166) => q(jwi),
-      q(3167) => q(jya),
-      q(3168) => q(jye),
-      q(3169) => q(jyy),
-      q(3170) => q(kad),
-      q(3171) => q(kae),
-      q(3172) => q(kaf),
-      q(3173) => q(kag),
-      q(3174) => q(kah),
-      q(3175) => q(kai),
-      q(3176) => q(kaj),
-      q(3177) => q(kak),
-      q(3178) => q(kao),
-      q(3179) => q(kap),
-      q(3180) => q(kaq),
-      q(3181) => q(kav),
-      q(3182) => q(kax),
-      q(3183) => q(kay),
-      q(3184) => q(kba),
-      q(3185) => q(kbb),
-      q(3186) => q(kbc),
-      q(3187) => q(kbe),
-      q(3188) => q(kbg),
-      q(3189) => q(kbh),
-      q(3190) => q(kbi),
-      q(3191) => q(kbj),
-      q(3192) => q(kbk),
-      q(3193) => q(kbl),
-      q(3194) => q(kbm),
-      q(3195) => q(kbn),
-      q(3196) => q(kbo),
-      q(3197) => q(kbp),
-      q(3198) => q(kbq),
-      q(3199) => q(kbr),
-      q(3200) => q(kbs),
-      q(3201) => q(kbt),
-      q(3202) => q(kbu),
-      q(3203) => q(kbv),
-      q(3204) => q(kbw),
-      q(3205) => q(kbx),
-      q(3206) => q(kby),
-      q(3207) => q(kbz),
-      q(3208) => q(kca),
-      q(3209) => q(kcb),
-      q(3210) => q(kcc),
-      q(3211) => q(kcd),
-      q(3212) => q(kce),
-      q(3213) => q(kcf),
-      q(3214) => q(kcg),
-      q(3215) => q(kch),
-      q(3216) => q(kci),
-      q(3217) => q(kcj),
-      q(3218) => q(kck),
-      q(3219) => q(kcl),
-      q(3220) => q(kcm),
-      q(3221) => q(kcn),
-      q(3222) => q(kco),
-      q(3223) => q(kcp),
-      q(3224) => q(kcq),
-      q(3225) => q(kcr),
-      q(3226) => q(kcs),
-      q(3227) => q(kct),
-      q(3228) => q(kcu),
-      q(3229) => q(kcv),
-      q(3230) => q(kcw),
-      q(3231) => q(kcx),
-      q(3232) => q(kcy),
-      q(3233) => q(kcz),
-      q(3234) => q(kda),
-      q(3235) => q(kdc),
-      q(3236) => q(kdd),
-      q(3237) => q(kde),
-      q(3238) => q(kdf),
-      q(3239) => q(kdg),
-      q(3240) => q(kdh),
-      q(3241) => q(kdi),
-      q(3242) => q(kdj),
-      q(3243) => q(kdk),
-      q(3244) => q(kdl),
-      q(3245) => q(kdm),
-      q(3246) => q(kdn),
-      q(3247) => q(kdp),
-      q(3248) => q(kdq),
-      q(3249) => q(kdr),
-      q(3250) => q(kdt),
-      q(3251) => q(kdu),
-      q(3252) => q(kdw),
-      q(3253) => q(kdx),
-      q(3254) => q(kdy),
-      q(3255) => q(kdz),
-      q(3256) => q(kea),
-      q(3257) => q(keb),
-      q(3258) => q(kec),
-      q(3259) => q(ked),
-      q(3260) => q(kee),
-      q(3261) => q(kef),
-      q(3262) => q(keg),
-      q(3263) => q(keh),
-      q(3264) => q(kei),
-      q(3265) => q(kej),
-      q(3266) => q(kek),
-      q(3267) => q(kel),
-      q(3268) => q(kem),
-      q(3269) => q(ken),
-      q(3270) => q(keo),
-      q(3271) => q(kep),
-      q(3272) => q(keq),
-      q(3273) => q(ker),
-      q(3274) => q(kes),
-      q(3275) => q(ket),
-      q(3276) => q(keu),
-      q(3277) => q(kev),
-      q(3278) => q(kew),
-      q(3279) => q(kex),
-      q(3280) => q(key),
-      q(3281) => q(kez),
-      q(3282) => q(kfa),
-      q(3283) => q(kfb),
-      q(3284) => q(kfc),
-      q(3285) => q(kfd),
-      q(3286) => q(kfe),
-      q(3287) => q(kff),
-      q(3288) => q(kfg),
-      q(3289) => q(kfh),
-      q(3290) => q(kfi),
-      q(3291) => q(kfj),
-      q(3292) => q(kfk),
-      q(3293) => q(kfl),
-      q(3294) => q(kfm),
-      q(3295) => q(kfn),
-      q(3296) => q(kfo),
-      q(3297) => q(kfp),
-      q(3298) => q(kfq),
-      q(3299) => q(kfr),
-      q(3300) => q(kfs),
-      q(3301) => q(kft),
-      q(3302) => q(kfu),
-      q(3303) => q(kfv),
-      q(3304) => q(kfw),
-      q(3305) => q(kfx),
-      q(3306) => q(kfy),
-      q(3307) => q(kfz),
-      q(3308) => q(kga),
-      q(3309) => q(kgb),
-      q(3310) => q(kgc),
-      q(3311) => q(kgd),
-      q(3312) => q(kge),
-      q(3313) => q(kgf),
-      q(3314) => q(kgg),
-      q(3315) => q(kgi),
-      q(3316) => q(kgj),
-      q(3317) => q(kgk),
-      q(3318) => q(kgl),
-      q(3319) => q(kuq),
-      q(3320) => q(kgn),
-      q(3321) => q(kgo),
-      q(3322) => q(kgp),
-      q(3323) => q(kgq),
-      q(3324) => q(kgr),
-      q(3325) => q(kgs),
-      q(3326) => q(kgt),
-      q(3327) => q(kgu),
-      q(3328) => q(kgv),
-      q(3329) => q(kgw),
-      q(3330) => q(kgx),
-      q(3331) => q(kgy),
-      q(3332) => q(khb),
-      q(3333) => q(khc),
-      q(3334) => q(khd),
-      q(3335) => q(khe),
-      q(3336) => q(khf),
-      q(3337) => q(khg),
-      q(3338) => q(khh),
-      q(3339) => q(khj),
-      q(3340) => q(khk),
-      q(3341) => q(khl),
-      q(3342) => q(khn),
-      q(3343) => q(khp),
-      q(3344) => q(khq),
-      q(3345) => q(khr),
-      q(3346) => q(khs),
-      q(3347) => q(kht),
-      q(3348) => q(khu),
-      q(3349) => q(khv),
-      q(3350) => q(khw),
-      q(3351) => q(khx),
-      q(3352) => q(khy),
-      q(3353) => q(khz),
-      q(3354) => q(kia),
-      q(3355) => q(kib),
-      q(3356) => q(kic),
-      q(3357) => q(kid),
-      q(3358) => q(kie),
-      q(3359) => q(kif),
-      q(3360) => q(kig),
-      q(3361) => q(kih),
-      q(3362) => q(kii),
-      q(3363) => q(kij),
-      q(3364) => q(kil),
-      q(3365) => q(kim),
-      q(3366) => q(kio),
-      q(3367) => q(kip),
-      q(3368) => q(kiq),
-      q(3369) => q(kis),
-      q(3370) => q(kit),
-      q(3371) => q(kiu),
-      q(3372) => q(kiv),
-      q(3373) => q(kiw),
-      q(3374) => q(kix),
-      q(3375) => q(kiy),
-      q(3376) => q(kiz),
-      q(3377) => q(kja),
-      q(3378) => q(kjb),
-      q(3379) => q(kjc),
-      q(3380) => q(kjd),
-      q(3381) => q(kje),
-      q(3382) => q(kjf),
-      q(3383) => q(kjg),
-      q(3384) => q(kjh),
-      q(3385) => q(kji),
-      q(3386) => q(kjj),
-      q(3387) => q(kjk),
-      q(3388) => q(kjl),
-      q(3389) => q(kjm),
-      q(3390) => q(kjn),
-      q(3391) => q(kjo),
-      q(3392) => q(kjp),
-      q(3393) => q(kjq),
-      q(3394) => q(kjr),
-      q(3395) => q(kjs),
-      q(3396) => q(kjt),
-      q(3397) => q(kju),
-      q(3398) => q(kjv),
-      q(3399) => q(kjx),
-      q(3400) => q(kjy),
-      q(3401) => q(kjz),
-      q(3402) => q(kka),
-      q(3403) => q(kkb),
-      q(3404) => q(kkc),
-      q(3405) => q(kkd),
-      q(3406) => q(kke),
-      q(3407) => q(kkf),
-      q(3408) => q(kkg),
-      q(3409) => q(kkh),
-      q(3410) => q(kki),
-      q(3411) => q(kkj),
-      q(3412) => q(kkk),
-      q(3413) => q(kkl),
-      q(3414) => q(kkm),
-      q(3415) => q(kkn),
-      q(3416) => q(kko),
-      q(3417) => q(kkp),
-      q(3418) => q(kkq),
-      q(3419) => q(kkr),
-      q(3420) => q(kks),
-      q(3421) => q(kkt),
-      q(3422) => q(kku),
-      q(3423) => q(kkv),
-      q(3424) => q(kkw),
-      q(3425) => q(kkx),
-      q(3426) => q(kky),
-      q(3427) => q(kkz),
-      q(3428) => q(kla),
-      q(3429) => q(klb),
-      q(3430) => q(klc),
-      q(3431) => q(kld),
-      q(3432) => q(kle),
-      q(3433) => q(klf),
-      q(3434) => q(klg),
-      q(3435) => q(klh),
-      q(3436) => q(kli),
-      q(3437) => q(klj),
-      q(3438) => q(klk),
-      q(3439) => q(kll),
-      q(3440) => q(klm),
-      q(3441) => q(kln),
-      q(3442) => q(klo),
-      q(3443) => q(klp),
-      q(3444) => q(klq),
-      q(3445) => q(klr),
-      q(3446) => q(kls),
-      q(3447) => q(klt),
-      q(3448) => q(klu),
-      q(3449) => q(klv),
-      q(3450) => q(klw),
-      q(3451) => q(klx),
-      q(3452) => q(kly),
-      q(3453) => q(klz),
-      q(3454) => q(kma),
-      q(3455) => q(kmc),
-      q(3456) => q(kmd),
-      q(3457) => q(kme),
-      q(3458) => q(kmf),
-      q(3459) => q(kmg),
-      q(3460) => q(kmh),
-      q(3461) => q(kmi),
-      q(3462) => q(kmj),
-      q(3463) => q(kmk),
-      q(3464) => q(kml),
-      q(3465) => q(kmm),
-      q(3466) => q(kmn),
-      q(3467) => q(kmo),
-      q(3468) => q(kmp),
-      q(3469) => q(kmq),
-      q(3470) => q(kmr),
-      q(3471) => q(kms),
-      q(3472) => q(kmt),
-      q(3473) => q(kmu),
-      q(3474) => q(kmv),
-      q(3475) => q(kmw),
-      q(3476) => q(kmx),
-      q(3477) => q(kmy),
-      q(3478) => q(kmz),
-      q(3479) => q(kna),
-      q(3480) => q(knb),
-      q(3481) => q(knc),
-      q(3482) => q(knd),
-      q(3483) => q(kne),
-      q(3484) => q(knf),
-      q(3485) => q(kng),
-      q(3486) => q(kni),
-      q(3487) => q(knj),
-      q(3488) => q(knk),
-      q(3489) => q(knl),
-      q(3490) => q(knm),
-      q(3491) => q(knn),
-      q(3492) => q(kno),
-      q(3493) => q(knp),
-      q(3494) => q(knq),
-      q(3495) => q(knr),
-      q(3496) => q(kns),
-      q(3497) => q(knt),
-      q(3498) => q(knu),
-      q(3499) => q(knv),
-      q(3500) => q(knw),
-      q(3501) => q(knx),
-      q(3502) => q(kny),
-      q(3503) => q(knz),
-      q(3504) => q(koa),
-      q(3505) => q(koc),
-      q(3506) => q(kod),
-      q(3507) => q(koe),
-      q(3508) => q(kof),
-      q(3509) => q(kog),
-      q(3510) => q(koh),
-      q(3511) => q(koi),
-      q(3512) => q(kol),
-      q(3513) => q(koo),
-      q(3514) => q(kop),
-      q(3515) => q(koq),
-      q(3516) => q(kot),
-      q(3517) => q(kou),
-      q(3518) => q(kov),
-      q(3519) => q(kow),
-      q(3520) => q(kox),
-      q(3521) => q(koy),
-      q(3522) => q(koz),
-      q(3523) => q(kpa),
-      q(3524) => q(kpb),
-      q(3525) => q(kpc),
-      q(3526) => q(kpd),
-      q(3527) => q(kpf),
-      q(3528) => q(kpg),
-      q(3529) => q(kph),
-      q(3530) => q(kpi),
-      q(3531) => q(kpj),
-      q(3532) => q(kpk),
-      q(3533) => q(kpl),
-      q(3534) => q(kpm),
-      q(3535) => q(kpn),
-      q(3536) => q(kpo),
-      q(3537) => q(kpq),
-      q(3538) => q(kpr),
-      q(3539) => q(kps),
-      q(3540) => q(kpt),
-      q(3541) => q(kpu),
-      q(3542) => q(kpv),
-      q(3543) => q(kpw),
-      q(3544) => q(kpx),
-      q(3545) => q(kpy),
-      q(3546) => q(kpz),
-      q(3547) => q(kqa),
-      q(3548) => q(kqb),
-      q(3549) => q(kqc),
-      q(3550) => q(kqd),
-      q(3551) => q(kqe),
-      q(3552) => q(kqf),
-      q(3553) => q(kqg),
-      q(3554) => q(kqh),
-      q(3555) => q(kqi),
-      q(3556) => q(kqj),
-      q(3557) => q(kqk),
-      q(3558) => q(kql),
-      q(3559) => q(kqm),
-      q(3560) => q(kqn),
-      q(3561) => q(kqo),
-      q(3562) => q(kqp),
-      q(3563) => q(kqq),
-      q(3564) => q(kqr),
-      q(3565) => q(kqs),
-      q(3566) => q(kqt),
-      q(3567) => q(kqu),
-      q(3568) => q(kqv),
-      q(3569) => q(kqw),
-      q(3570) => q(kqx),
-      q(3571) => q(kqy),
-      q(3572) => q(kqz),
-      q(3573) => q(kra),
-      q(3574) => q(krb),
-      q(3575) => q(krd),
-      q(3576) => q(kre),
-      q(3577) => q(krf),
-      q(3578) => q(krh),
-      q(3579) => q(kri),
-      q(3580) => q(krj),
-      q(3581) => q(krk),
-      q(3582) => q(krm),
-      q(3583) => q(krn),
-      q(3584) => q(krp),
-      q(3585) => q(krr),
-      q(3586) => q(krs),
-      q(3587) => q(krt),
-      q(3588) => q(krv),
-      q(3589) => q(krw),
-      q(3590) => q(krx),
-      q(3591) => q(kry),
-      q(3592) => q(krz),
-      q(3593) => q(ksa),
-      q(3594) => q(ksb),
-      q(3595) => q(ksc),
-      q(3596) => q(ksd),
-      q(3597) => q(kse),
-      q(3598) => q(ksf),
-      q(3599) => q(ksg),
-      q(3600) => q(ksh),
-      q(3601) => q(ksi),
-      q(3602) => q(ksj),
-      q(3603) => q(ksk),
-      q(3604) => q(ksl),
-      q(3605) => q(ksm),
-      q(3606) => q(ksn),
-      q(3607) => q(kso),
-      q(3608) => q(ksp),
-      q(3609) => q(ksq),
-      q(3610) => q(ksr),
-      q(3611) => q(kss),
-      q(3612) => q(kst),
-      q(3613) => q(ksu),
-      q(3614) => q(ksv),
-      q(3615) => q(ksw),
-      q(3616) => q(ksx),
-      q(3617) => q(ksy),
-      q(3618) => q(ksz),
-      q(3619) => q(kta),
-      q(3620) => q(ktb),
-      q(3621) => q(ktc),
-      q(3622) => q(ktd),
-      q(3623) => q(kte),
-      q(3624) => q(ktf),
-      q(3625) => q(ktg),
-      q(3626) => q(kth),
-      q(3627) => q(kti),
-      q(3628) => q(ktj),
-      q(3629) => q(ktk),
-      q(3630) => q(ktl),
-      q(3631) => q(ktm),
-      q(3632) => q(ktn),
-      q(3633) => q(kto),
-      q(3634) => q(ktp),
-      q(3635) => q(ktq),
-      q(3636) => q(ktr),
-      q(3637) => q(kts),
-      q(3638) => q(ktt),
-      q(3639) => q(ktu),
-      q(3640) => q(ktv),
-      q(3641) => q(ktw),
-      q(3642) => q(ktx),
-      q(3643) => q(kty),
-      q(3644) => q(ktz),
-      q(3645) => q(kub),
-      q(3646) => q(kuc),
-      q(3647) => q(kud),
-      q(3648) => q(kue),
-      q(3649) => q(kuf),
-      q(3650) => q(kug),
-      q(3651) => q(kuh),
-      q(3652) => q(kui),
-      q(3653) => q(kuj),
-      q(3654) => q(kuk),
-      q(3655) => q(kul),
-      q(3656) => q(kun),
-      q(3657) => q(kuo),
-      q(3658) => q(kup),
-      q(3659) => q(kus),
-      q(3660) => q(kuu),
-      q(3661) => q(kuv),
-      q(3662) => q(kuw),
-      q(3663) => q(kux),
-      q(3664) => q(kuy),
-      q(3665) => q(kuz),
-      q(3666) => q(kva),
-      q(3667) => q(kvb),
-      q(3668) => q(kvc),
-      q(3669) => q(kvd),
-      q(3670) => q(kve),
-      q(3671) => q(kvf),
-      q(3672) => q(kvg),
-      q(3673) => q(kvh),
-      q(3674) => q(kvi),
-      q(3675) => q(kvj),
-      q(3676) => q(kvk),
-      q(3677) => q(kvl),
-      q(3678) => q(kvm),
-      q(3679) => q(kvn),
-      q(3680) => q(kvo),
-      q(3681) => q(kvp),
-      q(3682) => q(kvq),
-      q(3683) => q(kvr),
-      q(3684) => q(kvs),
-      q(3685) => q(kvt),
-      q(3686) => q(kvu),
-      q(3687) => q(kvv),
-      q(3688) => q(kvw),
-      q(3689) => q(kvx),
-      q(3690) => q(kvy),
-      q(3691) => q(kvz),
-      q(3692) => q(kwa),
-      q(3693) => q(kwb),
-      q(3694) => q(kwc),
-      q(3695) => q(kwd),
-      q(3696) => q(kwe),
-      q(3697) => q(kwf),
-      q(3698) => q(kwg),
-      q(3699) => q(kwh),
-      q(3700) => q(kwi),
-      q(3701) => q(kwj),
-      q(3702) => q(kwk),
-      q(3703) => q(kwl),
-      q(3704) => q(kwm),
-      q(3705) => q(kwn),
-      q(3706) => q(kwo),
-      q(3707) => q(kwp),
-      q(3708) => q(kwr),
-      q(3709) => q(kws),
-      q(3710) => q(kwt),
-      q(3711) => q(kwu),
-      q(3712) => q(kwv),
-      q(3713) => q(kww),
-      q(3714) => q(kwx),
-      q(3715) => q(kwy),
-      q(3716) => q(kwz),
-      q(3717) => q(kxa),
-      q(3718) => q(kxb),
-      q(3719) => q(kxc),
-      q(3720) => q(kxd),
-      q(3721) => q(kxf),
-      q(3722) => q(kxh),
-      q(3723) => q(kxi),
-      q(3724) => q(kxj),
-      q(3725) => q(kxk),
-      q(3726) => q(kxl),
-      q(3727) => q(kxm),
-      q(3728) => q(kxn),
-      q(3729) => q(kxo),
-      q(3730) => q(kxp),
-      q(3731) => q(kxq),
-      q(3732) => q(kxr),
-      q(3733) => q(kxs),
-      q(3734) => q(kxt),
-      q(3735) => q(kxu),
-      q(3736) => q(kxv),
-      q(3737) => q(kxw),
-      q(3738) => q(kxx),
-      q(3739) => q(kxy),
-      q(3740) => q(kxz),
-      q(3741) => q(kya),
-      q(3742) => q(kyb),
-      q(3743) => q(kyc),
-      q(3744) => q(kyd),
-      q(3745) => q(kye),
-      q(3746) => q(kyf),
-      q(3747) => q(kyg),
-      q(3748) => q(kyh),
-      q(3749) => q(kyi),
-      q(3750) => q(kyj),
-      q(3751) => q(kyk),
-      q(3752) => q(kyl),
-      q(3753) => q(kym),
-      q(3754) => q(kyn),
-      q(3755) => q(kyo),
-      q(3756) => q(kyp),
-      q(3757) => q(kyq),
-      q(3758) => q(kyr),
-      q(3759) => q(kys),
-      q(3760) => q(kyt),
-      q(3761) => q(kyu),
-      q(3762) => q(kyv),
-      q(3763) => q(kyw),
-      q(3764) => q(kyx),
-      q(3765) => q(kyy),
-      q(3766) => q(kyz),
-      q(3767) => q(kza),
-      q(3768) => q(kzb),
-      q(3769) => q(kzc),
-      q(3770) => q(kzd),
-      q(3771) => q(kze),
-      q(3772) => q(kzf),
-      q(3773) => q(kzg),
-      q(3774) => q(kzi),
-      q(3775) => q(kzj),
-      q(3776) => q(kzk),
-      q(3777) => q(kzl),
-      q(3778) => q(kzm),
-      q(3779) => q(kzn),
-      q(3780) => q(kzo),
-      q(3781) => q(kzp),
-      q(3782) => q(kzq),
-      q(3783) => q(kzr),
-      q(3784) => q(kzs),
-      q(3785) => q(kzt),
-      q(3786) => q(kzu),
-      q(3787) => q(kzv),
-      q(3788) => q(kzw),
-      q(3789) => q(kzx),
-      q(3790) => q(kzy),
-      q(3791) => q(kzz),
-      q(3792) => q(laa),
-      q(3793) => q(lab),
-      q(3794) => q(lac),
-      q(3795) => q(lae),
-      q(3796) => q(laf),
-      q(3797) => q(lag),
-      q(3798) => q(lai),
-      q(3799) => q(laj),
-      q(3800) => q(lak),
-      q(3801) => q(lal),
-      q(3802) => q(lan),
-      q(3803) => q(lap),
-      q(3804) => q(laq),
-      q(3805) => q(lar),
-      q(3806) => q(las),
-      q(3807) => q(lau),
-      q(3808) => q(law),
-      q(3809) => q(lax),
-      q(3810) => q(lay),
-      q(3811) => q(laz),
-      q(3812) => q(lba),
-      q(3813) => q(lbb),
-      q(3814) => q(lbc),
-      q(3815) => q(lbe),
-      q(3816) => q(lbf),
-      q(3817) => q(lbg),
-      q(3818) => q(lbi),
-      q(3819) => q(lbj),
-      q(3820) => q(lbk),
-      q(3821) => q(lbl),
-      q(3822) => q(lbm),
-      q(3823) => q(lbn),
-      q(3824) => q(lbo),
-      q(3825) => q(lbq),
-      q(3826) => q(lbr),
-      q(3827) => q(lbs),
-      q(3828) => q(lbt),
-      q(3829) => q(lbu),
-      q(3830) => q(lbv),
-      q(3831) => q(lbw),
-      q(3832) => q(lbx),
-      q(3833) => q(lby),
-      q(3834) => q(lbz),
-      q(3835) => q(lcc),
-      q(3836) => q(lcd),
-      q(3837) => q(lce),
-      q(3838) => q(lcf),
-      q(3839) => q(lch),
-      q(3840) => q(lcl),
-      q(3841) => q(lcm),
-      q(3842) => q(lcp),
-      q(3843) => q(lcq),
-      q(3844) => q(lcs),
-      q(3845) => q(lda),
-      q(3846) => q(ldb),
-      q(3847) => q(ldd),
-      q(3848) => q(ldg),
-      q(3849) => q(ldh),
-      q(3850) => q(ldi),
-      q(3851) => q(ldj),
-      q(3852) => q(ldk),
-      q(3853) => q(ldl),
-      q(3854) => q(ldm),
-      q(3855) => q(ldn),
-      q(3856) => q(ldo),
-      q(3857) => q(ldp),
-      q(3858) => q(ldq),
-      q(3859) => q(lea),
-      q(3860) => q(leb),
-      q(3861) => q(lec),
-      q(3862) => q(led),
-      q(3863) => q(lee),
-      q(3864) => q(lef),
-      q(3865) => q(leh),
-      q(3866) => q(lei),
-      q(3867) => q(lej),
-      q(3868) => q(lek),
-      q(3869) => q(lel),
-      q(3870) => q(lem),
-      q(3871) => q(len),
-      q(3872) => q(leo),
-      q(3873) => q(lep),
-      q(3874) => q(leq),
-      q(3875) => q(ler),
-      q(3876) => q(les),
-      q(3877) => q(let),
-      q(3878) => q(leu),
-      q(3879) => q(lev),
-      q(3880) => q(lew),
-      q(3881) => q(lex),
-      q(3882) => q(ley),
-      q(3883) => q(lfa),
-      q(3884) => q(lfn),
-      q(3885) => q(lga),
-      q(3886) => q(lgb),
-      q(3887) => q(lgg),
-      q(3888) => q(lgh),
-      q(3889) => q(lgi),
-      q(3890) => q(lgk),
-      q(3891) => q(lgl),
-      q(3892) => q(lgm),
-      q(3893) => q(lgn),
-      q(3894) => q(lgq),
-      q(3895) => q(lgr),
-      q(3896) => q(lgt),
-      q(3897) => q(lgu),
-      q(3898) => q(lgz),
-      q(3899) => q(lha),
-      q(3900) => q(lhh),
-      q(3901) => q(lhi),
-      q(3902) => q(lhl),
-      q(3903) => q(lhm),
-      q(3904) => q(lhn),
-      q(3905) => q(lhp),
-      q(3906) => q(lhs),
-      q(3907) => q(lht),
-      q(3908) => q(lhu),
-      q(3909) => q(lia),
-      q(3910) => q(lib),
-      q(3911) => q(lic),
-      q(3912) => q(lid),
-      q(3913) => q(lie),
-      q(3914) => q(lif),
-      q(3915) => q(lig),
-      q(3916) => q(lih),
-      q(3917) => q(lij),
-      q(3918) => q(lik),
-      q(3919) => q(lil),
-      q(3920) => q(lio),
-      q(3921) => q(lip),
-      q(3922) => q(liq),
-      q(3923) => q(lir),
-      q(3924) => q(lis),
-      q(3925) => q(liu),
-      q(3926) => q(liv),
-      q(3927) => q(liw),
-      q(3928) => q(lix),
-      q(3929) => q(liy),
-      q(3930) => q(liz),
-      q(3931) => q(lja),
-      q(3932) => q(lje),
-      q(3933) => q(lji),
-      q(3934) => q(ljl),
-      q(3935) => q(ljp),
-      q(3936) => q(ljw),
-      q(3937) => q(ljx),
-      q(3938) => q(lka),
-      q(3939) => q(lkb),
-      q(3940) => q(lkc),
-      q(3941) => q(lkd),
-      q(3942) => q(lke),
-      q(3943) => q(lkh),
-      q(3944) => q(lki),
-      q(3945) => q(lkj),
-      q(3946) => q(lkl),
-      q(3947) => q(lkm),
-      q(3948) => q(lkn),
-      q(3949) => q(lko),
-      q(3950) => q(lkr),
-      q(3951) => q(lks),
-      q(3952) => q(lkt),
-      q(3953) => q(lku),
-      q(3954) => q(lky),
-      q(3955) => q(lla),
-      q(3956) => q(llb),
-      q(3957) => q(llc),
-      q(3958) => q(lld),
-      q(3959) => q(lle),
-      q(3960) => q(llf),
-      q(3961) => q(llg),
-      q(3962) => q(llh),
-      q(3963) => q(lli),
-      q(3964) => q(llj),
-      q(3965) => q(llk),
-      q(3966) => q(lll),
-      q(3967) => q(llm),
-      q(3968) => q(lln),
-      q(3969) => q(llo),
-      q(3970) => q(llp),
-      q(3971) => q(llq),
-      q(3972) => q(lls),
-      q(3973) => q(llu),
-      q(3974) => q(llx),
-      q(3975) => q(lma),
-      q(3976) => q(lmb),
-      q(3977) => q(lmc),
-      q(3978) => q(lmd),
-      q(3979) => q(lme),
-      q(3980) => q(lmf),
-      q(3981) => q(lmg),
-      q(3982) => q(lmh),
-      q(3983) => q(lmi),
-      q(3984) => q(lmj),
-      q(3985) => q(lmk),
-      q(3986) => q(lml),
-      q(3987) => q(lmn),
-      q(3988) => q(lmo),
-      q(3989) => q(lmp),
-      q(3990) => q(lmq),
-      q(3991) => q(lmr),
-      q(3992) => q(lmu),
-      q(3993) => q(lmv),
-      q(3994) => q(lmw),
-      q(3995) => q(lmx),
-      q(3996) => q(lmy),
-      q(3997) => q(lmz),
-      q(3998) => q(lna),
-      q(3999) => q(lnb),
-      q(4000) => q(lnd),
-      q(4001) => q(lng),
-      q(4002) => q(lnh),
-      q(4003) => q(lni),
-      q(4004) => q(lnj),
-      q(4005) => q(lnl),
-      q(4006) => q(lnm),
-      q(4007) => q(lnn),
-      q(4008) => q(lno),
-      q(4009) => q(lns),
-      q(4010) => q(lnu),
-      q(4011) => q(lnw),
-      q(4012) => q(lnz),
-      q(4013) => q(loa),
-      q(4014) => q(lob),
-      q(4015) => q(loc),
-      q(4016) => q(loe),
-      q(4017) => q(lof),
-      q(4018) => q(log),
-      q(4019) => q(loh),
-      q(4020) => q(loi),
-      q(4021) => q(loj),
-      q(4022) => q(lok),
-      q(4023) => q(lom),
-      q(4024) => q(lon),
-      q(4025) => q(loo),
-      q(4026) => q(lop),
-      q(4027) => q(loq),
-      q(4028) => q(lor),
-      q(4029) => q(los),
-      q(4030) => q(lot),
-      q(4031) => q(lou),
-      q(4032) => q(lov),
-      q(4033) => q(low),
-      q(4034) => q(lox),
-      q(4035) => q(loy),
-      q(4036) => q(lpa),
-      q(4037) => q(lpe),
-      q(4038) => q(lpn),
-      q(4039) => q(lpo),
-      q(4040) => q(lpx),
-      q(4041) => q(lra),
-      q(4042) => q(lrc),
-      q(4043) => q(lre),
-      q(4044) => q(lrg),
-      q(4045) => q(lri),
-      q(4046) => q(lrk),
-      q(4047) => q(lrl),
-      q(4048) => q(lrm),
-      q(4049) => q(lrn),
-      q(4050) => q(lro),
-      q(4051) => q(lrr),
-      q(4052) => q(lrt),
-      q(4053) => q(lrv),
-      q(4054) => q(lrz),
-      q(4055) => q(lsa),
-      q(4056) => q(lsd),
-      q(4057) => q(lse),
-      q(4058) => q(lsg),
-      q(4059) => q(lsh),
-      q(4060) => q(lsi),
-      q(4061) => q(lsl),
-      q(4062) => q(lsm),
-      q(4063) => q(lso),
-      q(4064) => q(lsp),
-      q(4065) => q(lsr),
-      q(4066) => q(lss),
-      q(4067) => q(lst),
-      q(4068) => q(lsy),
-      q(4069) => q(ltc),
-      q(4070) => q(ltg),
-      q(4071) => q(lti),
-      q(4072) => q(ltn),
-      q(4073) => q(lto),
-      q(4074) => q(lts),
-      q(4075) => q(ltu),
-      q(4076) => q(luc),
-      q(4077) => q(lud),
-      q(4078) => q(lue),
-      q(4079) => q(luf),
-      q(4080) => q(luj),
-      q(4081) => q(luk),
-      q(4082) => q(lul),
-      q(4083) => q(lum),
-      q(4084) => q(lup),
-      q(4085) => q(luq),
-      q(4086) => q(lur),
-      q(4087) => q(lut),
-      q(4088) => q(luu),
-      q(4089) => q(luv),
-      q(4090) => q(luw),
-      q(4091) => q(luy),
-      q(4092) => q(luz),
-      q(4093) => q(lva),
-      q(4094) => q(lvk),
-      q(4095) => q(lvs),
-      q(4096) => q(lvu),
-      q(4097) => q(lwa),
-      q(4098) => q(lwe),
-      q(4099) => q(lwg),
-      q(4100) => q(lwh),
-      q(4101) => q(lwl),
-      q(4102) => q(lwm),
-      q(4103) => q(lwo),
-      q(4104) => q(lwt),
-      q(4105) => q(lwu),
-      q(4106) => q(lww),
-      q(4107) => q(lya),
-      q(4108) => q(lyg),
-      q(4109) => q(lyn),
-      q(4110) => q(lzh),
-      q(4111) => q(lzl),
-      q(4112) => q(lzn),
-      q(4113) => q(lzz),
-      q(4114) => q(maa),
-      q(4115) => q(mab),
-      q(4116) => q(mae),
-      q(4117) => q(maf),
-      q(4118) => q(maj),
-      q(4119) => q(mam),
-      q(4120) => q(maq),
-      q(4121) => q(mat),
-      q(4122) => q(mau),
-      q(4123) => q(mav),
-      q(4124) => q(maw),
-      q(4125) => q(max),
-      q(4126) => q(maz),
-      q(4127) => q(mba),
-      q(4128) => q(mbb),
-      q(4129) => q(mbc),
-      q(4130) => q(mbd),
-      q(4131) => q(mbe),
-      q(4132) => q(mbf),
-      q(4133) => q(mbh),
-      q(4134) => q(mbi),
-      q(4135) => q(mbj),
-      q(4136) => q(mbk),
-      q(4137) => q(mbl),
-      q(4138) => q(mbm),
-      q(4139) => q(mbn),
-      q(4140) => q(mbo),
-      q(4141) => q(mbp),
-      q(4142) => q(mbq),
-      q(4143) => q(mbr),
-      q(4144) => q(mbs),
-      q(4145) => q(mbt),
-      q(4146) => q(mbu),
-      q(4147) => q(mbv),
-      q(4148) => q(mbw),
-      q(4149) => q(mbx),
-      q(4150) => q(mby),
-      q(4151) => q(mbz),
-      q(4152) => q(mca),
-      q(4153) => q(mcb),
-      q(4154) => q(mcc),
-      q(4155) => q(mcd),
-      q(4156) => q(mce),
-      q(4157) => q(mcf),
-      q(4158) => q(mcg),
-      q(4159) => q(mch),
-      q(4160) => q(mci),
-      q(4161) => q(mcj),
-      q(4162) => q(mck),
-      q(4163) => q(mcl),
-      q(4164) => q(mcm),
-      q(4165) => q(mcn),
-      q(4166) => q(mco),
-      q(4167) => q(mcp),
-      q(4168) => q(mcq),
-      q(4169) => q(mcr),
-      q(4170) => q(mcs),
-      q(4171) => q(mct),
-      q(4172) => q(mcu),
-      q(4173) => q(mcv),
-      q(4174) => q(mcw),
-      q(4175) => q(mcx),
-      q(4176) => q(mcy),
-      q(4177) => q(mcz),
-      q(4178) => q(mda),
-      q(4179) => q(mdb),
-      q(4180) => q(mdc),
-      q(4181) => q(mdd),
-      q(4182) => q(mde),
-      q(4183) => q(mdg),
-      q(4184) => q(mdh),
-      q(4185) => q(mdi),
-      q(4186) => q(mdj),
-      q(4187) => q(mdk),
-      q(4188) => q(mdl),
-      q(4189) => q(mdm),
-      q(4190) => q(mdn),
-      q(4191) => q(mdp),
-      q(4192) => q(mdq),
-      q(4193) => q(mds),
-      q(4194) => q(mdt),
-      q(4195) => q(mdu),
-      q(4196) => q(mdv),
-      q(4197) => q(mdw),
-      q(4198) => q(mdx),
-      q(4199) => q(mdy),
-      q(4200) => q(mdz),
-      q(4201) => q(mea),
-      q(4202) => q(meb),
-      q(4203) => q(mec),
-      q(4204) => q(med),
-      q(4205) => q(mee),
-      q(4206) => q(mef),
-      q(4207) => q(meh),
-      q(4208) => q(mei),
-      q(4209) => q(mej),
-      q(4210) => q(mek),
-      q(4211) => q(mel),
-      q(4212) => q(mem),
-      q(4213) => q(meo),
-      q(4214) => q(mep),
-      q(4215) => q(meq),
-      q(4216) => q(mer),
-      q(4217) => q(mes),
-      q(4218) => q(met),
-      q(4219) => q(meu),
-      q(4220) => q(mev),
-      q(4221) => q(mew),
-      q(4222) => q(mey),
-      q(4223) => q(mez),
-      q(4224) => q(mfa),
-      q(4225) => q(mfb),
-      q(4226) => q(mfc),
-      q(4227) => q(mfd),
-      q(4228) => q(mfe),
-      q(4229) => q(mff),
-      q(4230) => q(mfg),
-      q(4231) => q(mfh),
-      q(4232) => q(mfi),
-      q(4233) => q(mfj),
-      q(4234) => q(mfk),
-      q(4235) => q(mfl),
-      q(4236) => q(mfm),
-      q(4237) => q(mfn),
-      q(4238) => q(mfo),
-      q(4239) => q(mfp),
-      q(4240) => q(mfq),
-      q(4241) => q(mfr),
-      q(4242) => q(mfs),
-      q(4243) => q(mft),
-      q(4244) => q(mfu),
-      q(4245) => q(mfv),
-      q(4246) => q(mfw),
-      q(4247) => q(mfx),
-      q(4248) => q(mfy),
-      q(4249) => q(mfz),
-      q(4250) => q(mgb),
-      q(4251) => q(mgc),
-      q(4252) => q(mgd),
-      q(4253) => q(mge),
-      q(4254) => q(mgf),
-      q(4255) => q(mgg),
-      q(4256) => q(mgh),
-      q(4257) => q(mgi),
-      q(4258) => q(mgj),
-      q(4259) => q(mgk),
-      q(4260) => q(mgl),
-      q(4261) => q(mgm),
-      q(4262) => q(mgn),
-      q(4263) => q(mgo),
-      q(4264) => q(mgp),
-      q(4265) => q(mgq),
-      q(4266) => q(mgr),
-      q(4267) => q(mgs),
-      q(4268) => q(mgt),
-      q(4269) => q(mgu),
-      q(4270) => q(mgv),
-      q(4271) => q(mgw),
-      q(4272) => q(mgy),
-      q(4273) => q(mgz),
-      q(4274) => q(mha),
-      q(4275) => q(mhb),
-      q(4276) => q(mhc),
-      q(4277) => q(mhd),
-      q(4278) => q(mhe),
-      q(4279) => q(mhf),
-      q(4280) => q(mhg),
-      q(4281) => q(mhi),
-      q(4282) => q(mhj),
-      q(4283) => q(mhk),
-      q(4284) => q(mhl),
-      q(4285) => q(mhm),
-      q(4286) => q(mhn),
-      q(4287) => q(mho),
-      q(4288) => q(mhp),
-      q(4289) => q(mhq),
-      q(4290) => q(mhr),
-      q(4291) => q(mhs),
-      q(4292) => q(mht),
-      q(4293) => q(mhu),
-      q(4294) => q(mhw),
-      q(4295) => q(mhx),
-      q(4296) => q(mhy),
-      q(4297) => q(mhz),
-      q(4298) => q(mia),
-      q(4299) => q(mib),
-      q(4300) => q(mid),
-      q(4301) => q(mie),
-      q(4302) => q(mif),
-      q(4303) => q(mig),
-      q(4304) => q(mih),
-      q(4305) => q(mii),
-      q(4306) => q(mij),
-      q(4307) => q(mik),
-      q(4308) => q(mil),
-      q(4309) => q(mim),
-      q(4310) => q(mio),
-      q(4311) => q(mip),
-      q(4312) => q(miq),
-      q(4313) => q(mir),
-      q(4314) => q(mit),
-      q(4315) => q(miu),
-      q(4316) => q(miw),
-      q(4317) => q(mix),
-      q(4318) => q(miy),
-      q(4319) => q(miz),
-      q(4320) => q(mjc),
-      q(4321) => q(mjd),
-      q(4322) => q(mje),
-      q(4323) => q(mjg),
-      q(4324) => q(mjh),
-      q(4325) => q(mji),
-      q(4326) => q(mjj),
-      q(4327) => q(mjk),
-      q(4328) => q(mjl),
-      q(4329) => q(mjm),
-      q(4330) => q(mjn),
-      q(4331) => q(mjo),
-      q(4332) => q(mjp),
-      q(4333) => q(mjq),
-      q(4334) => q(mjr),
-      q(4335) => q(mjs),
-      q(4336) => q(mjt),
-      q(4337) => q(mju),
-      q(4338) => q(mjv),
-      q(4339) => q(mjw),
-      q(4340) => q(mjx),
-      q(4341) => q(mjy),
-      q(4342) => q(mjz),
-      q(4343) => q(mka),
-      q(4344) => q(mkb),
-      q(4345) => q(mkc),
-      q(4346) => q(mke),
-      q(4347) => q(mkf),
-      q(4348) => q(mkg),
-      q(4349) => q(mki),
-      q(4350) => q(mkj),
-      q(4351) => q(mkk),
-      q(4352) => q(mkl),
-      q(4353) => q(mkm),
-      q(4354) => q(mkn),
-      q(4355) => q(mko),
-      q(4356) => q(mkp),
-      q(4357) => q(mkq),
-      q(4358) => q(mkr),
-      q(4359) => q(mks),
-      q(4360) => q(mkt),
-      q(4361) => q(mku),
-      q(4362) => q(mkv),
-      q(4363) => q(mkw),
-      q(4364) => q(mkx),
-      q(4365) => q(mky),
-      q(4366) => q(mkz),
-      q(4367) => q(mla),
-      q(4368) => q(mlb),
-      q(4369) => q(mlc),
-      q(4370) => q(mle),
-      q(4371) => q(mlf),
-      q(4372) => q(mlh),
-      q(4373) => q(mli),
-      q(4374) => q(mlj),
-      q(4375) => q(mlk),
-      q(4376) => q(mll),
-      q(4377) => q(mlm),
-      q(4378) => q(mln),
-      q(4379) => q(mlo),
-      q(4380) => q(mlp),
-      q(4381) => q(mlq),
-      q(4382) => q(mlr),
-      q(4383) => q(mls),
-      q(4384) => q(mlu),
-      q(4385) => q(mlv),
-      q(4386) => q(mlw),
-      q(4387) => q(mlx),
-      q(4388) => q(mlz),
-      q(4389) => q(mma),
-      q(4390) => q(mmb),
-      q(4391) => q(mmc),
-      q(4392) => q(mmd),
-      q(4393) => q(mme),
-      q(4394) => q(mmf),
-      q(4395) => q(mmg),
-      q(4396) => q(mmh),
-      q(4397) => q(mmi),
-      q(4398) => q(mmj),
-      q(4399) => q(mmk),
-      q(4400) => q(mml),
-      q(4401) => q(mmm),
-      q(4402) => q(mmn),
-      q(4403) => q(mmo),
-      q(4404) => q(mmp),
-      q(4405) => q(mmq),
-      q(4406) => q(mmr),
-      q(4407) => q(mmt),
-      q(4408) => q(mmu),
-      q(4409) => q(mmv),
-      q(4410) => q(mmw),
-      q(4411) => q(mmx),
-      q(4412) => q(mmy),
-      q(4413) => q(mmz),
-      q(4414) => q(mna),
-      q(4415) => q(mnb),
-      q(4416) => q(mnd),
-      q(4417) => q(mne),
-      q(4418) => q(mnf),
-      q(4419) => q(mng),
-      q(4420) => q(mnh),
-      q(4421) => q(mnj),
-      q(4422) => q(mnk),
-      q(4423) => q(mnl),
-      q(4424) => q(mnm),
-      q(4425) => q(mnn),
-      q(4426) => q(mnp),
-      q(4427) => q(mnq),
-      q(4428) => q(mnr),
-      q(4429) => q(mns),
-      q(4430) => q(mnu),
-      q(4431) => q(mnv),
-      q(4432) => q(mnw),
-      q(4433) => q(mnx),
-      q(4434) => q(mny),
-      q(4435) => q(mnz),
-      q(4436) => q(moa),
-      q(4437) => q(moc),
-      q(4438) => q(mod),
-      q(4439) => q(moe),
-      q(4440) => q(mog),
-      q(4441) => q(moi),
-      q(4442) => q(moj),
-      q(4443) => q(mok),
-      q(4444) => q(mom),
-      q(4445) => q(moo),
-      q(4446) => q(mop),
-      q(4447) => q(moq),
-      q(4448) => q(mor),
-      q(4449) => q(mou),
-      q(4450) => q(mov),
-      q(4451) => q(mow),
-      q(4452) => q(mox),
-      q(4453) => q(moy),
-      q(4454) => q(moz),
-      q(4455) => q(mpa),
-      q(4456) => q(mpb),
-      q(4457) => q(mpc),
-      q(4458) => q(mpd),
-      q(4459) => q(mpe),
-      q(4460) => q(mpg),
-      q(4461) => q(mph),
-      q(4462) => q(mpi),
-      q(4463) => q(mpj),
-      q(4464) => q(mpk),
-      q(4465) => q(mpl),
-      q(4466) => q(mpm),
-      q(4467) => q(mpn),
-      q(4468) => q(mpo),
-      q(4469) => q(mpp),
-      q(4470) => q(mpq),
-      q(4471) => q(mpr),
-      q(4472) => q(mps),
-      q(4473) => q(mpt),
-      q(4474) => q(mpu),
-      q(4475) => q(mpv),
-      q(4476) => q(mpw),
-      q(4477) => q(mpx),
-      q(4478) => q(mpy),
-      q(4479) => q(mpz),
-      q(4480) => q(mqa),
-      q(4481) => q(mqb),
-      q(4482) => q(mqc),
-      q(4483) => q(mqe),
-      q(4484) => q(mqf),
-      q(4485) => q(mqg),
-      q(4486) => q(mqh),
-      q(4487) => q(mqi),
-      q(4488) => q(mqj),
-      q(4489) => q(mqk),
-      q(4490) => q(mql),
-      q(4491) => q(mqm),
-      q(4492) => q(mqn),
-      q(4493) => q(mqo),
-      q(4494) => q(mqp),
-      q(4495) => q(mqq),
-      q(4496) => q(mqr),
-      q(4497) => q(mqs),
-      q(4498) => q(mqt),
-      q(4499) => q(mqu),
-      q(4500) => q(mqv),
-      q(4501) => q(mqw),
-      q(4502) => q(mqx),
-      q(4503) => q(mqy),
-      q(4504) => q(mqz),
-      q(4505) => q(mra),
-      q(4506) => q(mrb),
-      q(4507) => q(mrc),
-      q(4508) => q(mrd),
-      q(4509) => q(mre),
-      q(4510) => q(mrf),
-      q(4511) => q(mrg),
-      q(4512) => q(mrh),
-      q(4513) => q(mrj),
-      q(4514) => q(mrk),
-      q(4515) => q(mrl),
-      q(4516) => q(mrm),
-      q(4517) => q(mrn),
-      q(4518) => q(mro),
-      q(4519) => q(mrp),
-      q(4520) => q(mrq),
-      q(4521) => q(mrr),
-      q(4522) => q(mrs),
-      q(4523) => q(mrt),
-      q(4524) => q(mru),
-      q(4525) => q(mrv),
-      q(4526) => q(mrw),
-      q(4527) => q(mrx),
-      q(4528) => q(mry),
-      q(4529) => q(mrz),
-      q(4530) => q(msb),
-      q(4531) => q(msc),
-      q(4532) => q(msd),
-      q(4533) => q(mse),
-      q(4534) => q(msf),
-      q(4535) => q(msg),
-      q(4536) => q(msh),
-      q(4537) => q(msi),
-      q(4538) => q(msj),
-      q(4539) => q(msk),
-      q(4540) => q(msl),
-      q(4541) => q(msm),
-      q(4542) => q(msn),
-      q(4543) => q(mso),
-      q(4544) => q(msp),
-      q(4545) => q(msq),
-      q(4546) => q(msr),
-      q(4547) => q(mss),
-      q(4548) => q(msu),
-      q(4549) => q(msv),
-      q(4550) => q(msw),
-      q(4551) => q(msx),
-      q(4552) => q(msy),
-      q(4553) => q(msz),
-      q(4554) => q(mta),
-      q(4555) => q(mtb),
-      q(4556) => q(mtc),
-      q(4557) => q(mtd),
-      q(4558) => q(mte),
-      q(4559) => q(mtf),
-      q(4560) => q(mtg),
-      q(4561) => q(mth),
-      q(4562) => q(mti),
-      q(4563) => q(mtj),
-      q(4564) => q(mtk),
-      q(4565) => q(mtl),
-      q(4566) => q(mtm),
-      q(4567) => q(mtn),
-      q(4568) => q(mto),
-      q(4569) => q(mtp),
-      q(4570) => q(mtq),
-      q(4571) => q(mtr),
-      q(4572) => q(mts),
-      q(4573) => q(mtt),
-      q(4574) => q(mtu),
-      q(4575) => q(mtv),
-      q(4576) => q(mtw),
-      q(4577) => q(mtx),
-      q(4578) => q(mty),
-      q(4579) => q(mua),
-      q(4580) => q(mub),
-      q(4581) => q(muc),
-      q(4582) => q(mud),
-      q(4583) => q(mue),
-      q(4584) => q(mug),
-      q(4585) => q(muh),
-      q(4586) => q(mui),
-      q(4587) => q(muj),
-      q(4588) => q(muk),
-      q(4589) => q(mum),
-      q(4590) => q(muo),
-      q(4591) => q(mup),
-      q(4592) => q(muq),
-      q(4593) => q(mur),
-      q(4594) => q(mut),
-      q(4595) => q(muu),
-      q(4596) => q(muv),
-      q(4597) => q(mux),
-      q(4598) => q(muy),
-      q(4599) => q(muz),
-      q(4600) => q(mva),
-      q(4601) => q(mvb),
-      q(4602) => q(mvd),
-      q(4603) => q(mve),
-      q(4604) => q(mvf),
-      q(4605) => q(mvg),
-      q(4606) => q(mvh),
-      q(4607) => q(mvi),
-      q(4608) => q(mvk),
-      q(4609) => q(mvl),
-      q(4610) => q(mvm),
-      q(4611) => q(mvn),
-      q(4612) => q(mvo),
-      q(4613) => q(mvp),
-      q(4614) => q(mvq),
-      q(4615) => q(mvr),
-      q(4616) => q(mvs),
-      q(4617) => q(mvt),
-      q(4618) => q(mvu),
-      q(4619) => q(mvv),
-      q(4620) => q(mvw),
-      q(4621) => q(mvx),
-      q(4622) => q(mvy),
-      q(4623) => q(mvz),
-      q(4624) => q(mwa),
-      q(4625) => q(mwb),
-      q(4626) => q(mwc),
-      q(4627) => q(mwe),
-      q(4628) => q(mwf),
-      q(4629) => q(mwg),
-      q(4630) => q(mwh),
-      q(4631) => q(mwi),
-      q(4632) => q(mwk),
-      q(4633) => q(mwm),
-      q(4634) => q(mwn),
-      q(4635) => q(mwo),
-      q(4636) => q(mwp),
-      q(4637) => q(mwq),
-      q(4638) => q(mws),
-      q(4639) => q(mwt),
-      q(4640) => q(mwu),
-      q(4641) => q(mwv),
-      q(4642) => q(mww),
-      q(4643) => q(mwx),
-      q(4644) => q(mwy),
-      q(4645) => q(mwz),
-      q(4646) => q(mxa),
-      q(4647) => q(mxb),
-      q(4648) => q(mxc),
-      q(4649) => q(mxd),
-      q(4650) => q(mxe),
-      q(4651) => q(mxf),
-      q(4652) => q(mxg),
-      q(4653) => q(mxh),
-      q(4654) => q(mxi),
-      q(4655) => q(mxj),
-      q(4656) => q(mxk),
-      q(4657) => q(mxl),
-      q(4658) => q(mxm),
-      q(4659) => q(mxn),
-      q(4660) => q(mxo),
-      q(4661) => q(mxp),
-      q(4662) => q(mxq),
-      q(4663) => q(mxr),
-      q(4664) => q(mxs),
-      q(4665) => q(mxt),
-      q(4666) => q(mxu),
-      q(4667) => q(mxv),
-      q(4668) => q(mxw),
-      q(4669) => q(mxx),
-      q(4670) => q(mxy),
-      q(4671) => q(mxz),
-      q(4672) => q(myb),
-      q(4673) => q(myc),
-      q(4674) => q(myd),
-      q(4675) => q(mye),
-      q(4676) => q(myf),
-      q(4677) => q(myg),
-      q(4678) => q(myh),
-      q(4679) => q(myi),
-      q(4680) => q(myj),
-      q(4681) => q(myk),
-      q(4682) => q(myl),
-      q(4683) => q(mym),
-      q(4684) => q(myo),
-      q(4685) => q(myp),
-      q(4686) => q(myr),
-      q(4687) => q(mys),
-      q(4688) => q(myu),
-      q(4689) => q(myw),
-      q(4690) => q(myx),
-      q(4691) => q(myy),
-      q(4692) => q(myz),
-      q(4693) => q(mza),
-      q(4694) => q(mzb),
-      q(4695) => q(mzc),
-      q(4696) => q(mzd),
-      q(4697) => q(mze),
-      q(4698) => q(mzg),
-      q(4699) => q(mzh),
-      q(4700) => q(mzi),
-      q(4701) => q(mzj),
-      q(4702) => q(mzk),
-      q(4703) => q(mzl),
-      q(4704) => q(mzm),
-      q(4705) => q(mzn),
-      q(4706) => q(mzo),
-      q(4707) => q(mzp),
-      q(4708) => q(mzq),
-      q(4709) => q(mzr),
-      q(4710) => q(mzs),
-      q(4711) => q(mzt),
-      q(4712) => q(mzu),
-      q(4713) => q(mzv),
-      q(4714) => q(mzw),
-      q(4715) => q(mzx),
-      q(4716) => q(mzy),
-      q(4717) => q(mzz),
-      q(4718) => q(naa),
-      q(4719) => q(nab),
-      q(4720) => q(nac),
-      q(4721) => q(nad),
-      q(4722) => q(nae),
-      q(4723) => q(naf),
-      q(4724) => q(nag),
-      q(4725) => q(naj),
-      q(4726) => q(nak),
-      q(4727) => q(nal),
-      q(4728) => q(nam),
-      q(4729) => q(nan),
-      q(4730) => q(nao),
-      q(4731) => q(naq),
-      q(4732) => q(nar),
-      q(4733) => q(nas),
-      q(4734) => q(nat),
-      q(4735) => q(naw),
-      q(4736) => q(nax),
-      q(4737) => q(nay),
-      q(4738) => q(naz),
-      q(4739) => q(nba),
-      q(4740) => q(nbb),
-      q(4741) => q(nbc),
-      q(4742) => q(nbd),
-      q(4743) => q(nbe),
-      q(4744) => q(nbg),
-      q(4745) => q(nbh),
-      q(4746) => q(nbi),
-      q(4747) => q(nbj),
-      q(4748) => q(nbk),
-      q(4749) => q(nbm),
-      q(4750) => q(nbn),
-      q(4751) => q(nbo),
-      q(4752) => q(nbp),
-      q(4753) => q(nbq),
-      q(4754) => q(nbr),
-      q(4755) => q(nbs),
-      q(4756) => q(nbt),
-      q(4757) => q(nbu),
-      q(4758) => q(nbv),
-      q(4759) => q(nbw),
-      q(4760) => q(nby),
-      q(4761) => q(nca),
-      q(4762) => q(ncb),
-      q(4763) => q(ncc),
-      q(4764) => q(ncd),
-      q(4765) => q(nce),
-      q(4766) => q(ncf),
-      q(4767) => q(ncg),
-      q(4768) => q(nch),
-      q(4769) => q(nci),
-      q(4770) => q(ncj),
-      q(4771) => q(nck),
-      q(4772) => q(ncl),
-      q(4773) => q(ncm),
-      q(4774) => q(ncn),
-      q(4775) => q(nco),
-      q(4776) => q(ncp),
-      q(4777) => q(ncr),
-      q(4778) => q(ncs),
-      q(4779) => q(nct),
-      q(4780) => q(ncu),
-      q(4781) => q(ncx),
-      q(4782) => q(ncz),
-      q(4783) => q(nda),
-      q(4784) => q(ndb),
-      q(4785) => q(ndc),
-      q(4786) => q(ndd),
-      q(4787) => q(ndf),
-      q(4788) => q(ndg),
-      q(4789) => q(ndh),
-      q(4790) => q(ndi),
-      q(4791) => q(ndj),
-      q(4792) => q(ndk),
-      q(4793) => q(ndl),
-      q(4794) => q(ndm),
-      q(4795) => q(ndn),
-      q(4796) => q(ndp),
-      q(4797) => q(ndq),
-      q(4798) => q(ndr),
-      q(4799) => q(ndt),
-      q(4800) => q(ndu),
-      q(4801) => q(ndv),
-      q(4802) => q(ndw),
-      q(4803) => q(ndx),
-      q(4804) => q(ndy),
-      q(4805) => q(ndz),
-      q(4806) => q(nea),
-      q(4807) => q(neb),
-      q(4808) => q(nec),
-      q(4809) => q(ned),
-      q(4810) => q(nee),
-      q(4811) => q(nef),
-      q(4812) => q(neg),
-      q(4813) => q(neh),
-      q(4814) => q(nei),
-      q(4815) => q(nej),
-      q(4816) => q(nek),
-      q(4817) => q(nem),
-      q(4818) => q(nen),
-      q(4819) => q(neo),
-      q(4820) => q(neq),
-      q(4821) => q(ner),
-      q(4822) => q(nes),
-      q(4823) => q(net),
-      q(4824) => q(neu),
-      q(4825) => q(nev),
-      q(4826) => q(nex),
-      q(4827) => q(ney),
-      q(4828) => q(nez),
-      q(4829) => q(nfa),
-      q(4830) => q(nfd),
-      q(4831) => q(nfl),
-      q(4832) => q(nfr),
-      q(4833) => q(nfu),
-      q(4834) => q(nga),
-      q(4835) => q(ngb),
-      q(4836) => q(ngc),
-      q(4837) => q(ngd),
-      q(4838) => q(nge),
-      q(4839) => q(ngg),
-      q(4840) => q(ngh),
-      q(4841) => q(ngi),
-      q(4842) => q(ngj),
-      q(4843) => q(ngk),
-      q(4844) => q(ngl),
-      q(4845) => q(ngm),
-      q(4846) => q(ngn),
-      q(4847) => q(ngo),
-      q(4848) => q(ngp),
-      q(4849) => q(ngq),
-      q(4850) => q(ngr),
-      q(4851) => q(ngs),
-      q(4852) => q(ngt),
-      q(4853) => q(ngu),
-      q(4854) => q(ngv),
-      q(4855) => q(ngw),
-      q(4856) => q(ngx),
-      q(4857) => q(ngy),
-      q(4858) => q(ngz),
-      q(4859) => q(nha),
-      q(4860) => q(nhb),
-      q(4861) => q(nhc),
-      q(4862) => q(nhd),
-      q(4863) => q(nhe),
-      q(4864) => q(nhf),
-      q(4865) => q(nhg),
-      q(4866) => q(nhh),
-      q(4867) => q(nhi),
-      q(4868) => q(nhk),
-      q(4869) => q(nhm),
-      q(4870) => q(nhn),
-      q(4871) => q(nho),
-      q(4872) => q(nhp),
-      q(4873) => q(nhq),
-      q(4874) => q(nhr),
-      q(4875) => q(nht),
-      q(4876) => q(nhu),
-      q(4877) => q(nhv),
-      q(4878) => q(nhw),
-      q(4879) => q(nhx),
-      q(4880) => q(nhy),
-      q(4881) => q(nhz),
-      q(4882) => q(nib),
-      q(4883) => q(nid),
-      q(4884) => q(nie),
-      q(4885) => q(nif),
-      q(4886) => q(nig),
-      q(4887) => q(nih),
-      q(4888) => q(nii),
-      q(4889) => q(nij),
-      q(4890) => q(nik),
-      q(4891) => q(nil),
-      q(4892) => q(nim),
-      q(4893) => q(nin),
-      q(4894) => q(nio),
-      q(4895) => q(niq),
-      q(4896) => q(nir),
-      q(4897) => q(nis),
-      q(4898) => q(nit),
-      q(4899) => q(niv),
-      q(4900) => q(niw),
-      q(4901) => q(nix),
-      q(4902) => q(niy),
-      q(4903) => q(niz),
-      q(4904) => q(nja),
-      q(4905) => q(njb),
-      q(4906) => q(njd),
-      q(4907) => q(njh),
-      q(4908) => q(nji),
-      q(4909) => q(njj),
-      q(4910) => q(njl),
-      q(4911) => q(njm),
-      q(4912) => q(njn),
-      q(4913) => q(njo),
-      q(4914) => q(njr),
-      q(4915) => q(njs),
-      q(4916) => q(njt),
-      q(4917) => q(nju),
-      q(4918) => q(njx),
-      q(4919) => q(njy),
-      q(4920) => q(njz),
-      q(4921) => q(nka),
-      q(4922) => q(nkb),
-      q(4923) => q(nkc),
-      q(4924) => q(nkd),
-      q(4925) => q(nke),
-      q(4926) => q(nkf),
-      q(4927) => q(nkg),
-      q(4928) => q(nkh),
-      q(4929) => q(nki),
-      q(4930) => q(nkj),
-      q(4931) => q(nkk),
-      q(4932) => q(nkm),
-      q(4933) => q(nkn),
-      q(4934) => q(nko),
-      q(4935) => q(nkp),
-      q(4936) => q(nkq),
-      q(4937) => q(nkr),
-      q(4938) => q(nks),
-      q(4939) => q(nkt),
-      q(4940) => q(nku),
-      q(4941) => q(nkv),
-      q(4942) => q(nkw),
-      q(4943) => q(nkx),
-      q(4944) => q(nkz),
-      q(4945) => q(nla),
-      q(4946) => q(nlc),
-      q(4947) => q(nle),
-      q(4948) => q(nlg),
-      q(4949) => q(nli),
-      q(4950) => q(nlj),
-      q(4951) => q(nlk),
-      q(4952) => q(nll),
-      q(4953) => q(nlo),
-      q(4954) => q(nlq),
-      q(4955) => q(nlu),
-      q(4956) => q(nlv),
-      q(4957) => q(nlw),
-      q(4958) => q(nlx),
-      q(4959) => q(nly),
-      q(4960) => q(nlz),
-      q(4961) => q(nma),
-      q(4962) => q(nmb),
-      q(4963) => q(nmc),
-      q(4964) => q(nmd),
-      q(4965) => q(nme),
-      q(4966) => q(nmf),
-      q(4967) => q(nmg),
-      q(4968) => q(nmh),
-      q(4969) => q(nmi),
-      q(4970) => q(nmj),
-      q(4971) => q(nmk),
-      q(4972) => q(nml),
-      q(4973) => q(nmm),
-      q(4974) => q(nmn),
-      q(4975) => q(nmo),
-      q(4976) => q(nmp),
-      q(4977) => q(nmq),
-      q(4978) => q(nmr),
-      q(4979) => q(nms),
-      q(4980) => q(nmt),
-      q(4981) => q(nmu),
-      q(4982) => q(nmv),
-      q(4983) => q(nmw),
-      q(4984) => q(nmx),
-      q(4985) => q(nmy),
-      q(4986) => q(nmz),
-      q(4987) => q(nna),
-      q(4988) => q(nnb),
-      q(4989) => q(nnc),
-      q(4990) => q(nnd),
-      q(4991) => q(nne),
-      q(4992) => q(nnf),
-      q(4993) => q(nng),
-      q(4994) => q(nnh),
-      q(4995) => q(nni),
-      q(4996) => q(nnj),
-      q(4997) => q(nnk),
-      q(4998) => q(nnl),
-      q(4999) => q(nnm),
-      q(5000) => q(nnn),
-      q(5001) => q(nnp),
-      q(5002) => q(nnq),
-      q(5003) => q(nnr),
-      q(5004) => q(nns),
-      q(5005) => q(nnt),
-      q(5006) => q(nnu),
-      q(5007) => q(nnv),
-      q(5008) => q(nnw),
-      q(5009) => q(nny),
-      q(5010) => q(nnz),
-      q(5011) => q(noa),
-      q(5012) => q(noc),
-      q(5013) => q(nod),
-      q(5014) => q(noe),
-      q(5015) => q(nof),
-      q(5016) => q(noh),
-      q(5017) => q(noi),
-      q(5018) => q(noj),
-      q(5019) => q(nok),
-      q(5020) => q(nol),
-      q(5021) => q(nom),
-      q(5022) => q(nop),
-      q(5023) => q(noq),
-      q(5024) => q(nos),
-      q(5025) => q(not),
-      q(5026) => q(nou),
-      q(5027) => q(nov),
-      q(5028) => q(now),
-      q(5029) => q(noy),
-      q(5030) => q(noz),
-      q(5031) => q(npa),
-      q(5032) => q(npb),
-      q(5033) => q(npg),
-      q(5034) => q(nph),
-      q(5035) => q(npi),
-      q(5036) => q(npl),
-      q(5037) => q(npn),
-      q(5038) => q(npo),
-      q(5039) => q(nps),
-      q(5040) => q(npu),
-      q(5041) => q(npy),
-      q(5042) => q(nqg),
-      q(5043) => q(nqk),
-      q(5044) => q(nqm),
-      q(5045) => q(nqn),
-      q(5046) => q(nqq),
-      q(5047) => q(nqy),
-      q(5048) => q(nra),
-      q(5049) => q(nrb),
-      q(5050) => q(nrc),
-      q(5051) => q(nre),
-      q(5052) => q(nrf),
-      q(5053) => q(nrg),
-      q(5054) => q(nri),
-      q(5055) => q(nrk),
-      q(5056) => q(nrl),
-      q(5057) => q(nrm),
-      q(5058) => q(nrn),
-      q(5059) => q(nrp),
-      q(5060) => q(nrr),
-      q(5061) => q(nrt),
-      q(5062) => q(nru),
-      q(5063) => q(nrx),
-      q(5064) => q(nrz),
-      q(5065) => q(nsa),
-      q(5066) => q(nsc),
-      q(5067) => q(nsd),
-      q(5068) => q(nse),
-      q(5069) => q(nsf),
-      q(5070) => q(nsg),
-      q(5071) => q(nsh),
-      q(5072) => q(nsi),
-      q(5073) => q(nsk),
-      q(5074) => q(nsl),
-      q(5075) => q(nsm),
-      q(5076) => q(nsn),
-      q(5077) => q(nsp),
-      q(5078) => q(nsq),
-      q(5079) => q(nsr),
-      q(5080) => q(nss),
-      q(5081) => q(nst),
-      q(5082) => q(nsu),
-      q(5083) => q(nsv),
-      q(5084) => q(nsw),
-      q(5085) => q(nsx),
-      q(5086) => q(nsy),
-      q(5087) => q(nsz),
-      q(5088) => q(nte),
-      q(5089) => q(ntg),
-      q(5090) => q(nti),
-      q(5091) => q(ntj),
-      q(5092) => q(ntk),
-      q(5093) => q(ntm),
-      q(5094) => q(nto),
-      q(5095) => q(ntp),
-      q(5096) => q(ntr),
-      q(5097) => q(nts),
-      q(5098) => q(ntu),
-      q(5099) => q(ntw),
-      q(5100) => q(ntx),
-      q(5101) => q(nty),
-      q(5102) => q(ntz),
-      q(5103) => q(nua),
-      q(5104) => q(nuc),
-      q(5105) => q(nud),
-      q(5106) => q(nue),
-      q(5107) => q(nuf),
-      q(5108) => q(nug),
-      q(5109) => q(nuh),
-      q(5110) => q(nui),
-      q(5111) => q(nuj),
-      q(5112) => q(nuk),
-      q(5113) => q(nul),
-      q(5114) => q(num),
-      q(5115) => q(nun),
-      q(5116) => q(nuo),
-      q(5117) => q(nup),
-      q(5118) => q(nuq),
-      q(5119) => q(nur),
-      q(5120) => q(nus),
-      q(5121) => q(nut),
-      q(5122) => q(nuu),
-      q(5123) => q(nuv),
-      q(5124) => q(nuw),
-      q(5125) => q(nux),
-      q(5126) => q(nuy),
-      q(5127) => q(nuz),
-      q(5128) => q(nvh),
-      q(5129) => q(nvm),
-      q(5130) => q(nvo),
-      q(5131) => q(nwa),
-      q(5132) => q(nwb),
-      q(5133) => q(nwe),
-      q(5134) => q(nwg),
-      q(5135) => q(nwi),
-      q(5136) => q(nwm),
-      q(5137) => q(nwo),
-      q(5138) => q(nwr),
-      q(5139) => q(nwx),
-      q(5140) => q(nwy),
-      q(5141) => q(nxa),
-      q(5142) => q(nxd),
-      q(5143) => q(nxe),
-      q(5144) => q(nxg),
-      q(5145) => q(nxi),
-      q(5146) => q(nxk),
-      q(5147) => q(nxl),
-      q(5148) => q(nxm),
-      q(5149) => q(nxn),
-      q(5150) => q(nxo),
-      q(5151) => q(nxq),
-      q(5152) => q(nxr),
-      q(5153) => q(nxu),
-      q(5154) => q(nxx),
-      q(5155) => q(nyb),
-      q(5156) => q(nyc),
-      q(5157) => q(nyd),
-      q(5158) => q(nye),
-      q(5159) => q(nyf),
-      q(5160) => q(nyg),
-      q(5161) => q(nyh),
-      q(5162) => q(nyi),
-      q(5163) => q(nyj),
-      q(5164) => q(nyk),
-      q(5165) => q(nyl),
-      q(5166) => q(nyp),
-      q(5167) => q(nyq),
-      q(5168) => q(nyr),
-      q(5169) => q(nys),
-      q(5170) => q(nyt),
-      q(5171) => q(nyu),
-      q(5172) => q(nyv),
-      q(5173) => q(nyw),
-      q(5174) => q(nyx),
-      q(5175) => q(nyy),
-      q(5176) => q(nza),
-      q(5177) => q(nzb),
-      q(5178) => q(nzk),
-      q(5179) => q(nzm),
-      q(5180) => q(nzs),
-      q(5181) => q(nzu),
-      q(5182) => q(nzy),
-      q(5183) => q(nzz),
-      q(5184) => q(oaa),
-      q(5185) => q(oac),
-      q(5186) => q(oar),
-      q(5187) => q(oav),
-      q(5188) => q(obi),
-      q(5189) => q(obk),
-      q(5190) => q(obl),
-      q(5191) => q(obm),
-      q(5192) => q(obo),
-      q(5193) => q(obr),
-      q(5194) => q(obt),
-      q(5195) => q(obu),
-      q(5196) => q(oca),
-      q(5197) => q(och),
-      q(5198) => q(oco),
-      q(5199) => q(ocu),
-      q(5200) => q(oda),
-      q(5201) => q(odk),
-      q(5202) => q(odt),
-      q(5203) => q(odu),
-      q(5204) => q(ofo),
-      q(5205) => q(ofs),
-      q(5206) => q(ofu),
-      q(5207) => q(ogb),
-      q(5208) => q(ogc),
-      q(5209) => q(oge),
-      q(5210) => q(ogg),
-      q(5211) => q(ogo),
-      q(5212) => q(ogu),
-      q(5213) => q(oht),
-      q(5214) => q(ohu),
-      q(5215) => q(oia),
-      q(5216) => q(oin),
-      q(5217) => q(ojb),
-      q(5218) => q(ojc),
-      q(5219) => q(ojg),
-      q(5220) => q(ojp),
-      q(5221) => q(ojs),
-      q(5222) => q(ojv),
-      q(5223) => q(ojw),
-      q(5224) => q(oka),
-      q(5225) => q(okb),
-      q(5226) => q(okd),
-      q(5227) => q(oke),
-      q(5228) => q(okg),
-      q(5229) => q(okh),
-      q(5230) => q(oki),
-      q(5231) => q(okj),
-      q(5232) => q(okk),
-      q(5233) => q(okl),
-      q(5234) => q(okm),
-      q(5235) => q(okn),
-      q(5236) => q(oko),
-      q(5237) => q(okr),
-      q(5238) => q(oks),
-      q(5239) => q(oku),
-      q(5240) => q(okv),
-      q(5241) => q(okx),
-      q(5242) => q(ola),
-      q(5243) => q(old),
-      q(5244) => q(ole),
-      q(5245) => q(olk),
-      q(5246) => q(olm),
-      q(5247) => q(olo),
-      q(5248) => q(olr),
-      q(5249) => q(olt),
-      q(5250) => q(oma),
-      q(5251) => q(omb),
-      q(5252) => q(omc),
-      q(5253) => q(ome),
-      q(5254) => q(omg),
-      q(5255) => q(omi),
-      q(5256) => q(omk),
-      q(5257) => q(oml),
-      q(5258) => q(omn),
-      q(5259) => q(omo),
-      q(5260) => q(omp),
-      q(5261) => q(omr),
-      q(5262) => q(omt),
-      q(5263) => q(omu),
-      q(5264) => q(omw),
-      q(5265) => q(omx),
-      q(5266) => q(ona),
-      q(5267) => q(onb),
-      q(5268) => q(one),
-      q(5269) => q(ong),
-      q(5270) => q(oni),
-      q(5271) => q(onj),
-      q(5272) => q(onk),
-      q(5273) => q(onn),
-      q(5274) => q(ono),
-      q(5275) => q(onp),
-      q(5276) => q(onr),
-      q(5277) => q(ons),
-      q(5278) => q(ont),
-      q(5279) => q(onu),
-      q(5280) => q(onw),
-      q(5281) => q(onx),
-      q(5282) => q(ood),
-      q(5283) => q(oog),
-      q(5284) => q(oon),
-      q(5285) => q(oor),
-      q(5286) => q(oos),
-      q(5287) => q(opa),
-      q(5288) => q(opk),
-      q(5289) => q(opm),
-      q(5290) => q(opo),
-      q(5291) => q(opt),
-      q(5292) => q(opy),
-      q(5293) => q(ora),
-      q(5294) => q(orc),
-      q(5295) => q(ore),
-      q(5296) => q(org),
-      q(5297) => q(orh),
-      q(5298) => q(orn),
-      q(5299) => q(oro),
-      q(5300) => q(orr),
-      q(5301) => q(ors),
-      q(5302) => q(ort),
-      q(5303) => q(oru),
-      q(5304) => q(orv),
-      q(5305) => q(orw),
-      q(5306) => q(orx),
-      q(5307) => q(ory),
-      q(5308) => q(orz),
-      q(5309) => q(osc),
-      q(5310) => q(osi),
-      q(5311) => q(oso),
-      q(5312) => q(osp),
-      q(5313) => q(ost),
-      q(5314) => q(osu),
-      q(5315) => q(osx),
-      q(5316) => q(otb),
-      q(5317) => q(otd),
-      q(5318) => q(ote),
-      q(5319) => q(oti),
-      q(5320) => q(otk),
-      q(5321) => q(otl),
-      q(5322) => q(otm),
-      q(5323) => q(otn),
-      q(5324) => q(otq),
-      q(5325) => q(otr),
-      q(5326) => q(ots),
-      q(5327) => q(ott),
-      q(5328) => q(otu),
-      q(5329) => q(otw),
-      q(5330) => q(otx),
-      q(5331) => q(oty),
-      q(5332) => q(otz),
-      q(5333) => q(oua),
-      q(5334) => q(oub),
-      q(5335) => q(oue),
-      q(5336) => q(oui),
-      q(5337) => q(oum),
-      q(5338) => q(owi),
-      q(5339) => q(owl),
-      q(5340) => q(oyb),
-      q(5341) => q(oyd),
-      q(5342) => q(oym),
-      q(5343) => q(oyy),
-      q(5344) => q(ozm),
-      q(5345) => q(pab),
-      q(5346) => q(pac),
-      q(5347) => q(pad),
-      q(5348) => q(pae),
-      q(5349) => q(paf),
-      q(5350) => q(pah),
-      q(5351) => q(pai),
-      q(5352) => q(pak),
-      q(5353) => q(pao),
-      q(5354) => q(paq),
-      q(5355) => q(par),
-      q(5356) => q(pas),
-      q(5357) => q(pat),
-      q(5358) => q(pav),
-      q(5359) => q(paw),
-      q(5360) => q(pax),
-      q(5361) => q(pay),
-      q(5362) => q(paz),
-      q(5363) => q(pbb),
-      q(5364) => q(pbc),
-      q(5365) => q(pbe),
-      q(5366) => q(pbf),
-      q(5367) => q(pbg),
-      q(5368) => q(pbh),
-      q(5369) => q(pbi),
-      q(5370) => q(pbl),
-      q(5371) => q(pbn),
-      q(5372) => q(pbo),
-      q(5373) => q(pbp),
-      q(5374) => q(pbr),
-      q(5375) => q(pbs),
-      q(5376) => q(pbt),
-      q(5377) => q(pbu),
-      q(5378) => q(pbv),
-      q(5379) => q(pby),
-      q(5380) => q(pca),
-      q(5381) => q(pcb),
-      q(5382) => q(pcc),
-      q(5383) => q(pcd),
-      q(5384) => q(pce),
-      q(5385) => q(pcf),
-      q(5386) => q(pcg),
-      q(5387) => q(pch),
-      q(5388) => q(pci),
-      q(5389) => q(pcj),
-      q(5390) => q(pck),
-      q(5391) => q(pcl),
-      q(5392) => q(pcm),
-      q(5393) => q(pcn),
-      q(5394) => q(pcp),
-      q(5395) => q(pcw),
-      q(5396) => q(pda),
-      q(5397) => q(pdc),
-      q(5398) => q(pdi),
-      q(5399) => q(pdn),
-      q(5400) => q(pdo),
-      q(5401) => q(pdt),
-      q(5402) => q(pdu),
-      q(5403) => q(pea),
-      q(5404) => q(peb),
-      q(5405) => q(ped),
-      q(5406) => q(pee),
-      q(5407) => q(pef),
-      q(5408) => q(peg),
-      q(5409) => q(peh),
-      q(5410) => q(pei),
-      q(5411) => q(pej),
-      q(5412) => q(pek),
-      q(5413) => q(pel),
-      q(5414) => q(pem),
-      q(5415) => q(pep),
-      q(5416) => q(peq),
-      q(5417) => q(pes),
-      q(5418) => q(pev),
-      q(5419) => q(pex),
-      q(5420) => q(pey),
-      q(5421) => q(pez),
-      q(5422) => q(pfa),
-      q(5423) => q(pfe),
-      q(5424) => q(pfl),
-      q(5425) => q(pga),
-      q(5426) => q(pgd),
-      q(5427) => q(pgg),
-      q(5428) => q(pgi),
-      q(5429) => q(pgk),
-      q(5430) => q(pgl),
-      q(5431) => q(pgn),
-      q(5432) => q(pgs),
-      q(5433) => q(pgu),
-      q(5434) => q(pha),
-      q(5435) => q(phd),
-      q(5436) => q(phg),
-      q(5437) => q(phh),
-      q(5438) => q(phk),
-      q(5439) => q(phl),
-      q(5440) => q(phm),
-      q(5441) => q(pho),
-      q(5442) => q(phq),
-      q(5443) => q(phr),
-      q(5444) => q(pht),
-      q(5445) => q(phu),
-      q(5446) => q(phv),
-      q(5447) => q(phw),
-      q(5448) => q(pia),
-      q(5449) => q(pib),
-      q(5450) => q(pic),
-      q(5451) => q(pid),
-      q(5452) => q(pie),
-      q(5453) => q(pif),
-      q(5454) => q(pig),
-      q(5455) => q(pih),
-      q(5456) => q(pii),
-      q(5457) => q(pij),
-      q(5458) => q(pil),
-      q(5459) => q(pim),
-      q(5460) => q(pin),
-      q(5461) => q(pio),
-      q(5462) => q(pip),
-      q(5463) => q(pir),
-      q(5464) => q(pis),
-      q(5465) => q(pit),
-      q(5466) => q(piu),
-      q(5467) => q(piv),
-      q(5468) => q(piw),
-      q(5469) => q(pix),
-      q(5470) => q(piy),
-      q(5471) => q(piz),
-      q(5472) => q(pjt),
-      q(5473) => q(pka),
-      q(5474) => q(pkb),
-      q(5475) => q(pkc),
-      q(5476) => q(pkg),
-      q(5477) => q(pkh),
-      q(5478) => q(pkn),
-      q(5479) => q(pko),
-      q(5480) => q(pkp),
-      q(5481) => q(pkr),
-      q(5482) => q(pks),
-      q(5483) => q(pkt),
-      q(5484) => q(pku),
-      q(5485) => q(pla),
-      q(5486) => q(plb),
-      q(5487) => q(plc),
-      q(5488) => q(pld),
-      q(5489) => q(ple),
-      q(5490) => q(plg),
-      q(5491) => q(plh),
-      q(5492) => q(plj),
-      q(5493) => q(plk),
-      q(5494) => q(pll),
-      q(5495) => q(pln),
-      q(5496) => q(plo),
-      q(5497) => q(plp),
-      q(5498) => q(plq),
-      q(5499) => q(plr),
-      q(5500) => q(pls),
-      q(5501) => q(plt),
-      q(5502) => q(plu),
-      q(5503) => q(plv),
-      q(5504) => q(plw),
-      q(5505) => q(ply),
-      q(5506) => q(plz),
-      q(5507) => q(pma),
-      q(5508) => q(pmb),
-      q(5509) => q(pmc),
-      q(5510) => q(pmd),
-      q(5511) => q(pme),
-      q(5512) => q(pmf),
-      q(5513) => q(pmh),
-      q(5514) => q(pmi),
-      q(5515) => q(pmj),
-      q(5516) => q(pmk),
-      q(5517) => q(pml),
-      q(5518) => q(pmm),
-      q(5519) => q(pmn),
-      q(5520) => q(pmo),
-      q(5521) => q(pmq),
-      q(5522) => q(pmr),
-      q(5523) => q(pms),
-      q(5524) => q(pmt),
-      q(5525) => q(pmw),
-      q(5526) => q(pmx),
-      q(5527) => q(pmy),
-      q(5528) => q(pmz),
-      q(5529) => q(pna),
-      q(5530) => q(pnb),
-      q(5531) => q(pnc),
-      q(5532) => q(pne),
-      q(5533) => q(png),
-      q(5534) => q(pnh),
-      q(5535) => q(pni),
-      q(5536) => q(pnj),
-      q(5537) => q(pnk),
-      q(5538) => q(pnl),
-      q(5539) => q(pnm),
-      q(5540) => q(pnn),
-      q(5541) => q(pno),
-      q(5542) => q(pnp),
-      q(5543) => q(pnq),
-      q(5544) => q(pnr),
-      q(5545) => q(pns),
-      q(5546) => q(pnt),
-      q(5547) => q(pnu),
-      q(5548) => q(pnv),
-      q(5549) => q(pnw),
-      q(5550) => q(pnx),
-      q(5551) => q(pny),
-      q(5552) => q(pnz),
-      q(5553) => q(poc),
-      q(5554) => q(pod),
-      q(5555) => q(poe),
-      q(5556) => q(pof),
-      q(5557) => q(pog),
-      q(5558) => q(poh),
-      q(5559) => q(poi),
-      q(5560) => q(pok),
-      q(5561) => q(pom),
-      q(5562) => q(poo),
-      q(5563) => q(pop),
-      q(5564) => q(poq),
-      q(5565) => q(pos),
-      q(5566) => q(pot),
-      q(5567) => q(pov),
-      q(5568) => q(pow),
-      q(5569) => q(pox),
-      q(5570) => q(poy),
-      q(5571) => q(ppa),
-      q(5572) => q(ppe),
-      q(5573) => q(ppi),
-      q(5574) => q(ppk),
-      q(5575) => q(ppl),
-      q(5576) => q(ppm),
-      q(5577) => q(ppn),
-      q(5578) => q(ppo),
-      q(5579) => q(ppp),
-      q(5580) => q(ppq),
-      q(5581) => q(pps),
-      q(5582) => q(ppt),
-      q(5583) => q(ppu),
-      q(5584) => q(pqa),
-      q(5585) => q(pqm),
-      q(5586) => q(prb),
-      q(5587) => q(prc),
-      q(5588) => q(prd),
-      q(5589) => q(pre),
-      q(5590) => q(prf),
-      q(5591) => q(prg),
-      q(5592) => q(prh),
-      q(5593) => q(pri),
-      q(5594) => q(prk),
-      q(5595) => q(prl),
-      q(5596) => q(prm),
-      q(5597) => q(prn),
-      q(5598) => q(prp),
-      q(5599) => q(prq),
-      q(5600) => q(prr),
-      q(5601) => q(prs),
-      q(5602) => q(prt),
-      q(5603) => q(pru),
-      q(5604) => q(prw),
-      q(5605) => q(prx),
-      q(5606) => q(pry),
-      q(5607) => q(prz),
-      q(5608) => q(psa),
-      q(5609) => q(psc),
-      q(5610) => q(psd),
-      q(5611) => q(pse),
-      q(5612) => q(psg),
-      q(5613) => q(psh),
-      q(5614) => q(psi),
-      q(5615) => q(psl),
-      q(5616) => q(psm),
-      q(5617) => q(psn),
-      q(5618) => q(pso),
-      q(5619) => q(psp),
-      q(5620) => q(psq),
-      q(5621) => q(psr),
-      q(5622) => q(pss),
-      q(5623) => q(pst),
-      q(5624) => q(psu),
-      q(5625) => q(psw),
-      q(5626) => q(psy),
-      q(5627) => q(pta),
-      q(5628) => q(pth),
-      q(5629) => q(pti),
-      q(5630) => q(ptn),
-      q(5631) => q(pto),
-      q(5632) => q(ptp),
-      q(5633) => q(ptq),
-      q(5634) => q(ptr),
-      q(5635) => q(ptt),
-      q(5636) => q(ptu),
-      q(5637) => q(ptv),
-      q(5638) => q(ptw),
-      q(5639) => q(pty),
-      q(5640) => q(pua),
-      q(5641) => q(pub),
-      q(5642) => q(puc),
-      q(5643) => q(pud),
-      q(5644) => q(pue),
-      q(5645) => q(puf),
-      q(5646) => q(pug),
-      q(5647) => q(pui),
-      q(5648) => q(puj),
-      q(5649) => q(puk),
-      q(5650) => q(pum),
-      q(5651) => q(puo),
-      q(5652) => q(pup),
-      q(5653) => q(puq),
-      q(5654) => q(pur),
-      q(5655) => q(put),
-      q(5656) => q(puu),
-      q(5657) => q(puw),
-      q(5658) => q(pux),
-      q(5659) => q(puy),
-      q(5660) => q(pwa),
-      q(5661) => q(pwb),
-      q(5662) => q(pwg),
-      q(5663) => q(pwi),
-      q(5664) => q(pwm),
-      q(5665) => q(pwn),
-      q(5666) => q(pwo),
-      q(5667) => q(pwr),
-      q(5668) => q(pww),
-      q(5669) => q(pxm),
-      q(5670) => q(pye),
-      q(5671) => q(pym),
-      q(5672) => q(pyn),
-      q(5673) => q(pys),
-      q(5674) => q(pyu),
-      q(5675) => q(pyx),
-      q(5676) => q(pyy),
-      q(5677) => q(pzn),
-      q(5678) => q(qua),
-      q(5679) => q(qub),
-      q(5680) => q(quc),
-      q(5681) => q(qud),
-      q(5682) => q(quf),
-      q(5683) => q(qug),
-      q(5684) => q(quh),
-      q(5685) => q(qui),
-      q(5686) => q(quk),
-      q(5687) => q(qul),
-      q(5688) => q(qum),
-      q(5689) => q(qun),
-      q(5690) => q(qup),
-      q(5691) => q(quq),
-      q(5692) => q(qur),
-      q(5693) => q(qus),
-      q(5694) => q(quv),
-      q(5695) => q(quw),
-      q(5696) => q(qux),
-      q(5697) => q(quy),
-      q(5698) => q(quz),
-      q(5699) => q(qva),
-      q(5700) => q(qvc),
-      q(5701) => q(qve),
-      q(5702) => q(qvh),
-      q(5703) => q(qvi),
-      q(5704) => q(qvj),
-      q(5705) => q(qvl),
-      q(5706) => q(qvm),
-      q(5707) => q(qvn),
-      q(5708) => q(qvo),
-      q(5709) => q(qvp),
-      q(5710) => q(qvs),
-      q(5711) => q(qvw),
-      q(5712) => q(qvy),
-      q(5713) => q(qvz),
-      q(5714) => q(qwa),
-      q(5715) => q(qwc),
-      q(5716) => q(qwh),
-      q(5717) => q(qwm),
-      q(5718) => q(qws),
-      q(5719) => q(qwt),
-      q(5720) => q(qxa),
-      q(5721) => q(qxc),
-      q(5722) => q(qxh),
-      q(5723) => q(qxl),
-      q(5724) => q(qxn),
-      q(5725) => q(qxo),
-      q(5726) => q(qxp),
-      q(5727) => q(qxq),
-      q(5728) => q(qxr),
-      q(5729) => q(qxs),
-      q(5730) => q(qxt),
-      q(5731) => q(qxu),
-      q(5732) => q(qxw),
-      q(5733) => q(qya),
-      q(5734) => q(qyp),
-      q(5735) => q(raa),
-      q(5736) => q(rab),
-      q(5737) => q(rac),
-      q(5738) => q(rad),
-      q(5739) => q(raf),
-      q(5740) => q(rag),
-      q(5741) => q(rah),
-      q(5742) => q(rai),
-      q(5743) => q(rak),
-      q(5744) => q(ral),
-      q(5745) => q(ram),
-      q(5746) => q(ran),
-      q(5747) => q(rao),
-      q(5748) => q(raq),
-      q(5749) => q(ras),
-      q(5750) => q(rat),
-      q(5751) => q(rau),
-      q(5752) => q(rav),
-      q(5753) => q(raw),
-      q(5754) => q(rax),
-      q(5755) => q(ray),
-      q(5756) => q(raz),
-      q(5757) => q(rbb),
-      q(5758) => q(rbk),
-      q(5759) => q(rbl),
-      q(5760) => q(rbp),
-      q(5761) => q(rcf),
-      q(5762) => q(rdb),
-      q(5763) => q(rea),
-      q(5764) => q(reb),
-      q(5765) => q(ree),
-      q(5766) => q(reg),
-      q(5767) => q(rei),
-      q(5768) => q(rej),
-      q(5769) => q(rel),
-      q(5770) => q(rem),
-      q(5771) => q(ren),
-      q(5772) => q(rer),
-      q(5773) => q(res),
-      q(5774) => q(ret),
-      q(5775) => q(rey),
-      q(5776) => q(rga),
-      q(5777) => q(rge),
-      q(5778) => q(rgk),
-      q(5779) => q(rgn),
-      q(5780) => q(rgr),
-      q(5781) => q(rgs),
-      q(5782) => q(rgu),
-      q(5783) => q(rhg),
-      q(5784) => q(rhp),
-      q(5785) => q(ria),
-      q(5786) => q(rie),
-      q(5787) => q(rif),
-      q(5788) => q(ril),
-      q(5789) => q(rim),
-      q(5790) => q(rin),
-      q(5791) => q(rir),
-      q(5792) => q(rit),
-      q(5793) => q(riu),
-      q(5794) => q(rjg),
-      q(5795) => q(rji),
-      q(5796) => q(rjs),
-      q(5797) => q(rka),
-      q(5798) => q(rkb),
-      q(5799) => q(rkh),
-      q(5800) => q(rki),
-      q(5801) => q(rkm),
-      q(5802) => q(rkt),
-      q(5803) => q(rkw),
-      q(5804) => q(rma),
-      q(5805) => q(rmb),
-      q(5806) => q(rmc),
-      q(5807) => q(rmd),
-      q(5808) => q(rme),
-      q(5809) => q(rmf),
-      q(5810) => q(rmg),
-      q(5811) => q(rmh),
-      q(5812) => q(rmi),
-      q(5813) => q(rmk),
-      q(5814) => q(rml),
-      q(5815) => q(rmm),
-      q(5816) => q(rmn),
-      q(5817) => q(rmo),
-      q(5818) => q(rmp),
-      q(5819) => q(rmq),
-      q(5820) => q(rms),
-      q(5821) => q(rmt),
-      q(5822) => q(rmu),
-      q(5823) => q(rmv),
-      q(5824) => q(rmw),
-      q(5825) => q(rmx),
-      q(5826) => q(rmy),
-      q(5827) => q(rmz),
-      q(5828) => q(rna),
-      q(5829) => q(rnd),
-      q(5830) => q(rng),
-      q(5831) => q(rnl),
-      q(5832) => q(rnn),
-      q(5833) => q(rnp),
-      q(5834) => q(rnr),
-      q(5835) => q(rnw),
-      q(5836) => q(rob),
-      q(5837) => q(roc),
-      q(5838) => q(rod),
-      q(5839) => q(roe),
-      q(5840) => q(rof),
-      q(5841) => q(rog),
-      q(5842) => q(rol),
-      q(5843) => q(roo),
-      q(5844) => q(rop),
-      q(5845) => q(ror),
-      q(5846) => q(rou),
-      q(5847) => q(row),
-      q(5848) => q(rpn),
-      q(5849) => q(rpt),
-      q(5850) => q(rri),
-      q(5851) => q(rro),
-      q(5852) => q(rrt),
-      q(5853) => q(rsb),
-      q(5854) => q(rsi),
-      q(5855) => q(rsl),
-      q(5856) => q(rtc),
-      q(5857) => q(rth),
-      q(5858) => q(rtm),
-      q(5859) => q(rts),
-      q(5860) => q(rtw),
-      q(5861) => q(rub),
-      q(5862) => q(ruc),
-      q(5863) => q(rue),
-      q(5864) => q(ruf),
-      q(5865) => q(rug),
-      q(5866) => q(ruh),
-      q(5867) => q(rui),
-      q(5868) => q(ruk),
-      q(5869) => q(ruo),
-      q(5870) => q(ruq),
-      q(5871) => q(rut),
-      q(5872) => q(ruu),
-      q(5873) => q(ruy),
-      q(5874) => q(ruz),
-      q(5875) => q(rwa),
-      q(5876) => q(rwk),
-      q(5877) => q(rwm),
-      q(5878) => q(rwo),
-      q(5879) => q(rwr),
-      q(5880) => q(rxd),
-      q(5881) => q(rxw),
-      q(5882) => q(ryn),
-      q(5883) => q(rys),
-      q(5884) => q(ryu),
-      q(5885) => q(saa),
-      q(5886) => q(sab),
-      q(5887) => q(sac),
-      q(5888) => q(sae),
-      q(5889) => q(saf),
-      q(5890) => q(saj),
-      q(5891) => q(sak),
-      q(5892) => q(sao),
-      q(5893) => q(saq),
-      q(5894) => q(sar),
-      q(5895) => q(sau),
-      q(5896) => q(sav),
-      q(5897) => q(saw),
-      q(5898) => q(sax),
-      q(5899) => q(say),
-      q(5900) => q(saz),
-      q(5901) => q(sba),
-      q(5902) => q(sbb),
-      q(5903) => q(sbc),
-      q(5904) => q(sbd),
-      q(5905) => q(slc),
-      q(5906) => q(sbf),
-      q(5907) => q(sbg),
-      q(5908) => q(sbh),
-      q(5909) => q(sbi),
-      q(5910) => q(sbj),
-      q(5911) => q(sbk),
-      q(5912) => q(sbl),
-      q(5913) => q(sbm),
-      q(5914) => q(sbn),
-      q(5915) => q(sbo),
-      q(5916) => q(sbp),
-      q(5917) => q(sbq),
-      q(5918) => q(sbr),
-      q(5919) => q(sbs),
-      q(5920) => q(sbt),
-      q(5921) => q(sbu),
-      q(5922) => q(sbv),
-      q(5923) => q(sbw),
-      q(5924) => q(sbx),
-      q(5925) => q(sby),
-      q(5926) => q(sbz),
-      q(5927) => q(scb),
-      q(5928) => q(sce),
-      q(5929) => q(scf),
-      q(5930) => q(scg),
-      q(5931) => q(sch),
-      q(5932) => q(sci),
-      q(5933) => q(sck),
-      q(5934) => q(scl),
-      q(5935) => q(scp),
-      q(5936) => q(scq),
-      q(5937) => q(scs),
-      q(5938) => q(scu),
-      q(5939) => q(scv),
-      q(5940) => q(scw),
-      q(5941) => q(scx),
-      q(5942) => q(sda),
-      q(5943) => q(sdb),
-      q(5944) => q(sdc),
-      q(5945) => q(sde),
-      q(5946) => q(sdf),
-      q(5947) => q(sdg),
-      q(5948) => q(sdh),
-      q(5949) => q(sdj),
-      q(5950) => q(sdk),
-      q(5951) => q(sdl),
-      q(5952) => q(sdm),
-      q(5953) => q(sdn),
-      q(5954) => q(sdo),
-      q(5955) => q(sdp),
-      q(5956) => q(sdr),
-      q(5957) => q(sds),
-      q(5958) => q(sdt),
-      q(5959) => q(sdu),
-      q(5960) => q(sdx),
-      q(5961) => q(sdz),
-      q(5962) => q(sea),
-      q(5963) => q(seb),
-      q(5964) => q(sec),
-      q(5965) => q(sed),
-      q(5966) => q(see),
-      q(5967) => q(sef),
-      q(5968) => q(seg),
-      q(5969) => q(seh),
-      q(5970) => q(sei),
-      q(5971) => q(sej),
-      q(5972) => q(sek),
-      q(5973) => q(sen),
-      q(5974) => q(seo),
-      q(5975) => q(sep),
-      q(5976) => q(seq),
-      q(5977) => q(ser),
-      q(5978) => q(ses),
-      q(5979) => q(set),
-      q(5980) => q(seu),
-      q(5981) => q(sev),
-      q(5982) => q(sew),
-      q(5983) => q(sey),
-      q(5984) => q(sez),
-      q(5985) => q(sfb),
-      q(5986) => q(sfe),
-      q(5987) => q(sfm),
-      q(5988) => q(sfs),
-      q(5989) => q(sfw),
-      q(5990) => q(sgb),
-      q(5991) => q(sgc),
-      q(5992) => q(sgd),
-      q(5993) => q(sge),
-      q(5994) => q(sgg),
-      q(5995) => q(sgh),
-      q(5996) => q(sgi),
-      q(5997) => q(sgj),
-      q(5998) => q(sgk),
-      q(5999) => q(sgm),
-      q(6000) => q(sgp),
-      q(6001) => q(sgr),
-      q(6002) => q(sgs),
-      q(6003) => q(sgt),
-      q(6004) => q(sgu),
-      q(6005) => q(sgw),
-      q(6006) => q(sgx),
-      q(6007) => q(sgy),
-      q(6008) => q(sgz),
-      q(6009) => q(sha),
-      q(6010) => q(shb),
-      q(6011) => q(shc),
-      q(6012) => q(shd),
-      q(6013) => q(she),
-      q(6014) => q(shg),
-      q(6015) => q(shh),
-      q(6016) => q(shi),
-      q(6017) => q(shj),
-      q(6018) => q(shk),
-      q(6019) => q(shl),
-      q(6020) => q(shm),
-      q(6021) => q(sho),
-      q(6022) => q(shp),
-      q(6023) => q(shq),
-      q(6024) => q(shr),
-      q(6025) => q(shs),
-      q(6026) => q(sht),
-      q(6027) => q(shu),
-      q(6028) => q(shv),
-      q(6029) => q(shw),
-      q(6030) => q(shx),
-      q(6031) => q(shy),
-      q(6032) => q(shz),
-      q(6033) => q(sia),
-      q(6034) => q(sib),
-      q(6035) => q(sie),
-      q(6036) => q(sif),
-      q(6037) => q(sig),
-      q(6038) => q(sih),
-      q(6039) => q(sii),
-      q(6040) => q(sij),
-      q(6041) => q(sik),
-      q(6042) => q(sil),
-      q(6043) => q(sim),
-      q(6044) => q(sip),
-      q(6045) => q(siq),
-      q(6046) => q(sir),
-      q(6047) => q(sis),
-      q(6048) => q(siu),
-      q(6049) => q(siv),
-      q(6050) => q(siw),
-      q(6051) => q(six),
-      q(6052) => q(siy),
-      q(6053) => q(siz),
-      q(6054) => q(sja),
-      q(6055) => q(sjb),
-      q(6056) => q(sjd),
-      q(6057) => q(sje),
-      q(6058) => q(sjg),
-      q(6059) => q(sjk),
-      q(6060) => q(sjl),
-      q(6061) => q(sjm),
-      q(6062) => q(sjn),
-      q(6063) => q(sjo),
-      q(6064) => q(sjp),
-      q(6065) => q(sjr),
-      q(6066) => q(sjs),
-      q(6067) => q(sjt),
-      q(6068) => q(sju),
-      q(6069) => q(sjw),
-      q(6070) => q(ska),
-      q(6071) => q(skb),
-      q(6072) => q(skc),
-      q(6073) => q(skd),
-      q(6074) => q(ske),
-      q(6075) => q(skf),
-      q(6076) => q(skg),
-      q(6077) => q(skh),
-      q(6078) => q(ski),
-      q(6079) => q(skj),
-      q(6080) => q(skk),
-      q(6081) => q(skm),
-      q(6082) => q(skn),
-      q(6083) => q(sko),
-      q(6084) => q(skp),
-      q(6085) => q(skq),
-      q(6086) => q(skr),
-      q(6087) => q(sks),
-      q(6088) => q(skt),
-      q(6089) => q(sku),
-      q(6090) => q(skv),
-      q(6091) => q(skw),
-      q(6092) => q(skx),
-      q(6093) => q(sky),
-      q(6094) => q(skz),
-      q(6095) => q(sld),
-      q(6096) => q(sle),
-      q(6097) => q(slf),
-      q(6098) => q(slg),
-      q(6099) => q(slh),
-      q(6100) => q(sli),
-      q(6101) => q(slj),
-      q(6102) => q(sll),
-      q(6103) => q(slm),
-      q(6104) => q(sln),
-      q(6105) => q(slp),
-      q(6106) => q(slq),
-      q(6107) => q(slr),
-      q(6108) => q(sls),
-      q(6109) => q(slt),
-      q(6110) => q(slu),
-      q(6111) => q(slw),
-      q(6112) => q(slx),
-      q(6113) => q(sly),
-      q(6114) => q(slz),
-      q(6115) => q(smb),
-      q(6116) => q(smc),
-      q(6117) => q(smd),
-      q(6118) => q(smf),
-      q(6119) => q(smg),
-      q(6120) => q(smh),
-      q(6121) => q(smk),
-      q(6122) => q(sml),
-      q(6123) => q(smm),
-      q(6124) => q(smp),
-      q(6125) => q(smq),
-      q(6126) => q(smr),
-      q(6127) => q(smt),
-      q(6128) => q(smu),
-      q(6129) => q(smv),
-      q(6130) => q(smw),
-      q(6131) => q(smx),
-      q(6132) => q(smy),
-      q(6133) => q(smz),
-      q(6134) => q(snb),
-      q(6135) => q(snc),
-      q(6136) => q(sne),
-      q(6137) => q(snf),
-      q(6138) => q(sng),
-      q(6139) => q(snh),
-      q(6140) => q(sni),
-      q(6141) => q(snj),
-      q(6142) => q(snl),
-      q(6143) => q(snm),
-      q(6144) => q(snn),
-      q(6145) => q(sno),
-      q(6146) => q(snp),
-      q(6147) => q(snq),
-      q(6148) => q(snr),
-      q(6149) => q(sns),
-      q(6150) => q(snu),
-      q(6151) => q(snv),
-      q(6152) => q(snw),
-      q(6153) => q(snx),
-      q(6154) => q(sny),
-      q(6155) => q(snz),
-      q(6156) => q(soa),
-      q(6157) => q(sob),
-      q(6158) => q(soc),
-      q(6159) => q(sod),
-      q(6160) => q(soe),
-      q(6161) => q(soh),
-      q(6162) => q(soi),
-      q(6163) => q(soj),
-      q(6164) => q(sok),
-      q(6165) => q(sol),
-      q(6166) => q(soo),
-      q(6167) => q(sop),
-      q(6168) => q(soq),
-      q(6169) => q(sor),
-      q(6170) => q(sos),
-      q(6171) => q(sou),
-      q(6172) => q(sov),
-      q(6173) => q(sow),
-      q(6174) => q(sox),
-      q(6175) => q(soy),
-      q(6176) => q(soz),
-      q(6177) => q(spb),
-      q(6178) => q(spc),
-      q(6179) => q(spd),
-      q(6180) => q(spe),
-      q(6181) => q(spg),
-      q(6182) => q(spi),
-      q(6183) => q(spk),
-      q(6184) => q(spl),
-      q(6185) => q(spm),
-      q(6186) => q(spn),
-      q(6187) => q(spo),
-      q(6188) => q(spp),
-      q(6189) => q(spq),
-      q(6190) => q(spr),
-      q(6191) => q(sps),
-      q(6192) => q(spt),
-      q(6193) => q(spu),
-      q(6194) => q(spv),
-      q(6195) => q(spx),
-      q(6196) => q(spy),
-      q(6197) => q(sqa),
-      q(6198) => q(sqh),
-      q(6199) => q(sqk),
-      q(6200) => q(sqm),
-      q(6201) => q(sqn),
-      q(6202) => q(sqo),
-      q(6203) => q(sqq),
-      q(6204) => q(sqr),
-      q(6205) => q(sqs),
-      q(6206) => q(sqt),
-      q(6207) => q(squ),
-      q(6208) => q(sra),
-      q(6209) => q(srb),
-      q(6210) => q(src),
-      q(6211) => q(sre),
-      q(6212) => q(srf),
-      q(6213) => q(srg),
-      q(6214) => q(srh),
-      q(6215) => q(sri),
-      q(6216) => q(srk),
-      q(6217) => q(srl),
-      q(6218) => q(srm),
-      q(6219) => q(sro),
-      q(6220) => q(srq),
-      q(6221) => q(srs),
-      q(6222) => q(srt),
-      q(6223) => q(sru),
-      q(6224) => q(srv),
-      q(6225) => q(srw),
-      q(6226) => q(srx),
-      q(6227) => q(sry),
-      q(6228) => q(srz),
-      q(6229) => q(ssb),
-      q(6230) => q(ssc),
-      q(6231) => q(ssd),
-      q(6232) => q(sse),
-      q(6233) => q(ssf),
-      q(6234) => q(ssg),
-      q(6235) => q(ssh),
-      q(6236) => q(ssi),
-      q(6237) => q(ssj),
-      q(6238) => q(ssk),
-      q(6239) => q(ssl),
-      q(6240) => q(ssm),
-      q(6241) => q(ssn),
-      q(6242) => q(sso),
-      q(6243) => q(ssp),
-      q(6244) => q(ssq),
-      q(6245) => q(ssr),
-      q(6246) => q(sss),
-      q(6247) => q(sst),
-      q(6248) => q(ssu),
-      q(6249) => q(ssv),
-      q(6250) => q(ssx),
-      q(6251) => q(ssy),
-      q(6252) => q(ssz),
-      q(6253) => q(sta),
-      q(6254) => q(stb),
-      q(6255) => q(std),
-      q(6256) => q(ste),
-      q(6257) => q(stf),
-      q(6258) => q(stg),
-      q(6259) => q(sth),
-      q(6260) => q(sti),
-      q(6261) => q(stj),
-      q(6262) => q(stk),
-      q(6263) => q(stl),
-      q(6264) => q(stm),
-      q(6265) => q(stn),
-      q(6266) => q(sto),
-      q(6267) => q(stp),
-      q(6268) => q(stq),
-      q(6269) => q(str),
-      q(6270) => q(sts),
-      q(6271) => q(stt),
-      q(6272) => q(stu),
-      q(6273) => q(stv),
-      q(6274) => q(stw),
-      q(6275) => q(sty),
-      q(6276) => q(sua),
-      q(6277) => q(sub),
-      q(6278) => q(suc),
-      q(6279) => q(sue),
-      q(6280) => q(sug),
-      q(6281) => q(sui),
-      q(6282) => q(suj),
-      q(6283) => q(suq),
-      q(6284) => q(sur),
-      q(6285) => q(sut),
-      q(6286) => q(suv),
-      q(6287) => q(suw),
-      q(6288) => q(suy),
-      q(6289) => q(suz),
-      q(6290) => q(sva),
-      q(6291) => q(svb),
-      q(6292) => q(svc),
-      q(6293) => q(sve),
-      q(6294) => q(svk),
-      q(6295) => q(svm),
-      q(6296) => q(svr),
-      q(6297) => q(svs),
-      q(6298) => q(svx),
-      q(6299) => q(swb),
-      q(6300) => q(swc),
-      q(6301) => q(swf),
-      q(6302) => q(swg),
-      q(6303) => q(swh),
-      q(6304) => q(swi),
-      q(6305) => q(swj),
-      q(6306) => q(swk),
-      q(6307) => q(swl),
-      q(6308) => q(swm),
-      q(6309) => q(swn),
-      q(6310) => q(swo),
-      q(6311) => q(swp),
-      q(6312) => q(swq),
-      q(6313) => q(swr),
-      q(6314) => q(sws),
-      q(6315) => q(swt),
-      q(6316) => q(swu),
-      q(6317) => q(swv),
-      q(6318) => q(sww),
-      q(6319) => q(swx),
-      q(6320) => q(swy),
-      q(6321) => q(sxb),
-      q(6322) => q(sxc),
-      q(6323) => q(sxe),
-      q(6324) => q(sxg),
-      q(6325) => q(sxk),
-      q(6326) => q(sxl),
-      q(6327) => q(sxm),
-      q(6328) => q(sxn),
-      q(6329) => q(sxo),
-      q(6330) => q(sxr),
-      q(6331) => q(sxs),
-      q(6332) => q(sxu),
-      q(6333) => q(sxw),
-      q(6334) => q(sya),
-      q(6335) => q(syb),
-      q(6336) => q(syi),
-      q(6337) => q(syk),
-      q(6338) => q(syl),
-      q(6339) => q(sym),
-      q(6340) => q(syn),
-      q(6341) => q(syo),
-      q(6342) => q(sys),
-      q(6343) => q(syw),
-      q(6344) => q(syx),
-      q(6345) => q(syy),
-      q(6346) => q(sza),
-      q(6347) => q(szb),
-      q(6348) => q(szc),
-      q(6349) => q(szd),
-      q(6350) => q(sze),
-      q(6351) => q(szg),
-      q(6352) => q(szl),
-      q(6353) => q(szn),
-      q(6354) => q(szp),
-      q(6355) => q(szv),
-      q(6356) => q(szw),
-      q(6357) => q(taa),
-      q(6358) => q(tab),
-      q(6359) => q(tac),
-      q(6360) => q(tad),
-      q(6361) => q(tae),
-      q(6362) => q(taf),
-      q(6363) => q(tag),
-      q(6364) => q(taj),
-      q(6365) => q(tak),
-      q(6366) => q(tal),
-      q(6367) => q(tan),
-      q(6368) => q(tao),
-      q(6369) => q(tap),
-      q(6370) => q(taq),
-      q(6371) => q(tar),
-      q(6372) => q(tas),
-      q(6373) => q(tau),
-      q(6374) => q(tav),
-      q(6375) => q(taw),
-      q(6376) => q(tax),
-      q(6377) => q(tay),
-      q(6378) => q(taz),
-      q(6379) => q(tba),
-      q(6380) => q(tbb),
-      q(6381) => q(tbc),
-      q(6382) => q(tbd),
-      q(6383) => q(tbe),
-      q(6384) => q(tbf),
-      q(6385) => q(tbg),
-      q(6386) => q(tbh),
-      q(6387) => q(tbi),
-      q(6388) => q(tbj),
-      q(6389) => q(tbk),
-      q(6390) => q(tbl),
-      q(6391) => q(tbm),
-      q(6392) => q(tbn),
-      q(6393) => q(tbo),
-      q(6394) => q(tbp),
-      q(6395) => q(tbr),
-      q(6396) => q(tbs),
-      q(6397) => q(tbt),
-      q(6398) => q(tbu),
-      q(6399) => q(tbv),
-      q(6400) => q(tbw),
-      q(6401) => q(tbx),
-      q(6402) => q(tby),
-      q(6403) => q(tbz),
-      q(6404) => q(tca),
-      q(6405) => q(tcb),
-      q(6406) => q(tcc),
-      q(6407) => q(tcd),
-      q(6408) => q(tce),
-      q(6409) => q(tcf),
-      q(6410) => q(tcg),
-      q(6411) => q(tch),
-      q(6412) => q(wbf),
-      q(6413) => q(tck),
-      q(6414) => q(tcl),
-      q(6415) => q(tcm),
-      q(6416) => q(tcn),
-      q(6417) => q(tco),
-      q(6418) => q(tcp),
-      q(6419) => q(tcq),
-      q(6420) => q(tcs),
-      q(6421) => q(tct),
-      q(6422) => q(tcu),
-      q(6423) => q(tcw),
-      q(6424) => q(tcx),
-      q(6425) => q(tcy),
-      q(6426) => q(tcz),
-      q(6427) => q(tda),
-      q(6428) => q(tdb),
-      q(6429) => q(tdc),
-      q(6430) => q(tdd),
-      q(6431) => q(tde),
-      q(6432) => q(tdf),
-      q(6433) => q(tdg),
-      q(6434) => q(tdh),
-      q(6435) => q(tdi),
-      q(6436) => q(tdj),
-      q(6437) => q(tdk),
-      q(6438) => q(tdl),
-      q(6439) => q(tdn),
-      q(6440) => q(tdo),
-      q(6441) => q(tdq),
-      q(6442) => q(tdr),
-      q(6443) => q(tds),
-      q(6444) => q(tdt),
-      q(6445) => q(tdu),
-      q(6446) => q(tdv),
-      q(6447) => q(tdx),
-      q(6448) => q(tdy),
-      q(6449) => q(tea),
-      q(6450) => q(teb),
-      q(6451) => q(tec),
-      q(6452) => q(ted),
-      q(6453) => q(tee),
-      q(6454) => q(tef),
-      q(6455) => q(teg),
-      q(6456) => q(teh),
-      q(6457) => q(tei),
-      q(6458) => q(tek),
-      q(6459) => q(ten),
-      q(6460) => q(teo),
-      q(6461) => q(tep),
-      q(6462) => q(teq),
-      q(6463) => q(tes),
-      q(6464) => q(teu),
-      q(6465) => q(tev),
-      q(6466) => q(tew),
-      q(6467) => q(tex),
-      q(6468) => q(tey),
-      q(6469) => q(tfi),
-      q(6470) => q(tfn),
-      q(6471) => q(tfo),
-      q(6472) => q(tfr),
-      q(6473) => q(tft),
-      q(6474) => q(tga),
-      q(6475) => q(tgb),
-      q(6476) => q(tgc),
-      q(6477) => q(tgd),
-      q(6478) => q(tge),
-      q(6479) => q(tgf),
-      q(6480) => q(tgh),
-      q(6481) => q(tgi),
-      q(6482) => q(tgj),
-      q(6483) => q(tgn),
-      q(6484) => q(tgo),
-      q(6485) => q(tgp),
-      q(6486) => q(tgq),
-      q(6487) => q(tgr),
-      q(6488) => q(tgs),
-      q(6489) => q(tgt),
-      q(6490) => q(tgu),
-      q(6491) => q(tgv),
-      q(6492) => q(tgw),
-      q(6493) => q(tgx),
-      q(6494) => q(tgy),
-      q(6495) => q(tgz),
-      q(6496) => q(thc),
-      q(6497) => q(thd),
-      q(6498) => q(the),
-      q(6499) => q(thf),
-      q(6500) => q(thh),
-      q(6501) => q(thi),
-      q(6502) => q(thk),
-      q(6503) => q(thl),
-      q(6504) => q(thm),
-      q(6505) => q(thn),
-      q(6506) => q(thp),
-      q(6507) => q(thq),
-      q(6508) => q(thr),
-      q(6509) => q(ths),
-      q(6510) => q(tht),
-      q(6511) => q(thu),
-      q(6512) => q(thv),
-      q(6513) => q(thw),
-      q(6514) => q(thy),
-      q(6515) => q(thz),
-      q(6516) => q(tia),
-      q(6517) => q(tic),
-      q(6518) => q(tid),
-      q(6519) => q(tif),
-      q(6520) => q(tih),
-      q(6521) => q(tii),
-      q(6522) => q(tij),
-      q(6523) => q(tik),
-      q(6524) => q(til),
-      q(6525) => q(tim),
-      q(6526) => q(tin),
-      q(6527) => q(tio),
-      q(6528) => q(tip),
-      q(6529) => q(tiq),
-      q(6530) => q(tis),
-      q(6531) => q(tit),
-      q(6532) => q(tiu),
-      q(6533) => q(tiw),
-      q(6534) => q(tix),
-      q(6535) => q(tiy),
-      q(6536) => q(tiz),
-      q(6537) => q(tja),
-      q(6538) => q(tjg),
-      q(6539) => q(tji),
-      q(6540) => q(tjl),
-      q(6541) => q(tjm),
-      q(6542) => q(tjn),
-      q(6543) => q(tjo),
-      q(6544) => q(tjs),
-      q(6545) => q(tju),
-      q(6546) => q(tjw),
-      q(6547) => q(tka),
-      q(6548) => q(tkb),
-      q(6549) => q(tkd),
-      q(6550) => q(tke),
-      q(6551) => q(tkf),
-      q(6552) => q(tkg),
-      q(6553) => q(tkm),
-      q(6554) => q(tkn),
-      q(6555) => q(tkp),
-      q(6556) => q(tkq),
-      q(6557) => q(tkr),
-      q(6558) => q(tks),
-      q(6559) => q(tkt),
-      q(6560) => q(tku),
-      q(6561) => q(tkv),
-      q(6562) => q(tkw),
-      q(6563) => q(tkx),
-      q(6564) => q(tkz),
-      q(6565) => q(tla),
-      q(6566) => q(tlb),
-      q(6567) => q(tlc),
-      q(6568) => q(tld),
-      q(6569) => q(tlf),
-      q(6570) => q(tlg),
-      q(6571) => q(tlj),
-      q(6572) => q(tlk),
-      q(6573) => q(tll),
-      q(6574) => q(tlm),
-      q(6575) => q(tln),
-      q(6576) => q(tlo),
-      q(6577) => q(tlp),
-      q(6578) => q(tlq),
-      q(6579) => q(tlr),
-      q(6580) => q(tls),
-      q(6581) => q(tlt),
-      q(6582) => q(tlu),
-      q(6583) => q(tlv),
-      q(6584) => q(tlx),
-      q(6585) => q(tly),
-      q(6586) => q(tma),
-      q(6587) => q(tmb),
-      q(6588) => q(tmc),
-      q(6589) => q(tmd),
-      q(6590) => q(tme),
-      q(6591) => q(tmf),
-      q(6592) => q(tmg),
-      q(6593) => q(tmi),
-      q(6594) => q(tmj),
-      q(6595) => q(tmk),
-      q(6596) => q(tml),
-      q(6597) => q(tmm),
-      q(6598) => q(tmn),
-      q(6599) => q(tmo),
-      q(6600) => q(tmp),
-      q(6601) => q(tmq),
-      q(6602) => q(tmr),
-      q(6603) => q(tms),
-      q(6604) => q(tmt),
-      q(6605) => q(tmu),
-      q(6606) => q(tmv),
-      q(6607) => q(tmw),
-      q(6608) => q(tmy),
-      q(6609) => q(tmz),
-      q(6610) => q(tna),
-      q(6611) => q(tnb),
-      q(6612) => q(tnc),
-      q(6613) => q(tnd),
-      q(6614) => q(tne),
-      q(6615) => q(tng),
-      q(6616) => q(tnh),
-      q(6617) => q(tni),
-      q(6618) => q(tnk),
-      q(6619) => q(tnl),
-      q(6620) => q(tnm),
-      q(6621) => q(tnn),
-      q(6622) => q(tno),
-      q(6623) => q(tnp),
-      q(6624) => q(tnq),
-      q(6625) => q(tnr),
-      q(6626) => q(tns),
-      q(6627) => q(tnt),
-      q(6628) => q(tnu),
-      q(6629) => q(tnv),
-      q(6630) => q(tnw),
-      q(6631) => q(tnx),
-      q(6632) => q(tny),
-      q(6633) => q(tnz),
-      q(6634) => q(tob),
-      q(6635) => q(toc),
-      q(6636) => q(tod),
-      q(6637) => q(toe),
-      q(6638) => q(tof),
-      q(6639) => q(toh),
-      q(6640) => q(toi),
-      q(6641) => q(toj),
-      q(6642) => q(tol),
-      q(6643) => q(tom),
-      q(6644) => q(too),
-      q(6645) => q(top),
-      q(6646) => q(toq),
-      q(6647) => q(tor),
-      q(6648) => q(tos),
-      q(6649) => q(tou),
-      q(6650) => q(tov),
-      q(6651) => q(tow),
-      q(6652) => q(tox),
-      q(6653) => q(toy),
-      q(6654) => q(toz),
-      q(6655) => q(tpa),
-      q(6656) => q(tpc),
-      q(6657) => q(tpe),
-      q(6658) => q(tpf),
-      q(6659) => q(tpg),
-      q(6660) => q(tpj),
-      q(6661) => q(tpk),
-      q(6662) => q(tpl),
-      q(6663) => q(tpm),
-      q(6664) => q(tpn),
-      q(6665) => q(tpo),
-      q(6666) => q(tpp),
-      q(6667) => q(tpq),
-      q(6668) => q(tpr),
-      q(6669) => q(tpt),
-      q(6670) => q(tpu),
-      q(6671) => q(tpv),
-      q(6672) => q(tpw),
-      q(6673) => q(tpx),
-      q(6674) => q(tpy),
-      q(6675) => q(tpz),
-      q(6676) => q(tqb),
-      q(6677) => q(tql),
-      q(6678) => q(tqm),
-      q(6679) => q(tqn),
-      q(6680) => q(tqo),
-      q(6681) => q(tqp),
-      q(6682) => q(tqq),
-      q(6683) => q(tqr),
-      q(6684) => q(tqt),
-      q(6685) => q(tqu),
-      q(6686) => q(tqw),
-      q(6687) => q(tra),
-      q(6688) => q(trb),
-      q(6689) => q(trc),
-      q(6690) => q(trd),
-      q(6691) => q(tre),
-      q(6692) => q(trf),
-      q(6693) => q(trg),
-      q(6694) => q(trh),
-      q(6695) => q(tri),
-      q(6696) => q(trj),
-      q(6697) => q(trl),
-      q(6698) => q(trm),
-      q(6699) => q(trn),
-      q(6700) => q(tro),
-      q(6701) => q(trp),
-      q(6702) => q(trq),
-      q(6703) => q(trr),
-      q(6704) => q(trs),
-      q(6705) => q(trt),
-      q(6706) => q(tru),
-      q(6707) => q(trv),
-      q(6708) => q(trw),
-      q(6709) => q(trx),
-      q(6710) => q(try),
-      q(6711) => q(trz),
-      q(6712) => q(tsa),
-      q(6713) => q(tsb),
-      q(6714) => q(tsc),
-      q(6715) => q(tsd),
-      q(6716) => q(tse),
-      q(6717) => q(tsg),
-      q(6718) => q(tsh),
-      q(6719) => q(tsj),
-      q(6720) => q(tsk),
-      q(6721) => q(tsl),
-      q(6722) => q(tsm),
-      q(6723) => q(tsp),
-      q(6724) => q(tsq),
-      q(6725) => q(tsr),
-      q(6726) => q(tss),
-      q(6727) => q(tst),
-      q(6728) => q(tsu),
-      q(6729) => q(tsv),
-      q(6730) => q(tsw),
-      q(6731) => q(tsx),
-      q(6732) => q(tsy),
-      q(6733) => q(tsz),
-      q(6734) => q(tta),
-      q(6735) => q(ttb),
-      q(6736) => q(ttc),
-      q(6737) => q(ttd),
-      q(6738) => q(tte),
-      q(6739) => q(ttf),
-      q(6740) => q(ttg),
-      q(6741) => q(tth),
-      q(6742) => q(tti),
-      q(6743) => q(ttj),
-      q(6744) => q(ttk),
-      q(6745) => q(ttl),
-      q(6746) => q(ttm),
-      q(6747) => q(ttn),
-      q(6748) => q(tto),
-      q(6749) => q(ttp),
-      q(6750) => q(ttq),
-      q(6751) => q(ttr),
-      q(6752) => q(tts),
-      q(6753) => q(ttt),
-      q(6754) => q(ttu),
-      q(6755) => q(ttv),
-      q(6756) => q(ttw),
-      q(6757) => q(tty),
-      q(6758) => q(ttz),
-      q(6759) => q(tua),
-      q(6760) => q(tub),
-      q(6761) => q(tuc),
-      q(6762) => q(tud),
-      q(6763) => q(tue),
-      q(6764) => q(tuf),
-      q(6765) => q(tug),
-      q(6766) => q(tuh),
-      q(6767) => q(tui),
-      q(6768) => q(tuj),
-      q(6769) => q(tul),
-      q(6770) => q(tun),
-      q(6771) => q(tuo),
-      q(6772) => q(tuq),
-      q(6773) => q(tus),
-      q(6774) => q(tuu),
-      q(6775) => q(tuv),
-      q(6776) => q(tux),
-      q(6777) => q(tuy),
-      q(6778) => q(tuz),
-      q(6779) => q(tva),
-      q(6780) => q(tvd),
-      q(6781) => q(tve),
-      q(6782) => q(tvk),
-      q(6783) => q(tvm),
-      q(6784) => q(tvn),
-      q(6785) => q(tvo),
-      q(6786) => q(tvs),
-      q(6787) => q(tvt),
-      q(6788) => q(tvu),
-      q(6789) => q(tvw),
-      q(6790) => q(tvy),
-      q(6791) => q(twa),
-      q(6792) => q(twb),
-      q(6793) => q(twc),
-      q(6794) => q(twd),
-      q(6795) => q(twe),
-      q(6796) => q(twf),
-      q(6797) => q(twg),
-      q(6798) => q(twh),
-      q(6799) => q(twl),
-      q(6800) => q(twm),
-      q(6801) => q(twn),
-      q(6802) => q(two),
-      q(6803) => q(twp),
-      q(6804) => q(twq),
-      q(6805) => q(twr),
-      q(6806) => q(twt),
-      q(6807) => q(twu),
-      q(6808) => q(tww),
-      q(6809) => q(twx),
-      q(6810) => q(twy),
-      q(6811) => q(txa),
-      q(6812) => q(txb),
-      q(6813) => q(txc),
-      q(6814) => q(txe),
-      q(6815) => q(txg),
-      q(6816) => q(txh),
-      q(6817) => q(txi),
-      q(6818) => q(txj),
-      q(6819) => q(txm),
-      q(6820) => q(txn),
-      q(6821) => q(txo),
-      q(6822) => q(txq),
-      q(6823) => q(txr),
-      q(6824) => q(txs),
-      q(6825) => q(txt),
-      q(6826) => q(txu),
-      q(6827) => q(txx),
-      q(6828) => q(txy),
-      q(6829) => q(tya),
-      q(6830) => q(tye),
-      q(6831) => q(tyh),
-      q(6832) => q(tyi),
-      q(6833) => q(tyj),
-      q(6834) => q(tyl),
-      q(6835) => q(tyn),
-      q(6836) => q(typ),
-      q(6837) => q(tyr),
-      q(6838) => q(tys),
-      q(6839) => q(tyt),
-      q(6840) => q(tyu),
-      q(6841) => q(tyx),
-      q(6842) => q(tyz),
-      q(6843) => q(tza),
-      q(6844) => q(tzh),
-      q(6845) => q(tzj),
-      q(6846) => q(tzl),
-      q(6847) => q(tzm),
-      q(6848) => q(tzn),
-      q(6849) => q(tzo),
-      q(6850) => q(tzx),
-      q(6851) => q(uam),
-      q(6852) => q(uan),
-      q(6853) => q(uar),
-      q(6854) => q(uba),
-      q(6855) => q(ubi),
-      q(6856) => q(ubl),
-      q(6857) => q(ubr),
-      q(6858) => q(ubu),
-      q(6859) => q(uby),
-      q(6860) => q(uda),
-      q(6861) => q(ude),
-      q(6862) => q(udg),
-      q(6863) => q(udi),
-      q(6864) => q(udj),
-      q(6865) => q(udl),
-      q(6866) => q(udu),
-      q(6867) => q(ues),
-      q(6868) => q(ufi),
-      q(6869) => q(ugb),
-      q(6870) => q(uge),
-      q(6871) => q(ugn),
-      q(6872) => q(ugo),
-      q(6873) => q(ugy),
-      q(6874) => q(uha),
-      q(6875) => q(uhn),
-      q(6876) => q(uis),
-      q(6877) => q(uiv),
-      q(6878) => q(uji),
-      q(6879) => q(uka),
-      q(6880) => q(ukg),
-      q(6881) => q(ukh),
-      q(6882) => q(ukl),
-      q(6883) => q(ukp),
-      q(6884) => q(ukq),
-      q(6885) => q(uks),
-      q(6886) => q(uku),
-      q(6887) => q(ukw),
-      q(6888) => q(uky),
-      q(6889) => q(ula),
-      q(6890) => q(ulb),
-      q(6891) => q(ulc),
-      q(6892) => q(ule),
-      q(6893) => q(ulf),
-      q(6894) => q(uli),
-      q(6895) => q(ulk),
-      q(6896) => q(ull),
-      q(6897) => q(ulm),
-      q(6898) => q(uln),
-      q(6899) => q(ulu),
-      q(6900) => q(ulw),
-      q(6901) => q(uma),
-      q(6902) => q(umc),
-      q(6903) => q(umd),
-      q(6904) => q(umg),
-      q(6905) => q(umi),
-      q(6906) => q(umm),
-      q(6907) => q(umn),
-      q(6908) => q(umo),
-      q(6909) => q(ump),
-      q(6910) => q(umr),
-      q(6911) => q(ums),
-      q(6912) => q(umu),
-      q(6913) => q(una),
-      q(6914) => q(une),
-      q(6915) => q(ung),
-      q(6916) => q(unk),
-      q(6917) => q(unm),
-      q(6918) => q(unn),
-      q(6919) => q(unr),
-      q(6920) => q(unu),
-      q(6921) => q(unx),
-      q(6922) => q(unz),
-      q(6923) => q(upi),
-      q(6924) => q(upv),
-      q(6925) => q(ura),
-      q(6926) => q(urb),
-      q(6927) => q(urc),
-      q(6928) => q(ure),
-      q(6929) => q(urf),
-      q(6930) => q(urg),
-      q(6931) => q(urh),
-      q(6932) => q(uri),
-      q(6933) => q(urk),
-      q(6934) => q(url),
-      q(6935) => q(urm),
-      q(6936) => q(urn),
-      q(6937) => q(uro),
-      q(6938) => q(urp),
-      q(6939) => q(urr),
-      q(6940) => q(urt),
-      q(6941) => q(uru),
-      q(6942) => q(urv),
-      q(6943) => q(urw),
-      q(6944) => q(urx),
-      q(6945) => q(ury),
-      q(6946) => q(urz),
-      q(6947) => q(usa),
-      q(6948) => q(ush),
-      q(6949) => q(usi),
-      q(6950) => q(usk),
-      q(6951) => q(usp),
-      q(6952) => q(usu),
-      q(6953) => q(uta),
-      q(6954) => q(ute),
-      q(6955) => q(utp),
-      q(6956) => q(utr),
-      q(6957) => q(utu),
-      q(6958) => q(uum),
-      q(6959) => q(uun),
-      q(6960) => q(uur),
-      q(6961) => q(uuu),
-      q(6962) => q(uve),
-      q(6963) => q(uvh),
-      q(6964) => q(uvl),
-      q(6965) => q(uwa),
-      q(6966) => q(uya),
-      q(6967) => q(uzn),
-      q(6968) => q(uzs),
-      q(6969) => q(vaa),
-      q(6970) => q(vae),
-      q(6971) => q(vaf),
-      q(6972) => q(vag),
-      q(6973) => q(vah),
-      q(6974) => q(vaj),
-      q(6975) => q(val),
-      q(6976) => q(vam),
-      q(6977) => q(van),
-      q(6978) => q(vao),
-      q(6979) => q(vap),
-      q(6980) => q(var),
-      q(6981) => q(vas),
-      q(6982) => q(vau),
-      q(6983) => q(vav),
-      q(6984) => q(vay),
-      q(6985) => q(vbb),
-      q(6986) => q(vbk),
-      q(6987) => q(vec),
-      q(6988) => q(ved),
-      q(6989) => q(vel),
-      q(6990) => q(vem),
-      q(6991) => q(veo),
-      q(6992) => q(vep),
-      q(6993) => q(ver),
-      q(6994) => q(vgr),
-      q(6995) => q(vgt),
-      q(6996) => q(vic),
-      q(6997) => q(vid),
-      q(6998) => q(vif),
-      q(6999) => q(vig),
-      q(7000) => q(vil),
-      q(7001) => q(vin),
-      q(7002) => q(vis),
-      q(7003) => q(vit),
-      q(7004) => q(viv),
-      q(7005) => q(vka),
-      q(7006) => q(vki),
-      q(7007) => q(vkj),
-      q(7008) => q(vkk),
-      q(7009) => q(vkl),
-      q(7010) => q(vkm),
-      q(7011) => q(vko),
-      q(7012) => q(vkp),
-      q(7013) => q(vkt),
-      q(7014) => q(vku),
-      q(7015) => q(vlp),
-      q(7016) => q(vls),
-      q(7017) => q(vma),
-      q(7018) => q(vmb),
-      q(7019) => q(vmc),
-      q(7020) => q(vmd),
-      q(7021) => q(vme),
-      q(7022) => q(vmf),
-      q(7023) => q(vmg),
-      q(7024) => q(vmh),
-      q(7025) => q(vmi),
-      q(7026) => q(vmj),
-      q(7027) => q(vmk),
-      q(7028) => q(vml),
-      q(7029) => q(vmm),
-      q(7030) => q(vmp),
-      q(7031) => q(vmq),
-      q(7032) => q(vmr),
-      q(7033) => q(vms),
-      q(7034) => q(vmu),
-      q(7035) => q(vmv),
-      q(7036) => q(vmw),
-      q(7037) => q(vmx),
-      q(7038) => q(vmy),
-      q(7039) => q(vmz),
-      q(7040) => q(vnk),
-      q(7041) => q(vnm),
-      q(7042) => q(vnp),
-      q(7043) => q(vro),
-      q(7044) => q(vra),
-      q(7045) => q(vrs),
-      q(7046) => q(vrt),
-      q(7047) => q(vsi),
-      q(7048) => q(vsl),
-      q(7049) => q(vsv),
-      q(7050) => q(vto),
-      q(7051) => q(vum),
-      q(7052) => q(vun),
-      q(7053) => q(vut),
-      q(7054) => q(vwa),
-      q(7055) => q(waa),
-      q(7056) => q(wab),
-      q(7057) => q(wac),
-      q(7058) => q(wad),
-      q(7059) => q(wae),
-      q(7060) => q(waf),
-      q(7061) => q(wag),
-      q(7062) => q(wah),
-      q(7063) => q(wai),
-      q(7064) => q(waj),
-      q(7065) => q(wam),
-      q(7066) => q(wan),
-      q(7067) => q(wao),
-      q(7068) => q(wap),
-      q(7069) => q(waq),
-      q(7070) => q(wat),
-      q(7071) => q(wau),
-      q(7072) => q(wav),
-      q(7073) => q(waw),
-      q(7074) => q(wax),
-      q(7075) => q(way),
-      q(7076) => q(waz),
-      q(7077) => q(wba),
-      q(7078) => q(wbb),
-      q(7079) => q(wbe),
-      q(7080) => q(wbh),
-      q(7081) => q(wbi),
-      q(7082) => q(wbj),
-      q(7083) => q(wbk),
-      q(7084) => q(wbl),
-      q(7085) => q(wbm),
-      q(7086) => q(wbp),
-      q(7087) => q(wbq),
-      q(7088) => q(wbr),
-      q(7089) => q(wbt),
-      q(7090) => q(wbv),
-      q(7091) => q(wbw),
-      q(7092) => q(wca),
-      q(7093) => q(wci),
-      q(7094) => q(wdd),
-      q(7095) => q(wdg),
-      q(7096) => q(wdj),
-      q(7097) => q(wdk),
-      q(7098) => q(wdu),
-      q(7099) => q(wdy),
-      q(7100) => q(wea),
-      q(7101) => q(wec),
-      q(7102) => q(wed),
-      q(7103) => q(weg),
-      q(7104) => q(weh),
-      q(7105) => q(wei),
-      q(7106) => q(wem),
-      q(7107) => q(weo),
-      q(7108) => q(wep),
-      q(7109) => q(wer),
-      q(7110) => q(wes),
-      q(7111) => q(wet),
-      q(7112) => q(weu),
-      q(7113) => q(wew),
-      q(7114) => q(wfg),
-      q(7115) => q(wga),
-      q(7116) => q(wgb),
-      q(7117) => q(wgg),
-      q(7118) => q(wgi),
-      q(7119) => q(wgo),
-      q(7120) => q(wgu),
-      q(7121) => q(wgy),
-      q(7122) => q(wha),
-      q(7123) => q(whg),
-      q(7124) => q(whk),
-      q(7125) => q(whu),
-      q(7126) => q(wib),
-      q(7127) => q(wic),
-      q(7128) => q(wie),
-      q(7129) => q(wif),
-      q(7130) => q(wig),
-      q(7131) => q(wih),
-      q(7132) => q(wii),
-      q(7133) => q(wij),
-      q(7134) => q(wik),
-      q(7135) => q(wil),
-      q(7136) => q(wim),
-      q(7137) => q(win),
-      q(7138) => q(wir),
-      q(7139) => q(wiu),
-      q(7140) => q(wiv),
-      q(7141) => q(wiy),
-      q(7142) => q(wja),
-      q(7143) => q(wji),
-      q(7144) => q(wka),
-      q(7145) => q(wkb),
-      q(7146) => q(wkd),
-      q(7147) => q(wkl),
-      q(7148) => q(wku),
-      q(7149) => q(wkw),
-      q(7150) => q(wky),
-      q(7151) => q(wla),
-      q(7152) => q(wlc),
-      q(7153) => q(wle),
-      q(7154) => q(wlg),
-      q(7155) => q(wli),
-      q(7156) => q(wlk),
-      q(7157) => q(wll),
-      q(7158) => q(wlm),
-      q(7159) => q(wlo),
-      q(7160) => q(wlr),
-      q(7161) => q(wls),
-      q(7162) => q(wlu),
-      q(7163) => q(wlv),
-      q(7164) => q(wlw),
-      q(7165) => q(wlx),
-      q(7166) => q(wly),
-      q(7167) => q(wma),
-      q(7168) => q(wmb),
-      q(7169) => q(wmc),
-      q(7170) => q(wmd),
-      q(7171) => q(wme),
-      q(7172) => q(wmh),
-      q(7173) => q(wmi),
-      q(7174) => q(wmm),
-      q(7175) => q(wmn),
-      q(7176) => q(wmo),
-      q(7177) => q(wms),
-      q(7178) => q(wmt),
-      q(7179) => q(wmw),
-      q(7180) => q(wmx),
-      q(7181) => q(wnb),
-      q(7182) => q(wnc),
-      q(7183) => q(wnd),
-      q(7184) => q(wne),
-      q(7185) => q(wng),
-      q(7186) => q(wni),
-      q(7187) => q(wnk),
-      q(7188) => q(wnm),
-      q(7189) => q(wnn),
-      q(7190) => q(wno),
-      q(7191) => q(wnp),
-      q(7192) => q(wnu),
-      q(7193) => q(wnw),
-      q(7194) => q(wny),
-      q(7195) => q(woa),
-      q(7196) => q(wob),
-      q(7197) => q(woc),
-      q(7198) => q(wod),
-      q(7199) => q(woe),
-      q(7200) => q(wof),
-      q(7201) => q(wog),
-      q(7202) => q(woi),
-      q(7203) => q(wok),
-      q(7204) => q(wom),
-      q(7205) => q(won),
-      q(7206) => q(woo),
-      q(7207) => q(wor),
-      q(7208) => q(wos),
-      q(7209) => q(wow),
-      q(7210) => q(woy),
-      q(7211) => q(wpc),
-      q(7212) => q(wra),
-      q(7213) => q(wrb),
-      q(7214) => q(wrd),
-      q(7215) => q(wrg),
-      q(7216) => q(wrh),
-      q(7217) => q(wri),
-      q(7218) => q(wrk),
-      q(7219) => q(wrl),
-      q(7220) => q(wrm),
-      q(7221) => q(wrn),
-      q(7222) => q(wro),
-      q(7223) => q(wrp),
-      q(7224) => q(wrr),
-      q(7225) => q(wrs),
-      q(7226) => q(wru),
-      q(7227) => q(wrv),
-      q(7228) => q(wrw),
-      q(7229) => q(wrx),
-      q(7230) => q(wry),
-      q(7231) => q(wrz),
-      q(7232) => q(wsa),
-      q(7233) => q(wsi),
-      q(7234) => q(wsk),
-      q(7235) => q(wsr),
-      q(7236) => q(wss),
-      q(7237) => q(wsu),
-      q(7238) => q(wsv),
-      q(7239) => q(wtf),
-      q(7240) => q(wth),
-      q(7241) => q(wti),
-      q(7242) => q(wtk),
-      q(7243) => q(wtm),
-      q(7244) => q(wtw),
-      q(7245) => q(wua),
-      q(7246) => q(wub),
-      q(7247) => q(wud),
-      q(7248) => q(wuh),
-      q(7249) => q(wul),
-      q(7250) => q(wum),
-      q(7251) => q(wun),
-      q(7252) => q(wur),
-      q(7253) => q(wut),
-      q(7254) => q(wuu),
-      q(7255) => q(wuv),
-      q(7256) => q(wux),
-      q(7257) => q(wuy),
-      q(7258) => q(wwa),
-      q(7259) => q(wwb),
-      q(7260) => q(wwo),
-      q(7261) => q(wwr),
-      q(7262) => q(www),
-      q(7263) => q(wxa),
-      q(7264) => q(wxw),
-      q(7265) => q(wya),
-      q(7266) => q(wyb),
-      q(7267) => q(wyi),
-      q(7268) => q(wym),
-      q(7269) => q(wyr),
-      q(7270) => q(wyy),
-      q(7271) => q(xaa),
-      q(7272) => q(xab),
-      q(7273) => q(xac),
-      q(7274) => q(xad),
-      q(7275) => q(xae),
-      q(7276) => q(xag),
-      q(7277) => q(xai),
-      q(7278) => q(xaj),
-      q(7279) => q(xam),
-      q(7280) => q(xan),
-      q(7281) => q(xao),
-      q(7282) => q(xap),
-      q(7283) => q(xaq),
-      q(7284) => q(xar),
-      q(7285) => q(xas),
-      q(7286) => q(xat),
-      q(7287) => q(xau),
-      q(7288) => q(xav),
-      q(7289) => q(xaw),
-      q(7290) => q(xay),
-      q(7291) => q(xba),
-      q(7292) => q(xbb),
-      q(7293) => q(xbc),
-      q(7294) => q(xbd),
-      q(7295) => q(xbe),
-      q(7296) => q(xbg),
-      q(7297) => q(xbi),
-      q(7298) => q(xbj),
-      q(7299) => q(xbm),
-      q(7300) => q(xbn),
-      q(7301) => q(xbo),
-      q(7302) => q(xbp),
-      q(7303) => q(xbr),
-      q(7304) => q(xbw),
-      q(7305) => q(xbx),
-      q(7306) => q(xby),
-      q(7307) => q(xcb),
-      q(7308) => q(xcc),
-      q(7309) => q(xce),
-      q(7310) => q(xcg),
-      q(7311) => q(xch),
-      q(7312) => q(xcl),
-      q(7313) => q(xcm),
-      q(7314) => q(xcn),
-      q(7315) => q(xco),
-      q(7316) => q(xcr),
-      q(7317) => q(xct),
-      q(7318) => q(xcu),
-      q(7319) => q(xcv),
-      q(7320) => q(xcw),
-      q(7321) => q(xcy),
-      q(7322) => q(xda),
-      q(7323) => q(xdc),
-      q(7324) => q(xdk),
-      q(7325) => q(xdm),
-      q(7326) => q(xdy),
-      q(7327) => q(xeb),
-      q(7328) => q(xed),
-      q(7329) => q(xeg),
-      q(7330) => q(xel),
-      q(7331) => q(xem),
-      q(7332) => q(xep),
-      q(7333) => q(xer),
-      q(7334) => q(xes),
-      q(7335) => q(xet),
-      q(7336) => q(xeu),
-      q(7337) => q(xfa),
-      q(7338) => q(xga),
-      q(7339) => q(xgb),
-      q(7340) => q(xgd),
-      q(7341) => q(xgf),
-      q(7342) => q(xgg),
-      q(7343) => q(xgi),
-      q(7344) => q(xgl),
-      q(7345) => q(xgm),
-      q(7346) => q(xgr),
-      q(7347) => q(xgu),
-      q(7348) => q(xgw),
-      q(7349) => q(xha),
-      q(7350) => q(xhc),
-      q(7351) => q(xhd),
-      q(7352) => q(xhe),
-      q(7353) => q(xhr),
-      q(7354) => q(xht),
-      q(7355) => q(xhu),
-      q(7356) => q(xhv),
-      q(7357) => q(xib),
-      q(7358) => q(xii),
-      q(7359) => q(xil),
-      q(7360) => q(xin),
-      q(7361) => q(xip),
-      q(7362) => q(xir),
-      q(7363) => q(xis),
-      q(7364) => q(xiv),
-      q(7365) => q(xiy),
-      q(7366) => q(xjb),
-      q(7367) => q(xjt),
-      q(7368) => q(xka),
-      q(7369) => q(xkb),
-      q(7370) => q(xkc),
-      q(7371) => q(xkd),
-      q(7372) => q(xke),
-      q(7373) => q(xkf),
-      q(7374) => q(xkg),
-      q(7375) => q(xkh),
-      q(7376) => q(xki),
-      q(7377) => q(xkj),
-      q(7378) => q(xkk),
-      q(7379) => q(xkl),
-      q(7380) => q(xkn),
-      q(7381) => q(xko),
-      q(7382) => q(xkp),
-      q(7383) => q(xkq),
-      q(7384) => q(xkr),
-      q(7385) => q(xks),
-      q(7386) => q(xkt),
-      q(7387) => q(xku),
-      q(7388) => q(xkv),
-      q(7389) => q(xkw),
-      q(7390) => q(xkx),
-      q(7391) => q(xky),
-      q(7392) => q(xkz),
-      q(7393) => q(xla),
-      q(7394) => q(xlb),
-      q(7395) => q(xlc),
-      q(7396) => q(xld),
-      q(7397) => q(xle),
-      q(7398) => q(xlg),
-      q(7399) => q(xli),
-      q(7400) => q(xln),
-      q(7401) => q(xlo),
-      q(7402) => q(xlp),
-      q(7403) => q(xls),
-      q(7404) => q(xlu),
-      q(7405) => q(xly),
-      q(7406) => q(xma),
-      q(7407) => q(xmb),
-      q(7408) => q(xmc),
-      q(7409) => q(xmd),
-      q(7410) => q(xme),
-      q(7411) => q(xmf),
-      q(7412) => q(xmg),
-      q(7413) => q(xmh),
-      q(7414) => q(xmj),
-      q(7415) => q(xmk),
-      q(7416) => q(xml),
-      q(7417) => q(xmm),
-      q(7418) => q(xmn),
-      q(7419) => q(xmo),
-      q(7420) => q(xmp),
-      q(7421) => q(xmq),
-      q(7422) => q(xmr),
-      q(7423) => q(xms),
-      q(7424) => q(xmt),
-      q(7425) => q(xmu),
-      q(7426) => q(xmv),
-      q(7427) => q(xmw),
-      q(7428) => q(xmx),
-      q(7429) => q(xmy),
-      q(7430) => q(xmz),
-      q(7431) => q(xna),
-      q(7432) => q(xnb),
-      q(7433) => q(xng),
-      q(7434) => q(xnh),
-      q(7435) => q(xni),
-      q(7436) => q(xnk),
-      q(7437) => q(xnn),
-      q(7438) => q(xno),
-      q(7439) => q(xnr),
-      q(7440) => q(xns),
-      q(7441) => q(xnt),
-      q(7442) => q(xnu),
-      q(7443) => q(xny),
-      q(7444) => q(xnz),
-      q(7445) => q(xoc),
-      q(7446) => q(xod),
-      q(7447) => q(xog),
-      q(7448) => q(xoi),
-      q(7449) => q(xok),
-      q(7450) => q(xom),
-      q(7451) => q(xon),
-      q(7452) => q(xoo),
-      q(7453) => q(xop),
-      q(7454) => q(xor),
-      q(7455) => q(xow),
-      q(7456) => q(xpa),
-      q(7457) => q(xpc),
-      q(7458) => q(xpe),
-      q(7459) => q(xpg),
-      q(7460) => q(xpi),
-      q(7461) => q(xpj),
-      q(7462) => q(xpk),
-      q(7463) => q(xpm),
-      q(7464) => q(xpn),
-      q(7465) => q(xpo),
-      q(7466) => q(xpp),
-      q(7467) => q(xpq),
-      q(7468) => q(xpr),
-      q(7469) => q(xps),
-      q(7470) => q(xpt),
-      q(7471) => q(xpu),
-      q(7472) => q(xpy),
-      q(7473) => q(xqa),
-      q(7474) => q(xqt),
-      q(7475) => q(xra),
-      q(7476) => q(xrb),
-      q(7477) => q(xrd),
-      q(7478) => q(xre),
-      q(7479) => q(xrg),
-      q(7480) => q(xri),
-      q(7481) => q(xrm),
-      q(7482) => q(xrn),
-      q(7483) => q(xrq),
-      q(7484) => q(xrr),
-      q(7485) => q(xrt),
-      q(7486) => q(xru),
-      q(7487) => q(xrw),
-      q(7488) => q(xsa),
-      q(7489) => q(xsb),
-      q(7490) => q(xsc),
-      q(7491) => q(xsd),
-      q(7492) => q(xse),
-      q(7493) => q(xsh),
-      q(7494) => q(xsi),
-      q(7495) => q(xsl),
-      q(7496) => q(xsm),
-      q(7497) => q(xsn),
-      q(7498) => q(xso),
-      q(7499) => q(xsp),
-      q(7500) => q(xsq),
-      q(7501) => q(xsr),
-      q(7502) => q(xss),
-      q(7503) => q(xsu),
-      q(7504) => q(xsv),
-      q(7505) => q(xsy),
-      q(7506) => q(xta),
-      q(7507) => q(xtb),
-      q(7508) => q(xtc),
-      q(7509) => q(xtd),
-      q(7510) => q(xte),
-      q(7511) => q(xtg),
-      q(7512) => q(xth),
-      q(7513) => q(xti),
-      q(7514) => q(xtj),
-      q(7515) => q(xtl),
-      q(7516) => q(xtm),
-      q(7517) => q(xtn),
-      q(7518) => q(xto),
-      q(7519) => q(xtp),
-      q(7520) => q(xtq),
-      q(7521) => q(xtr),
-      q(7522) => q(xts),
-      q(7523) => q(xtt),
-      q(7524) => q(xtu),
-      q(7525) => q(xtv),
-      q(7526) => q(xtw),
-      q(7527) => q(xty),
-      q(7528) => q(xtz),
-      q(7529) => q(xua),
-      q(7530) => q(xub),
-      q(7531) => q(xud),
-      q(7532) => q(xug),
-      q(7533) => q(xuj),
-      q(7534) => q(xul),
-      q(7535) => q(xum),
-      q(7536) => q(xun),
-      q(7537) => q(xuo),
-      q(7538) => q(xup),
-      q(7539) => q(xur),
-      q(7540) => q(xut),
-      q(7541) => q(xuu),
-      q(7542) => q(xve),
-      q(7543) => q(xvi),
-      q(7544) => q(xvn),
-      q(7545) => q(xvo),
-      q(7546) => q(xvs),
-      q(7547) => q(xwa),
-      q(7548) => q(xwc),
-      q(7549) => q(xwd),
-      q(7550) => q(xwe),
-      q(7551) => q(xwg),
-      q(7552) => q(xwj),
-      q(7553) => q(xwk),
-      q(7554) => q(xwl),
-      q(7555) => q(xwo),
-      q(7556) => q(xwr),
-      q(7557) => q(xwt),
-      q(7558) => q(xww),
-      q(7559) => q(xxb),
-      q(7560) => q(xxk),
-      q(7561) => q(xxm),
-      q(7562) => q(xxr),
-      q(7563) => q(xxt),
-      q(7564) => q(xya),
-      q(7565) => q(xyb),
-      q(7566) => q(xyj),
-      q(7567) => q(xyk),
-      q(7568) => q(xyl),
-      q(7569) => q(xyt),
-      q(7570) => q(xyy),
-      q(7571) => q(xzh),
-      q(7572) => q(xzm),
-      q(7573) => q(xzp),
-      q(7574) => q(yaa),
-      q(7575) => q(yab),
-      q(7576) => q(yac),
-      q(7577) => q(yad),
-      q(7578) => q(yae),
-      q(7579) => q(yaf),
-      q(7580) => q(yag),
-      q(7581) => q(yah),
-      q(7582) => q(yai),
-      q(7583) => q(yaj),
-      q(7584) => q(yak),
-      q(7585) => q(yal),
-      q(7586) => q(yam),
-      q(7587) => q(yan),
-      q(7588) => q(yaq),
-      q(7589) => q(yar),
-      q(7590) => q(yas),
-      q(7591) => q(yat),
-      q(7592) => q(yau),
-      q(7593) => q(yav),
-      q(7594) => q(yaw),
-      q(7595) => q(yax),
-      q(7596) => q(yay),
-      q(7597) => q(yaz),
-      q(7598) => q(yba),
-      q(7599) => q(ybb),
-      q(7600) => q(ybe),
-      q(7601) => q(ybh),
-      q(7602) => q(ybi),
-      q(7603) => q(ybj),
-      q(7604) => q(ybk),
-      q(7605) => q(ybl),
-      q(7606) => q(ybm),
-      q(7607) => q(ybn),
-      q(7608) => q(ybo),
-      q(7609) => q(ybx),
-      q(7610) => q(yby),
-      q(7611) => q(ych),
-      q(7612) => q(ycl),
-      q(7613) => q(ycn),
-      q(7614) => q(ycp),
-      q(7615) => q(yda),
-      q(7616) => q(ydd),
-      q(7617) => q(yde),
-      q(7618) => q(ydg),
-      q(7619) => q(ydk),
-      q(7620) => q(yea),
-      q(7621) => q(yec),
-      q(7622) => q(yee),
-      q(7623) => q(yei),
-      q(7624) => q(yej),
-      q(7625) => q(yel),
-      q(7626) => q(yer),
-      q(7627) => q(yes),
-      q(7628) => q(yet),
-      q(7629) => q(yeu),
-      q(7630) => q(yev),
-      q(7631) => q(yey),
-      q(7632) => q(yga),
-      q(7633) => q(ygi),
-      q(7634) => q(ygl),
-      q(7635) => q(ygm),
-      q(7636) => q(ygp),
-      q(7637) => q(ygr),
-      q(7638) => q(ygs),
-      q(7639) => q(ygu),
-      q(7640) => q(ygw),
-      q(7641) => q(yha),
-      q(7642) => q(yhd),
-      q(7643) => q(yhl),
-      q(7644) => q(yia),
-      q(7645) => q(yig),
-      q(7646) => q(yih),
-      q(7647) => q(yii),
-      q(7648) => q(yij),
-      q(7649) => q(yik),
-      q(7650) => q(yil),
-      q(7651) => q(yim),
-      q(7652) => q(yin),
-      q(7653) => q(yip),
-      q(7654) => q(yiq),
-      q(7655) => q(yir),
-      q(7656) => q(yis),
-      q(7657) => q(yit),
-      q(7658) => q(yiu),
-      q(7659) => q(yiv),
-      q(7660) => q(yix),
-      q(7661) => q(yiz),
-      q(7662) => q(yka),
-      q(7663) => q(ykg),
-      q(7664) => q(yki),
-      q(7665) => q(ykk),
-      q(7666) => q(ykl),
-      q(7667) => q(ykm),
-      q(7668) => q(ykn),
-      q(7669) => q(yko),
-      q(7670) => q(ykr),
-      q(7671) => q(ykt),
-      q(7672) => q(yku),
-      q(7673) => q(yky),
-      q(7674) => q(yla),
-      q(7675) => q(ylb),
-      q(7676) => q(yle),
-      q(7677) => q(ylg),
-      q(7678) => q(yli),
-      q(7679) => q(yll),
-      q(7680) => q(ylm),
-      q(7681) => q(yln),
-      q(7682) => q(ylo),
-      q(7683) => q(ylr),
-      q(7684) => q(ylu),
-      q(7685) => q(yly),
-      q(7686) => q(ymb),
-      q(7687) => q(ymc),
-      q(7688) => q(ymd),
-      q(7689) => q(yme),
-      q(7690) => q(ymg),
-      q(7691) => q(ymh),
-      q(7692) => q(ymi),
-      q(7693) => q(ymk),
-      q(7694) => q(yml),
-      q(7695) => q(ymm),
-      q(7696) => q(ymn),
-      q(7697) => q(ymo),
-      q(7698) => q(ymp),
-      q(7699) => q(ymq),
-      q(7700) => q(ymr),
-      q(7701) => q(yms),
-      q(7702) => q(ymx),
-      q(7703) => q(ymz),
-      q(7704) => q(yna),
-      q(7705) => q(ynd),
-      q(7706) => q(yne),
-      q(7707) => q(yng),
-      q(7708) => q(ynk),
-      q(7709) => q(ynl),
-      q(7710) => q(ynn),
-      q(7711) => q(yno),
-      q(7712) => q(ynq),
-      q(7713) => q(yns),
-      q(7714) => q(ynu),
-      q(7715) => q(yob),
-      q(7716) => q(yog),
-      q(7717) => q(yoi),
-      q(7718) => q(yok),
-      q(7719) => q(yol),
-      q(7720) => q(yom),
-      q(7721) => q(yon),
-      q(7722) => q(yot),
-      q(7723) => q(yox),
-      q(7724) => q(yoy),
-      q(7725) => q(ypa),
-      q(7726) => q(ypb),
-      q(7727) => q(ypg),
-      q(7728) => q(yph),
-      q(7729) => q(ypm),
-      q(7730) => q(ypn),
-      q(7731) => q(ypo),
-      q(7732) => q(ypp),
-      q(7733) => q(ypz),
-      q(7734) => q(yra),
-      q(7735) => q(yrb),
-      q(7736) => q(yre),
-      q(7737) => q(yri),
-      q(7738) => q(yrk),
-      q(7739) => q(yrl),
-      q(7740) => q(yrm),
-      q(7741) => q(yrn),
-      q(7742) => q(yrs),
-      q(7743) => q(yrw),
-      q(7744) => q(yry),
-      q(7745) => q(ysc),
-      q(7746) => q(ysd),
-      q(7747) => q(ysg),
-      q(7748) => q(ysl),
-      q(7749) => q(ysn),
-      q(7750) => q(yso),
-      q(7751) => q(ysp),
-      q(7752) => q(ysr),
-      q(7753) => q(yss),
-      q(7754) => q(ysy),
-      q(7755) => q(yta),
-      q(7756) => q(ytl),
-      q(7757) => q(ytp),
-      q(7758) => q(ytw),
-      q(7759) => q(yty),
-      q(7760) => q(yua),
-      q(7761) => q(yub),
-      q(7762) => q(yuc),
-      q(7763) => q(yud),
-      q(7764) => q(yue),
-      q(7765) => q(yuf),
-      q(7766) => q(yug),
-      q(7767) => q(yui),
-      q(7768) => q(yuj),
-      q(7769) => q(yuk),
-      q(7770) => q(yul),
-      q(7771) => q(yum),
-      q(7772) => q(yun),
-      q(7773) => q(yup),
-      q(7774) => q(yuq),
-      q(7775) => q(yur),
-      q(7776) => q(yut),
-      q(7777) => q(yuw),
-      q(7778) => q(yux),
-      q(7779) => q(yuy),
-      q(7780) => q(yuz),
-      q(7781) => q(yva),
-      q(7782) => q(yvt),
-      q(7783) => q(ywa),
-      q(7784) => q(ywg),
-      q(7785) => q(ywl),
-      q(7786) => q(ywn),
-      q(7787) => q(ywq),
-      q(7788) => q(ywr),
-      q(7789) => q(ywt),
-      q(7790) => q(ywu),
-      q(7791) => q(yww),
-      q(7792) => q(yxa),
-      q(7793) => q(yxg),
-      q(7794) => q(yxl),
-      q(7795) => q(yxm),
-      q(7796) => q(yxu),
-      q(7797) => q(yxy),
-      q(7798) => q(yyr),
-      q(7799) => q(yyu),
-      q(7800) => q(yyz),
-      q(7801) => q(yzg),
-      q(7802) => q(yzk),
-      q(7803) => q(zaa),
-      q(7804) => q(zab),
-      q(7805) => q(zac),
-      q(7806) => q(zad),
-      q(7807) => q(zae),
-      q(7808) => q(zaf),
-      q(7809) => q(zag),
-      q(7810) => q(zah),
-      q(7811) => q(zai),
-      q(7812) => q(zaj),
-      q(7813) => q(zak),
-      q(7814) => q(zal),
-      q(7815) => q(zam),
-      q(7816) => q(zao),
-      q(7817) => q(zaq),
-      q(7818) => q(zar),
-      q(7819) => q(zas),
-      q(7820) => q(zat),
-      q(7821) => q(zau),
-      q(7822) => q(zav),
-      q(7823) => q(zaw),
-      q(7824) => q(zax),
-      q(7825) => q(zay),
-      q(7826) => q(zaz),
-      q(7827) => q(zbc),
-      q(7828) => q(zbe),
-      q(7829) => q(zbt),
-      q(7830) => q(zbw),
-      q(7831) => q(zca),
-      q(7832) => q(zch),
-      q(7833) => q(zdj),
-      q(7834) => q(zea),
-      q(7835) => q(zeg),
-      q(7836) => q(zeh),
-      q(7837) => q(zga),
-      q(7838) => q(zgb),
-      q(7839) => q(zgm),
-      q(7840) => q(zgn),
-      q(7841) => q(zgr),
-      q(7842) => q(zhb),
-      q(7843) => q(zhd),
-      q(7844) => q(zhi),
-      q(7845) => q(zhn),
-      q(7846) => q(zhw),
-      q(7847) => q(zia),
-      q(7848) => q(zib),
-      q(7849) => q(zik),
-      q(7850) => q(zil),
-      q(7851) => q(zim),
-      q(7852) => q(zin),
-      q(7853) => q(zir),
-      q(7854) => q(ziw),
-      q(7855) => q(ziz),
-      q(7856) => q(zka),
-      q(7857) => q(zkb),
-      q(7858) => q(zkd),
-      q(7859) => q(zkg),
-      q(7860) => q(zkh),
-      q(7861) => q(zkk),
-      q(7862) => q(zkn),
-      q(7863) => q(zko),
-      q(7864) => q(zkp),
-      q(7865) => q(zkr),
-      q(7866) => q(zkt),
-      q(7867) => q(zku),
-      q(7868) => q(zkv),
-      q(7869) => q(zkz),
-      q(7870) => q(zlj),
-      q(7871) => q(zlm),
-      q(7872) => q(zln),
-      q(7873) => q(zlq),
-      q(7874) => q(zma),
-      q(7875) => q(zmb),
-      q(7876) => q(zmc),
-      q(7877) => q(zmd),
-      q(7878) => q(zme),
-      q(7879) => q(zmf),
-      q(7880) => q(zmg),
-      q(7881) => q(zmh),
-      q(7882) => q(zmi),
-      q(7883) => q(zmj),
-      q(7884) => q(zmk),
-      q(7885) => q(zml),
-      q(7886) => q(zmm),
-      q(7887) => q(zmn),
-      q(7888) => q(zmo),
-      q(7889) => q(zmp),
-      q(7890) => q(zmq),
-      q(7891) => q(zmr),
-      q(7892) => q(zms),
-      q(7893) => q(zmt),
-      q(7894) => q(zmu),
-      q(7895) => q(zmv),
-      q(7896) => q(zmw),
-      q(7897) => q(zmx),
-      q(7898) => q(zmy),
-      q(7899) => q(zmz),
-      q(7900) => q(zna),
-      q(7901) => q(zne),
-      q(7902) => q(zng),
-      q(7903) => q(znk),
-      q(7904) => q(zns),
-      q(7905) => q(zoc),
-      q(7906) => q(zoh),
-      q(7907) => q(zom),
-      q(7908) => q(zoo),
-      q(7909) => q(zoq),
-      q(7910) => q(zor),
-      q(7911) => q(zos),
-      q(7912) => q(zpa),
-      q(7913) => q(zpb),
-      q(7914) => q(zpc),
-      q(7915) => q(zpd),
-      q(7916) => q(zpe),
-      q(7917) => q(zpf),
-      q(7918) => q(zpg),
-      q(7919) => q(zph),
-      q(7920) => q(zpi),
-      q(7921) => q(zpj),
-      q(7922) => q(zpk),
-      q(7923) => q(zpl),
-      q(7924) => q(zpm),
-      q(7925) => q(zpn),
-      q(7926) => q(zpo),
-      q(7927) => q(zpp),
-      q(7928) => q(zpq),
-      q(7929) => q(zpr),
-      q(7930) => q(zps),
-      q(7931) => q(zpt),
-      q(7932) => q(zpu),
-      q(7933) => q(zpv),
-      q(7934) => q(zpw),
-      q(7935) => q(zpx),
-      q(7936) => q(zpy),
-      q(7937) => q(zpz),
-      q(7938) => q(zqe),
-      q(7939) => q(zra),
-      q(7940) => q(zrg),
-      q(7941) => q(zrn),
-      q(7942) => q(zro),
-      q(7943) => q(zrp),
-      q(7944) => q(zrs),
-      q(7945) => q(zsa),
-      q(7946) => q(zsk),
-      q(7947) => q(zsl),
-      q(7948) => q(zsm),
-      q(7949) => q(zsr),
-      q(7950) => q(zsu),
-      q(7951) => q(zte),
-      q(7952) => q(ztg),
-      q(7953) => q(ztl),
-      q(7954) => q(ztm),
-      q(7955) => q(ztn),
-      q(7956) => q(ztp),
-      q(7957) => q(ztq),
-      q(7958) => q(zts),
-      q(7959) => q(ztt),
-      q(7960) => q(ztu),
-      q(7961) => q(ztx),
-      q(7962) => q(zty),
-      q(7963) => q(zua),
-      q(7964) => q(zuh),
-      q(7965) => q(zum),
-      q(7966) => q(zuy),
-      q(7967) => q(zwa),
-      q(7968) => q(zyb),
-      q(7969) => q(zyg),
-      q(7970) => q(zyj),
-      q(7971) => q(zyn),
-      q(7972) => q(zyp),
-      q(7973) => q(zzj),
+      q(3136) => q(jog),
+      q(3137) => q(jor),
+      q(3138) => q(jos),
+      q(3139) => q(jow),
+      q(3140) => q(jpa),
+      q(3141) => q(jqr),
+      q(3142) => q(jra),
+      q(3143) => q(jrr),
+      q(3144) => q(jrt),
+      q(3145) => q(jru),
+      q(3146) => q(jsl),
+      q(3147) => q(jua),
+      q(3148) => q(jub),
+      q(3149) => q(juc),
+      q(3150) => q(jud),
+      q(3151) => q(juh),
+      q(3152) => q(jui),
+      q(3153) => q(juk),
+      q(3154) => q(jul),
+      q(3155) => q(jum),
+      q(3156) => q(jun),
+      q(3157) => q(juo),
+      q(3158) => q(jup),
+      q(3159) => q(jur),
+      q(3160) => q(jus),
+      q(3161) => q(jut),
+      q(3162) => q(juu),
+      q(3163) => q(juw),
+      q(3164) => q(juy),
+      q(3165) => q(jvd),
+      q(3166) => q(jvn),
+      q(3167) => q(jwi),
+      q(3168) => q(jya),
+      q(3169) => q(jye),
+      q(3170) => q(jyy),
+      q(3171) => q(kad),
+      q(3172) => q(kae),
+      q(3173) => q(kaf),
+      q(3174) => q(kag),
+      q(3175) => q(kah),
+      q(3176) => q(kai),
+      q(3177) => q(kaj),
+      q(3178) => q(kak),
+      q(3179) => q(kao),
+      q(3180) => q(kap),
+      q(3181) => q(kaq),
+      q(3182) => q(kav),
+      q(3183) => q(kax),
+      q(3184) => q(kay),
+      q(3185) => q(kba),
+      q(3186) => q(kbb),
+      q(3187) => q(kbc),
+      q(3188) => q(kbe),
+      q(3189) => q(kbg),
+      q(3190) => q(kbh),
+      q(3191) => q(kbi),
+      q(3192) => q(kbj),
+      q(3193) => q(kbk),
+      q(3194) => q(kbl),
+      q(3195) => q(kbm),
+      q(3196) => q(kbn),
+      q(3197) => q(kbo),
+      q(3198) => q(kbp),
+      q(3199) => q(kbq),
+      q(3200) => q(kbr),
+      q(3201) => q(kbs),
+      q(3202) => q(kbt),
+      q(3203) => q(kbu),
+      q(3204) => q(kbv),
+      q(3205) => q(kbw),
+      q(3206) => q(kbx),
+      q(3207) => q(kby),
+      q(3208) => q(kbz),
+      q(3209) => q(kca),
+      q(3210) => q(kcb),
+      q(3211) => q(kcc),
+      q(3212) => q(kcd),
+      q(3213) => q(kce),
+      q(3214) => q(kcf),
+      q(3215) => q(kcg),
+      q(3216) => q(kch),
+      q(3217) => q(kci),
+      q(3218) => q(kcj),
+      q(3219) => q(kck),
+      q(3220) => q(kcl),
+      q(3221) => q(kcm),
+      q(3222) => q(kcn),
+      q(3223) => q(kco),
+      q(3224) => q(kcp),
+      q(3225) => q(kcq),
+      q(3226) => q(kcr),
+      q(3227) => q(kcs),
+      q(3228) => q(kct),
+      q(3229) => q(kcu),
+      q(3230) => q(kcv),
+      q(3231) => q(kcw),
+      q(3232) => q(kcx),
+      q(3233) => q(kcy),
+      q(3234) => q(kcz),
+      q(3235) => q(kda),
+      q(3236) => q(kdc),
+      q(3237) => q(kdd),
+      q(3238) => q(kde),
+      q(3239) => q(kdf),
+      q(3240) => q(kdg),
+      q(3241) => q(kdh),
+      q(3242) => q(kdi),
+      q(3243) => q(kdj),
+      q(3244) => q(kdk),
+      q(3245) => q(kdl),
+      q(3246) => q(kdm),
+      q(3247) => q(kdn),
+      q(3248) => q(kdp),
+      q(3249) => q(kdq),
+      q(3250) => q(kdr),
+      q(3251) => q(kdt),
+      q(3252) => q(kdu),
+      q(3253) => q(kdw),
+      q(3254) => q(kdx),
+      q(3255) => q(kdy),
+      q(3256) => q(kdz),
+      q(3257) => q(kea),
+      q(3258) => q(keb),
+      q(3259) => q(kec),
+      q(3260) => q(ked),
+      q(3261) => q(kee),
+      q(3262) => q(kef),
+      q(3263) => q(keg),
+      q(3264) => q(keh),
+      q(3265) => q(kei),
+      q(3266) => q(kej),
+      q(3267) => q(kek),
+      q(3268) => q(kel),
+      q(3269) => q(kem),
+      q(3270) => q(ken),
+      q(3271) => q(keo),
+      q(3272) => q(kep),
+      q(3273) => q(keq),
+      q(3274) => q(ker),
+      q(3275) => q(kes),
+      q(3276) => q(ket),
+      q(3277) => q(keu),
+      q(3278) => q(kev),
+      q(3279) => q(kew),
+      q(3280) => q(kex),
+      q(3281) => q(key),
+      q(3282) => q(kez),
+      q(3283) => q(kfa),
+      q(3284) => q(kfb),
+      q(3285) => q(kfc),
+      q(3286) => q(kfd),
+      q(3287) => q(kfe),
+      q(3288) => q(kff),
+      q(3289) => q(kfg),
+      q(3290) => q(kfh),
+      q(3291) => q(kfi),
+      q(3292) => q(kfj),
+      q(3293) => q(kfk),
+      q(3294) => q(kfl),
+      q(3295) => q(kfm),
+      q(3296) => q(kfn),
+      q(3297) => q(kfo),
+      q(3298) => q(kfp),
+      q(3299) => q(kfq),
+      q(3300) => q(kfr),
+      q(3301) => q(kfs),
+      q(3302) => q(kft),
+      q(3303) => q(kfu),
+      q(3304) => q(kfv),
+      q(3305) => q(kfw),
+      q(3306) => q(kfx),
+      q(3307) => q(kfy),
+      q(3308) => q(kfz),
+      q(3309) => q(kga),
+      q(3310) => q(kgb),
+      q(3311) => q(kgc),
+      q(3312) => q(kgd),
+      q(3313) => q(kge),
+      q(3314) => q(kgf),
+      q(3315) => q(kgg),
+      q(3316) => q(kgi),
+      q(3317) => q(kgj),
+      q(3318) => q(kgk),
+      q(3319) => q(kgl),
+      q(3320) => q(kuq),
+      q(3321) => q(kgn),
+      q(3322) => q(kgo),
+      q(3323) => q(kgp),
+      q(3324) => q(kgq),
+      q(3325) => q(kgr),
+      q(3326) => q(kgs),
+      q(3327) => q(kgt),
+      q(3328) => q(kgu),
+      q(3329) => q(kgv),
+      q(3330) => q(kgw),
+      q(3331) => q(kgx),
+      q(3332) => q(kgy),
+      q(3333) => q(khb),
+      q(3334) => q(khc),
+      q(3335) => q(khd),
+      q(3336) => q(khe),
+      q(3337) => q(khf),
+      q(3338) => q(khg),
+      q(3339) => q(khh),
+      q(3340) => q(khj),
+      q(3341) => q(khk),
+      q(3342) => q(khl),
+      q(3343) => q(khn),
+      q(3344) => q(khp),
+      q(3345) => q(khq),
+      q(3346) => q(khr),
+      q(3347) => q(khs),
+      q(3348) => q(kht),
+      q(3349) => q(khu),
+      q(3350) => q(khv),
+      q(3351) => q(khw),
+      q(3352) => q(khx),
+      q(3353) => q(khy),
+      q(3354) => q(khz),
+      q(3355) => q(kia),
+      q(3356) => q(kib),
+      q(3357) => q(kic),
+      q(3358) => q(kid),
+      q(3359) => q(kie),
+      q(3360) => q(kif),
+      q(3361) => q(kig),
+      q(3362) => q(kih),
+      q(3363) => q(kii),
+      q(3364) => q(kij),
+      q(3365) => q(kil),
+      q(3366) => q(kim),
+      q(3367) => q(kio),
+      q(3368) => q(kip),
+      q(3369) => q(kiq),
+      q(3370) => q(kis),
+      q(3371) => q(kit),
+      q(3372) => q(kiu),
+      q(3373) => q(kiv),
+      q(3374) => q(kiw),
+      q(3375) => q(kix),
+      q(3376) => q(kiy),
+      q(3377) => q(kiz),
+      q(3378) => q(kja),
+      q(3379) => q(kjb),
+      q(3380) => q(kjc),
+      q(3381) => q(kjd),
+      q(3382) => q(kje),
+      q(3383) => q(kjf),
+      q(3384) => q(kjg),
+      q(3385) => q(kjh),
+      q(3386) => q(kji),
+      q(3387) => q(kjj),
+      q(3388) => q(kjk),
+      q(3389) => q(kjl),
+      q(3390) => q(kjm),
+      q(3391) => q(kjn),
+      q(3392) => q(kjo),
+      q(3393) => q(kjp),
+      q(3394) => q(kjq),
+      q(3395) => q(kjr),
+      q(3396) => q(kjs),
+      q(3397) => q(kjt),
+      q(3398) => q(kju),
+      q(3399) => q(kjv),
+      q(3400) => q(kjx),
+      q(3401) => q(kjy),
+      q(3402) => q(kjz),
+      q(3403) => q(kka),
+      q(3404) => q(kkb),
+      q(3405) => q(kkc),
+      q(3406) => q(kkd),
+      q(3407) => q(kke),
+      q(3408) => q(kkf),
+      q(3409) => q(kkg),
+      q(3410) => q(kkh),
+      q(3411) => q(kki),
+      q(3412) => q(kkj),
+      q(3413) => q(kkk),
+      q(3414) => q(kkl),
+      q(3415) => q(kkm),
+      q(3416) => q(kkn),
+      q(3417) => q(kko),
+      q(3418) => q(kkp),
+      q(3419) => q(kkq),
+      q(3420) => q(kkr),
+      q(3421) => q(kks),
+      q(3422) => q(kkt),
+      q(3423) => q(kku),
+      q(3424) => q(kkv),
+      q(3425) => q(kkw),
+      q(3426) => q(kkx),
+      q(3427) => q(kky),
+      q(3428) => q(kkz),
+      q(3429) => q(kla),
+      q(3430) => q(klb),
+      q(3431) => q(klc),
+      q(3432) => q(kld),
+      q(3433) => q(kle),
+      q(3434) => q(klf),
+      q(3435) => q(klg),
+      q(3436) => q(klh),
+      q(3437) => q(kli),
+      q(3438) => q(klj),
+      q(3439) => q(klk),
+      q(3440) => q(kll),
+      q(3441) => q(klm),
+      q(3442) => q(kln),
+      q(3443) => q(klo),
+      q(3444) => q(klp),
+      q(3445) => q(klq),
+      q(3446) => q(klr),
+      q(3447) => q(kls),
+      q(3448) => q(klt),
+      q(3449) => q(klu),
+      q(3450) => q(klv),
+      q(3451) => q(klw),
+      q(3452) => q(klx),
+      q(3453) => q(kly),
+      q(3454) => q(klz),
+      q(3455) => q(kma),
+      q(3456) => q(kmc),
+      q(3457) => q(kmd),
+      q(3458) => q(kme),
+      q(3459) => q(kmf),
+      q(3460) => q(kmg),
+      q(3461) => q(kmh),
+      q(3462) => q(kmi),
+      q(3463) => q(kmj),
+      q(3464) => q(kmk),
+      q(3465) => q(kml),
+      q(3466) => q(kmm),
+      q(3467) => q(kmn),
+      q(3468) => q(kmo),
+      q(3469) => q(kmp),
+      q(3470) => q(kmq),
+      q(3471) => q(kmr),
+      q(3472) => q(kms),
+      q(3473) => q(kmt),
+      q(3474) => q(kmu),
+      q(3475) => q(kmv),
+      q(3476) => q(kmw),
+      q(3477) => q(kmx),
+      q(3478) => q(kmy),
+      q(3479) => q(kmz),
+      q(3480) => q(kna),
+      q(3481) => q(knb),
+      q(3482) => q(knc),
+      q(3483) => q(knd),
+      q(3484) => q(kne),
+      q(3485) => q(knf),
+      q(3486) => q(kng),
+      q(3487) => q(kni),
+      q(3488) => q(knj),
+      q(3489) => q(knk),
+      q(3490) => q(knl),
+      q(3491) => q(knm),
+      q(3492) => q(knn),
+      q(3493) => q(kno),
+      q(3494) => q(knp),
+      q(3495) => q(knq),
+      q(3496) => q(knr),
+      q(3497) => q(kns),
+      q(3498) => q(knt),
+      q(3499) => q(knu),
+      q(3500) => q(knv),
+      q(3501) => q(knw),
+      q(3502) => q(knx),
+      q(3503) => q(kny),
+      q(3504) => q(knz),
+      q(3505) => q(koa),
+      q(3506) => q(koc),
+      q(3507) => q(kod),
+      q(3508) => q(koe),
+      q(3509) => q(kof),
+      q(3510) => q(kog),
+      q(3511) => q(koh),
+      q(3512) => q(koi),
+      q(3513) => q(kol),
+      q(3514) => q(koo),
+      q(3515) => q(kop),
+      q(3516) => q(koq),
+      q(3517) => q(kot),
+      q(3518) => q(kou),
+      q(3519) => q(kov),
+      q(3520) => q(kow),
+      q(3521) => q(kox),
+      q(3522) => q(koy),
+      q(3523) => q(koz),
+      q(3524) => q(kpa),
+      q(3525) => q(kpb),
+      q(3526) => q(kpc),
+      q(3527) => q(kpd),
+      q(3528) => q(kpf),
+      q(3529) => q(kpg),
+      q(3530) => q(kph),
+      q(3531) => q(kpi),
+      q(3532) => q(kpj),
+      q(3533) => q(kpk),
+      q(3534) => q(kpl),
+      q(3535) => q(kpm),
+      q(3536) => q(kpn),
+      q(3537) => q(kpo),
+      q(3538) => q(kpq),
+      q(3539) => q(kpr),
+      q(3540) => q(kps),
+      q(3541) => q(kpt),
+      q(3542) => q(kpu),
+      q(3543) => q(kpv),
+      q(3544) => q(kpw),
+      q(3545) => q(kpx),
+      q(3546) => q(kpy),
+      q(3547) => q(kpz),
+      q(3548) => q(kqa),
+      q(3549) => q(kqb),
+      q(3550) => q(kqc),
+      q(3551) => q(kqd),
+      q(3552) => q(kqe),
+      q(3553) => q(kqf),
+      q(3554) => q(kqg),
+      q(3555) => q(kqh),
+      q(3556) => q(kqi),
+      q(3557) => q(kqj),
+      q(3558) => q(kqk),
+      q(3559) => q(kql),
+      q(3560) => q(kqm),
+      q(3561) => q(kqn),
+      q(3562) => q(kqo),
+      q(3563) => q(kqp),
+      q(3564) => q(kqq),
+      q(3565) => q(kqr),
+      q(3566) => q(kqs),
+      q(3567) => q(kqt),
+      q(3568) => q(kqu),
+      q(3569) => q(kqv),
+      q(3570) => q(kqw),
+      q(3571) => q(kqx),
+      q(3572) => q(kqy),
+      q(3573) => q(kqz),
+      q(3574) => q(kra),
+      q(3575) => q(krb),
+      q(3576) => q(krd),
+      q(3577) => q(kre),
+      q(3578) => q(krf),
+      q(3579) => q(krh),
+      q(3580) => q(kri),
+      q(3581) => q(krj),
+      q(3582) => q(krk),
+      q(3583) => q(krm),
+      q(3584) => q(krn),
+      q(3585) => q(krp),
+      q(3586) => q(krr),
+      q(3587) => q(krs),
+      q(3588) => q(krt),
+      q(3589) => q(krv),
+      q(3590) => q(krw),
+      q(3591) => q(krx),
+      q(3592) => q(kry),
+      q(3593) => q(krz),
+      q(3594) => q(ksa),
+      q(3595) => q(ksb),
+      q(3596) => q(ksc),
+      q(3597) => q(ksd),
+      q(3598) => q(kse),
+      q(3599) => q(ksf),
+      q(3600) => q(ksg),
+      q(3601) => q(ksh),
+      q(3602) => q(ksi),
+      q(3603) => q(ksj),
+      q(3604) => q(ksk),
+      q(3605) => q(ksl),
+      q(3606) => q(ksm),
+      q(3607) => q(ksn),
+      q(3608) => q(kso),
+      q(3609) => q(ksp),
+      q(3610) => q(ksq),
+      q(3611) => q(ksr),
+      q(3612) => q(kss),
+      q(3613) => q(kst),
+      q(3614) => q(ksu),
+      q(3615) => q(ksv),
+      q(3616) => q(ksw),
+      q(3617) => q(ksx),
+      q(3618) => q(ksy),
+      q(3619) => q(ksz),
+      q(3620) => q(kta),
+      q(3621) => q(ktb),
+      q(3622) => q(ktc),
+      q(3623) => q(ktd),
+      q(3624) => q(kte),
+      q(3625) => q(ktf),
+      q(3626) => q(ktg),
+      q(3627) => q(kth),
+      q(3628) => q(kti),
+      q(3629) => q(ktj),
+      q(3630) => q(ktk),
+      q(3631) => q(ktl),
+      q(3632) => q(ktm),
+      q(3633) => q(ktn),
+      q(3634) => q(kto),
+      q(3635) => q(ktp),
+      q(3636) => q(ktq),
+      q(3637) => q(ktr),
+      q(3638) => q(kts),
+      q(3639) => q(ktt),
+      q(3640) => q(ktu),
+      q(3641) => q(ktv),
+      q(3642) => q(ktw),
+      q(3643) => q(ktx),
+      q(3644) => q(kty),
+      q(3645) => q(ktz),
+      q(3646) => q(kub),
+      q(3647) => q(kuc),
+      q(3648) => q(kud),
+      q(3649) => q(kue),
+      q(3650) => q(kuf),
+      q(3651) => q(kug),
+      q(3652) => q(kuh),
+      q(3653) => q(kui),
+      q(3654) => q(kuj),
+      q(3655) => q(kuk),
+      q(3656) => q(kul),
+      q(3657) => q(kun),
+      q(3658) => q(kuo),
+      q(3659) => q(kup),
+      q(3660) => q(kus),
+      q(3661) => q(kuu),
+      q(3662) => q(kuv),
+      q(3663) => q(kuw),
+      q(3664) => q(kux),
+      q(3665) => q(kuy),
+      q(3666) => q(kuz),
+      q(3667) => q(kva),
+      q(3668) => q(kvb),
+      q(3669) => q(kvc),
+      q(3670) => q(kvd),
+      q(3671) => q(kve),
+      q(3672) => q(kvf),
+      q(3673) => q(kvg),
+      q(3674) => q(kvh),
+      q(3675) => q(kvi),
+      q(3676) => q(kvj),
+      q(3677) => q(kvk),
+      q(3678) => q(kvl),
+      q(3679) => q(kvm),
+      q(3680) => q(kvn),
+      q(3681) => q(kvo),
+      q(3682) => q(kvp),
+      q(3683) => q(kvq),
+      q(3684) => q(kvr),
+      q(3685) => q(kvs),
+      q(3686) => q(kvt),
+      q(3687) => q(kvu),
+      q(3688) => q(kvv),
+      q(3689) => q(kvw),
+      q(3690) => q(kvx),
+      q(3691) => q(kvy),
+      q(3692) => q(kvz),
+      q(3693) => q(kwa),
+      q(3694) => q(kwb),
+      q(3695) => q(kwc),
+      q(3696) => q(kwd),
+      q(3697) => q(kwe),
+      q(3698) => q(kwf),
+      q(3699) => q(kwg),
+      q(3700) => q(kwh),
+      q(3701) => q(kwi),
+      q(3702) => q(kwj),
+      q(3703) => q(kwk),
+      q(3704) => q(kwl),
+      q(3705) => q(kwm),
+      q(3706) => q(kwn),
+      q(3707) => q(kwo),
+      q(3708) => q(kwp),
+      q(3709) => q(kwr),
+      q(3710) => q(kws),
+      q(3711) => q(kwt),
+      q(3712) => q(kwu),
+      q(3713) => q(kwv),
+      q(3714) => q(kww),
+      q(3715) => q(kwx),
+      q(3716) => q(kwy),
+      q(3717) => q(kwz),
+      q(3718) => q(kxa),
+      q(3719) => q(kxb),
+      q(3720) => q(kxc),
+      q(3721) => q(kxd),
+      q(3722) => q(kxf),
+      q(3723) => q(kxh),
+      q(3724) => q(kxi),
+      q(3725) => q(kxj),
+      q(3726) => q(kxk),
+      q(3727) => q(kxl),
+      q(3728) => q(kxm),
+      q(3729) => q(kxn),
+      q(3730) => q(kxo),
+      q(3731) => q(kxp),
+      q(3732) => q(kxq),
+      q(3733) => q(kxr),
+      q(3734) => q(kxs),
+      q(3735) => q(kxt),
+      q(3736) => q(kxu),
+      q(3737) => q(kxv),
+      q(3738) => q(kxw),
+      q(3739) => q(kxx),
+      q(3740) => q(kxy),
+      q(3741) => q(kxz),
+      q(3742) => q(kya),
+      q(3743) => q(kyb),
+      q(3744) => q(kyc),
+      q(3745) => q(kyd),
+      q(3746) => q(kye),
+      q(3747) => q(kyf),
+      q(3748) => q(kyg),
+      q(3749) => q(kyh),
+      q(3750) => q(kyi),
+      q(3751) => q(kyj),
+      q(3752) => q(kyk),
+      q(3753) => q(kyl),
+      q(3754) => q(kym),
+      q(3755) => q(kyn),
+      q(3756) => q(kyo),
+      q(3757) => q(kyp),
+      q(3758) => q(kyq),
+      q(3759) => q(kyr),
+      q(3760) => q(kys),
+      q(3761) => q(kyt),
+      q(3762) => q(kyu),
+      q(3763) => q(kyv),
+      q(3764) => q(kyw),
+      q(3765) => q(kyx),
+      q(3766) => q(kyy),
+      q(3767) => q(kyz),
+      q(3768) => q(kza),
+      q(3769) => q(kzb),
+      q(3770) => q(kzc),
+      q(3771) => q(kzd),
+      q(3772) => q(kze),
+      q(3773) => q(kzf),
+      q(3774) => q(kzg),
+      q(3775) => q(kzi),
+      q(3776) => q(kzj),
+      q(3777) => q(kzk),
+      q(3778) => q(kzl),
+      q(3779) => q(kzm),
+      q(3780) => q(kzn),
+      q(3781) => q(kzo),
+      q(3782) => q(kzp),
+      q(3783) => q(kzq),
+      q(3784) => q(kzr),
+      q(3785) => q(kzs),
+      q(3786) => q(kzt),
+      q(3787) => q(kzu),
+      q(3788) => q(kzv),
+      q(3789) => q(kzw),
+      q(3790) => q(kzx),
+      q(3791) => q(kzy),
+      q(3792) => q(kzz),
+      q(3793) => q(laa),
+      q(3794) => q(lab),
+      q(3795) => q(lac),
+      q(3796) => q(lae),
+      q(3797) => q(laf),
+      q(3798) => q(lag),
+      q(3799) => q(lai),
+      q(3800) => q(laj),
+      q(3801) => q(lak),
+      q(3802) => q(lal),
+      q(3803) => q(lan),
+      q(3804) => q(lap),
+      q(3805) => q(laq),
+      q(3806) => q(lar),
+      q(3807) => q(las),
+      q(3808) => q(lau),
+      q(3809) => q(law),
+      q(3810) => q(lax),
+      q(3811) => q(lay),
+      q(3812) => q(laz),
+      q(3813) => q(lba),
+      q(3814) => q(lbb),
+      q(3815) => q(lbc),
+      q(3816) => q(lbe),
+      q(3817) => q(lbf),
+      q(3818) => q(lbg),
+      q(3819) => q(lbi),
+      q(3820) => q(lbj),
+      q(3821) => q(lbk),
+      q(3822) => q(lbl),
+      q(3823) => q(lbm),
+      q(3824) => q(lbn),
+      q(3825) => q(lbo),
+      q(3826) => q(lbq),
+      q(3827) => q(lbr),
+      q(3828) => q(lbs),
+      q(3829) => q(lbt),
+      q(3830) => q(lbu),
+      q(3831) => q(lbv),
+      q(3832) => q(lbw),
+      q(3833) => q(lbx),
+      q(3834) => q(lby),
+      q(3835) => q(lbz),
+      q(3836) => q(lcc),
+      q(3837) => q(lcd),
+      q(3838) => q(lce),
+      q(3839) => q(lcf),
+      q(3840) => q(lch),
+      q(3841) => q(lcl),
+      q(3842) => q(lcm),
+      q(3843) => q(lcp),
+      q(3844) => q(lcq),
+      q(3845) => q(lcs),
+      q(3846) => q(lda),
+      q(3847) => q(ldb),
+      q(3848) => q(ldd),
+      q(3849) => q(ldg),
+      q(3850) => q(ldh),
+      q(3851) => q(ldi),
+      q(3852) => q(ldj),
+      q(3853) => q(ldk),
+      q(3854) => q(ldl),
+      q(3855) => q(ldm),
+      q(3856) => q(ldn),
+      q(3857) => q(ldo),
+      q(3858) => q(ldp),
+      q(3859) => q(ldq),
+      q(3860) => q(lea),
+      q(3861) => q(leb),
+      q(3862) => q(lec),
+      q(3863) => q(led),
+      q(3864) => q(lee),
+      q(3865) => q(lef),
+      q(3866) => q(leh),
+      q(3867) => q(lei),
+      q(3868) => q(lej),
+      q(3869) => q(lek),
+      q(3870) => q(lel),
+      q(3871) => q(lem),
+      q(3872) => q(len),
+      q(3873) => q(leo),
+      q(3874) => q(lep),
+      q(3875) => q(leq),
+      q(3876) => q(ler),
+      q(3877) => q(les),
+      q(3878) => q(let),
+      q(3879) => q(leu),
+      q(3880) => q(lev),
+      q(3881) => q(lew),
+      q(3882) => q(lex),
+      q(3883) => q(ley),
+      q(3884) => q(lfa),
+      q(3885) => q(lfn),
+      q(3886) => q(lga),
+      q(3887) => q(lgb),
+      q(3888) => q(lgg),
+      q(3889) => q(lgh),
+      q(3890) => q(lgi),
+      q(3891) => q(lgk),
+      q(3892) => q(lgl),
+      q(3893) => q(lgm),
+      q(3894) => q(lgn),
+      q(3895) => q(lgq),
+      q(3896) => q(lgr),
+      q(3897) => q(lgt),
+      q(3898) => q(lgu),
+      q(3899) => q(lgz),
+      q(3900) => q(lha),
+      q(3901) => q(lhh),
+      q(3902) => q(lhi),
+      q(3903) => q(lhl),
+      q(3904) => q(lhm),
+      q(3905) => q(lhn),
+      q(3906) => q(lhp),
+      q(3907) => q(lhs),
+      q(3908) => q(lht),
+      q(3909) => q(lhu),
+      q(3910) => q(lia),
+      q(3911) => q(lib),
+      q(3912) => q(lic),
+      q(3913) => q(lid),
+      q(3914) => q(lie),
+      q(3915) => q(lif),
+      q(3916) => q(lig),
+      q(3917) => q(lih),
+      q(3918) => q(lij),
+      q(3919) => q(lik),
+      q(3920) => q(lil),
+      q(3921) => q(lio),
+      q(3922) => q(lip),
+      q(3923) => q(liq),
+      q(3924) => q(lir),
+      q(3925) => q(lis),
+      q(3926) => q(liu),
+      q(3927) => q(liv),
+      q(3928) => q(liw),
+      q(3929) => q(lix),
+      q(3930) => q(liy),
+      q(3931) => q(liz),
+      q(3932) => q(lja),
+      q(3933) => q(lje),
+      q(3934) => q(lji),
+      q(3935) => q(ljl),
+      q(3936) => q(ljp),
+      q(3937) => q(ljw),
+      q(3938) => q(ljx),
+      q(3939) => q(lka),
+      q(3940) => q(lkb),
+      q(3941) => q(lkc),
+      q(3942) => q(lkd),
+      q(3943) => q(lke),
+      q(3944) => q(lkh),
+      q(3945) => q(lki),
+      q(3946) => q(lkj),
+      q(3947) => q(lkl),
+      q(3948) => q(lkm),
+      q(3949) => q(lkn),
+      q(3950) => q(lko),
+      q(3951) => q(lkr),
+      q(3952) => q(lks),
+      q(3953) => q(lkt),
+      q(3954) => q(lku),
+      q(3955) => q(lky),
+      q(3956) => q(lla),
+      q(3957) => q(llb),
+      q(3958) => q(llc),
+      q(3959) => q(lld),
+      q(3960) => q(lle),
+      q(3961) => q(llf),
+      q(3962) => q(llg),
+      q(3963) => q(llh),
+      q(3964) => q(lli),
+      q(3965) => q(llj),
+      q(3966) => q(llk),
+      q(3967) => q(lll),
+      q(3968) => q(llm),
+      q(3969) => q(lln),
+      q(3970) => q(llo),
+      q(3971) => q(llp),
+      q(3972) => q(llq),
+      q(3973) => q(lls),
+      q(3974) => q(llu),
+      q(3975) => q(llx),
+      q(3976) => q(lma),
+      q(3977) => q(lmb),
+      q(3978) => q(lmc),
+      q(3979) => q(lmd),
+      q(3980) => q(lme),
+      q(3981) => q(lmf),
+      q(3982) => q(lmg),
+      q(3983) => q(lmh),
+      q(3984) => q(lmi),
+      q(3985) => q(lmj),
+      q(3986) => q(lmk),
+      q(3987) => q(lml),
+      q(3988) => q(lmn),
+      q(3989) => q(lmo),
+      q(3990) => q(lmp),
+      q(3991) => q(lmq),
+      q(3992) => q(lmr),
+      q(3993) => q(lmu),
+      q(3994) => q(lmv),
+      q(3995) => q(lmw),
+      q(3996) => q(lmx),
+      q(3997) => q(lmy),
+      q(3998) => q(lmz),
+      q(3999) => q(lna),
+      q(4000) => q(lnb),
+      q(4001) => q(lnd),
+      q(4002) => q(lng),
+      q(4003) => q(lnh),
+      q(4004) => q(lni),
+      q(4005) => q(lnj),
+      q(4006) => q(lnl),
+      q(4007) => q(lnm),
+      q(4008) => q(lnn),
+      q(4009) => q(lno),
+      q(4010) => q(lns),
+      q(4011) => q(lnu),
+      q(4012) => q(lnw),
+      q(4013) => q(lnz),
+      q(4014) => q(loa),
+      q(4015) => q(lob),
+      q(4016) => q(loc),
+      q(4017) => q(loe),
+      q(4018) => q(lof),
+      q(4019) => q(log),
+      q(4020) => q(loh),
+      q(4021) => q(loi),
+      q(4022) => q(loj),
+      q(4023) => q(lok),
+      q(4024) => q(lom),
+      q(4025) => q(lon),
+      q(4026) => q(loo),
+      q(4027) => q(lop),
+      q(4028) => q(loq),
+      q(4029) => q(lor),
+      q(4030) => q(los),
+      q(4031) => q(lot),
+      q(4032) => q(lou),
+      q(4033) => q(lov),
+      q(4034) => q(low),
+      q(4035) => q(lox),
+      q(4036) => q(loy),
+      q(4037) => q(lpa),
+      q(4038) => q(lpe),
+      q(4039) => q(lpn),
+      q(4040) => q(lpo),
+      q(4041) => q(lpx),
+      q(4042) => q(lra),
+      q(4043) => q(lrc),
+      q(4044) => q(lre),
+      q(4045) => q(lrg),
+      q(4046) => q(lri),
+      q(4047) => q(lrk),
+      q(4048) => q(lrl),
+      q(4049) => q(lrm),
+      q(4050) => q(lrn),
+      q(4051) => q(lro),
+      q(4052) => q(lrr),
+      q(4053) => q(lrt),
+      q(4054) => q(lrv),
+      q(4055) => q(lrz),
+      q(4056) => q(lsa),
+      q(4057) => q(lsd),
+      q(4058) => q(lse),
+      q(4059) => q(lsg),
+      q(4060) => q(lsh),
+      q(4061) => q(lsi),
+      q(4062) => q(lsl),
+      q(4063) => q(lsm),
+      q(4064) => q(lso),
+      q(4065) => q(lsp),
+      q(4066) => q(lsr),
+      q(4067) => q(lss),
+      q(4068) => q(lst),
+      q(4069) => q(lsy),
+      q(4070) => q(ltc),
+      q(4071) => q(ltg),
+      q(4072) => q(lti),
+      q(4073) => q(ltn),
+      q(4074) => q(lto),
+      q(4075) => q(lts),
+      q(4076) => q(ltu),
+      q(4077) => q(luc),
+      q(4078) => q(lud),
+      q(4079) => q(lue),
+      q(4080) => q(luf),
+      q(4081) => q(luj),
+      q(4082) => q(luk),
+      q(4083) => q(lul),
+      q(4084) => q(lum),
+      q(4085) => q(lup),
+      q(4086) => q(luq),
+      q(4087) => q(lur),
+      q(4088) => q(lut),
+      q(4089) => q(luu),
+      q(4090) => q(luv),
+      q(4091) => q(luw),
+      q(4092) => q(luy),
+      q(4093) => q(luz),
+      q(4094) => q(lva),
+      q(4095) => q(lvk),
+      q(4096) => q(lvs),
+      q(4097) => q(lvu),
+      q(4098) => q(lwa),
+      q(4099) => q(lwe),
+      q(4100) => q(lwg),
+      q(4101) => q(lwh),
+      q(4102) => q(lwl),
+      q(4103) => q(lwm),
+      q(4104) => q(lwo),
+      q(4105) => q(lwt),
+      q(4106) => q(lwu),
+      q(4107) => q(lww),
+      q(4108) => q(lya),
+      q(4109) => q(lyg),
+      q(4110) => q(lyn),
+      q(4111) => q(lzh),
+      q(4112) => q(lzl),
+      q(4113) => q(lzn),
+      q(4114) => q(lzz),
+      q(4115) => q(maa),
+      q(4116) => q(mab),
+      q(4117) => q(mae),
+      q(4118) => q(maf),
+      q(4119) => q(maj),
+      q(4120) => q(mam),
+      q(4121) => q(maq),
+      q(4122) => q(mat),
+      q(4123) => q(mau),
+      q(4124) => q(mav),
+      q(4125) => q(maw),
+      q(4126) => q(max),
+      q(4127) => q(maz),
+      q(4128) => q(mba),
+      q(4129) => q(mbb),
+      q(4130) => q(mbc),
+      q(4131) => q(mbd),
+      q(4132) => q(mbe),
+      q(4133) => q(mbf),
+      q(4134) => q(mbh),
+      q(4135) => q(mbi),
+      q(4136) => q(mbj),
+      q(4137) => q(mbk),
+      q(4138) => q(mbl),
+      q(4139) => q(mbm),
+      q(4140) => q(mbn),
+      q(4141) => q(mbo),
+      q(4142) => q(mbp),
+      q(4143) => q(mbq),
+      q(4144) => q(mbr),
+      q(4145) => q(mbs),
+      q(4146) => q(mbt),
+      q(4147) => q(mbu),
+      q(4148) => q(mbv),
+      q(4149) => q(mbw),
+      q(4150) => q(mbx),
+      q(4151) => q(mby),
+      q(4152) => q(mbz),
+      q(4153) => q(mca),
+      q(4154) => q(mcb),
+      q(4155) => q(mcc),
+      q(4156) => q(mcd),
+      q(4157) => q(mce),
+      q(4158) => q(mcf),
+      q(4159) => q(mcg),
+      q(4160) => q(mch),
+      q(4161) => q(mci),
+      q(4162) => q(mcj),
+      q(4163) => q(mck),
+      q(4164) => q(mcl),
+      q(4165) => q(mcm),
+      q(4166) => q(mcn),
+      q(4167) => q(mco),
+      q(4168) => q(mcp),
+      q(4169) => q(mcq),
+      q(4170) => q(mcr),
+      q(4171) => q(mcs),
+      q(4172) => q(mct),
+      q(4173) => q(mcu),
+      q(4174) => q(mcv),
+      q(4175) => q(mcw),
+      q(4176) => q(mcx),
+      q(4177) => q(mcy),
+      q(4178) => q(mcz),
+      q(4179) => q(mda),
+      q(4180) => q(mdb),
+      q(4181) => q(mdc),
+      q(4182) => q(mdd),
+      q(4183) => q(mde),
+      q(4184) => q(mdg),
+      q(4185) => q(mdh),
+      q(4186) => q(mdi),
+      q(4187) => q(mdj),
+      q(4188) => q(mdk),
+      q(4189) => q(mdl),
+      q(4190) => q(mdm),
+      q(4191) => q(mdn),
+      q(4192) => q(mdp),
+      q(4193) => q(mdq),
+      q(4194) => q(mds),
+      q(4195) => q(mdt),
+      q(4196) => q(mdu),
+      q(4197) => q(mdv),
+      q(4198) => q(mdw),
+      q(4199) => q(mdx),
+      q(4200) => q(mdy),
+      q(4201) => q(mdz),
+      q(4202) => q(mea),
+      q(4203) => q(meb),
+      q(4204) => q(mec),
+      q(4205) => q(med),
+      q(4206) => q(mee),
+      q(4207) => q(mef),
+      q(4208) => q(meh),
+      q(4209) => q(mei),
+      q(4210) => q(mej),
+      q(4211) => q(mek),
+      q(4212) => q(mel),
+      q(4213) => q(mem),
+      q(4214) => q(meo),
+      q(4215) => q(mep),
+      q(4216) => q(meq),
+      q(4217) => q(mer),
+      q(4218) => q(mes),
+      q(4219) => q(met),
+      q(4220) => q(meu),
+      q(4221) => q(mev),
+      q(4222) => q(mew),
+      q(4223) => q(mey),
+      q(4224) => q(mez),
+      q(4225) => q(mfa),
+      q(4226) => q(mfb),
+      q(4227) => q(mfc),
+      q(4228) => q(mfd),
+      q(4229) => q(mfe),
+      q(4230) => q(mff),
+      q(4231) => q(mfg),
+      q(4232) => q(mfh),
+      q(4233) => q(mfi),
+      q(4234) => q(mfj),
+      q(4235) => q(mfk),
+      q(4236) => q(mfl),
+      q(4237) => q(mfm),
+      q(4238) => q(mfn),
+      q(4239) => q(mfo),
+      q(4240) => q(mfp),
+      q(4241) => q(mfq),
+      q(4242) => q(mfr),
+      q(4243) => q(mfs),
+      q(4244) => q(mft),
+      q(4245) => q(mfu),
+      q(4246) => q(mfv),
+      q(4247) => q(mfw),
+      q(4248) => q(mfx),
+      q(4249) => q(mfy),
+      q(4250) => q(mfz),
+      q(4251) => q(mgb),
+      q(4252) => q(mgc),
+      q(4253) => q(mgd),
+      q(4254) => q(mge),
+      q(4255) => q(mgf),
+      q(4256) => q(mgg),
+      q(4257) => q(mgh),
+      q(4258) => q(mgi),
+      q(4259) => q(mgj),
+      q(4260) => q(mgk),
+      q(4261) => q(mgl),
+      q(4262) => q(mgm),
+      q(4263) => q(mgn),
+      q(4264) => q(mgo),
+      q(4265) => q(mgp),
+      q(4266) => q(mgq),
+      q(4267) => q(mgr),
+      q(4268) => q(mgs),
+      q(4269) => q(mgt),
+      q(4270) => q(mgu),
+      q(4271) => q(mgv),
+      q(4272) => q(mgw),
+      q(4273) => q(mgy),
+      q(4274) => q(mgz),
+      q(4275) => q(mha),
+      q(4276) => q(mhb),
+      q(4277) => q(mhc),
+      q(4278) => q(mhd),
+      q(4279) => q(mhe),
+      q(4280) => q(mhf),
+      q(4281) => q(mhg),
+      q(4282) => q(mhi),
+      q(4283) => q(mhj),
+      q(4284) => q(mhk),
+      q(4285) => q(mhl),
+      q(4286) => q(mhm),
+      q(4287) => q(mhn),
+      q(4288) => q(mho),
+      q(4289) => q(mhp),
+      q(4290) => q(mhq),
+      q(4291) => q(mhr),
+      q(4292) => q(mhs),
+      q(4293) => q(mht),
+      q(4294) => q(mhu),
+      q(4295) => q(mhw),
+      q(4296) => q(mhx),
+      q(4297) => q(mhy),
+      q(4298) => q(mhz),
+      q(4299) => q(mia),
+      q(4300) => q(mib),
+      q(4301) => q(mid),
+      q(4302) => q(mie),
+      q(4303) => q(mif),
+      q(4304) => q(mig),
+      q(4305) => q(mih),
+      q(4306) => q(mii),
+      q(4307) => q(mij),
+      q(4308) => q(mik),
+      q(4309) => q(mil),
+      q(4310) => q(mim),
+      q(4311) => q(mio),
+      q(4312) => q(mip),
+      q(4313) => q(miq),
+      q(4314) => q(mir),
+      q(4315) => q(mit),
+      q(4316) => q(miu),
+      q(4317) => q(miw),
+      q(4318) => q(mix),
+      q(4319) => q(miy),
+      q(4320) => q(miz),
+      q(4321) => q(mjc),
+      q(4322) => q(mjd),
+      q(4323) => q(mje),
+      q(4324) => q(mjg),
+      q(4325) => q(mjh),
+      q(4326) => q(mji),
+      q(4327) => q(mjj),
+      q(4328) => q(mjk),
+      q(4329) => q(mjl),
+      q(4330) => q(mjm),
+      q(4331) => q(mjn),
+      q(4332) => q(mjo),
+      q(4333) => q(mjp),
+      q(4334) => q(mjq),
+      q(4335) => q(mjr),
+      q(4336) => q(mjs),
+      q(4337) => q(mjt),
+      q(4338) => q(mju),
+      q(4339) => q(mjv),
+      q(4340) => q(mjw),
+      q(4341) => q(mjx),
+      q(4342) => q(mjy),
+      q(4343) => q(mjz),
+      q(4344) => q(mka),
+      q(4345) => q(mkb),
+      q(4346) => q(mkc),
+      q(4347) => q(mke),
+      q(4348) => q(mkf),
+      q(4349) => q(mkg),
+      q(4350) => q(mki),
+      q(4351) => q(mkj),
+      q(4352) => q(mkk),
+      q(4353) => q(mkl),
+      q(4354) => q(mkm),
+      q(4355) => q(mkn),
+      q(4356) => q(mko),
+      q(4357) => q(mkp),
+      q(4358) => q(mkq),
+      q(4359) => q(mkr),
+      q(4360) => q(mks),
+      q(4361) => q(mkt),
+      q(4362) => q(mku),
+      q(4363) => q(mkv),
+      q(4364) => q(mkw),
+      q(4365) => q(mkx),
+      q(4366) => q(mky),
+      q(4367) => q(mkz),
+      q(4368) => q(mla),
+      q(4369) => q(mlb),
+      q(4370) => q(mlc),
+      q(4371) => q(mle),
+      q(4372) => q(mlf),
+      q(4373) => q(mlh),
+      q(4374) => q(mli),
+      q(4375) => q(mlj),
+      q(4376) => q(mlk),
+      q(4377) => q(mll),
+      q(4378) => q(mlm),
+      q(4379) => q(mln),
+      q(4380) => q(mlo),
+      q(4381) => q(mlp),
+      q(4382) => q(mlq),
+      q(4383) => q(mlr),
+      q(4384) => q(mls),
+      q(4385) => q(mlu),
+      q(4386) => q(mlv),
+      q(4387) => q(mlw),
+      q(4388) => q(mlx),
+      q(4389) => q(mlz),
+      q(4390) => q(mma),
+      q(4391) => q(mmb),
+      q(4392) => q(mmc),
+      q(4393) => q(mmd),
+      q(4394) => q(mme),
+      q(4395) => q(mmf),
+      q(4396) => q(mmg),
+      q(4397) => q(mmh),
+      q(4398) => q(mmi),
+      q(4399) => q(mmj),
+      q(4400) => q(mmk),
+      q(4401) => q(mml),
+      q(4402) => q(mmm),
+      q(4403) => q(mmn),
+      q(4404) => q(mmo),
+      q(4405) => q(mmp),
+      q(4406) => q(mmq),
+      q(4407) => q(mmr),
+      q(4408) => q(mmt),
+      q(4409) => q(mmu),
+      q(4410) => q(mmv),
+      q(4411) => q(mmw),
+      q(4412) => q(mmx),
+      q(4413) => q(mmy),
+      q(4414) => q(mmz),
+      q(4415) => q(mna),
+      q(4416) => q(mnb),
+      q(4417) => q(mnd),
+      q(4418) => q(mne),
+      q(4419) => q(mnf),
+      q(4420) => q(mng),
+      q(4421) => q(mnh),
+      q(4422) => q(mnj),
+      q(4423) => q(mnk),
+      q(4424) => q(mnl),
+      q(4425) => q(mnm),
+      q(4426) => q(mnn),
+      q(4427) => q(mnp),
+      q(4428) => q(mnq),
+      q(4429) => q(mnr),
+      q(4430) => q(mns),
+      q(4431) => q(mnu),
+      q(4432) => q(mnv),
+      q(4433) => q(mnw),
+      q(4434) => q(mnx),
+      q(4435) => q(mny),
+      q(4436) => q(mnz),
+      q(4437) => q(moa),
+      q(4438) => q(moc),
+      q(4439) => q(mod),
+      q(4440) => q(moe),
+      q(4441) => q(mog),
+      q(4442) => q(moi),
+      q(4443) => q(moj),
+      q(4444) => q(mok),
+      q(4445) => q(mom),
+      q(4446) => q(moo),
+      q(4447) => q(mop),
+      q(4448) => q(moq),
+      q(4449) => q(mor),
+      q(4450) => q(mou),
+      q(4451) => q(mov),
+      q(4452) => q(mow),
+      q(4453) => q(mox),
+      q(4454) => q(moy),
+      q(4455) => q(moz),
+      q(4456) => q(mpa),
+      q(4457) => q(mpb),
+      q(4458) => q(mpc),
+      q(4459) => q(mpd),
+      q(4460) => q(mpe),
+      q(4461) => q(mpg),
+      q(4462) => q(mph),
+      q(4463) => q(mpi),
+      q(4464) => q(mpj),
+      q(4465) => q(mpk),
+      q(4466) => q(mpl),
+      q(4467) => q(mpm),
+      q(4468) => q(mpn),
+      q(4469) => q(mpo),
+      q(4470) => q(mpp),
+      q(4471) => q(mpq),
+      q(4472) => q(mpr),
+      q(4473) => q(mps),
+      q(4474) => q(mpt),
+      q(4475) => q(mpu),
+      q(4476) => q(mpv),
+      q(4477) => q(mpw),
+      q(4478) => q(mpx),
+      q(4479) => q(mpy),
+      q(4480) => q(mpz),
+      q(4481) => q(mqa),
+      q(4482) => q(mqb),
+      q(4483) => q(mqc),
+      q(4484) => q(mqe),
+      q(4485) => q(mqf),
+      q(4486) => q(mqg),
+      q(4487) => q(mqh),
+      q(4488) => q(mqi),
+      q(4489) => q(mqj),
+      q(4490) => q(mqk),
+      q(4491) => q(mql),
+      q(4492) => q(mqm),
+      q(4493) => q(mqn),
+      q(4494) => q(mqo),
+      q(4495) => q(mqp),
+      q(4496) => q(mqq),
+      q(4497) => q(mqr),
+      q(4498) => q(mqs),
+      q(4499) => q(mqt),
+      q(4500) => q(mqu),
+      q(4501) => q(mqv),
+      q(4502) => q(mqw),
+      q(4503) => q(mqx),
+      q(4504) => q(mqy),
+      q(4505) => q(mqz),
+      q(4506) => q(mra),
+      q(4507) => q(mrb),
+      q(4508) => q(mrc),
+      q(4509) => q(mrd),
+      q(4510) => q(mre),
+      q(4511) => q(mrf),
+      q(4512) => q(mrg),
+      q(4513) => q(mrh),
+      q(4514) => q(mrj),
+      q(4515) => q(mrk),
+      q(4516) => q(mrl),
+      q(4517) => q(mrm),
+      q(4518) => q(mrn),
+      q(4519) => q(mro),
+      q(4520) => q(mrp),
+      q(4521) => q(mrq),
+      q(4522) => q(mrr),
+      q(4523) => q(mrs),
+      q(4524) => q(mrt),
+      q(4525) => q(mru),
+      q(4526) => q(mrv),
+      q(4527) => q(mrw),
+      q(4528) => q(mrx),
+      q(4529) => q(mry),
+      q(4530) => q(mrz),
+      q(4531) => q(msb),
+      q(4532) => q(msc),
+      q(4533) => q(msd),
+      q(4534) => q(mse),
+      q(4535) => q(msf),
+      q(4536) => q(msg),
+      q(4537) => q(msh),
+      q(4538) => q(msi),
+      q(4539) => q(msj),
+      q(4540) => q(msk),
+      q(4541) => q(msl),
+      q(4542) => q(msm),
+      q(4543) => q(msn),
+      q(4544) => q(mso),
+      q(4545) => q(msp),
+      q(4546) => q(msq),
+      q(4547) => q(msr),
+      q(4548) => q(mss),
+      q(4549) => q(msu),
+      q(4550) => q(msv),
+      q(4551) => q(msw),
+      q(4552) => q(msx),
+      q(4553) => q(msy),
+      q(4554) => q(msz),
+      q(4555) => q(mta),
+      q(4556) => q(mtb),
+      q(4557) => q(mtc),
+      q(4558) => q(mtd),
+      q(4559) => q(mte),
+      q(4560) => q(mtf),
+      q(4561) => q(mtg),
+      q(4562) => q(mth),
+      q(4563) => q(mti),
+      q(4564) => q(mtj),
+      q(4565) => q(mtk),
+      q(4566) => q(mtl),
+      q(4567) => q(mtm),
+      q(4568) => q(mtn),
+      q(4569) => q(mto),
+      q(4570) => q(mtp),
+      q(4571) => q(mtq),
+      q(4572) => q(mtr),
+      q(4573) => q(mts),
+      q(4574) => q(mtt),
+      q(4575) => q(mtu),
+      q(4576) => q(mtv),
+      q(4577) => q(mtw),
+      q(4578) => q(mtx),
+      q(4579) => q(mty),
+      q(4580) => q(mua),
+      q(4581) => q(mub),
+      q(4582) => q(muc),
+      q(4583) => q(mud),
+      q(4584) => q(mue),
+      q(4585) => q(mug),
+      q(4586) => q(muh),
+      q(4587) => q(mui),
+      q(4588) => q(muj),
+      q(4589) => q(muk),
+      q(4590) => q(mum),
+      q(4591) => q(muo),
+      q(4592) => q(mup),
+      q(4593) => q(muq),
+      q(4594) => q(mur),
+      q(4595) => q(mut),
+      q(4596) => q(muu),
+      q(4597) => q(muv),
+      q(4598) => q(mux),
+      q(4599) => q(muy),
+      q(4600) => q(muz),
+      q(4601) => q(mva),
+      q(4602) => q(mvb),
+      q(4603) => q(mvd),
+      q(4604) => q(mve),
+      q(4605) => q(mvf),
+      q(4606) => q(mvg),
+      q(4607) => q(mvh),
+      q(4608) => q(mvi),
+      q(4609) => q(mvk),
+      q(4610) => q(mvl),
+      q(4611) => q(mvm),
+      q(4612) => q(mvn),
+      q(4613) => q(mvo),
+      q(4614) => q(mvp),
+      q(4615) => q(mvq),
+      q(4616) => q(mvr),
+      q(4617) => q(mvs),
+      q(4618) => q(mvt),
+      q(4619) => q(mvu),
+      q(4620) => q(mvv),
+      q(4621) => q(mvw),
+      q(4622) => q(mvx),
+      q(4623) => q(mvy),
+      q(4624) => q(mvz),
+      q(4625) => q(mwa),
+      q(4626) => q(mwb),
+      q(4627) => q(mwc),
+      q(4628) => q(mwe),
+      q(4629) => q(mwf),
+      q(4630) => q(mwg),
+      q(4631) => q(mwh),
+      q(4632) => q(mwi),
+      q(4633) => q(mwk),
+      q(4634) => q(mwm),
+      q(4635) => q(mwn),
+      q(4636) => q(mwo),
+      q(4637) => q(mwp),
+      q(4638) => q(mwq),
+      q(4639) => q(mws),
+      q(4640) => q(mwt),
+      q(4641) => q(mwu),
+      q(4642) => q(mwv),
+      q(4643) => q(mww),
+      q(4644) => q(mwx),
+      q(4645) => q(mwy),
+      q(4646) => q(mwz),
+      q(4647) => q(mxa),
+      q(4648) => q(mxb),
+      q(4649) => q(mxc),
+      q(4650) => q(mxd),
+      q(4651) => q(mxe),
+      q(4652) => q(mxf),
+      q(4653) => q(mxg),
+      q(4654) => q(mxh),
+      q(4655) => q(mxi),
+      q(4656) => q(mxj),
+      q(4657) => q(mxk),
+      q(4658) => q(mxl),
+      q(4659) => q(mxm),
+      q(4660) => q(mxn),
+      q(4661) => q(mxo),
+      q(4662) => q(mxp),
+      q(4663) => q(mxq),
+      q(4664) => q(mxr),
+      q(4665) => q(mxs),
+      q(4666) => q(mxt),
+      q(4667) => q(mxu),
+      q(4668) => q(mxv),
+      q(4669) => q(mxw),
+      q(4670) => q(mxx),
+      q(4671) => q(mxy),
+      q(4672) => q(mxz),
+      q(4673) => q(myb),
+      q(4674) => q(myc),
+      q(4675) => q(myd),
+      q(4676) => q(mye),
+      q(4677) => q(myf),
+      q(4678) => q(myg),
+      q(4679) => q(myh),
+      q(4680) => q(myi),
+      q(4681) => q(myj),
+      q(4682) => q(myk),
+      q(4683) => q(myl),
+      q(4684) => q(mym),
+      q(4685) => q(myo),
+      q(4686) => q(myp),
+      q(4687) => q(myr),
+      q(4688) => q(mys),
+      q(4689) => q(myu),
+      q(4690) => q(myw),
+      q(4691) => q(myx),
+      q(4692) => q(myy),
+      q(4693) => q(myz),
+      q(4694) => q(mza),
+      q(4695) => q(mzb),
+      q(4696) => q(mzc),
+      q(4697) => q(mzd),
+      q(4698) => q(mze),
+      q(4699) => q(mzg),
+      q(4700) => q(mzh),
+      q(4701) => q(mzi),
+      q(4702) => q(mzj),
+      q(4703) => q(mzk),
+      q(4704) => q(mzl),
+      q(4705) => q(mzm),
+      q(4706) => q(mzn),
+      q(4707) => q(mzo),
+      q(4708) => q(mzp),
+      q(4709) => q(mzq),
+      q(4710) => q(mzr),
+      q(4711) => q(mzs),
+      q(4712) => q(mzt),
+      q(4713) => q(mzu),
+      q(4714) => q(mzv),
+      q(4715) => q(mzw),
+      q(4716) => q(mzx),
+      q(4717) => q(mzy),
+      q(4718) => q(mzz),
+      q(4719) => q(naa),
+      q(4720) => q(nab),
+      q(4721) => q(nac),
+      q(4722) => q(nad),
+      q(4723) => q(nae),
+      q(4724) => q(naf),
+      q(4725) => q(nag),
+      q(4726) => q(naj),
+      q(4727) => q(nak),
+      q(4728) => q(nal),
+      q(4729) => q(nam),
+      q(4730) => q(nan),
+      q(4731) => q(nao),
+      q(4732) => q(naq),
+      q(4733) => q(nar),
+      q(4734) => q(nas),
+      q(4735) => q(nat),
+      q(4736) => q(naw),
+      q(4737) => q(nax),
+      q(4738) => q(nay),
+      q(4739) => q(naz),
+      q(4740) => q(nba),
+      q(4741) => q(nbb),
+      q(4742) => q(nbc),
+      q(4743) => q(nbd),
+      q(4744) => q(nbe),
+      q(4745) => q(nbg),
+      q(4746) => q(nbh),
+      q(4747) => q(nbi),
+      q(4748) => q(nbj),
+      q(4749) => q(nbk),
+      q(4750) => q(nbm),
+      q(4751) => q(nbn),
+      q(4752) => q(nbo),
+      q(4753) => q(nbp),
+      q(4754) => q(nbq),
+      q(4755) => q(nbr),
+      q(4756) => q(nbs),
+      q(4757) => q(nbt),
+      q(4758) => q(nbu),
+      q(4759) => q(nbv),
+      q(4760) => q(nbw),
+      q(4761) => q(nby),
+      q(4762) => q(nca),
+      q(4763) => q(ncb),
+      q(4764) => q(ncc),
+      q(4765) => q(ncd),
+      q(4766) => q(nce),
+      q(4767) => q(ncf),
+      q(4768) => q(ncg),
+      q(4769) => q(nch),
+      q(4770) => q(nci),
+      q(4771) => q(ncj),
+      q(4772) => q(nck),
+      q(4773) => q(ncl),
+      q(4774) => q(ncm),
+      q(4775) => q(ncn),
+      q(4776) => q(nco),
+      q(4777) => q(ncp),
+      q(4778) => q(ncr),
+      q(4779) => q(ncs),
+      q(4780) => q(nct),
+      q(4781) => q(ncu),
+      q(4782) => q(ncx),
+      q(4783) => q(ncz),
+      q(4784) => q(nda),
+      q(4785) => q(ndb),
+      q(4786) => q(ndc),
+      q(4787) => q(ndd),
+      q(4788) => q(ndf),
+      q(4789) => q(ndg),
+      q(4790) => q(ndh),
+      q(4791) => q(ndi),
+      q(4792) => q(ndj),
+      q(4793) => q(ndk),
+      q(4794) => q(ndl),
+      q(4795) => q(ndm),
+      q(4796) => q(ndn),
+      q(4797) => q(ndp),
+      q(4798) => q(ndq),
+      q(4799) => q(ndr),
+      q(4800) => q(ndt),
+      q(4801) => q(ndu),
+      q(4802) => q(ndv),
+      q(4803) => q(ndw),
+      q(4804) => q(ndx),
+      q(4805) => q(ndy),
+      q(4806) => q(ndz),
+      q(4807) => q(nea),
+      q(4808) => q(neb),
+      q(4809) => q(nec),
+      q(4810) => q(ned),
+      q(4811) => q(nee),
+      q(4812) => q(nef),
+      q(4813) => q(neg),
+      q(4814) => q(neh),
+      q(4815) => q(nei),
+      q(4816) => q(nej),
+      q(4817) => q(nek),
+      q(4818) => q(nem),
+      q(4819) => q(nen),
+      q(4820) => q(neo),
+      q(4821) => q(neq),
+      q(4822) => q(ner),
+      q(4823) => q(nes),
+      q(4824) => q(net),
+      q(4825) => q(neu),
+      q(4826) => q(nev),
+      q(4827) => q(nex),
+      q(4828) => q(ney),
+      q(4829) => q(nez),
+      q(4830) => q(nfa),
+      q(4831) => q(nfd),
+      q(4832) => q(nfl),
+      q(4833) => q(nfr),
+      q(4834) => q(nfu),
+      q(4835) => q(nga),
+      q(4836) => q(ngb),
+      q(4837) => q(ngc),
+      q(4838) => q(ngd),
+      q(4839) => q(nge),
+      q(4840) => q(ngg),
+      q(4841) => q(ngh),
+      q(4842) => q(ngi),
+      q(4843) => q(ngj),
+      q(4844) => q(ngk),
+      q(4845) => q(ngl),
+      q(4846) => q(ngm),
+      q(4847) => q(ngn),
+      q(4848) => q(ngo),
+      q(4849) => q(ngp),
+      q(4850) => q(ngq),
+      q(4851) => q(ngr),
+      q(4852) => q(ngs),
+      q(4853) => q(ngt),
+      q(4854) => q(ngu),
+      q(4855) => q(ngv),
+      q(4856) => q(ngw),
+      q(4857) => q(ngx),
+      q(4858) => q(ngy),
+      q(4859) => q(ngz),
+      q(4860) => q(nha),
+      q(4861) => q(nhb),
+      q(4862) => q(nhc),
+      q(4863) => q(nhd),
+      q(4864) => q(nhe),
+      q(4865) => q(nhf),
+      q(4866) => q(nhg),
+      q(4867) => q(nhh),
+      q(4868) => q(nhi),
+      q(4869) => q(nhk),
+      q(4870) => q(nhm),
+      q(4871) => q(nhn),
+      q(4872) => q(nho),
+      q(4873) => q(nhp),
+      q(4874) => q(nhq),
+      q(4875) => q(nhr),
+      q(4876) => q(nht),
+      q(4877) => q(nhu),
+      q(4878) => q(nhv),
+      q(4879) => q(nhw),
+      q(4880) => q(nhx),
+      q(4881) => q(nhy),
+      q(4882) => q(nhz),
+      q(4883) => q(nib),
+      q(4884) => q(nid),
+      q(4885) => q(nie),
+      q(4886) => q(nif),
+      q(4887) => q(nig),
+      q(4888) => q(nih),
+      q(4889) => q(nii),
+      q(4890) => q(nij),
+      q(4891) => q(nik),
+      q(4892) => q(nil),
+      q(4893) => q(nim),
+      q(4894) => q(nin),
+      q(4895) => q(nio),
+      q(4896) => q(niq),
+      q(4897) => q(nir),
+      q(4898) => q(nis),
+      q(4899) => q(nit),
+      q(4900) => q(niv),
+      q(4901) => q(niw),
+      q(4902) => q(nix),
+      q(4903) => q(niy),
+      q(4904) => q(niz),
+      q(4905) => q(nja),
+      q(4906) => q(njb),
+      q(4907) => q(njd),
+      q(4908) => q(njh),
+      q(4909) => q(nji),
+      q(4910) => q(njj),
+      q(4911) => q(njl),
+      q(4912) => q(njm),
+      q(4913) => q(njn),
+      q(4914) => q(njo),
+      q(4915) => q(njr),
+      q(4916) => q(njs),
+      q(4917) => q(njt),
+      q(4918) => q(nju),
+      q(4919) => q(njx),
+      q(4920) => q(njy),
+      q(4921) => q(njz),
+      q(4922) => q(nka),
+      q(4923) => q(nkb),
+      q(4924) => q(nkc),
+      q(4925) => q(nkd),
+      q(4926) => q(nke),
+      q(4927) => q(nkf),
+      q(4928) => q(nkg),
+      q(4929) => q(nkh),
+      q(4930) => q(nki),
+      q(4931) => q(nkj),
+      q(4932) => q(nkk),
+      q(4933) => q(nkm),
+      q(4934) => q(nkn),
+      q(4935) => q(nko),
+      q(4936) => q(nkp),
+      q(4937) => q(nkq),
+      q(4938) => q(nkr),
+      q(4939) => q(nks),
+      q(4940) => q(nkt),
+      q(4941) => q(nku),
+      q(4942) => q(nkv),
+      q(4943) => q(nkw),
+      q(4944) => q(nkx),
+      q(4945) => q(nkz),
+      q(4946) => q(nla),
+      q(4947) => q(nlc),
+      q(4948) => q(nle),
+      q(4949) => q(nlg),
+      q(4950) => q(nli),
+      q(4951) => q(nlj),
+      q(4952) => q(nlk),
+      q(4953) => q(nll),
+      q(4954) => q(nlo),
+      q(4955) => q(nlq),
+      q(4956) => q(nlu),
+      q(4957) => q(nlv),
+      q(4958) => q(nlw),
+      q(4959) => q(nlx),
+      q(4960) => q(nly),
+      q(4961) => q(nlz),
+      q(4962) => q(nma),
+      q(4963) => q(nmb),
+      q(4964) => q(nmc),
+      q(4965) => q(nmd),
+      q(4966) => q(nme),
+      q(4967) => q(nmf),
+      q(4968) => q(nmg),
+      q(4969) => q(nmh),
+      q(4970) => q(nmi),
+      q(4971) => q(nmj),
+      q(4972) => q(nmk),
+      q(4973) => q(nml),
+      q(4974) => q(nmm),
+      q(4975) => q(nmn),
+      q(4976) => q(nmo),
+      q(4977) => q(nmp),
+      q(4978) => q(nmq),
+      q(4979) => q(nmr),
+      q(4980) => q(nms),
+      q(4981) => q(nmt),
+      q(4982) => q(nmu),
+      q(4983) => q(nmv),
+      q(4984) => q(nmw),
+      q(4985) => q(nmx),
+      q(4986) => q(nmy),
+      q(4987) => q(nmz),
+      q(4988) => q(nna),
+      q(4989) => q(nnb),
+      q(4990) => q(nnc),
+      q(4991) => q(nnd),
+      q(4992) => q(nne),
+      q(4993) => q(nnf),
+      q(4994) => q(nng),
+      q(4995) => q(nnh),
+      q(4996) => q(nni),
+      q(4997) => q(nnj),
+      q(4998) => q(nnk),
+      q(4999) => q(nnl),
+      q(5000) => q(nnm),
+      q(5001) => q(nnn),
+      q(5002) => q(nnp),
+      q(5003) => q(nnq),
+      q(5004) => q(nnr),
+      q(5005) => q(nns),
+      q(5006) => q(nnt),
+      q(5007) => q(nnu),
+      q(5008) => q(nnv),
+      q(5009) => q(nnw),
+      q(5010) => q(nny),
+      q(5011) => q(nnz),
+      q(5012) => q(noa),
+      q(5013) => q(noc),
+      q(5014) => q(nod),
+      q(5015) => q(noe),
+      q(5016) => q(nof),
+      q(5017) => q(noh),
+      q(5018) => q(noi),
+      q(5019) => q(noj),
+      q(5020) => q(nok),
+      q(5021) => q(nol),
+      q(5022) => q(nom),
+      q(5023) => q(nop),
+      q(5024) => q(noq),
+      q(5025) => q(nos),
+      q(5026) => q(not),
+      q(5027) => q(nou),
+      q(5028) => q(nov),
+      q(5029) => q(now),
+      q(5030) => q(noy),
+      q(5031) => q(noz),
+      q(5032) => q(npa),
+      q(5033) => q(npb),
+      q(5034) => q(npg),
+      q(5035) => q(nph),
+      q(5036) => q(npi),
+      q(5037) => q(npl),
+      q(5038) => q(npn),
+      q(5039) => q(npo),
+      q(5040) => q(nps),
+      q(5041) => q(npu),
+      q(5042) => q(npy),
+      q(5043) => q(nqg),
+      q(5044) => q(nqk),
+      q(5045) => q(nqm),
+      q(5046) => q(nqn),
+      q(5047) => q(nqq),
+      q(5048) => q(nqy),
+      q(5049) => q(nra),
+      q(5050) => q(nrb),
+      q(5051) => q(nrc),
+      q(5052) => q(nre),
+      q(5053) => q(nrf),
+      q(5054) => q(nrg),
+      q(5055) => q(nri),
+      q(5056) => q(nrk),
+      q(5057) => q(nrl),
+      q(5058) => q(nrm),
+      q(5059) => q(nrn),
+      q(5060) => q(nrp),
+      q(5061) => q(nrr),
+      q(5062) => q(nrt),
+      q(5063) => q(nru),
+      q(5064) => q(nrx),
+      q(5065) => q(nrz),
+      q(5066) => q(nsa),
+      q(5067) => q(nsc),
+      q(5068) => q(nsd),
+      q(5069) => q(nse),
+      q(5070) => q(nsf),
+      q(5071) => q(nsg),
+      q(5072) => q(nsh),
+      q(5073) => q(nsi),
+      q(5074) => q(nsk),
+      q(5075) => q(nsl),
+      q(5076) => q(nsm),
+      q(5077) => q(nsn),
+      q(5078) => q(nsp),
+      q(5079) => q(nsq),
+      q(5080) => q(nsr),
+      q(5081) => q(nss),
+      q(5082) => q(nst),
+      q(5083) => q(nsu),
+      q(5084) => q(nsv),
+      q(5085) => q(nsw),
+      q(5086) => q(nsx),
+      q(5087) => q(nsy),
+      q(5088) => q(nsz),
+      q(5089) => q(nte),
+      q(5090) => q(ntg),
+      q(5091) => q(nti),
+      q(5092) => q(ntj),
+      q(5093) => q(ntk),
+      q(5094) => q(ntm),
+      q(5095) => q(nto),
+      q(5096) => q(ntp),
+      q(5097) => q(ntr),
+      q(5098) => q(nts),
+      q(5099) => q(ntu),
+      q(5100) => q(ntw),
+      q(5101) => q(ntx),
+      q(5102) => q(nty),
+      q(5103) => q(ntz),
+      q(5104) => q(nua),
+      q(5105) => q(nuc),
+      q(5106) => q(nud),
+      q(5107) => q(nue),
+      q(5108) => q(nuf),
+      q(5109) => q(nug),
+      q(5110) => q(nuh),
+      q(5111) => q(nui),
+      q(5112) => q(nuj),
+      q(5113) => q(nuk),
+      q(5114) => q(nul),
+      q(5115) => q(num),
+      q(5116) => q(nun),
+      q(5117) => q(nuo),
+      q(5118) => q(nup),
+      q(5119) => q(nuq),
+      q(5120) => q(nur),
+      q(5121) => q(nus),
+      q(5122) => q(nut),
+      q(5123) => q(nuu),
+      q(5124) => q(nuv),
+      q(5125) => q(nuw),
+      q(5126) => q(nux),
+      q(5127) => q(nuy),
+      q(5128) => q(nuz),
+      q(5129) => q(nvh),
+      q(5130) => q(nvm),
+      q(5131) => q(nvo),
+      q(5132) => q(nwa),
+      q(5133) => q(nwb),
+      q(5134) => q(nwe),
+      q(5135) => q(nwg),
+      q(5136) => q(nwi),
+      q(5137) => q(nwm),
+      q(5138) => q(nwo),
+      q(5139) => q(nwr),
+      q(5140) => q(nwx),
+      q(5141) => q(nwy),
+      q(5142) => q(nxa),
+      q(5143) => q(nxd),
+      q(5144) => q(nxe),
+      q(5145) => q(nxg),
+      q(5146) => q(nxi),
+      q(5147) => q(nxk),
+      q(5148) => q(nxl),
+      q(5149) => q(nxm),
+      q(5150) => q(nxn),
+      q(5151) => q(nxo),
+      q(5152) => q(nxq),
+      q(5153) => q(nxr),
+      q(5154) => q(nxu),
+      q(5155) => q(nxx),
+      q(5156) => q(nyb),
+      q(5157) => q(nyc),
+      q(5158) => q(nyd),
+      q(5159) => q(nye),
+      q(5160) => q(nyf),
+      q(5161) => q(nyg),
+      q(5162) => q(nyh),
+      q(5163) => q(nyi),
+      q(5164) => q(nyj),
+      q(5165) => q(nyk),
+      q(5166) => q(nyl),
+      q(5167) => q(nyp),
+      q(5168) => q(nyq),
+      q(5169) => q(nyr),
+      q(5170) => q(nys),
+      q(5171) => q(nyt),
+      q(5172) => q(nyu),
+      q(5173) => q(nyv),
+      q(5174) => q(nyw),
+      q(5175) => q(nyx),
+      q(5176) => q(nyy),
+      q(5177) => q(nza),
+      q(5178) => q(nzb),
+      q(5179) => q(nzk),
+      q(5180) => q(nzm),
+      q(5181) => q(nzs),
+      q(5182) => q(nzu),
+      q(5183) => q(nzy),
+      q(5184) => q(nzz),
+      q(5185) => q(oaa),
+      q(5186) => q(oac),
+      q(5187) => q(oar),
+      q(5188) => q(oav),
+      q(5189) => q(obi),
+      q(5190) => q(obk),
+      q(5191) => q(obl),
+      q(5192) => q(obm),
+      q(5193) => q(obo),
+      q(5194) => q(obr),
+      q(5195) => q(obt),
+      q(5196) => q(obu),
+      q(5197) => q(oca),
+      q(5198) => q(och),
+      q(5199) => q(oco),
+      q(5200) => q(ocu),
+      q(5201) => q(oda),
+      q(5202) => q(odk),
+      q(5203) => q(odt),
+      q(5204) => q(odu),
+      q(5205) => q(ofo),
+      q(5206) => q(ofs),
+      q(5207) => q(ofu),
+      q(5208) => q(ogb),
+      q(5209) => q(ogc),
+      q(5210) => q(oge),
+      q(5211) => q(ogg),
+      q(5212) => q(ogo),
+      q(5213) => q(ogu),
+      q(5214) => q(oht),
+      q(5215) => q(ohu),
+      q(5216) => q(oia),
+      q(5217) => q(oin),
+      q(5218) => q(ojb),
+      q(5219) => q(ojc),
+      q(5220) => q(ojg),
+      q(5221) => q(ojp),
+      q(5222) => q(ojs),
+      q(5223) => q(ojv),
+      q(5224) => q(ojw),
+      q(5225) => q(oka),
+      q(5226) => q(okb),
+      q(5227) => q(okd),
+      q(5228) => q(oke),
+      q(5229) => q(okg),
+      q(5230) => q(okh),
+      q(5231) => q(oki),
+      q(5232) => q(okj),
+      q(5233) => q(okk),
+      q(5234) => q(okl),
+      q(5235) => q(okm),
+      q(5236) => q(okn),
+      q(5237) => q(oko),
+      q(5238) => q(okr),
+      q(5239) => q(oks),
+      q(5240) => q(oku),
+      q(5241) => q(okv),
+      q(5242) => q(okx),
+      q(5243) => q(ola),
+      q(5244) => q(old),
+      q(5245) => q(ole),
+      q(5246) => q(olk),
+      q(5247) => q(olm),
+      q(5248) => q(olo),
+      q(5249) => q(olr),
+      q(5250) => q(olt),
+      q(5251) => q(oma),
+      q(5252) => q(omb),
+      q(5253) => q(omc),
+      q(5254) => q(ome),
+      q(5255) => q(omg),
+      q(5256) => q(omi),
+      q(5257) => q(omk),
+      q(5258) => q(oml),
+      q(5259) => q(omn),
+      q(5260) => q(omo),
+      q(5261) => q(omp),
+      q(5262) => q(omr),
+      q(5263) => q(omt),
+      q(5264) => q(omu),
+      q(5265) => q(omw),
+      q(5266) => q(omx),
+      q(5267) => q(ona),
+      q(5268) => q(onb),
+      q(5269) => q(one),
+      q(5270) => q(ong),
+      q(5271) => q(oni),
+      q(5272) => q(onj),
+      q(5273) => q(onk),
+      q(5274) => q(onn),
+      q(5275) => q(ono),
+      q(5276) => q(onp),
+      q(5277) => q(onr),
+      q(5278) => q(ons),
+      q(5279) => q(ont),
+      q(5280) => q(onu),
+      q(5281) => q(onw),
+      q(5282) => q(onx),
+      q(5283) => q(ood),
+      q(5284) => q(oog),
+      q(5285) => q(oon),
+      q(5286) => q(oor),
+      q(5287) => q(oos),
+      q(5288) => q(opa),
+      q(5289) => q(opk),
+      q(5290) => q(opm),
+      q(5291) => q(opo),
+      q(5292) => q(opt),
+      q(5293) => q(opy),
+      q(5294) => q(ora),
+      q(5295) => q(orc),
+      q(5296) => q(ore),
+      q(5297) => q(org),
+      q(5298) => q(orh),
+      q(5299) => q(orn),
+      q(5300) => q(oro),
+      q(5301) => q(orr),
+      q(5302) => q(ors),
+      q(5303) => q(ort),
+      q(5304) => q(oru),
+      q(5305) => q(orv),
+      q(5306) => q(orw),
+      q(5307) => q(orx),
+      q(5308) => q(ory),
+      q(5309) => q(orz),
+      q(5310) => q(osc),
+      q(5311) => q(osi),
+      q(5312) => q(oso),
+      q(5313) => q(osp),
+      q(5314) => q(ost),
+      q(5315) => q(osu),
+      q(5316) => q(osx),
+      q(5317) => q(otb),
+      q(5318) => q(otd),
+      q(5319) => q(ote),
+      q(5320) => q(oti),
+      q(5321) => q(otk),
+      q(5322) => q(otl),
+      q(5323) => q(otm),
+      q(5324) => q(otn),
+      q(5325) => q(otq),
+      q(5326) => q(otr),
+      q(5327) => q(ots),
+      q(5328) => q(ott),
+      q(5329) => q(otu),
+      q(5330) => q(otw),
+      q(5331) => q(otx),
+      q(5332) => q(oty),
+      q(5333) => q(otz),
+      q(5334) => q(oua),
+      q(5335) => q(oub),
+      q(5336) => q(oue),
+      q(5337) => q(oui),
+      q(5338) => q(oum),
+      q(5339) => q(owi),
+      q(5340) => q(owl),
+      q(5341) => q(oyb),
+      q(5342) => q(oyd),
+      q(5343) => q(oym),
+      q(5344) => q(oyy),
+      q(5345) => q(ozm),
+      q(5346) => q(pab),
+      q(5347) => q(pac),
+      q(5348) => q(pad),
+      q(5349) => q(pae),
+      q(5350) => q(paf),
+      q(5351) => q(pah),
+      q(5352) => q(pai),
+      q(5353) => q(pak),
+      q(5354) => q(pao),
+      q(5355) => q(paq),
+      q(5356) => q(par),
+      q(5357) => q(pas),
+      q(5358) => q(pat),
+      q(5359) => q(pav),
+      q(5360) => q(paw),
+      q(5361) => q(pax),
+      q(5362) => q(pay),
+      q(5363) => q(paz),
+      q(5364) => q(pbb),
+      q(5365) => q(pbc),
+      q(5366) => q(pbe),
+      q(5367) => q(pbf),
+      q(5368) => q(pbg),
+      q(5369) => q(pbh),
+      q(5370) => q(pbi),
+      q(5371) => q(pbl),
+      q(5372) => q(pbn),
+      q(5373) => q(pbo),
+      q(5374) => q(pbp),
+      q(5375) => q(pbr),
+      q(5376) => q(pbs),
+      q(5377) => q(pbt),
+      q(5378) => q(pbu),
+      q(5379) => q(pbv),
+      q(5380) => q(pby),
+      q(5381) => q(pca),
+      q(5382) => q(pcb),
+      q(5383) => q(pcc),
+      q(5384) => q(pcd),
+      q(5385) => q(pce),
+      q(5386) => q(pcf),
+      q(5387) => q(pcg),
+      q(5388) => q(pch),
+      q(5389) => q(pci),
+      q(5390) => q(pcj),
+      q(5391) => q(pck),
+      q(5392) => q(pcl),
+      q(5393) => q(pcm),
+      q(5394) => q(pcn),
+      q(5395) => q(pcp),
+      q(5396) => q(pcw),
+      q(5397) => q(pda),
+      q(5398) => q(pdc),
+      q(5399) => q(pdi),
+      q(5400) => q(pdn),
+      q(5401) => q(pdo),
+      q(5402) => q(pdt),
+      q(5403) => q(pdu),
+      q(5404) => q(pea),
+      q(5405) => q(peb),
+      q(5406) => q(ped),
+      q(5407) => q(pee),
+      q(5408) => q(pef),
+      q(5409) => q(peg),
+      q(5410) => q(peh),
+      q(5411) => q(pei),
+      q(5412) => q(pej),
+      q(5413) => q(pek),
+      q(5414) => q(pel),
+      q(5415) => q(pem),
+      q(5416) => q(pep),
+      q(5417) => q(peq),
+      q(5418) => q(pes),
+      q(5419) => q(pev),
+      q(5420) => q(pex),
+      q(5421) => q(pey),
+      q(5422) => q(pez),
+      q(5423) => q(pfa),
+      q(5424) => q(pfe),
+      q(5425) => q(pfl),
+      q(5426) => q(pga),
+      q(5427) => q(pgd),
+      q(5428) => q(pgg),
+      q(5429) => q(pgi),
+      q(5430) => q(pgk),
+      q(5431) => q(pgl),
+      q(5432) => q(pgn),
+      q(5433) => q(pgs),
+      q(5434) => q(pgu),
+      q(5435) => q(pha),
+      q(5436) => q(phd),
+      q(5437) => q(phg),
+      q(5438) => q(phh),
+      q(5439) => q(phk),
+      q(5440) => q(phl),
+      q(5441) => q(phm),
+      q(5442) => q(pho),
+      q(5443) => q(phq),
+      q(5444) => q(phr),
+      q(5445) => q(pht),
+      q(5446) => q(phu),
+      q(5447) => q(phv),
+      q(5448) => q(phw),
+      q(5449) => q(pia),
+      q(5450) => q(pib),
+      q(5451) => q(pic),
+      q(5452) => q(pid),
+      q(5453) => q(pie),
+      q(5454) => q(pif),
+      q(5455) => q(pig),
+      q(5456) => q(pih),
+      q(5457) => q(pii),
+      q(5458) => q(pij),
+      q(5459) => q(pil),
+      q(5460) => q(pim),
+      q(5461) => q(pin),
+      q(5462) => q(pio),
+      q(5463) => q(pip),
+      q(5464) => q(pir),
+      q(5465) => q(pis),
+      q(5466) => q(pit),
+      q(5467) => q(piu),
+      q(5468) => q(piv),
+      q(5469) => q(piw),
+      q(5470) => q(pix),
+      q(5471) => q(piy),
+      q(5472) => q(piz),
+      q(5473) => q(pjt),
+      q(5474) => q(pka),
+      q(5475) => q(pkb),
+      q(5476) => q(pkc),
+      q(5477) => q(pkg),
+      q(5478) => q(pkh),
+      q(5479) => q(pkn),
+      q(5480) => q(pko),
+      q(5481) => q(pkp),
+      q(5482) => q(pkr),
+      q(5483) => q(pks),
+      q(5484) => q(pkt),
+      q(5485) => q(pku),
+      q(5486) => q(pla),
+      q(5487) => q(plb),
+      q(5488) => q(plc),
+      q(5489) => q(pld),
+      q(5490) => q(ple),
+      q(5491) => q(plg),
+      q(5492) => q(plh),
+      q(5493) => q(plj),
+      q(5494) => q(plk),
+      q(5495) => q(pll),
+      q(5496) => q(pln),
+      q(5497) => q(plo),
+      q(5498) => q(plp),
+      q(5499) => q(plq),
+      q(5500) => q(plr),
+      q(5501) => q(pls),
+      q(5502) => q(plt),
+      q(5503) => q(plu),
+      q(5504) => q(plv),
+      q(5505) => q(plw),
+      q(5506) => q(ply),
+      q(5507) => q(plz),
+      q(5508) => q(pma),
+      q(5509) => q(pmb),
+      q(5510) => q(pmc),
+      q(5511) => q(pmd),
+      q(5512) => q(pme),
+      q(5513) => q(pmf),
+      q(5514) => q(pmh),
+      q(5515) => q(pmi),
+      q(5516) => q(pmj),
+      q(5517) => q(pmk),
+      q(5518) => q(pml),
+      q(5519) => q(pmm),
+      q(5520) => q(pmn),
+      q(5521) => q(pmo),
+      q(5522) => q(pmq),
+      q(5523) => q(pmr),
+      q(5524) => q(pms),
+      q(5525) => q(pmt),
+      q(5526) => q(pmw),
+      q(5527) => q(pmx),
+      q(5528) => q(pmy),
+      q(5529) => q(pmz),
+      q(5530) => q(pna),
+      q(5531) => q(pnb),
+      q(5532) => q(pnc),
+      q(5533) => q(pne),
+      q(5534) => q(png),
+      q(5535) => q(pnh),
+      q(5536) => q(pni),
+      q(5537) => q(pnj),
+      q(5538) => q(pnk),
+      q(5539) => q(pnl),
+      q(5540) => q(pnm),
+      q(5541) => q(pnn),
+      q(5542) => q(pno),
+      q(5543) => q(pnp),
+      q(5544) => q(pnq),
+      q(5545) => q(pnr),
+      q(5546) => q(pns),
+      q(5547) => q(pnt),
+      q(5548) => q(pnu),
+      q(5549) => q(pnv),
+      q(5550) => q(pnw),
+      q(5551) => q(pnx),
+      q(5552) => q(pny),
+      q(5553) => q(pnz),
+      q(5554) => q(poc),
+      q(5555) => q(pod),
+      q(5556) => q(poe),
+      q(5557) => q(pof),
+      q(5558) => q(pog),
+      q(5559) => q(poh),
+      q(5560) => q(poi),
+      q(5561) => q(pok),
+      q(5562) => q(pom),
+      q(5563) => q(poo),
+      q(5564) => q(pop),
+      q(5565) => q(poq),
+      q(5566) => q(pos),
+      q(5567) => q(pot),
+      q(5568) => q(pov),
+      q(5569) => q(pow),
+      q(5570) => q(pox),
+      q(5571) => q(poy),
+      q(5572) => q(ppa),
+      q(5573) => q(ppe),
+      q(5574) => q(ppi),
+      q(5575) => q(ppk),
+      q(5576) => q(ppl),
+      q(5577) => q(ppm),
+      q(5578) => q(ppn),
+      q(5579) => q(ppo),
+      q(5580) => q(ppp),
+      q(5581) => q(ppq),
+      q(5582) => q(pps),
+      q(5583) => q(ppt),
+      q(5584) => q(ppu),
+      q(5585) => q(pqa),
+      q(5586) => q(pqm),
+      q(5587) => q(prb),
+      q(5588) => q(prc),
+      q(5589) => q(prd),
+      q(5590) => q(pre),
+      q(5591) => q(prf),
+      q(5592) => q(prg),
+      q(5593) => q(prh),
+      q(5594) => q(pri),
+      q(5595) => q(prk),
+      q(5596) => q(prl),
+      q(5597) => q(prm),
+      q(5598) => q(prn),
+      q(5599) => q(prp),
+      q(5600) => q(prq),
+      q(5601) => q(prr),
+      q(5602) => q(prs),
+      q(5603) => q(prt),
+      q(5604) => q(pru),
+      q(5605) => q(prw),
+      q(5606) => q(prx),
+      q(5607) => q(pry),
+      q(5608) => q(prz),
+      q(5609) => q(psa),
+      q(5610) => q(psc),
+      q(5611) => q(psd),
+      q(5612) => q(pse),
+      q(5613) => q(psg),
+      q(5614) => q(psh),
+      q(5615) => q(psi),
+      q(5616) => q(psl),
+      q(5617) => q(psm),
+      q(5618) => q(psn),
+      q(5619) => q(pso),
+      q(5620) => q(psp),
+      q(5621) => q(psq),
+      q(5622) => q(psr),
+      q(5623) => q(pss),
+      q(5624) => q(pst),
+      q(5625) => q(psu),
+      q(5626) => q(psw),
+      q(5627) => q(psy),
+      q(5628) => q(pta),
+      q(5629) => q(pth),
+      q(5630) => q(pti),
+      q(5631) => q(ptn),
+      q(5632) => q(pto),
+      q(5633) => q(ptp),
+      q(5634) => q(ptq),
+      q(5635) => q(ptr),
+      q(5636) => q(ptt),
+      q(5637) => q(ptu),
+      q(5638) => q(ptv),
+      q(5639) => q(ptw),
+      q(5640) => q(pty),
+      q(5641) => q(pua),
+      q(5642) => q(pub),
+      q(5643) => q(puc),
+      q(5644) => q(pud),
+      q(5645) => q(pue),
+      q(5646) => q(puf),
+      q(5647) => q(pug),
+      q(5648) => q(pui),
+      q(5649) => q(puj),
+      q(5650) => q(puk),
+      q(5651) => q(pum),
+      q(5652) => q(puo),
+      q(5653) => q(pup),
+      q(5654) => q(puq),
+      q(5655) => q(pur),
+      q(5656) => q(put),
+      q(5657) => q(puu),
+      q(5658) => q(puw),
+      q(5659) => q(pux),
+      q(5660) => q(puy),
+      q(5661) => q(pwa),
+      q(5662) => q(pwb),
+      q(5663) => q(pwg),
+      q(5664) => q(pwi),
+      q(5665) => q(pwm),
+      q(5666) => q(pwn),
+      q(5667) => q(pwo),
+      q(5668) => q(pwr),
+      q(5669) => q(pww),
+      q(5670) => q(pxm),
+      q(5671) => q(pye),
+      q(5672) => q(pym),
+      q(5673) => q(pyn),
+      q(5674) => q(pys),
+      q(5675) => q(pyu),
+      q(5676) => q(pyx),
+      q(5677) => q(pyy),
+      q(5678) => q(pzn),
+      q(5679) => q(qua),
+      q(5680) => q(qub),
+      q(5681) => q(quc),
+      q(5682) => q(qud),
+      q(5683) => q(quf),
+      q(5684) => q(qug),
+      q(5685) => q(quh),
+      q(5686) => q(qui),
+      q(5687) => q(quk),
+      q(5688) => q(qul),
+      q(5689) => q(qum),
+      q(5690) => q(qun),
+      q(5691) => q(qup),
+      q(5692) => q(quq),
+      q(5693) => q(qur),
+      q(5694) => q(qus),
+      q(5695) => q(quv),
+      q(5696) => q(quw),
+      q(5697) => q(qux),
+      q(5698) => q(quy),
+      q(5699) => q(quz),
+      q(5700) => q(qva),
+      q(5701) => q(qvc),
+      q(5702) => q(qve),
+      q(5703) => q(qvh),
+      q(5704) => q(qvi),
+      q(5705) => q(qvj),
+      q(5706) => q(qvl),
+      q(5707) => q(qvm),
+      q(5708) => q(qvn),
+      q(5709) => q(qvo),
+      q(5710) => q(qvp),
+      q(5711) => q(qvs),
+      q(5712) => q(qvw),
+      q(5713) => q(qvy),
+      q(5714) => q(qvz),
+      q(5715) => q(qwa),
+      q(5716) => q(qwc),
+      q(5717) => q(qwh),
+      q(5718) => q(qwm),
+      q(5719) => q(qws),
+      q(5720) => q(qwt),
+      q(5721) => q(qxa),
+      q(5722) => q(qxc),
+      q(5723) => q(qxh),
+      q(5724) => q(qxl),
+      q(5725) => q(qxn),
+      q(5726) => q(qxo),
+      q(5727) => q(qxp),
+      q(5728) => q(qxq),
+      q(5729) => q(qxr),
+      q(5730) => q(qxs),
+      q(5731) => q(qxt),
+      q(5732) => q(qxu),
+      q(5733) => q(qxw),
+      q(5734) => q(qya),
+      q(5735) => q(qyp),
+      q(5736) => q(raa),
+      q(5737) => q(rab),
+      q(5738) => q(rac),
+      q(5739) => q(rad),
+      q(5740) => q(raf),
+      q(5741) => q(rag),
+      q(5742) => q(rah),
+      q(5743) => q(rai),
+      q(5744) => q(rak),
+      q(5745) => q(ral),
+      q(5746) => q(ram),
+      q(5747) => q(ran),
+      q(5748) => q(rao),
+      q(5749) => q(raq),
+      q(5750) => q(ras),
+      q(5751) => q(rat),
+      q(5752) => q(rau),
+      q(5753) => q(rav),
+      q(5754) => q(raw),
+      q(5755) => q(rax),
+      q(5756) => q(ray),
+      q(5757) => q(raz),
+      q(5758) => q(rbb),
+      q(5759) => q(rbk),
+      q(5760) => q(rbl),
+      q(5761) => q(rbp),
+      q(5762) => q(rcf),
+      q(5763) => q(rdb),
+      q(5764) => q(rea),
+      q(5765) => q(reb),
+      q(5766) => q(ree),
+      q(5767) => q(reg),
+      q(5768) => q(rei),
+      q(5769) => q(rej),
+      q(5770) => q(rel),
+      q(5771) => q(rem),
+      q(5772) => q(ren),
+      q(5773) => q(rer),
+      q(5774) => q(res),
+      q(5775) => q(ret),
+      q(5776) => q(rey),
+      q(5777) => q(rga),
+      q(5778) => q(rge),
+      q(5779) => q(rgk),
+      q(5780) => q(rgn),
+      q(5781) => q(rgr),
+      q(5782) => q(rgs),
+      q(5783) => q(rgu),
+      q(5784) => q(rhg),
+      q(5785) => q(rhp),
+      q(5786) => q(ria),
+      q(5787) => q(rie),
+      q(5788) => q(rif),
+      q(5789) => q(ril),
+      q(5790) => q(rim),
+      q(5791) => q(rin),
+      q(5792) => q(rir),
+      q(5793) => q(rit),
+      q(5794) => q(riu),
+      q(5795) => q(rjg),
+      q(5796) => q(rji),
+      q(5797) => q(rjs),
+      q(5798) => q(rka),
+      q(5799) => q(rkb),
+      q(5800) => q(rkh),
+      q(5801) => q(rki),
+      q(5802) => q(rkm),
+      q(5803) => q(rkt),
+      q(5804) => q(rkw),
+      q(5805) => q(rma),
+      q(5806) => q(rmb),
+      q(5807) => q(rmc),
+      q(5808) => q(rmd),
+      q(5809) => q(rme),
+      q(5810) => q(rmf),
+      q(5811) => q(rmg),
+      q(5812) => q(rmh),
+      q(5813) => q(rmi),
+      q(5814) => q(rmk),
+      q(5815) => q(rml),
+      q(5816) => q(rmm),
+      q(5817) => q(rmn),
+      q(5818) => q(rmo),
+      q(5819) => q(rmp),
+      q(5820) => q(rmq),
+      q(5821) => q(rms),
+      q(5822) => q(rmt),
+      q(5823) => q(rmu),
+      q(5824) => q(rmv),
+      q(5825) => q(rmw),
+      q(5826) => q(rmx),
+      q(5827) => q(rmy),
+      q(5828) => q(rmz),
+      q(5829) => q(rna),
+      q(5830) => q(rnd),
+      q(5831) => q(rng),
+      q(5832) => q(rnl),
+      q(5833) => q(rnn),
+      q(5834) => q(rnp),
+      q(5835) => q(rnr),
+      q(5836) => q(rnw),
+      q(5837) => q(rob),
+      q(5838) => q(roc),
+      q(5839) => q(rod),
+      q(5840) => q(roe),
+      q(5841) => q(rof),
+      q(5842) => q(rog),
+      q(5843) => q(rol),
+      q(5844) => q(roo),
+      q(5845) => q(rop),
+      q(5846) => q(ror),
+      q(5847) => q(rou),
+      q(5848) => q(row),
+      q(5849) => q(rpn),
+      q(5850) => q(rpt),
+      q(5851) => q(rri),
+      q(5852) => q(rro),
+      q(5853) => q(rrt),
+      q(5854) => q(rsb),
+      q(5855) => q(rsi),
+      q(5856) => q(rsl),
+      q(5857) => q(rtc),
+      q(5858) => q(rth),
+      q(5859) => q(rtm),
+      q(5860) => q(rts),
+      q(5861) => q(rtw),
+      q(5862) => q(rub),
+      q(5863) => q(ruc),
+      q(5864) => q(rue),
+      q(5865) => q(ruf),
+      q(5866) => q(rug),
+      q(5867) => q(ruh),
+      q(5868) => q(rui),
+      q(5869) => q(ruk),
+      q(5870) => q(ruo),
+      q(5871) => q(ruq),
+      q(5872) => q(rut),
+      q(5873) => q(ruu),
+      q(5874) => q(ruy),
+      q(5875) => q(ruz),
+      q(5876) => q(rwa),
+      q(5877) => q(rwk),
+      q(5878) => q(rwm),
+      q(5879) => q(rwo),
+      q(5880) => q(rwr),
+      q(5881) => q(rxd),
+      q(5882) => q(rxw),
+      q(5883) => q(ryn),
+      q(5884) => q(rys),
+      q(5885) => q(ryu),
+      q(5886) => q(saa),
+      q(5887) => q(sab),
+      q(5888) => q(sac),
+      q(5889) => q(sae),
+      q(5890) => q(saf),
+      q(5891) => q(saj),
+      q(5892) => q(sak),
+      q(5893) => q(sao),
+      q(5894) => q(saq),
+      q(5895) => q(sar),
+      q(5896) => q(sau),
+      q(5897) => q(sav),
+      q(5898) => q(saw),
+      q(5899) => q(sax),
+      q(5900) => q(say),
+      q(5901) => q(saz),
+      q(5902) => q(sba),
+      q(5903) => q(sbb),
+      q(5904) => q(sbc),
+      q(5905) => q(sbd),
+      q(5906) => q(slc),
+      q(5907) => q(sbf),
+      q(5908) => q(sbg),
+      q(5909) => q(sbh),
+      q(5910) => q(sbi),
+      q(5911) => q(sbj),
+      q(5912) => q(sbk),
+      q(5913) => q(sbl),
+      q(5914) => q(sbm),
+      q(5915) => q(sbn),
+      q(5916) => q(sbo),
+      q(5917) => q(sbp),
+      q(5918) => q(sbq),
+      q(5919) => q(sbr),
+      q(5920) => q(sbs),
+      q(5921) => q(sbt),
+      q(5922) => q(sbu),
+      q(5923) => q(sbv),
+      q(5924) => q(sbw),
+      q(5925) => q(sbx),
+      q(5926) => q(sby),
+      q(5927) => q(sbz),
+      q(5928) => q(scb),
+      q(5929) => q(sce),
+      q(5930) => q(scf),
+      q(5931) => q(scg),
+      q(5932) => q(sch),
+      q(5933) => q(sci),
+      q(5934) => q(sck),
+      q(5935) => q(scl),
+      q(5936) => q(scp),
+      q(5937) => q(scq),
+      q(5938) => q(scs),
+      q(5939) => q(scu),
+      q(5940) => q(scv),
+      q(5941) => q(scw),
+      q(5942) => q(scx),
+      q(5943) => q(sda),
+      q(5944) => q(sdb),
+      q(5945) => q(sdc),
+      q(5946) => q(sde),
+      q(5947) => q(sdf),
+      q(5948) => q(sdg),
+      q(5949) => q(sdh),
+      q(5950) => q(sdj),
+      q(5951) => q(sdk),
+      q(5952) => q(sdl),
+      q(5953) => q(sdm),
+      q(5954) => q(sdn),
+      q(5955) => q(sdo),
+      q(5956) => q(sdp),
+      q(5957) => q(sdr),
+      q(5958) => q(sds),
+      q(5959) => q(sdt),
+      q(5960) => q(sdu),
+      q(5961) => q(sdx),
+      q(5962) => q(sdz),
+      q(5963) => q(sea),
+      q(5964) => q(seb),
+      q(5965) => q(sec),
+      q(5966) => q(sed),
+      q(5967) => q(see),
+      q(5968) => q(sef),
+      q(5969) => q(seg),
+      q(5970) => q(seh),
+      q(5971) => q(sei),
+      q(5972) => q(sej),
+      q(5973) => q(sek),
+      q(5974) => q(sen),
+      q(5975) => q(seo),
+      q(5976) => q(sep),
+      q(5977) => q(seq),
+      q(5978) => q(ser),
+      q(5979) => q(ses),
+      q(5980) => q(set),
+      q(5981) => q(seu),
+      q(5982) => q(sev),
+      q(5983) => q(sew),
+      q(5984) => q(sey),
+      q(5985) => q(sez),
+      q(5986) => q(sfb),
+      q(5987) => q(sfe),
+      q(5988) => q(sfm),
+      q(5989) => q(sfs),
+      q(5990) => q(sfw),
+      q(5991) => q(sgb),
+      q(5992) => q(sgc),
+      q(5993) => q(sgd),
+      q(5994) => q(sge),
+      q(5995) => q(sgg),
+      q(5996) => q(sgh),
+      q(5997) => q(sgi),
+      q(5998) => q(sgj),
+      q(5999) => q(sgk),
+      q(6000) => q(sgm),
+      q(6001) => q(sgp),
+      q(6002) => q(sgr),
+      q(6003) => q(sgs),
+      q(6004) => q(sgt),
+      q(6005) => q(sgu),
+      q(6006) => q(sgw),
+      q(6007) => q(sgx),
+      q(6008) => q(sgy),
+      q(6009) => q(sgz),
+      q(6010) => q(sha),
+      q(6011) => q(shb),
+      q(6012) => q(shc),
+      q(6013) => q(shd),
+      q(6014) => q(she),
+      q(6015) => q(shg),
+      q(6016) => q(shh),
+      q(6017) => q(shi),
+      q(6018) => q(shj),
+      q(6019) => q(shk),
+      q(6020) => q(shl),
+      q(6021) => q(shm),
+      q(6022) => q(sho),
+      q(6023) => q(shp),
+      q(6024) => q(shq),
+      q(6025) => q(shr),
+      q(6026) => q(shs),
+      q(6027) => q(sht),
+      q(6028) => q(shu),
+      q(6029) => q(shv),
+      q(6030) => q(shw),
+      q(6031) => q(shx),
+      q(6032) => q(shy),
+      q(6033) => q(shz),
+      q(6034) => q(sia),
+      q(6035) => q(sib),
+      q(6036) => q(sie),
+      q(6037) => q(sif),
+      q(6038) => q(sig),
+      q(6039) => q(sih),
+      q(6040) => q(sii),
+      q(6041) => q(sij),
+      q(6042) => q(sik),
+      q(6043) => q(sil),
+      q(6044) => q(sim),
+      q(6045) => q(sip),
+      q(6046) => q(siq),
+      q(6047) => q(sir),
+      q(6048) => q(sis),
+      q(6049) => q(siu),
+      q(6050) => q(siv),
+      q(6051) => q(siw),
+      q(6052) => q(six),
+      q(6053) => q(siy),
+      q(6054) => q(siz),
+      q(6055) => q(sja),
+      q(6056) => q(sjb),
+      q(6057) => q(sjd),
+      q(6058) => q(sje),
+      q(6059) => q(sjg),
+      q(6060) => q(sjk),
+      q(6061) => q(sjl),
+      q(6062) => q(sjm),
+      q(6063) => q(sjn),
+      q(6064) => q(sjo),
+      q(6065) => q(sjp),
+      q(6066) => q(sjr),
+      q(6067) => q(sjs),
+      q(6068) => q(sjt),
+      q(6069) => q(sju),
+      q(6070) => q(sjw),
+      q(6071) => q(ska),
+      q(6072) => q(skb),
+      q(6073) => q(skc),
+      q(6074) => q(skd),
+      q(6075) => q(ske),
+      q(6076) => q(skf),
+      q(6077) => q(skg),
+      q(6078) => q(skh),
+      q(6079) => q(ski),
+      q(6080) => q(skj),
+      q(6081) => q(skk),
+      q(6082) => q(skm),
+      q(6083) => q(skn),
+      q(6084) => q(sko),
+      q(6085) => q(skp),
+      q(6086) => q(skq),
+      q(6087) => q(skr),
+      q(6088) => q(sks),
+      q(6089) => q(skt),
+      q(6090) => q(sku),
+      q(6091) => q(skv),
+      q(6092) => q(skw),
+      q(6093) => q(skx),
+      q(6094) => q(sky),
+      q(6095) => q(skz),
+      q(6096) => q(sld),
+      q(6097) => q(sle),
+      q(6098) => q(slf),
+      q(6099) => q(slg),
+      q(6100) => q(slh),
+      q(6101) => q(sli),
+      q(6102) => q(slj),
+      q(6103) => q(sll),
+      q(6104) => q(slm),
+      q(6105) => q(sln),
+      q(6106) => q(slp),
+      q(6107) => q(slq),
+      q(6108) => q(slr),
+      q(6109) => q(sls),
+      q(6110) => q(slt),
+      q(6111) => q(slu),
+      q(6112) => q(slw),
+      q(6113) => q(slx),
+      q(6114) => q(sly),
+      q(6115) => q(slz),
+      q(6116) => q(smb),
+      q(6117) => q(smc),
+      q(6118) => q(smd),
+      q(6119) => q(smf),
+      q(6120) => q(smg),
+      q(6121) => q(smh),
+      q(6122) => q(smk),
+      q(6123) => q(sml),
+      q(6124) => q(smm),
+      q(6125) => q(smp),
+      q(6126) => q(smq),
+      q(6127) => q(smr),
+      q(6128) => q(smt),
+      q(6129) => q(smu),
+      q(6130) => q(smv),
+      q(6131) => q(smw),
+      q(6132) => q(smx),
+      q(6133) => q(smy),
+      q(6134) => q(smz),
+      q(6135) => q(snb),
+      q(6136) => q(snc),
+      q(6137) => q(sne),
+      q(6138) => q(snf),
+      q(6139) => q(sng),
+      q(6140) => q(snh),
+      q(6141) => q(sni),
+      q(6142) => q(snj),
+      q(6143) => q(snl),
+      q(6144) => q(snm),
+      q(6145) => q(snn),
+      q(6146) => q(sno),
+      q(6147) => q(snp),
+      q(6148) => q(snq),
+      q(6149) => q(snr),
+      q(6150) => q(sns),
+      q(6151) => q(snu),
+      q(6152) => q(snv),
+      q(6153) => q(snw),
+      q(6154) => q(snx),
+      q(6155) => q(sny),
+      q(6156) => q(snz),
+      q(6157) => q(soa),
+      q(6158) => q(sob),
+      q(6159) => q(soc),
+      q(6160) => q(sod),
+      q(6161) => q(soe),
+      q(6162) => q(soh),
+      q(6163) => q(soi),
+      q(6164) => q(soj),
+      q(6165) => q(sok),
+      q(6166) => q(sol),
+      q(6167) => q(soo),
+      q(6168) => q(sop),
+      q(6169) => q(soq),
+      q(6170) => q(sor),
+      q(6171) => q(sos),
+      q(6172) => q(sou),
+      q(6173) => q(sov),
+      q(6174) => q(sow),
+      q(6175) => q(sox),
+      q(6176) => q(soy),
+      q(6177) => q(soz),
+      q(6178) => q(spb),
+      q(6179) => q(spc),
+      q(6180) => q(spd),
+      q(6181) => q(spe),
+      q(6182) => q(spg),
+      q(6183) => q(spi),
+      q(6184) => q(spk),
+      q(6185) => q(spl),
+      q(6186) => q(spm),
+      q(6187) => q(spn),
+      q(6188) => q(spo),
+      q(6189) => q(spp),
+      q(6190) => q(spq),
+      q(6191) => q(spr),
+      q(6192) => q(sps),
+      q(6193) => q(spt),
+      q(6194) => q(spu),
+      q(6195) => q(spv),
+      q(6196) => q(spx),
+      q(6197) => q(spy),
+      q(6198) => q(sqa),
+      q(6199) => q(sqh),
+      q(6200) => q(sqk),
+      q(6201) => q(sqm),
+      q(6202) => q(sqn),
+      q(6203) => q(sqo),
+      q(6204) => q(sqq),
+      q(6205) => q(sqr),
+      q(6206) => q(sqs),
+      q(6207) => q(sqt),
+      q(6208) => q(squ),
+      q(6209) => q(sra),
+      q(6210) => q(srb),
+      q(6211) => q(src),
+      q(6212) => q(sre),
+      q(6213) => q(srf),
+      q(6214) => q(srg),
+      q(6215) => q(srh),
+      q(6216) => q(sri),
+      q(6217) => q(srk),
+      q(6218) => q(srl),
+      q(6219) => q(srm),
+      q(6220) => q(sro),
+      q(6221) => q(srq),
+      q(6222) => q(srs),
+      q(6223) => q(srt),
+      q(6224) => q(sru),
+      q(6225) => q(srv),
+      q(6226) => q(srw),
+      q(6227) => q(srx),
+      q(6228) => q(sry),
+      q(6229) => q(srz),
+      q(6230) => q(ssb),
+      q(6231) => q(ssc),
+      q(6232) => q(ssd),
+      q(6233) => q(sse),
+      q(6234) => q(ssf),
+      q(6235) => q(ssg),
+      q(6236) => q(ssh),
+      q(6237) => q(ssi),
+      q(6238) => q(ssj),
+      q(6239) => q(ssk),
+      q(6240) => q(ssl),
+      q(6241) => q(ssm),
+      q(6242) => q(ssn),
+      q(6243) => q(sso),
+      q(6244) => q(ssp),
+      q(6245) => q(ssq),
+      q(6246) => q(ssr),
+      q(6247) => q(sss),
+      q(6248) => q(sst),
+      q(6249) => q(ssu),
+      q(6250) => q(ssv),
+      q(6251) => q(ssx),
+      q(6252) => q(ssy),
+      q(6253) => q(ssz),
+      q(6254) => q(sta),
+      q(6255) => q(stb),
+      q(6256) => q(std),
+      q(6257) => q(ste),
+      q(6258) => q(stf),
+      q(6259) => q(stg),
+      q(6260) => q(sth),
+      q(6261) => q(sti),
+      q(6262) => q(stj),
+      q(6263) => q(stk),
+      q(6264) => q(stl),
+      q(6265) => q(stm),
+      q(6266) => q(stn),
+      q(6267) => q(sto),
+      q(6268) => q(stp),
+      q(6269) => q(stq),
+      q(6270) => q(str),
+      q(6271) => q(sts),
+      q(6272) => q(stt),
+      q(6273) => q(stu),
+      q(6274) => q(stv),
+      q(6275) => q(stw),
+      q(6276) => q(sty),
+      q(6277) => q(sua),
+      q(6278) => q(sub),
+      q(6279) => q(suc),
+      q(6280) => q(sue),
+      q(6281) => q(sug),
+      q(6282) => q(sui),
+      q(6283) => q(suj),
+      q(6284) => q(suq),
+      q(6285) => q(sur),
+      q(6286) => q(sut),
+      q(6287) => q(suv),
+      q(6288) => q(suw),
+      q(6289) => q(suy),
+      q(6290) => q(suz),
+      q(6291) => q(sva),
+      q(6292) => q(svb),
+      q(6293) => q(svc),
+      q(6294) => q(sve),
+      q(6295) => q(svk),
+      q(6296) => q(svm),
+      q(6297) => q(svr),
+      q(6298) => q(svs),
+      q(6299) => q(svx),
+      q(6300) => q(swb),
+      q(6301) => q(swc),
+      q(6302) => q(swf),
+      q(6303) => q(swg),
+      q(6304) => q(swh),
+      q(6305) => q(swi),
+      q(6306) => q(swj),
+      q(6307) => q(swk),
+      q(6308) => q(swl),
+      q(6309) => q(swm),
+      q(6310) => q(swn),
+      q(6311) => q(swo),
+      q(6312) => q(swp),
+      q(6313) => q(swq),
+      q(6314) => q(swr),
+      q(6315) => q(sws),
+      q(6316) => q(swt),
+      q(6317) => q(swu),
+      q(6318) => q(swv),
+      q(6319) => q(sww),
+      q(6320) => q(swx),
+      q(6321) => q(swy),
+      q(6322) => q(sxb),
+      q(6323) => q(sxc),
+      q(6324) => q(sxe),
+      q(6325) => q(sxg),
+      q(6326) => q(sxk),
+      q(6327) => q(sxl),
+      q(6328) => q(sxm),
+      q(6329) => q(sxn),
+      q(6330) => q(sxo),
+      q(6331) => q(sxr),
+      q(6332) => q(sxs),
+      q(6333) => q(sxu),
+      q(6334) => q(sxw),
+      q(6335) => q(sya),
+      q(6336) => q(syb),
+      q(6337) => q(syi),
+      q(6338) => q(syk),
+      q(6339) => q(syl),
+      q(6340) => q(sym),
+      q(6341) => q(syn),
+      q(6342) => q(syo),
+      q(6343) => q(sys),
+      q(6344) => q(syw),
+      q(6345) => q(syx),
+      q(6346) => q(syy),
+      q(6347) => q(sza),
+      q(6348) => q(szb),
+      q(6349) => q(szc),
+      q(6350) => q(szd),
+      q(6351) => q(sze),
+      q(6352) => q(szg),
+      q(6353) => q(szl),
+      q(6354) => q(szn),
+      q(6355) => q(szp),
+      q(6356) => q(szv),
+      q(6357) => q(szw),
+      q(6358) => q(taa),
+      q(6359) => q(tab),
+      q(6360) => q(tac),
+      q(6361) => q(tad),
+      q(6362) => q(tae),
+      q(6363) => q(taf),
+      q(6364) => q(tag),
+      q(6365) => q(taj),
+      q(6366) => q(tak),
+      q(6367) => q(tal),
+      q(6368) => q(tan),
+      q(6369) => q(tao),
+      q(6370) => q(tap),
+      q(6371) => q(taq),
+      q(6372) => q(tar),
+      q(6373) => q(tas),
+      q(6374) => q(tau),
+      q(6375) => q(tav),
+      q(6376) => q(taw),
+      q(6377) => q(tax),
+      q(6378) => q(tay),
+      q(6379) => q(taz),
+      q(6380) => q(tba),
+      q(6381) => q(tbb),
+      q(6382) => q(tbc),
+      q(6383) => q(tbd),
+      q(6384) => q(tbe),
+      q(6385) => q(tbf),
+      q(6386) => q(tbg),
+      q(6387) => q(tbh),
+      q(6388) => q(tbi),
+      q(6389) => q(tbj),
+      q(6390) => q(tbk),
+      q(6391) => q(tbl),
+      q(6392) => q(tbm),
+      q(6393) => q(tbn),
+      q(6394) => q(tbo),
+      q(6395) => q(tbp),
+      q(6396) => q(tbr),
+      q(6397) => q(tbs),
+      q(6398) => q(tbt),
+      q(6399) => q(tbu),
+      q(6400) => q(tbv),
+      q(6401) => q(tbw),
+      q(6402) => q(tbx),
+      q(6403) => q(tby),
+      q(6404) => q(tbz),
+      q(6405) => q(tca),
+      q(6406) => q(tcb),
+      q(6407) => q(tcc),
+      q(6408) => q(tcd),
+      q(6409) => q(tce),
+      q(6410) => q(tcf),
+      q(6411) => q(tcg),
+      q(6412) => q(tch),
+      q(6413) => q(wbf),
+      q(6414) => q(tck),
+      q(6415) => q(tcl),
+      q(6416) => q(tcm),
+      q(6417) => q(tcn),
+      q(6418) => q(tco),
+      q(6419) => q(tcp),
+      q(6420) => q(tcq),
+      q(6421) => q(tcs),
+      q(6422) => q(tct),
+      q(6423) => q(tcu),
+      q(6424) => q(tcw),
+      q(6425) => q(tcx),
+      q(6426) => q(tcy),
+      q(6427) => q(tcz),
+      q(6428) => q(tda),
+      q(6429) => q(tdb),
+      q(6430) => q(tdc),
+      q(6431) => q(tdd),
+      q(6432) => q(tde),
+      q(6433) => q(tdf),
+      q(6434) => q(tdg),
+      q(6435) => q(tdh),
+      q(6436) => q(tdi),
+      q(6437) => q(tdj),
+      q(6438) => q(tdk),
+      q(6439) => q(tdl),
+      q(6440) => q(tdn),
+      q(6441) => q(tdo),
+      q(6442) => q(tdq),
+      q(6443) => q(tdr),
+      q(6444) => q(tds),
+      q(6445) => q(tdt),
+      q(6446) => q(tdu),
+      q(6447) => q(tdv),
+      q(6448) => q(tdx),
+      q(6449) => q(tdy),
+      q(6450) => q(tea),
+      q(6451) => q(teb),
+      q(6452) => q(tec),
+      q(6453) => q(ted),
+      q(6454) => q(tee),
+      q(6455) => q(tef),
+      q(6456) => q(teg),
+      q(6457) => q(teh),
+      q(6458) => q(tei),
+      q(6459) => q(tek),
+      q(6460) => q(ten),
+      q(6461) => q(teo),
+      q(6462) => q(tep),
+      q(6463) => q(teq),
+      q(6464) => q(tes),
+      q(6465) => q(teu),
+      q(6466) => q(tev),
+      q(6467) => q(tew),
+      q(6468) => q(tex),
+      q(6469) => q(tey),
+      q(6470) => q(tfi),
+      q(6471) => q(tfn),
+      q(6472) => q(tfo),
+      q(6473) => q(tfr),
+      q(6474) => q(tft),
+      q(6475) => q(tga),
+      q(6476) => q(tgb),
+      q(6477) => q(tgc),
+      q(6478) => q(tgd),
+      q(6479) => q(tge),
+      q(6480) => q(tgf),
+      q(6481) => q(tgh),
+      q(6482) => q(tgi),
+      q(6483) => q(tgj),
+      q(6484) => q(tgn),
+      q(6485) => q(tgo),
+      q(6486) => q(tgp),
+      q(6487) => q(tgq),
+      q(6488) => q(tgr),
+      q(6489) => q(tgs),
+      q(6490) => q(tgt),
+      q(6491) => q(tgu),
+      q(6492) => q(tgv),
+      q(6493) => q(tgw),
+      q(6494) => q(tgx),
+      q(6495) => q(tgy),
+      q(6496) => q(tgz),
+      q(6497) => q(thc),
+      q(6498) => q(thd),
+      q(6499) => q(the),
+      q(6500) => q(thf),
+      q(6501) => q(thh),
+      q(6502) => q(thi),
+      q(6503) => q(thk),
+      q(6504) => q(thl),
+      q(6505) => q(thm),
+      q(6506) => q(thn),
+      q(6507) => q(thp),
+      q(6508) => q(thq),
+      q(6509) => q(thr),
+      q(6510) => q(ths),
+      q(6511) => q(tht),
+      q(6512) => q(thu),
+      q(6513) => q(thv),
+      q(6514) => q(thw),
+      q(6515) => q(thy),
+      q(6516) => q(thz),
+      q(6517) => q(tia),
+      q(6518) => q(tic),
+      q(6519) => q(tid),
+      q(6520) => q(tif),
+      q(6521) => q(tih),
+      q(6522) => q(tii),
+      q(6523) => q(tij),
+      q(6524) => q(tik),
+      q(6525) => q(til),
+      q(6526) => q(tim),
+      q(6527) => q(tin),
+      q(6528) => q(tio),
+      q(6529) => q(tip),
+      q(6530) => q(tiq),
+      q(6531) => q(tis),
+      q(6532) => q(tit),
+      q(6533) => q(tiu),
+      q(6534) => q(tiw),
+      q(6535) => q(tix),
+      q(6536) => q(tiy),
+      q(6537) => q(tiz),
+      q(6538) => q(tja),
+      q(6539) => q(tjg),
+      q(6540) => q(tji),
+      q(6541) => q(tjl),
+      q(6542) => q(tjm),
+      q(6543) => q(tjn),
+      q(6544) => q(tjo),
+      q(6545) => q(tjs),
+      q(6546) => q(tju),
+      q(6547) => q(tjw),
+      q(6548) => q(tka),
+      q(6549) => q(tkb),
+      q(6550) => q(tkd),
+      q(6551) => q(tke),
+      q(6552) => q(tkf),
+      q(6553) => q(tkg),
+      q(6554) => q(tkm),
+      q(6555) => q(tkn),
+      q(6556) => q(tkp),
+      q(6557) => q(tkq),
+      q(6558) => q(tkr),
+      q(6559) => q(tks),
+      q(6560) => q(tkt),
+      q(6561) => q(tku),
+      q(6562) => q(tkv),
+      q(6563) => q(tkw),
+      q(6564) => q(tkx),
+      q(6565) => q(tkz),
+      q(6566) => q(tla),
+      q(6567) => q(tlb),
+      q(6568) => q(tlc),
+      q(6569) => q(tld),
+      q(6570) => q(tlf),
+      q(6571) => q(tlg),
+      q(6572) => q(tlj),
+      q(6573) => q(tlk),
+      q(6574) => q(tll),
+      q(6575) => q(tlm),
+      q(6576) => q(tln),
+      q(6577) => q(tlo),
+      q(6578) => q(tlp),
+      q(6579) => q(tlq),
+      q(6580) => q(tlr),
+      q(6581) => q(tls),
+      q(6582) => q(tlt),
+      q(6583) => q(tlu),
+      q(6584) => q(tlv),
+      q(6585) => q(tlx),
+      q(6586) => q(tly),
+      q(6587) => q(tma),
+      q(6588) => q(tmb),
+      q(6589) => q(tmc),
+      q(6590) => q(tmd),
+      q(6591) => q(tme),
+      q(6592) => q(tmf),
+      q(6593) => q(tmg),
+      q(6594) => q(tmi),
+      q(6595) => q(tmj),
+      q(6596) => q(tmk),
+      q(6597) => q(tml),
+      q(6598) => q(tmm),
+      q(6599) => q(tmn),
+      q(6600) => q(tmo),
+      q(6601) => q(tmp),
+      q(6602) => q(tmq),
+      q(6603) => q(tmr),
+      q(6604) => q(tms),
+      q(6605) => q(tmt),
+      q(6606) => q(tmu),
+      q(6607) => q(tmv),
+      q(6608) => q(tmw),
+      q(6609) => q(tmy),
+      q(6610) => q(tmz),
+      q(6611) => q(tna),
+      q(6612) => q(tnb),
+      q(6613) => q(tnc),
+      q(6614) => q(tnd),
+      q(6615) => q(tne),
+      q(6616) => q(tng),
+      q(6617) => q(tnh),
+      q(6618) => q(tni),
+      q(6619) => q(tnk),
+      q(6620) => q(tnl),
+      q(6621) => q(tnm),
+      q(6622) => q(tnn),
+      q(6623) => q(tno),
+      q(6624) => q(tnp),
+      q(6625) => q(tnq),
+      q(6626) => q(tnr),
+      q(6627) => q(tns),
+      q(6628) => q(tnt),
+      q(6629) => q(tnu),
+      q(6630) => q(tnv),
+      q(6631) => q(tnw),
+      q(6632) => q(tnx),
+      q(6633) => q(tny),
+      q(6634) => q(tnz),
+      q(6635) => q(tob),
+      q(6636) => q(toc),
+      q(6637) => q(tod),
+      q(6638) => q(toe),
+      q(6639) => q(tof),
+      q(6640) => q(toh),
+      q(6641) => q(toi),
+      q(6642) => q(toj),
+      q(6643) => q(tol),
+      q(6644) => q(tom),
+      q(6645) => q(too),
+      q(6646) => q(top),
+      q(6647) => q(toq),
+      q(6648) => q(tor),
+      q(6649) => q(tos),
+      q(6650) => q(tou),
+      q(6651) => q(tov),
+      q(6652) => q(tow),
+      q(6653) => q(tox),
+      q(6654) => q(toy),
+      q(6655) => q(toz),
+      q(6656) => q(tpa),
+      q(6657) => q(tpc),
+      q(6658) => q(tpe),
+      q(6659) => q(tpf),
+      q(6660) => q(tpg),
+      q(6661) => q(tpj),
+      q(6662) => q(tpk),
+      q(6663) => q(tpl),
+      q(6664) => q(tpm),
+      q(6665) => q(tpn),
+      q(6666) => q(tpo),
+      q(6667) => q(tpp),
+      q(6668) => q(tpq),
+      q(6669) => q(tpr),
+      q(6670) => q(tpt),
+      q(6671) => q(tpu),
+      q(6672) => q(tpv),
+      q(6673) => q(tpw),
+      q(6674) => q(tpx),
+      q(6675) => q(tpy),
+      q(6676) => q(tpz),
+      q(6677) => q(tqb),
+      q(6678) => q(tql),
+      q(6679) => q(tqm),
+      q(6680) => q(tqn),
+      q(6681) => q(tqo),
+      q(6682) => q(tqp),
+      q(6683) => q(tqq),
+      q(6684) => q(tqr),
+      q(6685) => q(tqt),
+      q(6686) => q(tqu),
+      q(6687) => q(tqw),
+      q(6688) => q(tra),
+      q(6689) => q(trb),
+      q(6690) => q(trc),
+      q(6691) => q(trd),
+      q(6692) => q(tre),
+      q(6693) => q(trf),
+      q(6694) => q(trg),
+      q(6695) => q(trh),
+      q(6696) => q(tri),
+      q(6697) => q(trj),
+      q(6698) => q(trl),
+      q(6699) => q(trm),
+      q(6700) => q(trn),
+      q(6701) => q(tro),
+      q(6702) => q(trp),
+      q(6703) => q(trq),
+      q(6704) => q(trr),
+      q(6705) => q(trs),
+      q(6706) => q(trt),
+      q(6707) => q(tru),
+      q(6708) => q(trv),
+      q(6709) => q(trw),
+      q(6710) => q(trx),
+      q(6711) => q(try),
+      q(6712) => q(trz),
+      q(6713) => q(tsa),
+      q(6714) => q(tsb),
+      q(6715) => q(tsc),
+      q(6716) => q(tsd),
+      q(6717) => q(tse),
+      q(6718) => q(tsg),
+      q(6719) => q(tsh),
+      q(6720) => q(tsj),
+      q(6721) => q(tsk),
+      q(6722) => q(tsl),
+      q(6723) => q(tsm),
+      q(6724) => q(tsp),
+      q(6725) => q(tsq),
+      q(6726) => q(tsr),
+      q(6727) => q(tss),
+      q(6728) => q(tst),
+      q(6729) => q(tsu),
+      q(6730) => q(tsv),
+      q(6731) => q(tsw),
+      q(6732) => q(tsx),
+      q(6733) => q(tsy),
+      q(6734) => q(tsz),
+      q(6735) => q(tta),
+      q(6736) => q(ttb),
+      q(6737) => q(ttc),
+      q(6738) => q(ttd),
+      q(6739) => q(tte),
+      q(6740) => q(ttf),
+      q(6741) => q(ttg),
+      q(6742) => q(tth),
+      q(6743) => q(tti),
+      q(6744) => q(ttj),
+      q(6745) => q(ttk),
+      q(6746) => q(ttl),
+      q(6747) => q(ttm),
+      q(6748) => q(ttn),
+      q(6749) => q(tto),
+      q(6750) => q(ttp),
+      q(6751) => q(ttq),
+      q(6752) => q(ttr),
+      q(6753) => q(tts),
+      q(6754) => q(ttt),
+      q(6755) => q(ttu),
+      q(6756) => q(ttv),
+      q(6757) => q(ttw),
+      q(6758) => q(tty),
+      q(6759) => q(ttz),
+      q(6760) => q(tua),
+      q(6761) => q(tub),
+      q(6762) => q(tuc),
+      q(6763) => q(tud),
+      q(6764) => q(tue),
+      q(6765) => q(tuf),
+      q(6766) => q(tug),
+      q(6767) => q(tuh),
+      q(6768) => q(tui),
+      q(6769) => q(tuj),
+      q(6770) => q(tul),
+      q(6771) => q(tun),
+      q(6772) => q(tuo),
+      q(6773) => q(tuq),
+      q(6774) => q(tus),
+      q(6775) => q(tuu),
+      q(6776) => q(tuv),
+      q(6777) => q(tux),
+      q(6778) => q(tuy),
+      q(6779) => q(tuz),
+      q(6780) => q(tva),
+      q(6781) => q(tvd),
+      q(6782) => q(tve),
+      q(6783) => q(tvk),
+      q(6784) => q(tvm),
+      q(6785) => q(tvn),
+      q(6786) => q(tvo),
+      q(6787) => q(tvs),
+      q(6788) => q(tvt),
+      q(6789) => q(tvu),
+      q(6790) => q(tvw),
+      q(6791) => q(tvy),
+      q(6792) => q(twa),
+      q(6793) => q(twb),
+      q(6794) => q(twc),
+      q(6795) => q(twd),
+      q(6796) => q(twe),
+      q(6797) => q(twf),
+      q(6798) => q(twg),
+      q(6799) => q(twh),
+      q(6800) => q(twl),
+      q(6801) => q(twm),
+      q(6802) => q(twn),
+      q(6803) => q(two),
+      q(6804) => q(twp),
+      q(6805) => q(twq),
+      q(6806) => q(twr),
+      q(6807) => q(twt),
+      q(6808) => q(twu),
+      q(6809) => q(tww),
+      q(6810) => q(twx),
+      q(6811) => q(twy),
+      q(6812) => q(txa),
+      q(6813) => q(txb),
+      q(6814) => q(txc),
+      q(6815) => q(txe),
+      q(6816) => q(txg),
+      q(6817) => q(txh),
+      q(6818) => q(txi),
+      q(6819) => q(txj),
+      q(6820) => q(txm),
+      q(6821) => q(txn),
+      q(6822) => q(txo),
+      q(6823) => q(txq),
+      q(6824) => q(txr),
+      q(6825) => q(txs),
+      q(6826) => q(txt),
+      q(6827) => q(txu),
+      q(6828) => q(txx),
+      q(6829) => q(txy),
+      q(6830) => q(tya),
+      q(6831) => q(tye),
+      q(6832) => q(tyh),
+      q(6833) => q(tyi),
+      q(6834) => q(tyj),
+      q(6835) => q(tyl),
+      q(6836) => q(tyn),
+      q(6837) => q(typ),
+      q(6838) => q(tyr),
+      q(6839) => q(tys),
+      q(6840) => q(tyt),
+      q(6841) => q(tyu),
+      q(6842) => q(tyx),
+      q(6843) => q(tyz),
+      q(6844) => q(tza),
+      q(6845) => q(tzh),
+      q(6846) => q(tzj),
+      q(6847) => q(tzl),
+      q(6848) => q(tzm),
+      q(6849) => q(tzn),
+      q(6850) => q(tzo),
+      q(6851) => q(tzx),
+      q(6852) => q(uam),
+      q(6853) => q(uan),
+      q(6854) => q(uar),
+      q(6855) => q(uba),
+      q(6856) => q(ubi),
+      q(6857) => q(ubl),
+      q(6858) => q(ubr),
+      q(6859) => q(ubu),
+      q(6860) => q(uby),
+      q(6861) => q(uda),
+      q(6862) => q(ude),
+      q(6863) => q(udg),
+      q(6864) => q(udi),
+      q(6865) => q(udj),
+      q(6866) => q(udl),
+      q(6867) => q(udu),
+      q(6868) => q(ues),
+      q(6869) => q(ufi),
+      q(6870) => q(ugb),
+      q(6871) => q(uge),
+      q(6872) => q(ugn),
+      q(6873) => q(ugo),
+      q(6874) => q(ugy),
+      q(6875) => q(uha),
+      q(6876) => q(uhn),
+      q(6877) => q(uis),
+      q(6878) => q(uiv),
+      q(6879) => q(uji),
+      q(6880) => q(uka),
+      q(6881) => q(ukg),
+      q(6882) => q(ukh),
+      q(6883) => q(ukl),
+      q(6884) => q(ukp),
+      q(6885) => q(ukq),
+      q(6886) => q(uks),
+      q(6887) => q(uku),
+      q(6888) => q(ukw),
+      q(6889) => q(uky),
+      q(6890) => q(ula),
+      q(6891) => q(ulb),
+      q(6892) => q(ulc),
+      q(6893) => q(ule),
+      q(6894) => q(ulf),
+      q(6895) => q(uli),
+      q(6896) => q(ulk),
+      q(6897) => q(ull),
+      q(6898) => q(ulm),
+      q(6899) => q(uln),
+      q(6900) => q(ulu),
+      q(6901) => q(ulw),
+      q(6902) => q(uma),
+      q(6903) => q(umc),
+      q(6904) => q(umd),
+      q(6905) => q(umg),
+      q(6906) => q(umi),
+      q(6907) => q(umm),
+      q(6908) => q(umn),
+      q(6909) => q(umo),
+      q(6910) => q(ump),
+      q(6911) => q(umr),
+      q(6912) => q(ums),
+      q(6913) => q(umu),
+      q(6914) => q(una),
+      q(6915) => q(une),
+      q(6916) => q(ung),
+      q(6917) => q(unk),
+      q(6918) => q(unm),
+      q(6919) => q(unn),
+      q(6920) => q(unr),
+      q(6921) => q(unu),
+      q(6922) => q(unx),
+      q(6923) => q(unz),
+      q(6924) => q(upi),
+      q(6925) => q(upv),
+      q(6926) => q(ura),
+      q(6927) => q(urb),
+      q(6928) => q(urc),
+      q(6929) => q(ure),
+      q(6930) => q(urf),
+      q(6931) => q(urg),
+      q(6932) => q(urh),
+      q(6933) => q(uri),
+      q(6934) => q(urk),
+      q(6935) => q(url),
+      q(6936) => q(urm),
+      q(6937) => q(urn),
+      q(6938) => q(uro),
+      q(6939) => q(urp),
+      q(6940) => q(urr),
+      q(6941) => q(urt),
+      q(6942) => q(uru),
+      q(6943) => q(urv),
+      q(6944) => q(urw),
+      q(6945) => q(urx),
+      q(6946) => q(ury),
+      q(6947) => q(urz),
+      q(6948) => q(usa),
+      q(6949) => q(ush),
+      q(6950) => q(usi),
+      q(6951) => q(usk),
+      q(6952) => q(usp),
+      q(6953) => q(usu),
+      q(6954) => q(uta),
+      q(6955) => q(ute),
+      q(6956) => q(utp),
+      q(6957) => q(utr),
+      q(6958) => q(utu),
+      q(6959) => q(uum),
+      q(6960) => q(uun),
+      q(6961) => q(uur),
+      q(6962) => q(uuu),
+      q(6963) => q(uve),
+      q(6964) => q(uvh),
+      q(6965) => q(uvl),
+      q(6966) => q(uwa),
+      q(6967) => q(uya),
+      q(6968) => q(uzn),
+      q(6969) => q(uzs),
+      q(6970) => q(vaa),
+      q(6971) => q(vae),
+      q(6972) => q(vaf),
+      q(6973) => q(vag),
+      q(6974) => q(vah),
+      q(6975) => q(vaj),
+      q(6976) => q(val),
+      q(6977) => q(vam),
+      q(6978) => q(van),
+      q(6979) => q(vao),
+      q(6980) => q(vap),
+      q(6981) => q(var),
+      q(6982) => q(vas),
+      q(6983) => q(vau),
+      q(6984) => q(vav),
+      q(6985) => q(vay),
+      q(6986) => q(vbb),
+      q(6987) => q(vbk),
+      q(6988) => q(vec),
+      q(6989) => q(ved),
+      q(6990) => q(vel),
+      q(6991) => q(vem),
+      q(6992) => q(veo),
+      q(6993) => q(vep),
+      q(6994) => q(ver),
+      q(6995) => q(vgr),
+      q(6996) => q(vgt),
+      q(6997) => q(vic),
+      q(6998) => q(vid),
+      q(6999) => q(vif),
+      q(7000) => q(vig),
+      q(7001) => q(vil),
+      q(7002) => q(vin),
+      q(7003) => q(vis),
+      q(7004) => q(vit),
+      q(7005) => q(viv),
+      q(7006) => q(vka),
+      q(7007) => q(vki),
+      q(7008) => q(vkj),
+      q(7009) => q(vkk),
+      q(7010) => q(vkl),
+      q(7011) => q(vkm),
+      q(7012) => q(vko),
+      q(7013) => q(vkp),
+      q(7014) => q(vkt),
+      q(7015) => q(vku),
+      q(7016) => q(vlp),
+      q(7017) => q(vls),
+      q(7018) => q(vma),
+      q(7019) => q(vmb),
+      q(7020) => q(vmc),
+      q(7021) => q(vmd),
+      q(7022) => q(vme),
+      q(7023) => q(vmf),
+      q(7024) => q(vmg),
+      q(7025) => q(vmh),
+      q(7026) => q(vmi),
+      q(7027) => q(vmj),
+      q(7028) => q(vmk),
+      q(7029) => q(vml),
+      q(7030) => q(vmm),
+      q(7031) => q(vmp),
+      q(7032) => q(vmq),
+      q(7033) => q(vmr),
+      q(7034) => q(vms),
+      q(7035) => q(vmu),
+      q(7036) => q(vmv),
+      q(7037) => q(vmw),
+      q(7038) => q(vmx),
+      q(7039) => q(vmy),
+      q(7040) => q(vmz),
+      q(7041) => q(vnk),
+      q(7042) => q(vnm),
+      q(7043) => q(vnp),
+      q(7044) => q(vro),
+      q(7045) => q(vra),
+      q(7046) => q(vrs),
+      q(7047) => q(vrt),
+      q(7048) => q(vsi),
+      q(7049) => q(vsl),
+      q(7050) => q(vsv),
+      q(7051) => q(vto),
+      q(7052) => q(vum),
+      q(7053) => q(vun),
+      q(7054) => q(vut),
+      q(7055) => q(vwa),
+      q(7056) => q(waa),
+      q(7057) => q(wab),
+      q(7058) => q(wac),
+      q(7059) => q(wad),
+      q(7060) => q(wae),
+      q(7061) => q(waf),
+      q(7062) => q(wag),
+      q(7063) => q(wah),
+      q(7064) => q(wai),
+      q(7065) => q(waj),
+      q(7066) => q(wam),
+      q(7067) => q(wan),
+      q(7068) => q(wao),
+      q(7069) => q(wap),
+      q(7070) => q(waq),
+      q(7071) => q(wat),
+      q(7072) => q(wau),
+      q(7073) => q(wav),
+      q(7074) => q(waw),
+      q(7075) => q(wax),
+      q(7076) => q(way),
+      q(7077) => q(waz),
+      q(7078) => q(wba),
+      q(7079) => q(wbb),
+      q(7080) => q(wbe),
+      q(7081) => q(wbh),
+      q(7082) => q(wbi),
+      q(7083) => q(wbj),
+      q(7084) => q(wbk),
+      q(7085) => q(wbl),
+      q(7086) => q(wbm),
+      q(7087) => q(wbp),
+      q(7088) => q(wbq),
+      q(7089) => q(wbr),
+      q(7090) => q(wbt),
+      q(7091) => q(wbv),
+      q(7092) => q(wbw),
+      q(7093) => q(wca),
+      q(7094) => q(wci),
+      q(7095) => q(wdd),
+      q(7096) => q(wdg),
+      q(7097) => q(wdj),
+      q(7098) => q(wdk),
+      q(7099) => q(wdu),
+      q(7100) => q(wdy),
+      q(7101) => q(wea),
+      q(7102) => q(wec),
+      q(7103) => q(wed),
+      q(7104) => q(weg),
+      q(7105) => q(weh),
+      q(7106) => q(wei),
+      q(7107) => q(wem),
+      q(7108) => q(weo),
+      q(7109) => q(wep),
+      q(7110) => q(wer),
+      q(7111) => q(wes),
+      q(7112) => q(wet),
+      q(7113) => q(weu),
+      q(7114) => q(wew),
+      q(7115) => q(wfg),
+      q(7116) => q(wga),
+      q(7117) => q(wgb),
+      q(7118) => q(wgg),
+      q(7119) => q(wgi),
+      q(7120) => q(wgo),
+      q(7121) => q(wgu),
+      q(7122) => q(wgy),
+      q(7123) => q(wha),
+      q(7124) => q(whg),
+      q(7125) => q(whk),
+      q(7126) => q(whu),
+      q(7127) => q(wib),
+      q(7128) => q(wic),
+      q(7129) => q(wie),
+      q(7130) => q(wif),
+      q(7131) => q(wig),
+      q(7132) => q(wih),
+      q(7133) => q(wii),
+      q(7134) => q(wij),
+      q(7135) => q(wik),
+      q(7136) => q(wil),
+      q(7137) => q(wim),
+      q(7138) => q(win),
+      q(7139) => q(wir),
+      q(7140) => q(wiu),
+      q(7141) => q(wiv),
+      q(7142) => q(wiy),
+      q(7143) => q(wja),
+      q(7144) => q(wji),
+      q(7145) => q(wka),
+      q(7146) => q(wkb),
+      q(7147) => q(wkd),
+      q(7148) => q(wkl),
+      q(7149) => q(wku),
+      q(7150) => q(wkw),
+      q(7151) => q(wky),
+      q(7152) => q(wla),
+      q(7153) => q(wlc),
+      q(7154) => q(wle),
+      q(7155) => q(wlg),
+      q(7156) => q(wli),
+      q(7157) => q(wlk),
+      q(7158) => q(wll),
+      q(7159) => q(wlm),
+      q(7160) => q(wlo),
+      q(7161) => q(wlr),
+      q(7162) => q(wls),
+      q(7163) => q(wlu),
+      q(7164) => q(wlv),
+      q(7165) => q(wlw),
+      q(7166) => q(wlx),
+      q(7167) => q(wly),
+      q(7168) => q(wma),
+      q(7169) => q(wmb),
+      q(7170) => q(wmc),
+      q(7171) => q(wmd),
+      q(7172) => q(wme),
+      q(7173) => q(wmh),
+      q(7174) => q(wmi),
+      q(7175) => q(wmm),
+      q(7176) => q(wmn),
+      q(7177) => q(wmo),
+      q(7178) => q(wms),
+      q(7179) => q(wmt),
+      q(7180) => q(wmw),
+      q(7181) => q(wmx),
+      q(7182) => q(wnb),
+      q(7183) => q(wnc),
+      q(7184) => q(wnd),
+      q(7185) => q(wne),
+      q(7186) => q(wng),
+      q(7187) => q(wni),
+      q(7188) => q(wnk),
+      q(7189) => q(wnm),
+      q(7190) => q(wnn),
+      q(7191) => q(wno),
+      q(7192) => q(wnp),
+      q(7193) => q(wnu),
+      q(7194) => q(wnw),
+      q(7195) => q(wny),
+      q(7196) => q(woa),
+      q(7197) => q(wob),
+      q(7198) => q(woc),
+      q(7199) => q(wod),
+      q(7200) => q(woe),
+      q(7201) => q(wof),
+      q(7202) => q(wog),
+      q(7203) => q(woi),
+      q(7204) => q(wok),
+      q(7205) => q(wom),
+      q(7206) => q(won),
+      q(7207) => q(woo),
+      q(7208) => q(wor),
+      q(7209) => q(wos),
+      q(7210) => q(wow),
+      q(7211) => q(woy),
+      q(7212) => q(wpc),
+      q(7213) => q(wra),
+      q(7214) => q(wrb),
+      q(7215) => q(wrd),
+      q(7216) => q(wrg),
+      q(7217) => q(wrh),
+      q(7218) => q(wri),
+      q(7219) => q(wrk),
+      q(7220) => q(wrl),
+      q(7221) => q(wrm),
+      q(7222) => q(wrn),
+      q(7223) => q(wro),
+      q(7224) => q(wrp),
+      q(7225) => q(wrr),
+      q(7226) => q(wrs),
+      q(7227) => q(wru),
+      q(7228) => q(wrv),
+      q(7229) => q(wrw),
+      q(7230) => q(wrx),
+      q(7231) => q(wry),
+      q(7232) => q(wrz),
+      q(7233) => q(wsa),
+      q(7234) => q(wsi),
+      q(7235) => q(wsk),
+      q(7236) => q(wsr),
+      q(7237) => q(wss),
+      q(7238) => q(wsu),
+      q(7239) => q(wsv),
+      q(7240) => q(wtf),
+      q(7241) => q(wth),
+      q(7242) => q(wti),
+      q(7243) => q(wtk),
+      q(7244) => q(wtm),
+      q(7245) => q(wtw),
+      q(7246) => q(wua),
+      q(7247) => q(wub),
+      q(7248) => q(wud),
+      q(7249) => q(wuh),
+      q(7250) => q(wul),
+      q(7251) => q(wum),
+      q(7252) => q(wun),
+      q(7253) => q(wur),
+      q(7254) => q(wut),
+      q(7255) => q(wuu),
+      q(7256) => q(wuv),
+      q(7257) => q(wux),
+      q(7258) => q(wuy),
+      q(7259) => q(wwa),
+      q(7260) => q(wwb),
+      q(7261) => q(wwo),
+      q(7262) => q(wwr),
+      q(7263) => q(www),
+      q(7264) => q(wxa),
+      q(7265) => q(wxw),
+      q(7266) => q(wya),
+      q(7267) => q(wyb),
+      q(7268) => q(wyi),
+      q(7269) => q(wym),
+      q(7270) => q(wyr),
+      q(7271) => q(wyy),
+      q(7272) => q(xaa),
+      q(7273) => q(xab),
+      q(7274) => q(xac),
+      q(7275) => q(xad),
+      q(7276) => q(xae),
+      q(7277) => q(xag),
+      q(7278) => q(xai),
+      q(7279) => q(xaj),
+      q(7280) => q(xam),
+      q(7281) => q(xan),
+      q(7282) => q(xao),
+      q(7283) => q(xap),
+      q(7284) => q(xaq),
+      q(7285) => q(xar),
+      q(7286) => q(xas),
+      q(7287) => q(xat),
+      q(7288) => q(xau),
+      q(7289) => q(xav),
+      q(7290) => q(xaw),
+      q(7291) => q(xay),
+      q(7292) => q(xba),
+      q(7293) => q(xbb),
+      q(7294) => q(xbc),
+      q(7295) => q(xbd),
+      q(7296) => q(xbe),
+      q(7297) => q(xbg),
+      q(7298) => q(xbi),
+      q(7299) => q(xbj),
+      q(7300) => q(xbm),
+      q(7301) => q(xbn),
+      q(7302) => q(xbo),
+      q(7303) => q(xbp),
+      q(7304) => q(xbr),
+      q(7305) => q(xbw),
+      q(7306) => q(xbx),
+      q(7307) => q(xby),
+      q(7308) => q(xcb),
+      q(7309) => q(xcc),
+      q(7310) => q(xce),
+      q(7311) => q(xcg),
+      q(7312) => q(xch),
+      q(7313) => q(xcl),
+      q(7314) => q(xcm),
+      q(7315) => q(xcn),
+      q(7316) => q(xco),
+      q(7317) => q(xcr),
+      q(7318) => q(xct),
+      q(7319) => q(xcu),
+      q(7320) => q(xcv),
+      q(7321) => q(xcw),
+      q(7322) => q(xcy),
+      q(7323) => q(xda),
+      q(7324) => q(xdc),
+      q(7325) => q(xdk),
+      q(7326) => q(xdm),
+      q(7327) => q(xdy),
+      q(7328) => q(xeb),
+      q(7329) => q(xed),
+      q(7330) => q(xeg),
+      q(7331) => q(xel),
+      q(7332) => q(xem),
+      q(7333) => q(xep),
+      q(7334) => q(xer),
+      q(7335) => q(xes),
+      q(7336) => q(xet),
+      q(7337) => q(xeu),
+      q(7338) => q(xfa),
+      q(7339) => q(xga),
+      q(7340) => q(xgb),
+      q(7341) => q(xgd),
+      q(7342) => q(xgf),
+      q(7343) => q(xgg),
+      q(7344) => q(xgi),
+      q(7345) => q(xgl),
+      q(7346) => q(xgm),
+      q(7347) => q(xgr),
+      q(7348) => q(xgu),
+      q(7349) => q(xgw),
+      q(7350) => q(xha),
+      q(7351) => q(xhc),
+      q(7352) => q(xhd),
+      q(7353) => q(xhe),
+      q(7354) => q(xhr),
+      q(7355) => q(xht),
+      q(7356) => q(xhu),
+      q(7357) => q(xhv),
+      q(7358) => q(xib),
+      q(7359) => q(xii),
+      q(7360) => q(xil),
+      q(7361) => q(xin),
+      q(7362) => q(xip),
+      q(7363) => q(xir),
+      q(7364) => q(xis),
+      q(7365) => q(xiv),
+      q(7366) => q(xiy),
+      q(7367) => q(xjb),
+      q(7368) => q(xjt),
+      q(7369) => q(xka),
+      q(7370) => q(xkb),
+      q(7371) => q(xkc),
+      q(7372) => q(xkd),
+      q(7373) => q(xke),
+      q(7374) => q(xkf),
+      q(7375) => q(xkg),
+      q(7376) => q(xkh),
+      q(7377) => q(xki),
+      q(7378) => q(xkj),
+      q(7379) => q(xkk),
+      q(7380) => q(xkl),
+      q(7381) => q(xkn),
+      q(7382) => q(xko),
+      q(7383) => q(xkp),
+      q(7384) => q(xkq),
+      q(7385) => q(xkr),
+      q(7386) => q(xks),
+      q(7387) => q(xkt),
+      q(7388) => q(xku),
+      q(7389) => q(xkv),
+      q(7390) => q(xkw),
+      q(7391) => q(xkx),
+      q(7392) => q(xky),
+      q(7393) => q(xkz),
+      q(7394) => q(xla),
+      q(7395) => q(xlb),
+      q(7396) => q(xlc),
+      q(7397) => q(xld),
+      q(7398) => q(xle),
+      q(7399) => q(xlg),
+      q(7400) => q(xli),
+      q(7401) => q(xln),
+      q(7402) => q(xlo),
+      q(7403) => q(xlp),
+      q(7404) => q(xls),
+      q(7405) => q(xlu),
+      q(7406) => q(xly),
+      q(7407) => q(xma),
+      q(7408) => q(xmb),
+      q(7409) => q(xmc),
+      q(7410) => q(xmd),
+      q(7411) => q(xme),
+      q(7412) => q(xmf),
+      q(7413) => q(xmg),
+      q(7414) => q(xmh),
+      q(7415) => q(xmj),
+      q(7416) => q(xmk),
+      q(7417) => q(xml),
+      q(7418) => q(xmm),
+      q(7419) => q(xmn),
+      q(7420) => q(xmo),
+      q(7421) => q(xmp),
+      q(7422) => q(xmq),
+      q(7423) => q(xmr),
+      q(7424) => q(xms),
+      q(7425) => q(xmt),
+      q(7426) => q(xmu),
+      q(7427) => q(xmv),
+      q(7428) => q(xmw),
+      q(7429) => q(xmx),
+      q(7430) => q(xmy),
+      q(7431) => q(xmz),
+      q(7432) => q(xna),
+      q(7433) => q(xnb),
+      q(7434) => q(xng),
+      q(7435) => q(xnh),
+      q(7436) => q(xni),
+      q(7437) => q(xnk),
+      q(7438) => q(xnn),
+      q(7439) => q(xno),
+      q(7440) => q(xnr),
+      q(7441) => q(xns),
+      q(7442) => q(xnt),
+      q(7443) => q(xnu),
+      q(7444) => q(xny),
+      q(7445) => q(xnz),
+      q(7446) => q(xoc),
+      q(7447) => q(xod),
+      q(7448) => q(xog),
+      q(7449) => q(xoi),
+      q(7450) => q(xok),
+      q(7451) => q(xom),
+      q(7452) => q(xon),
+      q(7453) => q(xoo),
+      q(7454) => q(xop),
+      q(7455) => q(xor),
+      q(7456) => q(xow),
+      q(7457) => q(xpa),
+      q(7458) => q(xpc),
+      q(7459) => q(xpe),
+      q(7460) => q(xpg),
+      q(7461) => q(xpi),
+      q(7462) => q(xpj),
+      q(7463) => q(xpk),
+      q(7464) => q(xpm),
+      q(7465) => q(xpn),
+      q(7466) => q(xpo),
+      q(7467) => q(xpp),
+      q(7468) => q(xpq),
+      q(7469) => q(xpr),
+      q(7470) => q(xps),
+      q(7471) => q(xpt),
+      q(7472) => q(xpu),
+      q(7473) => q(xpy),
+      q(7474) => q(xqa),
+      q(7475) => q(xqt),
+      q(7476) => q(xra),
+      q(7477) => q(xrb),
+      q(7478) => q(xrd),
+      q(7479) => q(xre),
+      q(7480) => q(xrg),
+      q(7481) => q(xri),
+      q(7482) => q(xrm),
+      q(7483) => q(xrn),
+      q(7484) => q(xrq),
+      q(7485) => q(xrr),
+      q(7486) => q(xrt),
+      q(7487) => q(xru),
+      q(7488) => q(xrw),
+      q(7489) => q(xsa),
+      q(7490) => q(xsb),
+      q(7491) => q(xsc),
+      q(7492) => q(xsd),
+      q(7493) => q(xse),
+      q(7494) => q(xsh),
+      q(7495) => q(xsi),
+      q(7496) => q(xsl),
+      q(7497) => q(xsm),
+      q(7498) => q(xsn),
+      q(7499) => q(xso),
+      q(7500) => q(xsp),
+      q(7501) => q(xsq),
+      q(7502) => q(xsr),
+      q(7503) => q(xss),
+      q(7504) => q(xsu),
+      q(7505) => q(xsv),
+      q(7506) => q(xsy),
+      q(7507) => q(xta),
+      q(7508) => q(xtb),
+      q(7509) => q(xtc),
+      q(7510) => q(xtd),
+      q(7511) => q(xte),
+      q(7512) => q(xtg),
+      q(7513) => q(xth),
+      q(7514) => q(xti),
+      q(7515) => q(xtj),
+      q(7516) => q(xtl),
+      q(7517) => q(xtm),
+      q(7518) => q(xtn),
+      q(7519) => q(xto),
+      q(7520) => q(xtp),
+      q(7521) => q(xtq),
+      q(7522) => q(xtr),
+      q(7523) => q(xts),
+      q(7524) => q(xtt),
+      q(7525) => q(xtu),
+      q(7526) => q(xtv),
+      q(7527) => q(xtw),
+      q(7528) => q(xty),
+      q(7529) => q(xtz),
+      q(7530) => q(xua),
+      q(7531) => q(xub),
+      q(7532) => q(xud),
+      q(7533) => q(xug),
+      q(7534) => q(xuj),
+      q(7535) => q(xul),
+      q(7536) => q(xum),
+      q(7537) => q(xun),
+      q(7538) => q(xuo),
+      q(7539) => q(xup),
+      q(7540) => q(xur),
+      q(7541) => q(xut),
+      q(7542) => q(xuu),
+      q(7543) => q(xve),
+      q(7544) => q(xvi),
+      q(7545) => q(xvn),
+      q(7546) => q(xvo),
+      q(7547) => q(xvs),
+      q(7548) => q(xwa),
+      q(7549) => q(xwc),
+      q(7550) => q(xwd),
+      q(7551) => q(xwe),
+      q(7552) => q(xwg),
+      q(7553) => q(xwj),
+      q(7554) => q(xwk),
+      q(7555) => q(xwl),
+      q(7556) => q(xwo),
+      q(7557) => q(xwr),
+      q(7558) => q(xwt),
+      q(7559) => q(xww),
+      q(7560) => q(xxb),
+      q(7561) => q(xxk),
+      q(7562) => q(xxm),
+      q(7563) => q(xxr),
+      q(7564) => q(xxt),
+      q(7565) => q(xya),
+      q(7566) => q(xyb),
+      q(7567) => q(xyj),
+      q(7568) => q(xyk),
+      q(7569) => q(xyl),
+      q(7570) => q(xyt),
+      q(7571) => q(xyy),
+      q(7572) => q(xzh),
+      q(7573) => q(xzm),
+      q(7574) => q(xzp),
+      q(7575) => q(yaa),
+      q(7576) => q(yab),
+      q(7577) => q(yac),
+      q(7578) => q(yad),
+      q(7579) => q(yae),
+      q(7580) => q(yaf),
+      q(7581) => q(yag),
+      q(7582) => q(yah),
+      q(7583) => q(yai),
+      q(7584) => q(yaj),
+      q(7585) => q(yak),
+      q(7586) => q(yal),
+      q(7587) => q(yam),
+      q(7588) => q(yan),
+      q(7589) => q(yaq),
+      q(7590) => q(yar),
+      q(7591) => q(yas),
+      q(7592) => q(yat),
+      q(7593) => q(yau),
+      q(7594) => q(yav),
+      q(7595) => q(yaw),
+      q(7596) => q(yax),
+      q(7597) => q(yay),
+      q(7598) => q(yaz),
+      q(7599) => q(yba),
+      q(7600) => q(ybb),
+      q(7601) => q(ybe),
+      q(7602) => q(ybh),
+      q(7603) => q(ybi),
+      q(7604) => q(ybj),
+      q(7605) => q(ybk),
+      q(7606) => q(ybl),
+      q(7607) => q(ybm),
+      q(7608) => q(ybn),
+      q(7609) => q(ybo),
+      q(7610) => q(ybx),
+      q(7611) => q(yby),
+      q(7612) => q(ych),
+      q(7613) => q(ycl),
+      q(7614) => q(ycn),
+      q(7615) => q(ycp),
+      q(7616) => q(yda),
+      q(7617) => q(ydd),
+      q(7618) => q(yde),
+      q(7619) => q(ydg),
+      q(7620) => q(ydk),
+      q(7621) => q(yea),
+      q(7622) => q(yec),
+      q(7623) => q(yee),
+      q(7624) => q(yei),
+      q(7625) => q(yej),
+      q(7626) => q(yel),
+      q(7627) => q(yer),
+      q(7628) => q(yes),
+      q(7629) => q(yet),
+      q(7630) => q(yeu),
+      q(7631) => q(yev),
+      q(7632) => q(yey),
+      q(7633) => q(yga),
+      q(7634) => q(ygi),
+      q(7635) => q(ygl),
+      q(7636) => q(ygm),
+      q(7637) => q(ygp),
+      q(7638) => q(ygr),
+      q(7639) => q(ygs),
+      q(7640) => q(ygu),
+      q(7641) => q(ygw),
+      q(7642) => q(yha),
+      q(7643) => q(yhd),
+      q(7644) => q(yhl),
+      q(7645) => q(yhs),
+      q(7646) => q(yia),
+      q(7647) => q(yig),
+      q(7648) => q(yih),
+      q(7649) => q(yii),
+      q(7650) => q(yij),
+      q(7651) => q(yik),
+      q(7652) => q(yil),
+      q(7653) => q(yim),
+      q(7654) => q(yin),
+      q(7655) => q(yip),
+      q(7656) => q(yiq),
+      q(7657) => q(yir),
+      q(7658) => q(yis),
+      q(7659) => q(yit),
+      q(7660) => q(yiu),
+      q(7661) => q(yiv),
+      q(7662) => q(yix),
+      q(7663) => q(yiz),
+      q(7664) => q(yka),
+      q(7665) => q(ykg),
+      q(7666) => q(yki),
+      q(7667) => q(ykk),
+      q(7668) => q(ykl),
+      q(7669) => q(ykm),
+      q(7670) => q(ykn),
+      q(7671) => q(yko),
+      q(7672) => q(ykr),
+      q(7673) => q(ykt),
+      q(7674) => q(yku),
+      q(7675) => q(yky),
+      q(7676) => q(yla),
+      q(7677) => q(ylb),
+      q(7678) => q(yle),
+      q(7679) => q(ylg),
+      q(7680) => q(yli),
+      q(7681) => q(yll),
+      q(7682) => q(ylm),
+      q(7683) => q(yln),
+      q(7684) => q(ylo),
+      q(7685) => q(ylr),
+      q(7686) => q(ylu),
+      q(7687) => q(yly),
+      q(7688) => q(ymb),
+      q(7689) => q(ymc),
+      q(7690) => q(ymd),
+      q(7691) => q(yme),
+      q(7692) => q(ymg),
+      q(7693) => q(ymh),
+      q(7694) => q(ymi),
+      q(7695) => q(ymk),
+      q(7696) => q(yml),
+      q(7697) => q(ymm),
+      q(7698) => q(ymn),
+      q(7699) => q(ymo),
+      q(7700) => q(ymp),
+      q(7701) => q(ymq),
+      q(7702) => q(ymr),
+      q(7703) => q(yms),
+      q(7704) => q(ymx),
+      q(7705) => q(ymz),
+      q(7706) => q(yna),
+      q(7707) => q(ynd),
+      q(7708) => q(yne),
+      q(7709) => q(yng),
+      q(7710) => q(ynk),
+      q(7711) => q(ynl),
+      q(7712) => q(ynn),
+      q(7713) => q(yno),
+      q(7714) => q(ynq),
+      q(7715) => q(yns),
+      q(7716) => q(ynu),
+      q(7717) => q(yob),
+      q(7718) => q(yog),
+      q(7719) => q(yoi),
+      q(7720) => q(yok),
+      q(7721) => q(yol),
+      q(7722) => q(yom),
+      q(7723) => q(yon),
+      q(7724) => q(yot),
+      q(7725) => q(yox),
+      q(7726) => q(yoy),
+      q(7727) => q(ypa),
+      q(7728) => q(ypb),
+      q(7729) => q(ypg),
+      q(7730) => q(yph),
+      q(7731) => q(ypm),
+      q(7732) => q(ypn),
+      q(7733) => q(ypo),
+      q(7734) => q(ypp),
+      q(7735) => q(ypz),
+      q(7736) => q(yra),
+      q(7737) => q(yrb),
+      q(7738) => q(yre),
+      q(7739) => q(yri),
+      q(7740) => q(yrk),
+      q(7741) => q(yrl),
+      q(7742) => q(yrm),
+      q(7743) => q(yrn),
+      q(7744) => q(yrs),
+      q(7745) => q(yrw),
+      q(7746) => q(yry),
+      q(7747) => q(ysc),
+      q(7748) => q(ysd),
+      q(7749) => q(ysg),
+      q(7750) => q(ysl),
+      q(7751) => q(ysn),
+      q(7752) => q(yso),
+      q(7753) => q(ysp),
+      q(7754) => q(ysr),
+      q(7755) => q(yss),
+      q(7756) => q(ysy),
+      q(7757) => q(yta),
+      q(7758) => q(ytl),
+      q(7759) => q(ytp),
+      q(7760) => q(ytw),
+      q(7761) => q(yty),
+      q(7762) => q(yua),
+      q(7763) => q(yub),
+      q(7764) => q(yuc),
+      q(7765) => q(yud),
+      q(7766) => q(yue),
+      q(7767) => q(yuf),
+      q(7768) => q(yug),
+      q(7769) => q(yui),
+      q(7770) => q(yuj),
+      q(7771) => q(yuk),
+      q(7772) => q(yul),
+      q(7773) => q(yum),
+      q(7774) => q(yun),
+      q(7775) => q(yup),
+      q(7776) => q(yuq),
+      q(7777) => q(yur),
+      q(7778) => q(yut),
+      q(7779) => q(yuw),
+      q(7780) => q(yux),
+      q(7781) => q(yuy),
+      q(7782) => q(yuz),
+      q(7783) => q(yva),
+      q(7784) => q(yvt),
+      q(7785) => q(ywa),
+      q(7786) => q(ywg),
+      q(7787) => q(ywl),
+      q(7788) => q(ywn),
+      q(7789) => q(ywq),
+      q(7790) => q(ywr),
+      q(7791) => q(ywt),
+      q(7792) => q(ywu),
+      q(7793) => q(yww),
+      q(7794) => q(yxa),
+      q(7795) => q(yxg),
+      q(7796) => q(yxl),
+      q(7797) => q(yxm),
+      q(7798) => q(yxu),
+      q(7799) => q(yxy),
+      q(7800) => q(yyr),
+      q(7801) => q(yyu),
+      q(7802) => q(yyz),
+      q(7803) => q(yzg),
+      q(7804) => q(yzk),
+      q(7805) => q(zaa),
+      q(7806) => q(zab),
+      q(7807) => q(zac),
+      q(7808) => q(zad),
+      q(7809) => q(zae),
+      q(7810) => q(zaf),
+      q(7811) => q(zag),
+      q(7812) => q(zah),
+      q(7813) => q(zai),
+      q(7814) => q(zaj),
+      q(7815) => q(zak),
+      q(7816) => q(zal),
+      q(7817) => q(zam),
+      q(7818) => q(zao),
+      q(7819) => q(zaq),
+      q(7820) => q(zar),
+      q(7821) => q(zas),
+      q(7822) => q(zat),
+      q(7823) => q(zau),
+      q(7824) => q(zav),
+      q(7825) => q(zaw),
+      q(7826) => q(zax),
+      q(7827) => q(zay),
+      q(7828) => q(zaz),
+      q(7829) => q(zbc),
+      q(7830) => q(zbe),
+      q(7831) => q(zbt),
+      q(7832) => q(zbw),
+      q(7833) => q(zca),
+      q(7834) => q(zch),
+      q(7835) => q(zdj),
+      q(7836) => q(zea),
+      q(7837) => q(zeg),
+      q(7838) => q(zeh),
+      q(7839) => q(zga),
+      q(7840) => q(zgb),
+      q(7841) => q(zgm),
+      q(7842) => q(zgn),
+      q(7843) => q(zgr),
+      q(7844) => q(zhb),
+      q(7845) => q(zhd),
+      q(7846) => q(zhi),
+      q(7847) => q(zhn),
+      q(7848) => q(zhw),
+      q(7849) => q(zia),
+      q(7850) => q(zib),
+      q(7851) => q(zik),
+      q(7852) => q(zil),
+      q(7853) => q(zim),
+      q(7854) => q(zin),
+      q(7855) => q(zir),
+      q(7856) => q(ziw),
+      q(7857) => q(ziz),
+      q(7858) => q(zka),
+      q(7859) => q(zkb),
+      q(7860) => q(zkd),
+      q(7861) => q(zkg),
+      q(7862) => q(zkh),
+      q(7863) => q(zkk),
+      q(7864) => q(zkn),
+      q(7865) => q(zko),
+      q(7866) => q(zkp),
+      q(7867) => q(zkr),
+      q(7868) => q(zkt),
+      q(7869) => q(zku),
+      q(7870) => q(zkv),
+      q(7871) => q(zkz),
+      q(7872) => q(zlj),
+      q(7873) => q(zlm),
+      q(7874) => q(zln),
+      q(7875) => q(zlq),
+      q(7876) => q(zma),
+      q(7877) => q(zmb),
+      q(7878) => q(zmc),
+      q(7879) => q(zmd),
+      q(7880) => q(zme),
+      q(7881) => q(zmf),
+      q(7882) => q(zmg),
+      q(7883) => q(zmh),
+      q(7884) => q(zmi),
+      q(7885) => q(zmj),
+      q(7886) => q(zmk),
+      q(7887) => q(zml),
+      q(7888) => q(zmm),
+      q(7889) => q(zmn),
+      q(7890) => q(zmo),
+      q(7891) => q(zmp),
+      q(7892) => q(zmq),
+      q(7893) => q(zmr),
+      q(7894) => q(zms),
+      q(7895) => q(zmt),
+      q(7896) => q(zmu),
+      q(7897) => q(zmv),
+      q(7898) => q(zmw),
+      q(7899) => q(zmx),
+      q(7900) => q(zmy),
+      q(7901) => q(zmz),
+      q(7902) => q(zna),
+      q(7903) => q(zne),
+      q(7904) => q(zng),
+      q(7905) => q(znk),
+      q(7906) => q(zns),
+      q(7907) => q(zoc),
+      q(7908) => q(zoh),
+      q(7909) => q(zom),
+      q(7910) => q(zoo),
+      q(7911) => q(zoq),
+      q(7912) => q(zor),
+      q(7913) => q(zos),
+      q(7914) => q(zpa),
+      q(7915) => q(zpb),
+      q(7916) => q(zpc),
+      q(7917) => q(zpd),
+      q(7918) => q(zpe),
+      q(7919) => q(zpf),
+      q(7920) => q(zpg),
+      q(7921) => q(zph),
+      q(7922) => q(zpi),
+      q(7923) => q(zpj),
+      q(7924) => q(zpk),
+      q(7925) => q(zpl),
+      q(7926) => q(zpm),
+      q(7927) => q(zpn),
+      q(7928) => q(zpo),
+      q(7929) => q(zpp),
+      q(7930) => q(zpq),
+      q(7931) => q(zpr),
+      q(7932) => q(zps),
+      q(7933) => q(zpt),
+      q(7934) => q(zpu),
+      q(7935) => q(zpv),
+      q(7936) => q(zpw),
+      q(7937) => q(zpx),
+      q(7938) => q(zpy),
+      q(7939) => q(zpz),
+      q(7940) => q(zqe),
+      q(7941) => q(zra),
+      q(7942) => q(zrg),
+      q(7943) => q(zrn),
+      q(7944) => q(zro),
+      q(7945) => q(zrp),
+      q(7946) => q(zrs),
+      q(7947) => q(zsa),
+      q(7948) => q(zsk),
+      q(7949) => q(zsl),
+      q(7950) => q(zsm),
+      q(7951) => q(zsr),
+      q(7952) => q(zsu),
+      q(7953) => q(zte),
+      q(7954) => q(ztg),
+      q(7955) => q(ztl),
+      q(7956) => q(ztm),
+      q(7957) => q(ztn),
+      q(7958) => q(ztp),
+      q(7959) => q(ztq),
+      q(7960) => q(zts),
+      q(7961) => q(ztt),
+      q(7962) => q(ztu),
+      q(7963) => q(ztx),
+      q(7964) => q(zty),
+      q(7965) => q(zua),
+      q(7966) => q(zuh),
+      q(7967) => q(zum),
+      q(7968) => q(zuy),
+      q(7969) => q(zwa),
+      q(7970) => q(zyb),
+      q(7971) => q(zyg),
+      q(7972) => q(zyj),
+      q(7973) => q(zyn),
+      q(7974) => q(zyp),
+      q(7975) => q(zzj),
       },
    q(term) => {
       q(0001) => q(aar),
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Language_Retired.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Language_Retired.pm
index 3bf73c5636a..98908dd486f 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Language_Retired.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Language_Retired.pm
@@ -3,7 +3,7 @@ Locale::Codes::Language_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Fri Feb 20 15:27:22 GMT 2015
+#    Generated on: Tue Dec  1 14:45:28 EST 2015
 
 use strict;
 require 5.006;
@@ -11,7 +11,7 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
 $Locale::Codes::Retired{'language'}{'alpha-2'}{'code'} = {
    q(in) => q(Indonesian),
@@ -185,6 +185,7 @@ $Locale::Codes::Retired{'language'}{'alpha-3'}{'name'} = {
    q(apalik) => [ q(apo), q(Apalik) ],
    q(aramanik) => [ q(aam), q(Aramanik) ],
    q(aromanian) => [ q(rup), q(Aromanian) ],
+   q(atong) => [ q(ato), q(Atong) ],
    q(ayi (china)) => [ q(ayx), q(Ayi (China)) ],
    q(bandjigali) => [ q(bjd), q(Bandjigali) ],
    q(bangi me) => [ q(dba), q(Bangi Me) ],
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Script.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Script.pm
index 94130a93988..b188cf072b0 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Script.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Script.pm
@@ -22,7 +22,7 @@ use Locale::Codes::Script_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.34';
+$VERSION='3.37';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2script
                 script2code
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Script.pod b/Master/tlpkg/tlperl/lib/Locale/Codes/Script.pod
index b62d148e9f4..e4e1d4053f1 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Script.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Script.pod
@@ -18,7 +18,7 @@ Locale::Codes::Script - standard codes for script identification
 
 =head1 DESCRIPTION
 
-The C<Locale::Codes::Script> module provides access to standards codes used
+This module provides access to standards codes used
 for identifying scripts, such as those defined in ISO 15924.
 
 Most of the routines take an optional additional argument which
@@ -61,33 +61,33 @@ for Phoenician.
 
 =over 4
 
-=item B<code2script ( CODE [,CODESET] [,'retired'])>
+=item B<code2script(CODE [,CODESET] [,'retired'])>
 
-=item B<script2code ( NAME [,CODESET] [,'retired'])>
+=item B<script2code(NAME [,CODESET] [,'retired'])>
 
-=item B<script_code2code ( CODE ,CODESET ,CODESET2 )>
+=item B<script_code2code(CODE ,CODESET ,CODESET2)>
 
-=item B<all_script_codes ( [CODESET] [,'retired'])>
+=item B<all_script_codes([CODESET] [,'retired'])>
 
-=item B<all_script_names ( [CODESET] [,'retired'])>
+=item B<all_script_names([CODESET] [,'retired'])>
 
-=item B<Locale::Codes::Script::rename_script  ( CODE ,NEW_NAME [,CODESET] )>
+=item B<Locale::Codes::Script::rename_script(CODE ,NEW_NAME [,CODESET])>
 
-=item B<Locale::Codes::Script::add_script  ( CODE ,NAME [,CODESET] )>
+=item B<Locale::Codes::Script::add_script(CODE ,NAME [,CODESET])>
 
-=item B<Locale::Codes::Script::delete_script  ( CODE [,CODESET] )>
+=item B<Locale::Codes::Script::delete_script(CODE [,CODESET])>
 
-=item B<Locale::Codes::Script::add_script_alias  ( NAME ,NEW_NAME )>
+=item B<Locale::Codes::Script::add_script_alias(NAME ,NEW_NAME)>
 
-=item B<Locale::Codes::Script::delete_script_alias  ( NAME )>
+=item B<Locale::Codes::Script::delete_script_alias(NAME)>
 
-=item B<Locale::Codes::Script::rename_script_code  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::Script::rename_script_code(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::Script::add_script_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Codes::Script::add_script_code_alias(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Codes::Script::delete_script_code_alias  ( CODE [,CODESET] )>
+=item B<Locale::Codes::Script::delete_script_code_alias(CODE [,CODESET])>
 
-These routines are all documented in the Locale::Codes::API man page.
+These routines are all documented in the L<Locale::Codes::API> man page.
 
 =back
 
@@ -95,19 +95,19 @@ These routines are all documented in the Locale::Codes::API man page.
 
 =over 4
 
-=item B<Locale::Codes>
+=item L<Locale::Codes>
 
 The Locale-Codes distribution.
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions supported by this module.
 
-=item B<http://www.unicode.org/iso15924/>
+=item L<http://www.unicode.org/iso15924/>
 
 Home page for ISO 15924.
 
-=item B<http://www.iana.org/assignments/language-subtag-registry>
+=item L<http://www.iana.org/assignments/language-subtag-registry>
 
 The IANA language subtag registry.
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Script_Codes.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Script_Codes.pm
index 1e8f0de691b..451a4e4b373 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Script_Codes.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Script_Codes.pm
@@ -3,7 +3,7 @@ Locale::Codes::Script_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'harvest_data' is run.
-#    Generated on: Thu Feb 19 20:50:29 GMT 2015
+#    Generated on: Tue Dec  1 14:44:11 EST 2015
 
 use strict;
 require 5.006;
@@ -11,9 +11,9 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
-$Locale::Codes::Data{'script'}{'id'} = '0173';
+$Locale::Codes::Data{'script'}{'id'} = '0175';
 
 $Locale::Codes::Data{'script'}{'id2names'} = {
    q(0001) => [
@@ -61,560 +61,566 @@ $Locale::Codes::Data{'script'}{'id2names'} = {
       q(Bengali),
       ],
    q(0015) => [
-      q(Blissymbols),
+      q(Bhaiksuki),
       ],
    q(0016) => [
-      q(Bopomofo),
+      q(Blissymbols),
       ],
    q(0017) => [
-      q(Brahmi),
+      q(Bopomofo),
       ],
    q(0018) => [
-      q(Braille),
+      q(Brahmi),
       ],
    q(0019) => [
-      q(Buginese),
+      q(Braille),
       ],
    q(0020) => [
-      q(Buhid),
+      q(Buginese),
       ],
    q(0021) => [
-      q(Chakma),
+      q(Buhid),
       ],
    q(0022) => [
-      q(Unified Canadian Aboriginal Syllabics),
+      q(Chakma),
       ],
    q(0023) => [
-      q(Carian),
+      q(Unified Canadian Aboriginal Syllabics),
       ],
    q(0024) => [
-      q(Cham),
+      q(Carian),
       ],
    q(0025) => [
-      q(Cherokee),
+      q(Cham),
       ],
    q(0026) => [
-      q(Cirth),
+      q(Cherokee),
       ],
    q(0027) => [
-      q(Coptic),
+      q(Cirth),
       ],
    q(0028) => [
-      q(Cypriot),
+      q(Coptic),
       ],
    q(0029) => [
-      q(Cyrillic),
+      q(Cypriot),
       ],
    q(0030) => [
-      q(Cyrillic (Old Church Slavonic variant)),
+      q(Cyrillic),
       ],
    q(0031) => [
+      q(Cyrillic (Old Church Slavonic variant)),
+      ],
+   q(0032) => [
       q(Devanagari (Nagari)),
       q(Devanagari),
       q(Nagari),
       ],
-   q(0032) => [
+   q(0033) => [
       q(Deseret (Mormon)),
       q(Deseret),
       q(Mormon),
       ],
-   q(0033) => [
+   q(0034) => [
       q(Duployan shorthand, Duployan stenography),
       q(Duployan shorthand),
       q(Duployan stenography),
       ],
-   q(0034) => [
+   q(0035) => [
       q(Egyptian demotic),
       ],
-   q(0035) => [
+   q(0036) => [
       q(Egyptian hieratic),
       ],
-   q(0036) => [
+   q(0037) => [
       q(Egyptian hieroglyphs),
       ],
-   q(0037) => [
+   q(0038) => [
       q(Elbasan),
       ],
-   q(0038) => [
+   q(0039) => [
       q(Ethiopic (Geez)),
       q(Ethiopic),
       q(Ge'ez),
       ],
-   q(0039) => [
+   q(0040) => [
       q(Khutsuri (Asomtavruli and Nuskhuri)),
       ],
-   q(0040) => [
+   q(0041) => [
       q(Georgian (Mkhedruli)),
       ],
-   q(0041) => [
+   q(0042) => [
       q(Glagolitic),
       ],
-   q(0042) => [
+   q(0043) => [
       q(Gothic),
       ],
-   q(0043) => [
+   q(0044) => [
       q(Grantha),
       ],
-   q(0044) => [
+   q(0045) => [
       q(Greek),
       ],
-   q(0045) => [
+   q(0046) => [
       q(Gujarati),
       ],
-   q(0046) => [
+   q(0047) => [
       q(Gurmukhi),
       ],
-   q(0047) => [
+   q(0048) => [
       q(Hangul (Hangul, Hangeul)),
       q(Hangul),
       q(Hangeul),
       ],
-   q(0048) => [
+   q(0049) => [
       q(Han (Hanzi, Kanji, Hanja)),
       q(Han),
       q(Hanzi),
       q(Kanji),
       q(Hanja),
       ],
-   q(0049) => [
+   q(0050) => [
       q(Hanunoo (Hanunoo)),
       q(Hanunoo),
       ],
-   q(0050) => [
+   q(0051) => [
       q(Han (Simplified variant)),
       ],
-   q(0051) => [
+   q(0052) => [
       q(Han (Traditional variant)),
       ],
-   q(0052) => [
+   q(0053) => [
       q(Hatran),
       ],
-   q(0053) => [
+   q(0054) => [
       q(Hebrew),
       ],
-   q(0054) => [
+   q(0055) => [
       q(Hiragana),
       ],
-   q(0055) => [
+   q(0056) => [
       q(Anatolian Hieroglyphs (Luwian Hieroglyphs, Hittite Hieroglyphs)),
       q(Anatolian Hieroglyphs),
       q(Luwian Hieroglyphs),
       q(Hittite Hieroglyphs),
       ],
-   q(0056) => [
+   q(0057) => [
       q(Pahawh Hmong),
       ],
-   q(0057) => [
+   q(0058) => [
       q(Japanese syllabaries (alias for Hiragana + Katakana)),
       ],
-   q(0058) => [
+   q(0059) => [
       q(Old Hungarian (Hungarian Runic)),
       q(Old Hungarian),
       q(Hungarian Runic),
       ],
-   q(0059) => [
+   q(0060) => [
       q(Indus (Harappan)),
       q(Indus),
       q(Harappan),
       ],
-   q(0060) => [
+   q(0061) => [
       q(Old Italic (Etruscan, Oscan, etc.)),
       ],
-   q(0061) => [
+   q(0062) => [
       q(Javanese),
       ],
-   q(0062) => [
+   q(0063) => [
       q(Japanese (alias for Han + Hiragana + Katakana)),
       ],
-   q(0063) => [
+   q(0064) => [
       q(Jurchen),
       ],
-   q(0064) => [
+   q(0065) => [
       q(Kayah Li),
       ],
-   q(0065) => [
+   q(0066) => [
       q(Katakana),
       ],
-   q(0066) => [
+   q(0067) => [
       q(Kharoshthi),
       ],
-   q(0067) => [
+   q(0068) => [
       q(Khmer),
       ],
-   q(0068) => [
+   q(0069) => [
       q(Khojki),
       ],
-   q(0069) => [
+   q(0070) => [
       q(Khitan large script),
       ],
-   q(0070) => [
+   q(0071) => [
       q(Khitan small script),
       ],
-   q(0071) => [
+   q(0072) => [
       q(Kannada),
       ],
-   q(0072) => [
+   q(0073) => [
       q(Korean (alias for Hangul + Han)),
       ],
-   q(0073) => [
+   q(0074) => [
       q(Kpelle),
       ],
-   q(0074) => [
+   q(0075) => [
       q(Kaithi),
       ],
-   q(0075) => [
+   q(0076) => [
       q(Tai Tham (Lanna)),
       q(Tai Tham),
       q(Lanna),
       ],
-   q(0076) => [
+   q(0077) => [
       q(Lao),
       ],
-   q(0077) => [
+   q(0078) => [
       q(Latin (Fraktur variant)),
       ],
-   q(0078) => [
+   q(0079) => [
       q(Latin (Gaelic variant)),
       ],
-   q(0079) => [
+   q(0080) => [
       q(Latin),
       ],
-   q(0080) => [
+   q(0081) => [
+      q(Leke),
+      ],
+   q(0082) => [
       q(Lepcha (Rong)),
       q(Lepcha),
       q(Rong),
       ],
-   q(0081) => [
+   q(0083) => [
       q(Limbu),
       ],
-   q(0082) => [
+   q(0084) => [
       q(Linear A),
       ],
-   q(0083) => [
+   q(0085) => [
       q(Linear B),
       ],
-   q(0084) => [
+   q(0086) => [
       q(Lisu (Fraser)),
       q(Lisu),
       q(Fraser),
       ],
-   q(0085) => [
+   q(0087) => [
       q(Loma),
       ],
-   q(0086) => [
+   q(0088) => [
       q(Lycian),
       ],
-   q(0087) => [
+   q(0089) => [
       q(Lydian),
       ],
-   q(0088) => [
+   q(0090) => [
       q(Mahajani),
       ],
-   q(0089) => [
+   q(0091) => [
       q(Mandaic, Mandaean),
       q(Mandaic),
       q(Mandaean),
       ],
-   q(0090) => [
+   q(0092) => [
       q(Manichaean),
       ],
-   q(0091) => [
+   q(0093) => [
       q(Marchen),
       ],
-   q(0092) => [
+   q(0094) => [
       q(Mayan hieroglyphs),
       ],
-   q(0093) => [
+   q(0095) => [
       q(Mende Kikakui),
       ],
-   q(0094) => [
+   q(0096) => [
       q(Meroitic Cursive),
       ],
-   q(0095) => [
+   q(0097) => [
       q(Meroitic Hieroglyphs),
       ],
-   q(0096) => [
+   q(0098) => [
       q(Malayalam),
       ],
-   q(0097) => [
+   q(0099) => [
       q(Modi, Modi),
       q(Modi),
       ],
-   q(0098) => [
+   q(0100) => [
       q(Mongolian),
       ],
-   q(0099) => [
+   q(0101) => [
       q(Moon (Moon code, Moon script, Moon type)),
       q(Moon),
       q(Moon code),
       q(Moon script),
       q(Moon type),
       ],
-   q(0100) => [
+   q(0102) => [
       q(Mro, Mru),
       q(Mro),
       q(Mru),
       ],
-   q(0101) => [
+   q(0103) => [
       q(Meitei Mayek (Meithei, Meetei)),
       q(Meitei Mayek),
       q(Meithei),
       q(Meetei),
       ],
-   q(0102) => [
+   q(0104) => [
       q(Multani),
       ],
-   q(0103) => [
+   q(0105) => [
       q(Myanmar (Burmese)),
       q(Myanmar),
       q(Burmese),
       ],
-   q(0104) => [
+   q(0106) => [
       q(Old North Arabian (Ancient North Arabian)),
       q(Old North Arabian),
       q(Ancient North Arabian),
       ],
-   q(0105) => [
+   q(0107) => [
       q(Nabataean),
       ],
-   q(0106) => [
+   q(0108) => [
       q(Nakhi Geba ('Na-'Khi Ggo-baw, Naxi Geba)),
       q(Nakhi Geba),
       q('Na-'Khi Ggo-baw),
       q(Naxi Geba),
       ],
-   q(0107) => [
+   q(0109) => [
       q(N'Ko),
       ],
-   q(0108) => [
+   q(0110) => [
       q(Nushu),
       ],
-   q(0109) => [
+   q(0111) => [
       q(Ogham),
       ],
-   q(0110) => [
+   q(0112) => [
       q(Ol Chiki (Ol Cemet, Ol, Santali)),
       q(Ol Chiki),
       q(Ol Cemet'),
       q(Ol),
       q(Santali),
       ],
-   q(0111) => [
+   q(0113) => [
       q(Old Turkic, Orkhon Runic),
       q(Old Turkic),
       q(Orkhon Runic),
       ],
-   q(0112) => [
+   q(0114) => [
       q(Oriya),
       ],
-   q(0113) => [
+   q(0115) => [
       q(Osage),
       ],
-   q(0114) => [
+   q(0116) => [
       q(Osmanya),
       ],
-   q(0115) => [
+   q(0117) => [
       q(Palmyrene),
       ],
-   q(0116) => [
+   q(0118) => [
       q(Pau Cin Hau),
       ],
-   q(0117) => [
+   q(0119) => [
       q(Old Permic),
       ],
-   q(0118) => [
+   q(0120) => [
       q(Phags-pa),
       ],
-   q(0119) => [
+   q(0121) => [
       q(Inscriptional Pahlavi),
       ],
-   q(0120) => [
+   q(0122) => [
       q(Psalter Pahlavi),
       ],
-   q(0121) => [
+   q(0123) => [
       q(Book Pahlavi),
       ],
-   q(0122) => [
+   q(0124) => [
       q(Phoenician),
       ],
-   q(0123) => [
+   q(0125) => [
       q(Miao (Pollard)),
       q(Miao),
       q(Pollard),
       ],
-   q(0124) => [
+   q(0126) => [
       q(Inscriptional Parthian),
       ],
-   q(0125) => [
+   q(0127) => [
       q(Reserved for private use (start)),
       ],
-   q(0126) => [
+   q(0128) => [
       q(Reserved for private use (end)),
       ],
-   q(0127) => [
+   q(0129) => [
       q(Rejang (Redjang, Kaganga)),
       q(Rejang),
       q(Redjang),
       q(Kaganga),
       ],
-   q(0128) => [
+   q(0130) => [
       q(Rongorongo),
       ],
-   q(0129) => [
+   q(0131) => [
       q(Runic),
       ],
-   q(0130) => [
+   q(0132) => [
       q(Samaritan),
       ],
-   q(0131) => [
+   q(0133) => [
       q(Sarati),
       ],
-   q(0132) => [
+   q(0134) => [
       q(Old South Arabian),
       ],
-   q(0133) => [
+   q(0135) => [
       q(Saurashtra),
       ],
-   q(0134) => [
+   q(0136) => [
       q(SignWriting),
       ],
-   q(0135) => [
+   q(0137) => [
       q(Shavian (Shaw)),
       q(Shavian),
       q(Shaw),
       ],
-   q(0136) => [
+   q(0138) => [
       q(Sharada, Sarada),
       q(Sharada),
       q(Sarada),
       ],
-   q(0137) => [
+   q(0139) => [
       q(Siddham, Siddham, Siddhamatrka),
       q(Siddham),
       q(Siddhamatrka),
       ],
-   q(0138) => [
+   q(0140) => [
       q(Khudawadi, Sindhi),
       q(Khudawadi),
       q(Sindhi),
       ],
-   q(0139) => [
+   q(0141) => [
       q(Sinhala),
       ],
-   q(0140) => [
+   q(0142) => [
       q(Sora Sompeng),
       ],
-   q(0141) => [
+   q(0143) => [
       q(Sundanese),
       ],
-   q(0142) => [
+   q(0144) => [
       q(Syloti Nagri),
       ],
-   q(0143) => [
+   q(0145) => [
       q(Syriac),
       ],
-   q(0144) => [
+   q(0146) => [
       q(Syriac (Estrangelo variant)),
       ],
-   q(0145) => [
+   q(0147) => [
       q(Syriac (Western variant)),
       ],
-   q(0146) => [
+   q(0148) => [
       q(Syriac (Eastern variant)),
       ],
-   q(0147) => [
+   q(0149) => [
       q(Tagbanwa),
       ],
-   q(0148) => [
+   q(0150) => [
       q(Takri, Takri, Tankri),
       q(Takri),
       q(Tankri),
       ],
-   q(0149) => [
+   q(0151) => [
       q(Tai Le),
       ],
-   q(0150) => [
+   q(0152) => [
       q(New Tai Lue),
       ],
-   q(0151) => [
+   q(0153) => [
       q(Tamil),
       ],
-   q(0152) => [
+   q(0154) => [
       q(Tangut),
       ],
-   q(0153) => [
+   q(0155) => [
       q(Tai Viet),
       ],
-   q(0154) => [
+   q(0156) => [
       q(Telugu),
       ],
-   q(0155) => [
+   q(0157) => [
       q(Tengwar),
       ],
-   q(0156) => [
+   q(0158) => [
       q(Tifinagh (Berber)),
       q(Tifinagh),
       q(Berber),
       ],
-   q(0157) => [
+   q(0159) => [
       q(Tagalog (Baybayin, Alibata)),
       q(Tagalog),
       q(Baybayin),
       q(Alibata),
       ],
-   q(0158) => [
+   q(0160) => [
       q(Thaana),
       ],
-   q(0159) => [
+   q(0161) => [
       q(Thai),
       ],
-   q(0160) => [
+   q(0162) => [
       q(Tibetan),
       ],
-   q(0161) => [
+   q(0163) => [
       q(Tirhuta),
       ],
-   q(0162) => [
+   q(0164) => [
       q(Ugaritic),
       ],
-   q(0163) => [
+   q(0165) => [
       q(Vai),
       ],
-   q(0164) => [
+   q(0166) => [
       q(Visible Speech),
       ],
-   q(0165) => [
+   q(0167) => [
       q(Warang Citi (Varang Kshiti)),
       q(Warang Citi),
       q(Varang Kshiti),
       ],
-   q(0166) => [
+   q(0168) => [
       q(Woleai),
       ],
-   q(0167) => [
+   q(0169) => [
       q(Old Persian),
       ],
-   q(0168) => [
+   q(0170) => [
       q(Cuneiform, Sumero-Akkadian),
       q(Sumero-Akkadian cuneiform),
       ],
-   q(0169) => [
+   q(0171) => [
       q(Yi),
       ],
-   q(0170) => [
+   q(0172) => [
       q(Code for inherited script),
       ],
-   q(0171) => [
+   q(0173) => [
       q(Mathematical notation),
       ],
-   q(0172) => [
+   q(0174) => [
       q(Symbols),
       ],
 };
 
 $Locale::Codes::Data{'script'}{'alias2id'} = {
    q('na-'khi ggo-baw) => [
-      q(0106),
+      q(0108),
       q(2),
       ],
    q(adlam) => [
@@ -634,19 +640,19 @@ $Locale::Codes::Data{'script'}{'alias2id'} = {
       q(0),
       ],
    q(alibata) => [
-      q(0157),
+      q(0159),
       q(3),
       ],
    q(anatolian hieroglyphs) => [
-      q(0055),
+      q(0056),
       q(1),
       ],
    q(anatolian hieroglyphs (luwian hieroglyphs, hittite hieroglyphs)) => [
-      q(0055),
+      q(0056),
       q(0),
       ],
    q(ancient north arabian) => [
-      q(0104),
+      q(0106),
       q(2),
       ],
    q(arabic) => [
@@ -682,7 +688,7 @@ $Locale::Codes::Data{'script'}{'alias2id'} = {
       q(0),
       ],
    q(baybayin) => [
-      q(0157),
+      q(0159),
       q(2),
       ],
    q(bengali) => [
@@ -690,43 +696,47 @@ $Locale::Codes::Data{'script'}{'alias2id'} = {
       q(0),
       ],
    q(berber) => [
-      q(0156),
+      q(0158),
       q(2),
       ],
-   q(blissymbols) => [
+   q(bhaiksuki) => [
       q(0015),
       q(0),
       ],
+   q(blissymbols) => [
+      q(0016),
+      q(0),
+      ],
    q(book pahlavi) => [
-      q(0121),
+      q(0123),
       q(0),
       ],
    q(bopomofo) => [
-      q(0016),
+      q(0017),
       q(0),
       ],
    q(brahmi) => [
-      q(0017),
+      q(0018),
       q(0),
       ],
    q(braille) => [
-      q(0018),
+      q(0019),
       q(0),
       ],
    q(buginese) => [
-      q(0019),
+      q(0020),
       q(0),
       ],
    q(buhid) => [
-      q(0020),
+      q(0021),
       q(0),
       ],
    q(burmese) => [
-      q(0103),
+      q(0105),
       q(2),
       ],
    q(carian) => [
-      q(0023),
+      q(0024),
       q(0),
       ],
    q(caucasian albanian) => [
@@ -734,199 +744,199 @@ $Locale::Codes::Data{'script'}{'alias2id'} = {
       q(0),
       ],
    q(chakma) => [
-      q(0021),
+      q(0022),
       q(0),
       ],
    q(cham) => [
-      q(0024),
+      q(0025),
       q(0),
       ],
    q(cherokee) => [
-      q(0025),
+      q(0026),
       q(0),
       ],
    q(cirth) => [
-      q(0026),
+      q(0027),
       q(0),
       ],
    q(code for inherited script) => [
-      q(0170),
+      q(0172),
       q(0),
       ],
    q(coptic) => [
-      q(0027),
+      q(0028),
       q(0),
       ],
    q(cuneiform, sumero-akkadian) => [
-      q(0168),
+      q(0170),
       q(0),
       ],
    q(cypriot) => [
-      q(0028),
+      q(0029),
       q(0),
       ],
    q(cyrillic) => [
-      q(0029),
+      q(0030),
       q(0),
       ],
    q(cyrillic (old church slavonic variant)) => [
-      q(0030),
+      q(0031),
       q(0),
       ],
    q(deseret) => [
-      q(0032),
+      q(0033),
       q(1),
       ],
    q(deseret (mormon)) => [
-      q(0032),
+      q(0033),
       q(0),
       ],
    q(devanagari) => [
-      q(0031),
+      q(0032),
       q(1),
       ],
    q(devanagari (nagari)) => [
-      q(0031),
+      q(0032),
       q(0),
       ],
    q(duployan shorthand) => [
-      q(0033),
+      q(0034),
       q(1),
       ],
    q(duployan shorthand, duployan stenography) => [
-      q(0033),
+      q(0034),
       q(0),
       ],
    q(duployan stenography) => [
-      q(0033),
+      q(0034),
       q(2),
       ],
    q(egyptian demotic) => [
-      q(0034),
+      q(0035),
       q(0),
       ],
    q(egyptian hieratic) => [
-      q(0035),
+      q(0036),
       q(0),
       ],
    q(egyptian hieroglyphs) => [
-      q(0036),
+      q(0037),
       q(0),
       ],
    q(elbasan) => [
-      q(0037),
+      q(0038),
       q(0),
       ],
    q(ethiopic) => [
-      q(0038),
+      q(0039),
       q(1),
       ],
    q(ethiopic (geez)) => [
-      q(0038),
+      q(0039),
       q(0),
       ],
    q(fraser) => [
-      q(0084),
+      q(0086),
       q(2),
       ],
    q(ge'ez) => [
-      q(0038),
+      q(0039),
       q(2),
       ],
    q(georgian (mkhedruli)) => [
-      q(0040),
+      q(0041),
       q(0),
       ],
    q(glagolitic) => [
-      q(0041),
+      q(0042),
       q(0),
       ],
    q(gothic) => [
-      q(0042),
+      q(0043),
       q(0),
       ],
    q(grantha) => [
-      q(0043),
+      q(0044),
       q(0),
       ],
    q(greek) => [
-      q(0044),
+      q(0045),
       q(0),
       ],
    q(gujarati) => [
-      q(0045),
+      q(0046),
       q(0),
       ],
    q(gurmukhi) => [
-      q(0046),
+      q(0047),
       q(0),
       ],
    q(han) => [
-      q(0048),
+      q(0049),
       q(1),
       ],
    q(han (hanzi, kanji, hanja)) => [
-      q(0048),
+      q(0049),
       q(0),
       ],
    q(han (simplified variant)) => [
-      q(0050),
+      q(0051),
       q(0),
       ],
    q(han (traditional variant)) => [
-      q(0051),
+      q(0052),
       q(0),
       ],
    q(hangeul) => [
-      q(0047),
+      q(0048),
       q(2),
       ],
    q(hangul) => [
-      q(0047),
+      q(0048),
       q(1),
       ],
    q(hangul (hangul, hangeul)) => [
-      q(0047),
+      q(0048),
       q(0),
       ],
    q(hanja) => [
-      q(0048),
+      q(0049),
       q(4),
       ],
    q(hanunoo) => [
-      q(0049),
+      q(0050),
       q(1),
       ],
    q(hanunoo (hanunoo)) => [
-      q(0049),
+      q(0050),
       q(0),
       ],
    q(hanzi) => [
-      q(0048),
+      q(0049),
       q(2),
       ],
    q(harappan) => [
-      q(0059),
+      q(0060),
       q(2),
       ],
    q(hatran) => [
-      q(0052),
+      q(0053),
       q(0),
       ],
    q(hebrew) => [
-      q(0053),
+      q(0054),
       q(0),
       ],
    q(hiragana) => [
-      q(0054),
+      q(0055),
       q(0),
       ],
    q(hittite hieroglyphs) => [
-      q(0055),
+      q(0056),
       q(3),
       ],
    q(hungarian runic) => [
-      q(0058),
+      q(0059),
       q(2),
       ],
    q(imperial aramaic) => [
@@ -934,575 +944,579 @@ $Locale::Codes::Data{'script'}{'alias2id'} = {
       q(0),
       ],
    q(indus) => [
-      q(0059),
+      q(0060),
       q(1),
       ],
    q(indus (harappan)) => [
-      q(0059),
+      q(0060),
       q(0),
       ],
    q(inscriptional pahlavi) => [
-      q(0119),
+      q(0121),
       q(0),
       ],
    q(inscriptional parthian) => [
-      q(0124),
+      q(0126),
       q(0),
       ],
    q(japanese (alias for han + hiragana + katakana)) => [
-      q(0062),
+      q(0063),
       q(0),
       ],
    q(japanese syllabaries (alias for hiragana + katakana)) => [
-      q(0057),
+      q(0058),
       q(0),
       ],
    q(javanese) => [
-      q(0061),
+      q(0062),
       q(0),
       ],
    q(jurchen) => [
-      q(0063),
+      q(0064),
       q(0),
       ],
    q(kaganga) => [
-      q(0127),
+      q(0129),
       q(3),
       ],
    q(kaithi) => [
-      q(0074),
+      q(0075),
       q(0),
       ],
    q(kanji) => [
-      q(0048),
+      q(0049),
       q(3),
       ],
    q(kannada) => [
-      q(0071),
+      q(0072),
       q(0),
       ],
    q(katakana) => [
-      q(0065),
+      q(0066),
       q(0),
       ],
    q(kayah li) => [
-      q(0064),
+      q(0065),
       q(0),
       ],
    q(kharoshthi) => [
-      q(0066),
+      q(0067),
       q(0),
       ],
    q(khitan large script) => [
-      q(0069),
+      q(0070),
       q(0),
       ],
    q(khitan small script) => [
-      q(0070),
+      q(0071),
       q(0),
       ],
    q(khmer) => [
-      q(0067),
+      q(0068),
       q(0),
       ],
    q(khojki) => [
-      q(0068),
+      q(0069),
       q(0),
       ],
    q(khudawadi) => [
-      q(0138),
+      q(0140),
       q(1),
       ],
    q(khudawadi, sindhi) => [
-      q(0138),
+      q(0140),
       q(0),
       ],
    q(khutsuri (asomtavruli and nuskhuri)) => [
-      q(0039),
+      q(0040),
       q(0),
       ],
    q(korean (alias for hangul + han)) => [
-      q(0072),
+      q(0073),
       q(0),
       ],
    q(kpelle) => [
-      q(0073),
+      q(0074),
       q(0),
       ],
    q(lanna) => [
-      q(0075),
+      q(0076),
       q(2),
       ],
    q(lao) => [
-      q(0076),
+      q(0077),
       q(0),
       ],
    q(latin) => [
-      q(0079),
+      q(0080),
       q(0),
       ],
    q(latin (fraktur variant)) => [
-      q(0077),
+      q(0078),
       q(0),
       ],
    q(latin (gaelic variant)) => [
-      q(0078),
+      q(0079),
+      q(0),
+      ],
+   q(leke) => [
+      q(0081),
       q(0),
       ],
    q(lepcha) => [
-      q(0080),
+      q(0082),
       q(1),
       ],
    q(lepcha (rong)) => [
-      q(0080),
+      q(0082),
       q(0),
       ],
    q(limbu) => [
-      q(0081),
+      q(0083),
       q(0),
       ],
    q(linear a) => [
-      q(0082),
+      q(0084),
       q(0),
       ],
    q(linear b) => [
-      q(0083),
+      q(0085),
       q(0),
       ],
    q(lisu) => [
-      q(0084),
+      q(0086),
       q(1),
       ],
    q(lisu (fraser)) => [
-      q(0084),
+      q(0086),
       q(0),
       ],
    q(loma) => [
-      q(0085),
+      q(0087),
       q(0),
       ],
    q(luwian hieroglyphs) => [
-      q(0055),
+      q(0056),
       q(2),
       ],
    q(lycian) => [
-      q(0086),
+      q(0088),
       q(0),
       ],
    q(lydian) => [
-      q(0087),
+      q(0089),
       q(0),
       ],
    q(mahajani) => [
-      q(0088),
+      q(0090),
       q(0),
       ],
    q(malayalam) => [
-      q(0096),
+      q(0098),
       q(0),
       ],
    q(mandaean) => [
-      q(0089),
+      q(0091),
       q(2),
       ],
    q(mandaic) => [
-      q(0089),
+      q(0091),
       q(1),
       ],
    q(mandaic, mandaean) => [
-      q(0089),
+      q(0091),
       q(0),
       ],
    q(manichaean) => [
-      q(0090),
+      q(0092),
       q(0),
       ],
    q(marchen) => [
-      q(0091),
+      q(0093),
       q(0),
       ],
    q(mathematical notation) => [
-      q(0171),
+      q(0173),
       q(0),
       ],
    q(mayan hieroglyphs) => [
-      q(0092),
+      q(0094),
       q(0),
       ],
    q(meetei) => [
-      q(0101),
+      q(0103),
       q(3),
       ],
    q(meitei mayek) => [
-      q(0101),
+      q(0103),
       q(1),
       ],
    q(meitei mayek (meithei, meetei)) => [
-      q(0101),
+      q(0103),
       q(0),
       ],
    q(meithei) => [
-      q(0101),
+      q(0103),
       q(2),
       ],
    q(mende kikakui) => [
-      q(0093),
+      q(0095),
       q(0),
       ],
    q(meroitic cursive) => [
-      q(0094),
+      q(0096),
       q(0),
       ],
    q(meroitic hieroglyphs) => [
-      q(0095),
+      q(0097),
       q(0),
       ],
    q(miao) => [
-      q(0123),
+      q(0125),
       q(1),
       ],
    q(miao (pollard)) => [
-      q(0123),
+      q(0125),
       q(0),
       ],
    q(modi) => [
-      q(0097),
+      q(0099),
       q(1),
       ],
    q(modi, modi) => [
-      q(0097),
+      q(0099),
       q(0),
       ],
    q(mongolian) => [
-      q(0098),
+      q(0100),
       q(0),
       ],
    q(moon) => [
-      q(0099),
+      q(0101),
       q(1),
       ],
    q(moon (moon code, moon script, moon type)) => [
-      q(0099),
+      q(0101),
       q(0),
       ],
    q(moon code) => [
-      q(0099),
+      q(0101),
       q(2),
       ],
    q(moon script) => [
-      q(0099),
+      q(0101),
       q(3),
       ],
    q(moon type) => [
-      q(0099),
+      q(0101),
       q(4),
       ],
    q(mormon) => [
-      q(0032),
+      q(0033),
       q(2),
       ],
    q(mro) => [
-      q(0100),
+      q(0102),
       q(1),
       ],
    q(mro, mru) => [
-      q(0100),
+      q(0102),
       q(0),
       ],
    q(mru) => [
-      q(0100),
+      q(0102),
       q(2),
       ],
    q(multani) => [
-      q(0102),
+      q(0104),
       q(0),
       ],
    q(myanmar) => [
-      q(0103),
+      q(0105),
       q(1),
       ],
    q(myanmar (burmese)) => [
-      q(0103),
+      q(0105),
       q(0),
       ],
    q(n'ko) => [
-      q(0107),
+      q(0109),
       q(0),
       ],
    q(nabataean) => [
-      q(0105),
+      q(0107),
       q(0),
       ],
    q(nagari) => [
-      q(0031),
+      q(0032),
       q(2),
       ],
    q(nakhi geba) => [
-      q(0106),
+      q(0108),
       q(1),
       ],
    q(nakhi geba ('na-'khi ggo-baw, naxi geba)) => [
-      q(0106),
+      q(0108),
       q(0),
       ],
    q(naxi geba) => [
-      q(0106),
+      q(0108),
       q(3),
       ],
    q(new tai lue) => [
-      q(0150),
+      q(0152),
       q(0),
       ],
    q(nushu) => [
-      q(0108),
+      q(0110),
       q(0),
       ],
    q(ogham) => [
-      q(0109),
+      q(0111),
       q(0),
       ],
    q(ol) => [
-      q(0110),
+      q(0112),
       q(3),
       ],
    q(ol cemet') => [
-      q(0110),
+      q(0112),
       q(2),
       ],
    q(ol chiki) => [
-      q(0110),
+      q(0112),
       q(1),
       ],
    q(ol chiki (ol cemet, ol, santali)) => [
-      q(0110),
+      q(0112),
       q(0),
       ],
    q(old hungarian) => [
-      q(0058),
+      q(0059),
       q(1),
       ],
    q(old hungarian (hungarian runic)) => [
-      q(0058),
+      q(0059),
       q(0),
       ],
    q(old italic (etruscan, oscan, etc.)) => [
-      q(0060),
+      q(0061),
       q(0),
       ],
    q(old north arabian) => [
-      q(0104),
+      q(0106),
       q(1),
       ],
    q(old north arabian (ancient north arabian)) => [
-      q(0104),
+      q(0106),
       q(0),
       ],
    q(old permic) => [
-      q(0117),
+      q(0119),
       q(0),
       ],
    q(old persian) => [
-      q(0167),
+      q(0169),
       q(0),
       ],
    q(old south arabian) => [
-      q(0132),
+      q(0134),
       q(0),
       ],
    q(old turkic) => [
-      q(0111),
+      q(0113),
       q(1),
       ],
    q(old turkic, orkhon runic) => [
-      q(0111),
+      q(0113),
       q(0),
       ],
    q(oriya) => [
-      q(0112),
+      q(0114),
       q(0),
       ],
    q(orkhon runic) => [
-      q(0111),
+      q(0113),
       q(2),
       ],
    q(osage) => [
-      q(0113),
+      q(0115),
       q(0),
       ],
    q(osmanya) => [
-      q(0114),
+      q(0116),
       q(0),
       ],
    q(pahawh hmong) => [
-      q(0056),
+      q(0057),
       q(0),
       ],
    q(palmyrene) => [
-      q(0115),
+      q(0117),
       q(0),
       ],
    q(pau cin hau) => [
-      q(0116),
+      q(0118),
       q(0),
       ],
    q(phags-pa) => [
-      q(0118),
+      q(0120),
       q(0),
       ],
    q(phoenician) => [
-      q(0122),
+      q(0124),
       q(0),
       ],
    q(pollard) => [
-      q(0123),
+      q(0125),
       q(2),
       ],
    q(psalter pahlavi) => [
-      q(0120),
+      q(0122),
       q(0),
       ],
    q(redjang) => [
-      q(0127),
+      q(0129),
       q(2),
       ],
    q(rejang) => [
-      q(0127),
+      q(0129),
       q(1),
       ],
    q(rejang (redjang, kaganga)) => [
-      q(0127),
+      q(0129),
       q(0),
       ],
    q(reserved for private use (end)) => [
-      q(0126),
+      q(0128),
       q(0),
       ],
    q(reserved for private use (start)) => [
-      q(0125),
+      q(0127),
       q(0),
       ],
    q(rong) => [
-      q(0080),
+      q(0082),
       q(2),
       ],
    q(rongorongo) => [
-      q(0128),
+      q(0130),
       q(0),
       ],
    q(runic) => [
-      q(0129),
+      q(0131),
       q(0),
       ],
    q(samaritan) => [
-      q(0130),
+      q(0132),
       q(0),
       ],
    q(santali) => [
-      q(0110),
+      q(0112),
       q(4),
       ],
    q(sarada) => [
-      q(0136),
+      q(0138),
       q(2),
       ],
    q(sarati) => [
-      q(0131),
+      q(0133),
       q(0),
       ],
    q(saurashtra) => [
-      q(0133),
+      q(0135),
       q(0),
       ],
    q(sharada) => [
-      q(0136),
+      q(0138),
       q(1),
       ],
    q(sharada, sarada) => [
-      q(0136),
+      q(0138),
       q(0),
       ],
    q(shavian) => [
-      q(0135),
+      q(0137),
       q(1),
       ],
    q(shavian (shaw)) => [
-      q(0135),
+      q(0137),
       q(0),
       ],
    q(shaw) => [
-      q(0135),
+      q(0137),
       q(2),
       ],
    q(siddham) => [
-      q(0137),
+      q(0139),
       q(1),
       ],
    q(siddham, siddham, siddhamatrka) => [
-      q(0137),
+      q(0139),
       q(0),
       ],
    q(siddhamatrka) => [
-      q(0137),
+      q(0139),
       q(2),
       ],
    q(signwriting) => [
-      q(0134),
+      q(0136),
       q(0),
       ],
    q(sindhi) => [
-      q(0138),
+      q(0140),
       q(2),
       ],
    q(sinhala) => [
-      q(0139),
+      q(0141),
       q(0),
       ],
    q(sora sompeng) => [
-      q(0140),
+      q(0142),
       q(0),
       ],
    q(sumero-akkadian cuneiform) => [
-      q(0168),
+      q(0170),
       q(1),
       ],
    q(sundanese) => [
-      q(0141),
+      q(0143),
       q(0),
       ],
    q(syloti nagri) => [
-      q(0142),
+      q(0144),
       q(0),
       ],
    q(symbols) => [
-      q(0172),
+      q(0174),
       q(0),
       ],
    q(syriac) => [
-      q(0143),
+      q(0145),
       q(0),
       ],
    q(syriac (eastern variant)) => [
-      q(0146),
+      q(0148),
       q(0),
       ],
    q(syriac (estrangelo variant)) => [
-      q(0144),
+      q(0146),
       q(0),
       ],
    q(syriac (western variant)) => [
-      q(0145),
+      q(0147),
       q(0),
       ],
    q(tagalog) => [
-      q(0157),
+      q(0159),
       q(1),
       ],
    q(tagalog (baybayin, alibata)) => [
-      q(0157),
+      q(0159),
       q(0),
       ],
    q(tagbanwa) => [
-      q(0147),
+      q(0149),
       q(0),
       ],
    q(tai ahom) => [
@@ -1510,107 +1524,107 @@ $Locale::Codes::Data{'script'}{'alias2id'} = {
       q(2),
       ],
    q(tai le) => [
-      q(0149),
+      q(0151),
       q(0),
       ],
    q(tai tham) => [
-      q(0075),
+      q(0076),
       q(1),
       ],
    q(tai tham (lanna)) => [
-      q(0075),
+      q(0076),
       q(0),
       ],
    q(tai viet) => [
-      q(0153),
+      q(0155),
       q(0),
       ],
    q(takri) => [
-      q(0148),
+      q(0150),
       q(1),
       ],
    q(takri, takri, tankri) => [
-      q(0148),
+      q(0150),
       q(0),
       ],
    q(tamil) => [
-      q(0151),
+      q(0153),
       q(0),
       ],
    q(tangut) => [
-      q(0152),
+      q(0154),
       q(0),
       ],
    q(tankri) => [
-      q(0148),
+      q(0150),
       q(2),
       ],
    q(telugu) => [
-      q(0154),
+      q(0156),
       q(0),
       ],
    q(tengwar) => [
-      q(0155),
+      q(0157),
       q(0),
       ],
    q(thaana) => [
-      q(0158),
+      q(0160),
       q(0),
       ],
    q(thai) => [
-      q(0159),
+      q(0161),
       q(0),
       ],
    q(tibetan) => [
-      q(0160),
+      q(0162),
       q(0),
       ],
    q(tifinagh) => [
-      q(0156),
+      q(0158),
       q(1),
       ],
    q(tifinagh (berber)) => [
-      q(0156),
+      q(0158),
       q(0),
       ],
    q(tirhuta) => [
-      q(0161),
+      q(0163),
       q(0),
       ],
    q(ugaritic) => [
-      q(0162),
+      q(0164),
       q(0),
       ],
    q(unified canadian aboriginal syllabics) => [
-      q(0022),
+      q(0023),
       q(0),
       ],
    q(vai) => [
-      q(0163),
+      q(0165),
       q(0),
       ],
    q(varang kshiti) => [
-      q(0165),
+      q(0167),
       q(2),
       ],
    q(visible speech) => [
-      q(0164),
+      q(0166),
       q(0),
       ],
    q(warang citi) => [
-      q(0165),
+      q(0167),
       q(1),
       ],
    q(warang citi (varang kshiti)) => [
-      q(0165),
+      q(0167),
       q(0),
       ],
    q(woleai) => [
-      q(0166),
+      q(0168),
       q(0),
       ],
    q(yi) => [
-      q(0169),
+      q(0171),
       q(0),
       ],
 };
@@ -1673,706 +1687,714 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0014),
          q(0),
          ],
-      q(Blis) => [
+      q(Bhks) => [
          q(0015),
          q(0),
          ],
-      q(Bopo) => [
+      q(Blis) => [
          q(0016),
          q(0),
          ],
-      q(Brah) => [
+      q(Bopo) => [
          q(0017),
          q(0),
          ],
-      q(Brai) => [
+      q(Brah) => [
          q(0018),
          q(0),
          ],
-      q(Bugi) => [
+      q(Brai) => [
          q(0019),
          q(0),
          ],
-      q(Buhd) => [
+      q(Bugi) => [
          q(0020),
          q(0),
          ],
-      q(Cakm) => [
+      q(Buhd) => [
          q(0021),
          q(0),
          ],
-      q(Cans) => [
+      q(Cakm) => [
          q(0022),
          q(0),
          ],
-      q(Cari) => [
+      q(Cans) => [
          q(0023),
          q(0),
          ],
-      q(Cham) => [
+      q(Cari) => [
          q(0024),
          q(0),
          ],
-      q(Cher) => [
+      q(Cham) => [
          q(0025),
          q(0),
          ],
-      q(Cirt) => [
+      q(Cher) => [
          q(0026),
          q(0),
          ],
-      q(Copt) => [
+      q(Cirt) => [
          q(0027),
          q(0),
          ],
-      q(Cprt) => [
+      q(Copt) => [
          q(0028),
          q(0),
          ],
-      q(Cyrl) => [
+      q(Cprt) => [
          q(0029),
          q(0),
          ],
-      q(Cyrs) => [
+      q(Cyrl) => [
          q(0030),
          q(0),
          ],
-      q(Deva) => [
+      q(Cyrs) => [
          q(0031),
+         q(0),
+         ],
+      q(Deva) => [
+         q(0032),
          q(1),
          ],
       q(Dsrt) => [
-         q(0032),
+         q(0033),
          q(1),
          ],
       q(Dupl) => [
-         q(0033),
+         q(0034),
          q(1),
          ],
       q(Egyd) => [
-         q(0034),
+         q(0035),
          q(0),
          ],
       q(Egyh) => [
-         q(0035),
+         q(0036),
          q(0),
          ],
       q(Egyp) => [
-         q(0036),
+         q(0037),
          q(0),
          ],
       q(Elba) => [
-         q(0037),
+         q(0038),
          q(0),
          ],
       q(Ethi) => [
-         q(0038),
+         q(0039),
          q(1),
          ],
       q(Geok) => [
-         q(0039),
+         q(0040),
          q(0),
          ],
       q(Geor) => [
-         q(0040),
+         q(0041),
          q(0),
          ],
       q(Glag) => [
-         q(0041),
+         q(0042),
          q(0),
          ],
       q(Goth) => [
-         q(0042),
+         q(0043),
          q(0),
          ],
       q(Gran) => [
-         q(0043),
+         q(0044),
          q(0),
          ],
       q(Grek) => [
-         q(0044),
+         q(0045),
          q(0),
          ],
       q(Gujr) => [
-         q(0045),
+         q(0046),
          q(0),
          ],
       q(Guru) => [
-         q(0046),
+         q(0047),
          q(0),
          ],
       q(Hang) => [
-         q(0047),
+         q(0048),
          q(1),
          ],
       q(Hani) => [
-         q(0048),
+         q(0049),
          q(1),
          ],
       q(Hano) => [
-         q(0049),
+         q(0050),
          q(1),
          ],
       q(Hans) => [
-         q(0050),
+         q(0051),
          q(0),
          ],
       q(Hant) => [
-         q(0051),
+         q(0052),
          q(0),
          ],
       q(Hatr) => [
-         q(0052),
+         q(0053),
          q(0),
          ],
       q(Hebr) => [
-         q(0053),
+         q(0054),
          q(0),
          ],
       q(Hira) => [
-         q(0054),
+         q(0055),
          q(0),
          ],
       q(Hluw) => [
-         q(0055),
+         q(0056),
          q(1),
          ],
       q(Hmng) => [
-         q(0056),
+         q(0057),
          q(0),
          ],
       q(Hrkt) => [
-         q(0057),
+         q(0058),
          q(0),
          ],
       q(Hung) => [
-         q(0058),
+         q(0059),
          q(1),
          ],
       q(Inds) => [
-         q(0059),
+         q(0060),
          q(1),
          ],
       q(Ital) => [
-         q(0060),
+         q(0061),
          q(0),
          ],
       q(Java) => [
-         q(0061),
+         q(0062),
          q(0),
          ],
       q(Jpan) => [
-         q(0062),
+         q(0063),
          q(0),
          ],
       q(Jurc) => [
-         q(0063),
+         q(0064),
          q(0),
          ],
       q(Kali) => [
-         q(0064),
+         q(0065),
          q(0),
          ],
       q(Kana) => [
-         q(0065),
+         q(0066),
          q(0),
          ],
       q(Khar) => [
-         q(0066),
+         q(0067),
          q(0),
          ],
       q(Khmr) => [
-         q(0067),
+         q(0068),
          q(0),
          ],
       q(Khoj) => [
-         q(0068),
+         q(0069),
          q(0),
          ],
       q(Kitl) => [
-         q(0069),
+         q(0070),
          q(0),
          ],
       q(Kits) => [
-         q(0070),
+         q(0071),
          q(0),
          ],
       q(Knda) => [
-         q(0071),
+         q(0072),
          q(0),
          ],
       q(Kore) => [
-         q(0072),
+         q(0073),
          q(0),
          ],
       q(Kpel) => [
-         q(0073),
+         q(0074),
          q(0),
          ],
       q(Kthi) => [
-         q(0074),
+         q(0075),
          q(0),
          ],
       q(Lana) => [
-         q(0075),
+         q(0076),
          q(1),
          ],
       q(Laoo) => [
-         q(0076),
+         q(0077),
          q(0),
          ],
       q(Latf) => [
-         q(0077),
+         q(0078),
          q(0),
          ],
       q(Latg) => [
-         q(0078),
+         q(0079),
          q(0),
          ],
       q(Latn) => [
-         q(0079),
+         q(0080),
+         q(0),
+         ],
+      q(Leke) => [
+         q(0081),
          q(0),
          ],
       q(Lepc) => [
-         q(0080),
+         q(0082),
          q(1),
          ],
       q(Limb) => [
-         q(0081),
+         q(0083),
          q(0),
          ],
       q(Lina) => [
-         q(0082),
+         q(0084),
          q(0),
          ],
       q(Linb) => [
-         q(0083),
+         q(0085),
          q(0),
          ],
       q(Lisu) => [
-         q(0084),
+         q(0086),
          q(1),
          ],
       q(Loma) => [
-         q(0085),
+         q(0087),
          q(0),
          ],
       q(Lyci) => [
-         q(0086),
+         q(0088),
          q(0),
          ],
       q(Lydi) => [
-         q(0087),
+         q(0089),
          q(0),
          ],
       q(Mahj) => [
-         q(0088),
+         q(0090),
          q(0),
          ],
       q(Mand) => [
-         q(0089),
+         q(0091),
          q(1),
          ],
       q(Mani) => [
-         q(0090),
+         q(0092),
          q(0),
          ],
       q(Marc) => [
-         q(0091),
+         q(0093),
          q(0),
          ],
       q(Maya) => [
-         q(0092),
+         q(0094),
          q(0),
          ],
       q(Mend) => [
-         q(0093),
+         q(0095),
          q(0),
          ],
       q(Merc) => [
-         q(0094),
+         q(0096),
          q(0),
          ],
       q(Mero) => [
-         q(0095),
+         q(0097),
          q(0),
          ],
       q(Mlym) => [
-         q(0096),
+         q(0098),
          q(0),
          ],
       q(Modi) => [
-         q(0097),
+         q(0099),
          q(1),
          ],
       q(Mong) => [
-         q(0098),
+         q(0100),
          q(0),
          ],
       q(Moon) => [
-         q(0099),
+         q(0101),
          q(1),
          ],
       q(Mroo) => [
-         q(0100),
+         q(0102),
          q(1),
          ],
       q(Mtei) => [
-         q(0101),
+         q(0103),
          q(1),
          ],
       q(Mult) => [
-         q(0102),
+         q(0104),
          q(0),
          ],
       q(Mymr) => [
-         q(0103),
+         q(0105),
          q(1),
          ],
       q(Narb) => [
-         q(0104),
+         q(0106),
          q(1),
          ],
       q(Nbat) => [
-         q(0105),
+         q(0107),
          q(0),
          ],
       q(Nkgb) => [
-         q(0106),
+         q(0108),
          q(1),
          ],
       q(Nkoo) => [
-         q(0107),
+         q(0109),
          q(0),
          ],
       q(Nshu) => [
-         q(0108),
+         q(0110),
          q(0),
          ],
       q(Ogam) => [
-         q(0109),
+         q(0111),
          q(0),
          ],
       q(Olck) => [
-         q(0110),
+         q(0112),
          q(1),
          ],
       q(Orkh) => [
-         q(0111),
+         q(0113),
          q(1),
          ],
       q(Orya) => [
-         q(0112),
+         q(0114),
          q(0),
          ],
       q(Osge) => [
-         q(0113),
+         q(0115),
          q(0),
          ],
       q(Osma) => [
-         q(0114),
+         q(0116),
          q(0),
          ],
       q(Palm) => [
-         q(0115),
+         q(0117),
          q(0),
          ],
       q(Pauc) => [
-         q(0116),
+         q(0118),
          q(0),
          ],
       q(Perm) => [
-         q(0117),
+         q(0119),
          q(0),
          ],
       q(Phag) => [
-         q(0118),
+         q(0120),
          q(0),
          ],
       q(Phli) => [
-         q(0119),
+         q(0121),
          q(0),
          ],
       q(Phlp) => [
-         q(0120),
+         q(0122),
          q(0),
          ],
       q(Phlv) => [
-         q(0121),
+         q(0123),
          q(0),
          ],
       q(Phnx) => [
-         q(0122),
+         q(0124),
          q(0),
          ],
       q(Plrd) => [
-         q(0123),
+         q(0125),
          q(1),
          ],
       q(Prti) => [
-         q(0124),
+         q(0126),
          q(0),
          ],
       q(Qaaa) => [
-         q(0125),
+         q(0127),
          q(0),
          ],
       q(Qabx) => [
-         q(0126),
+         q(0128),
          q(0),
          ],
       q(Rjng) => [
-         q(0127),
+         q(0129),
          q(1),
          ],
       q(Roro) => [
-         q(0128),
+         q(0130),
          q(0),
          ],
       q(Runr) => [
-         q(0129),
+         q(0131),
          q(0),
          ],
       q(Samr) => [
-         q(0130),
+         q(0132),
          q(0),
          ],
       q(Sara) => [
-         q(0131),
+         q(0133),
          q(0),
          ],
       q(Sarb) => [
-         q(0132),
+         q(0134),
          q(0),
          ],
       q(Saur) => [
-         q(0133),
+         q(0135),
          q(0),
          ],
       q(Sgnw) => [
-         q(0134),
+         q(0136),
          q(0),
          ],
       q(Shaw) => [
-         q(0135),
+         q(0137),
          q(1),
          ],
       q(Shrd) => [
-         q(0136),
+         q(0138),
          q(1),
          ],
       q(Sidd) => [
-         q(0137),
+         q(0139),
          q(1),
          ],
       q(Sind) => [
-         q(0138),
+         q(0140),
          q(1),
          ],
       q(Sinh) => [
-         q(0139),
+         q(0141),
          q(0),
          ],
       q(Sora) => [
-         q(0140),
+         q(0142),
          q(0),
          ],
       q(Sund) => [
-         q(0141),
+         q(0143),
          q(0),
          ],
       q(Sylo) => [
-         q(0142),
+         q(0144),
          q(0),
          ],
       q(Syrc) => [
-         q(0143),
+         q(0145),
          q(0),
          ],
       q(Syre) => [
-         q(0144),
+         q(0146),
          q(0),
          ],
       q(Syrj) => [
-         q(0145),
+         q(0147),
          q(0),
          ],
       q(Syrn) => [
-         q(0146),
+         q(0148),
          q(0),
          ],
       q(Tagb) => [
-         q(0147),
+         q(0149),
          q(0),
          ],
       q(Takr) => [
-         q(0148),
+         q(0150),
          q(1),
          ],
       q(Tale) => [
-         q(0149),
+         q(0151),
          q(0),
          ],
       q(Talu) => [
-         q(0150),
+         q(0152),
          q(0),
          ],
       q(Taml) => [
-         q(0151),
+         q(0153),
          q(0),
          ],
       q(Tang) => [
-         q(0152),
+         q(0154),
          q(0),
          ],
       q(Tavt) => [
-         q(0153),
+         q(0155),
          q(0),
          ],
       q(Telu) => [
-         q(0154),
+         q(0156),
          q(0),
          ],
       q(Teng) => [
-         q(0155),
+         q(0157),
          q(0),
          ],
       q(Tfng) => [
-         q(0156),
+         q(0158),
          q(1),
          ],
       q(Tglg) => [
-         q(0157),
+         q(0159),
          q(1),
          ],
       q(Thaa) => [
-         q(0158),
+         q(0160),
          q(0),
          ],
       q(Thai) => [
-         q(0159),
+         q(0161),
          q(0),
          ],
       q(Tibt) => [
-         q(0160),
+         q(0162),
          q(0),
          ],
       q(Tirh) => [
-         q(0161),
+         q(0163),
          q(0),
          ],
       q(Ugar) => [
-         q(0162),
+         q(0164),
          q(0),
          ],
       q(Vaii) => [
-         q(0163),
+         q(0165),
          q(0),
          ],
       q(Visp) => [
-         q(0164),
+         q(0166),
          q(0),
          ],
       q(Wara) => [
-         q(0165),
+         q(0167),
          q(1),
          ],
       q(Wole) => [
-         q(0166),
+         q(0168),
          q(0),
          ],
       q(Xpeo) => [
-         q(0167),
+         q(0169),
          q(0),
          ],
       q(Xsux) => [
-         q(0168),
+         q(0170),
          q(1),
          ],
       q(Yiii) => [
-         q(0169),
+         q(0171),
          q(0),
          ],
       q(Zinh) => [
-         q(0170),
+         q(0172),
          q(0),
          ],
       q(Zmth) => [
-         q(0171),
+         q(0173),
          q(0),
          ],
       q(Zsym) => [
-         q(0172),
+         q(0174),
          q(0),
          ],
       },
    q(num) => {
       q(020) => [
-         q(0168),
+         q(0170),
          q(0),
          ],
       q(030) => [
-         q(0167),
+         q(0169),
          q(0),
          ],
       q(040) => [
-         q(0162),
+         q(0164),
          q(0),
          ],
       q(050) => [
-         q(0036),
+         q(0037),
          q(0),
          ],
       q(060) => [
-         q(0035),
+         q(0036),
          q(0),
          ],
       q(070) => [
-         q(0034),
+         q(0035),
          q(0),
          ],
       q(080) => [
-         q(0055),
+         q(0056),
          q(0),
          ],
       q(090) => [
-         q(0092),
+         q(0094),
          q(0),
          ],
       q(095) => [
-         q(0134),
+         q(0136),
          q(0),
          ],
       q(100) => [
-         q(0095),
+         q(0097),
          q(0),
          ],
       q(101) => [
-         q(0094),
+         q(0096),
          q(0),
          ],
       q(105) => [
-         q(0132),
+         q(0134),
          q(0),
          ],
       q(106) => [
-         q(0104),
+         q(0106),
          q(0),
          ],
       q(115) => [
-         q(0122),
+         q(0124),
          q(0),
          ],
       q(116) => [
-         q(0087),
+         q(0089),
          q(0),
          ],
       q(120) => [
-         q(0156),
+         q(0158),
          q(0),
          ],
       q(123) => [
-         q(0130),
+         q(0132),
          q(0),
          ],
       q(124) => [
@@ -2380,31 +2402,31 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(125) => [
-         q(0053),
+         q(0054),
          q(0),
          ],
       q(126) => [
-         q(0115),
+         q(0117),
          q(0),
          ],
       q(127) => [
-         q(0052),
+         q(0053),
          q(0),
          ],
       q(130) => [
-         q(0124),
+         q(0126),
          q(0),
          ],
       q(131) => [
-         q(0119),
+         q(0121),
          q(0),
          ],
       q(132) => [
-         q(0120),
+         q(0122),
          q(0),
          ],
       q(133) => [
-         q(0121),
+         q(0123),
          q(0),
          ],
       q(134) => [
@@ -2412,35 +2434,35 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(135) => [
-         q(0143),
+         q(0145),
          q(0),
          ],
       q(136) => [
-         q(0146),
+         q(0148),
          q(0),
          ],
       q(137) => [
-         q(0145),
+         q(0147),
          q(0),
          ],
       q(138) => [
-         q(0144),
+         q(0146),
          q(0),
          ],
       q(139) => [
-         q(0090),
+         q(0092),
          q(0),
          ],
       q(140) => [
-         q(0089),
+         q(0091),
          q(0),
          ],
       q(145) => [
-         q(0098),
+         q(0100),
          q(0),
          ],
       q(159) => [
-         q(0105),
+         q(0107),
          q(0),
          ],
       q(160) => [
@@ -2452,7 +2474,7 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(165) => [
-         q(0107),
+         q(0109),
          q(0),
          ],
       q(166) => [
@@ -2460,91 +2482,91 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(170) => [
-         q(0158),
+         q(0160),
          q(0),
          ],
       q(175) => [
-         q(0111),
+         q(0113),
          q(0),
          ],
       q(176) => [
-         q(0058),
+         q(0059),
          q(0),
          ],
       q(199) => [
-         q(0100),
+         q(0102),
          q(0),
          ],
       q(200) => [
-         q(0044),
+         q(0045),
          q(0),
          ],
       q(201) => [
-         q(0023),
+         q(0024),
          q(0),
          ],
       q(202) => [
-         q(0086),
+         q(0088),
          q(0),
          ],
       q(204) => [
-         q(0027),
+         q(0028),
          q(0),
          ],
       q(206) => [
-         q(0042),
+         q(0043),
          q(0),
          ],
       q(210) => [
-         q(0060),
+         q(0061),
          q(0),
          ],
       q(211) => [
-         q(0129),
+         q(0131),
          q(0),
          ],
       q(212) => [
-         q(0109),
+         q(0111),
          q(0),
          ],
       q(215) => [
-         q(0079),
+         q(0080),
          q(0),
          ],
       q(216) => [
-         q(0078),
+         q(0079),
          q(0),
          ],
       q(217) => [
-         q(0077),
+         q(0078),
          q(0),
          ],
       q(218) => [
-         q(0099),
+         q(0101),
          q(0),
          ],
       q(219) => [
-         q(0113),
+         q(0115),
          q(0),
          ],
       q(220) => [
-         q(0029),
+         q(0030),
          q(0),
          ],
       q(221) => [
-         q(0030),
+         q(0031),
          q(0),
          ],
       q(225) => [
-         q(0041),
+         q(0042),
          q(0),
          ],
       q(226) => [
-         q(0037),
+         q(0038),
          q(0),
          ],
       q(227) => [
-         q(0117),
+         q(0119),
          q(0),
          ],
       q(230) => [
@@ -2556,15 +2578,15 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(240) => [
-         q(0040),
+         q(0041),
          q(0),
          ],
       q(241) => [
-         q(0039),
+         q(0040),
          q(0),
          ],
       q(250) => [
-         q(0032),
+         q(0033),
          q(0),
          ],
       q(259) => [
@@ -2572,119 +2594,119 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(260) => [
-         q(0114),
+         q(0116),
          q(0),
          ],
       q(261) => [
-         q(0110),
+         q(0112),
          q(0),
          ],
       q(262) => [
-         q(0165),
+         q(0167),
          q(0),
          ],
       q(263) => [
-         q(0116),
+         q(0118),
          q(0),
          ],
       q(280) => [
-         q(0164),
+         q(0166),
          q(0),
          ],
       q(281) => [
-         q(0135),
+         q(0137),
          q(0),
          ],
       q(282) => [
-         q(0123),
+         q(0125),
          q(0),
          ],
       q(285) => [
-         q(0016),
+         q(0017),
          q(0),
          ],
       q(286) => [
-         q(0047),
+         q(0048),
          q(0),
          ],
       q(287) => [
-         q(0072),
+         q(0073),
          q(0),
          ],
       q(288) => [
-         q(0070),
+         q(0071),
          q(0),
          ],
       q(290) => [
-         q(0155),
+         q(0157),
          q(0),
          ],
       q(291) => [
-         q(0026),
+         q(0027),
          q(0),
          ],
       q(292) => [
-         q(0131),
+         q(0133),
          q(0),
          ],
       q(300) => [
-         q(0017),
+         q(0018),
          q(0),
          ],
       q(302) => [
-         q(0137),
+         q(0139),
          q(0),
          ],
       q(305) => [
-         q(0066),
+         q(0067),
          q(0),
          ],
       q(310) => [
-         q(0046),
+         q(0047),
          q(0),
          ],
       q(314) => [
-         q(0088),
+         q(0090),
          q(0),
          ],
       q(315) => [
-         q(0031),
+         q(0032),
          q(0),
          ],
       q(316) => [
-         q(0142),
+         q(0144),
          q(0),
          ],
       q(317) => [
-         q(0074),
+         q(0075),
          q(0),
          ],
       q(318) => [
-         q(0138),
+         q(0140),
          q(0),
          ],
       q(319) => [
-         q(0136),
+         q(0138),
          q(0),
          ],
       q(320) => [
-         q(0045),
+         q(0046),
          q(0),
          ],
       q(321) => [
-         q(0148),
+         q(0150),
          q(0),
          ],
       q(322) => [
-         q(0068),
+         q(0069),
          q(0),
          ],
       q(323) => [
-         q(0102),
+         q(0104),
          q(0),
          ],
       q(324) => [
-         q(0097),
+         q(0099),
          q(0),
          ],
       q(325) => [
@@ -2692,35 +2714,39 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(326) => [
-         q(0161),
+         q(0163),
          q(0),
          ],
       q(327) => [
-         q(0112),
+         q(0114),
          q(0),
          ],
       q(330) => [
-         q(0160),
+         q(0162),
          q(0),
          ],
       q(331) => [
-         q(0118),
+         q(0120),
          q(0),
          ],
       q(332) => [
-         q(0091),
+         q(0093),
+         q(0),
+         ],
+      q(334) => [
+         q(0015),
          q(0),
          ],
       q(335) => [
-         q(0080),
+         q(0082),
          q(0),
          ],
       q(336) => [
-         q(0081),
+         q(0083),
          q(0),
          ],
       q(337) => [
-         q(0101),
+         q(0103),
          q(0),
          ],
       q(338) => [
@@ -2728,75 +2754,75 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(340) => [
-         q(0154),
+         q(0156),
          q(0),
          ],
       q(343) => [
-         q(0043),
+         q(0044),
          q(0),
          ],
       q(344) => [
-         q(0133),
+         q(0135),
          q(0),
          ],
       q(345) => [
-         q(0071),
+         q(0072),
          q(0),
          ],
       q(346) => [
-         q(0151),
+         q(0153),
          q(0),
          ],
       q(347) => [
-         q(0096),
+         q(0098),
          q(0),
          ],
       q(348) => [
-         q(0139),
+         q(0141),
          q(0),
          ],
       q(349) => [
-         q(0021),
+         q(0022),
          q(0),
          ],
       q(350) => [
-         q(0103),
+         q(0105),
          q(0),
          ],
       q(351) => [
-         q(0075),
+         q(0076),
          q(0),
          ],
       q(352) => [
-         q(0159),
+         q(0161),
          q(0),
          ],
       q(353) => [
-         q(0149),
+         q(0151),
          q(0),
          ],
       q(354) => [
-         q(0150),
+         q(0152),
          q(0),
          ],
       q(355) => [
-         q(0067),
+         q(0068),
          q(0),
          ],
       q(356) => [
-         q(0076),
+         q(0077),
          q(0),
          ],
       q(357) => [
-         q(0064),
+         q(0065),
          q(0),
          ],
       q(358) => [
-         q(0024),
+         q(0025),
          q(0),
          ],
       q(359) => [
-         q(0153),
+         q(0155),
          q(0),
          ],
       q(360) => [
@@ -2804,15 +2830,19 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(361) => [
-         q(0061),
+         q(0062),
          q(0),
          ],
       q(362) => [
-         q(0141),
+         q(0143),
          q(0),
          ],
       q(363) => [
-         q(0127),
+         q(0129),
+         q(0),
+         ],
+      q(364) => [
+         q(0081),
          q(0),
          ],
       q(365) => [
@@ -2820,67 +2850,67 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(367) => [
-         q(0019),
+         q(0020),
          q(0),
          ],
       q(370) => [
-         q(0157),
+         q(0159),
          q(0),
          ],
       q(371) => [
-         q(0049),
+         q(0050),
          q(0),
          ],
       q(372) => [
-         q(0020),
+         q(0021),
          q(0),
          ],
       q(373) => [
-         q(0147),
+         q(0149),
          q(0),
          ],
       q(398) => [
-         q(0140),
+         q(0142),
          q(0),
          ],
       q(399) => [
-         q(0084),
+         q(0086),
          q(0),
          ],
       q(400) => [
-         q(0082),
+         q(0084),
          q(0),
          ],
       q(401) => [
-         q(0083),
+         q(0085),
          q(0),
          ],
       q(403) => [
-         q(0028),
+         q(0029),
          q(0),
          ],
       q(410) => [
-         q(0054),
+         q(0055),
          q(0),
          ],
       q(411) => [
-         q(0065),
+         q(0066),
          q(0),
          ],
       q(412) => [
-         q(0057),
+         q(0058),
          q(0),
          ],
       q(413) => [
-         q(0062),
+         q(0063),
          q(0),
          ],
       q(420) => [
-         q(0106),
+         q(0108),
          q(0),
          ],
       q(430) => [
-         q(0038),
+         q(0039),
          q(0),
          ],
       q(435) => [
@@ -2888,15 +2918,15 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(436) => [
-         q(0073),
+         q(0074),
          q(0),
          ],
       q(437) => [
-         q(0085),
+         q(0087),
          q(0),
          ],
       q(438) => [
-         q(0093),
+         q(0095),
          q(0),
          ],
       q(439) => [
@@ -2904,95 +2934,95 @@ $Locale::Codes::Data{'script'}{'code2id'} = {
          q(0),
          ],
       q(440) => [
-         q(0022),
+         q(0023),
          q(0),
          ],
       q(445) => [
-         q(0025),
+         q(0026),
          q(0),
          ],
       q(450) => [
-         q(0056),
+         q(0057),
          q(0),
          ],
       q(460) => [
-         q(0169),
+         q(0171),
          q(0),
          ],
       q(470) => [
-         q(0163),
+         q(0165),
          q(0),
          ],
       q(480) => [
-         q(0166),
+         q(0168),
          q(0),
          ],
       q(499) => [
-         q(0108),
+         q(0110),
          q(0),
          ],
       q(500) => [
-         q(0048),
+         q(0049),
          q(0),
          ],
       q(501) => [
-         q(0050),
+         q(0051),
          q(0),
          ],
       q(502) => [
-         q(0051),
+         q(0052),
          q(0),
          ],
       q(505) => [
-         q(0069),
+         q(0070),
          q(0),
          ],
       q(510) => [
-         q(0063),
+         q(0064),
          q(0),
          ],
       q(520) => [
-         q(0152),
+         q(0154),
          q(0),
          ],
       q(550) => [
-         q(0015),
+         q(0016),
          q(0),
          ],
       q(570) => [
-         q(0018),
+         q(0019),
          q(0),
          ],
       q(610) => [
-         q(0059),
+         q(0060),
          q(0),
          ],
       q(620) => [
-         q(0128),
+         q(0130),
          q(0),
          ],
       q(755) => [
-         q(0033),
+         q(0034),
          q(0),
          ],
       q(900) => [
-         q(0125),
+         q(0127),
          q(0),
          ],
       q(949) => [
-         q(0126),
+         q(0128),
          q(0),
          ],
       q(994) => [
-         q(0170),
+         q(0172),
          q(0),
          ],
       q(995) => [
-         q(0171),
+         q(0173),
          q(0),
          ],
       q(996) => [
-         q(0172),
+         q(0174),
          q(0),
          ],
       },
@@ -3014,164 +3044,166 @@ $Locale::Codes::Data{'script'}{'id2code'} = {
       q(0012) => q(Bass),
       q(0013) => q(Batk),
       q(0014) => q(Beng),
-      q(0015) => q(Blis),
-      q(0016) => q(Bopo),
-      q(0017) => q(Brah),
-      q(0018) => q(Brai),
-      q(0019) => q(Bugi),
-      q(0020) => q(Buhd),
-      q(0021) => q(Cakm),
-      q(0022) => q(Cans),
-      q(0023) => q(Cari),
-      q(0024) => q(Cham),
-      q(0025) => q(Cher),
-      q(0026) => q(Cirt),
-      q(0027) => q(Copt),
-      q(0028) => q(Cprt),
-      q(0029) => q(Cyrl),
-      q(0030) => q(Cyrs),
-      q(0031) => q(Deva),
-      q(0032) => q(Dsrt),
-      q(0033) => q(Dupl),
-      q(0034) => q(Egyd),
-      q(0035) => q(Egyh),
-      q(0036) => q(Egyp),
-      q(0037) => q(Elba),
-      q(0038) => q(Ethi),
-      q(0039) => q(Geok),
-      q(0040) => q(Geor),
-      q(0041) => q(Glag),
-      q(0042) => q(Goth),
-      q(0043) => q(Gran),
-      q(0044) => q(Grek),
-      q(0045) => q(Gujr),
-      q(0046) => q(Guru),
-      q(0047) => q(Hang),
-      q(0048) => q(Hani),
-      q(0049) => q(Hano),
-      q(0050) => q(Hans),
-      q(0051) => q(Hant),
-      q(0052) => q(Hatr),
-      q(0053) => q(Hebr),
-      q(0054) => q(Hira),
-      q(0055) => q(Hluw),
-      q(0056) => q(Hmng),
-      q(0057) => q(Hrkt),
-      q(0058) => q(Hung),
-      q(0059) => q(Inds),
-      q(0060) => q(Ital),
-      q(0061) => q(Java),
-      q(0062) => q(Jpan),
-      q(0063) => q(Jurc),
-      q(0064) => q(Kali),
-      q(0065) => q(Kana),
-      q(0066) => q(Khar),
-      q(0067) => q(Khmr),
-      q(0068) => q(Khoj),
-      q(0069) => q(Kitl),
-      q(0070) => q(Kits),
-      q(0071) => q(Knda),
-      q(0072) => q(Kore),
-      q(0073) => q(Kpel),
-      q(0074) => q(Kthi),
-      q(0075) => q(Lana),
-      q(0076) => q(Laoo),
-      q(0077) => q(Latf),
-      q(0078) => q(Latg),
-      q(0079) => q(Latn),
-      q(0080) => q(Lepc),
-      q(0081) => q(Limb),
-      q(0082) => q(Lina),
-      q(0083) => q(Linb),
-      q(0084) => q(Lisu),
-      q(0085) => q(Loma),
-      q(0086) => q(Lyci),
-      q(0087) => q(Lydi),
-      q(0088) => q(Mahj),
-      q(0089) => q(Mand),
-      q(0090) => q(Mani),
-      q(0091) => q(Marc),
-      q(0092) => q(Maya),
-      q(0093) => q(Mend),
-      q(0094) => q(Merc),
-      q(0095) => q(Mero),
-      q(0096) => q(Mlym),
-      q(0097) => q(Modi),
-      q(0098) => q(Mong),
-      q(0099) => q(Moon),
-      q(0100) => q(Mroo),
-      q(0101) => q(Mtei),
-      q(0102) => q(Mult),
-      q(0103) => q(Mymr),
-      q(0104) => q(Narb),
-      q(0105) => q(Nbat),
-      q(0106) => q(Nkgb),
-      q(0107) => q(Nkoo),
-      q(0108) => q(Nshu),
-      q(0109) => q(Ogam),
-      q(0110) => q(Olck),
-      q(0111) => q(Orkh),
-      q(0112) => q(Orya),
-      q(0113) => q(Osge),
-      q(0114) => q(Osma),
-      q(0115) => q(Palm),
-      q(0116) => q(Pauc),
-      q(0117) => q(Perm),
-      q(0118) => q(Phag),
-      q(0119) => q(Phli),
-      q(0120) => q(Phlp),
-      q(0121) => q(Phlv),
-      q(0122) => q(Phnx),
-      q(0123) => q(Plrd),
-      q(0124) => q(Prti),
-      q(0125) => q(Qaaa),
-      q(0126) => q(Qabx),
-      q(0127) => q(Rjng),
-      q(0128) => q(Roro),
-      q(0129) => q(Runr),
-      q(0130) => q(Samr),
-      q(0131) => q(Sara),
-      q(0132) => q(Sarb),
-      q(0133) => q(Saur),
-      q(0134) => q(Sgnw),
-      q(0135) => q(Shaw),
-      q(0136) => q(Shrd),
-      q(0137) => q(Sidd),
-      q(0138) => q(Sind),
-      q(0139) => q(Sinh),
-      q(0140) => q(Sora),
-      q(0141) => q(Sund),
-      q(0142) => q(Sylo),
-      q(0143) => q(Syrc),
-      q(0144) => q(Syre),
-      q(0145) => q(Syrj),
-      q(0146) => q(Syrn),
-      q(0147) => q(Tagb),
-      q(0148) => q(Takr),
-      q(0149) => q(Tale),
-      q(0150) => q(Talu),
-      q(0151) => q(Taml),
-      q(0152) => q(Tang),
-      q(0153) => q(Tavt),
-      q(0154) => q(Telu),
-      q(0155) => q(Teng),
-      q(0156) => q(Tfng),
-      q(0157) => q(Tglg),
-      q(0158) => q(Thaa),
-      q(0159) => q(Thai),
-      q(0160) => q(Tibt),
-      q(0161) => q(Tirh),
-      q(0162) => q(Ugar),
-      q(0163) => q(Vaii),
-      q(0164) => q(Visp),
-      q(0165) => q(Wara),
-      q(0166) => q(Wole),
-      q(0167) => q(Xpeo),
-      q(0168) => q(Xsux),
-      q(0169) => q(Yiii),
-      q(0170) => q(Zinh),
-      q(0171) => q(Zmth),
-      q(0172) => q(Zsym),
+      q(0015) => q(Bhks),
+      q(0016) => q(Blis),
+      q(0017) => q(Bopo),
+      q(0018) => q(Brah),
+      q(0019) => q(Brai),
+      q(0020) => q(Bugi),
+      q(0021) => q(Buhd),
+      q(0022) => q(Cakm),
+      q(0023) => q(Cans),
+      q(0024) => q(Cari),
+      q(0025) => q(Cham),
+      q(0026) => q(Cher),
+      q(0027) => q(Cirt),
+      q(0028) => q(Copt),
+      q(0029) => q(Cprt),
+      q(0030) => q(Cyrl),
+      q(0031) => q(Cyrs),
+      q(0032) => q(Deva),
+      q(0033) => q(Dsrt),
+      q(0034) => q(Dupl),
+      q(0035) => q(Egyd),
+      q(0036) => q(Egyh),
+      q(0037) => q(Egyp),
+      q(0038) => q(Elba),
+      q(0039) => q(Ethi),
+      q(0040) => q(Geok),
+      q(0041) => q(Geor),
+      q(0042) => q(Glag),
+      q(0043) => q(Goth),
+      q(0044) => q(Gran),
+      q(0045) => q(Grek),
+      q(0046) => q(Gujr),
+      q(0047) => q(Guru),
+      q(0048) => q(Hang),
+      q(0049) => q(Hani),
+      q(0050) => q(Hano),
+      q(0051) => q(Hans),
+      q(0052) => q(Hant),
+      q(0053) => q(Hatr),
+      q(0054) => q(Hebr),
+      q(0055) => q(Hira),
+      q(0056) => q(Hluw),
+      q(0057) => q(Hmng),
+      q(0058) => q(Hrkt),
+      q(0059) => q(Hung),
+      q(0060) => q(Inds),
+      q(0061) => q(Ital),
+      q(0062) => q(Java),
+      q(0063) => q(Jpan),
+      q(0064) => q(Jurc),
+      q(0065) => q(Kali),
+      q(0066) => q(Kana),
+      q(0067) => q(Khar),
+      q(0068) => q(Khmr),
+      q(0069) => q(Khoj),
+      q(0070) => q(Kitl),
+      q(0071) => q(Kits),
+      q(0072) => q(Knda),
+      q(0073) => q(Kore),
+      q(0074) => q(Kpel),
+      q(0075) => q(Kthi),
+      q(0076) => q(Lana),
+      q(0077) => q(Laoo),
+      q(0078) => q(Latf),
+      q(0079) => q(Latg),
+      q(0080) => q(Latn),
+      q(0081) => q(Leke),
+      q(0082) => q(Lepc),
+      q(0083) => q(Limb),
+      q(0084) => q(Lina),
+      q(0085) => q(Linb),
+      q(0086) => q(Lisu),
+      q(0087) => q(Loma),
+      q(0088) => q(Lyci),
+      q(0089) => q(Lydi),
+      q(0090) => q(Mahj),
+      q(0091) => q(Mand),
+      q(0092) => q(Mani),
+      q(0093) => q(Marc),
+      q(0094) => q(Maya),
+      q(0095) => q(Mend),
+      q(0096) => q(Merc),
+      q(0097) => q(Mero),
+      q(0098) => q(Mlym),
+      q(0099) => q(Modi),
+      q(0100) => q(Mong),
+      q(0101) => q(Moon),
+      q(0102) => q(Mroo),
+      q(0103) => q(Mtei),
+      q(0104) => q(Mult),
+      q(0105) => q(Mymr),
+      q(0106) => q(Narb),
+      q(0107) => q(Nbat),
+      q(0108) => q(Nkgb),
+      q(0109) => q(Nkoo),
+      q(0110) => q(Nshu),
+      q(0111) => q(Ogam),
+      q(0112) => q(Olck),
+      q(0113) => q(Orkh),
+      q(0114) => q(Orya),
+      q(0115) => q(Osge),
+      q(0116) => q(Osma),
+      q(0117) => q(Palm),
+      q(0118) => q(Pauc),
+      q(0119) => q(Perm),
+      q(0120) => q(Phag),
+      q(0121) => q(Phli),
+      q(0122) => q(Phlp),
+      q(0123) => q(Phlv),
+      q(0124) => q(Phnx),
+      q(0125) => q(Plrd),
+      q(0126) => q(Prti),
+      q(0127) => q(Qaaa),
+      q(0128) => q(Qabx),
+      q(0129) => q(Rjng),
+      q(0130) => q(Roro),
+      q(0131) => q(Runr),
+      q(0132) => q(Samr),
+      q(0133) => q(Sara),
+      q(0134) => q(Sarb),
+      q(0135) => q(Saur),
+      q(0136) => q(Sgnw),
+      q(0137) => q(Shaw),
+      q(0138) => q(Shrd),
+      q(0139) => q(Sidd),
+      q(0140) => q(Sind),
+      q(0141) => q(Sinh),
+      q(0142) => q(Sora),
+      q(0143) => q(Sund),
+      q(0144) => q(Sylo),
+      q(0145) => q(Syrc),
+      q(0146) => q(Syre),
+      q(0147) => q(Syrj),
+      q(0148) => q(Syrn),
+      q(0149) => q(Tagb),
+      q(0150) => q(Takr),
+      q(0151) => q(Tale),
+      q(0152) => q(Talu),
+      q(0153) => q(Taml),
+      q(0154) => q(Tang),
+      q(0155) => q(Tavt),
+      q(0156) => q(Telu),
+      q(0157) => q(Teng),
+      q(0158) => q(Tfng),
+      q(0159) => q(Tglg),
+      q(0160) => q(Thaa),
+      q(0161) => q(Thai),
+      q(0162) => q(Tibt),
+      q(0163) => q(Tirh),
+      q(0164) => q(Ugar),
+      q(0165) => q(Vaii),
+      q(0166) => q(Visp),
+      q(0167) => q(Wara),
+      q(0168) => q(Wole),
+      q(0169) => q(Xpeo),
+      q(0170) => q(Xsux),
+      q(0171) => q(Yiii),
+      q(0172) => q(Zinh),
+      q(0173) => q(Zmth),
+      q(0174) => q(Zsym),
       },
    q(num) => {
       q(0001) => q(166),
@@ -3188,164 +3220,166 @@ $Locale::Codes::Data{'script'}{'id2code'} = {
       q(0012) => q(259),
       q(0013) => q(365),
       q(0014) => q(325),
-      q(0015) => q(550),
-      q(0016) => q(285),
-      q(0017) => q(300),
-      q(0018) => q(570),
-      q(0019) => q(367),
-      q(0020) => q(372),
-      q(0021) => q(349),
-      q(0022) => q(440),
-      q(0023) => q(201),
-      q(0024) => q(358),
-      q(0025) => q(445),
-      q(0026) => q(291),
-      q(0027) => q(204),
-      q(0028) => q(403),
-      q(0029) => q(220),
-      q(0030) => q(221),
-      q(0031) => q(315),
-      q(0032) => q(250),
-      q(0033) => q(755),
-      q(0034) => q(070),
-      q(0035) => q(060),
-      q(0036) => q(050),
-      q(0037) => q(226),
-      q(0038) => q(430),
-      q(0039) => q(241),
-      q(0040) => q(240),
-      q(0041) => q(225),
-      q(0042) => q(206),
-      q(0043) => q(343),
-      q(0044) => q(200),
-      q(0045) => q(320),
-      q(0046) => q(310),
-      q(0047) => q(286),
-      q(0048) => q(500),
-      q(0049) => q(371),
-      q(0050) => q(501),
-      q(0051) => q(502),
-      q(0052) => q(127),
-      q(0053) => q(125),
-      q(0054) => q(410),
-      q(0055) => q(080),
-      q(0056) => q(450),
-      q(0057) => q(412),
-      q(0058) => q(176),
-      q(0059) => q(610),
-      q(0060) => q(210),
-      q(0061) => q(361),
-      q(0062) => q(413),
-      q(0063) => q(510),
-      q(0064) => q(357),
-      q(0065) => q(411),
-      q(0066) => q(305),
-      q(0067) => q(355),
-      q(0068) => q(322),
-      q(0069) => q(505),
-      q(0070) => q(288),
-      q(0071) => q(345),
-      q(0072) => q(287),
-      q(0073) => q(436),
-      q(0074) => q(317),
-      q(0075) => q(351),
-      q(0076) => q(356),
-      q(0077) => q(217),
-      q(0078) => q(216),
-      q(0079) => q(215),
-      q(0080) => q(335),
-      q(0081) => q(336),
-      q(0082) => q(400),
-      q(0083) => q(401),
-      q(0084) => q(399),
-      q(0085) => q(437),
-      q(0086) => q(202),
-      q(0087) => q(116),
-      q(0088) => q(314),
-      q(0089) => q(140),
-      q(0090) => q(139),
-      q(0091) => q(332),
-      q(0092) => q(090),
-      q(0093) => q(438),
-      q(0094) => q(101),
-      q(0095) => q(100),
-      q(0096) => q(347),
-      q(0097) => q(324),
-      q(0098) => q(145),
-      q(0099) => q(218),
-      q(0100) => q(199),
-      q(0101) => q(337),
-      q(0102) => q(323),
-      q(0103) => q(350),
-      q(0104) => q(106),
-      q(0105) => q(159),
-      q(0106) => q(420),
-      q(0107) => q(165),
-      q(0108) => q(499),
-      q(0109) => q(212),
-      q(0110) => q(261),
-      q(0111) => q(175),
-      q(0112) => q(327),
-      q(0113) => q(219),
-      q(0114) => q(260),
-      q(0115) => q(126),
-      q(0116) => q(263),
-      q(0117) => q(227),
-      q(0118) => q(331),
-      q(0119) => q(131),
-      q(0120) => q(132),
-      q(0121) => q(133),
-      q(0122) => q(115),
-      q(0123) => q(282),
-      q(0124) => q(130),
-      q(0125) => q(900),
-      q(0126) => q(949),
-      q(0127) => q(363),
-      q(0128) => q(620),
-      q(0129) => q(211),
-      q(0130) => q(123),
-      q(0131) => q(292),
-      q(0132) => q(105),
-      q(0133) => q(344),
-      q(0134) => q(095),
-      q(0135) => q(281),
-      q(0136) => q(319),
-      q(0137) => q(302),
-      q(0138) => q(318),
-      q(0139) => q(348),
-      q(0140) => q(398),
-      q(0141) => q(362),
-      q(0142) => q(316),
-      q(0143) => q(135),
-      q(0144) => q(138),
-      q(0145) => q(137),
-      q(0146) => q(136),
-      q(0147) => q(373),
-      q(0148) => q(321),
-      q(0149) => q(353),
-      q(0150) => q(354),
-      q(0151) => q(346),
-      q(0152) => q(520),
-      q(0153) => q(359),
-      q(0154) => q(340),
-      q(0155) => q(290),
-      q(0156) => q(120),
-      q(0157) => q(370),
-      q(0158) => q(170),
-      q(0159) => q(352),
-      q(0160) => q(330),
-      q(0161) => q(326),
-      q(0162) => q(040),
-      q(0163) => q(470),
-      q(0164) => q(280),
-      q(0165) => q(262),
-      q(0166) => q(480),
-      q(0167) => q(030),
-      q(0168) => q(020),
-      q(0169) => q(460),
-      q(0170) => q(994),
-      q(0171) => q(995),
-      q(0172) => q(996),
+      q(0015) => q(334),
+      q(0016) => q(550),
+      q(0017) => q(285),
+      q(0018) => q(300),
+      q(0019) => q(570),
+      q(0020) => q(367),
+      q(0021) => q(372),
+      q(0022) => q(349),
+      q(0023) => q(440),
+      q(0024) => q(201),
+      q(0025) => q(358),
+      q(0026) => q(445),
+      q(0027) => q(291),
+      q(0028) => q(204),
+      q(0029) => q(403),
+      q(0030) => q(220),
+      q(0031) => q(221),
+      q(0032) => q(315),
+      q(0033) => q(250),
+      q(0034) => q(755),
+      q(0035) => q(070),
+      q(0036) => q(060),
+      q(0037) => q(050),
+      q(0038) => q(226),
+      q(0039) => q(430),
+      q(0040) => q(241),
+      q(0041) => q(240),
+      q(0042) => q(225),
+      q(0043) => q(206),
+      q(0044) => q(343),
+      q(0045) => q(200),
+      q(0046) => q(320),
+      q(0047) => q(310),
+      q(0048) => q(286),
+      q(0049) => q(500),
+      q(0050) => q(371),
+      q(0051) => q(501),
+      q(0052) => q(502),
+      q(0053) => q(127),
+      q(0054) => q(125),
+      q(0055) => q(410),
+      q(0056) => q(080),
+      q(0057) => q(450),
+      q(0058) => q(412),
+      q(0059) => q(176),
+      q(0060) => q(610),
+      q(0061) => q(210),
+      q(0062) => q(361),
+      q(0063) => q(413),
+      q(0064) => q(510),
+      q(0065) => q(357),
+      q(0066) => q(411),
+      q(0067) => q(305),
+      q(0068) => q(355),
+      q(0069) => q(322),
+      q(0070) => q(505),
+      q(0071) => q(288),
+      q(0072) => q(345),
+      q(0073) => q(287),
+      q(0074) => q(436),
+      q(0075) => q(317),
+      q(0076) => q(351),
+      q(0077) => q(356),
+      q(0078) => q(217),
+      q(0079) => q(216),
+      q(0080) => q(215),
+      q(0081) => q(364),
+      q(0082) => q(335),
+      q(0083) => q(336),
+      q(0084) => q(400),
+      q(0085) => q(401),
+      q(0086) => q(399),
+      q(0087) => q(437),
+      q(0088) => q(202),
+      q(0089) => q(116),
+      q(0090) => q(314),
+      q(0091) => q(140),
+      q(0092) => q(139),
+      q(0093) => q(332),
+      q(0094) => q(090),
+      q(0095) => q(438),
+      q(0096) => q(101),
+      q(0097) => q(100),
+      q(0098) => q(347),
+      q(0099) => q(324),
+      q(0100) => q(145),
+      q(0101) => q(218),
+      q(0102) => q(199),
+      q(0103) => q(337),
+      q(0104) => q(323),
+      q(0105) => q(350),
+      q(0106) => q(106),
+      q(0107) => q(159),
+      q(0108) => q(420),
+      q(0109) => q(165),
+      q(0110) => q(499),
+      q(0111) => q(212),
+      q(0112) => q(261),
+      q(0113) => q(175),
+      q(0114) => q(327),
+      q(0115) => q(219),
+      q(0116) => q(260),
+      q(0117) => q(126),
+      q(0118) => q(263),
+      q(0119) => q(227),
+      q(0120) => q(331),
+      q(0121) => q(131),
+      q(0122) => q(132),
+      q(0123) => q(133),
+      q(0124) => q(115),
+      q(0125) => q(282),
+      q(0126) => q(130),
+      q(0127) => q(900),
+      q(0128) => q(949),
+      q(0129) => q(363),
+      q(0130) => q(620),
+      q(0131) => q(211),
+      q(0132) => q(123),
+      q(0133) => q(292),
+      q(0134) => q(105),
+      q(0135) => q(344),
+      q(0136) => q(095),
+      q(0137) => q(281),
+      q(0138) => q(319),
+      q(0139) => q(302),
+      q(0140) => q(318),
+      q(0141) => q(348),
+      q(0142) => q(398),
+      q(0143) => q(362),
+      q(0144) => q(316),
+      q(0145) => q(135),
+      q(0146) => q(138),
+      q(0147) => q(137),
+      q(0148) => q(136),
+      q(0149) => q(373),
+      q(0150) => q(321),
+      q(0151) => q(353),
+      q(0152) => q(354),
+      q(0153) => q(346),
+      q(0154) => q(520),
+      q(0155) => q(359),
+      q(0156) => q(340),
+      q(0157) => q(290),
+      q(0158) => q(120),
+      q(0159) => q(370),
+      q(0160) => q(170),
+      q(0161) => q(352),
+      q(0162) => q(330),
+      q(0163) => q(326),
+      q(0164) => q(040),
+      q(0165) => q(470),
+      q(0166) => q(280),
+      q(0167) => q(262),
+      q(0168) => q(480),
+      q(0169) => q(030),
+      q(0170) => q(020),
+      q(0171) => q(460),
+      q(0172) => q(994),
+      q(0173) => q(995),
+      q(0174) => q(996),
       },
 };
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Codes/Script_Retired.pm b/Master/tlpkg/tlperl/lib/Locale/Codes/Script_Retired.pm
index eb4d17c4c17..89a0f4718b9 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Codes/Script_Retired.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Codes/Script_Retired.pm
@@ -3,7 +3,7 @@ Locale::Codes::Script_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Fri Feb 20 15:27:22 GMT 2015
+#    Generated on: Tue Dec  1 14:45:28 EST 2015
 
 use strict;
 require 5.006;
@@ -11,7 +11,7 @@ use warnings;
 use utf8;
 
 our($VERSION);
-$VERSION='3.34';
+$VERSION='3.37';
 
 $Locale::Codes::Retired{'script'}{'alpha'}{'code'} = {
 };
diff --git a/Master/tlpkg/tlperl/lib/Locale/Country.pm b/Master/tlpkg/tlperl/lib/Locale/Country.pm
index 9dd896cca25..4c4d7c198fd 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Country.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Country.pm
@@ -10,7 +10,7 @@ use warnings;
 use Exporter;
 
 our $VERSION;
-$VERSION='3.34';
+$VERSION='3.37';
 
 our (@ISA,@EXPORT);
 
@@ -26,8 +26,6 @@ eval "require $backend; $backend->import(); return 1;";
 
 unshift (@ISA, $backend);
 
-sub alias_code                { Locale::Codes::Country::alias_code(@_) }
-
 sub rename_country            { Locale::Codes::Country::rename_country(@_) }
 sub add_country               { Locale::Codes::Country::add_country(@_) }
 sub delete_country            { Locale::Codes::Country::delete_country(@_) }
diff --git a/Master/tlpkg/tlperl/lib/Locale/Country.pod b/Master/tlpkg/tlperl/lib/Locale/Country.pod
index 133a9d69972..ae36beb6014 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Country.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Country.pod
@@ -15,12 +15,11 @@ Locale::Country - standard codes for country identification
    @names   = all_country_names();
 
    # semi-private routines
-   Locale::Country::alias_code('uk' => 'gb');
    Locale::Country::rename_country('gb' => 'Great Britain');
 
 =head1 DESCRIPTION
 
-The C<Locale::Country> module provides access to several code sets
+This module provides access to several code sets
 that can be used for identifying countries, such as those defined in
 ISO 3166-1.
 
@@ -80,56 +79,33 @@ Locale::Codes::Changes document for details.
 
 =over 4
 
-=item B<code2country ( CODE [,CODESET] [,'retired'])>
+=item B<code2country(CODE [,CODESET] [,'retired'])>
 
-=item B<country2code ( NAME [,CODESET] [,'retired'])>
+=item B<country2code(NAME [,CODESET] [,'retired'])>
 
-=item B<country_code2code ( CODE ,CODESET ,CODESET2 )>
+=item B<country_code2code(CODE ,CODESET ,CODESET2)>
 
-=item B<all_country_codes ( [CODESET] [,'retired'])>
+=item B<all_country_codes([CODESET] [,'retired'])>
 
-=item B<all_country_names ( [CODESET] [,'retired'])>
+=item B<all_country_names([CODESET] [,'retired'])>
 
-=item B<Locale::Country::rename_country  ( CODE ,NEW_NAME [,CODESET] )>
+=item B<Locale::Country::rename_country(CODE ,NEW_NAME [,CODESET])>
 
-=item B<Locale::Country::add_country  ( CODE ,NAME [,CODESET] )>
+=item B<Locale::Country::add_country(CODE ,NAME [,CODESET])>
 
-=item B<Locale::Country::delete_country  ( CODE [,CODESET] )>
+=item B<Locale::Country::delete_country(CODE [,CODESET])>
 
-=item B<Locale::Country::add_country_alias  ( NAME ,NEW_NAME )>
+=item B<Locale::Country::add_country_alias(NAME ,NEW_NAME)>
 
-=item B<Locale::Country::delete_country_alias  ( NAME )>
+=item B<Locale::Country::delete_country_alias(NAME)>
 
-=item B<Locale::Country::rename_country_code  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Country::rename_country_code(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Country::add_country_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Country::add_country_code_alias(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Country::delete_country_code_alias  ( CODE [,CODESET] )>
+=item B<Locale::Country::delete_country_code_alias(CODE [,CODESET])>
 
-These routines are all documented in the Locale::Codes::API man page.
-
-=item B<alias_code ( ALIAS, CODE [,CODESET] )>
-
-Version 2.07 included 2 functions for modifying the internal data:
-rename_country and alias_code. Both of these could be used only to
-modify the internal data for country codes.
-
-As of 3.10, the internal data for all types of codes can be modified.
-
-The alias_code function is preserved for backwards compatibility, but
-the following two are identical:
-
-   alias_code(ALIAS,CODE [,CODESET]);
-   rename_country_code(CODE,ALIAS [,CODESET]);
-
-and the latter should be used for consistency.
-
-The alias_code function is deprecated and will be removed in the December
-2014 release.
-
-B<Note:> this function was previously called _alias_code, but the
-leading underscore has been dropped. The old name was supported for
-all 2.X releases, but has been dropped as of 3.00.
+These routines are all documented in the L<Locale::Codes::API> man page.
 
 =back
 
@@ -137,35 +113,35 @@ all 2.X releases, but has been dropped as of 3.00.
 
 =over 4
 
-=item B<Locale::Codes>
+=item L<Locale::Codes>
 
 The Locale-Codes distribution.
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions supported by this module.
 
-=item B<Locale::SubCountry>
+=item L<Locale::SubCountry>
 
 ISO codes for country sub-divisions (states, counties, provinces,
 etc), as defined in ISO 3166-2.  This module is not part of the
 Locale-Codes distribution, but is available from CPAN in
 CPAN/modules/by-module/Locale/
 
-=item B<http://www.iso.org/iso/home/standards/country_codes.htm>
+=item L<http://www.iso.org/iso/home/standards/country_codes.htm>
 
 Official home page for the ISO 3166 maintenance agency.
 
-=item B<http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm>
+=item L<http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm>
 
 The source of ISO 3166-1 two-letter codes used by this
 module.
 
-=item B<http://www.iana.org/domains/root/db/>
+=item L<http://www.iana.org/domains/root/db/>
 
 Official source of the top-level domain names.
 
-=item B<http://unstats.un.org/unsd/methods/m49/m49alpha.htm>
+=item L<http://unstats.un.org/unsd/methods/m49/m49alpha.htm>
 
 The source of the official ISO 3166-1 three-letter codes and
 three-digit codes.
@@ -174,13 +150,13 @@ For some reason, this table is incomplete! Several countries are
 missing from it, and I cannot find them anywhere on the UN site.  I
 no longer use this as a source of data.
 
-=item B<https://www.cia.gov/library/publications/the-world-factbook/appendix/print_appendix-d.html>
+=item L<https://www.cia.gov/library/publications/the-world-factbook/appendix/print_appendix-d.html>
 
 The World Factbook maintained by the CIA is a potential source of
 the data.  Unfortunately, it adds/preserves non-standard codes, so it is no
 longer used as a source of data.
 
-=item B<http://www.statoids.com/wab.html>
+=item L<http://www.statoids.com/wab.html>
 
 Another unofficial source of data. Currently, it is not used to get
 data, but the notes and explanatory material were very useful for
diff --git a/Master/tlpkg/tlperl/lib/Locale/Currency.pm b/Master/tlpkg/tlperl/lib/Locale/Currency.pm
index 26535d199cb..c930ff964f5 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Currency.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Currency.pm
@@ -10,7 +10,7 @@ use warnings;
 use Exporter;
 
 our $VERSION;
-$VERSION='3.34';
+$VERSION='3.37';
 
 our (@ISA,@EXPORT);
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Currency.pod b/Master/tlpkg/tlperl/lib/Locale/Currency.pod
index 6b52d7fa535..22cafafa273 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Currency.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Currency.pod
@@ -14,11 +14,10 @@ Locale::Currency - standard codes for currency identification
     @codes   = all_currency_codes();
     @names   = all_currency_names();
 
-
 =head1 DESCRIPTION
 
-The C<Locale::Currency> module provides access to standard codes used
-for identifying currencies and funds, such as those defined in ISO 4217.
+This module provides access to standard codes used for identifying
+currencies and funds, such as those defined in ISO 4217.
 
 Most of the routines take an optional additional argument which
 specifies the code set to use. If not specified, the default ISO
@@ -60,33 +59,33 @@ This is the set of three-digit numeric codes from ISO 4217.
 
 =over 4
 
-=item B<code2currency ( CODE [,CODESET] [,'retired'])>
+=item B<code2currency(CODE [,CODESET] [,'retired'])>
 
-=item B<currency2code ( NAME [,CODESET] [,'retired'])>
+=item B<currency2code(NAME [,CODESET] [,'retired'])>
 
-=item B<currency_code2code ( CODE ,CODESET ,CODESET2 )>
+=item B<currency_code2code(CODE ,CODESET ,CODESET2)>
 
-=item B<all_currency_codes ( [CODESET] [,'retired'])>
+=item B<all_currency_codes([CODESET] [,'retired'])>
 
-=item B<all_currency_names ( [CODESET] [,'retired'])>
+=item B<all_currency_names([CODESET] [,'retired'])>
 
-=item B<Locale::Currency::rename_currency  ( CODE ,NEW_NAME [,CODESET] )>
+=item B<Locale::Currency::rename_currency(CODE ,NEW_NAME [,CODESET])>
 
-=item B<Locale::Currency::add_currency  ( CODE ,NAME [,CODESET] )>
+=item B<Locale::Currency::add_currency(CODE ,NAME [,CODESET])>
 
-=item B<Locale::Currency::delete_currency  ( CODE [,CODESET] )>
+=item B<Locale::Currency::delete_currency(CODE [,CODESET])>
 
-=item B<Locale::Currency::add_currency_alias  ( NAME ,NEW_NAME )>
+=item B<Locale::Currency::add_currency_alias(NAME ,NEW_NAME)>
 
-=item B<Locale::Currency::delete_currency_alias  ( NAME )>
+=item B<Locale::Currency::delete_currency_alias(NAME)>
 
-=item B<Locale::Currency::rename_currency_code  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Currency::rename_currency_code(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Currency::add_currency_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Currency::add_currency_code_alias(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Currency::delete_currency_code_alias  ( CODE [,CODESET] )>
+=item B<Locale::Currency::delete_currency_code_alias( ODE [,CODESET])>
 
-These routines are all documented in the Locale::Codes::API man page.
+These routines are all documented in the L<Locale::Codes::API> man page.
 
 =back
 
@@ -94,15 +93,15 @@ These routines are all documented in the Locale::Codes::API man page.
 
 =over 4
 
-=item B<Locale::Codes>
+=item L<Locale::Codes>
 
 The Locale-Codes distribution.
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions supported by this module.
 
-=item B<http://www.iso.org/iso/support/currency_codes_list-1.htm>
+=item L<http://www.iso.org/iso/support/currency_codes_list-1.htm>
 
 The ISO 4217 data.
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Language.pm b/Master/tlpkg/tlperl/lib/Locale/Language.pm
index bf3afa489f0..ab4d2145b05 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Language.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Language.pm
@@ -10,7 +10,7 @@ use warnings;
 use Exporter;
 
 our $VERSION;
-$VERSION='3.34';
+$VERSION='3.37';
 
 our (@ISA,@EXPORT);
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Language.pod b/Master/tlpkg/tlperl/lib/Locale/Language.pod
index 771aa8a8d91..d7e4bd8bf8c 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Language.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Language.pod
@@ -16,7 +16,7 @@ Locale::Language - standard codes for language identification
 
 =head1 DESCRIPTION
 
-The C<Locale::Language> module provides access to standard codes used
+This module provides access to standard codes used
 for identifying languages, such as those as defined in ISO 639.
 
 Most of the routines take an optional additional argument which
@@ -63,33 +63,33 @@ ISO 639.
 
 =over 4
 
-=item B<code2language ( CODE [,CODESET] [,'retired'])>
+=item B<code2language(CODE [,CODESET] [,'retired'])>
 
-=item B<language2code ( NAME [,CODESET] [,'retired'])>
+=item B<language2code(NAME [,CODESET] [,'retired'])>
 
-=item B<language_code2code ( CODE ,CODESET ,CODESET2 )>
+=item B<language_code2code(CODE ,CODESET ,CODESET2)>
 
-=item B<all_language_codes ( [CODESET] [,'retired'])>
+=item B<all_language_codes([CODESET] [,'retired'])>
 
-=item B<all_language_names ( [CODESET] [,'retired'])>
+=item B<all_language_names([CODESET] [,'retired'])>
 
-=item B<Locale::Language::rename_language  ( CODE ,NEW_NAME [,CODESET] )>
+=item B<Locale::Language::rename_language(CODE ,NEW_NAME [,CODESET])>
 
-=item B<Locale::Language::add_language  ( CODE ,NAME [,CODESET] )>
+=item B<Locale::Language::add_language(CODE ,NAME [,CODESET])>
 
-=item B<Locale::Language::delete_language  ( CODE [,CODESET] )>
+=item B<Locale::Language::delete_language(CODE [,CODESET])>
 
-=item B<Locale::Language::add_language_alias  ( NAME ,NEW_NAME )>
+=item B<Locale::Language::add_language_alias(NAME ,NEW_NAME)>
 
-=item B<Locale::Language::delete_language_alias  ( NAME )>
+=item B<Locale::Language::delete_language_alias(NAME)>
 
-=item B<Locale::Language::rename_language_code  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Language::rename_language_code(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Language::add_language_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Language::add_language_code_alias(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Language::delete_language_code_alias  ( CODE [,CODESET] )>
+=item B<Locale::Language::delete_language_code_alias(CODE [,CODESET])>
 
-These routines are all documented in the Locale::Codes::API man page.
+These routines are all documented in the L<Locale::Codes::API> man page.
 
 =back
 
@@ -97,23 +97,23 @@ These routines are all documented in the Locale::Codes::API man page.
 
 =over 4
 
-=item B<Locale::Codes>
+=item L<Locale::Codes>
 
 The Locale-Codes distribution.
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions supported by this module.
 
-=item B<http://www.loc.gov/standards/iso639-2/>
+=item L<http://www.loc.gov/standards/iso639-2/>
 
 Source of the ISO 639-2 codes.
 
-=item B<http://www.loc.gov/standards/iso639-5/>
+=item L<http://www.loc.gov/standards/iso639-5/>
 
 Source of the ISO 639-5 codes.
 
-=item B<http://www.iana.org/assignments/language-subtag-registry>
+=item L<http://www.iana.org/assignments/language-subtag-registry>
 
 The IANA language subtag registry.
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Maketext.pm b/Master/tlpkg/tlperl/lib/Locale/Maketext.pm
index 24c31ea9d6f..e73c149a068 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Maketext.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Maketext.pm
@@ -27,7 +27,7 @@ BEGIN {
 }
 
 
-$VERSION = '1.26';
+$VERSION = '1.26_01';
 @ISA = ();
 
 $MATCH_SUPERS = 1;
@@ -449,6 +449,8 @@ sub _try_use {   # Basically a wrapper around "require Modulename"
 
     local $SIG{'__DIE__'};
     local $@;
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     eval "require $module"; # used to be "use $module", but no point in that.
 
     if($@) {
diff --git a/Master/tlpkg/tlperl/lib/Locale/Maketext/Simple.pm b/Master/tlpkg/tlperl/lib/Locale/Maketext/Simple.pm
index 30760f3c26d..9e61670802e 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Maketext/Simple.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Maketext/Simple.pm
@@ -1,5 +1,5 @@
 package Locale::Maketext::Simple;
-$Locale::Maketext::Simple::VERSION = '0.21';
+$Locale::Maketext::Simple::VERSION = '0.21_01';
 
 use strict;
 use 5.005;
@@ -134,7 +134,12 @@ sub load_loc {
     my $pkg = join('::', grep { defined and length } $args{Class}, $args{Subclass});
     return $Loc{$pkg} if exists $Loc{$pkg};
 
-    eval { require Locale::Maketext::Lexicon; 1 }   or return;
+    eval {
+        local @INC = @INC;
+        pop @INC if $INC[-1] eq '.';
+        require Locale::Maketext::Lexicon;
+        1
+    } or return;
     $Locale::Maketext::Lexicon::VERSION > 0.20	    or return;
     eval { require File::Spec; 1 }		    or return;
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Script.pm b/Master/tlpkg/tlperl/lib/Locale/Script.pm
index 185935d0e8c..1ea0e188fe6 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Script.pm
+++ b/Master/tlpkg/tlperl/lib/Locale/Script.pm
@@ -10,7 +10,7 @@ use warnings;
 use Exporter;
 
 our $VERSION;
-$VERSION='3.34';
+$VERSION='3.37';
 
 our (@ISA,@EXPORT);
 
diff --git a/Master/tlpkg/tlperl/lib/Locale/Script.pod b/Master/tlpkg/tlperl/lib/Locale/Script.pod
index a1c2c81d49f..c06f1b16774 100644
--- a/Master/tlpkg/tlperl/lib/Locale/Script.pod
+++ b/Master/tlpkg/tlperl/lib/Locale/Script.pod
@@ -18,7 +18,7 @@ Locale::Script - standard codes for script identification
 
 =head1 DESCRIPTION
 
-The C<Locale::Script> module provides access to standards codes used
+This module provides access to standards codes used
 for identifying scripts, such as those defined in ISO 15924.
 
 Most of the routines take an optional additional argument which
@@ -61,33 +61,33 @@ for Phoenician.
 
 =over 4
 
-=item B<code2script ( CODE [,CODESET] [,'retired'])>
+=item B<code2script(CODE [,CODESET] [,'retired'])>
 
-=item B<script2code ( NAME [,CODESET] [,'retired'])>
+=item B<script2code(NAME [,CODESET] [,'retired'])>
 
-=item B<script_code2code ( CODE ,CODESET ,CODESET2 )>
+=item B<script_code2code(CODE ,CODESET ,CODESET2)>
 
-=item B<all_script_codes ( [CODESET] [,'retired'])>
+=item B<all_script_codes([CODESET] [,'retired'])>
 
-=item B<all_script_names ( [CODESET] [,'retired'])>
+=item B<all_script_names([CODESET] [,'retired'])>
 
-=item B<Locale::Script::rename_script  ( CODE ,NEW_NAME [,CODESET] )>
+=item B<Locale::Script::rename_script(CODE ,NEW_NAME [,CODESET])>
 
-=item B<Locale::Script::add_script  ( CODE ,NAME [,CODESET] )>
+=item B<Locale::Script::add_script(CODE ,NAME [,CODESET])>
 
-=item B<Locale::Script::delete_script  ( CODE [,CODESET] )>
+=item B<Locale::Script::delete_script(CODE [,CODESET])>
 
-=item B<Locale::Script::add_script_alias  ( NAME ,NEW_NAME )>
+=item B<Locale::Script::add_script_alias(NAME ,NEW_NAME)>
 
-=item B<Locale::Script::delete_script_alias  ( NAME )>
+=item B<Locale::Script::delete_script_alias(NAME)>
 
-=item B<Locale::Script::rename_script_code  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Script::rename_script_code(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Script::add_script_code_alias  ( CODE ,NEW_CODE [,CODESET] )>
+=item B<Locale::Script::add_script_code_alias(CODE ,NEW_CODE [,CODESET])>
 
-=item B<Locale::Script::delete_script_code_alias  ( CODE [,CODESET] )>
+=item B<Locale::Script::delete_script_code_alias(CODE [,CODESET])>
 
-These routines are all documented in the Locale::Codes::API man page.
+These routines are all documented in the L<Locale::Codes::API> man page.
 
 =back
 
@@ -95,19 +95,19 @@ These routines are all documented in the Locale::Codes::API man page.
 
 =over 4
 
-=item B<Locale::Codes>
+=item L<Locale::Codes>
 
 The Locale-Codes distribution.
 
-=item B<Locale::Codes::API>
+=item L<Locale::Codes::API>
 
 The list of functions supported by this module.
 
-=item B<http://www.unicode.org/iso15924/>
+=item L<http://www.unicode.org/iso15924/>
 
 Home page for ISO 15924.
 
-=item B<http://www.iana.org/assignments/language-subtag-registry>
+=item L<http://www.iana.org/assignments/language-subtag-registry>
 
 The IANA language subtag registry.
 
diff --git a/Master/tlpkg/tlperl/lib/Math/BigFloat.pm b/Master/tlpkg/tlperl/lib/Math/BigFloat.pm
index 1c31496a764..4c2c9b80f0a 100644
--- a/Master/tlpkg/tlperl/lib/Math/BigFloat.pm
+++ b/Master/tlpkg/tlperl/lib/Math/BigFloat.pm
@@ -12,35 +12,37 @@ package Math::BigFloat;
 #   _a	: accuracy
 #   _p	: precision
 
-$VERSION = '1.9997';
-require 5.006002;
+use 5.006001;
+use strict;
+use warnings;
+
+our $VERSION = '1.999715';
+$VERSION = eval $VERSION;
 
 require Exporter;
-@ISA		= qw/Math::BigInt/;
-@EXPORT_OK	= qw/bpi/;
+our @ISA	= qw/Math::BigInt/;
+our @EXPORT_OK	= qw/bpi/;
 
-use strict;
 # $_trap_inf/$_trap_nan are internal and should never be accessed from outside
-use vars qw/$AUTOLOAD $accuracy $precision $div_scale $round_mode $rnd_mode
-	    $upgrade $downgrade $_trap_nan $_trap_inf/;
+our ($AUTOLOAD, $accuracy, $precision, $div_scale, $round_mode, $rnd_mode,
+     $upgrade, $downgrade, $_trap_nan, $_trap_inf);
+
 my $class = "Math::BigFloat";
 
 use overload
-'<=>'	=>	sub { my $rc = $_[2] ?
-                      ref($_[0])->bcmp($_[1],$_[0]) : 
-                      ref($_[0])->bcmp($_[0],$_[1]); 
+  '<=>'	=>	sub { my $rc = $_[2] ? ref($_[0])->bcmp($_[1], $_[0])
+                                     : ref($_[0])->bcmp($_[0], $_[1]);
 		      $rc = 1 unless defined $rc;
 		      $rc <=> 0;
 		},
 # we need '>=' to get things like "1 >= NaN" right:
-'>='	=>	sub { my $rc = $_[2] ?
-                      ref($_[0])->bcmp($_[1],$_[0]) : 
-                      ref($_[0])->bcmp($_[0],$_[1]);
+  '>='	=>	sub { my $rc = $_[2] ? ref($_[0])->bcmp($_[1],$_[0])
+                                     : ref($_[0])->bcmp($_[0],$_[1]);
 		      # if there was a NaN involved, return false
 		      return '' unless defined $rc;
 		      $rc >= 0;
 		},
-'int'	=>	sub { $_[0]->as_number() },		# 'trunc' to bigint
+  'int'	=>	sub { $_[0]->as_number() },		# 'trunc' to bigint
 ;
 
 ##############################################################################
@@ -124,51 +126,72 @@ BEGIN
 ##############################################################################
 # constructors
 
-sub new 
-  {
-  # create a new BigFloat object from a string or another bigfloat object. 
-  # _e: exponent
-  # _m: mantissa
-  # sign  => sign (+/-), or "NaN"
+sub new {
+    # Create a new BigFloat object from a string or another bigfloat object.
+    # _e: exponent
+    # _m: mantissa
+    # sign  => sign ("+", "-", "+inf", "-inf", or "NaN"
 
-  my ($class,$wanted,@r) = @_;
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
 
-  # avoid numify-calls by not using || on $wanted!
-  return $class->bzero() if !defined $wanted;	# default to 0
-  return $wanted->copy() if UNIVERSAL::isa($wanted,'Math::BigFloat');
+    my ($wanted, @r) = @_;
 
-  $class->import() if $IMPORT == 0;             # make require work
+    # avoid numify-calls by not using || on $wanted!
 
-  my $self = {}; bless $self, $class;
-  # shortcut for bigints and its subclasses
-  if ((ref($wanted)) && UNIVERSAL::can( $wanted, "as_number"))
-    {
-    $self->{_m} = $wanted->as_number()->{value}; # get us a bigint copy
-    $self->{_e} = $MBI->_zero();
-    $self->{_es} = '+';
-    $self->{sign} = $wanted->sign();
-    return $self->bnorm();
+    unless (defined $wanted) {
+        require Carp;
+        Carp::carp("Use of uninitialized value in new");
+        return $self->bzero(@r);
     }
-  # else: got a string or something masquerading as number (with overload)
 
-  # handle '+inf', '-inf' first
-  if ($wanted =~ /^[+-]?inf\z/)
-    {
-    return $downgrade->new($wanted) if $downgrade;
+    # Using $wanted->isa("Math::BigFloat") here causes a 'Deep recursion on
+    # subroutine "Math::BigFloat::as_number"' in some tests. Fixme!
 
-    $self->{sign} = $wanted;		# set a default sign for bstr()
-    return $self->binf($wanted);
+    if (UNIVERSAL::isa($wanted, 'Math::BigFloat')) {
+        my $copy = $wanted -> copy();
+        if ($selfref) {                 # if new() called as instance method
+            %$self = %$copy;
+        } else {                        # if new() called as class method
+            $self = $copy;
+        }
+        return $copy;
     }
 
-  # shortcut for simple forms like '12' that neither have trailing nor leading
-  # zeros
-  if ($wanted =~ /^([+-]?)([1-9][0-9]*[1-9])$/)
-    {
-    $self->{_e} = $MBI->_zero();
-    $self->{_es} = '+';
-    $self->{sign} = $1 || '+';
-    $self->{_m} = $MBI->_new($2);
-    return $self->round(@r) if !$downgrade;
+    $class->import() if $IMPORT == 0;             # make require work
+
+    # If called as a class method, initialize a new object.
+
+    $self = bless {}, $class unless $selfref;
+
+    # shortcut for bigints and its subclasses
+    if ((ref($wanted)) && $wanted -> can("as_number")) {
+        $self->{_m} = $wanted->as_number()->{value};  # get us a bigint copy
+        $self->{_e} = $MBI->_zero();
+        $self->{_es} = '+';
+        $self->{sign} = $wanted->sign();
+        return $self->bnorm();
+    }
+
+    # else: got a string or something masquerading as number (with overload)
+
+    # Handle Infs.
+
+    if ($wanted =~ /^\s*([+-]?)inf(inity)?\s*\z/i) {
+        return $downgrade->new($wanted) if $downgrade;
+        my $sgn = $1 || '+';
+        $self->{sign} = $sgn . 'inf';   # set a default sign for bstr()
+        return $self->binf($sgn);
+    }
+
+    # Shortcut for simple forms like '12' that have no trailing zeros.
+    if ($wanted =~ /^([+-]?)0*([1-9][0-9]*[1-9])$/) {
+        $self->{_e} = $MBI->_zero();
+        $self->{_es} = '+';
+        $self->{sign} = $1 || '+';
+        $self->{_m} = $MBI->_new($2);
+        return $self->round(@r) if !$downgrade;
     }
 
   my ($mis,$miv,$mfv,$es,$ev) = Math::BigInt::_split($wanted);
@@ -220,10 +243,10 @@ sub new
       }
     $self->{sign} = $$mis;
 
-    # for something like 0Ey, set y to 1, and -0 => +0
+    # for something like 0Ey, set y to 0, and -0 => +0
     # Check $$miv for being '0' and $$mfv eq '', because otherwise _m could not
     # have become 0. That's faster than to call $MBI->_is_zero().
-    $self->{sign} = '+', $self->{_e} = $MBI->_one()
+    $self->{sign} = '+', $self->{_e} = $MBI->_zero()
      if $$miv eq '0' and $$mfv eq '';
 
     return $self->round(@r) if !$downgrade;
@@ -241,34 +264,26 @@ sub new
   $self->bnorm()->round(@r);			# first normalize, then round
   }
 
-sub copy
-  {
-  # if two arguments, the first one is the class to "swallow" subclasses
-  if (@_ > 1)
-    {
-    my  $self = bless {
-	sign => $_[1]->{sign}, 
-	_es => $_[1]->{_es}, 
-	_m => $MBI->_copy($_[1]->{_m}),
-	_e => $MBI->_copy($_[1]->{_e}),
-    }, $_[0] if @_ > 1;
-
-    $self->{_a} = $_[1]->{_a} if defined $_[1]->{_a};
-    $self->{_p} = $_[1]->{_p} if defined $_[1]->{_p};
-    return $self;
-    }
+sub copy {
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
 
-  my $self = bless {
-	sign => $_[0]->{sign}, 
-	_es => $_[0]->{_es}, 
-	_m => $MBI->_copy($_[0]->{_m}),
-	_e => $MBI->_copy($_[0]->{_e}),
-	}, ref($_[0]);
+    # If called as a class method, the object to copy is the next argument.
 
-  $self->{_a} = $_[0]->{_a} if defined $_[0]->{_a};
-  $self->{_p} = $_[0]->{_p} if defined $_[0]->{_p};
-  $self;
-  }
+    $self = shift() unless $selfref;
+
+    my $copy = bless {}, $class;
+
+    $copy->{sign} = $self->{sign};
+    $copy->{_es}  = $self->{_es};
+    $copy->{_m}   = $MBI->_copy($self->{_m});
+    $copy->{_e}   = $MBI->_copy($self->{_e});
+    $copy->{_a}   = $self->{_a} if exists $self->{_a};
+    $copy->{_p}   = $self->{_p} if exists $self->{_p};
+
+    return $copy;
+}
 
 sub _bnan
   {
@@ -318,11 +333,11 @@ sub _bone
 
 sub _bzero
   {
-  # used by parent class bone() to initialize number to 0
+  # used by parent class bzero() to initialize number to 0
   my $self = shift;
   $IMPORT=1;					# call our import only once
   $self->{_m} = $MBI->_zero();
-  $self->{_e} = $MBI->_one();
+  $self->{_e} = $MBI->_zero();
   $self->{_es} = '+';
   }
 
@@ -437,10 +452,23 @@ sub bsstr
     
 sub numify 
   {
-  # Convert a Perl scalar number from a BigFloat object.
-  # Create a string and let Perl's atoi()/atof() handle the rest.
+  # Make a Perl scalar number from a Math::BigFloat object.
   my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
-  return 0 + $x->bsstr(); 
+
+  if ($x -> is_nan()) {
+      require Math::Complex;
+      my $inf = Math::Complex::Inf();
+      return $inf - $inf;
+  }
+
+  if ($x -> is_inf()) {
+      require Math::Complex;
+      my $inf = Math::Complex::Inf();
+      return $x -> is_negative() ? -$inf : $inf;
+  }
+
+  # Create a string and let Perl's atoi()/atof() handle the rest.
+  return 0 + $x -> bsstr();
   }
 
 ##############################################################################
@@ -860,19 +888,24 @@ sub blog
   {
   my ($self,$x,$base,$a,$p,$r) = ref($_[0]) ? (ref($_[0]),@_) : objectify(1,@_);
 
+  # If called as $x -> blog() or $x -> blog(undef), don't objectify the
+  # undefined base, since undef signals that the base is Euler's number.
+  #unless (ref($x) && !defined($base)) {
+  #    # objectify is costly, so avoid it
+  #    if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1]))) {
+  #        ($self,$x,$base,$a,$p,$r) = objectify(2,@_);
+  #    }
+  #}
+
   return $x if $x->modify('blog');
 
-  # $base > 0, $base != 1; if $base == undef default to $base == e
-  # $x >= 0
+  return $x -> bnan() if $x -> is_nan();
 
   # we need to limit the accuracy to protect against overflow
   my $fallback = 0;
   my ($scale,@params);
   ($x,@params) = $x->_find_round_parameters($a,$p,$r);
 
-  # also takes care of the "error in _find_round_parameters?" case
-  return $x->bnan() if $x->{sign} ne '+' || $x->is_zero();
-
   # no rounding at all, so must use fallback
   if (scalar @params == 0)
     {
@@ -890,28 +923,62 @@ sub blog
     $scale = abs($params[0] || $params[1]) + 4;	# take whatever is defined
     }
 
-  return $x->bzero(@params) if $x->is_one();
-  # base not defined => base == Euler's number e
-  if (defined $base)
-    {
-    # make object, since we don't feed it through objectify() to still get the
-    # case of $base == undef
-    $base = $self->new($base) unless ref($base);
-    # $base > 0; $base != 1
-    return $x->bnan() if $base->is_zero() || $base->is_one() ||
-      $base->{sign} ne '+';
-    # if $x == $base, we know the result must be 1.0
-    if ($x->bcmp($base) == 0)
-      {
-      $x->bone('+',@params);
-      if ($fallback)
-        {
+  my $done = 0;
+  if (defined $base) {
+      $base = $self -> new($base) unless ref $base;
+      if ($base -> is_nan() || $base -> is_one()) {
+          $x -> bnan();
+          $done = 1;
+      } elsif ($base -> is_inf() || $base -> is_zero()) {
+          if ($x -> is_inf() || $x -> is_zero()) {
+              $x -> bnan();
+          } else {
+              $x -> bzero(@params);
+          }
+          $done = 1;
+      } elsif ($base -> is_negative()) {        # -inf < base < 0
+          if ($x -> is_one()) {                 #     x = 1
+              $x -> bzero(@params);
+          } elsif ($x == $base) {
+              $x -> bone('+', @params);         #     x = base
+          } else {
+              $x -> bnan();                     #     otherwise
+          }
+          $done = 1;
+      } elsif ($x == $base) {
+          $x -> bone('+', @params);             # 0 < base && 0 < x < inf
+          $done = 1;
+      }
+  }
+
+  # We now know that the base is either undefined or positive and finite.
+
+  unless ($done) {
+      if ($x -> is_inf()) {             #   x = +/-inf
+          my $sign = defined $base && $base < 1 ? '-' : '+';
+          $x -> binf($sign);
+          $done = 1;
+      } elsif ($x -> is_neg()) {        #   -inf < x < 0
+          $x -> bnan();
+          $done = 1;
+      } elsif ($x -> is_one()) {        #   x = 1
+          $x -> bzero(@params);
+          $done = 1;
+      } elsif ($x -> is_zero()) {       #   x = 0
+          my $sign = defined $base && $base < 1 ? '+' : '-';
+          $x -> binf($sign);
+          $done = 1;
+      }
+  }
+
+  if ($done) {
+      if ($fallback) {
         # clear a/p after round, since user did not request it
-        delete $x->{_a}; delete $x->{_p};
+          delete $x->{_a};
+          delete $x->{_p};
         }
       return $x;
       }
-    }
 
   # when user set globals, they would interfere with our calculation, so
   # disable them and later re-enable them
@@ -933,7 +1000,7 @@ sub blog
     $self = ref($x);
     }
   
-  my $done = 0;
+  $done = 0;
 
   # If the base is defined and an integer, try to calculate integer result
   # first. This is very fast, and in case the real result was found, we can
@@ -1197,8 +1264,22 @@ sub bexp
   # $x contains now an estimate of e, with some surplus digits, so we can round
   if (!$x_org->is_one())
     {
-    # raise $x to the wanted power and round it in one step:
-    $x->bpow($x_org, @params);
+    # Reduce size of fractional part, followup with integer power of two.
+    my $lshift = 0;
+    while ($lshift < 30 && $x_org->bacmp(2 << $lshift) > 0)
+      {
+        $lshift++;
+      }
+    # Raise $x to the wanted power and round it.
+    if ($lshift == 0)
+      {
+        $x->bpow($x_org, @params);
+      }
+    else
+      {
+        my($mul, $rescale) = (1 << $lshift, $scale+1+$lshift);
+        $x->bpow(scalar $x_org->bdiv($mul,$rescale),$rescale)->bpow($mul, @params);
+      }
     }
   else
     {
@@ -1263,7 +1344,7 @@ sub _log
   $over->bmul($u);
   $factor = $self->new(3); $f = $self->new(2);
 
-  my $steps = 0 if DEBUG;  
+  my $steps = 0;
   $limit = $self->new("1E-". ($scale-1));
   while (3 < 5)
     {
@@ -1476,6 +1557,7 @@ sub _log_10
     {
     $twos++; $x->bdiv($two,$scale+4);		# keep all digits
     }
+  $x->bround($scale+4);
   # $twos > 0 => did mul 2, < 0 => did div 2 (but we never did both)
   # So calculate correction factor based on ln(2):
   if ($twos != 0)
@@ -1557,49 +1639,46 @@ sub bgcd
 
 ##############################################################################
 
-sub _e_add
-  {
-  # Internal helper sub to take two positive integers and their signs and
-  # then add them. Input ($CALC,$CALC,('+'|'-'),('+'|'-')), 
-  # output ($CALC,('+'|'-'))
-  my ($x,$y,$xs,$ys) = @_;
-
-  # if the signs are equal we can add them (-5 + -3 => -(5 + 3) => -8)
-  if ($xs eq $ys)
-    {
-    $x = $MBI->_add ($x, $y );		# a+b
-    # the sign follows $xs
-    return ($x, $xs);
+sub _e_add {
+    # Internal helper sub to take two positive integers and their signs and
+    # then add them. Input ($CALC, $CALC, ('+'|'-'), ('+'|'-')), output
+    # ($CALC, ('+'|'-')).
+
+    my ($x, $y, $xs, $ys) = @_;
+
+    # if the signs are equal we can add them (-5 + -3 => -(5 + 3) => -8)
+    if ($xs eq $ys) {
+        $x = $MBI->_add($x, $y);                # +a + +b or -a + -b
+    } else {
+        my $a = $MBI->_acmp($x, $y);
+        if ($a == 0) {
+            # This does NOT modify $x in-place. TODO: Fix this?
+            $x = $MBI->_zero();                 # result is 0
+            $xs = '+';
+            return ($x, $xs);
+        }
+        if ($a > 0) {
+            $x = $MBI->_sub($x, $y);            # abs sub
+        } else {                                # a < 0
+            $x = $MBI->_sub ( $y, $x, 1 );      # abs sub
+            $xs = $ys;
+        }
     }
 
-  my $a = $MBI->_acmp($x,$y);
-  if ($a > 0)
-    {
-    $x = $MBI->_sub ($x , $y);				# abs sub
-    }
-  elsif ($a == 0)
-    {
-    $x = $MBI->_zero();					# result is 0
-    $xs = '+';
-    }
-  else # a < 0
-    {
-    $x = $MBI->_sub ( $y, $x, 1 );			# abs sub
-    $xs = $ys;
-    }
-  ($x,$xs);
-  }
+    $xs = '+' if $xs eq '-' && $MBI->_is_zero($x);      # no "-0"
 
-sub _e_sub
-  {
+    return ($x, $xs);
+}
+
+sub _e_sub {
   # Internal helper sub to take two positive integers and their signs and
   # then subtract them. Input ($CALC,$CALC,('+'|'-'),('+'|'-')), 
   # output ($CALC,('+'|'-'))
   my ($x,$y,$xs,$ys) = @_;
 
   # flip sign
-  $ys =~ tr/+-/-+/;
-  _e_add($x,$y,$xs,$ys);		# call add (does subtract now)
+    $ys = $ys eq '+' ? '-' : '+';       # swap sign of second operand ...
+    _e_add($x, $y, $xs, $ys);           # ... and let _e_add() do the job
   }
 
 ###############################################################################
@@ -1776,7 +1855,7 @@ sub bmuladd
 sub bdiv 
   {
   # (dividend: BFLOAT or num_str, divisor: BFLOAT or num_str) return 
-  # (BFLOAT,BFLOAT) (quo,rem) or BFLOAT (only rem)
+    # (BFLOAT, BFLOAT) (quo, rem) or BFLOAT (only quo)
 
   # set up parameters
   my ($self,$x,$y,$a,$p,$r) = (ref($_[0]),@_);
@@ -1788,10 +1867,80 @@ sub bdiv
 
   return $x if $x->modify('bdiv');
 
-  return $self->_div_inf($x,$y)
-   if (($x->{sign} !~ /^[+-]$/) || ($y->{sign} !~ /^[+-]$/) || $y->is_zero());
+    my $wantarray = wantarray;          # call only once
+
+    # At least one argument is NaN. This is handled the same way as in
+    # Math::BigInt -> bdiv().
+
+    if ($x -> is_nan() || $y -> is_nan()) {
+        return $wantarray ? ($x -> bnan(), $self -> bnan()) : $x -> bnan();
+    }
+
+    # Divide by zero and modulo zero. This is handled the same way as in
+    # Math::BigInt -> bdiv(). See the comment in the code for Math::BigInt ->
+    # bdiv() for further details.
 
-  # x== 0 # also: or y == 1 or y == -1
+    if ($y -> is_zero()) {
+        my ($quo, $rem);
+        if ($wantarray) {
+            $rem = $x -> copy();
+        }
+        if ($x -> is_zero()) {
+            $quo = $x -> bnan();
+        } else {
+            $quo = $x -> binf($x -> {sign});
+        }
+        return $wantarray ? ($quo, $rem) : $quo;
+    }
+
+    # Numerator (dividend) is +/-inf. This is handled the same way as in
+    # Math::BigInt -> bdiv(). See the comment in the code for Math::BigInt ->
+    # bdiv() for further details.
+
+    if ($x -> is_inf()) {
+        my ($quo, $rem);
+        $rem = $self -> bnan() if $wantarray;
+        if ($y -> is_inf()) {
+            $quo = $x -> bnan();
+        } else {
+            my $sign = $x -> bcmp(0) == $y -> bcmp(0) ? '+' : '-';
+            $quo = $x -> binf($sign);
+        }
+        return $wantarray ? ($quo, $rem) : $quo;
+    }
+
+  # Denominator (divisor) is +/-inf. This is handled the same way as in
+  # Math::BigInt -> bdiv(), with one exception: In scalar context,
+  # Math::BigFloat does true division (although rounded), not floored division
+  # (F-division), so a finite number divided by +/-inf is always zero. See the
+  # comment in the code for Math::BigInt -> bdiv() for further details.
+
+  if ($y -> is_inf()) {
+      my ($quo, $rem);
+      if ($wantarray) {
+          if ($x -> is_zero() || $x -> bcmp(0) == $y -> bcmp(0)) {
+              $rem = $x -> copy();
+              $quo = $x -> bzero();
+          } else {
+              $rem = $self -> binf($y -> {sign});
+              $quo = $x -> bone('-');
+          }
+          return ($quo, $rem);
+      } else {
+        if ($y -> is_inf()) {
+            if ($x -> is_nan() || $x -> is_inf()) {
+                return $x -> bnan();
+            } else {
+                return $x -> bzero();
+            }
+        }
+    }
+    }
+
+  # At this point, both the numerator and denominator are finite numbers, and
+  # the denominator (divisor) is non-zero.
+
+  # x == 0?
   return wantarray ? ($x,$self->bzero()) : $x if $x->is_zero();
 
   # upgrade ?
@@ -1805,33 +1954,30 @@ sub bdiv
   return $x if $x->is_nan();		# error in _find_round_parameters?
 
   # no rounding at all, so must use fallback
-  if (scalar @params == 0)
+    if (scalar @params == 0)
     {
     # simulate old behaviour
     $params[0] = $self->div_scale();	# and round to it as accuracy
     $scale = $params[0]+4; 		# at least four more for proper round
     $params[2] = $r;			# round mode by caller or undef
     $fallback = 1;			# to clear a/p afterwards
-    }
-  else
-    {
+    } else {
     # the 4 below is empirical, and there might be cases where it is not
     # enough...
     $scale = abs($params[0] || $params[1]) + 4;	# take whatever is defined
     }
 
-  my $rem; $rem = $self->bzero() if wantarray;
+    my $rem;
+    $rem = $self -> bzero() if wantarray;
 
   $y = $self->new($y) unless $y->isa('Math::BigFloat');
 
-  my $lx = $MBI->_len($x->{_m}); my $ly = $MBI->_len($y->{_m});
+  my $lx = $MBI -> _len($x->{_m}); my $ly = $MBI -> _len($y->{_m});
   $scale = $lx if $lx > $scale;
   $scale = $ly if $ly > $scale;
   my $diff = $ly - $lx;
   $scale += $diff if $diff > 0;		# if lx << ly, but not if ly << lx!
 
-  # already handled inf/NaN/-inf above:
-
   # check that $y is not 1 nor -1 and cache the result:
   my $y_not_one = !($MBI->_is_zero($y->{_e}) && $MBI->_is_one($y->{_m}));
 
@@ -1899,7 +2045,7 @@ sub bdiv
     {
     if ($y_not_one)
       {
-      $x -> bint();
+      $x -> bfloor();
       $rem->bmod($y,@params);			# copy already done
       }
     if ($fallback)
@@ -1926,34 +2072,54 @@ sub bmod
 
   return $x if $x->modify('bmod');
 
-  # handle NaN, inf, -inf
-  if (($x->{sign} !~ /^[+-]$/) || ($y->{sign} !~ /^[+-]$/))
-    {
-    my ($d,$re) = $self->SUPER::_div_inf($x,$y);
-    $x->{sign} = $re->{sign};
-    $x->{_e} = $re->{_e};
-    $x->{_m} = $re->{_m};
-    return $x->round($a,$p,$r,$y);
+    # At least one argument is NaN. This is handled the same way as in
+    # Math::BigInt -> bmod().
+
+    if ($x -> is_nan() || $y -> is_nan()) {
+        return $x -> bnan();
     } 
-  if ($y->is_zero())
-    {
-    return $x->bnan() if $x->is_zero();
+
+    # Modulo zero. This is handled the same way as in Math::BigInt -> bmod().
+
+    if ($y -> is_zero()) {
     return $x;
     }
 
+    # Numerator (dividend) is +/-inf. This is handled the same way as in
+    # Math::BigInt -> bmod().
+
+    if ($x -> is_inf()) {
+        return $x -> bnan();
+    }
+
+    # Denominator (divisor) is +/-inf. This is handled the same way as in
+    # Math::BigInt -> bmod().
+
+    if ($y -> is_inf()) {
+        if ($x -> is_zero() || $x -> bcmp(0) == $y -> bcmp(0)) {
+            return $x;
+        } else {
+            return $x -> binf($y -> sign());
+        }
+    }
+
   return $x->bzero() if $x->is_zero()
  || ($x->is_int() &&
   # check that $y == +1 or $y == -1:
     ($MBI->_is_zero($y->{_e}) && $MBI->_is_one($y->{_m})));
 
   my $cmp = $x->bacmp($y);			# equal or $x < $y?
-  return $x->bzero($a,$p) if $cmp == 0;		# $x == $y => result 0
+    if ($cmp == 0) {                            # $x == $y => result 0
+        return $x -> bzero($a, $p);
+    }
 
   # only $y of the operands negative? 
-  my $neg = 0; $neg = 1 if $x->{sign} ne $y->{sign};
+    my $neg = $x->{sign} ne $y->{sign} ? 1 : 0;
 
   $x->{sign} = $y->{sign};				# calc sign first
-  return $x->round($a,$p,$r) if $cmp < 0 && $neg == 0;	# $x < $y => result $x
+    if ($cmp < 0 && $neg == 0) {                # $x < $y => result $x
+        return $x -> round($a, $p, $r);
+    }
   
   my $ym = $MBI->_copy($y->{_m});
   
@@ -1996,7 +2162,7 @@ sub bmod
   $x->{sign} = '+' if $MBI->_is_zero($x->{_m});		# fix sign for -0
   $x->bnorm();
 
-  if ($neg != 0)	# one of them negative => correct in place
+    if ($neg != 0 && ! $x -> is_zero())   # one of them negative => correct in place
     {
     my $r = $y - $x;
     $x->{_m} = $r->{_m};
@@ -2394,6 +2560,8 @@ sub _pow
   my ($limit,$v,$u,$below,$factor,$next,$over);
 
   $u = $x->copy()->blog(undef,$scale)->bmul($y);
+  my $do_invert = ($u->{sign} eq '-');
+  $u->bneg()  if $do_invert;
   $v = $self->bone();				# 1
   $factor = $self->new(2);			# 2
   $x->bone();					# first term: 1
@@ -2418,6 +2586,12 @@ sub _pow
 
     #$steps++;
     }
+
+  if ($do_invert)
+    {
+    my $x_copy = $x->copy;
+    $x->bone->bdiv($x_copy, $scale);
+    }
   
   # shortcut to not run through _find_round_parameters again
   if (defined $params[0])
@@ -2666,66 +2840,175 @@ sub _atan_inv
   ($a,$b);
   }
 
-sub bpi
-  {
-  my ($self,$n) = @_;
-  if (@_ == 0)
-    {
-    $self = $class;
-    }
-  if (@_ == 1)
-    {
-    # called like Math::BigFloat::bpi(10);
-    $n = $self; $self = $class;
-    # called like Math::BigFloat->bpi();
-    $n = undef if $n eq 'Math::BigFloat';
-    }
-  $self = ref($self) if ref($self);
-  my $fallback = defined $n ? 0 : 1;
-  $n = 40 if !defined $n || $n < 1;
-
-  # after 黃見利 (Hwang Chien-Lih) (1997)
-  # pi/4 = 183 * atan(1/239) + 32 * atan(1/1023) – 68 * atan(1/5832)
-  #	 + 12 * atan(1/110443) - 12 * atan(1/4841182) - 100 * atan(1/6826318)
-
-  # a few more to prevent rounding errors
-  $n += 4;
-
-  my ($a,$b) = $self->_atan_inv( $MBI->_new(239),$n);
-  my ($c,$d) = $self->_atan_inv( $MBI->_new(1023),$n);
-  my ($e,$f) = $self->_atan_inv( $MBI->_new(5832),$n);
-  my ($g,$h) = $self->_atan_inv( $MBI->_new(110443),$n);
-  my ($i,$j) = $self->_atan_inv( $MBI->_new(4841182),$n);
-  my ($k,$l) = $self->_atan_inv( $MBI->_new(6826318),$n);
-
-  $MBI->_mul($a, $MBI->_new(732));
-  $MBI->_mul($c, $MBI->_new(128));
-  $MBI->_mul($e, $MBI->_new(272));
-  $MBI->_mul($g, $MBI->_new(48));
-  $MBI->_mul($i, $MBI->_new(48));
-  $MBI->_mul($k, $MBI->_new(400));
-
-  my $x = $self->bone(); $x->{_m} = $a; my $x_d = $self->bone(); $x_d->{_m} = $b;
-  my $y = $self->bone(); $y->{_m} = $c; my $y_d = $self->bone(); $y_d->{_m} = $d;
-  my $z = $self->bone(); $z->{_m} = $e; my $z_d = $self->bone(); $z_d->{_m} = $f;
-  my $u = $self->bone(); $u->{_m} = $g; my $u_d = $self->bone(); $u_d->{_m} = $h;
-  my $v = $self->bone(); $v->{_m} = $i; my $v_d = $self->bone(); $v_d->{_m} = $j;
-  my $w = $self->bone(); $w->{_m} = $k; my $w_d = $self->bone(); $w_d->{_m} = $l;
-  $x->bdiv($x_d, $n);
-  $y->bdiv($y_d, $n);
-  $z->bdiv($z_d, $n);
-  $u->bdiv($u_d, $n);
-  $v->bdiv($v_d, $n);
-  $w->bdiv($w_d, $n);
-
-  delete $x->{_a}; delete $y->{_a}; delete $z->{_a};
-  delete $u->{_a}; delete $v->{_a}; delete $w->{_a};
-  $x->badd($y)->bsub($z)->badd($u)->bsub($v)->bsub($w);
-
-  $x->bround($n-4);
-  delete $x->{_a} if $fallback == 1;
-  $x;
-  }
+sub bpi {
+
+    # Called as                 Argument list
+    # ---------                 -------------
+    # Math::BigFloat->bpi()     ("Math::BigFloat")
+    # Math::BigFloat->bpi(10)   ("Math::BigFloat", 10)
+    # $x->bpi()                 ($x)
+    # $x->bpi(10)               ($x, 10)
+    # Math::BigFloat::bpi()     ()
+    # Math::BigFloat::bpi(10)   (10)
+    #
+    # In ambiguous cases, we favour the OO-style, so the following case
+    #
+    #   $n = Math::BigFloat->new("10");
+    #   $x = Math::BigFloat->bpi($n);
+    #
+    # which gives an argument list with the single element $n, is resolved as
+    #
+    #   $n->bpi();
+
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
+
+    my $accu;                      # accuracy (number of digits)
+    my $prec;                      # precision
+    my $rndm;                      # round mode
+
+    # If bpi() is called as a function ...
+    #
+    # This cludge is necessary because we still support bpi() as a function. If
+    # bpi() is called with either no argument or one argument, and that one
+    # argument is either undefined or a scalar that looks like a number, then
+    # we assume bpi() is called as a function.
+
+    if (@_ == 0 &&
+        (defined($self) && !ref($self) && $self =~ /^\s*[+-]?\d/i)
+          ||
+        !defined($self))
+    {
+        $accu = $self;
+        $class = __PACKAGE__;
+        $self = $class -> bzero();      # initialize
+    }
+
+    # ... or if bpi() is called as a method ...
+
+    else {
+        if ($selfref) {                 # bpi() called as instance method
+            return $self if $self -> modify('bpi');
+        } else {                        # bpi() called as class method
+            $self = $class -> bzero();  # initialize
+        }
+        $accu = shift;
+        $prec = shift;
+        $rndm = shift;
+    }
+
+    my @r = ($accu, $prec, $rndm);
+
+    # We need to limit the accuracy to protect against overflow.
+    my $fallback = 0;
+    my ($scale, @params);
+    ($self, @params) = $self -> _find_round_parameters(@r);
+
+    # Error in _find_round_parameters?
+    #
+    # We can't return here, because that will fail if $self was a NaN when
+    # bpi() was invoked, and we want to assign pi to $x. It is probably not a
+    # good idea that _find_round_parameters() signals invalid round parameters
+    # by silently returning a NaN. Fixme!
+    #return $self if $self && $self->is_nan();
+
+    # No rounding at all, so must use fallback.
+    if (scalar @params == 0) {
+        # Simulate old behaviour
+        $params[0] = $self -> div_scale();  # and round to it as accuracy
+        $params[1] = undef;                 # disable P
+        $params[2] = $r[2];                 # round mode by caller or undef
+        $fallback = 1;                      # to clear a/p afterwards
+    }
+
+    # The accuracy, i.e., the number of digits. Pi has one digit before the
+    # dot, so a precision of 4 digits is equivalent to an accuracy of 5 digits.
+
+    my $n = $params[0] || 1 - $params[1];
+
+    if ($n < 1000) {
+
+        # after 黃見利 (Hwang Chien-Lih) (1997)
+        # pi/4 = 183 * atan(1/239) + 32 * atan(1/1023) – 68 * atan(1/5832)
+        #        + 12 * atan(1/110443) - 12 * atan(1/4841182) - 100 * atan(1/6826318)
+
+        # Use a few more digits in the intermediate computations.
+
+        my $nextra = $n < 800 ? 4 : 5;
+        $n += $nextra;
+
+        my ($a, $b) = $class->_atan_inv($MBI->_new(239), $n);
+        my ($c, $d) = $class->_atan_inv($MBI->_new(1023), $n);
+        my ($e, $f) = $class->_atan_inv($MBI->_new(5832), $n);
+        my ($g, $h) = $class->_atan_inv($MBI->_new(110443), $n);
+        my ($i, $j) = $class->_atan_inv($MBI->_new(4841182), $n);
+        my ($k, $l) = $class->_atan_inv($MBI->_new(6826318), $n);
+
+        $MBI->_mul($a, $MBI->_new(732));
+        $MBI->_mul($c, $MBI->_new(128));
+        $MBI->_mul($e, $MBI->_new(272));
+        $MBI->_mul($g, $MBI->_new(48));
+        $MBI->_mul($i, $MBI->_new(48));
+        $MBI->_mul($k, $MBI->_new(400));
+
+        my $x = $class->bone(); $x->{_m} = $a; my $x_d = $class->bone(); $x_d->{_m} = $b;
+        my $y = $class->bone(); $y->{_m} = $c; my $y_d = $class->bone(); $y_d->{_m} = $d;
+        my $z = $class->bone(); $z->{_m} = $e; my $z_d = $class->bone(); $z_d->{_m} = $f;
+        my $u = $class->bone(); $u->{_m} = $g; my $u_d = $class->bone(); $u_d->{_m} = $h;
+        my $v = $class->bone(); $v->{_m} = $i; my $v_d = $class->bone(); $v_d->{_m} = $j;
+        my $w = $class->bone(); $w->{_m} = $k; my $w_d = $class->bone(); $w_d->{_m} = $l;
+        $x->bdiv($x_d, $n);
+        $y->bdiv($y_d, $n);
+        $z->bdiv($z_d, $n);
+        $u->bdiv($u_d, $n);
+        $v->bdiv($v_d, $n);
+        $w->bdiv($w_d, $n);
+
+        delete $x->{_a}; delete $y->{_a}; delete $z->{_a};
+        delete $u->{_a}; delete $v->{_a}; delete $w->{_a};
+        $x->badd($y)->bsub($z)->badd($u)->bsub($v)->bsub($w);
+
+        for my $key (qw/ sign _m _es _e _a _p /) {
+            $self -> {$key} = $x -> {$key} if exists $x -> {$key};
+        }
+
+    } else {
+
+        # For large accuracy, the arctan formulas become very inefficient with
+        # Math::BigFloat. Switch to Brent-Salamin (aka AGM or Gauss-Legendre).
+
+        # Use a few more digits in the intermediate computations.
+        my $nextra = 8;
+
+        $HALF = $class -> new($HALF) unless ref($HALF);
+        my ($an, $bn, $tn, $pn) = ($class -> bone, $HALF -> copy -> bsqrt($n),
+                                   $HALF -> copy -> bmul($HALF), $class -> bone);
+        while ($pn < $n) {
+            my $prev_an = $an -> copy;
+            $an -> badd($bn) -> bmul($HALF, $n);
+            $bn -> bmul($prev_an) -> bsqrt($n);
+            $prev_an -> bsub($an);
+            $tn -> bsub($pn * $prev_an * $prev_an);
+            $pn -> badd($pn);
+        }
+        $an -> badd($bn);
+        $an -> bmul($an, $n) -> bdiv(4 * $tn, $n);
+
+        for my $key (qw/ sign _m _es _e _a _p /) {
+            $self -> {$key} = $an -> {$key} if exists $an -> {$key};;
+        }
+    }
+
+    $self -> round(@params);
+
+    if ($fallback) {
+        delete $self->{_a};
+        delete $self->{_p};
+    }
+
+    return $self;
+}
 
 sub bcos
   {
@@ -2924,334 +3207,261 @@ sub bsin
   $x;
   }
 
-sub batan2
-  { 
-  # calculate arcus tangens of ($y/$x)
-  
-  # set up parameters
-  my ($self,$y,$x,@r) = (ref($_[0]),@_);
-  # objectify is costly, so avoid it
-  if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1])))
-    {
-    ($self,$y,$x,@r) = objectify(2,@_);
+sub batan2 {
+    # $y -> batan2($x) returns the arcus tangens of $y / $x.
+
+    # Set up parameters.
+    my ($self, $y, $x, @r) = (ref($_[0]), @_);
+
+    # Objectify is costly, so avoid it if we can.
+    if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1]))) {
+        ($self, $y, $x, @r) = objectify(2, @_);
     }
 
-  return $y if $y->modify('batan2');
+    # Quick exit if $y is read-only.
+    return $y if $y -> modify('batan2');
 
-  return $y->bnan() if ($y->{sign} eq $nan) || ($x->{sign} eq $nan);
+    # Handle all NaN cases.
+    return $y -> bnan() if $x->{sign} eq $nan || $y->{sign} eq $nan;
 
-  # Y X
-  # 0 0 result is 0
-  # 0 +x result is 0
-  # ? inf result is 0
-  return $y->bzero(@r) if ($x->is_inf('+') && !$y->is_inf()) || ($y->is_zero() && $x->{sign} eq '+');
+    # We need to limit the accuracy to protect against overflow.
+    my $fallback = 0;
+    my ($scale, @params);
+    ($y, @params) = $y -> _find_round_parameters(@r);
 
-  # Y    X
-  # != 0 -inf result is +- pi
-  if ($x->is_inf() || $y->is_inf())
-    {
-    # calculate PI
-    my $pi = $self->bpi(@r);
-    if ($y->is_inf())
-      {
-      # upgrade to BigRat etc. 
-      return $upgrade->new($y)->batan2($upgrade->new($x),@r) if defined $upgrade;
-      if ($x->{sign} eq '-inf')
-        {
-        # calculate 3 pi/4
-        $MBI->_mul($pi->{_m}, $MBI->_new(3));
-        $MBI->_div($pi->{_m}, $MBI->_new(4));
-        }
-      elsif ($x->{sign} eq '+inf')
-	{
-        # calculate pi/4
-        $MBI->_div($pi->{_m}, $MBI->_new(4));
-	}
-      else
-        {
-        # calculate pi/2
-        $MBI->_div($pi->{_m}, $MBI->_new(2));
-        }
-      $y->{sign} = substr($y->{sign},0,1); # keep +/-
-      }
-    # modify $y in place
-    $y->{_m} = $pi->{_m};
-    $y->{_e} = $pi->{_e};
-    $y->{_es} = $pi->{_es};
-    # keep the sign of $y
-    return $y;
-    }
+    # Error in _find_round_parameters?
+    return $y if $y->is_nan();
 
-  return $upgrade->new($y)->batan2($upgrade->new($x),@r) if defined $upgrade;
+    # No rounding at all, so must use fallback.
+    if (scalar @params == 0) {
+        # Simulate old behaviour
+        $params[0] = $self -> div_scale();  # and round to it as accuracy
+        $params[1] = undef;                 # disable P
+        $scale = $params[0] + 4;            # at least four more for proper round
+        $params[2] = $r[2];                 # round mode by caller or undef
+        $fallback = 1;                      # to clear a/p afterwards
+    } else {
+        # The 4 below is empirical, and there might be cases where it is not
+        # enough ...
+        $scale = abs($params[0] || $params[1]) + 4; # take whatever is defined
+    }
 
-  # Y X
-  # 0 -x result is PI
-  if ($y->is_zero())
-    {
-    # calculate PI
-    my $pi = $self->bpi(@r);
-    # modify $y in place
-    $y->{_m} = $pi->{_m};
-    $y->{_e} = $pi->{_e};
-    $y->{_es} = $pi->{_es};
-    $y->{sign} = '+';
-    return $y;
+    if ($x -> is_inf("+")) {                            # x = inf
+        if ($y -> is_inf("+")) {                        #    y = inf
+            $y -> bpi($scale) -> bmul("0.25");          #       pi/4
+        } elsif ($y -> is_inf("-")) {                   #    y = -inf
+            $y -> bpi($scale) -> bmul("-0.25");         #       -pi/4
+        } else {                                        #    -inf < y < inf
+            return $y -> bzero(@r);                     #       0
+        }
     }
 
-  # Y X
-  # +y 0 result is PI/2
-  # -y 0 result is -PI/2
-  if ($x->is_zero())
-    {
-    # calculate PI/2
-    my $pi = $self->bpi(@r);
-    # modify $y in place
-    $y->{_m} = $pi->{_m};
-    $y->{_e} = $pi->{_e};
-    $y->{_es} = $pi->{_es};
-    # -y => -PI/2, +y => PI/2
-    $MBI->_div($y->{_m}, $MBI->_new(2));
-    return $y;
+    elsif ($x -> is_inf("-")) {                         # x = -inf
+        if ($y -> is_inf("+")) {                        #    y = inf
+            $y -> bpi($scale) -> bmul("0.75");          #       3/4 pi
+        } elsif ($y -> is_inf("-")) {                   #    y = -inf
+            $y -> bpi($scale) -> bmul("-0.75");         #       -3/4 pi
+        } elsif ($y >= 0) {                             #    y >= 0
+            $y -> bpi($scale);                          #       pi
+        } else {                                        #    y < 0
+            $y -> bpi($scale) -> bneg();                #       -pi
+        }
     }
 
-  # we need to limit the accuracy to protect against overflow
-  my $fallback = 0;
-  my ($scale,@params);
-  ($y,@params) = $y->_find_round_parameters(@r);
-    
-  # error in _find_round_parameters?
-  return $y if $y->is_nan();
+    elsif ($x > 0) {                                    # 0 < x < inf
+        if ($y -> is_inf("+")) {                        #    y = inf
+            $y -> bpi($scale) -> bmul("0.5");           #       pi/2
+        } elsif ($y -> is_inf("-")) {                   #    y = -inf
+            $y -> bpi($scale) -> bmul("-0.5");          #       -pi/2
+        } else {                                        #   -inf < y < inf
+            $y -> bdiv($x, $scale) -> batan($scale);    #       atan(y/x)
+        }
+    }
 
-  # no rounding at all, so must use fallback
-  if (scalar @params == 0)
-    {
-    # simulate old behaviour
-    $params[0] = $self->div_scale();	# and round to it as accuracy
-    $params[1] = undef;			# disable P
-    $scale = $params[0]+4; 		# at least four more for proper round
-    $params[2] = $r[2];			# round mode by caller or undef
-    $fallback = 1;			# to clear a/p afterwards
+    elsif ($x < 0) {                                    # -inf < x < 0
+        my $pi = $class -> bpi($scale);
+        if ($y >= 0) {                                  #    y >= 0
+            $y -> bdiv($x, $scale) -> batan()           #       atan(y/x) + pi
+               -> badd($pi);
+        } else {                                        #    y < 0
+            $y -> bdiv($x, $scale) -> batan()           #       atan(y/x) - pi
+               -> bsub($pi);
+        }
     }
-  else
-    {
-    # the 4 below is empirical, and there might be cases where it is not
-    # enough...
-    $scale = abs($params[0] || $params[1]) + 4; # take whatever is defined
+
+    else {                                              # x = 0
+        if ($y > 0) {                                   #    y > 0
+            $y -> bpi($scale) -> bmul("0.5");           #       pi/2
+        } elsif ($y < 0) {                              #    y < 0
+            $y -> bpi($scale) -> bmul("-0.5");          #       -pi/2
+        } else {                                        #    y = 0
+            return $y -> bzero(@r);                     #       0
+        }
     }
 
-  # inlined is_one() && is_one('-')
-  if ($MBI->_is_one($y->{_m}) && $MBI->_is_zero($y->{_e}))
-    {
-    # shortcut: 1 1 result is PI/4
-    # inlined is_one() && is_one('-')
-    if ($MBI->_is_one($x->{_m}) && $MBI->_is_zero($x->{_e}))
-      {
-      # 1,1 => PI/4
-      my $pi_4 = $self->bpi( $scale - 3);
-      # modify $y in place
-      $y->{_m} = $pi_4->{_m};
-      $y->{_e} = $pi_4->{_e};
-      $y->{_es} = $pi_4->{_es};
-      # 1 1 => +
-      # -1 1 => -
-      # 1 -1 => -
-      # -1 -1 => +
-      $y->{sign} = $x->{sign} eq $y->{sign} ? '+' : '-';
-      $MBI->_div($y->{_m}, $MBI->_new(4));
-      return $y;
-      }
-    # shortcut: 1 int(X) result is _atan_inv(X)
+    $y -> round(@r);
 
-    # is integer
-    if ($x->{_es} eq '+')
-      {
-      my $x1 = $MBI->_copy($x->{_m});
-      $MBI->_lsft($x1, $x->{_e},10) unless $MBI->_is_zero($x->{_e});
-
-      my ($a,$b) = $self->_atan_inv($x1, $scale);
-      my $y_sign = $y->{sign};
-      # calculate A/B
-      $y->bone(); $y->{_m} = $a; my $y_d = $self->bone(); $y_d->{_m} = $b;
-      $y->bdiv($y_d, @r);
-      $y->{sign} = $y_sign;
-      return $y;
-      }
+    if ($fallback) {
+        delete $y->{_a};
+        delete $y->{_p};
     }
 
-  # handle all other cases
-  #  X  Y
-  # +x +y 0 to PI/2
-  # -x +y PI/2 to PI
-  # +x -y 0 to -PI/2
-  # -x -y -PI/2 to -PI 
+    return $y;
+}
 
-  my $y_sign = $y->{sign};
+sub batan {
+    # Calculate a arcus tangens of x.
 
-  # divide $x by $y
-  $y->bdiv($x, $scale) unless $x->is_one();
-  $y->batan(@r);
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
 
-  # restore sign
-  $y->{sign} = $y_sign;
+    my (@r) = @_;
 
-  $y;
-  }
+    # taylor:       x^3   x^5   x^7   x^9
+    #    atan = x - --- + --- - --- + --- ...
+    #                3     5     7     9
 
-sub batan
-  {
-  # Calculate a arcus tangens of x.
-  my ($x,@r) = @_;
-  my $self = ref($x);
+    # We need to limit the accuracy to protect against overflow.
 
-  # taylor:       x^3   x^5   x^7   x^9
-  #    atan = x - --- + --- - --- + --- ...
-  #                3     5     7     9 
+    my $fallback = 0;
+    my ($scale, @params);
+    ($self, @params) = $self->_find_round_parameters(@r);
 
-  # we need to limit the accuracy to protect against overflow
-  my $fallback = 0;
-  my ($scale,@params);
-  ($x,@params) = $x->_find_round_parameters(@r);
-    
-  #         constant object       or error in _find_round_parameters?
-  return $x if $x->modify('batan') || $x->is_nan();
-
-  if ($x->{sign} =~ /^[+-]inf\z/)
-    {
-    # +inf result is PI/2
-    # -inf result is -PI/2
-    # calculate PI/2
-    my $pi = $self->bpi(@r);
-    # modify $x in place
-    $x->{_m} = $pi->{_m};
-    $x->{_e} = $pi->{_e};
-    $x->{_es} = $pi->{_es};
-    # -y => -PI/2, +y => PI/2
-    $x->{sign} = substr($x->{sign},0,1);		# +inf => +
-    $MBI->_div($x->{_m}, $MBI->_new(2));
-    return $x;
-    }
-
-  return $x->bzero(@r) if $x->is_zero();
+    # Constant object or error in _find_round_parameters?
 
-  # no rounding at all, so must use fallback
-  if (scalar @params == 0)
-    {
-    # simulate old behaviour
-    $params[0] = $self->div_scale();	# and round to it as accuracy
-    $params[1] = undef;			# disable P
-    $scale = $params[0]+4; 		# at least four more for proper round
-    $params[2] = $r[2];			# round mode by caller or undef
-    $fallback = 1;			# to clear a/p afterwards
-    }
-  else
-    {
-    # the 4 below is empirical, and there might be cases where it is not
-    # enough...
-    $scale = abs($params[0] || $params[1]) + 4; # take whatever is defined
-    }
+    return $self if $self->modify('batan') || $self->is_nan();
 
-  # 1 or -1 => PI/4
-  # inlined is_one() && is_one('-')
-  if ($MBI->_is_one($x->{_m}) && $MBI->_is_zero($x->{_e}))
-    {
-    my $pi = $self->bpi($scale - 3);
-    # modify $x in place
-    $x->{_m} = $pi->{_m};
-    $x->{_e} = $pi->{_e};
-    $x->{_es} = $pi->{_es};
-    # leave the sign of $x alone (+1 => +PI/4, -1 => -PI/4)
-    $MBI->_div($x->{_m}, $MBI->_new(4));
-    return $x;
-    }
-  
-  # This series is only valid if -1 < x < 1, so for other x we need to
-  # to calculate PI/2 - atan(1/x):
-  my $one = $MBI->_new(1);
-  my $pi = undef;
-  if ($x->{_es} eq '+' && ($MBI->_acmp($x->{_m},$one) >= 0))
-    {
-    # calculate PI/2
-    $pi = $self->bpi($scale - 3);
-    $MBI->_div($pi->{_m}, $MBI->_new(2));
-    # calculate 1/$x:
-    my $x_copy = $x->copy();
-    # modify $x in place
-    $x->bone(); $x->bdiv($x_copy,$scale);
+    if ($self->{sign} =~ /^[+-]inf\z/) {
+        # +inf result is PI/2
+        # -inf result is -PI/2
+        # calculate PI/2
+        my $pi = $class->bpi(@r);
+        # modify $self in place
+        $self->{_m} = $pi->{_m};
+        $self->{_e} = $pi->{_e};
+        $self->{_es} = $pi->{_es};
+        # -y => -PI/2, +y => PI/2
+        $self->{sign} = substr($self->{sign}, 0, 1);  # "+inf" => "+"
+        $MBI->_div($self->{_m}, $MBI->_new(2));
+        return $self;
     }
 
-  # when user set globals, they would interfere with our calculation, so
-  # disable them and later re-enable them
-  no strict 'refs';
-  my $abr = "$self\::accuracy"; my $ab = $$abr; $$abr = undef;
-  my $pbr = "$self\::precision"; my $pb = $$pbr; $$pbr = undef;
-  # we also need to disable any set A or P on $x (_find_round_parameters took
-  # them already into account), since these would interfere, too
-  delete $x->{_a}; delete $x->{_p};
-  # need to disable $upgrade in BigInt, to avoid deep recursion
-  local $Math::BigInt::upgrade = undef;
- 
-  my $last = 0;
-  my $over = $x * $x;			# X ^ 2
-  my $x2 = $over->copy();		# X ^ 2; difference between terms
-  $over->bmul($x);			# X ^ 3 as starting value
-  my $sign = 1;				# start with -=
-  my $below = $self->new(3);
-  my $two = $self->new(2);
-  delete $x->{_a}; delete $x->{_p};
+    return $self->bzero(@r) if $self->is_zero();
 
-  my $limit = $self->new("1E-". ($scale-1));
-  #my $steps = 0;
-  while (3 < 5)
-    {
-    # we calculate the next term, and add it to the last
-    # when the next term is below our limit, it won't affect the outcome
-    # anymore, so we stop:
-    my $next = $over->copy()->bdiv($below,$scale);
-    last if $next->bacmp($limit) <= 0;
-
-    if ($sign == 0)
-      {
-      $x->badd($next);
-      }
-    else
-      {
-      $x->bsub($next);
-      }
-    $sign = 1-$sign;					# alternate
-    # calculate things for the next term
-    $over->bmul($x2);					# $x*$x
-    $below->badd($two);					# n += 2
+    # no rounding at all, so must use fallback
+    if (scalar @params == 0) {
+        # simulate old behaviour
+        $params[0] = $class->div_scale();  # and round to it as accuracy
+        $params[1] = undef;               # disable P
+        $scale = $params[0]+4;            # at least four more for proper round
+        $params[2] = $r[2];               # round mode by caller or undef
+        $fallback = 1;                    # to clear a/p afterwards
+    } else {
+        # the 4 below is empirical, and there might be cases where it is not
+        # enough...
+        $scale = abs($params[0] || $params[1]) + 4; # take whatever is defined
     }
 
-  if (defined $pi)
-    {
-    my $x_copy = $x->copy();
-    # modify $x in place
-    $x->{_m} = $pi->{_m};
-    $x->{_e} = $pi->{_e};
-    $x->{_es} = $pi->{_es};
-    # PI/2 - $x
-    $x->bsub($x_copy);
+    # 1 or -1 => PI/4
+    # inlined is_one() && is_one('-')
+    if ($MBI->_is_one($self->{_m}) && $MBI->_is_zero($self->{_e})) {
+        my $pi = $class->bpi($scale - 3);
+        # modify $self in place
+        $self->{_m} = $pi->{_m};
+        $self->{_e} = $pi->{_e};
+        $self->{_es} = $pi->{_es};
+        # leave the sign of $self alone (+1 => +PI/4, -1 => -PI/4)
+        $MBI->_div($self->{_m}, $MBI->_new(4));
+        return $self;
+    }
+
+    # This series is only valid if -1 < x < 1, so for other x we need to
+    # calculate PI/2 - atan(1/x):
+    my $one = $MBI->_new(1);
+    my $pi = undef;
+    if ($self->bacmp($self->copy->bone) >= 0) {
+        # calculate PI/2
+        $pi = $class->bpi($scale - 3);
+        $MBI->_div($pi->{_m}, $MBI->_new(2));
+        # calculate 1/$self:
+        my $self_copy = $self->copy();
+        # modify $self in place
+        $self->bone(); $self->bdiv($self_copy, $scale);
+    }
+
+    my $fmul = 1;
+    foreach my $k (0 .. int($scale / 20)) {
+        $fmul *= 2;
+        $self->bdiv($self->copy->bmul($self)->binc->bsqrt($scale + 4)->binc, $scale + 4);
+    }
+
+    # When user set globals, they would interfere with our calculation, so
+    # disable them and later re-enable them.
+    no strict 'refs';
+    my $abr = "$class\::accuracy";  my $ab = $$abr; $$abr = undef;
+    my $pbr = "$class\::precision"; my $pb = $$pbr; $$pbr = undef;
+    # We also need to disable any set A or P on $self (_find_round_parameters
+    # took them already into account), since these would interfere, too
+    delete $self->{_a}; delete $self->{_p};
+    # Need to disable $upgrade in BigInt, to avoid deep recursion.
+    local $Math::BigInt::upgrade = undef;
+
+    my $last = 0;
+    my $over = $self * $self;		# X ^ 2
+    my $self2 = $over->copy();		# X ^ 2; difference between terms
+    $over->bmul($self);			# X ^ 3 as starting value
+    my $sign = 1;			# start with -=
+    my $below = $class->new(3);
+    my $two = $class->new(2);
+    delete $self->{_a}; delete $self->{_p};
+
+    my $limit = $class->new("1E-". ($scale-1));
+    #my $steps = 0;
+    while (1) {
+        # We calculate the next term, and add it to the last. When the next
+        # term is below our limit, it won't affect the outcome anymore, so we
+        # stop:
+        my $next = $over->copy()->bdiv($below, $scale);
+        last if $next->bacmp($limit) <= 0;
+
+        if ($sign == 0) {
+            $self->badd($next);
+        } else {
+            $self->bsub($next);
+        }
+        $sign = 1-$sign;        # alternatex
+        # calculate things for the next term
+        $over->bmul($self2);    # $self*$self
+        $below->badd($two);     # n += 2
     }
+    $self->bmul($fmul);
 
-  # shortcut to not run through _find_round_parameters again
-  if (defined $params[0])
-    {
-    $x->bround($params[0],$params[2]);		# then round accordingly
+    if (defined $pi) {
+        my $self_copy = $self->copy();
+        # modify $self in place
+        $self->{_m} = $pi->{_m};
+        $self->{_e} = $pi->{_e};
+        $self->{_es} = $pi->{_es};
+        # PI/2 - $self
+        $self->bsub($self_copy);
     }
-  else
-    {
-    $x->bfround($params[1],$params[2]);		# then round accordingly
+
+    # Shortcut to not run through _find_round_parameters again.
+    if (defined $params[0]) {
+        $self->bround($params[0], $params[2]); # then round accordingly
+    } else {
+        $self->bfround($params[1], $params[2]); # then round accordingly
     }
-  if ($fallback)
-    {
-    # clear a/p after round, since user did not request it
-    delete $x->{_a}; delete $x->{_p};
+    if ($fallback) {
+        # Clear a/p after round, since user did not request it.
+        delete $self->{_a}; delete $self->{_p};
     }
-  # restore globals
-  $$abr = $ab; $$pbr = $pb;
-  $x;
-  }
+
+    # restore globals
+    $$abr = $ab; $$pbr = $pb;
+    $self;
+}
 
 ###############################################################################
 # rounding functions
@@ -3440,7 +3650,11 @@ sub bceil
     $x->{_m} = $MBI->_rsft($x->{_m},$x->{_e},10); # cut off digits after dot
     $x->{_e} = $MBI->_zero();			# trunc/norm	
     $x->{_es} = '+';				# abs e
-    $MBI->_inc($x->{_m}) if $x->{sign} eq '+';	# increment if positive
+    if ($x->{sign} eq '+') {
+        $MBI->_inc($x->{_m});                   # increment if positive
+    } else {
+        $x->{sign} = '+' if $MBI->_is_zero($x->{_m});   # avoid -0
+    }
     }
   $x->round($a,$p,$r);
   }
@@ -3459,6 +3673,7 @@ sub bint
     $x->{_m} = $MBI->_rsft($x->{_m},$x->{_e},10); # cut off digits after dot
     $x->{_e} = $MBI->_zero();                     # truncate/normalize
     $x->{_es} = '+';                              # abs e
+    $x->{sign} = '+' if $MBI->_is_zero($x->{_m}); # avoid -0
     }
   $x->round($a,$p,$r);
   }
@@ -3830,6 +4045,255 @@ sub length
   $len;
   }
 
+sub from_hex {
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
+
+    my $str = shift;
+
+    # If called as a class method, initialize a new object.
+
+    $self = $class -> bzero() unless $selfref;
+
+    if ($str =~ s/
+                     ^
+
+                     # sign
+                     ( [+-]? )
+
+                     # optional "hex marker"
+                     (?: 0? x )?
+
+                     # significand using the hex digits 0..9 and a..f
+                     (
+                         [0-9a-fA-F]+ (?: _ [0-9a-fA-F]+ )*
+                         (?:
+                             \.
+                             (?: [0-9a-fA-F]+ (?: _ [0-9a-fA-F]+ )* )?
+                         )?
+                     |
+                         \.
+                         [0-9a-fA-F]+ (?: _ [0-9a-fA-F]+ )*
+                     )
+
+                     # exponent (power of 2) using decimal digits
+                     (?:
+                         [Pp]
+                         ( [+-]? )
+                         ( \d+ (?: _ \d+ )* )
+                     )?
+
+                     $
+                 //x)
+    {
+        my $s_sign  = $1 || '+';
+        my $s_value = $2;
+        my $e_sign  = $3 || '+';
+        my $e_value = $4 || '0';
+        $s_value =~ tr/_//d;
+        $e_value =~ tr/_//d;
+
+        # The significand must be multiplied by 2 raised to this exponent.
+
+        my $two_expon = $class -> new($e_value);
+        $two_expon -> bneg() if $e_sign eq '-';
+
+        # If there is a dot in the significand, remove it and adjust the
+        # exponent according to the number of digits in the fraction part of
+        # the significand. Since the digits in the significand are in base 16,
+        # but the exponent is only in base 2, multiply the exponent adjustment
+        # value by log(16) / log(2) = 4.
+
+        my $idx = index($s_value, '.');
+        if ($idx >= 0) {
+            substr($s_value, $idx, 1) = '';
+            $two_expon -= $class -> new(CORE::length($s_value))
+                                 -> bsub($idx)
+                                 -> bmul("4");
+        }
+
+        $self -> {sign} = $s_sign;
+        $self -> {_m}   = $MBI -> _from_hex('0x' . $s_value);
+
+        if ($two_expon > 0) {
+            my $factor = $class -> new("2") -> bpow($two_expon);
+            $self -> bmul($factor);
+        } elsif ($two_expon < 0) {
+            my $factor = $class -> new("0.5") -> bpow(-$two_expon);
+            $self -> bmul($factor);
+        }
+
+        return $self;
+    }
+
+    return $self->bnan();
+}
+
+sub from_oct {
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
+
+    my $str = shift;
+
+    # If called as a class method, initialize a new object.
+
+    $self = $class -> bzero() unless $selfref;
+
+    if ($str =~ s/
+                     ^
+
+                     # sign
+                     ( [+-]? )
+
+                     # significand using the octal digits 0..7
+                     (
+                         [0-7]+ (?: _ [0-7]+ )*
+                         (?:
+                             \.
+                             (?: [0-7]+ (?: _ [0-7]+ )* )?
+                         )?
+                     |
+                         \.
+                         [0-7]+ (?: _ [0-7]+ )*
+                     )
+
+                     # exponent (power of 2) using decimal digits
+                     (?:
+                         [Pp]
+                         ( [+-]? )
+                         ( \d+ (?: _ \d+ )* )
+                     )?
+
+                     $
+                 //x)
+    {
+        my $s_sign  = $1 || '+';
+        my $s_value = $2;
+        my $e_sign  = $3 || '+';
+        my $e_value = $4 || '0';
+        $s_value =~ tr/_//d;
+        $e_value =~ tr/_//d;
+
+        # The significand must be multiplied by 2 raised to this exponent.
+
+        my $two_expon = $class -> new($e_value);
+        $two_expon -> bneg() if $e_sign eq '-';
+
+        # If there is a dot in the significand, remove it and adjust the
+        # exponent according to the number of digits in the fraction part of
+        # the significand. Since the digits in the significand are in base 8,
+        # but the exponent is only in base 2, multiply the exponent adjustment
+        # value by log(8) / log(2) = 3.
+
+        my $idx = index($s_value, '.');
+        if ($idx >= 0) {
+            substr($s_value, $idx, 1) = '';
+            $two_expon -= $class -> new(CORE::length($s_value))
+                                 -> bsub($idx)
+                                 -> bmul("3");
+        }
+
+        $self -> {sign} = $s_sign;
+        $self -> {_m}   = $MBI -> _from_oct($s_value);
+
+        if ($two_expon > 0) {
+            my $factor = $class -> new("2") -> bpow($two_expon);
+            $self -> bmul($factor);
+        } elsif ($two_expon < 0) {
+            my $factor = $class -> new("0.5") -> bpow(-$two_expon);
+            $self -> bmul($factor);
+        }
+
+        return $self;
+    }
+
+    return $self->bnan();
+}
+
+sub from_bin {
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
+
+    my $str = shift;
+
+    # If called as a class method, initialize a new object.
+
+    $self = $class -> bzero() unless $selfref;
+
+    if ($str =~ s/
+                     ^
+
+                     # sign
+                     ( [+-]? )
+
+                     # optional "bin marker"
+                     (?: 0? b )?
+
+                     # significand using the binary digits 0 and 1
+                     (
+                         [01]+ (?: _ [01]+ )*
+                         (?:
+                             \.
+                             (?: [01]+ (?: _ [01]+ )* )?
+                         )?
+                     |
+                         \.
+                         [01]+ (?: _ [01]+ )*
+                     )
+
+                     # exponent (power of 2) using decimal digits
+                     (?:
+                         [Pp]
+                         ( [+-]? )
+                         ( \d+ (?: _ \d+ )* )
+                     )?
+
+                     $
+                 //x)
+    {
+        my $s_sign  = $1 || '+';
+        my $s_value = $2;
+        my $e_sign  = $3 || '+';
+        my $e_value = $4 || '0';
+        $s_value =~ tr/_//d;
+        $e_value =~ tr/_//d;
+
+        # The significand must be multiplied by 2 raised to this exponent.
+
+        my $two_expon = $class -> new($e_value);
+        $two_expon -> bneg() if $e_sign eq '-';
+
+        # If there is a dot in the significand, remove it and adjust the
+        # exponent according to the number of digits in the fraction part of
+        # the significand.
+
+        my $idx = index($s_value, '.');
+        if ($idx >= 0) {
+            substr($s_value, $idx, 1) = '';
+            $two_expon -= $class -> new(CORE::length($s_value))
+                                 -> bsub($idx);
+        }
+
+        $self -> {sign} = $s_sign;
+        $self -> {_m}   = $MBI -> _from_bin('0b' . $s_value);
+
+        if ($two_expon > 0) {
+            my $factor = $class -> new("2") -> bpow($two_expon);
+            $self -> bmul($factor);
+        } elsif ($two_expon < 0) {
+            my $factor = $class -> new("0.5") -> bpow(-$two_expon);
+            $self -> bmul($factor);
+        }
+
+        return $self;
+    }
+
+    return $self->bnan();
+}
+
 1;
 
 __END__
@@ -3853,6 +4317,11 @@ Math::BigFloat - Arbitrary size floating point math package
  my $inf = Math::BigFloat->binf('-');	# create a -inf
  my $one = Math::BigFloat->bone();	# create a +1
  my $mone = Math::BigFloat->bone('-');	# create a -1
+ my $x = Math::BigFloat->bone('-');	#
+
+ my $x = Math::BigFloat->from_hex('0xc.afep+3');    # from hexadecimal
+ my $x = Math::BigFloat->from_bin('0b1.1001p-4');   # from binary
+ my $x = Math::BigFloat->from_oct('1.3267p-4');     # from octal
 
  my $pi = Math::BigFloat->bpi(100);	# PI to 100 digits
 
@@ -3965,7 +4434,7 @@ Math::BigFloat - Arbitrary size floating point math package
 All operators (including basic math operations) are overloaded if you
 declare your big floating point numbers as
 
-  $i = new Math::BigFloat '12_3.456_789_123_456_789E-2';
+  $i = Math::BigFloat -> new('12_3.456_789_123_456_789E-2');
 
 Operations with overloaded operators preserve the arguments, which is
 exactly what you expect.
@@ -4027,8 +4496,8 @@ Actual math is done by using the class defined with C<< with => Class; >>
 (which defaults to BigInts) to represent the mantissa and exponent.
 
 The sign C</^[+-]$/> is stored separately. The string 'NaN' is used to 
-represent the result when input arguments are not numbers, as well as 
-the result of dividing by zero.
+represent the result when input arguments are not numbers, and 'inf' and
+'-inf' are used to represent positive and negative infinity, respectively.
 
 =head2 mantissa(), exponent() and parts()
 
@@ -4042,8 +4511,6 @@ as BigInts such that:
 
 C<< ($m,$e) = $x->parts(); >> is just a shortcut giving you both of them.
 
-A zero is represented and returned as C<0E1>, B<not> C<0E0> (after Knuth).
-
 Currently the mantissa is reduced as much as possible, favouring higher
 exponents over lower ones (e.g. returning 1e7 instead of 10e6 or 10000000e0).
 This might change in the future, so do not depend on it.
@@ -4109,26 +4576,26 @@ functions like so:
 
 =over
 
-=item ffround ( +$scale )
+=item bfround ( +$scale )
 
 Rounds to the $scale'th place left from the '.', counting from the dot.
 The first digit is numbered 1. 
 
-=item ffround ( -$scale )
+=item bfround ( -$scale )
 
 Rounds to the $scale'th place right from the '.', counting from the dot.
 
-=item ffround ( 0 )
+=item bfround ( 0 )
 
 Rounds to an integer.
 
-=item fround  ( +$scale )
+=item bround  ( +$scale )
 
 Preserves accuracy to $scale digits from the left (aka significant digits)
 and pads the rest with zeros. If the number is between 1 and -1, the
 significant digits count from the first non-zero after the '.'
 
-=item fround  ( -$scale ) and fround ( 0 )
+=item bround  ( -$scale ) and bround ( 0 )
 
 These are effectively no-ops.
 
@@ -4208,6 +4675,25 @@ Note: You probably want to use L</accuracy()> instead. With L</accuracy()> you
 set the number of digits each result should have, with L</precision()> you
 set the place where to round!
 
+=item bdiv()
+
+        $q = $x->bdiv($y);
+        ($q, $r) = $x->bdiv($y);
+
+In scalar context, divides $x by $y and returns the result to the given or
+default accuracy/precision. In list context, does floored division
+(F-division), returning an integer $q and a remainder $r so that $x = $q * $y +
+$r. The remainer (modulo) is equal to what is returned by C<$x->bmod($y)>.
+
+=item bmod()
+
+	$x->bmod($y);
+
+Returns $x modulo $y. When $x is finite, and $y is finite and non-zero, the
+result is identical to the remainder after floored division (F-division). If,
+in addition, both $x and $y are integers, the result is identical to the result
+from Perl's % operator.
+
 =item bexp()
 
 	$x->bexp($accuracy);		# calculate e ** X
@@ -4284,6 +4770,59 @@ Multiply $x by $y, and then add $z to the result.
 
 This method was added in v1.87 of Math::BigInt (June 2007).
 
+=item as_float()
+
+This method is called when Math::BigFloat encounters an object it doesn't know
+how to handle. For instance, assume $x is a Math::BigFloat, or subclass
+thereof, and $y is defined, but not a Math::BigFloat, or subclass thereof. If
+you do
+
+    $x -> badd($y);
+
+$y needs to be converted into an object that $x can deal with. This is done by
+first checking if $y is something that $x might be upgraded to. If that is the
+case, no further attempts are made. The next is to see if $y supports the
+method C<as_float()>. The method C<as_float()> is expected to return either an
+object that has the same class as $x, a subclass thereof, or a string that
+C<ref($x)-E<gt>new()> can parse to create an object.
+
+In Math::BigFloat, C<as_float()> has the same effect as C<copy()>.
+
+=item from_hex()
+
+    $x -> from_hex("0x1.921fb54442d18p+1");
+    $x = Math::BigFloat -> from_hex("0x1.921fb54442d18p+1");
+
+Interpret input as a hexadecimal string.A prefix ("0x", "x", ignoring case) is
+optional. A single underscore character ("_") may be placed between any two
+digits. If the input is invalid, a NaN is returned. The exponent is in base 2
+using decimal digits.
+
+If called as an instance method, the value is assigned to the invocand.
+
+=item from_bin()
+
+    $x -> from_bin("0b1.1001p-4");
+    $x = Math::BigFloat -> from_bin("0b1.1001p-4");
+
+Interpret input as a hexadecimal string. A prefix ("0b" or "b", ignoring case)
+is optional. A single underscore character ("_") may be placed between any two
+digits. If the input is invalid, a NaN is returned. The exponent is in base 2
+using decimal digits.
+
+If called as an instance method, the value is assigned to the invocand.
+
+=item from_oct()
+
+    $x -> from_oct("1.3267p-4");
+    $x = Math::BigFloat -> from_oct("1.3267p-4");
+
+Interpret input as an octal string. A single underscore character ("_") may be
+placed between any two digits. If the input is invalid, a NaN is returned. The
+exponent is in base 2 using decimal digits.
+
+If called as an instance method, the value is assigned to the invocand.
+
 =back
 
 =head1 Autocreating constants
@@ -4573,8 +5112,24 @@ because they solve the autoupgrading/downgrading issue, at least partly.
 
 =head1 AUTHORS
 
-Mark Biggar, overloaded interface by Ilya Zakharevich.
-Completely rewritten by Tels L<http://bloodgate.com> in 2001 - 2006, and still
-at it in 2007.
+=over 4
+
+=item *
+
+Mark Biggar, overloaded interface by Ilya Zakharevich, 1996-2001.
+
+=item *
+
+Completely rewritten by Tels L<http://bloodgate.com> in 2001-2008.
+
+=item *
+
+Florian Ragwitz L<flora@cpan.org>, 2010.
+
+=item *
+
+Peter John Acklam, L<pjacklam@online.no>, 2011-.
+
+=back
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Math/BigFloat/Trace.pm b/Master/tlpkg/tlperl/lib/Math/BigFloat/Trace.pm
index 203e0510b64..634d9670d46 100644
--- a/Master/tlpkg/tlperl/lib/Math/BigFloat/Trace.pm
+++ b/Master/tlpkg/tlperl/lib/Math/BigFloat/Trace.pm
@@ -1,58 +1,58 @@
-#!/usr/bin/perl -w
+#!perl
 
 package Math::BigFloat::Trace;
 
-require 5.005_02;
+require 5.006;
 use strict;
+use warnings;
 
 use Exporter;
 use Math::BigFloat;
-use vars qw($VERSION @ISA $PACKAGE @EXPORT_OK
-            $accuracy $precision $round_mode $div_scale);
 
-@ISA = qw(Exporter Math::BigFloat);
+our ($PACKAGE, @EXPORT_OK, $accuracy, $precision, $round_mode, $div_scale);
 
-$VERSION = '0.36';
+our @ISA = qw(Exporter Math::BigFloat);
 
-use overload;	# inherit overload from BigFloat
+our $VERSION = '0.42_01';
+
+use overload;                   # inherit overload from BigFloat
 
 # Globals
 $accuracy = $precision = undef;
 $round_mode = 'even';
 $div_scale = 40;
 
-sub new
-{
-        my $proto  = shift;
-        my $class  = ref($proto) || $proto;
+sub new {
+    my $proto = shift;
+    my $class = ref($proto) || $proto;
 
-        my $value       = shift;
-	my $a = $accuracy; $a = $_[0] if defined $_[0];
-	my $p = $precision; $p = $_[1] if defined $_[1];
-        my $self = Math::BigFloat->new($value,$a,$p,$round_mode);
+    my $value = shift;
+    my $a = $accuracy;
+    $a = $_[0] if defined $_[0];
+    my $p = $precision;
+    $p = $_[1] if defined $_[1];
+    my $self = Math::BigFloat->new($value, $a, $p, $round_mode);
 
-#	remember, downgrading may return a BigInt, so don't meddle with class	
-#	bless $self,$class;
+    # remember, downgrading may return a BigInt, so don't meddle with class
+    # bless $self, $class;
 
-	print "MBF new '$value' => '$self' (",ref($self),")";
-        return $self;
+    print "MBF new '$value' => '$self' (", ref($self), ")";
+    return $self;
 }
 
-sub import
-  {
-  print "MBF import ",join(' ',@_);
-  my $self = shift;
+sub import {
+    print "MBF import ", join(' ', @_);
+    my $self = shift;
 
-  # we catch the constants, the rest goes go BigFloat
-  my @a = ();
-  foreach (@_)
-    {
-    push @a, $_ if $_ ne ':constant';
+    # we catch the constants, the rest goes go BigFloat
+    my @a = ();
+    foreach (@_) {
+        push @a, $_ if $_ ne ':constant';
     }
-  overload::constant float => sub { $self->new(shift); }; 
+    overload::constant float => sub { $self->new(shift); };
 
-  Math::BigFloat->import(@a);		# need it for subclasses
-#  $self->export_to_level(1,$self,@_);		# need this ?
-  }
+    Math::BigFloat->import(@a);                 # need it for subclasses
+#    $self->export_to_level(1,$self,@_);         # need this ?
+}
 
 1;
diff --git a/Master/tlpkg/tlperl/lib/Math/BigInt.pm b/Master/tlpkg/tlperl/lib/Math/BigInt.pm
index 62f1be9cb06..a50b37e832a 100644
--- a/Master/tlpkg/tlperl/lib/Math/BigInt.pm
+++ b/Master/tlpkg/tlperl/lib/Math/BigInt.pm
@@ -15,19 +15,22 @@ package Math::BigInt;
 # Remember not to take shortcuts ala $xs = $x->{value}; $CALC->foo($xs); since
 # underlying lib might change the reference!
 
-my $class = "Math::BigInt";
-use 5.006002;
+use 5.006001;
+use strict;
+use warnings;
 
-$VERSION = '1.9997';
+our $VERSION = '1.999715';
+$VERSION = eval $VERSION;
 
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(objectify bgcd blcm); 
+our @ISA = qw(Exporter);
+our @EXPORT_OK = qw(objectify bgcd blcm);
 
 # _trap_inf and _trap_nan are internal and should never be accessed from the
 # outside
-use vars qw/$round_mode $accuracy $precision $div_scale $rnd_mode 
-	    $upgrade $downgrade $_trap_nan $_trap_inf/;
-use strict;
+our ($round_mode, $accuracy, $precision, $div_scale, $rnd_mode,
+     $upgrade, $downgrade, $_trap_nan, $_trap_inf);
+
+my $class = "Math::BigInt";
 
 # Inside overload, the first arg is always an object. If the original code had
 # it reversed (like $x = 2 * $y), then the third parameter is true.
@@ -48,101 +51,101 @@ use overload
 # some shortcuts for speed (assumes that reversed order of arguments is routed
 # to normal '+' and we thus can always modify first arg. If this is changed,
 # this breaks and must be adjusted.)
-'+='	=>	sub { $_[0]->badd($_[1]); },
-'-='	=>	sub { $_[0]->bsub($_[1]); },
-'*='	=>	sub { $_[0]->bmul($_[1]); },
-'/='	=>	sub { scalar $_[0]->bdiv($_[1]); },
-'%='	=>	sub { $_[0]->bmod($_[1]); },
-'^='	=>	sub { $_[0]->bxor($_[1]); },
-'&='	=>	sub { $_[0]->band($_[1]); },
-'|='	=>	sub { $_[0]->bior($_[1]); },
-
-'**='	=>	sub { $_[0]->bpow($_[1]); },
-'<<='	=>	sub { $_[0]->blsft($_[1]); },
-'>>='	=>	sub { $_[0]->brsft($_[1]); },
+'+='    =>      sub { $_[0]->badd($_[1]); },
+'-='    =>      sub { $_[0]->bsub($_[1]); },
+'*='    =>      sub { $_[0]->bmul($_[1]); },
+'/='    =>      sub { scalar $_[0]->bdiv($_[1]); },
+'%='    =>      sub { $_[0]->bmod($_[1]); },
+'^='    =>      sub { $_[0]->bxor($_[1]); },
+'&='    =>      sub { $_[0]->band($_[1]); },
+'|='    =>      sub { $_[0]->bior($_[1]); },
+
+'**='   =>      sub { $_[0]->bpow($_[1]); },
+'<<='   =>      sub { $_[0]->blsft($_[1]); },
+'>>='   =>      sub { $_[0]->brsft($_[1]); },
 
 # not supported by Perl yet
-'..'	=>	\&_pointpoint,
-
-'<=>'	=>	sub { my $rc = $_[2] ?
-                      ref($_[0])->bcmp($_[1],$_[0]) : 
-                      $_[0]->bcmp($_[1]); 
-		      $rc = 1 unless defined $rc;
-		      $rc <=> 0;
-		},
+'..'    =>      \&_pointpoint,
+
+'<=>'   =>      sub { my $rc = $_[2] ?
+                      ref($_[0])->bcmp($_[1],$_[0]) :
+                      $_[0]->bcmp($_[1]);
+                      $rc = 1 unless defined $rc;
+                      $rc <=> 0;
+                },
 # we need '>=' to get things like "1 >= NaN" right:
-'>='	=>	sub { my $rc = $_[2] ?
-                      ref($_[0])->bcmp($_[1],$_[0]) : 
+'>='    =>      sub { my $rc = $_[2] ?
+                      ref($_[0])->bcmp($_[1],$_[0]) :
                       $_[0]->bcmp($_[1]);
-		      # if there was a NaN involved, return false
-		      return '' unless defined $rc;
-		      $rc >= 0;
-		},
-'cmp'	=>	sub {
-         $_[2] ? 
+                      # if there was a NaN involved, return false
+                      return '' unless defined $rc;
+                      $rc >= 0;
+                },
+'cmp'   =>      sub {
+         $_[2] ?
                "$_[1]" cmp $_[0]->bstr() :
                $_[0]->bstr() cmp "$_[1]" },
 
-'cos'	=>	sub { $_[0]->copy->bcos(); }, 
-'sin'	=>	sub { $_[0]->copy->bsin(); }, 
-'atan2'	=>	sub { $_[2] ?
-			ref($_[0])->new($_[1])->batan2($_[0]) :
-			$_[0]->copy()->batan2($_[1]) },
+'cos'   =>      sub { $_[0]->copy->bcos(); },
+'sin'   =>      sub { $_[0]->copy->bsin(); },
+'atan2' =>      sub { $_[2] ?
+                        ref($_[0])->new($_[1])->batan2($_[0]) :
+                        $_[0]->copy()->batan2($_[1]) },
 
 # are not yet overloadable
-#'hex'	=>	sub { print "hex"; $_[0]; }, 
-#'oct'	=>	sub { print "oct"; $_[0]; }, 
+#'hex'  =>      sub { print "hex"; $_[0]; },
+#'oct'  =>      sub { print "oct"; $_[0]; },
 
 # log(N) is log(N, e), where e is Euler's number
-'log'	=>	sub { $_[0]->copy()->blog($_[1], undef); }, 
-'exp'	=>	sub { $_[0]->copy()->bexp($_[1]); }, 
-'int'	=>	sub { $_[0]->copy(); }, 
-'neg'	=>	sub { $_[0]->copy()->bneg(); }, 
-'abs'	=>	sub { $_[0]->copy()->babs(); },
-'sqrt'  =>	sub { $_[0]->copy()->bsqrt(); },
-'~'	=>	sub { $_[0]->copy()->bnot(); },
+'log'   =>      sub { $_[0]->copy()->blog(); },
+'exp'   =>      sub { $_[0]->copy()->bexp($_[1]); },
+'int'   =>      sub { $_[0]->copy(); },
+'neg'   =>      sub { $_[0]->copy()->bneg(); },
+'abs'   =>      sub { $_[0]->copy()->babs(); },
+'sqrt'  =>      sub { $_[0]->copy()->bsqrt(); },
+'~'     =>      sub { $_[0]->copy()->bnot(); },
 
 # for subtract it's a bit tricky to not modify b: b-a => -a+b
-'-'	=>	sub { my $c = $_[0]->copy; $_[2] ?
-			$c->bneg()->badd( $_[1]) :
-			$c->bsub( $_[1]) },
-'+'	=>	sub { $_[0]->copy()->badd($_[1]); },
-'*'	=>	sub { $_[0]->copy()->bmul($_[1]); },
+'-'     =>      sub { my $c = $_[0]->copy; $_[2] ?
+                        $c->bneg()->badd( $_[1]) :
+                        $c->bsub( $_[1]) },
+'+'     =>      sub { $_[0]->copy()->badd($_[1]); },
+'*'     =>      sub { $_[0]->copy()->bmul($_[1]); },
 
-'/'	=>	sub { 
+'/'     =>      sub {
    $_[2] ? ref($_[0])->new($_[1])->bdiv($_[0]) : $_[0]->copy->bdiv($_[1]);
-  }, 
-'%'	=>	sub { 
+  },
+'%'     =>      sub {
    $_[2] ? ref($_[0])->new($_[1])->bmod($_[0]) : $_[0]->copy->bmod($_[1]);
-  }, 
-'**'	=>	sub { 
+  },
+'**'    =>      sub {
    $_[2] ? ref($_[0])->new($_[1])->bpow($_[0]) : $_[0]->copy->bpow($_[1]);
-  }, 
-'<<'	=>	sub { 
+  },
+'<<'    =>      sub {
    $_[2] ? ref($_[0])->new($_[1])->blsft($_[0]) : $_[0]->copy->blsft($_[1]);
-  }, 
-'>>'	=>	sub { 
+  },
+'>>'    =>      sub {
    $_[2] ? ref($_[0])->new($_[1])->brsft($_[0]) : $_[0]->copy->brsft($_[1]);
-  }, 
-'&'	=>	sub { 
+  },
+'&'     =>      sub {
    $_[2] ? ref($_[0])->new($_[1])->band($_[0]) : $_[0]->copy->band($_[1]);
-  }, 
-'|'	=>	sub { 
+  },
+'|'     =>      sub {
    $_[2] ? ref($_[0])->new($_[1])->bior($_[0]) : $_[0]->copy->bior($_[1]);
-  }, 
-'^'	=>	sub { 
+  },
+'^'     =>      sub {
    $_[2] ? ref($_[0])->new($_[1])->bxor($_[0]) : $_[0]->copy->bxor($_[1]);
-  }, 
+  },
 
 # can modify arg of ++ and --, so avoid a copy() for speed, but don't
 # use $_[0]->bone(), it would modify $_[0] to be 1!
-'++'	=>	sub { $_[0]->binc() },
-'--'	=>	sub { $_[0]->bdec() },
+'++'    =>      sub { $_[0]->binc() },
+'--'    =>      sub { $_[0]->bdec() },
 
 # if overloaded, O(1) instead of O(N) and twice as fast for small numbers
-'bool'  =>	sub {
+'bool'  =>      sub {
   # this kludge is needed for perl prior 5.6.0 since returning 0 here fails :-/
-  # v5.6.1 dumps on this: return !$_[0]->is_zero() || undef;		    :-(
+  # v5.6.1 dumps on this: return !$_[0]->is_zero() || undef;                :-(
   my $t = undef;
   $t = 1 if !$_[0]->is_zero();
   $t;
@@ -166,23 +169,23 @@ $accuracy   = undef;
 $precision  = undef;
 $div_scale  = 40;
 
-$upgrade = undef;			# default is no upgrade
-$downgrade = undef;			# default is no downgrade
+$upgrade = undef;                       # default is no upgrade
+$downgrade = undef;                     # default is no downgrade
 
 # These are internally, and not to be used from the outside at all
 
-$_trap_nan = 0;				# are NaNs ok? set w/ config()
-$_trap_inf = 0;				# are infs ok? set w/ config()
-my $nan = 'NaN'; 			# constants for easier life
+$_trap_nan = 0;                         # are NaNs ok? set w/ config()
+$_trap_inf = 0;                         # are infs ok? set w/ config()
+my $nan = 'NaN';                        # constants for easier life
 
-my $CALC = 'Math::BigInt::Calc';	# module to do the low level math
-					# default is Calc.pm
-my $IMPORT = 0;				# was import() called yet?
-					# used to make require work
-my %WARN;				# warn only once for low-level libs
-my %CAN;				# cache for $CALC->can(...)
-my %CALLBACKS;				# callbacks to notify on lib loads
-my $EMU_LIB = 'Math/BigInt/CalcEmu.pm';	# emulate low-level math
+my $CALC = 'Math::BigInt::Calc';        # module to do the low level math
+                                        # default is Calc.pm
+my $IMPORT = 0;                         # was import() called yet?
+                                        # used to make require work
+my %WARN;                               # warn only once for low-level libs
+my %CAN;                                # cache for $CALC->can(...)
+my %CALLBACKS;                          # callbacks to notify on lib loads
+my $EMU_LIB = 'Math/BigInt/CalcEmu.pm'; # emulate low-level math
 
 ##############################################################################
 # the old code had $rnd_mode, so we need to support it, too
@@ -193,9 +196,9 @@ sub FETCH      { return $round_mode; }
 sub STORE      { $rnd_mode = $_[0]->round_mode($_[1]); }
 
 BEGIN
-  { 
+  {
   # tie to enable $rnd_mode to work transparently
-  tie $rnd_mode, 'Math::BigInt'; 
+  tie $rnd_mode, 'Math::BigInt';
 
   # set up some handy alias names
   *as_int = \&as_number;
@@ -203,7 +206,7 @@ BEGIN
   *is_neg = \&is_negative;
   }
 
-############################################################################## 
+##############################################################################
 
 sub round_mode
   {
@@ -270,10 +273,10 @@ sub div_scale
 
 sub accuracy
   {
-  # $x->accuracy($a);		ref($x)	$a
-  # $x->accuracy();		ref($x)
-  # Class->accuracy();		class
-  # Class->accuracy($a);	class $a
+  # $x->accuracy($a);           ref($x) $a
+  # $x->accuracy();             ref($x)
+  # Class->accuracy();          class
+  # Class->accuracy($a);        class $a
 
   my $x = shift;
   my $class = ref($x) || $x || __PACKAGE__;
@@ -294,28 +297,28 @@ sub accuracy
       if (!$a || $a <= 0)
         {
         require Carp;
-	Carp::croak ('Argument to accuracy must be greater than zero');
+        Carp::croak ('Argument to accuracy must be greater than zero');
         }
       if (int($a) != $a)
         {
         require Carp;
-	Carp::croak ('Argument to accuracy must be an integer');
+        Carp::croak ('Argument to accuracy must be an integer');
         }
       }
     if (ref($x))
       {
       # $object->accuracy() or fallback to global
-      $x->bround($a) if $a;		# not for undef, 0
-      $x->{_a} = $a;			# set/overwrite, even if not rounded
-      delete $x->{_p};			# clear P
+      $x->bround($a) if $a;             # not for undef, 0
+      $x->{_a} = $a;                    # set/overwrite, even if not rounded
+      delete $x->{_p};                  # clear P
       $a = ${"${class}::accuracy"} unless defined $a;   # proper return value
       }
     else
       {
-      ${"${class}::accuracy"} = $a;	# set global A
-      ${"${class}::precision"} = undef;	# clear global P
+      ${"${class}::accuracy"} = $a;     # set global A
+      ${"${class}::precision"} = undef; # clear global P
       }
-    return $a;				# shortcut
+    return $a;                          # shortcut
     }
 
   my $a;
@@ -328,10 +331,10 @@ sub accuracy
 
 sub precision
   {
-  # $x->precision($p);		ref($x)	$p
-  # $x->precision();		ref($x)
-  # Class->precision();		class
-  # Class->precision($p);	class $p
+  # $x->precision($p);          ref($x) $p
+  # $x->precision();            ref($x)
+  # Class->precision();         class
+  # Class->precision($p);       class $p
 
   my $x = shift;
   my $class = ref($x) || $x || __PACKAGE__;
@@ -351,17 +354,17 @@ sub precision
     if (ref($x))
       {
       # $object->precision() or fallback to global
-      $x->bfround($p) if $p;		# not for undef, 0
-      $x->{_p} = $p;			# set/overwrite, even if not rounded
-      delete $x->{_a};			# clear A
+      $x->bfround($p) if $p;            # not for undef, 0
+      $x->{_p} = $p;                    # set/overwrite, even if not rounded
+      delete $x->{_a};                  # clear A
       $p = ${"${class}::precision"} unless defined $p;  # proper return value
       }
     else
       {
-      ${"${class}::precision"} = $p;	# set global P
-      ${"${class}::accuracy"} = undef;	# clear global A
+      ${"${class}::precision"} = $p;    # set global P
+      ${"${class}::accuracy"} = undef;  # clear global A
       }
-    return $p;				# shortcut
+    return $p;                          # shortcut
     }
 
   my $p;
@@ -440,7 +443,7 @@ sub config
   }
 
 sub _scale_a
-  { 
+  {
   # select accuracy parameter based on precedence,
   # used by bround() and bfround(), may return undef for scale (means no op)
   my ($x,$scale,$mode) = @_;
@@ -464,7 +467,7 @@ sub _scale_a
   }
 
 sub _scale_p
-  { 
+  {
   # select precision parameter based on precedence,
   # used by bround() and bfround(), may return undef for scale (means no op)
   my ($x,$scale,$mode) = @_;
@@ -490,164 +493,191 @@ sub _scale_p
 ##############################################################################
 # constructors
 
-sub copy
-  {
-  # if two arguments, the first one is the class to "swallow" subclasses
-  if (@_ > 1)
-    {
-    my  $self = bless {
-	sign => $_[1]->{sign}, 
-	value => $CALC->_copy($_[1]->{value}),
-    }, $_[0] if @_ > 1;
+sub copy {
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
 
-    $self->{_a} = $_[1]->{_a} if defined $_[1]->{_a};
-    $self->{_p} = $_[1]->{_p} if defined $_[1]->{_p};
-    return $self;
-    }
+    # If called as a class method, the object to copy is the next argument.
 
-  my $self = bless {
-	sign => $_[0]->{sign}, 
-	value => $CALC->_copy($_[0]->{value}),
-	}, ref($_[0]);
+    $self = shift() unless $selfref;
 
-  $self->{_a} = $_[0]->{_a} if defined $_[0]->{_a};
-  $self->{_p} = $_[0]->{_p} if defined $_[0]->{_p};
-  $self;
-  }
+    my $copy = bless {}, $class;
 
-sub new 
-  {
-  # create a new BigInt object from a string or another BigInt object. 
-  # see hash keys documented at top
+    $copy->{sign}  = $self->{sign};
+    $copy->{value} = $CALC->_copy($self->{value});
+    $copy->{_a}    = $self->{_a} if exists $self->{_a};
+    $copy->{_p}    = $self->{_p} if exists $self->{_p};
 
-  # the argument could be an object, so avoid ||, && etc on it, this would
-  # cause costly overloaded code to be called. The only allowed ops are
-  # ref() and defined.
+    return $copy;
+}
 
-  my ($class,$wanted,$a,$p,$r) = @_;
+sub new {
+    # Create a new Math::BigInt object from a string or another Math::BigInt
+    # object. See hash keys documented at top.
 
-  # avoid numify-calls by not using || on $wanted!
-  return $class->bzero($a,$p) if !defined $wanted;	# default to 0
-  return $class->copy($wanted,$a,$p,$r)
-   if ref($wanted) && $wanted->isa($class);		# MBI or subclass
+    # The argument could be an object, so avoid ||, && etc. on it. This would
+    # cause costly overloaded code to be called. The only allowed ops are ref()
+    # and defined.
 
-  $class->import() if $IMPORT == 0;		# make require work
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
 
-  my $self = bless {}, $class;
+    my ($wanted, $a, $p, $r) = @_;
 
-  # shortcut for "normal" numbers
-  if ((!ref $wanted) && ($wanted =~ /^([+-]?)[1-9][0-9]*\z/))
-    {
-    $self->{sign} = $1 || '+';
+    # If called as a class method, initialize a new object.
 
-    if ($wanted =~ /^[+-]/)
-     {
-      # remove sign without touching wanted to make it work with constants
-      my $t = $wanted; $t =~ s/^[+-]//;
-      $self->{value} = $CALC->_new($t);
-      }
-    else
-      {
-      $self->{value} = $CALC->_new($wanted);
-      }
-    no strict 'refs';
-    if ( (defined $a) || (defined $p) 
-        || (defined ${"${class}::precision"})
-        || (defined ${"${class}::accuracy"}) 
-       )
-      {
-      $self->round($a,$p,$r) unless (@_ == 4 && !defined $a && !defined $p);
-      }
-    return $self;
-    }
+    $self = bless {}, $class unless $selfref;
 
-  # handle '+inf', '-inf' first
-  if ($wanted =~ /^[+-]?inf\z/)
-    {
-    $self->{sign} = $wanted;		# set a default sign for bstr()
-    return $self->binf($wanted);
+    unless (defined $wanted) {
+        require Carp;
+        Carp::carp("Use of uninitialized value in new");
+        return $self->bzero($a, $p, $r);
     }
-  # split str in m mantissa, e exponent, i integer, f fraction, v value, s sign
-  my ($mis,$miv,$mfv,$es,$ev) = _split($wanted);
-  if (!ref $mis)
-    {
-    if ($_trap_nan)
-      {
-      require Carp; Carp::croak("$wanted is not a number in $class");
-      }
-    $self->{value} = $CALC->_zero();
-    $self->{sign} = $nan;
-    return $self;
+
+    if (ref($wanted) && $wanted->isa($class)) {         # MBI or subclass
+        # Using "$copy = $wanted -> copy()" here fails some tests. Fixme!
+        my $copy = $class -> copy($wanted);
+        if ($selfref) {
+            %$self = %$copy;
+        } else {
+            $self = $copy;
+        }
+        return $self;
     }
-  if (!ref $miv)
-    {
-    # _from_hex or _from_bin
-    $self->{value} = $mis->{value};
-    $self->{sign} = $mis->{sign};
-    return $self;	# throw away $mis
-    }
-  # make integer from mantissa by adjusting exp, then convert to bigint
-  $self->{sign} = $$mis;			# store sign
-  $self->{value} = $CALC->_zero();		# for all the NaN cases
-  my $e = int("$$es$$ev");			# exponent (avoid recursion)
-  if ($e > 0)
+
+    $class->import() if $IMPORT == 0;           # make require work
+
+    # Shortcut for non-zero scalar integers with no non-zero exponent.
+
+    if (!ref($wanted) &&
+        $wanted =~ / ^
+                     ([+-]?)            # optional sign
+                     ([1-9][0-9]*)      # non-zero significand
+                     (\.0*)?            # ... with optional zero fraction
+                     ([Ee][+-]?0+)?     # optional zero exponent
+                     \z
+                   /x)
     {
-    my $diff = $e - CORE::length($$mfv);
-    if ($diff < 0)				# Not integer
-      {
-      if ($_trap_nan)
+        my $sgn = $1;
+        my $abs = $2;
+        $self->{sign} = $sgn || '+';
+        $self->{value} = $CALC->_new($abs);
+
+        no strict 'refs';
+        if (defined($a) || defined($p)
+            || defined(${"${class}::precision"})
+            || defined(${"${class}::accuracy"}))
         {
-        require Carp; Carp::croak("$wanted not an integer in $class");
+            $self->round($a, $p, $r)
+              unless @_ == 4 && !defined $a && !defined $p;
         }
-      #print "NOI 1\n";
-      return $upgrade->new($wanted,$a,$p,$r) if defined $upgrade;
-      $self->{sign} = $nan;
-      }
-    else					# diff >= 0
-      {
-      # adjust fraction and add it to value
-      #print "diff > 0 $$miv\n";
-      $$miv = $$miv . ($$mfv . '0' x $diff);
-      }
+
+        return $self;
     }
-  else
-    {
-    if ($$mfv ne '')				# e <= 0
-      {
-      # fraction and negative/zero E => NOI
-      if ($_trap_nan)
-        {
-        require Carp; Carp::croak("$wanted not an integer in $class");
+
+    # Handle Infs.
+
+    if ($wanted =~ /^\s*([+-]?)inf(inity)?\s*\z/i) {
+        my $sgn = $1 || '+';
+        $self->{sign} = $sgn . 'inf';   # set a default sign for bstr()
+        return $self->binf($sgn);
+    }
+
+    # Handle explicit NaNs (not the ones returned due to invalid input).
+
+    if ($wanted =~ /^\s*([+-]?)nan\s*\z/i) {
+        return $self->bnan();
+    }
+
+    if ($wanted =~ /^\s*[+-]?0[Xx]/) {
+        return $class -> from_hex($wanted);
+    }
+
+    if ($wanted =~ /^\s*[+-]?0[Bb]/) {
+        return $class -> from_bin($wanted);
+    }
+
+    # Split string into mantissa, exponent, integer, fraction, value, and sign.
+    my ($mis, $miv, $mfv, $es, $ev) = _split($wanted);
+    if (!ref $mis) {
+        if ($_trap_nan) {
+            require Carp; Carp::croak("$wanted is not a number in $class");
         }
-      #print "NOI 2 \$\$mfv '$$mfv'\n";
-      return $upgrade->new($wanted,$a,$p,$r) if defined $upgrade;
-      $self->{sign} = $nan;
-      }
-    elsif ($e < 0)
-      {
-      # xE-y, and empty mfv
-      #print "xE-y\n";
-      $e = abs($e);
-      if ($$miv !~ s/0{$e}$//)		# can strip so many zero's?
-        {
-        if ($_trap_nan)
-          {
-          require Carp; Carp::croak("$wanted not an integer in $class");
-          }
-        #print "NOI 3\n";
-        return $upgrade->new($wanted,$a,$p,$r) if defined $upgrade;
+        $self->{value} = $CALC->_zero();
         $self->{sign} = $nan;
+        return $self;
+    }
+
+    if (!ref $miv) {
+        # _from_hex or _from_bin
+        $self->{value} = $mis->{value};
+        $self->{sign} = $mis->{sign};
+        return $self;   # throw away $mis
+    }
+
+    # Make integer from mantissa by adjusting exponent, then convert to a
+    # Math::BigInt.
+    $self->{sign} = $$mis;           # store sign
+    $self->{value} = $CALC->_zero(); # for all the NaN cases
+    my $e = int("$$es$$ev");         # exponent (avoid recursion)
+    if ($e > 0) {
+        my $diff = $e - CORE::length($$mfv);
+        if ($diff < 0) {         # Not integer
+            if ($_trap_nan) {
+                require Carp; Carp::croak("$wanted not an integer in $class");
+            }
+            #print "NOI 1\n";
+            return $upgrade->new($wanted, $a, $p, $r) if defined $upgrade;
+            $self->{sign} = $nan;
+        } else {                 # diff >= 0
+            # adjust fraction and add it to value
+            #print "diff > 0 $$miv\n";
+            $$miv = $$miv . ($$mfv . '0' x $diff);
         }
-      }
     }
-  $self->{sign} = '+' if $$miv eq '0';			# normalize -0 => +0
-  $self->{value} = $CALC->_new($$miv) if $self->{sign} =~ /^[+-]$/;
-  # if any of the globals is set, use them to round and store them inside $self
-  # do not round for new($x,undef,undef) since that is used by MBF to signal
-  # no rounding
-  $self->round($a,$p,$r) unless @_ == 4 && !defined $a && !defined $p;
-  $self;
-  }
+
+    else {
+        if ($$mfv ne '') {       # e <= 0
+            # fraction and negative/zero E => NOI
+            if ($_trap_nan) {
+                require Carp; Carp::croak("$wanted not an integer in $class");
+            }
+            #print "NOI 2 \$\$mfv '$$mfv'\n";
+            return $upgrade->new($wanted, $a, $p, $r) if defined $upgrade;
+            $self->{sign} = $nan;
+        } elsif ($e < 0) {
+            # xE-y, and empty mfv
+            # Split the mantissa at the decimal point. E.g., if
+            # $$miv = 12345 and $e = -2, then $frac = 45 and $$miv = 123.
+
+            my $frac = substr($$miv, $e); # $frac is fraction part
+            substr($$miv, $e) = "";       # $$miv is now integer part
+
+            if ($frac =~ /[^0]/) {
+                if ($_trap_nan) {
+                    require Carp; Carp::croak("$wanted not an integer in $class");
+                }
+                #print "NOI 3\n";
+                return $upgrade->new($wanted, $a, $p, $r) if defined $upgrade;
+                $self->{sign} = $nan;
+            }
+        }
+    }
+
+    unless ($self->{sign} eq $nan) {
+        $self->{sign} = '+' if $$miv eq '0';            # normalize -0 => +0
+        $self->{value} = $CALC->_new($$miv) if $self->{sign} =~ /^[+-]$/;
+    }
+
+    # If any of the globals are set, use them to round, and store them inside
+    # $self. Do not round for new($x, undef, undef) since that is used by MBF
+    # to signal no rounding.
+
+    $self->round($a, $p, $r) unless @_ == 4 && !defined $a && !defined $p;
+    $self;
+}
 
 sub bnan
   {
@@ -664,7 +694,7 @@ sub bnan
     require Carp;
     Carp::croak ("Tried to set $self to NaN in $class\::bnan()");
     }
-  $self->import() if $IMPORT == 0;		# make require work
+  $self->import() if $IMPORT == 0;              # make require work
   return if $self->modify('bnan');
   if ($self->can('_bnan'))
     {
@@ -677,7 +707,7 @@ sub bnan
     $self->{value} = $CALC->_zero();
     }
   $self->{sign} = $nan;
-  delete $self->{_a}; delete $self->{_p};	# rounding NaN is silly
+  delete $self->{_a}; delete $self->{_p};       # rounding NaN is silly
   $self;
   }
 
@@ -698,7 +728,7 @@ sub binf
     require Carp;
     Carp::croak ("Tried to set $self to +-inf in $class\::binf()");
     }
-  $self->import() if $IMPORT == 0;		# make require work
+  $self->import() if $IMPORT == 0;              # make require work
   return if $self->modify('binf');
   if ($self->can('_binf'))
     {
@@ -710,9 +740,9 @@ sub binf
     # otherwise do our own thing
     $self->{value} = $CALC->_zero();
     }
-  $sign = $sign . 'inf' if $sign !~ /inf$/;	# - => -inf
+  $sign = $sign . 'inf' if $sign !~ /inf$/;     # - => -inf
   $self->{sign} = $sign;
-  ($self->{_a},$self->{_p}) = @_;		# take over requested rounding
+  ($self->{_a},$self->{_p}) = @_;               # take over requested rounding
   $self;
   }
 
@@ -726,7 +756,7 @@ sub bzero
     {
     my $c = $self; $self = {}; bless $self, $c;
     }
-  $self->import() if $IMPORT == 0;		# make require work
+  $self->import() if $IMPORT == 0;              # make require work
   return if $self->modify('bzero');
 
   if ($self->can('_bzero'))
@@ -770,7 +800,7 @@ sub bone
     {
     my $c = $self; $self = {}; bless $self, $c;
     }
-  $self->import() if $IMPORT == 0;		# make require work
+  $self->import() if $IMPORT == 0;              # make require work
   return if $self->modify('bone');
 
   if ($self->can('_bone'))
@@ -811,42 +841,52 @@ sub bsstr
   # (ref to BFLOAT or num_str ) return num_str
   # Convert number from internal format to scientific string format.
   # internal format is always normalized (no leading zeros, "-0E0" => "+0E0")
-  my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_); 
+  my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
 
   if ($x->{sign} !~ /^[+-]$/)
     {
-    return $x->{sign} unless $x->{sign} eq '+inf';	# -inf, NaN
-    return 'inf';					# +inf
+    return $x->{sign} unless $x->{sign} eq '+inf';      # -inf, NaN
+    return 'inf';                                       # +inf
     }
   my ($m,$e) = $x->parts();
-  #$m->bstr() . 'e+' . $e->bstr(); 	# e can only be positive in BigInt
+  #$m->bstr() . 'e+' . $e->bstr();      # e can only be positive in BigInt
   # 'e+' because E can only be positive in BigInt
-  $m->bstr() . 'e+' . $CALC->_str($e->{value}); 
+  $m->bstr() . 'e+' . $CALC->_str($e->{value});
   }
 
-sub bstr 
+sub bstr
   {
   # make a string from bigint object
-  my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_); 
+  my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
 
   if ($x->{sign} !~ /^[+-]$/)
     {
-    return $x->{sign} unless $x->{sign} eq '+inf';	# -inf, NaN
-    return 'inf';					# +inf
+    return $x->{sign} unless $x->{sign} eq '+inf';      # -inf, NaN
+    return 'inf';                                       # +inf
     }
   my $es = ''; $es = $x->{sign} if $x->{sign} eq '-';
   $es.$CALC->_str($x->{value});
   }
 
-sub numify 
+sub numify
   {
-  # Make a "normal" scalar from a BigInt object
+  # Make a Perl scalar number from a Math::BigInt object.
   my $x = shift; $x = $class->new($x) unless ref $x;
 
-  return $x->bstr() if $x->{sign} !~ /^[+-]$/;
-  my $num = $CALC->_num($x->{value});
-  return -$num if $x->{sign} eq '-';
-  $num;
+  if ($x -> is_nan()) {
+      require Math::Complex;
+      my $inf = Math::Complex::Inf();
+      return $inf - $inf;
+  }
+
+  if ($x -> is_inf()) {
+      require Math::Complex;
+      my $inf = Math::Complex::Inf();
+      return $x -> is_negative() ? -$inf : $inf;
+  }
+
+  my $num = 0 + $CALC->_num($x->{value});
+  return $x->{sign} eq '-' ? -$num : $num;
   }
 
 ##############################################################################
@@ -855,158 +895,146 @@ sub numify
 sub sign
   {
   # return the sign of the number: +/-/-inf/+inf/NaN
-  my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_); 
+  my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
 
   $x->{sign};
   }
 
-sub _find_round_parameters
-  {
-  # After any operation or when calling round(), the result is rounded by
-  # regarding the A & P from arguments, local parameters, or globals.
+sub _find_round_parameters {
+    # After any operation or when calling round(), the result is rounded by
+    # regarding the A & P from arguments, local parameters, or globals.
 
-  # !!!!!!! If you change this, remember to change round(), too! !!!!!!!!!!
+    # !!!!!!! If you change this, remember to change round(), too! !!!!!!!!!!
 
-  # This procedure finds the round parameters, but it is for speed reasons
-  # duplicated in round. Otherwise, it is tested by the testsuite and used
-  # by fdiv().
+    # This procedure finds the round parameters, but it is for speed reasons
+    # duplicated in round. Otherwise, it is tested by the testsuite and used
+    # by bdiv().
 
-  # returns ($self) or ($self,$a,$p,$r) - sets $self to NaN of both A and P
-  # were requested/defined (locally or globally or both)
+    # returns ($self) or ($self,$a,$p,$r) - sets $self to NaN of both A and P
+    # were requested/defined (locally or globally or both)
 
-  my ($self,$a,$p,$r,@args) = @_;
-  # $a accuracy, if given by caller
-  # $p precision, if given by caller
-  # $r round_mode, if given by caller
-  # @args all 'other' arguments (0 for unary, 1 for binary ops)
+    my ($self, $a, $p, $r, @args) = @_;
+    # $a accuracy, if given by caller
+    # $p precision, if given by caller
+    # $r round_mode, if given by caller
+    # @args all 'other' arguments (0 for unary, 1 for binary ops)
 
-  my $c = ref($self);				# find out class of argument(s)
-  no strict 'refs';
+    my $class = ref($self);       # find out class of argument(s)
+    no strict 'refs';
 
-  # convert to normal scalar for speed and correctness in inner parts
-  $a = $a->can('numify') ? $a->numify() : "$a" if defined $a && ref($a);
-  $p = $p->can('numify') ? $p->numify() : "$p" if defined $p && ref($p);
+    # convert to normal scalar for speed and correctness in inner parts
+    $a = $a->can('numify') ? $a->numify() : "$a" if defined $a && ref($a);
+    $p = $p->can('numify') ? $p->numify() : "$p" if defined $p && ref($p);
 
-  # now pick $a or $p, but only if we have got "arguments"
-  if (!defined $a)
-    {
-    foreach ($self,@args)
-      {
-      # take the defined one, or if both defined, the one that is smaller
-      $a = $_->{_a} if (defined $_->{_a}) && (!defined $a || $_->{_a} < $a);
-      }
+    # now pick $a or $p, but only if we have got "arguments"
+    if (!defined $a) {
+        foreach ($self, @args) {
+            # take the defined one, or if both defined, the one that is smaller
+            $a = $_->{_a} if (defined $_->{_a}) && (!defined $a || $_->{_a} < $a);
+        }
     }
-  if (!defined $p)
-    {
-    # even if $a is defined, take $p, to signal error for both defined
-    foreach ($self,@args)
-      {
-      # take the defined one, or if both defined, the one that is bigger
-      # -2 > -3, and 3 > 2
-      $p = $_->{_p} if (defined $_->{_p}) && (!defined $p || $_->{_p} > $p);
-      }
+    if (!defined $p) {
+        # even if $a is defined, take $p, to signal error for both defined
+        foreach ($self, @args) {
+            # take the defined one, or if both defined, the one that is bigger
+            # -2 > -3, and 3 > 2
+            $p = $_->{_p} if (defined $_->{_p}) && (!defined $p || $_->{_p} > $p);
+        }
     }
-  # if still none defined, use globals (#2)
-  $a = ${"$c\::accuracy"} unless defined $a;
-  $p = ${"$c\::precision"} unless defined $p;
 
-  # A == 0 is useless, so undef it to signal no rounding
-  $a = undef if defined $a && $a == 0;
+    # if still none defined, use globals (#2)
+    $a = ${"$class\::accuracy"}  unless defined $a;
+    $p = ${"$class\::precision"} unless defined $p;
 
-  # no rounding today? 
-  return ($self) unless defined $a || defined $p;		# early out
+    # A == 0 is useless, so undef it to signal no rounding
+    $a = undef if defined $a && $a == 0;
 
-  # set A and set P is an fatal error
-  return ($self->bnan()) if defined $a && defined $p;		# error
+    # no rounding today?
+    return ($self) unless defined $a || defined $p; # early out
 
-  $r = ${"$c\::round_mode"} unless defined $r;
-  if ($r !~ /^(even|odd|\+inf|\-inf|zero|trunc|common)$/)
-    {
-    require Carp; Carp::croak ("Unknown round mode '$r'");
+    # set A and set P is an fatal error
+    return ($self->bnan()) if defined $a && defined $p; # error
+
+    $r = ${"$class\::round_mode"} unless defined $r;
+    if ($r !~ /^(even|odd|[+-]inf|zero|trunc|common)$/) {
+        require Carp; Carp::croak ("Unknown round mode '$r'");
     }
 
-  $a = int($a) if defined $a;
-  $p = int($p) if defined $p;
+    $a = int($a) if defined $a;
+    $p = int($p) if defined $p;
 
-  ($self,$a,$p,$r);
-  }
+    ($self, $a, $p, $r);
+}
 
-sub round
-  {
-  # Round $self according to given parameters, or given second argument's
-  # parameters or global defaults 
+sub round {
+    # Round $self according to given parameters, or given second argument's
+    # parameters or global defaults
 
-  # for speed reasons, _find_round_parameters is embedded here:
+    # for speed reasons, _find_round_parameters is embedded here:
 
-  my ($self,$a,$p,$r,@args) = @_;
-  # $a accuracy, if given by caller
-  # $p precision, if given by caller
-  # $r round_mode, if given by caller
-  # @args all 'other' arguments (0 for unary, 1 for binary ops)
+    my ($self, $a, $p, $r, @args) = @_;
+    # $a accuracy, if given by caller
+    # $p precision, if given by caller
+    # $r round_mode, if given by caller
+    # @args all 'other' arguments (0 for unary, 1 for binary ops)
 
-  my $c = ref($self);				# find out class of argument(s)
-  no strict 'refs';
+    my $class = ref($self);       # find out class of argument(s)
+    no strict 'refs';
 
-  # now pick $a or $p, but only if we have got "arguments"
-  if (!defined $a)
-    {
-    foreach ($self,@args)
-      {
-      # take the defined one, or if both defined, the one that is smaller
-      $a = $_->{_a} if (defined $_->{_a}) && (!defined $a || $_->{_a} < $a);
-      }
+    # now pick $a or $p, but only if we have got "arguments"
+    if (!defined $a) {
+        foreach ($self, @args) {
+            # take the defined one, or if both defined, the one that is smaller
+            $a = $_->{_a} if (defined $_->{_a}) && (!defined $a || $_->{_a} < $a);
+        }
     }
-  if (!defined $p)
-    {
-    # even if $a is defined, take $p, to signal error for both defined
-    foreach ($self,@args)
-      {
-      # take the defined one, or if both defined, the one that is bigger
-      # -2 > -3, and 3 > 2
-      $p = $_->{_p} if (defined $_->{_p}) && (!defined $p || $_->{_p} > $p);
-      }
+    if (!defined $p) {
+        # even if $a is defined, take $p, to signal error for both defined
+        foreach ($self, @args) {
+            # take the defined one, or if both defined, the one that is bigger
+            # -2 > -3, and 3 > 2
+            $p = $_->{_p} if (defined $_->{_p}) && (!defined $p || $_->{_p} > $p);
+        }
     }
-  # if still none defined, use globals (#2)
-  $a = ${"$c\::accuracy"} unless defined $a;
-  $p = ${"$c\::precision"} unless defined $p;
 
-  # A == 0 is useless, so undef it to signal no rounding
-  $a = undef if defined $a && $a == 0;
+    # if still none defined, use globals (#2)
+    $a = ${"$class\::accuracy"}  unless defined $a;
+    $p = ${"$class\::precision"} unless defined $p;
 
-  # no rounding today? 
-  return $self unless defined $a || defined $p;		# early out
+    # A == 0 is useless, so undef it to signal no rounding
+    $a = undef if defined $a && $a == 0;
 
-  # set A and set P is an fatal error
-  return $self->bnan() if defined $a && defined $p;
+    # no rounding today?
+    return $self unless defined $a || defined $p; # early out
 
-  $r = ${"$c\::round_mode"} unless defined $r;
-  if ($r !~ /^(even|odd|\+inf|\-inf|zero|trunc|common)$/)
-    {
-    require Carp; Carp::croak ("Unknown round mode '$r'");
-    }
+    # set A and set P is an fatal error
+    return $self->bnan() if defined $a && defined $p;
 
-  # now round, by calling either fround or ffround:
-  if (defined $a)
-    {
-    $self->bround(int($a),$r) if !defined $self->{_a} || $self->{_a} >= $a;
+    $r = ${"$class\::round_mode"} unless defined $r;
+    if ($r !~ /^(even|odd|[+-]inf|zero|trunc|common)$/) {
+        require Carp; Carp::croak ("Unknown round mode '$r'");
     }
-  else # both can't be undefined due to early out
-    {
-    $self->bfround(int($p),$r) if !defined $self->{_p} || $self->{_p} <= $p;
+
+    # now round, by calling either bround or bfround:
+    if (defined $a) {
+        $self->bround(int($a), $r) if !defined $self->{_a} || $self->{_a} >= $a;
+    } else {                  # both can't be undefined due to early out
+        $self->bfround(int($p), $r) if !defined $self->{_p} || $self->{_p} <= $p;
     }
-  # bround() or bfround() already called bnorm() if nec.
-  $self;
-  }
+
+    # bround() or bfround() already called bnorm() if nec.
+    $self;
+}
 
 sub bnorm
-  { 
+  {
   # (numstr or BINT) return BINT
   # Normalize number -- no-op here
   my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
   $x;
   }
 
-sub babs 
+sub babs
   {
   # (BINT or num_str) return BINT
   # make number absolute, or return absolute BINT from string
@@ -1030,8 +1058,8 @@ sub bsgn {
     return $self;               # zero or NaN
 }
 
-sub bneg 
-  { 
+sub bneg
+  {
   # (BINT or num_str) return BINT
   # negate number or make a negated number from string
   my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
@@ -1043,7 +1071,7 @@ sub bneg
   $x;
   }
 
-sub bcmp 
+sub bcmp
   {
   # Compares 2 values.  Returns one of undef, <0, =0, >0. (suitable for sort)
   # (BINT or num_str, BINT or num_str) return cond_code
@@ -1051,7 +1079,7 @@ sub bcmp
   # set up parameters
   my ($self,$x,$y) = (ref($_[0]),@_);
 
-  # objectify is costly, so avoid it 
+  # objectify is costly, so avoid it
   if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1])))
     {
     ($self,$x,$y) = objectify(2,@_);
@@ -1071,33 +1099,33 @@ sub bcmp
     return +1;
     }
   # check sign for speed first
-  return 1 if $x->{sign} eq '+' && $y->{sign} eq '-';	# does also 0 <=> -y
-  return -1 if $x->{sign} eq '-' && $y->{sign} eq '+';  # does also -x <=> 0 
+  return 1 if $x->{sign} eq '+' && $y->{sign} eq '-';   # does also 0 <=> -y
+  return -1 if $x->{sign} eq '-' && $y->{sign} eq '+';  # does also -x <=> 0
 
   # have same sign, so compare absolute values.  Don't make tests for zero
   # here because it's actually slower than testing in Calc (especially w/ Pari
   # et al)
 
   # post-normalized compare for internal use (honors signs)
-  if ($x->{sign} eq '+') 
+  if ($x->{sign} eq '+')
     {
     # $x and $y both > 0
     return $CALC->_acmp($x->{value},$y->{value});
     }
 
   # $x && $y both < 0
-  $CALC->_acmp($y->{value},$x->{value});	# swapped acmp (lib returns 0,1,-1)
+  $CALC->_acmp($y->{value},$x->{value});        # swapped acmp (lib returns 0,1,-1)
   }
 
-sub bacmp 
+sub bacmp
   {
-  # Compares 2 values, ignoring their signs. 
+  # Compares 2 values, ignoring their signs.
   # Returns one of undef, <0, =0, >0. (suitable for sort)
   # (BINT, BINT) return cond_code
 
   # set up parameters
   my ($self,$x,$y) = (ref($_[0]),@_);
-  # objectify is costly, so avoid it 
+  # objectify is costly, so avoid it
   if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1])))
     {
     ($self,$x,$y) = objectify(2,@_);
@@ -1114,17 +1142,17 @@ sub bacmp
     return 1 if $x->{sign} =~ /^[+-]inf$/ && $y->{sign} !~ /^[+-]inf$/;
     return -1;
     }
-  $CALC->_acmp($x->{value},$y->{value});	# lib does only 0,1,-1
+  $CALC->_acmp($x->{value},$y->{value});        # lib does only 0,1,-1
   }
 
-sub badd 
+sub badd
   {
   # add second arg (BINT or string) to first (BINT) (modifies first)
   # return result as BINT
 
   # set up parameters
   my ($self,$x,$y,@r) = (ref($_[0]),@_);
-  # objectify is costly, so avoid it 
+  # objectify is costly, so avoid it
   if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1])))
     {
     ($self,$x,$y,@r) = objectify(2,@_);
@@ -1134,7 +1162,7 @@ sub badd
   return $upgrade->badd($upgrade->new($x),$upgrade->new($y),@r) if defined $upgrade &&
     ((!$x->isa($self)) || (!$y->isa($self)));
 
-  $r[3] = $y;				# no push!
+  $r[3] = $y;                           # no push!
   # inf and NaN handling
   if (($x->{sign} !~ /^[+-]$/) || ($y->{sign} !~ /^[+-]$/))
     {
@@ -1153,20 +1181,20 @@ sub badd
     return $x;
     }
 
-  my ($sx, $sy) = ( $x->{sign}, $y->{sign} ); 		# get signs
+  my ($sx, $sy) = ( $x->{sign}, $y->{sign} );           # get signs
 
-  if ($sx eq $sy)  
+  if ($sx eq $sy)
     {
-    $x->{value} = $CALC->_add($x->{value},$y->{value});	# same sign, abs add
+    $x->{value} = $CALC->_add($x->{value},$y->{value}); # same sign, abs add
     }
-  else 
+  else
     {
-    my $a = $CALC->_acmp ($y->{value},$x->{value});	# absolute compare
-    if ($a > 0)                           
+    my $a = $CALC->_acmp ($y->{value},$x->{value});     # absolute compare
+    if ($a > 0)
       {
       $x->{value} = $CALC->_sub($y->{value},$x->{value},1); # abs sub w/ swap
       $x->{sign} = $sy;
-      } 
+      }
     elsif ($a == 0)
       {
       # speedup, if equal, set result to 0
@@ -1181,7 +1209,7 @@ sub badd
   $x->round(@r);
   }
 
-sub bsub 
+sub bsub
   {
   # (BINT or num_str, BINT or num_str) return BINT
   # subtract second arg from first, modify first
@@ -1206,16 +1234,16 @@ sub bsub
   # of $x, then flip the sign from $y, and if the sign of $x did change, too,
   # then we caught the special case:
   my $xsign = $x->{sign};
-  $y->{sign} =~ tr/+\-/-+/; 	# does nothing for NaN
+  $y->{sign} =~ tr/+\-/-+/;     # does nothing for NaN
   if ($xsign ne $x->{sign})
     {
     # special case of $x->bsub($x) results in 0
     return $x->bzero(@r) if $xsign =~ /^[+-]$/;
     return $x->bnan();          # NaN, -inf, +inf
     }
-  $x->badd($y,@r); 		# badd does not leave internal zeros
-  $y->{sign} =~ tr/+\-/-+/; 	# refix $y (does nothing for NaN)
-  $x;				# already rounded by badd() or no round nec.
+  $x->badd($y,@r);              # badd does not leave internal zeros
+  $y->{sign} =~ tr/+\-/-+/;     # refix $y (does nothing for NaN)
+  $x;                           # already rounded by badd() or no round nec.
   }
 
 sub binc
@@ -1236,7 +1264,7 @@ sub binc
     return $x->round($a,$p,$r);
     }
   # inf, nan handling etc
-  $x->badd($self->bone(),$a,$p,$r);		# badd does round
+  $x->badd($self->bone(),$a,$p,$r);             # badd does round
   }
 
 sub bdec
@@ -1249,7 +1277,7 @@ sub bdec
     {
     # x already < 0
     $x->{value} = $CALC->_inc($x->{value});
-    } 
+    }
   else
     {
     return $x->badd($self->bone('-'),@r)
@@ -1258,7 +1286,7 @@ sub bdec
     if ($CALC->_is_zero($x->{value}))
       {
       # == 0
-      $x->{value} = $CALC->_one(); $x->{sign} = '-';		# 0 => -1
+      $x->{value} = $CALC->_one(); $x->{sign} = '-';            # 0 => -1
       }
     else
       {
@@ -1271,27 +1299,52 @@ sub bdec
 
 sub blog
   {
-  # calculate $x = $a ** $base + $b and return $a (e.g. the log() to base
-  # $base of $x)
+  # Return the logarithm of the operand. If a second operand is defined, that
+  # value is used as the base, otherwise the base is assumed to be Euler's
+  # constant.
+
+  # Don't objectify the base, since an undefined base, as in $x->blog() or
+  # $x->blog(undef) signals that the base is Euler's number.
 
   # set up parameters
   my ($self,$x,$base,@r) = (undef,@_);
   # objectify is costly, so avoid it
-  if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1])))
-    {
-    ($self,$x,$base,@r) = objectify(2,@_);
-    }
+  if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1]))) {
+      ($self,$x,$base,@r) = objectify(1,@_);
+  }
 
   return $x if $x->modify('blog');
 
-  $base = $self->new($base) if defined $base && !ref $base;
+  # Handle all exception cases and all trivial cases. I have used Wolfram Alpha
+  # (http://www.wolframalpha.com) as the reference for these cases.
+
+  return $x -> bnan() if $x -> is_nan();
+
+  if (defined $base) {
+      $base = $self -> new($base) unless ref $base;
+      if ($base -> is_nan() || $base -> is_one()) {
+          return $x -> bnan();
+      } elsif ($base -> is_inf() || $base -> is_zero()) {
+          return $x -> bnan() if $x -> is_inf() || $x -> is_zero();
+          return $x -> bzero();
+      } elsif ($base -> is_negative()) {            # -inf < base < 0
+          return $x -> bzero() if $x -> is_one();   #     x = 1
+          return $x -> bone()  if $x == $base;      #     x = base
+          return $x -> bnan();                      #     otherwise
+      }
+      return $x -> bone() if $x == $base;           # 0 < base && 0 < x < inf
+  }
 
-  # inf, -inf, NaN, <0 => NaN
-  return $x->bnan()
-   if $x->{sign} ne '+' || (defined $base && $base->{sign} ne '+');
+  # We now know that the base is either undefined or >= 2 and finite.
+
+  return $x -> binf('+') if $x -> is_inf();         #   x = +/-inf
+  return $x -> bnan()    if $x -> is_neg();         #   -inf < x < 0
+  return $x -> bzero()   if $x -> is_one();         #   x = 1
+  return $x -> binf('-') if $x -> is_zero();        #   x = 0
+
+  # At this point we are done handling all exception cases and trivial cases.
 
-  return $upgrade->blog($upgrade->new($x),$base,@r) if 
-    defined $upgrade;
+  return $upgrade -> blog($upgrade -> new($x), $base, @r) if defined $upgrade;
 
   # fix for bug #24969:
   # the default base is e (Euler's number) which is not an integer
@@ -1306,7 +1359,7 @@ sub blog
     }
 
   my ($rc,$exact) = $CALC->_log_int($x->{value},$base->{value});
-  return $x->bnan() unless defined $rc;		# not possible to take log?
+  return $x->bnan() unless defined $rc;         # not possible to take log?
   $x->{value} = $rc;
   $x->round(@r);
   }
@@ -1349,7 +1402,7 @@ sub bnok
       $z->binc();
       my $r = $z->copy(); $z->binc();
       my $d = $self->new(2);
-      while ($z->bacmp($x) <= 0)		# f <= x ?
+      while ($z->bacmp($x) <= 0)                # f <= x ?
         {
         $r->bmul($z); $r->bdiv($d);
         $z->binc(); $d->binc();
@@ -1409,16 +1462,16 @@ sub blcm
     $x = $class->new($y);
     }
   my $self = ref($x);
-  while (@_) 
+  while (@_)
     {
     my $y = shift; $y = $self->new($y) if !ref ($y);
     $x = __lcm($x,$y);
-    } 
+    }
   $x;
   }
 
-sub bgcd 
-  { 
+sub bgcd
+  {
   # (BINT or num_str, BINT or num_str) return BINT
   # does not modify arguments, but returns new object
   # GCD -- Euclid's algorithm, variant C (Knuth Vol 3, pg 341 ff)
@@ -1426,20 +1479,20 @@ sub bgcd
   my $y = shift;
   $y = $class->new($y) if !ref($y);
   my $self = ref($y);
-  my $x = $y->copy()->babs();			# keep arguments
-  return $x->bnan() if $x->{sign} !~ /^[+-]$/;	# x NaN?
+  my $x = $y->copy()->babs();                   # keep arguments
+  return $x->bnan() if $x->{sign} !~ /^[+-]$/;  # x NaN?
 
   while (@_)
     {
     $y = shift; $y = $self->new($y) if !ref($y);
-    return $x->bnan() if $y->{sign} !~ /^[+-]$/;	# y NaN?
+    return $x->bnan() if $y->{sign} !~ /^[+-]$/;        # y NaN?
     $x->{value} = $CALC->_gcd($x->{value},$y->{value});
     last if $CALC->_is_one($x->{value});
     }
   $x;
   }
 
-sub bnot 
+sub bnot
   {
   # (num_str or BINT) return BINT
   # represent ~x as twos-complement number
@@ -1447,7 +1500,7 @@ sub bnot
   my ($self,$x,$a,$p,$r) = ref($_[0]) ? (undef,@_) : objectify(1,@_);
 
   return $x if $x->modify('bnot');
-  $x->binc()->bneg();			# binc already does round
+  $x->binc()->bneg();                   # binc already does round
   }
 
 ##############################################################################
@@ -1459,7 +1512,7 @@ sub is_zero
   # return true if arg (BINT or num_str) is zero (array '+', '0')
   my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
 
-  return 0 if $x->{sign} !~ /^\+$/;			# -, NaN & +-inf aren't
+  return 0 if $x->{sign} !~ /^\+$/;                     # -, NaN & +-inf aren't
   $CALC->_is_zero($x->{value});
   }
 
@@ -1478,11 +1531,11 @@ sub is_inf
 
   if (defined $sign)
     {
-    $sign = '[+-]inf' if $sign eq '';	# +- doesn't matter, only that's inf
-    $sign = "[$1]inf" if $sign =~ /^([+-])(inf)?$/;	# extract '+' or '-'
+    $sign = '[+-]inf' if $sign eq '';   # +- doesn't matter, only that's inf
+    $sign = "[$1]inf" if $sign =~ /^([+-])(inf)?$/;     # extract '+' or '-'
     return $x->{sign} =~ /^$sign$/ ? 1 : 0;
     }
-  $x->{sign} =~ /^[+-]inf$/ ? 1 : 0;		# only +-inf is infinity
+  $x->{sign} =~ /^[+-]inf$/ ? 1 : 0;            # only +-inf is infinity
   }
 
 sub is_one
@@ -1492,7 +1545,7 @@ sub is_one
 
   $sign = '+' if !defined $sign || $sign ne '-';
 
-  return 0 if $x->{sign} ne $sign; 	# -1 != +1, NaN, +-inf aren't either
+  return 0 if $x->{sign} ne $sign;      # -1 != +1, NaN, +-inf aren't either
   $CALC->_is_one($x->{value});
   }
 
@@ -1501,7 +1554,7 @@ sub is_odd
   # return true when arg (BINT or num_str) is odd, false for even
   my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
 
-  return 0 if $x->{sign} !~ /^[+-]$/;			# NaN & +-inf aren't
+  return 0 if $x->{sign} !~ /^[+-]$/;                   # NaN & +-inf aren't
   $CALC->_is_odd($x->{value});
   }
 
@@ -1510,7 +1563,7 @@ sub is_even
   # return true when arg (BINT or num_str) is even, false for odd
   my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
 
-  return 0 if $x->{sign} !~ /^[+-]$/;			# NaN & +-inf aren't
+  return 0 if $x->{sign} !~ /^[+-]$/;                   # NaN & +-inf aren't
   $CALC->_is_even($x->{value});
   }
 
@@ -1519,7 +1572,7 @@ sub is_positive
   # return true when arg (BINT or num_str) is positive (> 0)
   my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
 
-  return 1 if $x->{sign} eq '+inf';			# +inf is positive
+  return 1 if $x->{sign} eq '+inf';                     # +inf is positive
 
   # 0+ is neither positive nor negative
   ($x->{sign} eq '+' && !$x->is_zero()) ? 1 : 0;
@@ -1530,7 +1583,7 @@ sub is_negative
   # return true when arg (BINT or num_str) is negative (< 0)
   my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
 
-  $x->{sign} =~ /^-/ ? 1 : 0; 		# -inf is negative, but NaN is not
+  $x->{sign} =~ /^-/ ? 1 : 0;           # -inf is negative, but NaN is not
   }
 
 sub is_int
@@ -1539,13 +1592,13 @@ sub is_int
   # always true for BigInt, but different for BigFloats
   my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
 
-  $x->{sign} =~ /^[+-]$/ ? 1 : 0;		# inf/-inf/NaN aren't
+  $x->{sign} =~ /^[+-]$/ ? 1 : 0;               # inf/-inf/NaN aren't
   }
 
 ###############################################################################
 
-sub bmul 
-  { 
+sub bmul
+  {
   # multiply the first number by the second number
   # (BINT or num_str, BINT or num_str) return BINT
 
@@ -1568,26 +1621,26 @@ sub bmul
     # result will always be +-inf:
     # +inf * +/+inf => +inf, -inf * -/-inf => +inf
     # +inf * -/-inf => -inf, -inf * +/+inf => -inf
-    return $x->binf() if ($x->{sign} =~ /^\+/ && $y->{sign} =~ /^\+/); 
-    return $x->binf() if ($x->{sign} =~ /^-/ && $y->{sign} =~ /^-/); 
+    return $x->binf() if ($x->{sign} =~ /^\+/ && $y->{sign} =~ /^\+/);
+    return $x->binf() if ($x->{sign} =~ /^-/ && $y->{sign} =~ /^-/);
     return $x->binf('-');
     }
 
   return $upgrade->bmul($x,$upgrade->new($y),@r)
    if defined $upgrade && !$y->isa($self);
 
-  $r[3] = $y;				# no push here
+  $r[3] = $y;                           # no push here
 
   $x->{sign} = $x->{sign} eq $y->{sign} ? '+' : '-'; # +1 * +1 or -1 * -1 => +
 
-  $x->{value} = $CALC->_mul($x->{value},$y->{value});	# do actual math
-  $x->{sign} = '+' if $CALC->_is_zero($x->{value}); 	# no -0
+  $x->{value} = $CALC->_mul($x->{value},$y->{value});   # do actual math
+  $x->{sign} = '+' if $CALC->_is_zero($x->{value});     # no -0
 
   $x->round(@r);
   }
 
 sub bmuladd
-  { 
+  {
   # multiply two numbers and then add the third to the result
   # (BINT or num_str, BINT or num_str, BINT or num_str) return BINT
 
@@ -1597,8 +1650,8 @@ sub bmuladd
   return $x if $x->modify('bmuladd');
 
   return $x->bnan() if  ($x->{sign} eq $nan) ||
-			($y->{sign} eq $nan) ||
-			($z->{sign} eq $nan);
+                        ($y->{sign} eq $nan) ||
+                        ($z->{sign} eq $nan);
 
   # inf handling of x and y
   if (($x->{sign} =~ /^[+-]inf$/) || ($y->{sign} =~ /^[+-]inf$/))
@@ -1607,8 +1660,8 @@ sub bmuladd
     # result will always be +-inf:
     # +inf * +/+inf => +inf, -inf * -/-inf => +inf
     # +inf * -/-inf => -inf, -inf * +/+inf => -inf
-    return $x->binf() if ($x->{sign} =~ /^\+/ && $y->{sign} =~ /^\+/); 
-    return $x->binf() if ($x->{sign} =~ /^-/ && $y->{sign} =~ /^-/); 
+    return $x->binf() if ($x->{sign} =~ /^\+/ && $y->{sign} =~ /^\+/);
+    return $x->binf() if ($x->{sign} =~ /^-/ && $y->{sign} =~ /^-/);
     return $x->binf('-');
     }
   # inf handling x*y and z
@@ -1622,27 +1675,27 @@ sub bmuladd
    if defined $upgrade && (!$y->isa($self) || !$z->isa($self) || !$x->isa($self));
 
   # TODO: what if $y and $z have A or P set?
-  $r[3] = $z;				# no push here
+  $r[3] = $z;                           # no push here
 
   $x->{sign} = $x->{sign} eq $y->{sign} ? '+' : '-'; # +1 * +1 or -1 * -1 => +
 
-  $x->{value} = $CALC->_mul($x->{value},$y->{value});	# do actual math
-  $x->{sign} = '+' if $CALC->_is_zero($x->{value}); 	# no -0
+  $x->{value} = $CALC->_mul($x->{value},$y->{value});   # do actual math
+  $x->{sign} = '+' if $CALC->_is_zero($x->{value});     # no -0
 
-  my ($sx, $sz) = ( $x->{sign}, $z->{sign} ); 		# get signs
+  my ($sx, $sz) = ( $x->{sign}, $z->{sign} );           # get signs
 
-  if ($sx eq $sz)  
+  if ($sx eq $sz)
     {
-    $x->{value} = $CALC->_add($x->{value},$z->{value});	# same sign, abs add
+    $x->{value} = $CALC->_add($x->{value},$z->{value}); # same sign, abs add
     }
-  else 
+  else
     {
-    my $a = $CALC->_acmp ($z->{value},$x->{value});	# absolute compare
-    if ($a > 0)                           
+    my $a = $CALC->_acmp ($z->{value},$x->{value});     # absolute compare
+    if ($a > 0)
       {
       $x->{value} = $CALC->_sub($z->{value},$x->{value},1); # abs sub w/ swap
       $x->{sign} = $sz;
-      } 
+      }
     elsif ($a == 0)
       {
       # speedup, if equal, set result to 0
@@ -1657,115 +1710,190 @@ sub bmuladd
   $x->round(@r);
   }
 
-sub _div_inf
+sub bdiv
   {
-  # helper function that handles +-inf cases for bdiv()/bmod() to reuse code
-  my ($self,$x,$y) = @_;
 
-  # NaN if x == NaN or y == NaN or x==y==0
-  return wantarray ? ($x->bnan(),$self->bnan()) : $x->bnan()
-   if (($x->is_nan() || $y->is_nan())   ||
-       ($x->is_zero() && $y->is_zero()));
+    # This does floored division, where the quotient is floored toward negative
+    # infinity and the remainder has the same sign as the divisor.
 
-  # +-inf / +-inf == NaN, remainder also NaN
-  if (($x->{sign} =~ /^[+-]inf$/) && ($y->{sign} =~ /^[+-]inf$/))
-    {
-    return wantarray ? ($x->bnan(),$self->bnan()) : $x->bnan();
+    # Set up parameters.
+    my ($self,$x,$y,@r) = (ref($_[0]),@_);
+
+    # objectify() is costly, so avoid it if we can.
+    if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1]))) {
+        ($self,$x,$y,@r) = objectify(2,@_);
     }
-  # x / +-inf => 0, remainder x (works even if x == 0)
-  if ($y->{sign} =~ /^[+-]inf$/)
-    {
-    my $t = $x->copy();		# bzero clobbers up $x
-    return wantarray ? ($x->bzero(),$t) : $x->bzero()
+
+    return $x if $x->modify('bdiv');
+
+    my $wantarray = wantarray;          # call only once
+
+    # At least one argument is NaN. Return NaN for both quotient and the
+    # modulo/remainder.
+
+    if ($x -> is_nan() || $y -> is_nan()) {
+        return $wantarray ? ($x -> bnan(), $self -> bnan()) : $x -> bnan();
     }
 
-  # 5 / 0 => +inf, -6 / 0 => -inf
-  # +inf / 0 = inf, inf,  and -inf / 0 => -inf, -inf 
-  # exception:   -8 / 0 has remainder -8, not 8
-  # exception: -inf / 0 has remainder -inf, not inf
-  if ($y->is_zero())
-    {
-    # +-inf / 0 => special case for -inf
-    return wantarray ?  ($x,$x->copy()) : $x if $x->is_inf();
-    if (!$x->is_zero() && !$x->is_inf())
-      {
-      my $t = $x->copy();		# binf clobbers up $x
-      return wantarray ?
-       ($x->binf($x->{sign}),$t) : $x->binf($x->{sign})
+    # Divide by zero and modulo zero.
+    #
+    # Division: Use the common convention that x / 0 is inf with the same sign
+    # as x, except when x = 0, where we return NaN. This is also what earlier
+    # versions did.
+    #
+    # Modulo: In modular arithmetic, the congruence relation z = x (mod y)
+    # means that there is some integer k such that z - x = k y. If y = 0, we
+    # get z - x = 0 or z = x. This is also what earlier versions did, except
+    # that 0 % 0 returned NaN.
+    #
+    #     inf / 0 =  inf                     inf % 0 =  inf
+    #       5 / 0 =  inf                       5 % 0 =    5
+    #       0 / 0 =  NaN                       0 % 0 =    0 (before: NaN)
+    #      -5 / 0 = -inf                      -5 % 0 =   -5
+    #    -inf / 0 = -inf                    -inf % 0 = -inf
+
+    if ($y -> is_zero()) {
+        my ($quo, $rem);
+        if ($wantarray) {
+                $rem = $x -> copy();
+            }
+        if ($x -> is_zero()) {
+            $quo = $x -> bnan();
+        } else {
+            $quo = $x -> binf($x -> {sign});
+        }
+        return $wantarray ? ($quo, $rem) : $quo;
+    }
+
+    # Numerator (dividend) is +/-inf, and denominator is finite and non-zero.
+    # The divide by zero cases are covered above. In all of the cases listed
+    # below we return the same as core Perl.
+    #
+    #     inf / -inf =  NaN                  inf % -inf =  NaN
+    #     inf /   -5 = -inf                  inf %   -5 =  NaN (before: 0)
+    #     inf /    5 =  inf                  inf %    5 =  NaN (before: 0)
+    #     inf /  inf =  NaN                  inf %  inf =  NaN
+    #
+    #    -inf / -inf =  NaN                 -inf % -inf =  NaN
+    #    -inf /   -5 =  inf                 -inf %   -5 =  NaN (before: 0)
+    #    -inf /    5 = -inf                 -inf %    5 =  NaN (before: 0)
+    #    -inf /  inf =  NaN                 -inf %  inf =  NaN
+
+    if ($x -> is_inf()) {
+        my ($quo, $rem);
+        $rem = $self -> bnan() if $wantarray;
+        if ($y -> is_inf()) {
+            $quo = $x -> bnan();
+        } else {
+            my $sign = $x -> bcmp(0) == $y -> bcmp(0) ? '+' : '-';
+            $quo = $x -> binf($sign);
       }
+        return $wantarray ? ($quo, $rem) : $quo;
     }
 
-  # last case: +-inf / ordinary number
-  my $sign = '+inf';
-  $sign = '-inf' if substr($x->{sign},0,1) ne $y->{sign};
-  $x->{sign} = $sign;
-  return wantarray ? ($x,$self->bzero()) : $x;
+    # Denominator (divisor) is +/-inf. The cases when the numerator is +/-inf
+    # are covered above. In the modulo cases (in the right column) we return
+    # the same as core Perl, which does floored division, so for consistency we
+    # also do floored division in the division cases (in the left column).
+    #
+    #      -5 /  inf =   -1 (before: 0)       -5 %  inf =  inf (before: -5)
+    #       0 /  inf =    0                    0 %  inf =    0
+    #       5 /  inf =    0                    5 %  inf =    5
+    #
+    #      -5 / -inf =    0                   -5 % -inf =   -5
+    #       0 / -inf =    0                    0 % -inf =    0
+    #       5 / -inf =   -1 (before: 0)        5 % -inf = -inf (before: 5)
+
+    if ($y -> is_inf()) {
+        my ($quo, $rem);
+        if ($x -> is_zero() || $x -> bcmp(0) == $y -> bcmp(0)) {
+            $rem = $x -> copy() if $wantarray;
+            $quo = $x -> bzero();
+        } else {
+            $rem = $self -> binf($y -> {sign}) if $wantarray;
+            $quo = $x -> bone('-');
+        }
+        return $wantarray ? ($quo, $rem) : $quo;
   }
 
-sub bdiv 
-  {
-  # (dividend: BINT or num_str, divisor: BINT or num_str) return 
-  # (BINT,BINT) (quo,rem) or BINT (only rem)
+  # At this point, both the numerator and denominator are finite numbers, and
+  # the denominator (divisor) is non-zero.
 
-  # set up parameters
-  my ($self,$x,$y,@r) = (ref($_[0]),@_);
-  # objectify is costly, so avoid it 
-  if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1])))
-    {
-    ($self,$x,$y,@r) = objectify(2,@_);
-    } 
+  return $upgrade->bdiv($upgrade->new($x),$upgrade->new($y),@r)
+   if defined $upgrade;
 
-  return $x if $x->modify('bdiv');
+  $r[3] = $y;                                   # no push!
 
-  return $self->_div_inf($x,$y)
-   if (($x->{sign} !~ /^[+-]$/) || ($y->{sign} !~ /^[+-]$/) || $y->is_zero());
+    # Inialize remainder.
 
-  return $upgrade->bdiv($upgrade->new($x),$upgrade->new($y),@r)
-   if defined $upgrade;
+    my $rem = $self->bzero();
 
-  $r[3] = $y;					# no push!
+    # Are both operands the same object, i.e., like $x -> bdiv($x)?
+    # If so, flipping the sign of $y also flips the sign of $x.
 
-  # calc new sign and in case $y == +/- 1, return $x
-  my $xsign = $x->{sign};				# keep
-  $x->{sign} = ($x->{sign} ne $y->{sign} ? '-' : '+'); 
+    my $xsign = $x->{sign};
+    my $ysign = $y->{sign};
 
-  if (wantarray)
-    {
-    my $rem = $self->bzero(); 
+    $y->{sign} =~ tr/+-/-+/;            # Flip the sign of $y, and see ...
+    my $same = $xsign ne $x->{sign};    # ... if that changed the sign of $x.
+    $y->{sign} = $ysign;                # Re-insert the original sign.
+
+    if ($same) {
+        $x -> bone();
+    } else {
     ($x->{value},$rem->{value}) = $CALC->_div($x->{value},$y->{value});
-    $x->{sign} = '+' if $CALC->_is_zero($x->{value});
-    $rem->{_a} = $x->{_a};
-    $rem->{_p} = $x->{_p};
+
+        if ($CALC -> _is_zero($rem->{value})) {
+            if ($xsign eq $ysign || $CALC -> _is_zero($x->{value})) {
+                $x->{sign} = '+';
+            } else {
+                $x->{sign} = '-';
+            }
+        } else {
+            if ($xsign eq $ysign) {
+                $x->{sign} = '+';
+            } else {
+                if ($xsign eq '+') {
+                    $x -> badd(1);
+                } else {
+                    $x -> bsub(1);
+                }
+                $x->{sign} = '-';
+            }
+        }
+    }
+
     $x->round(@r);
-    if (! $CALC->_is_zero($rem->{value}))
-      {
-      $rem->{sign} = $y->{sign};
-      $rem = $y->copy()->bsub($rem) if $xsign ne $y->{sign}; # one of them '-'
+
+    if ($wantarray) {
+        unless ($CALC -> _is_zero($rem->{value})) {
+            if ($xsign ne $ysign) {
+                $rem = $y -> copy() -> babs() -> bsub($rem);
       }
-    else
-      {
-      $rem->{sign} = '+';			# do not leave -0
+            $rem->{sign} = $ysign;
       }
+        $rem->{_a} = $x->{_a};
+        $rem->{_p} = $x->{_p};
     $rem->round(@r);
     return ($x,$rem);
     }
 
-  $x->{value} = $CALC->_div($x->{value},$y->{value});
-  $x->{sign} = '+' if $CALC->_is_zero($x->{value});
-
-  $x->round(@r);
+    return $x;
   }
 
 ###############################################################################
 # modulus functions
 
-sub bmod 
+sub bmod
   {
-  # modulus (or remainder)
-  # (BINT or num_str, BINT or num_str) return BINT
 
-  # set up parameters
+    # This is the remainder after floored division, where the quotient is
+    # floored toward negative infinity and the remainder has the same sign as
+    # the divisor.
+
+    # Set up parameters.
   my ($self,$x,$y,@r) = (ref($_[0]),@_);
+
   # objectify is costly, so avoid it
   if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1])))
     {
@@ -1773,36 +1901,63 @@ sub bmod
     }
 
   return $x if $x->modify('bmod');
-  $r[3] = $y;					# no push!
-  if (($x->{sign} !~ /^[+-]$/) || ($y->{sign} !~ /^[+-]$/) || $y->is_zero())
-    {
-    my ($d,$r) = $self->_div_inf($x,$y);
-    $x->{sign} = $r->{sign};
-    $x->{value} = $r->{value};
-    return $x->round(@r);
+  $r[3] = $y;                                   # no push!
+
+    # At least one argument is NaN.
+
+    if ($x -> is_nan() || $y -> is_nan()) {
+        return $x -> bnan();
+    }
+
+    # Modulo zero. See documentation for bdiv().
+
+    if ($y -> is_zero()) {
+            return $x;
+        }
+
+    # Numerator (dividend) is +/-inf.
+
+    if ($x -> is_inf()) {
+        return $x -> bnan();
     }
 
-  # calc new sign and in case $y == +/- 1, return $x
+    # Denominator (divisor) is +/-inf.
+
+    if ($y -> is_inf()) {
+        if ($x -> is_zero() || $x -> bcmp(0) == $y -> bcmp(0)) {
+            return $x;
+        } else {
+            return $x -> binf($y -> sign());
+        }
+    }
+
+    # Calc new sign and in case $y == +/- 1, return $x.
+
   $x->{value} = $CALC->_mod($x->{value},$y->{value});
-  if (!$CALC->_is_zero($x->{value}))
+  if ($CALC -> _is_zero($x->{value}))
     {
-    $x->{value} = $CALC->_sub($y->{value},$x->{value},1) 	# $y-$x
-      if ($x->{sign} ne $y->{sign});
-    $x->{sign} = $y->{sign};
+        $x->{sign} = '+';       # do not leave -0
     }
-   else
+  else
     {
-    $x->{sign} = '+';				# do not leave -0
+    $x->{value} = $CALC->_sub($y->{value},$x->{value},1)        # $y-$x
+      if ($x->{sign} ne $y->{sign});
+    $x->{sign} = $y->{sign};
     }
+
   $x->round(@r);
   }
 
 sub bmodinv
   {
-  # Return modular multiplicative inverse: z is the modular inverse of x (mod
-  # y) if and only if x*z (mod y) = 1 (mod y). If the modulus y is larger than
-  # one, x and z are relative primes (i.e., their greatest common divisor is
-  # one).
+  # Return modular multiplicative inverse:
+  #
+  #   z is the modular inverse of x (mod y) if and only if
+  #
+  #       x*z ≡ 1  (mod y)
+  #
+  # If the modulus y is larger than one, x and z are relative primes (i.e.,
+  # their greatest common divisor is one).
   #
   # If no modular multiplicative inverse exists, NaN is returned.
 
@@ -1896,8 +2051,17 @@ sub bmodpow
 
   return $num->bnan() if ($num->{sign} =~ /NaN|inf/ ||  # NaN, -inf, +inf
                           $exp->{sign} =~ /NaN|inf/ ||  # NaN, -inf, +inf
-                          $mod->{sign} =~ /NaN|inf/ ||  # NaN, -inf, +inf
-                          $mod->is_zero());
+                          $mod->{sign} =~ /NaN|inf/);   # NaN, -inf, +inf
+
+  # Modulo zero. See documentation for Math::BigInt's bmod() method.
+
+  if ($mod -> is_zero()) {
+      if ($num -> is_zero()) {
+          return $self -> bnan();
+      } else {
+          return $num -> copy();
+      }
+  }
 
   # Compute 'a (mod m)', ignoring the signs on 'a' and 'm'. If the resulting
   # value is zero, the output is also zero, regardless of the signs on 'a' and
@@ -1973,14 +2137,14 @@ sub bfac
   # compute factorial number from $x, modify $x in place
   my ($self,$x,@r) = ref($_[0]) ? (undef,@_) : objectify(1,@_);
 
-  return $x if $x->modify('bfac') || $x->{sign} eq '+inf';	# inf => inf
-  return $x->bnan() if $x->{sign} ne '+';			# NaN, <0 etc => NaN
+  return $x if $x->modify('bfac') || $x->{sign} eq '+inf';      # inf => inf
+  return $x->bnan() if $x->{sign} ne '+';                       # NaN, <0 etc => NaN
 
   $x->{value} = $CALC->_fac($x->{value});
   $x->round(@r);
   }
 
-sub bpow 
+sub bpow
   {
   # (BINT or num_str, BINT or num_str) return BINT
   # compute power of two numbers -- stolen from Knuth Vol 2 pg 233
@@ -2050,15 +2214,15 @@ sub bpow
   return $upgrade->bpow($upgrade->new($x),$y,@r)
    if defined $upgrade && (!$y->isa($self) || $y->{sign} eq '-');
 
-  $r[3] = $y;					# no push!
+  $r[3] = $y;                                   # no push!
 
   # cases 0 ** Y, X ** 0, X ** 1, 1 ** Y are handled by Calc or Emu
 
   my $new_sign = '+';
-  $new_sign = $y->is_odd() ? '-' : '+' if ($x->{sign} ne '+'); 
+  $new_sign = $y->is_odd() ? '-' : '+' if ($x->{sign} ne '+');
 
-  # 0 ** -7 => ( 1 / (0 ** 7)) => 1 / 0 => +inf 
-  return $x->binf() 
+  # 0 ** -7 => ( 1 / (0 ** 7)) => 1 / 0 => +inf
+  return $x->binf()
     if $y->{sign} eq '-' && $x->{sign} eq '+' && $CALC->_is_zero($x->{value});
   # 1 ** -y => 1 / (1 ** |y|)
   # so do test for negative $y after above's clause
@@ -2070,7 +2234,7 @@ sub bpow
   $x->round(@r);
   }
 
-sub blsft 
+sub blsft
   {
   # (BINT or num_str, BINT or num_str) return BINT
   # compute x << y, base n, y >= 0
@@ -2093,7 +2257,7 @@ sub blsft
   $x->round(@r);
   }
 
-sub brsft 
+sub brsft
   {
   # (BINT or num_str, BINT or num_str) return BINT
   # compute x >> y, base n, y >= 0
@@ -2109,52 +2273,52 @@ sub brsft
   return $x if $x->modify('brsft');
   return $x->bnan() if ($x->{sign} !~ /^[+-]$/ || $y->{sign} !~ /^[+-]$/);
   return $x->round(@r) if $y->is_zero();
-  return $x->bzero(@r) if $x->is_zero();		# 0 => 0
+  return $x->bzero(@r) if $x->is_zero();                # 0 => 0
 
   $n = 2 if !defined $n; return $x->bnan() if $n <= 0 || $y->{sign} eq '-';
 
    # this only works for negative numbers when shifting in base 2
   if (($x->{sign} eq '-') && ($n == 2))
     {
-    return $x->round(@r) if $x->is_one('-');	# -1 => -1
+    return $x->round(@r) if $x->is_one('-');    # -1 => -1
     if (!$y->is_one())
       {
       # although this is O(N*N) in calc (as_bin!) it is O(N) in Pari et al
       # but perhaps there is a better emulation for two's complement shift...
       # if $y != 1, we must simulate it by doing:
       # convert to bin, flip all bits, shift, and be done
-      $x->binc();			# -3 => -2
+      $x->binc();                       # -3 => -2
       my $bin = $x->as_bin();
-      $bin =~ s/^-0b//;			# strip '-0b' prefix
-      $bin =~ tr/10/01/;		# flip bits
+      $bin =~ s/^-0b//;                 # strip '-0b' prefix
+      $bin =~ tr/10/01/;                # flip bits
       # now shift
       if ($y >= CORE::length($bin))
         {
-	$bin = '0'; 			# shifting to far right creates -1
-					# 0, because later increment makes 
-					# that 1, attached '-' makes it '-1'
-					# because -1 >> x == -1 !
-        } 
+        $bin = '0';                     # shifting to far right creates -1
+                                        # 0, because later increment makes
+                                        # that 1, attached '-' makes it '-1'
+                                        # because -1 >> x == -1 !
+        }
       else
-	{
-	$bin =~ s/.{$y}$//;		# cut off at the right side
-        $bin = '1' . $bin;		# extend left side by one dummy '1'
-        $bin =~ tr/10/01/;		# flip bits back
-	}
-      my $res = $self->new('0b'.$bin);	# add prefix and convert back
-      $res->binc();			# remember to increment
-      $x->{value} = $res->{value};	# take over value
-      return $x->round(@r);		# we are done now, magic, isn't?
+        {
+        $bin =~ s/.{$y}$//;             # cut off at the right side
+        $bin = '1' . $bin;              # extend left side by one dummy '1'
+        $bin =~ tr/10/01/;              # flip bits back
+        }
+      my $res = $self->new('0b'.$bin);  # add prefix and convert back
+      $res->binc();                     # remember to increment
+      $x->{value} = $res->{value};      # take over value
+      return $x->round(@r);             # we are done now, magic, isn't?
       }
     # x < 0, n == 2, y == 1
-    $x->bdec();				# n == 2, but $y == 1: this fixes it
+    $x->bdec();                         # n == 2, but $y == 1: this fixes it
     }
 
   $x->{value} = $CALC->_rsft($x->{value},$y->{value},$n);
   $x->round(@r);
   }
 
-sub band 
+sub band
   {
   #(BINT or num_str, BINT or num_str) return BINT
   # compute x & y
@@ -2169,7 +2333,7 @@ sub band
 
   return $x if $x->modify('band');
 
-  $r[3] = $y;				# no push!
+  $r[3] = $y;                           # no push!
 
   return $x->bnan() if ($x->{sign} !~ /^[+-]$/ || $y->{sign} !~ /^[+-]$/);
 
@@ -2192,7 +2356,7 @@ sub band
   __emu_band($self,$x,$y,$sx,$sy,@r);
   }
 
-sub bior 
+sub bior
   {
   #(BINT or num_str, BINT or num_str) return BINT
   # compute x | y
@@ -2206,7 +2370,7 @@ sub bior
     }
 
   return $x if $x->modify('bior');
-  $r[3] = $y;				# no push!
+  $r[3] = $y;                           # no push!
 
   return $x->bnan() if ($x->{sign} !~ /^[+-]$/ || $y->{sign} !~ /^[+-]$/);
 
@@ -2233,7 +2397,7 @@ sub bior
   __emu_bior($self,$x,$y,$sx,$sy,@r);
   }
 
-sub bxor 
+sub bxor
   {
   #(BINT or num_str, BINT or num_str) return BINT
   # compute x ^ y
@@ -2247,7 +2411,7 @@ sub bxor
     }
 
   return $x if $x->modify('bxor');
-  $r[3] = $y;				# no push!
+  $r[3] = $y;                           # no push!
 
   return $x->bnan() if ($x->{sign} !~ /^[+-]$/ || $y->{sign} !~ /^[+-]$/);
 
@@ -2276,7 +2440,7 @@ sub length
   {
   my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
 
-  my $e = $CALC->_len($x->{value}); 
+  my $e = $CALC->_len($x->{value});
   wantarray ? ($e,0) : $e;
   }
 
@@ -2295,9 +2459,9 @@ sub _trailing_zeros
   my $x = shift;
   $x = $class->new($x) unless ref $x;
 
-  return 0 if $x->{sign} !~ /^[+-]$/;	# NaN, inf, -inf etc
+  return 0 if $x->{sign} !~ /^[+-]$/;   # NaN, inf, -inf etc
 
-  $CALC->_zeros($x->{value});		# must handle odd values, 0 etc
+  $CALC->_zeros($x->{value});           # must handle odd values, 0 etc
   }
 
 sub bsqrt
@@ -2307,8 +2471,8 @@ sub bsqrt
 
   return $x if $x->modify('bsqrt');
 
-  return $x->bnan() if $x->{sign} !~ /^\+/;	# -x or -inf or NaN => NaN
-  return $x if $x->{sign} eq '+inf';		# sqrt(+inf) == inf
+  return $x->bnan() if $x->{sign} !~ /^\+/;     # -x or -inf or NaN => NaN
+  return $x if $x->{sign} eq '+inf';            # sqrt(+inf) == inf
 
   return $upgrade->bsqrt($x,@r) if defined $upgrade;
 
@@ -2356,7 +2520,7 @@ sub exponent
     my $s = $x->{sign}; $s =~ s/^[+-]//;  # NaN, -inf,+inf => NaN or inf
     return $self->new($s);
     }
-  return $self->bone() if $x->is_zero();
+  return $self->bzero() if $x->is_zero();
 
   # 12300 => 2 trailing zeros => exponent is 2
   $self->new( $CALC->_zeros($x->{value}) );
@@ -2399,13 +2563,13 @@ sub bfround
 
   my ($scale,$mode) = $x->_scale_p(@_);
 
-  return $x if !defined $scale || $x->modify('bfround');	# no-op
+  return $x if !defined $scale || $x->modify('bfround');        # no-op
 
   # no-op for BigInts if $n <= 0
   $x->bround( $x->length()-$scale, $mode) if $scale > 0;
 
-  delete $x->{_a};	# delete to save memory
-  $x->{_p} = $scale;	# store new _p
+  delete $x->{_a};      # delete to save memory
+  $x->{_p} = $scale;    # store new _p
   $x;
   }
 
@@ -2414,7 +2578,7 @@ sub _scan_for_nonzero
   # internal, used by bround() to scan for non-zeros after a '5'
   my ($x,$pad,$xs,$len) = @_;
 
-  return 0 if $len == 1;		# "5" is trailed by invisible zeros
+  return 0 if $len == 1;                # "5" is trailed by invisible zeros
   my $follow = $pad - 1;
   return 0 if $follow > $len || $follow < 1;
 
@@ -2440,14 +2604,14 @@ sub bround
 
   my $x = shift; $x = $class->new($x) unless ref $x;
   my ($scale,$mode) = $x->_scale_a(@_);
-  return $x if !defined $scale || $x->modify('bround');	# no-op
+  return $x if !defined $scale || $x->modify('bround'); # no-op
 
   if ($x->is_zero() || $scale == 0)
     {
     $x->{_a} = $scale if !defined $x->{_a} || $x->{_a} > $scale; # 3 > 2
     return $x;
     }
-  return $x if $x->{sign} !~ /^[+-]$/;		# inf, NaN
+  return $x if $x->{sign} !~ /^[+-]$/;          # inf, NaN
 
   # we have fewer digits than we want to scale to
   my $len = $x->length();
@@ -2460,7 +2624,7 @@ sub bround
   if (($scale < 0 && $scale < -$len-1) || ($scale >= $len))
     {
     $x->{_a} = $scale if !defined $x->{_a} || $x->{_a} > $scale; # 3 > 2
-    return $x; 
+    return $x;
     }
 
   # count of 0's to pad, from left (+) or right (-): 9 - +6 => 3, or |-6| => 6
@@ -2481,50 +2645,50 @@ sub bround
 
   # in case of 01234 we round down, for 6789 up, and only in case 5 we look
   # closer at the remaining digits of the original $x, remember decision
-  my $round_up = 1;					# default round up
+  my $round_up = 1;                                     # default round up
   $round_up -- if
-    ($mode eq 'trunc')				||	# trunc by round down
-    ($digit_after =~ /[01234]/)			|| 	# round down anyway,
-							# 6789 => round up
-    ($digit_after eq '5')			&&	# not 5000...0000
-    ($x->_scan_for_nonzero($pad,$xs,$len) == 0)		&&
+    ($mode eq 'trunc')                          ||      # trunc by round down
+    ($digit_after =~ /[01234]/)                 ||      # round down anyway,
+                                                        # 6789 => round up
+    ($digit_after eq '5')                       &&      # not 5000...0000
+    ($x->_scan_for_nonzero($pad,$xs,$len) == 0)         &&
     (
      ($mode eq 'even') && ($digit_round =~ /[24680]/) ||
      ($mode eq 'odd')  && ($digit_round =~ /[13579]/) ||
      ($mode eq '+inf') && ($x->{sign} eq '-')   ||
      ($mode eq '-inf') && ($x->{sign} eq '+')   ||
-     ($mode eq 'zero')		# round down if zero, sign adjusted below
+     ($mode eq 'zero')          # round down if zero, sign adjusted below
     );
-  my $put_back = 0;					# not yet modified
-	
+  my $put_back = 0;                                     # not yet modified
+
   if (($pad > 0) && ($pad <= $len))
     {
-    substr($xs,-$pad,$pad) = '0' x $pad;		# replace with '00...'
-    $put_back = 1;					# need to put back
+    substr($xs,-$pad,$pad) = '0' x $pad;                # replace with '00...'
+    $put_back = 1;                                      # need to put back
     }
   elsif ($pad > $len)
     {
-    $x->bzero();					# round to '0'
+    $x->bzero();                                        # round to '0'
     }
 
-  if ($round_up)					# what gave test above?
+  if ($round_up)                                        # what gave test above?
     {
-    $put_back = 1;					# need to put back
-    $pad = $len, $xs = '0' x $pad if $scale < 0;	# tlr: whack 0.51=>1.0	
+    $put_back = 1;                                      # need to put back
+    $pad = $len, $xs = '0' x $pad if $scale < 0;        # tlr: whack 0.51=>1.0
 
     # we modify directly the string variant instead of creating a number and
     # adding it, since that is faster (we already have the string)
-    my $c = 0; $pad ++;				# for $pad == $len case
+    my $c = 0; $pad ++;                         # for $pad == $len case
     while ($pad <= $len)
       {
       $c = substr($xs,-$pad,1) + 1; $c = '0' if $c eq '10';
       substr($xs,-$pad,1) = $c; $pad++;
-      last if $c != 0;				# no overflow => early out
+      last if $c != 0;                          # no overflow => early out
       }
     $xs = '1'.$xs if $c == 0;
 
     }
-  $x->{value} = $CALC->_new($xs) if $put_back == 1;	# put back, if needed
+  $x->{value} = $CALC->_new($xs) if $put_back == 1;     # put back, if needed
 
   $x->{_a} = $scale if $scale >= 0;
   if ($scale < 0)
@@ -2571,7 +2735,7 @@ sub as_hex
   # return as hex string, with prefixed 0x
   my $x = shift; $x = $class->new($x) if !ref($x);
 
-  return $x->bstr() if $x->{sign} !~ /^[+-]$/;	# inf, nan etc
+  return $x->bstr() if $x->{sign} !~ /^[+-]$/;  # inf, nan etc
 
   my $s = '';
   $s = $x->{sign} if $x->{sign} eq '-';
@@ -2583,7 +2747,7 @@ sub as_bin
   # return as binary string, with prefixed 0b
   my $x = shift; $x = $class->new($x) if !ref($x);
 
-  return $x->bstr() if $x->{sign} !~ /^[+-]$/;	# inf, nan etc
+  return $x->bstr() if $x->{sign} !~ /^[+-]$/;  # inf, nan etc
 
   my $s = ''; $s = $x->{sign} if $x->{sign} eq '-';
   return $s . $CALC->_as_bin($x->{value});
@@ -2594,10 +2758,10 @@ sub as_oct
   # return as octal string, with prefixed 0
   my $x = shift; $x = $class->new($x) if !ref($x);
 
-  return $x->bstr() if $x->{sign} !~ /^[+-]$/;	# inf, nan etc
+  return $x->bstr() if $x->{sign} !~ /^[+-]$/;  # inf, nan etc
 
-  my $s = ''; $s = $x->{sign} if $x->{sign} eq '-';
-  return $s . $CALC->_as_oct($x->{value});
+  my $oct = $CALC->_as_oct($x->{value});
+  return $x->{sign} eq '-' ? "-$oct" : $oct;
   }
 
 ##############################################################################
@@ -2684,9 +2848,7 @@ sub objectify {
 
         # If it is an object of the right class, all is fine.
 
-        if ($ref -> isa($a[0])) {
-            next;
-        }
+        next if $ref -> isa($a[0]);
 
         # Upgrading is OK, so skip further tests if the argument is upgraded.
 
@@ -2694,27 +2856,44 @@ sub objectify {
             next;
         }
 
-        # If we want a Math::BigInt, see if the object can become one.
-        # Support the old misnomer as_number().
+        # See if we can call one of the as_xxx() methods. We don't know whether
+        # the as_xxx() method returns an object or a scalar, so re-check
+        # afterwards.
+
+        my $recheck = 0;
 
-        if ($a[0] eq 'Math::BigInt') {
+        if ($a[0] -> isa('Math::BigInt')) {
             if ($a[$i] -> can('as_int')) {
                 $a[$i] = $a[$i] -> as_int();
-                next;
-            }
-            if ($a[$i] -> can('as_number')) {
+                $recheck = 1;
+            } elsif ($a[$i] -> can('as_number')) {
                 $a[$i] = $a[$i] -> as_number();
-                next;
+                $recheck = 1;
             }
         }
 
-        # If we want a Math::BigFloat, see if the object can become one.
-
-        if ($a[0] eq 'Math::BigFloat') {
+        elsif ($a[0] -> isa('Math::BigFloat')) {
             if ($a[$i] -> can('as_float')) {
                 $a[$i] = $a[$i] -> as_float();
+                $recheck = $1;
+            }
+        }
+
+        # If we called one of the as_xxx() methods, recheck.
+
+        if ($recheck) {
+            $ref = ref($a[$i]);
+
+            # Perl scalars are fed to the appropriate constructor.
+
+            unless ($ref) {
+                $a[$i] = $a[0] -> new($a[$i]);
                 next;
             }
+
+            # If it is an object of the right class, all is fine.
+
+            next if $ref -> isa($a[0]);
         }
 
         # Last resort.
@@ -2734,33 +2913,33 @@ sub _register_callback
   my ($class,$callback) = @_;
 
   if (ref($callback) ne 'CODE')
-    { 
+    {
     require Carp;
     Carp::croak ("$callback is not a coderef");
     }
   $CALLBACKS{$class} = $callback;
   }
 
-sub import 
+sub import
   {
   my $self = shift;
 
-  $IMPORT++;				# remember we did import()
+  $IMPORT++;                            # remember we did import()
   my @a; my $l = scalar @_;
-  my $warn_or_die = 0;			# 0 - no warn, 1 - warn, 2 - die
+  my $warn_or_die = 0;                  # 0 - no warn, 1 - warn, 2 - die
   for ( my $i = 0; $i < $l ; $i++ )
     {
     if ($_[$i] eq ':constant')
       {
       # this causes overlord er load to step in
-      overload::constant 
-	integer => sub { $self->new(shift) },
-      	binary => sub { $self->new(shift) };
+      overload::constant
+        integer => sub { $self->new(shift) },
+        binary => sub { $self->new(shift) };
       }
     elsif ($_[$i] eq 'upgrade')
       {
       # this causes upgrading
-      $upgrade = $_[$i+1];		# or undef to disable
+      $upgrade = $_[$i+1];              # or undef to disable
       $i++;
       }
     elsif ($_[$i] =~ /^(lib|try|only)\z/)
@@ -2782,19 +2961,19 @@ sub import
     {
     require Exporter;
 
-    $self->SUPER::import(@a);			# need it for subclasses
-    $self->export_to_level(1,$self,@a);		# need it for MBF
+    $self->SUPER::import(@a);                   # need it for subclasses
+    $self->export_to_level(1,$self,@a);         # need it for MBF
     }
 
   # try to load core math lib
   my @c = split /\s*,\s*/,$CALC;
   foreach (@c)
     {
-    $_ =~ tr/a-zA-Z0-9://cd;			# limit to sane characters
+    $_ =~ tr/a-zA-Z0-9://cd;                    # limit to sane characters
     }
-  push @c, \'Calc'				# if all fail, try these
-    if $warn_or_die < 2;			# but not for "only"
-  $CALC = '';					# signal error
+  push @c, \'Calc'                              # if all fail, try these
+    if $warn_or_die < 2;                        # but not for "only"
+  $CALC = '';                                   # signal error
   foreach my $l (@c)
     {
     # fallback libraries are "marked" as \'string', extract string if nec.
@@ -2822,55 +3001,55 @@ sub import
       my $ok = 1;
       # loaded it ok, see if the api_version() is high enough
       if ($lib->can('api_version') && $lib->api_version() >= 1.0)
-	{
-	$ok = 0;
-	# api_version matches, check if it really provides anything we need
+        {
+        $ok = 0;
+        # api_version matches, check if it really provides anything we need
         for my $method (qw/
-		one two ten
-		str num
-		add mul div sub dec inc
-		acmp len digit is_one is_zero is_even is_odd
-		is_two is_ten
-		zeros new copy check
-		from_hex from_oct from_bin as_hex as_bin as_oct
-		rsft lsft xor and or
-		mod sqrt root fac pow modinv modpow log_int gcd
-	 /)
+                one two ten
+                str num
+                add mul div sub dec inc
+                acmp len digit is_one is_zero is_even is_odd
+                is_two is_ten
+                zeros new copy check
+                from_hex from_oct from_bin as_hex as_bin as_oct
+                rsft lsft xor and or
+                mod sqrt root fac pow modinv modpow log_int gcd
+         /)
           {
-	  if (!$lib->can("_$method"))
-	    {
-	    if (($WARN{$lib}||0) < 2)
-	      {
-	      require Carp;
-	      Carp::carp ("$lib is missing method '_$method'");
-	      $WARN{$lib} = 1;		# still warn about the lib
-	      }
-            $ok++; last; 
-	    }
+          if (!$lib->can("_$method"))
+            {
+            if (($WARN{$lib}||0) < 2)
+              {
+              require Carp;
+              Carp::carp ("$lib is missing method '_$method'");
+              $WARN{$lib} = 1;          # still warn about the lib
+              }
+            $ok++; last;
+            }
           }
-	}
+        }
       if ($ok == 0)
-	{
-	$CALC = $lib;
-	if ($warn_or_die > 0 && ref($l))
-	  {
-	  require Carp;
-	  my $msg =
+        {
+        $CALC = $lib;
+        if ($warn_or_die > 0 && ref($l))
+          {
+          require Carp;
+          my $msg =
         "Math::BigInt: couldn't load specified math lib(s), fallback to $lib";
           Carp::carp ($msg) if $warn_or_die == 1;
           Carp::croak ($msg) if $warn_or_die == 2;
-	  }
-        last;			# found a usable one, break
-	}
+          }
+        last;                   # found a usable one, break
+        }
       else
-	{
-	if (($WARN{$lib}||0) < 2)
-	  {
-	  my $ver = eval "\$$lib\::VERSION" || 'unknown';
-	  require Carp;
-	  Carp::carp ("Cannot load outdated $lib v$ver, please upgrade");
-	  $WARN{$lib} = 2;		# never warn again
-	  }
+        {
+        if (($WARN{$lib}||0) < 2)
+          {
+          my $ver = eval "\$$lib\::VERSION" || 'unknown';
+          require Carp;
+          Carp::carp ("Cannot load outdated $lib v$ver, please upgrade");
+          $WARN{$lib} = 2;              # never warn again
+          }
         }
       }
     }
@@ -2907,10 +3086,18 @@ sub import
   # import done
   }
 
+# Create a Math::BigInt from a hexadecimal string.
+
 sub from_hex {
-    # Create a bigint from a hexadecimal string.
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
+
+    my $str = shift;
+
+    # If called as a class method, initialize a new object.
 
-    my ($self, $str) = @_;
+    $self = $class -> bzero() unless $selfref;
 
     if ($str =~ s/
                      ^
@@ -2931,21 +3118,17 @@ sub from_hex {
         $chrs =~ tr/_//d;
         $chrs = '0' unless CORE::length $chrs;
 
-        # Initialize output.
-
-        my $x = Math::BigInt->bzero();
-
         # The library method requires a prefix.
 
-        $x->{value} = $CALC->_from_hex('0x' . $chrs);
+        $self->{value} = $CALC->_from_hex('0x' . $chrs);
 
         # Place the sign.
 
-        if ($sign eq '-' && ! $CALC->_is_zero($x->{value})) {
-            $x->{sign} = '-';
+        if ($sign eq '-' && ! $CALC->_is_zero($self->{value})) {
+            $self->{sign} = '-';
         }
 
-        return $x;
+        return $self;
     }
 
     # CORE::hex() parses as much as it can, and ignores any trailing garbage.
@@ -2954,10 +3137,18 @@ sub from_hex {
     return $self->bnan();
 }
 
+# Create a Math::BigInt from an octal string.
+
 sub from_oct {
-    # Create a bigint from an octal string.
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
 
-    my ($self, $str) = @_;
+    my $str = shift;
+
+    # If called as a class method, initialize a new object.
+
+    $self = $class -> bzero() unless $selfref;
 
     if ($str =~ s/
                      ^
@@ -2977,21 +3168,17 @@ sub from_oct {
         $chrs =~ tr/_//d;
         $chrs = '0' unless CORE::length $chrs;
 
-        # Initialize output.
-
-        my $x = Math::BigInt->bzero();
-
         # The library method requires a prefix.
 
-        $x->{value} = $CALC->_from_oct('0' . $chrs);
+        $self->{value} = $CALC->_from_oct('0' . $chrs);
 
         # Place the sign.
 
-        if ($sign eq '-' && ! $CALC->_is_zero($x->{value})) {
-            $x->{sign} = '-';
+        if ($sign eq '-' && ! $CALC->_is_zero($self->{value})) {
+            $self->{sign} = '-';
         }
 
-        return $x;
+        return $self;
     }
 
     # CORE::oct() parses as much as it can, and ignores any trailing garbage.
@@ -3000,10 +3187,18 @@ sub from_oct {
     return $self->bnan();
 }
 
+# Create a Math::BigInt from a binary string.
+
 sub from_bin {
-    # Create a bigint from a binary string.
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
 
-    my ($self, $str) = @_;
+    my $str = shift;
+
+    # If called as a class method, initialize a new object.
+
+    $self = $class -> bzero() unless $selfref;
 
     if ($str =~ s/
                      ^
@@ -3024,21 +3219,17 @@ sub from_bin {
         $chrs =~ tr/_//d;
         $chrs = '0' unless CORE::length $chrs;
 
-        # Initialize output.
-
-        my $x = Math::BigInt->bzero();
-
         # The library method requires a prefix.
 
-        $x->{value} = $CALC->_from_bin('0b' . $chrs);
+        $self->{value} = $CALC->_from_bin('0b' . $chrs);
 
         # Place the sign.
 
-        if ($sign eq '-' && ! $CALC->_is_zero($x->{value})) {
-            $x->{sign} = '-';
+        if ($sign eq '-' && ! $CALC->_is_zero($self->{value})) {
+            $self->{sign} = '-';
         }
 
-        return $x;
+        return $self;
     }
 
     # For consistency with from_hex() and from_oct(), we return NaN when the
@@ -3047,6 +3238,80 @@ sub from_bin {
     return $self->bnan();
 }
 
+sub _split_dec_string {
+    my $str = shift;
+
+    if ($str =~ s/
+                     ^
+
+                     # leading whitespace
+                     ( \s* )
+
+                     # optional sign
+                     ( [+-]? )
+
+                     # significand
+                     (
+                         \d+ (?: _ \d+ )*
+                         (?:
+                             \.
+                             (?: \d+ (?: _ \d+ )* )?
+                         )?
+                     |
+                         \.
+                         \d+ (?: _ \d+ )*
+                     )
+
+                     # optional exponent
+                     (?:
+                         [Ee]
+                         ( [+-]? )
+                         ( \d+ (?: _ \d+ )* )
+                     )?
+
+                     # trailing stuff
+                     ( \D .*? )?
+
+                     \z
+                 //x)
+    {
+        my $leading         = $1;
+        my $significand_sgn = $2 || '+';
+        my $significand_abs = $3;
+        my $exponent_sgn    = $4 || '+';
+        my $exponent_abs    = $5 || '0';
+        my $trailing        = $6;
+
+        # Remove underscores and leading zeros.
+
+        $significand_abs =~ tr/_//d;
+        $exponent_abs    =~ tr/_//d;
+
+        $significand_abs =~ s/^0+(.)/$1/;
+        $exponent_abs    =~ s/^0+(.)/$1/;
+
+        # If the significand contains a dot, remove it and adjust the exponent
+        # accordingly. E.g., "1234.56789e+3" -> "123456789e-2"
+
+        my $idx = index $significand_abs, '.';
+        if ($idx > -1) {
+            $significand_abs =~ s/0+\z//;
+            substr($significand_abs, $idx, 1) = '';
+            my $exponent = $exponent_sgn . $exponent_abs;
+            $exponent .= $idx - CORE::length($significand_abs);
+            $exponent_abs = abs $exponent;
+            $exponent_sgn = $exponent < 0 ? '-' : '+';
+        }
+
+        return($leading,
+               $significand_sgn, $significand_abs,
+               $exponent_sgn, $exponent_abs,
+               $trailing);
+    }
+
+    return undef;
+}
+
 sub _split
   {
   # input: num_str; output: undef for invalid or
@@ -3077,33 +3342,33 @@ sub _split
 
   # strip underscores between digits
   $x =~ s/([0-9])_([0-9])/$1$2/g;
-  $x =~ s/([0-9])_([0-9])/$1$2/g;		# do twice for 1_2_3
+  $x =~ s/([0-9])_([0-9])/$1$2/g;               # do twice for 1_2_3
 
-  # some possible inputs: 
-  # 2.1234 # 0.12        # 1 	      # 1E1 # 2.134E1 # 434E-10 # 1.02009E-2 
-  # .2 	   # 1_2_3.4_5_6 # 1.4E1_2_3  # 1e3 # +.2     # 0e999	
+  # some possible inputs:
+  # 2.1234 # 0.12        # 1          # 1E1 # 2.134E1 # 434E-10 # 1.02009E-2
+  # .2     # 1_2_3.4_5_6 # 1.4E1_2_3  # 1e3 # +.2     # 0e999
 
   my ($m,$e,$last) = split /[Ee]/,$x;
-  return if defined $last;		# last defined => 1e2E3 or others
+  return if defined $last;              # last defined => 1e2E3 or others
   $e = '0' if !defined $e || $e eq "";
 
   # sign,value for exponent,mantint,mantfrac
   my ($es,$ev,$mis,$miv,$mfv);
   # valid exponent?
-  if ($e =~ /^([+-]?)0*([0-9]+)$/)	# strip leading zeros
+  if ($e =~ /^([+-]?)0*([0-9]+)$/)      # strip leading zeros
     {
     $es = $1; $ev = $2;
     # valid mantissa?
     return if $m eq '.' || $m eq '';
     my ($mi,$mf,$lastf) = split /\./,$m;
-    return if defined $lastf;		# lastf defined => 1.2.3 or others
+    return if defined $lastf;           # lastf defined => 1.2.3 or others
     $mi = '0' if !defined $mi;
     $mi .= '0' if $mi =~ /^[\-\+]?$/;
     $mf = '0' if !defined $mf || $mf eq '';
-    if ($mi =~ /^([+-]?)0*([0-9]+)$/)		# strip leading zeros
+    if ($mi =~ /^([+-]?)0*([0-9]+)$/)           # strip leading zeros
       {
       $mis = $1||'+'; $miv = $2;
-      return unless ($mf =~ /^([0-9]*?)0*$/);	# strip trailing zeros
+      return unless ($mf =~ /^([0-9]*?)0*$/);   # strip trailing zeros
       $mfv = $1;
       # handle the 0e999 case here
       $ev = 0 if $miv eq '0' && $mfv eq '';
@@ -3116,8 +3381,8 @@ sub _split
 ##############################################################################
 # internal calculation routines (others are in Math::BigInt::Calc etc)
 
-sub __lcm 
-  { 
+sub __lcm
+  {
   # (BINT or num_str, BINT or num_str) return BINT
   # does modify first argument
   # LCM
@@ -3158,7 +3423,7 @@ sub bcos
 
   return $x if $x->modify('bcos');
 
-  return $x->bnan() if $x->{sign} !~ /^[+-]\z/;	# -inf +inf or NaN => NaN
+  return $x->bnan() if $x->{sign} !~ /^[+-]\z/; # -inf +inf or NaN => NaN
 
   return $upgrade->new($x)->bcos(@r) if defined $upgrade;
 
@@ -3179,7 +3444,7 @@ sub bsin
 
   return $x if $x->modify('bsin');
 
-  return $x->bnan() if $x->{sign} !~ /^[+-]\z/;	# -inf +inf or NaN => NaN
+  return $x->bnan() if $x->{sign} !~ /^[+-]\z/; # -inf +inf or NaN => NaN
 
   return $upgrade->new($x)->bsin(@r) if defined $upgrade;
 
@@ -3193,7 +3458,7 @@ sub bsin
   }
 
 sub batan2
-  { 
+  {
   # calculate arcus tangens of ($y/$x)
 
   # set up parameters
@@ -3271,7 +3536,7 @@ sub batan
 
   return $x if $x->modify('batan');
 
-  return $x->bnan() if $x->{sign} !~ /^[+-]\z/;	# -inf +inf or NaN => NaN
+  return $x->bnan() if $x->{sign} !~ /^[+-]\z/; # -inf +inf or NaN => NaN
 
   return $upgrade->new($x)->batan(@r) if defined $upgrade;
 
@@ -3320,106 +3585,108 @@ Math::BigInt - Arbitrary size integer/float math package
   my @values = (64,74,18);
   my $n = 1; my $sign = '-';
 
-  # Number creation	
-  my $x = Math::BigInt->new($str);	# defaults to 0
-  my $y = $x->copy();			# make a true copy
-  my $nan  = Math::BigInt->bnan(); 	# create a NotANumber
-  my $zero = Math::BigInt->bzero();	# create a +0
-  my $inf = Math::BigInt->binf();	# create a +inf
-  my $inf = Math::BigInt->binf('-');	# create a -inf
-  my $one = Math::BigInt->bone();	# create a +1
-  my $mone = Math::BigInt->bone('-');	# create a -1
-
-  my $pi = Math::BigInt->bpi();		# returns '3'
-					# see Math::BigFloat::bpi()
-
-  $h = Math::BigInt->new('0x123');	# from hexadecimal
-  $b = Math::BigInt->new('0b101');	# from binary
-  $o = Math::BigInt->from_oct('0101');	# from octal
+  # Number creation
+  my $x = Math::BigInt->new($str);      # defaults to 0
+  my $y = $x->copy();                   # make a true copy
+  my $nan  = Math::BigInt->bnan();      # create a NotANumber
+  my $zero = Math::BigInt->bzero();     # create a +0
+  my $inf = Math::BigInt->binf();       # create a +inf
+  my $inf = Math::BigInt->binf('-');    # create a -inf
+  my $one = Math::BigInt->bone();       # create a +1
+  my $mone = Math::BigInt->bone('-');   # create a -1
+
+  my $pi = Math::BigInt->bpi();         # returns '3'
+                                        # see Math::BigFloat::bpi()
+
+  $h = Math::BigInt->new('0x123');      # from hexadecimal
+  $b = Math::BigInt->new('0b101');      # from binary
+  $o = Math::BigInt->from_oct('0101');  # from octal
+  $h = Math::BigInt->from_hex('cafe');  # from hexadecimal
+  $b = Math::BigInt->from_bin('0101');  # from binary
 
   # Testing (don't modify their arguments)
   # (return true if the condition is met, otherwise false)
 
-  $x->is_zero();	# if $x is +0
-  $x->is_nan();		# if $x is NaN
-  $x->is_one();		# if $x is +1
-  $x->is_one('-');	# if $x is -1
-  $x->is_odd();		# if $x is odd
-  $x->is_even();	# if $x is even
-  $x->is_pos();		# if $x > 0
-  $x->is_neg();		# if $x < 0
-  $x->is_inf($sign);	# if $x is +inf, or -inf (sign is default '+')
-  $x->is_int();		# if $x is an integer (not a float)
+  $x->is_zero();        # if $x is +0
+  $x->is_nan();         # if $x is NaN
+  $x->is_one();         # if $x is +1
+  $x->is_one('-');      # if $x is -1
+  $x->is_odd();         # if $x is odd
+  $x->is_even();        # if $x is even
+  $x->is_pos();         # if $x > 0
+  $x->is_neg();         # if $x < 0
+  $x->is_inf($sign);    # if $x is +inf, or -inf (sign is default '+')
+  $x->is_int();         # if $x is an integer (not a float)
 
   # comparing and digit/sign extraction
-  $x->bcmp($y);		# compare numbers (undef,<0,=0,>0)
-  $x->bacmp($y);	# compare absolutely (undef,<0,=0,>0)
-  $x->sign();		# return the sign, either +,- or NaN
-  $x->digit($n);	# return the nth digit, counting from right
-  $x->digit(-$n);	# return the nth digit, counting from left
+  $x->bcmp($y);         # compare numbers (undef,<0,=0,>0)
+  $x->bacmp($y);        # compare absolutely (undef,<0,=0,>0)
+  $x->sign();           # return the sign, either +,- or NaN
+  $x->digit($n);        # return the nth digit, counting from right
+  $x->digit(-$n);       # return the nth digit, counting from left
 
   # The following all modify their first argument. If you want to pre-
   # serve $x, use $z = $x->copy()->bXXX($y); See under L<CAVEATS> for
   # why this is necessary when mixing $a = $b assignments with non-over-
   # loaded math.
 
-  $x->bzero();		# set $x to 0
-  $x->bnan();		# set $x to NaN
-  $x->bone();		# set $x to +1
-  $x->bone('-');	# set $x to -1
-  $x->binf();		# set $x to inf
-  $x->binf('-');	# set $x to -inf
-
-  $x->bneg();		# negation
-  $x->babs();		# absolute value
-  $x->bsgn();		# sign function (-1, 0, 1, or NaN)
-  $x->bnorm();		# normalize (no-op in BigInt)
-  $x->bnot();		# two's complement (bit wise not)
-  $x->binc();		# increment $x by 1
-  $x->bdec();		# decrement $x by 1
-
-  $x->badd($y);		# addition (add $y to $x)
-  $x->bsub($y);		# subtraction (subtract $y from $x)
-  $x->bmul($y);		# multiplication (multiply $x by $y)
-  $x->bdiv($y);		# divide, set $x to quotient
-			# return (quo,rem) or quo if scalar
-
-  $x->bmuladd($y,$z);	# $x = $x * $y + $z
-
-  $x->bmod($y);		# modulus (x % y)
+  $x->bzero();          # set $x to 0
+  $x->bnan();           # set $x to NaN
+  $x->bone();           # set $x to +1
+  $x->bone('-');        # set $x to -1
+  $x->binf();           # set $x to inf
+  $x->binf('-');        # set $x to -inf
+
+  $x->bneg();           # negation
+  $x->babs();           # absolute value
+  $x->bsgn();           # sign function (-1, 0, 1, or NaN)
+  $x->bnorm();          # normalize (no-op in BigInt)
+  $x->bnot();           # two's complement (bit wise not)
+  $x->binc();           # increment $x by 1
+  $x->bdec();           # decrement $x by 1
+
+  $x->badd($y);         # addition (add $y to $x)
+  $x->bsub($y);         # subtraction (subtract $y from $x)
+  $x->bmul($y);         # multiplication (multiply $x by $y)
+  $x->bdiv($y);         # divide, set $x to quotient
+                        # return (quo,rem) or quo if scalar
+
+  $x->bmuladd($y,$z);   # $x = $x * $y + $z
+
+  $x->bmod($y);         # modulus (x % y)
   $x->bmodpow($y,$mod); # modular exponentiation (($x ** $y) % $mod)
   $x->bmodinv($mod);    # modular multiplicative inverse
-  $x->bpow($y);		# power of arguments (x ** y)
-  $x->blsft($y);	# left shift in base 2
-  $x->brsft($y);	# right shift in base 2
-			# returns (quo,rem) or quo if in sca-
-			# lar context
-  $x->blsft($y,$n);	# left shift by $y places in base $n
-  $x->brsft($y,$n);	# right shift by $y places in base $n
-			# returns (quo,rem) or quo if in sca-
-			# lar context
-
-  $x->band($y);		# bitwise and
-  $x->bior($y);		# bitwise inclusive or
-  $x->bxor($y);		# bitwise exclusive or
-  $x->bnot();		# bitwise not (two's complement)
-
-  $x->bsqrt();		# calculate square-root
-  $x->broot($y);	# $y'th root of $x (e.g. $y == 3 => cubic root)
-  $x->bfac();		# factorial of $x (1*2*3*4*..$x)
-
-  $x->bnok($y);		# x over y (binomial coefficient n over k)
-
-  $x->blog();		# logarithm of $x to base e (Euler's number)
-  $x->blog($base);	# logarithm of $x to base $base (f.i. 2)
-  $x->bexp();		# calculate e ** $x where e is Euler's number
+  $x->bpow($y);         # power of arguments (x ** y)
+  $x->blsft($y);        # left shift in base 2
+  $x->brsft($y);        # right shift in base 2
+                        # returns (quo,rem) or quo if in sca-
+                        # lar context
+  $x->blsft($y,$n);     # left shift by $y places in base $n
+  $x->brsft($y,$n);     # right shift by $y places in base $n
+                        # returns (quo,rem) or quo if in sca-
+                        # lar context
+
+  $x->band($y);         # bitwise and
+  $x->bior($y);         # bitwise inclusive or
+  $x->bxor($y);         # bitwise exclusive or
+  $x->bnot();           # bitwise not (two's complement)
+
+  $x->bsqrt();          # calculate square-root
+  $x->broot($y);        # $y'th root of $x (e.g. $y == 3 => cubic root)
+  $x->bfac();           # factorial of $x (1*2*3*4*..$x)
+
+  $x->bnok($y);         # x over y (binomial coefficient n over k)
+
+  $x->blog();           # logarithm of $x to base e (Euler's number)
+  $x->blog($base);      # logarithm of $x to base $base (f.i. 2)
+  $x->bexp();           # calculate e ** $x where e is Euler's number
 
   $x->round($A,$P,$mode);  # round to accuracy or precision using
-			   # mode $mode
-  $x->bround($n);	   # accuracy: preserve $n digits
-  $x->bfround($n);	   # $n > 0: round $nth digits,
-			   # $n < 0: round to the $nth digit after the
-			   # dot, no-op for BigInts
+                           # mode $mode
+  $x->bround($n);          # accuracy: preserve $n digits
+  $x->bfround($n);         # $n > 0: round $nth digits,
+                           # $n < 0: round to the $nth digit after the
+                           # dot, no-op for BigInts
 
   # The following do not modify their arguments in BigInt (are no-ops),
   # but do so in BigFloat:
@@ -3435,38 +3702,38 @@ Math::BigInt - Arbitrary size integer/float math package
   # lowest common multiple (no OO style)
   my $lcm = Math::BigInt::blcm(@values);
 
-  $x->length();		   # return number of digits in number
+  $x->length();            # return number of digits in number
   ($xl,$f) = $x->length(); # length of number and length of fraction
-			   # part, latter is always 0 digits long
-			   # for BigInts
+                           # part, latter is always 0 digits long
+                           # for BigInts
 
-  $x->exponent();	  # return exponent as BigInt
-  $x->mantissa();	  # return (signed) mantissa as BigInt
-  $x->parts();		  # return (mantissa,exponent) as BigInt
-  $x->copy();		  # make a true copy of $x (unlike $y = $x;)
-  $x->as_int();		  # return as BigInt (in BigInt: same as copy())
-  $x->numify();		  # return as scalar (might overflow!)
+  $x->exponent();         # return exponent as BigInt
+  $x->mantissa();         # return (signed) mantissa as BigInt
+  $x->parts();            # return (mantissa,exponent) as BigInt
+  $x->copy();             # make a true copy of $x (unlike $y = $x;)
+  $x->as_int();           # return as BigInt (in BigInt: same as copy())
+  $x->numify();           # return as scalar (might overflow!)
 
   # conversion to string (do not modify their argument)
-  $x->bstr();	      # normalized string (e.g. '3')
-  $x->bsstr();	      # norm. string in scientific notation (e.g. '3E0')
-  $x->as_hex();	      # as signed hexadecimal string with prefixed 0x
-  $x->as_bin();	      # as signed binary string with prefixed 0b
-  $x->as_oct();	      # as signed octal string with prefixed 0
+  $x->bstr();         # normalized string (e.g. '3')
+  $x->bsstr();        # norm. string in scientific notation (e.g. '3E0')
+  $x->as_hex();       # as signed hexadecimal string with prefixed 0x
+  $x->as_bin();       # as signed binary string with prefixed 0b
+  $x->as_oct();       # as signed octal string with prefixed 0
 
 
   # precision and accuracy (see section about rounding for more)
-  $x->precision();	 # return P of $x (or global, if P of $x undef)
-  $x->precision($n);	 # set P of $x to $n
-  $x->accuracy();	 # return A of $x (or global, if A of $x undef)
-  $x->accuracy($n);	 # set A $x to $n
+  $x->precision();       # return P of $x (or global, if P of $x undef)
+  $x->precision($n);     # set P of $x to $n
+  $x->accuracy();        # return A of $x (or global, if A of $x undef)
+  $x->accuracy($n);      # set A $x to $n
 
   # Global methods
   Math::BigInt->precision();   # get/set global P for all BigInt objects
   Math::BigInt->accuracy();    # get/set global A for all BigInt objects
   Math::BigInt->round_mode();  # get/set global round mode, one of
-			       # 'even', 'odd', '+inf', '-inf', 'zero',
-			       # 'trunc' or 'common'
+                               # 'even', 'odd', '+inf', '-inf', 'zero',
+                               # 'trunc' or 'common'
   Math::BigInt->config();      # return hash containing configuration
 
 =head1 DESCRIPTION
@@ -3474,7 +3741,7 @@ Math::BigInt - Arbitrary size integer/float math package
 All operators (including basic math operations) are overloaded if you
 declare your big integers as
 
-  $i = new Math::BigInt '123_456_789_123_456_789';
+  $i = Math::BigInt -> new('123_456_789_123_456_789');
 
 Operations with overloaded operators preserve the arguments which is
 exactly what you expect.
@@ -3488,8 +3755,8 @@ Scalars holding numbers may also be passed, but note that non-integer numbers
 may already have lost precision due to the conversion to float. Quote
 your input if you want BigInt to see all the digits:
 
-	$x = Math::BigInt->new(12345678890123456789);	# bad
-	$x = Math::BigInt->new('12345678901234567890');	# good
+        $x = Math::BigInt->new(12345678890123456789);   # bad
+        $x = Math::BigInt->new('12345678901234567890'); # good
 
 You can include one underscore between any two digits.
 
@@ -3500,21 +3767,21 @@ Hexadecimal (prefixed with "0x") and binary numbers (prefixed with "0b")
 are accepted, too. Please note that octal numbers are not recognized
 by new(), so the following will print "123":
 
-	perl -MMath::BigInt -le 'print Math::BigInt->new("0123")'
+        perl -MMath::BigInt -le 'print Math::BigInt->new("0123")'
 
 To convert an octal number, use from_oct();
 
-	perl -MMath::BigInt -le 'print Math::BigInt->from_oct("0123")'
+        perl -MMath::BigInt -le 'print Math::BigInt->from_oct("0123")'
 
 Currently, Math::BigInt::new() defaults to 0, while Math::BigInt::new('')
 results in 'NaN'. This might change in the future, so use always the following
 explicit forms to get a zero or NaN:
 
-	$zero = Math::BigInt->bzero();
-	$nan = Math::BigInt->bnan();
+        $zero = Math::BigInt->bzero();
+        $nan = Math::BigInt->bnan();
 
-C<bnorm()> on a BigInt object is now effectively a no-op, since the numbers 
-are always stored in normalized form. If passed a string, creates a BigInt 
+C<bnorm()> on a BigInt object is now effectively a no-op, since the numbers
+are always stored in normalized form. If passed a string, creates a BigInt
 object from the input.
 
 =head2 Output
@@ -3546,50 +3813,50 @@ Returns a hash containing the configuration, e.g. the version number, lib
 loaded etc. The following hash keys are currently filled in with the
 appropriate information.
 
-    key		  Description
-		  Example
+    key           Description
+                  Example
     ============================================================
-    lib		  Name of the low-level math library
-		  Math::BigInt::Calc
+    lib           Name of the low-level math library
+                  Math::BigInt::Calc
     lib_version   Version of low-level math library (see 'lib')
-		  0.30
-    class	  The class name of config() you just called
-		  Math::BigInt
-    upgrade	  To which class math operations might be
-		  upgraded Math::BigFloat
+                  0.30
+    class         The class name of config() you just called
+                  Math::BigInt
+    upgrade       To which class math operations might be
+                  upgraded Math::BigFloat
     downgrade     To which class math operations might be
-		  downgraded undef
+                  downgraded undef
     precision     Global precision
-		  undef
+                  undef
     accuracy      Global accuracy
-		  undef
+                  undef
     round_mode    Global round mode
-		  even
-    version	  version number of the class you used
-		  1.61
+                  even
+    version       version number of the class you used
+                  1.61
     div_scale     Fallback accuracy for div
-		  40
+                  40
     trap_nan      If true, traps creation of NaN via croak()
-		  1
+                  1
     trap_inf      If true, traps creation of +inf/-inf via croak()
-		  1
+                  1
 
 The following values can be set by passing C<config()> a reference to a hash:
 
-	trap_inf trap_nan
+        trap_inf trap_nan
         upgrade downgrade precision accuracy round_mode div_scale
 
 Example:
 
-	$new_cfg = Math::BigInt->config(
-	    { trap_inf => 1, precision => 5 }
-	);
+        $new_cfg = Math::BigInt->config(
+            { trap_inf => 1, precision => 5 }
+        );
 
 =item accuracy()
 
-    $x->accuracy(5);	     # local for $x
-    CLASS->accuracy(5);	     # global for all members of CLASS
-    			     # Note: This also applies to new()!
+    $x->accuracy(5);         # local for $x
+    CLASS->accuracy(5);      # global for all members of CLASS
+                             # Note: This also applies to new()!
 
     $A = $x->accuracy();     # read out accuracy that affects $x
     $A = CLASS->accuracy();  # read out global accuracy
@@ -3607,8 +3874,8 @@ to the math operation as additional parameter:
 
     my $x = Math::BigInt->new(30000);
     my $y = Math::BigInt->new(7);
-    print scalar $x->copy()->bdiv($y, 2);		# print 4300
-    print scalar $x->copy()->bdiv($y)->bround(2);	# print 4300
+    print scalar $x->copy()->bdiv($y, 2);               # print 4300
+    print scalar $x->copy()->bdiv($y)->bround(2);       # print 4300
 
 Please see the section about L</ACCURACY and PRECISION> for further details.
 
@@ -3621,17 +3888,17 @@ Returns the current accuracy. For C<< $x->accuracy() >> it will return either
 the local accuracy, or if not defined, the global. This means the return value
 represents the accuracy that will be in effect for $x:
 
-    $y = Math::BigInt->new(1234567);	   # unrounded
+    $y = Math::BigInt->new(1234567);       # unrounded
     print Math::BigInt->accuracy(4),"\n";  # set 4, print 4
-    $x = Math::BigInt->new(123456);	   # $x will be automatic-
-					   # ally rounded!
-    print "$x $y\n";			   # '123500 1234567'
-    print $x->accuracy(),"\n";		   # will be 4
-    print $y->accuracy(),"\n";		   # also 4, since
-					   # global is 4
+    $x = Math::BigInt->new(123456);        # $x will be automatic-
+                                           # ally rounded!
+    print "$x $y\n";                       # '123500 1234567'
+    print $x->accuracy(),"\n";             # will be 4
+    print $y->accuracy(),"\n";             # also 4, since
+                                           # global is 4
     print Math::BigInt->accuracy(5),"\n";  # set to 5, print 5
-    print $x->accuracy(),"\n";		   # still 4
-    print $y->accuracy(),"\n";		   # 5, since global is 5
+    print $x->accuracy(),"\n";             # still 4
+    print $y->accuracy(),"\n";             # 5, since global is 5
 
 Note: Works also for subclasses like Math::BigFloat. Each class has it's own
 globals separated from Math::BigInt, but it is possible to subclass
@@ -3675,10 +3942,10 @@ Returns the current precision. For C<< $x->precision() >> it will return either
 the local precision of $x, or if not defined, the global. This means the return
 value represents the prevision that will be in effect for $x:
 
-    $y = Math::BigInt->new(1234567);	    # unrounded
+    $y = Math::BigInt->new(1234567);        # unrounded
     print Math::BigInt->precision(4),"\n";  # set 4, print 4
     $x = Math::BigInt->new(123456);  # will be automatically rounded
-    print $x;				    # print "120000"!
+    print $x;                               # print "120000"!
 
 Note: Works also for subclasses like L<Math::BigFloat>. Each class has its
 own globals separated from Math::BigInt, but it is possible to subclass
@@ -3697,9 +3964,9 @@ result:
 
 
     $x = Math::BigInt->new(10);
-    $x->brsft(1);			# same as $x >> 1: 5
+    $x->brsft(1);                       # same as $x >> 1: 5
     $x = Math::BigInt->new(1234);
-    $x->brsft(2,10);			# result 12
+    $x->brsft(2,10);                    # result 12
 
 There is one exception, and that is base 2 with negative $x:
 
@@ -3782,17 +4049,17 @@ Creates a new BigInt object representing one. The optional argument is
 either '-' or '+', indicating whether you want one or minus one.
 If used on an object, it will set it to one:
 
-    $x->bone();		# +1
-    $x->bone('-');		# -1
+    $x->bone();         # +1
+    $x->bone('-');              # -1
 
 =item is_one()/is_zero()/is_nan()/is_inf()
 
-    $x->is_zero();		# true if arg is +0
-    $x->is_nan();		# true if arg is NaN
-    $x->is_one();		# true if arg is +1
-    $x->is_one('-');		# true if arg is -1
-    $x->is_inf();		# true if +inf
-    $x->is_inf('-');		# true if -inf (sign is default '+')
+    $x->is_zero();              # true if arg is +0
+    $x->is_nan();               # true if arg is NaN
+    $x->is_one();               # true if arg is +1
+    $x->is_one('-');            # true if arg is -1
+    $x->is_inf();               # true if +inf
+    $x->is_inf('-');            # true if -inf (sign is default '+')
 
 These methods all test the BigInt for being one specific value and return
 true or false depending on the input. These are faster than doing something
@@ -3802,8 +4069,8 @@ like:
 
 =item is_pos()/is_neg()/is_positive()/is_negative()
 
-    $x->is_pos();			# true if > 0
-    $x->is_neg();			# true if < 0
+    $x->is_pos();                       # true if > 0
+    $x->is_neg();                       # true if < 0
 
 The methods return true if the argument is positive or negative, respectively.
 C<NaN> is neither positive nor negative, while C<+inf> counts as positive, and
@@ -3818,9 +4085,9 @@ in v1.68.
 
 =item is_odd()/is_even()/is_int()
 
-    $x->is_odd();		# true if odd, false for even
-    $x->is_even();		# true if even, false for odd
-    $x->is_int();		# true if $x is an integer
+    $x->is_odd();               # true if odd, false for even
+    $x->is_even();              # true if even, false for odd
+    $x->is_int();               # true if $x is an integer
 
 The return true when the argument satisfies the condition. C<NaN>, C<+inf>,
 C<-inf> are not integers and are neither odd nor even.
@@ -3848,15 +4115,15 @@ Return the sign, of $x, meaning either C<+>, C<->, C<-inf>, C<+inf> or NaN.
 
 If you want $x to have a certain sign, use one of the following methods:
 
-    $x->babs();			# '+'
-    $x->babs()->bneg();		# '-'
-    $x->bnan();			# 'NaN'
-    $x->binf();			# '+inf'
-    $x->binf('-');		# '-inf'
+    $x->babs();                 # '+'
+    $x->babs()->bneg();         # '-'
+    $x->bnan();                 # 'NaN'
+    $x->binf();                 # '+inf'
+    $x->binf('-');              # '-inf'
 
 =item digit()
 
-    $x->digit($n);	 # return the nth digit, counting from right
+    $x->digit($n);       # return the nth digit, counting from right
 
 If C<$n> is negative, returns the digit counting from left.
 
@@ -3884,7 +4151,7 @@ number is negative, zero, or positive, respectively. Does not modify NaNs.
 
 =item bnorm()
 
-    $x->bnorm();			# normalize (no-op)
+    $x->bnorm();                        # normalize (no-op)
 
 =item bnot()
 
@@ -3898,23 +4165,23 @@ but faster.
 
 =item binc()
 
-    $x->binc();			# increment x by 1
+    $x->binc();                 # increment x by 1
 
 =item bdec()
 
-    $x->bdec();			# decrement x by 1
+    $x->bdec();                 # decrement x by 1
 
 =item badd()
 
-    $x->badd($y);		# addition (add $y to $x)
+    $x->badd($y);               # addition (add $y to $x)
 
 =item bsub()
 
-    $x->bsub($y);		# subtraction (subtract $y from $x)
+    $x->bsub($y);               # subtraction (subtract $y from $x)
 
 =item bmul()
 
-    $x->bmul($y);		# multiplication (multiply $x by $y)
+    $x->bmul($y);               # multiplication (multiply $x by $y)
 
 =item bmuladd()
 
@@ -3926,16 +4193,24 @@ This method was added in v1.87 of Math::BigInt (June 2007).
 
 =item bdiv()
 
-    $x->bdiv($y);		# divide, set $x to quotient
-				# return (quo,rem) or quo if scalar
+    $x->bdiv($y);               # divide, set $x to quotient
+
+Returns $x divided by $y. In list context, does floored division (F-division),
+where the quotient is the greatest integer less than or equal to the quotient
+of the two operands. Consequently, the remainder is either zero or has the same
+sign as the second operand. In scalar context, only the quotient is returned.
 
 =item bmod()
 
-    $x->bmod($y);		# modulus (x % y)
+    $x->bmod($y);               # modulus (x % y)
+
+Returns $x modulo $y. When $x is finite, and $y is finite and non-zero, the
+result is identical to the remainder after floored division (F-division), i.e.,
+identical to the result from Perl's % operator.
 
 =item bmodinv()
 
-    $x->bmodinv($mod);		# modular multiplicative inverse
+    $x->bmodinv($mod);          # modular multiplicative inverse
 
 Returns the multiplicative inverse of C<$x> modulo C<$mod>. If
 
@@ -3952,8 +4227,8 @@ inverse exists.
 
 =item bmodpow()
 
-    $num->bmodpow($exp,$mod);		# modular exponentiation
-					# ($num**$exp % $mod)
+    $num->bmodpow($exp,$mod);           # modular exponentiation
+                                        # ($num**$exp % $mod)
 
 Returns the value of C<$num> taken to the power C<$exp> in the modulus
 C<$mod> using binary exponentiation.  C<bmodpow> is far superior to
@@ -3974,7 +4249,7 @@ is exactly equivalent to
 
 =item bpow()
 
-    $x->bpow($y);		      # power of arguments (x ** y)
+    $x->bpow($y);                     # power of arguments (x ** y)
 
 =item blog()
 
@@ -3986,7 +4261,7 @@ If C<$base> is not defined, Euler's number (e) is used:
 
 =item bexp()
 
-    $x->bexp($accuracy);	      # calculate e ** X
+    $x->bexp($accuracy);              # calculate e ** X
 
 Calculates the expression C<e ** $x> where C<e> is Euler's number.
 
@@ -3996,20 +4271,20 @@ See also L</blog()>.
 
 =item bnok()
 
-    $x->bnok($y);	  # x over y (binomial coefficient n over k)
+    $x->bnok($y);         # x over y (binomial coefficient n over k)
 
 Calculates the binomial coefficient n over k, also called the "choose"
 function. The result is equivalent to:
 
-	( n )      n!
-	| - |  = -------
-	( k )    k!(n-k)!
+        ( n )      n!
+        | - |  = -------
+        ( k )    k!(n-k)!
 
 This method was added in v1.84 of Math::BigInt (April 2007).
 
 =item bpi()
 
-    print Math::BigInt->bpi(100), "\n";		# 3
+    print Math::BigInt->bpi(100), "\n";         # 3
 
 Returns PI truncated to an integer, with the argument being ignored. This means
 under BigInt this always returns C<3>.
@@ -4019,8 +4294,8 @@ current rounding mode:
 
     use Math::BigFloat;
     use Math::BigInt upgrade => Math::BigFloat;
-    print Math::BigInt->bpi(3), "\n";		# 3.14
-    print Math::BigInt->bpi(100), "\n";		# 3.1415....
+    print Math::BigInt->bpi(3), "\n";           # 3.14
+    print Math::BigInt->bpi(100), "\n";         # 3.1415....
 
 This method was added in v1.87 of Math::BigInt (June 2007).
 
@@ -4075,33 +4350,33 @@ This method was added in v1.87 of Math::BigInt (June 2007).
 
 =item blsft()
 
-    $x->blsft($y);		# left shift in base 2
-    $x->blsft($y,$n);		# left shift, in base $n (like 10)
+    $x->blsft($y);              # left shift in base 2
+    $x->blsft($y,$n);           # left shift, in base $n (like 10)
 
 =item brsft()
 
-    $x->brsft($y);		# right shift in base 2
-    $x->brsft($y,$n);		# right shift, in base $n (like 10)
+    $x->brsft($y);              # right shift in base 2
+    $x->brsft($y,$n);           # right shift, in base $n (like 10)
 
 =item band()
 
-    $x->band($y);		# bitwise and
+    $x->band($y);               # bitwise and
 
 =item bior()
 
-    $x->bior($y);		# bitwise inclusive or
+    $x->bior($y);               # bitwise inclusive or
 
 =item bxor()
 
-    $x->bxor($y);		# bitwise exclusive or
+    $x->bxor($y);               # bitwise exclusive or
 
 =item bnot()
 
-    $x->bnot();			# bitwise not (two's complement)
+    $x->bnot();                 # bitwise not (two's complement)
 
 =item bsqrt()
 
-    $x->bsqrt();		# calculate square-root
+    $x->bsqrt();                # calculate square-root
 
 =item broot()
 
@@ -4111,7 +4386,7 @@ Calculates the N'th root of C<$x>.
 
 =item bfac()
 
-    $x->bfac();		        # factorial of $x (1*2*3*4*..$x)
+    $x->bfac();                 # factorial of $x (1*2*3*4*..$x)
 
 =item round()
 
@@ -4134,12 +4409,12 @@ is a no-op for them.
 
 Examples:
 
-	Input		N		Result
-	===================================================
-	123456.123456	3		123500
-	123456.123456	2		123450
-	123456.123456	-2		123456.12
-	123456.123456	-3		123456.123
+        Input           N               Result
+        ===================================================
+        123456.123456   3               123500
+        123456.123456   2               123450
+        123456.123456   -2              123456.12
+        123456.123456   -3              123456.123
 
 =item bfloor()
 
@@ -4166,11 +4441,11 @@ if $x is not an integer.
 
 =item bgcd()
 
-    bgcd(@values);	     # greatest common divisor (no OO style)
+    bgcd(@values);           # greatest common divisor (no OO style)
 
 =item blcm()
 
-    blcm(@values);	     # lowest common multiple (no OO style)
+    blcm(@values);           # lowest common multiple (no OO style)
 
 =item length()
 
@@ -4195,21 +4470,35 @@ Return the signed mantissa of $x as BigInt.
 
 =item parts()
 
-    $x->parts();	# return (mantissa,exponent) as BigInt
+    $x->parts();        # return (mantissa,exponent) as BigInt
 
 =item copy()
 
-    $x->copy();		# make a true copy of $x (unlike $y = $x;)
+    $x->copy();         # make a true copy of $x (unlike $y = $x;)
+
+=item as_int()
+
+=item as_number()
 
-=item as_int()/as_number()
+These methods are called when Math::BigInt encounters an object it doesn't know
+how to handle. For instance, assume $x is a Math::BigInt, or subclass thereof,
+and $y is defined, but not a Math::BigInt, or subclass thereof. If you do
 
-    $x->as_int();
+    $x -> badd($y);
 
-Returns $x as a BigInt (truncated towards zero). In BigInt this is the same as
-C<copy()>.
+$y needs to be converted into an object that $x can deal with. This is done by
+first checking if $y is something that $x might be upgraded to. If that is the
+case, no further attempts are made. The next is to see if $y supports the
+method C<as_int()>. If it does, C<as_int()> is called, but if it doesn't, the
+next thing is to see if $y supports the method C<as_number()>. If it does,
+C<as_number()> is called. The method C<as_int()> (and C<as_number()>) is
+expected to return either an object that has the same class as $x, a subclass
+thereof, or a string that C<ref($x)-E<gt>new()> can parse to create an object.
 
-C<as_number()> is an alias to this method. C<as_number> was introduced in
-v1.22, while C<as_int()> was only introduced in v1.68.
+C<as_number()> is an alias to C<as_int()>. C<as_number> was introduced in
+v1.22, while C<as_int()> was introduced in v1.68.
+
+In Math::BigInt, C<as_int()> has the same effect as C<copy()>.
 
 =item bstr()
 
@@ -4235,12 +4524,12 @@ Returns a normalized string representation of C<$x>.
 
 =item numify()
 
-	print $x->numify();
+        print $x->numify();
 
 This returns a normal Perl scalar from $x. It is used automatically
 whenever a scalar is needed, for instance in array index operations.
 
-This loses precision, to avoid this use L<as_int()|/"as_int()/as_number()"> instead.
+This loses precision, to avoid this use L</as_int()> instead.
 
 =item modify()
 
@@ -4257,10 +4546,10 @@ Set/get the class for downgrade/upgrade operations. Thuis is used
 for instance by L<bignum>. The defaults are '', thus the following
 operation will create a BigInt, not a BigFloat:
 
-	my $i = Math::BigInt->new(123);
-	my $f = Math::BigFloat->new('123.1');
+        my $i = Math::BigInt->new(123);
+        my $f = Math::BigFloat->new('123.1');
 
-	print $i + $f,"\n";			# print 246
+        print $i + $f,"\n";                     # print 246
 
 =item div_scale()
 
@@ -4305,15 +4594,15 @@ are zero.
 
 The string output (of floating point numbers) will be padded with zeros:
 
-	Initial value   P       A	Result          String
-	------------------------------------------------------------
-	1234.01         -3      	1000            1000
-	1234            -2      	1200            1200
-	1234.5          -1      	1230            1230
-	1234.001        1       	1234            1234.0
-	1234.01         0       	1234            1234
-	1234.01         2       	1234.01		1234.01
-	1234.01         5       	1234.01		1234.01000
+        Initial value   P       A       Result          String
+        ------------------------------------------------------------
+        1234.01         -3              1000            1000
+        1234            -2              1200            1200
+        1234.5          -1              1230            1230
+        1234.001        1               1234            1234.0
+        1234.01         0               1234            1234
+        1234.01         2               1234.01         1234.01
+        1234.01         5               1234.01         1234.01000
 
 For BigInts, no padding occurs.
 
@@ -4326,11 +4615,11 @@ A of 6, 10203 has 5, 123.0506 has 7, 123.450000 has 8 and 0.000123 has 3.
 
 The string output (of floating point numbers) will be padded with zeros:
 
-	Initial value   P       A	Result          String
-	------------------------------------------------------------
-	1234.01			3	1230		1230
-	1234.01			6	1234.01		1234.01
-	1234.1			8	1234.1		1234.1000
+        Initial value   P       A       Result          String
+        ------------------------------------------------------------
+        1234.01                 3       1230            1230
+        1234.01                 6       1234.01         1234.01
+        1234.1                  8       1234.1          1234.1000
 
 For BigInts, no padding occurs.
 
@@ -4414,21 +4703,21 @@ versions <= 5.7.2) is like this:
 
 =item Precision
 
-  * ffround($p) is able to round to $p number of digits after the decimal
+  * bfround($p) is able to round to $p number of digits after the decimal
     point
   * otherwise P is unused
 
 =item Accuracy (significant digits)
 
-  * fround($a) rounds to $a significant digits
-  * only fdiv() and fsqrt() take A as (optional) parameter
-    + other operations simply create the same number (fneg etc), or
-      more (fmul) of digits
+  * bround($a) rounds to $a significant digits
+  * only bdiv() and bsqrt() take A as (optional) parameter
+    + other operations simply create the same number (bneg etc), or
+      more (bmul) of digits
     + rounding/truncating is only done when explicitly calling one
-      of fround or ffround, and never for BigInt (not implemented)
-  * fsqrt() simply hands its accuracy argument over to fdiv.
+      of bround or bfround, and never for BigInt (not implemented)
+  * bsqrt() simply hands its accuracy argument over to bdiv.
   * the documentation and the comment in the code indicate two
-    different ways on how fdiv() determines the maximum number
+    different ways on how bdiv() determines the maximum number
     of digits it should calculate, and the actual code does yet
     another thing
     POD:
@@ -4497,12 +4786,12 @@ This is how it works now:
     globals enforced upon creation of a number by using
     $x = Math::BigInt->new($number,undef,undef):
 
-	use Math::BigInt::SomeSubclass;
-	use Math::BigInt;
+        use Math::BigInt::SomeSubclass;
+        use Math::BigInt;
 
-	Math::BigInt->accuracy(2);
-	Math::BigInt::SomeSubClass->accuracy(3);
-	$x = Math::BigInt::SomeSubClass->new(1234);
+        Math::BigInt->accuracy(2);
+        Math::BigInt::SomeSubClass->accuracy(3);
+        $x = Math::BigInt::SomeSubClass->new(1234);
 
     $x is now 1230, and not 1200. A subclass might choose to implement
     this otherwise, e.g. falling back to the parent's A and P.
@@ -4526,22 +4815,22 @@ This is how it works now:
     effect, and the other P, this results in an error (NaN).
   * A takes precedence over P (Hint: A comes before P).
     If neither of them is defined, nothing is used, i.e. the result will have
-    as many digits as it can (with an exception for fdiv/fsqrt) and will not
+    as many digits as it can (with an exception for bdiv/bsqrt) and will not
     be rounded.
-  * There is another setting for fdiv() (and thus for fsqrt()). If neither of
-    A or P is defined, fdiv() will use a fallback (F) of $div_scale digits.
+  * There is another setting for bdiv() (and thus for bsqrt()). If neither of
+    A or P is defined, bdiv() will use a fallback (F) of $div_scale digits.
     If either the dividend's or the divisor's mantissa has more digits than
     the value of F, the higher value will be used instead of F.
     This is to limit the digits (A) of the result (just consider what would
     happen with unlimited A and P in the case of 1/3 :-)
-  * fdiv will calculate (at least) 4 more digits than required (determined by
+  * bdiv will calculate (at least) 4 more digits than required (determined by
     A, P or F), and, if F is not used, round the result
     (this will still fail in the case of a result like 0.12345000000001 with A
     or P of 5, but this can not be helped - or can it?)
   * Thus you can have the math done by on Math::Big* class in two modi:
     + never round (this is the default):
       This is done by setting A and P to undef. No math operation
-      will round the result, with fdiv() and fsqrt() as exceptions to guard
+      will round the result, with bdiv() and bsqrt() as exceptions to guard
       against overflows. You must explicitly call bround(), bfround() or
       round() (the latter with parameters).
       Note: Once you have rounded a number, the settings will 'stick' on it
@@ -4552,7 +4841,7 @@ This is how it works now:
         $x = Math::BigFloat->new(12.34);
         $y = Math::BigFloat->new(98.76);
         $z = $x * $y;                           # 1218.6984
-        print $x->copy()->fround(3);            # 12.3 (but A is now 3!)
+        print $x->copy()->bround(3);            # 12.3 (but A is now 3!)
         $z = $x * $y;                           # still 1218.6984, without
                                                 # copy would have been 1210!
 
@@ -4582,7 +4871,7 @@ This is how it works now:
       + global A
       + global P
       + global F
-  * fsqrt() will hand its arguments to fdiv(), as it used to, only now for two
+  * bsqrt() will hand its arguments to bdiv(), as it used to, only now for two
     arguments (A and P) instead of one
 
 =item Local settings
@@ -4596,8 +4885,7 @@ This is how it works now:
 =item Rounding
 
   * the rounding routines will use the respective global or local settings.
-    fround()/bround() is for accuracy rounding, while ffround()/bfround()
-    is for precision
+    bround() is for accuracy rounding, while bfround() is for precision
   * the two rounding functions take as the second parameter one of the
     following rounding modes (R):
     'even', 'odd', '+inf', '-inf', 'zero', 'trunc', 'common'
@@ -4628,7 +4916,7 @@ This is how it works now:
 =item Remarks
 
   * The defaults are set up so that the new code gives the same results as
-    the old code (except in a few cases on fdiv):
+    the old code (except in a few cases on bdiv):
     + Both A and P are undefined and thus will not be used for rounding
       after each operation.
     + round() is thus a no-op, unless given extra parameters A and P
@@ -4646,15 +4934,15 @@ While BigInt has extensive handling of inf and NaN, certain quirks remain.
 These perl routines currently (as of Perl v.5.8.6) cannot handle passed
 inf.
 
-	te@linux:~> perl -wle 'print 2 ** 3333'
-	inf
-	te@linux:~> perl -wle 'print 2 ** 3333 == 2 ** 3333'
-	1
-	te@linux:~> perl -wle 'print oct(2 ** 3333)'
-	0
-	te@linux:~> perl -wle 'print hex(2 ** 3333)'
-	Illegal hexadecimal digit 'i' ignored at -e line 1.
-	0
+        te@linux:~> perl -wle 'print 2 ** 3333'
+        Inf
+        te@linux:~> perl -wle 'print 2 ** 3333 == 2 ** 3333'
+        1
+        te@linux:~> perl -wle 'print oct(2 ** 3333)'
+        0
+        te@linux:~> perl -wle 'print hex(2 ** 3333)'
+        Illegal hexadecimal digit 'I' ignored at -e line 1.
+        0
 
 The same problems occur if you pass them Math::BigInt->binf() objects. Since
 overloading these routines is not possible, this cannot be fixed from BigInt.
@@ -4693,11 +4981,11 @@ instead relying on the internal representation.
 Math with the numbers is done (by default) by a module called
 C<Math::BigInt::Calc>. This is equivalent to saying:
 
-	use Math::BigInt try => 'Calc';
+        use Math::BigInt try => 'Calc';
 
 You can change this backend library by using:
 
-	use Math::BigInt try => 'GMP';
+        use Math::BigInt try => 'GMP';
 
 B<Note>: General purpose packages should not be explicit about the library
 to use; let the script author decide which is best.
@@ -4706,12 +4994,12 @@ If your script works with huge numbers and Calc is too slow for them,
 you can also for the loading of one of these libraries and if none
 of them can be used, the code will die:
 
-	use Math::BigInt only => 'GMP,Pari';
+        use Math::BigInt only => 'GMP,Pari';
 
 The following would first try to find Math::BigInt::Foo, then
 Math::BigInt::Bar, and when this also fails, revert to Math::BigInt::Calc:
 
-	use Math::BigInt try => 'Foo,Math::BigInt::Bar';
+        use Math::BigInt try => 'Foo,Math::BigInt::Bar';
 
 The library that is loaded last will be used. Note that this can be
 overwritten at any time by loading a different library, and numbers
@@ -4774,21 +5062,21 @@ change.
 
   sub bigint { Math::BigInt->new(shift); }
 
-  $x = Math::BigInt->bstr("1234")      	# string "1234"
-  $x = "$x";                         	# same as bstr()
-  $x = Math::BigInt->bneg("1234");   	# BigInt "-1234"
-  $x = Math::BigInt->babs("-12345"); 	# BigInt "12345"
-  $x = Math::BigInt->bnorm("-0.00"); 	# BigInt "0"
+  $x = Math::BigInt->bstr("1234")       # string "1234"
+  $x = "$x";                            # same as bstr()
+  $x = Math::BigInt->bneg("1234");      # BigInt "-1234"
+  $x = Math::BigInt->babs("-12345");    # BigInt "12345"
+  $x = Math::BigInt->bnorm("-0.00");    # BigInt "0"
   $x = bigint(1) + bigint(2);           # BigInt "3"
   $x = bigint(1) + "2";                 # ditto (auto-BigIntify of "2")
   $x = bigint(1);                       # BigInt "1"
-  $x = $x + 5 / 2;                   	# BigInt "3"
-  $x = $x ** 3;                      	# BigInt "27"
-  $x *= 2;                           	# BigInt "54"
-  $x = Math::BigInt->new(0);       	# BigInt "0"
-  $x--;                              	# BigInt "-1"
-  $x = Math::BigInt->badd(4,5)		# BigInt "9"
-  print $x->bsstr();			# 9e+0
+  $x = $x + 5 / 2;                      # BigInt "3"
+  $x = $x ** 3;                         # BigInt "27"
+  $x *= 2;                              # BigInt "54"
+  $x = Math::BigInt->new(0);            # BigInt "0"
+  $x--;                                 # BigInt "-1"
+  $x = Math::BigInt->badd(4,5)          # BigInt "9"
+  print $x->bsstr();                    # 9e+0
 
 Examples for rounding:
 
@@ -4797,22 +5085,22 @@ Examples for rounding:
 
   $x = Math::BigFloat->new(123.4567);
   $y = Math::BigFloat->new(123.456789);
-  Math::BigFloat->accuracy(4);		# no more A than 4
-
-  is ($x->copy()->fround(),123.4);	# even rounding
-  print $x->copy()->fround(),"\n";	# 123.4
-  Math::BigFloat->round_mode('odd');	# round to odd
-  print $x->copy()->fround(),"\n";	# 123.5
-  Math::BigFloat->accuracy(5);		# no more A than 5
-  Math::BigFloat->round_mode('odd');	# round to odd
-  print $x->copy()->fround(),"\n";	# 123.46
-  $y = $x->copy()->fround(4),"\n";	# A = 4: 123.4
-  print "$y, ",$y->accuracy(),"\n";	# 123.4, 4
-
-  Math::BigFloat->accuracy(undef);	# A not important now
-  Math::BigFloat->precision(2); 	# P important
-  print $x->copy()->bnorm(),"\n";	# 123.46
-  print $x->copy()->fround(),"\n";	# 123.46
+  Math::BigFloat->accuracy(4);          # no more A than 4
+
+  is ($x->copy()->bround(),123.4);      # even rounding
+  print $x->copy()->bround(),"\n";      # 123.4
+  Math::BigFloat->round_mode('odd');    # round to odd
+  print $x->copy()->bround(),"\n";      # 123.5
+  Math::BigFloat->accuracy(5);          # no more A than 5
+  Math::BigFloat->round_mode('odd');    # round to odd
+  print $x->copy()->bround(),"\n";      # 123.46
+  $y = $x->copy()->bround(4),"\n";      # A = 4: 123.4
+  print "$y, ",$y->accuracy(),"\n";     # 123.4, 4
+
+  Math::BigFloat->accuracy(undef);      # A not important now
+  Math::BigFloat->precision(2);         # P important
+  print $x->copy()->bnorm(),"\n";       # 123.46
+  print $x->copy()->bround(),"\n";      # 123.46
 
 Examples for converting:
 
@@ -4823,31 +5111,31 @@ Examples for converting:
 
 After C<use Math::BigInt ':constant'> all the B<integer> decimal, hexadecimal
 and binary constants in the given scope are converted to C<Math::BigInt>.
-This conversion happens at compile time. 
+This conversion happens at compile time.
 
 In particular,
 
   perl -MMath::BigInt=:constant -e 'print 2**100,"\n"'
 
-prints the integer value of C<2**100>. Note that without conversion of 
+prints the integer value of C<2**100>. Note that without conversion of
 constants the expression 2**100 will be calculated as perl scalar.
 
 Please note that strings and floating point constants are not affected,
 so that
 
-  	use Math::BigInt qw/:constant/;
+        use Math::BigInt qw/:constant/;
 
-	$x = 1234567890123456789012345678901234567890
-		+ 123456789123456789;
-	$y = '1234567890123456789012345678901234567890'
-		+ '123456789123456789';
+        $x = 1234567890123456789012345678901234567890
+                + 123456789123456789;
+        $y = '1234567890123456789012345678901234567890'
+                + '123456789123456789';
 
 do not work. You need an explicit Math::BigInt->new() around one of the
 operands. You should also quote large constants to protect loss of precision:
 
-	use Math::BigInt;
+        use Math::BigInt;
 
-	$x = Math::BigInt->new('1234567889123456789123456789123456789');
+        $x = Math::BigInt->new('1234567889123456789123456789123456789');
 
 Without the quotes Perl would convert the large number to a floating point
 constant at compile time and then hand the result to BigInt, which results in
@@ -4855,10 +5143,10 @@ an truncated result or a NaN.
 
 This also applies to integers that look like floating point constants:
 
-	use Math::BigInt ':constant';
+        use Math::BigInt ':constant';
 
-	print ref(123e2),"\n";
-	print ref(123.2e2),"\n";
+        print ref(123e2),"\n";
+        print ref(123.2e2),"\n";
 
 will print nothing but newlines. Use either L<bignum> or L<Math::BigFloat>
 to get this to work.
@@ -4890,7 +5178,7 @@ C<babs()> etc), instead of O(N) and thus nearly always take much less time.
 These optimizations were done on purpose.
 
 If you find the Calc module to slow, try to install any of the replacement
-modules and see if they help you. 
+modules and see if they help you.
 
 =head2 Alternative math libraries
 
@@ -4931,7 +5219,7 @@ to support different storage methods.
 
 More complex sub-classes may have to replicate more of the logic internal of
 Math::BigInt if they need to change more basic behaviors. A subclass that
-needs to merely change the output only needs to overload C<bstr()>. 
+needs to merely change the output only needs to overload C<bstr()>.
 
 All other object methods and overloaded functions can be directly inherited
 from the parent class.
@@ -4952,13 +5240,13 @@ auto-upgrading and auto-downgrading to work correctly:
   $upgrade = undef;
   $downgrade = undef;
 
-This allows Math::BigInt to correctly retrieve package globals from the 
+This allows Math::BigInt to correctly retrieve package globals from the
 subclass, like C<$SubClass::precision>.  See t/Math/BigInt/Subclass.pm or
 t/Math/BigFloat/SubClass.pm completely functional subclass examples.
 
-Don't forget to 
+Don't forget to
 
-	use overload;
+        use overload;
 
 in your subclass to automatically inherit the overloading from the parent. If
 you like, you can change part of the overloading, look at Math::String for an
@@ -4968,20 +5256,20 @@ example.
 
 When used like this:
 
-	use Math::BigInt upgrade => 'Foo::Bar';
+        use Math::BigInt upgrade => 'Foo::Bar';
 
 certain operations will 'upgrade' their calculation and thus the result to
 the class Foo::Bar. Usually this is used in conjunction with Math::BigFloat:
 
-	use Math::BigInt upgrade => 'Math::BigFloat';
+        use Math::BigInt upgrade => 'Math::BigFloat';
 
 As a shortcut, you can use the module L<bignum>:
 
-	use bignum;
+        use bignum;
 
 Also good for one-liners:
 
-	perl -Mbignum -le 'print 2 ** 255'
+        perl -Mbignum -le 'print 2 ** 255'
 
 This makes it possible to mix arguments of different classes (as in 2.5 + 2)
 as well es preserve accuracy (as in sqrt(3)).
@@ -5003,20 +5291,27 @@ is in effect, they will always hand up their work:
 
 =item bexp()
 
-=back
+=item bpi()
+
+=item bcos()
+
+=item bsin()
+
+=item batan2()
+
+=item batan()
 
-Beware: This list is not complete.
+=back
 
 All other methods upgrade themselves only when one (or all) of their
-arguments are of the class mentioned in $upgrade (This might change in later
-versions to a more sophisticated scheme):
+arguments are of the class mentioned in $upgrade.
 
 =head1 EXPORTS
 
 C<Math::BigInt> exports nothing by default, but can export the following methods:
 
-	bgcd
-	blcm
+        bgcd
+        blcm
 
 =head1 CAVEATS
 
@@ -5036,44 +5331,44 @@ and L<Test::More>, which stringify arguments before comparing them.
 Mark Biggar said, when asked about to drop the '+' altogether, or make only
 C<cmp> work:
 
-	I agree (with the first alternative), don't add the '+' on positive
-	numbers.  It's not as important anymore with the new internal 
-	form for numbers.  It made doing things like abs and neg easier,
-	but those have to be done differently now anyway.
+        I agree (with the first alternative), don't add the '+' on positive
+        numbers.  It's not as important anymore with the new internal
+        form for numbers.  It made doing things like abs and neg easier,
+        but those have to be done differently now anyway.
 
 So, the following examples will now work all as expected:
 
-	use Test::More tests => 1;
-	use Math::BigInt;
+        use Test::More tests => 1;
+        use Math::BigInt;
 
-	my $x = new Math::BigInt 3*3;
-	my $y = new Math::BigInt 3*3;
+        my $x = Math::BigInt -> new(3*3);
+        my $y = Math::BigInt -> new(3*3);
 
-	is ($x,3*3, 'multiplication');
-	print "$x eq 9" if $x eq $y;
-	print "$x eq 9" if $x eq '9';
-	print "$x eq 9" if $x eq 3*3;
+        is ($x,3*3, 'multiplication');
+        print "$x eq 9" if $x eq $y;
+        print "$x eq 9" if $x eq '9';
+        print "$x eq 9" if $x eq 3*3;
 
 Additionally, the following still works:
 
-	print "$x == 9" if $x == $y;
-	print "$x == 9" if $x == 9;
-	print "$x == 9" if $x == 3*3;
+        print "$x == 9" if $x == $y;
+        print "$x == 9" if $x == 9;
+        print "$x == 9" if $x == 3*3;
 
 There is now a C<bsstr()> method to get the string in scientific notation aka
 C<1e+2> instead of C<100>. Be advised that overloaded 'eq' always uses bstr()
 for comparison, but Perl will represent some numbers as 100 and others
-as 1e+308. If in doubt, convert both arguments to Math::BigInt before 
+as 1e+308. If in doubt, convert both arguments to Math::BigInt before
 comparing them as strings:
 
-	use Test::More tests => 3;
-	use Math::BigInt;
+        use Test::More tests => 3;
+        use Math::BigInt;
 
-	$x = Math::BigInt->new('1e56'); $y = 1e56;
-	is ($x,$y);			# will fail
-	is ($x->bsstr(),$y);		# okay
-	$y = Math::BigInt->new($y);
-	is ($x,$y);			# okay
+        $x = Math::BigInt->new('1e56'); $y = 1e56;
+        is ($x,$y);                     # will fail
+        is ($x->bsstr(),$y);            # okay
+        $y = Math::BigInt->new($y);
+        is ($x,$y);                     # okay
 
 Alternatively, simply use C<< <=> >> for comparisons, this will get it
 always right. There is not yet a way to get a number automatically represented
@@ -5084,77 +5379,77 @@ comparing NaNs.
 
 =item int()
 
-C<int()> will return (at least for Perl v5.7.1 and up) another BigInt, not a 
+C<int()> will return (at least for Perl v5.7.1 and up) another BigInt, not a
 Perl scalar:
 
-	$x = Math::BigInt->new(123);
-	$y = int($x);				# BigInt 123
-	$x = Math::BigFloat->new(123.45);
-	$y = int($x);				# BigInt 123
+        $x = Math::BigInt->new(123);
+        $y = int($x);                           # BigInt 123
+        $x = Math::BigFloat->new(123.45);
+        $y = int($x);                           # BigInt 123
 
 In all Perl versions you can use C<as_number()> or C<as_int> for the same
 effect:
 
-	$x = Math::BigFloat->new(123.45);
-	$y = $x->as_number();			# BigInt 123
-	$y = $x->as_int();			# ditto
+        $x = Math::BigFloat->new(123.45);
+        $y = $x->as_number();                   # BigInt 123
+        $y = $x->as_int();                      # ditto
 
 This also works for other subclasses, like Math::String.
 
 If you want a real Perl scalar, use C<numify()>:
 
-	$y = $x->numify();			# 123 as scalar
+        $y = $x->numify();                      # 123 as scalar
 
 This is seldom necessary, though, because this is done automatically, like
 when you access an array:
 
-	$z = $array[$x];			# does work automatically
+        $z = $array[$x];                        # does work automatically
 
 =item length()
 
 The following will probably not do what you expect:
 
-	$c = Math::BigInt->new(123);
-	print $c->length(),"\n";		# prints 30
+        $c = Math::BigInt->new(123);
+        print $c->length(),"\n";                # prints 30
 
 It prints both the number of digits in the number and in the fraction part
-since print calls C<length()> in list context. Use something like: 
+since print calls C<length()> in list context. Use something like:
 
-	print scalar $c->length(),"\n";		# prints 3
+        print scalar $c->length(),"\n";         # prints 3
 
 =item bdiv()
 
 The following will probably not do what you expect:
 
-	print $c->bdiv(10000),"\n";
+        print $c->bdiv(10000),"\n";
 
 It prints both quotient and remainder since print calls C<bdiv()> in list
 context. Also, C<bdiv()> will modify $c, so be careful. You probably want
 to use
 
-	print $c / 10000,"\n";
+        print $c / 10000,"\n";
 
 or, if you want to  modify $c instead,
 
-	print scalar $c->bdiv(10000),"\n";
+        print scalar $c->bdiv(10000),"\n";
 
 The quotient is always the greatest integer less than or equal to the
 real-valued quotient of the two operands, and the remainder (when it is
 non-zero) always has the same sign as the second operand; so, for
 example,
 
-	  1 / 4  => ( 0, 1)
-	  1 / -4 => (-1,-3)
-	 -3 / 4  => (-1, 1)
-	 -3 / -4 => ( 0,-3)
-	-11 / 2  => (-5,1)
-	 11 /-2  => (-5,-1)
+          1 / 4  => ( 0, 1)
+          1 / -4 => (-1,-3)
+         -3 / 4  => (-1, 1)
+         -3 / -4 => ( 0,-3)
+        -11 / 2  => (-5,1)
+         11 /-2  => (-5,-1)
 
 As a consequence, the behavior of the operator % agrees with the
 behavior of Perl's built-in % operator (as documented in the perlop
 manpage), and the equation
 
-	$x == ($x / $y) * $y + ($x % $y)
+        $x == ($x / $y) * $y + ($x % $y)
 
 holds true for any $x and $y, which justifies calling the two return
 values of bdiv() the quotient and remainder. The only exception to this rule
@@ -5176,37 +5471,37 @@ The following table shows the result of the division and the remainder, so that
 the equation above holds true. Some "ordinary" cases are strewn in to show more
 clearly the reasoning:
 
-	A /  B  =   C,     R so that C *    B +    R =    A
+        A /  B  =   C,     R so that C *    B +    R =    A
      =========================================================
-	5 /   8 =   0,     5 	     0 *    8 +    5 =    5
-	0 /   8 =   0,     0	     0 *    8 +    0 =    0
-	0 / inf =   0,     0	     0 *  inf +    0 =    0
-	0 /-inf =   0,     0	     0 * -inf +    0 =    0
-	5 / inf =   0,     5	     0 *  inf +    5 =    5
-	5 /-inf =   0,     5	     0 * -inf +    5 =    5
-	-5/ inf =   0,    -5	     0 *  inf +   -5 =   -5
-	-5/-inf =   0,    -5	     0 * -inf +   -5 =   -5
-       inf/   5 =  inf,    0	   inf *    5 +    0 =  inf
+        5 /   8 =   0,     5         0 *    8 +    5 =    5
+        0 /   8 =   0,     0         0 *    8 +    0 =    0
+        0 / inf =   0,     0         0 *  inf +    0 =    0
+        0 /-inf =   0,     0         0 * -inf +    0 =    0
+        5 / inf =   0,     5         0 *  inf +    5 =    5
+        5 /-inf =   0,     5         0 * -inf +    5 =    5
+        -5/ inf =   0,    -5         0 *  inf +   -5 =   -5
+        -5/-inf =   0,    -5         0 * -inf +   -5 =   -5
+       inf/   5 =  inf,    0       inf *    5 +    0 =  inf
       -inf/   5 = -inf,    0      -inf *    5 +    0 = -inf
-       inf/  -5 = -inf,    0	  -inf *   -5 +    0 =  inf
+       inf/  -5 = -inf,    0      -inf *   -5 +    0 =  inf
       -inf/  -5 =  inf,    0       inf *   -5 +    0 = -inf
-	 5/   5 =    1,    0         1 *    5 +    0 =    5
-	-5/  -5 =    1,    0         1 *   -5 +    0 =   -5
+         5/   5 =    1,    0         1 *    5 +    0 =    5
+        -5/  -5 =    1,    0         1 *   -5 +    0 =   -5
        inf/ inf =    1,    0         1 *  inf +    0 =  inf
       -inf/-inf =    1,    0         1 * -inf +    0 = -inf
        inf/-inf =   -1,    0        -1 * -inf +    0 =  inf
       -inf/ inf =   -1,    0         1 * -inf +    0 = -inf
-	 8/   0 =  inf,    8       inf *    0 +    8 =    8
+         8/   0 =  inf,    8       inf *    0 +    8 =    8
        inf/   0 =  inf,  inf       inf *    0 +  inf =  inf
          0/   0 =  NaN
 
 These cases below violate the "remainder has the sign of the second of the two
 arguments", since they wouldn't match up otherwise.
 
-	A /  B  =   C,     R so that C *    B +    R =    A
+        A /  B  =   C,     R so that C *    B +    R =    A
      ========================================================
       -inf/   0 = -inf, -inf      -inf *    0 +  inf = -inf
-	-8/   0 = -inf,   -8      -inf *    0 +    8 = -8
+        -8/   0 = -inf,   -8      -inf *    0 +    8 = -8
 
 =item Modifying and =
 
@@ -5242,10 +5537,10 @@ returns it, unlike the old code which left it alone and only returned the
 result. This is to be consistent with C<badd()> etc. The first three will
 modify $x, the last one won't:
 
-	print bpow($x,$i),"\n"; 	# modify $x
-	print $x->bpow($i),"\n"; 	# ditto
-	print $x **= $i,"\n";		# the same
-	print $x ** $i,"\n";		# leave $x alone
+        print bpow($x,$i),"\n";         # modify $x
+        print $x->bpow($i),"\n";        # ditto
+        print $x **= $i,"\n";           # the same
+        print $x ** $i,"\n";            # leave $x alone
 
 The form C<$x **= $y> is faster than C<$x = $x ** $y;>, though.
 
@@ -5253,11 +5548,11 @@ The form C<$x **= $y> is faster than C<$x = $x ** $y;>, though.
 
 The following:
 
-	$x = -$x;
+        $x = -$x;
 
 is slower than
 
-	$x->bneg();
+        $x->bneg();
 
 since overload calls C<sub($x,0,1);> instead of C<neg($x)>. The first variant
 needs to preserve $x since it does not know that it later will get overwritten.
@@ -5265,56 +5560,47 @@ This makes a copy of $x and takes O(N), but $x->bneg() is O(1).
 
 =item Mixing different object types
 
-In Perl you will get a floating point value if you do one of the following:
-
-	$float = 5.0 + 2;
-	$float = 2 + 5.0;
-	$float = 5 / 2;
-
-With overloaded math, only the first two variants will result in a BigFloat:
-
-	use Math::BigInt;
-	use Math::BigFloat;
-
-	$mbf = Math::BigFloat->new(5);
-	$mbi2 = Math::BigInteger->new(5);
-	$mbi = Math::BigInteger->new(2);
+With overloaded operators, it is the first (dominating) operand that determines
+which method is called. Here are some examples showing what actually gets
+called in various cases.
 
-					# what actually gets called:
-	$float = $mbf + $mbi;		# $mbf->badd()
-	$float = $mbf / $mbi;		# $mbf->bdiv()
-	$integer = $mbi + $mbf;		# $mbi->badd()
-	$integer = $mbi2 / $mbi;	# $mbi2->bdiv()
-	$integer = $mbi2 / $mbf;	# $mbi2->bdiv()
+        use Math::BigInt;
+        use Math::BigFloat;
 
-This is because math with overloaded operators follows the first (dominating)
-operand, and the operation of that is called and returns thus the result. So,
-Math::BigInt::bdiv() will always return a Math::BigInt, regardless whether
-the result should be a Math::BigFloat or the second operant is one.
+        $mbf  = Math::BigFloat->new(5);
+        $mbi2 = Math::BigInt->new(5);
+        $mbi  = Math::BigInt->new(2);
+                                        # what actually gets called:
+        $float = $mbf + $mbi;           # $mbf->badd($mbi)
+        $float = $mbf / $mbi;           # $mbf->bdiv($mbi)
+        $integer = $mbi + $mbf;         # $mbi->badd($mbf)
+        $integer = $mbi2 / $mbi;        # $mbi2->bdiv($mbi)
+        $integer = $mbi2 / $mbf;        # $mbi2->bdiv($mbf)
 
-To get a Math::BigFloat you either need to call the operation manually,
-make sure the operands are already of the proper type or casted to that type
-via Math::BigFloat->new():
+For instance, Math::BigInt->bdiv() will always return a Math::BigInt, regardless of
+whether the second operant is a Math::BigFloat. To get a Math::BigFloat you
+either need to call the operation manually, make sure each operand already is a
+Math::BigFloat, or cast to that type via Math::BigFloat->new():
 
-	$float = Math::BigFloat->new($mbi2) / $mbi;	# = 2.5
+        $float = Math::BigFloat->new($mbi2) / $mbi;     # = 2.5
 
-Beware of simple "casting" the entire expression, this would only convert
-the already computed result:
+Beware of casting the entire expression, as this would cast the
+result, at which point it is too late:
 
-	$float = Math::BigFloat->new($mbi2 / $mbi);	# = 2.0 thus wrong!
+        $float = Math::BigFloat->new($mbi2 / $mbi);     # = 2
 
 Beware also of the order of more complicated expressions like:
 
-	$integer = ($mbi2 + $mbi) / $mbf;		# int / float => int
-	$integer = $mbi2 / Math::BigFloat->new($mbi);	# ditto
+        $integer = ($mbi2 + $mbi) / $mbf;               # int / float => int
+        $integer = $mbi2 / Math::BigFloat->new($mbi);   # ditto
 
 If in doubt, break the expression into simpler terms, or cast all operands
 to the desired resulting type.
 
 Scalar values are a bit different, since:
 
-	$float = 2 + $mbf;
-	$float = $mbf + 2;
+        $float = 2 + $mbf;
+        $float = $mbf + 2;
 
 will both result in the proper type due to the way the overloaded math works.
 
@@ -5331,14 +5617,14 @@ mode. The reason is that the result is always truncated to an integer.
 
 If you want a better approximation of the square root, then use:
 
-	$x = Math::BigFloat->new(12);
-	Math::BigFloat->precision(0);
-	Math::BigFloat->round_mode('even');
-	print $x->copy->bsqrt(),"\n";		# 4
+        $x = Math::BigFloat->new(12);
+        Math::BigFloat->precision(0);
+        Math::BigFloat->round_mode('even');
+        print $x->copy->bsqrt(),"\n";           # 4
 
-	Math::BigFloat->precision(2);
-	print $x->bsqrt(),"\n";			# 3.46
-	print $x->bsqrt(3),"\n";		# 3.464
+        Math::BigFloat->precision(2);
+        print $x->bsqrt(),"\n";                 # 3.46
+        print $x->bsqrt(3),"\n";                # 3.464
 
 =item brsft()
 
@@ -5420,9 +5706,25 @@ because they solve the autoupgrading/downgrading issue, at least partly.
 
 =head1 AUTHORS
 
-Original code by Mark Biggar, overloaded interface by Ilya Zakharevich.
-Completely rewritten by Tels http://bloodgate.com in late 2000, 2001 - 2006
-and still at it in 2007.
+=over 4
+
+=item *
+
+Mark Biggar, overloaded interface by Ilya Zakharevich, 1996-2001.
+
+=item *
+
+Completely rewritten by Tels L<http://bloodgate.com>, 2001-2008.
+
+=item *
+
+Florian Ragwitz E<lt>flora@cpan.orgE<gt>, 2010.
+
+=item *
+
+Peter John Acklam E<lt>pjacklam@online.noE<gt>, 2011-.
+
+=back
 
 Many people contributed in one or more ways to the final beast, see the file
 CREDITS for an (incomplete) list. If you miss your name, please drop me a
diff --git a/Master/tlpkg/tlperl/lib/Math/BigInt/Calc.pm b/Master/tlpkg/tlperl/lib/Math/BigInt/Calc.pm
index d511bab3310..1a7e4af9e9b 100644
--- a/Master/tlpkg/tlperl/lib/Math/BigInt/Calc.pm
+++ b/Master/tlpkg/tlperl/lib/Math/BigInt/Calc.pm
@@ -1,10 +1,11 @@
 package Math::BigInt::Calc;
 
-use 5.006002;
+use 5.006001;
 use strict;
-# use warnings;	# do not use warnings for older Perls
+use warnings;
 
-our $VERSION = '1.9997';
+our $VERSION = '1.999715';
+$VERSION = eval $VERSION;
 
 # Package to store unsigned big integers in decimal and do math with them
 
@@ -98,20 +99,24 @@ sub _base_len
   return ($BASE_LEN, $BASE, $AND_BITS, $XOR_BITS, $OR_BITS, $BASE_LEN, $MAX_VAL);
   }
 
-sub _new
-  {
-  # (ref to string) return ref to num_array
-  # Convert a number from string format (without sign) to internal base
-  # 1ex format. Assumes normalized value as input.
-  my $il = length($_[1])-1;
+sub _new {
+    # Given a string representing an integer, returns a reference to an array
+    # of integers, where each integer represents a chunk of the original input
+    # integer. Assumes normalized value as input.
 
-  # < BASE_LEN due len-1 above
-  return [ int($_[1]) ] if $il < $BASE_LEN;	# shortcut for short numbers
+    my ($proto, $str) = @_;
 
-  # this leaves '00000' instead of int 0 and will be corrected after any op
-  [ reverse(unpack("a" . ($il % $BASE_LEN+1) 
-    . ("a$BASE_LEN" x ($il / $BASE_LEN)), $_[1])) ];
-  }                                                                             
+    my $input_len = length($str) - 1;
+
+    # Shortcut for small numbers.
+    return [ int($str) ] if $input_len < $BASE_LEN;
+
+    my $format = "a" . (($input_len % $BASE_LEN) + 1);
+    $format .= $] < 5.008 ? "a$BASE_LEN" x int($input_len / $BASE_LEN)
+                          : "(a$BASE_LEN)*";
+
+    [ reverse(map { 0 + $_ } unpack($format, $str)) ];
+}
 
 BEGIN
   {
@@ -119,11 +124,10 @@ BEGIN
   # multipliable with itself plus carry
   # Test now changed to expect the proper pattern, not a result off by 1 or 2
   my ($e, $num) = 3;	# lowest value we will use is 3+1-1 = 3
-  do 
-    {
-    $num = ('9' x ++$e) + 0;
-    $num *= $num + 1.0;
-    } while ("$num" =~ /9{$e}0{$e}/);	# must be a certain pattern
+  do {
+      $num = '9' x ++$e;
+      $num *= $num + 1;
+  } while $num =~ /9{$e}0{$e}/;		# must be a certain pattern
   $e--; 				# last test failed, so retract one step
   # the limits below brush the problems with the test above under the rug:
   # the test should be able to find the proper $e automatically
@@ -241,34 +245,32 @@ sub import { }
 ##############################################################################
 # convert back to string and number
 
-sub _str
-  {
-  # (ref to BINT) return num_str
-  # Convert number from internal base 100000 format to string format.
-  # internal format is always normalized (no leading zeros, "-0" => "+0")
-  my $ar = $_[1];
+sub _str {
+    # Convert number from internal base 1eN format to string format. Internal
+    # format is always normalized, i.e., no leading zeros.
 
-  my $l = scalar @$ar;				# number of parts
-  if ($l < 1)					# should not happen
-    {
-    require Carp;
-    Carp::croak("$_[1] has no elements");
+    my $ary = $_[1];
+    my $idx = $#$ary;             # index of last element
+
+    if ($idx < 0) {               # should not happen
+        require Carp;
+        Carp::croak("$_[1] has no elements");
     }
 
-  my $ret = "";
-  # handle first one different to strip leading zeros from it (there are no
-  # leading zero parts in internal representation)
-  $l --; $ret .= int($ar->[$l]); $l--;
-  # Interestingly, the pre-padd method uses more time
-  # the old grep variant takes longer (14 vs. 10 sec)
-  my $z = '0' x ($BASE_LEN-1);                            
-  while ($l >= 0)
-    {
-    $ret .= substr($z.$ar->[$l],-$BASE_LEN); # fastest way I could think of
-    $l--;
+    # Handle first one differently, since it should not have any leading zeros.
+    my $ret = int($ary->[$idx]);
+    if ($idx > 0) {
+        $idx--;
+        # Interestingly, the pre-padd method uses more time
+        # the old grep variant takes longer (14 vs. 10 sec)
+        my $z = '0' x ($BASE_LEN - 1);
+        while ($idx >= 0) {
+            $ret .= substr($z . $ary->[$idx], -$BASE_LEN);
+            $idx--;
+        }
     }
-  $ret;
-  }                                                                             
+    $ret;
+}
 
 sub _num
   {
@@ -293,100 +295,96 @@ sub _num
 ##############################################################################
 # actual math code
 
-sub _add
-  {
-  # (ref to int_num_array, ref to int_num_array)
-  # routine to add two base 1eX numbers
-  # stolen from Knuth Vol 2 Algorithm A pg 231
-  # there are separate routines to add and sub as per Knuth pg 233
-  # This routine modifies array x, but not y.
- 
-  my ($c,$x,$y) = @_;
+sub _add {
+    # (ref to int_num_array, ref to int_num_array)
+    #
+    # Routine to add two base 1eX numbers stolen from Knuth Vol 2 Algorithm A
+    # pg 231. There are separate routines to add and sub as per Knuth pg 233.
+    # This routine modifies array x, but not y.
 
-  return $x if (@$y == 1) && $y->[0] == 0;		# $x + 0 => $x
-  if ((@$x == 1) && $x->[0] == 0)			# 0 + $y => $y->copy
-    {
-    # twice as slow as $x = [ @$y ], but nec. to retain $x as ref :(
-    @$x = @$y; return $x;		
+    my ($c, $x, $y) = @_;
+
+    return $x if @$y == 1 && $y->[0] == 0;      # $x + 0 => $x
+    if (@$x == 1 && $x->[0] == 0) {             # 0 + $y => $y->copy
+        # Twice as slow as $x = [ @$y ], but necessary to modify $x in-place.
+        @$x = @$y;
+        return $x;
     }
- 
-  # for each in Y, add Y to X and carry. If after that, something is left in
-  # X, foreach in X add carry to X and then return X, carry
-  # Trades one "$j++" for having to shift arrays
-  my $i; my $car = 0; my $j = 0;
-  for $i (@$y)
-    {
-    $x->[$j] -= $BASE if $car = (($x->[$j] += $i + $car) >= $BASE) ? 1 : 0;
-    $j++;
+
+    # For each in Y, add Y to X and carry. If after that, something is left in
+    # X, foreach in X add carry to X and then return X, carry. Trades one
+    # "$j++" for having to shift arrays.
+    my $i;
+    my $car = 0;
+    my $j = 0;
+    for $i (@$y) {
+        $x->[$j] -= $BASE if $car = (($x->[$j] += $i + $car) >= $BASE) ? 1 : 0;
+        $j++;
     }
-  while ($car != 0)
-    {
-    $x->[$j] -= $BASE if $car = (($x->[$j] += $car) >= $BASE) ? 1 : 0; $j++;
+    while ($car != 0) {
+        $x->[$j] -= $BASE if $car = (($x->[$j] += $car) >= $BASE) ? 1 : 0;
+        $j++;
     }
-  $x;
-  }                                                                             
+    $x;
+}
 
-sub _inc
-  {
-  # (ref to int_num_array, ref to int_num_array)
-  # Add 1 to $x, modify $x in place
-  my ($c,$x) = @_;
+sub _inc {
+    # (ref to int_num_array, ref to int_num_array)
+    # Add 1 to $x, modify $x in place
+    my ($c, $x) = @_;
 
-  for my $i (@$x)
-    {
-    return $x if (($i += 1) < $BASE);		# early out
-    $i = 0;					# overflow, next
+    for my $i (@$x) {
+        return $x if ($i += 1) < $BASE;		# early out
+        $i = 0;					# overflow, next
     }
-  push @$x,1 if (($x->[-1] || 0) == 0);		# last overflowed, so extend
-  $x;
-  }                                                                             
+    push @$x, 1 if $x->[-1] == 0;		# last overflowed, so extend
+    $x;
+}
 
-sub _dec
-  {
-  # (ref to int_num_array, ref to int_num_array)
-  # Sub 1 from $x, modify $x in place
-  my ($c,$x) = @_;
+sub _dec {
+    # (ref to int_num_array, ref to int_num_array)
+    # Sub 1 from $x, modify $x in place
+    my ($c, $x) = @_;
 
-  my $MAX = $BASE-1;				# since MAX_VAL based on BASE
-  for my $i (@$x)
-    {
-    last if (($i -= 1) >= 0);			# early out
-    $i = $MAX;					# underflow, next
+    my $MAX = $BASE - 1;			# since MAX_VAL based on BASE
+    for my $i (@$x) {
+        last if ($i -= 1) >= 0;			# early out
+        $i = $MAX;				# underflow, next
     }
-  pop @$x if $x->[-1] == 0 && @$x > 1;		# last underflowed (but leave 0)
-  $x;
-  }                                                                             
+    pop @$x if $x->[-1] == 0 && @$x > 1;	# last underflowed (but leave 0)
+    $x;
+}
 
-sub _sub
-  {
-  # (ref to int_num_array, ref to int_num_array, swap)
-  # subtract base 1eX numbers -- stolen from Knuth Vol 2 pg 232, $x > $y
-  # subtract Y from X by modifying x in place
-  my ($c,$sx,$sy,$s) = @_;
- 
-  my $car = 0; my $i; my $j = 0;
-  if (!$s)
-    {
-    for $i (@$sx)
-      {
-      last unless defined $sy->[$j] || $car;
-      $i += $BASE if $car = (($i -= ($sy->[$j] || 0) + $car) < 0); $j++;
-      }
-    # might leave leading zeros, so fix that
-    return __strip_zeros($sx);
+sub _sub {
+    # (ref to int_num_array, ref to int_num_array, swap)
+    #
+    # Subtract base 1eX numbers -- stolen from Knuth Vol 2 pg 232, $x > $y
+    # subtract Y from X by modifying x in place
+    my ($c, $sx, $sy, $s) = @_;
+
+    my $car = 0;
+    my $i;
+    my $j = 0;
+    if (!$s) {
+        for $i (@$sx) {
+            last unless defined $sy->[$j] || $car;
+            $i += $BASE if $car = (($i -= ($sy->[$j] || 0) + $car) < 0);
+            $j++;
+        }
+        # might leave leading zeros, so fix that
+        return __strip_zeros($sx);
     }
-  for $i (@$sx)
-    {
-    # we can't do an early out if $x is < than $y, since we
-    # need to copy the high chunks from $y. Found by Bob Mathews.
-    #last unless defined $sy->[$j] || $car;
-    $sy->[$j] += $BASE
-     if $car = (($sy->[$j] = $i-($sy->[$j]||0) - $car) < 0);
-    $j++;
+    for $i (@$sx) {
+        # We can't do an early out if $x < $y, since we need to copy the high
+        # chunks from $y. Found by Bob Mathews.
+        #last unless defined $sy->[$j] || $car;
+        $sy->[$j] += $BASE
+          if $car = ($sy->[$j] = $i - ($sy->[$j] || 0) - $car) < 0;
+        $j++;
     }
-  # might leave leading zeros, so fix that
-  __strip_zeros($sy);
-  }                                                                             
+    # might leave leading zeros, so fix that
+    __strip_zeros($sy);
+}
 
 sub _mul_use_mul
   {
@@ -1169,373 +1167,355 @@ sub _div_use_div
 ##############################################################################
 # testing
 
-sub _acmp
-  {
-  # internal absolute post-normalized compare (ignore signs)
-  # ref to array, ref to array, return <0, 0, >0
-  # arrays must have at least one entry; this is not checked for
-  my ($c,$cx,$cy) = @_;
- 
-  # shortcut for short numbers 
-  return (($cx->[0] <=> $cy->[0]) <=> 0) 
-   if scalar @$cx == scalar @$cy && scalar @$cx == 1;
-
-  # fast comp based on number of array elements (aka pseudo-length)
-  my $lxy = (scalar @$cx - scalar @$cy)
-  # or length of first element if same number of elements (aka difference 0)
-    ||
-  # need int() here because sometimes the last element is '00018' vs '18'
-   (length(int($cx->[-1])) - length(int($cy->[-1])));
-  return -1 if $lxy < 0;				# already differs, ret
-  return 1 if $lxy > 0;					# ditto
-
-  # manual way (abort if unequal, good for early ne)
-  my $a; my $j = scalar @$cx;
-  while (--$j >= 0)
-    {
-    last if ($a = $cx->[$j] - $cy->[$j]);
-    }
-  $a <=> 0;
-  }
+sub _acmp {
+    # Internal absolute post-normalized compare (ignore signs)
+    # ref to array, ref to array, return <0, 0, >0
+    # Arrays must have at least one entry; this is not checked for.
+    my ($c, $cx, $cy) = @_;
+
+    # shortcut for short numbers
+    return (($cx->[0] <=> $cy->[0]) <=> 0)
+      if @$cx == @$cy && @$cx == 1;
+
+    # fast comp based on number of array elements (aka pseudo-length)
+    my $lxy = (@$cx - @$cy)
+      # or length of first element if same number of elements (aka difference 0)
+      ||
+        # need int() here because sometimes the last element is '00018' vs '18'
+        (length(int($cx->[-1])) - length(int($cy->[-1])));
+
+    return -1 if $lxy < 0;      # already differs, ret
+    return  1 if $lxy > 0;      # ditto
+
+    # manual way (abort if unequal, good for early ne)
+    my $a;
+    my $j = @$cx;
+    while (--$j >= 0) {
+        last if $a = $cx->[$j] - $cy->[$j];
+    }
+    $a <=> 0;
+}
 
-sub _len
-  {
-  # compute number of digits in base 10
+sub _len {
+    # compute number of digits in base 10
 
-  # int() because add/sub sometimes leaves strings (like '00005') instead of
-  # '5' in this place, thus causing length() to report wrong length
-  my $cx = $_[1];
+    # int() because add/sub sometimes leaves strings (like '00005') instead of
+    # '5' in this place, thus causing length() to report wrong length
+    my $cx = $_[1];
 
-  (@$cx-1)*$BASE_LEN+length(int($cx->[-1]));
-  }
+    (@$cx - 1) * $BASE_LEN + length(int($cx->[-1]));
+}
 
-sub _digit
-  {
-  # Return the nth digit. Zero is rightmost, so _digit(123,0) gives 3.
-  # Negative values count from the left, so _digit(123, -1) gives 1.
-  my ($c,$x,$n) = @_;
+sub _digit {
+    # Return the nth digit. Zero is rightmost, so _digit(123,0) gives 3.
+    # Negative values count from the left, so _digit(123, -1) gives 1.
+    my ($c, $x, $n) = @_;
 
-  my $len = _len('',$x);
+    my $len = _len('', $x);
 
-  $n += $len if $n < 0;                 # -1 last, -2 second-to-last
-  return "0" if $n < 0 || $n >= $len;   # return 0 for digits out of range
+    $n += $len if $n < 0;               # -1 last, -2 second-to-last
+    return "0" if $n < 0 || $n >= $len; # return 0 for digits out of range
 
-  my $elem = int($n / $BASE_LEN);       # which array element
-  my $digit = $n % $BASE_LEN;           # which digit in this element
-  substr("$x->[$elem]", -$digit-1, 1);
-  }
+    my $elem = int($n / $BASE_LEN);     # which array element
+    my $digit = $n % $BASE_LEN;         # which digit in this element
+    substr("$x->[$elem]", -$digit - 1, 1);
+}
 
-sub _zeros
-  {
-  # return amount of trailing zeros in decimal
-  # check each array elem in _m for having 0 at end as long as elem == 0
-  # Upon finding a elem != 0, stop
-  my $x = $_[1];
+sub _zeros {
+    # Return number of trailing zeros in decimal.
+    # Check each array element for having 0 at end as long as elem == 0
+    # Upon finding a elem != 0, stop.
 
-  return 0 if scalar @$x == 1 && $x->[0] == 0;
+    my $x = $_[1];
 
-  my $zeros = 0; my $elem;
-  foreach my $e (@$x)
-    {
-    if ($e != 0)
-      {
-      $elem = "$e";				# preserve x
-      $elem =~ s/.*?(0*$)/$1/;			# strip anything not zero
-      $zeros *= $BASE_LEN;			# elems * 5
-      $zeros += length($elem);			# count trailing zeros
-      last;					# early out
-      }
-    $zeros ++;					# real else branch: 50% slower!
+    return 0 if @$x == 1 && $x->[0] == 0;
+
+    my $zeros = 0;
+    my $elem;
+    foreach my $e (@$x) {
+        if ($e != 0) {
+            $elem = "$e";               # preserve x
+            $elem =~ s/.*?(0*$)/$1/;    # strip anything not zero
+            $zeros *= $BASE_LEN;        # elems * 5
+            $zeros += length($elem);    # count trailing zeros
+            last;                       # early out
+        }
+        $zeros ++;                      # real else branch: 50% slower!
     }
-  $zeros;
-  }
+    $zeros;
+}
 
 ##############################################################################
 # _is_* routines
 
-sub _is_zero
-  {
-  # return true if arg is zero 
-  (((scalar @{$_[1]} == 1) && ($_[1]->[0] == 0))) <=> 0;
-  }
+sub _is_zero {
+    # return true if arg is zero 
+    @{$_[1]} == 1 && $_[1]->[0] == 0 ? 1 : 0;
+}
 
-sub _is_even
-  {
-  # return true if arg is even
-  (!($_[1]->[0] & 1)) <=> 0; 
-  }
+sub _is_even {
+    # return true if arg is even
+    $_[1]->[0] & 1 ? 0 : 1;
+}
 
-sub _is_odd
-  {
-  # return true if arg is odd
-  (($_[1]->[0] & 1)) <=> 0;
-  }
+sub _is_odd {
+    # return true if arg is odd
+    $_[1]->[0] & 1 ? 1 : 0;
+}
 
-sub _is_one
-  {
-  # return true if arg is one
-  (scalar @{$_[1]} == 1) && ($_[1]->[0] == 1) <=> 0; 
-  }
+sub _is_one {
+    # return true if arg is one
+    @{$_[1]} == 1 && $_[1]->[0] == 1 ? 1 : 0;
+}
 
-sub _is_two
-  {
-  # return true if arg is two 
-  (scalar @{$_[1]} == 1) && ($_[1]->[0] == 2) <=> 0; 
-  }
+sub _is_two {
+    # return true if arg is two 
+    @{$_[1]} == 1 && $_[1]->[0] == 2 ? 1 : 0;
+}
 
-sub _is_ten
-  {
-  # return true if arg is ten 
-  (scalar @{$_[1]} == 1) && ($_[1]->[0] == 10) <=> 0; 
-  }
+sub _is_ten {
+    # return true if arg is ten 
+    @{$_[1]} == 1 && $_[1]->[0] == 10 ? 1 : 0;
+}
 
-sub __strip_zeros
-  {
-  # internal normalization function that strips leading zeros from the array
-  # args: ref to array
-  my $s = shift;
- 
-  my $cnt = scalar @$s; # get count of parts
-  my $i = $cnt-1;
-  push @$s,0 if $i < 0;		# div might return empty results, so fix it
-
-  return $s if @$s == 1;		# early out
-
-  #print "strip: cnt $cnt i $i\n";
-  # '0', '3', '4', '0', '0',
-  #  0    1    2    3    4
-  # cnt = 5, i = 4
-  # i = 4
-  # i = 3
-  # => fcnt = cnt - i (5-2 => 3, cnt => 5-1 = 4, throw away from 4th pos)
-  # >= 1: skip first part (this can be zero)
-  while ($i > 0) { last if $s->[$i] != 0; $i--; }
-  $i++; splice @$s,$i if ($i < $cnt); # $i cant be 0
-  $s;                                                                    
-  }                                                                             
+sub __strip_zeros {
+    # Internal normalization function that strips leading zeros from the array.
+    # Args: ref to array
+    my $s = shift;
+
+    my $cnt = @$s;              # get count of parts
+    my $i = $cnt - 1;
+    push @$s, 0 if $i < 0;	# div might return empty results, so fix it
+
+    return $s if @$s == 1;	# early out
+
+    #print "strip: cnt $cnt i $i\n";
+    # '0', '3', '4', '0', '0',
+    #  0    1    2    3    4
+    # cnt = 5, i = 4
+    # i = 4
+    # i = 3
+    # => fcnt = cnt - i (5-2 => 3, cnt => 5-1 = 4, throw away from 4th pos)
+    # >= 1: skip first part (this can be zero)
+    while ($i > 0) {
+        last if $s->[$i] != 0;
+        $i--;
+    }
+    $i++;
+    splice @$s, $i if $i < $cnt;        # $i cant be 0
+    $s;
+}
 
 ###############################################################################
 # check routine to test internal state for corruptions
 
-sub _check
-  {
-  # used by the test suite
-  my $x = $_[1];
-
-  return "$x is not a reference" if !ref($x);
-
-  # are all parts are valid?
-  my $i = 0; my $j = scalar @$x; my ($e,$try);
-  while ($i < $j)
-    {
-    $e = $x->[$i]; $e = 'undef' unless defined $e;
-    $try = '=~ /^[\+]?[0-9]+\$/; '."($x, $e)";
-    last if $e !~ /^[+]?[0-9]+$/;
-    $try = '=~ /^[\+]?[0-9]+\$/; '."($x, $e) (stringify)";
-    last if "$e" !~ /^[+]?[0-9]+$/;
-    $try = '=~ /^[\+]?[0-9]+\$/; '."($x, $e) (cat-stringify)";
-    last if '' . "$e" !~ /^[+]?[0-9]+$/;
-    $try = ' < 0 || >= $BASE; '."($x, $e)";
-    last if $e <0 || $e >= $BASE;
-    # this test is disabled, since new/bnorm and certain ops (like early out
-    # in add/sub) are allowed/expected to leave '00000' in some elements
-    #$try = '=~ /^00+/; '."($x, $e)";
-    #last if $e =~ /^00+/;
-    $i++;
-    }
-  return "Illegal part '$e' at pos $i (tested: $try)" if $i < $j;
-  0;
-  }
+sub _check {
+    # used by the test suite
+    my $x = $_[1];
 
+    return "$x is not a reference" if !ref($x);
+
+    # are all parts are valid?
+    my $i = 0;
+    my $j = @$x;
+    my ($e, $try);
+    while ($i < $j) {
+        $e = $x->[$i]; $e = 'undef' unless defined $e;
+        $try = '=~ /^[\+]?[0-9]+\$/; '."($x, $e)";
+        last if $e !~ /^[+]?[0-9]+$/;
+        $try = '=~ /^[\+]?[0-9]+\$/; '."($x, $e) (stringify)";
+        last if "$e" !~ /^[+]?[0-9]+$/;
+        $try = '=~ /^[\+]?[0-9]+\$/; '."($x, $e) (cat-stringify)";
+        last if '' . "$e" !~ /^[+]?[0-9]+$/;
+        $try = ' < 0 || >= $BASE; '."($x, $e)";
+        last if $e <0 || $e >= $BASE;
+        # This test is disabled, since new/bnorm and certain ops (like early out
+        # in add/sub) are allowed/expected to leave '00000' in some elements.
+        #$try = '=~ /^00+/; '."($x, $e)";
+        #last if $e =~ /^00+/;
+        $i++;
+    }
+    return "Illegal part '$e' at pos $i (tested: $try)" if $i < $j;
+    0;
+}
 
 ###############################################################################
 
-sub _mod
-  {
-  # if possible, use mod shortcut
-  my ($c,$x,$yo) = @_;
+sub _mod {
+    # if possible, use mod shortcut
+    my ($c, $x, $yo) = @_;
 
-  # slow way since $y too big
-  if (scalar @$yo > 1)
-    {
-    my ($xo,$rem) = _div($c,$x,$yo);
-    @$x = @$rem;
-    return $x;
+    # slow way since $y too big
+    if (@$yo > 1) {
+        my ($xo, $rem) = _div($c, $x, $yo);
+        @$x = @$rem;
+        return $x;
     }
 
-  my $y = $yo->[0];
-
-  # if both are single element arrays
-  if (scalar @$x == 1)
-    {
-    $x->[0] %= $y;
-    return $x;
-    }
+    my $y = $yo->[0];
 
-  # if @$x has more than one element, but @$y is a single element
-  my $b = $BASE % $y;
-  if ($b == 0)
-    {
-    # when BASE % Y == 0 then (B * BASE) % Y == 0
-    # (B * BASE) % $y + A % Y => A % Y
-    # so need to consider only last element: O(1)
-    $x->[0] %= $y;
-    }
-  elsif ($b == 1)
-    {
-    # else need to go through all elements in @$x: O(N), but loop is a bit
-    # simplified
-    my $r = 0;
-    foreach (@$x)
-      {
-      $r = ($r + $_) % $y;		# not much faster, but heh...
-      #$r += $_ % $y; $r %= $y;
-      }
-    $r = 0 if $r == $y;
-    $x->[0] = $r;
+    # if both are single element arrays
+    if (scalar @$x == 1) {
+        $x->[0] %= $y;
+        return $x;
     }
-  else
-    {
-    # else need to go through all elements in @$x: O(N)
-    my $r = 0;
-    my $bm = 1;
-    foreach (@$x)
-      {
-      $r = ($_ * $bm + $r) % $y;
-      $bm = ($bm * $b) % $y;
 
-      #$r += ($_ % $y) * $bm;
-      #$bm *= $b;
-      #$bm %= $y;
-      #$r %= $y;
-      }
-    $r = 0 if $r == $y;
-    $x->[0] = $r;
+    # if @$x has more than one element, but @$y is a single element
+    my $b = $BASE % $y;
+    if ($b == 0) {
+        # when BASE % Y == 0 then (B * BASE) % Y == 0
+        # (B * BASE) % $y + A % Y => A % Y
+        # so need to consider only last element: O(1)
+        $x->[0] %= $y;
+    } elsif ($b == 1) {
+        # else need to go through all elements in @$x: O(N), but loop is a bit
+        # simplified
+        my $r = 0;
+        foreach (@$x) {
+            $r = ($r + $_) % $y;        # not much faster, but heh...
+            #$r += $_ % $y; $r %= $y;
+        }
+        $r = 0 if $r == $y;
+        $x->[0] = $r;
+    } else {
+        # else need to go through all elements in @$x: O(N)
+        my $r = 0;
+        my $bm = 1;
+        foreach (@$x) {
+            $r = ($_ * $bm + $r) % $y;
+            $bm = ($bm * $b) % $y;
+
+            #$r += ($_ % $y) * $bm;
+            #$bm *= $b;
+            #$bm %= $y;
+            #$r %= $y;
+        }
+        $r = 0 if $r == $y;
+        $x->[0] = $r;
     }
-  @$x = $x->[0];		# keep one element of @$x
-  return $x;
-  }
+    @$x = $x->[0];		# keep one element of @$x
+    return $x;
+}
 
 ##############################################################################
 # shifts
 
-sub _rsft
-  {
-  my ($c,$x,$y,$n) = @_;
+sub _rsft {
+    my ($c, $x, $y, $n) = @_;
 
-  if ($n != 10)
-    {
-    $n = _new($c,$n); return _div($c,$x, _pow($c,$n,$y));
+    if ($n != 10) {
+        $n = _new($c, $n);
+        return _div($c, $x, _pow($c, $n, $y));
     }
 
-  # shortcut (faster) for shifting by 10)
-  # multiples of $BASE_LEN
-  my $dst = 0;				# destination
-  my $src = _num($c,$y);		# as normal int
-  my $xlen = (@$x-1)*$BASE_LEN+length(int($x->[-1]));  # len of x in digits
-  if ($src >= $xlen or ($src == $xlen and ! defined $x->[1]))
-    {
-    # 12345 67890 shifted right by more than 10 digits => 0
-    splice (@$x,1);                    # leave only one element
-    $x->[0] = 0;                       # set to zero
-    return $x;
-    }
-  my $rem = $src % $BASE_LEN;		# remainder to shift
-  $src = int($src / $BASE_LEN);		# source
-  if ($rem == 0)
-    {
-    splice (@$x,0,$src);		# even faster, 38.4 => 39.3
+    # shortcut (faster) for shifting by 10)
+    # multiples of $BASE_LEN
+    my $dst = 0;                                            # destination
+    my $src = _num($c, $y);                                 # as normal int
+    my $xlen = (@$x - 1) * $BASE_LEN + length(int($x->[-1]));
+    if ($src >= $xlen or ($src == $xlen and !defined $x->[1])) {
+        # 12345 67890 shifted right by more than 10 digits => 0
+        splice(@$x, 1);                 # leave only one element
+        $x->[0] = 0;                    # set to zero
+        return $x;
     }
-  else
-    {
-    my $len = scalar @$x - $src;	# elems to go
-    my $vd; my $z = '0'x $BASE_LEN;
-    $x->[scalar @$x] = 0;		# avoid || 0 test inside loop
-    while ($dst < $len)
-      {
-      $vd = $z.$x->[$src];
-      $vd = substr($vd,-$BASE_LEN,$BASE_LEN-$rem);
-      $src++;
-      $vd = substr($z.$x->[$src],-$rem,$rem) . $vd;
-      $vd = substr($vd,-$BASE_LEN,$BASE_LEN) if length($vd) > $BASE_LEN;
-      $x->[$dst] = int($vd);
-      $dst++;
-      }
-    splice (@$x,$dst) if $dst > 0;		# kill left-over array elems
-    pop @$x if $x->[-1] == 0 && @$x > 1;	# kill last element if 0
-    } # else rem == 0
-  $x;
-  }
+    my $rem = $src % $BASE_LEN;         # remainder to shift
+    $src = int($src / $BASE_LEN);       # source
+    if ($rem == 0) {
+        splice(@$x, 0, $src);           # even faster, 38.4 => 39.3
+    } else {
+        my $len = @$x - $src;           # elems to go
+        my $vd;
+        my $z = '0' x $BASE_LEN;
+        $x->[@$x] = 0;                  # avoid || 0 test inside loop
+        while ($dst < $len) {
+            $vd = $z . $x->[$src];
+            $vd = substr($vd, -$BASE_LEN, $BASE_LEN - $rem);
+            $src++;
+            $vd = substr($z . $x->[$src], -$rem, $rem) . $vd;
+            $vd = substr($vd, -$BASE_LEN, $BASE_LEN) if length($vd) > $BASE_LEN;
+            $x->[$dst] = int($vd);
+            $dst++;
+        }
+        splice(@$x, $dst) if $dst > 0;          # kill left-over array elems
+        pop @$x if $x->[-1] == 0 && @$x > 1;    # kill last element if 0
+    }                                           # else rem == 0
+    $x;
+}
 
-sub _lsft
-  {
-  my ($c,$x,$y,$n) = @_;
-
-  if ($n != 10)
-    {
-    $n = _new($c,$n); return _mul($c,$x, _pow($c,$n,$y));
-    }
-
-  # shortcut (faster) for shifting by 10) since we are in base 10eX
-  # multiples of $BASE_LEN:
-  my $src = scalar @$x;			# source
-  my $len = _num($c,$y);		# shift-len as normal int
-  my $rem = $len % $BASE_LEN;		# remainder to shift
-  my $dst = $src + int($len/$BASE_LEN);	# destination
-  my $vd;				# further speedup
-  $x->[$src] = 0;			# avoid first ||0 for speed
-  my $z = '0' x $BASE_LEN;
-  while ($src >= 0)
-    {
-    $vd = $x->[$src]; $vd = $z.$vd;
-    $vd = substr($vd,-$BASE_LEN+$rem,$BASE_LEN-$rem);
-    $vd .= $src > 0 ? substr($z.$x->[$src-1],-$BASE_LEN,$rem) : '0' x $rem;
-    $vd = substr($vd,-$BASE_LEN,$BASE_LEN) if length($vd) > $BASE_LEN;
-    $x->[$dst] = int($vd);
-    $dst--; $src--;
-    }
-  # set lowest parts to 0
-  while ($dst >= 0) { $x->[$dst--] = 0; }
-  # fix spurious last zero element
-  splice @$x,-1 if $x->[-1] == 0;
-  $x;
-  }
+sub _lsft {
+    my ($c, $x, $y, $n) = @_;
+
+    if ($n != 10) {
+        $n = _new($c, $n);
+        return _mul($c, $x, _pow($c, $n, $y));
+    }
+
+    # shortcut (faster) for shifting by 10) since we are in base 10eX
+    # multiples of $BASE_LEN:
+    my $src = @$x;                              # source
+    my $len = _num($c, $y);		        # shift-len as normal int
+    my $rem = $len % $BASE_LEN;	        	# remainder to shift
+    my $dst = $src + int($len / $BASE_LEN);     # destination
+    my $vd;                                     # further speedup
+    $x->[$src] = 0;                             # avoid first ||0 for speed
+    my $z = '0' x $BASE_LEN;
+    while ($src >= 0) {
+        $vd = $x->[$src];
+        $vd = $z . $vd;
+        $vd = substr($vd, -$BASE_LEN + $rem, $BASE_LEN - $rem);
+        $vd .= $src > 0 ? substr($z . $x->[$src - 1], -$BASE_LEN, $rem)
+                        : '0' x $rem;
+        $vd = substr($vd, -$BASE_LEN, $BASE_LEN) if length($vd) > $BASE_LEN;
+        $x->[$dst] = int($vd);
+        $dst--;
+        $src--;
+    }
+    # set lowest parts to 0
+    while ($dst >= 0) {
+        $x->[$dst--] = 0;
+    }
+    # fix spurious last zero element
+    splice @$x, -1 if $x->[-1] == 0;
+    $x;
+}
 
-sub _pow
-  {
-  # power of $x to $y
-  # ref to array, ref to array, return ref to array
-  my ($c,$cx,$cy) = @_;
+sub _pow {
+    # power of $x to $y
+    # ref to array, ref to array, return ref to array
+    my ($c, $cx, $cy) = @_;
 
-  if (scalar @$cy == 1 && $cy->[0] == 0)
-    {
-    splice (@$cx,1); $cx->[0] = 1;		# y == 0 => x => 1
-    return $cx;
+    if (@$cy == 1 && $cy->[0] == 0) {
+        splice(@$cx, 1);
+        $cx->[0] = 1;                   # y == 0 => x => 1
+        return $cx;
     }
-  if ((scalar @$cx == 1 && $cx->[0] == 1) ||	#    x == 1
-      (scalar @$cy == 1 && $cy->[0] == 1))	# or y == 1
+
+    if ((@$cx == 1 && $cx->[0] == 1) ||     #    x == 1
+        (@$cy == 1 && $cy->[0] == 1))       # or y == 1
     {
-    return $cx;
+        return $cx;
     }
-  if (scalar @$cx == 1 && $cx->[0] == 0)
-    {
-    splice (@$cx,1); $cx->[0] = 0;		# 0 ** y => 0 (if not y <= 0)
-    return $cx;
+
+    if (@$cx == 1 && $cx->[0] == 0) {
+        splice (@$cx, 1);
+        $cx->[0] = 0;                   # 0 ** y => 0 (if not y <= 0)
+        return $cx;
     }
 
-  my $pow2 = _one();
+    my $pow2 = _one();
 
-  my $y_bin = _as_bin($c,$cy); $y_bin =~ s/^0b//;
-  my $len = length($y_bin);
-  while (--$len > 0)
-    {
-    _mul($c,$pow2,$cx) if substr($y_bin,$len,1) eq '1';		# is odd?
-    _mul($c,$cx,$cx);
+    my $y_bin = _as_bin($c, $cy);
+    $y_bin =~ s/^0b//;
+    my $len = length($y_bin);
+    while (--$len > 0) {
+        _mul($c, $pow2, $cx) if substr($y_bin, $len, 1) eq '1'; # is odd?
+        _mul($c, $cx, $cx);
     }
 
-  _mul($c,$cx,$pow2);
-  $cx;
-  }
+    _mul($c, $cx, $pow2);
+    $cx;
+}
 
 sub _nok {
     # Return binomial coefficient (n over k).
@@ -2293,7 +2273,7 @@ sub _as_oct
     $es .= reverse sprintf("%05o", $xr->[0]);
     }
   $es = reverse $es;
-  $es =~ s/^[0]+//;   # strip leading zeros
+  $es =~ s/^0+//;   # strip leading zeros
   '0' . $es;					# return result prepended with 0
   }
 
diff --git a/Master/tlpkg/tlperl/lib/Math/BigInt/CalcEmu.pm b/Master/tlpkg/tlperl/lib/Math/BigInt/CalcEmu.pm
index 9bf3e07f8a5..8e994ede273 100644
--- a/Master/tlpkg/tlperl/lib/Math/BigInt/CalcEmu.pm
+++ b/Master/tlpkg/tlperl/lib/Math/BigInt/CalcEmu.pm
@@ -1,11 +1,11 @@
 package Math::BigInt::CalcEmu;
 
-use 5.006002;
+use 5.006001;
 use strict;
-# use warnings;	# do not use warnings for older Perls
-use vars qw/$VERSION/;
+use warnings;
 
-$VERSION = '1.9997';
+our $VERSION = '1.999715';
+$VERSION = eval $VERSION;
 
 package Math::BigInt;
 
diff --git a/Master/tlpkg/tlperl/lib/Math/BigInt/FastCalc.pm b/Master/tlpkg/tlperl/lib/Math/BigInt/FastCalc.pm
index 9bf5a60839e..2cc49f41f60 100644
--- a/Master/tlpkg/tlperl/lib/Math/BigInt/FastCalc.pm
+++ b/Master/tlpkg/tlperl/lib/Math/BigInt/FastCalc.pm
@@ -4,11 +4,9 @@ use 5.006;
 use strict;
 use warnings;
 
-use Math::BigInt::Calc 1.997;
+use Math::BigInt::Calc 1.999706;
 
-use vars '$VERSION';
-
-$VERSION = '0.31';
+our $VERSION = '0.40';
 
 ##############################################################################
 # global constants, flags and accessory
@@ -43,7 +41,9 @@ XSLoader::load(__PACKAGE__, $VERSION, Math::BigInt::Calc::_base_len());
 ##############################################################################
 
 1;
+
 __END__
+
 =pod
 
 =head1 NAME
@@ -88,6 +88,65 @@ The following functions are now implemented in FastCalc.xs:
 	_inc		_dec
 	__strip_zeros	_copy
 
+=head1 BUGS
+
+Please report any bugs or feature requests to
+C<bug-math-bigint-fastcalc at rt.cpan.org>, or through the web interface at
+L<https://rt.cpan.org/Ticket/Create.html?Queue=Math-BigInt-FastCalc>
+(requires login).
+We will be notified, and then you'll automatically be notified of progress on
+your bug as I make changes.
+
+=head1 SUPPORT
+
+You can find documentation for this module with the perldoc command.
+
+    perldoc Math::BigInt::FastCalc
+
+You can also look for information at:
+
+=over 4
+
+=item * RT: CPAN's request tracker
+
+L<https://rt.cpan.org/Public/Dist/Display.html?Name=Math-BigInt-FastCalc>
+
+=item * AnnoCPAN: Annotated CPAN documentation
+
+L<http://annocpan.org/dist/Math-BigInt-FastCalc>
+
+=item * CPAN Ratings
+
+L<http://cpanratings.perl.org/dist/Math-BigInt-FastCalc>
+
+=item * Search CPAN
+
+L<http://search.cpan.org/dist/Math-BigInt-FastCalc/>
+
+=item * CPAN Testers Matrix
+
+L<http://matrix.cpantesters.org/?dist=Math-BigInt-FastCalc>
+
+=item * The Bignum mailing list
+
+=over 4
+
+=item * Post to mailing list
+
+C<bignum at lists.scsys.co.uk>
+
+=item * View mailing list
+
+L<http://lists.scsys.co.uk/pipermail/bignum/>
+
+=item * Subscribe/Unsubscribe
+
+L<http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/bignum>
+
+=back
+
+=back
+
 =head1 LICENSE
 
 This program is free software; you may redistribute it and/or modify it under
@@ -102,11 +161,11 @@ Separated from BigInt and shaped API with the help of John Peacock.
 Fixed, sped-up and enhanced by Tels http://bloodgate.com 2001-2003.
 Further streamlining (api_version 1 etc.) by Tels 2004-2007.
 
-Bug-fixing by Peter John Acklam E<lt>pjacklam@online.noE<gt> 2010-2011.
+Bug-fixing by Peter John Acklam E<lt>pjacklam@online.noE<gt> 2010-2015.
 
 =head1 SEE ALSO
 
-L<Math::BigInt>, L<Math::BigFloat>,
-L<Math::BigInt::GMP>, L<Math::BigInt::FastCalc> and L<Math::BigInt::Pari>.
+L<Math::BigInt>, L<Math::BigFloat>, and the other backends
+L<Math::BigInt::Calc>, L<Math::BigInt::GMP>, and L<Math::BigInt::Pari>.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Math/BigInt/Trace.pm b/Master/tlpkg/tlperl/lib/Math/BigInt/Trace.pm
index 79fc0970e47..4e474976e54 100644
--- a/Master/tlpkg/tlperl/lib/Math/BigInt/Trace.pm
+++ b/Master/tlpkg/tlperl/lib/Math/BigInt/Trace.pm
@@ -1,47 +1,48 @@
-#!/usr/bin/perl -w
+#!perl
 
 package Math::BigInt::Trace;
 
-require 5.005_02;
+require 5.006;
 use strict;
+use warnings;
 
 use Exporter;
 use Math::BigInt;
-use vars qw($VERSION @ISA $PACKAGE @EXPORT_OK
-            $accuracy $precision $round_mode $div_scale);
 
-@ISA = qw(Exporter Math::BigInt);
+our ($PACKAGE, @EXPORT_OK, $accuracy, $precision, $round_mode, $div_scale);
 
-$VERSION = '0.36';
+our @ISA = qw(Exporter Math::BigInt);
 
-use overload;	# inherit overload from BigInt
+our $VERSION = '0.42_01';
+
+use overload;                   # inherit overload from BigInt
 
 # Globals
 $accuracy = $precision = undef;
 $round_mode = 'even';
 $div_scale = 40;
 
-sub new
-{
-        my $proto  = shift;
-        my $class  = ref($proto) || $proto;
-
-        my $value       = shift;
-	my $a = $accuracy; $a = $_[0] if defined $_[0];
-	my $p = $precision; $p = $_[1] if defined $_[1];
-        my $self = Math::BigInt->new($value,$a,$p,$round_mode);
-	bless $self,$class;
-	print "MBI new '$value' => '$self' (",ref($self),")";
-        return $self;
+sub new {
+    my $proto = shift;
+    my $class = ref($proto) || $proto;
+
+    my $value = shift;
+    my $a = $accuracy;
+    $a = $_[0] if defined $_[0];
+    my $p = $precision;
+    $p = $_[1] if defined $_[1];
+    my $self = Math::BigInt->new($value, $a, $p, $round_mode);
+    bless $self, $class;
+    print "MBI new '$value' => '$self' (", ref($self), ")";
+    return $self;
 }
 
-sub import
-  {
-  print "MBI import ",join(' ',@_);
-  my $self = shift;
-  Math::BigInt::import($self,@_);		# need it for subclasses
-#  $self->export_to_level(1,$self,@_);		# need this ?
-  @_ = ();
-  }
+sub import {
+    print "MBI import ", join(' ', @_);
+    my $self = shift;
+    Math::BigInt::import($self, @_);            # need it for subclasses
+#    $self->export_to_level(1, $self, @_);       # need this ?
+    @_ = ();
+}
 
 1;
diff --git a/Master/tlpkg/tlperl/lib/Math/BigRat.pm b/Master/tlpkg/tlperl/lib/Math/BigRat.pm
index 7f5b8677b3e..95c2927a864 100644
--- a/Master/tlpkg/tlperl/lib/Math/BigRat.pm
+++ b/Master/tlpkg/tlperl/lib/Math/BigRat.pm
@@ -1,4 +1,3 @@
-
 #
 # "Tax the rat farms." - Lord Vetinari
 #
@@ -16,41 +15,43 @@ package Math::BigRat;
 # anything older is untested, and unlikely to work
 use 5.006;
 use strict;
+use warnings;
+
 use Carp ();
 
 use Math::BigFloat;
-use vars qw($VERSION @ISA $upgrade $downgrade
-            $accuracy $precision $round_mode $div_scale $_trap_nan $_trap_inf);
+
+our ($VERSION, @ISA, $upgrade, $downgrade,
+     $accuracy, $precision, $round_mode, $div_scale, $_trap_nan, $_trap_inf);
 
 @ISA = qw(Math::BigFloat);
 
-$VERSION = '0.2608';
+$VERSION = '0.260802';
 $VERSION = eval $VERSION;
 
-# inherit overload from Math::BigFloat, but disable the bitwise ops that don't
-# make much sense for rationals unless they're truncated or something first
+# Inherit overload from Math::BigFloat, but disable the bitwise ops that don't
+# make much sense for rationals unless they're truncated or something first.
 
 use overload
-    map {
-	my $op = $_;
-	($op => sub {
-	    Carp::croak("bitwise operation $op not supported in Math::BigRat");
-	});
-    } qw(& | ^ ~ << >> &= |= ^= <<= >>=);
-
-BEGIN
-  {
-  *objectify = \&Math::BigInt::objectify; 	# inherit this from BigInt
-  *AUTOLOAD = \&Math::BigFloat::AUTOLOAD;	# can't inherit AUTOLOAD
-  # we inherit these from BigFloat because currently it is not possible
-  # that MBF has a different $MBI variable than we, because MBF also uses
-  # Math::BigInt::config->('lib'); (there is always only one library loaded)
-  *_e_add = \&Math::BigFloat::_e_add;
-  *_e_sub = \&Math::BigFloat::_e_sub;
-  *as_int = \&as_number;
-  *is_pos = \&is_positive;
-  *is_neg = \&is_negative;
-  }
+  map {
+      my $op = $_;
+      ($op => sub {
+           Carp::croak("bitwise operation $op not supported in Math::BigRat");
+       });
+  } qw(& | ^ ~ << >> &= |= ^= <<= >>=);
+
+BEGIN {
+    *objectify = \&Math::BigInt::objectify;  # inherit this from BigInt
+    *AUTOLOAD  = \&Math::BigFloat::AUTOLOAD; # can't inherit AUTOLOAD
+    # We inherit these from BigFloat because currently it is not possible
+    # that MBF has a different $MBI variable than we, because MBF also uses
+    # Math::BigInt::config->('lib'); (there is always only one library loaded)
+    *_e_add = \&Math::BigFloat::_e_add;
+    *_e_sub = \&Math::BigFloat::_e_sub;
+    *as_int = \&as_number;
+    *is_pos = \&is_positive;
+    *is_neg = \&is_negative;
+}
 
 ##############################################################################
 # Global constants and flags. Access these only via the accessor methods!
@@ -70,17 +71,22 @@ $_trap_inf = 0;                         # are infs ok? set w/ config()
 # Math::BigInt->config()->{lib}
 my $MBI = 'Math::BigInt::Calc';
 
-my $nan = 'NaN';
+my $nan   = 'NaN';
 my $class = 'Math::BigRat';
 
-sub isa
-  {
-  return 0 if $_[1] =~ /^Math::Big(Int|Float)/;		# we aren't
-  UNIVERSAL::isa(@_);
-  }
+sub isa {
+    return 0 if $_[1] =~ /^Math::Big(Int|Float)/; # we aren't
+    UNIVERSAL::isa(@_);
+}
 
 ##############################################################################
 
+# If $x is a Math::BigRat object and $f is a Math::BigFloat object, then
+#
+#   $x -> _new_from_float($f)
+#
+# converts $x into a Math::BigRat with the value of $f.
+
 sub _new_from_float
   {
   # turn a single float input into a rational number (like '0.1')
@@ -89,258 +95,262 @@ sub _new_from_float
   return $self->bnan() if $f->is_nan();
   return $self->binf($f->{sign}) if $f->{sign} =~ /^[+-]inf$/;
 
-  $self->{_n} = $MBI->_copy( $f->{_m} );	# mantissa
+  $self->{_n} = $MBI->_copy($f->{_m});	# mantissa
   $self->{_d} = $MBI->_one();
   $self->{sign} = $f->{sign} || '+';
   if ($f->{_es} eq '-')
     {
     # something like Math::BigRat->new('0.1');
     # 1 / 1 => 1/10
-    $MBI->_lsft ( $self->{_d}, $f->{_e} ,10);
+    $MBI->_lsft($self->{_d}, $f->{_e} ,10);
     }
   else
     {
     # something like Math::BigRat->new('10');
     # 1 / 1 => 10/1
-    $MBI->_lsft ( $self->{_n}, $f->{_e} ,10) unless
+    $MBI->_lsft($self->{_n}, $f->{_e} ,10) unless
       $MBI->_is_zero($f->{_e});
     }
-  $self;
+  return $self -> bnorm();
   }
 
-sub new
-  {
-  # create a Math::BigRat
-  my $class = shift;
+# If $x is a Math::BigRat object and $i is a Math::BigInt object, then
+#
+#   $x -> _new_from_int($i)
+#
+# converts $x into a Math::BigRat with the value of $i.
 
-  my ($n,$d) = @_;
+sub _new_from_int {
+    my ($self, $i) = @_;
 
-  my $self = { }; bless $self,$class;
+    return $self -> bnan()             if $i -> is_nan();
+    return $self -> binf($i -> sign()) if $i -> is_inf();
 
-  # input like (BigInt) or (BigFloat):
-  if ((!defined $d) && (ref $n) && (!$n->isa('Math::BigRat')))
-    {
-    if ($n->isa('Math::BigFloat'))
-      {
-      $self->_new_from_float($n);
-      }
-    if ($n->isa('Math::BigInt'))
-      {
-      # TODO: trap NaN, inf
-      $self->{_n} = $MBI->_copy($n->{value});		# "mantissa" = N
-      $self->{_d} = $MBI->_one();			# d => 1
-      $self->{sign} = $n->{sign};
-      }
-    if ($n->isa('Math::BigInt::Lite'))
-      {
-      # TODO: trap NaN, inf
-      $self->{sign} = '+'; $self->{sign} = '-' if $$n < 0;
-      $self->{_n} = $MBI->_new(abs($$n));		# "mantissa" = N
-      $self->{_d} = $MBI->_one();			# d => 1
-      }
-    return $self->bnorm();				# normalize (120/1 => 12/10)
-    }
+    $self -> {_n}   = $MBI -> _copy($i -> {value});
+    $self -> {_d}   = $MBI -> _one();
+    $self -> {sign} = $i -> {sign};
+    return $self;
+}
 
-  # input like (BigInt,BigInt) or (BigLite,BigLite):
-  if (ref($d) && ref($n))
-    {
-    # do N first (for $self->{sign}):
-    if ($n->isa('Math::BigInt'))
-      {
-      # TODO: trap NaN, inf
-      $self->{_n} = $MBI->_copy($n->{value});		# "mantissa" = N
-      $self->{sign} = $n->{sign};
-      }
-    elsif ($n->isa('Math::BigInt::Lite'))
-      {
-      # TODO: trap NaN, inf
-      $self->{sign} = '+'; $self->{sign} = '-' if $$n < 0;
-      $self->{_n} = $MBI->_new(abs($$n));		# "mantissa" = $n
-      }
-    else
-      {
-      require Carp;
-      Carp::croak(ref($n) . " is not a recognized object format for Math::BigRat->new");
-      }
-    # now D:
-    if ($d->isa('Math::BigInt'))
-      {
-      # TODO: trap NaN, inf
-      $self->{_d} = $MBI->_copy($d->{value});		# "mantissa" = D
-      # +/+ or -/- => +, +/- or -/+ => -
-      $self->{sign} = $d->{sign} ne $self->{sign} ? '-' : '+';
-      }
-    elsif ($d->isa('Math::BigInt::Lite'))
-      {
-      # TODO: trap NaN, inf
-      $self->{_d} = $MBI->_new(abs($$d));		# "mantissa" = D
-      my $ds = '+'; $ds = '-' if $$d < 0;
-      # +/+ or -/- => +, +/- or -/+ => -
-      $self->{sign} = $ds ne $self->{sign} ? '-' : '+';
-      }
-    else
-      {
-      require Carp;
-      Carp::croak(ref($d) . " is not a recognized object format for Math::BigRat->new");
-      }
-    return $self->bnorm();				# normalize (120/1 => 12/10)
-    }
-  return $n->copy() if ref $n;				# already a BigRat
+sub new {
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
 
-  if (!defined $n)
-    {
-    $self->{_n} = $MBI->_zero();			# undef => 0
-    $self->{_d} = $MBI->_one();
-    $self->{sign} = '+';
-    return $self;
-    }
+    # Get numerator and denominator.
 
-  # string input with / delimiter
-  if ($n =~ /\s*\/\s*/)
-    {
-    return $class->bnan() if $n =~ /\/.*\//;	# 1/2/3 isn't valid
-    return $class->bnan() if $n =~ /\/\s*$/;	# 1/ isn't valid
-    ($n,$d) = split (/\//,$n);
-    # try as BigFloats first
-    if (($n =~ /[\.eE]/) || ($d =~ /[\.eE]/))
-      {
-      local $Math::BigFloat::accuracy = undef;
-      local $Math::BigFloat::precision = undef;
-
-      # one of them looks like a float
-      my $nf = Math::BigFloat->new($n,undef,undef);
-      $self->{sign} = '+';
-      return $self->bnan() if $nf->is_nan();
-
-      $self->{_n} = $MBI->_copy( $nf->{_m} );	# get mantissa
-
-      # now correct $self->{_n} due to $n
-      my $f = Math::BigFloat->new($d,undef,undef);
-      return $self->bnan() if $f->is_nan();
-      $self->{_d} = $MBI->_copy( $f->{_m} );
-
-      # calculate the difference between nE and dE
-      my $diff_e = $nf->exponent()->bsub( $f->exponent);
-      if ($diff_e->is_negative())
-	{
-        # < 0: mul d with it
-        $MBI->_lsft( $self->{_d}, $MBI->_new( $diff_e->babs()), 10);
-	}
-      elsif (!$diff_e->is_zero())
-        {
-        # > 0: mul n with it
-        $MBI->_lsft( $self->{_n}, $MBI->_new( $diff_e), 10);
+    my ($n, $d) = @_;
+
+    # If called as a class method, initialize a new object.
+
+    $self = bless {}, $class unless $selfref;
+
+    # Input like $class->new($n), where there is no denominator, and where $n
+    # is a Math::BigInt or Math::BigFloat.
+
+    if ((!defined $d) && (ref $n) && (!$n->isa('Math::BigRat'))) {
+        if ($n->isa('Math::BigFloat')) {
+            $self->_new_from_float($n);
         }
-      }
-    else
-      {
-      # both d and n look like (big)ints
-
-      $self->{sign} = '+';					# no sign => '+'
-      $self->{_n} = undef;
-      $self->{_d} = undef;
-      if ($n =~ /^([+-]?)0*([0-9]+)\z/)				# first part ok?
-	{
-	$self->{sign} = $1 || '+';				# no sign => '+'
-	$self->{_n} = $MBI->_new($2 || 0);
+        elsif ($n->isa('Math::BigInt')) {
+            # TODO: trap NaN, inf
+            $self->{_n} = $MBI->_copy($n->{value}); # "mantissa" = N
+            $self->{_d} = $MBI->_one();             # d => 1
+            $self->{sign} = $n->{sign};
         }
+        elsif ($n->isa('Math::BigInt::Lite')) {
+            # TODO: trap NaN, inf
+            $self->{sign} = '+';
+            $self->{sign} = '-' if $$n < 0;
+            $self->{_n} = $MBI->_new(abs($$n)); # "mantissa" = N
+            $self->{_d} = $MBI->_one();         # d => 1
+        }
+        return $self->bnorm();  # normalize (120/100 => 6/5)
+    }
 
-      if ($d =~ /^([+-]?)0*([0-9]+)\z/)				# second part ok?
-	{
-	$self->{sign} =~ tr/+-/-+/ if ($1 || '') eq '-';	# negate if second part neg.
-	$self->{_d} = $MBI->_new($2 || 0);
+    # Input like $class->new($n, $d) where $n and $d both are Math::BigInt
+    # objects or Math::BigInt::Lite objects.
+    if (ref($d) && ref($n)) {
+
+        # do N first (for $self->{sign}):
+        if ($n->isa('Math::BigInt')) {
+            # TODO: trap NaN, inf
+            $self->{_n} = $MBI->_copy($n->{value}); # "mantissa" = N
+            $self->{sign} = $n->{sign};
+        }
+        elsif ($n->isa('Math::BigInt::Lite')) {
+            # TODO: trap NaN, inf
+            $self->{sign} = '+';
+            $self->{sign} = '-' if $$n < 0;
+            $self->{_n} = $MBI->_new(abs($$n)); # "mantissa" = $n
+        }
+        else {
+            Carp::croak(ref($n) . " is not a recognized object format for"
+                        . " Math::BigRat->new");
         }
 
-      if (!defined $self->{_n} || !defined $self->{_d})
-	{
-        $d = Math::BigInt->new($d,undef,undef) unless ref $d;
-        $n = Math::BigInt->new($n,undef,undef) unless ref $n;
-
-        if ($n->{sign} =~ /^[+-]$/ && $d->{sign} =~ /^[+-]$/)
-	  {
-	  # both parts are ok as integers (weird things like ' 1e0'
-          $self->{_n} = $MBI->_copy($n->{value});
-          $self->{_d} = $MBI->_copy($d->{value});
-          $self->{sign} = $n->{sign};
-          $self->{sign} =~ tr/+-/-+/ if $d->{sign} eq '-';	# -1/-2 => 1/2
-          return $self->bnorm();
-	  }
-
-        $self->{sign} = '+';					# a default sign
-        return $self->bnan() if $n->is_nan() || $d->is_nan();
-
-	# handle inf cases:
-        if ($n->is_inf() || $d->is_inf())
-	  {
-	  if ($n->is_inf())
-	    {
-	    return $self->bnan() if $d->is_inf();		# both are inf => NaN
-	    my $s = '+'; 		# '+inf/+123' or '-inf/-123'
-	    $s = '-' if substr($n->{sign},0,1) ne $d->{sign};
-	    # +-inf/123 => +-inf
-	    return $self->binf($s);
-	    }
-          # 123/inf => 0
-          return $self->bzero();
-	  }
-	}
-      }
+        # now D:
+        if ($d->isa('Math::BigInt')) {
+            # TODO: trap NaN, inf
+            $self->{_d} = $MBI->_copy($d->{value}); # "mantissa" = D
+            # +/+ or -/- => +, +/- or -/+ => -
+            $self->{sign} = $d->{sign} ne $self->{sign} ? '-' : '+';
+        } elsif ($d->isa('Math::BigInt::Lite')) {
+            # TODO: trap NaN, inf
+            $self->{_d} = $MBI->_new(abs($$d)); # "mantissa" = D
+            my $ds = '+';
+            $ds = '-' if $$d < 0;
+            # +/+ or -/- => +, +/- or -/+ => -
+            $self->{sign} = $ds ne $self->{sign} ? '-' : '+';
+        } else {
+            Carp::croak(ref($d) . " is not a recognized object format for"
+                        . " Math::BigRat->new");
+        }
 
-    return $self->bnorm();
+        return $self->bnorm();  # normalize (120/100 => 6/5)
     }
 
-  # simple string input
-  if (($n =~ /[\.eE]/) && $n !~ /^0x/)
-    {
-    # looks like a float, quacks like a float, so probably is a float
-    $self->{sign} = 'NaN';
-    local $Math::BigFloat::accuracy = undef;
-    local $Math::BigFloat::precision = undef;
-    $self->_new_from_float(Math::BigFloat->new($n,undef,undef));
+    return $n->copy() if ref $n; # already a BigRat
+
+    if (!defined $n) {
+        $self->{_n} = $MBI->_zero(); # undef => 0
+        $self->{_d} = $MBI->_one();
+        $self->{sign} = '+';
+        return $self;
     }
-  else
-    {
-    # for simple forms, use $MBI directly
-    if ($n =~ /^([+-]?)0*([0-9]+)\z/)
-      {
-      $self->{sign} = $1 || '+';
-      $self->{_n} = $MBI->_new($2 || 0);
-      $self->{_d} = $MBI->_one();
-      }
-    else
-      {
-      my $n = Math::BigInt->new($n,undef,undef);
-      $self->{_n} = $MBI->_copy($n->{value});
-      $self->{_d} = $MBI->_one();
-      $self->{sign} = $n->{sign};
-      return $self->bnan() if $self->{sign} eq 'NaN';
-      return $self->binf($self->{sign}) if $self->{sign} =~ /^[+-]inf$/;
-      }
+
+    # string input with / delimiter
+    if ($n =~ m|\s*/\s*|) {
+        return $class->bnan() if $n =~ m|/.*/|; # 1/2/3 isn't valid
+        return $class->bnan() if $n =~ m|/\s*$|; # 1/ isn't valid
+        ($n, $d) = split (/\//, $n);
+        # try as BigFloats first
+        if (($n =~ /[\.eE]/) || ($d =~ /[\.eE]/)) {
+            local $Math::BigFloat::accuracy = undef;
+            local $Math::BigFloat::precision = undef;
+
+            # one of them looks like a float
+            my $nf = Math::BigFloat->new($n, undef, undef);
+            $self->{sign} = '+';
+            return $self->bnan() if $nf->is_nan();
+
+            $self->{_n} = $MBI->_copy($nf->{_m}); # get mantissa
+
+            # now correct $self->{_n} due to $n
+            my $f = Math::BigFloat->new($d, undef, undef);
+            return $self->bnan() if $f->is_nan();
+            $self->{_d} = $MBI->_copy($f->{_m});
+
+            # calculate the difference between nE and dE
+            my $diff_e = $nf->exponent()->bsub($f->exponent);
+            if ($diff_e->is_negative()) {
+                # < 0: mul d with it
+                $MBI->_lsft($self->{_d}, $MBI->_new($diff_e->babs()), 10);
+            } elsif (!$diff_e->is_zero()) {
+                # > 0: mul n with it
+                $MBI->_lsft($self->{_n}, $MBI->_new($diff_e), 10);
+            }
+        } else {
+            # both d and n look like (big)ints
+
+            $self->{sign} = '+'; # no sign => '+'
+            $self->{_n} = undef;
+            $self->{_d} = undef;
+            if ($n =~ /^([+-]?)0*([0-9]+)\z/) { # first part ok?
+                $self->{sign} = $1 || '+'; # no sign => '+'
+                $self->{_n} = $MBI->_new($2 || 0);
+            }
+
+            if ($d =~ /^([+-]?)0*([0-9]+)\z/) { # second part ok?
+                $self->{sign} =~ tr/+-/-+/ if ($1 || '') eq '-'; # negate if second part neg.
+                $self->{_d} = $MBI->_new($2 || 0);
+            }
+
+            if (!defined $self->{_n} || !defined $self->{_d}) {
+                $d = Math::BigInt->new($d, undef, undef) unless ref $d;
+                $n = Math::BigInt->new($n, undef, undef) unless ref $n;
+
+                if ($n->{sign} =~ /^[+-]$/ && $d->{sign} =~ /^[+-]$/) {
+                    # both parts are ok as integers (weird things like ' 1e0'
+                    $self->{_n} = $MBI->_copy($n->{value});
+                    $self->{_d} = $MBI->_copy($d->{value});
+                    $self->{sign} = $n->{sign};
+                    $self->{sign} =~ tr/+-/-+/ if $d->{sign} eq '-'; # -1/-2 => 1/2
+                    return $self->bnorm();
+                }
+
+                $self->{sign} = '+'; # a default sign
+                return $self->bnan() if $n->is_nan() || $d->is_nan();
+
+                # handle inf cases:
+                if ($n->is_inf() || $d->is_inf()) {
+                    if ($n->is_inf()) {
+                        return $self->bnan() if $d->is_inf(); # both are inf => NaN
+                        my $s = '+'; # '+inf/+123' or '-inf/-123'
+                        $s = '-' if substr($n->{sign}, 0, 1) ne $d->{sign};
+                        # +-inf/123 => +-inf
+                        return $self->binf($s);
+                    }
+                    # 123/inf => 0
+                    return $self->bzero();
+                }
+            }
+        }
+
+        return $self->bnorm();
     }
-  $self->bnorm();
-  }
 
-sub copy
-  {
-  # if two arguments, the first one is the class to "swallow" subclasses
-  my ($c,$x) = @_;
+    # simple string input
+    if (($n =~ /[\.eE]/) && $n !~ /^0x/) {
+        # looks like a float, quacks like a float, so probably is a float
+        $self->{sign} = 'NaN';
+        local $Math::BigFloat::accuracy = undef;
+        local $Math::BigFloat::precision = undef;
+        $self->_new_from_float(Math::BigFloat->new($n, undef, undef));
+    } else {
+        # for simple forms, use $MBI directly
+        if ($n =~ /^([+-]?)0*([0-9]+)\z/) {
+            $self->{sign} = $1 || '+';
+            $self->{_n} = $MBI->_new($2 || 0);
+            $self->{_d} = $MBI->_one();
+        }
+        elsif ($n =~ /^\s*([+-]?)inf(inity)?\s*\z/i) {
+            my $sgn = $1 || '+';
+            $self->{sign} = $sgn . 'inf';   # set a default sign for bstr()
+            $self->binf($sgn);
+        }
 
-  if (scalar @_ == 1)
-    {
-    $x = $_[0];
-    $c = ref($x);
+        else {
+            my $n = Math::BigInt->new($n, undef, undef);
+            $self->{_n} = $MBI->_copy($n->{value});
+            $self->{_d} = $MBI->_one();
+            $self->{sign} = $n->{sign};
+            return $self->bnan() if $self->{sign} eq 'NaN';
+        }
     }
-  return unless ref($x); # only for objects
 
-  my $self = bless {}, $c;
+    $self->bnorm();
+}
 
-  $self->{sign} = $x->{sign};
-  $self->{_d} = $MBI->_copy($x->{_d});
-  $self->{_n} = $MBI->_copy($x->{_n});
-  $self->{_a} = $x->{_a} if defined $x->{_a};
-  $self->{_p} = $x->{_p} if defined $x->{_p};
-  $self;
-  }
+sub copy {
+    my $self    = shift;
+    my $selfref = ref $self;
+    my $class   = $selfref || $self;
+
+    # If called as a class method, the object to copy is the next argument.
+
+    $self = shift() unless $selfref;
+
+    my $copy = bless {}, $class;
+
+    $copy->{sign} = $self->{sign};
+    $copy->{_d} = $MBI->_copy($self->{_d});
+    $copy->{_n} = $MBI->_copy($self->{_n});
+    $copy->{_a} = $self->{_a} if defined $self->{_a};
+    $copy->{_p} = $self->{_p} if defined $self->{_p};
+
+    $copy;
+}
 
 ##############################################################################
 
@@ -401,15 +411,13 @@ sub bnorm
   my ($self,$x) = ref($_[0]) ? (undef,$_[0]) : objectify(1,@_);
 
   # Both parts must be objects of whatever we are using today.
-  if ( my $c = $MBI->_check($x->{_n}) )
+  if (my $c = $MBI->_check($x->{_n}))
     {
-    require Carp; Carp::croak(
-        "n did not pass the self-check ($c) in bnorm()");
+        Carp::croak("n did not pass the self-check ($c) in bnorm()");
     }
-  if ( my $c = $MBI->_check($x->{_d}) )
+  if (my $c = $MBI->_check($x->{_d}))
     {
-    require Carp; Carp::croak(
-        "d did not pass the self-check ($c) in bnorm()");
+        Carp::croak("d did not pass the self-check ($c) in bnorm()");
     }
 
   # no normalize for NaN, inf etc.
@@ -464,7 +472,6 @@ sub _bnan
 
   if ($_trap_nan)
     {
-    require Carp;
     my $class = ref($self);
     # "$self" below will stringify the object, this blows up if $self is a
     # partial object (happens under trap_nan), so fix it beforehand
@@ -483,7 +490,6 @@ sub _binf
 
   if ($_trap_inf)
     {
-    require Carp;
     my $class = ref($self);
     # "$self" below will stringify the object, this blows up if $self is a
     # partial object (happens under trap_nan), so fix it beforehand
@@ -545,16 +551,16 @@ sub badd
   # and bnorm() will then take care of the rest
 
   # 5 * 3
-  $x->{_n} = $MBI->_mul( $x->{_n}, $y->{_d});
+  $x->{_n} = $MBI->_mul($x->{_n}, $y->{_d});
 
   # 7 * 4
-  my $m = $MBI->_mul( $MBI->_copy( $y->{_n} ), $x->{_d} );
+  my $m = $MBI->_mul($MBI->_copy($y->{_n}), $x->{_d});
 
   # 5 * 3 + 7 * 4
-  ($x->{_n}, $x->{sign}) = _e_add( $x->{_n}, $m, $x->{sign}, $y->{sign});
+  ($x->{_n}, $x->{sign}) = _e_add($x->{_n}, $m, $x->{sign}, $y->{sign});
 
   # 4 * 3
-  $x->{_d} = $MBI->_mul( $x->{_d}, $y->{_d});
+  $x->{_d} = $MBI->_mul($x->{_d}, $y->{_d});
 
   # normalize result, and possible round
   $x->bnorm()->round(@r);
@@ -618,8 +624,8 @@ sub bmul
   #  - * - =  -----  = -  = -
   #  4   3    4 * 3    12   6
 
-  $x->{_n} = $MBI->_mul( $x->{_n}, $y->{_n});
-  $x->{_d} = $MBI->_mul( $x->{_d}, $y->{_d});
+  $x->{_n} = $MBI->_mul($x->{_n}, $y->{_n});
+  $x->{_d} = $MBI->_mul($x->{_d}, $y->{_d});
 
   # compute new sign
   $x->{sign} = $x->{sign} eq $y->{sign} ? '+' : '-';
@@ -640,10 +646,81 @@ sub bdiv
     ($self,$x,$y,@r) = objectify(2,@_);
     }
 
-  return $self->_div_inf($x,$y)
-   if (($x->{sign} !~ /^[+-]$/) || ($y->{sign} !~ /^[+-]$/) || $y->is_zero());
+  return $x if $x->modify('bdiv');
 
-  # x== 0 # also: or y == 1 or y == -1
+    my $wantarray = wantarray;          # call only once
+
+    # At least one argument is NaN. This is handled the same way as in
+    # Math::BigInt -> bdiv(). See the comments in the code implementing that
+    # method.
+
+    if ($x -> is_nan() || $y -> is_nan()) {
+        return $wantarray ? ($x -> bnan(), $self -> bnan()) : $x -> bnan();
+    }
+
+    # Divide by zero and modulo zero. This is handled the same way as in
+    # Math::BigInt -> bdiv(). See the comments in the code implementing that
+    # method.
+
+    if ($y -> is_zero()) {
+        my ($quo, $rem);
+        if ($wantarray) {
+            $rem = $x -> copy();
+        }
+        if ($x -> is_zero()) {
+            $quo = $x -> bnan();
+        } else {
+            $quo = $x -> binf($x -> {sign});
+        }
+        return $wantarray ? ($quo, $rem) : $quo;
+    }
+
+    # Numerator (dividend) is +/-inf. This is handled the same way as in
+    # Math::BigInt -> bdiv(). See the comments in the code implementing that
+    # method.
+
+    if ($x -> is_inf()) {
+        my ($quo, $rem);
+        $rem = $self -> bnan() if $wantarray;
+        if ($y -> is_inf()) {
+            $quo = $x -> bnan();
+        } else {
+            my $sign = $x -> bcmp(0) == $y -> bcmp(0) ? '+' : '-';
+            $quo = $x -> binf($sign);
+        }
+        return $wantarray ? ($quo, $rem) : $quo;
+    }
+
+  # Denominator (divisor) is +/-inf. This is handled the same way as in
+  # Math::BigFloat -> bdiv(). See the comments in the code implementing that
+  # method.
+
+  if ($y -> is_inf()) {
+      my ($quo, $rem);
+      if ($wantarray) {
+          if ($x -> is_zero() || $x -> bcmp(0) == $y -> bcmp(0)) {
+              $rem = $x -> copy();
+              $quo = $x -> bzero();
+          } else {
+              $rem = $self -> binf($y -> {sign});
+              $quo = $x -> bone('-');
+          }
+          return ($quo, $rem);
+      } else {
+          if ($y -> is_inf()) {
+              if ($x -> is_nan() || $x -> is_inf()) {
+                  return $x -> bnan();
+              } else {
+                  return $x -> bzero();
+              }
+          }
+      }
+  }
+
+  # At this point, both the numerator and denominator are finite numbers, and
+  # the denominator (divisor) is non-zero.
+
+  # x == 0?
   return wantarray ? ($x,$self->bzero()) : $x if $x->is_zero();
 
   # XXX TODO: list context, upgrade
@@ -654,14 +731,23 @@ sub bdiv
   # -  /  - == - * -
   # 4     3    4   1
 
-  $x->{_n} = $MBI->_mul( $x->{_n}, $y->{_d});
-  $x->{_d} = $MBI->_mul( $x->{_d}, $y->{_n});
+  $x->{_n} = $MBI->_mul($x->{_n}, $y->{_d});
+  $x->{_d} = $MBI->_mul($x->{_d}, $y->{_n});
 
   # compute new sign
   $x->{sign} = $x->{sign} eq $y->{sign} ? '+' : '-';
 
-  $x->bnorm()->round(@r);
-  $x;
+  $x -> bnorm();
+  if (wantarray) {
+      my $rem = $x -> copy();
+      $x -> bfloor();
+      $x -> round(@r);
+      $rem -> bsub($x -> copy()) -> bmul($y);
+      return $x, $rem;
+  } else {
+      $x -> round(@r);
+      return $x;
+  }
   }
 
 sub bmod
@@ -676,35 +762,49 @@ sub bmod
     ($self,$x,$y,@r) = objectify(2,@_);
     }
 
-  return $self->_div_inf($x,$y)
-   if (($x->{sign} !~ /^[+-]$/) || ($y->{sign} !~ /^[+-]$/) || $y->is_zero());
+  return $x if $x->modify('bmod');
 
-  return $x if $x->is_zero();           # 0 / 7 = 0, mod 0
+    # At least one argument is NaN. This is handled the same way as in
+    # Math::BigInt -> bmod().
 
-  # compute $x - $y * floor($x/$y), keeping the sign of $x
+    if ($x -> is_nan() || $y -> is_nan()) {
+        return $x -> bnan();
+    }
 
-  # copy x to u, make it positive and then do a normal division ($u/$y)
-  my $u = bless { sign => '+' }, $self;
-  $u->{_n} = $MBI->_mul( $MBI->_copy($x->{_n}), $y->{_d} );
-  $u->{_d} = $MBI->_mul( $MBI->_copy($x->{_d}), $y->{_n} );
+    # Modulo zero. This is handled the same way as in Math::BigInt -> bmod().
 
-  # compute floor(u)
-  if (! $MBI->_is_one($u->{_d}))
-    {
-    $u->{_n} = $MBI->_div($u->{_n},$u->{_d});	# 22/7 => 3/1 w/ truncate
-    # no need to set $u->{_d} to 1, since below we set it to $y->{_d} anyway
+    if ($y -> is_zero()) {
+        return $x;
     }
 
-  # now compute $y * $u
-  $u->{_d} = $MBI->_copy($y->{_d});		# 1 * $y->{_d}, see floor above
-  $u->{_n} = $MBI->_mul($u->{_n},$y->{_n});
+    # Numerator (dividend) is +/-inf. This is handled the same way as in
+    # Math::BigInt -> bmod().
 
-  my $xsign = $x->{sign}; $x->{sign} = '+';	# remember sign and make x positive
-  # compute $x - $u
-  $x->bsub($u);
-  $x->{sign} = $xsign;				# put sign back
+    if ($x -> is_inf()) {
+        return $x -> bnan();
+    }
 
-  $x->bnorm()->round(@r);
+    # Denominator (divisor) is +/-inf. This is handled the same way as in
+    # Math::BigInt -> bmod().
+
+    if ($y -> is_inf()) {
+        if ($x -> is_zero() || $x -> bcmp(0) == $y -> bcmp(0)) {
+            return $x;
+        } else {
+            return $x -> binf($y -> sign());
+        }
+    }
+
+  # At this point, both the numerator and denominator are finite numbers, and
+  # the denominator (divisor) is non-zero.
+
+  return $x if $x->is_zero();           # 0 / 7 = 0, mod 0
+
+  # Compute $x - $y * floor($x/$y). This can probably be optimized by working
+  # on a lower level.
+
+  $x -> bsub($x -> copy() -> bdiv($y) -> bfloor() -> bmul($y));
+  return $x -> round(@r);
   }
 
 ##############################################################################
@@ -719,14 +819,14 @@ sub bdec
 
   if ($x->{sign} eq '-')
     {
-    $x->{_n} = $MBI->_add( $x->{_n}, $x->{_d});		# -5/2 => -7/2
+    $x->{_n} = $MBI->_add($x->{_n}, $x->{_d});		# -5/2 => -7/2
     }
   else
     {
     if ($MBI->_acmp($x->{_n},$x->{_d}) < 0)		# n < d?
       {
       # 1/3 -- => -2/3
-      $x->{_n} = $MBI->_sub( $MBI->_copy($x->{_d}), $x->{_n});
+      $x->{_n} = $MBI->_sub($MBI->_copy($x->{_d}), $x->{_n});
       $x->{sign} = '-';
       }
     else
@@ -749,7 +849,7 @@ sub binc
     if ($MBI->_acmp($x->{_n},$x->{_d}) < 0)
       {
       # -1/3 ++ => 2/3 (overflow at 0)
-      $x->{_n} = $MBI->_sub( $MBI->_copy($x->{_d}), $x->{_n});
+      $x->{_n} = $MBI->_sub($MBI->_copy($x->{_d}), $x->{_n});
       $x->{sign} = '+';
       }
     else
@@ -854,9 +954,9 @@ sub parts
   return ($c->binf(),$c->binf()) if $x->{sign} eq '+inf';
   return ($c->binf('-'),$c->binf()) if $x->{sign} eq '-inf';
 
-  my $n = $c->new( $MBI->_str($x->{_n}));
+  my $n = $c->new($MBI->_str($x->{_n}));
   $n->{sign} = $x->{sign};
-  my $d = $c->new( $MBI->_str($x->{_d}));
+  my $d = $c->new($MBI->_str($x->{_d}));
   ($n,$d);
   }
 
@@ -1003,36 +1103,71 @@ sub bpow
   # a/b       =  -\/  (a/b) ** d
 
   # (a/b) ** n == (a ** n) / (b ** n)
-  $MBI->_pow($x->{_n}, $y->{_n} );
-  $MBI->_pow($x->{_d}, $y->{_n} );
+  $MBI->_pow($x->{_n}, $y->{_n});
+  $MBI->_pow($x->{_d}, $y->{_n});
 
   return $x->broot($MBI->_str($y->{_d}),@r);		# n/d => root(n)
   }
 
 sub blog
   {
+  # Return the logarithm of the operand. If a second operand is defined, that
+  # value is used as the base, otherwise the base is assumed to be Euler's
+  # constant.
+
+  # Don't objectify the base, since an undefined base, as in $x->blog() or
+  # $x->blog(undef) signals that the base is Euler's number.
+
   # set up parameters
-  my ($self,$x,$y,@r) = (ref($_[0]),@_);
+  my ($self,$x,$base,@r) = (ref($_[0]),@_);
 
   # objectify is costly, so avoid it
   if ((!ref($_[0])) || (ref($_[0]) ne ref($_[1])))
     {
-    ($self,$x,$y,@r) = objectify(2,$class,@_);
+    ($self,$x,$base,@r) = objectify(1,$class,@_);
     }
 
-  # blog(1,Y) => 0
-  return $x->bzero() if $x->is_one() && $y->{sign} eq '+';
+  return $x if $x->modify('blog');
 
-  # $x <= 0 => NaN
-  return $x->bnan() if $x->is_zero() || $x->{sign} ne '+' || $y->{sign} ne '+';
+  # Handle all exception cases and all trivial cases. I have used Wolfram Alpha
+  # (http://www.wolframalpha.com) as the reference for these cases.
 
-  if ($x->is_int() && $y->is_int())
-    {
-    return $self->new($x->as_number()->blog($y->as_number(),@r));
-    }
+  return $x -> bnan() if $x -> is_nan();
 
-  # do it with floats
-  $x->_new_from_float( $x->_as_float()->blog(Math::BigFloat->new("$y"),@r) );
+  if (defined $base) {
+      $base = $self -> new($base) unless ref $base;
+      if ($base -> is_nan() || $base -> is_one()) {
+          return $x -> bnan();
+      } elsif ($base -> is_inf() || $base -> is_zero()) {
+          return $x -> bnan() if $x -> is_inf() || $x -> is_zero();
+          return $x -> bzero();
+      } elsif ($base -> is_negative()) {            # -inf < base < 0
+          return $x -> bzero() if $x -> is_one();   #     x = 1
+          return $x -> bone()  if $x == $base;      #     x = base
+          return $x -> bnan();                      #     otherwise
+      }
+      return $x -> bone() if $x == $base;           # 0 < base && 0 < x < inf
+  }
+
+  # We now know that the base is either undefined or positive and finite.
+
+  if ($x -> is_inf()) {                 # x = +/-inf
+      my $sign = defined $base && $base < 1 ? '-' : '+';
+      return $x -> binf($sign);
+  } elsif ($x -> is_neg()) {            # -inf < x < 0
+      return $x -> bnan();
+  } elsif ($x -> is_one()) {            # x = 1
+      return $x -> bzero();
+  } elsif ($x -> is_zero()) {           # x = 0
+      my $sign = defined $base && $base < 1 ? '+' : '-';
+      return $x -> binf($sign);
+  }
+
+  # At this point we are done handling all exception cases and trivial cases.
+
+  # Do it with Math::BigFloats and convert back to Math::BigRat.
+  $base = $base -> _as_float() if defined $base;
+  $x -> _new_from_float($x -> _as_float() -> blog($base, @r));
   }
 
 sub bexp
@@ -1158,7 +1293,7 @@ sub bnok
     }
 
   # do it with floats
-  $x->_new_from_float( $x->_as_float()->bnok(Math::BigFloat->new("$y"),@r) );
+  $x->_new_from_float($x->_as_float()->bnok(Math::BigFloat->new("$y"),@r));
   }
 
 sub _float_from_part
@@ -1185,7 +1320,7 @@ sub _as_float
   if ($a != 0 || !$MBI->_is_one($x->{_d}))
     {
     # n/d
-    return scalar Math::BigFloat->new($x->{sign} . $MBI->_str($x->{_n}))->bdiv( $MBI->_str($x->{_d}), $x->accuracy());
+    return scalar Math::BigFloat->new($x->{sign} . $MBI->_str($x->{_n}))->bdiv($MBI->_str($x->{_d}), $x->accuracy());
     }
   # just n
   Math::BigFloat->new($x->{sign} . $MBI->_str($x->{_n}));
@@ -1207,7 +1342,7 @@ sub broot
     }
 
   # do it with floats
-  $x->_new_from_float( $x->_as_float()->broot($y->_as_float(),@r) )->bnorm()->bround(@r);
+  $x->_new_from_float($x->_as_float()->broot($y->_as_float(),@r))->bnorm()->bround(@r);
   }
 
 sub bmodpow
@@ -1273,8 +1408,8 @@ sub bsqrt
   local $Math::BigInt::precision = undef;
   local $Math::BigInt::accuracy = undef;
 
-  $x->{_n} = _float_from_part( $x->{_n} )->bsqrt();
-  $x->{_d} = _float_from_part( $x->{_d} )->bsqrt();
+  $x->{_n} = _float_from_part($x->{_n})->bsqrt();
+  $x->{_d} = _float_from_part($x->{_d})->bsqrt();
 
   # XXX TODO: we probably can optimize this:
 
@@ -1282,19 +1417,19 @@ sub bsqrt
   if ($x->{_d}->{_es} ne '+')
     {
     $x->{_n}->blsft($x->{_d}->exponent()->babs(),10);	# 7.1/4.51 => 7.1/45.1
-    $x->{_d} = $MBI->_copy( $x->{_d}->{_m} );		# 7.1/45.1 => 71/45.1
+    $x->{_d} = $MBI->_copy($x->{_d}->{_m});		# 7.1/45.1 => 71/45.1
     }
   # if sqrt(N) was not integer
   if ($x->{_n}->{_es} ne '+')
     {
     $x->{_d}->blsft($x->{_n}->exponent()->babs(),10);	# 71/45.1 => 710/45.1
-    $x->{_n} = $MBI->_copy( $x->{_n}->{_m} );		# 710/45.1 => 710/451
+    $x->{_n} = $MBI->_copy($x->{_n}->{_m});		# 710/45.1 => 710/451
     }
 
   # convert parts to $MBI again
-  $x->{_n} = $MBI->_lsft( $MBI->_copy( $x->{_n}->{_m} ), $x->{_n}->{_e}, 10)
+  $x->{_n} = $MBI->_lsft($MBI->_copy($x->{_n}->{_m}), $x->{_n}->{_e}, 10)
     if ref($x->{_n}) ne $MBI && ref($x->{_n}) ne 'ARRAY';
-  $x->{_d} = $MBI->_lsft( $MBI->_copy( $x->{_d}->{_m} ), $x->{_d}->{_e}, 10)
+  $x->{_d} = $MBI->_lsft($MBI->_copy($x->{_d}->{_m}), $x->{_d}->{_e}, 10)
     if ref($x->{_d}) ne $MBI && ref($x->{_d}) ne 'ARRAY';
 
   $x->bnorm()->round(@r);
@@ -1306,7 +1441,7 @@ sub blsft
 
   $b = 2 unless defined $b;
   $b = $self->new($b) unless ref ($b);
-  $x->bmul( $b->copy()->bpow($y), @r);
+  $x->bmul($b->copy()->bpow($y), @r);
   $x;
   }
 
@@ -1316,7 +1451,7 @@ sub brsft
 
   $b = 2 unless defined $b;
   $b = $self->new($b) unless ref ($b);
-  $x->bdiv( $b->copy()->bpow($y), @r);
+  $x->bdiv($b->copy()->bpow($y), @r);
   $x;
   }
 
@@ -1374,8 +1509,8 @@ sub bcmp
   return -1 if $xz && $y->{sign} eq '+';                # 0 <=> +y
   return 1 if $yz && $x->{sign} eq '+';                 # +x <=> 0
 
-  my $t = $MBI->_mul( $MBI->_copy($x->{_n}), $y->{_d});
-  my $u = $MBI->_mul( $MBI->_copy($y->{_n}), $x->{_d});
+  my $t = $MBI->_mul($MBI->_copy($x->{_n}), $y->{_d});
+  my $u = $MBI->_mul($MBI->_copy($y->{_n}), $x->{_d});
 
   my $cmp = $MBI->_acmp($t,$u);				# signs are equal
   $cmp = -$cmp if $x->{sign} eq '-';			# both are '-' => reverse
@@ -1403,8 +1538,8 @@ sub bacmp
     return -1;
     }
 
-  my $t = $MBI->_mul( $MBI->_copy($x->{_n}), $y->{_d});
-  my $u = $MBI->_mul( $MBI->_copy($y->{_n}), $x->{_d});
+  my $t = $MBI->_mul($MBI->_copy($x->{_n}), $y->{_d});
+  my $u = $MBI->_mul($MBI->_copy($y->{_n}), $x->{_d});
   $MBI->_acmp($t,$u);					# ignore signs
   }
 
@@ -1433,7 +1568,7 @@ sub as_number
   return Math::BigInt->new($x->{sign}) if $x->{sign} !~ /^[+-]$/;
 
   my $u = Math::BigInt->bzero();
-  $u->{value} = $MBI->_div( $MBI->_copy($x->{_n}), $x->{_d});	# 22/7 => 3
+  $u->{value} = $MBI->_div($MBI->_copy($x->{_n}), $x->{_d});	# 22/7 => 3
   $u->bneg if $x->{sign} eq '-'; # no negative zero
   $u;
   }
@@ -1455,7 +1590,7 @@ sub as_float
   # n
   $u->{_m} = $MBI->_copy($x->{_n});
   $u->{_e} = $MBI->_zero();
-  $u->bdiv( $MBI->_str($x->{_d}), @r);
+  $u->bdiv($MBI->_str($x->{_d}), @r);
   # return $u
   $u;
   }
@@ -1515,7 +1650,7 @@ sub from_oct
     {
     push @parts, Math::BigInt->from_oct($c);
     }
-  $class->new ( @parts );
+  $class->new (@parts);
   }
 
 ##############################################################################
@@ -1528,9 +1663,9 @@ sub import
   my $lib = ''; my @a;
   my $try = 'try';
 
-  for ( my $i = 0; $i < $l ; $i++)
+  for (my $i = 0; $i < $l ; $i++)
     {
-    if ( $_[$i] eq ':constant' )
+    if ($_[$i] eq ':constant')
       {
       # this rest causes overlord er load to step in
       overload::constant float => sub { $self->new(shift); };
@@ -1580,12 +1715,12 @@ sub import
   push @import, $try => $lib if $lib ne '';
 
   # MBI already loaded, so feed it our lib arguments
-  Math::BigInt->import( @import );
+  Math::BigInt->import(@import);
 
   $MBI = Math::BigFloat->config()->{lib};
 
   # register us with MBI to get notified of future lib changes
-  Math::BigInt::_register_callback( $self, sub { $MBI = $_[0]; } );
+  Math::BigInt::_register_callback($self, sub { $MBI = $_[0]; });
 
   # any non :constant stuff is handled by our parent, Exporter (loaded
   # by Math::BigFloat, even if @_ is empty, to give it a chance
@@ -1796,12 +1931,12 @@ Are not yet implemented.
 
 =head2 bmod()
 
-	use Math::BigRat;
-	my $x = Math::BigRat->new('7/4');
-	my $y = Math::BigRat->new('4/3');
-	print $x->bmod($y);
+	$x->bmod($y);
 
-Set $x to the remainder of the division of $x by $y.
+Returns $x modulo $y. When $x is finite, and $y is finite and non-zero, the
+result is identical to the remainder after floored division (F-division). If,
+in addition, both $x and $y are integers, the result is identical to the result
+from Perl's % operator.
 
 =head2 bneg()
 
@@ -1883,9 +2018,45 @@ Calculate the square root of $x.
 
 Calculate the N'th root of $x.
 
-=head2 badd()/bmul()/bsub()/bdiv()/bdec()/binc()
+=head2 badd()
+
+        $x->badd($y);
+
+Adds $y to $x and returns the result.
+
+=head2 bmul()
+
+        $x->bmul($y);
+
+Multiplies $y to $x and returns the result.
+
+=head2 bsub()
+
+        $x->bsub($y);
+
+Subtracts $y from $x and returns the result.
+
+=head2 bdiv()
+
+        $q = $x->bdiv($y);
+        ($q, $r) = $x->bdiv($y);
+
+In scalar context, divides $x by $y and returns the result. In list context,
+does floored division (F-division), returning an integer $q and a remainder $r
+so that $x = $q * $y + $r. The remainer (modulo) is equal to what is returned
+by C<$x->bmod($y)>.
+
+=head2 bdec()
+
+        $x->bdec();
+
+Decrements $x by 1 and returns the result.
+
+=head2 binc()
+
+        $x->binc();
 
-Please see the documentation in L<Math::BigInt>.
+Increments $x by 1 and returns the result.
 
 =head2 copy()
 
@@ -2067,6 +2238,6 @@ L<Math::BigInt::FastCalc>, L<Math::BigInt::GMP>, and L<Math::BigInt::Pari>.
 
 (C) by Tels L<http://bloodgate.com/> 2001 - 2009.
 
-Currently maintained by Jonathan "Duke" Leto <jonathan@leto.net> L<http://leto.net>
+Currently maintained by Peter John Acklam <pjacklam@online.no>.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Memoize.pm b/Master/tlpkg/tlperl/lib/Memoize.pm
index 9a58c4ac743..f4e6522d483 100644
--- a/Master/tlpkg/tlperl/lib/Memoize.pm
+++ b/Master/tlpkg/tlperl/lib/Memoize.pm
@@ -9,7 +9,7 @@
 # write to mjd-perl-memoize+@plover.com for a license.
 
 package Memoize;
-$VERSION = '1.03';
+$VERSION = '1.03_01';
 
 # Compile-time constants
 sub SCALAR () { 0 } 
@@ -184,7 +184,11 @@ sub _my_tie {
   }
   my $modulefile = $module . '.pm';
   $modulefile =~ s{::}{/}g;
-  eval { require $modulefile };
+  eval {
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
+    require $modulefile
+  };
   if ($@) {
     croak "Memoize: Couldn't load hash tie module `$module': $@; aborting";
   }
diff --git a/Master/tlpkg/tlperl/lib/Module/CoreList.pm b/Master/tlpkg/tlperl/lib/Module/CoreList.pm
index 17655b2f06c..6cbf8d054bf 100644
--- a/Master/tlpkg/tlperl/lib/Module/CoreList.pm
+++ b/Master/tlpkg/tlperl/lib/Module/CoreList.pm
@@ -4,7 +4,7 @@ use vars qw/$VERSION %released %version %families %upstream
 	    %bug_tracker %deprecated %delta/;
 use Module::CoreList::TieHashDelta;
 use version;
-$VERSION = '5.20151213';
+$VERSION = '5.20170114_24';
 
 sub _released_order {   # Sort helper, to make '?' sort after everything else
     (substr($released{$a}, 0, 1) eq "?")
@@ -287,6 +287,22 @@ sub changes_between {
     5.023004 => '2015-10-20',
     5.023005 => '2015-11-20',
     5.022001 => '2015-12-13',
+    5.023006 => '2015-12-21',
+    5.023007 => '2016-01-20',
+    5.023008 => '2016-02-20',
+    5.023009 => '2016-03-20',
+    5.022002 => '2016-04-29',
+    5.024000 => '2016-05-09',
+    5.025000 => '2016-05-09',
+    5.025001 => '2016-05-20',
+    5.025002 => '2016-06-20',
+    5.025003 => '2016-07-20',
+    5.025004 => '2016-08-20',
+    5.025005 => '2016-09-20',
+    5.025006 => '2016-10-20',
+    5.025007 => '2016-11-20',
+    5.025008 => '2016-12-20',
+    5.024001 => '2017-01-14',
   );
 
 for my $version ( sort { $a <=> $b } keys %released ) {
@@ -8115,6 +8131,8 @@ for my $version ( sort { $a <=> $b } keys %released ) {
     5.018003 => {
         delta_from => 5.018002,
         changed => {
+            'Config'                => '5.018003',
+            'Digest::SHA'           => '5.84_02',
             'Module::CoreList'      => '3.12',
             'Module::CoreList::TieHashDelta'=> '3.12',
             'Module::CoreList::Utils'=> '3.12',
@@ -8123,6 +8141,7 @@ for my $version ( sort { $a <=> $b } keys %released ) {
     5.018004 => {
         delta_from => 5.018003,
         changed => {
+            'Config'                => '5.018004',
             'Module::CoreList'      => '3.13',
             'Module::CoreList::TieHashDelta'=> '3.13',
             'Module::CoreList::Utils'=> '3.13',
@@ -9901,7 +9920,6 @@ for my $version ( sort { $a <=> $b } keys %released ) {
             'Module::Build::Version'=> 1,
             'Module::Build::YAML'   => 1,
             'Package::Constants'    => 1,
-            'Simple'                => 1,
             'inc::latest'           => 1,
         }
     },
@@ -10000,9 +10018,6 @@ for my $version ( sort { $a <=> $b } keys %released ) {
             'Module::CoreList::TieHashDelta'=> '5.021001_01',
             'Module::CoreList::Utils'=> '5.021001_01',
             'Module::Metadata'      => '1.000024',
-            'Module::Metadata::corpus::BOMTest::UTF16BE'=> undef,
-            'Module::Metadata::corpus::BOMTest::UTF16LE'=> undef,
-            'Module::Metadata::corpus::BOMTest::UTF8'=> '1',
             'NDBM_File'             => '1.13',
             'Net::Config'           => '1.14',
             'Net::SMTP'             => '2.34',
@@ -12020,6 +12035,1661 @@ for my $version ( sort { $a <=> $b } keys %released ) {
         removed => {
         }
     },
+    5.023006 => {
+        delta_from => 5.023005,
+        changed => {
+            'B::Deparse'            => '1.36',
+            'B::Op_private'         => '5.023006',
+            'Benchmark'             => '1.21',
+            'CPAN::Meta::Requirements'=> '2.140',
+            'CPAN::Meta::YAML'      => '0.018',
+            'Config'                => '5.023006',
+            'Cwd'                   => '3.60',
+            'Data::Dumper'          => '2.159',
+            'DynaLoader'            => '1.37',
+            'File::Spec'            => '3.60',
+            'File::Spec::AmigaOS'   => '3.60',
+            'File::Spec::Cygwin'    => '3.60',
+            'File::Spec::Epoc'      => '3.60',
+            'File::Spec::Functions' => '3.60',
+            'File::Spec::Mac'       => '3.60',
+            'File::Spec::OS2'       => '3.60',
+            'File::Spec::Unix'      => '3.60',
+            'File::Spec::VMS'       => '3.60',
+            'File::Spec::Win32'     => '3.60',
+            'Hash::Util::FieldHash' => '1.19',
+            'Locale::Codes'         => '3.37',
+            'Locale::Codes::Constants'=> '3.37',
+            'Locale::Codes::Country'=> '3.37',
+            'Locale::Codes::Country_Codes'=> '3.37',
+            'Locale::Codes::Country_Retired'=> '3.37',
+            'Locale::Codes::Currency'=> '3.37',
+            'Locale::Codes::Currency_Codes'=> '3.37',
+            'Locale::Codes::Currency_Retired'=> '3.37',
+            'Locale::Codes::LangExt'=> '3.37',
+            'Locale::Codes::LangExt_Codes'=> '3.37',
+            'Locale::Codes::LangExt_Retired'=> '3.37',
+            'Locale::Codes::LangFam'=> '3.37',
+            'Locale::Codes::LangFam_Codes'=> '3.37',
+            'Locale::Codes::LangFam_Retired'=> '3.37',
+            'Locale::Codes::LangVar'=> '3.37',
+            'Locale::Codes::LangVar_Codes'=> '3.37',
+            'Locale::Codes::LangVar_Retired'=> '3.37',
+            'Locale::Codes::Language'=> '3.37',
+            'Locale::Codes::Language_Codes'=> '3.37',
+            'Locale::Codes::Language_Retired'=> '3.37',
+            'Locale::Codes::Script' => '3.37',
+            'Locale::Codes::Script_Codes'=> '3.37',
+            'Locale::Codes::Script_Retired'=> '3.37',
+            'Locale::Country'       => '3.37',
+            'Locale::Currency'      => '3.37',
+            'Locale::Language'      => '3.37',
+            'Locale::Script'        => '3.37',
+            'Math::BigInt::FastCalc'=> '0.38',
+            'Module::CoreList'      => '5.20151220',
+            'Module::CoreList::TieHashDelta'=> '5.20151220',
+            'Module::CoreList::Utils'=> '5.20151220',
+            'Module::Metadata'      => '1.000031',
+            'Opcode'                => '1.34',
+            'PerlIO::mmap'          => '0.016',
+            'Pod::Perldoc'          => '3.25_02',
+            'SDBM_File'             => '1.14',
+            'Term::ANSIColor'       => '4.04',
+            'Test'                  => '1.28',
+            'Unicode::Normalize'    => '1.24',
+            'XS::APItest'           => '0.77',
+            'base'                  => '2.23',
+            'encoding::warnings'    => '0.12',
+            'fields'                => '2.23',
+            'locale'                => '1.08',
+            'strict'                => '1.10',
+            'threads'               => '2.05',
+            'threads::shared'       => '1.50',
+            'utf8'                  => '1.18',
+        },
+        removed => {
+        }
+    },
+    5.023007 => {
+        delta_from => 5.023006,
+        changed => {
+            'App::Prove'            => '3.36',
+            'App::Prove::State'     => '3.36',
+            'App::Prove::State::Result'=> '3.36',
+            'App::Prove::State::Result::Test'=> '3.36',
+            'B'                     => '1.62',
+            'B::Deparse'            => '1.37',
+            'B::Op_private'         => '5.023007',
+            'Benchmark'             => '1.22',
+            'Config'                => '5.023007',
+            'Cwd'                   => '3.62',
+            'Data::Dumper'          => '2.160',
+            'ExtUtils::ParseXS'     => '3.31',
+            'ExtUtils::ParseXS::Constants'=> '3.31',
+            'ExtUtils::ParseXS::CountLines'=> '3.31',
+            'ExtUtils::ParseXS::Eval'=> '3.31',
+            'ExtUtils::ParseXS::Utilities'=> '3.31',
+            'ExtUtils::Typemaps'    => '3.31',
+            'ExtUtils::Typemaps::Cmd'=> '3.31',
+            'ExtUtils::Typemaps::InputMap'=> '3.31',
+            'ExtUtils::Typemaps::OutputMap'=> '3.31',
+            'ExtUtils::Typemaps::Type'=> '3.31',
+            'File::Find'            => '1.33',
+            'File::Spec'            => '3.62',
+            'File::Spec::AmigaOS'   => '3.62',
+            'File::Spec::Cygwin'    => '3.62',
+            'File::Spec::Epoc'      => '3.62',
+            'File::Spec::Functions' => '3.62',
+            'File::Spec::Mac'       => '3.62',
+            'File::Spec::OS2'       => '3.62',
+            'File::Spec::Unix'      => '3.62',
+            'File::Spec::VMS'       => '3.62',
+            'File::Spec::Win32'     => '3.62',
+            'Math::BigFloat'        => '1.999715',
+            'Math::BigFloat::Trace' => '0.42',
+            'Math::BigInt'          => '1.999715',
+            'Math::BigInt::Calc'    => '1.999715',
+            'Math::BigInt::CalcEmu' => '1.999715',
+            'Math::BigInt::FastCalc'=> '0.40',
+            'Math::BigInt::Trace'   => '0.42',
+            'Math::BigRat'          => '0.260802',
+            'Module::CoreList'      => '5.20160120',
+            'Module::CoreList::TieHashDelta'=> '5.20160120',
+            'Module::CoreList::Utils'=> '5.20160120',
+            'Net::Cmd'              => '3.08',
+            'Net::Config'           => '3.08',
+            'Net::Domain'           => '3.08',
+            'Net::FTP'              => '3.08',
+            'Net::FTP::A'           => '3.08',
+            'Net::FTP::E'           => '3.08',
+            'Net::FTP::I'           => '3.08',
+            'Net::FTP::L'           => '3.08',
+            'Net::FTP::dataconn'    => '3.08',
+            'Net::NNTP'             => '3.08',
+            'Net::Netrc'            => '3.08',
+            'Net::POP3'             => '3.08',
+            'Net::SMTP'             => '3.08',
+            'Net::Time'             => '3.08',
+            'Pod::Man'              => '4.04',
+            'Pod::ParseLink'        => '4.04',
+            'Pod::Text'             => '4.04',
+            'Pod::Text::Color'      => '4.04',
+            'Pod::Text::Overstrike' => '4.04',
+            'Pod::Text::Termcap'    => '4.04',
+            'Pod::Usage'            => '1.68',
+            'TAP::Base'             => '3.36',
+            'TAP::Formatter::Base'  => '3.36',
+            'TAP::Formatter::Color' => '3.36',
+            'TAP::Formatter::Console'=> '3.36',
+            'TAP::Formatter::Console::ParallelSession'=> '3.36',
+            'TAP::Formatter::Console::Session'=> '3.36',
+            'TAP::Formatter::File'  => '3.36',
+            'TAP::Formatter::File::Session'=> '3.36',
+            'TAP::Formatter::Session'=> '3.36',
+            'TAP::Harness'          => '3.36',
+            'TAP::Harness::Env'     => '3.36',
+            'TAP::Object'           => '3.36',
+            'TAP::Parser'           => '3.36',
+            'TAP::Parser::Aggregator'=> '3.36',
+            'TAP::Parser::Grammar'  => '3.36',
+            'TAP::Parser::Iterator' => '3.36',
+            'TAP::Parser::Iterator::Array'=> '3.36',
+            'TAP::Parser::Iterator::Process'=> '3.36',
+            'TAP::Parser::Iterator::Stream'=> '3.36',
+            'TAP::Parser::IteratorFactory'=> '3.36',
+            'TAP::Parser::Multiplexer'=> '3.36',
+            'TAP::Parser::Result'   => '3.36',
+            'TAP::Parser::Result::Bailout'=> '3.36',
+            'TAP::Parser::Result::Comment'=> '3.36',
+            'TAP::Parser::Result::Plan'=> '3.36',
+            'TAP::Parser::Result::Pragma'=> '3.36',
+            'TAP::Parser::Result::Test'=> '3.36',
+            'TAP::Parser::Result::Unknown'=> '3.36',
+            'TAP::Parser::Result::Version'=> '3.36',
+            'TAP::Parser::Result::YAML'=> '3.36',
+            'TAP::Parser::ResultFactory'=> '3.36',
+            'TAP::Parser::Scheduler'=> '3.36',
+            'TAP::Parser::Scheduler::Job'=> '3.36',
+            'TAP::Parser::Scheduler::Spinner'=> '3.36',
+            'TAP::Parser::Source'   => '3.36',
+            'TAP::Parser::SourceHandler'=> '3.36',
+            'TAP::Parser::SourceHandler::Executable'=> '3.36',
+            'TAP::Parser::SourceHandler::File'=> '3.36',
+            'TAP::Parser::SourceHandler::Handle'=> '3.36',
+            'TAP::Parser::SourceHandler::Perl'=> '3.36',
+            'TAP::Parser::SourceHandler::RawTAP'=> '3.36',
+            'TAP::Parser::YAMLish::Reader'=> '3.36',
+            'TAP::Parser::YAMLish::Writer'=> '3.36',
+            'Test::Harness'         => '3.36',
+            'Unicode::Normalize'    => '1.25',
+            'Unicode::UCD'          => '0.64',
+            'XS::APItest'           => '0.78',
+            'bigint'                => '0.42',
+            'bignum'                => '0.42',
+            'bigrat'                => '0.42',
+            'utf8'                  => '1.19',
+        },
+        removed => {
+        }
+    },
+    5.023008 => {
+        delta_from => 5.023007,
+        changed => {
+            'B::Op_private'         => '5.023008',
+            'Config'                => '5.023008',
+            'Cwd'                   => '3.63',
+            'DynaLoader'            => '1.38',
+            'Encode'                => '2.80',
+            'Encode::Alias'         => '2.20',
+            'Encode::MIME::Header'  => '2.19',
+            'Encode::Unicode'       => '2.15',
+            'ExtUtils::CBuilder'    => '0.280225',
+            'ExtUtils::CBuilder::Base'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::Unix'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::VMS'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::Windows'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::Windows::BCC'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::Windows::GCC'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::Windows::MSVC'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::aix'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::android'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::cygwin'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::darwin'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::dec_osf'=> '0.280225',
+            'ExtUtils::CBuilder::Platform::os2'=> '0.280225',
+            'ExtUtils::Command::MM' => '7.10_01',
+            'ExtUtils::Liblist'     => '7.10_01',
+            'ExtUtils::Liblist::Kid'=> '7.10_01',
+            'ExtUtils::MM'          => '7.10_01',
+            'ExtUtils::MM_AIX'      => '7.10_01',
+            'ExtUtils::MM_Any'      => '7.10_01',
+            'ExtUtils::MM_BeOS'     => '7.10_01',
+            'ExtUtils::MM_Cygwin'   => '7.10_01',
+            'ExtUtils::MM_DOS'      => '7.10_01',
+            'ExtUtils::MM_Darwin'   => '7.10_01',
+            'ExtUtils::MM_MacOS'    => '7.10_01',
+            'ExtUtils::MM_NW5'      => '7.10_01',
+            'ExtUtils::MM_OS2'      => '7.10_01',
+            'ExtUtils::MM_QNX'      => '7.10_01',
+            'ExtUtils::MM_UWIN'     => '7.10_01',
+            'ExtUtils::MM_Unix'     => '7.10_01',
+            'ExtUtils::MM_VMS'      => '7.10_01',
+            'ExtUtils::MM_VOS'      => '7.10_01',
+            'ExtUtils::MM_Win32'    => '7.10_01',
+            'ExtUtils::MM_Win95'    => '7.10_01',
+            'ExtUtils::MY'          => '7.10_01',
+            'ExtUtils::MakeMaker'   => '7.10_01',
+            'ExtUtils::MakeMaker::Config'=> '7.10_01',
+            'ExtUtils::MakeMaker::version'=> '7.10_01',
+            'ExtUtils::MakeMaker::version::regex'=> '7.10_01',
+            'ExtUtils::Mkbootstrap' => '7.10_01',
+            'ExtUtils::Mksymlists'  => '7.10_01',
+            'ExtUtils::testlib'     => '7.10_01',
+            'File::Spec'            => '3.63',
+            'File::Spec::AmigaOS'   => '3.63',
+            'File::Spec::Cygwin'    => '3.63',
+            'File::Spec::Epoc'      => '3.63',
+            'File::Spec::Functions' => '3.63',
+            'File::Spec::Mac'       => '3.63',
+            'File::Spec::OS2'       => '3.63',
+            'File::Spec::Unix'      => '3.63',
+            'File::Spec::VMS'       => '3.63',
+            'File::Spec::Win32'     => '3.63',
+            'IPC::Msg'              => '2.05',
+            'IPC::Semaphore'        => '2.05',
+            'IPC::SharedMem'        => '2.05',
+            'IPC::SysV'             => '2.05',
+            'Module::CoreList'      => '5.20160121',
+            'Module::CoreList::TieHashDelta'=> '5.20160121',
+            'Module::CoreList::Utils'=> '5.20160121',
+            'ODBM_File'             => '1.13',
+            'POSIX'                 => '1.63',
+            'PerlIO::encoding'      => '0.24',
+            'Pod::Man'              => '4.06',
+            'Pod::ParseLink'        => '4.06',
+            'Pod::Text'             => '4.06',
+            'Pod::Text::Color'      => '4.06',
+            'Pod::Text::Overstrike' => '4.06',
+            'Pod::Text::Termcap'    => '4.06',
+            'Storable'              => '2.55',
+            'Time::HiRes'           => '1.9730',
+            'XS::APItest'           => '0.79',
+        },
+        removed => {
+        }
+    },
+    5.023009 => {
+        delta_from => 5.023008,
+        changed => {
+            'Amiga::ARexx'          => '0.04',
+            'Amiga::Exec'           => '0.02',
+            'B::Op_private'         => '5.023009',
+            'Carp'                  => '1.40',
+            'Carp::Heavy'           => '1.40',
+            'Config'                => '5.023009',
+            'Errno'                 => '1.25',
+            'ExtUtils::Embed'       => '1.33',
+            'File::Find'            => '1.34',
+            'File::Glob'            => '1.26',
+            'File::Spec::AmigaOS'   => ';.64',
+            'IPC::Msg'              => '2.06_01',
+            'IPC::Semaphore'        => '2.06_01',
+            'IPC::SharedMem'        => '2.06_01',
+            'IPC::SysV'             => '2.06_01',
+            'List::Util'            => '1.42_02',
+            'List::Util::XS'        => '1.42_02',
+            'Module::CoreList'      => '5.20160320',
+            'Module::CoreList::TieHashDelta'=> '5.20160320',
+            'Module::CoreList::Utils'=> '5.20160320',
+            'POSIX'                 => '1.64',
+            'Pod::Functions'        => '1.10',
+            'Pod::Functions::Functions'=> '1.10',
+            'Scalar::Util'          => '1.42_02',
+            'SelfLoader'            => '1.23',
+            'Socket'                => '2.020_03',
+            'Storable'              => '2.56',
+            'Sub::Util'             => '1.42_02',
+            'Thread::Queue'         => '3.08',
+            'Tie::File'             => '1.02',
+            'Time::HiRes'           => '1.9732',
+            'Win32API::File'        => '0.1203',
+            'Win32API::File::inc::ExtUtils::Myconst2perl'=> '1',
+            'XS::APItest'           => '0.80',
+            'autouse'               => '1.11',
+            'bytes'                 => '1.05',
+            'strict'                => '1.11',
+            'threads'               => '2.06',
+            'version'               => '0.9916',
+            'version::regex'        => '0.9916',
+            'warnings'              => '1.36',
+        },
+        removed => {
+            'Win32API::File::ExtUtils::Myconst2perl'=> 1,
+        }
+    },
+    5.022002 => {
+        delta_from => 5.022001,
+        changed => {
+            'B::Op_private'         => '5.022002',
+            'Config'                => '5.022002',
+            'Cwd'                   => '3.56_01',
+            'File::Spec'            => '3.56_01',
+            'File::Spec::Cygwin'    => '3.56_01',
+            'File::Spec::Epoc'      => '3.56_01',
+            'File::Spec::Functions' => '3.56_01',
+            'File::Spec::Mac'       => '3.56_01',
+            'File::Spec::OS2'       => '3.56_01',
+            'File::Spec::Unix'      => '3.56_01',
+            'File::Spec::VMS'       => '3.56_01',
+            'File::Spec::Win32'     => '3.56_01',
+            'Module::CoreList'      => '5.20160429',
+            'Module::CoreList::TieHashDelta'=> '5.20160429',
+            'Module::CoreList::Utils'=> '5.20160429',
+            'XS::APItest'           => '0.72_01',
+        },
+        removed => {
+        }
+    },
+    5.024000 => {
+        delta_from => 5.023009,
+        changed => {
+            'B::Op_private'         => '5.024000',
+            'Config'                => '5.024',
+            'File::Copy'            => '2.31',
+            'File::Path'            => '2.12_01',
+            'File::Spec::AmigaOS'   => '3.64',
+            'IO::Handle'            => '1.36',
+            'Module::CoreList'      => '5.20160506',
+            'Module::CoreList::TieHashDelta'=> '5.20160506',
+            'Module::CoreList::Utils'=> '5.20160506',
+            'ODBM_File'             => '1.14',
+            'POSIX'                 => '1.65',
+            'Pod::Man'              => '4.07',
+            'Pod::ParseLink'        => '4.07',
+            'Pod::Text'             => '4.07',
+            'Pod::Text::Color'      => '4.07',
+            'Pod::Text::Overstrike' => '4.07',
+            'Pod::Text::Termcap'    => '4.07',
+            'Thread::Queue'         => '3.09',
+            'Time::HiRes'           => '1.9733',
+            'threads'               => '2.07',
+            'threads::shared'       => '1.51',
+            'locale'                => '1.09',
+        },
+        removed => {
+        }
+    },
+    5.025000 => {
+        delta_from => 5.024,
+        changed => {
+            'B::Op_private'         => '5.025000',
+            'Config'                => '5.025',
+            'Module::CoreList'      => '5.20160507',
+            'Module::CoreList::TieHashDelta'=> '5.20160507',
+            'Module::CoreList::Utils'=> '5.20160507',
+            'feature'               => '1.43',
+        },
+        removed => {
+        }
+    },
+    5.025001 => {
+        delta_from => 5.025,
+        changed => {
+            'Archive::Tar'          => '2.08',
+            'Archive::Tar::Constant'=> '2.08',
+            'Archive::Tar::File'    => '2.08',
+            'B::Op_private'         => '5.025001',
+            'Carp'                  => '1.41',
+            'Carp::Heavy'           => '1.41',
+            'Config'                => '5.025001',
+            'Config::Perl::V'       => '0.26',
+            'DB_File'               => '1.838',
+            'Digest::MD5'           => '2.55',
+            'IPC::Cmd'              => '0.94',
+            'IPC::Msg'              => '2.07',
+            'IPC::Semaphore'        => '2.07',
+            'IPC::SharedMem'        => '2.07',
+            'IPC::SysV'             => '2.07',
+            'List::Util'            => '1.45_01',
+            'List::Util::XS'        => '1.45_01',
+            'Locale::Codes'         => '3.38',
+            'Locale::Codes::Constants'=> '3.38',
+            'Locale::Codes::Country'=> '3.38',
+            'Locale::Codes::Country_Codes'=> '3.38',
+            'Locale::Codes::Country_Retired'=> '3.38',
+            'Locale::Codes::Currency'=> '3.38',
+            'Locale::Codes::Currency_Codes'=> '3.38',
+            'Locale::Codes::Currency_Retired'=> '3.38',
+            'Locale::Codes::LangExt'=> '3.38',
+            'Locale::Codes::LangExt_Codes'=> '3.38',
+            'Locale::Codes::LangExt_Retired'=> '3.38',
+            'Locale::Codes::LangFam'=> '3.38',
+            'Locale::Codes::LangFam_Codes'=> '3.38',
+            'Locale::Codes::LangFam_Retired'=> '3.38',
+            'Locale::Codes::LangVar'=> '3.38',
+            'Locale::Codes::LangVar_Codes'=> '3.38',
+            'Locale::Codes::LangVar_Retired'=> '3.38',
+            'Locale::Codes::Language'=> '3.38',
+            'Locale::Codes::Language_Codes'=> '3.38',
+            'Locale::Codes::Language_Retired'=> '3.38',
+            'Locale::Codes::Script' => '3.38',
+            'Locale::Codes::Script_Codes'=> '3.38',
+            'Locale::Codes::Script_Retired'=> '3.38',
+            'Locale::Country'       => '3.38',
+            'Locale::Currency'      => '3.38',
+            'Locale::Language'      => '3.38',
+            'Locale::Maketext'      => '1.27',
+            'Locale::Script'        => '3.38',
+            'Module::CoreList'      => '5.20160520',
+            'Module::CoreList::TieHashDelta'=> '5.20160520',
+            'Module::CoreList::Utils'=> '5.20160520',
+            'Module::Metadata'      => '1.000032',
+            'POSIX'                 => '1.69',
+            'Scalar::Util'          => '1.45_01',
+            'Sub::Util'             => '1.45_01',
+            'Sys::Syslog'           => '0.34',
+            'Term::ANSIColor'       => '4.05',
+            'Test2'                 => '1.302015',
+            'Test2::API'            => '1.302015',
+            'Test2::API::Breakage'  => '1.302015',
+            'Test2::API::Context'   => '1.302015',
+            'Test2::API::Instance'  => '1.302015',
+            'Test2::API::Stack'     => '1.302015',
+            'Test2::Event'          => '1.302015',
+            'Test2::Event::Bail'    => '1.302015',
+            'Test2::Event::Diag'    => '1.302015',
+            'Test2::Event::Exception'=> '1.302015',
+            'Test2::Event::Note'    => '1.302015',
+            'Test2::Event::Ok'      => '1.302015',
+            'Test2::Event::Plan'    => '1.302015',
+            'Test2::Event::Skip'    => '1.302015',
+            'Test2::Event::Subtest' => '1.302015',
+            'Test2::Event::Waiting' => '1.302015',
+            'Test2::Formatter'      => '1.302015',
+            'Test2::Formatter::TAP' => '1.302015',
+            'Test2::Hub'            => '1.302015',
+            'Test2::Hub::Interceptor'=> '1.302015',
+            'Test2::Hub::Interceptor::Terminator'=> '1.302015',
+            'Test2::Hub::Subtest'   => '1.302015',
+            'Test2::IPC'            => '1.302015',
+            'Test2::IPC::Driver'    => '1.302015',
+            'Test2::IPC::Driver::Files'=> '1.302015',
+            'Test2::Util'           => '1.302015',
+            'Test2::Util::ExternalMeta'=> '1.302015',
+            'Test2::Util::HashBase' => '1.302015',
+            'Test2::Util::Trace'    => '1.302015',
+            'Test::Builder'         => '1.302015',
+            'Test::Builder::Formatter'=> '1.302015',
+            'Test::Builder::Module' => '1.302015',
+            'Test::Builder::Tester' => '1.302015',
+            'Test::Builder::Tester::Color'=> '1.302015',
+            'Test::Builder::TodoDiag'=> '1.302015',
+            'Test::More'            => '1.302015',
+            'Test::Simple'          => '1.302015',
+            'Test::Tester'          => '1.302015',
+            'Test::Tester::Capture' => '1.302015',
+            'Test::Tester::CaptureRunner'=> '1.302015',
+            'Test::Tester::Delegate'=> '1.302015',
+            'Test::use::ok'         => '1.302015',
+            'XS::APItest'           => '0.81',
+            '_charnames'            => '1.44',
+            'charnames'             => '1.44',
+            'ok'                    => '1.302015',
+            'perlfaq'               => '5.021011',
+            're'                    => '0.33',
+            'threads'               => '2.08',
+            'threads::shared'       => '1.52',
+        },
+        removed => {
+        }
+    },
+    5.025002 => {
+        delta_from => 5.025001,
+        changed => {
+            'App::Cpan'             => '1.64',
+            'B::Op_private'         => '5.025002',
+            'CPAN'                  => '2.14',
+            'CPAN::Distribution'    => '2.12',
+            'CPAN::FTP'             => '5.5007',
+            'CPAN::FirstTime'       => '5.5309',
+            'CPAN::HandleConfig'    => '5.5007',
+            'CPAN::Index'           => '2.12',
+            'CPAN::Mirrors'         => '2.12',
+            'CPAN::Plugin'          => '0.96',
+            'CPAN::Shell'           => '5.5006',
+            'Config'                => '5.025002',
+            'Cwd'                   => '3.64',
+            'Devel::Peek'           => '1.24',
+            'DynaLoader'            => '1.39',
+            'ExtUtils::Command'     => '7.18',
+            'ExtUtils::Command::MM' => '7.18',
+            'ExtUtils::Liblist'     => '7.18',
+            'ExtUtils::Liblist::Kid'=> '7.18',
+            'ExtUtils::MM'          => '7.18',
+            'ExtUtils::MM_AIX'      => '7.18',
+            'ExtUtils::MM_Any'      => '7.18',
+            'ExtUtils::MM_BeOS'     => '7.18',
+            'ExtUtils::MM_Cygwin'   => '7.18',
+            'ExtUtils::MM_DOS'      => '7.18',
+            'ExtUtils::MM_Darwin'   => '7.18',
+            'ExtUtils::MM_MacOS'    => '7.18',
+            'ExtUtils::MM_NW5'      => '7.18',
+            'ExtUtils::MM_OS2'      => '7.18',
+            'ExtUtils::MM_QNX'      => '7.18',
+            'ExtUtils::MM_UWIN'     => '7.18',
+            'ExtUtils::MM_Unix'     => '7.18',
+            'ExtUtils::MM_VMS'      => '7.18',
+            'ExtUtils::MM_VOS'      => '7.18',
+            'ExtUtils::MM_Win32'    => '7.18',
+            'ExtUtils::MM_Win95'    => '7.18',
+            'ExtUtils::MY'          => '7.18',
+            'ExtUtils::MakeMaker'   => '7.18',
+            'ExtUtils::MakeMaker::Config'=> '7.18',
+            'ExtUtils::MakeMaker::Locale'=> '7.18',
+            'ExtUtils::MakeMaker::version'=> '7.18',
+            'ExtUtils::MakeMaker::version::regex'=> '7.18',
+            'ExtUtils::Miniperl'    => '1.06',
+            'ExtUtils::Mkbootstrap' => '7.18',
+            'ExtUtils::Mksymlists'  => '7.18',
+            'ExtUtils::ParseXS'     => '3.32',
+            'ExtUtils::ParseXS::Constants'=> '3.32',
+            'ExtUtils::ParseXS::CountLines'=> '3.32',
+            'ExtUtils::ParseXS::Eval'=> '3.32',
+            'ExtUtils::ParseXS::Utilities'=> '3.32',
+            'ExtUtils::Typemaps'    => '3.32',
+            'ExtUtils::Typemaps::Cmd'=> '3.32',
+            'ExtUtils::Typemaps::InputMap'=> '3.32',
+            'ExtUtils::Typemaps::OutputMap'=> '3.32',
+            'ExtUtils::Typemaps::Type'=> '3.32',
+            'ExtUtils::testlib'     => '7.18',
+            'File::Copy'            => '2.32',
+            'File::Glob'            => '1.27',
+            'File::Spec'            => '3.64',
+            'File::Spec::Cygwin'    => '3.64',
+            'File::Spec::Epoc'      => '3.64',
+            'File::Spec::Functions' => '3.64',
+            'File::Spec::Mac'       => '3.64',
+            'File::Spec::OS2'       => '3.64',
+            'File::Spec::Unix'      => '3.64',
+            'File::Spec::VMS'       => '3.64',
+            'File::Spec::Win32'     => '3.64',
+            'FileHandle'            => '2.03',
+            'Getopt::Long'          => '2.49',
+            'HTTP::Tiny'            => '0.058',
+            'JSON::PP'              => '2.27400',
+            'Locale::Codes'         => '3.39',
+            'Locale::Codes::Constants'=> '3.39',
+            'Locale::Codes::Country'=> '3.39',
+            'Locale::Codes::Country_Codes'=> '3.39',
+            'Locale::Codes::Country_Retired'=> '3.39',
+            'Locale::Codes::Currency'=> '3.39',
+            'Locale::Codes::Currency_Codes'=> '3.39',
+            'Locale::Codes::Currency_Retired'=> '3.39',
+            'Locale::Codes::LangExt'=> '3.39',
+            'Locale::Codes::LangExt_Codes'=> '3.39',
+            'Locale::Codes::LangExt_Retired'=> '3.39',
+            'Locale::Codes::LangFam'=> '3.39',
+            'Locale::Codes::LangFam_Codes'=> '3.39',
+            'Locale::Codes::LangFam_Retired'=> '3.39',
+            'Locale::Codes::LangVar'=> '3.39',
+            'Locale::Codes::LangVar_Codes'=> '3.39',
+            'Locale::Codes::LangVar_Retired'=> '3.39',
+            'Locale::Codes::Language'=> '3.39',
+            'Locale::Codes::Language_Codes'=> '3.39',
+            'Locale::Codes::Language_Retired'=> '3.39',
+            'Locale::Codes::Script' => '3.39',
+            'Locale::Codes::Script_Codes'=> '3.39',
+            'Locale::Codes::Script_Retired'=> '3.39',
+            'Locale::Country'       => '3.39',
+            'Locale::Currency'      => '3.39',
+            'Locale::Language'      => '3.39',
+            'Locale::Script'        => '3.39',
+            'Module::CoreList'      => '5.20160620',
+            'Module::CoreList::TieHashDelta'=> '5.20160620',
+            'Module::CoreList::Utils'=> '5.20160620',
+            'Opcode'                => '1.35',
+            'POSIX'                 => '1.70',
+            'Pod::Checker'          => '1.73',
+            'Pod::Functions'        => '1.11',
+            'Pod::Functions::Functions'=> '1.11',
+            'Pod::Usage'            => '1.69',
+            'Test2'                 => '1.302026',
+            'Test2::API'            => '1.302026',
+            'Test2::API::Breakage'  => '1.302026',
+            'Test2::API::Context'   => '1.302026',
+            'Test2::API::Instance'  => '1.302026',
+            'Test2::API::Stack'     => '1.302026',
+            'Test2::Event'          => '1.302026',
+            'Test2::Event::Bail'    => '1.302026',
+            'Test2::Event::Diag'    => '1.302026',
+            'Test2::Event::Exception'=> '1.302026',
+            'Test2::Event::Generic' => '1.302026',
+            'Test2::Event::Note'    => '1.302026',
+            'Test2::Event::Ok'      => '1.302026',
+            'Test2::Event::Plan'    => '1.302026',
+            'Test2::Event::Skip'    => '1.302026',
+            'Test2::Event::Subtest' => '1.302026',
+            'Test2::Event::Waiting' => '1.302026',
+            'Test2::Formatter'      => '1.302026',
+            'Test2::Formatter::TAP' => '1.302026',
+            'Test2::Hub'            => '1.302026',
+            'Test2::Hub::Interceptor'=> '1.302026',
+            'Test2::Hub::Interceptor::Terminator'=> '1.302026',
+            'Test2::Hub::Subtest'   => '1.302026',
+            'Test2::IPC'            => '1.302026',
+            'Test2::IPC::Driver'    => '1.302026',
+            'Test2::IPC::Driver::Files'=> '1.302026',
+            'Test2::Util'           => '1.302026',
+            'Test2::Util::ExternalMeta'=> '1.302026',
+            'Test2::Util::HashBase' => '1.302026',
+            'Test2::Util::Trace'    => '1.302026',
+            'Test::Builder'         => '1.302026',
+            'Test::Builder::Formatter'=> '1.302026',
+            'Test::Builder::Module' => '1.302026',
+            'Test::Builder::Tester' => '1.302026',
+            'Test::Builder::Tester::Color'=> '1.302026',
+            'Test::Builder::TodoDiag'=> '1.302026',
+            'Test::More'            => '1.302026',
+            'Test::Simple'          => '1.302026',
+            'Test::Tester'          => '1.302026',
+            'Test::Tester::Capture' => '1.302026',
+            'Test::Tester::CaptureRunner'=> '1.302026',
+            'Test::Tester::Delegate'=> '1.302026',
+            'Test::use::ok'         => '1.302026',
+            'Thread::Queue'         => '3.11',
+            'Time::HiRes'           => '1.9734',
+            'Unicode::UCD'          => '0.65',
+            'VMS::DCLsym'           => '1.07',
+            'XS::APItest'           => '0.82',
+            'diagnostics'           => '1.35',
+            'feature'               => '1.44',
+            'ok'                    => '1.302026',
+            'threads'               => '2.09',
+        },
+        removed => {
+        }
+    },
+    5.025003 => {
+        delta_from => 5.025002,
+        changed => {
+            'B::Op_private'         => '5.025003',
+            'Config'                => '5.025003',
+            'Data::Dumper'          => '2.161',
+            'Devel::PPPort'         => '3.35',
+            'Encode'                => '2.84',
+            'Encode::MIME::Header'  => '2.23',
+            'Encode::MIME::Header::ISO_2022_JP'=> '1.07',
+            'ExtUtils::ParseXS'     => '3.33',
+            'ExtUtils::ParseXS::Constants'=> '3.33',
+            'ExtUtils::ParseXS::CountLines'=> '3.33',
+            'ExtUtils::ParseXS::Eval'=> '3.33',
+            'ExtUtils::ParseXS::Utilities'=> '3.33',
+            'ExtUtils::Typemaps'    => '3.33',
+            'ExtUtils::Typemaps::Cmd'=> '3.33',
+            'ExtUtils::Typemaps::InputMap'=> '3.33',
+            'ExtUtils::Typemaps::OutputMap'=> '3.33',
+            'ExtUtils::Typemaps::Type'=> '3.33',
+            'Hash::Util'            => '0.20',
+            'Math::BigFloat'        => '1.999726',
+            'Math::BigFloat::Trace' => '0.43',
+            'Math::BigInt'          => '1.999726',
+            'Math::BigInt::Calc'    => '1.999726',
+            'Math::BigInt::CalcEmu' => '1.999726',
+            'Math::BigInt::FastCalc'=> '0.42',
+            'Math::BigInt::Trace'   => '0.43',
+            'Math::BigRat'          => '0.260804',
+            'Module::CoreList'      => '5.20160720',
+            'Module::CoreList::TieHashDelta'=> '5.20160720',
+            'Module::CoreList::Utils'=> '5.20160720',
+            'Net::Cmd'              => '3.09',
+            'Net::Config'           => '3.09',
+            'Net::Domain'           => '3.09',
+            'Net::FTP'              => '3.09',
+            'Net::FTP::A'           => '3.09',
+            'Net::FTP::E'           => '3.09',
+            'Net::FTP::I'           => '3.09',
+            'Net::FTP::L'           => '3.09',
+            'Net::FTP::dataconn'    => '3.09',
+            'Net::NNTP'             => '3.09',
+            'Net::Netrc'            => '3.09',
+            'Net::POP3'             => '3.09',
+            'Net::SMTP'             => '3.09',
+            'Net::Time'             => '3.09',
+            'Parse::CPAN::Meta'     => '1.4422',
+            'Perl::OSType'          => '1.010',
+            'Test2'                 => '1.302045',
+            'Test2::API'            => '1.302045',
+            'Test2::API::Breakage'  => '1.302045',
+            'Test2::API::Context'   => '1.302045',
+            'Test2::API::Instance'  => '1.302045',
+            'Test2::API::Stack'     => '1.302045',
+            'Test2::Event'          => '1.302045',
+            'Test2::Event::Bail'    => '1.302045',
+            'Test2::Event::Diag'    => '1.302045',
+            'Test2::Event::Exception'=> '1.302045',
+            'Test2::Event::Generic' => '1.302045',
+            'Test2::Event::Info'    => '1.302045',
+            'Test2::Event::Note'    => '1.302045',
+            'Test2::Event::Ok'      => '1.302045',
+            'Test2::Event::Plan'    => '1.302045',
+            'Test2::Event::Skip'    => '1.302045',
+            'Test2::Event::Subtest' => '1.302045',
+            'Test2::Event::Waiting' => '1.302045',
+            'Test2::Formatter'      => '1.302045',
+            'Test2::Formatter::TAP' => '1.302045',
+            'Test2::Hub'            => '1.302045',
+            'Test2::Hub::Interceptor'=> '1.302045',
+            'Test2::Hub::Interceptor::Terminator'=> '1.302045',
+            'Test2::Hub::Subtest'   => '1.302045',
+            'Test2::IPC'            => '1.302045',
+            'Test2::IPC::Driver'    => '1.302045',
+            'Test2::IPC::Driver::Files'=> '1.302045',
+            'Test2::Util'           => '1.302045',
+            'Test2::Util::ExternalMeta'=> '1.302045',
+            'Test2::Util::HashBase' => '1.302045',
+            'Test2::Util::Trace'    => '1.302045',
+            'Test::Builder'         => '1.302045',
+            'Test::Builder::Formatter'=> '1.302045',
+            'Test::Builder::Module' => '1.302045',
+            'Test::Builder::Tester' => '1.302045',
+            'Test::Builder::Tester::Color'=> '1.302045',
+            'Test::Builder::TodoDiag'=> '1.302045',
+            'Test::More'            => '1.302045',
+            'Test::Simple'          => '1.302045',
+            'Test::Tester'          => '1.302045',
+            'Test::Tester::Capture' => '1.302045',
+            'Test::Tester::CaptureRunner'=> '1.302045',
+            'Test::Tester::Delegate'=> '1.302045',
+            'Test::use::ok'         => '1.302045',
+            'Time::HiRes'           => '1.9739',
+            'Unicode'               => '9.0.0',
+            'Unicode::UCD'          => '0.66',
+            'XSLoader'              => '0.22',
+            'bigint'                => '0.43',
+            'bignum'                => '0.43',
+            'bigrat'                => '0.43',
+            'encoding'              => '2.17_01',
+            'encoding::warnings'    => '0.13',
+            'feature'               => '1.45',
+            'ok'                    => '1.302045',
+            'version'               => '0.9917',
+            'version::regex'        => '0.9917',
+            'warnings'              => '1.37',
+        },
+        removed => {
+        }
+    },
+    5.025004 => {
+        delta_from => 5.025003,
+        changed => {
+            'App::Cpan'             => '1.64_01',
+            'App::Prove'            => '3.36_01',
+            'App::Prove::State'     => '3.36_01',
+            'App::Prove::State::Result'=> '3.36_01',
+            'App::Prove::State::Result::Test'=> '3.36_01',
+            'Archive::Tar'          => '2.10',
+            'Archive::Tar::Constant'=> '2.10',
+            'Archive::Tar::File'    => '2.10',
+            'B'                     => '1.63',
+            'B::Concise'            => '0.998',
+            'B::Deparse'            => '1.38',
+            'B::Op_private'         => '5.025004',
+            'CPAN'                  => '2.14_01',
+            'CPAN::Meta'            => '2.150010',
+            'CPAN::Meta::Converter' => '2.150010',
+            'CPAN::Meta::Feature'   => '2.150010',
+            'CPAN::Meta::History'   => '2.150010',
+            'CPAN::Meta::Merge'     => '2.150010',
+            'CPAN::Meta::Prereqs'   => '2.150010',
+            'CPAN::Meta::Spec'      => '2.150010',
+            'CPAN::Meta::Validator' => '2.150010',
+            'Carp'                  => '1.42',
+            'Carp::Heavy'           => '1.42',
+            'Compress::Zlib'        => '2.069_01',
+            'Config'                => '5.025004',
+            'Config::Perl::V'       => '0.27',
+            'Cwd'                   => '3.65',
+            'Digest'                => '1.17_01',
+            'Digest::SHA'           => '5.96',
+            'Encode'                => '2.86',
+            'Errno'                 => '1.26',
+            'ExtUtils::Command'     => '7.24',
+            'ExtUtils::Command::MM' => '7.24',
+            'ExtUtils::Liblist'     => '7.24',
+            'ExtUtils::Liblist::Kid'=> '7.24',
+            'ExtUtils::MM'          => '7.24',
+            'ExtUtils::MM_AIX'      => '7.24',
+            'ExtUtils::MM_Any'      => '7.24',
+            'ExtUtils::MM_BeOS'     => '7.24',
+            'ExtUtils::MM_Cygwin'   => '7.24',
+            'ExtUtils::MM_DOS'      => '7.24',
+            'ExtUtils::MM_Darwin'   => '7.24',
+            'ExtUtils::MM_MacOS'    => '7.24',
+            'ExtUtils::MM_NW5'      => '7.24',
+            'ExtUtils::MM_OS2'      => '7.24',
+            'ExtUtils::MM_QNX'      => '7.24',
+            'ExtUtils::MM_UWIN'     => '7.24',
+            'ExtUtils::MM_Unix'     => '7.24',
+            'ExtUtils::MM_VMS'      => '7.24',
+            'ExtUtils::MM_VOS'      => '7.24',
+            'ExtUtils::MM_Win32'    => '7.24',
+            'ExtUtils::MM_Win95'    => '7.24',
+            'ExtUtils::MY'          => '7.24',
+            'ExtUtils::MakeMaker'   => '7.24',
+            'ExtUtils::MakeMaker::Config'=> '7.24',
+            'ExtUtils::MakeMaker::Locale'=> '7.24',
+            'ExtUtils::MakeMaker::version'=> '7.24',
+            'ExtUtils::MakeMaker::version::regex'=> '7.24',
+            'ExtUtils::Mkbootstrap' => '7.24',
+            'ExtUtils::Mksymlists'  => '7.24',
+            'ExtUtils::testlib'     => '7.24',
+            'File::Fetch'           => '0.52',
+            'File::Spec'            => '3.65',
+            'File::Spec::AmigaOS'   => '3.65',
+            'File::Spec::Cygwin'    => '3.65',
+            'File::Spec::Epoc'      => '3.65',
+            'File::Spec::Functions' => '3.65',
+            'File::Spec::Mac'       => '3.65',
+            'File::Spec::OS2'       => '3.65',
+            'File::Spec::Unix'      => '3.65',
+            'File::Spec::VMS'       => '3.65',
+            'File::Spec::Win32'     => '3.65',
+            'HTTP::Tiny'            => '0.064',
+            'Hash::Util'            => '0.21',
+            'I18N::LangTags'        => '0.41',
+            'I18N::LangTags::Detect'=> '1.06',
+            'IO'                    => '1.37',
+            'IO::Compress::Adapter::Bzip2'=> '2.069_01',
+            'IO::Compress::Adapter::Deflate'=> '2.069_01',
+            'IO::Compress::Adapter::Identity'=> '2.069_01',
+            'IO::Compress::Base'    => '2.069_01',
+            'IO::Compress::Base::Common'=> '2.069_01',
+            'IO::Compress::Bzip2'   => '2.069_01',
+            'IO::Compress::Deflate' => '2.069_01',
+            'IO::Compress::Gzip'    => '2.069_01',
+            'IO::Compress::Gzip::Constants'=> '2.069_01',
+            'IO::Compress::RawDeflate'=> '2.069_01',
+            'IO::Compress::Zip'     => '2.069_01',
+            'IO::Compress::Zip::Constants'=> '2.069_01',
+            'IO::Compress::Zlib::Constants'=> '2.069_01',
+            'IO::Compress::Zlib::Extra'=> '2.069_01',
+            'IO::Socket::IP'        => '0.38',
+            'IO::Uncompress::Adapter::Bunzip2'=> '2.069_01',
+            'IO::Uncompress::Adapter::Identity'=> '2.069_01',
+            'IO::Uncompress::Adapter::Inflate'=> '2.069_01',
+            'IO::Uncompress::AnyInflate'=> '2.069_01',
+            'IO::Uncompress::AnyUncompress'=> '2.069_01',
+            'IO::Uncompress::Base'  => '2.069_01',
+            'IO::Uncompress::Bunzip2'=> '2.069_01',
+            'IO::Uncompress::Gunzip'=> '2.069_01',
+            'IO::Uncompress::Inflate'=> '2.069_01',
+            'IO::Uncompress::RawInflate'=> '2.069_01',
+            'IO::Uncompress::Unzip' => '2.069_01',
+            'IPC::Cmd'              => '0.96',
+            'JSON::PP'              => '2.27400_01',
+            'Locale::Maketext'      => '1.28',
+            'Locale::Maketext::Simple'=> '0.21_01',
+            'Math::BigFloat::Trace' => '0.43_01',
+            'Math::BigInt::Trace'   => '0.43_01',
+            'Memoize'               => '1.03_01',
+            'Module::CoreList'      => '5.20160820',
+            'Module::CoreList::TieHashDelta'=> '5.20160820',
+            'Module::CoreList::Utils'=> '5.20160820',
+            'Module::Load::Conditional'=> '0.68',
+            'Module::Metadata'      => '1.000033',
+            'NEXT'                  => '0.67',
+            'Net::Cmd'              => '3.10',
+            'Net::Config'           => '3.10',
+            'Net::Domain'           => '3.10',
+            'Net::FTP'              => '3.10',
+            'Net::FTP::A'           => '3.10',
+            'Net::FTP::E'           => '3.10',
+            'Net::FTP::I'           => '3.10',
+            'Net::FTP::L'           => '3.10',
+            'Net::FTP::dataconn'    => '3.10',
+            'Net::NNTP'             => '3.10',
+            'Net::Netrc'            => '3.10',
+            'Net::POP3'             => '3.10',
+            'Net::Ping'             => '2.44',
+            'Net::SMTP'             => '3.10',
+            'Net::Time'             => '3.10',
+            'Opcode'                => '1.37',
+            'POSIX'                 => '1.71',
+            'Parse::CPAN::Meta'     => '2.150010',
+            'Pod::Html'             => '1.2201',
+            'Pod::Perldoc'          => '3.27',
+            'Pod::Perldoc::BaseTo'  => '3.27',
+            'Pod::Perldoc::GetOptsOO'=> '3.27',
+            'Pod::Perldoc::ToANSI'  => '3.27',
+            'Pod::Perldoc::ToChecker'=> '3.27',
+            'Pod::Perldoc::ToMan'   => '3.27',
+            'Pod::Perldoc::ToNroff' => '3.27',
+            'Pod::Perldoc::ToPod'   => '3.27',
+            'Pod::Perldoc::ToRtf'   => '3.27',
+            'Pod::Perldoc::ToTerm'  => '3.27',
+            'Pod::Perldoc::ToText'  => '3.27',
+            'Pod::Perldoc::ToTk'    => '3.27',
+            'Pod::Perldoc::ToXml'   => '3.27',
+            'Storable'              => '2.57',
+            'Sys::Syslog'           => '0.34_01',
+            'TAP::Base'             => '3.36_01',
+            'TAP::Formatter::Base'  => '3.36_01',
+           'TAP::Formatter::Color' => '3.36_01',
+            'TAP::Formatter::Console'=> '3.36_01',
+            'TAP::Formatter::Console::ParallelSession'=> '3.36_01',
+            'TAP::Formatter::Console::Session'=> '3.36_01',
+            'TAP::Formatter::File'  => '3.36_01',
+            'TAP::Formatter::File::Session'=> '3.36_01',
+            'TAP::Formatter::Session'=> '3.36_01',
+            'TAP::Harness'          => '3.36_01',
+            'TAP::Harness::Env'     => '3.36_01',
+            'TAP::Object'           => '3.36_01',
+            'TAP::Parser'           => '3.36_01',
+            'TAP::Parser::Aggregator'=> '3.36_01',
+            'TAP::Parser::Grammar'  => '3.36_01',
+            'TAP::Parser::Iterator' => '3.36_01',
+            'TAP::Parser::Iterator::Array'=> '3.36_01',
+            'TAP::Parser::Iterator::Process'=> '3.36_01',
+            'TAP::Parser::Iterator::Stream'=> '3.36_01',
+            'TAP::Parser::IteratorFactory'=> '3.36_01',
+            'TAP::Parser::Multiplexer'=> '3.36_01',
+            'TAP::Parser::Result'   => '3.36_01',
+            'TAP::Parser::Result::Bailout'=> '3.36_01',
+            'TAP::Parser::Result::Comment'=> '3.36_01',
+            'TAP::Parser::Result::Plan'=> '3.36_01',
+            'TAP::Parser::Result::Pragma'=> '3.36_01',
+            'TAP::Parser::Result::Test'=> '3.36_01',
+            'TAP::Parser::Result::Unknown'=> '3.36_01',
+            'TAP::Parser::Result::Version'=> '3.36_01',
+            'TAP::Parser::Result::YAML'=> '3.36_01',
+            'TAP::Parser::ResultFactory'=> '3.36_01',
+            'TAP::Parser::Scheduler'=> '3.36_01',
+            'TAP::Parser::Scheduler::Job'=> '3.36_01',
+            'TAP::Parser::Scheduler::Spinner'=> '3.36_01',
+            'TAP::Parser::Source'   => '3.36_01',
+            'TAP::Parser::SourceHandler'=> '3.36_01',
+            'TAP::Parser::SourceHandler::Executable'=> '3.36_01',
+            'TAP::Parser::SourceHandler::File'=> '3.36_01',
+            'TAP::Parser::SourceHandler::Handle'=> '3.36_01',
+            'TAP::Parser::SourceHandler::Perl'=> '3.36_01',
+            'TAP::Parser::SourceHandler::RawTAP'=> '3.36_01',
+            'TAP::Parser::YAMLish::Reader'=> '3.36_01',
+            'TAP::Parser::YAMLish::Writer'=> '3.36_01',
+            'Test'                  => '1.29',
+            'Test2'                 => '1.302052',
+            'Test2::API'            => '1.302052',
+            'Test2::API::Breakage'  => '1.302052',
+            'Test2::API::Context'   => '1.302052',
+            'Test2::API::Instance'  => '1.302052',
+            'Test2::API::Stack'     => '1.302052',
+            'Test2::Event'          => '1.302052',
+            'Test2::Event::Bail'    => '1.302052',
+            'Test2::Event::Diag'    => '1.302052',
+            'Test2::Event::Exception'=> '1.302052',
+            'Test2::Event::Generic' => '1.302052',
+            'Test2::Event::Info'    => '1.302052',
+            'Test2::Event::Note'    => '1.302052',
+            'Test2::Event::Ok'      => '1.302052',
+            'Test2::Event::Plan'    => '1.302052',
+            'Test2::Event::Skip'    => '1.302052',
+            'Test2::Event::Subtest' => '1.302052',
+            'Test2::Event::Waiting' => '1.302052',
+            'Test2::Formatter'      => '1.302052',
+            'Test2::Formatter::TAP' => '1.302052',
+            'Test2::Hub'            => '1.302052',
+            'Test2::Hub::Interceptor'=> '1.302052',
+            'Test2::Hub::Interceptor::Terminator'=> '1.302052',
+            'Test2::Hub::Subtest'   => '1.302052',
+            'Test2::IPC'            => '1.302052',
+            'Test2::IPC::Driver'    => '1.302052',
+            'Test2::IPC::Driver::Files'=> '1.302052',
+            'Test2::Util'           => '1.302052',
+            'Test2::Util::ExternalMeta'=> '1.302052',
+            'Test2::Util::HashBase' => '1.302052',
+            'Test2::Util::Trace'    => '1.302052',
+            'Test::Builder'         => '1.302052',
+            'Test::Builder::Formatter'=> '1.302052',
+            'Test::Builder::Module' => '1.302052',
+            'Test::Builder::Tester' => '1.302052',
+            'Test::Builder::Tester::Color'=> '1.302052',
+            'Test::Builder::TodoDiag'=> '1.302052',
+            'Test::Harness'         => '3.36_01',
+            'Test::More'            => '1.302052',
+            'Test::Simple'          => '1.302052',
+            'Test::Tester'          => '1.302052',
+            'Test::Tester::Capture' => '1.302052',
+            'Test::Tester::CaptureRunner'=> '1.302052',
+            'Test::Tester::Delegate'=> '1.302052',
+            'Test::use::ok'         => '1.302052',
+            'Tie::Hash::NamedCapture'=> '0.10',
+            'Time::Local'           => '1.24',
+            'XS::APItest'           => '0.83',
+            'arybase'               => '0.12',
+            'base'                  => '2.24',
+            'bigint'                => '0.43_01',
+            'bignum'                => '0.43_01',
+            'bigrat'                => '0.43_01',
+            'encoding'              => '2.18',
+            'ok'                    => '1.302052',
+        },
+        removed => {
+        }
+    },
+    5.025005 => {
+        delta_from => 5.025004,
+        changed => {
+            'B::Op_private'         => '5.025005',
+            'Config'                => '5.025005',
+            'Filter::Simple'        => '0.93',
+            'Locale::Codes'         => '3.40',
+            'Locale::Codes::Constants'=> '3.40',
+            'Locale::Codes::Country'=> '3.40',
+            'Locale::Codes::Country_Codes'=> '3.40',
+            'Locale::Codes::Country_Retired'=> '3.40',
+            'Locale::Codes::Currency'=> '3.40',
+            'Locale::Codes::Currency_Codes'=> '3.40',
+            'Locale::Codes::Currency_Retired'=> '3.40',
+            'Locale::Codes::LangExt'=> '3.40',
+            'Locale::Codes::LangExt_Codes'=> '3.40',
+            'Locale::Codes::LangExt_Retired'=> '3.40',
+            'Locale::Codes::LangFam'=> '3.40',
+            'Locale::Codes::LangFam_Codes'=> '3.40',
+            'Locale::Codes::LangFam_Retired'=> '3.40',
+            'Locale::Codes::LangVar'=> '3.40',
+            'Locale::Codes::LangVar_Codes'=> '3.40',
+            'Locale::Codes::LangVar_Retired'=> '3.40',
+            'Locale::Codes::Language'=> '3.40',
+            'Locale::Codes::Language_Codes'=> '3.40',
+            'Locale::Codes::Language_Retired'=> '3.40',
+            'Locale::Codes::Script' => '3.40',
+            'Locale::Codes::Script_Codes'=> '3.40',
+            'Locale::Codes::Script_Retired'=> '3.40',
+            'Locale::Country'       => '3.40',
+            'Locale::Currency'      => '3.40',
+            'Locale::Language'      => '3.40',
+            'Locale::Script'        => '3.40',
+            'Module::CoreList'      => '5.20160920',
+            'Module::CoreList::TieHashDelta'=> '5.20160920',
+            'Module::CoreList::Utils'=> '5.20160920',
+            'POSIX'                 => '1.72',
+            'Sys::Syslog'           => '0.35',
+            'Test2'                 => '1.302056',
+            'Test2::API'            => '1.302056',
+            'Test2::API::Breakage'  => '1.302056',
+            'Test2::API::Context'   => '1.302056',
+            'Test2::API::Instance'  => '1.302056',
+            'Test2::API::Stack'     => '1.302056',
+            'Test2::Event'          => '1.302056',
+            'Test2::Event::Bail'    => '1.302056',
+            'Test2::Event::Diag'    => '1.302056',
+            'Test2::Event::Exception'=> '1.302056',
+            'Test2::Event::Generic' => '1.302056',
+            'Test2::Event::Info'    => '1.302056',
+            'Test2::Event::Note'    => '1.302056',
+            'Test2::Event::Ok'      => '1.302056',
+            'Test2::Event::Plan'    => '1.302056',
+            'Test2::Event::Skip'    => '1.302056',
+            'Test2::Event::Subtest' => '1.302056',
+            'Test2::Event::Waiting' => '1.302056',
+            'Test2::Formatter'      => '1.302056',
+            'Test2::Formatter::TAP' => '1.302056',
+            'Test2::Hub'            => '1.302056',
+            'Test2::Hub::Interceptor'=> '1.302056',
+            'Test2::Hub::Interceptor::Terminator'=> '1.302056',
+            'Test2::Hub::Subtest'   => '1.302056',
+            'Test2::IPC'            => '1.302056',
+            'Test2::IPC::Driver'    => '1.302056',
+            'Test2::IPC::Driver::Files'=> '1.302056',
+            'Test2::Util'           => '1.302056',
+            'Test2::Util::ExternalMeta'=> '1.302056',
+            'Test2::Util::HashBase' => '1.302056',
+            'Test2::Util::Trace'    => '1.302056',
+            'Test::Builder'         => '1.302056',
+            'Test::Builder::Formatter'=> '1.302056',
+            'Test::Builder::Module' => '1.302056',
+            'Test::Builder::Tester' => '1.302056',
+            'Test::Builder::Tester::Color'=> '1.302056',
+            'Test::Builder::TodoDiag'=> '1.302056',
+            'Test::More'            => '1.302056',
+            'Test::Simple'          => '1.302056',
+            'Test::Tester'          => '1.302056',
+            'Test::Tester::Capture' => '1.302056',
+            'Test::Tester::CaptureRunner'=> '1.302056',
+            'Test::Tester::Delegate'=> '1.302056',
+            'Test::use::ok'         => '1.302056',
+            'Thread::Semaphore'     => '2.13',
+            'XS::APItest'           => '0.84',
+            'XSLoader'              => '0.24',
+            'ok'                    => '1.302056',
+        },
+        removed => {
+        }
+    },
+    5.025006 => {
+        delta_from => 5.025005,
+        changed => {
+            'Archive::Tar'          => '2.14',
+            'Archive::Tar::Constant'=> '2.14',
+            'Archive::Tar::File'    => '2.14',
+            'B'                     => '1.64',
+            'B::Concise'            => '0.999',
+            'B::Deparse'            => '1.39',
+            'B::Op_private'         => '5.025006',
+            'Config'                => '5.025006',
+            'Data::Dumper'          => '2.162',
+            'Devel::Peek'           => '1.25',
+            'HTTP::Tiny'            => '0.070',
+            'List::Util'            => '1.46',
+            'List::Util::XS'        => '1.46',
+            'Module::CoreList'      => '5.20161020',
+            'Module::CoreList::TieHashDelta'=> '5.20161020',
+            'Module::CoreList::Utils'=> '5.20161020',
+            'Net::Ping'             => '2.51',
+            'OS2::DLL'              => '1.07',
+            'Opcode'                => '1.38',
+            'POSIX'                 => '1.73',
+            'PerlIO::encoding'      => '0.25',
+            'Pod::Man'              => '4.08',
+            'Pod::ParseLink'        => '4.08',
+            'Pod::Text'             => '4.08',
+            'Pod::Text::Color'      => '4.08',
+            'Pod::Text::Overstrike' => '4.08',
+            'Pod::Text::Termcap'    => '4.08',
+            'Scalar::Util'          => '1.46',
+            'Storable'              => '2.58',
+            'Sub::Util'             => '1.46',
+            'Test2'                 => '1.302059',
+            'Test2::API'            => '1.302059',
+            'Test2::API::Breakage'  => '1.302059',
+            'Test2::API::Context'   => '1.302059',
+            'Test2::API::Instance'  => '1.302059',
+            'Test2::API::Stack'     => '1.302059',
+            'Test2::Event'          => '1.302059',
+            'Test2::Event::Bail'    => '1.302059',
+            'Test2::Event::Diag'    => '1.302059',
+            'Test2::Event::Exception'=> '1.302059',
+            'Test2::Event::Generic' => '1.302059',
+            'Test2::Event::Info'    => '1.302059',
+            'Test2::Event::Note'    => '1.302059',
+            'Test2::Event::Ok'      => '1.302059',
+            'Test2::Event::Plan'    => '1.302059',
+            'Test2::Event::Skip'    => '1.302059',
+            'Test2::Event::Subtest' => '1.302059',
+            'Test2::Event::Waiting' => '1.302059',
+            'Test2::Formatter'      => '1.302059',
+            'Test2::Formatter::TAP' => '1.302059',
+            'Test2::Hub'            => '1.302059',
+            'Test2::Hub::Interceptor'=> '1.302059',
+            'Test2::Hub::Interceptor::Terminator'=> '1.302059',
+            'Test2::Hub::Subtest'   => '1.302059',
+            'Test2::IPC'            => '1.302059',
+            'Test2::IPC::Driver'    => '1.302059',
+            'Test2::IPC::Driver::Files'=> '1.302059',
+            'Test2::Util'           => '1.302059',
+            'Test2::Util::ExternalMeta'=> '1.302059',
+            'Test2::Util::HashBase' => '1.302059',
+            'Test2::Util::Trace'    => '1.302059',
+            'Test::Builder'         => '1.302059',
+            'Test::Builder::Formatter'=> '1.302059',
+            'Test::Builder::Module' => '1.302059',
+            'Test::Builder::Tester' => '1.302059',
+            'Test::Builder::Tester::Color'=> '1.302059',
+            'Test::Builder::TodoDiag'=> '1.302059',
+            'Test::More'            => '1.302059',
+            'Test::Simple'          => '1.302059',
+            'Test::Tester'          => '1.302059',
+            'Test::Tester::Capture' => '1.302059',
+            'Test::Tester::CaptureRunner'=> '1.302059',
+            'Test::Tester::Delegate'=> '1.302059',
+            'Test::use::ok'         => '1.302059',
+            'Time::HiRes'           => '1.9740_01',
+            'VMS::Stdio'            => '2.42',
+            'XS::APItest'           => '0.86',
+            'attributes'            => '0.28',
+            'mro'                   => '1.19',
+            'ok'                    => '1.302059',
+            'overload'              => '1.27',
+            'parent'                => '0.236',
+        },
+        removed => {
+        }
+    },
+    5.025007 => {
+        delta_from => 5.025006,
+        changed => {
+            'Archive::Tar'          => '2.18',
+            'Archive::Tar::Constant'=> '2.18',
+            'Archive::Tar::File'    => '2.18',
+            'B'                     => '1.65',
+            'B::Op_private'         => '5.025007',
+            'Config'                => '5.025007',
+            'Cwd'                   => '3.66',
+            'Data::Dumper'          => '2.165',
+            'Devel::Peek'           => '1.26',
+            'DynaLoader'            => '1.40',
+            'Errno'                 => '1.27',
+            'ExtUtils::ParseXS::Utilities'=> '3.34',
+            'File::Spec'            => '3.66',
+            'File::Spec::AmigaOS'   => '3.66',
+            'File::Spec::Cygwin'    => '3.66',
+            'File::Spec::Epoc'      => '3.66',
+            'File::Spec::Functions' => '3.66',
+            'File::Spec::Mac'       => '3.66',
+            'File::Spec::OS2'       => '3.66',
+            'File::Spec::Unix'      => '3.66',
+            'File::Spec::VMS'       => '3.66',
+            'File::Spec::Win32'     => '3.66',
+            'Hash::Util'            => '0.22',
+            'JSON::PP'              => '2.27400_02',
+            'List::Util'            => '1.46_02',
+            'List::Util::XS'        => '1.46_02',
+            'Math::BigFloat'        => '1.999727',
+            'Math::BigInt'          => '1.999727',
+            'Math::BigInt::Calc'    => '1.999727',
+            'Math::BigInt::CalcEmu' => '1.999727',
+            'Math::Complex'         => '1.5901',
+            'Module::CoreList'      => '5.20161120',
+            'Module::CoreList::TieHashDelta'=> '5.20161120',
+            'Module::CoreList::Utils'=> '5.20161120',
+            'Net::Ping'             => '2.55',
+            'Opcode'                => '1.39',
+            'POSIX'                 => '1.75',
+            'Pod::Man'              => '4.09',
+            'Pod::ParseLink'        => '4.09',
+            'Pod::Text'             => '4.09',
+            'Pod::Text::Color'      => '4.09',
+            'Pod::Text::Overstrike' => '4.09',
+            'Pod::Text::Termcap'    => '4.09',
+            'Scalar::Util'          => '1.46_02',
+            'Storable'              => '2.59',
+            'Sub::Util'             => '1.46_02',
+            'Term::ANSIColor'       => '4.06',
+            'Test2'                 => '1.302062',
+            'Test2::API'            => '1.302062',
+            'Test2::API::Breakage'  => '1.302062',
+            'Test2::API::Context'   => '1.302062',
+            'Test2::API::Instance'  => '1.302062',
+            'Test2::API::Stack'     => '1.302062',
+            'Test2::Event'          => '1.302062',
+            'Test2::Event::Bail'    => '1.302062',
+            'Test2::Event::Diag'    => '1.302062',
+            'Test2::Event::Exception'=> '1.302062',
+            'Test2::Event::Generic' => '1.302062',
+            'Test2::Event::Info'    => '1.302062',
+            'Test2::Event::Note'    => '1.302062',
+            'Test2::Event::Ok'      => '1.302062',
+            'Test2::Event::Plan'    => '1.302062',
+            'Test2::Event::Skip'    => '1.302062',
+            'Test2::Event::Subtest' => '1.302062',
+            'Test2::Event::Waiting' => '1.302062',
+            'Test2::Formatter'      => '1.302062',
+            'Test2::Formatter::TAP' => '1.302062',
+            'Test2::Hub'            => '1.302062',
+            'Test2::Hub::Interceptor'=> '1.302062',
+            'Test2::Hub::Interceptor::Terminator'=> '1.302062',
+            'Test2::Hub::Subtest'   => '1.302062',
+            'Test2::IPC'            => '1.302062',
+            'Test2::IPC::Driver'    => '1.302062',
+            'Test2::IPC::Driver::Files'=> '1.302062',
+            'Test2::Util'           => '1.302062',
+            'Test2::Util::ExternalMeta'=> '1.302062',
+            'Test2::Util::HashBase' => '1.302062',
+            'Test2::Util::Trace'    => '1.302062',
+            'Test::Builder'         => '1.302062',
+            'Test::Builder::Formatter'=> '1.302062',
+            'Test::Builder::Module' => '1.302062',
+            'Test::Builder::Tester' => '1.302062',
+            'Test::Builder::Tester::Color'=> '1.302062',
+            'Test::Builder::TodoDiag'=> '1.302062',
+            'Test::More'            => '1.302062',
+            'Test::Simple'          => '1.302062',
+            'Test::Tester'          => '1.302062',
+            'Test::Tester::Capture' => '1.302062',
+            'Test::Tester::CaptureRunner'=> '1.302062',
+            'Test::Tester::Delegate'=> '1.302062',
+            'Test::use::ok'         => '1.302062',
+            'Time::HiRes'           => '1.9740_03',
+            'Unicode::Collate'      => '1.18',
+            'Unicode::Collate::CJK::Big5'=> '1.18',
+            'Unicode::Collate::CJK::GB2312'=> '1.18',
+            'Unicode::Collate::CJK::JISX0208'=> '1.18',
+            'Unicode::Collate::CJK::Korean'=> '1.18',
+            'Unicode::Collate::CJK::Pinyin'=> '1.18',
+            'Unicode::Collate::CJK::Stroke'=> '1.18',
+            'Unicode::Collate::CJK::Zhuyin'=> '1.18',
+            'Unicode::Collate::Locale'=> '1.18',
+            'Unicode::UCD'          => '0.67',
+            'XS::APItest'           => '0.87',
+            'XS::Typemap'           => '0.15',
+            'mro'                   => '1.20',
+            'ok'                    => '1.302062',
+            'threads'               => '2.10',
+        },
+        removed => {
+        }
+    },
+    5.025008 => {
+        delta_from => 5.025007,
+        changed => {
+            'Archive::Tar'          => '2.24',
+            'Archive::Tar::Constant'=> '2.24',
+            'Archive::Tar::File'    => '2.24',
+            'B::Debug'              => '1.24',
+            'B::Op_private'         => '5.025008',
+            'Config'                => '5.025008',
+            'Data::Dumper'          => '2.166',
+            'Encode'                => '2.88',
+            'Encode::Alias'         => '2.21',
+            'Encode::CN::HZ'        => '2.08',
+            'Encode::MIME::Header'  => '2.24',
+            'Encode::MIME::Name'    => '1.02',
+            'Encode::Unicode'       => '2.1501',
+            'IO'                    => '1.38',
+            'Locale::Codes'         => '3.42',
+            'Locale::Codes::Constants'=> '3.42',
+            'Locale::Codes::Country'=> '3.42',
+            'Locale::Codes::Country_Codes'=> '3.42',
+            'Locale::Codes::Country_Retired'=> '3.42',
+            'Locale::Codes::Currency'=> '3.42',
+            'Locale::Codes::Currency_Codes'=> '3.42',
+            'Locale::Codes::Currency_Retired'=> '3.42',
+            'Locale::Codes::LangExt'=> '3.42',
+            'Locale::Codes::LangExt_Codes'=> '3.42',
+            'Locale::Codes::LangExt_Retired'=> '3.42',
+            'Locale::Codes::LangFam'=> '3.42',
+            'Locale::Codes::LangFam_Codes'=> '3.42',
+            'Locale::Codes::LangFam_Retired'=> '3.42',
+            'Locale::Codes::LangVar'=> '3.42',
+            'Locale::Codes::LangVar_Codes'=> '3.42',
+            'Locale::Codes::LangVar_Retired'=> '3.42',
+            'Locale::Codes::Language'=> '3.42',
+            'Locale::Codes::Language_Codes'=> '3.42',
+            'Locale::Codes::Language_Retired'=> '3.42',
+            'Locale::Codes::Script' => '3.42',
+            'Locale::Codes::Script_Codes'=> '3.42',
+            'Locale::Codes::Script_Retired'=> '3.42',
+            'Locale::Country'       => '3.42',
+            'Locale::Currency'      => '3.42',
+            'Locale::Language'      => '3.42',
+            'Locale::Script'        => '3.42',
+            'Math::BigFloat'        => '1.999806',
+            'Math::BigFloat::Trace' => '0.47',
+            'Math::BigInt'          => '1.999806',
+            'Math::BigInt::Calc'    => '1.999806',
+            'Math::BigInt::CalcEmu' => '1.999806',
+            'Math::BigInt::FastCalc'=> '0.5005',
+            'Math::BigInt::Lib'     => '1.999806',
+            'Math::BigInt::Trace'   => '0.47',
+            'Math::BigRat'          => '0.2611',
+            'Module::CoreList'      => '5.20161220',
+            'Module::CoreList::TieHashDelta'=> '5.20161220',
+            'Module::CoreList::Utils'=> '5.20161220',
+            'POSIX'                 => '1.76',
+            'PerlIO::scalar'        => '0.25',
+            'Pod::Simple'           => '3.35',
+            'Pod::Simple::BlackBox' => '3.35',
+            'Pod::Simple::Checker'  => '3.35',
+            'Pod::Simple::Debug'    => '3.35',
+            'Pod::Simple::DumpAsText'=> '3.35',
+            'Pod::Simple::DumpAsXML'=> '3.35',
+            'Pod::Simple::HTML'     => '3.35',
+            'Pod::Simple::HTMLBatch'=> '3.35',
+            'Pod::Simple::LinkSection'=> '3.35',
+            'Pod::Simple::Methody'  => '3.35',
+            'Pod::Simple::Progress' => '3.35',
+            'Pod::Simple::PullParser'=> '3.35',
+            'Pod::Simple::PullParserEndToken'=> '3.35',
+            'Pod::Simple::PullParserStartToken'=> '3.35',
+            'Pod::Simple::PullParserTextToken'=> '3.35',
+            'Pod::Simple::PullParserToken'=> '3.35',
+            'Pod::Simple::RTF'      => '3.35',
+            'Pod::Simple::Search'   => '3.35',
+            'Pod::Simple::SimpleTree'=> '3.35',
+            'Pod::Simple::Text'     => '3.35',
+            'Pod::Simple::TextContent'=> '3.35',
+            'Pod::Simple::TiedOutFH'=> '3.35',
+            'Pod::Simple::Transcode'=> '3.35',
+            'Pod::Simple::TranscodeDumb'=> '3.35',
+            'Pod::Simple::TranscodeSmart'=> '3.35',
+            'Pod::Simple::XHTML'    => '3.35',
+            'Pod::Simple::XMLOutStream'=> '3.35',
+            'Test2'                 => '1.302073',
+            'Test2::API'            => '1.302073',
+            'Test2::API::Breakage'  => '1.302073',
+            'Test2::API::Context'   => '1.302073',
+            'Test2::API::Instance'  => '1.302073',
+            'Test2::API::Stack'     => '1.302073',
+            'Test2::Event'          => '1.302073',
+            'Test2::Event::Bail'    => '1.302073',
+            'Test2::Event::Diag'    => '1.302073',
+            'Test2::Event::Encoding'=> '1.302073',
+            'Test2::Event::Exception'=> '1.302073',
+            'Test2::Event::Generic' => '1.302073',
+            'Test2::Event::Info'    => '1.302073',
+            'Test2::Event::Note'    => '1.302073',
+            'Test2::Event::Ok'      => '1.302073',
+            'Test2::Event::Plan'    => '1.302073',
+            'Test2::Event::Skip'    => '1.302073',
+            'Test2::Event::Subtest' => '1.302073',
+            'Test2::Event::TAP::Version'=> '1.302073',
+            'Test2::Event::Waiting' => '1.302073',
+            'Test2::Formatter'      => '1.302073',
+            'Test2::Formatter::TAP' => '1.302073',
+            'Test2::Hub'            => '1.302073',
+            'Test2::Hub::Interceptor'=> '1.302073',
+            'Test2::Hub::Interceptor::Terminator'=> '1.302073',
+            'Test2::Hub::Subtest'   => '1.302073',
+            'Test2::IPC'            => '1.302073',
+            'Test2::IPC::Driver'    => '1.302073',
+            'Test2::IPC::Driver::Files'=> '1.302073',
+            'Test2::Tools::Tiny'    => '1.302073',
+            'Test2::Util'           => '1.302073',
+            'Test2::Util::ExternalMeta'=> '1.302073',
+            'Test2::Util::HashBase' => '0.002',
+            'Test2::Util::Trace'    => '1.302073',
+            'Test::Builder'         => '1.302073',
+            'Test::Builder::Formatter'=> '1.302073',
+            'Test::Builder::Module' => '1.302073',
+            'Test::Builder::Tester' => '1.302073',
+            'Test::Builder::Tester::Color'=> '1.302073',
+            'Test::Builder::TodoDiag'=> '1.302073',
+            'Test::More'            => '1.302073',
+            'Test::Simple'          => '1.302073',
+            'Test::Tester'          => '1.302073',
+            'Test::Tester::Capture' => '1.302073',
+            'Test::Tester::CaptureRunner'=> '1.302073',
+            'Test::Tester::Delegate'=> '1.302073',
+            'Test::use::ok'         => '1.302073',
+            'Time::HiRes'           => '1.9741',
+            'Time::Local'           => '1.25',
+            'Unicode::Collate'      => '1.19',
+            'Unicode::Collate::CJK::Big5'=> '1.19',
+            'Unicode::Collate::CJK::GB2312'=> '1.19',
+            'Unicode::Collate::CJK::JISX0208'=> '1.19',
+            'Unicode::Collate::CJK::Korean'=> '1.19',
+            'Unicode::Collate::CJK::Pinyin'=> '1.19',
+            'Unicode::Collate::CJK::Stroke'=> '1.19',
+            'Unicode::Collate::CJK::Zhuyin'=> '1.19',
+            'Unicode::Collate::Locale'=> '1.19',
+            'bigint'                => '0.47',
+            'bignum'                => '0.47',
+            'bigrat'                => '0.47',
+            'encoding'              => '2.19',
+            'ok'                    => '1.302073',
+        },
+        removed => {
+        }
+    },
+    5.024001 => {
+        delta_from => 5.024000,
+        changed => {
+            'App::Cpan'             => '1.63_01',
+            'App::Prove'            => '3.36_01',
+            'App::Prove::State'     => '3.36_01',
+            'App::Prove::State::Result'=> '3.36_01',
+            'App::Prove::State::Result::Test'=> '3.36_01',
+            'Archive::Tar'          => '2.04_01',
+            'Archive::Tar::Constant'=> '2.04_01',
+            'Archive::Tar::File'    => '2.04_01',
+            'B::Op_private'         => '5.024001',
+            'CPAN'                  => '2.11_01',
+            'Compress::Zlib'        => '2.069_001',
+            'Config'                => '5.024001',
+            'Cwd'                   => '3.63_01',
+            'Digest'                => '1.17_01',
+            'Digest::SHA'           => '5.95_01',
+            'Encode'                => '2.80_01',
+            'ExtUtils::Command'     => '7.10_02',
+            'ExtUtils::Command::MM' => '7.10_02',
+            'ExtUtils::Liblist'     => '7.10_02',
+            'ExtUtils::Liblist::Kid'=> '7.10_02',
+            'ExtUtils::MM'          => '7.10_02',
+            'ExtUtils::MM_AIX'      => '7.10_02',
+            'ExtUtils::MM_Any'      => '7.10_02',
+            'ExtUtils::MM_BeOS'     => '7.10_02',
+            'ExtUtils::MM_Cygwin'   => '7.10_02',
+            'ExtUtils::MM_DOS'      => '7.10_02',
+            'ExtUtils::MM_Darwin'   => '7.10_02',
+            'ExtUtils::MM_MacOS'    => '7.10_02',
+            'ExtUtils::MM_NW5'      => '7.10_02',
+            'ExtUtils::MM_OS2'      => '7.10_02',
+            'ExtUtils::MM_QNX'      => '7.10_02',
+            'ExtUtils::MM_UWIN'     => '7.10_02',
+            'ExtUtils::MM_Unix'     => '7.10_02',
+            'ExtUtils::MM_VMS'      => '7.10_02',
+            'ExtUtils::MM_VOS'      => '7.10_02',
+            'ExtUtils::MM_Win32'    => '7.10_02',
+            'ExtUtils::MM_Win95'    => '7.10_02',
+            'ExtUtils::MY'          => '7.10_02',
+            'ExtUtils::MakeMaker'   => '7.10_02',
+            'ExtUtils::MakeMaker::Config'=> '7.10_02',
+            'ExtUtils::Mkbootstrap' => '7.10_02',
+            'ExtUtils::Mksymlists'  => '7.10_02',
+            'ExtUtils::testlib'     => '7.10_02',
+            'File::Fetch'           => '0.48_01',
+            'File::Spec'            => '3.63_01',
+            'File::Spec::Cygwin'    => '3.63_01',
+            'File::Spec::Epoc'      => '3.63_01',
+            'File::Spec::Functions' => '3.63_01',
+            'File::Spec::Mac'       => '3.63_01',
+            'File::Spec::OS2'       => '3.63_01',
+            'File::Spec::Unix'      => '3.63_01',
+            'File::Spec::VMS'       => '3.63_01',
+            'File::Spec::Win32'     => '3.63_01',
+            'HTTP::Tiny'            => '0.056_001',
+            'I18N::LangTags::Detect'=> '1.05_01',
+            'IO'                    => '1.36_01',
+            'IO::Compress::Adapter::Bzip2'=> '2.069_001',
+            'IO::Compress::Adapter::Deflate'=> '2.069_001',
+            'IO::Compress::Adapter::Identity'=> '2.069_001',
+            'IO::Compress::Base'    => '2.069_001',
+            'IO::Compress::Base::Common'=> '2.069_001',
+            'IO::Compress::Bzip2'   => '2.069_001',
+            'IO::Compress::Deflate' => '2.069_001',
+            'IO::Compress::Gzip'    => '2.069_001',
+            'IO::Compress::Gzip::Constants'=> '2.069_001',
+            'IO::Compress::RawDeflate'=> '2.069_001',
+            'IO::Compress::Zip'     => '2.069_001',
+            'IO::Compress::Zip::Constants'=> '2.069_001',
+            'IO::Compress::Zlib::Constants'=> '2.069_001',
+            'IO::Compress::Zlib::Extra'=> '2.069_001',
+            'IO::Uncompress::Adapter::Bunzip2'=> '2.069_001',
+            'IO::Uncompress::Adapter::Identity'=> '2.069_001',
+            'IO::Uncompress::Adapter::Inflate'=> '2.069_001',
+            'IO::Uncompress::AnyInflate'=> '2.069_001',
+            'IO::Uncompress::AnyUncompress'=> '2.069_001',
+            'IO::Uncompress::Base'  => '2.069_001',
+            'IO::Uncompress::Bunzip2'=> '2.069_001',
+            'IO::Uncompress::Gunzip'=> '2.069_001',
+            'IO::Uncompress::Inflate'=> '2.069_001',
+            'IO::Uncompress::RawInflate'=> '2.069_001',
+            'IO::Uncompress::Unzip' => '2.069_001',
+            'IPC::Cmd'              => '0.92_01',
+            'JSON::PP'              => '2.27300_01',
+            'Locale::Maketext'      => '1.26_01',
+            'Locale::Maketext::Simple'=> '0.21_01',
+            'Math::BigFloat::Trace' => '0.42_01',
+            'Math::BigInt::Trace'   => '0.42_01',
+            'Memoize'               => '1.03_01',
+            'Module::CoreList'      => '5.20170114_24',
+            'Module::CoreList::TieHashDelta'=> '5.20170114_24',
+            'Module::CoreList::Utils'=> '5.20170114_24',
+            'Module::Metadata::corpus::BOMTest::UTF16BE'=> undef,
+            'Module::Metadata::corpus::BOMTest::UTF16LE'=> undef,
+            'Module::Metadata::corpus::BOMTest::UTF8'=> '1',
+            'Net::Cmd'              => '3.08_01',
+            'Net::Config'           => '3.08_01',
+            'Net::Domain'           => '3.08_01',
+            'Net::FTP'              => '3.08_01',
+            'Net::FTP::A'           => '3.08_01',
+            'Net::FTP::E'           => '3.08_01',
+            'Net::FTP::I'           => '3.08_01',
+            'Net::FTP::L'           => '3.08_01',
+            'Net::FTP::dataconn'    => '3.08_01',
+            'Net::NNTP'             => '3.08_01',
+            'Net::Netrc'            => '3.08_01',
+            'Net::POP3'             => '3.08_01',
+            'Net::Ping'             => '2.43_01',
+            'Net::SMTP'             => '3.08_01',
+            'Net::Time'             => '3.08_01',
+            'Parse::CPAN::Meta'     => '1.4417_001',
+            'Pod::Html'             => '1.2201',
+            'Pod::Perldoc'          => '3.25_03',
+            'Storable'              => '2.56_01',
+            'Sys::Syslog'           => '0.33_01',
+            'TAP::Base'             => '3.36_01',
+            'TAP::Formatter::Base'  => '3.36_01',
+            'TAP::Formatter::Color' => '3.36_01',
+            'TAP::Formatter::Console'=> '3.36_01',
+            'TAP::Formatter::Console::ParallelSession'=> '3.36_01',
+            'TAP::Formatter::Console::Session'=> '3.36_01',
+            'TAP::Formatter::File'  => '3.36_01',
+            'TAP::Formatter::File::Session'=> '3.36_01',
+            'TAP::Formatter::Session'=> '3.36_01',
+            'TAP::Harness'          => '3.36_01',
+            'TAP::Harness::Env'     => '3.36_01',
+            'TAP::Object'           => '3.36_01',
+            'TAP::Parser'           => '3.36_01',
+            'TAP::Parser::Aggregator'=> '3.36_01',
+            'TAP::Parser::Grammar'  => '3.36_01',
+            'TAP::Parser::Iterator' => '3.36_01',
+            'TAP::Parser::Iterator::Array'=> '3.36_01',
+            'TAP::Parser::Iterator::Process'=> '3.36_01',
+            'TAP::Parser::Iterator::Stream'=> '3.36_01',
+            'TAP::Parser::IteratorFactory'=> '3.36_01',
+            'TAP::Parser::Multiplexer'=> '3.36_01',
+            'TAP::Parser::Result'   => '3.36_01',
+            'TAP::Parser::Result::Bailout'=> '3.36_01',
+            'TAP::Parser::Result::Comment'=> '3.36_01',
+            'TAP::Parser::Result::Plan'=> '3.36_01',
+            'TAP::Parser::Result::Pragma'=> '3.36_01',
+            'TAP::Parser::Result::Test'=> '3.36_01',
+            'TAP::Parser::Result::Unknown'=> '3.36_01',
+            'TAP::Parser::Result::Version'=> '3.36_01',
+            'TAP::Parser::Result::YAML'=> '3.36_01',
+            'TAP::Parser::ResultFactory'=> '3.36_01',
+            'TAP::Parser::Scheduler'=> '3.36_01',
+            'TAP::Parser::Scheduler::Job'=> '3.36_01',
+            'TAP::Parser::Scheduler::Spinner'=> '3.36_01',
+            'TAP::Parser::Source'   => '3.36_01',
+            'TAP::Parser::SourceHandler'=> '3.36_01',
+            'TAP::Parser::SourceHandler::Executable'=> '3.36_01',
+            'TAP::Parser::SourceHandler::File'=> '3.36_01',
+            'TAP::Parser::SourceHandler::Handle'=> '3.36_01',
+            'TAP::Parser::SourceHandler::Perl'=> '3.36_01',
+            'TAP::Parser::SourceHandler::RawTAP'=> '3.36_01',
+            'TAP::Parser::YAMLish::Reader'=> '3.36_01',
+            'TAP::Parser::YAMLish::Writer'=> '3.36_01',
+            'Test'                  => '1.28_01',
+            'Test::Harness'         => '3.36_01',
+            'XSLoader'              => '0.22',
+            'bigint'                => '0.42_01',
+            'bignum'                => '0.42_01',
+            'bigrat'                => '0.42_01',
+        },
+        removed => {
+        }
+    },
 );
 
 sub is_core
@@ -12059,7 +13729,7 @@ sub is_core
         }
         RELEASE:
         foreach my $prn (@releases) {
-            next RELEASE if $prn <= $first_release;
+            next RELEASE if $prn < $first_release;
             last RELEASE if $prn > $perl_version;
             next unless defined(my $next_module_version
                                    = $delta{$prn}->{changed}->{$module});
@@ -12474,7 +14144,6 @@ for my $version (sort { $a <=> $b } keys %delta) {
             'Module::Build::Version'=> 1,
             'Module::Build::YAML'   => 1,
             'Package::Constants'    => 1,
-            'Simple'                => 1,
             'inc::latest'           => 1,
         }
     },
@@ -12632,6 +14301,118 @@ for my $version (sort { $a <=> $b } keys %delta) {
         removed => {
         }
     },
+    5.023006 => {
+        delta_from => 5.023005,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.023007 => {
+        delta_from => 5.023006,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.023008 => {
+        delta_from => 5.023007,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.023009 => {
+        delta_from => 5.023008,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.022002 => {
+        delta_from => 5.022001,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.024000 => {
+        delta_from => 5.023009,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025000 => {
+        delta_from => 5.024,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025001 => {
+        delta_from => 5.025,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025002 => {
+        delta_from => 5.025001,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025003 => {
+        delta_from => 5.025002,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025004 => {
+        delta_from => 5.025003,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025005 => {
+        delta_from => 5.025004,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025006 => {
+        delta_from => 5.025005,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025007 => {
+        delta_from => 5.025006,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025008 => {
+        delta_from => 5.025007,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.024001 => {
+        delta_from => 5.024000,
+        changed => {
+        },
+        removed => {
+        }
+    },
 );
 
 for my $version (sort { $a <=> $b } keys %deprecated) {
@@ -12768,7 +14549,6 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'ExtUtils::MakeMaker::Locale'=> 'cpan',
     'ExtUtils::MakeMaker::version'=> 'cpan',
     'ExtUtils::MakeMaker::version::regex'=> 'cpan',
-    'ExtUtils::MakeMaker::version::vpp'=> 'cpan',
     'ExtUtils::Manifest'    => 'cpan',
     'ExtUtils::Mkbootstrap' => 'cpan',
     'ExtUtils::Mksymlists'  => 'cpan',
@@ -12848,6 +14628,14 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'Locale::Script'        => 'cpan',
     'MIME::Base64'          => 'cpan',
     'MIME::QuotedPrint'     => 'cpan',
+    'Math::BigFloat'        => 'cpan',
+    'Math::BigFloat::Trace' => 'cpan',
+    'Math::BigInt'          => 'cpan',
+    'Math::BigInt::Calc'    => 'cpan',
+    'Math::BigInt::CalcEmu' => 'cpan',
+    'Math::BigInt::FastCalc'=> 'cpan',
+    'Math::BigInt::Trace'   => 'cpan',
+    'Math::BigRat'          => 'cpan',
     'Math::Complex'         => 'cpan',
     'Math::Trig'            => 'cpan',
     'Memoize'               => 'cpan',
@@ -12990,7 +14778,6 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'TAP::Parser::YAMLish::Writer'=> 'cpan',
     'Term::ANSIColor'       => 'cpan',
     'Term::Cap'             => 'cpan',
-    'Test'                  => 'cpan',
     'Test::Builder'         => 'cpan',
     'Test::Builder::IO::Scalar'=> 'cpan',
     'Test::Builder::Module' => 'cpan',
@@ -13009,7 +14796,6 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'Text::Tabs'            => 'cpan',
     'Text::Wrap'            => 'cpan',
     'Tie::RefHash'          => 'cpan',
-    'Time::HiRes'           => 'cpan',
     'Time::Local'           => 'cpan',
     'Time::Piece'           => 'cpan',
     'Time::Seconds'         => 'cpan',
@@ -13025,24 +14811,25 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'Unicode::Normalize'    => 'cpan',
     'Win32'                 => 'cpan',
     'Win32API::File'        => 'cpan',
-    'Win32API::File::ExtUtils::Myconst2perl'=> 'cpan',
+    'Win32API::File::inc::ExtUtils::Myconst2perl'=> 'cpan',
     'autodie'               => 'cpan',
     'autodie::Scope::Guard' => 'cpan',
     'autodie::Scope::GuardStack'=> 'cpan',
-    'autodie::ScopeUtil'    => 'cpan',
+    'autodie::Util'         => 'cpan',
     'autodie::exception'    => 'cpan',
     'autodie::exception::system'=> 'cpan',
     'autodie::hints'        => 'cpan',
     'autodie::skip'         => 'cpan',
+    'bigint'                => 'cpan',
+    'bignum'                => 'cpan',
+    'bigrat'                => 'cpan',
     'encoding'              => 'cpan',
-    'encoding::warnings'    => 'cpan',
     'experimental'          => 'cpan',
     'ok'                    => 'cpan',
     'parent'                => 'cpan',
     'perlfaq'               => 'cpan',
     'version'               => 'cpan',
     'version::regex'        => 'cpan',
-    'version::vpp'          => 'cpan',
 );
 
 %bug_tracker = (
@@ -13085,7 +14872,7 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'CPAN::Meta::History'   => 'https://github.com/Perl-Toolchain-Gang/CPAN-Meta/issues',
     'CPAN::Meta::Merge'     => 'https://github.com/Perl-Toolchain-Gang/CPAN-Meta/issues',
     'CPAN::Meta::Prereqs'   => 'https://github.com/Perl-Toolchain-Gang/CPAN-Meta/issues',
-    'CPAN::Meta::Requirements'=> 'https://github.com/dagolden/CPAN-Meta-Requirements/issues',
+    'CPAN::Meta::Requirements'=> 'https://github.com/Perl-Toolchain-Gang/CPAN-Meta-Requirements/issues',
     'CPAN::Meta::Spec'      => 'https://github.com/Perl-Toolchain-Gang/CPAN-Meta/issues',
     'CPAN::Meta::Validator' => 'https://github.com/Perl-Toolchain-Gang/CPAN-Meta/issues',
     'CPAN::Meta::YAML'      => 'https://github.com/Perl-Toolchain-Gang/YAML-Tiny/issues',
@@ -13169,7 +14956,6 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'ExtUtils::MakeMaker::Locale'=> 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=ExtUtils-MakeMaker',
     'ExtUtils::MakeMaker::version'=> 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=ExtUtils-MakeMaker',
     'ExtUtils::MakeMaker::version::regex'=> 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=ExtUtils-MakeMaker',
-    'ExtUtils::MakeMaker::version::vpp'=> 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=ExtUtils-MakeMaker',
     'ExtUtils::Manifest'    => 'http://github.com/Perl-Toolchain-Gang/ExtUtils-Manifest/issues',
     'ExtUtils::Mkbootstrap' => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=ExtUtils-MakeMaker',
     'ExtUtils::Mksymlists'  => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=ExtUtils-MakeMaker',
@@ -13217,8 +15003,8 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'IPC::SysV'             => undef,
     'JSON::PP'              => undef,
     'JSON::PP::Boolean'     => undef,
-    'List::Util'            => undef,
-    'List::Util::XS'        => undef,
+    'List::Util'            => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Scalar-List-Utils',
+    'List::Util::XS'        => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Scalar-List-Utils',
     'Locale::Codes'         => undef,
     'Locale::Codes::Constants'=> undef,
     'Locale::Codes::Country'=> undef,
@@ -13249,6 +15035,14 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'Locale::Script'        => undef,
     'MIME::Base64'          => undef,
     'MIME::QuotedPrint'     => undef,
+    'Math::BigFloat'        => undef,
+    'Math::BigFloat::Trace' => undef,
+    'Math::BigInt'          => undef,
+    'Math::BigInt::Calc'    => undef,
+    'Math::BigInt::CalcEmu' => undef,
+    'Math::BigInt::FastCalc'=> undef,
+    'Math::BigInt::Trace'   => undef,
+    'Math::BigRat'          => undef,
     'Math::Complex'         => undef,
     'Math::Trig'            => undef,
     'Memoize'               => undef,
@@ -13282,15 +15076,15 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'Net::SMTP'             => undef,
     'Net::Time'             => undef,
     'Params::Check'         => undef,
-    'Parse::CPAN::Meta'     => 'https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta/issues',
+    'Parse::CPAN::Meta'     => 'https://github.com/Perl-Toolchain-Gang/CPAN-Meta/issues',
     'Perl::OSType'          => 'https://github.com/Perl-Toolchain-Gang/Perl-OSType/issues',
     'PerlIO::via::QuotedPrint'=> undef,
     'Pod::Checker'          => undef,
     'Pod::Escapes'          => undef,
     'Pod::Find'             => undef,
     'Pod::InputObjects'     => undef,
-    'Pod::Man'              => undef,
-    'Pod::ParseLink'        => undef,
+    'Pod::Man'              => 'https://rt.cpan.org/Dist/Display.html?Name=podlators',
+    'Pod::ParseLink'        => 'https://rt.cpan.org/Dist/Display.html?Name=podlators',
     'Pod::ParseUtils'       => undef,
     'Pod::Parser'           => undef,
     'Pod::Perldoc'          => undef,
@@ -13336,14 +15130,14 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'Pod::Simple::TranscodeSmart'=> 'https://github.com/perl-pod/pod-simple/issues',
     'Pod::Simple::XHTML'    => 'https://github.com/perl-pod/pod-simple/issues',
     'Pod::Simple::XMLOutStream'=> 'https://github.com/perl-pod/pod-simple/issues',
-    'Pod::Text'             => undef,
-    'Pod::Text::Color'      => undef,
-    'Pod::Text::Overstrike' => undef,
-    'Pod::Text::Termcap'    => undef,
+    'Pod::Text'             => 'https://rt.cpan.org/Dist/Display.html?Name=podlators',
+    'Pod::Text::Color'      => 'https://rt.cpan.org/Dist/Display.html?Name=podlators',
+    'Pod::Text::Overstrike' => 'https://rt.cpan.org/Dist/Display.html?Name=podlators',
+    'Pod::Text::Termcap'    => 'https://rt.cpan.org/Dist/Display.html?Name=podlators',
     'Pod::Usage'            => undef,
-    'Scalar::Util'          => undef,
+    'Scalar::Util'          => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Scalar-List-Utils',
     'Socket'                => undef,
-    'Sub::Util'             => undef,
+    'Sub::Util'             => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Scalar-List-Utils',
     'Sys::Syslog'           => undef,
     'Sys::Syslog::Win32'    => undef,
     'TAP::Base'             => 'http://rt.cpan.org/Public/Dist/Display.html?Name=Test-Harness',
@@ -13389,29 +15183,27 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'TAP::Parser::SourceHandler::RawTAP'=> 'http://rt.cpan.org/Public/Dist/Display.html?Name=Test-Harness',
     'TAP::Parser::YAMLish::Reader'=> 'http://rt.cpan.org/Public/Dist/Display.html?Name=Test-Harness',
     'TAP::Parser::YAMLish::Writer'=> 'http://rt.cpan.org/Public/Dist/Display.html?Name=Test-Harness',
-    'Term::ANSIColor'       => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Term-ANSIColor',
+    'Term::ANSIColor'       => 'https://rt.cpan.org/Dist/Display.html?Name=Term-ANSIColor',
     'Term::Cap'             => undef,
-    'Test'                  => undef,
-    'Test::Builder'         => 'http://github.com/Test-More/test-more/issues/',
-    'Test::Builder::IO::Scalar'=> 'http://github.com/Test-More/test-more/issues/',
-    'Test::Builder::Module' => 'http://github.com/Test-More/test-more/issues/',
-    'Test::Builder::Tester' => 'http://github.com/Test-More/test-more/issues/',
-    'Test::Builder::Tester::Color'=> 'http://github.com/Test-More/test-more/issues/',
+    'Test::Builder'         => 'http://github.com/Test-More/test-more/issues',
+    'Test::Builder::IO::Scalar'=> 'http://github.com/Test-More/test-more/issues',
+    'Test::Builder::Module' => 'http://github.com/Test-More/test-more/issues',
+    'Test::Builder::Tester' => 'http://github.com/Test-More/test-more/issues',
+    'Test::Builder::Tester::Color'=> 'http://github.com/Test-More/test-more/issues',
     'Test::Harness'         => 'http://rt.cpan.org/Public/Dist/Display.html?Name=Test-Harness',
-    'Test::More'            => 'http://github.com/Test-More/test-more/issues/',
-    'Test::Simple'          => 'http://github.com/Test-More/test-more/issues/',
-    'Test::Tester'          => 'http://github.com/Test-More/test-more/issues/',
-    'Test::Tester::Capture' => 'http://github.com/Test-More/test-more/issues/',
-    'Test::Tester::CaptureRunner'=> 'http://github.com/Test-More/test-more/issues/',
-    'Test::Tester::Delegate'=> 'http://github.com/Test-More/test-more/issues/',
-    'Test::use::ok'         => 'http://github.com/Test-More/test-more/issues/',
+    'Test::More'            => 'http://github.com/Test-More/test-more/issues',
+    'Test::Simple'          => 'http://github.com/Test-More/test-more/issues',
+    'Test::Tester'          => 'http://github.com/Test-More/test-more/issues',
+    'Test::Tester::Capture' => 'http://github.com/Test-More/test-more/issues',
+    'Test::Tester::CaptureRunner'=> 'http://github.com/Test-More/test-more/issues',
+    'Test::Tester::Delegate'=> 'http://github.com/Test-More/test-more/issues',
+    'Test::use::ok'         => 'http://github.com/Test-More/test-more/issues',
     'Text::Balanced'        => undef,
     'Text::ParseWords'      => undef,
     'Text::Tabs'            => undef,
     'Text::Wrap'            => undef,
     'Tie::RefHash'          => undef,
-    'Time::HiRes'           => undef,
-    'Time::Local'           => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=Time-Local',
+    'Time::Local'           => 'https://github.com/houseabsolute/Time-Local/issues',
     'Time::Piece'           => undef,
     'Time::Seconds'         => undef,
     'Unicode::Collate'      => undef,
@@ -13426,24 +15218,25 @@ for my $version (sort { $a <=> $b } keys %deprecated) {
     'Unicode::Normalize'    => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Unicode-Normalize',
     'Win32'                 => undef,
     'Win32API::File'        => undef,
-    'Win32API::File::ExtUtils::Myconst2perl'=> undef,
+    'Win32API::File::inc::ExtUtils::Myconst2perl'=> undef,
     'autodie'               => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=autodie',
     'autodie::Scope::Guard' => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=autodie',
     'autodie::Scope::GuardStack'=> 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=autodie',
-    'autodie::ScopeUtil'    => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=autodie',
+    'autodie::Util'         => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=autodie',
     'autodie::exception'    => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=autodie',
     'autodie::exception::system'=> 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=autodie',
     'autodie::hints'        => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=autodie',
     'autodie::skip'         => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=autodie',
+    'bigint'                => undef,
+    'bignum'                => undef,
+    'bigrat'                => undef,
     'encoding'              => undef,
-    'encoding::warnings'    => undef,
     'experimental'          => 'http://rt.cpan.org/Public/Dist/Display.html?Name=experimental',
-    'ok'                    => 'http://github.com/Test-More/test-more/issues/',
+    'ok'                    => 'http://github.com/Test-More/test-more/issues',
     'parent'                => undef,
     'perlfaq'               => 'https://github.com/perl-doc-cats/perlfaq/issues',
     'version'               => 'https://rt.cpan.org/Public/Dist/Display.html?Name=version',
     'version::regex'        => 'https://rt.cpan.org/Public/Dist/Display.html?Name=version',
-    'version::vpp'          => 'https://rt.cpan.org/Public/Dist/Display.html?Name=version',
 );
 
 # Create aliases with trailing zeros for $] use
diff --git a/Master/tlpkg/tlperl/lib/Module/CoreList.pod b/Master/tlpkg/tlperl/lib/Module/CoreList.pod
index d8807bf8b44..0ab1f611d0d 100644
--- a/Master/tlpkg/tlperl/lib/Module/CoreList.pod
+++ b/Master/tlpkg/tlperl/lib/Module/CoreList.pod
@@ -8,9 +8,14 @@ Module::CoreList - what modules shipped with versions of perl
 
  print $Module::CoreList::version{5.00503}{CPAN}; # prints 1.48
 
- print Module::CoreList->first_release('File::Spec');         # prints 5.00405
- print Module::CoreList->first_release_by_date('File::Spec'); # prints 5.005
- print Module::CoreList->first_release('File::Spec', 0.82);   # prints 5.006001
+ print Module::CoreList->first_release('File::Spec');
+ # prints 5.00405
+
+ print Module::CoreList->first_release_by_date('File::Spec');
+ # prints 5.005
+
+ print Module::CoreList->first_release('File::Spec', 0.82);
+ # prints 5.006001
 
  if (Module::CoreList::is_core('File::Spec')) {
    print "File::Spec is a core module\n";
@@ -19,7 +24,7 @@ Module::CoreList - what modules shipped with versions of perl
  print join ', ', Module::CoreList->find_modules(qr/Data/);
     # prints 'Data::Dumper'
  print join ', ',
-            Module::CoreList->find_modules(qr/test::h.*::.*s/i, 5.008008);
+          Module::CoreList->find_modules(qr/test::h.*::.*s/i, 5.008008);
     # prints 'Test::Harness::Assert, Test::Harness::Straps'
 
  print join ", ", @{ $Module::CoreList::families{5.005} };
diff --git a/Master/tlpkg/tlperl/lib/Module/CoreList/TieHashDelta.pm b/Master/tlpkg/tlperl/lib/Module/CoreList/TieHashDelta.pm
index bbe1066ca5f..dedd3ab4995 100644
--- a/Master/tlpkg/tlperl/lib/Module/CoreList/TieHashDelta.pm
+++ b/Master/tlpkg/tlperl/lib/Module/CoreList/TieHashDelta.pm
@@ -3,7 +3,7 @@ package Module::CoreList::TieHashDelta;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '5.20151213';
+$VERSION = '5.20170114_24';
 
 sub TIEHASH {
     my ($class, $changed, $removed, $parent) = @_;
@@ -48,6 +48,9 @@ sub FIRSTKEY {
     my ($self) = @_;
 
     if (not $self->{keys_inflated}) {
+        # exceeds the warning limit of 100 calls since 5.23.2
+        no warnings 'recursion';
+
         # This inflates the whole set of hashes... Somewhat expensive, but saves
         # many tied hash calls later.
         my @parent_keys;
diff --git a/Master/tlpkg/tlperl/lib/Module/CoreList/Utils.pm b/Master/tlpkg/tlperl/lib/Module/CoreList/Utils.pm
index ef82479ca6e..71edc4f4d07 100755
--- a/Master/tlpkg/tlperl/lib/Module/CoreList/Utils.pm
+++ b/Master/tlpkg/tlperl/lib/Module/CoreList/Utils.pm
@@ -6,7 +6,7 @@ use vars qw[$VERSION %utilities];
 use Module::CoreList;
 use Module::CoreList::TieHashDelta;
 
-$VERSION = '5.20151213';
+$VERSION = '5.20170114_24';
 
 sub utilities {
     my $perl = shift;
@@ -1108,6 +1108,118 @@ my %delta = (
         removed => {
         }
     },
+    5.023006 => {
+        delta_from => 5.023005,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.023007 => {
+        delta_from => 5.023006,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.023008 => {
+        delta_from => 5.023007,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.023009 => {
+        delta_from => 5.023008,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.022002 => {
+        delta_from => 5.022001,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.024000 => {
+        delta_from => 5.023009,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025000 => {
+        delta_from => 5.024000,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025001 => {
+        delta_from => 5.025000,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025002 => {
+        delta_from => 5.025001,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025003 => {
+        delta_from => 5.025002,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025004 => {
+        delta_from => 5.025003,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025005 => {
+        delta_from => 5.025004,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025006 => {
+        delta_from => 5.025005,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025007 => {
+        delta_from => 5.025006,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.025008 => {
+        delta_from => 5.025007,
+        changed => {
+        },
+        removed => {
+        }
+    },
+    5.024001 => {
+        delta_from => 5.024000,
+        changed => {
+        },
+        removed => {
+        }
+    },
 );
 
 for my $version (sort { $a <=> $b } keys %delta) {
@@ -1154,8 +1266,11 @@ Module::CoreList::Utils - what utilities shipped with versions of perl
 
  print $Module::CoreList::Utils::utilities{5.009003}{ptar}; # prints 1
 
- print Module::CoreList::Utils->first_release('corelist');           # prints 5.008009
- print Module::CoreList::Utils->first_release_by_date('corelist');   # prints 5.009002
+ print Module::CoreList::Utils->first_release('corelist');
+ # prints 5.008009
+
+ print Module::CoreList::Utils->first_release_by_date('corelist');
+ # prints 5.009002
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/Module/Metadata.pm b/Master/tlpkg/tlperl/lib/Module/Metadata.pm
index 7ea1210a241..f7017cf90ff 100644
--- a/Master/tlpkg/tlperl/lib/Module/Metadata.pm
+++ b/Master/tlpkg/tlperl/lib/Module/Metadata.pm
@@ -1,6 +1,7 @@
 # -*- mode: cperl; tab-width: 8; indent-tabs-mode: nil; basic-offset: 2 -*-
 # vim:ts=8:sw=2:et:sta:sts=2
-package Module::Metadata; # git description: v1.000025-7-g47ca1b2
+package Module::Metadata; # git description: v1.000030-2-g52f466c
+# ABSTRACT: Gather package and POD information from perl module files
 
 # Adapted from Perl-licensed code originally distributed with
 # Module-Build by Ken Williams
@@ -13,7 +14,7 @@ sub __clean_eval { eval $_[0] }
 use strict;
 use warnings;
 
-our $VERSION = '1.000026';
+our $VERSION = '1.000031'; # TRIAL
 
 use Carp qw/croak/;
 use File::Spec;
@@ -26,8 +27,12 @@ BEGIN {
 use version 0.87;
 BEGIN {
   if ($INC{'Log/Contextual.pm'}) {
-    Log::Contextual->import('log_info');
-  } else {
+    require "Log/Contextual/WarnLogger.pm"; # Hide from AutoPrereqs
+    Log::Contextual->import('log_info',
+      '-default_logger' => Log::Contextual::WarnLogger->new({ env_prefix => 'MODULE_METADATA', }),
+    );
+  }
+  else {
     *log_info = sub (&) { warn $_[0]->() };
   }
 }
@@ -170,10 +175,12 @@ sub new_from_module {
           if ( defined( $version ) ) {
             if ( $compare_versions->( $version, '!=', $p->{version} ) ) {
               $err .= "  $p->{file} ($p->{version})\n";
-            } else {
+            }
+            else {
               # same version declared multiple times, ignore
             }
-          } else {
+          }
+          else {
             $file    = $p->{file};
             $version = $p->{version};
           }
@@ -239,7 +246,8 @@ sub new_from_module {
 
     if ( $files ) {
       @files = @$files;
-    } else {
+    }
+    else {
       find( {
         wanted => sub {
           push @files, $_ if -f $_ && /\.pm$/;
@@ -269,12 +277,14 @@ sub new_from_module {
         if ( $package eq $prime_package ) {
           if ( exists( $prime{$package} ) ) {
             croak "Unexpected conflict in '$package'; multiple versions found.\n";
-          } else {
+          }
+          else {
             $mapped_filename = "$package.pm" if lc("$package.pm") eq lc($mapped_filename);
             $prime{$package}{file} = $mapped_filename;
             $prime{$package}{version} = $version if defined( $version );
           }
-        } else {
+        }
+        else {
           push( @{$alt{$package}}, {
                                     file    => $mapped_filename,
                                     version => $version,
@@ -301,7 +311,8 @@ sub new_from_module {
             $result->{err}
           };
 
-        } elsif ( defined( $result->{version} ) ) {
+        }
+        elsif ( defined( $result->{version} ) ) {
         # There is a primary package selected, and exactly one
         # alternative package
 
@@ -321,19 +332,22 @@ sub new_from_module {
             };
           }
 
-        } else {
+        }
+        else {
           # The prime package selected has no version so, we choose to
           # use any alternative package that does have a version
           $prime{$package}{file}    = $result->{file};
           $prime{$package}{version} = $result->{version};
         }
 
-        } else {
+        }
+        else {
         # no alt package found with a version, but we have a prime
         # package so we use it whether it has a version or not
         }
 
-      } else { # No primary package was selected, use the best alternative
+      }
+      else { # No primary package was selected, use the best alternative
 
         if ( $result->{err} ) {
           log_info {
@@ -405,17 +419,12 @@ sub _init {
       $self->{module} = shift(@candidates); # punt
     }
     else {
-      if(grep /main/, @{$self->{packages}}) {
-        $self->{module} = 'main';
-      }
-      else {
-        $self->{module} = $self->{packages}[0] || '';
-      }
+      $self->{module} = 'main';
     }
   }
 
   $self->{version} = $self->{versions}{$self->{module}}
-      if defined( $self->{module} );
+    if defined( $self->{module} );
 
   return $self;
 }
@@ -484,9 +493,11 @@ sub _handle_bom {
   my $encoding;
   if ( $buf eq "\x{FE}\x{FF}" ) {
     $encoding = 'UTF-16BE';
-  } elsif ( $buf eq "\x{FF}\x{FE}" ) {
+  }
+  elsif ( $buf eq "\x{FF}\x{FE}" ) {
     $encoding = 'UTF-16LE';
-  } elsif ( $buf eq "\x{EF}\x{BB}" ) {
+  }
+  elsif ( $buf eq "\x{EF}\x{BB}" ) {
     $buf = ' ';
     $count = read $fh, $buf, length $buf;
     if ( defined $count and $count >= 1 and $buf eq "\x{BF}" ) {
@@ -498,7 +509,8 @@ sub _handle_bom {
     if ( "$]" >= 5.008 ) {
       binmode( $fh, ":encoding($encoding)" );
     }
-  } else {
+  }
+  else {
     seek $fh, $pos, SEEK_SET
       or croak( sprintf "Can't reset position to the top of '$filename'" );
   }
@@ -541,88 +553,91 @@ sub _parse_fh {
           $pod_data = '';
         }
         $pod_sect = $1;
-
-      } elsif ( $self->{collect_pod} ) {
+      }
+      elsif ( $self->{collect_pod} ) {
         $pod_data .= "$line\n";
-
       }
-
-    } elsif ( $is_cut ) {
-
+      next;
+    }
+    elsif ( $is_cut ) {
       if ( $self->{collect_pod} && length( $pod_data ) ) {
         $pod{$pod_sect} = $pod_data;
         $pod_data = '';
       }
       $pod_sect = '';
+      next;
+    }
 
-    } else {
+    # Skip after __END__
+    next if $in_end;
 
-      # Skip after __END__
-      next if $in_end;
+    # Skip comments in code
+    next if $line =~ /^\s*#/;
 
-      # Skip comments in code
-      next if $line =~ /^\s*#/;
+    # Would be nice if we could also check $in_string or something too
+    if ($line eq '__END__') {
+      $in_end++;
+      next;
+    }
 
-      # Would be nice if we could also check $in_string or something too
-      if ($line eq '__END__') {
-        $in_end++;
-        next;
+    last if $line eq '__DATA__';
+
+    # parse $line to see if it's a $VERSION declaration
+    my( $version_sigil, $version_fullname, $version_package ) =
+      index($line, 'VERSION') >= 1
+        ? $self->_parse_version_expression( $line )
+        : ();
+
+    if ( $line =~ /$PKG_REGEXP/o ) {
+      $package = $1;
+      my $version = $2;
+      push( @packages, $package ) unless grep( $package eq $_, @packages );
+      $need_vers = defined $version ? 0 : 1;
+
+      if ( not exists $vers{$package} and defined $version ){
+        # Upgrade to a version object.
+        my $dwim_version = eval { _dwim_version($version) };
+        croak "Version '$version' from $self->{filename} does not appear to be valid:\n$line\n\nThe fatal error was: $@\n"
+          unless defined $dwim_version;  # "0" is OK!
+        $vers{$package} = $dwim_version;
       }
-      last if $line eq '__DATA__';
-
-      # parse $line to see if it's a $VERSION declaration
-      my( $version_sigil, $version_fullname, $version_package ) =
-          index($line, 'VERSION') >= 1
-              ? $self->_parse_version_expression( $line )
-              : ();
-
-      if ( $line =~ /$PKG_REGEXP/o ) {
-        $package = $1;
-        my $version = $2;
-        push( @packages, $package ) unless grep( $package eq $_, @packages );
-        $need_vers = defined $version ? 0 : 1;
-
-        if ( not exists $vers{$package} and defined $version ){
-          # Upgrade to a version object.
-          my $dwim_version = eval { _dwim_version($version) };
-          croak "Version '$version' from $self->{filename} does not appear to be valid:\n$line\n\nThe fatal error was: $@\n"
-              unless defined $dwim_version;  # "0" is OK!
-          $vers{$package} = $dwim_version;
-        }
+    }
 
-      # VERSION defined with full package spec, i.e. $Module::VERSION
-      } elsif ( $version_fullname && $version_package ) {
-        push( @packages, $version_package ) unless grep( $version_package eq $_, @packages );
-        $need_vers = 0 if $version_package eq $package;
+    # VERSION defined with full package spec, i.e. $Module::VERSION
+    elsif ( $version_fullname && $version_package ) {
+      # we do NOT save this package in found @packages
+      $need_vers = 0 if $version_package eq $package;
 
-        unless ( defined $vers{$version_package} && length $vers{$version_package} ) {
+      unless ( defined $vers{$version_package} && length $vers{$version_package} ) {
         $vers{$version_package} = $self->_evaluate_version_line( $version_sigil, $version_fullname, $line );
       }
+    }
 
-      # first non-comment line in undeclared package main is VERSION
-      } elsif ( $package eq 'main' && $version_fullname && !exists($vers{main}) ) {
-        $need_vers = 0;
-        my $v = $self->_evaluate_version_line( $version_sigil, $version_fullname, $line );
-        $vers{$package} = $v;
-        push( @packages, 'main' );
+    # first non-comment line in undeclared package main is VERSION
+    elsif ( $package eq 'main' && $version_fullname && !exists($vers{main}) ) {
+      $need_vers = 0;
+      my $v = $self->_evaluate_version_line( $version_sigil, $version_fullname, $line );
+      $vers{$package} = $v;
+      push( @packages, 'main' );
+    }
 
-      # first non-comment line in undeclared package defines package main
-      } elsif ( $package eq 'main' && !exists($vers{main}) && $line =~ /\w/ ) {
-        $need_vers = 1;
-        $vers{main} = '';
-        push( @packages, 'main' );
+    # first non-comment line in undeclared package defines package main
+    elsif ( $package eq 'main' && !exists($vers{main}) && $line =~ /\w/ ) {
+      $need_vers = 1;
+      $vers{main} = '';
+      push( @packages, 'main' );
+    }
 
-      # only keep if this is the first $VERSION seen
-      } elsif ( $version_fullname && $need_vers ) {
-        $need_vers = 0;
-        my $v = $self->_evaluate_version_line( $version_sigil, $version_fullname, $line );
+    # only keep if this is the first $VERSION seen
+    elsif ( $version_fullname && $need_vers ) {
+      $need_vers = 0;
+      my $v = $self->_evaluate_version_line( $version_sigil, $version_fullname, $line );
 
-        unless ( defined $vers{$package} && length $vers{$package} ) {
-          $vers{$package} = $v;
-        }
+      unless ( defined $vers{$package} && length $vers{$package} ) {
+        $vers{$package} = $v;
       }
     }
-  }
+  } # end loop over each line
 
   if ( $self->{collect_pod} && length($pod_data) ) {
     $pod{$pod_sect} = $pod_data;
@@ -649,7 +664,8 @@ sub _evaluate_version_line {
     sub {
       local $sigil$variable_name;
       $line;
-      \$$variable_name
+      return \$$variable_name if defined \$$variable_name;
+      return \$Module::Metadata::_version::p${pn}::$variable_name;
     };
   };
 
@@ -760,7 +776,8 @@ sub version {
     if ( defined( $mod ) && length( $mod ) &&
          exists( $self->{versions}{$mod} ) ) {
         return $self->{versions}{$mod};
-    } else {
+    }
+    else {
         return undef;
     }
 }
@@ -771,7 +788,8 @@ sub pod {
     if ( defined( $sect ) && length( $sect ) &&
          exists( $self->{pod}{$sect} ) ) {
         return $self->{pod}{$sect};
-    } else {
+    }
+    else {
         return undef;
     }
 }
@@ -790,10 +808,20 @@ sub is_indexable {
 
 1;
 
+__END__
+
+=pod
+
+=encoding UTF-8
+
 =head1 NAME
 
 Module::Metadata - Gather package and POD information from perl module files
 
+=head1 VERSION
+
+version 1.000031
+
 =head1 SYNOPSIS
 
   use Module::Metadata;
@@ -814,13 +842,9 @@ This module provides a standard way to gather metadata about a .pm file through
 version of a module, the C<$VERSION> assignment is C<eval>ed, as is traditional
 in the CPAN toolchain.
 
-=head1 USAGE
+=head1 CLASS METHODS
 
-=head2 Class methods
-
-=over 4
-
-=item C<< new_from_file($filename, collect_pod => 1) >>
+=head2 C<< new_from_file($filename, collect_pod => 1) >>
 
 Constructs a C<Module::Metadata> object given the path to a file.  Returns
 undef if the filename does not exist.
@@ -833,7 +857,7 @@ If the file begins by an UTF-8, UTF-16BE or UTF-16LE byte-order mark, then
 it is skipped before processing, and the content of the file is also decoded
 appropriately starting from perl 5.8.
 
-=item C<< new_from_handle($handle, $filename, collect_pod => 1) >>
+=head2 C<< new_from_handle($handle, $filename, collect_pod => 1) >>
 
 This works just like C<new_from_file>, except that a handle can be provided
 as the first argument.
@@ -846,7 +870,7 @@ mandatory or undef will be returned.
 You are responsible for setting the decoding layers on C<$handle> if
 required.
 
-=item C<< new_from_module($module, collect_pod => 1, inc => \@dirs) >>
+=head2 C<< new_from_module($module, collect_pod => 1, inc => \@dirs) >>
 
 Constructs a C<Module::Metadata> object given a module or package name.
 Returns undef if the module cannot be found.
@@ -860,7 +884,7 @@ If the file that contains the module begins by an UTF-8, UTF-16BE or
 UTF-16LE byte-order mark, then it is skipped before processing, and the
 content of the file is also decoded appropriately starting from perl 5.8.
 
-=item C<< find_module_by_name($module, \@dirs) >>
+=head2 C<< find_module_by_name($module, \@dirs) >>
 
 Returns the path to a module given the module or package name. A list
 of directories can be passed in as an optional parameter, otherwise
@@ -868,7 +892,7 @@ of directories can be passed in as an optional parameter, otherwise
 
 Can be called as either an object or a class method.
 
-=item C<< find_module_dir_by_name($module, \@dirs) >>
+=head2 C<< find_module_dir_by_name($module, \@dirs) >>
 
 Returns the entry in C<@dirs> (or C<@INC> by default) that contains
 the module C<$module>. A list of directories can be passed in as an
@@ -876,7 +900,7 @@ optional parameter, otherwise @INC is searched.
 
 Can be called as either an object or a class method.
 
-=item C<< provides( %options ) >>
+=head2 C<< provides( %options ) >>
 
 This is a convenience wrapper around C<package_versions_from_directory>
 to generate a CPAN META C<provides> data structure.  It takes key/value
@@ -925,7 +949,7 @@ is a hashref of the form:
     'OtherPackage::Name' => ...
   }
 
-=item C<< package_versions_from_directory($dir, \@files?) >>
+=head2 C<< package_versions_from_directory($dir, \@files?) >>
 
 Scans C<$dir> for .pm files (unless C<@files> is given, in which case looks
 for those files in C<$dir> - and reads each file for packages and versions,
@@ -947,36 +971,33 @@ Note that the file path is relative to C<$dir> if that is specified.
 This B<must not> be used directly for CPAN META C<provides>.  See
 the C<provides> method instead.
 
-=item C<< log_info (internal) >>
+=head2 C<< log_info (internal) >>
 
 Used internally to perform logging; imported from Log::Contextual if
 Log::Contextual has already been loaded, otherwise simply calls warn.
 
-=back
+=head1 OBJECT METHODS
 
-=head2 Object methods
-
-=over 4
-
-=item C<< name() >>
+=head2 C<< name() >>
 
 Returns the name of the package represented by this module. If there
 is more than one package, it makes a best guess based on the
 filename. If it's a script (i.e. not a *.pm) the package name is
 'main'.
 
-=item C<< version($package) >>
+=head2 C<< version($package) >>
 
 Returns the version as defined by the $VERSION variable for the
 package as returned by the C<name> method if no arguments are
 given. If given the name of a package it will attempt to return the
 version of that package if it is specified in the file.
 
-=item C<< filename() >>
+=head2 C<< filename() >>
 
 Returns the absolute path to the file.
+Note that this file may not actually exist on disk yet, e.g. if the module was read from an in-memory filehandle.
 
-=item C<< packages_inside() >>
+=head2 C<< packages_inside() >>
 
 Returns a list of packages. Note: this is a raw list of packages
 discovered (or assumed, in the case of C<main>).  It is not
@@ -986,26 +1007,37 @@ for example "Foo:Bar".  Strange but valid package names are
 returned, for example "Foo::Bar::", and are left up to the caller
 on how to handle.
 
-=item C<< pod_inside() >>
+=head2 C<< pod_inside() >>
 
 Returns a list of POD sections.
 
-=item C<< contains_pod() >>
+=head2 C<< contains_pod() >>
 
 Returns true if there is any POD in the file.
 
-=item C<< pod($section) >>
+=head2 C<< pod($section) >>
 
 Returns the POD data in the given section.
 
-=item C<< is_indexable($package) >> or C<< is_indexable() >>
+=head2 C<< is_indexable($package) >> or C<< is_indexable() >>
+
+Available since version 1.000020.
 
 Returns a boolean indicating whether the package (if provided) or any package
 (otherwise) is eligible for indexing by PAUSE, the Perl Authors Upload Server.
 Note This only checks for valid C<package> declarations, and does not take any
 ownership information into account.
 
-=back
+=head1 SUPPORT
+
+Bugs may be submitted through L<the RT bug tracker|https://rt.cpan.org/Public/Dist/Display.html?Name=Module-Metadata>
+(or L<bug-Module-Metadata@rt.cpan.org|mailto:bug-Module-Metadata@rt.cpan.org>).
+
+There is also a mailing list available for users of this distribution, at
+L<http://lists.perl.org/list/cpan-workers.html>.
+
+There is also an irc channel available for users of this distribution, at
+L<irc://irc.perl.org/#toolchain>.
 
 =head1 AUTHOR
 
@@ -1015,6 +1047,102 @@ Original code from Module::Build::ModuleInfo by Ken Williams
 Released as Module::Metadata by Matt S Trout (mst) <mst@shadowcat.co.uk> with
 assistance from David Golden (xdg) <dagolden@cpan.org>.
 
+=head1 CONTRIBUTORS
+
+=for stopwords Karen Etheridge David Golden Vincent Pit Matt S Trout Chris Nehren Graham Knop Olivier Mengué Tomas Doran Tatsuhiko Miyagawa tokuhirom Peter Rabbitson Steve Hay Josh Jore Craig A. Berry Mitchell Steinbrunner Edward Zborowski Gareth Harper James Raspass Jerry D. Hedden 'BinGOs' Williams Kent Fredric
+
+=over 4
+
+=item *
+
+Karen Etheridge <ether@cpan.org>
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=item *
+
+Vincent Pit <perl@profvince.com>
+
+=item *
+
+Matt S Trout <mst@shadowcat.co.uk>
+
+=item *
+
+Chris Nehren <apeiron@cpan.org>
+
+=item *
+
+Graham Knop <haarg@haarg.org>
+
+=item *
+
+Olivier Mengué <dolmen@cpan.org>
+
+=item *
+
+Tomas Doran <bobtfish@bobtfish.net>
+
+=item *
+
+Tatsuhiko Miyagawa <miyagawa@bulknews.net>
+
+=item *
+
+tokuhirom <tokuhirom@gmail.com>
+
+=item *
+
+Peter Rabbitson <ribasushi@cpan.org>
+
+=item *
+
+Steve Hay <steve.m.hay@googlemail.com>
+
+=item *
+
+Josh Jore <jjore@cpan.org>
+
+=item *
+
+Craig A. Berry <cberry@cpan.org>
+
+=item *
+
+David Mitchell <davem@iabyn.com>
+
+=item *
+
+David Steinbrunner <dsteinbrunner@pobox.com>
+
+=item *
+
+Edward Zborowski <ed@rubensteintech.com>
+
+=item *
+
+Gareth Harper <gareth@broadbean.com>
+
+=item *
+
+James Raspass <jraspass@gmail.com>
+
+=item *
+
+Jerry D. Hedden <jdhedden@cpan.org>
+
+=item *
+
+Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
+
+=item *
+
+Kent Fredric <kentnl@cpan.org>
+
+=back
+
 =head1 COPYRIGHT & LICENSE
 
 Original code Copyright (c) 2001-2011 Ken Williams.
@@ -1025,4 +1153,3 @@ This library is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
 =cut
-
diff --git a/Master/tlpkg/tlperl/lib/Net/Cmd.pm b/Master/tlpkg/tlperl/lib/Net/Cmd.pm
index 2614e695391..3a5d4d9a547 100644
--- a/Master/tlpkg/tlperl/lib/Net/Cmd.pm
+++ b/Master/tlpkg/tlperl/lib/Net/Cmd.pm
@@ -2,10 +2,11 @@
 #
 # Versions up to 2.29_1 Copyright (c) 1995-2006 Graham Barr <gbarr@pobox.com>.
 # All rights reserved.
-# Changes in Version 2.29_2 onwards Copyright (C) 2013-2014 Steve Hay.  All
+# Changes in Version 2.29_2 onwards Copyright (C) 2013-2015 Steve Hay.  All
 # rights reserved.
-# This program is free software; you can redistribute it and/or
-# modify it under the same terms as Perl itself.
+# This module is free software; you can redistribute it and/or modify it under
+# the same terms as Perl itself, i.e. under the terms of either the GNU General
+# Public License or the Artistic License, as specified in the F<LICENCE> file.
 
 package Net::Cmd;
 
@@ -17,6 +18,7 @@ use warnings;
 use Carp;
 use Exporter;
 use Symbol 'gensym';
+use Errno 'EINTR';
 
 BEGIN {
   if ($^O eq 'os390') {
@@ -26,22 +28,7 @@ BEGIN {
   }
 }
 
-BEGIN {
-  if (!eval { require utf8 }) {
-    *is_utf8 = sub { 0 };
-  }
-  elsif (eval { utf8::is_utf8(undef); 1 }) {
-    *is_utf8 = \&utf8::is_utf8;
-  }
-  elsif (eval { require Encode; Encode::is_utf8(undef); 1 }) {
-    *is_utf8 = \&Encode::is_utf8;
-  }
-  else {
-    *is_utf8 = sub { $_[0] =~ /[^\x00-\xff]/ };
-  }
-}
-
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 our @ISA     = qw(Exporter);
 our @EXPORT  = qw(CMD_INFO CMD_OK CMD_MORE CMD_REJECT CMD_ERROR CMD_PENDING);
 
@@ -203,7 +190,57 @@ sub set_status {
   1;
 }
 
+sub _syswrite_with_timeout {
+  my $cmd = shift;
+  my $line = shift;
 
+  my $len    = length($line);
+  my $offset = 0;
+  my $win    = "";
+  vec($win, fileno($cmd), 1) = 1;
+  my $timeout = $cmd->timeout || undef;
+  my $initial = time;
+  my $pending = $timeout;
+
+  local $SIG{PIPE} = 'IGNORE' unless $^O eq 'MacOS';
+
+  while ($len) {
+    my $wout;
+    my $nfound = select(undef, $wout = $win, undef, $pending);
+    if ((defined $nfound and $nfound > 0) or -f $cmd)    # -f for testing on win32
+    {
+      my $w = syswrite($cmd, $line, $len, $offset);
+      if (! defined($w) ) {
+        my $err = $!;
+        $cmd->close;
+        $cmd->_set_status_closed($err);
+        return;
+      }
+      $len -= $w;
+      $offset += $w;
+    }
+    elsif ($nfound == -1) {
+      if ( $! == EINTR ) {
+        if ( defined($timeout) ) {
+          redo if ($pending = $timeout - ( time - $initial ) ) > 0;
+          $cmd->_set_status_timeout;
+          return;
+        }
+        redo;
+      }
+      my $err = $!;
+      $cmd->close;
+      $cmd->_set_status_closed($err);
+      return;
+    }
+    else {
+      $cmd->_set_status_timeout;
+      return;
+    }
+  }
+
+  return 1;
+}
 
 sub _set_status_timeout {
   my $cmd = shift;
@@ -215,17 +252,18 @@ sub _set_status_timeout {
 
 sub _set_status_closed {
   my $cmd = shift;
+  my $err = shift;
   my $pkg = ref($cmd) || $cmd;
 
   $cmd->set_status($cmd->DEF_REPLY_CODE, "[$pkg] Connection closed");
   carp(ref($cmd) . ": " . (caller(1))[3]
-    . "(): unexpected EOF on command channel: $!") if $cmd->debug;
+    . "(): unexpected EOF on command channel: $err") if $cmd->debug;
 }
 
 sub _is_closed {
   my $cmd = shift;
   if (!defined fileno($cmd)) {
-     $cmd->_set_status_closed;
+     $cmd->_set_status_closed($!);
      return 1;
   }
   return 0;
@@ -241,8 +279,6 @@ sub command {
     if (exists ${*$cmd}{'net_cmd_last_ch'});
 
   if (scalar(@_)) {
-    local $SIG{PIPE} = 'IGNORE' unless $^O eq 'MacOS';
-
     my $str = join(
       " ",
       map {
@@ -254,17 +290,13 @@ sub command {
     $str = $cmd->toascii($str) if $tr;
     $str .= "\015\012";
 
-    my $len = length $str;
-    my $swlen;
-
     $cmd->debug_print(1, $str)
       if ($cmd->debug);
 
-    unless (defined($swlen = syswrite($cmd,$str,$len)) && $swlen == $len) {
-      $cmd->close;
-      $cmd->_set_status_closed;
-      return $cmd;
-    }
+    # though documented to return undef on failure, the legacy behavior
+    # was to return $cmd even on failure, so this odd construct does that
+    $cmd->_syswrite_with_timeout($str)
+      or return $cmd;
   }
 
   $cmd;
@@ -314,8 +346,9 @@ sub getline {
     my $select_ret = select($rout = $rin, undef, undef, $timeout);
     if ($select_ret > 0) {
       unless (sysread($cmd, $buf = "", 1024)) {
+        my $err = $!;
         $cmd->close;
-        $cmd->_set_status_closed;
+        $cmd->_set_status_closed($err);
         return;
       }
 
@@ -428,9 +461,17 @@ sub datasend {
   my $arr  = @_ == 1 && ref($_[0]) ? $_[0] : \@_;
   my $line = join("", @$arr);
 
-  # encode to individual utf8 bytes if
-  # $line is a string (in internal UTF-8)
-  utf8::encode($line) if is_utf8($line);
+  # Perls < 5.10.1 (with the exception of 5.8.9) have a performance problem with
+  # the substitutions below when dealing with strings stored internally in
+  # UTF-8, so downgrade them (if possible).
+  # Data passed to datasend() should be encoded to octets upstream already so
+  # shouldn't even have the UTF-8 flag on to start with, but if it so happens
+  # that the octets are stored in an upgraded string (as can sometimes occur)
+  # then they would still downgrade without fail anyway.
+  # Only Unicode codepoints > 0xFF stored in an upgraded string will fail to
+  # downgrade. We fail silently in that case, and a "Wide character in print"
+  # warning will be emitted later by syswrite().
+  utf8::downgrade($line, 1) if $] < 5.010001 && $] != 5.008009;
 
   return 0
     if $cmd->_is_closed;
@@ -469,33 +510,8 @@ sub datasend {
 
   ${*$cmd}{'net_cmd_last_ch'} = substr($line, -1, 1);
 
-  my $len    = length($line);
-  my $offset = 0;
-  my $win    = "";
-  vec($win, fileno($cmd), 1) = 1;
-  my $timeout = $cmd->timeout || undef;
-
-  local $SIG{PIPE} = 'IGNORE' unless $^O eq 'MacOS';
-
-  while ($len) {
-    my $wout;
-    my $s = select(undef, $wout = $win, undef, $timeout);
-    if ((defined $s and $s > 0) or -f $cmd)    # -f for testing on win32
-    {
-      my $w = syswrite($cmd, $line, $len, $offset);
-      unless (defined($w) && $w == $len) {
-        $cmd->close;
-        $cmd->_set_status_closed;
-        return;
-      }
-      $len -= $w;
-      $offset += $w;
-    }
-    else {
-      $cmd->_set_status_timeout;
-      return;
-    }
-  }
+  $cmd->_syswrite_with_timeout($line)
+    or return;
 
   1;
 }
@@ -517,30 +533,8 @@ sub rawdatasend {
     print STDERR $b, join("\n$b", split(/\n/, $line)), "\n";
   }
 
-  my $len    = length($line);
-  my $offset = 0;
-  my $win    = "";
-  vec($win, fileno($cmd), 1) = 1;
-  my $timeout = $cmd->timeout || undef;
-
-  local $SIG{PIPE} = 'IGNORE' unless $^O eq 'MacOS';
-  while ($len) {
-    my $wout;
-    if (select(undef, $wout = $win, undef, $timeout) > 0) {
-      my $w = syswrite($cmd, $line, $len, $offset);
-      unless (defined($w) && $w == $len) {
-        $cmd->close;
-        $cmd->_set_status_closed;
-        return;
-      }
-      $len -= $w;
-      $offset += $w;
-    }
-    else {
-      $cmd->_set_status_timeout;
-      return;
-    }
-  }
+  $cmd->_syswrite_with_timeout($line)
+    or return;
 
   1;
 }
@@ -564,19 +558,11 @@ sub dataend {
 
   $tosend .= ".\015\012";
 
-  local $SIG{PIPE} = 'IGNORE' unless $^O eq 'MacOS';
-
   $cmd->debug_print(1, ".\n")
     if ($cmd->debug);
 
-  my $len = length $tosend;
-  my $w = syswrite($cmd, $tosend, $len);
-  unless (defined($w) && $w == $len)
-  {
-    $cmd->close;
-    $cmd->_set_status_closed;
-    return 0;
-  }
+  $cmd->_syswrite_with_timeout($tosend)
+    or return 0;
 
   delete ${*$cmd}{'net_cmd_last_ch'};
 
@@ -721,6 +707,8 @@ is pending then C<CMD_PENDING> is returned.
 Send data to the remote server, converting LF to CRLF. Any line starting
 with a '.' will be prefixed with another '.'.
 C<DATA> may be an array or a reference to an array.
+The C<DATA> passed in must be encoded by the caller to octets of whatever
+encoding is required, e.g. by using the Encode module's C<encode()> function.
 
 =item dataend ()
 
@@ -793,6 +781,9 @@ Unget a line of text from the server.
 
 Send data to the remote server without performing any conversions. C<DATA>
 is a scalar.
+As with C<datasend()>, the C<DATA> passed in must be encoded by the caller
+to octets of whatever encoding is required, e.g. by using the Encode module's
+C<encode()> function.
 
 =item read_until_dot ()
 
@@ -870,7 +861,8 @@ Versions up to 2.29_1 Copyright (c) 1995-2006 Graham Barr. All rights reserved.
 Changes in Version 2.29_2 onwards Copyright (C) 2013-2014 Steve Hay.  All rights
 reserved.
 
-This program is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself, i.e. under the terms of either the GNU General Public
+License or the Artistic License, as specified in the F<LICENCE> file.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Net/Config.pm b/Master/tlpkg/tlperl/lib/Net/Config.pm
index 953a826a68e..3e4ab0a03be 100644
--- a/Master/tlpkg/tlperl/lib/Net/Config.pm
+++ b/Master/tlpkg/tlperl/lib/Net/Config.pm
@@ -4,8 +4,9 @@
 # All rights reserved.
 # Changes in Version 1.11_01 onwards Copyright (C) 2013-2014 Steve Hay.  All
 # rights reserved.
-# This program is free software; you can redistribute it and/or
-# modify it under the same terms as Perl itself.
+# This module is free software; you can redistribute it and/or modify it under
+# the same terms as Perl itself, i.e. under the terms of either the GNU General
+# Public License or the Artistic License, as specified in the F<LICENCE> file.
 
 package Net::Config;
 
@@ -19,11 +20,16 @@ use Socket qw(inet_aton inet_ntoa);
 
 our @EXPORT  = qw(%NetConfig);
 our @ISA     = qw(Net::LocalCfg Exporter);
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 
 our($CONFIGURE, $LIBNET_CFG);
 
-eval { local $SIG{__DIE__}; require Net::LocalCfg };
+eval {
+  local @INC = @INC;
+  pop @INC if $INC[-1] eq '.';
+  local $SIG{__DIE__};
+  require Net::LocalCfg;
+};
 
 our %NetConfig = (
   nntp_hosts      => [],
@@ -133,7 +139,7 @@ __END__
 
 Net::Config - Local configuration data for libnet
 
-=head1 SYNOPSYS
+=head1 SYNOPSIS
 
     use Net::Config qw(%NetConfig);
 
@@ -319,4 +325,21 @@ If true then C<Configure> will check each hostname given that it exists
 
 =back
 
+=head1 AUTHOR
+
+Graham Barr E<lt>F<gbarr@pobox.com>E<gt>
+
+Steve Hay E<lt>F<shay@cpan.org>E<gt> is now maintaining libnet as of version
+1.22_02
+
+=head1 COPYRIGHT
+
+Versions up to 1.11 Copyright (c) 1998-2011 Graham Barr. All rights reserved.
+Changes in Version 1.11_01 onwards Copyright (C) 2013-2014 Steve Hay.  All
+rights reserved.
+
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself, i.e. under the terms of either the GNU General Public
+License or the Artistic License, as specified in the F<LICENCE> file.
+
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Net/Domain.pm b/Master/tlpkg/tlperl/lib/Net/Domain.pm
index 3b274a66cff..53822da103a 100644
--- a/Master/tlpkg/tlperl/lib/Net/Domain.pm
+++ b/Master/tlpkg/tlperl/lib/Net/Domain.pm
@@ -4,8 +4,9 @@
 # All rights reserved.
 # Changes in Version 2.22 onwards Copyright (C) 2013-2014 Steve Hay.  All rights
 # reserved.
-# This program is free software; you can redistribute it and/or
-# modify it under the same terms as Perl itself.
+# This module is free software; you can redistribute it and/or modify it under
+# the same terms as Perl itself, i.e. under the terms of either the GNU General
+# Public License or the Artistic License, as specified in the F<LICENCE> file.
 
 package Net::Domain;
 
@@ -20,7 +21,7 @@ use Net::Config;
 
 our @ISA       = qw(Exporter);
 our @EXPORT_OK = qw(hostname hostdomain hostfqdn domainname);
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 
 my ($host, $domain, $fqdn) = (undef, undef, undef);
 
@@ -356,7 +357,8 @@ Versions up to 2.21 Copyright (c) 1995-1998 Graham Barr. All rights reserved.
 Changes in Version 2.22 onwards Copyright (C) 2013-2014 Steve Hay.  All rights
 reserved.
 
-This program is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself, i.e. under the terms of either the GNU General Public
+License or the Artistic License, as specified in the F<LICENCE> file.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Net/FTP.pm b/Master/tlpkg/tlperl/lib/Net/FTP.pm
index c791fac502f..f3beb2511c5 100644
--- a/Master/tlpkg/tlperl/lib/Net/FTP.pm
+++ b/Master/tlpkg/tlperl/lib/Net/FTP.pm
@@ -2,10 +2,11 @@
 #
 # Versions up to 2.77_2 Copyright (c) 1995-2004 Graham Barr <gbarr@pobox.com>.
 # All rights reserved.
-# Changes in Version 2.77_3 onwards Copyright (C) 2013-2014 Steve Hay.  All
+# Changes in Version 2.77_3 onwards Copyright (C) 2013-2015 Steve Hay.  All
 # rights reserved.
-# This program is free software; you can redistribute it and/or
-# modify it under the same terms as Perl itself.
+# This module is free software; you can redistribute it and/or modify it under
+# the same terms as Perl itself, i.e. under the terms of either the GNU General
+# Public License or the Artistic License, as specified in the F<LICENCE> file.
 #
 # Documentation (at end) improved 1996 by Nathan Torkington <gnat@frii.com>.
 
@@ -24,9 +25,10 @@ use Net::Config;
 use Socket;
 use Time::Local;
 
-our $VERSION = '3.05';
+our $VERSION = '3.08_01';
 
 our $IOCLASS;
+my $family_key;
 BEGIN {
   # Code for detecting if we can use SSL
   my $ssl_class = eval {
@@ -54,6 +56,10 @@ BEGIN {
   sub can_inet6 { $inet6_class };
 
   $IOCLASS = $ssl_class || $inet6_class || 'IO::Socket::INET';
+  $family_key =
+    ( $ssl_class ? $ssl_class->can_ipv6 : $inet6_class || '' )
+      eq 'IO::Socket::IP'
+      ? 'Family' : 'Domain';
 }
 
 our @ISA = ('Exporter','Net::Cmd',$IOCLASS);
@@ -119,6 +125,7 @@ sub new {
     PeerAddr  => $peer,
     PeerPort  => $arg{Port} || ($arg{SSL} ? 'ftps(990)' : 'ftp(21)'),
     LocalAddr => $arg{'LocalAddr'},
+    $family_key => $arg{Domain} || $arg{Family},
     Proto     => 'tcp',
     Timeout   => defined $arg{Timeout} ? $arg{Timeout} : 120,
     %tlsargs,
@@ -130,6 +137,7 @@ sub new {
   ${*$ftp}{'net_ftp_blksize'} = abs($arg{'BlockSize'} || 10240);
 
   ${*$ftp}{'net_ftp_localaddr'} = $arg{'LocalAddr'};
+  ${*$ftp}{'net_ftp_domain'} = $arg{Domain} || $arg{Family};
 
   ${*$ftp}{'net_ftp_firewall'} = $fire
     if (defined $fire);
@@ -452,7 +460,7 @@ sub authorize {
 
   my $ok = $ftp->_AUTH($auth || "");
 
-  $ok = $ftp->_RESP($resp || "")
+  return $ftp->_RESP($resp || "")
     if ($ok == CMD_MORE);
 
   $ok == CMD_OK;
@@ -661,8 +669,12 @@ sub rmdir {
     or !$recurse;
 
   # Try to delete the contents
-  # Get a list of all the files in the directory
-  my @filelist = grep { !/^\.{1,2}$/ } $ftp->ls($dir);
+  # Get a list of all the files in the directory, excluding the current and parent directories
+  my @filelist = map { /^(?:\S+;)+ (.+)$/ ? ($1) : () } grep { !/^(?:\S+;)*type=[cp]dir;/ } $ftp->_list_cmd("MLSD", $dir);
+
+  # Fallback to using the less well-defined NLST command if MLSD fails
+  @filelist = grep { !/^\.{1,2}$/ } $ftp->ls($dir)
+    unless @filelist;
 
   return
     unless @filelist;    # failed, it is probably not a directory
@@ -888,9 +900,10 @@ sub _eprt {
       Listen    => 1,
       Timeout   => $ftp->timeout,
       LocalAddr => $ftp->sockhost,
+      $family_key  => $ftp->sockdomain,
       can_ssl() ? (
-	%{ ${*$ftp}{net_ftp_tlsargs} },
-	SSL_startHandshake => 0,
+        %{ ${*$ftp}{net_ftp_tlsargs} },
+        SSL_startHandshake => 0,
       ):(),
     );
     ${*$ftp}{net_ftp_intern_port} = 1;
@@ -1034,17 +1047,18 @@ sub _dataconn {
       PeerAddr  => $pasv->[0],
       PeerPort  => $pasv->[1],
       LocalAddr => ${*$ftp}{net_ftp_localaddr},
+      $family_key => ${*$ftp}{net_ftp_domain},
       Timeout   => $ftp->timeout,
       can_ssl() ? (
-	SSL_startHandshake => 0,
-	$ftp->is_SSL ? (
-	  SSL_reuse_ctx => $ftp,
-	  SSL_verifycn_name => ${*$ftp}{net_ftp_tlsargs}{SSL_verifycn_name},
-	  # This will cause the use of SNI if supported by IO::Socket::SSL.
-	  $ftp->can_client_sni ? (
-	    SSL_hostname  => ${*$ftp}{net_ftp_tlsargs}{SSL_hostname}
-	  ):(),
-	) :( %{${*$ftp}{net_ftp_tlsargs}} ),
+        SSL_startHandshake => 0,
+        $ftp->is_SSL ? (
+          SSL_reuse_ctx => $ftp,
+          SSL_verifycn_name => ${*$ftp}{net_ftp_tlsargs}{SSL_verifycn_name},
+          # This will cause the use of SNI if supported by IO::Socket::SSL.
+          $ftp->can_client_sni ? (
+            SSL_hostname  => ${*$ftp}{net_ftp_tlsargs}{SSL_hostname}
+          ):(),
+        ) :( %{${*$ftp}{net_ftp_tlsargs}} ),
       ):(),
     ) or return;
   } elsif (my $listen =  delete ${*$ftp}{net_ftp_listen}) {
@@ -1141,7 +1155,7 @@ sub _data_cmd {
     my $data = $ftp->_dataconn();
     if (CMD_INFO == $ftp->response()) {
       $data->reading
-	if $data && $cmd =~ /RETR|LIST|NLST/;
+        if $data && $cmd =~ /RETR|LIST|NLST|MLSD/;
       return $data;
     }
     $data->_close if $data;
@@ -1180,7 +1194,7 @@ sub _data_cmd {
     my $data = $ftp->_dataconn();
 
     $data->reading
-      if $data && $cmd =~ /RETR|LIST|NLST/;
+      if $data && $cmd =~ /RETR|LIST|NLST|MLSD/;
 
     return $data;
   }
@@ -1434,10 +1448,15 @@ Net::FTP - FTP Client class
 =head1 DESCRIPTION
 
 C<Net::FTP> is a class implementing a simple FTP client in Perl as
-described in RFC959.  It provides wrappers for a subset of the RFC959
-commands.
+described in RFC959.  It provides wrappers for the commonly used subset of the
+RFC959 commands.
+If L<IO::Socket::IP> or L<IO::Socket::INET6> is installed it also provides
+support for IPv6 as defined in RFC2428.
+And with L<IO::Socket::SSL> installed it provides support for implicit FTPS
+and explicit FTPS as defined in RFC4217.
 
-The Net::FTP class is a subclass of Net::Cmd and IO::Socket::INET.
+The Net::FTP class is a subclass of Net::Cmd and (depending on avaibility) of
+IO::Socket::IP, IO::Socket::INET6 or IO::Socket::INET.
 
 =head1 OVERVIEW
 
@@ -1538,8 +1557,15 @@ simply invokes the C<hash()> method for you, so that hash marks
 are displayed for all transfers.  You can, of course, call C<hash()>
 explicitly whenever you'd like.
 
-B<LocalAddr> - Local address to use for all socket connections, this
-argument will be passed to L<IO::Socket::INET>
+B<LocalAddr> - Local address to use for all socket connections. This
+argument will be passed to the super class, i.e. L<IO::Socket::INET>
+or L<IO::Socket::IP>.
+
+B<Domain> - Domain to use, i.e. AF_INET or AF_INET6. This
+argument will be passed to the IO::Socket super class.
+This can be used to enforce IPv4 even with L<IO::Socket::IP>
+which would default to IPv6.
+B<Family> is accepted as alternative name for B<Domain>.
 
 If the constructor fails undef will be returned and an error message will
 be in $@
@@ -1591,8 +1617,8 @@ Only C<LEVEL>s "C" (clear) and "P" (private) are supported.
 
 =item host ()
 
-Returns the value used by the constructor, and passed to IO::Socket::INET,
-to connect to the host.
+Returns the value used by the constructor, and passed to the IO::Socket super
+class to connect to the host.
 
 =item account( ACCT )
 
@@ -1839,6 +1865,7 @@ C<put_unique> and those that do not require data connections.
 =over 4
 
 =item port ( [ PORT ] )
+
 =item eprt ( [ PORT ] )
 
 Send a C<PORT> (IPv4) or C<EPRT> (IPv6) command to the server. If C<PORT> is
@@ -1846,6 +1873,7 @@ specified then it is sent to the server. If not, then a listen socket is created
 and the correct information sent to the server.
 
 =item pasv ()
+
 =item epsv ()
 
 Tell the server to go into passive mode (C<pasv> for IPv4, C<epsv> for IPv6).
@@ -1963,7 +1991,7 @@ It may be difficult for me to reproduce the problem as almost every setup
 is different.
 
 A small script which yields the problem will probably be of help. It would
-also be useful if this script was run with the extra options C<Debug => 1>
+also be useful if this script was run with the extra options C<< Debug => 1 >>
 passed to the constructor, and the output sent with the bug report. If you
 cannot include a small script then please include a Debug trace from a
 run of your program which does yield the problem.
@@ -2011,10 +2039,11 @@ Roderick Schertler <roderick@gate.net> - for various inputs
 =head1 COPYRIGHT
 
 Versions up to 2.77_2 Copyright (c) 1995-2004 Graham Barr. All rights reserved.
-Changes in Version 2.77_3 onwards Copyright (C) 2013-2014 Steve Hay.  All rights
+Changes in Version 2.77_3 onwards Copyright (C) 2013-2015 Steve Hay.  All rights
 reserved.
 
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself, i.e. under the terms of either the GNU General Public
+License or the Artistic License, as specified in the F<LICENCE> file.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Net/FTP/A.pm b/Master/tlpkg/tlperl/lib/Net/FTP/A.pm
index 9f83e6c7909..cdbd7680e50 100644
--- a/Master/tlpkg/tlperl/lib/Net/FTP/A.pm
+++ b/Master/tlpkg/tlperl/lib/Net/FTP/A.pm
@@ -13,7 +13,7 @@ use Carp;
 use Net::FTP::dataconn;
 
 our @ISA     = qw(Net::FTP::dataconn);
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 
 our $buf;
 
diff --git a/Master/tlpkg/tlperl/lib/Net/FTP/E.pm b/Master/tlpkg/tlperl/lib/Net/FTP/E.pm
index 1984a0e30bd..d3cb8207fb7 100644
--- a/Master/tlpkg/tlperl/lib/Net/FTP/E.pm
+++ b/Master/tlpkg/tlperl/lib/Net/FTP/E.pm
@@ -8,6 +8,6 @@ use warnings;
 use Net::FTP::I;
 
 our @ISA = qw(Net::FTP::I);
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 
 1;
diff --git a/Master/tlpkg/tlperl/lib/Net/FTP/I.pm b/Master/tlpkg/tlperl/lib/Net/FTP/I.pm
index c388d8fe8ac..3bd1c0fbe41 100644
--- a/Master/tlpkg/tlperl/lib/Net/FTP/I.pm
+++ b/Master/tlpkg/tlperl/lib/Net/FTP/I.pm
@@ -13,7 +13,7 @@ use Carp;
 use Net::FTP::dataconn;
 
 our @ISA     = qw(Net::FTP::dataconn);
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 
 our $buf;
 
diff --git a/Master/tlpkg/tlperl/lib/Net/FTP/L.pm b/Master/tlpkg/tlperl/lib/Net/FTP/L.pm
index dda51c45fd0..630db0d0a8b 100644
--- a/Master/tlpkg/tlperl/lib/Net/FTP/L.pm
+++ b/Master/tlpkg/tlperl/lib/Net/FTP/L.pm
@@ -8,6 +8,6 @@ use warnings;
 use Net::FTP::I;
 
 our @ISA = qw(Net::FTP::I);
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 
 1;
diff --git a/Master/tlpkg/tlperl/lib/Net/FTP/dataconn.pm b/Master/tlpkg/tlperl/lib/Net/FTP/dataconn.pm
index eaa769d5d71..ba0891bdfcd 100644
--- a/Master/tlpkg/tlperl/lib/Net/FTP/dataconn.pm
+++ b/Master/tlpkg/tlperl/lib/Net/FTP/dataconn.pm
@@ -13,7 +13,7 @@ use Carp;
 use Errno;
 use Net::Cmd;
 
-our $VERSION = '3.05';
+our $VERSION = '3.08_01';
 
 $Net::FTP::IOCLASS or die "please load Net::FTP before Net::FTP::dataconn";
 our @ISA = $Net::FTP::IOCLASS;
diff --git a/Master/tlpkg/tlperl/lib/Net/NNTP.pm b/Master/tlpkg/tlperl/lib/Net/NNTP.pm
index 3796798cdd5..675b1e6a5c1 100644
--- a/Master/tlpkg/tlperl/lib/Net/NNTP.pm
+++ b/Master/tlpkg/tlperl/lib/Net/NNTP.pm
@@ -2,10 +2,11 @@
 #
 # Versions up to 2.24_1 Copyright (c) 1995-1997 Graham Barr <gbarr@pobox.com>.
 # All rights reserved.
-# Changes in Version 2.25 onwards Copyright (C) 2013-2014 Steve Hay.  All rights
+# Changes in Version 2.25 onwards Copyright (C) 2013-2015 Steve Hay.  All rights
 # reserved.
-# This program is free software; you can redistribute it and/or
-# modify it under the same terms as Perl itself.
+# This module is free software; you can redistribute it and/or modify it under
+# the same terms as Perl itself, i.e. under the terms of either the GNU General
+# Public License or the Artistic License, as specified in the F<LICENCE> file.
 
 package Net::NNTP;
 
@@ -20,7 +21,7 @@ use Net::Cmd;
 use Net::Config;
 use Time::Local;
 
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 
 # Code for detecting if we can use SSL
 my $ssl_class = eval {
@@ -34,16 +35,19 @@ my $nossl_warn = !$ssl_class &&
   'To use SSL please install IO::Socket::SSL with version>=2.007';
 
 # Code for detecting if we can use IPv6
+my $family_key = 'Domain';
 my $inet6_class = eval {
   require IO::Socket::IP;
   no warnings 'numeric';
-  IO::Socket::IP->VERSION(0.20);
+  IO::Socket::IP->VERSION(0.20) || die;
+  $family_key = 'Family';
 } && 'IO::Socket::IP' || eval {
   require IO::Socket::INET6;
   no warnings 'numeric';
   IO::Socket::INET6->VERSION(2.62);
 } && 'IO::Socket::INET6';
 
+
 sub can_ssl   { $ssl_class };
 sub can_inet6 { $inet6_class };
 
@@ -80,9 +84,10 @@ sub new {
     $connect{$_} = $arg{$_} for(grep { m{^SSL_} } keys %arg);
   }
 
-  foreach my $o (qw(LocalAddr Timeout)) {
+  foreach my $o (qw(LocalAddr LocalPort Timeout)) {
     $connect{$o} = $arg{$o} if exists $arg{$o};
   }
+  $connect{$family_key} = $arg{Domain} || $arg{Family};
   $connect{Timeout} = 120 unless defined $connect{Timeout};
   $connect{PeerPort} = $arg{Port} || 'nntp(119)';
   foreach my $h (@{$hosts}) {
@@ -756,9 +761,9 @@ sub DESTROY {
     my ($class,$nntp,%arg) = @_;
     delete @arg{ grep { !m{^SSL_} } keys %arg };
     ( $arg{SSL_verifycn_name} ||= $nntp->host )
-	=~s{(?<!:):[\w()]+$}{}; # strip port
+        =~s{(?<!:):[\w()]+$}{}; # strip port
     $arg{SSL_hostname} = $arg{SSL_verifycn_name}
-	if ! defined $arg{SSL_hostname} && $class->can_client_sni;
+        if ! defined $arg{SSL_hostname} && $class->can_client_sni;
     my $ok = $class->SUPER::start_SSL($nntp,
       SSL_verifycn_scheme => 'nntp',
       %arg
@@ -798,8 +803,11 @@ Net::NNTP - NNTP Client class
 
 C<Net::NNTP> is a class implementing a simple NNTP client in Perl as described
 in RFC977 and RFC4642.
+With L<IO::Socket::SSL> installed it also provides support for implicit and
+explicit TLS encryption, i.e. NNTPS or NNTP+STARTTLS.
 
-The Net::NNTP class is a subclass of Net::Cmd and IO::Socket::INET.
+The Net::NNTP class is a subclass of Net::Cmd and (depending on avaibility) of
+IO::Socket::IP, IO::Socket::INET6 or IO::Socket::INET.
 
 =head1 CONSTRUCTOR
 
@@ -842,10 +850,12 @@ so that the remote server becomes innd. If the C<Reader> option is given
 with a value of zero, then this command will not be sent and the
 connection will be left talking to nnrpd.
 
-B<LocalAddr> - If multiple IP addresses are present on the client host
-with a valid route to the destination, you can specify the address your
-C<Net::NNTP> connects from and this way override the operating system's
-pick.
+B<LocalAddr> and B<LocalPort> - These parameters are passed directly
+to IO::Socket to allow binding the socket to a specific local address and port.
+
+B<Domain> - This parameter is passed directly to IO::Socket and makes it
+possible to enforce IPv4 connections even if L<IO::Socket::IP> is used as super
+class. Alternatively B<Family> can be used.
 
 =back
 
@@ -946,15 +956,17 @@ implementation) from the server. Returns the text or undef upon failure.
 
 The C<ihave> command informs the server that the client has an article
 whose id is C<MSGID>.  If the server desires a copy of that
-article, and C<MESSAGE> has been given the it will be sent.
+article and C<MESSAGE> has been given then it will be sent.
 
 Returns I<true> if the server desires the article and C<MESSAGE> was
-successfully sent,if specified.
+successfully sent, if specified.
 
 If C<MESSAGE> is not specified then the message must be sent using the
 C<datasend> and C<dataend> methods from L<Net::Cmd>
 
-C<MESSAGE> can be either an array of lines or a reference to an array.
+C<MESSAGE> can be either an array of lines or a reference to an array
+and must be encoded by the caller to octets of whatever encoding is required,
+e.g. by using the Encode module's C<encode()> function.
 
 =item last ()
 
@@ -1027,7 +1039,9 @@ is allowed then the message will be sent.
 If C<MESSAGE> is not specified then the message must be sent using the
 C<datasend> and C<dataend> methods from L<Net::Cmd>
 
-C<MESSAGE> can be either an array of lines or a reference to an array.
+C<MESSAGE> can be either an array of lines or a reference to an array
+and must be encoded by the caller to octets of whatever encoding is required,
+e.g. by using the Encode module's C<encode()> function.
 
 The message, either sent via C<datasend> or as the C<MESSAGE>
 parameter, must be in the format as described by RFC822 and must
@@ -1278,10 +1292,11 @@ Steve Hay E<lt>F<shay@cpan.org>E<gt> is now maintaining libnet as of version
 =head1 COPYRIGHT
 
 Versions up to 2.24_1 Copyright (c) 1995-1997 Graham Barr. All rights reserved.
-Changes in Version 2.25 onwards Copyright (C) 2013-2014 Steve Hay.  All rights
+Changes in Version 2.25 onwards Copyright (C) 2013-2015 Steve Hay.  All rights
 reserved.
 
-This program is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself, i.e. under the terms of either the GNU General Public
+License or the Artistic License, as specified in the F<LICENCE> file.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Net/Netrc.pm b/Master/tlpkg/tlperl/lib/Net/Netrc.pm
index 9cf06b12bae..ba60ae6904e 100644
--- a/Master/tlpkg/tlperl/lib/Net/Netrc.pm
+++ b/Master/tlpkg/tlperl/lib/Net/Netrc.pm
@@ -4,8 +4,9 @@
 # All rights reserved.
 # Changes in Version 2.13_01 onwards Copyright (C) 2013-2014 Steve Hay.  All
 # rights reserved.
-# This program is free software; you can redistribute it and/or
-# modify it under the same terms as Perl itself.
+# This module is free software; you can redistribute it and/or modify it under
+# the same terms as Perl itself, i.e. under the terms of either the GNU General
+# Public License or the Artistic License, as specified in the F<LICENCE> file.
 
 package Net::Netrc;
 
@@ -17,7 +18,7 @@ use warnings;
 use Carp;
 use FileHandle;
 
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 
 our $TESTING;
 
@@ -339,7 +340,8 @@ Versions up to 2.13 Copyright (c) 1995-1998 Graham Barr. All rights reserved.
 Changes in Version 2.13_01 onwards Copyright (C) 2013-2014 Steve Hay.  All
 rights reserved.
 
-This program is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself, i.e. under the terms of either the GNU General Public
+License or the Artistic License, as specified in the F<LICENCE> file.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Net/POP3.pm b/Master/tlpkg/tlperl/lib/Net/POP3.pm
index 0c6c4b1dc92..ab8121e6581 100644
--- a/Master/tlpkg/tlperl/lib/Net/POP3.pm
+++ b/Master/tlpkg/tlperl/lib/Net/POP3.pm
@@ -2,10 +2,11 @@
 #
 # Versions up to 2.29 Copyright (c) 1995-2004 Graham Barr <gbarr@pobox.com>.
 # All rights reserved.
-# Changes in Version 2.29_01 onwards Copyright (C) 2013-2014 Steve Hay.  All
+# Changes in Version 2.29_01 onwards Copyright (C) 2013-2015 Steve Hay.  All
 # rights reserved.
-# This program is free software; you can redistribute it and/or
-# modify it under the same terms as Perl itself.
+# This module is free software; you can redistribute it and/or modify it under
+# the same terms as Perl itself, i.e. under the terms of either the GNU General
+# Public License or the Artistic License, as specified in the F<LICENCE> file.
 
 package Net::POP3;
 
@@ -19,7 +20,7 @@ use IO::Socket;
 use Net::Cmd;
 use Net::Config;
 
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 
 # Code for detecting if we can use SSL
 my $ssl_class = eval {
@@ -33,16 +34,19 @@ my $nossl_warn = !$ssl_class &&
   'To use SSL please install IO::Socket::SSL with version>=2.007';
 
 # Code for detecting if we can use IPv6
+my $family_key = 'Domain';
 my $inet6_class = eval {
   require IO::Socket::IP;
   no warnings 'numeric';
-  IO::Socket::IP->VERSION(0.20);
+  IO::Socket::IP->VERSION(0.20) || die;
+  $family_key = 'Family';
 } && 'IO::Socket::IP' || eval {
   require IO::Socket::INET6;
   no warnings 'numeric';
   IO::Socket::INET6->VERSION(2.62);
 } && 'IO::Socket::INET6';
 
+
 sub can_ssl   { $ssl_class };
 sub can_inet6 { $inet6_class };
 
@@ -62,7 +66,6 @@ sub new {
   }
   my $hosts = defined $host ? [$host] : $NetConfig{pop3_hosts};
   my $obj;
-  my @localport = exists $arg{ResvPort} ? (LocalPort => $arg{ResvPort}) : ();
 
   if ($arg{SSL}) {
     # SSL from start
@@ -77,7 +80,9 @@ sub new {
       PeerAddr => ($host = $h),
       PeerPort => $arg{Port} || 'pop3(110)',
       Proto => 'tcp',
-      @localport,
+      $family_key => $arg{Domain} || $arg{Family},
+      LocalAddr => $arg{LocalAddr},
+      LocalPort => exists($arg{ResvPort}) ? $arg{ResvPort} : $arg{LocalPort},
       Timeout => $arg{Timeout},
       )
       and last;
@@ -577,9 +582,9 @@ sub banner {
     my ($class,$pop3,%arg) = @_;
     delete @arg{ grep { !m{^SSL_} } keys %arg };
     ( $arg{SSL_verifycn_name} ||= $pop3->host )
-	=~s{(?<!:):[\w()]+$}{}; # strip port
+        =~s{(?<!:):[\w()]+$}{}; # strip port
     $arg{SSL_hostname} = $arg{SSL_verifycn_name}
-	if ! defined $arg{SSL_hostname} && $class->can_client_sni;
+        if ! defined $arg{SSL_hostname} && $class->can_client_sni;
     $arg{SSL_verifycn_scheme} ||= 'pop3';
     my $ok = $class->SUPER::start_SSL($pop3,%arg);
     $@ = $ssl_class->errstr if !$ok;
@@ -622,12 +627,16 @@ Net::POP3 - Post Office Protocol 3 Client class (RFC1939)
 This module implements a client interface to the POP3 protocol, enabling
 a perl5 application to talk to POP3 servers. This documentation assumes
 that you are familiar with the POP3 protocol described in RFC1939.
+With L<IO::Socket::SSL> installed it also provides support for implicit and
+explicit TLS encryption, i.e. POP3S or POP3+STARTTLS.
 
 A new Net::POP3 object must be created with the I<new> method. Once
 this has been done, all POP3 commands are accessed via method calls
 on the object.
 
-The Net::POP3 class is a subclass of Net::Cmd and IO::Socket::INET.
+The Net::POP3 class is a subclass of Net::Cmd and (depending on avaibility) of
+IO::Socket::IP, IO::Socket::INET6 or IO::Socket::INET.
+
 
 =head1 CONSTRUCTOR
 
@@ -658,9 +667,14 @@ upgrade with C<starttls>.
 You can use SSL arguments as documented in L<IO::Socket::SSL>, but it will
 usually use the right arguments already.
 
-B<ResvPort> - If given then the socket for the C<Net::POP3> object
-will be bound to the local port given using C<bind> when the socket is
-created.
+B<LocalAddr> and B<LocalPort> - These parameters are passed directly
+to IO::Socket to allow binding the socket to a specific local address and port.
+For compatibility with older versions B<ResvPort> can be used instead of
+B<LocalPort>.
+
+B<Domain> - This parameter is passed directly to IO::Socket and makes it
+possible to enforce IPv4 connections even if L<IO::Socket::IP> is used as super
+class. Alternatively B<Family> can be used.
 
 B<Timeout> - Maximum time, in seconds, to wait for a response from the
 POP3 server (default: 120)
@@ -839,10 +853,11 @@ Steve Hay E<lt>F<shay@cpan.org>E<gt> is now maintaining libnet as of version
 =head1 COPYRIGHT
 
 Versions up to 2.29 Copyright (c) 1995-2004 Graham Barr. All rights reserved.
-Changes in Version 2.29_01 onwards Copyright (C) 2013-2014 Steve Hay.  All
+Changes in Version 2.29_01 onwards Copyright (C) 2013-2015 Steve Hay.  All
 rights reserved.
 
-This program is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself, i.e. under the terms of either the GNU General Public
+License or the Artistic License, as specified in the F<LICENCE> file.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Net/Ping.pm b/Master/tlpkg/tlperl/lib/Net/Ping.pm
index 2766c9edbb5..86b0dfd3f51 100644
--- a/Master/tlpkg/tlperl/lib/Net/Ping.pm
+++ b/Master/tlpkg/tlperl/lib/Net/Ping.pm
@@ -17,7 +17,7 @@ use Time::HiRes;
 
 @ISA = qw(Exporter);
 @EXPORT = qw(pingecho);
-$VERSION = "2.43";
+$VERSION = "2.43_01";
 
 # Constants
 
@@ -410,7 +410,11 @@ sub ping_external {
       $timeout            # Seconds after which ping times out
      ) = @_;
 
-  eval { require Net::Ping::External; }
+  eval {
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
+    require Net::Ping::External;
+  }
     or croak('Protocol "external" not supported on your system: Net::Ping::External not found');
   return Net::Ping::External::ping(ip => $ip, timeout => $timeout);
 }
diff --git a/Master/tlpkg/tlperl/lib/Net/SMTP.pm b/Master/tlpkg/tlperl/lib/Net/SMTP.pm
index afd017aa0ef..0130a2fd64b 100644
--- a/Master/tlpkg/tlperl/lib/Net/SMTP.pm
+++ b/Master/tlpkg/tlperl/lib/Net/SMTP.pm
@@ -2,10 +2,11 @@
 #
 # Versions up to 2.31_1 Copyright (c) 1995-2004 Graham Barr <gbarr@pobox.com>.
 # All rights reserved.
-# Changes in Version 2.31_2 onwards Copyright (C) 2013-2014 Steve Hay.  All
+# Changes in Version 2.31_2 onwards Copyright (C) 2013-2015 Steve Hay.  All
 # rights reserved.
-# This program is free software; you can redistribute it and/or
-# modify it under the same terms as Perl itself.
+# This module is free software; you can redistribute it and/or modify it under
+# the same terms as Perl itself, i.e. under the terms of either the GNU General
+# Public License or the Artistic License, as specified in the F<LICENCE> file.
 
 package Net::SMTP;
 
@@ -20,7 +21,7 @@ use Net::Cmd;
 use Net::Config;
 use Socket;
 
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 
 # Code for detecting if we can use SSL
 my $ssl_class = eval {
@@ -34,10 +35,12 @@ my $nossl_warn = !$ssl_class &&
   'To use SSL please install IO::Socket::SSL with version>=2.007';
 
 # Code for detecting if we can use IPv6
+my $family_key = 'Domain';
 my $inet6_class = eval {
   require IO::Socket::IP;
   no warnings 'numeric';
-  IO::Socket::IP->VERSION(0.20);
+  IO::Socket::IP->VERSION(0.20) || die;
+  $family_key = 'Family';
 } && 'IO::Socket::IP' || eval {
   require IO::Socket::INET6;
   no warnings 'numeric';
@@ -79,6 +82,7 @@ sub new {
       PeerPort => $arg{Port} || 'smtp(25)',
       LocalAddr => $arg{LocalAddr},
       LocalPort => $arg{LocalPort},
+      $family_key => $arg{Domain} || $arg{Family},
       Proto     => 'tcp',
       Timeout   => $arg{Timeout}
       )
@@ -112,11 +116,13 @@ sub new {
   (${*$obj}{'net_smtp_banner'}) = $obj->message;
   (${*$obj}{'net_smtp_domain'}) = $obj->message =~ /\A\s*(\S+)/;
 
-  unless ($obj->hello($arg{Hello} || "")) {
-    my $err = ref($obj) . ": " . $obj->code . " " . $obj->message;
-    $obj->close();
-    $@ = $err;
-    return;
+  if (!exists $arg{SendHello} || $arg{SendHello}) {
+    unless ($obj->hello($arg{Hello} || "")) {
+      my $err = ref($obj) . ": " . $obj->code . " " . $obj->message;
+      $obj->close();
+      $@ = $err;
+      return;
+    }
   }
 
   $obj;
@@ -615,9 +621,9 @@ sub _STARTTLS { shift->command("STARTTLS")->response() == CMD_OK }
     my ($class,$smtp,%arg) = @_;
     delete @arg{ grep { !m{^SSL_} } keys %arg };
     ( $arg{SSL_verifycn_name} ||= $smtp->host )
-	=~s{(?<!:):[\w()]+$}{}; # strip port
+        =~s{(?<!:):[\w()]+$}{}; # strip port
     $arg{SSL_hostname} = $arg{SSL_verifycn_name}
-	if ! defined $arg{SSL_hostname} && $class->can_client_sni;
+        if ! defined $arg{SSL_hostname} && $class->can_client_sni;
     $arg{SSL_verifycn_scheme} ||= 'smtp';
     my $ok = $class->SUPER::start_SSL($smtp,%arg);
     $@ = $ssl_class->errstr if !$ok;
@@ -648,12 +654,12 @@ Net::SMTP - Simple Mail Transfer Protocol Client
 This module implements a client interface to the SMTP and ESMTP
 protocol, enabling a perl5 application to talk to SMTP servers. This
 documentation assumes that you are familiar with the concepts of the
-SMTP protocol described in RFC821.
-
-A new Net::SMTP object must be created with the I<new> method. Once
-this has been done, all SMTP commands are accessed through this object.
+SMTP protocol described in RFC2821.
+With L<IO::Socket::SSL> installed it also provides support for implicit and
+explicit TLS encryption, i.e. SMTPS or SMTP+STARTTLS.
 
-The Net::SMTP class is a subclass of Net::Cmd and IO::Socket::INET.
+The Net::SMTP class is a subclass of Net::Cmd and (depending on avaibility) of
+IO::Socket::IP, IO::Socket::INET6 or IO::Socket::INET.
 
 =head1 EXAMPLES
 
@@ -712,6 +718,10 @@ B<Hello> - SMTP requires that you identify yourself. This option
 specifies a string to pass as your mail domain. If not given localhost.localdomain
 will be used.
 
+B<SendHello> - If false then the EHLO (or HELO) command that is normally sent
+when constructing the object will not be sent. In that case the command will
+have to be sent manually by calling C<hello()> instead.
+
 B<Host> - SMTP host to connect to. It may be a single scalar (hostname[:port]),
 as defined for the C<PeerAddr> option in L<IO::Socket::INET>, or a reference to
 an array with hosts to try in turn. The L</host> method will return the value
@@ -727,7 +737,11 @@ You can use SSL arguments as documented in L<IO::Socket::SSL>, but it will
 usually use the right arguments already.
 
 B<LocalAddr> and B<LocalPort> - These parameters are passed directly
-to IO::Socket to allow binding the socket to a local port.
+to IO::Socket to allow binding the socket to a specific local address and port.
+
+B<Domain> - This parameter is passed directly to IO::Socket and makes it
+possible to enforce IPv4 connections even if L<IO::Socket::IP> is used as super
+class. Alternatively B<Family> can be used.
 
 B<Timeout> - Maximum time, in seconds, to wait for a response from the
 SMTP server (default: 120)
@@ -758,11 +772,11 @@ Example:
 
     # the same with direct SSL
     $smtp = Net::SMTP->new('mailhost',
-			   Hello => 'my.mail.domain',
-			   Timeout => 30,
-			   Debug   => 1,
-			   SSL     => 1,
-			  );
+                           Hello => 'my.mail.domain',
+                           Timeout => 30,
+                           Debug   => 1,
+                           SSL     => 1,
+                          );
 
     # Connect to the default server from Net::config
     $smtp = Net::SMTP->new(
@@ -819,7 +833,11 @@ usually use the right arguments already.
 
 =item auth ( USERNAME, PASSWORD )
 
-Attempt SASL authentication. Requires Authen::SASL module.
+=item auth ( SASL )
+
+Attempt SASL authentication. Requires Authen::SASL module. The first form
+constructs a new Authen::SASL object using the given username and password;
+the second form uses the given Authen::SASL object.
 
 =item mail ( ADDRESS [, OPTIONS] )
 
@@ -935,9 +953,12 @@ Synonyms for C<recipient>.
 
 Initiate the sending of the data from the current message. 
 
-C<DATA> may be a reference to a list or a list. If specified the contents
-of C<DATA> and a termination string C<".\r\n"> is sent to the server. And the
-result will be true if the data was accepted.
+C<DATA> may be a reference to a list or a list and must be encoded by the
+caller to octets of whatever encoding is required, e.g. by using the Encode
+module's C<encode()> function.
+
+If specified the contents of C<DATA> and a termination string C<".\r\n"> is
+sent to the server. The result will be true if the data was accepted.
 
 If C<DATA> is not specified then the result will indicate that the server
 wishes the data to be sent. The data must then be sent using the C<datasend>
@@ -1011,10 +1032,11 @@ Steve Hay E<lt>F<shay@cpan.org>E<gt> is now maintaining libnet as of version
 =head1 COPYRIGHT
 
 Versions up to 2.31_1 Copyright (c) 1995-2004 Graham Barr. All rights reserved.
-Changes in Version 2.31_2 onwards Copyright (C) 2013-2014 Steve Hay.  All rights
+Changes in Version 2.31_2 onwards Copyright (C) 2013-2015 Steve Hay.  All rights
 reserved.
 
-This program is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself, i.e. under the terms of either the GNU General Public
+License or the Artistic License, as specified in the F<LICENCE> file.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Net/Time.pm b/Master/tlpkg/tlperl/lib/Net/Time.pm
index da259422cf8..6118ad19d1a 100644
--- a/Master/tlpkg/tlperl/lib/Net/Time.pm
+++ b/Master/tlpkg/tlperl/lib/Net/Time.pm
@@ -4,8 +4,9 @@
 # All rights reserved.
 # Changes in Version 2.11 onwards Copyright (C) 2014 Steve Hay.  All rights
 # reserved.
-# This program is free software; you can redistribute it and/or
-# modify it under the same terms as Perl itself.
+# This module is free software; you can redistribute it and/or modify it under
+# the same terms as Perl itself, i.e. under the terms of either the GNU General
+# Public License or the Artistic License, as specified in the F<LICENCE> file.
 
 package Net::Time;
 
@@ -23,7 +24,7 @@ use Net::Config;
 our @ISA       = qw(Exporter);
 our @EXPORT_OK = qw(inet_time inet_daytime);
 
-our $VERSION = "3.05";
+our $VERSION = "3.08_01";
 
 our $TIMEOUT = 120;
 
@@ -156,7 +157,8 @@ Versions up to 2.11 Copyright (c) 1995-2004 Graham Barr. All rights reserved.
 Changes in Version 2.11 onwards Copyright (C) 2014 Steve Hay.  All rights
 reserved.
 
-This program is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+This module is free software; you can redistribute it and/or modify it under the
+same terms as Perl itself, i.e. under the terms of either the GNU General Public
+License or the Artistic License, as specified in the F<LICENCE> file.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Opcode.pm b/Master/tlpkg/tlperl/lib/Opcode.pm
index c9a3f15f478..1522c4c3780 100644
--- a/Master/tlpkg/tlperl/lib/Opcode.pm
+++ b/Master/tlpkg/tlperl/lib/Opcode.pm
@@ -6,7 +6,7 @@ use strict;
 
 our($VERSION, @ISA, @EXPORT_OK);
 
-$VERSION = "1.32";
+$VERSION = "1.34";
 
 use Carp;
 use Exporter ();
@@ -312,7 +312,7 @@ invert_opset function.
     av2arylen
 
     rv2hv helem hslice kvhslice each values keys exists delete
-    aeach akeys avalues reach rvalues rkeys multideref
+    aeach akeys avalues multideref
 
     preinc i_preinc predec i_predec postinc i_postinc
     postdec i_postdec int hex oct abs pow multiply i_multiply
diff --git a/Master/tlpkg/tlperl/lib/POSIX.pm b/Master/tlpkg/tlperl/lib/POSIX.pm
index 6fc0e7518e0..05bdbbe7e6d 100644
--- a/Master/tlpkg/tlperl/lib/POSIX.pm
+++ b/Master/tlpkg/tlperl/lib/POSIX.pm
@@ -4,7 +4,7 @@ use warnings;
 
 our ($AUTOLOAD, %SIGRT);
 
-our $VERSION = '1.53_01';
+our $VERSION = '1.65';
 
 require XSLoader;
 
@@ -234,7 +234,7 @@ sub sprintf {
 }
 
 sub load_imports {
-my %default_export_tags = (
+my %default_export_tags = ( # cf. exports policy below
 
     assert_h =>	[qw(assert NDEBUG)],
 
@@ -389,7 +389,22 @@ my %default_export_tags = (
     utime_h =>	[],
 );
 
-my %other_export_tags = (
+if ($^O eq 'MSWin32') {
+    $default_export_tags{winsock_h} = [qw(
+	WSAEINTR WSAEBADF WSAEACCES WSAEFAULT WSAEINVAL WSAEMFILE WSAEWOULDBLOCK
+	WSAEINPROGRESS WSAEALREADY WSAENOTSOCK WSAEDESTADDRREQ WSAEMSGSIZE
+	WSAEPROTOTYPE WSAENOPROTOOPT WSAEPROTONOSUPPORT WSAESOCKTNOSUPPORT
+	WSAEOPNOTSUPP WSAEPFNOSUPPORT WSAEAFNOSUPPORT WSAEADDRINUSE
+	WSAEADDRNOTAVAIL WSAENETDOWN WSAENETUNREACH WSAENETRESET WSAECONNABORTED
+	WSAECONNRESET WSAENOBUFS WSAEISCONN WSAENOTCONN WSAESHUTDOWN
+	WSAETOOMANYREFS WSAETIMEDOUT WSAECONNREFUSED WSAELOOP WSAENAMETOOLONG
+	WSAEHOSTDOWN WSAEHOSTUNREACH WSAENOTEMPTY WSAEPROCLIM WSAEUSERS
+	WSAEDQUOT WSAESTALE WSAEREMOTE WSAEDISCON WSAENOMORE WSAECANCELLED
+	WSAEINVALIDPROCTABLE WSAEINVALIDPROVIDER WSAEPROVIDERFAILEDINIT
+	WSAEREFUSED)];
+}
+
+my %other_export_tags = ( # cf. exports policy below
     fenv_h => [qw(
         FE_DOWNWARD FE_TONEAREST FE_TOWARDZERO FE_UPWARD fegetround fesetround
     )],
@@ -403,8 +418,27 @@ my %other_export_tags = (
     )],
 
     stdlib_h_c99 => [ @{$default_export_tags{stdlib_h}}, 'strtold' ],
+
+    nan_payload => [ qw(getpayload setpayload setpayloadsig issignaling) ],
+
+    signal_h_si_code => [qw(
+        ILL_ILLOPC ILL_ILLOPN ILL_ILLADR ILL_ILLTRP ILL_PRVOPC ILL_PRVREG
+        ILL_COPROC ILL_BADSTK
+        FPE_INTDIV FPE_INTOVF FPE_FLTDIV FPE_FLTOVF FPE_FLTUND
+        FPE_FLTRES FPE_FLTINV FPE_FLTSUB
+        SEGV_MAPERR SEGV_ACCERR
+        BUS_ADRALN BUS_ADRERR BUS_OBJERR
+        TRAP_BRKPT TRAP_TRACE
+        CLD_EXITED CLD_KILLED CLD_DUMPED CLD_TRAPPED CLD_STOPPED CLD_CONTINUED
+        POLL_IN POLL_OUT POLL_MSG POLL_ERR POLL_PRI POLL_HUP
+        SI_USER SI_QUEUE SI_TIMER SI_ASYNCIO SI_MESGQ
+  )],
 );
 
+# exports policy:
+# - new functions may not be added to @EXPORT, only to @EXPORT_OK
+# - new SHOUTYCONSTANTS are OK to add to @EXPORT
+
 {
   # De-duplicate the export list: 
   my ( %export, %export_ok );
@@ -414,8 +448,12 @@ my %other_export_tags = (
   # @EXPORT are actually shared hash key scalars, which will save some memory.
   our @EXPORT = keys %export;
 
+  # you do not want to add symbols to the following list. add a new tag instead
   our @EXPORT_OK = (qw(close lchown nice open pipe read sleep times write
-		       printf sprintf),
+		       printf sprintf lround),
+                    # lround() should really be in the :math_h_c99 tag, but
+                    # we're too far into the 5.24 code freeze for that to be
+                    # done now. This can be revisited in the 5.25.x cycle.
 		    grep {!exists $export{$_}} keys %reimpl, keys %replacement, keys %export_ok);
 
   our %EXPORT_TAGS = ( %default_export_tags, %other_export_tags );
diff --git a/Master/tlpkg/tlperl/lib/POSIX.pod b/Master/tlpkg/tlperl/lib/POSIX.pod
index 0ca7bb77bb2..1d263a7bc40 100644
--- a/Master/tlpkg/tlperl/lib/POSIX.pod
+++ b/Master/tlpkg/tlperl/lib/POSIX.pod
@@ -629,6 +629,17 @@ This is identical to Perl's builtin C<getlogin()> function for
 returning the user name associated with the current session, see
 L<perlfunc/getlogin>.
 
+=item C<getpayload>
+
+	use POSIX ':nan_payload';
+	getpayload($var)
+
+Returns the C<NaN> payload.
+
+Note the API instability warning in L</setpayload>.
+
+See L</nan> for more discussion about C<NaN>.
+
 =item C<getpgrp>
 
 This is identical to Perl's builtin C<getpgrp()> function for
@@ -702,38 +713,15 @@ See also L</isinf>, and L</fpclassify>.
 
 =item C<isalnum>
 
-Deprecated function whose use raises a warning, and which is slated to
-be removed in a future Perl version.  It is very similar to matching
-against S<C<qr/ ^ [[:alnum:]]+ $ /x>>, which you should convert to use
-instead.  The function is deprecated because 1) it doesn't handle UTF-8
-encoded strings properly; and 2) it returns C<TRUE> even if the input is
-the empty string.  The function return is always based on the current
-locale, whereas using locale rules is optional with the regular
-expression, based on pragmas in effect and pattern modifiers (see
-L<perlre/Character set modifiers> and L<perlre/Which character set
-modifier is in effect?>).
-
-The function returns C<TRUE> if the input string is empty, or if the
-corresponding C function returns C<TRUE> for every byte in the string.
-
-You may want to use the C<L<E<sol>\wE<sol>|perlrecharclass/Word
-characters>> construct instead.
+This function has been removed as of v5.24.  It was very similar to
+matching against S<C<qr/ ^ [[:alnum:]]+ $ /x>>, which you should convert
+to use instead.  See L<perlrecharclass/POSIX Character Classes>.
 
 =item C<isalpha>
 
-Deprecated function whose use raises a warning, and which is slated to
-be removed in a future Perl version.  It is very similar to matching
-against S<C<qr/ ^ [[:alpha:]]+ $ /x>>, which you should convert to use
-instead.  The function is deprecated because 1) it doesn't handle UTF-8
-encoded strings properly; and 2) it returns C<TRUE> even if the input is
-the empty string.  The function return is always based on the current
-locale, whereas using locale rules is optional with the regular
-expression, based on pragmas in effect and pattern modifiers (see
-L<perlre/Character set modifiers> and L<perlre/Which character set
-modifier is in effect?>).
-
-The function returns C<TRUE> if the input string is empty, or if the
-corresponding C function returns C<TRUE> for every byte in the string.
+This function has been removed as of v5.24.  It was very similar to
+matching against S<C<qr/ ^ [[:alpha:]]+ $ /x>>, which you should convert
+to use instead.  See L<perlrecharclass/POSIX Character Classes>.
 
 =item C<isatty>
 
@@ -742,38 +730,15 @@ to a tty.  Similar to the C<-t> operator, see L<perlfunc/-X>.
 
 =item C<iscntrl>
 
-Deprecated function whose use raises a warning, and which is slated to
-be removed in a future Perl version.  It is very similar to matching
-against S<C<qr/ ^ [[:cntrl:]]+ $ /x>>, which you should convert to use
-instead.  The function is deprecated because 1) it doesn't handle UTF-8
-encoded strings properly; and 2) it returns C<TRUE> even if the input is
-the empty string.  The function return is always based on the current
-locale, whereas using locale rules is optional with the regular
-expression, based on pragmas in effect and pattern modifiers (see
-L<perlre/Character set modifiers> and L<perlre/Which character set
-modifier is in effect?>).
-
-The function returns C<TRUE> if the input string is empty, or if the
-corresponding C function returns C<TRUE> for every byte in the string.
+This function has been removed as of v5.24.  It was very similar to
+matching against S<C<qr/ ^ [[:cntrl:]]+ $ /x>>, which you should convert
+to use instead.  See L<perlrecharclass/POSIX Character Classes>.
 
 =item C<isdigit>
 
-Deprecated function whose use raises a warning, and which is slated to
-be removed in a future Perl version.  It is very similar to matching
-against S<C<qr/ ^ [[:digit:]]+ $ /x>>, which you should convert to use
-instead.  The function is deprecated because 1) it doesn't handle UTF-8
-encoded strings properly; and 2) it returns C<TRUE> even if the input is
-the empty string.  The function return is always based on the current
-locale, whereas using locale rules is optional with the regular
-expression, based on pragmas in effect and pattern modifiers (see
-L<perlre/Character set modifiers> and L<perlre/Which character set
-modifier is in effect?>).
-
-The function returns C<TRUE> if the input string is empty, or if the
-corresponding C function returns C<TRUE> for every byte in the string.
-
-You may want to use the C<L<E<sol>\dE<sol>|perlrecharclass/Digits>>
-construct instead.
+This function has been removed as of v5.24.  It was very similar to
+matching against S<C<qr/ ^ [[:digit:]]+ $ /x>>, which you should convert
+to use instead.  See L<perlrecharclass/POSIX Character Classes>.
 
 =item C<isfinite>
 
@@ -784,19 +749,9 @@ See also L</isinf>, L</isnan>, and L</fpclassify>.
 
 =item C<isgraph>
 
-Deprecated function whose use raises a warning, and which is slated to
-be removed in a future Perl version.  It is very similar to matching
-against S<C<qr/ ^ [[:graph:]]+ $ /x>>, which you should convert to use
-instead.  The function is deprecated because 1) it doesn't handle UTF-8
-encoded strings properly; and 2) it returns C<TRUE> even if the input is
-the empty string.  The function return is always based on the current
-locale, whereas using locale rules is optional with the regular
-expression, based on pragmas in effect and pattern modifiers (see
-L<perlre/Character set modifiers> and L<perlre/Which character set
-modifier is in effect?>).
-
-The function returns C<TRUE> if the input string is empty, or if the
-corresponding C function returns C<TRUE> for every byte in the string.
+This function has been removed as of v5.24.  It was very similar to
+matching against S<C<qr/ ^ [[:graph:]]+ $ /x>>, which you should convert
+to use instead.  See L<perlrecharclass/POSIX Character Classes>.
 
 =item C<isgreater>
 
@@ -813,21 +768,9 @@ See also L</Inf>, L</isnan>, L</isfinite>, and L</fpclassify>.
 
 =item C<islower>
 
-Deprecated function whose use raises a warning, and which is slated to
-be removed in a future Perl version.  It is very similar to matching
-against S<C<qr/ ^ [[:lower:]]+ $ /x>>, which you should convert to use
-instead.  The function is deprecated because 1) it doesn't handle UTF-8
-encoded strings properly; and 2) it returns C<TRUE> even if the input is
-the empty string.  The function return is always based on the current
-locale, whereas using locale rules is optional with the regular
-expression, based on pragmas in effect and pattern modifiers (see
-L<perlre/Character set modifiers> and L<perlre/Which character set
-modifier is in effect?>).
-
-The function returns C<TRUE> if the input string is empty, or if the
-corresponding C function returns C<TRUE> for every byte in the string.
-
-Do B<not> use C</[a-z]/> unless you don't care about the current locale.
+This function has been removed as of v5.24.  It was very similar to
+matching against S<C<qr/ ^ [[:lower:]]+ $ /x>>, which you should convert
+to use instead.  See L<perlrecharclass/POSIX Character Classes>.
 
 =item C<isnan>
 
@@ -850,88 +793,44 @@ See also L</isfinite>, and L</fpclassify>.
 
 =item C<isprint>
 
-Deprecated function whose use raises a warning, and which is slated to
-be removed in a future Perl version.  It is very similar to matching
-against S<C<qr/ ^ [[:print:]]+ $ /x>>, which you should convert to use
-instead.  The function is deprecated because 1) it doesn't handle UTF-8
-encoded strings properly; and 2) it returns C<TRUE> even if the input is
-the empty string.  The function return is always based on the current
-locale, whereas using locale rules is optional with the regular
-expression, based on pragmas in effect and pattern modifiers (see
-L<perlre/Character set modifiers> and L<perlre/Which character set
-modifier is in effect?>).
-
-The function returns C<TRUE> if the input string is empty, or if the
-corresponding C function returns C<TRUE> for every byte in the string.
+This function has been removed as of v5.24.  It was very similar to
+matching against S<C<qr/ ^ [[:print:]]+ $ /x>>, which you should convert
+to use instead.  See L<perlrecharclass/POSIX Character Classes>.
 
 =item C<ispunct>
 
-Deprecated function whose use raises a warning, and which is slated to
-be removed in a future Perl version.  It is very similar to matching
-against S<C<qr/ ^ [[:punct:]]+ $ /x>>, which you should convert to use
-instead.  The function is deprecated because 1) it doesn't handle UTF-8
-encoded strings properly; and 2) it returns C<TRUE> even if the input is
-the empty string.  The function return is always based on the current
-locale, whereas using locale rules is optional with the regular
-expression, based on pragmas in effect and pattern modifiers (see
-L<perlre/Character set modifiers> and L<perlre/Which character set
-modifier is in effect?>).
+This function has been removed as of v5.24.  It was very similar to
+matching against S<C<qr/ ^ [[:punct:]]+ $ /x>>, which you should convert
+to use instead.  See L<perlrecharclass/POSIX Character Classes>.
 
-The function returns C<TRUE> if the input string is empty, or if the
-corresponding C function returns C<TRUE> for every byte in the string.
+=item C<issignaling>
 
-=item C<isspace>
+	use POSIX ':nan_payload';
+	issignaling($var, $payload)
 
-Deprecated function whose use raises a warning, and which is slated to
-be removed in a future Perl version.  It is very similar to matching
-against S<C<qr/ ^ [[:space:]]+ $ /x>>, which you should convert to use
-instead.  The function is deprecated because 1) it doesn't handle UTF-8
-encoded strings properly; and 2) it returns C<TRUE> even if the input is
-the empty string.  The function return is always based on the current
-locale, whereas using locale rules is optional with the regular
-expression, based on pragmas in effect and pattern modifiers (see
-L<perlre/Character set modifiers> and L<perlre/Which character set
-modifier is in effect?>).
+Return true if the argument is a I<signaling> NaN.
 
-The function returns C<TRUE> if the input string is empty, or if the
-corresponding C function returns C<TRUE> for every byte in the string.
+Note the API instability warning in L</setpayload>.
 
-You may want to use the C<L<E<sol>\sE<sol>|perlrecharclass/Whitespace>>
-construct instead.
+See L</nan> for more discussion about C<NaN>.
 
-=item C<isupper>
+=item C<isspace>
 
-Deprecated function whose use raises a warning, and which is slated to
-be removed in a future Perl version.  It is very similar to matching
-against S<C<qr/ ^ [[:upper:]]+ $ /x>>, which you should convert to use
-instead.  The function is deprecated because 1) it doesn't handle UTF-8
-encoded strings properly; and 2) it returns C<TRUE> even if the input is
-the empty string.  The function return is always based on the current
-locale, whereas using locale rules is optional with the regular
-expression, based on pragmas in effect and pattern modifiers (see
-L<perlre/Character set modifiers> and L<perlre/Which character set
-modifier is in effect?>).
+This function has been removed as of v5.24.  It was very similar to
+matching against S<C<qr/ ^ [[:space:]]+ $ /x>>, which you should convert
+to use instead.  See L<perlrecharclass/POSIX Character Classes>.
 
-The function returns C<TRUE> if the input string is empty, or if the
-corresponding C function returns C<TRUE> for every byte in the string.
+=item C<isupper>
 
-Do B<not> use C</[A-Z]/> unless you don't care about the current locale.
+This function has been removed as of v5.24.  It was very similar to
+matching against S<C<qr/ ^ [[:upper:]]+ $ /x>>, which you should convert
+to use instead.  See L<perlrecharclass/POSIX Character Classes>.
 
 =item C<isxdigit>
 
-Deprecated function whose use raises a warning, and which is slated to
-be removed in a future Perl version.  It is very similar to matching
-against S<C<qr/ ^ [[:xdigit:]]+ $ /x>>, which you should convert to use
-instead.  The function is deprecated because 1) it doesn't handle UTF-8
-encoded strings properly; and 2) it returns C<TRUE> even if the input is
-the empty string.  The function return is always based on the current
-locale, whereas using locale rules is optional with the regular
-expression, based on pragmas in effect and pattern modifiers (see
-L<perlre/Character set modifiers> and L<perlre/Which character set
-modifier is in effect?>).
-
-The function returns C<TRUE> if the input string is empty, or if the
-corresponding C function returns C<TRUE> for every byte in the string.
+This function has been removed as of v5.24.  It was very similar to
+matching against S<C<qr/ ^ [[:xdigit:]]+ $ /x>>, which you should
+convert to use instead.  See L<perlrecharclass/POSIX Character Classes>.
 
 =item C<j0>
 
@@ -1112,6 +1011,10 @@ Like L</round>, but as integer, as opposed to floating point [C99].
 
 See also L</ceil>, L</floor>, L</trunc>.
 
+Owing to an oversight, this is not currently exported by default, or as part of
+the C<:math_h_c99> export tag; importing it must therefore be done by explicit
+name. This will be changed in Perl 5.26.
+
 =item C<malloc>
 
 Not implemented.  C<malloc()> is C-specific.  Perl does memory management transparently.
@@ -1215,9 +1118,40 @@ See also L</nan>, C</isnan>, and L</fpclassify>.
 
 =item C<nan>
 
-Returns not-a-number [C99].
+   my $nan = nan();
+
+Returns C<NaN>, not-a-number [C99].
+
+The returned NaN is always a I<quiet> NaN, as opposed to I<signaling>.
+
+With an argument, can be used to generate a NaN with I<payload>.
+The argument is first interpreted as a floating point number,
+but then any fractional parts are truncated (towards zero),
+and the value is interpreted as an unsigned integer.
+The bits of this integer are stored in the unused bits of the NaN.
+
+The result has a dual nature: it is a NaN, but it also carries
+the integer inside it.  The integer can be retrieved with L</getpayload>.
+Note, though, that the payload is not propagated, not even on copies,
+and definitely not in arithmetic operations.
+
+How many bits fit in the NaN depends on what kind of floating points
+are being used, but on the most common platforms (64-bit IEEE 754,
+or the x86 80-bit long doubles) there are 51 and 61 bits available,
+respectively.  (There would be 52 and 62, but the quiet/signaling
+bit of NaNs takes away one.)  However, because of the floating-point-to-
+integer-and-back conversions, please test carefully whether you get back
+what you put in.  If your integers are only 32 bits wide, you probably
+should not rely on more than 32 bits of payload.
 
-See also L</isnan> and L</NaN>.
+Whether a "signaling" NaN is in any way different from a "quiet" NaN,
+depends on the platform.  Also note that the payload of the default
+NaN (no argument to nan()) is not necessarily zero, use C<setpayload>
+to explicitly set the payload.  On some platforms like the 32-bit x86,
+(unless using the 80-bit long doubles) the signaling bit is not supported
+at all.
+
+See also L</isnan>, L</NaN>, L</setpayload> and L</issignaling>.
 
 =item C<nearbyint>
 
@@ -1395,7 +1329,7 @@ Not implemented.  C<realloc()> is C-specific.  Perl does memory management trans
 =item C<remainder>
 
 Given C<x> and C<y>, returns the value S<C<x - n*y>>, where C<n> is the integer
-closest to C<x/y>. [C99]
+closest to C<x>/C<y>. [C99]
 
  my $remainder = POSIX::remainder($x, $y)
 
@@ -1471,6 +1405,13 @@ see L<perlfunc/eval>.
 
 =item C<setlocale>
 
+WARNING!  Do NOT use this function in a L<thread|threads>.  The locale
+will change in all other threads at the same time, and should your
+thread get paused by the operating system, and another started, that
+thread will not have the locale it is expecting.  On some platforms,
+there can be a race leading to segfaults if two threads call this
+function nearly simultaneously.
+
 Modifies and queries the program's underlying locale.  Users of this
 function should read L<perllocale>, whch provides a comprehensive
 discussion of Perl locale handling, knowledge of which is necessary to
@@ -1511,6 +1452,38 @@ out which locales are available in your system.
 
 	$loc = setlocale( LC_COLLATE, "es_AR.ISO8859-1" );
 
+=item C<setpayload>
+
+	use POSIX ':nan_payload';
+	setpayload($var, $payload);
+
+Sets the C<NaN> payload of var.
+
+NOTE: the NaN payload APIs are based on the latest (as of June 2015)
+proposed ISO C interfaces, but they are not yet a standard.  Things
+may change.
+
+See L</nan> for more discussion about C<NaN>.
+
+See also L</setpayloadsig>, L</isnan>, L</getpayload>, and L</issignaling>.
+
+=item C<setpayloadsig>
+
+	use POSIX ':nan_payload';
+	setpayloadsig($var, $payload);
+
+Like L</setpayload> but also makes the NaN I<signaling>.
+
+Depending on the platform the NaN may or may not behave differently.
+
+Note the API instability warning in L</setpayload>.
+
+Note that because how the floating point formats work out, on the most
+common platforms signaling payload of zero is best avoided,
+since it might end up being identical to C<+Inf>.
+
+See also L</nan>, L</isnan>, L</getpayload>, and L</issignaling>.
+
 =item C<setpgid>
 
 This is similar to the C function C<setpgid()> for
@@ -1556,6 +1529,9 @@ semantics, as defined by POSIX/SUSv3:
                 a user process and the uid and pid make sense,
                 otherwise the signal was sent by the kernel
 
+The constants for specific C<code> values can be imported individually
+or using the C<:signal_h_si_code> tag.
+
 The following are also defined by POSIX/SUSv3, but unfortunately
 not very widely implemented:
 
@@ -1563,6 +1539,8 @@ not very widely implemented:
     uid         the uid of the process id generating the signal
     status      exit value or signal for SIGCHLD
     band        band event for SIGPOLL
+    addr        address of faulting instruction or memory
+                reference for SIGILL, SIGFPE, SIGSEGV or SIGBUS
 
 A third argument is also passed to the handler, which contains a copy
 of the raw binary contents of the C<siginfo> structure: if a system has
@@ -2571,6 +2549,12 @@ C<SA_SIGINFO> C<SIGABRT> C<SIGALRM> C<SIGCHLD> C<SIGCONT> C<SIGFPE> C<SIGHUP> C<
 C<SIGKILL> C<SIGPIPE> C<SIGQUIT> C<SIGSEGV> C<SIGSTOP> C<SIGTERM> C<SIGTSTP> C<SIGTTIN> C<SIGTTOU>
 C<SIGUSR1> C<SIGUSR2> C<SIG_BLOCK> C<SIG_DFL> C<SIG_ERR> C<SIG_IGN> C<SIG_SETMASK>
 C<SIG_UNBLOCK>
+C<ILL_ILLOPC> C<ILL_ILLOPN> C<ILL_ILLADR> C<ILL_ILLTRP> C<ILL_PRVOPC> C<ILL_PRVREG> C<ILL_COPROC>
+C<ILL_BADSTK> C<FPE_INTDIV> C<FPE_INTOVF> C<FPE_FLTDIV> C<FPE_FLTOVF> C<FPE_FLTUND> C<FPE_FLTRES>
+C<FPE_FLTINV> C<FPE_FLTSUB> C<SEGV_MAPERR> C<SEGV_ACCERR> C<BUS_ADRALN> C<BUS_ADRERR>
+C<BUS_OBJERR> C<TRAP_BRKPT> C<TRAP_TRACE> C<CLD_EXITED> C<CLD_KILLED> C<CLD_DUMPED> C<CLD_TRAPPED>
+C<CLD_STOPPED> C<CLD_CONTINUED> C<POLL_IN> C<POLL_OUT> C<POLL_MSG> C<POLL_ERR> C<POLL_PRI>
+C<POLL_HUP> C<SI_USER> C<SI_QUEUE> C<SI_TIMER> C<SI_ASYNCIO> C<SI_MESGQ>
 
 =back
 
@@ -2696,3 +2680,25 @@ is true)
 
 =back
 
+=head1 WINSOCK
+
+(Windows only.)
+
+=over 8
+
+=item Constants
+
+C<WSAEINTR> C<WSAEBADF> C<WSAEACCES> C<WSAEFAULT> C<WSAEINVAL> C<WSAEMFILE> C<WSAEWOULDBLOCK>
+C<WSAEINPROGRESS> C<WSAEALREADY> C<WSAENOTSOCK> C<WSAEDESTADDRREQ> C<WSAEMSGSIZE>
+C<WSAEPROTOTYPE> C<WSAENOPROTOOPT> C<WSAEPROTONOSUPPORT> C<WSAESOCKTNOSUPPORT>
+C<WSAEOPNOTSUPP> C<WSAEPFNOSUPPORT> C<WSAEAFNOSUPPORT> C<WSAEADDRINUSE>
+C<WSAEADDRNOTAVAIL> C<WSAENETDOWN> C<WSAENETUNREACH> C<WSAENETRESET> C<WSAECONNABORTED>
+C<WSAECONNRESET> C<WSAENOBUFS> C<WSAEISCONN> C<WSAENOTCONN> C<WSAESHUTDOWN>
+C<WSAETOOMANYREFS> C<WSAETIMEDOUT> C<WSAECONNREFUSED> C<WSAELOOP> C<WSAENAMETOOLONG>
+C<WSAEHOSTDOWN> C<WSAEHOSTUNREACH> C<WSAENOTEMPTY> C<WSAEPROCLIM> C<WSAEUSERS>
+C<WSAEDQUOT> C<WSAESTALE> C<WSAEREMOTE> C<WSAEDISCON> C<WSAENOMORE> C<WSAECANCELLED>
+C<WSAEINVALIDPROCTABLE> C<WSAEINVALIDPROVIDER> C<WSAEPROVIDERFAILEDINIT>
+C<WSAEREFUSED>
+
+=back
+
diff --git a/Master/tlpkg/tlperl/lib/Parse/CPAN/Meta.pm b/Master/tlpkg/tlperl/lib/Parse/CPAN/Meta.pm
index 7888d1c3cb8..56eecb45290 100644
--- a/Master/tlpkg/tlperl/lib/Parse/CPAN/Meta.pm
+++ b/Master/tlpkg/tlperl/lib/Parse/CPAN/Meta.pm
@@ -2,7 +2,8 @@ use 5.008001;
 use strict;
 package Parse::CPAN::Meta;
 # ABSTRACT: Parse META.yml and META.json CPAN metadata files
-our $VERSION = '1.4414'; # VERSION
+
+our $VERSION = '1.4417_001';
 
 use Exporter;
 use Carp 'croak';
@@ -55,7 +56,7 @@ sub load_json_string {
 }
 
 sub yaml_backend {
-  if (! defined $ENV{PERL_YAML_BACKEND} ) {
+  if ($ENV{PERL_CORE} or not defined $ENV{PERL_YAML_BACKEND} ) {
     _can_load( 'CPAN::Meta::YAML', 0.011 )
       or croak "CPAN::Meta::YAML 0.011 is not available\n";
     return "CPAN::Meta::YAML";
@@ -71,7 +72,7 @@ sub yaml_backend {
 }
 
 sub json_backend {
-  if (! $ENV{PERL_JSON_BACKEND} or $ENV{PERL_JSON_BACKEND} eq 'JSON::PP') {
+  if ($ENV{PERL_CORE} or ! $ENV{PERL_JSON_BACKEND} or $ENV{PERL_JSON_BACKEND} eq 'JSON::PP') {
     _can_load( 'JSON::PP' => 2.27103 )
       or croak "JSON::PP 2.27103 is not available\n";
     return 'JSON::PP';
@@ -110,12 +111,12 @@ sub _can_load {
 
 # Kept for backwards compatibility only
 # Create an object from a file
-sub LoadFile ($) {
+sub LoadFile ($) { ## no critic
   return Load(_slurp(shift));
 }
 
 # Parse a document from a string.
-sub Load ($) {
+sub Load ($) { ## no critic
   require CPAN::Meta::YAML;
   my $object = eval { CPAN::Meta::YAML::Load(shift) };
   croak $@ if $@;
@@ -136,7 +137,7 @@ Parse::CPAN::Meta - Parse META.yml and META.json CPAN metadata files
 
 =head1 VERSION
 
-version 1.4414
+version 1.4417
 
 =head1 SYNOPSIS
 
@@ -283,7 +284,7 @@ will be thrown.
 =head2 Bugs / Feature Requests
 
 Please report any bugs or feature requests through the issue tracker
-at L<http://rt.cpan.org/Public/Dist/Display.html?Name=Parse-CPAN-Meta>.
+at L<https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta/issues>.
 You will be notified automatically of any progress on your issue.
 
 =head2 Source Code
@@ -311,6 +312,8 @@ David Golden <dagolden@cpan.org>
 
 =head1 CONTRIBUTORS
 
+=for stopwords Graham Knop Joshua ben Jore Karen Etheridge Neil Bowers Ricardo Signes Steffen Mueller
+
 =over 4
 
 =item *
@@ -323,6 +326,10 @@ Joshua ben Jore <jjore@cpan.org>
 
 =item *
 
+Karen Etheridge <ether@cpan.org>
+
+=item *
+
 Neil Bowers <neil@bowers.com>
 
 =item *
@@ -337,7 +344,7 @@ Steffen Mueller <smueller@cpan.org>
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is copyright (c) 2014 by Adam Kennedy and Contributors.
+This software is copyright (c) 2015 by Adam Kennedy and Contributors.
 
 This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
diff --git a/Master/tlpkg/tlperl/lib/Perl/OSType.pm b/Master/tlpkg/tlperl/lib/Perl/OSType.pm
index 0d5b54b732b..8a915771bd7 100644
--- a/Master/tlpkg/tlperl/lib/Perl/OSType.pm
+++ b/Master/tlpkg/tlperl/lib/Perl/OSType.pm
@@ -4,7 +4,7 @@ use warnings;
 package Perl::OSType;
 # ABSTRACT: Map Perl operating system names to generic types
 
-our $VERSION = '1.008';
+our $VERSION = '1.009';
 
 require Exporter;
 our @ISA = qw(Exporter);
@@ -40,6 +40,7 @@ my %OSTYPES = qw(
   nto         Unix
   svr4        Unix
   svr5        Unix
+  sco         Unix
   sco_sv      Unix
   unicos      Unix
   unicosmk    Unix
@@ -95,7 +96,7 @@ Perl::OSType - Map Perl operating system names to generic types
 
 =head1 VERSION
 
-version 1.008
+version 1.009
 
 =head1 SYNOPSIS
 
@@ -156,7 +157,7 @@ L<Devel::CheckOS>
 =head2 Bugs / Feature Requests
 
 Please report any bugs or feature requests through the issue tracker
-at L<https://github.com/dagolden/Perl-OSType/issues>.
+at L<https://github.com/Perl-Toolchain-Gang/Perl-OSType/issues>.
 You will be notified automatically of any progress on your issue.
 
 =head2 Source Code
@@ -164,9 +165,9 @@ You will be notified automatically of any progress on your issue.
 This is open source software.  The code repository is available for
 public review and contribution under the terms of the license.
 
-L<https://github.com/dagolden/Perl-OSType>
+L<https://github.com/Perl-Toolchain-Gang/Perl-OSType>
 
-  git clone https://github.com/dagolden/Perl-OSType.git
+  git clone https://github.com/Perl-Toolchain-Gang/Perl-OSType.git
 
 =head1 AUTHOR
 
diff --git a/Master/tlpkg/tlperl/lib/PerlIO/encoding.pm b/Master/tlpkg/tlperl/lib/PerlIO/encoding.pm
index 4cff76d8702..13cb20b3bd9 100644
--- a/Master/tlpkg/tlperl/lib/PerlIO/encoding.pm
+++ b/Master/tlpkg/tlperl/lib/PerlIO/encoding.pm
@@ -1,7 +1,7 @@
 package PerlIO::encoding;
 
 use strict;
-our $VERSION = '0.21';
+our $VERSION = '0.24';
 our $DEBUG = 0;
 $DEBUG and warn __PACKAGE__, " called by ", join(", ", caller), "\n";
 
diff --git a/Master/tlpkg/tlperl/lib/PerlIO/mmap.pm b/Master/tlpkg/tlperl/lib/PerlIO/mmap.pm
index 845f2d1de8c..0ed59d2db49 100644
--- a/Master/tlpkg/tlperl/lib/PerlIO/mmap.pm
+++ b/Master/tlpkg/tlperl/lib/PerlIO/mmap.pm
@@ -1,7 +1,7 @@
 package PerlIO::mmap;
 use strict;
 use warnings;
-our $VERSION = '0.014';
+our $VERSION = '0.016';
 
 use XSLoader;
 XSLoader::load(__PACKAGE__, __PACKAGE__->VERSION);
diff --git a/Master/tlpkg/tlperl/lib/PerlIO/scalar.pm b/Master/tlpkg/tlperl/lib/PerlIO/scalar.pm
index 5d2049ba3f7..4ed4e4060da 100644
--- a/Master/tlpkg/tlperl/lib/PerlIO/scalar.pm
+++ b/Master/tlpkg/tlperl/lib/PerlIO/scalar.pm
@@ -1,5 +1,5 @@
 package PerlIO::scalar;
-our $VERSION = '0.23';
+our $VERSION = '0.24';
 require XSLoader;
 XSLoader::load();
 1;
diff --git a/Master/tlpkg/tlperl/lib/PerlIO/via.pm b/Master/tlpkg/tlperl/lib/PerlIO/via.pm
index a10f7ee67e8..e477dcca193 100644
--- a/Master/tlpkg/tlperl/lib/PerlIO/via.pm
+++ b/Master/tlpkg/tlperl/lib/PerlIO/via.pm
@@ -1,5 +1,5 @@
 package PerlIO::via;
-our $VERSION = '0.15';
+our $VERSION = '0.16';
 require XSLoader;
 XSLoader::load();
 1;
diff --git a/Master/tlpkg/tlperl/lib/Pod/Functions.pm b/Master/tlpkg/tlperl/lib/Pod/Functions.pm
index 87b64d178d7..55d6e826659 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Functions.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Functions.pm
@@ -54,7 +54,7 @@ L<perlfunc/"Perl Functions by Category"> section.
 
 =cut
 
-our $VERSION = '1.09';
+our $VERSION = '1.10';
 
 require Exporter;
 
@@ -207,7 +207,7 @@ glob	File	expand filenames using wildcards
 gmtime	Time	convert UNIX time into record or string using Greenwich time
 goto	Flow	create spaghetti code
 grep	LIST	locate elements in a list test true against a given criterion
-hex	Math	String	convert a string to a hexadecimal number
+hex	Math	String	convert a hexadecimal string to a number
 import	Modules	Namespace	patch a module's namespace into your own
 index	String	find a substring within a string
 int	Math	get the integer portion of a number
@@ -280,7 +280,7 @@ say	I/O	output a list to a filehandle, appending a newline
 scalar	Misc	force a scalar context
 seek	I/O	reposition file pointer for random-access I/O
 seekdir	I/O	reposition directory pointer
-select	I/O	reset default output or do I/O multiplexing
+select	File	I/O	reset default output or do I/O multiplexing
 semctl	SysV	SysV semaphore control operations
 semget	SysV	get set of SysV semaphores
 semop	SysV	SysV semaphore operations
diff --git a/Master/tlpkg/tlperl/lib/Pod/Html.pm b/Master/tlpkg/tlperl/lib/Pod/Html.pm
index 34729a9c241..cef329e1ef9 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Html.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Html.pm
@@ -3,7 +3,7 @@ use strict;
 require Exporter;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = 1.22;
+$VERSION = 1.2201;
 @ISA = qw(Exporter);
 @EXPORT = qw(pod2html htmlify);
 @EXPORT_OK = qw(anchorify);
diff --git a/Master/tlpkg/tlperl/lib/Pod/Man.pm b/Master/tlpkg/tlperl/lib/Pod/Man.pm
index 72ca9ff1da9..b739559551d 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Man.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Man.pm
@@ -11,9 +11,10 @@
 # me any patches at the address above in addition to sending them to the
 # standard Perl mailing lists.
 #
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-#     2010, 2012, 2013 Russ Allbery <rra@stanford.edu>
+# Written by Russ Allbery <rra@cpan.org>
 # Substantial contributions by Sean Burke <sburke@cpan.org>
+# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+#     2010, 2012, 2013, 2014, 2015, 2016 Russ Allbery <rra@cpan.org>
 #
 # This program is free software; you may redistribute it and/or modify it
 # under the same terms as Perl itself.
@@ -24,19 +25,25 @@
 
 package Pod::Man;
 
-require 5.005;
-
+use 5.006;
 use strict;
+use warnings;
+
 use subs qw(makespace);
 use vars qw(@ISA %ESCAPES $PREAMBLE $VERSION);
 
-use Carp qw(croak);
-use Encode qw(encode);
+use Carp qw(carp croak);
 use Pod::Simple ();
 
+# Conditionally import Encode and set $HAS_ENCODE if it is available.
+our $HAS_ENCODE;
+BEGIN {
+    $HAS_ENCODE = eval { require Encode };
+}
+
 @ISA = qw(Pod::Simple);
 
-$VERSION = '2.28';
+$VERSION = '4.07';
 
 # Set the debugging level.  If someone has inserted a debug function into this
 # class already, use that.  Otherwise, use any Pod::Simple debug function
@@ -139,6 +146,22 @@ sub new {
     }
     delete $$self{errors};
 
+    # Degrade back to non-utf8 if Encode is not available.
+    #
+    # Suppress the warning message when PERL_CORE is set, indicating this is
+    # running as part of the core Perl build.  Perl builds podlators (and all
+    # pure Perl modules) before Encode and other XS modules, so Encode won't
+    # yet be available.  Rely on the Perl core build to generate man pages
+    # later, after all the modules are available, so that UTF-8 handling will
+    # be correct.
+    if ($$self{utf8} and !$HAS_ENCODE) {
+        if (!$ENV{PERL_CORE}) {
+            carp ('utf8 mode requested but Encode module not available,'
+                    . ' falling back to non-utf8');
+        }
+        delete $$self{utf8};
+    }
+
     # Initialize various other internal constants based on our arguments.
     $self->init_fonts;
     $self->init_quotes;
@@ -204,10 +227,10 @@ sub init_quotes {
         $$self{LQUOTE} = $$self{RQUOTE} = '';
     } elsif (length ($$self{quotes}) == 1) {
         $$self{LQUOTE} = $$self{RQUOTE} = $$self{quotes};
-    } elsif ($$self{quotes} =~ /^(.)(.)$/
-             || $$self{quotes} =~ /^(..)(..)$/) {
-        $$self{LQUOTE} = $1;
-        $$self{RQUOTE} = $2;
+    } elsif (length ($$self{quotes}) % 2 == 0) {
+        my $length = length ($$self{quotes}) / 2;
+        $$self{LQUOTE} = substr ($$self{quotes}, 0, $length);
+        $$self{RQUOTE} = substr ($$self{quotes}, $length);
     } else {
         croak(qq(Invalid quote specification "$$self{quotes}"))
     }
@@ -662,10 +685,11 @@ sub switchquotes {
         # to Roman rather than the actual previous font when used in headings.
         # troff output may still be broken, but at least we can fix nroff by
         # just switching the font changes to the non-fixed versions.
-        $nroff =~ s/\Q$$self{FONTS}{100}\E(.*?)\\f[PR]/$1/g;
-        $nroff =~ s/\Q$$self{FONTS}{101}\E(.*?)\\f([PR])/\\fI$1\\f$2/g;
-        $nroff =~ s/\Q$$self{FONTS}{110}\E(.*?)\\f([PR])/\\fB$1\\f$2/g;
-        $nroff =~ s/\Q$$self{FONTS}{111}\E(.*?)\\f([PR])/\\f\(BI$1\\f$2/g;
+        my $font_end = "(?:\\f[PR]|\Q$$self{FONTS}{100}\E)";
+        $nroff =~ s/\Q$$self{FONTS}{100}\E(.*?)\\f([PR])/$1/g;
+        $nroff =~ s/\Q$$self{FONTS}{101}\E(.*?)$font_end/\\fI$1\\fP/g;
+        $nroff =~ s/\Q$$self{FONTS}{110}\E(.*?)$font_end/\\fB$1\\fP/g;
+        $nroff =~ s/\Q$$self{FONTS}{111}\E(.*?)$font_end/\\f\(BI$1\\fP/g;
 
         # Now finally output the command.  Bother with .ie only if the nroff
         # and troff output aren't the same.
@@ -741,7 +765,7 @@ sub outindex {
 sub output {
     my ($self, @text) = @_;
     if ($$self{ENCODE}) {
-        print { $$self{output_fh} } encode ('UTF-8', join ('', @text));
+        print { $$self{output_fh} } Encode::encode ('UTF-8', join ('', @text));
     } else {
         print { $$self{output_fh} } @text;
     }
@@ -788,7 +812,7 @@ sub start_document {
         } else {
             ($name, $section) = $self->devise_title;
         }
-        my $date = $$self{date} || $self->devise_date;
+        my $date = defined($$self{date}) ? $$self{date} : $self->devise_date;
         $self->preamble ($name, $section, $date)
             unless $self->bare_output or DEBUG > 9;
     }
@@ -828,45 +852,61 @@ sub devise_title {
     $section = 3 if (!$$self{section} && $name =~ /\.pm\z/i);
     $name =~ s/\.p(od|[lm])\z//i;
 
+    # If Pod::Parser gave us an IO::File reference as the source file name,
+    # convert that to the empty string as well.  Then, if we don't have a
+    # valid name, emit a warning and convert it to STDIN.
+    if ($name =~ /^IO::File(?:=\w+)\(0x[\da-f]+\)$/i) {
+        $name = '';
+    }
+    if ($name eq '') {
+        $self->whine (1, 'No name given for document');
+        $name = 'STDIN';
+    }
+
     # If the section isn't 3, then the name defaults to just the basename of
-    # the file.  Otherwise, assume we're dealing with a module.  We want to
-    # figure out the full module name from the path to the file, but we don't
-    # want to include too much of the path into the module name.  Lose
-    # anything up to the first off:
-    #
-    #     */lib/*perl*/         standard or site_perl module
-    #     */*perl*/lib/         from -Dprefix=/opt/perl
-    #     */*perl*/             random module hierarchy
-    #
-    # which works.  Also strip off a leading site, site_perl, or vendor_perl
-    # component, any OS-specific component, and any version number component,
-    # and strip off an initial component of "lib" or "blib/lib" since that's
-    # what ExtUtils::MakeMaker creates.  splitdir requires at least File::Spec
-    # 0.8.
+    # the file.
     if ($section !~ /^3/) {
         require File::Basename;
         $name = uc File::Basename::basename ($name);
     } else {
         require File::Spec;
         my ($volume, $dirs, $file) = File::Spec->splitpath ($name);
+
+        # Otherwise, assume we're dealing with a module.  We want to figure
+        # out the full module name from the path to the file, but we don't
+        # want to include too much of the path into the module name.  Lose
+        # anything up to the first of:
+        #
+        #     */lib/*perl*/         standard or site_perl module
+        #     */*perl*/lib/         from -Dprefix=/opt/perl
+        #     */*perl*/             random module hierarchy
+        #
+        # Also strip off a leading site, site_perl, or vendor_perl component,
+        # any OS-specific component, and any version number component, and
+        # strip off an initial component of "lib" or "blib/lib" since that's
+        # what ExtUtils::MakeMaker creates.
+        #
+        # splitdir requires at least File::Spec 0.8.
         my @dirs = File::Spec->splitdir ($dirs);
-        my $cut = 0;
-        my $i;
-        for ($i = 0; $i < @dirs; $i++) {
-            if ($dirs[$i] =~ /perl/) {
-                $cut = $i + 1;
-                $cut++ if ($dirs[$i + 1] && $dirs[$i + 1] eq 'lib');
-                last;
+        if (@dirs) {
+            my $cut = 0;
+            my $i;
+            for ($i = 0; $i < @dirs; $i++) {
+                if ($dirs[$i] =~ /perl/) {
+                    $cut = $i + 1;
+                    $cut++ if ($dirs[$i + 1] && $dirs[$i + 1] eq 'lib');
+                    last;
+                }
             }
+            if ($cut > 0) {
+                splice (@dirs, 0, $cut);
+                shift @dirs if ($dirs[0] =~ /^(site|vendor)(_perl)?$/);
+                shift @dirs if ($dirs[0] =~ /^[\d.]+$/);
+                shift @dirs if ($dirs[0] =~ /^(.*-$^O|$^O-.*|$^O)$/);
+            }
+            shift @dirs if $dirs[0] eq 'lib';
+            splice (@dirs, 0, 2) if ($dirs[0] eq 'blib' && $dirs[1] eq 'lib');
         }
-        if ($cut > 0) {
-            splice (@dirs, 0, $cut);
-            shift @dirs if ($dirs[0] =~ /^(site|vendor)(_perl)?$/);
-            shift @dirs if ($dirs[0] =~ /^[\d.]+$/);
-            shift @dirs if ($dirs[0] =~ /^(.*-$^O|$^O-.*|$^O)$/);
-        }
-        shift @dirs if $dirs[0] eq 'lib';
-        splice (@dirs, 0, 2) if ($dirs[0] eq 'blib' && $dirs[1] eq 'lib');
 
         # Remove empty directories when building the module name; they
         # occur too easily on Unix by doubling slashes.
@@ -876,25 +916,55 @@ sub devise_title {
 }
 
 # Determine the modification date and return that, properly formatted in ISO
-# format.  If we can't get the modification date of the input, instead use the
-# current time.  Pod::Simple returns a completely unuseful stringified file
-# handle as the source_filename for input from a file handle, so we have to
-# deal with that as well.
+# format.
+#
+# If POD_MAN_DATE is set, that overrides anything else.  This can be used for
+# reproducible generation of the same file even if the input file timestamps
+# are unpredictable or the POD coms from standard input.
+#
+# Otherwise, if SOURCE_DATE_EPOCH is set and can be parsed as seconds since
+# the UNIX epoch, base the timestamp on that.  See
+# <https://reproducible-builds.org/specs/source-date-epoch/>
+#
+# Otherwise, use the modification date of the input if we can stat it.  Be
+# aware that Pod::Simple returns the stringification of the file handle as
+# source_filename for input from a file handle, so we'll stat some random ref
+# string in that case.  If that fails, instead use the current time.
+#
+# $self - Pod::Man object, used to get the source file
+#
+# Returns: YYYY-MM-DD date suitable for the left-hand footer
 sub devise_date {
     my ($self) = @_;
-    my $input = $self->source_filename;
+
+    # If POD_MAN_DATE is set, always use it.
+    if (defined($ENV{POD_MAN_DATE})) {
+        return $ENV{POD_MAN_DATE};
+    }
+
+    # If SOURCE_DATE_EPOCH is set and can be parsed, use that.
     my $time;
-    if ($input) {
-        $time = (stat $input)[9] || time;
-    } else {
-        $time = time;
+    if (defined($ENV{SOURCE_DATE_EPOCH}) && $ENV{SOURCE_DATE_EPOCH} !~ /\D/) {
+        $time = $ENV{SOURCE_DATE_EPOCH};
     }
 
-    # Can't use POSIX::strftime(), which uses Fcntl, because MakeMaker
-    # uses this and it has to work in the core which can't load dynamic
-    # libraries.
-    my ($year, $month, $day) = (localtime $time)[5,4,3];
-    return sprintf ("%04d-%02d-%02d", $year + 1900, $month + 1, $day);
+    # Otherwise, get the input filename and try to stat it.  If that fails,
+    # use the current time.
+    if (!defined $time) {
+        my $input = $self->source_filename;
+        if ($input) {
+            $time = (stat($input))[9] || time();
+        } else {
+            $time = time();
+        }
+    }
+
+    # Can't use POSIX::strftime(), which uses Fcntl, because MakeMaker uses
+    # this and it has to work in the core which can't load dynamic libraries.
+    # Use gmtime instead of localtime so that the generated man page does not
+    # depend on the local time zone setting and is more reproducible
+    my ($year, $month, $day) = (gmtime($time))[5,4,3];
+    return sprintf("%04d-%02d-%02d", $year + 1900, $month + 1, $day);
 }
 
 # Print out the preamble and the title.  The meaning of the arguments to .TH
@@ -1461,7 +1531,7 @@ sub preamble_template {
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -1469,20 +1539,16 @@ sub preamble_template {
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 ----END OF PREAMBLE----
 #'# for cperl-mode
 
@@ -1566,7 +1632,7 @@ __END__
 =for stopwords
 en em ALLCAPS teeny fixedbold fixeditalic fixedbolditalic stderr utf8
 UTF-8 Allbery Sean Burke Ossanna Solaris formatters troff uppercased
-Christiansen nourls parsers
+Christiansen nourls parsers Kernighan
 
 =head1 NAME
 
@@ -1629,8 +1695,19 @@ argument.
 
 =item center
 
-Sets the centered page header to use instead of "User Contributed Perl
-Documentation".
+Sets the centered page header for the C<.TH> macro.  The default, if this
+option is not specified, is "User Contributed Perl Documentation".
+
+=item date
+
+Sets the left-hand footer for the C<.TH> macro.  If this option is not set,
+the contents of the environment variable POD_MAN_DATE, if set, will be used.
+Failing that, the value of SOURCE_DATE_EPOCH, the modification date of the
+input file, or the current time if stat() can't find that file (which will be
+the case if the input is from C<STDIN>) will be used.  If obtained from the
+file modification date or the current time, the date will be formatted as
+C<YYYY-MM-DD> and will be based on UTC (so that the output will be
+reproducible regardless of local time zone).
 
 =item errors
 
@@ -1642,13 +1719,6 @@ POD errors entirely, as much as possible.
 
 The default is C<pod>.
 
-=item date
-
-Sets the left-hand footer.  By default, the modification date of the input
-file will be used, or the current date if stat() can't find that file (the
-case if the input is from C<STDIN>), and the date will be formatted as
-C<YYYY-MM-DD>.
-
 =item fixed
 
 The fixed-width font to use for verbatim text and code.  Defaults to
@@ -1675,12 +1745,16 @@ for B<troff> output.
 
 =item name
 
-Set the name of the manual page.  Without this option, the manual name is
-set to the uppercased base name of the file being converted unless the
-manual section is 3, in which case the path is parsed to see if it is a Perl
-module path.  If it is, a path like C<.../lib/Pod/Man.pm> is converted into
-a name like C<Pod::Man>.  This option, if given, overrides any automatic
-determination of the name.
+Set the name of the manual page for the C<.TH> macro.  Without this
+option, the manual name is set to the uppercased base name of the file
+being converted unless the manual section is 3, in which case the path is
+parsed to see if it is a Perl module path.  If it is, a path like
+C<.../lib/Pod/Man.pm> is converted into a name like C<Pod::Man>.  This
+option, if given, overrides any automatic determination of the name.
+
+If generating a manual page from standard input, this option is required,
+since there's otherwise no way for Pod::Man to know what to use for the
+manual page name.
 
 =item nourls
 
@@ -1701,10 +1775,9 @@ important.
 =item quotes
 
 Sets the quote marks used to surround CE<lt>> text.  If the value is a
-single character, it is used as both the left and right quote; if it is two
-characters, the first character is used as the left quote and the second as
-the right quoted; and if it is four characters, the first two are used as
-the left quote and the second two as the right quote.
+single character, it is used as both the left and right quote.  Otherwise,
+it is split in half, and the first half of the string is used as the left
+quote and the second is used as the right quote.
 
 This may also be set to the special value C<none>, in which case no quote
 marks are added around CE<lt>> text (but the font is still changed for troff
@@ -1712,11 +1785,16 @@ output).
 
 =item release
 
-Set the centered footer.  By default, this is the version of Perl you run
-Pod::Man under.  Note that some system an macro sets assume that the
-centered footer will be a modification date and will prepend something like
-"Last modified: "; if this is the case, you may want to set C<release> to
-the last modified date and C<date> to the version number.
+Set the centered footer for the C<.TH> macro.  By default, this is set to
+the version of Perl you run Pod::Man under.  Setting this to the empty
+string will cause some *roff implementations to use the system default
+value.
+
+Note that some system C<an> macro sets assume that the centered footer
+will be a modification date and will prepend something like "Last
+modified: ".  If this is the case for your target system, you may want to
+set C<release> to the last modified date and C<date> to the version
+number.
 
 =item section
 
@@ -1756,10 +1834,10 @@ by many implementations and may even result in segfaults and other bad
 behavior.
 
 Be aware that, when using this option, the input encoding of your POD
-source must be properly declared unless it is US-ASCII or Latin-1.  POD
-input without an C<=encoding> command will be assumed to be in Latin-1,
-and if it's actually in UTF-8, the output will be double-encoded.  See
-L<perlpod(1)> for more information on the C<=encoding> command.
+source should be properly declared unless it's US-ASCII.  Pod::Simple will
+attempt to guess the encoding and may be successful if it's Latin-1 or
+UTF-8, but it will produce warnings.  Use the C<=encoding> command to
+declare the encoding.  See L<perlpod(1)> for more information.
 
 =back
 
@@ -1800,8 +1878,8 @@ canonical versions of B<nroff> and B<troff> don't either).
 =item Invalid quote specification "%s"
 
 (F) The quote specification given (the C<quotes> option to the
-constructor) was invalid.  A quote specification must be one, two, or four
-characters long.
+constructor) was invalid.  A quote specification must be either one
+character long or an even number (greater than one) characters long.
 
 =item POD document had syntax errors
 
@@ -1810,6 +1888,43 @@ option was set to C<die>.
 
 =back
 
+=head1 ENVIRONMENT
+
+=over 4
+
+=item PERL_CORE
+
+If set and Encode is not available, silently fall back to non-UTF-8 mode
+without complaining to standard error.  This environment variable is set
+during Perl core builds, which build Encode after podlators.  Encode is
+expected to not (yet) be available in that case.
+
+=item POD_MAN_DATE
+
+If set, this will be used as the value of the left-hand footer unless the
+C<date> option is explicitly set, overriding the timestamp of the input
+file or the current time.  This is primarily useful to ensure reproducible
+builds of the same output file given the same source and Pod::Man version,
+even when file timestamps may not be consistent.
+
+=item SOURCE_DATE_EPOCH
+
+If set, and POD_MAN_DATE and the C<date> options are not set, this will be
+used as the modification time of the source file, overriding the timestamp of
+the input file or the current time.  It should be set to the desired time in
+seconds since UNIX epoch.  This is primarily useful to ensure reproducible
+builds of the same output file given the same source and Pod::Man version,
+even when file timestamps may not be consistent.  See
+L<https://reproducible-builds.org/specs/source-date-epoch/> for the full
+specification.
+
+(Arguably, according to the specification, this variable should be used only
+if the timestamp of the input file is not available and Pod::Man uses the
+current time.  However, for reproducible builds in Debian, results were more
+reliable if this variable overrode the timestamp of the input file.)
+
+=back
+
 =head1 BUGS
 
 Encoding handling assumes that PerlIO is available and does not work
@@ -1860,7 +1975,7 @@ only matters for troff output.
 
 =head1 AUTHOR
 
-Russ Allbery <rra@stanford.edu>, based I<very> heavily on the original
+Russ Allbery <rra@cpan.org>, based I<very> heavily on the original
 B<pod2man> by Tom Christiansen <tchrist@mox.perl.com>.  The modifications to
 work with Pod::Simple instead of Pod::Parser were originally contributed by
 Sean Burke (but I've since hacked them beyond recognition and all bugs are
@@ -1869,7 +1984,7 @@ mine).
 =head1 COPYRIGHT AND LICENSE
 
 Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2009, 2010, 2012, 2013 Russ Allbery <rra@stanford.edu>.
+2009, 2010, 2012, 2013, 2014, 2015, 2016 Russ Allbery <rra@cpan.org>
 
 This program is free software; you may redistribute it and/or modify it
 under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/Pod/ParseLink.pm b/Master/tlpkg/tlperl/lib/Pod/ParseLink.pm
index 750fdfb88dc..a9e6b34d3ab 100644
--- a/Master/tlpkg/tlperl/lib/Pod/ParseLink.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/ParseLink.pm
@@ -1,6 +1,6 @@
 # Pod::ParseLink -- Parse an L<> formatting code in POD text.
 #
-# Copyright 2001, 2008, 2009 by Russ Allbery <rra@stanford.edu>
+# Copyright 2001, 2008, 2009, 2014 by Russ Allbery <rra@cpan.org>
 #
 # This program is free software; you may redistribute it and/or modify it
 # under the same terms as Perl itself.
@@ -21,16 +21,17 @@
 
 package Pod::ParseLink;
 
-require 5.004;
-
+use 5.006;
 use strict;
+use warnings;
+
 use vars qw(@EXPORT @ISA $VERSION);
 
 use Exporter;
 @ISA    = qw(Exporter);
 @EXPORT = qw(parselink);
 
-$VERSION = '1.10';
+$VERSION = '4.07';
 
 ##############################################################################
 # Implementation
@@ -123,7 +124,8 @@ markup Allbery URL
 =head1 SYNOPSIS
 
     use Pod::ParseLink;
-    my ($text, $inferred, $name, $section, $type) = parselink ($link);
+    my $link = get_link();
+    my ($text, $inferred, $name, $section, $type) = parselink($link);
 
 =head1 DESCRIPTION
 
@@ -180,11 +182,11 @@ L<http://www.eyrie.org/~eagle/software/podlators/>.
 
 =head1 AUTHOR
 
-Russ Allbery <rra@stanford.edu>.
+Russ Allbery <rra@cpan.org>.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2001, 2008, 2009 Russ Allbery <rra@stanford.edu>.
+Copyright 2001, 2008, 2009 Russ Allbery <rra@cpan.org>.
 
 This program is free software; you may redistribute it and/or modify it
 under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Perldoc.pm b/Master/tlpkg/tlperl/lib/Pod/Perldoc.pm
index 969019d89ad..787353ba588 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Perldoc.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Perldoc.pm
@@ -12,7 +12,8 @@ use File::Spec::Functions qw(catfile catdir splitdir);
 use vars qw($VERSION @Pagers $Bindir $Pod2man
   $Temp_Files_Created $Temp_File_Lifetime
 );
-$VERSION = '3.25';
+$VERSION = '3.25_03'; # patched in perl5.git
+$VERSION =~ s/_//;
 
 #..........................................................................
 
@@ -69,6 +70,7 @@ BEGIN {
  *is_cygwin  = $^O eq 'cygwin'  ? \&TRUE : \&FALSE unless defined &is_cygwin;
  *is_linux   = $^O eq 'linux'   ? \&TRUE : \&FALSE unless defined &is_linux;
  *is_hpux    = $^O =~ m/hpux/   ? \&TRUE : \&FALSE unless defined &is_hpux;
+ *is_amigaos = $^O eq 'amigaos' ? \&TRUE : \&FALSE unless defined &is_amigaos;
 }
 
 $Temp_File_Lifetime ||= 60 * 60 * 24 * 5;
@@ -484,7 +486,7 @@ sub init_formatter_class_list {
 
   $self->opt_M_with('Pod::Perldoc::ToPod');   # the always-there fallthru
   $self->opt_o_with('text');
-  $self->opt_o_with('term') unless $self->is_mswin32 || $self->is_dos
+  $self->opt_o_with('term') unless $self->is_mswin32 || $self->is_dos || $self->is_amigaos
        || !($ENV{TERM} && (
               ($ENV{TERM} || '') !~ /dumb|emacs|none|unknown/i
            ));
@@ -573,6 +575,9 @@ sub find_good_formatter_class {
   my @class_list = @{ $self->{'formatter_classes'} || [] };
   $self->die( "WHAT?  Nothing in the formatter class list!?" ) unless @class_list;
 
+  local @INC = @INC;
+  pop @INC if $INC[-1] eq '.';
+
   my $good_class_found;
   foreach my $c (@class_list) {
     DEBUG > 4 and print "Trying to load $c...\n";
@@ -1004,6 +1009,8 @@ sub new_translator { # $tr = $self->new_translator($lang);
     my $self = shift;
     my $lang = shift;
 
+    local @INC = @INC;
+    pop @INC if $INC[-1] eq '.';
     my $pack = 'POD2::' . uc($lang);
     eval "require $pack";
     if ( !$@ && $pack->can('new') ) {
@@ -1662,6 +1669,10 @@ sub pagers_guessing {
         push @pagers, qw( less.exe more.com< );
         unshift @pagers, $ENV{PAGER}  if $ENV{PAGER};
     }
+    elsif ( $self->is_amigaos) {
+        push @pagers, qw( /SYS/Utilities/MultiView /SYS/Utilities/More /C/TYPE );
+        unshift @pagers, "$ENV{PAGER}"  if $ENV{PAGER};
+    }
     else {
         if ($self->is_os2) {
           unshift @pagers, 'less', 'cmd /c more <';
@@ -1912,10 +1923,15 @@ sub page {  # apply a pager to the output file
         #  many many corners of the OS don't like it.  So we
         #  have to force it to be "\" to make everyone happy.
 
+        # if we are on an amiga convert unix path to an amiga one
+        $output =~ s/^\/(.*)\/(.*)/$1:$2/ if $self->is_amigaos;
+
         foreach my $pager (@pagers) {
             $self->aside("About to try calling $pager $output\n");
             if ($self->is_vms) {
                 last if system("$pager $output") == 0;
+              } elsif($self->is_amigaos) {
+                last if system($pager, $output) == 0;
             } else {
                 # fix visible escape codes in ToTerm output
                 # https://bugs.debian.org/758689
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple.pm b/Master/tlpkg/tlperl/lib/Pod/Simple.pm
index 538969d9fb2..d8521b2e8be 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple.pm
@@ -18,7 +18,7 @@ use vars qw(
 );
 
 @ISA = ('Pod::Simple::BlackBox');
-$VERSION = '3.29';
+$VERSION = '3.32';
 
 @Known_formatting_codes = qw(I B C L E F S X Z); 
 %Known_formatting_codes = map(($_=>1), @Known_formatting_codes);
@@ -35,7 +35,7 @@ BEGIN {
   else                  { *ASCII = sub () {''} }
 
   unless(defined &MANY_LINES) { *MANY_LINES = sub () {20} }
-  DEBUG > 4 and print "MANY_LINES is ", MANY_LINES(), "\n";
+  DEBUG > 4 and print STDERR "MANY_LINES is ", MANY_LINES(), "\n";
   unless(MANY_LINES() >= 1) {
     die "MANY_LINES is too small (", MANY_LINES(), ")!\nAborting";
   }
@@ -44,8 +44,24 @@ BEGIN {
   else                 { *UNICODE = sub() {''} }
 }
 if(DEBUG > 2) {
-  print "# We are ", ASCII ? '' : 'not ', "in ASCII-land\n";
-  print "# We are under a Unicode-safe Perl.\n";
+  print STDERR "# We are ", ASCII ? '' : 'not ', "in ASCII-land\n";
+  print STDERR "# We are under a Unicode-safe Perl.\n";
+}
+
+# The NO BREAK SPACE and SOFT HYHPEN are used in several submodules.
+if ($] ge 5.007_003) {  # On sufficiently modern Perls we can handle any
+                        # character set
+  $Pod::Simple::nbsp = chr utf8::unicode_to_native(0xA0);
+  $Pod::Simple::shy  = chr utf8::unicode_to_native(0xAD);
+}
+elsif (Pod::Simple::ASCII) {  # Hard code ASCII early Perl
+  $Pod::Simple::nbsp = "\xA0";
+  $Pod::Simple::shy  = "\xAD";
+}
+else { # EBCDIC on early Perl.  We know what the values are for the code
+        # pages supported then.
+  $Pod::Simple::nbsp = "\x41";
+  $Pod::Simple::shy  = "\xCA";
 }
 
 # Design note:
@@ -114,6 +130,10 @@ sub any_errata_seen {  # good for using as an exit() value...
   return shift->{'errors_seen'} || 0;
 }
 
+sub errata_seen {
+  return shift->{'all_errata'} || {};
+}
+
 # Returns the encoding only if it was recognized as being handled and set
 sub detected_encoding {
   return shift->{'detected_encoding'};
@@ -127,7 +147,7 @@ sub encoding {
   if ($this->{'_processed_encoding'}) {
     delete $this->{'_processed_encoding'};
     if(! $this->{'encoding_command_statuses'} ) {
-      DEBUG > 2 and print " CRAZY ERROR: encoding wasn't really handled?!\n";
+      DEBUG > 2 and print STDERR " CRAZY ERROR: encoding wasn't really handled?!\n";
     } elsif( $this->{'encoding_command_statuses'}[-1] ) {
       $this->scream( "=encoding $_[0]",
          sprintf "Couldn't do %s: %s",
@@ -135,7 +155,7 @@ sub encoding {
          $this->{'encoding_command_statuses'}[-1],
       );
     } else {
-      DEBUG > 2 and print " (encoding successfully handled.)\n";
+      DEBUG > 2 and print STDERR " (encoding successfully handled.)\n";
     }
     return $this->{'encoding'};
   } else {
@@ -179,7 +199,7 @@ sub output_string {
   require Pod::Simple::TiedOutFH;
   my $x = (defined($_[0]) and ref($_[0])) ? $_[0] : \( $_[0] );
   $$x = '' unless defined $$x;
-  DEBUG > 4 and print "# Output string set to $x ($$x)\n";
+  DEBUG > 4 and print STDERR "# Output string set to $x ($$x)\n";
   $this->{'output_fh'} = Pod::Simple::TiedOutFH->handle_on($_[0]);
   return
     $this->{'output_string'} = $_[0];
@@ -244,9 +264,9 @@ sub _accept_directives {
     Carp::croak "\"$d\" is already a reserved Pod directive name"
      if exists $Known_directives{$d};
     $this->{'accept_directives'}{$d} = $type;
-    DEBUG > 2 and print "Learning to accept \"=$d\" as directive of type $type\n";
+    DEBUG > 2 and print STDERR "Learning to accept \"=$d\" as directive of type $type\n";
   }
-  DEBUG > 6 and print "$this\'s accept_directives : ",
+  DEBUG > 6 and print STDERR "$this\'s accept_directives : ",
    pretty($this->{'accept_directives'}), "\n";
   
   return sort keys %{ $this->{'accept_directives'} } if wantarray;
@@ -267,7 +287,7 @@ sub unaccept_directives {
     Carp::croak "But you must accept \"$d\" directives -- it's a builtin!"
      if exists $Known_directives{$d};
     delete $this->{'accept_directives'}{$d};
-    DEBUG > 2 and print "OK, won't accept \"=$d\" as directive.\n";
+    DEBUG > 2 and print STDERR "OK, won't accept \"=$d\" as directive.\n";
   }
   return sort keys %{ $this->{'accept_directives'} } if wantarray;
   return
@@ -292,7 +312,7 @@ sub _accept_targets {
     next unless defined $t and length $t;
     # TODO: enforce some limitations on what a target name can be?
     $this->{'accept_targets'}{$t} = $type;
-    DEBUG > 2 and print "Learning to accept \"$t\" as target of type $type\n";
+    DEBUG > 2 and print STDERR "Learning to accept \"$t\" as target of type $type\n";
   }    
   return sort keys %{ $this->{'accept_targets'} } if wantarray;
   return;
@@ -307,7 +327,7 @@ sub unaccept_targets {
     next unless defined $t and length $t;
     # TODO: enforce some limitations on what a target name can be?
     delete $this->{'accept_targets'}{$t};
-    DEBUG > 2 and print "OK, won't accept \"$t\" as target.\n";
+    DEBUG > 2 and print STDERR "OK, won't accept \"$t\" as target.\n";
   }    
   return sort keys %{ $this->{'accept_targets'} } if wantarray;
   return;
@@ -317,6 +337,13 @@ sub unaccept_targets {
 #
 # And now codes (not targets or directives)
 
+# XXX Probably it is an error that the digit '9' is excluded from these re's.
+# Broken for early Perls on EBCDIC
+my $xml_name_re = eval "qr/[^-.0-8:A-Z_a-z[:^ascii:]]/";
+if (! defined $xml_name_re) {
+    $xml_name_re = qr/[\x00-\x2C\x2F\x39\x3B-\x40\x5B-\x5E\x60\x7B-\x7F]/;
+}
+
 sub accept_code { shift->accept_codes(@_) } # alias
 
 sub accept_codes {  # Add some codes
@@ -324,20 +351,17 @@ sub accept_codes {  # Add some codes
   
   foreach my $new_code (@_) {
     next unless defined $new_code and length $new_code;
-    if(ASCII) {
-      # A good-enough check that it's good as an XML Name symbol:
-      Carp::croak "\"$new_code\" isn't a valid element name"
-        if $new_code =~
-          m/[\x00-\x2C\x2F\x39\x3B-\x40\x5B-\x5E\x60\x7B-\x7F]/
-            # Characters under 0x80 that aren't legal in an XML Name.
-        or $new_code =~ m/^[-\.0-9]/s
-        or $new_code =~ m/:[-\.0-9]/s;
-            # The legal under-0x80 Name characters that 
-            #  an XML Name still can't start with.
-    }
-    
+    # A good-enough check that it's good as an XML Name symbol:
+    Carp::croak "\"$new_code\" isn't a valid element name"
+      if $new_code =~ $xml_name_re
+          # Characters under 0x80 that aren't legal in an XML Name.
+      or $new_code =~ m/^[-\.0-9]/s
+      or $new_code =~ m/:[-\.0-9]/s;
+          # The legal under-0x80 Name characters that
+          #  an XML Name still can't start with.
+
     $this->{'accept_codes'}{$new_code} = $new_code;
-    
+
     # Yes, map to itself -- just so that when we
     #  see "=extend W [whatever] thatelementname", we say that W maps
     #  to whatever $this->{accept_codes}{thatelementname} is,
@@ -359,24 +383,21 @@ sub unaccept_codes { # remove some codes
   
   foreach my $new_code (@_) {
     next unless defined $new_code and length $new_code;
-    if(ASCII) {
-      # A good-enough check that it's good as an XML Name symbol:
-      Carp::croak "\"$new_code\" isn't a valid element name"
-        if $new_code =~
-          m/[\x00-\x2C\x2F\x39\x3B-\x40\x5B-\x5E\x60\x7B-\x7F]/
-            # Characters under 0x80 that aren't legal in an XML Name.
-        or $new_code =~ m/^[-\.0-9]/s
-        or $new_code =~ m/:[-\.0-9]/s;
-            # The legal under-0x80 Name characters that 
-            #  an XML Name still can't start with.
-    }
-    
+    # A good-enough check that it's good as an XML Name symbol:
+    Carp::croak "\"$new_code\" isn't a valid element name"
+      if $new_code =~ $xml_name_re
+          # Characters under 0x80 that aren't legal in an XML Name.
+      or $new_code =~ m/^[-\.0-9]/s
+      or $new_code =~ m/:[-\.0-9]/s;
+          # The legal under-0x80 Name characters that
+          #  an XML Name still can't start with.
+
     Carp::croak "But you must accept \"$new_code\" codes -- it's a builtin!"
      if grep $new_code eq $_, @Known_formatting_codes;
 
     delete $this->{'accept_codes'}{$new_code};
 
-    DEBUG > 2 and print "OK, won't accept the code $new_code<...>.\n";
+    DEBUG > 2 and print STDERR "OK, won't accept the code $new_code<...>.\n";
   }
   
   return;
@@ -411,7 +432,7 @@ sub parse_string_document {
 sub _init_fh_source {
   my($self, $source) = @_;
 
-  #DEBUG > 1 and print "Declaring $source as :raw for starters\n";
+  #DEBUG > 1 and print STDERR "Declaring $source as :raw for starters\n";
   #$self->_apply_binmode($source, ':raw');
   #binmode($source, ":raw");
 
@@ -504,7 +525,7 @@ sub parse_from_file {
   } else {
     require Symbol;
     my $out_fh = Symbol::gensym();
-    DEBUG and print "Write-opening to $to\n";
+    DEBUG and print STDERR "Write-opening to $to\n";
     open($out_fh, ">$to")  or  Carp::croak "Can't write-open $to: $!";
     binmode($out_fh)
      if $self->can('write_with_binmode') and $self->write_with_binmode;
@@ -521,9 +542,10 @@ sub whine {
   my $self = shift(@_);
   ++$self->{'errors_seen'};
   if($self->{'no_whining'}) {
-    DEBUG > 9 and print "Discarding complaint (at line $_[0]) $_[1]\n because no_whining is on.\n";
+    DEBUG > 9 and print STDERR "Discarding complaint (at line $_[0]) $_[1]\n because no_whining is on.\n";
     return;
   }
+  push @{$self->{'all_errata'}{$_[0]}}, $_[1];
   return $self->_complain_warn(@_) if $self->{'complain_stderr'};
   return $self->_complain_errata(@_);
 }
@@ -532,6 +554,7 @@ sub scream {    # like whine, but not suppressible
   #my($self,$line,$complaint) = @_;
   my $self = shift(@_);
   ++$self->{'errors_seen'};
+  push @{$self->{'all_errata'}{$_[0]}}, $_[1];
   return $self->_complain_warn(@_) if $self->{'complain_stderr'};
   return $self->_complain_errata(@_);
 }
@@ -545,9 +568,9 @@ sub _complain_warn {
 sub _complain_errata {
   my($self,$line,$complaint) = @_;
   if( $self->{'no_errata_section'} ) {
-    DEBUG > 9 and print "Discarding erratum (at line $line) $complaint\n because no_errata_section is on.\n";
+    DEBUG > 9 and print STDERR "Discarding erratum (at line $line) $complaint\n because no_errata_section is on.\n";
   } else {
-    DEBUG > 9 and print "Queuing erratum (at line $line) $complaint\n";
+    DEBUG > 9 and print STDERR "Queuing erratum (at line $line) $complaint\n";
     push @{$self->{'errata'}{$line}}, $complaint
       # for a report to be generated later!
   }
@@ -589,7 +612,7 @@ sub _get_item_type {       # mutates the item!!
     # Like: "=item * Foo bar baz";
     $para->[1]{'~orig_content'}      = $content;
     $para->[1]{'~_freaky_para_hack'} = $1;
-    DEBUG > 2 and print " Tolerating $$para[2] as =item *\\n\\n$1\n";
+    DEBUG > 2 and print STDERR " Tolerating $$para[2] as =item *\\n\\n$1\n";
     splice @$para, 2; # so it ends up just being ['=item', { attrhash } ]
     return $para->[1]{'~type'} = 'bullet';
 
@@ -621,7 +644,7 @@ sub _make_treelet {
     #  just have the first line be a reference to a ['~Top', {}, ...]
     # We use this feechure in gen_errata and stuff.
 
-    DEBUG and print "Applying precooked treelet hack to $_[0][0]\n";
+    DEBUG and print STDERR "Applying precooked treelet hack to $_[0][0]\n";
     $treelet = $_[0][0];
     splice @$treelet, 0, 2;  # lop the top off
     return $treelet;
@@ -638,7 +661,7 @@ sub _make_treelet {
     $self->_wrap_up($treelet); # Nix X's and merge texties
     
   } else {
-    DEBUG and print "Formatless treelet gets fast-tracked.\n";
+    DEBUG and print STDERR "Formatless treelet gets fast-tracked.\n";
      # Very common case!
   }
   
@@ -655,7 +678,7 @@ sub _wrap_up {
   my $merge = $self->{'merge_text' };
   return unless $nixx or $merge;
 
-  DEBUG > 2 and print "\nStarting _wrap_up traversal.\n",
+  DEBUG > 2 and print STDERR "\nStarting _wrap_up traversal.\n",
    $merge ? (" Merge mode on\n") : (),
    $nixx  ? (" Nix-X mode on\n") : (),
   ;    
@@ -663,11 +686,11 @@ sub _wrap_up {
 
   my($i, $treelet);
   while($treelet = shift @stack) {
-    DEBUG > 3 and print " Considering children of this $treelet->[0] node...\n";
+    DEBUG > 3 and print STDERR " Considering children of this $treelet->[0] node...\n";
     for($i = 2; $i < @$treelet; ++$i) { # iterate over children
-      DEBUG > 3 and print " Considering child at $i ", pretty($treelet->[$i]), "\n";
+      DEBUG > 3 and print STDERR " Considering child at $i ", pretty($treelet->[$i]), "\n";
       if($nixx and ref $treelet->[$i] and $treelet->[$i][0] eq 'X') {
-        DEBUG > 3 and print "   Nixing X node at $i\n";
+        DEBUG > 3 and print STDERR "   Nixing X node at $i\n";
         splice(@$treelet, $i, 1); # just nix this node (and its descendants)
         # no need to back-update the counter just yet
         redo;
@@ -675,17 +698,17 @@ sub _wrap_up {
       } elsif($merge and $i != 2 and  # non-initial
          !ref $treelet->[$i] and !ref $treelet->[$i - 1]
       ) {
-        DEBUG > 3 and print "   Merging ", $i-1,
+        DEBUG > 3 and print STDERR "   Merging ", $i-1,
          ":[$treelet->[$i-1]] and $i\:[$treelet->[$i]]\n";
         $treelet->[$i-1] .= ( splice(@$treelet, $i, 1) )[0];
-        DEBUG > 4 and print "    Now: ", $i-1, ":[$treelet->[$i-1]]\n";
+        DEBUG > 4 and print STDERR "    Now: ", $i-1, ":[$treelet->[$i-1]]\n";
         --$i;
         next; 
         # since we just pulled the possibly last node out from under
         #  ourselves, we can't just redo()
 
       } elsif( ref $treelet->[$i] ) {
-        DEBUG > 4 and print "  Enqueuing ", pretty($treelet->[$i]), " for traversal.\n";
+        DEBUG > 4 and print STDERR "  Enqueuing ", pretty($treelet->[$i]), " for traversal.\n";
         push @stack, $treelet->[$i];
 
         if($treelet->[$i][0] eq 'L') {
@@ -693,7 +716,7 @@ sub _wrap_up {
           foreach my $attrname ('section', 'to') {        
             if(defined($thing = $treelet->[$i][1]{$attrname}) and ref $thing) {
               unshift @stack, $thing;
-              DEBUG > 4 and print "  +Enqueuing ",
+              DEBUG > 4 and print STDERR "  +Enqueuing ",
                pretty( $treelet->[$i][1]{$attrname} ),
                " as an attribute value to tweak.\n";
             }
@@ -702,7 +725,7 @@ sub _wrap_up {
       }
     }
   }
-  DEBUG > 2 and print "End of _wrap_up traversal.\n\n";
+  DEBUG > 2 and print STDERR "End of _wrap_up traversal.\n\n";
 
   return;
 }
@@ -714,7 +737,7 @@ sub _remap_sequences {
   
   if(@stack == 1 and @{ $stack[0] } == 3 and !ref $stack[0][2]) {
     # VERY common case: abort it.
-    DEBUG and print "Skipping _remap_sequences: formatless treelet.\n";
+    DEBUG and print STDERR "Skipping _remap_sequences: formatless treelet.\n";
     return 0;
   }
   
@@ -725,7 +748,7 @@ sub _remap_sequences {
    "\nAbout to start _remap_sequences on treelet from line %s.\n",
    $start_line || '[?]'
   ;
-  DEBUG > 3 and print " Map: ",
+  DEBUG > 3 and print STDERR " Map: ",
     join('; ', map "$_=" . (
         ref($map->{$_}) ? join(",", @{$map->{$_}}) : $map->{$_}
       ),
@@ -738,20 +761,20 @@ sub _remap_sequences {
   
   my($is, $was, $i, $treelet); # scratch
   while($treelet = shift @stack) {
-    DEBUG > 3 and print " Considering children of this $treelet->[0] node...\n";
+    DEBUG > 3 and print STDERR " Considering children of this $treelet->[0] node...\n";
     for($i = 2; $i < @$treelet; ++$i) { # iterate over children
       next unless ref $treelet->[$i];  # text nodes are uninteresting
       
-      DEBUG > 4 and print "  Noting child $i : $treelet->[$i][0]<...>\n";
+      DEBUG > 4 and print STDERR "  Noting child $i : $treelet->[$i][0]<...>\n";
       
       $is = $treelet->[$i][0] = $map->{ $was = $treelet->[$i][0] };
       if( DEBUG > 3 ) {
         if(!defined $is) {
-          print "   Code $was<> is UNKNOWN!\n";
+          print STDERR "   Code $was<> is UNKNOWN!\n";
         } elsif($is eq $was) {
-          DEBUG > 4 and print "   Code $was<> stays the same.\n";
+          DEBUG > 4 and print STDERR "   Code $was<> stays the same.\n";
         } else  {
-          print "   Code $was<> maps to ",
+          print STDERR "   Code $was<> maps to ",
            ref($is)
             ? ( "tags ", map("$_<", @$is), '...', map('>', @$is), "\n" )
             : "tag $is<...>.\n";
@@ -766,7 +789,7 @@ sub _remap_sequences {
       }
       if(ref $is) {
         my @dynasty = @$is;
-        DEBUG > 4 and print "    Renaming $was node to $dynasty[-1]\n"; 
+        DEBUG > 4 and print STDERR "    Renaming $was node to $dynasty[-1]\n";
         $treelet->[$i][0] = pop @dynasty;
         my $nugget;
         while(@dynasty) {
@@ -795,10 +818,10 @@ sub _remap_sequences {
     }
   }
   
-  DEBUG > 2 and print "End of _remap_sequences traversal.\n\n";
+  DEBUG > 2 and print STDERR "End of _remap_sequences traversal.\n\n";
 
   if(@_ == 2 and @{ $_[1] } == 3 and !ref $_[1][2]) {
-    DEBUG and print "Noting that the treelet is now formatless.\n";
+    DEBUG and print STDERR "Noting that the treelet is now formatless.\n";
     return 0;
   }
   return 1;
@@ -816,7 +839,7 @@ sub _ponder_extend {
   $content =~ s/^\s+//s;
   $content =~ s/\s+$//s;
 
-  DEBUG > 2 and print "Ogling extensor: =extend $content\n";
+  DEBUG > 2 and print STDERR "Ogling extensor: =extend $content\n";
 
   if($content =~
     m/^
@@ -833,10 +856,10 @@ sub _ponder_extend {
     my $elements_one;
     $elements_one = defined($3) ? $3 : $1;
 
-    DEBUG > 2 and print "Extensor has good syntax.\n";
+    DEBUG > 2 and print STDERR "Extensor has good syntax.\n";
 
     unless($new_letter =~ m/^[A-Z]$/s or $new_letter) {
-      DEBUG > 2 and print " $new_letter isn't a valid thing to entend.\n";
+      DEBUG > 2 and print STDERR " $new_letter isn't a valid thing to entend.\n";
       $self->whine(
         $para->[1]{'start_line'},
         "You can extend only formatting codes A-Z, not like \"$new_letter\""
@@ -845,7 +868,7 @@ sub _ponder_extend {
     }
     
     if(grep $new_letter eq $_, @Known_formatting_codes) {
-      DEBUG > 2 and print " $new_letter isn't a good thing to extend, because known.\n";
+      DEBUG > 2 and print STDERR " $new_letter isn't a good thing to extend, because known.\n";
       $self->whine(
         $para->[1]{'start_line'},
         "You can't extend an established code like \"$new_letter\""
@@ -882,7 +905,7 @@ sub _ponder_extend {
 
     foreach my $f (@fallbacks) {
       next if exists $Known_formatting_codes{$f} or $f eq '0' or $f eq '1';
-      DEBUG > 2 and print "  Can't fall back on unknown code $f\n";
+      DEBUG > 2 and print STDERR "  Can't fall back on unknown code $f\n";
       $self->whine(
         $para->[1]{'start_line'},
         "Can't use unknown formatting code '$f' as a fallback for '$new_letter'"
@@ -890,17 +913,17 @@ sub _ponder_extend {
       return;
     }
 
-    DEBUG > 3 and printf "Extensor: Fallbacks <%s> Elements <%s>.\n",
+    DEBUG > 3 and printf STDERR "Extensor: Fallbacks <%s> Elements <%s>.\n",
      @fallbacks, @elements;
 
     my $canonical_form;
     foreach my $e (@elements) {
       if(exists $self->{'accept_codes'}{$e}) {
-        DEBUG > 1 and print " Mapping '$new_letter' to known extension '$e'\n";
+        DEBUG > 1 and print STDERR " Mapping '$new_letter' to known extension '$e'\n";
         $canonical_form = $e;
         last; # first acceptable elementname wins!
       } else {
-        DEBUG > 1 and print " Can't map '$new_letter' to unknown extension '$e'\n";
+        DEBUG > 1 and print STDERR " Can't map '$new_letter' to unknown extension '$e'\n";
       }
     }
 
@@ -919,7 +942,7 @@ sub _ponder_extend {
     }
 
   } else {
-    DEBUG > 2 and print "Extensor has bad syntax.\n";
+    DEBUG > 2 and print STDERR "Extensor has bad syntax.\n";
     $self->whine(
       $para->[1]{'start_line'},
       "Unknown =extend syntax: $content"
@@ -947,7 +970,7 @@ sub _treat_Zs {  # Nix Z<...>'s
         next;
       }
         
-      DEBUG > 1 and print "Nixing Z node @{$treelet->[$i]}\n";
+      DEBUG > 1 and print STDERR "Nixing Z node @{$treelet->[$i]}\n";
         
       # bitch UNLESS it's empty
       unless(  @{$treelet->[$i]} == 2
@@ -1057,7 +1080,7 @@ sub _treat_Ls {  # Process our dear dear friends, the L<...> sequences
       
       # By here, $treelet->[$i] is definitely an L node
       my $ell = $treelet->[$i];
-      DEBUG > 1 and print "Ogling L node $ell\n";
+      DEBUG > 1 and print STDERR "Ogling L node $ell\n";
         
       # bitch if it's empty
       if(  @{$ell} == 2
@@ -1134,7 +1157,7 @@ sub _treat_Ls {  # Process our dear dear friends, the L<...> sequences
         my $it = $ell->[2];
         if($it =~ m{^[^/|]+[(][-a-zA-Z0-9]+[)]$}s) { # man sections
           # Hopefully neither too broad nor too restrictive a RE
-          DEBUG > 1 and print "Catching \"$it\" as manpage link.\n";
+          DEBUG > 1 and print STDERR "Catching \"$it\" as manpage link.\n";
           $ell->[1]{'type'} = 'man';
           # This's the only place where man links can get made.
           $ell->[1]{'content-implicit'} = 'yes';
@@ -1146,7 +1169,7 @@ sub _treat_Ls {  # Process our dear dear friends, the L<...> sequences
         if($it =~ m/^[^\/\|,\$\%\@\ \"\<\>\:\#\&\*\{\}\[\]\(\)]+(\:\:[^\/\|,\$\%\@\ \"\<\>\:\#\&\*\{\}\[\]\(\)]+)*$/s) {
           # Extremely forgiving idea of what constitutes a bare
           #  modulename link like L<Foo::Bar> or even L<Thing::1.0::Docs::Tralala>
-          DEBUG > 1 and print "Catching \"$it\" as ho-hum L<Modulename> link.\n";
+          DEBUG > 1 and print STDERR "Catching \"$it\" as ho-hum L<Modulename> link.\n";
           $ell->[1]{'type'} = 'pod';
           $ell->[1]{'content-implicit'} = 'yes';
           $ell->[1]{'to'  } =
@@ -1161,32 +1184,32 @@ sub _treat_Ls {  # Process our dear dear friends, the L<...> sequences
       # ...Uhoh, here's the real L<...> parsing stuff...
       # "With the ill behavior, with the ill behavior, with the ill behavior..."
 
-      DEBUG > 1 and print "Running a real parse on this non-trivial L\n";
+      DEBUG > 1 and print STDERR "Running a real parse on this non-trivial L\n";
       
       
       my $link_text; # set to an arrayref if found
       my @ell_content = @$ell;
       splice @ell_content,0,2; # Knock off the 'L' and {} bits
 
-      DEBUG > 3 and print " Ell content to start: ",
+      DEBUG > 3 and print STDERR " Ell content to start: ",
        pretty(@ell_content), "\n";
 
 
       # Look for the "|" -- only in CHILDREN (not all underlings!)
       # Like L<I like the strictness|strict>
       DEBUG > 3 and
-         print "  Peering at L content for a '|' ...\n";
+         print STDERR "  Peering at L content for a '|' ...\n";
       for(my $j = 0; $j < @ell_content; ++$j) {
         next if ref $ell_content[$j];
         DEBUG > 3 and
-         print "    Peering at L-content text bit \"$ell_content[$j]\" for a '|'.\n";
+         print STDERR "    Peering at L-content text bit \"$ell_content[$j]\" for a '|'.\n";
 
         if($ell_content[$j] =~ m/^([^\|]*)\|(.*)$/s) {
           my @link_text = ($1);   # might be 0-length
           $ell_content[$j] = $2;  # might be 0-length
 
           DEBUG > 3 and
-           print "     FOUND a '|' in it.  Splitting into [$1] + [$2]\n";
+           print STDERR "     FOUND a '|' in it.  Splitting into [$1] + [$2]\n";
 
           if ($link_text[0] =~ m{[|/]}) {
             $self->whine(
@@ -1211,18 +1234,18 @@ sub _treat_Ls {  # Process our dear dear friends, the L<...> sequences
       # And afterward, anything left in @ell_content will be the raw name
       # Like L<Foo::Bar/Object Methods>
       my $section_name;  # set to arrayref if found
-      DEBUG > 3 and print "  Peering at L-content for a '/' ...\n";
+      DEBUG > 3 and print STDERR "  Peering at L-content for a '/' ...\n";
       for(my $j = 0; $j < @ell_content; ++$j) {
         next if ref $ell_content[$j];
         DEBUG > 3 and
-         print "    Peering at L-content text bit \"$ell_content[$j]\" for a '/'.\n";
+         print STDERR "    Peering at L-content text bit \"$ell_content[$j]\" for a '/'.\n";
 
         if($ell_content[$j] =~ m/^([^\/]*)\/(.*)$/s) {
           my @section_name = ($2); # might be 0-length
           $ell_content[$j] =  $1;  # might be 0-length
 
           DEBUG > 3 and
-           print "     FOUND a '/' in it.",
+           print STDERR "     FOUND a '/' in it.",
              "  Splitting to page [...$1] + section [$2...]\n";
 
           push @section_name, splice @ell_content, 1+$j;
@@ -1243,10 +1266,10 @@ sub _treat_Ls {  # Process our dear dear friends, the L<...> sequences
             $section_name[ 0] =~ s/^\"//s;
             $section_name[-1] =~ s/\"$//s;
             DEBUG > 3 and
-             print "     Quotes removed: ", pretty(@section_name), "\n";
+             print STDERR "     Quotes removed: ", pretty(@section_name), "\n";
           } else {
             DEBUG > 3 and
-             print "     No need to remove quotes in ", pretty(@section_name), "\n";
+             print STDERR "     No need to remove quotes in ", pretty(@section_name), "\n";
           }
 
           $section_name = \@section_name;
@@ -1301,30 +1324,30 @@ sub _treat_Ls {  # Process our dear dear friends, the L<...> sequences
          and $ell_content[0] =~ m{^[^/]+[(][-a-zA-Z0-9]+[)]$}s
       ) {
         $ell->[1]{'type'}    = 'man';
-        DEBUG > 3 and print "Considering this ($ell_content[0]) a man link.\n";
+        DEBUG > 3 and print STDERR "Considering this ($ell_content[0]) a man link.\n";
       } else {
         $ell->[1]{'type'}    = 'pod';
-        DEBUG > 3 and print "Considering this a pod link (not man or url).\n";
+        DEBUG > 3 and print STDERR "Considering this a pod link (not man or url).\n";
       }
 
       if( defined $section_name ) {
         $ell->[1]{'section'} = Pod::Simple::LinkSection->new(
           ['', {}, @$section_name]
         );
-        DEBUG > 3 and print "L-section content: ", pretty($ell->[1]{'section'}), "\n";
+        DEBUG > 3 and print STDERR "L-section content: ", pretty($ell->[1]{'section'}), "\n";
       }
 
       if( @ell_content ) {
         $ell->[1]{'to'} = Pod::Simple::LinkSection->new(
           ['', {}, @ell_content]
         );
-        DEBUG > 3 and print "L-to content: ", pretty($ell->[1]{'to'}), "\n";
+        DEBUG > 3 and print STDERR "L-to content: ", pretty($ell->[1]{'to'}), "\n";
       }
       
       # And update children to be the link-text:
       @$ell = (@$ell[0,1], defined($link_text) ? splice(@$link_text) : '');
       
-      DEBUG > 2 and print "End of L-parsing for this node $treelet->[$i]\n";
+      DEBUG > 2 and print STDERR "End of L-parsing for this node $treelet->[$i]\n";
 
       unshift @stack, $treelet->[$i]; # might as well recurse
     }
@@ -1358,7 +1381,7 @@ sub _treat_Es {
         foreach my $attrname ('section', 'to') {        
           if(defined($thing = $treelet->[$i][1]{$attrname}) and ref $thing) {
             unshift @stack, $thing;
-            DEBUG > 2 and print "  Enqueuing ",
+            DEBUG > 2 and print STDERR "  Enqueuing ",
              pretty( $treelet->[$i][1]{$attrname} ),
              " as an attribute value to tweak.\n";
           }
@@ -1371,7 +1394,7 @@ sub _treat_Es {
         next;
       }
       
-      DEBUG > 1 and print "Ogling E node ", pretty($treelet->[$i]), "\n";
+      DEBUG > 1 and print STDERR "Ogling E node ", pretty($treelet->[$i]), "\n";
 
       # bitch if it's empty
       if(  @{$treelet->[$i]} == 2
@@ -1395,27 +1418,27 @@ sub _treat_Es {
         next;
       }
 
-      DEBUG > 1 and print "Ogling E<$content>\n";
+      DEBUG > 1 and print STDERR "Ogling E<$content>\n";
 
       # XXX E<>'s contents *should* be a valid char in the scope of the current
       # =encoding directive. Defaults to iso-8859-1, I believe. Fix this in the
       # future sometime.
 
       $charnum  = Pod::Escapes::e2charnum($content);
-      DEBUG > 1 and print " Considering E<$content> with char ",
+      DEBUG > 1 and print STDERR " Considering E<$content> with char ",
         defined($charnum) ? $charnum : "undef", ".\n";
 
       if(!defined( $charnum )) {
-        DEBUG > 1 and print "I don't know how to deal with E<$content>.\n";
+        DEBUG > 1 and print STDERR "I don't know how to deal with E<$content>.\n";
         $self->whine( $start_line, "Unknown E content in E<$content>" );
         $replacer = "E<$content>"; # better than nothing
       } elsif($charnum >= 255 and !UNICODE) {
         $replacer = ASCII ? "\xA4" : "?";
-        DEBUG > 1 and print "This Perl version can't handle ", 
+        DEBUG > 1 and print STDERR "This Perl version can't handle ",
           "E<$content> (chr $charnum), so replacing with $replacer\n";
       } else {
         $replacer = Pod::Escapes::e2char($content);
-        DEBUG > 1 and print " Replacing E<$content> with $replacer\n";
+        DEBUG > 1 and print STDERR " Replacing E<$content> with $replacer\n";
       }
 
       splice(@$treelet, $i, 1, $replacer); # no need to back up $i, tho
@@ -1441,15 +1464,6 @@ sub _treat_Ss {
   return;
 }
 
-# We can get NO BREAK SPACE accurately for any platform for recent Perls; for
-# earlier ones use the ASCII value for those platforms, and assume the typical
-# EBCDIC value for any others.
-my $nbsp = ($] >= 5.007003)
-            ? chr utf8::unicode_to_native(0xA0)
-            : (ASCII)
-            ? "\xA0"
-            : "\x41";
-
 sub _change_S_to_nbsp { #  a recursive function
   # Sanely assumes that the top node in the excursion won't be an S node.
   my($treelet, $in_s) = @_;
@@ -1467,7 +1481,7 @@ sub _change_S_to_nbsp { #  a recursive function
         $i +=  @$to_pull_up - 1;   # Make $i skip the pulled-up stuff
       }
     } else {
-      $treelet->[$i] =~ s/\s/$nbsp/g if $in_s;
+      $treelet->[$i] =~ s/\s/$Pod::Simple::nbsp/g if $in_s;
        
        # Note that if you apply nbsp_for_S to text, and so turn
        # "foo S<bar baz> quux" into "foo bar&#160;faz quux", you
@@ -1532,7 +1546,7 @@ sub _out {
 
   my $mutor = shift(@_) if @_ and ref($_[0] || '') eq 'CODE';
 
-  DEBUG and print "\n\n", '#' x 76,
+  DEBUG and print STDERR "\n\n", '#' x 76,
    "\nAbout to parse source: {{\n$_[0]\n}}\n\n";
   
   
@@ -1541,12 +1555,12 @@ sub _out {
 
   my $out = '';
   $parser->output_string( \$out );
-  DEBUG and print " _out to ", \$out, "\n";
+  DEBUG and print STDERR " _out to ", \$out, "\n";
   
   $mutor->($parser) if $mutor;
 
   $parser->parse_string_document( $_[0] );
-  # use Data::Dumper; print Dumper($parser), "\n";
+  # use Data::Dumper; print STDERR Dumper($parser), "\n";
   return $out;
 }
 
@@ -1574,13 +1588,13 @@ sub _duo {
     push @out, '';
     $parser->output_string( \( $out[-1] ) );
 
-    DEBUG and print " _duo out to ", $parser->output_string(),
+    DEBUG and print STDERR " _duo out to ", $parser->output_string(),
       " = $parser->{'output_string'}\n";
 
     $parser->hide_line_numbers(1);
     $mutor->($parser) if $mutor;
     $parser->parse_string_document( shift( @_ ) );
-    # use Data::Dumper; print Dumper($parser), "\n";
+    # use Data::Dumper; print STDERR Dumper($parser), "\n";
   }
 
   return @out;
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple.pod b/Master/tlpkg/tlperl/lib/Pod/Simple.pod
index aadba19e941..67a18df0d64 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple.pod
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple.pod
@@ -12,7 +12,7 @@ Pod::Simple - framework for parsing Pod
 Pod::Simple is a Perl library for parsing text in the Pod ("plain old
 documentation") markup language that is typically used for writing
 documentation for Perl and for Perl modules. The Pod format is explained
-L<perlpod>; the most common formatter is called C<perldoc>.
+in L<perlpod>; the most common formatter is called C<perldoc>.
 
 Be sure to read L</ENCODING> if your Pod contains non-ASCII characters.
 
@@ -289,6 +289,16 @@ I<Example:>
 
   die "too many errors\n" if $parser->any_errata_seen();
 
+=item C<< $parser->errata_seen() >>X<errata_seen>
+
+Returns a hash reference of all errata seen, both whines and screams. The hash reference's keys are the line number and the value is an array reference of the errors for that line.
+
+I<Example:>
+
+  if ( $parser->any_errata_seen() ) {
+     $logger->log( $parser->errata_seen() );
+  }
+
 =item C<< $parser->detected_encoding() >>X<detected_encoding>
 
 Return the encoding corresponding to C<< =encoding >>, but only if the
@@ -349,21 +359,15 @@ octets into Perl's internal character string representation using the value of
 the C<=encoding> declaration in the POD source.
 
 If the POD source does not include an C<=encoding> declaration, the parser will
-attempt to guess the encoding (selecting one of UTF-8 or Latin-1) by examining
+attempt to guess the encoding (selecting one of UTF-8 or CP 1252) by examining
 the first non-ASCII bytes and applying the heuristic described in
-L<perlpodspec>.
+L<perlpodspec>.  (If the POD source contains only ASCII bytes, the
+encoding is assumed to be ASCII.)
 
 If you set the C<parse_characters> option to a true value the parser will
 expect characters rather than octets; will ignore any C<=encoding>; and will
 make no attempt to decode the input.
 
-=head1 CAVEATS
-
-This is just a beta release -- there are a good number of things still
-left to do.  Notably, support for EBCDIC platforms is still half-done,
-an untested.
-
-
 =head1 SEE ALSO
 
 L<Pod::Simple::Subclassing>
@@ -383,8 +387,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/BlackBox.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/BlackBox.pm
index ee6e747a6a0..7021e6c9f15 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/BlackBox.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/BlackBox.pm
@@ -22,13 +22,27 @@ use integer; # vroom!
 use strict;
 use Carp ();
 use vars qw($VERSION );
-$VERSION = '3.29';
+$VERSION = '3.32';
 #use constant DEBUG => 7;
 BEGIN {
   require Pod::Simple;
   *DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG
 }
 
+# Matches a character iff the character will have a different meaning
+# if we choose CP1252 vs UTF-8 if there is no =encoding line.
+# This is broken for early Perls on non-ASCII platforms.
+my $non_ascii_re = eval "qr/[[:^ascii:]]/";
+$non_ascii_re = qr/[\x80-\xFF]/ if ! defined $non_ascii_re;
+
+my $utf8_bom;
+if (($] ge 5.007_003)) {
+  $utf8_bom = "\x{FEFF}";
+  utf8::encode($utf8_bom);
+} else {
+  $utf8_bom = "\xEF\xBB\xBF";   # No EBCDIC BOM detection for early Perls.
+}
+
 #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 
 sub parse_line { shift->parse_lines(@_) } # alias
@@ -47,10 +61,10 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
   my $scratch;
 
   DEBUG > 4 and 
-   print "# Parsing starting at line ", $self->{'line_count'}, ".\n";
+   print STDERR "# Parsing starting at line ", $self->{'line_count'}, ".\n";
 
   DEBUG > 5 and
-   print "#  About to parse lines: ",
+   print STDERR "#  About to parse lines: ",
      join(' ', map defined($_) ? "[$_]" : "EOF", @_), "\n";
 
   my $paras = ($self->{'paras'} ||= []);
@@ -63,12 +77,12 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
   my $line;
   foreach my $source_line (@_) {
     if( $self->{'source_dead'} ) {
-      DEBUG > 4 and print "# Source is dead.\n";
+      DEBUG > 4 and print STDERR "# Source is dead.\n";
       last;
     }
 
     unless( defined $source_line ) {
-      DEBUG > 4 and print "# Undef-line seen.\n";
+      DEBUG > 4 and print STDERR "# Undef-line seen.\n";
 
       push @$paras, ['~end', {'start_line' => $self->{'line_count'}}];
       push @$paras, $paras->[-1], $paras->[-1];
@@ -85,16 +99,16 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
        # tr/// modding the (potentially read-only) original source line!
     
     } else {
-      DEBUG > 2 and print "First line: [$source_line]\n";
+      DEBUG > 2 and print STDERR "First line: [$source_line]\n";
 
-      if( ($line = $source_line) =~ s/^\xEF\xBB\xBF//s ) {
-        DEBUG and print "UTF-8 BOM seen.  Faking a '=encoding utf8'.\n";
+      if( ($line = $source_line) =~ s/^$utf8_bom//s ) {
+        DEBUG and print STDERR "UTF-8 BOM seen.  Faking a '=encoding utf8'.\n";
         $self->_handle_encoding_line( "=encoding utf8" );
         delete $self->{'_processed_encoding'};
         $line =~ tr/\n\r//d;
         
       } elsif( $line =~ s/^\xFE\xFF//s ) {
-        DEBUG and print "Big-endian UTF-16 BOM seen.  Aborting parsing.\n";
+        DEBUG and print STDERR "Big-endian UTF-16 BOM seen.  Aborting parsing.\n";
         $self->scream(
           $self->{'line_count'},
           "UTF16-BE Byte Encoding Mark found; but Pod::Simple v$Pod::Simple::VERSION doesn't implement UTF16 yet."
@@ -106,7 +120,7 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
         # TODO: implement somehow?
 
       } elsif( $line =~ s/^\xFF\xFE//s ) {
-        DEBUG and print "Little-endian UTF-16 BOM seen.  Aborting parsing.\n";
+        DEBUG and print STDERR "Little-endian UTF-16 BOM seen.  Aborting parsing.\n";
         $self->scream(
           $self->{'line_count'},
           "UTF16-LE Byte Encoding Mark found; but Pod::Simple v$Pod::Simple::VERSION doesn't implement UTF16 yet."
@@ -118,33 +132,107 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
         # TODO: implement somehow?
         
       } else {
-        DEBUG > 2 and print "First line is BOM-less.\n";
+        DEBUG > 2 and print STDERR "First line is BOM-less.\n";
         ($line = $source_line) =~ tr/\n\r//d;
       }
     }
 
-    # Try to guess encoding. Inlined for performance reasons.
     if(!$self->{'parse_characters'} && !$self->{'encoding'}
       && ($self->{'in_pod'} || $line =~ /^=/s)
-      && $line =~ /[[:^ascii:]]/
+      && $line =~ /$non_ascii_re/
     ) {
+
       my $encoding;
-      if (ord("A") != 65) {
 
-        # Hard to figure out on non-ASCII platform if UTF-8 or not.  This
-        # won't work if it isn't UTF-8, so just assume it is and hope for the
-        # best.  It's not clear that the other encodings work on non-ASCII
-        # platforms anyway.
-        $encoding = 'UTF-8';
-      }
-      else {
-        $encoding = $line =~ /^[\x00-\x7f]*[\xC0-\xFD][\x80-\xBF]/ ? 'UTF-8' : 'ISO8859-1';
-      }
+      # No =encoding line, and we are at the first line in the input that
+      # contains a non-ascii byte, that is one whose meaning varies depending
+      # on whether the file is encoded in UTF-8 or CP1252, which are the two
+      # possibilities permitted by the pod spec.  (ASCII is assumed if the
+      # file only contains ASCII bytes.)  In order to process this line, we
+      # need to figure out what encoding we will use for the file.
+      #
+      # Strictly speaking ISO 8859-1 (Latin 1) refers to the code points
+      # 160-255, but it is used here, as it often colloquially is, to refer to
+      # the complete set of code points 0-255, including ASCII (0-127), the C1
+      # controls (128-159), and strict Latin 1 (160-255).
+      #
+      # CP1252 is effectively a superset of Latin 1, because it differs only
+      # from colloquial 8859-1 in the C1 controls, which are very unlikely to
+      # actually be present in 8859-1 files, so can be used for other purposes
+      # without conflict.  CP 1252 uses most of them for graphic characters.
+      #
+      # Note that all ASCII-range bytes represent their corresponding code
+      # points in CP1252 and UTF-8.  In ASCII platform UTF-8 all other code
+      # points require multiple (non-ASCII) bytes to represent.  (A separate
+      # paragraph for EBCDIC is below.)  The multi-byte representation is
+      # quite structured.  If we find an isolated byte that requires multiple
+      # bytes to represent in UTF-8, we know that the encoding is not UTF-8.
+      # If we find a sequence of bytes that violates the UTF-8 structure, we
+      # also can presume the encoding isn't UTF-8, and hence must be 1252.
+      #
+      # But there are ambiguous cases where we could guess wrong.  If so, the
+      # user will end up having to supply an =encoding line.  We use all
+      # readily available information to improve our chances of guessing
+      # right.  The odds of something not being UTF-8, but still passing a
+      # UTF-8 validity test go down very rapidly with increasing length of the
+      # sequence.  Therefore we look at all the maximal length non-ascii
+      # sequences on the line.  If any of the sequences can't be UTF-8, we
+      # quit there and choose CP1252.  If all could be UTF-8, we guess UTF-8.
+      #
+      # On EBCDIC platforms, the situation is somewhat different.  In
+      # UTF-EBCDIC, not only do ASCII-range bytes represent their code points,
+      # but so do the bytes that are for the C1 controls.  Recall that these
+      # correspond to the unused portion of 8859-1 that 1252 mostly takes
+      # over.  That means that there are fewer code points that are
+      # represented by multi-bytes.  But, note that the these controls are
+      # very unlikely to be in pod text.  So if we encounter one of them, it
+      # means that it is quite likely CP1252 and not UTF-8.  The net result is
+      # the same code below is used for both platforms.
+      while ($line =~ m/($non_ascii_re+)/g) {
+        my $non_ascii_seq = $1;
+
+        if (length $non_ascii_seq == 1) {
+          $encoding = 'CP1252';
+          goto guessed;
+        } elsif ($] ge 5.007_003) {
+
+          # On Perls that have this function, we can see if the sequence is
+          # valid UTF-8 or not.
+          if (! utf8::decode($non_ascii_seq)) {
+            $encoding = 'CP1252';
+            goto guessed;
+          }
+        } elsif (ord("A") == 65) {  # An early Perl, ASCII platform
+
+          # Without utf8::decode, it's a lot harder to do a rigorous check
+          # (though some early releases had a different function that
+          # accomplished the same thing).  Since these are ancient Perls, not
+          # likely to be in use today, we take the easy way out, and look at
+          # just the first two bytes of the sequence to see if they are the
+          # start of a UTF-8 character.  In ASCII UTF-8, continuation bytes
+          # must be between 0x80 and 0xBF.  Start bytes can range from 0xC2
+          # through 0xFF, but anything above 0xF4 is not Unicode, and hence
+          # extremely unlikely to be in a pod.
+          if ($non_ascii_seq !~ /^[\xC2-\xF4][\x80-\xBF]/) {
+            $encoding = 'CP1252';
+            goto guessed;
+          }
+
+          # We don't bother doing anything special for EBCDIC on early Perls.
+          # If there is a solitary variant, CP1252 will be chosen; otherwise
+          # UTF-8.
+        }
+      } # End of loop through all variant sequences on the line
+
+      # All sequences in the line could be UTF-8.  Guess that.
+      $encoding = 'UTF-8';
+
+    guessed:
       $self->_handle_encoding_line( "=encoding $encoding" );
       delete $self->{'_processed_encoding'};
       $self->{'_transcoder'} && $self->{'_transcoder'}->($line);
 
-      my ($word) = $line =~ /(\S*[[:^ascii:]]\S*)/;
+      my ($word) = $line =~ /(\S*$non_ascii_re\S*)/;
 
       $self->whine(
         $self->{'line_count'},
@@ -152,10 +240,10 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
       );
     }
 
-    DEBUG > 5 and print "# Parsing line: [$line]\n";
+    DEBUG > 5 and print STDERR "# Parsing line: [$line]\n";
 
     if(!$self->{'in_pod'}) {
-      if($line =~ m/^=([a-zA-Z]+)/s) {
+      if($line =~ m/^=([a-zA-Z][a-zA-Z0-9]*)(?:\s|$)/s) {
         if($1 eq 'cut') {
           $self->scream(
             $self->{'line_count'},
@@ -175,7 +263,7 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
           # And fall thru to the pod-mode block further down
         }
       } else {
-        DEBUG > 5 and print "# It's a code-line.\n";
+        DEBUG > 5 and print STDERR "# It's a code-line.\n";
         $code_handler->(map $_, $line, $self->{'line_count'}, $self)
          if $code_handler;
         # Note: this may cause code to be processed out of order relative
@@ -187,8 +275,8 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
         if( $line =~ m/^#\s*line\s+(\d+)\s*(?:\s"([^"]+)")?\s*$/ ) {
           # That RE is from perlsyn, section "Plain Old Comments (Not!)",
           #$fname = $2 if defined $2;
-          #DEBUG > 1 and defined $2 and print "# Setting fname to \"$fname\"\n";
-          DEBUG > 1 and print "# Setting nextline to $1\n";
+          #DEBUG > 1 and defined $2 and print STDERR "# Setting fname to \"$fname\"\n";
+          DEBUG > 1 and print STDERR "# Setting nextline to $1\n";
           $self->{'line_count'} = $1 - 1;
         }
         
@@ -210,7 +298,7 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
 
     if($line =~ m/^=cut/s) {
       # here ends the pod block, and therefore the previous pod para
-      DEBUG > 1 and print "Noting =cut at line ${$self}{'line_count'}\n";
+      DEBUG > 1 and print STDERR "Noting =cut at line ${$self}{'line_count'}\n";
       $self->{'in_pod'} = 0;
       # ++$self->{'pod_para_count'};
       $self->_ponder_paragraph_buffer();
@@ -228,12 +316,12 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
       }
 
       if(!$self->{'start_of_pod_block'} and @$paras and $paras->[-1][0] eq '~Verbatim') {
-        DEBUG > 1 and print "Saving blank line at line ${$self}{'line_count'}\n";
+        DEBUG > 1 and print STDERR "Saving blank line at line ${$self}{'line_count'}\n";
         push @{$paras->[-1]}, $line;
       }  # otherwise it's not interesting
       
       if(!$self->{'start_of_pod_block'} and !$self->{'last_was_blank'}) {
-        DEBUG > 1 and print "Noting para ends with blank line at ${$self}{'line_count'}\n"; 
+        DEBUG > 1 and print STDERR "Noting para ends with blank line at ${$self}{'line_count'}\n";
       }
       
       $self->{'last_was_blank'} = 1;
@@ -252,18 +340,18 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
          # by now it's safe to consider the previous paragraph as done.
                 
         push @$paras, $new; # the new incipient paragraph
-        DEBUG > 1 and print "Starting new ${$paras}[-1][0] para at line ${$self}{'line_count'}\n";
+        DEBUG > 1 and print STDERR "Starting new ${$paras}[-1][0] para at line ${$self}{'line_count'}\n";
         
       } elsif($line =~ m/^\s/s) {
 
         if(!$self->{'start_of_pod_block'} and @$paras and $paras->[-1][0] eq '~Verbatim') {
-          DEBUG > 1 and print "Resuming verbatim para at line ${$self}{'line_count'}\n";
+          DEBUG > 1 and print STDERR "Resuming verbatim para at line ${$self}{'line_count'}\n";
           push @{$paras->[-1]}, $line;
         } else {
           ++$self->{'pod_para_count'};
           $self->_ponder_paragraph_buffer();
            # by now it's safe to consider the previous paragraph as done.
-          DEBUG > 1 and print "Starting verbatim para at line ${$self}{'line_count'}\n";
+          DEBUG > 1 and print STDERR "Starting verbatim para at line ${$self}{'line_count'}\n";
           push @$paras, ['~Verbatim', {'start_line' => $self->{'line_count'}}, $line];
         }
       } else {
@@ -271,14 +359,14 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
         $self->_ponder_paragraph_buffer();
          # by now it's safe to consider the previous paragraph as done.
         push @$paras, ['~Para',  {'start_line' => $self->{'line_count'}}, $line];
-        DEBUG > 1 and print "Starting plain para at line ${$self}{'line_count'}\n";
+        DEBUG > 1 and print STDERR "Starting plain para at line ${$self}{'line_count'}\n";
       }
       $self->{'last_was_blank'} = $self->{'start_of_pod_block'} = 0;
 
     } else {
       # It's a non-blank line /continuing/ the current para
       if(@$paras) {
-        DEBUG > 2 and print "Line ${$self}{'line_count'} continues current paragraph\n";
+        DEBUG > 2 and print STDERR "Line ${$self}{'line_count'} continues current paragraph\n";
         push @{$paras->[-1]}, $line;
       } else {
         # Unexpected case!
@@ -289,7 +377,7 @@ sub parse_lines {             # Usage: $parser->parse_lines(@lines)
     
   } # ends the big while loop
 
-  DEBUG > 1 and print(pretty(@$paras), "\n");
+  DEBUG > 1 and print STDERR (pretty(@$paras), "\n");
   return $self;
 }
 
@@ -303,7 +391,7 @@ sub _handle_encoding_line {
   # The point of this routine is to set $self->{'_transcoder'} as indicated.
 
   return $line unless $line =~ m/^=encoding\s+(\S+)\s*$/s;
-  DEBUG > 1 and print "Found an encoding line \"=encoding $1\"\n";
+  DEBUG > 1 and print STDERR "Found an encoding line \"=encoding $1\"\n";
 
   my $e    = $1;
   my $orig = $e;
@@ -323,24 +411,24 @@ sub _handle_encoding_line {
       $that =~ s/[-_]//g;
     }
     if($norm_current eq $norm_e) {
-      DEBUG > 1 and print "The '=encoding $orig' line is ",
+      DEBUG > 1 and print STDERR "The '=encoding $orig' line is ",
        "redundant.  ($norm_current eq $norm_e).  Ignoring.\n";
       $enc_error = '';
        # But that doesn't necessarily mean that the earlier one went okay
     } else {
       $enc_error = "Encoding is already set to " . $self->{'encoding'};
-      DEBUG > 1 and print $enc_error;
+      DEBUG > 1 and print STDERR $enc_error;
     }
   } elsif (
     # OK, let's turn on the encoding
     do {
-      DEBUG > 1 and print " Setting encoding to $e\n";
+      DEBUG > 1 and print STDERR " Setting encoding to $e\n";
       $self->{'encoding'} = $e;
       1;
     }
     and $e eq 'HACKRAW'
   ) {
-    DEBUG and print " Putting in HACKRAW (no-op) encoding mode.\n";
+    DEBUG and print STDERR " Putting in HACKRAW (no-op) encoding mode.\n";
 
   } elsif( Pod::Simple::Transcode::->encoding_is_available($e) ) {
 
@@ -361,7 +449,7 @@ sub _handle_encoding_line {
     my @supported = Pod::Simple::Transcode::->all_encodings;
 
     # Note unsupported, and complain
-    DEBUG and print " Encoding [$e] is unsupported.",
+    DEBUG and print STDERR " Encoding [$e] is unsupported.",
       "\nSupporteds: @supported\n";
     my $suggestion = '';
 
@@ -406,7 +494,7 @@ sub _handle_encoding_second_level {
   $content =~ s/^\s+//s;
   $content =~ s/\s+$//s;
 
-  DEBUG > 2 and print "Ogling encoding directive: =encoding $content\n";
+  DEBUG > 2 and print STDERR "Ogling encoding directive: =encoding $content\n";
   
   if (defined($self->{'_processed_encoding'})) {
     #if($content ne $self->{'_processed_encoding'}) {
@@ -415,7 +503,7 @@ sub _handle_encoding_second_level {
     delete $self->{'_processed_encoding'};
     # It's already been handled.  Check for errors.
     if(! $self->{'encoding_command_statuses'} ) {
-      DEBUG > 2 and print " CRAZY ERROR: It wasn't really handled?!\n";
+      DEBUG > 2 and print STDERR " CRAZY ERROR: It wasn't really handled?!\n";
     } elsif( $self->{'encoding_command_statuses'}[-1] ) {
       $self->whine( $para->[1]{'start_line'},
         sprintf "Couldn't do %s: %s",
@@ -423,7 +511,7 @@ sub _handle_encoding_second_level {
           $self->{'encoding_command_statuses'}[-1],
       );
     } else {
-      DEBUG > 2 and print " (Yup, it was successfully handled already.)\n";
+      DEBUG > 2 and print STDERR " (Yup, it was successfully handled already.)\n";
     }
     
   } else {
@@ -480,7 +568,7 @@ sub _gen_errata {
     ['=back',  {'start_line' => $m, 'errata' => 1}, ''],
   ;
 
-  DEBUG and print "\n<<\n", pretty(\@out), "\n>>\n\n";
+  DEBUG and print STDERR "\n<<\n", pretty(\@out), "\n>>\n\n";
 
   return @out;
 }
@@ -526,7 +614,7 @@ sub _ponder_paragraph_buffer {
 
   my $scratch;
 
-  DEBUG > 10 and print "# Paragraph buffer: <<", pretty($paras), ">>\n";
+  DEBUG > 10 and print STDERR "# Paragraph buffer: <<", pretty($paras), ">>\n";
 
   # We have something in our buffer.  So apparently the document has started.
   unless($self->{'doc_has_started'}) {
@@ -540,7 +628,7 @@ sub _ponder_paragraph_buffer {
         # i.e., if the paras is all ~ends
      )
     ;
-    DEBUG and print "# Starting ", 
+    DEBUG and print STDERR "# Starting ",
       $starting_contentless ? 'contentless' : 'contentful',
       " document\n"
     ;
@@ -572,7 +660,7 @@ sub _ponder_paragraph_buffer {
     $para = shift @$paras;
     $para_type = $para->[0];
 
-    DEBUG > 1 and print "Pondering a $para_type paragraph, given the stack: (",
+    DEBUG > 1 and print STDERR "Pondering a $para_type paragraph, given the stack: (",
       $self->_dump_curr_open(), ")\n";
     
     if($para_type eq '=for') {
@@ -593,7 +681,7 @@ sub _ponder_paragraph_buffer {
     #~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
     if(grep $_->[1]{'~ignore'}, @$curr_open) {
       DEBUG > 1 and
-       print "Skipping $para_type paragraph because in ignore mode.\n";
+       print STDERR "Skipping $para_type paragraph because in ignore mode.\n";
       next;
     }
     #~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
@@ -616,7 +704,7 @@ sub _ponder_paragraph_buffer {
       #  mean how it should get treated, not as what the element name
       #  should be.
 
-      DEBUG > 1 and print "Pondering non-magical $para_type\n";
+      DEBUG > 1 and print STDERR "Pondering non-magical $para_type\n";
 
       my $i;
 
@@ -626,7 +714,7 @@ sub _ponder_paragraph_buffer {
          and @$curr_open
          and $curr_open->[-1][0] eq '=over'
       ) {
-        DEBUG > 2 and print "'=$para_type' inside an '=over'!\n";
+        DEBUG > 2 and print STDERR "'=$para_type' inside an '=over'!\n";
         $self->whine(
           $para->[1]{'start_line'},
           "You forgot a '=back' before '$para_type'"
@@ -678,7 +766,7 @@ sub _ponder_paragraph_buffer {
         } elsif($over_type eq 'text') {
           my $item_type = $self->_get_item_type($para);
             # That kills the content of the item if it's a number or bullet.
-          DEBUG and print " Item is of type ", $para->[0], " under $over_type\n";
+          DEBUG and print STDERR " Item is of type ", $para->[0], " under $over_type\n";
           
           if($item_type eq 'text') {
             # Nothing special needs doing for 'text'
@@ -701,7 +789,7 @@ sub _ponder_paragraph_buffer {
         } elsif($over_type eq 'number') {
           my $item_type = $self->_get_item_type($para);
             # That kills the content of the item if it's a number or bullet.
-          DEBUG and print " Item is of type ", $para->[0], " under $over_type\n";
+          DEBUG and print STDERR " Item is of type ", $para->[0], " under $over_type\n";
           
           my $expected_value = ++ $curr_open->[-1][1]{'~counter'};
           
@@ -728,10 +816,10 @@ sub _ponder_paragraph_buffer {
             die "Unknown item type $item_type"; # should never happen
 
           } elsif($expected_value == $para->[1]{'number'}) {
-            DEBUG > 1 and print " Numeric item has the expected value of $expected_value\n";
+            DEBUG > 1 and print STDERR " Numeric item has the expected value of $expected_value\n";
             
           } else {
-            DEBUG > 1 and print " Numeric item has ", $para->[1]{'number'},
+            DEBUG > 1 and print STDERR " Numeric item has ", $para->[1]{'number'},
              " instead of the expected value of $expected_value\n";
             $self->whine(
               $para->[1]{'start_line'},
@@ -744,10 +832,10 @@ sub _ponder_paragraph_buffer {
           if(@$para == 2) {
             # For the cases where we /didn't/ push to @$para
             if($paras->[0][0] eq '~Para') {
-              DEBUG and print "Assimilating following ~Para content into $over_type item\n";
+              DEBUG and print STDERR "Assimilating following ~Para content into $over_type item\n";
               push @$para, splice @{shift @$paras},2;
             } else {
-              DEBUG and print "Can't assimilate following ", $paras->[0][0], "\n";
+              DEBUG and print STDERR "Can't assimilate following ", $paras->[0][0], "\n";
               push @$para, '';  # Just so it's not contentless
             }
           }
@@ -756,13 +844,13 @@ sub _ponder_paragraph_buffer {
         } elsif($over_type eq 'bullet') {
           my $item_type = $self->_get_item_type($para);
             # That kills the content of the item if it's a number or bullet.
-          DEBUG and print " Item is of type ", $para->[0], " under $over_type\n";
+          DEBUG and print STDERR " Item is of type ", $para->[0], " under $over_type\n";
           
           if($item_type eq 'bullet') {
             # as expected!
 
             if( $para->[1]{'~_freaky_para_hack'} ) {
-              DEBUG and print "Accomodating '=item * Foo' tolerance hack.\n";
+              DEBUG and print STDERR "Accomodating '=item * Foo' tolerance hack.\n";
               push @$para, delete $para->[1]{'~_freaky_para_hack'};
             }
 
@@ -790,10 +878,10 @@ sub _ponder_paragraph_buffer {
           if(@$para == 2) {
             # For the cases where we /didn't/ push to @$para
             if($paras->[0][0] eq '~Para') {
-              DEBUG and print "Assimilating following ~Para content into $over_type item\n";
+              DEBUG and print STDERR "Assimilating following ~Para content into $over_type item\n";
               push @$para, splice @{shift @$paras},2;
             } else {
-              DEBUG and print "Can't assimilate following ", $paras->[0][0], "\n";
+              DEBUG and print STDERR "Can't assimilate following ", $paras->[0][0], "\n";
               push @$para, '';  # Just so it's not contentless
             }
           }
@@ -829,10 +917,10 @@ sub _ponder_paragraph_buffer {
       } elsif( $para_type =~ s/^=//s
         and defined( $para_type = $self->{'accept_directives'}{$para_type} )
       ) {
-        DEBUG > 1 and print " Pondering known directive ${$para}[0] as $para_type\n";
+        DEBUG > 1 and print STDERR " Pondering known directive ${$para}[0] as $para_type\n";
       } else {
         # An unknown directive!
-        DEBUG > 1 and printf "Unhandled directive %s (Handled: %s)\n",
+        DEBUG > 1 and printf STDERR "Unhandled directive %s (Handled: %s)\n",
          $para->[0], join(' ', sort keys %{$self->{'accept_directives'}} )
         ;
         $self->whine(
@@ -846,14 +934,14 @@ sub _ponder_paragraph_buffer {
 
       if($para_type =~ s/^\?//s) {
         if(! @$curr_open) {  # usual case
-          DEBUG and print "Treating $para_type paragraph as such because stack is empty.\n";
+          DEBUG and print STDERR "Treating $para_type paragraph as such because stack is empty.\n";
         } else {
           my @fors = grep $_->[0] eq '=for', @$curr_open;
-          DEBUG > 1 and print "Containing fors: ",
+          DEBUG > 1 and print STDERR "Containing fors: ",
             join(',', map $_->[1]{'target'}, @fors), "\n";
           
           if(! @fors) {
-            DEBUG and print "Treating $para_type paragraph as such because stack has no =for's\n";
+            DEBUG and print STDERR "Treating $para_type paragraph as such because stack has no =for's\n";
             
           #} elsif(grep $_->[1]{'~resolve'}, @fors) {
           #} elsif(not grep !$_->[1]{'~resolve'}, @fors) {
@@ -861,14 +949,14 @@ sub _ponder_paragraph_buffer {
             # Look to the immediately containing for
           
             if($para_type eq 'Data') {
-              DEBUG and print "Treating Data paragraph as Plain/Verbatim because the containing =for ($fors[-1][1]{'target'}) is a resolver\n";
+              DEBUG and print STDERR "Treating Data paragraph as Plain/Verbatim because the containing =for ($fors[-1][1]{'target'}) is a resolver\n";
               $para->[0] = 'Para';
               $para_type = 'Plain';
             } else {
-              DEBUG and print "Treating $para_type paragraph as such because the containing =for ($fors[-1][1]{'target'}) is a resolver\n";
+              DEBUG and print STDERR "Treating $para_type paragraph as such because the containing =for ($fors[-1][1]{'target'}) is a resolver\n";
             }
           } else {
-            DEBUG and print "Treating $para_type paragraph as Data because the containing =for ($fors[-1][1]{'target'}) is a non-resolver\n";
+            DEBUG and print STDERR "Treating $para_type paragraph as Data because the containing =for ($fors[-1][1]{'target'}) is a non-resolver\n";
             $para->[0] = $para_type = 'Data';
           }
         }
@@ -889,7 +977,7 @@ sub _ponder_paragraph_buffer {
       #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       $para->[0] =~ s/^[~=]//s;
 
-      DEBUG and print "\n", pretty($para), "\n";
+      DEBUG and print STDERR "\n", pretty($para), "\n";
 
       # traverse the treelet (which might well be just one string scalar)
       $self->{'content_seen'} ||= 1;
@@ -912,7 +1000,7 @@ sub _ponder_for {
   my $target;
 
   if(grep $_->[1]{'~ignore'}, @$curr_open) {
-    DEBUG > 1 and print "Ignoring ignorable =for\n";
+    DEBUG > 1 and print STDERR "Ignoring ignorable =for\n";
     return 1;
   }
 
@@ -930,7 +1018,7 @@ sub _ponder_for {
     return 1;
   }
   DEBUG > 1 and
-   print "Faking out a =for $target as a =begin $target / =end $target\n";
+   print STDERR "Faking out a =for $target as a =begin $target / =end $target\n";
   
   $para->[0] = 'Data';
   
@@ -959,7 +1047,7 @@ sub _ponder_begin {
       $para->[1]{'start_line'},
       "=begin without a target?"
     );
-    DEBUG and print "Ignoring targetless =begin\n";
+    DEBUG and print STDERR "Ignoring targetless =begin\n";
     return 1;
   }
   
@@ -981,11 +1069,11 @@ sub _ponder_begin {
     $neg ? () : '*'
   ) {
     DEBUG > 2 and
-     print " Considering whether =begin $content matches $target_name\n";
+     print STDERR " Considering whether =begin $content matches $target_name\n";
     next unless $self->{'accept_targets'}{$target_name};
     
     DEBUG > 2 and
-     print "  It DOES match the acceptable target $target_name!\n";
+     print STDERR "  It DOES match the acceptable target $target_name!\n";
     $to_resolve = 1
       if $self->{'accept_targets'}{$target_name} eq 'force_resolve';
     $dont_ignore = 1;
@@ -997,11 +1085,11 @@ sub _ponder_begin {
     if( $dont_ignore ) {
       $dont_ignore = '';
       delete $para->[1]{'target_matching'};
-      DEBUG > 2 and print " But the leading ! means that this is a NON-match!\n";
+      DEBUG > 2 and print STDERR " But the leading ! means that this is a NON-match!\n";
     } else {
       $dont_ignore = 1;
       $para->[1]{'target_matching'} = '!';
-      DEBUG > 2 and print " But the leading ! means that this IS a match!\n";
+      DEBUG > 2 and print STDERR " But the leading ! means that this IS a match!\n";
     }
   }
 
@@ -1010,15 +1098,15 @@ sub _ponder_begin {
   $para->[1]{'~ignore'}   = (! $dont_ignore) || 0;
   $para->[1]{'~resolve'}  = $to_resolve || 0;
 
-  DEBUG > 1 and print " Making note to ", $dont_ignore ? 'not ' : '',
+  DEBUG > 1 and print STDERR " Making note to ", $dont_ignore ? 'not ' : '',
     "ignore contents of this region\n";
-  DEBUG > 1 and $dont_ignore and print " Making note to treat contents as ",
+  DEBUG > 1 and $dont_ignore and print STDERR " Making note to treat contents as ",
     ($to_resolve ? 'verbatim/plain' : 'data'), " paragraphs\n";
-  DEBUG > 1 and print " (Stack now: ", $self->_dump_curr_open(), ")\n";
+  DEBUG > 1 and print STDERR " (Stack now: ", $self->_dump_curr_open(), ")\n";
 
   push @$curr_open, $para;
   if(!$dont_ignore or scalar grep $_->[1]{'~ignore'}, @$curr_open) {
-    DEBUG > 1 and print "Ignoring ignorable =begin\n";
+    DEBUG > 1 and print STDERR "Ignoring ignorable =begin\n";
   } else {
     $self->{'content_seen'} ||= 1;
     $self->_handle_element_start((my $scratch='for'), $para->[1]);
@@ -1032,7 +1120,7 @@ sub _ponder_end {
   my $content = join ' ', splice @$para, 2;
   $content =~ s/^\s+//s;
   $content =~ s/\s+$//s;
-  DEBUG and print "Ogling '=end $content' directive\n";
+  DEBUG and print STDERR "Ogling '=end $content' directive\n";
 
   unless(length($content)) {
     $self->whine(
@@ -1043,7 +1131,7 @@ sub _ponder_end {
         : ''
       )
     );
-    DEBUG and print "Ignoring targetless =end\n";
+    DEBUG and print STDERR "Ignoring targetless =end\n";
     return 1;
   }
   
@@ -1053,7 +1141,7 @@ sub _ponder_end {
       "'=end $content' is invalid.  (Stack: "
       . $self->_dump_curr_open() . ')'
     );
-    DEBUG and print "Ignoring mistargetted =end $content\n";
+    DEBUG and print STDERR "Ignoring mistargetted =end $content\n";
     return 1;
   }
   
@@ -1063,7 +1151,7 @@ sub _ponder_end {
       "=end $content without matching =begin.  (Stack: "
       . $self->_dump_curr_open() . ')'
     );
-    DEBUG and print "Ignoring mistargetted =end $content\n";
+    DEBUG and print STDERR "Ignoring mistargetted =end $content\n";
     return 1;
   }
   
@@ -1075,13 +1163,13 @@ sub _ponder_end {
       . ".  (Stack: "
       . $self->_dump_curr_open() . ')'
     );
-    DEBUG and print "Ignoring mistargetted =end $content at line $para->[1]{'start_line'}\n";
+    DEBUG and print STDERR "Ignoring mistargetted =end $content at line $para->[1]{'start_line'}\n";
     return 1;
   }
 
   # Else it's okay to close...
   if(grep $_->[1]{'~ignore'}, @$curr_open) {
-    DEBUG > 1 and print "Not firing any event for this =end $content because in an ignored region\n";
+    DEBUG > 1 and print STDERR "Not firing any event for this =end $content because in an ignored region\n";
     # And that may be because of this to-be-closed =for region, or some
     #  other one, but it doesn't matter.
   } else {
@@ -1091,7 +1179,7 @@ sub _ponder_end {
     $self->{'content_seen'} ||= 1;
     $self->_handle_element_end( my $scratch = 'for', $para->[1]);
   }
-  DEBUG > 1 and print "Popping $curr_open->[-1][0] $curr_open->[-1][1]{'target'} because of =end $content\n";
+  DEBUG > 1 and print STDERR "Popping $curr_open->[-1][0] $curr_open->[-1][1]{'target'} because of =end $content\n";
   pop @$curr_open;
 
   return 1;
@@ -1100,10 +1188,10 @@ sub _ponder_end {
 sub _ponder_doc_end {
   my ($self,$para,$curr_open,$paras) = @_;
   if(@$curr_open) { # Deal with things left open
-    DEBUG and print "Stack is nonempty at end-document: (",
+    DEBUG and print STDERR "Stack is nonempty at end-document: (",
       $self->_dump_curr_open(), ")\n";
       
-    DEBUG > 9 and print "Stack: ", pretty($curr_open), "\n";
+    DEBUG > 9 and print STDERR "Stack: ", pretty($curr_open), "\n";
     unshift @$paras, $self->_closers_for_all_curr_open;
     # Make sure there is exactly one ~end in the parastack, at the end:
     @$paras = grep $_->[0] ne '~end', @$paras;
@@ -1114,7 +1202,7 @@ sub _ponder_doc_end {
     return 1;
     
   } else {
-    DEBUG and print "Okay, stack is empty now.\n";
+    DEBUG and print STDERR "Okay, stack is empty now.\n";
   }
   
   # Try generating errata section, if applicable
@@ -1123,13 +1211,13 @@ sub _ponder_doc_end {
     my @extras = $self->_gen_errata();
     if(@extras) {
       unshift @$paras, @extras;
-      DEBUG and print "Generated errata... relooping...\n";
+      DEBUG and print STDERR "Generated errata... relooping...\n";
       return 1;  # I.e., loop around again to process these fake-o paragraphs
     }
   }
   
   splice @$paras; # Well, that's that for this paragraph buffer.
-  DEBUG and print "Throwing end-document event.\n";
+  DEBUG and print STDERR "Throwing end-document event.\n";
 
   $self->_handle_element_end( my $scratch = 'Document' );
   return 1; # Hasta la byebye
@@ -1207,7 +1295,7 @@ sub _ponder_over {
     );
     $para->[1]{'indent'} = 4;
   }
-  DEBUG > 1 and print "=over found of type $list_type\n";
+  DEBUG > 1 and print STDERR "=over found of type $list_type\n";
   
   $self->{'content_seen'} ||= 1;
   $self->_handle_element_start((my $scratch = 'over-' . $list_type), $para->[1]);
@@ -1228,7 +1316,7 @@ sub _ponder_back {
   }
 
   if(@$curr_open and $curr_open->[-1][0] eq '=over') {
-    DEBUG > 1 and print "=back happily closes matching =over\n";
+    DEBUG > 1 and print STDERR "=back happily closes matching =over\n";
     # Expected case: we're closing the most recently opened thing
     #my $over = pop @$curr_open;
     $self->{'content_seen'} ||= 1;
@@ -1236,7 +1324,7 @@ sub _ponder_back {
       'over-' . ( (pop @$curr_open)->[1]{'~type'} ), $para->[1]
     );
   } else {
-    DEBUG > 1 and print "=back found without a matching =over.  Stack: (",
+    DEBUG > 1 and print STDERR "=back found without a matching =over.  Stack: (",
         join(', ', map $_->[0], @$curr_open), ").\n";
     $self->whine(
       $para->[1]{'start_line'},
@@ -1288,7 +1376,7 @@ sub _ponder_item {
   } elsif($over_type eq 'text') {
     my $item_type = $self->_get_item_type($para);
       # That kills the content of the item if it's a number or bullet.
-    DEBUG and print " Item is of type ", $para->[0], " under $over_type\n";
+    DEBUG and print STDERR " Item is of type ", $para->[0], " under $over_type\n";
     
     if($item_type eq 'text') {
       # Nothing special needs doing for 'text'
@@ -1311,7 +1399,7 @@ sub _ponder_item {
   } elsif($over_type eq 'number') {
     my $item_type = $self->_get_item_type($para);
       # That kills the content of the item if it's a number or bullet.
-    DEBUG and print " Item is of type ", $para->[0], " under $over_type\n";
+    DEBUG and print STDERR " Item is of type ", $para->[0], " under $over_type\n";
     
     my $expected_value = ++ $curr_open->[-1][1]{'~counter'};
     
@@ -1338,10 +1426,10 @@ sub _ponder_item {
       die "Unknown item type $item_type"; # should never happen
 
     } elsif($expected_value == $para->[1]{'number'}) {
-      DEBUG > 1 and print " Numeric item has the expected value of $expected_value\n";
+      DEBUG > 1 and print STDERR " Numeric item has the expected value of $expected_value\n";
       
     } else {
-      DEBUG > 1 and print " Numeric item has ", $para->[1]{'number'},
+      DEBUG > 1 and print STDERR " Numeric item has ", $para->[1]{'number'},
        " instead of the expected value of $expected_value\n";
       $self->whine(
         $para->[1]{'start_line'},
@@ -1354,10 +1442,10 @@ sub _ponder_item {
     if(@$para == 2) {
       # For the cases where we /didn't/ push to @$para
       if($paras->[0][0] eq '~Para') {
-        DEBUG and print "Assimilating following ~Para content into $over_type item\n";
+        DEBUG and print STDERR "Assimilating following ~Para content into $over_type item\n";
         push @$para, splice @{shift @$paras},2;
       } else {
-        DEBUG and print "Can't assimilate following ", $paras->[0][0], "\n";
+        DEBUG and print STDERR "Can't assimilate following ", $paras->[0][0], "\n";
         push @$para, '';  # Just so it's not contentless
       }
     }
@@ -1366,13 +1454,13 @@ sub _ponder_item {
   } elsif($over_type eq 'bullet') {
     my $item_type = $self->_get_item_type($para);
       # That kills the content of the item if it's a number or bullet.
-    DEBUG and print " Item is of type ", $para->[0], " under $over_type\n";
+    DEBUG and print STDERR " Item is of type ", $para->[0], " under $over_type\n";
     
     if($item_type eq 'bullet') {
       # as expected!
 
       if( $para->[1]{'~_freaky_para_hack'} ) {
-        DEBUG and print "Accomodating '=item * Foo' tolerance hack.\n";
+        DEBUG and print STDERR "Accomodating '=item * Foo' tolerance hack.\n";
         push @$para, delete $para->[1]{'~_freaky_para_hack'};
       }
 
@@ -1400,10 +1488,10 @@ sub _ponder_item {
     if(@$para == 2) {
       # For the cases where we /didn't/ push to @$para
       if($paras->[0][0] eq '~Para') {
-        DEBUG and print "Assimilating following ~Para content into $over_type item\n";
+        DEBUG and print STDERR "Assimilating following ~Para content into $over_type item\n";
         push @$para, splice @{shift @$paras},2;
       } else {
-        DEBUG and print "Can't assimilate following ", $paras->[0][0], "\n";
+        DEBUG and print STDERR "Can't assimilate following ", $paras->[0][0], "\n";
         push @$para, '';  # Just so it's not contentless
       }
     }
@@ -1419,7 +1507,7 @@ sub _ponder_item {
 
 sub _ponder_Plain {
   my ($self,$para) = @_;
-  DEBUG and print " giving plain treatment...\n";
+  DEBUG and print STDERR " giving plain treatment...\n";
   unless( @$para == 2 or ( @$para == 3 and $para->[2] eq '' )
     or $para->[1]{'~cooked'}
   ) {
@@ -1436,7 +1524,7 @@ sub _ponder_Plain {
 
 sub _ponder_Verbatim {
   my ($self,$para) = @_;
-  DEBUG and print " giving verbatim treatment...\n";
+  DEBUG and print STDERR " giving verbatim treatment...\n";
 
   $para->[1]{'xml:space'} = 'preserve';
 
@@ -1487,7 +1575,7 @@ sub _ponder_Verbatim {
 
 sub _ponder_Data {
   my ($self,$para) = @_;
-  DEBUG and print " giving data treatment...\n";
+  DEBUG and print STDERR " giving data treatment...\n";
   $para->[1]{'xml:space'} = 'preserve';
   push @$para, join "\n", splice(@$para, 2) if @$para > 3;
   return;
@@ -1548,7 +1636,7 @@ sub _closers_for_all_curr_open {
 
     $copy[1]{'fake-closer'} = 1;
 
-    DEBUG and print "Queuing up fake-o event: ", pretty(\@copy), "\n";
+    DEBUG and print STDERR "Queuing up fake-o event: ", pretty(\@copy), "\n";
     unshift @closers, \@copy;
   }
   return @closers;
@@ -1562,7 +1650,7 @@ sub _verbatim_format {
   my $formatting;
 
   for(my $i = 2; $i < @$p; $i++) { # work backwards over the lines
-    DEBUG and print "_verbatim_format appends a newline to $i: $p->[$i]\n";
+    DEBUG and print STDERR "_verbatim_format appends a newline to $i: $p->[$i]\n";
     $p->[$i] .= "\n";
      # Unlike with simple Verbatim blocks, we don't end up just doing
      # a join("\n", ...) on the contents, so we have to append a
@@ -1570,11 +1658,11 @@ sub _verbatim_format {
   }
 
   if( DEBUG > 4 ) {
-    print "<<\n";
+    print STDERR "<<\n";
     for(my $i = $#$p; $i >= 2; $i--) { # work backwards over the lines
-      print "_verbatim_format $i: $p->[$i]";
+      print STDERR "_verbatim_format $i: $p->[$i]";
     }
-    print ">>\n";
+    print STDERR ">>\n";
   }
 
   for(my $i = $#$p; $i > 2; $i--) {
@@ -1583,19 +1671,19 @@ sub _verbatim_format {
     #next unless $p->[$i]   =~ m{^#:([ \^\/\%]*)\n?$}s
     #        and $p->[$i-1] !~ m{^#:[ \^\/\%]*\n?$}s;
      # look at a formatty line preceding a nonformatty one
-    DEBUG > 5 and print "Scrutinizing line $i: $$p[$i]\n";
+    DEBUG > 5 and print STDERR "Scrutinizing line $i: $$p[$i]\n";
     if($p->[$i]   =~ m{^#:([ \^\/\%]*)\n?$}s) {
-      DEBUG > 5 and print "  It's a formatty line.  ",
+      DEBUG > 5 and print STDERR "  It's a formatty line.  ",
        "Peeking at previous line ", $i-1, ": $$p[$i-1]: \n";
       
       if( $p->[$i-1] =~ m{^#:[ \^\/\%]*\n?$}s ) {
-        DEBUG > 5 and print "  Previous line is formatty!  Skipping this one.\n";
+        DEBUG > 5 and print STDERR "  Previous line is formatty!  Skipping this one.\n";
         next;
       } else {
-        DEBUG > 5 and print "  Previous line is non-formatty!  Yay!\n";
+        DEBUG > 5 and print STDERR "  Previous line is non-formatty!  Yay!\n";
       }
     } else {
-      DEBUG > 5 and print "  It's not a formatty line.  Ignoring\n";
+      DEBUG > 5 and print STDERR "  It's not a formatty line.  Ignoring\n";
       next;
     }
 
@@ -1606,7 +1694,7 @@ sub _verbatim_format {
     # #:^^^^^^^^^^^^^^^^^              /////////////         
     
 
-    DEBUG > 4 and print "_verbatim_format considers:\n<$p->[$i-1]>\n<$p->[$i]>\n";
+    DEBUG > 4 and print STDERR "_verbatim_format considers:\n<$p->[$i-1]>\n<$p->[$i]>\n";
     
     $formatting = '  ' . $1;
     $formatting =~ s/\s+$//s; # nix trailing whitespace
@@ -1624,19 +1712,19 @@ sub _verbatim_format {
     # Make $formatting and the previous line be exactly the same length,
     # with $formatting having a " " as the last character.
  
-    DEBUG > 4 and print "Formatting <$formatting>    on <", $p->[$i-1], ">\n";
+    DEBUG > 4 and print STDERR "Formatting <$formatting>    on <", $p->[$i-1], ">\n";
 
 
     my @new_line;
     while( $formatting =~ m{\G(( +)|(\^+)|(\/+)|(\%+))}g ) {
-      #print "Format matches $1\n";
+      #print STDERR "Format matches $1\n";
 
       if($2) {
-        #print "SKIPPING <$2>\n";
+        #print STDERR "SKIPPING <$2>\n";
         push @new_line,
           substr($p->[$i-1], pos($formatting)-length($1), length($1));
       } else {
-        #print "SNARING $+\n";
+        #print STDERR "SNARING $+\n";
         push @new_line, [
           (
             $3 ? 'VerbatimB'  :
@@ -1645,14 +1733,14 @@ sub _verbatim_format {
           ), {},
           substr($p->[$i-1], pos($formatting)-length($1), length($1))
         ];
-        #print "Formatting <$new_line[-1][-1]> as $new_line[-1][0]\n";
+        #print STDERR "Formatting <$new_line[-1][-1]> as $new_line[-1][0]\n";
       }
     }
     my @nixed =    
       splice @$p, $i-1, 2, @new_line; # replace myself and the next line
-    DEBUG > 10 and print "Nixed count: ", scalar(@nixed), "\n";
+    DEBUG > 10 and print STDERR "Nixed count: ", scalar(@nixed), "\n";
     
-    DEBUG > 6 and print "New version of the above line is these tokens (",
+    DEBUG > 6 and print STDERR "New version of the above line is these tokens (",
       scalar(@new_line), "):",
       map( ref($_)?"<@$_> ":"<$_>", @new_line ), "\n";
     $i--; # So the next line we scrutinize is the line before the one
@@ -1664,7 +1752,7 @@ sub _verbatim_format {
   # Collapse adjacent text nodes, just for kicks.
   for( my $i = 2; $i > $#$p; $i++ ) { # work forwards over the tokens except for the last
     if( !ref($p->[$i]) and !ref($p->[$i + 1]) ) {
-      DEBUG > 5 and print "_verbatim_format merges {$p->[$i]} and {$p->[$i+1]}\n";
+      DEBUG > 5 and print STDERR "_verbatim_format merges {$p->[$i]} and {$p->[$i+1]}\n";
       $p->[$i] .= splice @$p, $i+1, 1; # merge
       --$i;  # and back up
     }
@@ -1675,9 +1763,9 @@ sub _verbatim_format {
     # work backwards over the tokens, even the first
     if( !ref($p->[$i]) ) {
       if($p->[$i] =~ s/\n$//s) {
-        DEBUG > 5 and print "_verbatim_format killed the terminal newline on #$i: {$p->[$i]}, after {$p->[$i-1]}\n";
+        DEBUG > 5 and print STDERR "_verbatim_format killed the terminal newline on #$i: {$p->[$i]}, after {$p->[$i-1]}\n";
       } else {
-        DEBUG > 5 and print
+        DEBUG > 5 and print STDERR
          "No terminal newline on #$i: {$p->[$i]}, after {$p->[$i-1]} !?\n";
       }
       last; # we only want the next one
@@ -1719,7 +1807,7 @@ sub _treelet_from_formatting_codes {
     # into just 1 ' '. Is this the regex's doing or 'raw's?
   my $inL = 0;
 
-  DEBUG > 4 and print "Paragraph:\n$para\n\n";
+  DEBUG > 4 and print STDERR "Paragraph:\n$para\n\n";
  
   # Here begins our frightening tokenizer RE.  The following regex matches
   # text in four main parts:
@@ -1777,14 +1865,14 @@ sub _treelet_from_formatting_codes {
       )
     /xgo
   ) {
-    DEBUG > 4 and print "\nParagraphic tokenstack = (@stack)\n";
+    DEBUG > 4 and print STDERR "\nParagraphic tokenstack = (@stack)\n";
     if(defined $1) {
       if(defined $2) {
-        DEBUG > 3 and print "Found complex start-text code \"$1\"\n";
+        DEBUG > 3 and print STDERR "Found complex start-text code \"$1\"\n";
         push @stack, length($2) + 1; 
           # length of the necessary complex end-code string
       } else {
-        DEBUG > 3 and print "Found simple start-text code \"$1\"\n";
+        DEBUG > 3 and print STDERR "Found simple start-text code \"$1\"\n";
         push @stack, 0;  # signal that we're looking for simple
       }
       push @lineage, [ substr($1,0,1), {}, ];  # new node object
@@ -1797,32 +1885,32 @@ sub _treelet_from_formatting_codes {
       }
 
     } elsif(defined $4) {
-      DEBUG > 3 and print "Found apparent complex end-text code \"$3$4\"\n";
+      DEBUG > 3 and print STDERR "Found apparent complex end-text code \"$3$4\"\n";
       # This is where it gets messy...
       if(! @stack) {
         # We saw " >>>>" but needed nothing.  This is ALL just stuff then.
-        DEBUG > 4 and print " But it's really just stuff.\n";
+        DEBUG > 4 and print STDERR " But it's really just stuff.\n";
         push @{ $lineage[-1] }, $3, $4;
         next;
       } elsif(!$stack[-1]) {
         # We saw " >>>>" but needed only ">".  Back pos up.
-        DEBUG > 4 and print " And that's more than we needed to close simple.\n";
+        DEBUG > 4 and print STDERR " And that's more than we needed to close simple.\n";
         push @{ $lineage[-1] }, $3; # That was a for-real space, too.
         pos($para) = pos($para) - length($4) + 1;
       } elsif($stack[-1] == length($4)) {
         # We found " >>>>", and it was exactly what we needed.  Commonest case.
-        DEBUG > 4 and print " And that's exactly what we needed to close complex.\n";
+        DEBUG > 4 and print STDERR " And that's exactly what we needed to close complex.\n";
       } elsif($stack[-1] < length($4)) {
         # We saw " >>>>" but needed only " >>".  Back pos up.
-        DEBUG > 4 and print " And that's more than we needed to close complex.\n";
+        DEBUG > 4 and print STDERR " And that's more than we needed to close complex.\n";
         pos($para) = pos($para) - length($4) + $stack[-1];
       } else {
         # We saw " >>>>" but needed " >>>>>>".  So this is all just stuff!
-        DEBUG > 4 and print " But it's really just stuff, because we needed more.\n";
+        DEBUG > 4 and print STDERR " But it's really just stuff, because we needed more.\n";
         push @{ $lineage[-1] }, $3, $4;
         next;
       }
-      #print "\nHOOBOY ", scalar(@{$lineage[-1]}), "!!!\n";
+      #print STDERR "\nHOOBOY ", scalar(@{$lineage[-1]}), "!!!\n";
 
       push @{ $lineage[-1] }, '' if 2 == @{ $lineage[-1] };
       # Keep the element from being childless
@@ -1839,11 +1927,11 @@ sub _treelet_from_formatting_codes {
       $raw .= $3.$4 if $inL;
       
     } elsif(defined $5) {
-      DEBUG > 3 and print "Found apparent simple end-text code \"$5\"\n";
+      DEBUG > 3 and print STDERR "Found apparent simple end-text code \"$5\"\n";
 
       if(@stack and ! $stack[-1]) {
         # We're indeed expecting a simple end-code
-        DEBUG > 4 and print " It's indeed an end-code.\n";
+        DEBUG > 4 and print STDERR " It's indeed an end-code.\n";
 
         if(length($5) == 2) { # There was a space there: " >"
           push @{ $lineage[-1] }, ' ';
@@ -1854,7 +1942,7 @@ sub _treelet_from_formatting_codes {
         pop @stack;
         pop @lineage;
       } else {
-        DEBUG > 4 and print " It's just stuff.\n";
+        DEBUG > 4 and print STDERR " It's just stuff.\n";
         push @{ $lineage[-1] }, $5;
       }
 
@@ -1867,7 +1955,7 @@ sub _treelet_from_formatting_codes {
       $raw .= $5 if $inL;
 
     } elsif(defined $6) {
-      DEBUG > 3 and print "Found stuff \"$6\"\n";
+      DEBUG > 3 and print STDERR "Found stuff \"$6\"\n";
       push @{ $lineage[-1] }, $6;
       $raw .= $6 if $inL;
         # XXX does not capture multiplace whitespaces -- 'raw' ends up with
@@ -1875,7 +1963,7 @@ sub _treelet_from_formatting_codes {
 
     } else {
       # should never ever ever ever happen
-      DEBUG and print "AYYAYAAAAA at line ", __LINE__, "\n";
+      DEBUG and print STDERR "AYYAYAAAAA at line ", __LINE__, "\n";
       die "SPORK 512512!";
     }
   }
@@ -1895,7 +1983,7 @@ sub _treelet_from_formatting_codes {
         $x = $code . "<$x>";
       }
     }
-    DEBUG > 1 and print "Unterminated $x sequence\n";
+    DEBUG > 1 and print STDERR "Unterminated $x sequence\n";
     $self->whine($start_line,
       "Unterminated $x sequence",
     );
@@ -2023,7 +2111,7 @@ sub reinit {
   my $self = shift;
   foreach (qw(source_dead source_filename doc_has_started
 start_of_pod_block content_seen last_was_blank paras curr_open
-line_count pod_para_count in_pod ~tried_gen_errata errata errors_seen
+line_count pod_para_count in_pod ~tried_gen_errata all_errata errata errors_seen
 Title)) {
 
     delete $self->{$_};
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/Checker.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/Checker.pm
index 3ef64eea650..a32d8b813c2 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/Checker.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/Checker.pm
@@ -9,7 +9,7 @@ use Carp ();
 use Pod::Simple::Methody ();
 use Pod::Simple ();
 use vars qw( @ISA $VERSION );
-$VERSION = '3.29';
+$VERSION = '3.32';
 @ISA = ('Pod::Simple::Methody');
 BEGIN { *DEBUG = defined(&Pod::Simple::DEBUG)
           ? \&Pod::Simple::DEBUG
@@ -91,9 +91,9 @@ sub emit_par {
   my $indent = ' ' x ( 2 * $self->{'Indent'} + ($tweak_indent||0) );
    # Yes, 'STRING' x NEGATIVE gives '', same as 'STRING' x 0
 
-  $self->{'Thispara'} =~ tr{\xAD}{}d if Pod::Simple::ASCII;
+  $self->{'Thispara'} =~ s/$Pod::Simple::shy//g;
   my $out = Text::Wrap::wrap($indent, $indent, $self->{'Thispara'} .= "\n");
-  $out =~ tr{\xA0}{ } if Pod::Simple::ASCII;
+  $out =~ s/$Pod::Simple::nbsp/ /g;
   print {$self->{'output_fh'}} $out,
     #"\n"
   ;
@@ -107,10 +107,8 @@ sub emit_par {
 sub end_Verbatim  {
   return unless $_[0]{'Errata_seen'};
   my $self = shift;
-  if(Pod::Simple::ASCII) {
-    $self->{'Thispara'} =~ tr{\xA0}{ };
-    $self->{'Thispara'} =~ tr{\xAD}{}d;
-  }
+  $self->{'Thispara'} =~ s/$Pod::Simple::nbsp/ /g;
+  $self->{'Thispara'} =~ s/$Pod::Simple::shy//g;
 
   my $i = ' ' x ( 2 * $self->{'Indent'} + 4);
   
@@ -159,8 +157,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/Debug.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/Debug.pm
index 2bbd50a6643..603d4a5b2d0 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/Debug.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/Debug.pm
@@ -2,7 +2,7 @@ require 5;
 package Pod::Simple::Debug;
 use strict;
 use vars qw($VERSION );
-$VERSION = '3.29';
+$VERSION = '3.32';
 
 sub import {
   my($value,$variable);
@@ -47,10 +47,10 @@ sub import {
     # make a not-really-constant
     *Pod::Simple::DEBUG = sub () { $$variable } ;
     $$variable = $value;
-    print "# Starting Pod::Simple::DEBUG = non-constant $variable with val $value\n";
+    print STDERR "# Starting Pod::Simple::DEBUG = non-constant $variable with val $value\n";
   } else {
     *Pod::Simple::DEBUG = eval " sub () { $value } ";
-    print "# Starting Pod::Simple::DEBUG = $value\n";
+    print STDERR "# Starting Pod::Simple::DEBUG = $value\n";
   }
   
   require Pod::Simple;
@@ -140,8 +140,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/DumpAsText.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/DumpAsText.pm
index dfde4d66b2c..a2325626f08 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/DumpAsText.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/DumpAsText.pm
@@ -1,7 +1,7 @@
 
 require 5;
 package Pod::Simple::DumpAsText;
-$VERSION = '3.29';
+$VERSION = '3.32';
 use Pod::Simple ();
 BEGIN {@ISA = ('Pod::Simple')}
 
@@ -26,7 +26,7 @@ sub _handle_element_start {
   # ($self, $element_name, $attr_hash_r)
   my $fh = $_[0]{'output_fh'};
   my($key, $value);
-  DEBUG and print "++ $_[1]\n";
+  DEBUG and print STDERR "++ $_[1]\n";
   
   print $fh   '  ' x ($_[0]{'indent'} || 0),  "++", $_[1], "\n";
   $_[0]{'indent'}++;
@@ -43,7 +43,7 @@ sub _handle_element_start {
 }
 
 sub _handle_text {
-  DEBUG and print "== \"$_[1]\"\n";
+  DEBUG and print STDERR "== \"$_[1]\"\n";
   
   if(length $_[1]) {
     my $indent = '  ' x $_[0]{'indent'};
@@ -64,7 +64,7 @@ sub _handle_text {
 }
 
 sub _handle_element_end {
-  DEBUG and print "-- $_[1]\n";
+  DEBUG and print STDERR "-- $_[1]\n";
   print {$_[0]{'output_fh'}}
    '  ' x --$_[0]{'indent'}, "--", $_[1], "\n";
   return;
@@ -119,8 +119,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/DumpAsXML.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/DumpAsXML.pm
index 4db6a061494..bd3919852c7 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/DumpAsXML.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/DumpAsXML.pm
@@ -1,7 +1,7 @@
 
 require 5;
 package Pod::Simple::DumpAsXML;
-$VERSION = '3.29';
+$VERSION = '3.32';
 use Pod::Simple ();
 BEGIN {@ISA = ('Pod::Simple')}
 
@@ -27,7 +27,7 @@ sub _handle_element_start {
   # ($self, $element_name, $attr_hash_r)
   my $fh = $_[0]{'output_fh'};
   my($key, $value);
-  DEBUG and print "++ $_[1]\n";
+  DEBUG and print STDERR "++ $_[1]\n";
   
   print $fh   '  ' x ($_[0]{'indent'} || 0),  "<", $_[1];
 
@@ -46,7 +46,7 @@ sub _handle_element_start {
 }
 
 sub _handle_text {
-  DEBUG and print "== \"$_[1]\"\n";
+  DEBUG and print STDERR "== \"$_[1]\"\n";
   if(length $_[1]) {
     my $indent = '  ' x $_[0]{'indent'};
     my $text = $_[1];
@@ -59,7 +59,7 @@ sub _handle_text {
 }
 
 sub _handle_element_end {
-  DEBUG and print "-- $_[1]\n";
+  DEBUG and print STDERR "-- $_[1]\n";
   print {$_[0]{'output_fh'}}
    '  ' x --$_[0]{'indent'}, "</", $_[1], ">\n";
   return;
@@ -70,11 +70,13 @@ sub _handle_element_end {
 sub _xml_escape {
   foreach my $x (@_) {
     # Escape things very cautiously:
-    $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg;
+    if ($] ge 5.007_003) {
+      $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(utf8::native_to_unicode(ord($1))).';'/eg;
+    } else { # Is broken for non-ASCII platforms on early perls
+      $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg;
+    }
     # Yes, stipulate the list without a range, so that this can work right on
     #  all charsets that this module happens to run under.
-    # Altho, hmm, what about that ord?  Presumably that won't work right
-    #  under non-ASCII charsets.  Something should be done about that.
   }
   return;
 }
@@ -128,8 +130,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/HTML.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/HTML.pm
index 2c6494b9ba2..9d8f978eea1 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/HTML.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/HTML.pm
@@ -9,7 +9,7 @@ use vars qw(
   $Doctype_decl  $Content_decl
 );
 @ISA = ('Pod::Simple::PullParser');
-$VERSION = '3.29';
+$VERSION = '3.32';
 BEGIN {
   if(defined &DEBUG) { } # no-op
   elsif( defined &Pod::Simple::DEBUG ) { *DEBUG = \&Pod::Simple::DEBUG }
@@ -188,7 +188,7 @@ sub new {
   $new->accept_targets( 'html', 'HTML' );
   $new->accept_codes('VerbatimFormatted');
   $new->accept_codes(@_to_accept);
-  DEBUG > 2 and print "To accept: ", join(' ',@_to_accept), "\n";
+  DEBUG > 2 and print STDERR "To accept: ", join(' ',@_to_accept), "\n";
 
   $new->perldoc_url_prefix(  $Perldoc_URL_Prefix  );
   $new->perldoc_url_postfix( $Perldoc_URL_Postfix );
@@ -232,7 +232,7 @@ sub __adjust_html_h_levels {
 
 sub batch_mode_page_object_init {
   my($self, $batchconvobj, $module, $infile, $outfile, $depth) = @_;
-  DEBUG and print "Initting $self\n  for $module\n",
+  DEBUG and print STDERR "Initting $self\n  for $module\n",
     "  in $infile\n  out $outfile\n  depth $depth\n";
   $self->batch_mode(1);
   $self->batch_mode_current_level($depth);
@@ -255,12 +255,12 @@ sub do_beginning {
   
   if(defined $self->force_title) {
     $title = $self->force_title;
-    DEBUG and print "Forcing title to be $title\n";
+    DEBUG and print STDERR "Forcing title to be $title\n";
   } else {
     # Actually try looking for the title in the document:
     $title = $self->get_short_title();
     unless($self->content_seen) {
-      DEBUG and print "No content seen in search for title.\n";
+      DEBUG and print STDERR "No content seen in search for title.\n";
       return;
     }
     $self->{'Title'} = $title;
@@ -270,7 +270,7 @@ sub do_beginning {
     } else {
       $title = $self->default_title;    
       $title = '' unless defined $title;
-      DEBUG and print "Title defaults to $title\n";
+      DEBUG and print STDERR "Title defaults to $title\n";
     }
   }
 
@@ -305,7 +305,7 @@ sub do_beginning {
     $after,
   ;
 
-  DEBUG and print "Returning from do_beginning...\n";
+  DEBUG and print STDERR "Returning from do_beginning...\n";
   return 1;
 }
 
@@ -368,9 +368,9 @@ sub do_middle {
     my $index = $self->index_as_html();
     if( $$out =~ s/$sneakytag/$index/s ) {
       # Expected case
-      DEBUG and print "Inserted ", length($index), " bytes of index HTML into $out.\n";
+      DEBUG and print STDERR "Inserted ", length($index), " bytes of index HTML into $out.\n";
     } else {
-      DEBUG and print "Odd, couldn't find where to insert the index in the output!\n";
+      DEBUG and print STDERR "Odd, couldn't find where to insert the index in the output!\n";
       # I don't think this should ever happen.
     }
     return 1;
@@ -502,7 +502,7 @@ sub _do_middle_main_loop {
         if(defined $name) {
           my $esc = esc(  $self->section_name_tidy( $name ) );
           print $fh qq[name="$esc"];
-          DEBUG and print "Linearized ", scalar(@to_unget),
+          DEBUG and print STDERR "Linearized ", scalar(@to_unget),
            " tokens as \"$name\".\n";
           push @{ $self->{'PSHTML_index_points'} }, [$tagname, $name]
            if $ToIndex{ $tagname };
@@ -510,7 +510,7 @@ sub _do_middle_main_loop {
             #  just their content), but ahwell.
            
         } else {  # ludicrously long, so nevermind
-          DEBUG and print "Linearized ", scalar(@to_unget),
+          DEBUG and print STDERR "Linearized ", scalar(@to_unget),
            " tokens, but it was too long, so nevermind.\n";
         }
         print $fh "\n>";
@@ -523,7 +523,7 @@ sub _do_middle_main_loop {
           $self->unget_token($next);
           next;
         }
-        DEBUG and print "    raw text ", $next->text, "\n";
+        DEBUG and print STDERR "    raw text ", $next->text, "\n";
         # The parser sometimes preserves newlines and sometimes doesn't!
         (my $text = $next->text) =~ s/\n\z//;
         print $fh $text, "\n";
@@ -608,7 +608,7 @@ sub do_man_link {
   $frag = $self->section_escape($frag)
    if defined $frag and length($frag .= ''); # (stringify)
 
-  DEBUG and print "Resolving \"$to/$frag\"\n\n";
+  DEBUG and print STDERR "Resolving \"$to/$frag\"\n\n";
 
   return $self->resolve_man_page_link($to, $frag);
 }
@@ -627,18 +627,18 @@ sub do_pod_link {
   $section = $self->section_escape($section)
    if defined $section and length($section .= ''); # (stringify)
 
-  DEBUG and printf "Resolving \"%s\" \"%s\"...\n",
+  DEBUG and printf STDERR "Resolving \"%s\" \"%s\"...\n",
    $to || "(nil)",  $section || "(nil)";
    
   {
     # An early hack:
     my $complete_url = $self->resolve_pod_link_by_table($to, $section);
     if( $complete_url ) {
-      DEBUG > 1 and print "resolve_pod_link_by_table(T,S) gives ",
+      DEBUG > 1 and print STDERR "resolve_pod_link_by_table(T,S) gives ",
         $complete_url, "\n  (Returning that.)\n";
       return $complete_url;
     } else {
-      DEBUG > 4 and print " resolve_pod_link_by_table(T,S)", 
+      DEBUG > 4 and print STDERR " resolve_pod_link_by_table(T,S)",
        " didn't return anything interesting.\n";
     }
   }
@@ -648,15 +648,15 @@ sub do_pod_link {
     my $there = $self->resolve_pod_link_by_table($to);
     if(defined $there and length $there) {
       DEBUG > 1
-       and print "resolve_pod_link_by_table(T) gives $there\n";
+       and print STDERR "resolve_pod_link_by_table(T) gives $there\n";
     } else {
       $there = 
         $self->resolve_pod_page_link($to, $section);
          # (I pass it the section value, but I don't see a
          #  particular reason it'd use it.)
-      DEBUG > 1 and print "resolve_pod_page_link gives ", $to || "(nil)", "\n";
+      DEBUG > 1 and print STDERR "resolve_pod_page_link gives ", $there || "(nil)", "\n";
       unless( defined $there and length $there ) {
-        DEBUG and print "Can't resolve $to\n";
+        DEBUG and print STDERR "Can't resolve $to\n";
         return undef;
       }
       # resolve_pod_page_link returning undef is how it
@@ -665,18 +665,18 @@ sub do_pod_link {
     $to = $there;
   }
 
-  #DEBUG and print "So far [", $to||'nil', "] [", $section||'nil', "]\n";
+  #DEBUG and print STDERR "So far [", $to||'nil', "] [", $section||'nil', "]\n";
 
   my $out = (defined $to and length $to) ? $to : '';
   $out .= "#" . $section if defined $section and length $section;
   
   unless(length $out) { # sanity check
-    DEBUG and printf "Oddly, couldn't resolve \"%s\" \"%s\"...\n",
+    DEBUG and printf STDERR "Oddly, couldn't resolve \"%s\" \"%s\"...\n",
      $to || "(nil)",  $section || "(nil)";
     return undef;
   }
 
-  DEBUG and print "Resolved to $out\n";
+  DEBUG and print STDERR "Resolved to $out\n";
   return $out;  
 }
 
@@ -695,7 +695,11 @@ sub section_name_tidy {
   $section =~ s/^\s+//;
   $section =~ s/\s+$//;
   $section =~ tr/ /_/;
-  $section =~ tr/\x00-\x1F\x80-\x9F//d if 'A' eq chr(65); # drop crazy characters
+  if ($] ge 5.006) {
+    $section =~ s/[[:cntrl:][:^ascii:]]//g; # drop crazy characters
+  } elsif ('A' eq chr(65)) { # But not on early EBCDIC
+    $section =~ tr/\x00-\x1F\x80-\x9F//d;
+  }
   $section = $self->unicode_escape_url($section);
   $section = '_' unless length $section;
   return $section;
@@ -714,12 +718,13 @@ sub general_url_escape {
   # A pretty conservative escaping, behoovey even for query components
   #  of a URL (see RFC 2396)
   
-  $string =~ s/([^-_\.!~*()abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/sprintf('%%%02X',ord($1))/eg;
+  if ($] ge 5.007_003) {
+    $string =~ s/([^-_\.!~*()abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/sprintf('%%%02X',utf8::native_to_unicode(ord($1)))/eg;
+  } else { # Is broken for non-ASCII platforms on early perls
+    $string =~ s/([^-_\.!~*()abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/sprintf('%%%02X',ord($1))/eg;
+  }
    # Yes, stipulate the list without a range, so that this can work right on
    #  all charsets that this module happens to run under.
-   # Altho, hmm, what about that ord?  Presumably that won't work right
-   #  under non-ASCII charsets.  Something should be done
-   #  about that, I guess?
   
   return $string;
 }
@@ -752,16 +757,16 @@ sub resolve_pod_page_link_singleton_mode {
 
 sub resolve_pod_page_link_batch_mode {
   my($self, $to) = @_;
-  DEBUG > 1 and print " During batch mode, resolving $to ...\n";
+  DEBUG > 1 and print STDERR " During batch mode, resolving $to ...\n";
   my @path = grep length($_), split m/::/s, $to, -1;
   unless( @path ) { # sanity
-    DEBUG and print "Very odd!  Splitting $to gives (nil)!\n";
+    DEBUG and print STDERR "Very odd!  Splitting $to gives (nil)!\n";
     return undef;
   }
   $self->batch_mode_rectify_path(\@path);
   my $out = join('/', map $self->pagepath_url_escape($_), @path)
     . $HTML_EXTENSION;
-  DEBUG > 1 and print " => $out\n";
+  DEBUG > 1 and print STDERR " => $out\n";
   return $out;
 }
 
@@ -851,21 +856,28 @@ sub esc { # a function.
       @_ = splice @_; # break aliasing
     } else {
       my $x = shift;
-      $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg;
+      if ($] ge 5.007_003) {
+        $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(utf8::native_to_unicode(ord($1))).';'/eg;
+      } else { # Is broken for non-ASCII platforms on early perls
+        $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg;
+      }
       return $x;
     }
   }
   foreach my $x (@_) {
     # Escape things very cautiously:
-    $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg
-     if defined $x;
+    if (defined $x) {
+      if ($] ge 5.007_003) {
+        $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(utf8::native_to_unicode(ord($1))).';'/eg
+      } else { # Is broken for non-ASCII platforms on early perls
+        $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg
+      }
+    }
     # Leave out "- so that "--" won't make it thru in X-generated comments
     #  with text in them.
 
     # Yes, stipulate the list without a range, so that this can work right on
     #  all charsets that this module happens to run under.
-    # Altho, hmm, what about that ord?  Presumably that won't work right
-    #  under non-ASCII charsets.  Something should be done about that.
   }
   return @_;
 }
@@ -1100,8 +1112,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/HTMLBatch.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/HTMLBatch.pm
index 19e700b825f..5758645073a 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/HTMLBatch.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/HTMLBatch.pm
@@ -5,7 +5,7 @@ use strict;
 use vars qw( $VERSION $HTML_RENDER_CLASS $HTML_EXTENSION
  $CSS $JAVASCRIPT $SLEEPY $SEARCH_CLASS @ISA
 );
-$VERSION = '3.29';
+$VERSION = '3.32';
 @ISA = ();  # Yup, we're NOT a subclass of Pod::Simple::HTML!
 
 # TODO: nocontents stylesheets. Strike some of the color variations?
@@ -270,7 +270,7 @@ sub _do_one_batch_conversion {
   $self->batch_mode_page_object_kill($page, $module, $infile, $outfile, $depth)
    if $self->can('batch_mode_page_object_kill');
     
-  DEBUG > 4 and printf "%s %sb < $infile %s %sb\n",
+  DEBUG > 4 and printf STDERR "%s %sb < $infile %s %sb\n",
      $outfile, -s $outfile, $infile, -s $infile
   ;
 
@@ -295,7 +295,7 @@ sub note_for_contents_file {
      [ join("::", @$namelets), $infile, $outfile, $namelets ]
      #            0               1         2         3
     ;
-    DEBUG > 3 and print "Noting @$c[-1]\n";
+    DEBUG > 3 and print STDERR "Noting @$c[-1]\n";
   }
   return;
 }
@@ -446,7 +446,7 @@ sub makepath {
       die "$dir exists but not as a directory!?" unless -d $dir;
       next;
     }
-    DEBUG > 3 and print "  Making $dir\n";
+    DEBUG > 3 and print STDERR "  Making $dir\n";
     mkdir $dir, 0777
      or die "Can't mkdir $dir: $!\nAborting"
     ;
@@ -533,7 +533,7 @@ sub modnames2paths { # return a hashref mapping modulenames => paths
   my $m2p;
   {
     my $search = $self->search_class->new;
-    DEBUG and print "Searching via $search\n";
+    DEBUG and print STDERR "Searching via $search\n";
     $search->verbose(1) if DEBUG > 10;
     $search->progress( $self->progress->copy->goal(0) ) if $self->progress;
     $search->shadows(0);  # don't bother noting shadowed files
@@ -545,13 +545,13 @@ sub modnames2paths { # return a hashref mapping modulenames => paths
 
   $self->muse("That's odd... no modules found!") unless keys %$m2p;
   if( DEBUG > 4 ) {
-    print "Modules found (name => path):\n";
+    print STDERR "Modules found (name => path):\n";
     foreach my $m (sort {lc($a) cmp lc($b)} keys %$m2p) {
-      print "  $m  $$m2p{$m}\n";
+      print STDERR "  $m  $$m2p{$m}\n";
     }
-    print "(total ",     scalar(keys %$m2p), ")\n\n";
+    print STDERR "(total ",     scalar(keys %$m2p), ")\n\n";
   } elsif( DEBUG ) {
-    print      "Found ", scalar(keys %$m2p), " modules.\n";
+    print STDERR      "Found ", scalar(keys %$m2p), " modules.\n";
   }
   $self->muse( "Found ", scalar(keys %$m2p), " modules." );
   
@@ -566,7 +566,7 @@ sub _wopen {
   my($self, $outpath) = @_;
   require Symbol;
   my $out_fh = Symbol::gensym();
-  DEBUG > 5 and print "Write-opening to $outpath\n";
+  DEBUG > 5 and print STDERR "Write-opening to $outpath\n";
   return $out_fh if open($out_fh, "> $outpath");
   require Carp;  
   Carp::croak("Can't write-open $outpath: $!");
@@ -608,9 +608,9 @@ sub _spray_css {
     my $outfile;
     if( ref($chunk->[-1]) and $url =~ m{^(_[-a-z0-9_]+\.css$)} ) {
       $outfile = $self->filespecsys->catfile( $outdir, "$1" );
-      DEBUG > 5 and print "Noting $$chunk[0] as a file I'll create.\n";
+      DEBUG > 5 and print STDERR "Noting $$chunk[0] as a file I'll create.\n";
     } else {
-      DEBUG > 5 and print "OK, noting $$chunk[0] as an external CSS.\n";
+      DEBUG > 5 and print STDERR "OK, noting $$chunk[0] as an external CSS.\n";
       # Requires no further attention.
       next;
     }
@@ -620,7 +620,7 @@ sub _spray_css {
     print $Cssout ${$chunk->[-1]}
      or warn "Couldn't print to $outfile: $!\nAbort writing to $outfile at all";
     close($Cssout);
-    DEBUG > 5 and print "Wrote $outfile\n";
+    DEBUG > 5 and print STDERR "Wrote $outfile\n";
   }
 
   return;
@@ -771,9 +771,9 @@ sub _spray_javascript {
     
     if( ref($script->[-1]) and $url =~ m{^(_[-a-z0-9_]+\.js$)} ) {
       $outfile = $self->filespecsys->catfile( $outdir, "$1" );
-      DEBUG > 5 and print "Noting $$script[0] as a file I'll create.\n";
+      DEBUG > 5 and print STDERR "Noting $$script[0] as a file I'll create.\n";
     } else {
-      DEBUG > 5 and print "OK, noting $$script[0] as an external JavaScript.\n";
+      DEBUG > 5 and print STDERR "OK, noting $$script[0] as an external JavaScript.\n";
       next;
     }
     
@@ -783,7 +783,7 @@ sub _spray_javascript {
     print $Jsout ${$script->[-1]}
      or warn "Couldn't print to $outfile: $!\nAbort writing to $outfile at all";
     close($Jsout);
-    DEBUG > 5 and print "Wrote $outfile\n";
+    DEBUG > 5 and print STDERR "Wrote $outfile\n";
   }
 
   return;
@@ -1321,8 +1321,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/LinkSection.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/LinkSection.pm
index 2139509303e..0d487313b2d 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/LinkSection.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/LinkSection.pm
@@ -3,12 +3,12 @@ require 5;
 package Pod::Simple::LinkSection;
   # Based somewhat dimly on Array::Autojoin
 use vars qw($VERSION );
-$VERSION = '3.29';
+$VERSION = '3.32';
 
 use strict;
 use Pod::Simple::BlackBox;
 use vars qw($VERSION );
-$VERSION = '3.29';
+$VERSION = '3.32';
 
 use overload( # So it'll stringify nice
   '""'   => \&Pod::Simple::BlackBox::stringify_lol,
@@ -137,8 +137,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/Methody.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/Methody.pm
index d867b1ce932..29ed32090be 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/Methody.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/Methody.pm
@@ -4,7 +4,7 @@ package Pod::Simple::Methody;
 use strict;
 use Pod::Simple ();
 use vars qw(@ISA $VERSION);
-$VERSION = '3.29';
+$VERSION = '3.32';
 @ISA = ('Pod::Simple');
 
 # Yes, we could use named variables, but I want this to be impose
@@ -115,8 +115,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/Progress.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/Progress.pm
index 3a87b998423..af24049f11f 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/Progress.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/Progress.pm
@@ -1,7 +1,7 @@
 
 require 5;
 package Pod::Simple::Progress;
-$VERSION = '3.29';
+$VERSION = '3.32';
 use strict;
 
 # Objects of this class are used for noting progress of an
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/PullParser.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/PullParser.pm
index 0e47ec3413b..758f42d6594 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/PullParser.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/PullParser.pm
@@ -1,6 +1,6 @@
 require 5;
 package Pod::Simple::PullParser;
-$VERSION = '3.29';
+$VERSION = '3.32';
 use Pod::Simple ();
 BEGIN {@ISA = ('Pod::Simple')}
 
@@ -88,7 +88,7 @@ sub new {
   $self->{'text_token_class'}  ||= 'Pod::Simple::PullParserTextToken';
   $self->{'end_token_class'}   ||= 'Pod::Simple::PullParserEndToken';
 
-  DEBUG > 1 and print "New pullparser object: $self\n";
+  DEBUG > 1 and print STDERR "New pullparser object: $self\n";
 
   return $self;
 }
@@ -97,8 +97,8 @@ sub new {
 
 sub get_token {
   my $self = shift;
-  DEBUG > 1 and print "\nget_token starting up on $self.\n";
-  DEBUG > 2 and print " Items in token-buffer (",
+  DEBUG > 1 and print STDERR "\nget_token starting up on $self.\n";
+  DEBUG > 2 and print STDERR " Items in token-buffer (",
    scalar( @{ $self->{'token_buffer'} } ) ,
    ") :\n", map(
      "    " . $_->dump . "\n", @{ $self->{'token_buffer'} }
@@ -108,25 +108,25 @@ sub get_token {
   ;
 
   until( @{ $self->{'token_buffer'} } ) {
-    DEBUG > 3 and print "I need to get something into my empty token buffer...\n";
+    DEBUG > 3 and print STDERR "I need to get something into my empty token buffer...\n";
     if($self->{'source_dead'}) {
-      DEBUG and print "$self 's source is dead.\n";
+      DEBUG and print STDERR "$self 's source is dead.\n";
       push @{ $self->{'token_buffer'} }, undef;
     } elsif(exists $self->{'source_fh'}) {
       my @lines;
       my $fh = $self->{'source_fh'}
        || Carp::croak('You have to call set_source before you can call get_token');
        
-      DEBUG and print "$self 's source is filehandle $fh.\n";
+      DEBUG and print STDERR "$self 's source is filehandle $fh.\n";
       # Read those many lines at a time
       for(my $i = Pod::Simple::MANY_LINES; $i--;) {
-        DEBUG > 3 and print " Fetching a line from source filehandle $fh...\n";
+        DEBUG > 3 and print STDERR " Fetching a line from source filehandle $fh...\n";
         local $/ = $Pod::Simple::NL;
         push @lines, scalar(<$fh>); # readline
-        DEBUG > 3 and print "  Line is: ",
+        DEBUG > 3 and print STDERR "  Line is: ",
           defined($lines[-1]) ? $lines[-1] : "<undef>\n";
         unless( defined $lines[-1] ) {
-          DEBUG and print "That's it for that source fh!  Killing.\n";
+          DEBUG and print STDERR "That's it for that source fh!  Killing.\n";
           delete $self->{'source_fh'}; # so it can be GC'd
           last;
         }
@@ -138,31 +138,31 @@ sub get_token {
       }
       
       if(DEBUG > 8) {
-        print "* I've gotten ", scalar(@lines), " lines:\n";
+        print STDERR "* I've gotten ", scalar(@lines), " lines:\n";
         foreach my $l (@lines) {
           if(defined $l) {
-            print "  line {$l}\n";
+            print STDERR "  line {$l}\n";
           } else {
-            print "  line undef\n";
+            print STDERR "  line undef\n";
           }
         }
-        print "* end of ", scalar(@lines), " lines\n";
+        print STDERR "* end of ", scalar(@lines), " lines\n";
       }
 
       $self->SUPER::parse_lines(@lines);
       
     } elsif(exists $self->{'source_arrayref'}) {
-      DEBUG and print "$self 's source is arrayref $self->{'source_arrayref'}, with ",
+      DEBUG and print STDERR "$self 's source is arrayref $self->{'source_arrayref'}, with ",
        scalar(@{$self->{'source_arrayref'}}), " items left in it.\n";
 
-      DEBUG > 3 and print "  Fetching ", Pod::Simple::MANY_LINES, " lines.\n";
+      DEBUG > 3 and print STDERR "  Fetching ", Pod::Simple::MANY_LINES, " lines.\n";
       $self->SUPER::parse_lines(
         splice @{ $self->{'source_arrayref'} },
         0,
         Pod::Simple::MANY_LINES
       );
       unless( @{ $self->{'source_arrayref'} } ) {
-        DEBUG and print "That's it for that source arrayref!  Killing.\n";
+        DEBUG and print STDERR "That's it for that source arrayref!  Killing.\n";
         $self->SUPER::parse_lines(undef);
         delete $self->{'source_arrayref'}; # so it can be GC'd
       }
@@ -170,12 +170,12 @@ sub get_token {
 
     } elsif(exists $self->{'source_scalar_ref'}) {
 
-      DEBUG and print "$self 's source is scalarref $self->{'source_scalar_ref'}, with ",
+      DEBUG and print STDERR "$self 's source is scalarref $self->{'source_scalar_ref'}, with ",
         length(${ $self->{'source_scalar_ref'} }) -
         (pos(${ $self->{'source_scalar_ref'} }) || 0),
         " characters left to parse.\n";
 
-      DEBUG > 3 and print " Fetching a line from source-string...\n";
+      DEBUG > 3 and print STDERR " Fetching a line from source-string...\n";
       if( ${ $self->{'source_scalar_ref'} } =~
         m/([^\n\r]*)((?:\r?\n)?)/g
       ) {
@@ -189,7 +189,7 @@ sub get_token {
       } else { # that's the end.  Byebye
         $self->SUPER::parse_lines(undef);
         delete $self->{'source_scalar_ref'};
-        DEBUG and print "That's it for that source scalarref!  Killing.\n";
+        DEBUG and print STDERR "That's it for that source scalarref!  Killing.\n";
       }
 
       
@@ -197,7 +197,7 @@ sub get_token {
       die "What source??";
     }
   }
-  DEBUG and print "get_token about to return ",
+  DEBUG and print STDERR "get_token about to return ",
    Pod::Simple::pretty( @{$self->{'token_buffer'}}
      ? $self->{'token_buffer'}[-1] : undef
    ), "\n";
@@ -206,7 +206,7 @@ sub get_token {
 
 sub unget_token {
   my $self = shift;
-  DEBUG and print "Ungetting ", scalar(@_), " tokens: ",
+  DEBUG and print STDERR "Ungetting ", scalar(@_), " tokens: ",
    @_ ? "@_\n" : "().\n";
   foreach my $t (@_) {
     Carp::croak "Can't unget that, because it's not a token -- it's undef!"
@@ -218,7 +218,7 @@ sub unget_token {
   }
   
   unshift @{$self->{'token_buffer'}}, @_;
-  DEBUG > 1 and print "Token buffer now has ",
+  DEBUG > 1 and print STDERR "Token buffer now has ",
    scalar(@{$self->{'token_buffer'}}), " items in it.\n";
   return;
 }
@@ -237,36 +237,36 @@ sub set_source {
     Carp::croak("Can't use empty-string as a source for set_source");
   } elsif(ref(\( $_[0] )) eq 'GLOB') {
     $self->{'source_filename'} = '' . ($handle = $_[0]);
-    DEBUG and print "$self 's source is glob $_[0]\n";
+    DEBUG and print STDERR "$self 's source is glob $_[0]\n";
     # and fall thru   
   } elsif(ref( $_[0] ) eq 'SCALAR') {
     $self->{'source_scalar_ref'} = $_[0];
-    DEBUG and print "$self 's source is scalar ref $_[0]\n";
+    DEBUG and print STDERR "$self 's source is scalar ref $_[0]\n";
     return;
   } elsif(ref( $_[0] ) eq 'ARRAY') {
     $self->{'source_arrayref'} = $_[0];
-    DEBUG and print "$self 's source is array ref $_[0]\n";
+    DEBUG and print STDERR "$self 's source is array ref $_[0]\n";
     return;
   } elsif(ref $_[0]) {
     $self->{'source_filename'} = '' . ($handle = $_[0]);
-    DEBUG and print "$self 's source is fh-obj $_[0]\n";
+    DEBUG and print STDERR "$self 's source is fh-obj $_[0]\n";
   } elsif(!length $_[0]) {
     Carp::croak("Can't use empty-string as a source for set_source");
   } else {  # It's a filename!
-    DEBUG and print "$self 's source is filename $_[0]\n";
+    DEBUG and print STDERR "$self 's source is filename $_[0]\n";
     {
       local *PODSOURCE;
       open(PODSOURCE, "<$_[0]") || Carp::croak "Can't open $_[0]: $!";
       $handle = *PODSOURCE{IO};
     }
     $self->{'source_filename'} = $_[0];
-    DEBUG and print "  Its name is $_[0].\n";
+    DEBUG and print STDERR "  Its name is $_[0].\n";
 
     # TODO: file-discipline things here!
   }
 
   $self->{'source_fh'} = $handle;
-  DEBUG and print "  Its handle is $handle\n";
+  DEBUG and print STDERR "  Its handle is $handle\n";
   return 1;
 }
 
@@ -356,7 +356,7 @@ sub _get_titled_section {
 
     if ($state == 0) { # seeking =head1
       if( $token->is_start and $token->tagname eq 'head1' ) {
-        DEBUG and print "  Found head1.  Seeking content...\n";
+        DEBUG and print STDERR "  Found head1.  Seeking content...\n";
         ++$state;
         $head1_text_content = '';
       }
@@ -365,21 +365,21 @@ sub _get_titled_section {
     elsif($state == 1) { # accumulating text until end of head1
       if( $token->is_text ) {
           unless ($skipX) {
-            DEBUG and print "   Adding \"", $token->text, "\" to head1-content.\n";
+            DEBUG and print STDERR "   Adding \"", $token->text, "\" to head1-content.\n";
             $head1_text_content .= $token->text;
           }
       } elsif( $token->is_tagname('X') ) {
           # We're going to want to ignore X<> stuff.
           $skipX = $token->is_start;
-          DEBUG and print +($skipX ? 'Start' : 'End'), 'ing ignoring of X<> tag';
+          DEBUG and print STDERR +($skipX ? 'Start' : 'End'), 'ing ignoring of X<> tag';
       } elsif( $token->is_end and $token->tagname eq 'head1' ) {
-        DEBUG and print "  Found end of head1.  Considering content...\n";
+        DEBUG and print STDERR "  Found end of head1.  Considering content...\n";
         $head1_text_content = uc $head1_text_content if $nocase;
         if($head1_text_content eq $titlename
           or $head1_text_content =~ m/\($titlename_re\)/s
           # We accept "=head1 Nomen Modularis (NAME)" for sake of i18n
         ) {
-          DEBUG and print "  Yup, it was $titlename.  Seeking next para-content...\n";
+          DEBUG and print STDERR "  Yup, it was $titlename.  Seeking next para-content...\n";
           ++$state;
         } elsif(
           $desperate_for_title
@@ -400,11 +400,11 @@ sub _get_titled_section {
         ) {
           # Looks good; trim it
           ($title = $head1_text_content) =~ s/\s+$//;
-          DEBUG and print "  It looks titular: \"$title\".\n\n  Using that.\n";
+          DEBUG and print STDERR "  It looks titular: \"$title\".\n\n  Using that.\n";
           last;
         } else {
           --$state;
-          DEBUG and print "  Didn't look titular ($head1_text_content).\n",
+          DEBUG and print STDERR "  Didn't look titular ($head1_text_content).\n",
             "\n  Dropping back to seeking-head1-content mode...\n";
         }
       }
@@ -413,7 +413,7 @@ sub _get_titled_section {
     elsif($state == 2) {
       # seeking start of para (which must immediately follow)
       if($token->is_start and $content_containers{ $token->tagname }) {
-        DEBUG and print "  Found start of Para.  Accumulating content...\n";
+        DEBUG and print STDERR "  Found start of Para.  Accumulating content...\n";
         $para_text_content = '';
         ++$state;
       } else {
@@ -426,12 +426,12 @@ sub _get_titled_section {
     elsif($state == 3) {
       # accumulating text until end of Para
       if( $token->is_text ) {
-        DEBUG and print "   Adding \"", $token->text, "\" to para-content.\n";
+        DEBUG and print STDERR "   Adding \"", $token->text, "\" to para-content.\n";
         $para_text_content .= $token->text;
         # and keep looking
         
       } elsif( $token->is_end and $content_containers{ $token->tagname } ) {
-        DEBUG and print "  Found end of Para.  Considering content: ",
+        DEBUG and print STDERR "  Found end of Para.  Considering content: ",
           $para_text_content, "\n";
 
         if( $para_text_content =~ m/\S/
@@ -440,11 +440,11 @@ sub _get_titled_section {
            : 1)
         ) {
           # Some minimal sanity constraints, I think.
-          DEBUG and print "  It looks contentworthy, I guess.  Using it.\n";
+          DEBUG and print STDERR "  It looks contentworthy, I guess.  Using it.\n";
           $title = $para_text_content;
           last;
         } else {
-          DEBUG and print "  Doesn't look at all contentworthy!\n  Giving up.\n";
+          DEBUG and print STDERR "  Doesn't look at all contentworthy!\n  Giving up.\n";
           undef $title;
           last;
         }
@@ -461,8 +461,8 @@ sub _get_titled_section {
   $self->unget_token(@to_unget);
   
   if(DEBUG) {
-    if(defined $title) { print "  Returning title <$title>\n" }
-    else { print "Returning title <>\n" }
+    if(defined $title) { print STDERR "  Returning title <$title>\n" }
+    else { print STDERR "Returning title <>\n" }
   }
   
   return '' unless defined $title;
@@ -476,7 +476,7 @@ sub _get_titled_section {
 
 sub _handle_element_start {
   my $self = shift;   # leaving ($element_name, $attr_hash_r)
-  DEBUG > 2 and print "++ $_[0] (", map("<$_> ", %{$_[1]}), ")\n";
+  DEBUG > 2 and print STDERR "++ $_[0] (", map("<$_> ", %{$_[1]}), ")\n";
   
   push @{ $self->{'token_buffer'} },
        $self->{'start_token_class'}->new(@_);
@@ -485,7 +485,7 @@ sub _handle_element_start {
 
 sub _handle_text {
   my $self = shift;   # leaving ($text)
-  DEBUG > 2 and print "== $_[0]\n";
+  DEBUG > 2 and print STDERR "== $_[0]\n";
   push @{ $self->{'token_buffer'} },
        $self->{'text_token_class'}->new(@_);
   return;
@@ -493,7 +493,7 @@ sub _handle_text {
 
 sub _handle_element_end {
   my $self = shift;   # leaving ($element_name);
-  DEBUG > 2 and print "-- $_[0]\n";
+  DEBUG > 2 and print STDERR "-- $_[0]\n";
   push @{ $self->{'token_buffer'} }, 
        $self->{'end_token_class'}->new(@_);
   return;
@@ -742,8 +742,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
@@ -792,9 +792,9 @@ sub _old_get_title {  # some witchery in here
       last;
     }
 
-    DEBUG and print "-Got token ", $to_unget[-1]->dump, "\n";
+    DEBUG and print STDERR "-Got token ", $to_unget[-1]->dump, "\n";
 
-    (DEBUG and print "Too much in the buffer.\n"),
+    (DEBUG and print STDERR "Too much in the buffer.\n"),
      last if @to_unget > 25; # sanity
     
     my $pattern = '';
@@ -811,7 +811,7 @@ sub _old_get_title {  # some witchery in here
        )) =~ m{<head1>NAME</head1><Para>(X|</?[BCIFLS]>)+</Para>$}s
     ) {
       # Whee, it fits the pattern
-      DEBUG and print "Seems to match =head1 NAME pattern.\n";
+      DEBUG and print STDERR "Seems to match =head1 NAME pattern.\n";
       $title = '';
       foreach my $t (reverse @to_unget) {
         last if $t->type eq 'start' and $t->tagname eq 'Para';
@@ -824,7 +824,7 @@ sub _old_get_title {  # some witchery in here
       and !( $1 eq '1' and $2 eq 'NAME' )
     ) {
       # Well, it fits a fallback pattern
-      DEBUG and print "Seems to match NAMEless pattern.\n";
+      DEBUG and print STDERR "Seems to match NAMEless pattern.\n";
       $title = '';
       foreach my $t (reverse @to_unget) {
         last if $t->type eq 'start' and $t->tagname =~ m/^head\d$/s;
@@ -834,7 +834,7 @@ sub _old_get_title {  # some witchery in here
       last;
       
     } else {
-      DEBUG and $pattern and print "Leading pattern: $pattern\n";
+      DEBUG and $pattern and print STDERR "Leading pattern: $pattern\n";
     }
   }
   
@@ -842,8 +842,8 @@ sub _old_get_title {  # some witchery in here
   $self->unget_token(@to_unget);
   
   if(DEBUG) {
-    if(defined $title) { print "  Returning title <$title>\n" }
-    else { print "Returning title <>\n" }
+    if(defined $title) { print STDERR "  Returning title <$title>\n" }
+    else { print STDERR "Returning title <>\n" }
   }
   
   return '' unless defined $title;
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserEndToken.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserEndToken.pm
index bb5ac7adbfe..0d68841d095 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserEndToken.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserEndToken.pm
@@ -5,7 +5,7 @@ use Pod::Simple::PullParserToken ();
 use strict;
 use vars qw(@ISA $VERSION);
 @ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.29';
+$VERSION = '3.32';
 
 sub new {  # Class->new(tagname);
   my $class = shift;
@@ -83,8 +83,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserStartToken.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserStartToken.pm
index dbb0b2c859f..f09c10915e1 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserStartToken.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserStartToken.pm
@@ -5,7 +5,7 @@ use Pod::Simple::PullParserToken ();
 use strict;
 use vars qw(@ISA $VERSION);
 @ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.29';
+$VERSION = '3.32';
 
 sub new {  # Class->new(tagname, optional_attrhash);
   my $class = shift;
@@ -124,8 +124,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserTextToken.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserTextToken.pm
index 9db7f1ee8fc..17d065535cd 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserTextToken.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserTextToken.pm
@@ -5,7 +5,7 @@ use Pod::Simple::PullParserToken ();
 use strict;
 use vars qw(@ISA $VERSION);
 @ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.29';
+$VERSION = '3.32';
 
 sub new {  # Class->new(text);
   my $class = shift;
@@ -70,6 +70,12 @@ Or, if you want to alter the value, you can even do things like this:
     }
 
     ...or however you want to alter the value...
+    (Note that starting with Perl v5.8, you can use, e.g.,
+
+        my $nbsp = chr utf8::unicode_to_native(0xA0);
+        s/$nbsp/ /g;
+
+    to handle the above regardless if it's an ASCII world or not)
   }
 
 =back
@@ -91,8 +97,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserToken.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserToken.pm
index 46ab1fd4d3a..7f493b964d7 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserToken.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/PullParserToken.pm
@@ -3,7 +3,7 @@ require 5;
 package Pod::Simple::PullParserToken;
  # Base class for tokens gotten from Pod::Simple::PullParser's $parser->get_token
 @ISA = ();
-$VERSION = '3.29';
+$VERSION = '3.32';
 use strict;
 
 sub new {  # Class->new('type', stuff...);  ## Overridden in derived classes anyway
@@ -50,7 +50,7 @@ Given a $parser that's an object of class Pod::Simple::PullParser
 (or a subclass)...
 
   while(my $token = $parser->get_token) {
-    $DEBUG and print "Token: ", $token->dump, "\n";
+    $DEBUG and print STDERR "Token: ", $token->dump, "\n";
     if($token->is_start) {
       ...access $token->tagname, $token->attr, etc...
 
@@ -104,7 +104,7 @@ This returns a handy stringified value of this object.  This
 is useful for debugging, as in:
 
   while(my $token = $parser->get_token) {
-    $DEBUG and print "Token: ", $token->dump, "\n";
+    $DEBUG and print STDERR "Token: ", $token->dump, "\n";
     ...
   }
 
@@ -126,8 +126,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/RTF.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/RTF.pm
index 617190418b6..9aea743a7e0 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/RTF.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/RTF.pm
@@ -8,7 +8,7 @@ package Pod::Simple::RTF;
 
 use strict;
 use vars qw($VERSION @ISA %Escape $WRAP %Tagmap);
-$VERSION = '3.29';
+$VERSION = '3.32';
 use Pod::Simple::PullParser ();
 BEGIN {@ISA = ('Pod::Simple::PullParser')}
 
@@ -17,6 +17,16 @@ BEGIN { *DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG }
 
 $WRAP = 1 unless defined $WRAP;
 
+# These are broken for early Perls on EBCDIC; they could be fixed to work
+# better there, but not worth it.  These are part of a larger [...] class, so
+# are just the strings to substitute into it, as opposed to compiled patterns.
+my $cntrl = '[:cntrl:]';
+$cntrl = '\x00-\x1F\x7F' unless eval "qr/[$cntrl]/";
+
+my $not_ascii = '[:^ascii:]';
+$not_ascii = '\x80-\xFF' unless eval "qr/[$not_ascii]/";
+
+
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 sub _openclose {
@@ -101,7 +111,7 @@ sub new {
 
   $new->accept_codes(@_to_accept);
   $new->accept_codes('VerbatimFormatted');
-  DEBUG > 2 and print "To accept: ", join(' ',@_to_accept), "\n";
+  DEBUG > 2 and print STDERR "To accept: ", join(' ',@_to_accept), "\n";
   $new->doc_lang(
     (  $ENV{'RTFDEFLANG'} || '') =~ m/^(\d{1,10})$/s ? $1
     : ($ENV{'RTFDEFLANG'} || '') =~ m/^0?x([a-fA-F0-9]{1,10})$/s ? hex($1)
@@ -161,13 +171,13 @@ sub do_middle {      # the main work
   
     if( ($type = $token->type) eq 'text' ) {
       if( $self->{'rtfverbatim'} ) {
-        DEBUG > 1 and print "  $type " , $token->text, " in verbatim!\n";
+        DEBUG > 1 and print STDERR "  $type " , $token->text, " in verbatim!\n";
         rtf_esc_codely($scratch = $token->text);
         print $fh $scratch;
         next;
       }
 
-      DEBUG > 1 and print "  $type " , $token->text, "\n";
+      DEBUG > 1 and print STDERR "  $type " , $token->text, "\n";
       
       $scratch = $token->text;
       $scratch =~ tr/\t\cb\cc/ /d;
@@ -176,7 +186,7 @@ sub do_middle {      # the main work
        s/(?:
            ^
            |
-           (?<=[\cm\cj\t "\[\<\(])
+           (?<=[\r\n\t "\[\<\(])
          )   # start on whitespace, sequence-start, or quote
          ( # something looking like a Perl token:
           (?:
@@ -185,7 +195,7 @@ sub do_middle {      # the main work
           |
           # or starting alpha, but containing anything strange:
           (?:
-           [a-zA-Z'\x80-\xFF]+[\$\@\:_<>\(\\\*]\S+
+           [a-zA-Z'${not_ascii}]+[\$\@\:_<>\(\\\*]\S+
           )
          )
         /\cb$1\cc/xsg
@@ -194,10 +204,10 @@ sub do_middle {      # the main work
       rtf_esc($scratch);
       $scratch =~
          s/(
-            [^\cm\cj\n]{65}        # Snare 65 characters from a line
-            [^\cm\cj\n\x20]{0,50}  #  and finish any current word
+            [^\r\n]{65}        # Snare 65 characters from a line
+            [^\r\n ]{0,50}     #  and finish any current word
            )
-           (\x20{1,10})(?![\cm\cj\n]) # capture some spaces not at line-end
+           (\ {1,10})(?![\r\n]) # capture some spaces not at line-end
           /$1$2\n/gx     # and put a NL before those spaces
         if $WRAP;
         # This may wrap at well past the 65th column, but not past the 120th.
@@ -205,7 +215,7 @@ sub do_middle {      # the main work
       print $fh $scratch;
 
     } elsif( $type eq 'start' ) {
-      DEBUG > 1 and print "  +$type ",$token->tagname,
+      DEBUG > 1 and print STDERR "  +$type ",$token->tagname,
         " (", map("<$_> ", %{$token->attr_hash}), ")\n";
 
       if( ($tagname = $token->tagname) eq 'Verbatim'
@@ -220,7 +230,7 @@ sub do_middle {      # the main work
           while( $$t =~ m/$/mg ) {
             last if  ++$line_count  > 15; # no point in counting further
           }
-          DEBUG > 3 and print "    verbatim line count: $line_count\n";
+          DEBUG > 3 and print STDERR "    verbatim line count: $line_count\n";
         }
         $self->unget_token($next);
         $self->{'rtfkeep'} = ($line_count > 15) ? '' : '\keepn' ;     
@@ -242,7 +252,7 @@ sub do_middle {      # the main work
           
           if($to_unget[-1]->type eq 'text') {
             if( ($text_count_here += length ${$to_unget[-1]->text_r}) > 150 ){
-              DEBUG > 1 and print "    item-* is too long to be keepn'd.\n";
+              DEBUG > 1 and print STDERR "    item-* is too long to be keepn'd.\n";
               last;
             }
           } elsif (@to_unget > 1 and
@@ -254,13 +264,13 @@ sub do_middle {      # the main work
               $to_unget[-1]->type eq 'start' and
               $to_unget[-1]->tagname eq 'Para';
 
-            DEBUG > 1 and printf "    item-* before %s(%s) %s keepn'd.\n",
+            DEBUG > 1 and printf STDERR "    item-* before %s(%s) %s keepn'd.\n",
               $to_unget[-1]->type,
               $to_unget[-1]->can('tagname') ? $to_unget[-1]->tagname : '',
               $self->{'rtfitemkeepn'} ? "gets" : "doesn't get";
             last;
           } elsif (@to_unget > 40) {
-            DEBUG > 1 and print "    item-* now has too many tokens (",
+            DEBUG > 1 and print STDERR "    item-* now has too many tokens (",
               scalar(@to_unget),
               (DEBUG > 4) ? (q<: >, map($_->dump, @to_unget)) : (),
               ") to be keepn'd.\n";
@@ -275,7 +285,7 @@ sub do_middle {      # the main work
         push @stack, $1;
         push @indent_stack,
          int($token->attr('indent') * 4 * $self->normal_halfpoint_size);
-        DEBUG and print "Indenting over $indent_stack[-1] twips.\n";
+        DEBUG and print STDERR "Indenting over $indent_stack[-1] twips.\n";
         $self->{'rtfindent'} += $indent_stack[-1];
         
       } elsif ($tagname eq 'L') {
@@ -288,7 +298,7 @@ sub do_middle {      # the main work
           $self->unget_token($next);
           next;
         }
-        DEBUG and print "    raw text ", $next->text, "\n";
+        DEBUG and print STDERR "    raw text ", $next->text, "\n";
         printf $fh "\n" . $next->text . "\n";
         next;
       }
@@ -300,14 +310,14 @@ sub do_middle {      # the main work
       if ($tagname eq 'item-number') {
         print $fh $token->attr('number'), ". \n";
       } elsif ($tagname eq 'item-bullet') {
-        print $fh "\\'95 \n";
+        print $fh "\\'", ord("_"), "\n";
         #for funky testing: print $fh '', rtf_esc("\x{4E4B}\x{9053}");
       }
 
     } elsif( $type eq 'end' ) {
-      DEBUG > 1 and print "  -$type ",$token->tagname,"\n";
+      DEBUG > 1 and print STDERR "  -$type ",$token->tagname,"\n";
       if( ($tagname = $token->tagname) =~ m/^over-/s ) {
-        DEBUG and print "Indenting back $indent_stack[-1] twips.\n";
+        DEBUG and print STDERR "Indenting back $indent_stack[-1] twips.\n";
         $self->{'rtfindent'} -= pop @indent_stack;
         pop @stack;
       } elsif( $tagname eq 'Verbatim' or $tagname eq 'VerbatimFormatted') {
@@ -441,7 +451,7 @@ END
 sub doc_start {
   my $self = $_[0];
   my $title = $self->get_short_title();
-  DEBUG and print "Short Title: <$title>\n";
+  DEBUG and print STDERR "Short Title: <$title>\n";
   $title .= ' ' if length $title;
   
   $title =~ s/ *$/ /s;
@@ -454,9 +464,9 @@ sub doc_start {
    if $title =~ m/^\S+$/s and $title =~ m/::/s;
     # catches the most common case, at least
 
-  DEBUG and print "Title0: <$title>\n";
+  DEBUG and print STDERR "Title0: <$title>\n";
   $title = rtf_esc($title);
-  DEBUG and print "Title1: <$title>\n";
+  DEBUG and print STDERR "Title1: <$title>\n";
   $title = '\lang1024\noproof ' . $title
    if $is_obviously_module_name;
 
@@ -483,19 +493,19 @@ sub rtf_esc {
   my $x; # scratch
   if(!defined wantarray) { # void context: alter in-place!
     for(@_) {
-      s/([F\x00-\x1F\-\\\{\}\x7F-\xFF])/$Escape{$1}/g;  # ESCAPER
+      s/([F${cntrl}\-\\\{\}${not_ascii}])/$Escape{$1}/g;  # ESCAPER
       s/([^\x00-\xFF])/'\\uc1\\u'.((ord($1)<32768)?ord($1):(ord($1)-65536)).'?'/eg;
     }
     return;
   } elsif(wantarray) {  # return an array
     return map {; ($x = $_) =~
-      s/([F\x00-\x1F\-\\\{\}\x7F-\xFF])/$Escape{$1}/g;  # ESCAPER
+      s/([F${cntrl}\-\\\{\}${not_ascii}])/$Escape{$1}/g;  # ESCAPER
       $x =~ s/([^\x00-\xFF])/'\\uc1\\u'.((ord($1)<32768)?ord($1):(ord($1)-65536)).'?'/eg;
       $x;
     } @_;
   } else { # return a single scalar
     ($x = ((@_ == 1) ? $_[0] : join '', @_)
-    ) =~ s/([F\x00-\x1F\-\\\{\}\x7F-\xFF])/$Escape{$1}/g;  # ESCAPER
+    ) =~ s/([F${cntrl}\-\\\{\}${not_ascii}])/$Escape{$1}/g;  # ESCAPER
              # Escape \, {, }, -, control chars, and 7f-ff.
     $x =~ s/([^\x00-\xFF])/'\\uc1\\u'.((ord($1)<32768)?ord($1):(ord($1)-65536)).'?'/eg;
     return $x;
@@ -512,19 +522,19 @@ sub rtf_esc_codely {
   my $x; # scratch
   if(!defined wantarray) { # void context: alter in-place!
     for(@_) {
-      s/([F\x00-\x1F\\\{\}\x7F-\xFF])/$Escape{$1}/g;  # ESCAPER
+      s/([F${cntrl}\\\{\}${not_ascii}])/$Escape{$1}/g;  # ESCAPER
       s/([^\x00-\xFF])/'\\uc1\\u'.((ord($1)<32768)?ord($1):(ord($1)-65536)).'?'/eg;
     }
     return;
   } elsif(wantarray) {  # return an array
     return map {; ($x = $_) =~
-      s/([F\x00-\x1F\\\{\}\x7F-\xFF])/$Escape{$1}/g;  # ESCAPER
+      s/([F${cntrl}\\\{\}${not_ascii}])/$Escape{$1}/g;  # ESCAPER
       $x =~ s/([^\x00-\xFF])/'\\uc1\\u'.((ord($1)<32768)?ord($1):(ord($1)-65536)).'?'/eg;
       $x;
     } @_;
   } else { # return a single scalar
     ($x = ((@_ == 1) ? $_[0] : join '', @_)
-    ) =~ s/([F\x00-\x1F\\\{\}\x7F-\xFF])/$Escape{$1}/g;  # ESCAPER
+    ) =~ s/([F${cntrl}\\\{\}${not_ascii}])/$Escape{$1}/g;  # ESCAPER
              # Escape \, {, }, -, control chars, and 7f-ff.
     $x =~ s/([^\x00-\xFF])/'\\uc1\\u'.((ord($1)<32768)?ord($1):(ord($1)-65536)).'?'/eg;
     return $x;
@@ -532,25 +542,30 @@ sub rtf_esc_codely {
 }
 
 %Escape = (
-  map( (chr($_),chr($_)),       # things not apparently needing escaping
+  (($] lt 5.007_003) # Broken for non-ASCII on early Perls
+   ? (map( (chr($_),chr($_)), # things not apparently needing escaping
+       0x20 .. 0x7E ),
+      map( (chr($_),sprintf("\\'%02x", $_)), # apparently escapeworthy things
+       0x00 .. 0x1F, 0x5c, 0x7b, 0x7d, 0x7f .. 0xFF, 0x46))
+   : (map( (chr(utf8::unicode_to_native($_)),chr(utf8::unicode_to_native($_))),
        0x20 .. 0x7E ),
-  map( (chr($_),sprintf("\\'%02x", $_)),    # apparently escapeworthy things
-       0x00 .. 0x1F, 0x5c, 0x7b, 0x7d, 0x7f .. 0xFF, 0x46),
+      map( (chr($_),sprintf("\\'%02x", utf8::unicode_to_native($_))),
+       0x00 .. 0x1F, 0x5c, 0x7b, 0x7d, 0x7f .. 0xFF, 0x46))),
 
   # We get to escape out 'F' so that we can send RTF files thru the mail
   # without the slightest worry that paragraphs beginning with "From"
   # will get munged.
 
   # And some refinements:
-  "\cm"  => "\n",
+  "\r"  => "\n",
   "\cj"  => "\n",
   "\n"   => "\n\\line ",
 
   "\t"   => "\\tab ",     # Tabs (altho theoretically raw \t's are okay)
   "\f"   => "\n\\page\n", # Formfeed
   "-"    => "\\_",        # Turn plaintext '-' into a non-breaking hyphen
-  "\xA0" => "\\~",        # Latin-1 non-breaking space
-  "\xAD" => "\\-",        # Latin-1 soft (optional) hyphen
+  $Pod::Simple::nbsp => "\\~",        # Latin-1 non-breaking space
+  $Pod::Simple::shy => "\\-",        # Latin-1 soft (optional) hyphen
 
   # CRAZY HACKS:
   "\n" => "\\line\n",
@@ -662,8 +677,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/Search.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/Search.pm
index 49df34d3543..d5a4a020811 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/Search.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/Search.pm
@@ -3,7 +3,7 @@ package Pod::Simple::Search;
 use strict;
 
 use vars qw($VERSION $MAX_VERSION_WITHIN $SLEEPY);
-$VERSION = '3.29';   ## Current version of this package
+$VERSION = '3.32';   ## Current version of this package
 
 BEGIN { *DEBUG = sub () {0} unless defined &DEBUG; }   # set DEBUG level
 use Carp ();
@@ -12,12 +12,13 @@ $SLEEPY = 1 if !defined $SLEEPY and $^O =~ /mswin|mac/i;
   # flag to occasionally sleep for $SLEEPY - 1 seconds.
 
 $MAX_VERSION_WITHIN ||= 60;
+my $IS_CASE_INSENSITIVE = -e uc __FILE__ && -e lc __FILE__;
 
 #############################################################################
 
 #use diagnostics;
 use File::Spec ();
-use File::Basename qw( basename );
+use File::Basename qw( basename dirname );
 use Config ();
 use Cwd qw( cwd );
 
@@ -25,6 +26,7 @@ use Cwd qw( cwd );
 __PACKAGE__->_accessorize(  # Make my dumb accessor methods
  'callback', 'progress', 'dir_prefix', 'inc', 'laborious', 'limit_glob',
  'limit_re', 'shadows', 'verbose', 'name2path', 'path2name', 'recurse',
+ 'ciseen'
 );
 #==========================================================================
 
@@ -51,11 +53,11 @@ sub survey {
 
   $self->_expand_inc( \@search_dirs );
 
-
   $self->{'_scan_count'} = 0;
   $self->{'_dirs_visited'} = {};
   $self->path2name( {} );
   $self->name2path( {} );
+  $self->ciseen( {} );
   $self->limit_re( $self->_limit_glob_to_limit_re ) if $self->{'limit_glob'};
   my $cwd = cwd();
   my $verbose  = $self->verbose;
@@ -115,23 +117,33 @@ sub survey {
   }
   $self->progress and $self->progress->done(
    "Noted $$self{'_scan_count'} Pod files total");
+  $self->ciseen( {} );
 
   return unless defined wantarray; # void
   return $self->name2path unless wantarray; # scalar
   return $self->name2path, $self->path2name; # list
 }
 
-
 #==========================================================================
 sub _make_search_callback {
   my $self = $_[0];
 
   # Put the options in variables, for easy access
   my( $laborious, $verbose, $shadows, $limit_re, $callback, $progress,
-      $path2name, $name2path, $recurse) =
+      $path2name, $name2path, $recurse, $ciseen) =
     map scalar($self->$_()),
      qw(laborious verbose shadows limit_re callback progress
-        path2name name2path recurse);
+        path2name name2path recurse ciseen);
+  my ($seen, $remember, $files_for);
+  if ($IS_CASE_INSENSITIVE) {
+      $seen      = sub { $ciseen->{ lc $_[0] } };
+      $remember  = sub { $name2path->{ $_[0] } = $ciseen->{ lc $_[0] } = $_[1]; };
+      $files_for = sub { my $n = lc $_[0]; grep { lc $path2name->{$_} eq $n } %{ $path2name } };
+  } else {
+      $seen      = sub { $name2path->{ $_[0] } };
+      $remember  = sub { $name2path->{ $_[0] } = $_[1] };
+      $files_for = sub { my $n = $_[0]; grep { $path2name->{$_} eq $n } %{ $path2name } };
+  }
 
   my($file, $shortname, $isdir, $modname_bits);
   return sub {
@@ -171,7 +183,6 @@ sub _make_search_callback {
       return; # (not pruning);
     }
 
-      
     # Make sure it's a file even worth even considering
     if($laborious) {
       unless(
@@ -197,31 +208,26 @@ sub _make_search_callback {
       return;
     }
 
-    if( !$shadows and $name2path->{$name} ) {
+    if( !$shadows and $seen->($name) ) {
       $verbose and print "Not worth considering $file ",
         "-- already saw $name as ",
-        join(' ', grep($path2name->{$_} eq $name, keys %$path2name)), "\n";
+        join(' ', $files_for->($name)), "\n";
       return;
     }
-        
+
     # Put off until as late as possible the expense of
     #  actually reading the file:
-    if( m/\.pod\z/is ) {
-      # just assume it has pod, okay?
-    } else {
-      $progress and $progress->reach($self->{'_scan_count'}, "Scanning $file");
-      return unless $self->contains_pod( $file );
-    }
+    $progress and $progress->reach($self->{'_scan_count'}, "Scanning $file");
+    return unless $self->contains_pod( $file );
     ++ $self->{'_scan_count'};
 
     # Or finally take note of it:
-    if( $name2path->{$name} ) {
+    if ( my $prev = $seen->($name)  ) {
       $verbose and print
        "Duplicate POD found (shadowing?): $name ($file)\n",
-       "    Already seen in ",
-       join(' ', grep($path2name->{$_} eq $name, keys %$path2name)), "\n";
+       "    Already seen in ", join(' ', $files_for->($name)), "\n";
     } else {
-      $name2path->{$name} = $file; # Noting just the first occurrence
+      $remember->($name, $file); # Noting just the first occurrence
     }
     $verbose and print "  Noting $name = $file\n";
     if( $callback ) {
@@ -326,7 +332,14 @@ sub _recurse_dir {
       closedir(INDIR);
       return
     }
-    my @items = sort readdir(INDIR);
+
+    # Load all items; put no extension before .pod before .pm before .plx?.
+    my @items = map { $_->[0] }
+      sort { $a->[1] cmp $b->[1] || $b->[2] cmp $a->[2] }
+      map {
+        (my $t = $_) =~ s/[.]p(m|lx?|od)\z//;
+        [$_, $t, lc($1 || 'z') ]
+      } readdir(INDIR);
     closedir(INDIR);
 
     push @$modname_bits, $dir_bare unless $dir_bare eq '';
@@ -469,13 +482,15 @@ sub _expand_inc {
   my($self, $search_dirs) = @_;
   
   return unless $self->{'inc'};
+  my %seen = map { File::Spec->rel2abs($_) => 1 } @{ $search_dirs };
 
   if ($^O eq 'MacOS') {
     push @$search_dirs,
-      grep $_ ne File::Spec->curdir, $self->_mac_whammy(@INC);
+      grep { !$seen{ File::Spec->rel2abs($_) }++ } $self->_mac_whammy(@INC);
   # Any other OSs need custom handling here?
   } else {
-    push @$search_dirs, grep $_ ne File::Spec->curdir,  @INC;
+    push @$search_dirs,
+      grep { !$seen{ File::Spec->rel2abs($_) }++ } @INC;
   }
 
   $self->{'laborious'} = 0;   # Since inc said to use INC
@@ -528,6 +543,14 @@ sub _limit_glob_to_limit_re {
 
 # contribution mostly from Tim Jenness <t.jenness@jach.hawaii.edu>
 
+sub _actual_filenames {
+    my $dir = shift;
+    my $fn = lc shift;
+    opendir my $dh, $dir or return;
+    return map { File::Spec->catdir($dir, $_) }
+        grep { lc $_  eq $fn } readdir $dh;
+}
+
 sub find {
   my($self, $pod, @search_dirs) = @_;
   $self = $self->new unless ref $self; # tolerate being a class method
@@ -544,34 +567,17 @@ sub find {
 
   #@search_dirs = File::Spec->curdir unless @search_dirs;
   
-  if( $self->inc ) {
-    if( $^O eq 'MacOS' ) {
-      push @search_dirs, $self->_mac_whammy(@INC);
-    } else {
-      push @search_dirs,                    @INC;
-    }
-
-    # Add location of pod documentation for perl man pages (eg perlfunc)
-    # This is a pod directory in the private install tree
-    #my $perlpoddir = File::Spec->catdir($Config::Config{'installprivlib'},
-    #					'pod');
-    #push (@search_dirs, $perlpoddir)
-    #  if -d $perlpoddir;
-
-    # Add location of binaries such as pod2text:
-    push @search_dirs, $Config::Config{'scriptdir'};
-     # and if that's undef or q{} or nonexistent, we just ignore it later
-  }
+  $self->_expand_inc(\@search_dirs);
+  # Add location of binaries such as pod2text:
+  push @search_dirs, $Config::Config{'scriptdir'} if $self->inc;
 
   my %seen_dir;
- Dir:
-  foreach my $dir ( @search_dirs ) {
+  while (my $dir = shift @search_dirs ) {
     next unless defined $dir and length $dir;
     next if $seen_dir{$dir};
     $seen_dir{$dir} = 1;
     unless(-d $dir) {
       print "Directory $dir does not exist\n" if $verbose;
-      next Dir;
     }
 
     print "Looking in directory $dir\n" if $verbose;
@@ -580,16 +586,36 @@ sub find {
 
     foreach my $ext ('', '.pod', '.pm', '.pl') {   # possible extensions
       my $fullext = $fullname . $ext;
-      if( -f $fullext  and  $self->contains_pod( $fullext ) ){
+      if ( -f $fullext and $self->contains_pod($fullext) ) {
         print "FOUND: $fullext\n" if $verbose;
+        if (@parts > 1 && lc $parts[0] eq 'pod' && $IS_CASE_INSENSITIVE && $ext eq '.pod') {
+          # Well, this file could be for a program (perldoc) but we actually
+          # want a module (Pod::Perldoc). So see if there is a .pm with the
+          # proper casing.
+          my $subdir = dirname $fullext;
+          unless (grep { $fullext eq $_  } _actual_filenames $subdir, "$parts[-1].pod") {
+            print "# Looking for alternate spelling in $subdir\n" if $verbose;
+            # Try the .pm file.
+            my $pm = $fullname . '.pm';
+            if ( -f $pm and $self->contains_pod($pm) ) {
+              # Prefer the .pm if its case matches.
+              if (grep { $pm eq $_  } _actual_filenames $subdir, "$parts[-1].pm") {
+                print "FOUND: $fullext\n" if $verbose;
+                return $pm;
+              }
+            }
+          }
+        }
         return $fullext;
       }
     }
-    my $subdir = File::Spec->catdir($dir,'pod');
-    if(-d $subdir) {  # slip in the ./pod dir too
-      $verbose and print "Noticing $subdir and stopping there...\n";
-      $dir = $subdir;
-      redo Dir;
+
+    # Case-insensitively Look for ./pod directories and slip them in.
+    for my $subdir ( _actual_filenames($dir, 'pod') ) {
+      if (-d $subdir) {
+        $verbose and print "Noticing $subdir and looking there...\n";
+        unshift @search_dirs, $subdir;
+      }
     }
   }
 
@@ -1005,6 +1031,7 @@ with default attribute values is used.
 
 Returns true if the supplied filename (not POD module) contains some Pod
 documentation.
+
 =head1 SUPPORT
 
 Questions or discussion about POD and Pod::Simple should be sent to the
@@ -1012,8 +1039,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/SimpleTree.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/SimpleTree.pm
index 201e37aac95..436cd25e462 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/SimpleTree.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/SimpleTree.pm
@@ -5,7 +5,7 @@ use strict;
 use Carp ();
 use Pod::Simple ();
 use vars qw( $ATTR_PAD @ISA $VERSION $SORT_ATTRS);
-$VERSION = '3.29';
+$VERSION = '3.32';
 BEGIN {
   @ISA = ('Pod::Simple');
   *DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG;
@@ -18,31 +18,31 @@ __PACKAGE__->_accessorize(
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 sub _handle_element_start { # self, tagname, attrhash
-  DEBUG > 2 and print "Handling $_[1] start-event\n";
+  DEBUG > 2 and print STDERR "Handling $_[1] start-event\n";
   my $x = [$_[1], $_[2]];
   if($_[0]{'_currpos'}) {
     push    @{ $_[0]{'_currpos'}[0] }, $x; # insert in parent's child-list
     unshift @{ $_[0]{'_currpos'} },    $x; # prefix to stack
   } else {
-    DEBUG and print " And oo, it gets to be root!\n";
+    DEBUG and print STDERR " And oo, it gets to be root!\n";
     $_[0]{'_currpos'} = [   $_[0]{'root'} = $x   ];
       # first event!  set to stack, and set as root.
   }
-  DEBUG > 3 and print "Stack is now: ",
+  DEBUG > 3 and print STDERR "Stack is now: ",
     join(">", map $_->[0], @{$_[0]{'_currpos'}}), "\n";
   return;
 }
 
 sub _handle_element_end { # self, tagname
-  DEBUG > 2 and print "Handling $_[1] end-event\n";
+  DEBUG > 2 and print STDERR "Handling $_[1] end-event\n";
   shift @{$_[0]{'_currpos'}};
-  DEBUG > 3 and print "Stack is now: ",
+  DEBUG > 3 and print STDERR "Stack is now: ",
     join(">", map $_->[0], @{$_[0]{'_currpos'}}), "\n";
   return;
 }
 
 sub _handle_text { # self, text
-  DEBUG > 2 and print "Handling $_[1] text-event\n";
+  DEBUG > 2 and print STDERR "Handling $_[1] text-event\n";
   push @{ $_[0]{'_currpos'}[0] }, $_[1];
   return;
 }
@@ -50,7 +50,7 @@ sub _handle_text { # self, text
 
 # A bit of evil from the black box...  please avert your eyes, kind souls.
 sub _traverse_treelet_bit {
-  DEBUG > 2 and print "Handling $_[1] paragraph event\n";
+  DEBUG > 2 and print STDERR "Handling $_[1] paragraph event\n";
   my $self = shift;
   push @{ $self->{'_currpos'}[0] }, [@_];
   return;
@@ -142,8 +142,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/Subclassing.pod b/Master/tlpkg/tlperl/lib/Pod/Simple/Subclassing.pod
index e3f09a34e1b..88f85e86de2 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/Subclassing.pod
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/Subclassing.pod
@@ -46,7 +46,7 @@ anyone has a formatter for that format -- maybe someone cobbled one
 together but just hasn't released it.
 
 B<The first step> in writing a Pod processor is to read L<perlpodspec>,
-which contains notes information on writing a Pod parser (which has been
+which contains information on writing a Pod parser (which has been
 largely taken care of by Pod::Simple), but also a lot of requirements
 and recommendations for writing a formatter.
 
@@ -78,7 +78,7 @@ like L<HTML::TokeParser>'s interface.
 
 L<Pod::Simple::SimpleTree> provides a simple tree interface, rather like
 L<XML::Parser>'s "Tree" interface. Users familiar with XML handling will
-be comfortable with this interface. Users interested in outputting XML, 
+be comfortable with this interface. Users interested in outputting XML,
 should look into the modules that produce an XML representation of the
 Pod stream, notably L<Pod::Simple::XMLOutStream>; you can feed the output
 of such a class to whatever XML parsing system you are most at home with.
@@ -87,8 +87,8 @@ of such a class to whatever XML parsing system you are most at home with.
 
 B<The last step> is to write your code based on how the events (or tokens,
 or tree-nodes, or the XML, or however you're parsing) will map to
-constructs in the output format. Also sure to consider how to escape
-text nodes containing arbitrary text, and also what to do with text
+constructs in the output format. Also be sure to consider how to escape
+text nodes containing arbitrary text, and what to do with text
 nodes that represent preformatted text (from verbatim sections).
 
 
@@ -272,7 +272,7 @@ produces this event structure:
 	crontab(5)
   </L>
 
-In the rare cases where a man page link has a specified, that text appears
+In the rare cases where a man page link has a section specified, that text appears
 in a I<section> attribute. For example, this Pod source:
 
   L<crontab(5)/"ENVIRONMENT">
@@ -461,7 +461,7 @@ will produce this event structure:
 	 et al.
   </head1>
 
-"=head2" thru "=head4" directives are the same, except for the element
+"=head2" through "=head4" directives are the same, except for the element
 names in the event structure.
 
 =item events with an element_name of encoding
@@ -922,8 +922,8 @@ interesting, but this is included for completeness.
 
 =item C<< $parser->whine( I<linenumber>, I<complaint string> ) >>
 
-This notes a problem in the Pod, which will be reported to in the "Pod
-Errors" section of the document and/or send to STDERR, depending on the
+This notes a problem in the Pod, which will be reported in the "Pod
+Errors" section of the document and/or sent to STDERR, depending on the
 values of the attributes C<no_whining>, C<no_errata_section>, and
 C<complain_stderr>.
 
@@ -1021,7 +1021,7 @@ indented text, showing each event on its own line
 L<Pod::Simple::LinkSection> -- class for objects representing the values
 of the TODO and TODO attributes of LE<lt>...E<gt> elements
 
-L<Pod::Escapes> -- the module the Pod::Simple uses for evaluating
+L<Pod::Escapes> -- the module that Pod::Simple uses for evaluating
 EE<lt>...E<gt> content
 
 L<Pod::Simple::Text> -- a simple plaintext formatter for Pod
@@ -1044,8 +1044,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/Text.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/Text.pm
index b3292f8c498..e1c2d0b21f0 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/Text.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/Text.pm
@@ -6,7 +6,7 @@ use Carp ();
 use Pod::Simple::Methody ();
 use Pod::Simple ();
 use vars qw( @ISA $VERSION $FREAKYMODE);
-$VERSION = '3.29';
+$VERSION = '3.32';
 @ISA = ('Pod::Simple::Methody');
 BEGIN { *DEBUG = defined(&Pod::Simple::DEBUG)
           ? \&Pod::Simple::DEBUG
@@ -81,9 +81,9 @@ sub emit_par {
   my $indent = ' ' x ( 2 * $self->{'Indent'} + 4 + ($tweak_indent||0) );
    # Yes, 'STRING' x NEGATIVE gives '', same as 'STRING' x 0
 
-  $self->{'Thispara'} =~ tr{\xAD}{}d if Pod::Simple::ASCII;
+  $self->{'Thispara'} =~ s/$Pod::Simple::shy//g;
   my $out = Text::Wrap::wrap($indent, $indent, $self->{'Thispara'} .= "\n");
-  $out =~ tr{\xA0}{ } if Pod::Simple::ASCII;
+  $out =~ s/$Pod::Simple::nbsp/ /g;
   print {$self->{'output_fh'}} $out, "\n";
   $self->{'Thispara'} = '';
   
@@ -94,10 +94,8 @@ sub emit_par {
 
 sub end_Verbatim  {
   my $self = shift;
-  if(Pod::Simple::ASCII) {
-    $self->{'Thispara'} =~ tr{\xA0}{ };
-    $self->{'Thispara'} =~ tr{\xAD}{}d;
-  }
+  $self->{'Thispara'} =~ s/$Pod::Simple::nbsp/ /g;
+  $self->{'Thispara'} =~ s/$Pod::Simple::shy//g;
 
   my $i = ' ' x ( 2 * $self->{'Indent'} + 4);
   #my $i = ' ' x (4 + $self->{'Indent'});
@@ -149,8 +147,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/TextContent.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/TextContent.pm
index 516f28cb223..e0db26defb4 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/TextContent.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/TextContent.pm
@@ -6,7 +6,7 @@ use strict;
 use Carp ();
 use Pod::Simple ();
 use vars qw( @ISA $VERSION );
-$VERSION = '3.29';
+$VERSION = '3.32';
 @ISA = ('Pod::Simple');
 
 sub new {
@@ -25,10 +25,8 @@ sub _handle_element_start {
 }
 
 sub _handle_text {
-  if( chr(65) eq 'A' ) {     # in ASCIIworld
-    $_[1] =~ tr/\xAD//d;
-    $_[1] =~ tr/\xA0/ /;
-  }
+  $_[1] =~ s/$Pod::Simple::shy//g;
+  $_[1] =~ s/$Pod::Simple::nbsp/ /g;
   print {$_[0]{'output_fh'}} $_[1];
   return;
 }
@@ -75,8 +73,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/TiedOutFH.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/TiedOutFH.pm
index dbf5210388e..6abba4defab 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/TiedOutFH.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/TiedOutFH.pm
@@ -4,7 +4,7 @@ package Pod::Simple::TiedOutFH;
 use Symbol ('gensym');
 use Carp ();
 use vars qw($VERSION );
-$VERSION = '3.29';
+$VERSION = '3.32';
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -20,7 +20,7 @@ sub handle_on { # some horrible frightening things are encapsulated in here
   ;
   $$x = '' unless defined $$x;
   
-  #Pod::Simple::DEBUG and print "New $class handle on $x = \"$$x\"\n";
+  #Pod::Simple::DEBUG and print STDERR "New $class handle on $x = \"$$x\"\n";
   
   my $new = gensym();
   tie *$new, $class, $x;
@@ -39,7 +39,7 @@ sub PRINT {
   my $it = shift;
   foreach my $x (@_) { $$$it .= $x }
 
-  #Pod::Simple::DEBUG > 10 and print " appended to $$it = \"$$$it\"\n";
+  #Pod::Simple::DEBUG > 10 and print STDERR " appended to $$it = \"$$$it\"\n";
 
   return 1;
 }
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/Transcode.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/Transcode.pm
index 9c60f05d021..ae9298ef311 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/Transcode.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/Transcode.pm
@@ -1,8 +1,9 @@
 
 require 5;
 package Pod::Simple::Transcode;
-use vars qw($VERSION );
-$VERSION = '3.29';
+use strict;
+use vars qw($VERSION @ISA);
+$VERSION = '3.32';
 
 BEGIN {
   if(defined &DEBUG) {;} # Okay
@@ -16,12 +17,12 @@ foreach my $class (
   '',
 ) {
   $class or die "Couldn't load any encoding classes";
-  DEBUG and print "About to try loading $class...\n";
+  DEBUG and print STDERR "About to try loading $class...\n";
   eval "require $class;";
   if($@) {
-    DEBUG and print "Couldn't load $class: $@\n";
+    DEBUG and print STDERR "Couldn't load $class: $@\n";
   } else {
-    DEBUG and print "OK, loaded $class.\n";
+    DEBUG and print STDERR "OK, loaded $class.\n";
     @ISA = ($class);
     last;
   }
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/TranscodeDumb.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/TranscodeDumb.pm
index badb9a0d439..80b828a753f 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/TranscodeDumb.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/TranscodeDumb.pm
@@ -5,7 +5,7 @@ require 5;
 package Pod::Simple::TranscodeDumb;
 use strict;
 use vars qw($VERSION %Supported);
-$VERSION = '3.29';
+$VERSION = '3.32';
 # This module basically pretends it knows how to transcode, except
 #  only for null-transcodings!  We use this when Encode isn't
 #  available.
@@ -14,6 +14,7 @@ $VERSION = '3.29';
   'ascii'       => 1,
   'ascii-ctrl'  => 1,
   'iso-8859-1'  => 1,
+  'cp1252'      => 1,
   'null'        => 1,
   'latin1'      => 1,
   'latin-1'     => 1,
@@ -36,24 +37,46 @@ sub encmodver {
 }
 
 sub make_transcoder {
-  my($e) = $_[1];
-  die "WHAT ENCODING!?!?" unless $e;
-  my $x;
-  return sub {;
-    #foreach $x (@_) {
-    #  if(Pod::Simple::ASCII and !Pod::Simple::UNICODE and $] > 5.005) {
-    #    # We're in horrible gimp territory, so we need to knock out
-    #    # all the highbit things
-    #    $x =
-    #      pack 'C*',
-    #      map {; ($_ < 128) ? $_ : 0x7e }
-    #      unpack "C*",
-    #      $x
-    #    ;
-    #  }
-    #}
-    #
-    #return;
+    my ($e) = $_[1];
+    die "WHAT ENCODING!?!?" unless $e;
+    # No-op for all but CP1252.
+    return sub {;} if $e !~ /^cp-?1252$/i;
+
+    # Replace CP1252 nerbles with their ASCII equivalents.
+    return sub {
+        # Copied from Encode::ZapCP1252.
+        my %ascii_for = (
+            # http://en.wikipedia.org/wiki/Windows-1252
+            "\x80" => 'e',    # EURO SIGN
+            "\x82" => ',',    # SINGLE LOW-9 QUOTATION MARK
+            "\x83" => 'f',    # LATIN SMALL LETTER F WITH HOOK
+            "\x84" => ',,',   # DOUBLE LOW-9 QUOTATION MARK
+            "\x85" => '...',  # HORIZONTAL ELLIPSIS
+            "\x86" => '+',    # DAGGER
+            "\x87" => '++',   # DOUBLE DAGGER
+            "\x88" => '^',    # MODIFIER LETTER CIRCUMFLEX ACCENT
+            "\x89" => '%',    # PER MILLE SIGN
+            "\x8a" => 'S',    # LATIN CAPITAL LETTER S WITH CARON
+            "\x8b" => '<',    # SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+            "\x8c" => 'OE',   # LATIN CAPITAL LIGATURE OE
+            "\x8e" => 'Z',    # LATIN CAPITAL LETTER Z WITH CARON
+            "\x91" => "'",    # LEFT SINGLE QUOTATION MARK
+            "\x92" => "'",    # RIGHT SINGLE QUOTATION MARK
+            "\x93" => '"',    # LEFT DOUBLE QUOTATION MARK
+            "\x94" => '"',    # RIGHT DOUBLE QUOTATION MARK
+            "\x95" => '*',    # BULLET
+            "\x96" => '-',    # EN DASH
+            "\x97" => '--',   # EM DASH
+            "\x98" => '~',    # SMALL TILDE
+            "\x99" => '(tm)', # TRADE MARK SIGN
+            "\x9a" => 's',    # LATIN SMALL LETTER S WITH CARON
+            "\x9b" => '>',    # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+            "\x9c" => 'oe',   # LATIN SMALL LIGATURE OE
+            "\x9e" => 'z',    # LATIN SMALL LETTER Z WITH CARON
+            "\x9f" => 'Y',    # LATIN CAPITAL LETTER Y WITH DIAERESIS
+        );
+
+        s{([\x80-\x9f])}{$ascii_for{$1} || $1}emxsg for @_;
   };
 }
 
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/TranscodeSmart.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/TranscodeSmart.pm
index 6735b9979b3..335654998ec 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/TranscodeSmart.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/TranscodeSmart.pm
@@ -9,7 +9,7 @@ use strict;
 use Pod::Simple;
 require Encode;
 use vars qw($VERSION );
-$VERSION = '3.29';
+$VERSION = '3.32';
 
 sub is_dumb  {0}
 sub is_smart {1}
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/XHTML.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/XHTML.pm
index 3a2d2094c68..67b259cb98f 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/XHTML.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/XHTML.pm
@@ -38,14 +38,14 @@ you can prevent high-bit characters from being encoded as HTML entities and
 declare the output character set as UTF-8 before parsing, like so:
 
   $psx->html_charset('UTF-8');
-  $psx->html_encode_chars('&<>">');
+  $psx->html_encode_chars(q{&<>'"});
 
 =cut
 
 package Pod::Simple::XHTML;
 use strict;
 use vars qw( $VERSION @ISA $HAS_HTML_ENTITIES );
-$VERSION = '3.29';
+$VERSION = '3.32';
 use Pod::Simple::Methody ();
 @ISA = ('Pod::Simple::Methody');
 
@@ -832,8 +832,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Simple/XMLOutStream.pm b/Master/tlpkg/tlperl/lib/Pod/Simple/XMLOutStream.pm
index a0f50a20fb2..03f2930e967 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Simple/XMLOutStream.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Simple/XMLOutStream.pm
@@ -5,7 +5,7 @@ use strict;
 use Carp ();
 use Pod::Simple ();
 use vars qw( $ATTR_PAD @ISA $VERSION $SORT_ATTRS);
-$VERSION = '3.29';
+$VERSION = '3.32';
 BEGIN {
   @ISA = ('Pod::Simple');
   *DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG;
@@ -31,7 +31,7 @@ sub _handle_element_start {
   # ($self, $element_name, $attr_hash_r)
   my $fh = $_[0]{'output_fh'};
   my($key, $value);
-  DEBUG and print "++ $_[1]\n";
+  DEBUG and print STDERR "++ $_[1]\n";
   print $fh "<", $_[1];
   if($SORT_ATTRS) {
     foreach my $key (sort keys %{$_[2]}) {
@@ -55,7 +55,7 @@ sub _handle_element_start {
 }
 
 sub _handle_text {
-  DEBUG and print "== \"$_[1]\"\n";
+  DEBUG and print STDERR "== \"$_[1]\"\n";
   if(length $_[1]) {
     my $text = $_[1];
     _xml_escape($text);
@@ -65,7 +65,7 @@ sub _handle_text {
 }
 
 sub _handle_element_end {
-  DEBUG and print "-- $_[1]\n";
+  DEBUG and print STDERR "-- $_[1]\n";
   print {$_[0]{'output_fh'}} "</", $_[1], ">";
   return;
 }
@@ -76,11 +76,13 @@ sub _handle_element_end {
 sub _xml_escape {
   foreach my $x (@_) {
     # Escape things very cautiously:
-    $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg;
+    if ($] ge 5.007_003) {
+      $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(utf8::native_to_unicode(ord($1))).';'/eg;
+    } else { # Is broken for non-ASCII platforms on early perls
+      $x =~ s/([^-\n\t !\#\$\%\(\)\*\+,\.\~\/\:\;=\?\@\[\\\]\^_\`\{\|\}abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789])/'&#'.(ord($1)).';'/eg;
+    }
     # Yes, stipulate the list without a range, so that this can work right on
     #  all charsets that this module happens to run under.
-    # Altho, hmm, what about that ord?  Presumably that won't work right
-    #  under non-ASCII charsets.  Something should be done about that.
   }
   return;
 }
@@ -136,8 +138,8 @@ pod-people@perl.org mail list. Send an empty email to
 pod-people-subscribe@perl.org to subscribe.
 
 This module is managed in an open GitHub repository,
-L<https://github.com/theory/pod-simple/>. Feel free to fork and contribute, or
-to clone L<git://github.com/theory/pod-simple.git> and send patches!
+L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
+to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
 Patches against Pod::Simple are welcome. Please send bug reports to
 <bug-pod-simple@rt.cpan.org>.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Text.pm b/Master/tlpkg/tlperl/lib/Pod/Text.pm
index 87f9e816d00..e141da2fd6d 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Text.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Text.pm
@@ -1,4 +1,4 @@
-# Pod::Text -- Convert POD data to formatted ASCII text.
+# Pod::Text -- Convert POD data to formatted text.
 #
 # This module converts POD to formatted text.  It replaces the old Pod::Text
 # module that came with versions of Perl prior to 5.6.0 and attempts to match
@@ -11,8 +11,8 @@
 # me any patches at the address above in addition to sending them to the
 # standard Perl mailing lists.
 #
-# Copyright 1999, 2000, 2001, 2002, 2004, 2006, 2008, 2009, 2012, 2013
-#     Russ Allbery <rra@stanford.edu>
+# Copyright 1999, 2000, 2001, 2002, 2004, 2006, 2008, 2009, 2012, 2013, 2014,
+#     2015 Russ Allbery <rra@cpan.org>
 #
 # This program is free software; you may redistribute it and/or modify it
 # under the same terms as Perl itself.
@@ -23,9 +23,10 @@
 
 package Pod::Text;
 
-require 5.004;
-
+use 5.006;
 use strict;
+use warnings;
+
 use vars qw(@ISA @EXPORT %ESCAPES $VERSION);
 
 use Carp qw(carp croak);
@@ -38,7 +39,7 @@ use Pod::Simple ();
 # We have to export pod2text for backward compatibility.
 @EXPORT = qw(pod2text);
 
-$VERSION = '3.18';
+$VERSION = '4.07';
 
 ##############################################################################
 # Initialization
@@ -126,10 +127,10 @@ sub new {
         $$self{LQUOTE} = $$self{RQUOTE} = '';
     } elsif (length ($$self{opt_quotes}) == 1) {
         $$self{LQUOTE} = $$self{RQUOTE} = $$self{opt_quotes};
-    } elsif ($$self{opt_quotes} =~ /^(.)(.)$/
-             || $$self{opt_quotes} =~ /^(..)(..)$/) {
-        $$self{LQUOTE} = $1;
-        $$self{RQUOTE} = $2;
+    } elsif (length ($$self{opt_quotes}) % 2 == 0) {
+        my $length = length ($$self{opt_quotes}) / 2;
+        $$self{LQUOTE} = substr ($$self{opt_quotes}, 0, $length);
+        $$self{RQUOTE} = substr ($$self{opt_quotes}, $length);
     } else {
         croak qq(Invalid quote specification "$$self{opt_quotes}");
     }
@@ -273,12 +274,12 @@ sub output {
     my ($self, @text) = @_;
     my $text = join ('', @text);
     $text =~ tr/\240\255/ /d;
-    unless ($$self{opt_utf8} || $$self{CHECKED_ENCODING}) {
+    unless ($$self{opt_utf8}) {
         my $encoding = $$self{encoding} || '';
-        if ($encoding) {
+        if ($encoding && $encoding ne $$self{ENCODING}) {
+            $$self{ENCODING} = $encoding;
             eval { binmode ($$self{output_fh}, ":encoding($encoding)") };
         }
-        $$self{CHECKED_ENCODING} = 1;
     }
     if ($$self{ENCODE}) {
         print { $$self{output_fh} } encode ('UTF-8', $text);
@@ -312,7 +313,7 @@ sub start_document {
     $$self{PENDING} = [[]];     # Pending output.
 
     # We have to redo encoding handling for each document.
-    delete $$self{CHECKED_ENCODING};
+    $$self{ENCODING} = '';
 
     # When UTF-8 output is set, check whether our output file handle already
     # has a PerlIO encoding layer set.  If it does not, we'll need to encode
@@ -326,6 +327,7 @@ sub start_document {
             my $flag = (PerlIO::get_layers ($$self{output_fh}, @options))[-1];
             if ($flag & PerlIO::F_UTF8 ()) {
                 $$self{ENCODE} = 0;
+                $$self{ENCODING} = 'UTF-8';
             }
         };
     }
@@ -759,7 +761,7 @@ parsers
 
 =head1 NAME
 
-Pod::Text - Convert POD data to formatted ASCII text
+Pod::Text - Convert POD data to formatted text
 
 =head1 SYNOPSIS
 
@@ -774,10 +776,10 @@ Pod::Text - Convert POD data to formatted ASCII text
 
 =head1 DESCRIPTION
 
-Pod::Text is a module that can convert documentation in the POD format (the
-preferred language for documenting Perl) into formatted ASCII.  It uses no
-special formatting controls or codes whatsoever, and its output is therefore
-suitable for nearly any device.
+Pod::Text is a module that can convert documentation in the POD format
+(the preferred language for documenting Perl) into formatted text.  It
+uses no special formatting controls or codes whatsoever, and its output is
+therefore suitable for nearly any device.
 
 As a derived class from Pod::Simple, Pod::Text supports the same methods and
 interfaces.  See L<Pod::Simple> for all the details; briefly, one creates a
@@ -850,10 +852,9 @@ important.
 =item quotes
 
 Sets the quote marks used to surround CE<lt>> text.  If the value is a
-single character, it is used as both the left and right quote; if it is two
-characters, the first character is used as the left quote and the second as
-the right quoted; and if it is four characters, the first two are used as
-the left quote and the second two as the right quote.
+single character, it is used as both the left and right quote.  Otherwise,
+it is split in half, and the first half of the string is used as the left
+quote and the second is used as the right quote.
 
 This may also be set to the special value C<none>, in which case no quote
 marks are added around CE<lt>> text.
@@ -880,10 +881,10 @@ doesn't encode its output).  If this option is given, the output encoding
 is forced to UTF-8.
 
 Be aware that, when using this option, the input encoding of your POD
-source must be properly declared unless it is US-ASCII or Latin-1.  POD
-input without an C<=encoding> command will be assumed to be in Latin-1,
-and if it's actually in UTF-8, the output will be double-encoded.  See
-L<perlpod(1)> for more information on the C<=encoding> command.
+source should be properly declared unless it's US-ASCII.  Pod::Simple will
+attempt to guess the encoding and may be successful if it's Latin-1 or
+UTF-8, but it will produce warnings.  Use the C<=encoding> command to
+declare the encoding.  See L<perlpod(1)> for more information.
 
 =item width
 
@@ -933,8 +934,8 @@ and the input file it was given could not be opened.
 =item Invalid quote specification "%s"
 
 (F) The quote specification given (the C<quotes> option to the
-constructor) was invalid.  A quote specification must be one, two, or four
-characters long.
+constructor) was invalid.  A quote specification must be either one
+character long or an even number (greater than one) characters long.
 
 =item POD document had syntax errors
 
@@ -989,7 +990,7 @@ Perl core distribution as of 5.6.0.
 
 =head1 AUTHOR
 
-Russ Allbery <rra@stanford.edu>, based I<very> heavily on the original
+Russ Allbery <rra@cpan.org>, based I<very> heavily on the original
 Pod::Text by Tom Christiansen <tchrist@mox.perl.com> and its conversion to
 Pod::Parser by Brad Appleton <bradapp@enteract.com>.  Sean Burke's initial
 conversion of Pod::Man to use Pod::Simple provided much-needed guidance on
@@ -997,8 +998,8 @@ how to use Pod::Simple.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 1999, 2000, 2001, 2002, 2004, 2006, 2008, 2009, 2012, 2013 Russ
-Allbery <rra@stanford.edu>.
+Copyright 1999, 2000, 2001, 2002, 2004, 2006, 2008, 2009, 2012, 2013, 2014,
+2015 Russ Allbery <rra@cpan.org>
 
 This program is free software; you may redistribute it and/or modify it
 under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Text/Color.pm b/Master/tlpkg/tlperl/lib/Pod/Text/Color.pm
index a114ed937f0..b67742e32c3 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Text/Color.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Text/Color.pm
@@ -4,7 +4,8 @@
 # better use of color, take options changing what colors are used for what
 # text, and the like.
 #
-# Copyright 1999, 2001, 2004, 2006, 2008, 2009 Russ Allbery <rra@stanford.edu>
+# Copyright 1999, 2001, 2004, 2006, 2008, 2009, 2014
+#     Russ Allbery <rra@cpan.org>
 #
 # This program is free software; you may redistribute it and/or modify it
 # under the same terms as Perl itself.
@@ -15,17 +16,18 @@
 
 package Pod::Text::Color;
 
-require 5.004;
+use 5.006;
+use strict;
+use warnings;
 
 use Pod::Text ();
 use Term::ANSIColor qw(colored);
 
-use strict;
 use vars qw(@ISA $VERSION);
 
 @ISA = qw(Pod::Text);
 
-$VERSION = '2.07';
+$VERSION = '4.07';
 
 ##############################################################################
 # Overrides
@@ -143,11 +145,11 @@ Perl core distribution as of 5.6.0.
 
 =head1 AUTHOR
 
-Russ Allbery <rra@stanford.edu>.
+Russ Allbery <rra@cpan.org>.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 1999, 2001, 2004, 2006, 2008, 2009 Russ Allbery <rra@stanford.edu>.
+Copyright 1999, 2001, 2004, 2006, 2008, 2009 Russ Allbery <rra@cpan.org>.
 
 This program is free software; you may redistribute it and/or modify it
 under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Text/Overstrike.pm b/Master/tlpkg/tlperl/lib/Pod/Text/Overstrike.pm
index f5dce0230f8..1592026e9f7 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Text/Overstrike.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Text/Overstrike.pm
@@ -12,9 +12,9 @@
 # independent.
 #
 # Created by Joe Smith <Joe.Smith@inwap.com> 30-Nov-2000
-#   (based on Pod::Text::Color by Russ Allbery <rra@stanford.edu>)
+#   (based on Pod::Text::Color by Russ Allbery <rra@cpan.org>)
 # Copyright 2000 Joe Smith <Joe.Smith@inwap.com>.
-# Copyright 2001, 2004, 2008 Russ Allbery <rra@stanford.edu>.
+# Copyright 2001, 2004, 2008, 2014 Russ Allbery <rra@cpan.org>.
 #
 # This program is free software; you may redistribute it and/or modify it
 # under the same terms as Perl itself.
@@ -25,16 +25,17 @@
 
 package Pod::Text::Overstrike;
 
-require 5.004;
-
-use Pod::Text ();
-
+use 5.006;
 use strict;
+use warnings;
+
 use vars qw(@ISA $VERSION);
 
+use Pod::Text ();
+
 @ISA = qw(Pod::Text);
 
-$VERSION = '2.05';
+$VERSION = '4.07';
 
 ##############################################################################
 # Overrides
@@ -195,12 +196,12 @@ Perl core distribution as of 5.6.0.
 =head1 AUTHOR
 
 Joe Smith <Joe.Smith@inwap.com>, using the framework created by Russ Allbery
-<rra@stanford.edu>.
+<rra@cpan.org>.
 
 =head1 COPYRIGHT AND LICENSE
 
 Copyright 2000 by Joe Smith <Joe.Smith@inwap.com>.
-Copyright 2001, 2004, 2008 by Russ Allbery <rra@stanford.edu>.
+Copyright 2001, 2004, 2008 by Russ Allbery <rra@cpan.org>.
 
 This program is free software; you may redistribute it and/or modify it
 under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Text/Termcap.pm b/Master/tlpkg/tlperl/lib/Pod/Text/Termcap.pm
index 18ba7b20ff5..d533e76ddde 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Text/Termcap.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Text/Termcap.pm
@@ -4,8 +4,8 @@
 # output the right termcap escape sequences for formatted text on the current
 # terminal type.
 #
-# Copyright 1999, 2001, 2002, 2004, 2006, 2008, 2009
-#     Russ Allbery <rra@stanford.edu>
+# Copyright 1999, 2001, 2002, 2004, 2006, 2008, 2009, 2014, 2015
+#     Russ Allbery <rra@cpan.org>
 #
 # This program is free software; you may redistribute it and/or modify it
 # under the same terms as Perl itself.
@@ -16,18 +16,19 @@
 
 package Pod::Text::Termcap;
 
-require 5.004;
+use 5.006;
+use strict;
+use warnings;
 
 use Pod::Text ();
 use POSIX ();
 use Term::Cap;
 
-use strict;
 use vars qw(@ISA $VERSION);
 
 @ISA = qw(Pod::Text);
 
-$VERSION = '2.08';
+$VERSION = '4.07';
 
 ##############################################################################
 # Overrides
@@ -42,9 +43,11 @@ sub new {
 
     # $ENV{HOME} is usually not set on Windows.  The default Term::Cap path
     # may not work on Solaris.
-    my $home = exists $ENV{HOME} ? "$ENV{HOME}/.termcap:" : '';
-    $ENV{TERMPATH} = $home . '/etc/termcap:/usr/share/misc/termcap'
-                           . ':/usr/share/lib/termcap';
+    unless (exists $ENV{TERMPATH}) {
+        my $home = exists $ENV{HOME} ? "$ENV{HOME}/.termcap:" : '';
+        $ENV{TERMPATH} =
+          "${home}/etc/termcap:/usr/share/misc/termcap:/usr/share/lib/termcap";
+    }
 
     # Fall back on a hard-coded terminal speed if POSIX::Termios isn't
     # available (such as on VMS).
@@ -144,7 +147,7 @@ __END__
 Pod::Text::Termcap - Convert POD data to ASCII text with format escapes
 
 =for stopwords
-ECMA-48 VT100 Allbery
+ECMA-48 VT100 Allbery Solaris TERMPATH
 
 =head1 SYNOPSIS
 
@@ -164,6 +167,18 @@ text using the correct termcap escape sequences for the current terminal.
 Apart from the format codes, it in all ways functions like Pod::Text.  See
 L<Pod::Text> for details and available options.
 
+=head1 ENVIRONMENT
+
+This module sets the TERMPATH environment variable globally to:
+
+    $HOME/.termcap:/etc/termcap:/usr/share/misc/termcap:/usr/share/lib/termcap
+
+if it isn't already set.  (The first entry is omitted if the HOME
+environment variable isn't set.)  This is a (very old) workaround for
+problems finding termcap information on older versions of Solaris, and is
+not good module behavior.  Please do not rely on this behavior; it may be
+dropped in a future release.
+
 =head1 NOTES
 
 This module uses Term::Cap to retrieve the formatting escape sequences for
@@ -182,12 +197,12 @@ Perl core distribution as of 5.6.0.
 
 =head1 AUTHOR
 
-Russ Allbery <rra@stanford.edu>.
+Russ Allbery <rra@cpan.org>.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 1999, 2001, 2002, 2004, 2006, 2008, 2009 Russ Allbery
-<rra@stanford.edu>.
+Copyright 1999, 2001, 2002, 2004, 2006, 2008, 2009, 2014, 2015 Russ Allbery
+<rra@cpan.org>
 
 This program is free software; you may redistribute it and/or modify it
 under the same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/Pod/Usage.pm b/Master/tlpkg/tlperl/lib/Pod/Usage.pm
index bb8e60f05b0..cc4f2e1e4fd 100644
--- a/Master/tlpkg/tlperl/lib/Pod/Usage.pm
+++ b/Master/tlpkg/tlperl/lib/Pod/Usage.pm
@@ -1,8 +1,9 @@
 #############################################################################
 # Pod/Usage.pm -- print usage messages for the running script.
 #
-# Copyright (C) 1996-2000 by Bradford Appleton. All rights reserved.
-# This file is part of "PodParser". PodParser is free software;
+# Copyright (c) 1996-2000 by Bradford Appleton. All rights reserved.
+# Copyright (c) 2001-2016 by Marek Rouchal.
+# This file is part of "Pod-Usage". Pod-Usage is free software;
 # you can redistribute it and/or modify it under the same terms
 # as Perl itself.
 #############################################################################
@@ -11,7 +12,7 @@ package Pod::Usage;
 use strict;
 
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION = '1.64';  ## Current version of this package
+$VERSION = '1.68';  ## Current version of this package
 require  5.006;    ## requires this Perl version or later
 
 #use diagnostics;
@@ -128,7 +129,8 @@ sub pod2usage {
     }
 
     ## Check for perldoc
-    my $progpath = File::Spec->catfile($Config{scriptdirexp} 
+    my $progpath = $opts{'-perldoc'} ? $opts{'-perldoc'} :
+        File::Spec->catfile($Config{scriptdirexp} 
 	|| $Config{scriptdir}, 'perldoc');
 
     my $version = sprintf("%vd",$^V);
@@ -148,7 +150,15 @@ sub pod2usage {
        if(defined $opts{-input} && $opts{-input} =~ /^\s*(\S.*?)\s*$/) {
          # the perldocs back to 5.005 should all have -F
 	 # without -F there are warnings in -T scripts
-         system($progpath, '-F', $1);
+	 my $f = $1;
+         my @perldoc_cmd = ($progpath);
+	 if ($opts{'-perldocopt'}) {
+           $opts{'-perldocopt'} =~ s/^\s+|\s+$//g;
+	   push @perldoc_cmd, split(/\s+/, $opts{'-perldocopt'});
+	 }
+	 push @perldoc_cmd, ('-F', $f);
+         unshift @perldoc_cmd, $opts{'-perlcmd'} if $opts{'-perlcmd'};
+         system(@perldoc_cmd);
          if($?) {
            # RT16091: fall back to more if perldoc failed
            system(($Config{pager} || $ENV{PAGER} || '/bin/more'), $1);
@@ -263,10 +273,13 @@ sub select {
 
 # Override Pod::Text->seq_i to return just "arg", not "*arg*".
 sub seq_i { return $_[1] }
+# Override Pod::Text->cmd_i to return just "arg", not "*arg*".
+# newer version based on Pod::Simple
+sub cmd_i { return $_[2] }
 
 # This overrides the Pod::Text method to do something very akin to what
 # Pod::Select did as well as the work done below by preprocess_paragraph.
-# Note that the below is very, very specific to Pod::Text.
+# Note that the below is very, very specific to Pod::Text and Pod::Simple.
 sub _handle_element_end {
     my ($self, $element) = @_;
     if ($element eq 'head1') {
@@ -278,6 +291,8 @@ sub _handle_element_end {
         my $idx = $1 - 1;
         $self->{USAGE_HEADINGS} = [] unless($self->{USAGE_HEADINGS});
         $self->{USAGE_HEADINGS}->[$idx] = $$self{PENDING}[-1][1];
+        # we have to get rid of the lower headings
+        splice(@{$self->{USAGE_HEADINGS}},$idx+1);
     }
     if ($element =~ /^head\d+$/) {
         $$self{USAGE_SKIPPING} = 1;
@@ -312,7 +327,7 @@ sub _handle_element_end {
             $$self{PENDING}[-1][1] = $_;
         }
     }
-    if ($$self{USAGE_SKIPPING} && $element !~ m/^over-/) {
+    if ($$self{USAGE_SKIPPING} && $element !~ m/^over-|^[BCFILSZ]$/) {
         pop @{ $$self{PENDING} };
     } else {
         $self->SUPER::_handle_element_end($element);
@@ -383,10 +398,15 @@ Pod::Usage - print a usage message from embedded pod documentation
   pod2usage(   -msg     => $message_text ,
                -exitval => $exit_status  ,  
                -verbose => $verbose_level,  
-               -output  => $filehandle   );
+               -output  => $filehandle );
 
   pod2usage(   -verbose => 2,
-               -noperldoc => 1  )
+               -noperldoc => 1  );
+
+  pod2usage(   -verbose => 2,
+               -perlcmd => $path_to_perl,
+               -perldoc => $path_to_perldoc,
+               -perldocopt => $perldoc_options );
 
 =head1 ARGUMENTS
 
@@ -418,49 +438,73 @@ keys:
 
 =over 4
 
-=item C<-message>
+=item C<-message> I<string>
 
-=item C<-msg>
+=item C<-msg> I<string>
 
 The text of a message to print immediately prior to printing the
 program's usage message. 
 
-=item C<-exitval>
+=item C<-exitval> I<value>
 
 The desired exit status to pass to the B<exit()> function.
 This should be an integer, or else the string "NOEXIT" to
 indicate that control should simply be returned without
 terminating the invoking process.
 
-=item C<-verbose>
+=item C<-verbose> I<value>
 
-The desired level of "verboseness" to use when printing the usage
-message. If the corresponding value is 0, then only the "SYNOPSIS"
-section of the pod documentation is printed. If the corresponding value
-is 1, then the "SYNOPSIS" section, along with any section entitled
-"OPTIONS", "ARGUMENTS", or "OPTIONS AND ARGUMENTS" is printed.  If the
-corresponding value is 2 or more then the entire manpage is printed.
+The desired level of "verboseness" to use when printing the usage message.
+If the value is 0, then only the "SYNOPSIS" section of the pod documentation
+is printed. If the value is 1, then the "SYNOPSIS" section, along with any
+section entitled "OPTIONS", "ARGUMENTS", or "OPTIONS AND ARGUMENTS" is
+printed. If the corresponding value is 2 or more then the entire manpage is
+printed, using L<perldoc> if available; otherwise L<Pod::Text> is used for
+the formatting. For better readability, the all-capital headings are
+downcased, e.g. C<SYNOPSIS> =E<gt> C<Synopsis>.
 
 The special verbosity level 99 requires to also specify the -sections
 parameter; then these sections are extracted and printed.
 
-=item C<-sections>
+=item C<-sections> I<spec>
+
+There are two ways to specify the selection. Either a string (scalar) 
+representing a selection regexp for sections to be printed when -verbose
+is set to 99, e.g.
+
+  "NAME|SYNOPSIS|DESCRIPTION|VERSION"
+
+With the above regexp all content following (and including) any of the
+given C<=head1> headings will be shown. It is possible to restrict the 
+output to particular subsections only, e.g.:
 
-A string representing a selection list for sections to be printed
-when -verbose is set to 99, e.g. C<"NAME|SYNOPSIS|DESCRIPTION|VERSION">.
+  "DESCRIPTION/Algorithm"
+
+This will output only the C<=head2 Algorithm> heading and content within
+the C<=head1 DESCRIPTION> section. The regexp binding is stronger than the
+section separator, such that e.g.:
+
+  "DESCRIPTION|OPTIONS|ENVIORNMENT/Caveats"
+
+will print any C<=head2 Caveats> section (only) within any of the three
+C<=head1> sections.
 
 Alternatively, an array reference of section specifications can be used:
 
-  pod2usage(-verbose => 99, 
-            -sections => [ qw(fred fred/subsection) ] );
+  pod2usage(-verbose => 99, -sections => [
+    qw(DESCRIPTION DESCRIPTION/Introduction) ] );
+
+This will print only the content of C<=head1 DESCRIPTION> and the 
+C<=head2 Introduction> sections, but no other C<=head2>, and no other
+C<=head1> either.
 
-=item C<-output>
+=item C<-output> I<handle>
 
 A reference to a filehandle, or the pathname of a file to which the
 usage message should be written. The default is C<\*STDERR> unless the
 exit value is less than 2 (in which case the default is C<\*STDOUT>).
 
-=item C<-input>
+=item C<-input> I<handle>
 
 A reference to a filehandle, or the pathname of a file from which the
 invoking script's pod documentation should be read.  It defaults to the
@@ -472,7 +516,7 @@ that module's POD, you can use this:
   use Pod::Find qw(pod_where);
   pod2usage( -input => pod_where({-inc => 1}, __PACKAGE__) );
 
-=item C<-pathlist>
+=item C<-pathlist> I<string>
 
 A list of directory paths. If the input file does not exist, then it
 will be searched for in the given directory list (in the order the
@@ -490,17 +534,43 @@ with L<PAR>. The -noperldoc option suppresses the external call to
 L<perldoc> and uses the simple text formatter (L<Pod::Text>) to 
 output the POD.
 
+=item C<-perlcmd>
+
+By default, Pod::Usage will call L<perldoc> when -verbose >= 2 is
+specified. In case of special or unusual Perl installations,
+the -perlcmd option may be used to supply the path to a L<perl> executable
+which should run L<perldoc>.
+
+=item C<-perldoc> I<path-to-perldoc>
+
+By default, Pod::Usage will call L<perldoc> when -verbose >= 2 is
+specified. In case L<perldoc> is not installed where the L<perl> interpreter
+thinks it is (see L<Config>), the -perldoc option may be used to supply
+the correct path to L<perldoc>.
+
+=item C<-perldocopt> I<string>
+
+By default, Pod::Usage will call L<perldoc> when -verbose >= 2 is specified.
+The -perldocopt option may be used to supply options to L<perldoc>. The
+string may contain several, space-separated options.
+
 =back
 
 =head2 Formatting base class
 
-The default text formatter is L<Pod::Text>.  The base class for Pod::Usage can
+The default text formatter is L<Pod::Text>. The base class for Pod::Usage can
 be defined by pre-setting C<$Pod::Usage::Formatter> I<before>
 loading Pod::Usage, e.g.:
 
     BEGIN { $Pod::Usage::Formatter = 'Pod::Text::Termcap'; }
     use Pod::Usage qw(pod2usage);
 
+Pod::Usage uses L<Pod::Simple>'s _handle_element_end() method to implement
+the section selection, and in case of verbosity < 2 it down-cases the
+all-caps headings to first capital letter and rest lowercase, and adds
+a colon/newline at the end of the headings, for better readability. Same for
+verbosity = 99.
+
 =head2 Pass-through options
 
 The following options are passed through to the underlying text formatter.
diff --git a/Master/tlpkg/tlperl/lib/SDBM_File.pm b/Master/tlpkg/tlperl/lib/SDBM_File.pm
index 707a9f8bf29..5df90857606 100644
--- a/Master/tlpkg/tlperl/lib/SDBM_File.pm
+++ b/Master/tlpkg/tlperl/lib/SDBM_File.pm
@@ -7,7 +7,7 @@ require Tie::Hash;
 require XSLoader;
 
 our @ISA = qw(Tie::Hash);
-our $VERSION = "1.13";
+our $VERSION = "1.14";
 
 our @EXPORT_OK = qw(PAGFEXT DIRFEXT PAIRMAX);
 use Exporter "import";
diff --git a/Master/tlpkg/tlperl/lib/Scalar/Util.pm b/Master/tlpkg/tlperl/lib/Scalar/Util.pm
index 3f17d13b838..99a536df642 100644
--- a/Master/tlpkg/tlperl/lib/Scalar/Util.pm
+++ b/Master/tlpkg/tlperl/lib/Scalar/Util.pm
@@ -8,7 +8,6 @@ package Scalar::Util;
 
 use strict;
 require Exporter;
-require List::Util; # List::Util loads the XS
 
 our @ISA       = qw(Exporter);
 our @EXPORT_OK = qw(
@@ -17,9 +16,12 @@ our @EXPORT_OK = qw(
   dualvar isdual isvstring looks_like_number openhandle readonly set_prototype
   tainted
 );
-our $VERSION    = "1.41";
+our $VERSION    = "1.42_02";
 $VERSION   = eval $VERSION;
 
+require List::Util; # List::Util loads the XS
+List::Util->VERSION( $VERSION ); # Ensure we got the right XS version (RT#100863)
+
 our @EXPORT_FAIL;
 
 unless (defined &weaken) {
diff --git a/Master/tlpkg/tlperl/lib/SelfLoader.pm b/Master/tlpkg/tlperl/lib/SelfLoader.pm
index 586dc57621f..e36cb923d9e 100644
--- a/Master/tlpkg/tlperl/lib/SelfLoader.pm
+++ b/Master/tlpkg/tlperl/lib/SelfLoader.pm
@@ -2,7 +2,7 @@ package SelfLoader;
 use 5.008;
 use strict;
 use IO::Handle;
-our $VERSION = "1.22";
+our $VERSION = "1.23";
 
 # The following bit of eval-magic is necessary to make this work on
 # perls < 5.009005.
@@ -395,54 +395,61 @@ can benefit from bug fixes.
 
 This package has the same copyright and license as the perl core:
 
-             Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-        2000, 2001, 2002, 2003, 2004, 2005, 2006 by Larry Wall and others
-
-			    All rights reserved.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either:
-
-	a) the GNU General Public License as published by the Free
-	Software Foundation; either version 1, or (at your option) any
-	later version, or
-
-	b) the "Artistic License" which comes with this Kit.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See either
-    the GNU General Public License or the Artistic License for more details.
-
-    You should have received a copy of the Artistic License with this
-    Kit, in the file named "Artistic".  If not, I'll be glad to provide one.
-
-    You should also have received a copy of the GNU General Public License
-    along with this program in the file named "Copying". If not, write to the
-    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-    MA 02110-1301, USA or visit their web page on the internet at
-    http://www.gnu.org/copyleft/gpl.html.
-
-    For those of you that choose to use the GNU General Public License,
-    my interpretation of the GNU General Public License is that no Perl
-    script falls under the terms of the GPL unless you explicitly put
-    said script under the terms of the GPL yourself.  Furthermore, any
-    object code linked with perl does not automatically fall under the
-    terms of the GPL, provided such object code only adds definitions
-    of subroutines and variables, and does not otherwise impair the
-    resulting interpreter from executing any standard Perl script.  I
-    consider linking in C subroutines in this manner to be the moral
-    equivalent of defining subroutines in the Perl language itself.  You
-    may sell such an object file as proprietary provided that you provide
-    or offer to provide the Perl source, as specified by the GNU General
-    Public License.  (This is merely an alternate way of specifying input
-    to the program.)  You may also sell a binary produced by the dumping of
-    a running Perl script that belongs to you, provided that you provide or
-    offer to provide the Perl source as specified by the GPL.  (The
-    fact that a Perl interpreter and your code are in the same binary file
-    is, in this case, a form of mere aggregation.)  This is my interpretation
-    of the GPL.  If you still have concerns or difficulties understanding
-    my intent, feel free to contact me.  Of course, the Artistic License
-    spells all this out for your protection, so you may prefer to use that.
+Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+2000, 2001, 2002, 2003, 2004, 2005, 2006 by Larry Wall and others
+
+All rights reserved.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of either:
+
+=over 4
+
+=item a)
+
+the GNU General Public License as published by the Free Software Foundation;
+either version 1, or (at your option) any later version, or
+
+=item b)
+
+the "Artistic License" which comes with this Kit.
+
+=back
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See either
+the GNU General Public License or the Artistic License for more details.
+
+You should have received a copy of the Artistic License with this
+Kit, in the file named "Artistic".  If not, I'll be glad to provide one.
+
+You should also have received a copy of the GNU General Public License
+along with this program in the file named "Copying". If not, write to the
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA 02110-1301, USA or visit their web page on the internet at
+http://www.gnu.org/copyleft/gpl.html.
+
+For those of you that choose to use the GNU General Public License,
+my interpretation of the GNU General Public License is that no Perl
+script falls under the terms of the GPL unless you explicitly put
+said script under the terms of the GPL yourself.  Furthermore, any
+object code linked with perl does not automatically fall under the
+terms of the GPL, provided such object code only adds definitions
+of subroutines and variables, and does not otherwise impair the
+resulting interpreter from executing any standard Perl script.  I
+consider linking in C subroutines in this manner to be the moral
+equivalent of defining subroutines in the Perl language itself.  You
+may sell such an object file as proprietary provided that you provide
+or offer to provide the Perl source, as specified by the GNU General
+Public License.  (This is merely an alternate way of specifying input
+to the program.)  You may also sell a binary produced by the dumping of
+a running Perl script that belongs to you, provided that you provide or
+offer to provide the Perl source as specified by the GPL.  (The
+fact that a Perl interpreter and your code are in the same binary file
+is, in this case, a form of mere aggregation.)  This is my interpretation
+of the GPL.  If you still have concerns or difficulties understanding
+my intent, feel free to contact me.  Of course, the Artistic License
+spells all this out for your protection, so you may prefer to use that.
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/Socket.pm b/Master/tlpkg/tlperl/lib/Socket.pm
index 20657e805d6..5b187facf2f 100644
--- a/Master/tlpkg/tlperl/lib/Socket.pm
+++ b/Master/tlpkg/tlperl/lib/Socket.pm
@@ -3,7 +3,7 @@ package Socket;
 use strict;
 { use 5.006001; }
 
-our $VERSION = '2.018';
+our $VERSION = '2.020_03'; # patched in perl5.git
 
 =head1 NAME
 
@@ -760,8 +760,9 @@ our @EXPORT_OK = qw(
 	IP_DROP_SOURCE_MEMBERSHIP IP_MULTICAST_IF IP_MULTICAST_LOOP
 	IP_MULTICAST_TTL
 
-	IPPROTO_IP IPPROTO_IPV6 IPPROTO_RAW IPPROTO_ICMP IPPROTO_TCP
-	IPPROTO_UDP
+	IPPROTO_IP IPPROTO_IPV6 IPPROTO_RAW IPPROTO_ICMP IPPROTO_IGMP
+	IPPROTO_TCP IPPROTO_UDP IPPROTO_GRE IPPROTO_ESP IPPROTO_AH
+	IPPROTO_SCTP
 
 	IPTOS_LOWDELAY IPTOS_THROUGHPUT IPTOS_RELIABILITY IPTOS_MINCOST
 
diff --git a/Master/tlpkg/tlperl/lib/Storable.pm b/Master/tlpkg/tlperl/lib/Storable.pm
index bd0632f832d..5823b930b8d 100644
--- a/Master/tlpkg/tlperl/lib/Storable.pm
+++ b/Master/tlpkg/tlperl/lib/Storable.pm
@@ -22,10 +22,16 @@ package Storable; @ISA = qw(Exporter);
 
 use vars qw($canonical $forgive_me $VERSION);
 
-$VERSION = '2.53_01';
+$VERSION = '2.56_01';
 
 BEGIN {
-    if (eval { local $SIG{__DIE__}; require Log::Agent; 1 }) {
+    if (eval {
+        local $SIG{__DIE__};
+        local @INC = @INC;
+        pop @INC if $INC[-1] eq '.';
+        require Log::Agent;
+        1;
+    }) {
         Log::Agent->import;
     }
     #
@@ -979,43 +985,43 @@ such.
 
 Here are some code samples showing a possible usage of Storable:
 
-	use Storable qw(store retrieve freeze thaw dclone);
+ use Storable qw(store retrieve freeze thaw dclone);
 
-	%color = ('Blue' => 0.1, 'Red' => 0.8, 'Black' => 0, 'White' => 1);
+ %color = ('Blue' => 0.1, 'Red' => 0.8, 'Black' => 0, 'White' => 1);
 
-	store(\%color, 'mycolors') or die "Can't store %a in mycolors!\n";
+ store(\%color, 'mycolors') or die "Can't store %a in mycolors!\n";
 
-	$colref = retrieve('mycolors');
-	die "Unable to retrieve from mycolors!\n" unless defined $colref;
-	printf "Blue is still %lf\n", $colref->{'Blue'};
+ $colref = retrieve('mycolors');
+ die "Unable to retrieve from mycolors!\n" unless defined $colref;
+ printf "Blue is still %lf\n", $colref->{'Blue'};
 
-	$colref2 = dclone(\%color);
+ $colref2 = dclone(\%color);
 
-	$str = freeze(\%color);
-	printf "Serialization of %%color is %d bytes long.\n", length($str);
-	$colref3 = thaw($str);
+ $str = freeze(\%color);
+ printf "Serialization of %%color is %d bytes long.\n", length($str);
+ $colref3 = thaw($str);
 
 which prints (on my machine):
 
-	Blue is still 0.100000
-	Serialization of %color is 102 bytes long.
+ Blue is still 0.100000
+ Serialization of %color is 102 bytes long.
 
 Serialization of CODE references and deserialization in a safe
 compartment:
 
 =for example begin
 
-	use Storable qw(freeze thaw);
-	use Safe;
-	use strict;
-	my $safe = new Safe;
+ use Storable qw(freeze thaw);
+ use Safe;
+ use strict;
+ my $safe = new Safe;
         # because of opcodes used in "use strict":
-	$safe->permit(qw(:default require));
-	local $Storable::Deparse = 1;
-	local $Storable::Eval = sub { $safe->reval($_[0]) };
-	my $serialized = freeze(sub { 42 });
-	my $code = thaw($serialized);
-	$code->() == 42;
+ $safe->permit(qw(:default require));
+ local $Storable::Deparse = 1;
+ local $Storable::Eval = sub { $safe->reval($_[0]) };
+ my $serialized = freeze(sub { 42 });
+ my $code = thaw($serialized);
+ $code->() == 42;
 
 =for example end
 
diff --git a/Master/tlpkg/tlperl/lib/Sub/Util.pm b/Master/tlpkg/tlperl/lib/Sub/Util.pm
index e40cf2205e6..1bf58788869 100644
--- a/Master/tlpkg/tlperl/lib/Sub/Util.pm
+++ b/Master/tlpkg/tlperl/lib/Sub/Util.pm
@@ -8,7 +8,6 @@ use strict;
 use warnings;
 
 require Exporter;
-require List::Util; # as it has the XS
 
 our @ISA = qw( Exporter );
 our @EXPORT_OK = qw(
@@ -16,9 +15,12 @@ our @EXPORT_OK = qw(
   subname set_subname
 );
 
-our $VERSION    = "1.41";
+our $VERSION    = "1.42_02";
 $VERSION   = eval $VERSION;
 
+require List::Util; # as it has the XS
+List::Util->VERSION( $VERSION ); # Ensure we got the right XS version (RT#100863)
+
 =head1 NAME
 
 Sub::Util - A selection of utility subroutines for subs and CODE references
diff --git a/Master/tlpkg/tlperl/lib/TAP/Base.pm b/Master/tlpkg/tlperl/lib/TAP/Base.pm
index 61c567f570b..e6ea22d6ecd 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Base.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Base.pm
@@ -12,11 +12,11 @@ and L<TAP::Harness>
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 use constant GOT_TIME_HIRES => do {
     eval 'use Time::HiRes qw(time);';
diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Base.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Base.pm
index a5a78d1cbe1..a2fa3ea765f 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Base.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Base.pm
@@ -58,11 +58,11 @@ TAP::Formatter::Base - Base class for harness output delegates
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Color.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Color.pm
index 76937b01a0f..728247c07d7 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Color.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Color.pm
@@ -71,11 +71,11 @@ TAP::Formatter::Color - Run Perl test scripts with color
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console.pm
index 01f1a541655..8cc3060dac3 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console.pm
@@ -11,11 +11,11 @@ TAP::Formatter::Console - Harness output delegate for default console output
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/ParallelSession.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/ParallelSession.pm
index 9c4b9cf2564..c8cdf7c998d 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/ParallelSession.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/ParallelSession.pm
@@ -41,11 +41,11 @@ TAP::Formatter::Console::ParallelSession - Harness output delegate for parallel
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/Session.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/Session.pm
index 672a0834cd1..8a15812f3d8 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/Session.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Console/Session.pm
@@ -26,11 +26,11 @@ TAP::Formatter::Console::Session - Harness output delegate for default console o
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/File.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/File.pm
index 8ee90fc1739..45d93a1860e 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Formatter/File.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/File.pm
@@ -13,11 +13,11 @@ TAP::Formatter::File - Harness output delegate for file output
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/File/Session.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/File/Session.pm
index 2a92d6082ca..371d7d56c63 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Formatter/File/Session.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/File/Session.pm
@@ -10,11 +10,11 @@ TAP::Formatter::File::Session - Harness output delegate for file output
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Formatter/Session.pm b/Master/tlpkg/tlperl/lib/TAP/Formatter/Session.pm
index 089c1e6729d..2924276f331 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Formatter/Session.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Formatter/Session.pm
@@ -23,11 +23,11 @@ TAP::Formatter::Session - Abstract base class for harness output delegate
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 METHODS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Harness.pm b/Master/tlpkg/tlperl/lib/TAP/Harness.pm
index d9ede6b96ae..c916a32edd0 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Harness.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Harness.pm
@@ -16,11 +16,11 @@ TAP::Harness - Run test scripts with statistics
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 $ENV{HARNESS_ACTIVE}  = 1;
 $ENV{HARNESS_VERSION} = $VERSION;
diff --git a/Master/tlpkg/tlperl/lib/TAP/Harness/Beyond.pod b/Master/tlpkg/tlperl/lib/TAP/Harness/Beyond.pod
index b70564ec956..989e2efc146 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Harness/Beyond.pod
+++ b/Master/tlpkg/tlperl/lib/TAP/Harness/Beyond.pod
@@ -417,6 +417,10 @@ there's the tap-l[2] list. Finally there's a wiki dedicated to the
 Test Anything Protocol[3]. Contributions to the wiki, patches and
 suggestions are all welcome.
 
+=for comment
+  The URLs in [1] and [2] point to 404 pages. What are currently the
+  correct URLs?
+
 [1] L<http://www.hexten.net/mailman/listinfo/tapx-dev>
 [2] L<http://testanything.org/mailman/listinfo/tap-l>
 [3] L<http://testanything.org/>
diff --git a/Master/tlpkg/tlperl/lib/TAP/Harness/Env.pm b/Master/tlpkg/tlperl/lib/TAP/Harness/Env.pm
index c565b13bd0d..0a328da76a7 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Harness/Env.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Harness/Env.pm
@@ -7,7 +7,7 @@ use constant IS_VMS => ( $^O eq 'VMS' );
 use TAP::Object;
 use Text::ParseWords qw/shellwords/;
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 # Get the parts of @INC which are changed from the stock list AND
 # preserve reordering of stock directories.
@@ -126,7 +126,7 @@ TAP::Harness::Env - Parsing harness related environmental variables where approp
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Object.pm b/Master/tlpkg/tlperl/lib/TAP/Object.pm
index 84dfe88c2af..5195bd7f26c 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Object.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Object.pm
@@ -9,11 +9,11 @@ TAP::Object - Base class that provides common functionality to all C<TAP::*> mod
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser.pm b/Master/tlpkg/tlperl/lib/TAP/Parser.pm
index 22222c2482e..f688c722f06 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser.pm
@@ -27,11 +27,11 @@ TAP::Parser - Parse L<TAP|Test::Harness::TAP> output
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 my $DEFAULT_TAP_VERSION = 12;
 my $MAX_TAP_VERSION     = 13;
@@ -97,7 +97,7 @@ L<http://testanything.org>
 
 It includes the TAP::Parser Cookbook:
 
-L<http://testanything.org/wiki/index.php/TAP::Parser_Cookbook>
+L<http://testanything.org/testing-with-tap/perl/tap::parser-cookbook.html>
 
 =head1 METHODS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Aggregator.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Aggregator.pm
index 5745245072a..94289a44c85 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Aggregator.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Aggregator.pm
@@ -12,11 +12,11 @@ TAP::Parser::Aggregator - Aggregate TAP::Parser results
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Grammar.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Grammar.pm
index 1a0be3c7e80..e4ab7b4ecc1 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Grammar.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Grammar.pm
@@ -14,11 +14,11 @@ TAP::Parser::Grammar - A grammar for the Test Anything Protocol.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator.pm
index 114aba6bd4f..93b8a7f5d08 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator.pm
@@ -11,11 +11,11 @@ TAP::Parser::Iterator - Base class for TAP source iterators
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Array.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Array.pm
index 650adbfa45c..ce7000beaa3 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Array.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Array.pm
@@ -11,11 +11,11 @@ TAP::Parser::Iterator::Array - Iterator for array-based TAP sources
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Process.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Process.pm
index 923de9aa4d4..cf842998d22 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Process.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Process.pm
@@ -16,11 +16,11 @@ TAP::Parser::Iterator::Process - Iterator for process-based TAP sources
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Stream.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Stream.pm
index bd6a8b75423..f98527969e0 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Stream.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Iterator/Stream.pm
@@ -11,11 +11,11 @@ TAP::Parser::Iterator::Stream - Iterator for filehandle-based TAP sources
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/IteratorFactory.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/IteratorFactory.pm
index d4e29ffa3b4..7a80031be03 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/IteratorFactory.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/IteratorFactory.pm
@@ -16,11 +16,11 @@ TAP::Parser::IteratorFactory - Figures out which SourceHandler objects to use fo
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Multiplexer.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Multiplexer.pm
index d002272ac1e..55701f84a2d 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Multiplexer.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Multiplexer.pm
@@ -17,11 +17,11 @@ TAP::Parser::Multiplexer - Multiplex multiple TAP::Parsers
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result.pm
index efbcfe8ee23..270a24a63c7 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result.pm
@@ -24,11 +24,11 @@ TAP::Parser::Result - Base class for TAP::Parser output objects
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Bailout.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Bailout.pm
index c3749864c92..d5c7e8cfdf9 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Bailout.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Bailout.pm
@@ -11,11 +11,11 @@ TAP::Parser::Result::Bailout - Bailout result token.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Comment.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Comment.pm
index bd0f78ad897..a519634436c 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Comment.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Comment.pm
@@ -11,11 +11,11 @@ TAP::Parser::Result::Comment - Comment result token.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Plan.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Plan.pm
index 900874a8966..0b2b3362457 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Plan.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Plan.pm
@@ -11,11 +11,11 @@ TAP::Parser::Result::Plan - Plan result token.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Pragma.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Pragma.pm
index b7b6a43399f..40380e7c603 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Pragma.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Pragma.pm
@@ -11,11 +11,11 @@ TAP::Parser::Result::Pragma - TAP pragma token.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Test.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Test.pm
index 57219cbea73..46b63e9ef07 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Test.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Test.pm
@@ -11,11 +11,11 @@ TAP::Parser::Result::Test - Test result token.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Unknown.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Unknown.pm
index 8bfeb6c933a..89935239c19 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Unknown.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Unknown.pm
@@ -11,11 +11,11 @@ TAP::Parser::Result::Unknown - Unknown result token.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Version.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Version.pm
index 68789b502db..28bab595b9f 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Version.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/Version.pm
@@ -11,11 +11,11 @@ TAP::Parser::Result::Version - TAP syntax version token.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/YAML.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/YAML.pm
index 0775e4a12a5..e93b43782de 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Result/YAML.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Result/YAML.pm
@@ -11,11 +11,11 @@ TAP::Parser::Result::YAML - YAML result token.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/ResultFactory.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/ResultFactory.pm
index 12ecb1cc3a6..c45074d08f8 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/ResultFactory.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/ResultFactory.pm
@@ -29,11 +29,11 @@ TAP::Parser::ResultFactory - Factory for creating TAP::Parser output objects
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head2 DESCRIPTION
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler.pm
index ed3ef5135f3..2eea054d5e0 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler.pm
@@ -13,11 +13,11 @@ TAP::Parser::Scheduler - Schedule tests during parallel testing
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Job.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Job.pm
index ae0b59b9c71..c5bb3544c5d 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Job.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Job.pm
@@ -10,11 +10,11 @@ TAP::Parser::Scheduler::Job - A single testing job.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Spinner.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Spinner.pm
index a739164aa6c..768ade96ef8 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Spinner.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Scheduler/Spinner.pm
@@ -10,11 +10,11 @@ TAP::Parser::Scheduler::Spinner - A no-op job.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/Source.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/Source.pm
index 27f6e53315e..1b4c2110fc3 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/Source.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/Source.pm
@@ -14,11 +14,11 @@ TAP::Parser::Source - a TAP source & meta data about it
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler.pm
index a2e943b9096..e2d1cf960ae 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler.pm
@@ -12,11 +12,11 @@ TAP::Parser::SourceHandler - Base class for different TAP source handlers
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Executable.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Executable.pm
index 3e0bd6e1d5b..a4df5dabbe2 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Executable.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Executable.pm
@@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::Executable - Stream output from an executable TAP so
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/File.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/File.pm
index cb117c66365..30187a028f3 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/File.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/File.pm
@@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::File - Stream TAP from a text file.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Handle.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Handle.pm
index d113845e7b1..05b8dcb5a87 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Handle.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Handle.pm
@@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::Handle - Stream TAP from an IO::Handle or a GLOB.
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Perl.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Perl.pm
index 4dc3afbb479..7d238cd6249 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Perl.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/Perl.pm
@@ -21,11 +21,11 @@ TAP::Parser::SourceHandler::Perl - Stream TAP from a Perl executable
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/RawTAP.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/RawTAP.pm
index 8574e27ab7c..6dfc815c5ac 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/RawTAP.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/SourceHandler/RawTAP.pm
@@ -16,11 +16,11 @@ TAP::Parser::SourceHandler::RawTAP - Stream output from raw TAP in a scalar/arra
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Reader.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Reader.pm
index a79f7280237..3381fa110e2 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Reader.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Reader.pm
@@ -5,7 +5,7 @@ use warnings;
 
 use base 'TAP::Object';
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 # TODO:
 #   Handle blessed object syntax
@@ -81,7 +81,7 @@ sub _read {
     my $line = $self->_peek;
 
     # Do we have a document header?
-    if ( $line =~ /^ --- (?: \s* (.+?) \s* )? $/x ) {
+    if ( $line =~ /^ --- (?: \s* (.+?)? \s* )? $/x ) {
         $self->_next;
 
         return $self->_read_scalar($1) if defined $1;    # Inline?
@@ -269,7 +269,7 @@ TAP::Parser::YAMLish::Reader - Read YAMLish data from iterator
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Writer.pm b/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Writer.pm
index 9d68a1824f9..4897aa88478 100644
--- a/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Writer.pm
+++ b/Master/tlpkg/tlperl/lib/TAP/Parser/YAMLish/Writer.pm
@@ -5,7 +5,7 @@ use warnings;
 
 use base 'TAP::Object';
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 my $ESCAPE_CHAR = qr{ [ \x00-\x1f \" ] }x;
 my $ESCAPE_KEY  = qr{ (?: ^\W ) | $ESCAPE_CHAR }x;
@@ -146,7 +146,7 @@ TAP::Parser::YAMLish::Writer - Write YAMLish data
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/Term/ANSIColor.pm b/Master/tlpkg/tlperl/lib/Term/ANSIColor.pm
index 2101a871257..ace4d471676 100644
--- a/Master/tlpkg/tlperl/lib/Term/ANSIColor.pm
+++ b/Master/tlpkg/tlperl/lib/Term/ANSIColor.pm
@@ -1,7 +1,7 @@
 # Term::ANSIColor -- Color screen output using ANSI escape sequences.
 #
 # Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2005, 2006, 2008, 2009, 2010,
-#     2011, 2012, 2013, 2014 Russ Allbery <rra@cpan.org>
+#     2011, 2012, 2013, 2014, 2015 Russ Allbery <rra@cpan.org>
 # Copyright 1996 Zenin
 # Copyright 2012 Kurt Starsinic <kstarsinic@gmail.com>
 #
@@ -40,7 +40,7 @@ our $AUTOLOAD;
 # against circular module loading (not that we load any modules, but
 # consistency is good).
 BEGIN {
-    $VERSION = '4.03';
+    $VERSION = '4.04';
 
     # All of the basic supported constants, used in %EXPORT_TAGS.
     my @colorlist = qw(
@@ -475,7 +475,7 @@ sub colored {
     # empty segments, and then colorize each of the line sections.
     if (defined($EACHLINE)) {
         my @text = map { ($_ ne $EACHLINE) ? $attr . $_ . "\e[0m" : $_ }
-          grep { length($_) > 0 }
+          grep { length > 0 }
           split(m{ (\Q$EACHLINE\E) }xms, $string);
         return join(q{}, @text);
     } else {
@@ -536,9 +536,9 @@ sub colorstrip {
 # Returns: True if all the attributes are valid, false otherwise.
 sub colorvalid {
     my (@codes) = @_;
-    @codes = map { split(q{ }, lc($_)) } @codes;
+    @codes = map { split(q{ }, lc) } @codes;
     for my $code (@codes) {
-        if (!defined($ATTRIBUTES{$code}) && !defined($ALIASES{$code})) {
+        if (!(defined($ATTRIBUTES{$code}) || defined($ALIASES{$code}))) {
             return;
         }
     }
@@ -635,9 +635,9 @@ particular features and the versions of Perl that included them.
 
 =head2 Supported Colors
 
-Terminal emulators that support color divide into two types: ones that
+Terminal emulators that support color divide into three types: ones that
 support only eight colors, ones that support sixteen, and ones that
-support 256.  This module provides the ANSI escape codes all of them.
+support 256.  This module provides the ANSI escape codes for all of them.
 These colors are referred to as ANSI colors 0 through 7 (normal), 8
 through 15 (16-color), and 16 through 255 (256-color).
 
@@ -1190,9 +1190,13 @@ voice solutions.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 1996 Zenin.  Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2005,
-2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Russ Allbery
-<rra@cpan.org>.  Copyright 2012 Kurt Starsinic <kstarsinic@gmail.com>.
+Copyright 1996 Zenin
+
+Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2005, 2006, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015 Russ Allbery <rra@cpan.org>
+
+Copyright 2012 Kurt Starsinic <kstarsinic@gmail.com>
+
 This program is free software; you may redistribute it and/or modify it
 under the same terms as Perl itself.
 
diff --git a/Master/tlpkg/tlperl/lib/Term/Cap.pm b/Master/tlpkg/tlperl/lib/Term/Cap.pm
index 9a70251270d..12d8299a3a4 100644
--- a/Master/tlpkg/tlperl/lib/Term/Cap.pm
+++ b/Master/tlpkg/tlperl/lib/Term/Cap.pm
@@ -19,51 +19,8 @@ use strict;
 use vars qw($VERSION $VMS_TERMCAP);
 use vars qw($termpat $state $first $entry);
 
-$VERSION = '1.15';
-
-# Version undef: Thu Dec 14 20:02:42 CST 1995 by sanders@bsdi.com
-# Version 1.00:  Thu Nov 30 23:34:29 EST 2000 by schwern@pobox.com
-#	[PATCH] $VERSION crusade, strict, tests, etc... all over lib/
-# Version 1.01:  Wed May 23 00:00:00 CST 2001 by d-lewart@uiuc.edu
-#	Avoid warnings in Tgetent and Tputs
-# Version 1.02:  Sat Nov 17 13:50:39 GMT 2001 by jns@gellyfish.com
-#       Altered layout of the POD
-#       Added Test::More to PREREQ_PM in Makefile.PL
-#       Fixed no argument Tgetent()
-# Version 1.03:  Wed Nov 28 10:09:38 GMT 2001
-#       VMS Support from Charles Lane <lane@DUPHY4.Physics.Drexel.Edu>
-# Version 1.04:  Thu Nov 29 16:22:03 GMT 2001
-#       Fixed warnings in test
-# Version 1.05:  Mon Dec  3 15:33:49 GMT 2001
-#       Don't try to fall back on infocmp if it's not there. From chromatic.
-# Version 1.06:  Thu Dec  6 18:43:22 GMT 2001
-#       Preload the default VMS termcap from Charles Lane
-#       Don't carp at setting OSPEED unless warnings are on.
-# Version 1.07:  Wed Jan  2 21:35:09 GMT 2002
-#       Sanity check on infocmp output from Norton Allen
-#       Repaired INSTALLDIRS thanks to Michael Schwern
-# Version 1.08:  Sat Sep 28 11:33:15 BST 2002
-#       Late loading of 'Carp' as per Michael Schwern
-# Version 1.09:  Tue Apr 20 12:06:51 BST 2004
-#       Merged in changes from and to Core
-#       Core (Fri Aug 30 14:15:55 CEST 2002):
-#       Cope with comments lines from 'infocmp' from Brendan O'Dea
-#       Allow for EBCDIC in Tgoto magic test.
-# Version 1.10: Thu Oct 18 16:52:20 BST 2007
-#       Don't use try to use $ENV{HOME} if it doesn't exist
-#       Give Win32 'dumb' if TERM isn't set
-#       Provide fallback 'dumb' termcap entry as last resort
-# Version 1.11: Thu Oct 25 09:33:07 BST 2007
-#       EBDIC fixes from Chun Bing Ge <gecb@cn.ibm.com>
-# Version 1.12: Sat Dec  8 00:10:21 GMT 2007
-#       QNX test fix from Matt Kraai <kraai@ftbfs.org>
-# Version 1.13: Thu Dec 22 22:21:09 GMT 2011
-#       POD error fix from Domin Hargreaves <dom@earth.li>
-# Version 1.14 Sat Oct 26 19:16:38 BST 2013
-#       Applied all patches from RT and updated contact details
-# Version 1.15 Sat Oct 26 21:32:24 BST 2013
-#        Metadata change from David Steinbrunner
-#        Forgot to update the email somewhere
+$VERSION = '1.17';
+
 # TODO:
 # support Berkeley DB termcaps
 # force $FH into callers package?
@@ -279,7 +236,7 @@ sub Tgetent
 
     my @termcap_path = termcap_path();
 
-    unless ( @termcap_path || $entry )
+    if ( !@termcap_path && !$entry )
     {
 
         # last resort--fake up a termcap from terminfo
@@ -405,25 +362,25 @@ sub Tgetent
     $entry =~ s/^[^:]*://;
     foreach $field ( split( /:[\s:\\]*/, $entry ) )
     {
-        if ( defined $field && $field =~ /^(\w\w)$/ )
+        if ( defined $field && $field =~ /^(\w{2,})$/ )
         {
             $self->{ '_' . $field } = 1 unless defined $self->{ '_' . $1 };
 
             # print STDERR "DEBUG: flag $1\n";
         }
-        elsif ( defined $field && $field =~ /^(\w\w)\@/ )
+        elsif ( defined $field && $field =~ /^(\w{2,})\@/ )
         {
             $self->{ '_' . $1 } = "";
 
             # print STDERR "DEBUG: unset $1\n";
         }
-        elsif ( defined $field && $field =~ /^(\w\w)#(.*)/ )
+        elsif ( defined $field && $field =~ /^(\w{2,})#(.*)/ )
         {
             $self->{ '_' . $1 } = $2 unless defined $self->{ '_' . $1 };
 
             # print STDERR "DEBUG: numeric $1 = $2\n";
         }
-        elsif ( defined $field && $field =~ /^(\w\w)=(.*)/ )
+        elsif ( defined $field && $field =~ /^(\w{2,})=(.*)/ )
         {
 
             # print STDERR "DEBUG: string $1 = $2\n";
@@ -770,7 +727,13 @@ sub Trequire
 
 =head1 COPYRIGHT AND LICENSE
 
-Please see the README file in distribution.
+Copyright 1995-2015 (c) perl5 porters.
+
+This software is free software and can be modified and distributed under
+the same terms as Perl itself.
+
+Please see the file README in the Perl source distribution for details of
+the Perl license.
 
 =head1 AUTHOR
 
diff --git a/Master/tlpkg/tlperl/lib/Test.pm b/Master/tlpkg/tlperl/lib/Test.pm
index 108bc10a167..3350517e649 100644
--- a/Master/tlpkg/tlperl/lib/Test.pm
+++ b/Master/tlpkg/tlperl/lib/Test.pm
@@ -20,7 +20,7 @@ sub _reset_globals {
     $planned    = 0;
 }
 
-$VERSION = '1.26';
+$VERSION = '1.28_01';
 require Exporter;
 @ISA=('Exporter');
 
@@ -239,9 +239,31 @@ sub _quote {
     $str =~ s/\n/\\n/g;
     $str =~ s/\r/\\r/g;
     $str =~ s/\t/\\t/g;
-    $str =~ s/([\0-\037])(?!\d)/sprintf('\\%o',ord($1))/eg;
-    $str =~ s/([\0-\037\177-\377])/sprintf('\\x%02X',ord($1))/eg;
-    $str =~ s/([^\0-\176])/sprintf('\\x{%X}',ord($1))/eg;
+    if (defined $^V && $^V ge v5.6) {
+        $str =~ s/([[:cntrl:]])(?!\d)/sprintf('\\%o',ord($1))/eg;
+        $str =~ s/([[:^print:]])/sprintf('\\x%02X',ord($1))/eg;
+        $str =~ s/([[:^ascii:]])/sprintf('\\x{%X}',ord($1))/eg;
+    }
+    elsif (ord("A") == 65) {
+        $str =~ s/([\0-\037])(?!\d)/sprintf('\\%o',ord($1))/eg;
+        $str =~ s/([\0-\037\177-\377])/sprintf('\\x%02X',ord($1))/eg;
+        $str =~ s/([^\0-\176])/sprintf('\\x{%X}',ord($1))/eg;
+    }
+    else { # Assuming EBCDIC on this ancient Perl
+
+        # The controls except for one are 0-\077, so almost all controls on
+        # EBCDIC platforms will be expressed in octal, instead of just the C0
+        # ones.
+        $str =~ s/([\0-\077])(?!\d)/sprintf('\\%o',ord($1))/eg;
+        $str =~ s/([\0-\077])/sprintf('\\x%02X',ord($1))/eg;
+
+        $str =~ s/([^\0-\xFF])/sprintf('\\x{%X}',ord($1))/eg;
+
+        # What remains to be escaped are the non-ASCII-range characters,
+        # including the one control that isn't in the 0-077 range.
+        # (We don't escape further any ASCII printables.)
+        $str =~ s<[^ !"\$\%#'()*+,\-./0123456789:;\<=\>?\@ABCDEFGHIJKLMNOPQRSTUVWXYZ\[\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~]><sprintf('\\x%02X',ord($1))>eg;
+    }
     #if( $_[1] ) {
     #  substr( $str , 218-3 ) = "..."
     #   if length($str) >= 218 and !$ENV{PERL_TEST_NO_TRUNC};
@@ -273,14 +295,16 @@ the test fails.  Examples:
     ok( $foo =~ /bar/ );        # ok if $foo contains 'bar'
     ok( baz($x + $y) eq 'Armondo' );    # ok if baz($x + $y) returns
                                         # 'Armondo'
-    ok( @a == @b );             # ok if @a and @b are the same length
+    ok( @a == @b );             # ok if @a and @b are the same
+                                # length
 
 The expression is evaluated in scalar context.  So the following will
 work:
 
-    ok( @stuff );                       # ok if @stuff has any elements
-    ok( !grep !defined $_, @stuff );    # ok if everything in @stuff is
-                                        # defined.
+    ok( @stuff );                       # ok if @stuff has any
+                                        # elements
+    ok( !grep !defined $_, @stuff );    # ok if everything in @stuff
+                                        # is defined.
 
 A special case is if the expression is a subroutine reference (in either
 C<sub {...}> syntax or C<\&foo> syntax).  In
@@ -437,23 +461,24 @@ sub _complain {
     my $diag = $$detail{diagnostic};
     $diag =~ s/\n/\n#/g if defined $diag;
 
+    my $out = $$detail{todo} ? $TESTOUT : $TESTERR;
     $$detail{context} .= ' *TODO*' if $$detail{todo};
     if (!$$detail{compare}) {
         if (!$diag) {
-            print $TESTERR "# Failed test $ntest in $$detail{context}\n";
+            print $out "# Failed test $ntest in $$detail{context}\n";
         } else {
-            print $TESTERR "# Failed test $ntest in $$detail{context}: $diag\n";
+            print $out "# Failed test $ntest in $$detail{context}: $diag\n";
         }
     } else {
         my $prefix = "Test $ntest";
 
-        print $TESTERR "# $prefix got: " . _quote($result) .
+        print $out "# $prefix got: " . _quote($result) .
                        " ($$detail{context})\n";
         $prefix = ' ' x (length($prefix) - 5);
         my $expected_quoted = (defined $$detail{regex})
          ?  'qr{'.($$detail{regex}).'}'  :  _quote($expected);
 
-        print $TESTERR "# $prefix Expected: $expected_quoted",
+        print $out "# $prefix Expected: $expected_quoted",
            $diag ? " ($diag)" : (), "\n";
 
         _diff_complain( $result, $expected, $detail, $prefix )
@@ -461,7 +486,7 @@ sub _complain {
     }
 
     if(defined $Program_Lines{ $$detail{file} }[ $$detail{line} ]) {
-        print $TESTERR
+        print $out
           "#  $$detail{file} line $$detail{line} is: $Program_Lines{ $$detail{file} }[ $$detail{line} ]\n"
          if $Program_Lines{ $$detail{file} }[ $$detail{line} ]
           =~ m/[^\s\#\(\)\{\}\[\]\;]/;  # Otherwise it's uninformative
@@ -480,7 +505,12 @@ sub _diff_complain {
     my($result, $expected, $detail, $prefix) = @_;
     return _diff_complain_external(@_) if $ENV{PERL_TEST_DIFF};
     return _diff_complain_algdiff(@_)
-     if eval { require Algorithm::Diff; Algorithm::Diff->VERSION(1.15); 1; };
+      if eval {
+          local @INC = @INC;
+          pop @INC if $INC[-1] eq '.';
+          require Algorithm::Diff; Algorithm::Diff->VERSION(1.15);
+          1;
+      };
 
     $told_about_diff++ or print $TESTERR <<"EOT";
 # $prefix   (Install the Algorithm::Diff module to have differences in multiline
@@ -634,7 +664,8 @@ Example usage:
   my $if_MSWin =
     $^O =~ m/MSWin/ ? 'Skip if under MSWin' : '';
 
-  # A test to be skipped if under MSWin (i.e., run except under MSWin)
+  # A test to be skipped if under MSWin (i.e., run except under
+  # MSWin)
   skip($if_MSWin, thing($foo), thing($bar) );
 
 Or, going the other way:
@@ -642,7 +673,8 @@ Or, going the other way:
   my $unless_MSWin =
     $^O =~ m/MSWin/ ? '' : 'Skip unless under MSWin';
 
-  # A test to be skipped unless under MSWin (i.e., run only under MSWin)
+  # A test to be skipped unless under MSWin (i.e., run only under
+  # MSWin)
   skip($unless_MSWin, thing($foo), thing($bar) );
 
 The tricky thing to remember is that the first parameter is true if
@@ -931,7 +963,7 @@ L<Test::Builder> for building your own testing library.
 
 L<Test::Unit> is an interesting XUnit-style testing library.
 
-L<Test::Inline> and L<SelfTest> let you embed tests in code.
+L<Test::Inline> lets you embed tests in code.
 
 
 =head1 AUTHOR
diff --git a/Master/tlpkg/tlperl/lib/Test/Harness.pm b/Master/tlpkg/tlperl/lib/Test/Harness.pm
index d3759195e01..fe9d3049f9f 100644
--- a/Master/tlpkg/tlperl/lib/Test/Harness.pm
+++ b/Master/tlpkg/tlperl/lib/Test/Harness.pm
@@ -31,11 +31,11 @@ Test::Harness - Run Perl standard test scripts with statistics
 
 =head1 VERSION
 
-Version 3.35
+Version 3.36
 
 =cut
 
-our $VERSION = '3.35';
+our $VERSION = '3.36_01';
 
 # Backwards compatibility for exportable variable names.
 *verbose  = *Verbose;
diff --git a/Master/tlpkg/tlperl/lib/Thread/Queue.pm b/Master/tlpkg/tlperl/lib/Thread/Queue.pm
index 316644a64f3..2f87eed9c73 100644
--- a/Master/tlpkg/tlperl/lib/Thread/Queue.pm
+++ b/Master/tlpkg/tlperl/lib/Thread/Queue.pm
@@ -3,7 +3,7 @@ package Thread::Queue;
 use strict;
 use warnings;
 
-our $VERSION = '3.05';
+our $VERSION = '3.09';
 $VERSION = eval $VERSION;
 
 use threads::shared 1.21;
@@ -26,14 +26,29 @@ sub enqueue
 {
     my $self = shift;
     lock(%$self);
+
     if ($$self{'ENDED'}) {
         require Carp;
         Carp::croak("'enqueue' method called on queue that has been 'end'ed");
     }
-    push(@{$$self{'queue'}}, map { shared_clone($_) } @_)
+
+    # Block if queue size exceeds any specified limit
+    my $queue = $$self{'queue'};
+    cond_wait(%$self) while ($$self{'LIMIT'} && (@$queue >= $$self{'LIMIT'}));
+
+    # Add items to queue, and then signal other threads
+    push(@$queue, map { shared_clone($_) } @_)
         and cond_signal(%$self);
 }
 
+# Set or return the max. size for a queue
+sub limit : lvalue
+{
+    my $self = shift;
+    lock(%$self);
+    $$self{'LIMIT'};
+}
+
 # Return a count of the number of items on a queue
 sub pending
 {
@@ -47,7 +62,7 @@ sub pending
 sub end
 {
     my $self = shift;
-    lock $self;
+    lock(%$self);
     # No more data is coming
     $$self{'ENDED'} = 1;
     # Try to release at least one blocked thread
@@ -65,7 +80,7 @@ sub dequeue
 
     # Wait for requisite number of items
     cond_wait(%$self) while ((@$queue < $count) && ! $$self{'ENDED'});
-    cond_signal(%$self) if ((@$queue > $count) || $$self{'ENDED'});
+    cond_signal(%$self) if ((@$queue >= $count) || $$self{'ENDED'});
 
     # If no longer blocking, try getting whatever is left on the queue
     return $self->dequeue_nb($count) if ($$self{'ENDED'});
@@ -120,7 +135,7 @@ sub dequeue_timed
     while ((@$queue < $count) && ! $$self{'ENDED'}) {
         last if (! cond_timedwait(%$self, $timeout));
     }
-    cond_signal(%$self) if ((@$queue > $count) || $$self{'ENDED'});
+    cond_signal(%$self) if ((@$queue >= $count) || $$self{'ENDED'});
 
     # Get whatever we need off the queue if available
     return $self->dequeue_nb($count);
@@ -289,7 +304,7 @@ Thread::Queue - Thread-safe queues
 
 =head1 VERSION
 
-This document describes Thread::Queue version 3.05
+This document describes Thread::Queue version 3.09
 
 =head1 SYNOPSIS
 
@@ -334,6 +349,9 @@ This document describes Thread::Queue version 3.05
         # Work on $item
     }
 
+    # Set a size for a queue
+    $q->limit = 5;
+
     # Get the second item in the queue without dequeuing anything
     my $item = $q->peek(1);
 
@@ -375,20 +393,20 @@ shared array reference via C<&shared([])>, copy the elements 'foo', 'bar'
 and 'baz' from C<@ary> into it, and then place that shared reference onto
 the queue:
 
-    my @ary = qw/foo bar baz/;
-    $q->enqueue(\@ary);
+ my @ary = qw/foo bar baz/;
+ $q->enqueue(\@ary);
 
 However, for the following, the items are already shared, so their references
 are added directly to the queue, and no cloning takes place:
 
-    my @ary :shared = qw/foo bar baz/;
-    $q->enqueue(\@ary);
+ my @ary :shared = qw/foo bar baz/;
+ $q->enqueue(\@ary);
 
-    my $obj = &shared({});
-    $$obj{'foo'} = 'bar';
-    $$obj{'qux'} = 99;
-    bless($obj, 'My::Class');
-    $q->enqueue($obj);
+ my $obj = &shared({});
+ $$obj{'foo'} = 'bar';
+ $$obj{'qux'} = 99;
+ bless($obj, 'My::Class');
+ $q->enqueue($obj);
 
 See L</"LIMITATIONS"> for caveats related to passing objects via queues.
 
@@ -423,7 +441,7 @@ Adds a list of items onto the end of the queue.
 Removes the requested number of items (default is 1) from the head of the
 queue, and returns them.  If the queue contains fewer than the requested
 number of items, then the thread will be blocked until the requisite number
-of items are available (i.e., until other threads <enqueue> more items).
+of items are available (i.e., until other threads C<enqueue> more items).
 
 =item ->dequeue_nb()
 
@@ -461,6 +479,21 @@ behaves the same as C<dequeue_nb>.
 Returns the number of items still in the queue.  Returns C<undef> if the queue
 has been ended (see below), and there are no more items in the queue.
 
+=item ->limit
+
+Sets the size of the queue.  If set, calls to C<enqueue()> will block until
+the number of pending items in the queue drops below the C<limit>.  The
+C<limit> does not prevent enqueuing items beyond that count:
+
+ my $q = Thread::Queue->new(1, 2);
+ $q->limit = 4;
+ $q->enqueue(3, 4, 5);   # Does not block
+ $q->enqueue(6);         # Blocks until at least 2 items are
+                         # dequeued
+ my $size = $q->limit;   # Returns the current limit (may return
+                         # 'undef')
+ $q->limit = 0;          # Queue size is now unlimited
+
 =item ->end()
 
 Declares that no more items will be added to the queue.
@@ -481,14 +514,14 @@ To prevent the contents of a queue from being modified by another thread
 while it is being examined and/or changed, L<lock|threads::shared/"lock
 VARIABLE"> the queue inside a local block:
 
-    {
-        lock($q);   # Keep other threads from changing the queue's contents
-        my $item = $q->peek();
-        if ($item ...) {
-            ...
-        }
-    }
-    # Queue is now unlocked
+ {
+     lock($q);   # Keep other threads from changing the queue's contents
+     my $item = $q->peek();
+     if ($item ...) {
+         ...
+     }
+ }
+ # Queue is now unlocked
 
 =over
 
@@ -513,18 +546,18 @@ Adds the list of items to the queue at the specified index position (0
 is the head of the list).  Any existing items at and beyond that position are
 pushed back past the newly added items:
 
-    $q->enqueue(1, 2, 3, 4);
-    $q->insert(1, qw/foo bar/);
-    # Queue now contains:  1, foo, bar, 2, 3, 4
+ $q->enqueue(1, 2, 3, 4);
+ $q->insert(1, qw/foo bar/);
+ # Queue now contains:  1, foo, bar, 2, 3, 4
 
 Specifying an index position greater than the number of items in the queue
 just adds the list to the end.
 
 Negative index positions are supported:
 
-    $q->enqueue(1, 2, 3, 4);
-    $q->insert(-2, qw/foo bar/);
-    # Queue now contains:  1, 2, foo, bar, 3, 4
+ $q->enqueue(1, 2, 3, 4);
+ $q->insert(-2, qw/foo bar/);
+ # Queue now contains:  1, 2, foo, bar, 3, 4
 
 Specifying a negative index position greater than the number of items in the
 queue adds the list to the head of the queue.
@@ -542,18 +575,18 @@ called with no arguments, C<extract> operates the same as C<dequeue_nb>.
 This method is non-blocking, and will return only as many items as are
 available to fulfill the request:
 
-    $q->enqueue(1, 2, 3, 4);
-    my $item  = $q->extract(2)     # Returns 3
-                                   # Queue now contains:  1, 2, 4
-    my @items = $q->extract(1, 3)  # Returns (2, 4)
-                                   # Queue now contains:  1
+ $q->enqueue(1, 2, 3, 4);
+ my $item  = $q->extract(2)     # Returns 3
+                                # Queue now contains:  1, 2, 4
+ my @items = $q->extract(1, 3)  # Returns (2, 4)
+                                # Queue now contains:  1
 
 Specifying an index position greater than the number of items in the
 queue results in C<undef> or an empty list being returned.
 
-    $q->enqueue('foo');
-    my $nada = $q->extract(3)      # Returns undef
-    my @nada = $q->extract(1, 3)   # Returns ()
+ $q->enqueue('foo');
+ my $nada = $q->extract(3)      # Returns undef
+ my @nada = $q->extract(1, 3)   # Returns ()
 
 Negative index positions are supported.  Specifying a negative index position
 greater than the number of items in the queue may return items from the head
@@ -561,11 +594,12 @@ of the queue (similar to C<dequeue_nb>) if the count overlaps the head of the
 queue from the specified position (i.e. if queue size + index + count is
 greater than zero):
 
-    $q->enqueue(qw/foo bar baz/);
-    my @nada = $q->extract(-6, 2);   # Returns ()         - (3+(-6)+2) <= 0
-    my @some = $q->extract(-6, 4);   # Returns (foo)      - (3+(-6)+4) > 0
-                                     # Queue now contains:  bar, baz
-    my @rest = $q->extract(-3, 4);   # Returns (bar, baz) - (2+(-3)+4) > 0
+ $q->enqueue(qw/foo bar baz/);
+ my @nada = $q->extract(-6, 2);  # Returns ()      - (3+(-6)+2) <= 0
+ my @some = $q->extract(-6, 4);  # Returns (foo)   - (3+(-6)+4) > 0
+                                 # Queue now contains:  bar, baz
+ my @rest = $q->extract(-3, 4);  # Returns (bar, baz) -
+                                 #                   (2+(-3)+4) > 0
 
 =back
 
diff --git a/Master/tlpkg/tlperl/lib/Tie/File.pm b/Master/tlpkg/tlperl/lib/Tie/File.pm
index df8a197867f..d546b81f44e 100644
--- a/Master/tlpkg/tlperl/lib/Tie/File.pm
+++ b/Master/tlpkg/tlperl/lib/Tie/File.pm
@@ -7,7 +7,7 @@ use Fcntl 'O_CREAT', 'O_RDWR', 'LOCK_EX', 'LOCK_SH', 'O_WRONLY', 'O_RDONLY';
 sub O_ACCMODE () { O_RDONLY | O_RDWR | O_WRONLY }
 
 
-$VERSION = "1.01";
+$VERSION = "1.02";
 my $DEFAULT_MEMORY_SIZE = 1<<21;    # 2 megabytes
 my $DEFAULT_AUTODEFER_THRESHHOLD = 3; # 3 records
 my $DEFAULT_AUTODEFER_FILELEN_THRESHHOLD = 65536; # 16 disk blocksful
@@ -2013,32 +2013,32 @@ Tie::File - Access the lines of a disk file via a Perl array
 
 =head1 SYNOPSIS
 
-	# This file documents Tie::File version 0.98
-	use Tie::File;
+ # This file documents Tie::File version 0.98
+ use Tie::File;
 
-	tie @array, 'Tie::File', filename or die ...;
+ tie @array, 'Tie::File', filename or die ...;
 
-	$array[13] = 'blah';     # line 13 of the file is now 'blah'
-	print $array[42];        # display line 42 of the file
+ $array[13] = 'blah';     # line 13 of the file is now 'blah'
+ print $array[42];        # display line 42 of the file
 
-	$n_recs = @array;        # how many records are in the file?
-	$#array -= 2;            # chop two records off the end
+ $n_recs = @array;        # how many records are in the file?
+ $#array -= 2;            # chop two records off the end
 
 
-	for (@array) {
-	  s/PERL/Perl/g;         # Replace PERL with Perl everywhere in the file
-	}
+ for (@array) {
+   s/PERL/Perl/g;        # Replace PERL with Perl everywhere in the file
+ }
 
-	# These are just like regular push, pop, unshift, shift, and splice
-	# Except that they modify the file in the way you would expect
+ # These are just like regular push, pop, unshift, shift, and splice
+ # Except that they modify the file in the way you would expect
 
-	push @array, new recs...;
-	my $r1 = pop @array;
-	unshift @array, new recs...;
-	my $r2 = shift @array;
-	@old_recs = splice @array, 3, 7, new recs...;
+ push @array, new recs...;
+ my $r1 = pop @array;
+ unshift @array, new recs...;
+ my $r2 = shift @array;
+ @old_recs = splice @array, 3, 7, new recs...;
 
-	untie @array;            # all finished
+ untie @array;            # all finished
 
 
 =head1 DESCRIPTION
@@ -2174,8 +2174,8 @@ The default memory limit is 2Mib.  You can adjust the maximum read
 cache size by supplying the C<memory> option.  The argument is the
 desired cache size, in bytes.
 
-	# I have a lot of memory, so use a large cache to speed up access
-	tie @array, 'Tie::File', $file, memory => 20_000_000;
+ # I have a lot of memory, so use a large cache to speed up access
+ tie @array, 'Tie::File', $file, memory => 20_000_000;
 
 Setting the memory limit to 0 will inhibit caching; records will be
 fetched from disk every time you examine them.
diff --git a/Master/tlpkg/tlperl/lib/Tie/Scalar.pm b/Master/tlpkg/tlperl/lib/Tie/Scalar.pm
index b56ac9abd88..50b97018ad1 100644
--- a/Master/tlpkg/tlperl/lib/Tie/Scalar.pm
+++ b/Master/tlpkg/tlperl/lib/Tie/Scalar.pm
@@ -1,6 +1,6 @@
 package Tie::Scalar;
 
-our $VERSION = '1.03';
+our $VERSION = '1.04';
 
 =head1 NAME
 
@@ -145,7 +145,7 @@ package Tie::StdScalar;
 
 sub TIESCALAR {
     my $class = shift;
-    my $instance = shift || undef;
+    my $instance = @_ ? shift : undef;
     return bless \$instance => $class;
 }
 
diff --git a/Master/tlpkg/tlperl/lib/Time/HiRes.pm b/Master/tlpkg/tlperl/lib/Time/HiRes.pm
index cf64bc1fbba..ad9a65c99d2 100644
--- a/Master/tlpkg/tlperl/lib/Time/HiRes.pm
+++ b/Master/tlpkg/tlperl/lib/Time/HiRes.pm
@@ -12,8 +12,13 @@ our @EXPORT = qw( );
 our @EXPORT_OK = qw (usleep sleep ualarm alarm gettimeofday time tv_interval
 		 getitimer setitimer nanosleep clock_gettime clock_getres
 		 clock clock_nanosleep
-		 CLOCK_HIGHRES CLOCK_MONOTONIC CLOCK_PROCESS_CPUTIME_ID
-		 CLOCK_REALTIME CLOCK_SOFTTIME CLOCK_THREAD_CPUTIME_ID
+		 CLOCK_BOOTTIME CLOCK_HIGHRES
+		 CLOCK_MONOTONIC CLOCK_MONOTONIC_COARSE
+		 CLOCK_MONOTONIC_PRECISE CLOCK_MONOTONIC_RAW
+		 CLOCK_PROCESS_CPUTIME_ID
+		 CLOCK_REALTIME CLOCK_REALTIME_COARSE
+		 CLOCK_REALTIME_FAST CLOCK_REALTIME_PRECISE
+		 CLOCK_SECOND CLOCK_SOFTTIME CLOCK_THREAD_CPUTIME_ID
 		 CLOCK_TIMEOFDAY CLOCKS_PER_SEC
 		 ITIMER_REAL ITIMER_VIRTUAL ITIMER_PROF ITIMER_REALPROF
 		 TIMER_ABSTIME
@@ -23,7 +28,7 @@ our @EXPORT_OK = qw (usleep sleep ualarm alarm gettimeofday time tv_interval
 		 stat lstat
 		);
 
-our $VERSION = '1.9726';
+our $VERSION = '1.9733';
 our $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
@@ -115,7 +120,8 @@ Time::HiRes - High resolution alarm, sleep, gettimeofday, interval timers
   getitimer ($which);
 
   use Time::HiRes qw( clock_gettime clock_getres clock_nanosleep
-		      ITIMER_REAL ITIMER_VIRTUAL ITIMER_PROF ITIMER_REALPROF );
+		      ITIMER_REAL ITIMER_VIRTUAL ITIMER_PROF
+                      ITIMER_REALPROF );
 
   $realtime   = clock_gettime(CLOCK_REALTIME);
   $resolution = clock_getres(CLOCK_REALTIME);
@@ -356,6 +362,13 @@ specified by C<$which>.  All implementations that support POSIX high
 resolution timers are supposed to support at least the C<$which> value
 of C<CLOCK_REALTIME>, see L</clock_gettime>.
 
+B<NOTE>: the resolution returned may be highly optimistic.  Even if
+the resolution is high (a small number), all it means is that you'll
+be able to specify the arguments to clock_gettime() and clock_nanosleep()
+with that resolution.  The system might not actually be able to measure
+events at that resolution, and the various overheads and the overall system
+load are certain to affect any timings.
+
 =item clock_nanosleep ( $which, $nanoseconds, $flags = 0)
 
 Sleeps for the number of nanoseconds (1e9ths of a second) specified.
@@ -510,7 +523,7 @@ modglobal hash:
 
   name             C prototype
   ---------------  ----------------------
-  Time::NVtime     double (*)()
+  Time::NVtime     NV (*)()
   Time::U2time     void (*)(pTHX_ UV ret[2])
 
 Both functions return equivalent information (like C<gettimeofday>)
@@ -521,12 +534,12 @@ VMS have emulations for it.)
 
 Here is an example of using C<NVtime> from C:
 
-  double (*myNVtime)(); /* Returns -1 on failure. */
+  NV (*myNVtime)(); /* Returns -1 on failure. */
   SV **svp = hv_fetch(PL_modglobal, "Time::NVtime", 12, 0);
   if (!svp)         croak("Time::HiRes is required");
   if (!SvIOK(*svp)) croak("Time::NVtime isn't a function pointer");
-  myNVtime = INT2PTR(double(*)(), SvIV(*svp));
-  printf("The current time is: %f\n", (*myNVtime)());
+  myNVtime = INT2PTR(NV(*)(), SvIV(*svp));
+  printf("The current time is: %" NVff "\n", (*myNVtime)());
 
 =head1 DIAGNOSTICS
 
@@ -573,6 +586,10 @@ might help in this (in case your system supports CLOCK_MONOTONIC).
 Some systems have APIs but not implementations: for example QNX and Haiku
 have the interval timer APIs but not the functionality.
 
+In OS X clock_getres(), clock_gettime() and clock_nanosleep() are
+emulated using the Mach timers; as a side effect of being emulated
+the CLOCK_REALTIME and CLOCK_MONOTONIC are the same timer.
+
 =head1 SEE ALSO
 
 Perl modules L<BSD::Resource>, L<Time::TAI64>.
diff --git a/Master/tlpkg/tlperl/lib/Time/Piece.pm b/Master/tlpkg/tlperl/lib/Time/Piece.pm
index aaf63eebb78..6dbf4d69c44 100644
--- a/Master/tlpkg/tlperl/lib/Time/Piece.pm
+++ b/Master/tlpkg/tlperl/lib/Time/Piece.pm
@@ -2,13 +2,14 @@ package Time::Piece;
 
 use strict;
 
-require Exporter;
 require DynaLoader;
 use Time::Seconds;
 use Carp;
 use Time::Local;
 
-our @ISA = qw(Exporter DynaLoader);
+our @ISA = qw(DynaLoader);
+ 
+use Exporter ();
 
 our @EXPORT = qw(
     localtime
@@ -19,7 +20,7 @@ our %EXPORT_TAGS = (
     ':override' => 'internal',
     );
 
-our $VERSION = '1.29';
+our $VERSION = '1.31';
 
 bootstrap Time::Piece $VERSION;
 
@@ -31,17 +32,19 @@ my @FULLMON_LIST = qw(January February March April May June July
 my @DAY_LIST = qw(Sun Mon Tue Wed Thu Fri Sat);
 my @FULLDAY_LIST = qw(Sunday Monday Tuesday Wednesday Thursday Friday Saturday);
 
-use constant 'c_sec' => 0;
-use constant 'c_min' => 1;
-use constant 'c_hour' => 2;
-use constant 'c_mday' => 3;
-use constant 'c_mon' => 4;
-use constant 'c_year' => 5;
-use constant 'c_wday' => 6;
-use constant 'c_yday' => 7;
-use constant 'c_isdst' => 8;
-use constant 'c_epoch' => 9;
-use constant 'c_islocal' => 10;
+use constant {
+    'c_sec' => 0,
+    'c_min' => 1,
+    'c_hour' => 2,
+    'c_mday' => 3,
+    'c_mon' => 4,
+    'c_year' => 5,
+    'c_wday' => 6,
+    'c_yday' => 7,
+    'c_isdst' => 8,
+    'c_epoch' => 9,
+    'c_islocal' => 10,
+};
 
 sub localtime {
     unshift @_, __PACKAGE__ unless eval { $_[0]->isa('Time::Piece') };
@@ -62,9 +65,9 @@ sub gmtime {
 sub new {
     my $class = shift;
     my ($time) = @_;
-    
+
     my $self;
-    
+
     if (defined($time)) {
         $self = $class->localtime($time);
     }
@@ -74,7 +77,7 @@ sub new {
     else {
         $self = $class->localtime();
     }
-    
+
     return bless $self, ref($class) || $class;
 }
 
@@ -82,6 +85,10 @@ sub parse {
     my $proto = shift;
     my $class = ref($proto) || $proto;
     my @components;
+
+    warnings::warnif("deprecated", 
+        "parse() is deprecated, use strptime() instead.");
+
     if (@_ > 1) {
         @components = @_;
     }
@@ -89,7 +96,7 @@ sub parse {
         @components = shift =~ /(\d+)$DATE_SEP(\d+)$DATE_SEP(\d+)(?:(?:T|\s+)(\d+)$TIME_SEP(\d+)(?:$TIME_SEP(\d+)))/;
         @components = reverse(@components[0..5]);
     }
-    return $class->new(_strftime("%s", @components));
+    return $class->new(_strftime("%s", timelocal(@components)));
 }
 
 sub _mktime {
@@ -98,7 +105,9 @@ sub _mktime {
            ? ref $class
            : $class;
     if (ref($time)) {
-        $time->[c_epoch] = undef;
+        my @tm_parts = (@{$time}[c_sec .. c_mon], $time->[c_year]+1900);
+        $time->[c_epoch] = $islocal ? timelocal(@tm_parts) : timegm(@tm_parts);
+
         return wantarray ? @$time : bless [@$time[0..9], $islocal], $class;
     }
     _tzset();
@@ -122,13 +131,13 @@ sub export {
       no warnings 'redefine';
       *{$to . "::$method"} = $_special_exports{$method}->($class);
     } else {
-      $class->SUPER::export($to, $method);
+      $class->Exporter::export($to, $method);
     }
   }
 }
 
 sub import {
-    # replace CORE::GLOBAL localtime and gmtime if required
+    # replace CORE::GLOBAL localtime and gmtime if passed :override
     my $class = shift;
     my %params;
     map($params{$_}++,@_,@EXPORT);
@@ -136,7 +145,7 @@ sub import {
         $class->export('CORE::GLOBAL', keys %params);
     }
     else {
-        $class->export((caller)[0], keys %params);
+        $class->export(scalar caller, keys %params);
     }
 }
 
@@ -279,7 +288,7 @@ sub isdst {
 # Thanks to Tony Olekshy <olekshy@cs.ualberta.ca> for this algorithm
 sub tzoffset {
     my $time = shift;
-    
+
     return Time::Seconds->new(0) unless $time->[c_islocal];
 
     my $epoch = $time->epoch;
@@ -447,19 +456,22 @@ sub month_last_day {
     return $MON_LAST[$_mon] + ($_mon == 1 ? _is_leap_year($year) : 0);
 }
 
+#since %z and %Z are not portable lets just
+#parse it out before calling native strftime
+#(but only if we are in UTC time)
+my %GMT_REPR = (
+    '%z' => '+0000',
+    '%Z' => 'UTC',
+);
+
 sub strftime {
     my $time = shift;
-    my $tzname = $time->[c_islocal] ? '%Z' : 'UTC';
-    my $format = @_ ? shift(@_) : "%a, %d %b %Y %H:%M:%S $tzname";
-    if (!defined $time->[c_wday]) {
-        if ($time->[c_islocal]) {
-            return _strftime($format, CORE::localtime($time->epoch));
-        }
-        else {
-            return _strftime($format, CORE::gmtime($time->epoch));
-        }
+    my $format = @_ ? shift(@_) : '%a, %d %b %Y %H:%M:%S %Z';
+    if (! $time->[c_islocal]) {
+        $format =~ s/(%.)/$GMT_REPR{$1} || $1/eg;
     }
-    return _strftime($format, (@$time)[c_sec..c_isdst]);
+
+    return _strftime($format, $time->epoch, $time->[c_islocal]);
 }
 
 sub strptime {
@@ -550,7 +562,7 @@ sub subtract {
 	# to override this function.
 	return $rhs - "$time";
     }
-    
+
     if (UNIVERSAL::isa($rhs, 'Time::Piece')) {
         return Time::Seconds->new($time->epoch - $rhs->epoch);
     }
@@ -592,9 +604,9 @@ sub compare {
 
 sub add_months {
     my ($time, $num_months) = @_;
-    
+
     croak("add_months requires a number of months") unless defined($num_months);
-    
+
     my $final_month = $time->_mon + $num_months;
     my $num_years = 0;
     if ($final_month > 11 || $final_month < 0) {
@@ -607,10 +619,10 @@ sub add_months {
             $num_years = int($final_month / 12);
         }
         $num_years-- if ($final_month < 0);
-        
+
         $final_month = $final_month % 12;
     }
-    
+
     my @vals = _mini_mktime($time->sec, $time->min, $time->hour,
                             $time->mday, $final_month, $time->year - 1900 + $num_years);
     # warn(sprintf("got %d vals: %d-%d-%d %d:%d:%d [%d]\n", scalar(@vals), reverse(@vals), $time->[c_islocal]));
@@ -701,7 +713,7 @@ following methods are available on the object:
 
     $t->week                # week number (ISO 8601)
 
-    $t->is_leap_year        # true if it its
+    $t->is_leap_year        # true if it's a leap year
     $t->month_last_day      # 28-31
 
     $t->time_separator($s)  # set the default separator (default ":")
diff --git a/Master/tlpkg/tlperl/lib/Time/Seconds.pm b/Master/tlpkg/tlperl/lib/Time/Seconds.pm
index 8e5b52b269f..965e3a6e502 100644
--- a/Master/tlpkg/tlperl/lib/Time/Seconds.pm
+++ b/Master/tlpkg/tlperl/lib/Time/Seconds.pm
@@ -1,53 +1,49 @@
 package Time::Seconds;
 use strict;
-use vars qw/@EXPORT @EXPORT_OK/;
 
-our $VERSION = '1.29';
+our $VERSION = '1.31';
 
 use Exporter 5.57 'import';
 
-@EXPORT = qw(
-    ONE_MINUTE 
-    ONE_HOUR 
-    ONE_DAY 
-    ONE_WEEK 
+our @EXPORT = qw(
+    ONE_MINUTE
+    ONE_HOUR
+    ONE_DAY
+    ONE_WEEK
     ONE_MONTH
-    ONE_REAL_MONTH
     ONE_YEAR
-    ONE_REAL_YEAR
     ONE_FINANCIAL_MONTH
-    LEAP_YEAR 
+    LEAP_YEAR
     NON_LEAP_YEAR
 );
 
-@EXPORT_OK = qw(cs_sec cs_mon);
-
-use constant ONE_MINUTE => 60;
-use constant ONE_HOUR => 3_600;
-use constant ONE_DAY => 86_400;
-use constant ONE_WEEK => 604_800;
-use constant ONE_MONTH => 2_629_744; # ONE_YEAR / 12
-use constant ONE_REAL_MONTH => '1M';
-use constant ONE_YEAR => 31_556_930; # 365.24225 days
-use constant ONE_REAL_YEAR  => '1Y';
-use constant ONE_FINANCIAL_MONTH => 2_592_000; # 30 days
-use constant LEAP_YEAR => 31_622_400; # 366 * ONE_DAY
-use constant NON_LEAP_YEAR => 31_536_000; # 365 * ONE_DAY
-
-# hacks to make Time::Piece compile once again
-use constant cs_sec => 0;
-use constant cs_mon => 1;
-
-use overload 
-                'fallback' => 'undef',
-                '0+' => \&seconds,
-                '""' => \&seconds,
-                '<=>' => \&compare,
-                '+' => \&add,
-                '-' => \&subtract,
-                '-=' => \&subtract_from,
-                '+=' => \&add_to,
-                '=' => \&copy;
+our @EXPORT_OK = qw(cs_sec cs_mon);
+
+use constant {
+    ONE_MINUTE => 60,
+    ONE_HOUR => 3_600,
+    ONE_DAY => 86_400,
+    ONE_WEEK => 604_800,
+    ONE_MONTH => 2_629_744, # ONE_YEAR / 12
+    ONE_YEAR => 31_556_930, # 365.24225 days
+    ONE_FINANCIAL_MONTH => 2_592_000, # 30 days
+    LEAP_YEAR => 31_622_400, # 366 * ONE_DAY
+    NON_LEAP_YEAR => 31_536_000, # 365 * ONE_DAY
+    # hacks to make Time::Piece compile once again
+    cs_sec => 0,
+    cs_mon => 1,
+};
+
+use overload
+    'fallback' => 'undef',
+    '0+' => \&seconds,
+    '""' => \&seconds,
+    '<=>' => \&compare,
+    '+' => \&add,
+    '-' => \&subtract,
+    '-=' => \&subtract_from,
+    '+=' => \&add_to,
+    '=' => \&copy;
 
 sub new {
     my $class = shift;
@@ -229,8 +225,8 @@ The following methods are available:
     $val->hours;
     $val->days;
     $val->weeks;
-	$val->months;
-	$val->financial_months; # 30 days
+    $val->months;
+    $val->financial_months; # 30 days
     $val->years;
     $val->pretty; # gives English representation of the delta
 
diff --git a/Master/tlpkg/tlperl/lib/UNIVERSAL.pm b/Master/tlpkg/tlperl/lib/UNIVERSAL.pm
index 2f16cb544ab..12800fb54cc 100644
--- a/Master/tlpkg/tlperl/lib/UNIVERSAL.pm
+++ b/Master/tlpkg/tlperl/lib/UNIVERSAL.pm
@@ -1,6 +1,6 @@
 package UNIVERSAL;
 
-our $VERSION = '1.12';
+our $VERSION = '1.13';
 
 # UNIVERSAL should not contain any extra subs/methods beyond those
 # that it exists to define. The existence of import() below is a historical
@@ -186,10 +186,8 @@ None.
 Previous versions of this documentation suggested using C<isa> as
 a function to determine the type of a reference:
 
-  use UNIVERSAL 'isa';
-
-  $yes = isa $h, "HASH";
-  $yes = isa "Foo", "Bar";
+  $yes = UNIVERSAL::isa($h, "HASH");
+  $yes = UNIVERSAL::isa("Foo", "Bar");
 
 The problem is that this code would I<never> call an overridden C<isa> method in
 any class.  Instead, use C<reftype> from L<Scalar::Util> for the first case:
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate.pm b/Master/tlpkg/tlperl/lib/Unicode/Collate.pm
index f939b66d550..493c281a837 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate.pm
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate.pm
@@ -17,7 +17,7 @@ use File::Spec;
 
 no warnings 'utf8';
 
-our $VERSION = '1.12';
+our $VERSION = '1.14';
 our $PACKAGE = __PACKAGE__;
 
 ### begin XS only ###
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Big5.pm b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Big5.pm
index 0ea47af2ee7..63999976230 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Big5.pm
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Big5.pm
@@ -4,7 +4,7 @@ use 5.006;
 use strict;
 use warnings;
 
-our $VERSION = '1.12';
+our $VERSION = '1.14';
 
 my %u2p;
 my $wt = 0x8000;
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/GB2312.pm b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/GB2312.pm
index 8052bfa580c..f33eb693fe6 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/GB2312.pm
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/GB2312.pm
@@ -4,7 +4,7 @@ use 5.006;
 use strict;
 use warnings;
 
-our $VERSION = '1.12';
+our $VERSION = '1.14';
 
 my %u2p;
 my $wt = 0x8000;
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/JISX0208.pm b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/JISX0208.pm
index e8d5f4425d0..492496b652f 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/JISX0208.pm
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/JISX0208.pm
@@ -4,7 +4,7 @@ use 5.006;
 use strict;
 use warnings;
 
-our $VERSION = '1.12';
+our $VERSION = '1.14';
 
 my %u2p;
 my $wt = 0x8000;
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Korean.pm b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Korean.pm
index 3746d01d4e4..04ef6763f85 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Korean.pm
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Korean.pm
@@ -3,34 +3,32 @@ package Unicode::Collate::CJK::Korean;
 use 5.006;
 use strict;
 use warnings;
-use Unicode::Collate;
 
-our $VERSION = '1.12';
+our $VERSION = '1.14';
 
 my %jamo2prim = (
-    0x1100, 0x376F,   0x1101, 0x3770,   0x1102, 0x3771,   0x1103, 0x3772,
-    0x1105, 0x3774,   0x1106, 0x3775,   0x1107, 0x3776,   0x1109, 0x3778,
-    0x110A, 0x3779,   0x110B, 0x377A,   0x110C, 0x377B,   0x110E, 0x377D,
-    0x110F, 0x377E,   0x1110, 0x377F,   0x1111, 0x3780,   0x1112, 0x3781,
-    0x1161, 0x37ED,   0x1162, 0x37EE,   0x1163, 0x37EF,   0x1165, 0x37F1,
-    0x1166, 0x37F2,   0x1167, 0x37F3,   0x1168, 0x37F4,   0x1169, 0x37F5,
-    0x116A, 0x37F6,   0x116B, 0x37F7,   0x116C, 0x37F8,   0x116D, 0x37F9,
-    0x116E, 0x37FA,   0x116F, 0x37FB,   0x1170, 0x37FC,   0x1171, 0x37FD,
-    0x1172, 0x37FE,   0x1173, 0x37FF,   0x1174, 0x3800,   0x1175, 0x3801,
-    0x11A8, 0x384B,   0x11AB, 0x384E,   0x11AF, 0x3852,   0x11B7, 0x385A,
-    0x11B8, 0x385B,   0x11BC, 0x385F,   0x11BD, 0x3860,
+    '1100', 0x376F,   '1101', 0x3770,   '1102', 0x3771,   '1103', 0x3772,
+    '1105', 0x3774,   '1106', 0x3775,   '1107', 0x3776,   '1109', 0x3778,
+    '110A', 0x3779,   '110B', 0x377A,   '110C', 0x377B,   '110E', 0x377D,
+    '110F', 0x377E,   '1110', 0x377F,   '1111', 0x3780,   '1112', 0x3781,
+    '1161', 0x37ED,   '1162', 0x37EE,   '1163', 0x37EF,   '1165', 0x37F1,
+    '1166', 0x37F2,   '1167', 0x37F3,   '1168', 0x37F4,   '1169', 0x37F5,
+    '116A', 0x37F6,   '116B', 0x37F7,   '116C', 0x37F8,   '116D', 0x37F9,
+    '116E', 0x37FA,   '116F', 0x37FB,   '1170', 0x37FC,   '1171', 0x37FD,
+    '1172', 0x37FE,   '1173', 0x37FF,   '1174', 0x3800,   '1175', 0x3801,
+    '11A8', 0x384B,   '11AB', 0x384E,   '11AF', 0x3852,   '11B7', 0x385A,
+    '11B8', 0x385B,   '11BC', 0x385F,   '11BD', 0x3860,
 ); # for DUCET v7.0.0
 
 my(%u2e, $prim, $wt);
 while (<DATA>) {
     last if /^__END__/;
     my @c = split;
-    if (@c == 1 && $c[0] =~ /^[A-D]/) {
-	my $u = hex $c[0];
-	my @h = Unicode::Collate::_decompHangul($u);
-	$prim = [ map $jamo2prim{$_}, @h ];
+    if (@c == 1 && $c[0] =~ /^[A-D]/) { # hangul
+	$c[0] =~ s/^.*://;
+	$prim = [ map $jamo2prim{$_}, split /-/, $c[0] ];
 	$wt = 0x20;
-    } else {
+    } else { # ideographs
 	for my $c (@c) {
 	    next if !$c;
 	    $wt++;
@@ -49,74 +47,79 @@ sub weightKorean {
 }
 
 1;
+
+# DATA format
+# hangul syllable:jamo-jamo(-jamo)
+# equiv. ideographs
+
 __DATA__
-AC00
+AC00:1100-1161
 4F3D 4F73 5047 50F9 52A0 53EF 5475 54E5 5609 5AC1
 5BB6 6687 67B6 67B7 67EF 6B4C 73C2 75C2 7A3C 82DB
 8304 8857 8888 8A36 8CC8 8DCF 8EFB 8FE6 99D5 4EEE
 50A2 5496 54FF 5777 5B8A 659D 698E 6A9F 73C8 7B33
 801E 8238 846D 8B0C
-AC01
+AC01:1100-1161-11A8
 523B 5374 5404 606A 6164 6BBC 73CF 811A 89BA 89D2
 95A3 537B 54AF 57C6 6409 64F1 6877
-AC04
+AC04:1100-1161-11AB
 4F83 520A 58BE 5978 59E6 5E72 5E79 61C7 63C0 6746
 67EC 687F 6F97 764E 770B 78F5 7A08 7AFF 7C21 809D
 826E 8271 8AEB 9593 5058 6173 681E 69A6 7395 79C6
 831B 884E 8D76 8FC0 9F66
-AC08
+AC08:1100-1161-11AF
 4E6B 559D 66F7 6E34 78A3 7AED 845B 8910 874E 97A8
 5676 696C 79F8 7FAF 880D 9DA1
-AC10
+AC10:1100-1161-11B7
 52D8 574E 582A 5D4C 611F 61BE 6221 6562 67D1 6A44
 6E1B 7518 75B3 76E3 77B0 7D3A 90AF 9451 9452 9F95
 5769 57F3 5D41 5F07 61A8 64BC 6B3F 6B5B 6CD4 6DE6
 6F89 77D9 8F57 9163 9E7B
-AC11
+AC11:1100-1161-11B8
 5323 5CAC 7532 80DB 9240 9598 97D0
-AC15
+AC15:1100-1161-11BC
 525B 5808 59DC 5CA1 5D17 5EB7 5F3A 5F4A 6177 6C5F
 757A 7586 7CE0 7D73 7DB1 7F8C 8154 8221 8591 8941
 8B1B 92FC 964D 9C47 508B 50F5 58C3 5FFC 625B 6760
 6A7F 6BAD 77FC 7A45 7E48 7F61 7F97 7FAB 8333 8C47
 97C1
-AC1C
+AC1C:1100-1162
 4ECB 4EF7 500B 51F1 584F 6137 613E 6168 6539 69EA
 6F11 75A5 7686 76D6 7B87 82A5 84CB 93A7 958B 5274
 5303 63E9 69E9 73A0 78D5 95D3
-AC1D
+AC1D:1100-1162-11A8
 5580 5BA2
-AC31
+AC31:1100-1162-11BC
 5751 7CB3 7FB9 785C 8CE1 93D7
-AC39
+AC39:1100-1163-11A8
 91B5
-AC70
+AC70:1100-1165
 5028 53BB 5C45 5DE8 62D2 636E 64DA 64E7 6E20 70AC
 795B 8DDD 8E1E 907D 9245 92F8 547F 661B 79EC 7B65
 7C67 80E0 8152 82E3 8392 8556 8627 88AA 88FE 99CF
-AC74
+AC74:1100-1165-11AB
 4E7E 4EF6 5065 5DFE 5EFA 6106 6957 8171 8654 8E47
 9375 9A2B 63F5 728D 7777 8930 8B07 97AC
-AC78
+AC78:1100-1165-11AF
 4E5E 5091 6770 6840 4E6C 6705 69A4
-AC80
+AC80:1100-1165-11B7
 5109 528D 5292 6AA2 77BC 9210 9ED4 64BF 82A1
-AC81
+AC81:1100-1165-11B8
 52AB 602F 8FF2 5226 5227
-AC8C
+AC8C:1100-1166
 5048 61A9 63ED
-ACA9
+ACA9:1100-1167-11A8
 64CA 683C 6A84 6FC0 8188 89A1 9694 630C 6BC4 95C3
 9ABC 9B32 9D03
-ACAC
+ACAC:1100-1167-11AB
 5805 727D 72AC 7504 7D79 7E6D 80A9 898B 8B74 9063
 9D51 6A2B 72F7 754E 7B67 7E33 7E7E 7F82 8832 9C39
-ACB0
+ACB0:1100-1167-11AF
 6289 6C7A 6F54 7D50 7F3A 8A23 73A6 89D6 95CB
-ACB8
+ACB8:1100-1167-11B7
 517C 614A 7B9D 8B19 9257 938C 5094 55DB 5C92 62D1
 6B49 7E11 84B9 9EDA 9F38
-ACBD
+ACBD:1100-1167-11BC
 4EAC 4FD3 501E 50BE 5106 52C1 52CD 537F 5770 5883
 5E9A 5F91 6176 61AC 64CE 656C 666F 66BB 66F4 6897
 6D87 7085 70F1 749F 74A5 74CA 75D9 786C 78EC 7ADF
@@ -124,12 +127,12 @@ ACBD
 93E1 9803 9838 9A5A 9BE8 518F 5244 54FD 60F8 61BC
 6243 6AA0 7162 712D 71B2 754A 7AF8 7D86 9848 7F44
 8927 8B26 99C9 9BC1 9EE5
-ACC4
+ACC4:1100-1168
 4FC2 5553 583A 5951 5B63 5C46 60B8 6212 6842 68B0
 68E8 6EAA 754C 7678 78CE 7A3D 7CFB 7E6B 7E7C 8A08
 8AA1 8C3F 968E 9DC4 5826 70D3 7608 798A 7B53 7DAE
 7E18 7F7D 846A 858A 96DE 9AFB
-ACE0
+ACE0:1100-1169
 53E4 53E9 544A 5471 56FA 59D1 5B64 5C3B 5EAB 62F7
 6537 6545 6572 66A0 67AF 69C1 6CBD 75FC 7690 777E
 7A3F 7F94 8003 80A1 818F 82E6 82FD 83F0 85C1 8831
@@ -137,54 +140,54 @@ ACE0
 5233 5859 6772 6832 69C0 69F9 6ADC 726F 768B 76EC
 77BD 7A01 7B8D 7BD9 7CD5 7F5F 7F96 7FFA 80EF 89DA
 8A41 90DC 9164 9237 9760 9D23 9DF1
-ACE1
+ACE1:1100-1169-11A8
 54ED 659B 66F2 688F 7A40 8C37 9D60 56B3 69F2 7E20
 89F3 8F42
-ACE4
+ACE4:1100-1169-11AB
 56F0 5764 5D11 6606 68B1 68CD 6EFE 7428 889E 9BE4
 5803 5D10 6083 6346 7DC4 886E 88CD 890C 9315 95AB
 9AE1 9D7E 9DA4 9F6B
-ACE8
+ACE8:1100-1169-11AF
 6C68 9AA8 6430 69BE 77FB 9DBB
-ACF5
+ACF5:1100-1169-11BC
 4F9B 516C 5171 529F 5B54 5DE5 6050 606D 62F1 63A7
 653B 73D9 7A7A 86A3 8CA2 978F 5025 5D06 60BE 6831
 69D3 7B9C 86E9 86EC 8D1B 8DEB 91ED 9F94
-ACF6
+ACF6:1100-1169-11BD
 4E32
-ACFC
+ACFC:1100-116A
 5BE1 6208 679C 74DC 79D1 83D3 8A87 8AB2 8DE8 904E
 934B 9846 4F89 581D 5925 5938 64BE 7313 7A1E 7AA0
 874C 88F9 8E1D 9299 9A0D
-ACFD
+ACFD:1100-116A-11A8
 5ED3 69E8 85FF 90ED 6901 7668 8EA9 970D 97B9
-AD00
+AD00:1100-116A-11AB
 51A0 5B98 5BEC 6163 68FA 6B3E 704C 742F 74D8 7BA1
 7F50 83C5 89C0 8CAB 95DC 9928 4E31 6DAB 721F 76E5
 797C 7ABE 7B66 7DB0 8F28 9327 9475 96DA 9874 9AD6
 9E1B
-AD04
+AD04:1100-116A-11AF
 522E 605D 62EC 9002 4F78 681D 7B48 8052 9AFA 9D30
-AD11
+AD11:1100-116A-11BC
 4F8A 5149 5321 58D9 5EE3 66E0 6D38 709A 72C2 73D6
 7B50 80F1 945B 6047 6844 6846 720C 7377 78FA 7D56
 7E8A 832A 8A86 8A91
-AD18
+AD18:1100-116B
 5366 639B 7F6B 54BC 6302 7F63 8A7F
-AD34
+AD34:1100-116C
 4E56 5080 584A 58DE 602A 6127 62D0 69D0 9B41 5ABF
 5EE5 6060 7470 749D 84AF 8958
-AD35
+AD35:1100-116C-11A8
 9998
-AD49
+AD49:1100-116C-11BC
 5B8F 7D18 80B1 8F5F 6D64 89E5 8A07 958E
-AD50
+AD50:1100-116D
 4EA4 50D1 54AC 55AC 5B0C 5DA0 5DE7 652A 654E 6821
 6A4B 72E1 768E 77EF 7D5E 7FF9 81A0 854E 86DF 8F03
 8F4E 90CA 9903 9A55 9BAB 4F7C 5604 5610 566D 5699
 59E3 618D 649F 6648 669E 69B7 78FD 7A96 8DAB 8E7B
 9278 9AB9 9D41 9F69
-AD6C
+AD6C:1100-116E
 4E18 4E45 4E5D 4EC7 4FF1 5177 52FE 5340 53E3 53E5
 548E 5614 5775 57A2 5BC7 5D87 5ED0 61FC 62D8 6551
 67B8 67E9 69CB 6B50 6BC6 6BEC 6C42 6E9D 7078 72D7
@@ -196,49 +199,49 @@ AD6C
 759A 75C0 766F 7A9B 7AB6 7BDD 7CD7 80CA 849F 86AF
 88D8 89AF 8A6C 9058 91E6 97DD 97ED 97EE 98B6 99C8
 9B2E 9DC7 9E1C
-AD6D
+AD6D:1100-116E-11A8
 570B 5C40 83CA 97A0 97AB 9EB4 530A 63AC 8DFC 9EAF
-AD70
+AD70:1100-116E-11AB
 541B 7A98 7FA4 88D9 8ECD 90E1 6343 687E 76B8
-AD74
+AD74:1100-116E-11AF
 5800 5C48 6398 7A9F 5014 5D1B 6DC8 8A58
-AD81
+AD81:1100-116E-11BC
 5BAE 5F13 7A79 7AAE 828E 8EAC 8EB3
-AD8C
+AD8C:1100-116F-11AB
 5026 5238 52F8 5377 5708 62F3 6372 6B0A 6DC3 7737
 52CC 60D3 68EC 7760 7DA3 8737
-AD90
+AD90:1100-116F-11AF
 53A5 7357 8568 8E76 95D5
-ADA4
+ADA4:1100-1170
 673A 6AC3 6F70 8A6D 8ECC 994B 4F79 51E0 5282 5331
 6192 6485 6A3B 6C3F 7C0B 7E62 8DEA 95E0 993D 9E82
-ADC0
+ADC0:1100-1171
 6677 6B78 8CB4 9B3C
-ADDC
+ADDC:1100-1172
 53EB 572D 594E 63C6 69FB 73EA 7845 7ABA 7AC5 7CFE
 8475 898F 8D73 9035 95A8 5232 5AE2 5B00 5DCB 668C
 694F 6A1B 6F59 777D 7CFA 866C 866F 8DEC 90BD 95DA
 980D 9997
-ADE0
+ADE0:1100-1172-11AB
 52FB 5747 7547 7B60 83CC 921E 56F7 9E8F
-ADE4
+ADE4:1100-1172-11AF
 6A58
-ADF9
+ADF9:1100-1173-11A8
 514B 524B 5287 621F 68D8 6975 9699 4E9F 5C05 5C50
 90C4
-ADFC
+ADFC:1100-1173-11AB
 50C5 52A4 52E4 61C3 65A4 6839 69FF 747E 7B4B 82B9
 83EB 89B2 8B39 8FD1 9949 537A 53AA 5890 5DF9 5ED1
 6F0C 89D4 8DDF 91FF 9773
-AE08
+AE08:1100-1173-11B7
 4ECA 5997 64D2 6611 6A8E 7434 7981 79BD 82A9 887E
 887F 895F 9326 552B 5664 5D94 7B12 9EC5
-AE09
+AE09:1100-1173-11B8
 4F0B 53CA 6025 6271 6C72 7D1A 7D66 573E 5C8C 7680
 790F 7B08 82A8
-AE0D
+AE0D:1100-1173-11BC
 4E98 5162 77DC 80AF 4E99 6B91
-AE30
+AE30:1100-1175
 4F01 4F0E 5176 5180 55DC 5668 573B 57FA 57FC 5914
 5947 5993 5BC4 5C90 5D0E 5DF1 5E7E 5FCC 6280 65D7
 65E3 671E 671F 675E 68CB 68C4 6A5F 6B3A 6C23 6C7D
@@ -249,362 +252,362 @@ AE30
 5FEE 612D 638E 6532 65C2 66A3 66C1 68CA 6B67 7081
 7309 79A8 7DA5 7DA6 7F87 80B5 82AA 82B0 8604 8641
 871D 87E3 8989 89AC 8DC2 9691 980E 9B10 9C2D 9ED6
-AE34
+AE34:1100-1175-11AB
 7DCA
-AE38
+AE38:1100-1175-11AF
 4F76 5409 62EE 6854 59DE 86E3
-AE40
+AE40:1100-1175-11B7
 91D1
-B07D
+B07D:1101-1175-11A8
 55AB
-B098
+B098:1102-1161
 513A 5A1C 61E6 62CF 62FF 90A3 6310 632A 689B 7CE5
 7CEF
-B099
+B099:1102-1161-11A8
 8AFE
-B09C
+B09C:1102-1161-11AB
 6696 7156 96E3 5044 7157 8D67 992A
-B0A0
+B0A0:1102-1161-11AF
 634F 637A
-B0A8
+B0A8:1102-1161-11B7
 5357 678F 6960 6E73 7537 5583 67DF
-B0A9
+B0A9:1102-1161-11B8
 7D0D 8872
-B0AD
+B0AD:1102-1161-11BC
 56CA 5A18 66E9
-B0B4
+B0B4:1102-1162
 4E43 5167 5948 67F0 8010 5302 5976 5B2D 8FFA 9F10
-B140
+B140:1102-1167
 5973
-B141
+B141:1102-1167-11A8
 60C4
-B144
+B144:1102-1167-11AB
 5E74 649A 79CA 78BE
-B150
+B150:1102-1167-11B7
 5FF5 606C 62C8 637B
-B155
+B155:1102-1167-11BC
 5BE7 5BD7 4F5E 511C 5680 6FD8
-B178
+B178:1102-1169
 52AA 5974 5F29 6012 7459 99D1 5476 5B65 5CF1 7331
 7B2F 81D1
-B18D
+B18D:1102-1169-11BC
 6FC3 81BF 8FB2 5102 5665 7A60 91B2
-B1CC
+B1CC:1102-116C
 60F1 8166 9912
-B1E8
+B1E8:1102-116D
 5C3F 5ACB 5B32 6DD6 78E0 88CA 9403
-B204
+B204:1102-116E
 5542 8028
-B208
+B208:1102-116E-11AB
 5AE9
-B20C
+B20C:1102-116E-11AF
 8A25 5436 80AD
-B274
+B274:1102-1172
 677B 7D10 5FF8 9775
-B275
+B275:1102-1172-11A8
 8844
-B2A5
+B2A5:1102-1173-11BC
 80FD
-B2C8
+B2C8:1102-1175
 5C3C 6CE5 5462 6029 67C5 7962 79B0 81A9
-B2C9
+B2C9:1102-1175-11A8
 533F 6EBA 6635 66B1
-B2E4
+B2E4:1103-1161
 591A 8336 7239
-B2E8
+B2E8:1103-1161-11AB
 4E39 4EB6 4F46 55AE 5718 58C7 5F56 65B7 65E6 6A80
 6BB5 6E4D 77ED 7AEF 7C1E 7DDE 86CB 8892 9132 935B
 6171 62C5 6934 6F19 7649 8011 80C6 8176 8711
-B2EC
+B2EC:1103-1161-11AF
 64BB 6FBE 737A 75B8 9054 59B2 601B 95E5 977C 97C3
-B2F4
+B2F4:1103-1161-11B7
 5556 574D 61BA 64D4 66C7 6DE1 6E5B 6F6D 6FB9 75F0
 8043 81BD 8541 8983 8AC7 8B5A 931F 510B 5557 5649
 58B0 58DC 6BEF 79AB 7F4E 859D 90EF 9EEE 9EF5
-B2F5
+B2F5:1103-1161-11B8
 6C93 7553 7B54 8E0F 905D
-B2F9
+B2F9:1103-1161-11BC
 5510 5802 5858 5E62 6207 649E 68E0 7576 7CD6 87B3
 9EE8 5018 513B 515A 642A 6A94 6E8F 746D 74AB 77A0
 7911 87F7 8960 8B9C 93DC 943A 9933 9939
-B300
+B300:1103-1162
 4EE3 5788 576E 5927 5C0D 5CB1 5E36 5F85 6234 64E1
 73B3 81FA 888B 8CB8 968A 9EDB 5113 61DF 65F2 6C4F
 7893 9413
-B301
+B301:1103-1162-11A8
 5B85
-B355
+B355:1103-1165-11A8
 5FB7 60B3
-B3C4
+B3C4:1103-1169
 5012 5200 5230 5716 5835 5857 5C0E 5C60 5CF6 5D8B
 5EA6 5F92 60BC 6311 6389 6417 6843 68F9 6AC2 6DD8
 6E21 6ED4 6FE4 71FE 76DC 7779 79B1 7A3B 8404 89A9
 8CED 8DF3 8E48 9003 9014 9053 90FD 934D 9676 97DC
 53E8 58D4 5F22 5FC9 6146 638F 642F 64E3 6AAE 6D2E
 6D82 7A0C 83DF 9174 95CD 9780 97B1 9955 9F17
-B3C5
+B3C5:1103-1169-11A8
 6BD2 7006 7258 72A2 7368 7763 79BF 7BE4 7E9B 8B80
 6ADD 9EF7
-B3C8
+B3C8:1103-1169-11AB
 58A9 60C7 6566 65FD 66BE 6C8C 711E 71C9 8C5A 9813
 5F34 6F61 8E89
-B3CC
+B3CC:1103-1169-11AF
 4E6D 7A81 5484 5817
-B3D9
+B3D9:1103-1169-11BC
 4EDD 51AC 51CD 52D5 540C 61A7 6771 6850 68DF 6D1E
 6F7C 75BC 77B3 7AE5 80F4 8463 9285 4F97 50EE 54C3
 578C 5CD2 5F64 6723 6A66 6DB7 825F 82F3 833C 856B
 8740 932C 9B97
-B450
+B450:1103-116E
 515C 6597 675C 6793 75D8 7AC7 8373 8C46 9017 982D
 6296 6581 809A 8130 86AA 8839 9661
-B454
+B454:1103-116E-11AB
 5C6F 81C0 829A 9041 906F 920D 7A80 8FCD
-B458
+B458:1103-116E-11AF
 4E67
-B4DD
+B4DD:1103-1173-11A8
 5F97
-B4F1
+B4F1:1103-1173-11BC
 5D9D 6A59 71C8 767B 7B49 85E4 8B04 9127 9A30 51F3
 58B1 6ED5 78F4 7C50 7E22 87A3 9419
-B77C
+B77C:1105-1161
 5587 61F6 7669 7F85 863F 87BA 88F8 908F 502E 56C9
 66EA 7630 7822 81DD 947C 9A3E 9A58
-B77D
+B77D:1105-1161-11A8
 6D1B 70D9 73DE 7D61 843D 916A 99F1 55E0 7296
-B780
+B780:1105-1161-11AB
 4E82 5375 6B04 6B12 703E 721B 862D 9E1E 5B3E 5E71
 6514 7053 8974 947E 95CC
-B784
+B784:1105-1161-11AF
 524C 8FA3 57D2 8FA2
-B78C
+B78C:1105-1161-11B7
 5D50 64E5 652C 6B16 6FEB 7C43 7E9C 85CD 8964 89BD
 5A6A 60CF
-B78D
+B78D:1105-1161-11B8
 62C9 81D8 881F 945E
-B791
+B791:1105-1161-11BC
 5ECA 6717 6D6A 72FC 7405 746F 8782 90DE 6994 7860
 7A02 83A8 870B 95AC
-B798
+B798:1105-1162
 4F86 5D0D 5FA0 840A 6DF6 9A0B
-B7AD
+B7AD:1105-1162-11BC
 51B7
-B7B5
+B7B5:1105-1163-11A8
 63A0 7565 7567
-B7C9
+B7C9:1105-1163-11BC
 4EAE 5006 5169 51C9 6881 6A11 7CAE 7CB1 7CE7 826F
 8AD2 8F1B 91CF 55A8 60A2 690B 6DBC 8E09 9B4E
-B824
+B824:1105-1167
 4FB6 5137 52F5 5442 5EEC 616E 623E 65C5 6ADA 6FFE
 792A 85DC 8823 95AD 9A62 9A6A 9E97 9ECE 5122 53B2
 5533 68A0 7658 7CF2 8182 81DA 8821 908C 9462
-B825
+B825:1105-1167-11A8
 529B 66C6 6B77 701D 792B 8F62 9742 650A 6ADF 6AEA
 7667 8F63 9148
-B828
+B828:1105-1167-11AB
 6190 6200 6523 6F23 7149 7489 7DF4 806F 84EE 8F26
 9023 934A 5B4C 695D 6E45 81E0 93C8 9C0A 9C31
-B82C
+B82C:1105-1167-11AF
 51BD 5217 52A3 6D0C 70C8 88C2 6312 6369 98B2
-B834
+B834:1105-1167-11B7
 5EC9 6582 6BAE 6FC2 7C3E 5969 7032 78CF
-B835
+B835:1105-1167-11B8
 7375 8E90 9B23
-B839
+B839:1105-1167-11BC
 4EE4 4F36 56F9 5CBA 5DBA 601C 73B2 7B2D 7F9A 7FCE
 8046 901E 9234 96F6 9748 9818 9F61 53E6 5464 59C8
 5CAD 6624 6B1E 6CE0 79E2 82D3 86C9 8EE8 9D12 9E77
-B840
+B840:1105-1168
 4F8B 6FA7 79AE 91B4 96B7 96B8 9C67
-B85C
+B85C:1105-1169
 52DE 6488 64C4 6AD3 6F5E 7018 7210 76E7 8001 8606
 865C 8DEF 8F05 9732 9B6F 9DFA 9E75 58DA 6EF7 7388
 7646 7A82 826A 826B 8F64 942A 946A 9871 9AD7 9C78
 9E15
-B85D
+B85D:1105-1169-11A8
 788C 797F 7DA0 83C9 9304 9E7F 9E93 5725 5F54 6DE5
 6F09 7C0F 8F46 9A04
-B860
+B860:1105-1169-11AB
 8AD6
-B871
+B871:1105-1169-11BC
 58DF 5F04 6727 7027 74CF 7C60 807E 5131 650F 66E8
 7931 8622 96B4 9F8E
-B8B0
+B8B0:1105-116C
 5121 7028 7262 78CA 8CC2 8CDA 8CF4 96F7 6502 790C
 7927 7C5F 7E87 7F4D 8012 857E 8A84 9179 9842
-B8CC
+B8CC:1105-116D
 4E86 50DA 5BEE 5ED6 6599 71CE 7642 77AD 804A 84FC
 907C 9B27 5639 5AFD 64A9 66B8 6F66 7360 7E5A 818B
 91AA 9410 98C2 98C9
-B8E1
+B8E1:1105-116D-11BC
 9F8D 9F92
-B8E8
+B8E8:1105-116E
 58D8 5A41 5C62 6A13 6DDA 6F0F 763B 7D2F 7E37 851E
 8938 93E4 964B 50C2 560D 5D81 617A 802C 87BB 9ACF
-B958
+B958:1105-1172
 5289 65D2 67F3 69B4 6D41 6E9C 700F 7409 7460 7559
 7624 786B 8B2C 985E 6A4A 7E32 7E8D 905B 9DB9
-B959
+B959:1105-1172-11A8
 516D 622E 9678 52E0
-B95C
+B95C:1105-1172-11AB
 4F96 502B 5D19 6DEA 7DB8 8F2A 6384
-B960
+B960:1105-1172-11AF
 5F8B 6144 6817 5D42 6EA7
-B96D
+B96D:1105-1172-11BC
 9686 7643 7ABF
-B975
+B975:1105-1173-11A8
 52D2 808B 6CD0
-B984
+B984:1105-1173-11B7
 51DC 51DB 5EE9 6F9F
-B989
+B989:1105-1173-11BC
 51CC 695E 7A1C 7DBE 83F1 9675 5030 8506
-B9AC
+B9AC:1105-1175
 4FDA 5229 5398 540F 550E 5C65 60A7 674E 68A8 6D6C
 7281 72F8 7406 7483 75E2 7C6C 7F79 7FB8 8389 88CF
 88E1 91CC 91D0 96E2 9BC9 4FD0 527A 54E9 5AE0 6D96
 6F13 79BB 8385 870A 87AD 8C8D 9090 9B51 9ED0
-B9B0
+B9B0:1105-1175-11AB
 541D 6F7E 71D0 7498 85FA 8EAA 96A3 9C57 9E9F 5D99
 608B 735C 78F7 7CA6 7CBC 7E57 8E99 8F54 9130 93FB
 9A4E
-B9BC
+B9BC:1105-1175-11B7
 6797 6DCB 7433 81E8 9716 75F3
-B9BD
+B9BD:1105-1175-11B8
 782C 7ACB 7B20 7C92 5CA6
-B9C8
+B9C8:1106-1161
 6469 746A 75F2 78BC 78E8 99AC 9B54 9EBB 5298 5ABD
 879E 87C7 9EBD 9EBF
-B9C9
+B9C9:1106-1161-11A8
 5BDE 5E55 6F20 819C 83AB 9088 7799 93CC
-B9CC
+B9CC:1106-1161-11AB
 4E07 534D 5A29 5DD2 5F4E 6162 633D 6669 66FC 6EFF
 6F2B 7063 779E 842C 8513 883B 8F13 9945 9C3B 5881
 5ADA 5E54 7E35 8B3E 8E63 93CB 93DD 9B18
-B9D0
+B9D0:1106-1161-11AF
 551C 62B9 672B 6CAB 8309 896A 977A 5E15 79E3
-B9DD
+B9DD:1106-1161-11BC
 4EA1 5984 5FD8 5FD9 671B 7DB2 7F54 8292 832B 83BD
 8F1E 9099 60D8 6C52 6F2D 83BE 87D2 9B4D
-B9E4
+B9E4:1106-1162
 57CB 59B9 5A92 5BD0 6627 679A 6885 6BCF 7164 7F75
 8CB7 8CE3 9081 9B45 5446 6973 6CAC 73AB 771B 82FA
 8393 9176 9709
-B9E5
+B9E5:1106-1162-11A8
 8108 8C8A 964C 9A40 9EA5 8109 8C83 8C98
-B9F9
+B9F9:1106-1162-11BC
 5B5F 6C13 731B 76F2 76DF 840C 511A 750D 753F 867B
-BA71
+BA71:1106-1167-11A8
 51AA 8993 5E4E 7CF8
-BA74
+BA74:1106-1167-11AB
 514D 5195 52C9 68C9 6C94 7704 7720 7DBF 7DEC 9762
 9EB5 4FDB 6E4E 7CC6 7DDC 9EAA
-BA78
+BA78:1106-1167-11AF
 6EC5 8511 7BFE 884A
-BA85
+BA85:1106-1167-11BC
 51A5 540D 547D 660E 669D 6927 6E9F 76BF 7791 8317
 84C2 879F 9169 9298 9CF4 6D3A
-BA8C
+BA8C:1106-1168
 8882
-BAA8
+BAA8:1106-1169
 4FAE 5192 52DF 59C6 5E3D 6155 6478 6479 66AE 67D0
 6A21 6BCD 6BDB 725F 7261 7441 7738 77DB 8017 82BC
 8305 8B00 8B28 8C8C 4F94 59E5 5AA2 5AEB 6048 65C4
 7683 770A 7C8D 7CE2 8004 8765 87CA 927E 9AE6
-BAA9
+BAA9:1106-1169-11A8
 6728 6C90 7267 76EE 7766 7A46 9DA9 51E9 82DC
-BAB0
+BAB0:1106-1169-11AF
 6B7F 6C92
-BABD
+BABD:1106-1169-11BC
 5922 6726 8499 5E6A 61DE 66DA 6E95 6FDB 77A2 77C7
 8268 96FA 9E0F
-BB18
+BB18:1106-116D
 536F 5893 5999 5EDF 63CF 6634 6773 6E3A 732B 7AD7
 82D7 9328 6DFC 7707 85D0 8C93
-BB34
+BB34:1106-116E
 52D9 5DEB 61AE 61CB 620A 62C7 64AB 65E0 6959 6B66
 6BCB 7121 73F7 755D 7E46 821E 8302 856A 8AA3 8CBF
 9727 9D61 511B 5638 5EE1 81B4 9A16
-BB35
+BB35:1106-116E-11A8
 58A8 9ED8 563F
-BB38
+BB38:1106-116E-11AB
 5011 520E 543B 554F 6587 6C76 7D0A 7D0B 805E 868A
 9580 96EF 5301 6097 61E3 6286 636B 7086 748A
-BB3C
+BB3C:1106-116E-11AF
 52FF 6C95 7269
-BBF8
+BBF8:1106-1175
 5473 5A9A 5C3E 5D4B 5F4C 5FAE 672A 68B6 6963 6E3C
 6E44 7709 7C73 7F8E 8587 8B0E 8FF7 9761 9EF4 4EB9
 5A13 5A84 5ABA 5F25 5F2D 6549 7030 737C 7CDC 7E3B
 82FF 863C 9E8B
-BBFC
+BBFC:1106-1175-11AB
 5CB7 60B6 610D 61AB 654F 65FB 65FC 6C11 6CEF 739F
 73C9 7DE1 9594 5FDE 5FDF 668B 6E63 7DCD 7F60 82E0
 95A9 9C35 9EFD
-BC00
+BC00:1106-1175-11AF
 5BC6 871C 8B10 6A12 6EF5
-BC15
+BC15:1107-1161-11A8
 525D 535A 62CD 640F 64B2 6734 6A38 6CCA 73C0 749E
 7B94 7C95 7E1B 818A 8236 8584 8FEB 96F9 99C1 4EB3
 6B02 7254 939B 99EE 9AC6
-BC18
+BC18:1107-1161-11AB
 4F34 534A 53CD 53DB 62CC 642C 6500 6591 69C3 6CEE
 6F58 73ED 7554 7622 76E4 76FC 78D0 78FB 792C 7D46
 822C 87E0 8FD4 9812 98EF 5ABB 6273 642B 653D 670C
 80D6 878C 9816
-BC1C
+BC1C:1107-1161-11AF
 52C3 62D4 64A5 6E24 6F51 767C 8DCB 91B1 9262 9AEE
 9B43 54F1 6D61 8116 9238 9D53
-BC29
+BC29:1107-1161-11BC
 5023 508D 574A 59A8 5C28 5E47 5F77 623F 653E 65B9
 65C1 6609 678B 699C 6EC2 78C5 7D21 80AA 8180 822B
 82B3 84A1 868C 8A2A 8B17 90A6 9632 9F90 4EFF 5396
 5E6B 5FAC 6412 65CA 6886 7253 823D 8783 938A 9AE3
 9B74
-BC30
+BC30:1107-1162
 500D 4FF3 57F9 5F98 62DC 6392 676F 6E43 7119 76C3
 80CC 80DA 88F4 88F5 8919 8CE0 8F29 914D 966A 574F
 576F 6252 7432 84D3
-BC31
+BC31:1107-1162-11A8
 4F2F 4F70 5E1B 67CF 6822 767D 767E 9B44 7CA8
-BC88
+BC88:1107-1165-11AB
 5E61 6A0A 7169 71D4 756A 7E41 8543 85E9 98DC 7E59
 7FFB 81B0 8629 88A2
-BC8C
+BC8C:1107-1165-11AF
 4F10 7B4F 7F70 95A5 6A43 7F78
-BC94
+BC94:1107-1165-11B7
 51E1 5E06 68B5 6C3E 6C4E 6CDB 72AF 7BC4 8303 7B35
 8A09 98BF
-BC95
+BC95:1107-1165-11B8
 6CD5 743A
-BCBD
+BCBD:1107-1167-11A8
 50FB 5288 58C1 64D8 6A97 74A7 7656 78A7 8617 95E2
 9739 64D7 7513 7588 895E 9DFF 9F0A
-BCC0
+BCC0:1107-1167-11AB
 535E 5F01 8B8A 8FA8 8FAF 908A 5FED 6283 7C69 8FAE
 8141 8CC6 99E2 9ABF 9D18
-BCC4
+BCC4:1107-1167-11AF
 5225 77A5 9C49 9F08 5F46 9DE9
-BCD1
+BCD1:1107-1167-11BC
 4E19 5002 5175 5C5B 5E77 661E 663A 67C4 68C5 70B3
 7501 75C5 79C9 7ADD 8F27 9920 9A08 4E26 5840 7D63
 7F3E 8FF8 9235 92F2 927C
-BCF4
+BCF4:1107-1169
 4FDD 5821 5831 5BF6 666E 6B65 6D11 6E7A 6F7D 73E4
 752B 83E9 88DC 8913 8B5C 8F14 4FCC 76D9 7C20 8446
 974C 9D07 9EFC
-BCF5
+BCF5:1107-1169-11A8
 4F0F 50D5 5310 535C 5B93 5FA9 670D 798F 8179 832F
 8514 8907 8986 8F39 8F3B 99A5 9C12 58A3 5E5E 6251
 6FEE 7B99 83D4 8760 876E 9D69
-BCF8
+BCF8:1107-1169-11AB
 672C
-BCFC
+BCFC:1107-1169-11AF
 4E76
-BD09
+BD09:1107-1169-11BC
 4FF8 5949 5C01 5CEF 5CF0 6367 68D2 70FD 71A2 742B
 7E2B 84EC 8702 9022 92D2 9CF3 4E30 5906 7BF7 7D98
 83F6 9D0C
-BD80
+BD80:1107-116E
 4E0D 4ED8 4FEF 5085 5256 526F 5426 5490 57E0 592B
 5A66 5B5A 5B75 5BCC 5E9C 6276 6577 65A7 6D6E 6EA5
 7236 7B26 7C3F 7F36 8150 8151 819A 8240 8299 83A9
@@ -612,19 +615,19 @@ BD80
 99D9 9CE7 4EC6 4FD8 5A8D 6294 62CA 638A 6874 6991
 6DAA 739E 7954 7B5F 7F58 7F66 80D5 82A3 82FB 8500
 86A8 8709 889D 88D2 8DD7 9207 982B 9B92 9EA9
-BD81
+BD81:1107-116E-11A8
 5317
-BD84
+BD84:1107-116E-11AB
 5206 5429 5674 58B3 5954 596E 5FFF 61A4 626E 6610
 6C7E 711A 76C6 7C89 7CDE 7D1B 82AC 8CC1 96F0 4F53
 574C 5E09 678C 68FB 68FC 6C1B 6E53 6FC6 7287 755A
 780F 7B28 80A6 81B9 8561 8F52 9EFA 9F22
-BD88
+BD88:1107-116E-11AF
 4F5B 5F17 5F7F 62C2 5CAA 7953 7D31 8274 8300 97CD
 9AF4 9EFB
-BD95
+BD95:1107-116E-11BC
 5D29 670B 68DA 787C 7E43 9D6C 580B 6F30 9B05
-BE44
+BE44:1107-1175
 4E15 5099 5315 532A 5351 5983 5A62 5E87 60B2 618A
 6249 6279 6590 6787 69A7 6BD4 6BD6 6BD7 6BD8 6CB8
 7435 75FA 7812 7891 79D5 79D8 7C83 7DCB 7FE1 80A5
@@ -634,13 +637,13 @@ BE44
 75F9 7765 7955 7BE6 7D15 7F86 8153 8298 82BE 8406
 84D6 868D 8C94 8D14 8F61 90B3 90EB 959F 9674 970F
 97B4 9A11 9A1B 9AC0 9F19
-BE48
+BE48:1107-1175-11AB
 56AC 5B2A 5F6C 658C 6AB3 6BAF 6D5C 6FF1 7015 725D
 73AD 8CA7 8CD3 983B 5110 64EF 77C9 7E7D 81CF 860B
 8C73 90A0 944C 9726 9870 9B02 9B22
-BE59
+BE59:1107-1175-11BC
 6191 6C37 8058 9A01 51B0 51ED 51F4 5A09
-C0AC
+C0AC:1109-1161
 4E4D 4E8B 4E9B 4ED5 4F3A 4F3C 4F7F 4FDF 50FF 53F2
 53F8 5506 55E3 56DB 58EB 5962 5A11 5BEB 5BFA 5C04
 5DF3 5E2B 5F99 601D 6368 659C 65AF 67F6 67FB 68AD
@@ -649,82 +652,82 @@ C0AC
 8A50 8A5E 8B1D 8CDC 8D66 8FAD 90AA 98FC 99DF 9E9D
 509E 525A 5378 548B 59D2 6942 69AD 6C5C 75E7 76B6
 7AE2 7B25 7F37 8721 8997 99DB 9B66 9BCA 9C24
-C0AD
+C0AD:1109-1161-11A8
 524A 6714 69CA 720D 84B4 9460
-C0B0
+C0B0:1109-1161-11AB
 5098 522A 5C71 6563 6C55 73CA 7523 759D 7B97 849C
 9178 9730 5277 59CD 5B7F 6A75 6F78 6F98 72FB 7E56
 8A15 93DF 958A 6BFF
-C0B4
+C0B4:1109-1161-11AF
 4E77 6492 6BBA 715E 85A9
-C0BC
+C0BC:1109-1161-11B7
 4E09 6749 68EE 6E17 829F 8518 886B 7CDD 91E4 9B16
-C0BD
+C0BD:1109-1161-11B8
 63F7 6F81 9212 98AF 5345 553C 6B43 7FE3 9364 9705
 970E
-C0C1
+C0C1:1109-1161-11BC
 4E0A 50B7 50CF 511F 5546 55AA 5617 5B40 5C19 5CE0
 5E38 5E8A 5EA0 5EC2 60F3 6851 6A61 6E58 723D 7240
 72C0 76F8 7965 7BB1 7FD4 88F3 89F4 8A73 8C61 8CDE
 971C 587D 5F9C 664C 6BA4 751E 7DD7 939F 9859 9B3A
-C0C8
+C0C8:1109-1162
 585E 74BD 8CFD 9C13
-C0C9
+C0C9:1109-1162-11A8
 55C7 7A61 7D22 8272 69ED 6FC7 7012
-C0DD
+C0DD:1109-1162-11BC
 7272 751F 7525 7B19 771A 924E
-C11C
+C11C:1109-1165
 5885 58FB 5DBC 5E8F 5EB6 5F90 6055 6292 637F 654D
 6691 66D9 66F8 6816 68F2 7280 745E 7B6E 7D6E 7DD6
 7F72 80E5 8212 85AF 897F 8A93 901D 92E4 9ECD 9F20
 566C 5A7F 63DF 6495 6E51 6FA8 7D13 8021 82A7 924F
-C11D
+C11D:1109-1165-11A8
 5915 596D 5E2D 60DC 6614 6673 6790 6C50 6DC5 6F5F
 77F3 78A9 84C6 91CB 932B 6670 77FD 814A 8203 8725
 9250 9F2B
-C120
+C120:1109-1165-11AB
 4ED9 50CA 5148 5584 5B0B 5BA3 6247 657E 65CB 6E32
 717D 7401 7444 7487 74BF 766C 79AA 7DDA 7E55 7FA8
 817A 81B3 8239 861A 87EC 8A75 8DE3 9078 9291 9425
 994D 9BAE 58A1 5AD9 5C1F 5C20 5C73 6103 6B5A 71AF
 7B45 7DAB 8B54 8B71 93C7 9A38 9C53 9C7B
-C124
+C124:1109-1165-11AF
 5368 5C51 6954 6CC4 6D29 6E2B 820C 859B 893B 8A2D
 8AAA 96EA 9F67 5070 5A9F 63F2 66AC 7207 789F 7A27
 7D32
-C12C
+C12C:1109-1165-11B7
 5261 66B9 6BB2 7E96 87FE 8D0D 9583 965D 5B45 61B8
 647B 7752 8B6B 929B 97F1
-C12D
+C12D:1109-1165-11B8
 651D 6D89 71EE 56C1 61FE 7044 8076 8EA1 9477 9873
-C131
+C131:1109-1165-11BC
 57CE 59D3 5BAC 6027 60FA 6210 661F 665F 7329 73F9
 76DB 7701 7B6C 8056 8072 8165 8AA0 9192 7446 9A02
-C138
+C138:1109-1166
 4E16 52E2 6B72 6D17 7A05 7B39 7D30 8CB0 5E28 6D12
 7E50 86FB
-C18C
+C18C:1109-1169
 53EC 562F 5851 5BB5 5C0F 5C11 5DE2 6240 6383 6414
 662D 68B3 6CBC 6D88 6EAF 701F 70A4 71D2 7526 758F
 758E 7619 7B11 7BE0 7C2B 7D20 7D39 852C 856D 8607
 8A34 900D 9061 90B5 92B7 97F6 9A37 4F4B 4FCF 5372
 55C9 57FD 5850 612C 634E 6A14 6CDD 7B71 7BBE 7E45
 7FDB 8186 8258 86F8 8E08 9165 9704 9B48 9BB9 9C3A
-C18D
+C18D:1109-1169-11A8
 4FD7 5C6C 675F 6D91 7C9F 7E8C 8B16 8D16 901F 6D2C
 906C
-C190
+C190:1109-1169-11AB
 5B6B 5DFD 640D 84C0 905C 98E1 98E7 98F1
-C194
+C194:1109-1169-11AF
 7387 7AA3 87C0
-C1A1
+C1A1:1109-1169-11BC
 5B8B 609A 677E 6DDE 8A1F 8AA6 9001 980C 67D7 7AE6
 9B06
-C1C4
+C1C4:1109-116B
 5237 7051 788E 9396 60E2 66EC 7463
-C1E0
+C1E0:1109-116C
 8870 91D7
-C218
+C218:1109-116E
 4FEE 53D7 55FD 56DA 5782 58FD 5AC2 5B88 5CAB 5CC0
 5E25 6101 620D 624B 6388 641C 6536 6578 6A39 6B8A
 6C34 6D19 6F31 71E7 72E9 7378 7407 74B2 7626 7761
@@ -734,219 +737,219 @@ C218
 9B1A 53DF 552E 5ECB 666C 6BB3 6CC5 6EB2 6FC9 775F
 7762 778D 795F 7C54 813A 8184 81B8 8B8E 8C4E 9672
 98BC 9948
-C219
+C219:1109-116E-11A8
 53D4 587E 5919 5B70 5BBF 6DD1 6F5A 719F 7421 74B9
 8085 83FD 4FF6 500F 5135 5A4C 6A5A 9A4C 9DEB
-C21C
+C21C:1109-116E-11AB
 5DE1 5F87 5FAA 6042 65EC 6812 696F 6A53 6B89 6D35
 6DF3 73E3 76FE 77AC 7B4D 7D14 8123 821C 8340 84F4
 8563 8A62 8AC4 9187 931E 9806 99B4 4F9A 72E5 76F9
 7734 7D03 80AB 99E8 9B0A 9D89
-C220
+C220:1109-116E-11AF
 620C 8853 8FF0 9265 7D49
-C22D
+C22D:1109-116E-11BC
 5D07 5D27 5D69 83D8
-C26C
+C26C:1109-1171
 5005 6DEC 7120
-C2AC
+C2AC:1109-1173-11AF
 745F 819D 8768 8671
-C2B5
+C2B5:1109-1173-11B8
 6FD5 62FE 7FD2 8936 8972 6174 71A0 96B0
-C2B9
+C2B9:1109-1173-11BC
 4E1E 4E58 50E7 52DD 5347 627F 6607 7E69 8805 965E
 584D 9B19
-C2DC
+C2DC:1109-1175
 4F8D 5319 5636 59CB 5AA4 5C38 5C4E 5C4D 5E02 5F11
 6043 65BD 662F 6642 67BE 67F4 731C 77E2 793A 7FC5
 8494 84CD 8996 8A66 8A69 8AE1 8C55 8C7A 5072 5155
 53AE 557B 5852 5EDD 67B2 67F9 6F8C 7DE6 7FE4 8ADF
 8AF0 8C49 91C3 9349 984B
-C2DD
+C2DD:1109-1175-11A8
 57F4 5BD4 5F0F 606F 62ED 690D 6B96 6E5C 7184 7BD2
 8755 8B58 8EFE 98DF 98FE 55B0 5AB3 683B
-C2E0
+C2E0:1109-1175-11AB
 4F38 4F81 4FE1 547B 5A20 5BB8 613C 65B0 6668 71FC
 7533 795E 7D33 814E 81E3 8398 85AA 85CE 8703 8A0A
 8EAB 8F9B 8FC5 54C2 567A 56DF 59FA 6C5B 77E7 8124
 8D10 9823 99EA
-C2E4
+C2E4:1109-1175-11AF
 5931 5BA4 5BE6 6089 87CB 98CB
-C2EC
+C2EC:1109-1175-11B7
 5BE9 5C0B 5FC3 6C81 6DF1 700B 751A 82AF 8AF6 68A3
 6F6F 71D6 845A 9414 9C4F
-C2ED
+C2ED:1109-1175-11B8
 4EC0 5341 8FBB
-C30D
+C30D:110A-1161-11BC
 96D9
-C528
+C528:110A-1175
 6C0F
-C544
+C544:110B-1161
 4E9E 4FC4 5152 555E 5A25 5CE8 6211 7259 82BD 83AA
 86FE 8859 8A1D 963F 96C5 9913 9D09 9D5D 4E2B 54E6
 5A3F 5A40 5CE9 75B4 7811 7B0C 8FD3 930F 9D5E
-C545
+C545:110B-1161-11A8
 580A 5CB3 5DBD 5E44 60E1 6115 63E1 6A02 6E25 9102
 9354 984E 9C10 9F77 5053 537E 54A2 5594 5669 816D
 843C 89A8 8AE4 9D9A 9F76
-C548
+C548:110B-1161-11AB
 5B89 5CB8 6309 664F 6848 773C 96C1 978D 9854 9B9F
 6849 72B4 8D0B 9D08
-C54C
+C54C:110B-1161-11AF
 65A1 8B01 8ECB 95BC 560E 621E 63E0 7A75 8A10 904F
 981E 9D36
-C554
+C554:110B-1161-11B7
 5535 5CA9 5DD6 5EB5 6697 764C 83F4 95C7 557D 5A95
 5D53 667B 8164 844A 84ED 8AF3 9837 99A3 9EEF
-C555
+C555:110B-1161-11B8
 58D3 62BC 72CE 9D28
-C559
+C559:110B-1161-11BC
 4EF0 592E 600F 663B 6B83 79E7 9D26 536C 5771 6CF1
 76CE 9785
-C560
+C560:110B-1162
 5393 54C0 57C3 5D16 611B 66D6 6DAF 788D 827E 9698
 9744 50FE 5509 5540 566F 5A2D 5D15 6328 6371 6B38
 6F04 7343 769A 775A 77B9 78D1 7919 8586 85F9 9749
 9A03
-C561
+C561:110B-1162-11A8
 5384 627C 6396 6DB2 7E0A 814B 984D 545D 6239 6424
 9628
-C575
+C575:110B-1162-11BC
 6AFB 7F4C 9DAF 9E1A 56B6 5AC8 7F43 9DEA
-C57C
+C57C:110B-1163
 4E5F 503B 51B6 591C 60F9 63F6 6930 723A 8036 91CE
 57DC
-C57D
+C57D:110B-1163-11A8
 5F31 7D04 82E5 846F 84BB 85E5 8E8D 721A 79B4 7BDB
 7C65 9470 9C2F 9DB8 9FA0
-C591
+C591:110B-1163-11BC
 4F6F 58E4 5B43 6059 63DA 6518 656D 6698 694A 6A23
 6D0B 7001 716C 75D2 760D 79B3 7A70 7F8A 8944 8B93
 91C0 967D 990A 5F89 6F3E 703C 70CA 7662 773B 8618
 8F30 9472 98BA 9A64
-C5B4
+C5B4:110B-1165
 5704 5FA1 65BC 6F01 7600 79A6 8A9E 99AD 9B5A 9F6C
 5709 6554 6DE4 98EB
-C5B5
+C5B5:110B-1165-11A8
 5104 61B6 6291 6A8D 81C6 7E76
-C5B8
+C5B8:110B-1165-11AB
 5043 5830 5F66 7109 8A00 8AFA 50BF 533D 5AE3 8B9E
 9122 9F34 9F39
-C5BC
+C5BC:110B-1165-11AF
 5B7C 8616 81EC
-C5C4
+C5C4:110B-1165-11B7
 4FFA 513C 56B4 5944 63A9 6DF9 5D26 5E7F 66EE 7F68
 9183 95B9
-C5C5
+C5C5:110B-1165-11B8
 5DAA 696D 5DAB 9134
-C5D0
+C5D0:110B-1166
 605A 66C0
-C5D4
+C5D4:110B-1166-11AB
 5186
-C5EC
+C5EC:110B-1167
 4E88 4F59 5982 6B5F 6C5D 74B5 7916 8207 8245 8339
 8F3F 8F5D 9918 8201
-C5ED
+C5ED:110B-1167-11A8
 4EA6 57DF 5F79 6613 75AB 7E79 8B6F 9006 9A5B 5DA7
 61CC 6DE2 95BE
-C5F0
+C5F0:110B-1167-11AB
 56A5 5827 59F8 5A1F 5BB4 5EF6 6350 633B 693D 6C87
 6CBF 6D8E 6D93 6DF5 6F14 70DF 7136 7159 71C3 71D5
 784F 786F 7B75 7DE3 7E2F 884D 8EDF 925B 9CF6 5157
 56E6 57CF 5B3F 6081 63BE 66E3 6ADE 6E37 81D9 839A
 8735 8815 8B8C 9DF0
-C5F4
+C5F4:110B-1167-11AF
 6085 6D85 71B1 95B1 564E
-C5FC
+C5FC:110B-1167-11B7
 53AD 67D3 708E 7130 7430 8276 82D2 95BB 9AE5 9E7D
 5189 5869 61D5 624A 6ABF 6AB6 704E 7069 91C5 995C
 9B58 9EF6
-C5FD
+C5FD:110B-1167-11B8
 66C4 71C1 8449 66C5 7180 7217 9768
-C601
+C601:110B-1167-11BC
 584B 5DB8 5F71 6620 668E 6979 69AE 6C38 6CF3 6E36
 6F41 6FDA 701B 702F 7150 71DF 7370 745B 74D4 76C8
 7A4E 7E93 82F1 8A60 8FCE 9348 9719 548F 5B34 5B30
 6D67 6FF4 766D 78A4 7E08 8811 8D0F 90E2 97FA
-C608
+C608:110B-1168
 4E42 502A 5208 53E1 66F3 6C6D 6FCA 730A 777F 7A62
 82AE 85DD 8602 88D4 8A63 8B7D 8C6B 92B3 9713 9810
 56C8 5ADB 62FD 639C 6798 7369 7768 7796 7E44 7FF3
 82C5 854A 854B 8589 868B 873A 9BE2 9DD6 9E91
-C624
+C624:110B-1169
 4E94 4F0D 4FC9 50B2 5348 543E 5433 55DA 5862 58BA
 5967 5A1B 5BE4 609F 61CA 6556 65FF 6664 68A7 6C5A
 6FB3 70CF 71AC 7352 7B7D 8708 8AA4 9C32 9F07 4EF5
 4FE3 5514 55F7 5641 572C 5AAA 5AEF 5FE4 6160 6342
 6C59 7AB9 8071 8323 8956 8B37 8FC3 8FD5 9068 93CA
 93D6 96A9 9A41 9F2F
-C625
+C625:110B-1169-11A8
 5C4B 6C83 7344 7389 923A
-C628
+C628:110B-1169-11AB
 6EAB 7465 761F 7A69 7E15 860A 5ABC 614D 6637 6C33
 7185 8580 8F40 919E 97DE 9942 9C2E
-C62C
+C62C:110B-1169-11AF
 5140 55E2 8183
-C639
+C639:110B-1169-11BC
 58C5 64C1 74EE 7515 7670 7FC1 9095 96CD 9954 5581
 5EF1 6EC3 7655 79BA 7F4B 84CA 96DD 9852
-C640
+C640:110B-116A
 6E26 74E6 7AA9 7AAA 81E5 86D9 8778 8A1B 54C7 56EE
 5A50 6799 6D3C 7327 7A8A 8435 8B4C
-C644
+C644:110B-116A-11AB
 5A49 5B8C 5B9B 68A1 6900 6D63 73A9 7413 742C 7897
 7DE9 7FEB 8118 8155 839E 8C4C 962E 9811 5213 57B8
 59A7 5C8F 5FE8 60CB 6DB4 76CC
-C648
+C648:110B-116A-11AF
 66F0
-C655
+C655:110B-116A-11BC
 5F80 65FA 6789 6C6A 738B 5C2B 7007 8FEC
-C65C
+C65C:110B-116B
 502D 5A03 6B6A 77EE 5AA7
-C678
+C678:110B-116C
 5916 5D6C 5DCD 7325 754F 504E 5D34 5D54 6E28 7168
 78A8 78C8 8075 9697
-C694
+C694:110B-116D
 50E5 51F9 582F 592D 5996 59DA 5BE5 5DA2 62D7 6416
 6493 64FE 66DC 6A48 71FF 7464 7A88 7AAF 7E47 7E5E
 8000 8170 87EF 8981 8B20 9059 9080 9952 5060 5593
 5773 589D 5B08 5E7A 5FAD 5FBC 6B80 6F86 7945 7A7E
 7A85 8558 9076 9DC2
-C695
+C695:110B-116D-11A8
 617E 6B32 6D74 7E1F 8925 8FB1 6EBD 84D0
-C6A9
+C6A9:110B-116D-11BC
 4FD1 50AD 5197 52C7 57C7 5889 5BB9 5EB8 6142 6995
 6D8C 6E67 6EB6 7194 7462 7528 752C 8073 8338 84C9
 8E0A 9394 93DE 509B 5B82 5D71 6175 6183 69E6 7867
 8202 86F9 8E34
-C6B0
+C6B0:110B-116E
 4E8E 4F51 5076 512A 53C8 53CB 53F3 5B87 5BD3 5C24
 611A 6182 65F4 725B 7397 7440 76C2 7950 7991 79B9
 7D06 7FBD 828B 85D5 865E 8FC2 9047 90F5 91EA 9685
 96E8 96E9 4E8F 4EB4 4FC1 504A 5401 5823 5D4E 5EBD
 6745 75A3 76F1 7AFD 8026 8030 8B23 8E3D 935D 9E80
 9E8C 9F72
-C6B1
+C6B1:110B-116E-11A8
 52D6 5F67 65ED 6631 682F 715C 7A36 90C1 980A 71E0
-C6B4
+C6B4:110B-116E-11AB
 4E91 6A52 6B9E 6F90 7189 8018 82B8 8553 904B 9695
 96F2 97FB 60F2 6C84 7BD4 7D1C 9723 97F5
-C6B8
+C6B8:110B-116E-11AF
 851A 9B31 4E90
-C6C5
+C6C5:110B-116E-11BC
 718A 96C4
-C6D0
+C6D0:110B-116F-11AB
 5143 539F 54E1 5713 5712 57A3 5A9B 5AC4 5BC3 6028
 613F 63F4 6C85 6D39 6E72 6E90 7230 733F 7457 82D1
 8881 8F45 9060 9662 9858 9D1B 51A4 571C 676C 6965
 7328 7DA9 82AB 8597 873F 8B1C 92FA 9A35 9D77 9EFF
-C6D4
+C6D4:110B-116F-11AF
 6708 8D8A 925E 5216 7CA4
-C704
+C704:110B-1171
 4F4D 5049 50DE 5371 570D 59D4 5A01 5C09 6170 6690
 6E2D 7232 744B 7DEF 80C3 840E 8466 853F 875F 885B
 8918 8B02 9055 97CB 9B4F 559F 5E43 7152 71A8 75FF
 8473 885E 8AC9 9036 95C8 97D9 97E1 9927 9AAA
-C720
+C720:110B-1172
 4E73 4F91 5112 516A 552F 55A9 5B7A 5BA5 5E7C 5E7D
 5EBE 60A0 60DF 6108 6109 63C4 6538 6709 67D4 67DA
 6961 6962 6CB9 6D27 6E38 6FE1 7336 7337 745C 7531
@@ -955,94 +958,94 @@ C720
 5E37 63C9 65BF 6CD1 7256 7609 7610 7AAC 7AB3 7C72
 7CC5 7DCC 8174 83A0 8555 8564 86B0 86B4 8764 8915
 8B89 900C 97A3 9BAA 9EDD 9F2C 9FA5
-C721
+C721:110B-1172-11A8
 5809 6BD3 8089 80B2 5125
-C724
+C724:110B-1172-11AB
 5141 596B 5C39 6F64 73A7 80E4 8D07 9217 958F 6600
 92C6
-C728
+C728:110B-1172-11AF
 807F 6F4F 77DE
-C735
+C735:110B-1172-11BC
 620E 701C 7D68 878D 72E8
-C740
+C740:110B-1173-11AB
 57A0 6069 6147 6BB7 8ABE 9280 96B1 542C 569A 5701
 57BD 6196 6ABC 6EB5 72FA 73E2 766E 8A14 911E 9F57
-C744
+C744:110B-1173-11AF
 4E59 9CE6
-C74C
+C74C:110B-1173-11B7
 541F 6DEB 852D 9670 97F3 98EE 5591 5D1F 5ED5 6114
 972A
-C74D
+C74D:110B-1173-11B8
 63D6 6CE3 9091 6092 6339 6D65
-C751
+C751:110B-1173-11BC
 51DD 61C9 81BA 9DF9
-C758
+C758:110B-1174
 4F9D 501A 5100 5B9C 610F 61FF 64EC 6905 6BC5 7591
 77E3 7FA9 8264 858F 87FB 8863 8ABC 8B70 91AB 5117
 51D2 5293 5DB7 6B39 6F2A 7317 7912 8798 9950
-C774
+C774:110B-1175
 4E8C 4EE5 4F0A 5937 59E8 5DF2 5F1B 5F5B 6021 723E
 73E5 7570 75CD 79FB 800C 8033 8084 82E1 8351 8CBD
 8CB3 9087 98F4 990C 54BF 5768 5C14 5F5D 682E 6D1F
 73C6 8A11 8A51 8FE4 96B6
-C775
+C775:110B-1175-11A8
 7037 76CA 7FCA 7FCC 7FFC 8B1A 5F0B 71A4 9DC1
-C778
+C778:110B-1175-11AB
 4EBA 4EC1 5203 5370 54BD 56E0 59FB 5BC5 5F15 5FCD
 6E6E 7D6A 8335 8693 8A8D 976D 9777 4EDE 5819 5924
 5A63 6268 6C24 6D07 798B 7C7E 82A2 88C0
-C77C
+C77C:110B-1175-11AF
 4E00 4F5A 4F7E 58F9 65E5 6EA2 9038 93B0 99B9 6CC6
 8EFC
-C784
+C784:110B-1175-11B7
 4EFB 58EC 598A 59D9 6041 7A14 834F 8CC3 7D4D 887D
 928B 98EA
-C785
+C785:110B-1175-11B8
 5165 5344 5EFF
-C789
+C789:110B-1175-11BC
 4ECD 5269 5B55 82BF 5AB5
-C790
+C790:110C-1161
 4ED4 523A 54A8 59C9 59FF 5B50 5B57 5B5C 6063 6148
 6ECB 7099 716E 7386 74F7 75B5 78C1 7D2B 8005 81EA
 8328 8517 85C9 8AEE 8CC7 96CC 5470 5B28 5B56 5B76
 67D8 6CDA 7278 7725 7726 7CA2 8014 80FE 8308 8332
 83BF 8678 89DC 8A3E 8CB2 8D6D 93A1 983F 9AED 9B93
 9DBF 9DD3
-C791
+C791:110C-1161-11A8
 4F5C 52FA 56BC 65AB 6628 707C 70B8 7235 7DBD 828D
 914C 96C0 9D72 5C9D 600D 65B1 67DE 6C4B 712F 72B3
 788F
-C794
+C794:110C-1161-11AB
 5B71 68E7 6B98 6F7A 76DE 5257 6214 9A4F
-C7A0
+C7A0:110C-1161-11B7
 5C91 66AB 6F5B 7BB4 7C2A 8836 6D94 6F5C 6FF3
-C7A1
+C7A1:110C-1161-11B8
 96DC 5361 56C3 7728 78FC 894D
-C7A5
+C7A5:110C-1161-11BC
 4E08 4ED7 5320 5834 58BB 58EF 596C 5C07 5E33 5E84
 5F35 638C 66B2 6756 6A1F 6AA3 6B0C 6F3F 7246 7350
 748B 7AE0 7CA7 8178 81DF 81E7 838A 846C 8523 8594
 85CF 88DD 8D13 91AC 9577 969C 50BD 5958 599D 5B19
 5D82 5EE7 6215 6F33 7242 7634 7CDA 7F98 8407 88C5
 8CEC 9123 93D8 9926 9E9E
-C7AC
+C7AC:110C-1162
 518D 54C9 5728 5BB0 624D 6750 683D 6893 6E3D 6ED3
 707D 7E21 88C1 8CA1 8F09 9F4B 9F4E 5908 5D3D 6257
 699F 707E 7E94
-C7C1
+C7C1:110C-1162-11BC
 722D 7B8F 8ACD 931A 5D22 7319 7424 9397
-C800
+C800:110C-1165
 4F47 4F4E 5132 5480 59D0 5E95 62B5 6775 696E 6A17
 6CAE 6E1A 72D9 732A 75BD 7BB8 7D35 82E7 83F9 8457
 85F7 8A5B 8CAF 8E87 9019 90B8 96CE 9F5F 5B81 5CA8
 677C 67E2 6C10 6F74 7026 7274 7F5D 7F9D 82F4 86C6
 889B 891A 89DD 8A46 8C6C 967C
-C801
+C801:110C-1165-11A8
 52E3 540A 5AE1 5BC2 6458 6575 6EF4 72C4 7684 7A4D
 7B1B 7C4D 7E3E 7FDF 837B 8B2B 8CCA 8D64 8DE1 8E5F
 8FEA 8FF9 9069 93D1 6A00 78E7 7CF4 83C2 89BF 9016
 99B0
-C804
+C804:110C-1165-11AB
 4F43 4F7A 50B3 5168 5178 524D 526A 5861 587C 5960
 5C08 5C55 5EDB 609B 6230 6813 6BBF 6C08 6FB1 714E
 7420 7530 7538 7551 7672 7B4C 7B8B 7BAD 7BC6 7E8F
@@ -1052,15 +1055,15 @@ C804
 78DA 7C5B 7FB6 7FE6 8146 819E 8343 8E94 8F07 9085
 913D 92D1 932A 975B 9766 9853 98E6 9930 9B0B 9C63
 9E07
-C808
+C808:110C-1165-11AF
 5207 622A 6298 6D59 7664 7ACA 7BC0 7D76 5C8A 6662
 7A83
-C810
+C810:110C-1165-11B7
 5360 5CBE 5E97 6F38 70B9 7C98 9711 9B8E 9EDE 4F54
 588A 73B7 7B18 7C1F 82EB 852A 86C5 8998 98AD 9ECF
-C811
+C811:110C-1165-11B8
 63A5 647A 8776 6904 696A 8728 8DD5 8E40 9C08
-C815
+C815:110C-1165-11BC
 4E01 4E95 4EAD 505C 5075 5448 59C3 5B9A 5E40 5EAD
 5EF7 5F81 60C5 633A 653F 6574 65CC 6676 6678 67FE
 6968 6A89 6B63 6C40 6DC0 6DE8 6E1F 6E5E 701E 70A1
@@ -1069,12 +1072,12 @@ C815
 9706 9756 975C 9802 9F0E 4F42 53EE 5A67 5A77 6014
 639F 686F 6883 68D6 706F 73F5 7594 7B73 839B 8A3C
 9049 9172 92E5 975A
-C81C
+C81C:110C-1166
 5236 5291 557C 5824 5E1D 5F1F 608C 63D0 68AF 6FDF
 796D 7B2C 81CD 85BA 88FD 8AF8 8E44 918D 9664 969B
 973D 984C 9F4A 5115 5A23 64E0 7318 7445 7747 7994
 7A0A 7DF9 8E36 8E4F 8E8B 9357 9684 97F2 9BA7 9BF7
-C870
+C870:110C-1169
 4FCE 5146 51CB 52A9 5632 5F14 5F6B 63AA 64CD 65E9
 6641 66FA 66F9 671D 689D 68D7 69FD 6F15 6F6E 7167
 71E5 722A 74AA 773A 7956 795A 79DF 7A20 7A95 7C97
@@ -1083,21 +1086,21 @@ C870
 5608 566A 5B25 5F82 61C6 627E 6B82 6FA1 7431 7681
 7967 7AC8 7B0A 7CD9 7CF6 7D69 7D5B 80D9 81CA 825A
 8526 8729 8A82 8B5F 921F 929A 92FD 9BDB 9D70 9F02
-C871
+C871:110C-1169-11A8
 65CF 7C07 8DB3 93C3 762F
-C874
+C874:110C-1169-11AB
 5B58 5C0A 62F5
-C878
+C878:110C-1169-11AF
 5352 62D9 731D
-C885
+C885:110C-1169-11BC
 5027 5B97 5F9E 60B0 616B 68D5 6DD9 742E 7A2E 7D42
 7D9C 7E31 816B 8E2A 8E35 937E 9418 4F00 6152 67CA
 6936 6A05 747D 7607 7CBD 87BD 8E64
-C88C
+C88C:110C-116A
 4F50 5750 5DE6 5EA7 632B 5249 75E4 839D 9AFD
-C8C4
+C8C4:110C-116C
 7F6A
-C8FC
+C8FC:110C-116E
 4E3B 4F4F 4F8F 505A 59DD 80C4 546A 5468 55FE 594F
 5B99 5DDE 5EDA 665D 6731 67F1 682A 6CE8 6D32 6E4A
 6F8D 70B7 73E0 7587 7C4C 7D02 7D2C 7DA2 821F 86DB
@@ -1105,413 +1108,413 @@ C8FC
 4E1F 4F9C 5114 5C0C 5E6C 62C4 7843 7C52 8098 8160
 851F 86C0 88EF 8A4B 8CD9 8D8E 8F08 9052 9252 970C
 9714 9F04
-C8FD
+C8FD:110C-116E-11A8
 7AF9 7CA5
-C900
+C900:110C-116E-11AB
 4FCA 5101 51C6 57C8 5BEF 5CFB 6659 6A3D 6D5A 6E96
 6FEC 710C 756F 7AE3 8822 9021 9075 96CB 99FF 5642
 57FB 58AB 60F7 6499 76B4 7DA7 7F47 8E06 8E72 940F
 96BC 9915 9C52 9D54
-C904
+C904:110C-116E-11AF
 8301 4E7C
-C911
+C911:110C-116E-11BC
 4E2D 4EF2 8846 91CD 773E
-C989
+C989:110C-1173-11A8
 537D 5373 559E
-C990
+C990:110C-1173-11AF
 6ADB 9A2D
-C999
+C999:110C-1173-11B8
 696B 6C41 847A 6A9D 857A
-C99D
+C99D:110C-1173-11BC
 589E 618E 66FE 62EF 70DD 7511 75C7 7E52 84B8 8B49
 8D08 5D92 77F0 7F7E
-C9C0
+C9C0:110C-1175
 4E4B 53EA 54AB 5730 5740 5FD7 6301 6307 646F 652F
 65E8 667A 679D 67B3 6B62 6C60 6C9A 6F2C 77E5 7825
 7949 7957 7D19 80A2 8102 81F3 829D 82B7 8718 8A8C
 8D04 8DBE 9072 577B 5880 627A 69B0 6CDC 75E3 79EA
 7BEA 8210 8E1F 8E93 8EF9 962F 9BA8 9DD9
-C9C1
+C9C1:110C-1175-11A8
 76F4 7A19 7A37 7E54 8077 799D
-C9C4
+C9C4:110C-1175-11AB
 5507 55D4 5875 632F 6422 6649 664B 686D 699B 6B84
 6D25 6EB1 73CD 7468 74A1 755B 75B9 76E1 771E 778B
 79E6 7E09 7E1D 81FB 852F 8897 8A3A 8CD1 8EEB 8FB0
 9032 93AD 9663 9673 9707 4FB2 5118 73D2 7A39 84C1
 87B4 8D81 9241 9B12
-C9C8
+C9C8:110C-1175-11AF
 4F84 53F1 59EA 5AC9 5E19 684E 74C6 75BE 79E9 7A92
 81A3 86ED 8CEA 8DCC 8FED 57A4 7D70 84BA 90C5 9455
-C9D0
+C9D0:110C-1175-11B7
 659F 6715 9D06
-C9D1
+C9D1:110C-1175-11B8
 57F7 6F57 7DDD 8F2F 93F6 96C6 54A0 6222
-C9D5
+C9D5:110C-1175-11BC
 5FB5 61F2 6F84 6F82 7013 7665 77AA
-CC28
+CC28:110E-1161
 4E14 4F98 501F 53C9 55DF 5D6F 5DEE 6B21 6B64 78CB
 7B9A 8E49 8ECA 906E 4F7D 5056 5953 5C94 5FA3 69CE
 7473 7868
-CC29
+CC29:110E-1161-11A8
 6349 643E 7740 7A84 932F 947F 9F6A 6233 64C9 65B2
-CC2C
+CC2C:110E-1161-11AB
 64B0 6FAF 71E6 74A8 74DA 7AC4 7C12 7E82 7CB2 7E98
 8B9A 8D0A 947D 9910 994C 5127 5139 5297 5DD1 6522
 6B11 7228 8DB2
-CC30
+CC30:110E-1161-11AF
 5239 5BDF 64E6 672D 7D2E 624E 62F6
-CC38
+CC38:110E-1161-11B7
 50ED 53C3 5879 6158 6159 61FA 65AC 7AD9 8B92 8B96
 5133 53C5 5D84 5DC9 615A 61AF 6519 69E7 6B03 6BDA
 8B56 93E8 9471 995E 9A42 9EF2
-CC3D
+CC3D:110E-1161-11BC
 5009 5021 5275 5531 5A3C 5EE0 5F70 6134 655E 660C
 6636 66A2 69CD 6EC4 6F32 7316 7621 7A93 8139 8259
 83D6 84BC 5000 5096 51D4 5231 60B5 60DD 6227 6436
 6919 6C05 7472 7A97 7ABB 8E4C 92F9 9306 95B6 9B2F
 9DAC
-CC44
+CC44:110E-1162
 50B5 57F0 5BC0 5BE8 5F69 63A1 7826 7DB5 83DC 8521
 91C7 91F5 68CC 831D
-CC45
+CC45:110E-1162-11A8
 518A 67F5 7B56 8CAC 5616 5E58 78D4 7B27 7C00 86B1
-CC98
+CC98:110E-1165
 51C4 59BB 60BD 8655 6DD2 840B 8904 89B7 90EA
-CC99
+CC99:110E-1165-11A8
 501C 5254 5C3A 617D 621A 62D3 64F2 65A5 6ECC 7620
 810A 8E60 965F 96BB 544E 5767 5849 60D5 6357 646D
 8734 8DD6 8E91
-CC9C
+CC9C:110E-1165-11AB
 4EDF 5343 5598 5929 5DDD 64C5 6CC9 6DFA 7394 7A7F
 821B 85A6 8CE4 8E10 9077 91E7 95E1 9621 97C6 4FF4
 5029 50E2 5103 6D0A 6FFA 74E9 7946 7C81 81F6 828A
 831C 8350 84A8 8546 8695 8FBF 975D
-CCA0
+CCA0:110E-1165-11AF
 51F8 54F2 5586 5FB9 64A4 6F88 7DB4 8F1F 8F4D 9435
 525F 555C 57D1 60D9 6387 6B60 9295 9323 98FB 992E
-CCA8
+CCA8:110E-1165-11B7
 50C9 5C16 6CBE 6DFB 751B 77BB 7C3D 7C64 8A79 8AC2
 5E68 5FDD 60C9 6A90 6AFC 7038 7C37 895C
-CCA9
+CCA9:110E-1165-11B8
 581E 59BE 5E16 6377 7252 758A 776B 8ADC 8CBC 8F12
 5022 546B 558B 6017 893A
-CCAD
+CCAD:110E-1165-11BC
 5EF3 6674 6DF8 807D 83C1 8ACB 9751 9BD6 51CA 570A
 873B 9D84
-CCB4
+CCB4:110E-1166
 5243 66FF 6D95 6EEF 7DE0 8AE6 902E 905E 9AD4 568F
 5F58 68E3 6BA2 780C 8482 8515 855E 8EC6 9746 9AF0
-CD08
+CD08:110E-1169
 521D 527F 54E8 6194 6284 62DB 68A2 6912 695A 6A35
 7092 7126 785D 7901 790E 79D2 7A0D 8096 8278 82D5
 8349 8549 8C82 8D85 9162 918B 91AE 5062 50EC 52AD
 52E6 564D 5AF6 5CA7 5CED 5D95 600A 6084 6100 676A
 71CB 7D83 8016 8A9A 8B59 8DA0 8EFA 8FE2 9214 936B
 936C 9798 9866 9AEB 9DE6 9F60
-CD09
+CD09:110E-1169-11A8
 4FC3 56D1 71ED 77D7 8700 89F8 66EF 7225 77DA 85A5
 8E85 9AD1
-CD0C
+CD0C:110E-1169-11AB
 5BF8 5FD6 6751 90A8 540B
-CD1D
+CD1D:110E-1169-11BC
 53E2 585A 5BF5 60A4 6181 6460 7E3D 8070 8525 9283
 8471 84EF 93E6 9A18 9A44
-CD2C
+CD2C:110E-116A-11AF
 64AE
-CD5C
+CD5C:110E-116C
 50AC 5D14 6700 562C 6467 69B1 6F3C 7480 78EA 7E17
 8127
-CD94
+CD94:110E-116E
 589C 62BD 63A8 690E 6978 6A1E 6E6B 76BA 79CB 82BB
 8429 8ACF 8DA8 8FFD 9112 914B 919C 9310 9318 939A
 96DB 9A36 9C0D 50E6 557E 5A35 5E1A 60C6 6376 63EB
 6425 7503 7633 9F9D 7B92 7BA0 7C09 7E0B 7E10 84AD
 966C 96B9 97A6 9A05 9B4B 9C0C 9D7B 9D96 9DB5 9E84
 9EA4
-CD95
+CD95:110E-116E-11A8
 4E11 755C 795D 7AFA 7B51 7BC9 7E2E 84C4 8E59 8E74
 8EF8 9010 59AF 8233 8C56 8E5C 9F00
-CD98
+CD98:110E-116E-11AB
 6625 693F 7443
-CD9C
+CD9C:110E-116E-11AF
 51FA 672E 9EDC 79EB
-CDA9
+CDA9:110E-116E-11BC
 5145 5FE0 6C96 87F2 885D 8877 51B2 5FE1 73EB
-CDCC
+CDCC:110E-1170
 60B4 81B5 8403 8D05 60F4 63E3 75A9 7601 9847
-CDE8
+CDE8:110E-1171
 53D6 5439 5634 5A36 5C31 708A 7FE0 805A 8106 81ED
 8DA3 9189 9A5F 9DF2 51A3 6A47 6BF3
-CE21
+CE21:110E-1173-11A8
 5074 4EC4 53A0 60FB 6E2C 5EC1 6603
-CE35
+CE35:110E-1173-11BC
 5C64
-CE58
+CE58:110E-1175
 4F88 5024 55E4 5CD9 5E5F 6065 6894 6CBB 6DC4 71BE
 75D4 75F4 7661 7A1A 7A49 7DC7 7DFB 7F6E 81F4 86A9
 8F1C 96C9 99B3 9F52 536E 54C6 5BD8 5DF5 7564 75D3
 7D7A 83D1 8599 892B 8C78 8DF1 9319 9624 9BD4 9D19
 9D1F 9D44
-CE59
+CE59:110E-1175-11A8
 5247 52C5 98ED 6555
-CE5C
+CE5C:110E-1175-11AB
 89AA 6AEC 85FD 896F 9F54
-CE60
+CE60:110E-1175-11AF
 4E03 67D2 6F06
-CE68
+CE68:110E-1175-11B7
 4FB5 5BE2 6795 6C88 6D78 741B 7827 91DD 937C 5BD6
 5FF1 6939 6C89 90F4 92DF 99F8
-CE69
+CE69:110E-1175-11B8
 87C4
-CE6D
+CE6D:110E-1175-11BC
 79E4 7A31
-CF8C
+CF8C:110F-116B
 5FEB 5672 592C
-D0C0
+D0C0:1110-1161
 4ED6 54A4 553E 58AE 59A5 60F0 6253 62D6 6736 6955
 8235 9640 99B1 99DD 4F57 579E 62D5 67C1 6A62 6CB1
 8A6B 8DCE 8EB1 99DE 9B80 9D15 9F09
-D0C1
+D0C1:1110-1161-11A8
 502C 5353 5544 577C 6258 64E2 666B 67DD 6FC1 6FEF
 7422 7438 8A17 9438 62C6 6A50 6CB0 6DBF 77FA 7C5C
 8600 8E14 9034
-D0C4
+D0C4:1110-1161-11AB
 5451 5606 5766 5F48 619A 6B4E 7058 70AD 7DBB 8A95
 61BB 6524 6BAB 7671 9A52
-D0C8
+D0C8:1110-1161-11AF
 596A 812B 4FBB
-D0D0
+D0D0:1110-1161-11B7
 63A2 7708 803D 8CAA 55FF 5FD0 9156
-D0D1
+D0D1:1110-1161-11B8
 5854 642D 69BB 509D 584C 6428
-D0D5
+D0D5:1110-1161-11BC
 5B95 5E11 6E6F 8569 71D9 76EA 78AD 862F
-D0DC
+D0DC:1110-1162
 514C 53F0 592A 6020 614B 6B86 6C70 6CF0 7B1E 80CE
 82D4 8DC6 90B0 98B1 57ED 5A27 5B61 62AC 8FE8 99C4
 99D8
-D0DD
+D0DD:1110-1162-11A8
 64C7 6FA4
-D0F1
+D0F1:1110-1162-11BC
 6491 6490 725A
-D130
+D130:1110-1165
 6504
-D1A0
+D1A0:1110-1169
 514E 5410 571F 8A0E
-D1A4
+D1A4:1110-1169-11AB
 564B 5678 74F2
-D1B5
+D1B5:1110-1169-11BC
 615F 6876 75DB 7B52 7D71 901A 606B 6A0B 7B69
-D1F4
+D1F4:1110-116C
 5806 69CC 817F 892A 9000 9839 96A4
-D22C
+D22C:1110-116E
 5078 5957 59AC 6295 900F 9B2A 5992 6E1D 9AB0
-D241
+D241:1110-116E-11BC
 4F5F
-D2B9
+D2B9:1110-1173-11A8
 615D 7279 5FD2
-D2C8
+D2C8:1110-1173-11B7
 95D6
-D30C
+D30C:1111-1161
 5761 5A46 5DF4 628A 64AD 64FA 6777 6CE2 6D3E 722C
 7436 7834 7F77 82AD 8DDB 9817 53F5 5991 5CA5 6015
 705E 7238 73BB 76A4 7B06 7C38 8019 83E0 8469 9131
-D310
+D310:1111-1161-11AB
 5224 5742 677F 7248 74E3 8CA9 8FA6 9211 962A 6C74
-D314
+D314:1111-1161-11AF
 516B 53ED 634C 6733 6C43
-D328
+D328:1111-1162
 4F69 5504 6096 6557 6C9B 6D7F 724C 72FD 7A17 8987
 8C9D 5B5B 65C6 73EE 9708 9738
-D33D
+D33D:1111-1162-11BC
 5F6D 6F8E 70F9 81A8 7830 794A 87DA 87DB
-D345
+D345:1111-1163-11A8
 610E
-D3B8
+D3B8:1111-1167-11AB
 4FBF 504F 6241 7247 7BC7 7DE8 7FE9 904D 97AD 9A19
 533E 5FA7 60FC 7DF6 8251 8439 8759 890A 8ADE
-D3C4
+D3C4:1111-1167-11B7
 8CB6 782D 7A86
-D3C9
+D3C9:1111-1167-11BC
 576A 5E73 67B0 840D 8A55 6026 62A8 6CD9 82F9 84F1
 9B83
-D3D0
+D3D0:1111-1168
 5420 5B16 5E63 5EE2 5F0A 6583 80BA 853D 9589 965B
 655D 72F4 7358 7648
-D3EC
+D3EC:1111-1169
 4F48 5305 530D 530F 5486 54FA 5703 5E03 6016 629B
 62B1 6355 6CE1 6D66 75B1 7832 80DE 812F 82DE 8461
 84B2 888D 8912 900B 92EA 98FD 9B91 5124 5E96 6661
 66D3 70AE 70B0 8216 8AA7 924B 9784 9914 9BC6
-D3ED
+D3ED:1111-1169-11A8
 5E45 66B4 66DD 7011 7206
-D45C
+D45C:1111-116D
 4FF5 527D 5F6A 6153 6753 6A19 6F02 74E2 7968 8868
 8C79 98C7 98C4 9A43 50C4 52E1 560C 5AD6 647D 6B8D
 719B 7E39 88F1 93E2 9463 9ADF 9C3E
-D488
+D488:1111-116E-11B7
 54C1 7A1F 7980
-D48D
+D48D:1111-116E-11BC
 6953 8AF7 8C4A 98A8 99AE 760B 8451
-D53C
+D53C:1111-1175
 5F7C 62AB 75B2 76AE 88AB 907F 9642 8A56 8F9F 9781
 9AF2
-D53D
+D53D:1111-1175-11A8
 8177
-D544
+D544:1111-1175-11AF
 5339 5F3C 5FC5 6CCC 73CC 7562 758B 7B46 82FE 999D
 4F56 5487 6EED 7BF3 7F7C 84FD 89F1 8E55 97B8 97E0
 99DC 9D6F
-D54D
+D54D:1111-1175-11B8
 4E4F 903C 506A
-D558
+D558:1112-1161
 4E0B 4F55 53A6 590F 5EC8 6630 6CB3 7455 8377 8766
 8CC0 9050 971E 9C15 5440 5687 5C88 61D7 7146 7615
 7F45 935C
-D559
+D559:1112-1161-11A8
 58D1 5B78 8650 8B14 9DB4 72E2 7627 76AC 786E 90DD
 9DFD
-D55C
+D55C:1112-1161-11AB
 5BD2 6068 608D 65F1 6C57 6F22 6FA3 701A 7F55 7FF0
 9591 9592 9650 97D3 50E9 5AFA 5AFB 634D 66B5 9588
 99FB 9DF3 9F3E
-D560
+D560:1112-1161-11AF
 5272 8F44 778E
-D568
+D568:1112-1161-11B7
 51FD 542B 54B8 5563 558A 6ABB 6DB5 7DD8 8266 929C
 9677 9E79 839F 83E1 8AF4 8F5E 95DE
-D569
+D569:1112-1161-11B8
 5408 54C8 76D2 86E4 95A4 95D4 965C 530C 55D1 67D9
 69BC 6E98 76CD 90C3
-D56D
+D56D:1112-1161-11BC
 4EA2 4F09 59EE 5AE6 5DF7 6052 6297 676D 6841 6C86
 6E2F 7F38 809B 822A 9805 592F 6046 7095 7F3F 980F
-D574
+D574:1112-1162
 4EA5 5055 54B3 5793 595A 5B69 5BB3 61C8 6977 6D77
 7023 87F9 89E3 8A72 8AE7 9082 99ED 9AB8 548D 5DB0
 5EE8 6B2C 736C 744E 75CE 85A4 91A2 9826 9BAD
-D575
+D575:1112-1162-11A8
 52BE 6838 7FEE 8988
-D589
+D589:1112-1162-11BC
 5016 5E78 674F 8347 884C 60BB
-D5A5
+D5A5:1112-1163-11BC
 4EAB 5411 56AE 73E6 9115 97FF 9909 9957 9999 858C
-D5C8
+D5C8:1112-1165
 5653 589F 865B 8A31 6B54
-D5CC
+D5CC:1112-1165-11AB
 61B2 6AF6 737B 8ED2 5DDA 5E70 6507
-D5D0
+D5D0:1112-1165-11AF
 6B47
-D5D8
+D5D8:1112-1165-11B7
 96AA 9A57 5DAE 736B 7381
-D601
+D601:1112-1167-11A8
 5955 7200 8D6B 9769 5F08 6D2B 7131 9B29
-D604
+D604:1112-1167-11AB
 4FD4 5CF4 5F26 61F8 665B 6CEB 70AB 7384 73B9 73FE
 7729 774D 7D43 7D62 7E23 8237 8852 8CE2 9249 986F
 5107 5B1B 6621 7404 75C3 770C 7E6F 7FFE 8706 8AA2
 92D7 99FD
-D608
+D608:1112-1167-11AF
 5B51 7A74 8840 9801 7D5C 8D90
-D610
+D610:1112-1167-11B7
 5ACC
-D611
+D611:1112-1167-11B8
 4FE0 5354 593E 5CFD 633E 6D79 72F9 8105 8107 83A2
 92CF 9830 5327 53F6 57C9 604A 608F 611C 7BCB
-D615
+D615:1112-1167-11BC
 4EA8 5144 5211 578B 5F62 6CC2 6ECE 7005 7050 70AF
 7192 73E9 7469 834A 87A2 8861 9008 90A2 93A3 99A8
 5910 5A19 8A57 8FE5 9658
-D61C
+D61C:1112-1168
 516E 5F57 60E0 6167 66B3 8559 8E4A 91AF 978B 5092
 5612 5BED 5FAF 69E5 76FB 8B11 8B7F
-D638
+D638:1112-1169
 4E4E 4E92 547C 58D5 58FA 597D 5CB5 5F27 6236 6248
 660A 6667 6BEB 6D69 6DCF 6E56 6EF8 6F94 6FE0 6FE9
 705D 72D0 7425 745A 74E0 7693 795C 7CCA 7E1E 80E1
 82A6 846B 84BF 864E 865F 8774 8B77 8C6A 93AC 9800
 9865 512B 51B1 5637 5AED 5AEE 6019 6C8D 6EC8 6EEC
 7292 7322 769C 769E 7B8E 8055 9190 992C 9B0D
-D639
+D639:1112-1169-11A8
 60D1 6216 9177
-D63C
+D63C:1112-1169-11AB
 5A5A 660F 6DF7 6E3E 743F 9B42 5702 60DB 6EB7 711C
 95BD
-D640
+D640:1112-1169-11AF
 5FFD 60DA 7B0F 56EB
-D64D
+D64D:1112-1169-11BC
 54C4 5F18 6C5E 6CD3 6D2A 70D8 7D05 8679 8A0C 9D3B
 664E 6F92 7BCA 9277 9B28
-D654
+D654:1112-116A
 5316 548C 5B05 6A3A 706B 7575 798D 79BE 82B1 83EF
 8A71 8B41 8CA8 9774 4FF0 5629 5A72 64ED 756B 9A4A
 9FA2
-D655
+D655:1112-116A-11A8
 64F4 652B 78BA 78BB 7A6B 77CD 77E1 792D 944A
-D658
+D658:1112-116A-11AB
 4E38 559A 5950 5BA6 5E7B 60A3 63DB 6B61 6665 6853
 6E19 7165 74B0 7D08 9084 9A69 9C25 5BF0 61FD 64D0
 74DB 7696 7746 7D59 8C62 8F58 9370 9436 9B1F
-D65C
+D65C:1112-116A-11AF
 6D3B 6ED1 733E 8C41 95CA 86DE
-D669
+D669:1112-116A-11BC
 51F0 5E4C 5FA8 604D 60F6 6130 614C 6643 6644 69A5
 6CC1 6E5F 6EC9 6F62 714C 749C 7687 7BC1 7C27 8352
 8757 9051 968D 9EC3 55A4 5A93 6033 745D 8093 8CBA
 93A4
-D68C
+D68C:1112-116C
 532F 56DE 5EFB 5F8A 6062 6094 61F7 6666 6703 6A9C
 6DEE 6FAE 7070 736A 7E6A 81BE 8334 86D4 8AA8 8CC4
 4F6A 6803 6D04 6ED9 76D4 8A7C 8FF4 982E 9C60
-D68D
+D68D:1112-116C-11A8
 5283 7372 5684
-D6A1
+D6A1:1112-116C-11BC
 5B96 6A6B 9404 6F8B 921C 9ECC
-D6A8
+D6A8:1112-116D
 54EE 5686 5B5D 6548 6585 66C9 689F 6D8D 6DC6 723B
 80B4 9175 9A4D 509A 56C2 5D24 6BBD 7187 769B 8653
 991A
-D6C4
+D6C4:1112-116E
 4FAF 5019 539A 540E 543C 5589 55C5 5E3F 5F8C 673D
 7166 73DD 9005 543D 55A3 5795 5820 6DB8 7334 7BCC
 8A61 8B43 9157 9931
-D6C8
+D6C8:1112-116E-11AB
 52DB 52F3 5864 58CE 7104 718F 71FB 85B0 8A13 6688
 66DB 720B 736F 7E81 8477 9442
-D6CC
+D6CC:1112-116E-11AF
 6B3B
-D6D9
+D6D9:1112-116E-11BC
 85A8
-D6E4
+D6E4:1112-116F-11AB
 55A7 6684 714A 8431 70DC 8AE0 8AFC
-D6FC
+D6FC:1112-1170
 5349 5599 6BC1 71EC 8294 866B 867A
-D718
+D718:1112-1171
 5F59 5FBD 63EE 6689 7147 8AF1 8F1D 9EBE 649D 7FEC
-D734
+D734:1112-1172
 4F11 643A 70CB 7566 8667 54BB 64D5 96B3 9AF9 9D42
-D73C
+D73C:1112-1172-11AF
 6064 8B4E 9DF8 5379
-D749
+D749:1112-1172-11BC
 5147 51F6 5308 6D36 80F8 605F 80F7
-D751
+D751:1112-1173-11A8
 9ED1
-D754
+D754:1112-1173-11AB
 6615 6B23 7098 75D5 5F88 5FFB 6380 712E 8A22 91C1
-D758
+D758:1112-1173-11AF
 5403 5C79 7D07 8A16 4EE1 6C54 7599 8FC4 9F55
-D760
+D760:1112-1173-11B7
 6B20 6B3D 6B46 5EDE
-D761
+D761:1112-1173-11B8
 5438 6070 6D3D 7FD5 564F 6B59 6F5D 7FD6
-D765
+D765:1112-1173-11BC
 8208
-D76C
+D76C:1112-1174
 50D6 51DE 559C 566B 56CD 59EC 5B09 5E0C 6199 6198
 6231 665E 66E6 7199 71B9 71BA 72A7 79A7 7A00 7FB2
 54A5 550F 563B 6095 6232 66BF 6B37 71F9 7214 8C68
 993C
-D790
+D790:1112-1175-11AF
 8A70 72B5 7E88 896D 9821 9EE0
 __END__
 
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Pinyin.pm b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Pinyin.pm
index b8f3976caa3..5abe6505b79 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Pinyin.pm
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Pinyin.pm
@@ -4,7 +4,7 @@ use 5.006;
 use strict;
 use warnings;
 
-our $VERSION = '1.12';
+our $VERSION = '1.14';
 
 my %u2p;
 my $wt = 0x8000;
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Stroke.pm b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Stroke.pm
index a7f7526826e..e40e69106ed 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Stroke.pm
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Stroke.pm
@@ -4,7 +4,7 @@ use 5.006;
 use strict;
 use warnings;
 
-our $VERSION = '1.12';
+our $VERSION = '1.14';
 
 my %u2p;
 my $wt = 0x8000;
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Zhuyin.pm b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Zhuyin.pm
index 9e5ced0f9f3..13e4dc04bdb 100755
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Zhuyin.pm
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/CJK/Zhuyin.pm
@@ -4,7 +4,7 @@ use 5.006;
 use strict;
 use warnings;
 
-our $VERSION = '1.12';
+our $VERSION = '1.14';
 
 my %u2p;
 my $wt = 0x8000;
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale.pm b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale.pm
index 184ab6c7da5..f76abe579ab 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale.pm
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp;
 use base qw(Unicode::Collate);
 
-our $VERSION = '1.12';
+our $VERSION = '1.14';
 
 my $PL_EXT  = '.pl';
 
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/af.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/af.pl
index f962e61700b..1a3a479ed4d 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/af.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/af.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0149      ; [.1A7D.0020.0009] # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
 ENTRY
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ar.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ar.pl
index c5eef3195a2..cf27cfd5dc1 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ar.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ar.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0629      ; [.2025.0021.0002] # ARABIC LETTER TEH MARBUTA
 FE94      ; [.2025.0021.0019] # ARABIC LETTER TEH MARBUTA FINAL FORM
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/as.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/as.pl
index a7efd2a033c..9a869cf671a 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/as.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/as.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0982      ; [.23CC.0020.0002][.FFF1.0000.0000] # BENGALI SIGN ANUSVARA
 0981      ; [.23CC.0020.0002][.FFF2.0000.0000] # BENGALI SIGN CANDRABINDU
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/az.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/az.pl
index 09f159b1701..c405fc57c62 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/az.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/az.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
 # schwa doesn't require tailoring
    entry => <<'ENTRY', # for DUCET v7.0.0
 00E7      ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CEDILLA
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/be.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/be.pl
index 8c2af06574a..adb17e34945 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/be.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/be.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435,
 		0x0416, 0x0436, 0x0417, 0x0437, 0x0406, 0x0456, 0x041E, 0x043E,
 		0x04E8, 0x04E9, 0x041A, 0x043A, 0x0427, 0x0447, 0x042B, 0x044B,
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/bg.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/bg.pl
index 645125ce0c6..b23b64125ab 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/bg.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/bg.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435,
 		0x0416, 0x0436, 0x0417, 0x0437, 0x0406, 0x0456, 0x041E, 0x043E,
 		0x04E8, 0x04E9, 0x041A, 0x043A, 0x0423, 0x0443, 0x0427, 0x0447,
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/bn.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/bn.pl
index a876406ad88..d2aacdb6c5e 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/bn.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/bn.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0982      ; [.23CC.0020.0002][.FFF1.0000.0000] # BENGALI SIGN ANUSVARA
 0983      ; [.23CC.0020.0002][.FFF2.0000.0000] # BENGALI SIGN VISARGA
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ca.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ca.pl
index 308c68f305f..f36465357cb 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ca.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ca.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    backwards => 2,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0063 0068 ; [.193F.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H>
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/cs.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/cs.pl
index f75d2668a40..920897c76e0 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/cs.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/cs.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 010D      ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON
 0063 030C ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/cy.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/cy.pl
index 4449bcd641c..4e5baf6ef43 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/cy.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/cy.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0063 0068 ; [.193F.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H>
 0043 0068 ; [.193F.0020.0007] # <LATIN CAPITAL LETTER C, LATIN SMALL LETTER H>
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/da.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/da.pl
index 2e5097170aa..8dcffab0a86 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/da.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/da.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    upper_before_lower => 1,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0111      ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/de_phone.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/de_phone.pl
index 00daa92e097..b253e5c5b85 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/de_phone.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/de_phone.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 00E4      ; [.190C.0021.0002][.196E.0021.0002] # LATIN SMALL LETTER A WITH DIAERESIS
 0061 0308 ; [.190C.0021.0002][.196E.0021.0002] # LATIN SMALL LETTER A WITH DIAERESIS
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ee.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ee.pl
index 4ac1b91ba01..c8b792469a2 100755
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ee.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ee.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
 # d-tail, open-e, f-hook, gamma, eng, open-o, v-hook don't require tailoring
    entry => <<'ENTRY', # for DUCET v7.0.0
 0302      ; [.0000.0029.0002] # COMBINING CIRCUMFLEX ACCENT
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/eo.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/eo.pl
index bdecddb2c80..de2d1075dd5 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/eo.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/eo.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0109      ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CIRCUMFLEX
 0063 0302 ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CIRCUMFLEX
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/es.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/es.pl
index c1515723edf..fb5e1006408 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/es.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/es.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 00F1      ; [.1A7E.0020.0002] # LATIN SMALL LETTER N WITH TILDE
 006E 0303 ; [.1A7E.0020.0002] # LATIN SMALL LETTER N WITH TILDE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/es_trad.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/es_trad.pl
index cc1bdfc03aa..966a69bf4d7 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/es_trad.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/es_trad.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0063 0068 ; [.193F.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H>
 0043 0068 ; [.193F.0020.0007] # <LATIN CAPITAL LETTER C, LATIN SMALL LETTER H>
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/et.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/et.pl
index 8611cc5f080..98087690f3e 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/et.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/et.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0161      ; [.1B54.0020.0002] # LATIN SMALL LETTER S WITH CARON
 0073 030C ; [.1B54.0020.0002] # LATIN SMALL LETTER S WITH CARON
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fa.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fa.pl
index f68dfd9b153..fbd3e28ac7c 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fa.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fa.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0650      ; [.0000.0077.0002] # ARABIC KASRA
 064B      ; [.0000.007B.0002] # ARABIC FATHATAN
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fi.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fi.pl
index 65211cc814a..a1e6a6b3906 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fi.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fi.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
 # in cldr test/fi.xml why x{110}x < xdx though xd < x{110} ?
    entry => <<'ENTRY', # for DUCET v7.0.0
 0111      ; [.1953.0021.0002][.0000.0039.0002] # LATIN SMALL LETTER D WITH STROKE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fi_phone.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fi_phone.pl
index aa8335e5047..93f3df17505 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fi_phone.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fi_phone.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
 # in cldr test/fi.xml why x{110}x < xdx though xd < x{110} ?
    entry => <<'ENTRY', # for DUCET v7.0.0
 0111      ; [.1953.0021.0002][.0000.0039.0002] # LATIN SMALL LETTER D WITH STROKE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fil.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fil.pl
index e0a3bf8adae..d53d155d724 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fil.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fil.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 00F1      ; [.1A7E.0020.0002] # LATIN SMALL LETTER N WITH TILDE
 006E 0303 ; [.1A7E.0020.0002] # LATIN SMALL LETTER N WITH TILDE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fo.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fo.pl
index 0f8e8e09309..ec79a4983ba 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fo.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fo.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0111      ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fr.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fr.pl
index b5083bd6307..8c1a56567d0 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fr.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/fr.pl
@@ -1,4 +1,4 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    backwards => 2,
 };
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/gu.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/gu.pl
index 6984e21438c..037b655b088 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/gu.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/gu.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0A82      ; [.2438.0020.0002][.FFF1.0000.0000] # GUJARATI SIGN ANUSVARA
 0A81      ; [.2438.0021.0002][.FFF1.0000.0000] # GUJARATI SIGN CANDRABINDU
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ha.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ha.pl
index 244d693356e..845b7c0ceac 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ha.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ha.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
 # b-hook, d-hook, k-hook, y-hook don't require tailoring
    entry => <<'ENTRY', # for DUCET v7.0.0
 0073 0068 ; [.1B34.0020.0002] # <LATIN SMALL LETTER S, LATIN SMALL LETTER H>
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/haw.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/haw.pl
index 059b55ff76d..cb17e77a8e8 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/haw.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/haw.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0065      ; [.190D.0020.0002] # LATIN SMALL LETTER E
 0045      ; [.190D.0020.0008] # LATIN CAPITAL LETTER E
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hi.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hi.pl
index 0b72a65b271..1fab20c2186 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hi.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hi.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0902      ; [.235B.0020.0002][.FFF1.0000.0000] # DEVANAGARI SIGN ANUSVARA
 0901      ; [.235B.0021.0002][.FFF1.0000.0000] # DEVANAGARI SIGN CANDRABINDU
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hr.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hr.pl
index 2a8e8feb516..e7d29d61b3e 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hr.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hr.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 010D      ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON
 0063 030C ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hu.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hu.pl
index c5e8ca0e649..62b6707e3f0 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hu.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hu.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0063 0073 ; [.193F.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER S>
 0063 0053 ; [.193F.0020.0007][.0000.0000.0002] # <LATIN SMALL LETTER C, LATIN CAPITAL LETTER S>
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hy.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hy.pl
index 8d02f53622a..2b5e06d7b5b 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hy.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/hy.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0587      ; [.1FBD.0020.0002][.FFF1.0000.0000] # ARMENIAN SMALL LIGATURE ECH YIWN
 0584      ; [.1FBD.0020.0002][.FFF0.0000.0000] # ARMENIAN SMALL LETTER KEH
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ig.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ig.pl
index c5a852b9825..518cd522b9c 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ig.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ig.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0063 0068 ; [.1926.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H>
 0043 0068 ; [.1926.0020.0007] # <LATIN CAPITAL LETTER C, LATIN SMALL LETTER H>
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/is.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/is.pl
index 0c0c06b1e2b..16d2491fe9b 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/is.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/is.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 00E1      ; [.1924.0020.0002] # LATIN SMALL LETTER A WITH ACUTE
 0061 0301 ; [.1924.0020.0002] # LATIN SMALL LETTER A WITH ACUTE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ja.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ja.pl
index a8fa6635db3..5cc9358bc33 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ja.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ja.pl
@@ -1,6 +1,6 @@
 use Unicode::Collate::CJK::JISX0208;
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    overrideCJK => \&Unicode::Collate::CJK::JISX0208::weightJISX0208,
    entry => <<'ENTRY', # for DUCET v7.0.0
 30A1      ; [.38D4.0020.000F.0002] # KATAKANA LETTER SMALL A
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kk.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kk.pl
index 24e5abbe7e2..4d605ba231c 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kk.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kk.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435,
 		0x0416, 0x0436, 0x0417, 0x0437, 0x0406, 0x0456, 0x041E, 0x043E,
 		0x04E8, 0x04E9, 0x041A, 0x043A, 0x0423, 0x0443, 0x0427, 0x0447,
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kl.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kl.pl
index 9fcae20b18f..9cd73f4d508 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kl.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kl.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0111      ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kn.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kn.pl
index ef846e660e2..1f1f9e7a018 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kn.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kn.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0C82      ; [.2549.0020.0002][.FFF1.0000.0000] # KANNADA SIGN ANUSVARA
 0C83      ; [.2549.0020.0002][.FFF2.0000.0000] # KANNADA SIGN VISARGA
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ko.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ko.pl
index e328bf4b55c..049f4958a7a 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ko.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ko.pl
@@ -1,6 +1,6 @@
 use Unicode::Collate::CJK::Korean;
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    overrideCJK => \&Unicode::Collate::CJK::Korean::weightKorean,
    entry => <<'ENTRY', # for DUCET v7.0.0
 F967      ; [.3776.0021.0002.4E0D][.37FA.0020.0002] # CJK COMPATIBILITY IDEOGRAPH-F967
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kok.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kok.pl
index d2e645acad4..a49d361d012 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kok.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/kok.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0902      ; [.235B.0020.0002][.FFF1.0000.0000] # DEVANAGARI SIGN ANUSVARA
 0901      ; [.235B.0021.0002][.FFF1.0000.0000] # DEVANAGARI SIGN CANDRABINDU
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ln.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ln.pl
index e461791faeb..694e83698b8 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ln.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ln.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 025B      ; [.196F.0020.0002] # LATIN SMALL LETTER OPEN E
 0190      ; [.196F.0020.0008] # LATIN CAPITAL LETTER OPEN E
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/lt.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/lt.pl
index 5782ba22fd6..a4630feab32 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/lt.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/lt.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
 # in cldr test/lt.xml why I-dot-acute > I-dot though i-dot-acute < i-dot ?
    entry => <<'ENTRY', # for DUCET v7.0.0
 0049 0307 ; [.19F6.0020.0008][.0000.002E.0002] # <LATIN CAPITAL LETTER I, COMBINING DOT ABOVE>
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/lv.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/lv.pl
index c490ce38a9f..ebd25078db2 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/lv.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/lv.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 010D      ; [.1952.0020.0002] # LATIN SMALL LETTER C WITH CARON
 0063 030C ; [.1952.0020.0002] # LATIN SMALL LETTER C WITH CARON
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mk.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mk.pl
index 8ad888de3cc..16efe353994 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mk.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mk.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0415, 0x0435, 0x0416, 0x0436,
 		0x0417, 0x0437, 0x0418, 0x0438, 0x0406, 0x0456, 0x041E, 0x043E,
 		0x04E8, 0x04E9, 0x0423, 0x0443, 0x0427, 0x0447, 0x042B, 0x044B,
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ml.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ml.pl
index 1cced229346..ad26fb751f7 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ml.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ml.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0D3D      ; [.0000.00C0.0002] # MALAYALAM SIGN AVAGRAHA
 0D57      ; [.25C8.0020.0002] # MALAYALAM AU LENGTH MARK
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mr.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mr.pl
index 98bc0b174f2..44ca45a0e01 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mr.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mr.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0902      ; [.235B.0020.0002][.FFF1.0000.0000] # DEVANAGARI SIGN ANUSVARA
 0901      ; [.235B.0021.0002][.FFF1.0000.0000] # DEVANAGARI SIGN CANDRABINDU
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mt.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mt.pl
index e8cca669ab1..38d14dc3375 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mt.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/mt.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    upper_before_lower => 1,
    entry => <<'ENTRY', # for DUCET v7.0.0
 010B      ; [.193D.0020.0002] # LATIN SMALL LETTER C WITH DOT ABOVE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nb.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nb.pl
index 749807d7218..6306b814001 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nb.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nb.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0111      ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nn.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nn.pl
index 749807d7218..6306b814001 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nn.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nn.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0111      ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nso.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nso.pl
index 0a43662ca58..d3c1d6bfb6a 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nso.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/nso.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 00EA      ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH CIRCUMFLEX
 0065 0302 ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH CIRCUMFLEX
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/om.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/om.pl
index 4c4e9ce6abb..5c7196ceca6 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/om.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/om.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0063 0068 ; [.1BE4.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H>
 0043 0068 ; [.1BE4.0020.0007] # <LATIN CAPITAL LETTER C, LATIN SMALL LETTER H>
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/or.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/or.pl
index 3af7bfed51d..fa34f4cc519 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/or.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/or.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0B01      ; [.2489.0020.0002][.FFF1.0000.0000] # ORIYA SIGN CANDRABINDU
 0B02      ; [.2489.0020.0002][.FFF2.0000.0000] # ORIYA SIGN ANUSVARA
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/pa.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/pa.pl
index 0db0eca062c..1f53ce33bcd 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/pa.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/pa.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0A71      ; [.0000.00BD.0002] # GURMUKHI ADDAK
 0A03      ; [.0000.00BC.0002] # GURMUKHI SIGN VISARGA
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/pl.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/pl.pl
index 2b155f462bd..90b839fb381 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/pl.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/pl.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0105      ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH OGONEK
 0061 0328 ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH OGONEK
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ro.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ro.pl
index 9a59f36a0a1..8d1ec1ee75c 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ro.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ro.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0103      ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH BREVE
 0061 0306 ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH BREVE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ru.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ru.pl
index 645125ce0c6..b23b64125ab 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ru.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ru.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435,
 		0x0416, 0x0436, 0x0417, 0x0437, 0x0406, 0x0456, 0x041E, 0x043E,
 		0x04E8, 0x04E9, 0x041A, 0x043A, 0x0423, 0x0443, 0x0427, 0x0447,
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sa.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sa.pl
index 98bc0b174f2..44ca45a0e01 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sa.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sa.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0902      ; [.235B.0020.0002][.FFF1.0000.0000] # DEVANAGARI SIGN ANUSVARA
 0901      ; [.235B.0021.0002][.FFF1.0000.0000] # DEVANAGARI SIGN CANDRABINDU
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/se.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/se.pl
index 957b896673d..f693e93d4ae 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/se.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/se.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
 # eng, g-stroke, t-stroke don't require tailoring
    entry => <<'ENTRY', # for DUCET v7.0.0
 00E1      ; [.1924.0020.0002] # LATIN SMALL LETTER A WITH ACUTE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/si.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/si.pl
index 5510c730b10..24e7ff8ef95 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/si.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/si.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0D82      ; [.25DC.0020.0002][.FFF1.0000.0000] # SINHALA SIGN ANUSVARAYA
 0D83      ; [.25DC.0020.0002][.FFF2.0000.0000] # SINHALA SIGN VISARGAYA
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/si_dict.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/si_dict.pl
index 7f2a1feb997..708d2b41433 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/si_dict.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/si_dict.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0D82      ; [.25DC.0020.0002][.FFF1.0000.0000] # SINHALA SIGN ANUSVARAYA
 0D83      ; [.25DC.0020.0002][.FFF2.0000.0000] # SINHALA SIGN VISARGAYA
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sk.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sk.pl
index ce7eaf098fa..89f5de15883 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sk.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sk.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 00E4      ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH DIAERESIS
 0061 0308 ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH DIAERESIS
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sl.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sl.pl
index 6d5bd70253e..979e890fbdd 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sl.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sl.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 010D      ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON
 0063 030C ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CARON
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sq.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sq.pl
index deaf1036d89..b8d243b54c3 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sq.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sq.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 00E7      ; [.1952.0020.0002] # LATIN SMALL LETTER C WITH CEDILLA
 0063 0327 ; [.1952.0020.0002] # LATIN SMALL LETTER C WITH CEDILLA
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sr.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sr.pl
index 90d5c73b2bc..8b829e1997a 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sr.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sr.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435,
 		0x0416, 0x0436, 0x0417, 0x0437, 0x0418, 0x0438, 0x0406, 0x0456,
 		0x041E, 0x043E, 0x04E8, 0x04E9, 0x041A, 0x043A, 0x0423, 0x0443,
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sv.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sv.pl
index 7e26b336484..5fe73703e39 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sv.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sv.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0111      ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sv_refo.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sv_refo.pl
index 9d850b71936..336054ea968 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sv_refo.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/sv_refo.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0111      ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
 0064 0335 ; [.1953.0021.0002] # LATIN SMALL LETTER D WITH STROKE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ta.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ta.pl
index 70097121e7e..8bfd19e0e40 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ta.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ta.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0B82      ; [.24CC.0020.0002][.FFF0.0000.0000] # TAMIL SIGN ANUSVARA
 0B83      ; [.24CC.0020.0002][.FFF1.0000.0000] # TAMIL SIGN VISARGA
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/te.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/te.pl
index 22aaffad298..93c55546763 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/te.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/te.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0C01      ; [.2500.0020.0002][.FFF1.0000.0000] # TELUGU SIGN CANDRABINDU
 0C02      ; [.2500.0020.0002][.FFF2.0000.0000] # TELUGU SIGN ANUSVARA
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/th.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/th.pl
index 1924027a6be..4c27713ad63 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/th.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/th.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    variable => 'shifted',
    alternate => 'shifted',
    entry => <<'ENTRY', # for DUCET v7.0.0
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/tn.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/tn.pl
index 0a43662ca58..d3c1d6bfb6a 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/tn.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/tn.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 00EA      ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH CIRCUMFLEX
 0065 0302 ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH CIRCUMFLEX
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/to.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/to.pl
index 0125da2dd0e..ca33252f0b1 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/to.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/to.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 006E 0067 ; [.1A7E.0020.0002] # <LATIN SMALL LETTER N, LATIN SMALL LETTER G>
 004E 0067 ; [.1A7E.0020.0007] # <LATIN CAPITAL LETTER N, LATIN SMALL LETTER G>
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/tr.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/tr.pl
index beaba4f703f..5eb59581a34 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/tr.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/tr.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 00E7      ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CEDILLA
 0063 0327 ; [.193F.0020.0002] # LATIN SMALL LETTER C WITH CEDILLA
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/uk.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/uk.pl
index 73c1090b5fa..844e836ec76 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/uk.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/uk.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    suppress => [0x0410, 0x0430, 0x04D8, 0x04D9, 0x0413, 0x0433, 0x0415, 0x0435,
 		0x0416, 0x0436, 0x0417, 0x0437, 0x041E, 0x043E, 0x04E8, 0x04E9,
 		0x041A, 0x043A, 0x0423, 0x0443, 0x0427, 0x0447, 0x042B, 0x044B,
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ur.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ur.pl
index 53de5d425d7..b248e1ca89e 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ur.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/ur.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0623      ; [.2015.0021.0002] # ARABIC LETTER ALEF WITH HAMZA ABOVE
 0627 0654 ; [.2015.0021.0002] # ARABIC LETTER ALEF WITH HAMZA ABOVE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/vi.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/vi.pl
index c03a83956d4..9c99d49b8a4 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/vi.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/vi.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
 # 0306 is not a Vietnamese tone, just to avoid \x{306} eq. to something.
    entry => <<'ENTRY', # for DUCET v7.0.0
 0309      ; [.0000.0026.0002][.0000.00F0.0000] # COMBINING HOOK ABOVE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/wae.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/wae.pl
index 84815663a49..42fcc2a23ad 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/wae.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/wae.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0061 0061 ; [.190C.0020.0002][.0000.0024.0002] # <LATIN SMALL LETTER A, LATIN SMALL LETTER A>
 00E4 00E4 ; [.190C.0020.0002][.0000.002D.0002] # <LATIN SMALL LETTER A WITH DIAERESIS, LATIN SMALL LETTER A WITH DIAERESIS>
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/wo.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/wo.pl
index 3d78de32a3b..dcc94fed6ee 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/wo.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/wo.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
 # eng doesn't require tailoring
    entry => <<'ENTRY', # for DUCET v7.0.0
 00E0      ; [.190D.0020.0002] # LATIN SMALL LETTER A WITH GRAVE
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/yo.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/yo.pl
index 5cffcd1222f..977dc8f2f28 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/yo.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/yo.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 1EB9      ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH DOT BELOW
 0065 0323 ; [.196F.0020.0002] # LATIN SMALL LETTER E WITH DOT BELOW
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh.pl
index ec4296ffb6b..75cd780fbc6 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh.pl
@@ -1,5 +1,5 @@
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0101      ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON
 0061 0304 ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_big5.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_big5.pl
index d8929ef259a..8136f444e31 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_big5.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_big5.pl
@@ -1,6 +1,6 @@
 use Unicode::Collate::CJK::Big5;
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    overrideCJK => \&Unicode::Collate::CJK::Big5::weightBig5,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0101      ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_gb.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_gb.pl
index ad117218d74..4d092a1dcf5 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_gb.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_gb.pl
@@ -1,6 +1,6 @@
 use Unicode::Collate::CJK::GB2312;
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    overrideCJK => \&Unicode::Collate::CJK::GB2312::weightGB2312,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0101      ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_pin.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_pin.pl
index 37a7b315f20..3562aa112d2 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_pin.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_pin.pl
@@ -1,6 +1,6 @@
 use Unicode::Collate::CJK::Pinyin;
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    overrideCJK => \&Unicode::Collate::CJK::Pinyin::weightPinyin,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0101      ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_strk.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_strk.pl
index dc88d0468cb..68d6edf2356 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_strk.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_strk.pl
@@ -1,6 +1,6 @@
 use Unicode::Collate::CJK::Stroke;
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    overrideCJK => \&Unicode::Collate::CJK::Stroke::weightStroke,
    entry => <<'ENTRY', # for DUCET v7.0.0
 0101      ; [.190C.001C.0002] # LATIN SMALL LETTER A WITH MACRON
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_zhu.pl b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_zhu.pl
index 1463055e347..5d235673a5b 100755
--- a/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_zhu.pl
+++ b/Master/tlpkg/tlperl/lib/Unicode/Collate/Locale/zh_zhu.pl
@@ -1,6 +1,6 @@
 use Unicode::Collate::CJK::Zhuyin;
 +{
-   locale_version => 1.12,
+   locale_version => 1.14,
    overrideCJK => \&Unicode::Collate::CJK::Zhuyin::weightZhuyin,
    entry => <<'ENTRY', # for DUCET v7.0.0
 02C9      ; [.0000.0199.0002] # MODIFIER LETTER MACRON
diff --git a/Master/tlpkg/tlperl/lib/Unicode/Normalize.pm b/Master/tlpkg/tlperl/lib/Unicode/Normalize.pm
index b11df69cf5b..ff6c0f0dc47 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/Normalize.pm
+++ b/Master/tlpkg/tlperl/lib/Unicode/Normalize.pm
@@ -16,7 +16,7 @@ use Carp;
 
 no warnings 'utf8';
 
-our $VERSION = '1.18';
+our $VERSION = '1.25';
 our $PACKAGE = __PACKAGE__;
 
 our @EXPORT = qw( NFC NFD NFKC NFKD );
@@ -45,501 +45,22 @@ sub pack_U {
 }
 
 sub unpack_U {
+
+    # The empty pack returns an empty UTF-8 string, so the effect is to force
+    # the shifted parameter into being UTF-8.  This allows this to work on
+    # Perl 5.6, where there is no utf8::upgrade().
     return unpack('U*', shift(@_).pack('U*'));
 }
 
 require Exporter;
 
-our @ISA = qw(Exporter);
-use File::Spec;
-
-our %Combin;	# $codepoint => $number    : combination class
-our %Canon;	# $codepoint => \@codepoints : canonical decomp.
-our %Compat;	# $codepoint => \@codepoints : compat. decomp.
-our %Compos;	# $1st,$2nd  => $codepoint : composite
-our %Exclus;	# $codepoint => 1          : composition exclusions
-our %Single;	# $codepoint => 1          : singletons
-our %NonStD;	# $codepoint => 1          : non-starter decompositions
-our %Comp2nd;	# $codepoint => 1          : may be composed with a prev char.
-
-# from core Unicode database
-our $Combin = do "unicore/CombiningClass.pl"
-    || do "unicode/CombiningClass.pl"
-    || croak "$PACKAGE: CombiningClass.pl not found";
-our $Decomp = do "unicore/Decomposition.pl"
-    || do "unicode/Decomposition.pl"
-    || croak "$PACKAGE: Decomposition.pl not found";
-
-# CompositionExclusions.txt since Unicode 3.2.0
-our @CompEx = qw(
-    0958 0959 095A 095B 095C 095D 095E 095F 09DC 09DD 09DF 0A33 0A36
-    0A59 0A5A 0A5B 0A5E 0B5C 0B5D 0F43 0F4D 0F52 0F57 0F5C 0F69 0F76
-    0F78 0F93 0F9D 0FA2 0FA7 0FAC 0FB9 FB1D FB1F FB2A FB2B FB2C FB2D
-    FB2E FB2F FB30 FB31 FB32 FB33 FB34 FB35 FB36 FB38 FB39 FB3A FB3B
-    FB3C FB3E FB40 FB41 FB43 FB44 FB46 FB47 FB48 FB49 FB4A FB4B FB4C
-    FB4D FB4E 2ADC 1D15E 1D15F 1D160 1D161 1D162 1D163 1D164 1D1BB
-    1D1BC 1D1BD 1D1BE 1D1BF 1D1C0
-);
-
-# definition of Hangul constants
-use constant SBase  => 0xAC00;
-use constant SFinal => 0xD7A3; # SBase -1 + SCount
-use constant SCount =>  11172; # LCount * NCount
-use constant NCount =>    588; # VCount * TCount
-use constant LBase  => 0x1100;
-use constant LFinal => 0x1112;
-use constant LCount =>     19;
-use constant VBase  => 0x1161;
-use constant VFinal => 0x1175;
-use constant VCount =>     21;
-use constant TBase  => 0x11A7;
-use constant TFinal => 0x11C2;
-use constant TCount =>     28;
-
-sub decomposeHangul {
-    my $sindex = $_[0] - SBase;
-    my $lindex = int( $sindex / NCount);
-    my $vindex = int(($sindex % NCount) / TCount);
-    my $tindex =      $sindex % TCount;
-    my @ret = (
-       LBase + $lindex,
-       VBase + $vindex,
-      $tindex ? (TBase + $tindex) : (),
-    );
-    return wantarray ? @ret : pack_U(@ret);
-}
-
-########## getting full decomposition ##########
-
-## converts string "hhhh hhhh hhhh" to a numeric list
-## (hex digits separated by spaces)
-sub _getHexArray { map hex, $_[0] =~ /\G *([0-9A-Fa-f]+)/g }
-
-while ($Combin =~ /(.+)/g) {
-    my @tab = split /\t/, $1;
-    my $ini = hex $tab[0];
-    if ($tab[1] eq '') {
-	$Combin{$ini} = $tab[2];
-    } else {
-	$Combin{$_} = $tab[2] foreach $ini .. hex($tab[1]);
-    }
-}
-
-while ($Decomp =~ /(.+)/g) {
-    my @tab = split /\t/, $1;
-    my $compat = $tab[2] =~ s/<[^>]+>//;
-    my $dec = [ _getHexArray($tab[2]) ]; # decomposition
-    my $ini = hex($tab[0]); # initial decomposable character
-    my $end = $tab[1] eq '' ? $ini : hex($tab[1]);
-    # ($ini .. $end) is the range of decomposable characters.
-
-    foreach my $u ($ini .. $end) {
-	$Compat{$u} = $dec;
-	$Canon{$u} = $dec if ! $compat;
-    }
-}
-
-for my $s (@CompEx) {
-    my $u = hex $s;
-    next if !$Canon{$u}; # not assigned
-    next if $u == 0xFB1D && !$Canon{0x1D15E}; # 3.0.1 before Corrigendum #2
-    $Exclus{$u} = 1;
-}
-
-foreach my $u (keys %Canon) {
-    my $dec = $Canon{$u};
-
-    if (@$dec == 2) {
-	if ($Combin{ $dec->[0] }) {
-	    $NonStD{$u} = 1;
-	} else {
-	    $Compos{ $dec->[0] }{ $dec->[1] } = $u;
-	    $Comp2nd{ $dec->[1] } = 1 if ! $Exclus{$u};
-	}
-    } elsif (@$dec == 1) {
-	$Single{$u} = 1;
-    } else {
-	my $h = sprintf '%04X', $u;
-	croak("Weird Canonical Decomposition of U+$h");
-    }
-}
-
-# modern HANGUL JUNGSEONG and HANGUL JONGSEONG jamo
-foreach my $j (0x1161..0x1175, 0x11A8..0x11C2) {
-    $Comp2nd{$j} = 1;
-}
-
-sub getCanonList {
-    my @src = @_;
-    my @dec = map {
-	(SBase <= $_ && $_ <= SFinal) ? decomposeHangul($_)
-	    : $Canon{$_} ? @{ $Canon{$_} } : $_
-		} @src;
-    return join(" ",@src) eq join(" ",@dec) ? @dec : getCanonList(@dec);
-    # condition @src == @dec is not ok.
-}
-
-sub getCompatList {
-    my @src = @_;
-    my @dec = map {
-	(SBase <= $_ && $_ <= SFinal) ? decomposeHangul($_)
-	    : $Compat{$_} ? @{ $Compat{$_} } : $_
-		} @src;
-    return join(" ",@src) eq join(" ",@dec) ? @dec : getCompatList(@dec);
-    # condition @src == @dec is not ok.
-}
-
-# exhaustive decomposition
-foreach my $key (keys %Canon) {
-    $Canon{$key}  = [ getCanonList($key) ];
-}
-
-# exhaustive decomposition
-foreach my $key (keys %Compat) {
-    $Compat{$key} = [ getCompatList($key) ];
-}
-
-sub getHangulComposite ($$) {
-    if ((LBase <= $_[0] && $_[0] <= LFinal)
-     && (VBase <= $_[1] && $_[1] <= VFinal)) {
-	my $lindex = $_[0] - LBase;
-	my $vindex = $_[1] - VBase;
-	return (SBase + ($lindex * VCount + $vindex) * TCount);
-    }
-    if ((SBase <= $_[0] && $_[0] <= SFinal && (($_[0] - SBase ) % TCount) == 0)
-     && (TBase  < $_[1] && $_[1] <= TFinal)) {
-	return($_[0] + $_[1] - TBase);
-    }
-    return undef;
-}
-
-##########
-
-sub getCombinClass ($) {
-    my $uv = 0 + shift;
-    return $Combin{$uv} || 0;
-}
-
-sub getCanon ($) {
-    my $uv = 0 + shift;
-    return exists $Canon{$uv}
-	? pack_U(@{ $Canon{$uv} })
-	: (SBase <= $uv && $uv <= SFinal)
-	    ? scalar decomposeHangul($uv)
-	    : undef;
-}
-
-sub getCompat ($) {
-    my $uv = 0 + shift;
-    return exists $Compat{$uv}
-	? pack_U(@{ $Compat{$uv} })
-	: (SBase <= $uv && $uv <= SFinal)
-	    ? scalar decomposeHangul($uv)
-	    : undef;
-}
-
-sub getComposite ($$) {
-    my $uv1 = 0 + shift;
-    my $uv2 = 0 + shift;
-    my $hangul = getHangulComposite($uv1, $uv2);
-    return $hangul if $hangul;
-    return $Compos{ $uv1 } && $Compos{ $uv1 }{ $uv2 };
-}
-
-sub isExclusion  ($) {
-    my $uv = 0 + shift;
-    return exists $Exclus{$uv};
-}
-
-sub isSingleton  ($) {
-    my $uv = 0 + shift;
-    return exists $Single{$uv};
-}
-
-sub isNonStDecomp($) {
-    my $uv = 0 + shift;
-    return exists $NonStD{$uv};
-}
-
-sub isComp2nd ($) {
-    my $uv = 0 + shift;
-    return exists $Comp2nd{$uv};
-}
-
-sub isNFC_MAYBE ($) {
-    my $uv = 0 + shift;
-    return exists $Comp2nd{$uv};
-}
-
-sub isNFKC_MAYBE($) {
-    my $uv = 0 + shift;
-    return exists $Comp2nd{$uv};
-}
-
-sub isNFD_NO ($) {
-    my $uv = 0 + shift;
-    return exists $Canon {$uv} || (SBase <= $uv && $uv <= SFinal);
-}
-
-sub isNFKD_NO ($) {
-    my $uv = 0 + shift;
-    return exists $Compat{$uv} || (SBase <= $uv && $uv <= SFinal);
-}
-
-sub isComp_Ex ($) {
-    my $uv = 0 + shift;
-    return exists $Exclus{$uv} || exists $Single{$uv} || exists $NonStD{$uv};
-}
-
-sub isNFC_NO ($) {
-    my $uv = 0 + shift;
-    return exists $Exclus{$uv} || exists $Single{$uv} || exists $NonStD{$uv};
-}
-
-sub isNFKC_NO ($) {
-    my $uv = 0 + shift;
-    return 1  if $Exclus{$uv} || $Single{$uv} || $NonStD{$uv};
-    return '' if (SBase <= $uv && $uv <= SFinal) || !exists $Compat{$uv};
-    return 1  if ! exists $Canon{$uv};
-    return pack('N*', @{ $Canon{$uv} }) ne pack('N*', @{ $Compat{$uv} });
-}
-
-##
-## string decompose(string, compat?)
-##
-sub decompose ($;$)
-{
-    my $hash = $_[1] ? \%Compat : \%Canon;
-    return pack_U map {
-	$hash->{ $_ } ? @{ $hash->{ $_ } } :
-	    (SBase <= $_ && $_ <= SFinal) ? decomposeHangul($_) : $_
-    } unpack_U($_[0]);
-}
-
-##
-## string reorder(string)
-##
-sub reorder ($)
-{
-    my @src = unpack_U($_[0]);
-
-    for (my $i=0; $i < @src;) {
-	$i++, next if ! $Combin{ $src[$i] };
+##### The above part is common to XS and PP #####
 
-	my $ini = $i;
-	$i++ while $i < @src && $Combin{ $src[$i] };
+our @ISA = qw(Exporter DynaLoader);
+require DynaLoader;
+bootstrap Unicode::Normalize $VERSION;
 
-        my @tmp = sort {
-		$Combin{ $src[$a] } <=> $Combin{ $src[$b] } || $a <=> $b
-	    } $ini .. $i - 1;
-
-	@src[ $ini .. $i - 1 ] = @src[ @tmp ];
-    }
-    return pack_U(@src);
-}
-
-
-##
-## string compose(string)
-##
-## S : starter; NS : not starter;
-##
-## composable sequence begins at S.
-## S + S or (S + S) + S may be composed.
-## NS + NS must not be composed.
-##
-sub compose ($)
-{
-    my @src = unpack_U($_[0]);
-
-    for (my $s = 0; $s+1 < @src; $s++) {
-	next unless defined $src[$s] && ! $Combin{ $src[$s] };
-	 # S only; removed or combining are skipped as a starter.
-
-	my($c, $blocked, $uncomposed_cc);
-	for (my $j = $s+1; $j < @src && !$blocked; $j++) {
-	    ($Combin{ $src[$j] } ? $uncomposed_cc : $blocked) = 1;
-
-	    # S + C + S => S-S + C would be blocked.
-	    next if $blocked && $uncomposed_cc;
-
-	    # blocked by same CC (and higher CC: revised D2)
-	    next if defined $src[$j-1]   && $Combin{ $src[$j-1] }
-		&& $Combin{ $src[$j-1] } >= $Combin{ $src[$j] };
-
-	    $c = getComposite($src[$s], $src[$j]);
-
-	    # no composite or is exclusion
-	    next if !$c || $Exclus{$c};
-
-	    # replace by composite
-	    $src[$s] = $c; $src[$j] = undef;
-	    if ($blocked) { $blocked = 0 } else { -- $uncomposed_cc }
-	}
-    }
-    return pack_U(grep defined, @src);
-}
-
-
-##
-## string composeContiguous(string)
-##
-sub composeContiguous ($)
-{
-    my @src = unpack_U($_[0]);
-
-    for (my $s = 0; $s+1 < @src; $s++) {
-	next unless defined $src[$s] && ! $Combin{ $src[$s] };
-	 # S only; removed or combining are skipped as a starter.
-
-	for (my $j = $s+1; $j < @src; $j++) {
-	    my $c = getComposite($src[$s], $src[$j]);
-
-	    # no composite or is exclusion
-	    last if !$c || $Exclus{$c};
-
-	    # replace by composite
-	    $src[$s] = $c; $src[$j] = undef;
-	}
-    }
-    return pack_U(grep defined, @src);
-}
-
-
-##
-## normalization forms
-##
-
-use constant COMPAT => 1;
-
-sub NFD  ($) { reorder(decompose($_[0])) }
-sub NFKD ($) { reorder(decompose($_[0], COMPAT)) }
-sub NFC  ($) { compose(reorder(decompose($_[0]))) }
-sub NFKC ($) { compose(reorder(decompose($_[0], COMPAT))) }
-sub FCC  ($) { composeContiguous(reorder(decompose($_[0]))) }
-
-##
-## quick check
-##
-
-sub checkNFD ($)
-{
-    my $preCC = 0;
-    my $curCC;
-    for my $uv (unpack_U($_[0])) {
-	$curCC = $Combin{ $uv } || 0;
-	return '' if $preCC > $curCC && $curCC != 0;
-	return '' if exists $Canon{$uv} || (SBase <= $uv && $uv <= SFinal);
-	$preCC = $curCC;
-    }
-    return 1;
-}
-
-sub checkNFKD ($)
-{
-    my $preCC = 0;
-    my $curCC;
-    for my $uv (unpack_U($_[0])) {
-	$curCC = $Combin{ $uv } || 0;
-	return '' if $preCC > $curCC && $curCC != 0;
-	return '' if exists $Compat{$uv} || (SBase <= $uv && $uv <= SFinal);
-	$preCC = $curCC;
-    }
-    return 1;
-}
-
-sub checkNFC ($)
-{
-    my $preCC = 0;
-    my($curCC, $isMAYBE);
-    for my $uv (unpack_U($_[0])) {
-	$curCC = $Combin{ $uv } || 0;
-	return '' if $preCC > $curCC && $curCC != 0;
-
-	if (isNFC_MAYBE($uv)) {
-	    $isMAYBE = 1;
-	} elsif (isNFC_NO($uv)) {
-	    return '';
-	}
-	$preCC = $curCC;
-    }
-    return $isMAYBE ? undef : 1;
-}
-
-sub checkNFKC ($)
-{
-    my $preCC = 0;
-    my($curCC, $isMAYBE);
-    for my $uv (unpack_U($_[0])) {
-	$curCC = $Combin{ $uv } || 0;
-	return '' if $preCC > $curCC && $curCC != 0;
-
-	if (isNFKC_MAYBE($uv)) {
-	    $isMAYBE = 1;
-	} elsif (isNFKC_NO($uv)) {
-	    return '';
-	}
-	$preCC = $curCC;
-    }
-    return $isMAYBE ? undef : 1;
-}
-
-sub checkFCD ($)
-{
-    my $preCC = 0;
-    my $curCC;
-    for my $uv (unpack_U($_[0])) {
-	# Hangul syllable need not decomposed since cc[any Jamo] == 0;
-	my @uvCan = exists $Canon{$uv} ? @{ $Canon{$uv} } : ($uv);
-
-	$curCC = $Combin{ $uvCan[0] } || 0;
-	return '' if $curCC != 0 && $curCC < $preCC;
-	$preCC = $Combin{ $uvCan[-1] } || 0;
-    }
-    return 1;
-}
-
-sub checkFCC ($)
-{
-    my $preCC = 0;
-    my($curCC, $isMAYBE);
-    for my $uv (unpack_U($_[0])) {
-	# Hangul syllable need not decomposed since cc[any Jamo] == 0;
-	my @uvCan = exists $Canon{$uv} ? @{ $Canon{$uv} } : ($uv);
-
-	$curCC = $Combin{ $uvCan[0] } || 0;
-	return '' if $curCC != 0 && $curCC < $preCC;
-
-	if (isNFC_MAYBE($uv)) {
-	    $isMAYBE = 1;
-	} elsif (isNFC_NO($uv)) {
-	    return '';
-	}
-
-	$preCC = $Combin{ $uvCan[-1] } || 0;
-    }
-    return $isMAYBE ? undef : 1;
-}
-
-##
-## split on last starter
-##
-
-sub splitOnLastStarter
-{
-    my $str = pack_U(unpack_U(shift));
-    if ($str eq '') {
-	return ('', '');
-    }
-
-    my $ch;
-    my $unproc = "";
-    do {
-	$ch = chop($str);
-	$unproc = $ch.$unproc;
-    } while (getCombinClass(unpack 'U', $ch) && $str ne "");
-    return ($str, $unproc);
-}
+##### The below part is common to XS and PP #####
 
 ##
 ## normalize
@@ -644,7 +165,10 @@ C<$string> is used as a string under character semantics (see F<perlunicode>).
 
 C<$code_point> should be an unsigned integer representing a Unicode code point.
 
-Note: Do not use a floating point nor a negative sign in C<$code_point>.
+Note: Between XSUB and pure Perl, there is an incompatibility
+about the interpretation of C<$code_point> as a decimal number.
+XSUB converts C<$code_point> to an unsigned integer, but pure Perl does not.
+Do not use a floating point nor a negative sign in C<$code_point>.
 
 =head2 Normalization Forms
 
@@ -1019,22 +543,29 @@ C<normalize> and other some functions: on request.
 
 Since this module refers to perl core's Unicode database in the directory
 F</lib/unicore> (or formerly F</lib/unicode>), the Unicode version of
-normalization implemented by this module depends on your perl's version.
+normalization implemented by this module depends on what has been
+compiled into your perl.  The following table lists the default Unicode
+version that comes with various perl versions.  (It is possible to change
+the Unicode version in any perl version to be any earlier Unicode version,
+so one could cause Unicode 3.2 to be used in any perl version starting with
+5.8.0.  See C<$Config{privlib}>/F<unicore/README.perl>.
 
     perl's version     implemented Unicode version
        5.6.1              3.0.1
        5.7.2              3.1.0
        5.7.3              3.1.1 (normalization is same as 3.1.0)
        5.8.0              3.2.0
-     5.8.1-5.8.3          4.0.0
-     5.8.4-5.8.6          4.0.1 (normalization is same as 4.0.0)
-     5.8.7-5.8.8          4.1.0
+         5.8.1-5.8.3      4.0.0
+         5.8.4-5.8.6      4.0.1 (normalization is same as 4.0.0)
+         5.8.7-5.8.8      4.1.0
        5.10.0             5.0.0
-    5.8.9, 5.10.1         5.1.0
+        5.8.9, 5.10.1     5.1.0
        5.12.x             5.2.0
        5.14.x             6.0.0
        5.16.x             6.1.0
        5.18.x             6.2.0
+       5.20.x             6.3.0
+       5.22.x             7.0.0
 
 =item Correction of decomposition mapping
 
@@ -1062,8 +593,12 @@ lower than 4.1.0.
 
 SADAHIRO Tomoyuki <SADAHIRO@cpan.org>
 
+Currently maintained by <perl5-porters@perl.org> 
+
 Copyright(C) 2001-2012, SADAHIRO Tomoyuki. Japan. All rights reserved.
 
+=head1 LICENSE
+
 This module is free software; you can redistribute it
 and/or modify it under the same terms as Perl itself.
 
diff --git a/Master/tlpkg/tlperl/lib/Unicode/UCD.pm b/Master/tlpkg/tlperl/lib/Unicode/UCD.pm
index 06fbfd1143b..13c2c785981 100644
--- a/Master/tlpkg/tlperl/lib/Unicode/UCD.pm
+++ b/Master/tlpkg/tlperl/lib/Unicode/UCD.pm
@@ -5,7 +5,7 @@ use warnings;
 no warnings 'surrogate';    # surrogates can be inputs to this
 use charnames ();
 
-our $VERSION = '0.61';
+our $VERSION = '0.64';
 
 require Exporter;
 
@@ -384,6 +384,9 @@ my %SIMPLE_UPPER;
 my %UNICODE_1_NAMES;
 my %ISO_COMMENT;
 
+# Eval'd so can run on versions earlier than the property is available in
+my $Hangul_Syllables_re = eval 'qr/\p{Block=Hangul_Syllables}/';
+
 sub charinfo {
 
     # This function has traditionally mimicked what is in UnicodeData.txt,
@@ -438,7 +441,7 @@ sub charinfo {
     # "Canonical" imply a compatible decomposition, and the type is prefixed
     # to that, as it is in UnicodeData.txt
     UnicodeVersion() unless defined $v_unicode_version;
-    if ($v_unicode_version ge v2.0.0 && $char =~ /\p{Block=Hangul_Syllables}/) {
+    if ($v_unicode_version ge v2.0.0 && $char =~ $Hangul_Syllables_re) {
         # The code points of the decomposition are output in standard Unicode
         # hex format, separated by blanks.
         $prop{'decomposition'} = join " ", map { sprintf("%04X", $_)}
@@ -775,7 +778,6 @@ sub charprop ($$) {
     }
     else {
         croak __PACKAGE__, "::charprop: Internal error: unknown format '$format'.  Please perlbug this";
-        return undef;
     }
 }
 
@@ -877,6 +879,10 @@ sub _charblocks {
 	    local $_;
 	    local $/ = "\n";
 	    while (<$BLOCKSFH>) {
+
+                # Old versions used a different syntax to mark the range.
+                $_ =~ s/;\s+/../ if $v_unicode_version lt v3.1.0;
+
 		if (/^([0-9A-F]+)\.\.([0-9A-F]+);\s+(.+)/) {
 		    my ($lo, $hi) = (hex($1), hex($2));
 		    my $subrange = [ $lo, $hi, $3 ];
@@ -934,6 +940,9 @@ sub charblock {
     elsif (exists $BLOCKS{$arg}) {
         return _dclone $BLOCKS{$arg};
     }
+
+    carp __PACKAGE__, "::charblock: unknown code '$arg'";
+    return;
 }
 
 =head2 B<charscript()>
@@ -1001,6 +1010,7 @@ sub charscript {
         return _dclone $SCRIPTS{$arg};
     }
 
+    carp __PACKAGE__, "::charscript: unknown code '$arg'";
     return;
 }
 
@@ -1226,6 +1236,9 @@ The routine returns B<false> otherwise.
 
 =cut
 
+# Eval'd so can run on versions earlier than the property is available in
+my $Composition_Exclusion_re = eval 'qr/\p{Composition_Exclusion}/';
+
 sub compexcl {
     my $arg  = shift;
     my $code = _getcode($arg);
@@ -1236,7 +1249,7 @@ sub compexcl {
     return if $v_unicode_version lt v3.0.0;
 
     no warnings "non_unicode";     # So works on non-Unicode code points
-    return chr($code) =~ /\p{Composition_Exclusion}/;
+    return chr($code) =~ $Composition_Exclusion_re
 }
 
 =head2 B<casefold()>
@@ -2652,9 +2665,11 @@ or even better, C<"Gc=LC">).
 
 Many Unicode properties have more than one name (or alias).  C<prop_invmap>
 understands all of these, including Perl extensions to them.  Ambiguities are
-resolved as described above for L</prop_aliases()>.  The Perl internal
-property "Perl_Decimal_Digit, described below, is also accepted.  An empty
-list is returned if the property name is unknown.
+resolved as described above for L</prop_aliases()> (except if a property has
+both a complete mapping, and a binary C<Y>/C<N> mapping, then specifying the
+property name prefixed by C<"is"> causes the binary one to be returned).  The
+Perl internal property "Perl_Decimal_Digit, described below, is also accepted.
+An empty list is returned if the property name is unknown.
 See L<perluniprops/Properties accessible through Unicode::UCD> for the
 properties acceptable as inputs to this function.
 
@@ -3253,8 +3268,8 @@ RETRY:
             # we need to also read in that table.  Create a hash with the keys
             # being the code points, and the values being a list of the
             # aliases for the code point key.
-            my ($aliases_code_points, $aliases_maps, undef, undef) =
-                                                &prop_invmap('Name_Alias');
+            my ($aliases_code_points, $aliases_maps, undef, undef)
+                  = &prop_invmap("_Perl_Name_Alias", '_perl_core_internal_ok');
             my %aliases;
             for (my $i = 0; $i < @$aliases_code_points; $i++) {
                 my $code_point = $aliases_code_points->[$i];
@@ -3545,7 +3560,19 @@ RETRY:
 
     if ($swash->{'LIST'} =~ /^V/) {
         @invlist = split "\n", $swash->{'LIST'} =~ s/ \s* (?: \# .* )? $ //xmgr;
-        shift @invlist;
+
+        shift @invlist;     # Get rid of 'V';
+
+        # Could need to be inverted: add or subtract a 0 at the beginning of
+        # the list.
+        if ($swash->{'INVERT_IT'}) {
+            if (@invlist && $invlist[0] == 0) {
+                shift @invlist;
+            }
+            else {
+                unshift @invlist, 0;
+            }
+        }
         foreach my $i (0 .. @invlist - 1) {
             $invmap[$i] = ($i % 2 == 0) ? 'Y' : 'N'
         }
@@ -3558,6 +3585,10 @@ RETRY:
         }
     }
     else {
+        if ($swash->{'INVERT_IT'}) {
+            croak __PACKAGE__, ":prop_invmap: Don't know how to deal with inverted";
+        }
+
         # The LIST input lines look like:
         # ...
         # 0374\t\tCommon
@@ -3873,7 +3904,7 @@ RETRY:
         map { $_ = [ split " ", $_  ] if $_ =~ / / } @invmap;
         $format = 'sl';
     }
-    elsif ($returned_prop eq 'ToNameAlias') {
+    elsif ($returned_prop =~ / To ( _Perl )? NameAlias/x) {
 
         # This property currently doesn't have any lists, but theoretically
         # could
@@ -3888,7 +3919,14 @@ RETRY:
         # to indicate that need to add code point to it.
         $format = 'ar';
     }
-    elsif ($format ne 'n' && $format ne 'a') {
+    elsif ($format eq 'ax') {
+
+        # Normally 'ax' properties have overrides, and will have been handled
+        # above, but if not, they still need adjustment, and the hex values
+        # have already been converted to decimal
+        $format = 'a';
+    }
+    elsif ($format ne 'n' && $format !~ / ^ a /x) {
 
         # All others are simple scalars
         $format = 's';
@@ -4079,6 +4117,15 @@ for its block using C<charblock>).
 Note that starting in Unicode 6.1, many of the block names have shorter
 synonyms.  These are always given in the new style.
 
+=head2 Use with older Unicode versions
+
+The functions in this module work as well as can be expected when
+used on earlier Unicode versions.  But, obviously, they use the available data
+from that Unicode version.  For example, if the Unicode version predates the
+definition of the script property (Unicode 3.1), then any function that deals
+with scripts is going to return C<undef> for the script portion of the return
+value.
+
 =head1 AUTHOR
 
 Jarkko Hietaniemi.  Now maintained by perl5 porters.
diff --git a/Master/tlpkg/tlperl/lib/Win32API/File.pm b/Master/tlpkg/tlperl/lib/Win32API/File.pm
index ca7cf3c8995..10c5d2ff662 100644
--- a/Master/tlpkg/tlperl/lib/Win32API/File.pm
+++ b/Master/tlpkg/tlperl/lib/Win32API/File.pm
@@ -10,7 +10,7 @@ use Fcntl qw( O_RDONLY O_RDWR O_WRONLY O_APPEND O_BINARY O_TEXT );
 use vars qw( $VERSION @ISA );
 use vars qw( @EXPORT @EXPORT_OK @EXPORT_FAIL %EXPORT_TAGS );
 
-$VERSION= '0.1202';
+$VERSION= '0.1203';
 
 use base qw( Exporter DynaLoader Tie::Handle IO::File );
 
@@ -317,8 +317,8 @@ sub OsFHandleOpen {
     if ($@) {
 	return tie *{$fh}, __PACKAGE__, $osfh;
     }
-    return  undef if  $fd < 0;
-    return  open( $fh, $pref."&=".$fd );
+    return  undef unless  $fd;
+    return  open( $fh, $pref."&=".(0+$fd) );
 }
 
 sub GetOsFHandle {
diff --git a/Master/tlpkg/tlperl/lib/XSLoader.pm b/Master/tlpkg/tlperl/lib/XSLoader.pm
index de341608e35..8ff7cd1cdc9 100644
--- a/Master/tlpkg/tlperl/lib/XSLoader.pm
+++ b/Master/tlpkg/tlperl/lib/XSLoader.pm
@@ -1,8 +1,9 @@
 # Generated from XSLoader.pm.PL (resolved %Config::Config value)
+# This file is unique for every OS
 
 package XSLoader;
 
-$VERSION = "0.20";
+$VERSION = "0.22";
 
 #use strict;
 
@@ -38,6 +39,31 @@ sub load {
     my $modpname = join('/',@modparts);
     my $c = () = split(/::/,$caller,-1);
     $modlibname =~ s,[\\/][^\\/]+$,, while $c--;    # Q&D basename
+    # Does this look like a relative path?
+    if ($modlibname !~ m{^(?:[A-Za-z]:)?[\\/]}) {
+        # Someone may have a #line directive that changes the file name, or
+        # may be calling XSLoader::load from inside a string eval.  We cer-
+        # tainly do not want to go loading some code that is not in @INC,
+        # as it could be untrusted.
+        #
+        # We could just fall back to DynaLoader here, but then the rest of
+        # this function would go untested in the perl core, since all @INC
+        # paths are relative during testing.  That would be a time bomb
+        # waiting to happen, since bugs could be introduced into the code.
+        #
+        # So look through @INC to see if $modlibname is in it.  A rela-
+        # tive $modlibname is not a common occurrence, so this block is
+        # not hot code.
+        FOUND: {
+            for (@INC) {
+                if ($_ eq $modlibname) {
+                    last FOUND;
+                }
+            }
+            # Not found.  Fall back to DynaLoader.
+            goto \&XSLoader::bootstrap_inherit;
+        }
+    }
     my $file = "$modlibname/auto/$modpname/$modfname.dll";
 
 #   print STDERR "XSLoader::load for $module ($file)\n" if $dl_debug;
@@ -73,12 +99,6 @@ sub load {
     };
     push(@DynaLoader::dl_librefs,$libref);  # record loaded object
 
-    my @unresolved = dl_undef_symbols();
-    if (@unresolved) {
-        require Carp;
-        Carp::carp("Undefined symbols present after loading $file: @unresolved\n");
-    }
-
     $boot_symbol_ref = dl_find_symbol($libref, $bootname) or do {
         require Carp;
         Carp::croak("Can't find '$bootname' symbol in $file\n");
@@ -110,7 +130,7 @@ XSLoader - Dynamically load C libraries into Perl code
 
 =head1 VERSION
 
-Version 0.17
+Version 0.22
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/arybase.pm b/Master/tlpkg/tlperl/lib/arybase.pm
index d905e6f2e86..a519a4b3927 100644
--- a/Master/tlpkg/tlperl/lib/arybase.pm
+++ b/Master/tlpkg/tlperl/lib/arybase.pm
@@ -1,6 +1,6 @@
 package arybase;
 
-our $VERSION = "0.10";
+our $VERSION = "0.11";
 
 require XSLoader;
 XSLoader::load(); # This returns true, which makes require happy.
diff --git a/Master/tlpkg/tlperl/lib/auto/B/B.dll b/Master/tlpkg/tlperl/lib/auto/B/B.dll
index 8e8143e509f..88d7532a10a 100755
--- a/Master/tlpkg/tlperl/lib/auto/B/B.dll
+++ b/Master/tlpkg/tlperl/lib/auto/B/B.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Compress/Raw/Bzip2/Bzip2.dll b/Master/tlpkg/tlperl/lib/auto/Compress/Raw/Bzip2/Bzip2.dll
index 0dbcf17135b..e732bfe8591 100755
--- a/Master/tlpkg/tlperl/lib/auto/Compress/Raw/Bzip2/Bzip2.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Compress/Raw/Bzip2/Bzip2.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Compress/Raw/Zlib/Zlib.dll b/Master/tlpkg/tlperl/lib/auto/Compress/Raw/Zlib/Zlib.dll
index 2426d49e9f4..c4c1a49e08a 100755
--- a/Master/tlpkg/tlperl/lib/auto/Compress/Raw/Zlib/Zlib.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Compress/Raw/Zlib/Zlib.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Cwd/Cwd.dll b/Master/tlpkg/tlperl/lib/auto/Cwd/Cwd.dll
index 4a703935b7c..4bc5e4fc915 100755
--- a/Master/tlpkg/tlperl/lib/auto/Cwd/Cwd.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Cwd/Cwd.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Data/Dumper/Dumper.dll b/Master/tlpkg/tlperl/lib/auto/Data/Dumper/Dumper.dll
index ddf53aff553..cbf9cec0f5f 100755
--- a/Master/tlpkg/tlperl/lib/auto/Data/Dumper/Dumper.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Data/Dumper/Dumper.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Devel/PPPort/PPPort.dll b/Master/tlpkg/tlperl/lib/auto/Devel/PPPort/PPPort.dll
deleted file mode 100755
index 57f30afe3be..00000000000
--- a/Master/tlpkg/tlperl/lib/auto/Devel/PPPort/PPPort.dll
+++ /dev/null
diff --git a/Master/tlpkg/tlperl/lib/auto/Devel/Peek/Peek.dll b/Master/tlpkg/tlperl/lib/auto/Devel/Peek/Peek.dll
index 9b3a0ab6959..399575e0580 100755
--- a/Master/tlpkg/tlperl/lib/auto/Devel/Peek/Peek.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Devel/Peek/Peek.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Digest/MD5/MD5.dll b/Master/tlpkg/tlperl/lib/auto/Digest/MD5/MD5.dll
index 5207aa951c8..b8aeeaa44e7 100755
--- a/Master/tlpkg/tlperl/lib/auto/Digest/MD5/MD5.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Digest/MD5/MD5.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Digest/SHA/SHA.dll b/Master/tlpkg/tlperl/lib/auto/Digest/SHA/SHA.dll
index bb42ce268cc..5412620e3f8 100755
--- a/Master/tlpkg/tlperl/lib/auto/Digest/SHA/SHA.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Digest/SHA/SHA.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Encode/Byte/Byte.dll b/Master/tlpkg/tlperl/lib/auto/Encode/Byte/Byte.dll
index 374c7db0e51..5a3b63f6abf 100755
--- a/Master/tlpkg/tlperl/lib/auto/Encode/Byte/Byte.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Encode/Byte/Byte.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Encode/CN/CN.dll b/Master/tlpkg/tlperl/lib/auto/Encode/CN/CN.dll
index 095c40ae15c..f2841410ed5 100755
--- a/Master/tlpkg/tlperl/lib/auto/Encode/CN/CN.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Encode/CN/CN.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Encode/EBCDIC/EBCDIC.dll b/Master/tlpkg/tlperl/lib/auto/Encode/EBCDIC/EBCDIC.dll
index 57acb893de1..bfd094da4c5 100755
--- a/Master/tlpkg/tlperl/lib/auto/Encode/EBCDIC/EBCDIC.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Encode/EBCDIC/EBCDIC.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Encode/Encode.dll b/Master/tlpkg/tlperl/lib/auto/Encode/Encode.dll
index fd8506ad587..17c1ebeb595 100755
--- a/Master/tlpkg/tlperl/lib/auto/Encode/Encode.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Encode/Encode.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Encode/JP/JP.dll b/Master/tlpkg/tlperl/lib/auto/Encode/JP/JP.dll
index ab42e1de9bc..efcd357724f 100755
--- a/Master/tlpkg/tlperl/lib/auto/Encode/JP/JP.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Encode/JP/JP.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Encode/KR/KR.dll b/Master/tlpkg/tlperl/lib/auto/Encode/KR/KR.dll
index 67089b873f5..040c4b80c80 100755
--- a/Master/tlpkg/tlperl/lib/auto/Encode/KR/KR.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Encode/KR/KR.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Encode/Symbol/Symbol.dll b/Master/tlpkg/tlperl/lib/auto/Encode/Symbol/Symbol.dll
index d828ae9fe71..1acd1bbbe3c 100755
--- a/Master/tlpkg/tlperl/lib/auto/Encode/Symbol/Symbol.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Encode/Symbol/Symbol.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Encode/TW/TW.dll b/Master/tlpkg/tlperl/lib/auto/Encode/TW/TW.dll
index 6149bbd70d0..6815f293fe2 100755
--- a/Master/tlpkg/tlperl/lib/auto/Encode/TW/TW.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Encode/TW/TW.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Encode/Unicode/Unicode.dll b/Master/tlpkg/tlperl/lib/auto/Encode/Unicode/Unicode.dll
index e6dd62f73a0..3d630a56775 100755
--- a/Master/tlpkg/tlperl/lib/auto/Encode/Unicode/Unicode.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Encode/Unicode/Unicode.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Fcntl/Fcntl.dll b/Master/tlpkg/tlperl/lib/auto/Fcntl/Fcntl.dll
index 5325a503036..17bcbaf087d 100755
--- a/Master/tlpkg/tlperl/lib/auto/Fcntl/Fcntl.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Fcntl/Fcntl.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/File/DosGlob/DosGlob.dll b/Master/tlpkg/tlperl/lib/auto/File/DosGlob/DosGlob.dll
index 48085dcb83d..0b9a238e3dc 100755
--- a/Master/tlpkg/tlperl/lib/auto/File/DosGlob/DosGlob.dll
+++ b/Master/tlpkg/tlperl/lib/auto/File/DosGlob/DosGlob.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/File/Glob/Glob.dll b/Master/tlpkg/tlperl/lib/auto/File/Glob/Glob.dll
index c5946b430c1..c8c906836d9 100755
--- a/Master/tlpkg/tlperl/lib/auto/File/Glob/Glob.dll
+++ b/Master/tlpkg/tlperl/lib/auto/File/Glob/Glob.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Filter/Util/Call/Call.dll b/Master/tlpkg/tlperl/lib/auto/Filter/Util/Call/Call.dll
index 74a3b017130..9abc0fd5319 100755
--- a/Master/tlpkg/tlperl/lib/auto/Filter/Util/Call/Call.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Filter/Util/Call/Call.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Hash/Util/FieldHash/FieldHash.dll b/Master/tlpkg/tlperl/lib/auto/Hash/Util/FieldHash/FieldHash.dll
index c9215453a5d..ae5d80034f8 100755
--- a/Master/tlpkg/tlperl/lib/auto/Hash/Util/FieldHash/FieldHash.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Hash/Util/FieldHash/FieldHash.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Hash/Util/Util.dll b/Master/tlpkg/tlperl/lib/auto/Hash/Util/Util.dll
index 5cecb93b24f..fa4f6b9f90e 100755
--- a/Master/tlpkg/tlperl/lib/auto/Hash/Util/Util.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Hash/Util/Util.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/IO/IO.dll b/Master/tlpkg/tlperl/lib/auto/IO/IO.dll
index c2becf06c4e..88e99a0a0f1 100755
--- a/Master/tlpkg/tlperl/lib/auto/IO/IO.dll
+++ b/Master/tlpkg/tlperl/lib/auto/IO/IO.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/List/Util/Util.dll b/Master/tlpkg/tlperl/lib/auto/List/Util/Util.dll
index fd5f6341672..207ab911638 100755
--- a/Master/tlpkg/tlperl/lib/auto/List/Util/Util.dll
+++ b/Master/tlpkg/tlperl/lib/auto/List/Util/Util.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/MIME/Base64/Base64.dll b/Master/tlpkg/tlperl/lib/auto/MIME/Base64/Base64.dll
index 1e3426116dc..f8c14a3ab3f 100755
--- a/Master/tlpkg/tlperl/lib/auto/MIME/Base64/Base64.dll
+++ b/Master/tlpkg/tlperl/lib/auto/MIME/Base64/Base64.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Math/BigInt/FastCalc/FastCalc.dll b/Master/tlpkg/tlperl/lib/auto/Math/BigInt/FastCalc/FastCalc.dll
index 53c6dc5817e..5c50a937a58 100755
--- a/Master/tlpkg/tlperl/lib/auto/Math/BigInt/FastCalc/FastCalc.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Math/BigInt/FastCalc/FastCalc.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Opcode/Opcode.dll b/Master/tlpkg/tlperl/lib/auto/Opcode/Opcode.dll
index 0f4d5708336..f1cdff4c634 100755
--- a/Master/tlpkg/tlperl/lib/auto/Opcode/Opcode.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Opcode/Opcode.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/POSIX/POSIX.dll b/Master/tlpkg/tlperl/lib/auto/POSIX/POSIX.dll
index 7b29918ce7f..ed7fc32df89 100755
--- a/Master/tlpkg/tlperl/lib/auto/POSIX/POSIX.dll
+++ b/Master/tlpkg/tlperl/lib/auto/POSIX/POSIX.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/PerlIO/encoding/encoding.dll b/Master/tlpkg/tlperl/lib/auto/PerlIO/encoding/encoding.dll
index b688f8df9f7..2e6b3c557f1 100755
--- a/Master/tlpkg/tlperl/lib/auto/PerlIO/encoding/encoding.dll
+++ b/Master/tlpkg/tlperl/lib/auto/PerlIO/encoding/encoding.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/PerlIO/mmap/mmap.dll b/Master/tlpkg/tlperl/lib/auto/PerlIO/mmap/mmap.dll
index 86881bea2be..39730e468d0 100755
--- a/Master/tlpkg/tlperl/lib/auto/PerlIO/mmap/mmap.dll
+++ b/Master/tlpkg/tlperl/lib/auto/PerlIO/mmap/mmap.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/PerlIO/scalar/scalar.dll b/Master/tlpkg/tlperl/lib/auto/PerlIO/scalar/scalar.dll
index ab139c99310..bae04f98d8a 100755
--- a/Master/tlpkg/tlperl/lib/auto/PerlIO/scalar/scalar.dll
+++ b/Master/tlpkg/tlperl/lib/auto/PerlIO/scalar/scalar.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/PerlIO/via/via.dll b/Master/tlpkg/tlperl/lib/auto/PerlIO/via/via.dll
index dac526d12fe..f7bf56057a2 100755
--- a/Master/tlpkg/tlperl/lib/auto/PerlIO/via/via.dll
+++ b/Master/tlpkg/tlperl/lib/auto/PerlIO/via/via.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/SDBM_File/SDBM_File.dll b/Master/tlpkg/tlperl/lib/auto/SDBM_File/SDBM_File.dll
index c22fde05178..02dcf0ee232 100755
--- a/Master/tlpkg/tlperl/lib/auto/SDBM_File/SDBM_File.dll
+++ b/Master/tlpkg/tlperl/lib/auto/SDBM_File/SDBM_File.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Socket/Socket.dll b/Master/tlpkg/tlperl/lib/auto/Socket/Socket.dll
index cbefa02168f..a0679213454 100755
--- a/Master/tlpkg/tlperl/lib/auto/Socket/Socket.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Socket/Socket.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Storable/Storable.dll b/Master/tlpkg/tlperl/lib/auto/Storable/Storable.dll
index 1e0e0fbdacc..652bc4900f4 100755
--- a/Master/tlpkg/tlperl/lib/auto/Storable/Storable.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Storable/Storable.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Sys/Hostname/Hostname.dll b/Master/tlpkg/tlperl/lib/auto/Sys/Hostname/Hostname.dll
index f56b1a824c9..8005463b289 100755
--- a/Master/tlpkg/tlperl/lib/auto/Sys/Hostname/Hostname.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Sys/Hostname/Hostname.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Tie/Hash/NamedCapture/NamedCapture.dll b/Master/tlpkg/tlperl/lib/auto/Tie/Hash/NamedCapture/NamedCapture.dll
index 14088ff9cae..9a30c3026c2 100755
--- a/Master/tlpkg/tlperl/lib/auto/Tie/Hash/NamedCapture/NamedCapture.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Tie/Hash/NamedCapture/NamedCapture.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Time/HiRes/HiRes.dll b/Master/tlpkg/tlperl/lib/auto/Time/HiRes/HiRes.dll
index ec78aef1f3d..45aafc35ff2 100755
--- a/Master/tlpkg/tlperl/lib/auto/Time/HiRes/HiRes.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Time/HiRes/HiRes.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Time/Piece/Piece.dll b/Master/tlpkg/tlperl/lib/auto/Time/Piece/Piece.dll
index 94e46c9f9e8..cb6bbd8443d 100755
--- a/Master/tlpkg/tlperl/lib/auto/Time/Piece/Piece.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Time/Piece/Piece.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Unicode/Collate/Collate.dll b/Master/tlpkg/tlperl/lib/auto/Unicode/Collate/Collate.dll
index 8b5137f86bf..51f80f2348f 100755
--- a/Master/tlpkg/tlperl/lib/auto/Unicode/Collate/Collate.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Unicode/Collate/Collate.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Unicode/Normalize/Normalize.dll b/Master/tlpkg/tlperl/lib/auto/Unicode/Normalize/Normalize.dll
new file mode 100755
index 00000000000..3e933d5df99
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/auto/Unicode/Normalize/Normalize.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Win32/Win32.dll b/Master/tlpkg/tlperl/lib/auto/Win32/Win32.dll
index 64dc0f179a5..44a03699d0d 100755
--- a/Master/tlpkg/tlperl/lib/auto/Win32/Win32.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Win32/Win32.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/Win32API/File/File.dll b/Master/tlpkg/tlperl/lib/auto/Win32API/File/File.dll
index f598d551194..a68c91eddfe 100755
--- a/Master/tlpkg/tlperl/lib/auto/Win32API/File/File.dll
+++ b/Master/tlpkg/tlperl/lib/auto/Win32API/File/File.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/arybase/arybase.dll b/Master/tlpkg/tlperl/lib/auto/arybase/arybase.dll
index 914415b4707..8b92c72d2b9 100755
--- a/Master/tlpkg/tlperl/lib/auto/arybase/arybase.dll
+++ b/Master/tlpkg/tlperl/lib/auto/arybase/arybase.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/attributes/attributes.dll b/Master/tlpkg/tlperl/lib/auto/attributes/attributes.dll
index 2f15b234c92..40643f192ae 100755
--- a/Master/tlpkg/tlperl/lib/auto/attributes/attributes.dll
+++ b/Master/tlpkg/tlperl/lib/auto/attributes/attributes.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/mro/mro.dll b/Master/tlpkg/tlperl/lib/auto/mro/mro.dll
index 725306edc82..9ee5a3ef641 100755
--- a/Master/tlpkg/tlperl/lib/auto/mro/mro.dll
+++ b/Master/tlpkg/tlperl/lib/auto/mro/mro.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/re/re.dll b/Master/tlpkg/tlperl/lib/auto/re/re.dll
index 6799e7cc79c..24df706a596 100755
--- a/Master/tlpkg/tlperl/lib/auto/re/re.dll
+++ b/Master/tlpkg/tlperl/lib/auto/re/re.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/threads/shared/shared.dll b/Master/tlpkg/tlperl/lib/auto/threads/shared/shared.dll
index 8bb62acb34c..75a3fccc16f 100755
--- a/Master/tlpkg/tlperl/lib/auto/threads/shared/shared.dll
+++ b/Master/tlpkg/tlperl/lib/auto/threads/shared/shared.dll
diff --git a/Master/tlpkg/tlperl/lib/auto/threads/threads.dll b/Master/tlpkg/tlperl/lib/auto/threads/threads.dll
index 26bf993d92a..8bc629e3f14 100755
--- a/Master/tlpkg/tlperl/lib/auto/threads/threads.dll
+++ b/Master/tlpkg/tlperl/lib/auto/threads/threads.dll
diff --git a/Master/tlpkg/tlperl/lib/autodie.pm b/Master/tlpkg/tlperl/lib/autodie.pm
index 15d713498a9..5934c138ed0 100644
--- a/Master/tlpkg/tlperl/lib/autodie.pm
+++ b/Master/tlpkg/tlperl/lib/autodie.pm
@@ -9,7 +9,7 @@ our $VERSION;
 # ABSTRACT: Replace functions with ones that succeed or die with lexical scope
 
 BEGIN {
-    our $VERSION = '2.26'; # VERSION: Generated by DZP::OurPkg::Version
+    our $VERSION = '2.29'; # VERSION: Generated by DZP::OurPkg::Version
 }
 
 use constant ERROR_WRONG_FATAL => q{
diff --git a/Master/tlpkg/tlperl/lib/autodie/Scope/Guard.pm b/Master/tlpkg/tlperl/lib/autodie/Scope/Guard.pm
index db38e36facd..bd34fc81b20 100644
--- a/Master/tlpkg/tlperl/lib/autodie/Scope/Guard.pm
+++ b/Master/tlpkg/tlperl/lib/autodie/Scope/Guard.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 # ABSTRACT: Wrapper class for calling subs at end of scope
-our $VERSION = '2.26'; # VERSION
+our $VERSION = '2.29'; # VERSION
 
 # This code schedules the cleanup of subroutines at the end of
 # scope.  It's directly inspired by chocolateboy's excellent
diff --git a/Master/tlpkg/tlperl/lib/autodie/Scope/GuardStack.pm b/Master/tlpkg/tlperl/lib/autodie/Scope/GuardStack.pm
index 75300ffdcde..3ee3ae51db5 100644
--- a/Master/tlpkg/tlperl/lib/autodie/Scope/GuardStack.pm
+++ b/Master/tlpkg/tlperl/lib/autodie/Scope/GuardStack.pm
@@ -6,7 +6,7 @@ use warnings;
 use autodie::Scope::Guard;
 
 # ABSTRACT: Hook stack for managing scopes via %^H
-our $VERSION = '2.26'; # VERSION
+our $VERSION = '2.29'; # VERSION
 
 my $H_KEY_STEM = __PACKAGE__ . '/guard';
 my $COUNTER = 0;
diff --git a/Master/tlpkg/tlperl/lib/autodie/ScopeUtil.pm b/Master/tlpkg/tlperl/lib/autodie/ScopeUtil.pm
deleted file mode 100644
index 2029209abf7..00000000000
--- a/Master/tlpkg/tlperl/lib/autodie/ScopeUtil.pm
+++ /dev/null
@@ -1,80 +0,0 @@
-package autodie::ScopeUtil;
-
-use strict;
-use warnings;
-
-# Docs say that perl 5.8.3 has Exporter 5.57 and autodie requires
-# 5.8.4, so this should "just work".
-use Exporter 5.57 qw(import);
-
-use autodie::Scope::GuardStack;
-
-our @EXPORT_OK = qw(on_end_of_compile_scope);
-
-# ABSTRACT: Utilities for managing %^H scopes
-our $VERSION = '2.26'; # VERSION
-
-# docs says we should pick __PACKAGE__ /<whatever>
-my $H_STACK_KEY = __PACKAGE__ . '/stack';
-
-sub on_end_of_compile_scope {
-    my ($hook) = @_;
-
-    # Dark magic to have autodie work under 5.8
-    # Copied from namespace::clean, that copied it from
-    # autobox, that found it on an ancient scroll written
-    # in blood.
-
-    # This magic bit causes %^H to be lexically scoped.
-    $^H |= 0x020000;
-
-    my $stack = $^H{$H_STACK_KEY};
-    if (not defined($stack)) {
-        $stack = autodie::Scope::GuardStack->new;
-        $^H{$H_STACK_KEY} = $stack;
-    }
-
-    $stack->push_hook($hook);
-    return;
-}
-
-1;
-
-=head1 NAME
-
-autodie::ScopeUtil - Utilities for managing %^H scopes
-
-=head1 SYNOPSIS
-
-    use autodie::ScopeUtil qw(on_end_of_compile_scope);
-    on_end_of_compile_scope(sub { print "Hallo world\n"; });
-
-=head1 DESCRIPTION
-
-Utilities for abstracting away the underlying magic of (ab)using
-C<%^H> to call subs at the end of a (compile-time) scopes.
-
-Due to how C<%^H> works, these utilities are only useful during the
-compilation phase of a perl module and relies on the internals of how
-perl handles references in C<%^H>.  This module is not a part of
-autodie's public API.
-
-=head2 Methods
-
-=head3 on_end_of_compile_scope
-
-  on_end_of_compile_scope(sub { print "Hallo world\n"; });
-
-Will invoke a sub at the end of a (compile-time) scope.  The sub is
-called once with no arguments.  Can be called multiple times (even in
-the same "compile-time" scope) to install multiple subs.  Subs are
-called in a "first-in-last-out"-order (FILO or "stack"-order).
-
-=head1 AUTHOR
-
-Copyright 2013, Niels Thykier E<lt>niels@thykier.netE<gt>
-
-=head1 LICENSE
-
-This module is free software.  You may distribute it under the
-same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/autodie/Util.pm b/Master/tlpkg/tlperl/lib/autodie/Util.pm
new file mode 100644
index 00000000000..2a308a89778
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/autodie/Util.pm
@@ -0,0 +1,250 @@
+package autodie::Util;
+
+use strict;
+use warnings;
+
+use Exporter 5.57 qw(import);
+
+use autodie::Scope::GuardStack;
+
+our @EXPORT_OK = qw(
+  fill_protos
+  install_subs
+  make_core_trampoline
+  on_end_of_compile_scope
+);
+
+our $VERSION = '2.29'; # VERSION: Generated by DZP::OurPkg:Version
+
+# ABSTRACT: Internal Utility subroutines for autodie and Fatal
+
+# docs says we should pick __PACKAGE__ /<whatever>
+my $H_STACK_KEY = __PACKAGE__ . '/stack';
+
+sub on_end_of_compile_scope {
+    my ($hook) = @_;
+
+    # Dark magic to have autodie work under 5.8
+    # Copied from namespace::clean, that copied it from
+    # autobox, that found it on an ancient scroll written
+    # in blood.
+
+    # This magic bit causes %^H to be lexically scoped.
+    $^H |= 0x020000;
+
+    my $stack = $^H{$H_STACK_KEY};
+    if (not defined($stack)) {
+        $stack = autodie::Scope::GuardStack->new;
+        $^H{$H_STACK_KEY} = $stack;
+    }
+
+    $stack->push_hook($hook);
+    return;
+}
+
+# This code is based on code from the original Fatal.  The "XXXX"
+# remark is from the original code and its meaning is (sadly) unknown.
+sub fill_protos {
+    my ($proto) = @_;
+    my ($n, $isref, @out, @out1, $seen_semi) = -1;
+    if ($proto =~ m{^\s* (?: [;] \s*)? \@}x) {
+        # prototype is entirely slurply - special case that does not
+        # require any handling.
+        return ([0, '@_']);
+    }
+
+    while ($proto =~ /\S/) {
+        $n++;
+        push(@out1,[$n,@out]) if $seen_semi;
+        push(@out, $1 . "{\$_[$n]}"), next if $proto =~ s/^\s*\\([\@%\$\&])//;
+        push(@out, "\$_[$n]"),        next if $proto =~ s/^\s*([_*\$&])//;
+        push(@out, "\@_[$n..\$#_]"),  last if $proto =~ s/^\s*(;\s*)?\@//;
+        $seen_semi = 1, $n--,         next if $proto =~ s/^\s*;//; # XXXX ????
+        die "Internal error: Unknown prototype letters: \"$proto\"";
+    }
+    push(@out1,[$n+1,@out]);
+    return @out1;
+}
+
+
+sub make_core_trampoline {
+    my ($call, $pkg, $proto_str) = @_;
+    my $trampoline_code = 'sub {';
+    my $trampoline_sub;
+    my @protos = fill_protos($proto_str);
+
+    foreach my $proto (@protos) {
+        local $" = ", ";    # So @args is formatted correctly.
+        my ($count, @args) = @$proto;
+        if (@args && $args[-1] =~ m/[@#]_/) {
+            $trampoline_code .= qq/
+                if (\@_ >= $count) {
+                    return $call(@args);
+                }
+             /;
+        } else {
+            $trampoline_code .= qq<
+                if (\@_ == $count) {
+                    return $call(@args);
+                }
+             >;
+        }
+    }
+
+    $trampoline_code .= qq< require Carp; Carp::croak("Internal error in Fatal/autodie.  Leak-guard failure"); } >;
+    my $E;
+
+    {
+        local $@;
+        $trampoline_sub = eval "package $pkg;\n $trampoline_code"; ## no critic
+        $E = $@;
+    }
+    die "Internal error in Fatal/autodie: Leak-guard installation failure: $E"
+        if $E;
+
+    return $trampoline_sub;
+}
+
+# The code here is originally lifted from namespace::clean,
+# by Robert "phaylon" Sedlacek.
+#
+# It's been redesigned after feedback from ikegami on perlmonks.
+# See http://perlmonks.org/?node_id=693338 .  Ikegami rocks.
+#
+# Given a package, and hash of (subname => subref) pairs,
+# we install the given subroutines into the package.  If
+# a subref is undef, the subroutine is removed.  Otherwise
+# it replaces any existing subs which were already there.
+
+sub install_subs {
+    my ($target_pkg, $subs_to_reinstate) = @_;
+
+    my $pkg_sym = "${target_pkg}::";
+
+    # It does not hurt to do this in a predictable order, and might help debugging.
+    foreach my $sub_name (sort keys(%{$subs_to_reinstate})) {
+
+        # We will repeatedly mess with stuff that strict "refs" does
+        # not like.  So lets just disable it once for this entire
+        # scope.
+        no strict qw(refs);   ## no critic
+
+        my $sub_ref = $subs_to_reinstate->{$sub_name};
+
+        my $full_path = ${pkg_sym}.${sub_name};
+        my $oldglob = *$full_path;
+
+        # Nuke the old glob.
+        delete($pkg_sym->{$sub_name});
+
+        # For some reason this local *alias = *$full_path triggers an
+        # "only used once" warning.  Not entirely sure why, but at
+        # least it is easy to silence.
+        no warnings qw(once);
+        local *alias = *$full_path;
+        use warnings qw(once);
+
+        # Copy innocent bystanders back.  Note that we lose
+        # formats; it seems that Perl versions up to 5.10.0
+        # have a bug which causes copying formats to end up in
+        # the scalar slot.  Thanks to Ben Morrow for spotting this.
+
+        foreach my $slot (qw( SCALAR ARRAY HASH IO ) ) {
+            next unless defined(*$oldglob{$slot});
+            *alias = *$oldglob{$slot};
+        }
+
+        if ($sub_ref) {
+            *$full_path = $sub_ref;
+        }
+    }
+
+    return;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+autodie::Util - Internal Utility subroutines for autodie and Fatal
+
+=head1 SYNOPSIS
+
+    # INTERNAL API for autodie and Fatal only!
+
+    use autodie::Util qw(on_end_of_compile_scope);
+    on_end_of_compile_scope(sub { print "Hallo world\n"; });
+
+=head1 DESCRIPTION
+
+Interal Utilities for autodie and Fatal!  This module is not a part of
+autodie's public API.
+
+This module contains utility subroutines for abstracting away the
+underlying magic of autodie and (ab)uses of C<%^H> to call subs at the
+end of a (compile-time) scopes.
+
+Note that due to how C<%^H> works, some of these utilities are only
+useful during the compilation phase of a perl module and relies on the
+internals of how perl handles references in C<%^H>.
+
+=head2 Methods
+
+=head3 on_end_of_compile_scope
+
+  on_end_of_compile_scope(sub { print "Hallo world\n"; });
+
+Will invoke a sub at the end of a (compile-time) scope.  The sub is
+called once with no arguments.  Can be called multiple times (even in
+the same "compile-time" scope) to install multiple subs.  Subs are
+called in a "first-in-last-out"-order (FILO or "stack"-order).
+
+=head3 fill_protos
+
+  fill_protos('*$$;$@')
+
+Given a Perl subroutine prototype, return a list of invocation
+specifications.  Each specification is a listref, where the first
+member is the (minimum) number of arguments for this invocation
+specification.  The remaining arguments are a string representation of
+how to pass the arguments correctly to a sub with the given prototype,
+when called with the given number of arguments.
+
+The specifications are returned in increasing order of arguments
+starting at 0 (e.g.  ';$') or 1 (e.g.  '$@').  Note that if the
+prototype is "slurpy" (e.g. ends with a "@"), the number of arguments
+for the last specification is a "minimum" number rather than an exact
+number.  This can be detected by the last member of the last
+specification matching m/[@#]_/.
+
+=head3 make_core_trampoline
+
+  make_core_trampoline('CORE::open', 'main', prototype('CORE::open'))
+
+Creates a trampoline for calling a core sub.  Essentially, a tiny sub
+that figures out how we should be calling our core sub, puts in the
+arguments in the right way, and bounces our control over to it.
+
+If we could reliably use `goto &` on core builtins, we wouldn't need
+this subroutine.
+
+=head3 install_subs
+
+  install_subs('My::Module', { 'read' => sub { die("Hallo\n"), ... }})
+
+Given a package name and a hashref mapping names to a subroutine
+reference (or C<undef>), this subroutine will install said subroutines
+on their given name in that module.  If a name mapes to C<undef>, any
+subroutine with that name in the target module will be remove
+(possibly "unshadowing" a CORE sub of same name).
+
+=head1 AUTHOR
+
+Copyright 2013-2014, Niels Thykier E<lt>niels@thykier.netE<gt>
+
+=head1 LICENSE
+
+This module is free software.  You may distribute it under the
+same terms as Perl itself.
diff --git a/Master/tlpkg/tlperl/lib/autodie/exception.pm b/Master/tlpkg/tlperl/lib/autodie/exception.pm
index 15d09146d8d..73058085e00 100644
--- a/Master/tlpkg/tlperl/lib/autodie/exception.pm
+++ b/Master/tlpkg/tlperl/lib/autodie/exception.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp qw(croak);
 
-our $VERSION = '2.26'; # VERSION: Generated by DZP::OurPkg:Version
+our $VERSION = '2.29'; # VERSION: Generated by DZP::OurPkg:Version
 # ABSTRACT: Exceptions from autodying functions.
 
 our $DEBUG = 0;
@@ -292,8 +292,50 @@ my %formatter_of = (
     'CORE::read'     => \&_format_readwrite,
     'CORE::sysread'  => \&_format_readwrite,
     'CORE::syswrite' => \&_format_readwrite,
+    'CORE::chmod'    => \&_format_chmod,
+    'CORE::mkdir'    => \&_format_mkdir,
 );
 
+sub _beautify_arguments {
+    shift @_;
+
+    # Walk through all our arguments, and...
+    #
+    #   * Replace undef with the word 'undef'
+    #   * Replace globs with the string '$fh'
+    #   * Quote all other args.
+    foreach my $arg (@_) {
+       if    (not defined($arg))   { $arg = 'undef' }
+       elsif (ref($arg) eq "GLOB") { $arg = '$fh'   }
+       else                        { $arg = qq{'$arg'} }
+    }
+
+    return @_;
+}
+
+sub _trim_package_name {
+    # Info: The following is done since 05/2008 (which is before v1.10)
+
+    # TODO: This is probably a good idea for CORE, is it
+    # a good idea for other subs?
+
+    # Trim package name off dying sub for error messages
+    (my $name = $_[1]) =~ s/.*:://;
+    return $name;
+}
+
+# Returns the parameter formatted as octal number
+sub _octalize_number {
+    my $number = $_[1];
+
+    # Only reformat if it looks like a whole number
+    if ($number =~ /^\d+$/) {
+        $number = sprintf("%#04lo", $number);
+    }
+
+    return $number;
+}
+
 # TODO: Our tests only check LOCK_EX | LOCK_NB is properly
 # formatted.  Try other combinations and ensure they work
 # correctly.
@@ -348,6 +390,40 @@ sub _format_flock {
 
 }
 
+# Default formatter for CORE::chmod
+sub _format_chmod {
+    my ($this) = @_;
+    my @args   = @{$this->args};
+
+    my $mode   = shift @args;
+    local $!   = $this->errno;
+
+    $mode = $this->_octalize_number($mode);
+
+    @args = $this->_beautify_arguments(@args);
+
+    return "Can't chmod($mode, ". join(q{, }, @args) ."): $!";
+}
+
+# Default formatter for CORE::mkdir
+sub _format_mkdir {
+    my ($this) = @_;
+    my @args   = @{$this->args};
+
+    # If no mask is specified use default formatter
+    if (@args < 2) {
+      return $this->format_default;
+    }
+
+    my $file = $args[0];
+    my $mask = $args[1];
+    local $! = $this->errno;
+
+    $mask = $this->_octalize_number($mask);
+
+    return "Can't mkdir('$file', $mask): '$!'";
+}
+
 # Default formatter for CORE::dbmopen
 sub _format_dbmopen {
     my ($this) = @_;
@@ -362,13 +438,7 @@ sub _format_dbmopen {
     my $mode = $args[-1];
     my $file = $args[-2];
 
-    # If we have a mask, then display it in octal, not decimal.
-    # We don't do this if it already looks octalish, or doesn't
-    # look like a number.
-
-    if ($mode =~ /^[^\D0]\d+$/) {
-        $mode = sprintf("0%lo", $mode);
-    };
+    $mode = $this->_octalize_number($mode);
 
     local $! = $this->errno;
 
@@ -399,12 +469,9 @@ sub _format_close {
 # may contain binary data.
 sub _format_readwrite {
     my ($this) = @_;
-    my $call = $this->function;
+    my $call = $this->_trim_package_name($this->function);
     local $! = $this->errno;
 
-    # Trim package name off dying sub for error messages.
-    $call =~ s/.*:://;
-
     # These subs receive the following arguments (in order):
     #
     # * FILEHANDLE
@@ -619,29 +686,12 @@ messages are formatted.
 sub format_default {
     my ($this) = @_;
 
-    my $call        =  $this->function;
+    my $call   =  $this->_trim_package_name($this->function);
 
     local $! = $this->errno;
 
-    # TODO: This is probably a good idea for CORE, is it
-    # a good idea for other subs?
-
-    # Trim package name off dying sub for error messages.
-    $call =~ s/.*:://;
-
-    # Walk through all our arguments, and...
-    #
-    #   * Replace undef with the word 'undef'
-    #   * Replace globs with the string '$fh'
-    #   * Quote all other args.
-
     my @args = @{ $this->args() };
-
-    foreach my $arg (@args) {
-       if    (not defined($arg))   { $arg = 'undef' }
-       elsif (ref($arg) eq "GLOB") { $arg = '$fh'   }
-       else                        { $arg = qq{'$arg'} }
-    }
+    @args = $this->_beautify_arguments(@args);
 
     # Format our beautiful error.
 
diff --git a/Master/tlpkg/tlperl/lib/autodie/exception/system.pm b/Master/tlpkg/tlperl/lib/autodie/exception/system.pm
index d63a60714ec..e6305fd42ea 100644
--- a/Master/tlpkg/tlperl/lib/autodie/exception/system.pm
+++ b/Master/tlpkg/tlperl/lib/autodie/exception/system.pm
@@ -5,7 +5,7 @@ use warnings;
 use parent 'autodie::exception';
 use Carp qw(croak);
 
-our $VERSION = '2.26'; # VERSION: Generated by DZP::OurPkg:Version
+our $VERSION = '2.29'; # VERSION: Generated by DZP::OurPkg:Version
 
 # ABSTRACT: Exceptions from autodying system().
 
diff --git a/Master/tlpkg/tlperl/lib/autodie/hints.pm b/Master/tlpkg/tlperl/lib/autodie/hints.pm
index 3c9d679928a..beaefcc28a9 100644
--- a/Master/tlpkg/tlperl/lib/autodie/hints.pm
+++ b/Master/tlpkg/tlperl/lib/autodie/hints.pm
@@ -5,7 +5,7 @@ use warnings;
 
 use constant PERL58 => ( $] < 5.009 );
 
-our $VERSION = '2.26'; # VERSION: Generated by DZP::OurPkg:Version
+our $VERSION = '2.29'; # VERSION: Generated by DZP::OurPkg:Version
 
 # ABSTRACT: Provide hints about user subroutines to autodie
 
diff --git a/Master/tlpkg/tlperl/lib/autodie/skip.pm b/Master/tlpkg/tlperl/lib/autodie/skip.pm
index 1462acd3321..9a048fe62f2 100644
--- a/Master/tlpkg/tlperl/lib/autodie/skip.pm
+++ b/Master/tlpkg/tlperl/lib/autodie/skip.pm
@@ -2,7 +2,7 @@ package autodie::skip;
 use strict;
 use warnings;
 
-our $VERSION = '2.26'; # VERSION
+our $VERSION = '2.29'; # VERSION
 
 # This package exists purely so people can inherit from it,
 # which isn't at all how roles are supposed to work, but it's
diff --git a/Master/tlpkg/tlperl/lib/autouse.pm b/Master/tlpkg/tlperl/lib/autouse.pm
index 79dadc419e1..2dd8c1dbd74 100644
--- a/Master/tlpkg/tlperl/lib/autouse.pm
+++ b/Master/tlpkg/tlperl/lib/autouse.pm
@@ -3,7 +3,7 @@ package autouse;
 #use strict;		# debugging only
 use 5.006;		# use warnings
 
-$autouse::VERSION = '1.08';
+$autouse::VERSION = '1.11';
 
 $autouse::DEBUG ||= 0;
 
diff --git a/Master/tlpkg/tlperl/lib/base.pm b/Master/tlpkg/tlperl/lib/base.pm
index 5d1378786de..6fee6008fc2 100644
--- a/Master/tlpkg/tlperl/lib/base.pm
+++ b/Master/tlpkg/tlperl/lib/base.pm
@@ -1,9 +1,10 @@
+use 5.008;
 package base;
 
 use strict 'vars';
 use vars qw($VERSION);
-$VERSION = '2.22';
-$VERSION = eval $VERSION;
+$VERSION = '2.23';
+$VERSION =~ tr/_//d;
 
 # constant.pm is slow
 sub SUCCESS () { 1 }
diff --git a/Master/tlpkg/tlperl/lib/bigint.pm b/Master/tlpkg/tlperl/lib/bigint.pm
index 3bcf15aa32f..bc1ebe39724 100644
--- a/Master/tlpkg/tlperl/lib/bigint.pm
+++ b/Master/tlpkg/tlperl/lib/bigint.pm
@@ -1,145 +1,222 @@
 package bigint;
+
 use 5.006;
+use strict;
+use warnings;
+
+our $VERSION = '0.42_01';
 
-$VERSION = '0.39';
 use Exporter;
-@ISA		= qw( Exporter );
-@EXPORT_OK	= qw( PI e bpi bexp hex oct );
-@EXPORT		= qw( inf NaN );
+our @ISA            = qw( Exporter );
+our @EXPORT_OK      = qw( PI e bpi bexp hex oct );
+our @EXPORT         = qw( inf NaN );
 
-use strict;
 use overload;
 
-############################################################################## 
+##############################################################################
 
 # These are all alike, and thus faked by AUTOLOAD
 
 my @faked = qw/round_mode accuracy precision div_scale/;
-use vars qw/$VERSION $AUTOLOAD $_lite/;		# _lite for testsuite
-
-sub AUTOLOAD
-  {
-  my $name = $AUTOLOAD;
-
-  $name =~ s/.*:://;    # split package
-  no strict 'refs';
-  foreach my $n (@faked)
-    {
-    if ($n eq $name)
-      {
-      *{"bigint::$name"} = sub 
-        {
-        my $self = shift;
-        no strict 'refs';
-        if (defined $_[0])
-          {
-          return Math::BigInt->$name($_[0]);
-          }
-        return Math::BigInt->$name();
-        };
-      return &$name;
-      }
+our ($AUTOLOAD, $_lite);        # _lite for testsuite
+
+sub AUTOLOAD {
+    my $name = $AUTOLOAD;
+
+    $name =~ s/.*:://;          # split package
+    no strict 'refs';
+    foreach my $n (@faked) {
+        if ($n eq $name) {
+            *{"bigint::$name"} =
+              sub {
+                  my $self = shift;
+                  no strict 'refs';
+                  if (defined $_[0]) {
+                      return Math::BigInt->$name($_[0]);
+                  }
+                  return Math::BigInt->$name();
+              };
+            return &$name;
+        }
     }
- 
-  # delayed load of Carp and avoid recursion
-  require Carp;
-  Carp::croak ("Can't call bigint\-\>$name, not a valid method");
-  }
 
-sub upgrade
-  {
-  $Math::BigInt::upgrade;
-  }
+    # delayed load of Carp and avoid recursion
+    require Carp;
+    Carp::croak ("Can't call bigint\-\>$name, not a valid method");
+}
 
-sub _binary_constant
-  {
-  # this takes a binary/hexadecimal/octal constant string and returns it
-  # as string suitable for new. Basically it converts octal to decimal, and
-  # passes every thing else unmodified back.
-  my $string = shift;
+sub upgrade {
+    $Math::BigInt::upgrade;
+}
 
-  return Math::BigInt->new($string) if $string =~ /^0[bx]/;
+sub _binary_constant {
+    # this takes a binary/hexadecimal/octal constant string and returns it
+    # as string suitable for new. Basically it converts octal to decimal, and
+    # passes every thing else unmodified back.
+    my $string = shift;
 
-  # so it must be an octal constant
-  Math::BigInt->from_oct($string);
-  }
+    return Math::BigInt->new($string) if $string =~ /^0[bx]/;
 
-sub _float_constant
-  {
-  # this takes a floating point constant string and returns it truncated to
-  # integer. For instance, '4.5' => '4', '1.234e2' => '123' etc
-  my $float = shift;
-
-  # some simple cases first
-  return $float if ($float =~ /^[+-]?[0-9]+$/);		# '+123','-1','0' etc
-  return $float 
-    if ($float =~ /^[+-]?[0-9]+\.?[eE]\+?[0-9]+$/);	# 123e2, 123.e+2
-  return '0' if ($float =~ /^[+-]?[0]*\.[0-9]+$/);	# .2, 0.2, -.1
-  if ($float =~ /^[+-]?[0-9]+\.[0-9]*$/)		# 1., 1.23, -1.2 etc
-    {
-    $float =~ s/\..*//;
-    return $float;
+    # so it must be an octal constant
+    Math::BigInt->from_oct($string);
+}
+
+sub _float_constant {
+    # this takes a floating point constant string and returns it truncated to
+    # integer. For instance, '4.5' => '4', '1.234e2' => '123' etc
+    my $float = shift;
+
+    # some simple cases first
+    return $float if ($float =~ /^[+-]?[0-9]+$/);       # '+123','-1','0' etc
+    return $float
+      if ($float =~ /^[+-]?[0-9]+\.?[eE]\+?[0-9]+$/);   # 123e2, 123.e+2
+    return '0' if ($float =~ /^[+-]?[0]*\.[0-9]+$/);    # .2, 0.2, -.1
+    if ($float =~ /^[+-]?[0-9]+\.[0-9]*$/) {            # 1., 1.23, -1.2 etc
+        $float =~ s/\..*//;
+        return $float;
     }
-  my ($mis,$miv,$mfv,$es,$ev) = Math::BigInt::_split($float);
-  return $float if !defined $mis; 	# doesn't look like a number to me
-  my $ec = int($$ev);
-  my $sign = $$mis; $sign = '' if $sign eq '+';
-  if ($$es eq '-')
-    {
-    # ignore fraction part entirely
-    if ($ec >= length($$miv))			# 123.23E-4
-      {
-      return '0';
-      }
-    return $sign . substr ($$miv,0,length($$miv)-$ec);	# 1234.45E-2 = 12
+    my ($mis, $miv, $mfv, $es, $ev) = Math::BigInt::_split($float);
+    return $float if !defined $mis;       # doesn't look like a number to me
+    my $ec = int($$ev);
+    my $sign = $$mis;
+    $sign = '' if $sign eq '+';
+    if ($$es eq '-') {
+        # ignore fraction part entirely
+        if ($ec >= length($$miv)) {                     # 123.23E-4
+            return '0';
+        }
+        return $sign . substr($$miv, 0, length($$miv) - $ec); # 1234.45E-2 = 12
     }
-  # xE+y
-  if ($ec >= length($$mfv))
-    {
-    $ec -= length($$mfv);			
-    return $sign.$$miv.$$mfv if $ec == 0;	# 123.45E+2 => 12345
-    return $sign.$$miv.$$mfv.'E'.$ec; 		# 123.45e+3 => 12345e1
+    # xE+y
+    if ($ec >= length($$mfv)) {
+        $ec -= length($$mfv);
+        return $sign.$$miv.$$mfv if $ec == 0;           # 123.45E+2 => 12345
+        return $sign.$$miv.$$mfv.'E'.$ec;               # 123.45e+3 => 12345e1
     }
-  $mfv = substr($$mfv,0,$ec);
-  $sign.$$miv.$mfv; 				# 123.45e+1 => 1234
-  }
+    $mfv = substr($$mfv, 0, $ec);
+    $sign.$$miv.$mfv;                                   # 123.45e+1 => 1234
+}
 
-sub unimport
-  {
-  $^H{bigint} = undef;					# no longer in effect
-  overload::remove_constant('binary','','float','','integer');
-  }
+sub unimport {
+    $^H{bigint} = undef;                                # no longer in effect
+    overload::remove_constant('binary', '', 'float', '', 'integer');
+}
 
-sub in_effect
-  {
-  my $level = shift || 0;
-  my $hinthash = (caller($level))[10];
-  $hinthash->{bigint};
-  }
+sub in_effect {
+    my $level = shift || 0;
+    my $hinthash = (caller($level))[10];
+    $hinthash->{bigint};
+}
 
 #############################################################################
 # the following two routines are for "use bigint qw/hex oct/;":
 
 use constant LEXICAL => $] > 5.009004;
 
+# Internal function with the same semantics as CORE::hex(). This function is
+# not used directly, but rather by other front-end functions.
+
+sub _hex_core {
+    my $str = shift;
+
+    # Strip off, clean, and parse as much as we can from the beginning.
+
+    my $x;
+    if ($str =~ s/ ^ (0?[xX])? ( [0-9a-fA-F]* ( _ [0-9a-fA-F]+ )* ) //x) {
+        my $chrs = $2;
+        $chrs =~ tr/_//d;
+        $chrs = '0' unless CORE::length $chrs;
+        $x = Math::BigInt -> from_hex($chrs);
+    } else {
+        $x = Math::BigInt -> bzero();
+    }
+
+    # Warn about trailing garbage.
+
+    if (CORE::length($str)) {
+        require Carp;
+        Carp::carp(sprintf("Illegal hexadecimal digit '%s' ignored",
+                           substr($str, 0, 1)));
+    }
+
+    return $x;
+}
+
+# Internal function with the same semantics as CORE::oct(). This function is
+# not used directly, but rather by other front-end functions.
+
+sub _oct_core {
+    my $str = shift;
+
+    $str =~ s/^\s*//;
+
+    # Hexadecimal input.
+
+    return _hex_core($str) if $str =~ /^0?[xX]/;
+
+    my $x;
+
+    # Binary input.
+
+    if ($str =~ /^0?[bB]/) {
+
+        # Strip off, clean, and parse as much as we can from the beginning.
+
+        if ($str =~ s/ ^ (0?[bB])? ( [01]* ( _ [01]+ )* ) //x) {
+            my $chrs = $2;
+            $chrs =~ tr/_//d;
+            $chrs = '0' unless CORE::length $chrs;
+            $x = Math::BigInt -> from_bin($chrs);
+        }
+
+        # Warn about trailing garbage.
+
+        if (CORE::length($str)) {
+            require Carp;
+            Carp::carp(sprintf("Illegal binary digit '%s' ignored",
+                               substr($str, 0, 1)));
+        }
+
+        return $x;
+    }
+
+    # Octal input. Strip off, clean, and parse as much as we can from the
+    # beginning.
+
+    if ($str =~ s/ ^ ( [0-7]* ( _ [0-7]+ )* ) //x) {
+        my $chrs = $1;
+        $chrs =~ tr/_//d;
+        $chrs = '0' unless CORE::length $chrs;
+        $x = Math::BigInt -> from_oct($chrs);
+    }
+
+    # Warn about trailing garbage. CORE::oct() only warns about 8 and 9.
+
+    if (CORE::length($str)) {
+        my $chr = substr($str, 0, 1);
+        if ($chr eq '8' || $chr eq '9') {
+            require Carp;
+            Carp::carp(sprintf("Illegal octal digit '%s' ignored", $chr));
+        }
+    }
+
+    return $x;
+}
+
 {
     my $proto = LEXICAL ? '_' : ';$';
     eval '
-sub hex(' . $proto . ')' . <<'.';
-  {
-  my $i = @_ ? $_[0] : $_;
-  $i = '0x'.$i unless $i =~ /^0x/;
-  Math::BigInt->new($i);
-  }
+sub hex(' . $proto . ') {' . <<'.';
+    my $str = @_ ? $_[0] : $_;
+    _hex_core($str);
+}
 .
+
     eval '
-sub oct(' . $proto . ')' . <<'.';
-  {
-  my $i = @_ ? $_[0] : $_;
-  # oct() should never fall back to decimal
-  return Math::BigInt->from_oct($i) if $i =~ s/^(?=0[0-9]|[1-9])/0/;
-  Math::BigInt->new($i);
-  }
+sub oct(' . $proto . ') {' . <<'.';
+    my $str = @_ ? $_[0] : $_;
+    _oct_core($str);
+}
 .
 }
 
@@ -149,145 +226,140 @@ sub oct(' . $proto . ')' . <<'.';
 my ($prev_oct, $prev_hex, $overridden);
 
 if (LEXICAL) { eval <<'.' }
-sub _hex(_)
-  {
-  my $hh = (caller 0)[10];
-  return $prev_hex ? &$prev_hex($_[0]) : CORE::hex($_[0])
-    unless $$hh{bigint}||$$hh{bignum}||$$hh{bigrat};
-  my $i = $_[0];
-  $i = '0x'.$i unless $i =~ /^0x/;
-  Math::BigInt->new($i);
-  }
+sub _hex(_) {
+    my $hh = (caller 0)[10];
+    return $prev_hex ? &$prev_hex($_[0]) : CORE::hex($_[0])
+      unless $$hh{bigint}||$$hh{bignum}||$$hh{bigrat};
+    _hex_core($_[0]);
+}
 
-sub _oct(_)
-  {
-  my $hh = (caller 0)[10];
-  return $prev_oct ? &$prev_oct($_[0]) : CORE::oct($_[0])
-    unless $$hh{bigint}||$$hh{bignum}||$$hh{bigrat};
-  my $i = $_[0];
-  # oct() should never fall back to decimal
-  return Math::BigInt->from_oct($i) if $i =~ s/^(?=0[0-9]|[1-9])/0/;
-  Math::BigInt->new($i);
-  }
+sub _oct(_) {
+    my $hh = (caller 0)[10];
+    return $prev_oct ? &$prev_oct($_[0]) : CORE::oct($_[0])
+      unless $$hh{bigint}||$$hh{bignum}||$$hh{bigrat};
+    _oct_core($_[0]);
+}
 .
 
-sub _override
-  {
-  return if $overridden;
-  $prev_oct = *CORE::GLOBAL::oct{CODE};
-  $prev_hex = *CORE::GLOBAL::hex{CODE};
-  no warnings 'redefine';
-  *CORE::GLOBAL::oct = \&_oct;
-  *CORE::GLOBAL::hex = \&_hex;
-  $overridden++;
-  }
+sub _override {
+    return if $overridden;
+    $prev_oct = *CORE::GLOBAL::oct{CODE};
+    $prev_hex = *CORE::GLOBAL::hex{CODE};
+    no warnings 'redefine';
+    *CORE::GLOBAL::oct = \&_oct;
+    *CORE::GLOBAL::hex = \&_hex;
+    $overridden++;
+}
 
-sub import 
-  {
-  my $self = shift;
+sub import {
+    my $self = shift;
 
-  $^H{bigint} = 1;					# we are in effect
+    $^H{bigint} = 1;                            # we are in effect
 
-  # for newer Perls always override hex() and oct() with a lexical version:
-  if (LEXICAL)
-    {
-    _override();
+    # for newer Perls always override hex() and oct() with a lexical version:
+    if (LEXICAL) {
+        _override();
     }
-  # some defaults
-  my $lib = ''; my $lib_kind = 'try';
-
-  my @import = ( ':constant' );				# drive it w/ constant
-  my @a = @_; my $l = scalar @_; my $j = 0;
-  my ($ver,$trace);					# version? trace?
-  my ($a,$p);						# accuracy, precision
-  for ( my $i = 0; $i < $l ; $i++,$j++ )
-    {
-    if ($_[$i] =~ /^(l|lib|try|only)$/)
-      {
-      # this causes a different low lib to take care...
-      $lib_kind = $1; $lib_kind = 'lib' if $lib_kind eq 'l';
-      $lib = $_[$i+1] || '';
-      my $s = 2; $s = 1 if @a-$j < 2;	# avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s; $i++;
-      }
-    elsif ($_[$i] =~ /^(a|accuracy)$/)
-      {
-      $a = $_[$i+1];
-      my $s = 2; $s = 1 if @a-$j < 2;	# avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s; $i++;
-      }
-    elsif ($_[$i] =~ /^(p|precision)$/)
-      {
-      $p = $_[$i+1];
-      my $s = 2; $s = 1 if @a-$j < 2;	# avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s; $i++;
-      }
-    elsif ($_[$i] =~ /^(v|version)$/)
-      {
-      $ver = 1;
-      splice @a, $j, 1; $j --;
-      }
-    elsif ($_[$i] =~ /^(t|trace)$/)
-      {
-      $trace = 1;
-      splice @a, $j, 1; $j --;
-      }
-    elsif ($_[$i] !~ /^(PI|e|bpi|bexp|hex|oct)\z/)
-      {
-      die ("unknown option $_[$i]");
-      }
-    }
-  my $class;
-  $_lite = 0;					# using M::BI::L ?
-  if ($trace)
-    {
-    require Math::BigInt::Trace; $class = 'Math::BigInt::Trace';
+    # some defaults
+    my $lib = '';
+    my $lib_kind = 'try';
+
+    my @import = (':constant');                 # drive it w/ constant
+    my @a = @_;
+    my $l = scalar @_;
+    my $j = 0;
+    my ($ver, $trace);                          # version? trace?
+    my ($a, $p);                                # accuracy, precision
+    for (my $i = 0; $i < $l; $i++, $j++) {
+        if ($_[$i] =~ /^(l|lib|try|only)$/) {
+            # this causes a different low lib to take care...
+            $lib_kind = $1;
+            $lib_kind = 'lib' if $lib_kind eq 'l';
+            $lib = $_[$i + 1] || '';
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+            $i++;
+        } elsif ($_[$i] =~ /^(a|accuracy)$/) {
+            $a = $_[$i + 1];
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+            $i++;
+        } elsif ($_[$i] =~ /^(p|precision)$/) {
+            $p = $_[$i + 1];
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+            $i++;
+        } elsif ($_[$i] =~ /^(v|version)$/) {
+            $ver = 1;
+            splice @a, $j, 1;
+            $j--;
+        } elsif ($_[$i] =~ /^(t|trace)$/) {
+            $trace = 1;
+            splice @a, $j, 1;
+            $j--;
+        } elsif ($_[$i] !~ /^(PI|e|bpi|bexp|hex|oct)\z/) {
+            die ("unknown option $_[$i]");
+        }
     }
-  else
-    {
-    # see if we can find Math::BigInt::Lite
-    if (!defined $a && !defined $p)		# rounding won't work to well
-      {
-      if (eval { require Math::BigInt::Lite; 1 })
-        {
-        @import = ( );				# :constant in Lite, not MBI
-        Math::BigInt::Lite->import( ':constant' );
-        $_lite= 1;				# signal okay
+    my $class;
+    $_lite = 0;                                 # using M::BI::L ?
+    if ($trace) {
+        require Math::BigInt::Trace;
+        $class = 'Math::BigInt::Trace';
+    } else {
+        # see if we can find Math::BigInt::Lite
+        if (!defined $a && !defined $p) {       # rounding won't work to well
+            local @INC = @INC;
+            pop @INC if $INC[-1] eq '.';
+            if (eval { require Math::BigInt::Lite; 1 }) {
+                @import = ();                   # :constant in Lite, not MBI
+                Math::BigInt::Lite->import(':constant');
+                $_lite = 1;                     # signal okay
+            }
         }
-      }
-    require Math::BigInt if $_lite == 0;	# not already loaded?
-    $class = 'Math::BigInt';			# regardless of MBIL or not
+        require Math::BigInt if $_lite == 0;    # not already loaded?
+        $class = 'Math::BigInt';                # regardless of MBIL or not
     }
-  push @import, $lib_kind => $lib if $lib ne '';
-  # Math::BigInt::Trace or plain Math::BigInt
-  $class->import(@import);
-
-  bigint->accuracy($a) if defined $a;
-  bigint->precision($p) if defined $p;
-  if ($ver)
-    {
-    print "bigint\t\t\t v$VERSION\n";
-    print "Math::BigInt::Lite\t v$Math::BigInt::Lite::VERSION\n" if $_lite;
-    print "Math::BigInt\t\t v$Math::BigInt::VERSION";
-    my $config = Math::BigInt->config();
-    print " lib => $config->{lib} v$config->{lib_version}\n";
-    exit;
+    push @import, $lib_kind => $lib if $lib ne '';
+    # Math::BigInt::Trace or plain Math::BigInt
+    $class->import(@import);
+
+    bigint->accuracy($a)  if defined $a;
+    bigint->precision($p) if defined $p;
+    if ($ver) {
+        print "bigint\t\t\t v$VERSION\n";
+        print "Math::BigInt::Lite\t v$Math::BigInt::Lite::VERSION\n" if $_lite;
+        print "Math::BigInt\t\t v$Math::BigInt::VERSION";
+        my $config = Math::BigInt->config();
+        print " lib => $config->{lib} v$config->{lib_version}\n";
+        exit;
     }
-  # we take care of floating point constants, since BigFloat isn't available
-  # and BigInt doesn't like them:
-  overload::constant float => sub { Math::BigInt->new( _float_constant(shift) ); };
-  # Take care of octal/hexadecimal constants
-  overload::constant binary => sub { _binary_constant(shift) };
-
-  # if another big* was already loaded:
-  my ($package) = caller();
-
-  no strict 'refs';
-  if (!defined *{"${package}::inf"})
-    {
-    $self->export_to_level(1,$self,@a);           # export inf and NaN, e and PI
+    # we take care of floating point constants, since BigFloat isn't available
+    # and BigInt doesn't like them:
+    overload::constant float =>
+        sub {
+            Math::BigInt->new(_float_constant(shift));
+        };
+    # Take care of octal/hexadecimal constants
+    overload::constant binary =>
+        sub {
+            _binary_constant(shift);
+        };
+
+    # if another big* was already loaded:
+    my ($package) = caller();
+
+    no strict 'refs';
+    if (!defined *{"${package}::inf"}) {
+        $self->export_to_level(1, $self, @a);   # export inf and NaN, e and PI
     }
-  }
+}
 
 sub inf () { Math::BigInt::binf(); }
 sub NaN () { Math::BigInt::bnan(); }
@@ -295,12 +367,17 @@ sub NaN () { Math::BigInt::bnan(); }
 sub PI () { Math::BigInt->new(3); }
 sub e () { Math::BigInt->new(2); }
 sub bpi ($) { Math::BigInt->new(3); }
-sub bexp ($$) { my $x = Math::BigInt->new($_[0]); $x->bexp($_[1]); }
+sub bexp ($$) {
+    my $x = Math::BigInt->new($_[0]);
+    $x->bexp($_[1]);
+}
 
 1;
 
 __END__
 
+=pod
+
 =head1 NAME
 
 bigint - Transparent BigInteger support for Perl
@@ -309,15 +386,15 @@ bigint - Transparent BigInteger support for Perl
 
   use bigint;
 
-  $x = 2 + 4.5,"\n";			# BigInt 6
-  print 2 ** 512,"\n";			# really is what you think it is
-  print inf + 42,"\n";			# inf
-  print NaN * 7,"\n";			# NaN
-  print hex("0x1234567890123490"),"\n";	# Perl v5.10.0 or later
+  $x = 2 + 4.5,"\n";                    # BigInt 6
+  print 2 ** 512,"\n";                  # really is what you think it is
+  print inf + 42,"\n";                  # inf
+  print NaN * 7,"\n";                   # NaN
+  print hex("0x1234567890123490"),"\n"; # Perl v5.10.0 or later
 
   {
     no bigint;
-    print 2 ** 256,"\n";		# a normal Perl scalar now
+    print 2 ** 256,"\n";                # a normal Perl scalar now
   }
 
   # Import into current package:
@@ -342,32 +419,32 @@ There is one small difference between C<use integer> and C<use bigint>: the
 former will not affect assignments to variables and the return value of
 some functions. C<bigint> truncates these results to integer too:
 
-	# perl -Minteger -wle 'print 3.2'
-	3.2
-	# perl -Minteger -wle 'print 3.2 + 0'
-	3
-	# perl -Mbigint -wle 'print 3.2'
-	3
-	# perl -Mbigint -wle 'print 3.2 + 0'
-	3
-
-	# perl -Mbigint -wle 'print exp(1) + 0'
-	2
-	# perl -Mbigint -wle 'print exp(1)'
-	2
-	# perl -Minteger -wle 'print exp(1)'
-	2.71828182845905
-	# perl -Minteger -wle 'print exp(1) + 0'
-	2
+        # perl -Minteger -wle 'print 3.2'
+        3.2
+        # perl -Minteger -wle 'print 3.2 + 0'
+        3
+        # perl -Mbigint -wle 'print 3.2'
+        3
+        # perl -Mbigint -wle 'print 3.2 + 0'
+        3
+
+        # perl -Mbigint -wle 'print exp(1) + 0'
+        2
+        # perl -Mbigint -wle 'print exp(1)'
+        2
+        # perl -Minteger -wle 'print exp(1)'
+        2.71828182845905
+        # perl -Minteger -wle 'print exp(1) + 0'
+        2
 
 In practice this makes seldom a difference as B<parts and results> of
 expressions will be truncated anyway, but this can, for instance, affect the
 return value of subroutines:
 
-    sub three_integer { use integer; return 3.2; } 
+    sub three_integer { use integer; return 3.2; }
     sub three_bigint { use bigint; return 3.2; }
 
-    print three_integer(), " ", three_bigint(),"\n";	# prints "3.2 3"
+    print three_integer(), " ", three_bigint(),"\n";    # prints "3.2 3"
 
 =head2 Options
 
@@ -382,7 +459,7 @@ The following options exist:
 This sets the accuracy for all math operations. The argument must be greater
 than or equal to zero. See Math::BigInt's bround() function for details.
 
-	perl -Mbigint=a,2 -le 'print 12345+1'
+        perl -Mbigint=a,2 -le 'print 12345+1'
 
 Note that setting precision and accuracy at the same time is not possible.
 
@@ -396,7 +473,7 @@ integer and are ignore like negative values.
 
 See Math::BigInt's bfround() function for details.
 
-	perl -Mbignum=p,5 -le 'print 123456789+123'
+        perl -Mbignum=p,5 -le 'print 123456789+123'
 
 Note that setting precision and accuracy at the same time is not possible.
 
@@ -423,14 +500,14 @@ overridden in the current scope whenever the bigint pragma is active.
 
 Load a different math lib, see L<Math Library>.
 
-	perl -Mbigint=lib,GMP -e 'print 2 ** 512'
-	perl -Mbigint=try,GMP -e 'print 2 ** 512'
-	perl -Mbigint=only,GMP -e 'print 2 ** 512'
+        perl -Mbigint=lib,GMP -e 'print 2 ** 512'
+        perl -Mbigint=try,GMP -e 'print 2 ** 512'
+        perl -Mbigint=only,GMP -e 'print 2 ** 512'
 
 Currently there is no way to specify more than one library on the command
 line. This means the following does not work:
 
-	perl -Mbignum=l,GMP,Pari -e 'print 2 ** 512'
+        perl -Mbignum=l,GMP,Pari -e 'print 2 ** 512'
 
 This will be hopefully fixed soon ;)
 
@@ -438,7 +515,7 @@ This will be hopefully fixed soon ;)
 
 This prints out the name and version of all modules used and then exits.
 
-	perl -Mbigint=v
+        perl -Mbigint=v
 
 =back
 
@@ -447,16 +524,16 @@ This prints out the name and version of all modules used and then exits.
 Math with the numbers is done (by default) by a module called
 Math::BigInt::Calc. This is equivalent to saying:
 
-	use bigint lib => 'Calc';
+        use bigint lib => 'Calc';
 
 You can change this by using:
 
-	use bignum lib => 'GMP';
+        use bignum lib => 'GMP';
 
 The following would first try to find Math::BigInt::Foo, then
 Math::BigInt::Bar, and when this also fails, revert to Math::BigInt::Calc:
 
-	use bigint lib => 'Foo,Math::BigInt::Bar';
+        use bigint lib => 'Foo,Math::BigInt::Bar';
 
 Using C<lib> warns if none of the specified libraries can be found and
 L<Math::BigInt> did fall back to one of the default libraries.
@@ -496,36 +573,36 @@ minus infinity. You will get '+inf' when dividing a positive number by 0, and
 
 Since all numbers are now objects, you can use all functions that are part of
 the BigInt API. You can only use the bxxx() notation, and not the fxxx()
-notation, though. 
+notation, though.
 
 But a warning is in order. When using the following to make a copy of a number,
 only a shallow copy will be made.
 
-	$x = 9; $y = $x;
-	$x = $y = 7;
+        $x = 9; $y = $x;
+        $x = $y = 7;
 
 Using the copy or the original with overloaded math is okay, e.g. the
 following work:
 
-	$x = 9; $y = $x;
-	print $x + 1, " ", $y,"\n";	# prints 10 9
+        $x = 9; $y = $x;
+        print $x + 1, " ", $y,"\n";     # prints 10 9
 
 but calling any method that modifies the number directly will result in
 B<both> the original and the copy being destroyed:
 
-	$x = 9; $y = $x;
-	print $x->badd(1), " ", $y,"\n";	# prints 10 10
+        $x = 9; $y = $x;
+        print $x->badd(1), " ", $y,"\n";        # prints 10 10
 
-	$x = 9; $y = $x;
-	print $x->binc(1), " ", $y,"\n";	# prints 10 10
+        $x = 9; $y = $x;
+        print $x->binc(1), " ", $y,"\n";        # prints 10 10
 
-	$x = 9; $y = $x;
-	print $x->bmul(2), " ", $y,"\n";	# prints 18 18
+        $x = 9; $y = $x;
+        print $x->bmul(2), " ", $y,"\n";        # prints 18 18
 
 Using methods that do not modify, but test that the contents works:
 
-	$x = 9; $y = $x;
-	$z = 9 if $x->is_zero();		# works fine
+        $x = 9; $y = $x;
+        $z = 9 if $x->is_zero();                # works fine
 
 See the documentation about the copy constructor and C<=> in overload, as
 well as the documentation in BigInt for further details.
@@ -546,21 +623,21 @@ handle bareword C<NaN> properly.
 
 =item e
 
-	# perl -Mbigint=e -wle 'print e'
+        # perl -Mbigint=e -wle 'print e'
 
 Returns Euler's number C<e>, aka exp(1). Note that under bigint, this is
 truncated to an integer, and hence simple '2'.
 
 =item PI
 
-	# perl -Mbigint=PI -wle 'print PI'
+        # perl -Mbigint=PI -wle 'print PI'
 
 Returns PI. Note that under bigint, this is truncated to an integer, and hence
 simple '3'.
 
 =item bexp()
 
-	bexp($power,$accuracy);
+        bexp($power,$accuracy);
 
 Returns Euler's number C<e> raised to the appropriate power, to
 the wanted accuracy.
@@ -569,18 +646,18 @@ Note that under bigint, the result is truncated to an integer.
 
 Example:
 
-	# perl -Mbigint=bexp -wle 'print bexp(1,80)'
+        # perl -Mbigint=bexp -wle 'print bexp(1,80)'
 
 =item bpi()
 
-	bpi($accuracy);
+        bpi($accuracy);
 
 Returns PI to the wanted accuracy. Note that under bigint, this is truncated
 to an integer, and hence simple '3'.
 
 Example:
 
-	# perl -Mbigint=bpi -wle 'print bpi(80)'
+        # perl -Mbigint=bpi -wle 'print bpi(80)'
 
 =item upgrade()
 
@@ -589,13 +666,13 @@ C<$Math::BigInt::upgrade>.
 
 =item in_effect()
 
-	use bigint;
+        use bigint;
 
-	print "in effect\n" if bigint::in_effect;	# true
-	{
-	  no bigint;
-	  print "in effect\n" if bigint::in_effect;	# false
-	}
+        print "in effect\n" if bigint::in_effect;       # true
+        {
+          no bigint;
+          print "in effect\n" if bigint::in_effect;     # false
+        }
 
 Returns true or false if C<bigint> is in effect in the current scope.
 
@@ -633,14 +710,13 @@ C<Math::BigInt> objects, use a literal number in the expression:
 Perl does not allow overloading of ranges, so you can neither safely use
 ranges with bigint endpoints, nor is the iterator variable a bigint.
 
-	use 5.010;
-	for my $i (12..13) {
-	  for my $j (20..21) {
-	    say $i ** $j;  # produces a floating-point number,
-	                   # not a big integer
-	  }
-	}
-
+        use 5.010;
+        for my $i (12..13) {
+          for my $j (20..21) {
+            say $i ** $j;  # produces a floating-point number,
+                           # not a big integer
+          }
+        }
 
 =item in_effect()
 
@@ -654,22 +730,22 @@ will not happen unless you specifically ask for it with the two
 import tags "hex" and "oct" - and then it will be global and cannot be
 disabled inside a scope with "no bigint":
 
-	use bigint qw/hex oct/;
+        use bigint qw/hex oct/;
 
-	print hex("0x1234567890123456");
-	{
-		no bigint;
-		print hex("0x1234567890123456");
-	}
+        print hex("0x1234567890123456");
+        {
+                no bigint;
+                print hex("0x1234567890123456");
+        }
 
 The second call to hex() will warn about a non-portable constant.
 
 Compare this to:
 
-	use bigint;
+        use bigint;
 
-	# will warn only under Perl older than v5.9.4
-	print hex("0x1234567890123456");
+        # will warn only under Perl older than v5.9.4
+        print hex("0x1234567890123456");
 
 =back
 
@@ -681,23 +757,23 @@ the others to do the work.
 
 The following modules are currently used by bigint:
 
-	Math::BigInt::Lite	(for speed, and only if it is loadable)
-	Math::BigInt
+        Math::BigInt::Lite      (for speed, and only if it is loadable)
+        Math::BigInt
 
 =head1 EXAMPLES
 
 Some cool command line examples to impress the Python crowd ;) You might want
 to compare them to the results under -Mbignum or -Mbigrat:
 
-	perl -Mbigint -le 'print sqrt(33)'
-	perl -Mbigint -le 'print 2*255'
-	perl -Mbigint -le 'print 4.5+2*255'
-	perl -Mbigint -le 'print 3/7 + 5/7 + 8/3'
-	perl -Mbigint -le 'print 123->is_odd()'
-	perl -Mbigint -le 'print log(2)'
-	perl -Mbigint -le 'print 2 ** 0.5'
-	perl -Mbigint=a,65 -le 'print 2 ** 0.2'
-	perl -Mbignum=a,65,l,GMP -le 'print 7 ** 7777'
+        perl -Mbigint -le 'print sqrt(33)'
+        perl -Mbigint -le 'print 2*255'
+        perl -Mbigint -le 'print 4.5+2*255'
+        perl -Mbigint -le 'print 3/7 + 5/7 + 8/3'
+        perl -Mbigint -le 'print 123->is_odd()'
+        perl -Mbigint -le 'print log(2)'
+        perl -Mbigint -le 'print 2 ** 0.5'
+        perl -Mbigint=a,65 -le 'print 2 ** 0.2'
+        perl -Mbignum=a,65,l,GMP -le 'print 7 ** 7777'
 
 =head1 LICENSE
 
diff --git a/Master/tlpkg/tlperl/lib/bignum.pm b/Master/tlpkg/tlperl/lib/bignum.pm
index 67b9ede8351..394b1473554 100644
--- a/Master/tlpkg/tlperl/lib/bignum.pm
+++ b/Master/tlpkg/tlperl/lib/bignum.pm
@@ -1,220 +1,229 @@
 package bignum;
+
 use 5.006;
+use strict;
+use warnings;
+
+our $VERSION = '0.42_01';
 
-$VERSION = '0.39';
 use Exporter;
-@ISA 		= qw( bigint );
-@EXPORT_OK	= qw( PI e bexp bpi hex oct ); 
-@EXPORT 	= qw( inf NaN ); 
+our @ISA            = qw( bigint );
+our @EXPORT_OK      = qw( PI e bpi bexp hex oct );
+our @EXPORT         = qw( inf NaN );
 
-use strict;
 use overload;
 use bigint ();
 
-############################################################################## 
+##############################################################################
 
-BEGIN 
-  {
-  *inf = \&bigint::inf;
-  *NaN = \&bigint::NaN;
-  *hex = \&bigint::hex;
-  *oct = \&bigint::oct;
-  }
+BEGIN {
+    *inf = \&bigint::inf;
+    *NaN = \&bigint::NaN;
+    *hex = \&bigint::hex;
+    *oct = \&bigint::oct;
+}
 
 # These are all alike, and thus faked by AUTOLOAD
 
 my @faked = qw/round_mode accuracy precision div_scale/;
-use vars qw/$VERSION $AUTOLOAD $_lite/;		# _lite for testsuite
-
-sub AUTOLOAD
-  {
-  my $name = $AUTOLOAD;
-
-  $name =~ s/.*:://;    # split package
-  no strict 'refs';
-  foreach my $n (@faked)
-    {
-    if ($n eq $name)
-      {
-      *{"bignum::$name"} = sub 
-        {
-        my $self = shift;
-        no strict 'refs';
-        if (defined $_[0])
-          {
-          Math::BigInt->$name($_[0]);
-          return Math::BigFloat->$name($_[0]);
-          }
-        return Math::BigInt->$name();
-        };
-      return &$name;
-      }
+our ($AUTOLOAD, $_lite);        # _lite for testsuite
+
+sub AUTOLOAD {
+    my $name = $AUTOLOAD;
+
+    $name =~ s/.*:://;          # split package
+    no strict 'refs';
+    foreach my $n (@faked) {
+        if ($n eq $name) {
+            *{"bignum::$name"} =
+              sub {
+                  my $self = shift;
+                  no strict 'refs';
+                  if (defined $_[0]) {
+                      Math::BigInt->$name($_[0]);
+                      return Math::BigFloat->$name($_[0]);
+                  }
+                  return Math::BigInt->$name();
+              };
+            return &$name;
+        }
     }
- 
-  # delayed load of Carp and avoid recursion
-  require Carp;
-  Carp::croak ("Can't call bignum\-\>$name, not a valid method");
-  }
 
-sub unimport
-  {
-  $^H{bignum} = undef;					# no longer in effect
-  overload::remove_constant('binary','','float','','integer');
-  }
+    # delayed load of Carp and avoid recursion
+    require Carp;
+    Carp::croak ("Can't call bignum\-\>$name, not a valid method");
+}
 
-sub in_effect
-  {
-  my $level = shift || 0;
-  my $hinthash = (caller($level))[10];
-  $hinthash->{bignum};
-  }
+sub unimport {
+    $^H{bignum} = undef;                                # no longer in effect
+    overload::remove_constant('binary', '', 'float', '', 'integer');
+}
+
+sub in_effect {
+    my $level = shift || 0;
+    my $hinthash = (caller($level))[10];
+    $hinthash->{bignum};
+}
 
 #############################################################################
 
-sub import 
-  {
-  my $self = shift;
+sub import {
+    my $self = shift;
 
-  $^H{bignum} = 1;					# we are in effect
+    $^H{bignum} = 1;                                    # we are in effect
 
-  # for newer Perls override hex() and oct() with a lexical version:
-  if ($] > 5.009004)
-    {
-    bigint::_override();
+    # for newer Perls override hex() and oct() with a lexical version:
+    if ($] > 5.009004) {
+        bigint::_override();
     }
 
-  # some defaults
-  my $lib = ''; my $lib_kind = 'try';
-  my $upgrade = 'Math::BigFloat';
-  my $downgrade = 'Math::BigInt';
-
-  my @import = ( ':constant' );				# drive it w/ constant
-  my @a = @_; my $l = scalar @_; my $j = 0;
-  my ($ver,$trace);					# version? trace?
-  my ($a,$p);						# accuracy, precision
-  for ( my $i = 0; $i < $l ; $i++,$j++ )
-    {
-    if ($_[$i] eq 'upgrade')
-      {
-      # this causes upgrading
-      $upgrade = $_[$i+1];		# or undef to disable
-      my $s = 2; $s = 1 if @a-$j < 2;	# avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s; $i++;
-      }
-    elsif ($_[$i] eq 'downgrade')
-      {
-      # this causes downgrading
-      $downgrade = $_[$i+1];		# or undef to disable
-      my $s = 2; $s = 1 if @a-$j < 2;	# avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s; $i++;
-      }
-    elsif ($_[$i] =~ /^(l|lib|try|only)$/)
-      {
-      # this causes a different low lib to take care...
-      $lib_kind = $1; $lib_kind = 'lib' if $lib_kind eq 'l';
-      $lib = $_[$i+1] || '';
-      my $s = 2; $s = 1 if @a-$j < 2;	# avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s; $i++;
-      }
-    elsif ($_[$i] =~ /^(a|accuracy)$/)
-      {
-      $a = $_[$i+1];
-      my $s = 2; $s = 1 if @a-$j < 2;	# avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s; $i++;
-      }
-    elsif ($_[$i] =~ /^(p|precision)$/)
-      {
-      $p = $_[$i+1];
-      my $s = 2; $s = 1 if @a-$j < 2;	# avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s; $i++;
-      }
-    elsif ($_[$i] =~ /^(v|version)$/)
-      {
-      $ver = 1;
-      splice @a, $j, 1; $j --;
-      }
-    elsif ($_[$i] =~ /^(t|trace)$/)
-      {
-      $trace = 1;
-      splice @a, $j, 1; $j --;
-      }
-    elsif ($_[$i] !~ /^(PI|e|bexp|bpi|hex|oct)\z/)
-      {
-      die ("unknown option $_[$i]");
-      }
+    # some defaults
+    my $lib       = '';
+    my $lib_kind  = 'try';
+    my $upgrade   = 'Math::BigFloat';
+    my $downgrade = 'Math::BigInt';
+
+    my @import = (':constant');                 # drive it w/ constant
+    my @a = @_;
+    my $l = scalar @_;
+    my $j = 0;
+    my ($ver, $trace);                          # version? trace?
+    my ($a, $p);                                # accuracy, precision
+    for (my $i = 0; $i < $l; $i++, $j++) {
+        if ($_[$i] eq 'upgrade') {
+            # this causes upgrading
+            $upgrade = $_[$i + 1];              # or undef to disable
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+            $i++;
+        } elsif ($_[$i] eq 'downgrade') {
+            # this causes downgrading
+            $downgrade = $_[$i + 1];            # or undef to disable
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+            $i++;
+        } elsif ($_[$i] =~ /^(l|lib|try|only)$/) {
+            # this causes a different low lib to take care...
+            $lib_kind = $1;
+            $lib_kind = 'lib' if $lib_kind eq 'l';
+            $lib = $_[$i + 1] || '';
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+            $i++;
+        }
+        elsif ($_[$i] =~ /^(a|accuracy)$/) {
+            $a = $_[$i + 1];
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+            $i++;
+        }
+        elsif ($_[$i] =~ /^(p|precision)$/) {
+            $p = $_[$i + 1];
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+            $i++;
+        }
+        elsif ($_[$i] =~ /^(v|version)$/) {
+            $ver = 1;
+            splice @a, $j, 1;
+            $j--;
+        }
+        elsif ($_[$i] =~ /^(t|trace)$/) {
+            $trace = 1;
+            splice @a, $j, 1;
+            $j--;
+        }
+        elsif ($_[$i] !~ /^(PI|e|bexp|bpi|hex|oct)\z/) {
+            die ("unknown option $_[$i]");
+        }
     }
-  my $class;
-  $_lite = 0;					# using M::BI::L ?
-  if ($trace)
-    {
-    require Math::BigInt::Trace; $class = 'Math::BigInt::Trace';
-    $upgrade = 'Math::BigFloat::Trace';	
+    my $class;
+    $_lite = 0;                                 # using M::BI::L ?
+    if ($trace) {
+        require Math::BigInt::Trace;
+        $class   = 'Math::BigInt::Trace';
+        $upgrade = 'Math::BigFloat::Trace';
     }
-  else
-    {
-    # see if we can find Math::BigInt::Lite
-    if (!defined $a && !defined $p)		# rounding won't work to well
-      {
-      if (eval { require Math::BigInt::Lite; 1 })
-        {
-        @import = ( );				# :constant in Lite, not MBI
-        Math::BigInt::Lite->import( ':constant' );
-        $_lite= 1;				# signal okay
+    else {
+        # see if we can find Math::BigInt::Lite
+        if (!defined $a && !defined $p) {       # rounding won't work to well
+            local @INC = @INC;
+            pop @INC if $INC[-1] eq '.';
+            if (eval { require Math::BigInt::Lite; 1 }) {
+                @import = ();                   # :constant in Lite, not MBI
+                Math::BigInt::Lite->import(':constant');
+                $_lite = 1;                     # signal okay
+            }
         }
-      }
-    require Math::BigInt if $_lite == 0;	# not already loaded?
-    $class = 'Math::BigInt';			# regardless of MBIL or not
+        require Math::BigInt if $_lite == 0;    # not already loaded?
+        $class = 'Math::BigInt';                # regardless of MBIL or not
     }
-  push @import, $lib_kind => $lib if $lib ne ''; 
-  # Math::BigInt::Trace or plain Math::BigInt
-  $class->import(@import, upgrade => $upgrade);
-
-  if ($trace)
-    {
-    require Math::BigFloat::Trace; $class = 'Math::BigFloat::Trace';
-    $downgrade = 'Math::BigInt::Trace';	
+    push @import, $lib_kind => $lib if $lib ne '';
+    # Math::BigInt::Trace or plain Math::BigInt
+    $class->import(@import, upgrade => $upgrade);
+
+    if ($trace) {
+        require Math::BigFloat::Trace;
+        $class     = 'Math::BigFloat::Trace';
+        $downgrade = 'Math::BigInt::Trace';
     }
-  else
-    {
-    require Math::BigFloat; $class = 'Math::BigFloat';
+    else {
+        require Math::BigFloat;
+        $class = 'Math::BigFloat';
     }
-  $class->import(':constant','downgrade',$downgrade);
-
-  bignum->accuracy($a) if defined $a;
-  bignum->precision($p) if defined $p;
-  if ($ver)
-    {
-    print "bignum\t\t\t v$VERSION\n";
-    print "Math::BigInt::Lite\t v$Math::BigInt::Lite::VERSION\n" if $_lite;
-    print "Math::BigInt\t\t v$Math::BigInt::VERSION";
-    my $config = Math::BigInt->config();
-    print " lib => $config->{lib} v$config->{lib_version}\n";
-    print "Math::BigFloat\t\t v$Math::BigFloat::VERSION\n";
-    exit;
+    $class->import(':constant', 'downgrade', $downgrade);
+
+    bignum->accuracy($a)  if defined $a;
+    bignum->precision($p) if defined $p;
+    if ($ver) {
+        print "bignum\t\t\t v$VERSION\n";
+        print "Math::BigInt::Lite\t v$Math::BigInt::Lite::VERSION\n" if $_lite;
+        print "Math::BigInt\t\t v$Math::BigInt::VERSION";
+        my $config = Math::BigInt->config();
+        print " lib => $config->{lib} v$config->{lib_version}\n";
+        print "Math::BigFloat\t\t v$Math::BigFloat::VERSION\n";
+        exit;
     }
 
-  # Take care of octal/hexadecimal constants
-  overload::constant binary => sub { bigint::_binary_constant(shift) };
+    # Take care of octal/hexadecimal constants
+    overload::constant binary =>
+        sub {
+            bigint::_binary_constant(shift);
+        };
 
-  # if another big* was already loaded:
-  my ($package) = caller();
+    # if another big* was already loaded:
+    my ($package) = caller();
 
-  no strict 'refs';
-  if (!defined *{"${package}::inf"})
-    {
-    $self->export_to_level(1,$self,@a);           # export inf and NaN
+    no strict 'refs';
+    if (!defined *{"${package}::inf"}) {
+        $self->export_to_level(1, $self, @a);   # export inf and NaN
     }
-  }
+}
 
 sub PI () { Math::BigFloat->new('3.141592653589793238462643383279502884197'); }
 sub e () { Math::BigFloat->new('2.718281828459045235360287471352662497757'); }
-sub bpi ($) { Math::BigFloat::bpi(@_); }
-sub bexp ($$) { my $x = Math::BigFloat->new($_[0]); $x->bexp($_[1]); }
+sub bpi ($) { Math::BigFloat->bpi(@_); }
+sub bexp ($$) {
+    my $x = Math::BigFloat->new($_[0]);
+    $x->bexp($_[1]);
+}
 
 1;
 
 __END__
 
+=pod
+
 =head1 NAME
 
 bignum - Transparent BigNumber support for Perl
@@ -223,14 +232,14 @@ bignum - Transparent BigNumber support for Perl
 
   use bignum;
 
-  $x = 2 + 4.5,"\n";			# BigFloat 6.5
-  print 2 ** 512 * 0.1,"\n";		# really is what you think it is
-  print inf * inf,"\n";			# prints inf
-  print NaN * 3,"\n";			# prints NaN
+  $x = 2 + 4.5,"\n";                    # BigFloat 6.5
+  print 2 ** 512 * 0.1,"\n";            # really is what you think it is
+  print inf * inf,"\n";                 # prints inf
+  print NaN * 3,"\n";                   # prints NaN
 
   {
     no bignum;
-    print 2 ** 256,"\n";		# a normal Perl scalar now
+    print 2 ** 256,"\n";                # a normal Perl scalar now
   }
 
   # for older Perls, import into current package:
@@ -244,7 +253,7 @@ All operators (including basic math operations) are overloaded. Integer and
 floating-point constants are created as proper BigInts or BigFloats,
 respectively.
 
-If you do 
+If you do
 
         use bignum;
 
@@ -302,7 +311,7 @@ appropriately. This means that:
 
 will work correctly. These mixed cases don't do always work when using
 Math::BigInt or Math::BigFloat alone, or at least not in the way normal Perl
-scalars work. 
+scalars work.
 
 If you do want to work with large integers like under C<use integer;>, try
 C<use bigint;>:
@@ -350,7 +359,7 @@ The following options exist:
 This sets the accuracy for all math operations. The argument must be greater
 than or equal to zero. See Math::BigInt's bround() function for details.
 
-	perl -Mbignum=a,50 -le 'print sqrt(20)'
+        perl -Mbignum=a,50 -le 'print sqrt(20)'
 
 Note that setting precision and accuracy at the same time is not possible.
 
@@ -361,7 +370,7 @@ integer. Negative values mean a fixed number of digits after the dot, while
 a positive value rounds to this digit left from the dot. 0 or 1 mean round to
 integer. See Math::BigInt's bfround() function for details.
 
-	perl -Mbignum=p,-50 -le 'print sqrt(20)'
+        perl -Mbignum=p,-50 -le 'print sqrt(20)'
 
 Note that setting precision and accuracy at the same time is not possible.
 
@@ -374,12 +383,12 @@ Math::BigInt/Math::BigFloat.
 
 Load a different math lib, see L<Math Library>.
 
-	perl -Mbignum=l,GMP -e 'print 2 ** 512'
+        perl -Mbignum=l,GMP -e 'print 2 ** 512'
 
 Currently there is no way to specify more than one library on the command
 line. This means the following does not work:
 
-	perl -Mbignum=l,GMP,Pari -e 'print 2 ** 512'
+        perl -Mbignum=l,GMP,Pari -e 'print 2 ** 512'
 
 This will be hopefully fixed soon ;)
 
@@ -401,7 +410,7 @@ overridden in the current scope whenever the bigint pragma is active.
 
 This prints out the name and version of all modules used and then exits.
 
-	perl -Mbignum=v
+        perl -Mbignum=v
 
 =back
 
@@ -466,36 +475,36 @@ handle bareword C<NaN> properly.
 
 =item e
 
-	# perl -Mbignum=e -wle 'print e'
+        # perl -Mbignum=e -wle 'print e'
 
 Returns Euler's number C<e>, aka exp(1).
 
 =item PI()
 
-	# perl -Mbignum=PI -wle 'print PI'
+        # perl -Mbignum=PI -wle 'print PI'
 
 Returns PI.
 
 =item bexp()
 
-	bexp($power,$accuracy);
+        bexp($power,$accuracy);
 
 Returns Euler's number C<e> raised to the appropriate power, to
 the wanted accuracy.
 
 Example:
 
-	# perl -Mbignum=bexp -wle 'print bexp(1,80)'
+        # perl -Mbignum=bexp -wle 'print bexp(1,80)'
 
 =item bpi()
 
-	bpi($accuracy);
+        bpi($accuracy);
 
 Returns PI to the wanted accuracy.
 
 Example:
 
-	# perl -Mbignum=bpi -wle 'print bpi(80)'
+        # perl -Mbignum=bpi -wle 'print bpi(80)'
 
 =item upgrade()
 
@@ -504,13 +513,13 @@ C<$Math::BigInt::upgrade>.
 
 =item in_effect()
 
-	use bignum;
+        use bignum;
 
-	print "in effect\n" if bignum::in_effect;	# true
-	{
-	  no bignum;
-	  print "in effect\n" if bignum::in_effect;	# false
-	}
+        print "in effect\n" if bignum::in_effect;       # true
+        {
+          no bignum;
+          print "in effect\n" if bignum::in_effect;     # false
+        }
 
 Returns true or false if C<bignum> is in effect in the current scope.
 
@@ -523,16 +532,16 @@ This method only works on Perl v5.9.4 or later.
 Math with the numbers is done (by default) by a module called
 Math::BigInt::Calc. This is equivalent to saying:
 
-	use bignum lib => 'Calc';
+        use bignum lib => 'Calc';
 
 You can change this by using:
 
-	use bignum lib => 'GMP';
+        use bignum lib => 'GMP';
 
 The following would first try to find Math::BigInt::Foo, then
 Math::BigInt::Bar, and when this also fails, revert to Math::BigInt::Calc:
 
-	use bignum lib => 'Foo,Math::BigInt::Bar';
+        use bignum lib => 'Foo,Math::BigInt::Bar';
 
 Please see respective module documentation for further details.
 
@@ -540,11 +549,11 @@ Using C<lib> warns if none of the specified libraries can be found and
 L<Math::BigInt> did fall back to one of the default libraries.
 To suppress this warning, use C<try> instead:
 
-	use bignum try => 'GMP';
+        use bignum try => 'GMP';
 
 If you want the code to die instead of falling back, use C<only> instead:
 
-	use bignum only => 'GMP';
+        use bignum only => 'GMP';
 
 =head2 INTERNAL FORMAT
 
@@ -607,22 +616,22 @@ will not happen unless you specifically ask for it with the two
 import tags "hex" and "oct" - and then it will be global and cannot be
 disabled inside a scope with "no bigint":
 
-	use bigint qw/hex oct/;
+        use bigint qw/hex oct/;
 
-	print hex("0x1234567890123456");
-	{
-		no bigint;
-		print hex("0x1234567890123456");
-	}
+        print hex("0x1234567890123456");
+        {
+                no bigint;
+                print hex("0x1234567890123456");
+        }
 
 The second call to hex() will warn about a non-portable constant.
 
 Compare this to:
 
-	use bigint;
+        use bigint;
 
-	# will warn only under older than v5.9.4
-	print hex("0x1234567890123456");
+        # will warn only under older than v5.9.4
+        print hex("0x1234567890123456");
 
 =back
 
@@ -634,24 +643,24 @@ the others to do the work.
 
 The following modules are currently used by bignum:
 
-	Math::BigInt::Lite	(for speed, and only if it is loadable)
-	Math::BigInt
-	Math::BigFloat
+        Math::BigInt::Lite      (for speed, and only if it is loadable)
+        Math::BigInt
+        Math::BigFloat
 
 =head1 EXAMPLES
 
 Some cool command line examples to impress the Python crowd ;)
 
-	perl -Mbignum -le 'print sqrt(33)'
-	perl -Mbignum -le 'print 2*255'
-	perl -Mbignum -le 'print 4.5+2*255'
-	perl -Mbignum -le 'print 3/7 + 5/7 + 8/3'
-	perl -Mbignum -le 'print 123->is_odd()'
-	perl -Mbignum -le 'print log(2)'
-	perl -Mbignum -le 'print exp(1)'
-	perl -Mbignum -le 'print 2 ** 0.5'
-	perl -Mbignum=a,65 -le 'print 2 ** 0.2'
-	perl -Mbignum=a,65,l,GMP -le 'print 7 ** 7777'
+        perl -Mbignum -le 'print sqrt(33)'
+        perl -Mbignum -le 'print 2*255'
+        perl -Mbignum -le 'print 4.5+2*255'
+        perl -Mbignum -le 'print 3/7 + 5/7 + 8/3'
+        perl -Mbignum -le 'print 123->is_odd()'
+        perl -Mbignum -le 'print log(2)'
+        perl -Mbignum -le 'print exp(1)'
+        perl -Mbignum -le 'print 2 ** 0.5'
+        perl -Mbignum=a,65 -le 'print 2 ** 0.2'
+        perl -Mbignum=a,65,l,GMP -le 'print 7 ** 7777'
 
 =head1 LICENSE
 
diff --git a/Master/tlpkg/tlperl/lib/bigrat.pm b/Master/tlpkg/tlperl/lib/bigrat.pm
index b02831bc4e1..260973b8427 100644
--- a/Master/tlpkg/tlperl/lib/bigrat.pm
+++ b/Master/tlpkg/tlperl/lib/bigrat.pm
@@ -1,214 +1,223 @@
 package bigrat;
+
 use 5.006;
+use strict;
+use warnings;
 
-$VERSION = '0.39';
-require Exporter;
-@ISA		= qw( bigint );
-@EXPORT_OK 	= qw( PI e bpi bexp hex oct );
-@EXPORT		= qw( inf NaN );
+our $VERSION = '0.42_01';
+
+use Exporter;
+our @ISA            = qw( bigint );
+our @EXPORT_OK      = qw( PI e bpi bexp hex oct );
+our @EXPORT         = qw( inf NaN );
 
-use strict;
 use overload;
 use bigint ();
 
-############################################################################## 
+##############################################################################
 
-BEGIN 
-  {
-  *inf = \&bigint::inf;
-  *NaN = \&bigint::NaN;
-  *hex = \&bigint::hex;
-  *oct = \&bigint::oct;
-  }
+BEGIN {
+    *inf = \&bigint::inf;
+    *NaN = \&bigint::NaN;
+    *hex = \&bigint::hex;
+    *oct = \&bigint::oct;
+}
 
 # These are all alike, and thus faked by AUTOLOAD
 
 my @faked = qw/round_mode accuracy precision div_scale/;
-use vars qw/$VERSION $AUTOLOAD $_lite/;		# _lite for testsuite
-
-sub AUTOLOAD
-  {
-  my $name = $AUTOLOAD;
-
-  $name =~ s/.*:://;    # split package
-  no strict 'refs';
-  foreach my $n (@faked)
-    {
-    if ($n eq $name)
-      {
-      *{"bigrat::$name"} = sub 
-        {
-        my $self = shift;
-        no strict 'refs';
-        if (defined $_[0])
-          {
-          Math::BigInt->$name($_[0]);
-          Math::BigFloat->$name($_[0]);
-          return Math::BigRat->$name($_[0]);
-          }
-        return Math::BigInt->$name();
-        };
-      return &$name;
-      }
+our ($AUTOLOAD, $_lite);        # _lite for testsuite
+
+sub AUTOLOAD {
+    my $name = $AUTOLOAD;
+
+    $name =~ s/.*:://;          # split package
+    no strict 'refs';
+    foreach my $n (@faked) {
+        if ($n eq $name) {
+            *{"bigrat::$name"} =
+              sub {
+                  my $self = shift;
+                  no strict 'refs';
+                  if (defined $_[0]) {
+                      Math::BigInt->$name($_[0]);
+                      Math::BigFloat->$name($_[0]);
+                      return Math::BigRat->$name($_[0]);
+                  }
+                  return Math::BigInt->$name();
+              };
+            return &$name;
+        }
     }
- 
-  # delayed load of Carp and avoid recursion
-  require Carp;
-  Carp::croak ("Can't call bigrat\-\>$name, not a valid method");
-  }
 
-sub unimport
-  {
-  $^H{bigrat} = undef;					# no longer in effect
-  overload::remove_constant('binary','','float','','integer');
-  }
+    # delayed load of Carp and avoid recursion
+    require Carp;
+    Carp::croak ("Can't call bigrat\-\>$name, not a valid method");
+}
 
-sub in_effect
-  {
-  my $level = shift || 0;
-  my $hinthash = (caller($level))[10];
-  $hinthash->{bigrat};
-  }
+sub unimport {
+    $^H{bigrat} = undef;        # no longer in effect
+    overload::remove_constant('binary', '', 'float', '', 'integer');
+}
+
+sub in_effect {
+    my $level = shift || 0;
+    my $hinthash = (caller($level))[10];
+    $hinthash->{bigrat};
+}
 
 #############################################################################
 
-sub import 
-  {
-  my $self = shift;
+sub import {
+    my $self = shift;
 
-  # see also bignum->import() for additional comments
+    # see also bignum->import() for additional comments
 
-  $^H{bigrat} = 1;					# we are in effect
+    $^H{bigrat} = 1;                            # we are in effect
 
-  # for newer Perls always override hex() and oct() with a lexical version:
-  if ($] > 5.009004)
-    {
-    bigint::_override();
+    # for newer Perls always override hex() and oct() with a lexical version:
+    if ($] > 5.009004) {
+        bigint::_override();
     }
-  # some defaults
-  my $lib = ''; my $lib_kind = 'try'; my $upgrade = 'Math::BigFloat';
-
-  my @import = ( ':constant' );				# drive it w/ constant
-  my @a = @_; my $l = scalar @_; my $j = 0;
-  my ($a,$p);
-  my ($ver,$trace);					# version? trace?
-  for ( my $i = 0; $i < $l ; $i++,$j++ )
-    {
-    if ($_[$i] eq 'upgrade')
-      {
-      # this causes upgrading
-      $upgrade = $_[$i+1];		# or undef to disable
-      my $s = 2; $s = 1 if @a-$j < 2;	# avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s;
-      }
-    elsif ($_[$i] =~ /^(l|lib|try|only)$/)
-      {
-      # this causes a different low lib to take care...
-      $lib_kind = $1; $lib_kind = 'lib' if $lib_kind eq 'l';
-      $lib = $_[$i+1] || '';
-      my $s = 2; $s = 1 if @a-$j < 2;	# avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s; $i++;
-      }
-    elsif ($_[$i] =~ /^(a|accuracy)$/)
-      {
-      $a = $_[$i+1];
-      my $s = 2; $s = 1 if @a-$j < 2;   # avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s; $i++;
-      }
-    elsif ($_[$i] =~ /^(p|precision)$/)
-      {
-      $p = $_[$i+1];
-      my $s = 2; $s = 1 if @a-$j < 2;   # avoid "can not modify non-existent..."
-      splice @a, $j, $s; $j -= $s; $i++;
-      }
-    elsif ($_[$i] =~ /^(v|version)$/)
-      {
-      $ver = 1;
-      splice @a, $j, 1; $j --;
-      }
-    elsif ($_[$i] =~ /^(t|trace)$/)
-      {
-      $trace = 1;
-      splice @a, $j, 1; $j --;
-      }
-    elsif ($_[$i] !~ /^(PI|e|bpi|bexp|hex|oct)\z/)
-      {
-      die ("unknown option $_[$i]");
-      }
+    # some defaults
+    my $lib      = '';
+    my $lib_kind = 'try';
+    my $upgrade  = 'Math::BigFloat';
+
+    my @import = (':constant');                 # drive it w/ constant
+    my @a = @_;
+    my $l = scalar @_;
+    my $j = 0;
+    my ($a, $p);
+    my ($ver, $trace);                          # version? trace?
+    for (my $i = 0; $i < $l ; $i++, $j++) {
+        if ($_[$i] eq 'upgrade') {
+            # this causes upgrading
+            $upgrade = $_[$i + 1];              # or undef to disable
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+        }
+        elsif ($_[$i] =~ /^(l|lib|try|only)$/) {
+            # this causes a different low lib to take care...
+            $lib_kind = $1;
+            $lib_kind = 'lib' if $lib_kind eq 'l';
+            $lib = $_[$i + 1] || '';
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+            $i++;
+        }
+        elsif ($_[$i] =~ /^(a|accuracy)$/) {
+            $a = $_[$i + 1];
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+            $i++;
+        }
+        elsif ($_[$i] =~ /^(p|precision)$/) {
+            $p = $_[$i + 1];
+            my $s = 2;
+            $s = 1 if @a - $j < 2;  # avoid "can not modify non-existent..."
+            splice @a, $j, $s;
+            $j -= $s;
+            $i++;
+        }
+        elsif ($_[$i] =~ /^(v|version)$/) {
+            $ver = 1;
+            splice @a, $j, 1;
+            $j--;
+        }
+        elsif ($_[$i] =~ /^(t|trace)$/) {
+            $trace = 1;
+            splice @a, $j, 1;
+            $j--;
+        }
+        elsif ($_[$i] !~ /^(PI|e|bpi|bexp|hex|oct)\z/) {
+            die ("unknown option $_[$i]");
+        }
     }
-  my $class;
-  $_lite = 0;                                   # using M::BI::L ?
-  if ($trace)
-    {
-    require Math::BigInt::Trace; $class = 'Math::BigInt::Trace';
-    $upgrade = 'Math::BigFloat::Trace';
+    my $class;
+    $_lite = 0;                                 # using M::BI::L ?
+    if ($trace) {
+        require Math::BigInt::Trace;
+        $class   = 'Math::BigInt::Trace';
+        $upgrade = 'Math::BigFloat::Trace';
     }
-  else
-    {
-    # see if we can find Math::BigInt::Lite
-    if (!defined $a && !defined $p)             # rounding won't work to well
-      {
-      if (eval { require Math::BigInt::Lite; 1 })
-        {
-        @import = ( );                          # :constant in Lite, not MBI
-        Math::BigInt::Lite->import( ':constant' );
-        $_lite= 1;                              # signal okay
+    else {
+        # see if we can find Math::BigInt::Lite
+        if (!defined $a && !defined $p) {       # rounding won't work to well
+            local @INC = @INC;
+            pop @INC if $INC[-1] eq '.';
+            if (eval { require Math::BigInt::Lite; 1 }) {
+                @import = ();                   # :constant in Lite, not MBI
+                Math::BigInt::Lite->import(':constant');
+                $_lite = 1;                     # signal okay
+            }
         }
-      }
-    require Math::BigInt if $_lite == 0;        # not already loaded?
-    $class = 'Math::BigInt';                    # regardless of MBIL or not
+        require Math::BigInt if $_lite == 0;    # not already loaded?
+        $class = 'Math::BigInt';                # regardless of MBIL or not
     }
-  push @import, $lib_kind => $lib if $lib ne ''; 
-  # Math::BigInt::Trace or plain Math::BigInt
-  $class->import(@import, upgrade => $upgrade);
-
-  require Math::BigFloat;
-  Math::BigFloat->import( upgrade => 'Math::BigRat', ':constant' );
-  require Math::BigRat;
-  Math::BigRat->import( @import );
-
-  bigrat->accuracy($a) if defined $a;
-  bigrat->precision($p) if defined $p;
-  if ($ver)
-    {
-    print "bigrat\t\t\t v$VERSION\n";
-    print "Math::BigInt::Lite\t v$Math::BigInt::Lite::VERSION\n" if $_lite;  
-    print "Math::BigInt\t\t v$Math::BigInt::VERSION";
-    my $config = Math::BigInt->config();
-    print " lib => $config->{lib} v$config->{lib_version}\n";
-    print "Math::BigFloat\t\t v$Math::BigFloat::VERSION\n";
-    print "Math::BigRat\t\t v$Math::BigRat::VERSION\n";
-    exit;
+    push @import, $lib_kind => $lib if $lib ne '';
+    # Math::BigInt::Trace or plain Math::BigInt
+    $class->import(@import, upgrade => $upgrade);
+
+    require Math::BigFloat;
+    Math::BigFloat->import(upgrade => 'Math::BigRat', ':constant');
+    require Math::BigRat;
+    Math::BigRat->import(@import);
+
+    bigrat->accuracy($a)  if defined $a;
+    bigrat->precision($p) if defined $p;
+    if ($ver) {
+        print "bigrat\t\t\t v$VERSION\n";
+        print "Math::BigInt::Lite\t v$Math::BigInt::Lite::VERSION\n" if $_lite;
+        print "Math::BigInt\t\t v$Math::BigInt::VERSION";
+        my $config = Math::BigInt->config();
+        print " lib => $config->{lib} v$config->{lib_version}\n";
+        print "Math::BigFloat\t\t v$Math::BigFloat::VERSION\n";
+        print "Math::BigRat\t\t v$Math::BigRat::VERSION\n";
+        exit;
     }
 
-  # Take care of octal/hexadecimal constants
-  overload::constant binary => sub { bigint::_binary_constant(shift) };
+    # Take care of octal/hexadecimal constants
+    overload::constant binary =>
+        sub {
+            bigint::_binary_constant(shift);
+          };
 
-  # if another big* was already loaded:
-  my ($package) = caller();
+    # if another big* was already loaded:
+    my ($package) = caller();
 
-  no strict 'refs';
-  if (!defined *{"${package}::inf"})
-    {
-    $self->export_to_level(1,$self,@a);           # export inf and NaN
+    no strict 'refs';
+    if (!defined *{"${package}::inf"}) {
+        $self->export_to_level(1, $self, @a);   # export inf and NaN
     }
-  }
+}
 
 sub PI () { Math::BigFloat->new('3.141592653589793238462643383279502884197'); }
-sub e () { Math::BigFloat->new('2.718281828459045235360287471352662497757'); }
+sub e  () { Math::BigFloat->new('2.718281828459045235360287471352662497757'); }
 
-sub bpi ($) { local $Math::BigFloat::upgrade; Math::BigFloat::bpi(@_); }
+sub bpi ($) {
+    local $Math::BigFloat::upgrade;
+    Math::BigFloat->bpi(@_);
+}
 
-sub bexp ($$)
-  {
-  local $Math::BigFloat::upgrade;
-  my $x = Math::BigFloat->new($_[0]); $x->bexp($_[1]);
-  }
+sub bexp ($$) {
+    local $Math::BigFloat::upgrade;
+    my $x = Math::BigFloat->new($_[0]);
+    $x->bexp($_[1]);
+}
 
 1;
 
 __END__
 
+=pod
+
 =head1 NAME
 
 bigrat - Transparent BigNumber/BigRational support for Perl
@@ -217,12 +226,12 @@ bigrat - Transparent BigNumber/BigRational support for Perl
 
   use bigrat;
 
-  print 2 + 4.5,"\n";			# BigFloat 6.5
-  print 1/3 + 1/4,"\n";			# produces 7/12
+  print 2 + 4.5,"\n";                   # BigFloat 6.5
+  print 1/3 + 1/4,"\n";                 # produces 7/12
 
   {
     no bigrat;
-    print 1/3,"\n";			# 0.33333...
+    print 1/3,"\n";                     # 0.33333...
   }
 
   # Import into current package:
@@ -257,7 +266,7 @@ The following modules are currently used by bignum:
 Math with the numbers is done (by default) by a module called
 Math::BigInt::Calc. This is equivalent to saying:
 
-	use bigrat lib => 'Calc';
+        use bigrat lib => 'Calc';
 
 You can change this by using:
 
@@ -266,7 +275,7 @@ You can change this by using:
 The following would first try to find Math::BigInt::Foo, then
 Math::BigInt::Bar, and when this also fails, revert to Math::BigInt::Calc:
 
-	use bigrat lib => 'Foo,Math::BigInt::Bar';
+        use bigrat lib => 'Foo,Math::BigInt::Bar';
 
 Using C<lib> warns if none of the specified libraries can be found and
 L<Math::BigInt> did fall back to one of the default libraries.
@@ -310,37 +319,36 @@ handle bareword C<NaN> properly.
 
 =item e
 
-	# perl -Mbigrat=e -wle 'print e'
+        # perl -Mbigrat=e -wle 'print e'
 
 Returns Euler's number C<e>, aka exp(1).
 
 =item PI
 
-	# perl -Mbigrat=PI -wle 'print PI'
+        # perl -Mbigrat=PI -wle 'print PI'
 
 Returns PI.
 
 =item bexp()
 
-	bexp($power,$accuracy);
-
+        bexp($power,$accuracy);
 
 Returns Euler's number C<e> raised to the appropriate power, to
 the wanted accuracy.
 
 Example:
 
-	# perl -Mbigrat=bexp -wle 'print bexp(1,80)'
+        # perl -Mbigrat=bexp -wle 'print bexp(1,80)'
 
 =item bpi()
 
-	bpi($accuracy);
+        bpi($accuracy);
 
 Returns PI to the wanted accuracy.
 
 Example:
 
-	# perl -Mbigrat=bpi -wle 'print bpi(80)'
+        # perl -Mbigrat=bpi -wle 'print bpi(80)'
 
 =item upgrade()
 
@@ -349,13 +357,13 @@ C<$Math::BigInt::upgrade>.
 
 =item in_effect()
 
-	use bigrat;
+        use bigrat;
 
-	print "in effect\n" if bigrat::in_effect;	# true
-	{
-	  no bigrat;
-	  print "in effect\n" if bigrat::in_effect;	# false
-	}
+        print "in effect\n" if bigrat::in_effect;       # true
+        {
+          no bigrat;
+          print "in effect\n" if bigrat::in_effect;     # false
+        }
 
 Returns true or false if C<bigrat> is in effect in the current scope.
 
@@ -377,7 +385,7 @@ only a shallow copy will be made.
 
 If you want to make a real copy, use the following:
 
-	$y = $x->copy();
+        $y = $x->copy();
 
 Using the copy or the original with overloaded math is okay, e.g. the
 following work:
@@ -418,7 +426,7 @@ The following options exist:
 This sets the accuracy for all math operations. The argument must be greater
 than or equal to zero. See Math::BigInt's bround() function for details.
 
-	perl -Mbigrat=a,50 -le 'print sqrt(20)'
+        perl -Mbigrat=a,50 -le 'print sqrt(20)'
 
 Note that setting precision and accuracy at the same time is not possible.
 
@@ -429,7 +437,7 @@ integer. Negative values mean a fixed number of digits after the dot, while
 a positive value rounds to this digit left from the dot. 0 or 1 mean round to
 integer. See Math::BigInt's bfround() function for details.
 
-	perl -Mbigrat=p,-50 -le 'print sqrt(20)'
+        perl -Mbigrat=p,-50 -le 'print sqrt(20)'
 
 Note that setting precision and accuracy at the same time is not possible.
 
@@ -442,12 +450,12 @@ Math::BigInt/Math::BigFloat.
 
 Load a different math lib, see L<MATH LIBRARY>.
 
-	perl -Mbigrat=l,GMP -e 'print 2 ** 512'
+        perl -Mbigrat=l,GMP -e 'print 2 ** 512'
 
 Currently there is no way to specify more than one library on the command
 line. This means the following does not work:
 
-	perl -Mbignum=l,GMP,Pari -e 'print 2 ** 512'
+        perl -Mbignum=l,GMP,Pari -e 'print 2 ** 512'
 
 This will be hopefully fixed soon ;)
 
@@ -469,7 +477,7 @@ overridden in the current scope whenever the bigrat pragma is active.
 
 This prints out the name and version of all modules used and then exits.
 
-	perl -Mbigrat=v
+        perl -Mbigrat=v
 
 =back
 
@@ -512,33 +520,33 @@ will not happen unless you specifically ask for it with the two
 import tags "hex" and "oct" - and then it will be global and cannot be
 disabled inside a scope with "no bigint":
 
-	use bigint qw/hex oct/;
+        use bigint qw/hex oct/;
 
-	print hex("0x1234567890123456");
-	{
-		no bigint;
-		print hex("0x1234567890123456");
-	}
+        print hex("0x1234567890123456");
+        {
+                no bigint;
+                print hex("0x1234567890123456");
+        }
 
 The second call to hex() will warn about a non-portable constant.
 
 Compare this to:
 
-	use bigint;
+        use bigint;
 
-	# will warn only under Perl older than v5.9.4
-	print hex("0x1234567890123456");
+        # will warn only under Perl older than v5.9.4
+        print hex("0x1234567890123456");
 
 =back
 
 =head1 EXAMPLES
 
-	perl -Mbigrat -le 'print sqrt(33)'
-	perl -Mbigrat -le 'print 2*255'
-	perl -Mbigrat -le 'print 4.5+2*255'
-	perl -Mbigrat -le 'print 3/7 + 5/7 + 8/3'
-	perl -Mbigrat -le 'print 12->is_odd()';
-	perl -Mbignum=l,GMP -le 'print 7 ** 7777'
+        perl -Mbigrat -le 'print sqrt(33)'
+        perl -Mbigrat -le 'print 2*255'
+        perl -Mbigrat -le 'print 4.5+2*255'
+        perl -Mbigrat -le 'print 3/7 + 5/7 + 8/3'
+        perl -Mbigrat -le 'print 12->is_odd()';
+        perl -Mbignum=l,GMP -le 'print 7 ** 7777'
 
 =head1 LICENSE
 
diff --git a/Master/tlpkg/tlperl/lib/bytes.pm b/Master/tlpkg/tlperl/lib/bytes.pm
index 6dad41ad9ff..f0022eeb51a 100644
--- a/Master/tlpkg/tlperl/lib/bytes.pm
+++ b/Master/tlpkg/tlperl/lib/bytes.pm
@@ -1,6 +1,6 @@
 package bytes;
 
-our $VERSION = '1.04';
+our $VERSION = '1.05';
 
 $bytes::hint_bits = 0x00000008;
 
@@ -31,19 +31,21 @@ __END__
 
 =head1 NAME
 
-bytes - Perl pragma to force byte semantics rather than character semantics
+bytes - Perl pragma to expose the individual bytes of characters
 
 =head1 NOTICE
 
-This pragma reflects early attempts to incorporate Unicode into perl and
-has since been superseded. It breaks encapsulation (i.e. it exposes the
-innards of how the perl executable currently happens to store a string),
-and use of this module for anything other than debugging purposes is
-strongly discouraged. If you feel that the functions here within might be
-useful for your application, this possibly indicates a mismatch between
-your mental model of Perl Unicode and the current reality. In that case,
-you may wish to read some of the perl Unicode documentation:
-L<perluniintro>, L<perlunitut>, L<perlunifaq> and L<perlunicode>.
+Because the bytes pragma breaks encapsulation (i.e. it exposes the innards of
+how the perl executable currently happens to store a string), the byte values
+that result are in an unspecified encoding.
+
+B<Use of this module for anything other than debugging purposes is
+strongly discouraged.>  If you feel that the functions here within
+might be useful for your application, this possibly indicates a
+mismatch between your mental model of Perl Unicode and the current
+reality. In that case, you may wish to read some of the perl Unicode
+documentation: L<perluniintro>, L<perlunitut>, L<perlunifaq> and
+L<perlunicode>.
 
 =head1 SYNOPSIS
 
@@ -59,42 +61,66 @@ L<perluniintro>, L<perlunitut>, L<perlunifaq> and L<perlunicode>.
 
 =head1 DESCRIPTION
 
-The C<use bytes> pragma disables character semantics for the rest of the
-lexical scope in which it appears.  C<no bytes> can be used to reverse
-the effect of C<use bytes> within the current lexical scope.
+Perl's characters are stored internally as sequences of one or more bytes.
+This pragma allows for the examination of the individual bytes that together
+comprise a character.
+
+Originally the pragma was designed for the loftier goal of helping incorporate
+Unicode into Perl, but the approach that used it was found to be defective,
+and the one remaining legitimate use is for debugging when you need to
+non-destructively examine characters' individual bytes.  Just insert this
+pragma temporarily, and remove it after the debugging is finished.
+
+The original usage can be accomplished by explicit (rather than this pragma's
+implict) encoding using the L<Encode> module:
+
+    use Encode qw/encode/;
+
+    my $utf8_byte_string   = encode "UTF8",   $string;
+    my $latin1_byte_string = encode "Latin1", $string;
 
-Perl normally assumes character semantics in the presence of character
-data (i.e. data that has come from a source that has been marked as
-being of a particular character encoding). When C<use bytes> is in
-effect, the encoding is temporarily ignored, and each string is treated
-as a series of bytes. 
+Or, if performance is needed and you are only interested in the UTF-8
+representation:
+
+    use utf8;
+
+    utf8::encode(my $utf8_byte_string = $string);
+
+C<no bytes> can be used to reverse the effect of C<use bytes> within the
+current lexical scope.
 
 As an example, when Perl sees C<$x = chr(400)>, it encodes the character
-in UTF-8 and stores it in $x. Then it is marked as character data, so,
+in UTF-8 and stores it in C<$x>. Then it is marked as character data, so,
 for instance, C<length $x> returns C<1>. However, in the scope of the
-C<bytes> pragma, $x is treated as a series of bytes - the bytes that make
+C<bytes> pragma, C<$x> is treated as a series of bytes - the bytes that make
 up the UTF8 encoding - and C<length $x> returns C<2>:
 
-    $x = chr(400);
-    print "Length is ", length $x, "\n";     # "Length is 1"
-    printf "Contents are %vd\n", $x;         # "Contents are 400"
-    { 
-        use bytes; # or "require bytes; bytes::length()"
-        print "Length is ", length $x, "\n"; # "Length is 2"
-        printf "Contents are %vd\n", $x;     # "Contents are 198.144"
-    }
+ $x = chr(400);
+ print "Length is ", length $x, "\n";     # "Length is 1"
+ printf "Contents are %vd\n", $x;         # "Contents are 400"
+ {
+     use bytes; # or "require bytes; bytes::length()"
+     print "Length is ", length $x, "\n"; # "Length is 2"
+     printf "Contents are %vd\n", $x;     # "Contents are 198.144 (on
+                                          # ASCII platforms)"
+ }
+
+C<chr()>, C<ord()>, C<substr()>, C<index()> and C<rindex()> behave similarly.
+
+For more on the implications, see L<perluniintro> and L<perlunicode>.
 
-chr(), ord(), substr(), index() and rindex() behave similarly.
+C<bytes::length()> is admittedly handy if you need to know the
+B<byte length> of a Perl scalar.  But a more modern way is:
 
-For more on the implications and differences between character
-semantics and byte semantics, see L<perluniintro> and L<perlunicode>.
+   use Encode 'encode';
+   length(encode('UTF-8', $scalar))
 
 =head1 LIMITATIONS
 
-bytes::substr() does not work as an lvalue().
+C<bytes::substr()> does not work as an I<lvalue()>.
 
 =head1 SEE ALSO
 
-L<perluniintro>, L<perlunicode>, L<utf8>
+L<perluniintro>, L<perlunicode>, L<utf8>, L<Encode>
 
 =cut
diff --git a/Master/tlpkg/tlperl/lib/encoding.pm b/Master/tlpkg/tlperl/lib/encoding.pm
index fde410dc890..8450f9ca127 100644
--- a/Master/tlpkg/tlperl/lib/encoding.pm
+++ b/Master/tlpkg/tlperl/lib/encoding.pm
@@ -1,25 +1,16 @@
-# $Id: encoding.pm,v 2.14 2015/03/14 02:44:39 dankogai Exp dankogai $
+# $Id: encoding.pm,v 2.17 2015/09/15 13:53:27 dankogai Exp dankogai $
 package encoding;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.14 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.17 $ =~ /(\d+)/g;
 
 use Encode;
 use strict;
 use warnings;
 
-use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
-
-BEGIN {
-    if ( ord("A") == 193 ) {
-        require Carp;
-        Carp::croak("encoding: pragma does not support EBCDIC platforms");
-    }
-}
-
-our $HAS_PERLIO = 0;
-eval { require PerlIO::encoding };
-unless ($@) {
-    $HAS_PERLIO = ( PerlIO::encoding->VERSION >= 0.02 );
-}
+use constant {
+    DEBUG => !!$ENV{PERL_ENCODE_DEBUG},
+    HAS_PERLIO => eval { require PerlIO::encoding; PerlIO::encoding->VERSION(0.02) },
+    PERL_5_21_7 => $^V && $^V ge v5.21.7,
+};
 
 sub _exception {
     my $name = shift;
@@ -39,69 +30,90 @@ sub in_locale { $^H & ( $locale::hint_bits || 0 ) }
 sub _get_locale_encoding {
     my $locale_encoding;
 
+    if ($^O eq 'MSWin32') {
+        my @tries = (
+            # First try to get the OutputCP. This will work only if we
+            # are attached to a console
+            'Win32.pm' => 'Win32::GetConsoleOutputCP',
+            'Win32/Console.pm' => 'Win32::Console::OutputCP',
+            # If above failed, this means that we are a GUI app
+            # Let's assume that the ANSI codepage is what matters
+            'Win32.pm' => 'Win32::GetACP',
+        );
+        while (@tries) {
+            my $cp = eval {
+                require $tries[0];
+                no strict 'refs';
+                &{$tries[1]}()
+            };
+            if ($cp) {
+                if ($cp == 65001) { # Code page for UTF-8
+                    $locale_encoding = 'UTF-8';
+                } else {
+                    $locale_encoding = 'cp' . $cp;
+                }
+                return $locale_encoding;
+            }
+            splice(@tries, 0, 2)
+        }
+    }
+
     # I18N::Langinfo isn't available everywhere
-    eval {
+    $locale_encoding = eval {
         require I18N::Langinfo;
-        I18N::Langinfo->import(qw(langinfo CODESET));
-        $locale_encoding = langinfo( CODESET() );
+        find_encoding(
+            I18N::Langinfo::langinfo( I18N::Langinfo::CODESET() )
+        )->name
     };
+    return $locale_encoding if defined $locale_encoding;
 
-    my $country_language;
-
-    no warnings 'uninitialized';
-
-    if ( (not $locale_encoding) && in_locale() ) {
-        if ( $ENV{LC_ALL} =~ /^([^.]+)\.([^.@]+)(@.*)?$/ ) {
-            ( $country_language, $locale_encoding ) = ( $1, $2 );
-        }
-        elsif ( $ENV{LANG} =~ /^([^.]+)\.([^.@]+)(@.*)?$/ ) {
+    eval {
+        require POSIX;
+        # Get the current locale
+        # Remember that MSVCRT impl is quite different from Unixes
+        my $locale = POSIX::setlocale(POSIX::LC_CTYPE());
+        if ( $locale =~ /^([^.]+)\.([^.@]+)(?:@.*)?$/ ) {
+            my $country_language;
             ( $country_language, $locale_encoding ) = ( $1, $2 );
-        }
-
-        # LANGUAGE affects only LC_MESSAGES only on glibc
-    }
-    elsif ( not $locale_encoding ) {
-        if (   $ENV{LC_ALL} =~ /\butf-?8\b/i
-            || $ENV{LANG} =~ /\butf-?8\b/i )
-        {
-            $locale_encoding = 'utf8';
-        }
 
-        # Could do more heuristics based on the country and language
-        # parts of LC_ALL and LANG (the parts before the dot (if any)),
-        # since we have Locale::Country and Locale::Language available.
-        # TODO: get a database of Language -> Encoding mappings
-        # (the Estonian database at http://www.eki.ee/letter/
-        # would be excellent!) --jhi
-    }
-    if (   defined $locale_encoding
-        && lc($locale_encoding) eq 'euc'
-        && defined $country_language )
-    {
-        if ( $country_language =~ /^ja_JP|japan(?:ese)?$/i ) {
-            $locale_encoding = 'euc-jp';
-        }
-        elsif ( $country_language =~ /^ko_KR|korean?$/i ) {
-            $locale_encoding = 'euc-kr';
-        }
-        elsif ( $country_language =~ /^zh_CN|chin(?:a|ese)$/i ) {
-            $locale_encoding = 'euc-cn';
-        }
-        elsif ( $country_language =~ /^zh_TW|taiwan(?:ese)?$/i ) {
-            $locale_encoding = 'euc-tw';
-        }
-        else {
-            require Carp;
-            Carp::croak(
-                "encoding: Locale encoding '$locale_encoding' too ambiguous"
-            );
+            # Could do more heuristics based on the country and language
+            # since we have Locale::Country and Locale::Language available.
+            # TODO: get a database of Language -> Encoding mappings
+            # (the Estonian database at http://www.eki.ee/letter/
+            # would be excellent!) --jhi
+            if (lc($locale_encoding) eq 'euc') {
+                if ( $country_language =~ /^ja_JP|japan(?:ese)?$/i ) {
+                    $locale_encoding = 'euc-jp';
+                }
+                elsif ( $country_language =~ /^ko_KR|korean?$/i ) {
+                    $locale_encoding = 'euc-kr';
+                }
+                elsif ( $country_language =~ /^zh_CN|chin(?:a|ese)$/i ) {
+                    $locale_encoding = 'euc-cn';
+                }
+                elsif ( $country_language =~ /^zh_TW|taiwan(?:ese)?$/i ) {
+                    $locale_encoding = 'euc-tw';
+                }
+                else {
+                    require Carp;
+                    Carp::croak(
+                        "encoding: Locale encoding '$locale_encoding' too ambiguous"
+                    );
+                }
+            }
         }
-    }
+    };
 
     return $locale_encoding;
 }
 
 sub import {
+
+    if ( ord("A") == 193 ) {
+        require Carp;
+        Carp::croak("encoding: pragma does not support EBCDIC platforms");
+    }
+
     if ($] >= 5.017) {
 	warnings::warnif("deprecated",
 			 "Use of the encoding pragma is deprecated")
@@ -132,7 +144,7 @@ sub import {
     unless ( $arg{Filter} ) {
         DEBUG and warn "_exception($name) = ", _exception($name);
         if (! _exception($name)) {
-            if (!$^V || $^V lt v5.21.7) {
+            if (!PERL_5_21_7) {
                 ${^ENCODING} = $enc;
             }
             else {
@@ -143,11 +155,11 @@ sub import {
                 ${^E_NCODING} = $enc;
             }
         }
-        $HAS_PERLIO or return 1;
+        HAS_PERLIO or return 1;
     }
     else {
         defined( ${^ENCODING} ) and undef ${^ENCODING};
-        undef ${^E_NCODING} if $^V && $^V ge v5.21.7;
+        undef ${^E_NCODING} if PERL_5_21_7;
 
         # implicitly 'use utf8'
         require utf8;      # to fetch $utf8::hint_bits;
@@ -197,8 +209,8 @@ sub import {
 sub unimport {
     no warnings;
     undef ${^ENCODING};
-    undef ${^E_NCODING} if $^V && $^V ge v5.21.7;
-    if ($HAS_PERLIO) {
+    undef ${^E_NCODING} if PERL_5_21_7;
+    if (HAS_PERLIO) {
         binmode( STDIN,  ":raw" );
         binmode( STDOUT, ":raw" );
     }
diff --git a/Master/tlpkg/tlperl/lib/encoding/warnings.pm b/Master/tlpkg/tlperl/lib/encoding/warnings.pm
index 5e6aec0c8fe..d5c41841309 100644
--- a/Master/tlpkg/tlperl/lib/encoding/warnings.pm
+++ b/Master/tlpkg/tlperl/lib/encoding/warnings.pm
@@ -1,5 +1,5 @@
 package encoding::warnings;
-$encoding::warnings::VERSION = '0.11';
+$encoding::warnings::VERSION = '0.12';
 
 use strict;
 use 5.007;
@@ -170,7 +170,9 @@ sub import {
 	], $class,
     );
 
+    no warnings 'deprecated';
     ${^ENCODING} = $decoder;
+    use warnings 'deprecated';
     $^H{$class} = 1;
 }
 
diff --git a/Master/tlpkg/tlperl/lib/experimental.pm b/Master/tlpkg/tlperl/lib/experimental.pm
index befa409be77..8d747518d19 100644
--- a/Master/tlpkg/tlperl/lib/experimental.pm
+++ b/Master/tlpkg/tlperl/lib/experimental.pm
@@ -1,5 +1,5 @@
 package experimental;
-$experimental::VERSION = '0.013';
+$experimental::VERSION = '0.016';
 use strict;
 use warnings;
 use version ();
@@ -20,6 +20,7 @@ my %features = map { $_ => 1 } $] > 5.015006 ? keys %feature::feature : do {
 my %min_version = (
 	array_base      => '5',
 	autoderef       => '5.14.0',
+	bitwise         => '5.22.0',
 	current_sub     => '5.16.0',
 	evalbytes       => '5.16.0',
 	fc              => '5.16.0',
@@ -27,7 +28,7 @@ my %min_version = (
 	lexical_subs    => '5.18.0',
 	postderef       => '5.20.0',
 	postderef_qq    => '5.20.0',
-	refaliasing     => '5.21.5',
+	refaliasing     => '5.22.0',
 	regex_sets      => '5.18.0',
 	say             => '5.10.0',
 	smartmatch      => '5.10.0',
@@ -37,7 +38,12 @@ my %min_version = (
 	unicode_eval    => '5.16.0',
 	unicode_strings => '5.12.0',
 );
+my %max_version = (
+	lexical_topic   => '5.23.4',
+);
+
 $_ = version->new($_) for values %min_version;
+$_ = version->new($_) for values %max_version;
 
 my %additional = (
 	postderef  => ['postderef_qq'],
@@ -58,7 +64,7 @@ sub _enable {
 	elsif (not exists $min_version{$pragma}) {
 		croak "Can't enable unknown feature $pragma";
 	}
-	elsif ($min_version{$pragma} > $]) {
+	elsif ($] < $min_version{$pragma}) {
 		my $stable = $min_version{$pragma};
 		if ($stable->{version}[1] % 2) {
 			$stable = version->new(
@@ -67,6 +73,9 @@ sub _enable {
 		}
 		croak "Need perl $stable or later for feature $pragma";
 	}
+	elsif ($] >= ($max_version{$pragma} || 7)) {
+		croak "Experimental feature $pragma has been removed from perl in version $max_version{$pragma}";
+	}
 }
 
 sub import {
@@ -119,7 +128,7 @@ experimental - Experimental features made easy
 
 =head1 VERSION
 
-version 0.013
+version 0.016
 
 =head1 SYNOPSIS
 
diff --git a/Master/tlpkg/tlperl/lib/feature.pm b/Master/tlpkg/tlperl/lib/feature.pm
index 70d8ada2b4b..ec9fff7a6d4 100644
--- a/Master/tlpkg/tlperl/lib/feature.pm
+++ b/Master/tlpkg/tlperl/lib/feature.pm
@@ -5,7 +5,7 @@
 
 package feature;
 
-our $VERSION = '1.40';
+our $VERSION = '1.42';
 
 our %feature = (
     fc              => 'feature_fc',
@@ -29,6 +29,7 @@ our %feature_bundle = (
     "5.10"    => [qw(array_base say state switch)],
     "5.11"    => [qw(array_base say state switch unicode_strings)],
     "5.15"    => [qw(current_sub evalbytes fc say state switch unicode_eval unicode_strings)],
+    "5.23"    => [qw(current_sub evalbytes fc postderef_qq say state switch unicode_eval unicode_strings)],
     "all"     => [qw(array_base bitwise current_sub evalbytes fc lexical_subs postderef postderef_qq refaliasing say signatures state switch unicode_eval unicode_strings)],
     "default" => [qw(array_base)],
 );
@@ -43,11 +44,12 @@ $feature_bundle{"5.19"} = $feature_bundle{"5.15"};
 $feature_bundle{"5.20"} = $feature_bundle{"5.15"};
 $feature_bundle{"5.21"} = $feature_bundle{"5.15"};
 $feature_bundle{"5.22"} = $feature_bundle{"5.15"};
+$feature_bundle{"5.24"} = $feature_bundle{"5.23"};
 $feature_bundle{"5.9.5"} = $feature_bundle{"5.10"};
 
 our $hint_shift   = 26;
 our $hint_mask    = 0x1c000000;
-our @hint_bundles = qw( default 5.10 5.11 5.15 );
+our @hint_bundles = qw( default 5.10 5.11 5.15 5.23 );
 
 # This gets set (for now) in $^H as well as in %^H,
 # for runtime speed of the uc/lc/ucfirst/lcfirst functions.
@@ -258,24 +260,30 @@ This feature is available from Perl 5.18 onwards.
 
 =head2 The 'postderef' and 'postderef_qq' features
 
-B<WARNING>: This feature is still experimental and the implementation may
-change in future versions of Perl.  For this reason, Perl will
-warn when you use the feature, unless you have explicitly disabled the
-warning:
+The 'postderef_qq' feature extends the applicability of L<postfix
+dereference syntax|perlref/Postfix Dereference Syntax> so that postfix array
+and scalar dereference are available in double-quotish interpolations. For
+example, it makes the following two statements equivalent:
 
-  no warnings "experimental::postderef";
+  my $s = "[@{ $h->{a} }]";
+  my $s = "[$h->{a}->@*]";
 
-The 'postderef' feature allows the use of L<postfix dereference
-syntax|perlref/Postfix Dereference Syntax>.  For example, it will make the
-following two statements equivalent:
+This feature is available from Perl 5.20 onwards. In Perl 5.20 and 5.22, it
+was classed as experimental, and Perl emitted a warning for its
+usage, except when explicitly disabled:
 
-  my @x = @{ $h->{a} };
-  my @x = $h->{a}->@*;
+  no warnings "experimental::postderef";
 
-The 'postderef_qq' feature extends this, for array and scalar dereference, to
-working inside of double-quotish interpolations.
+As of Perl 5.24, use of this feature no longer triggers a warning, though
+the C<experimental::postderef> warning category still exists (for
+compatibility with code that disables it).
 
-This feature is available from Perl 5.20 onwards.
+The 'postderef' feature was used in Perl 5.20 and Perl 5.22 to enable
+postfix dereference syntax outside double-quotish interpolations. In those
+versions, using it triggered the C<experimental::postderef> warning in the
+same way as the 'postderef_qq' feature did. As of Perl 5.24, this syntax is
+not only no longer experimental, but it is enabled for all Perl code,
+regardless of what feature declarations are in scope.
 
 =head2 The 'signatures' feature
 
@@ -370,6 +378,10 @@ The following feature bundles are available:
   :5.22     say state switch unicode_strings
             unicode_eval evalbytes current_sub fc
 
+  :5.24     say state switch unicode_strings
+            unicode_eval evalbytes current_sub fc
+            postderef_qq
+
 The C<:default> bundle represents the feature set that is enabled before
 any C<use feature> or C<no feature> declaration.
 
@@ -424,7 +436,7 @@ bundle is automatically loaded instead.
 =cut
 
 sub import {
-    my $class = shift;
+    shift;
 
     if (!@_) {
         croak("No features specified");
@@ -434,7 +446,7 @@ sub import {
 }
 
 sub unimport {
-    my $class = shift;
+    shift;
 
     # A bare C<no feature> should reset to the default bundle
     if (!@_) {
diff --git a/Master/tlpkg/tlperl/lib/fields.pm b/Master/tlpkg/tlperl/lib/fields.pm
index ad1a5cfa412..c40978bd90e 100644
--- a/Master/tlpkg/tlperl/lib/fields.pm
+++ b/Master/tlpkg/tlperl/lib/fields.pm
@@ -1,3 +1,4 @@
+use 5.008;
 package fields;
 
 require 5.005;
@@ -11,7 +12,8 @@ unless( eval q{require warnings::register; warnings::register->import; 1} ) {
 }
 use vars qw(%attr $VERSION);
 
-$VERSION = '2.17';
+$VERSION = '2.23';
+$VERSION =~ tr/_//d;
 
 # constant.pm is slow
 sub PUBLIC     () { 2**0  }
diff --git a/Master/tlpkg/tlperl/lib/if.pm b/Master/tlpkg/tlperl/lib/if.pm
index b118302714d..1985df4db18 100644
--- a/Master/tlpkg/tlperl/lib/if.pm
+++ b/Master/tlpkg/tlperl/lib/if.pm
@@ -1,11 +1,13 @@
 package if;
 
-$VERSION = '0.0604';
+$VERSION = '0.0606';
 
 sub work {
   my $method = shift() ? 'import' : 'unimport';
-  die "Too few arguments to 'use if' (some code returning an empty list in list context?)"
-    unless @_ >= 2;
+  unless (@_ >= 2) {
+    my $type = ($method eq 'import') ? 'use' : 'no';
+    die "Too few arguments to '$type if' (some code returning an empty list in list context?)"
+  }
   return unless shift;		# CONDITION
 
   my $p = $_[0];		# PACKAGE
@@ -101,5 +103,11 @@ based on what version of Perl is running.
 
 Ilya Zakharevich L<mailto:ilyaz@cpan.org>.
 
-=cut
+=head1 COPYRIGHT AND LICENCE
+
+This software is copyright (c) 2002 by Ilya Zakharevich.
 
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
diff --git a/Master/tlpkg/tlperl/lib/locale.pm b/Master/tlpkg/tlperl/lib/locale.pm
index 9cc243f86c6..02e4bb24347 100644
--- a/Master/tlpkg/tlperl/lib/locale.pm
+++ b/Master/tlpkg/tlperl/lib/locale.pm
@@ -1,6 +1,6 @@
 package locale;
 
-our $VERSION = '1.06';
+our $VERSION = '1.09';
 use Config;
 
 $Carp::Internal{ (__PACKAGE__) } = 1;
@@ -9,6 +9,17 @@ $Carp::Internal{ (__PACKAGE__) } = 1;
 
 locale - Perl pragma to use or avoid POSIX locales for built-in operations
 
+=head1 WARNING
+
+DO NOT USE this pragma in scripts that have multiple
+L<threads|threads> active.  The locale is not local to a single thread.
+Another thread may change the locale at any time, which could cause at a
+minimum that a given thread is operating in a locale it isn't expecting
+to be in.  On some platforms, segfaults can also occur.  The locale
+change need not be explicit; some operations cause perl to change the
+locale itself.  You are vulnerable simply by having done a C<"use
+locale">.
+
 =head1 SYNOPSIS
 
     @x = sort @y;      # Native-platform/Unicode code point sort order
@@ -97,15 +108,24 @@ sub import {
             $arg =~ s/^://;
 
             eval { require POSIX; import POSIX 'locale_h'; };
-            unless (defined &POSIX::LC_CTYPE) {
-              return;
-            }
 
             # Map our names to the ones defined by POSIX
-            $arg = "LC_" . uc($arg);
+            my $LC = "LC_" . uc($arg);
+
+            my $bit = eval "&POSIX::$LC";
+            if (defined $bit) { # XXX Should we warn that this category isn't
+                                # supported on this platform, or make it
+                                # always be the C locale?
+
+                # Verify our assumption.
+                if (! ($bit >= 0 && $bit < 31)) {
+                    require Carp;
+                    Carp::croak("Cannot have ':$arg' parameter to 'use locale'"
+                              . " on this platform.  Use the 'perlbug' utility"
+                              . " to report this problem, or send email to"
+                              . " 'perlbug\@perl.org'.  $LC=$bit");
+                }
 
-            my $bit = eval "&POSIX::$arg";
-            if (defined $bit) {
                 # 1 is added so that the pseudo-category :characters, which is
                 # -1, comes out 0.
                 $^H{locale} |= 1 << ($bit + 1);
diff --git a/Master/tlpkg/tlperl/lib/meta_notation.pm b/Master/tlpkg/tlperl/lib/meta_notation.pm
index 2f85cd30c55..eea85875c9f 100644
--- a/Master/tlpkg/tlperl/lib/meta_notation.pm
+++ b/Master/tlpkg/tlperl/lib/meta_notation.pm
@@ -4,7 +4,7 @@ use warnings;
 # A tiny private library routine which is a helper to several Perl core
 # modules, to allow a paradigm to be implemented in a single place.  The name,
 # contents, or even the existence of this file may be changed at any time and
-# are NOT to be used by anthing outside the Perl core.
+# are NOT to be used by anything outside the Perl core.
 
 sub _meta_notation ($) {
 
@@ -22,10 +22,8 @@ sub _meta_notation ($) {
     # On ASCII platforms, the upper-Latin1-range characters are converted to
     # Meta notation, so that \xC1 becomes 'M-A', \xE2 becomes 'M-b', etc.
     # This is how it always has worked, so is continued that way for backwards
-    # compatibility.  XXX Wrong, but the way it has always worked is that \x80
-    # .. \x9F are converted to M- followed by a literal control char.  This
-    # probably has escaped attention due to the limited domains this code has
-    # been applied to.  ext/SDBM_File/dbu.c does this right.
+    # compatibility.  The range \x80 .. \x9F becomes M-^@ .. M-^A, M-^B, ...
+    # M-^Z, M-^[, M-^\, M-^], M-^, M-^_
     #
     # On EBCDIC platforms, the upper-Latin1-range characters are converted
     # into '\x{...}'  Meta notation doesn't make sense on EBCDIC platforms
@@ -40,7 +38,8 @@ sub _meta_notation ($) {
                sprintf("^%c",utf8::unicode_to_native(ord($1)^64))/xeg;
     $string =~ s/\c?/^?/g;
     if (ord("A") == 65) {
-        $string =~ s/([\200-\377])/sprintf("M-%c",ord($1)&0177)/eg;
+        $string =~ s/([\200-\237])/sprintf("M-^%c",(ord($1)&0177)^64)/eg;
+        $string =~ s/([\240-\377])/sprintf("M-%c"  ,ord($1)&0177)/eg;
     }
     else {
         no warnings 'experimental::regex_sets';
diff --git a/Master/tlpkg/tlperl/lib/mro.pm b/Master/tlpkg/tlperl/lib/mro.pm
index 093d080c472..0946fb67221 100644
--- a/Master/tlpkg/tlperl/lib/mro.pm
+++ b/Master/tlpkg/tlperl/lib/mro.pm
@@ -12,7 +12,7 @@ use warnings;
 
 # mro.pm versions < 1.00 reserved for MRO::Compat
 #  for partial back-compat to 5.[68].x
-our $VERSION = '1.17';
+our $VERSION = '1.18';
 
 sub import {
     mro::set_mro(scalar(caller), $_[1]) if $_[1];
diff --git a/Master/tlpkg/tlperl/lib/parent.pm b/Master/tlpkg/tlperl/lib/parent.pm
index 445ed125e9a..f6e8cd497db 100644
--- a/Master/tlpkg/tlperl/lib/parent.pm
+++ b/Master/tlpkg/tlperl/lib/parent.pm
@@ -1,7 +1,7 @@
 package parent;
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.232';
+$VERSION = '0.234';
 
 sub import {
     my $class = shift;
@@ -12,10 +12,6 @@ sub import {
         shift @_;
     } else {
         for ( my @filename = @_ ) {
-            if ( $_ eq $inheritor ) {
-                warn "Class '$inheritor' tried to inherit from itself\n";
-            };
-
             s{::|'}{/}g;
             require "$_.pm"; # dies if the file is not found
         }
@@ -94,19 +90,6 @@ either C<.pm> or C<.pmc>), use the following code:
   require './plugins/custom.plugin'; # contains Plugin::Custom
   use parent -norequire, 'Plugin::Custom';
 
-=head1 DIAGNOSTICS
-
-=over 4
-
-=item Class 'Foo' tried to inherit from itself
-
-Attempting to inherit from yourself generates a warning.
-
-    package Foo;
-    use parent 'Foo';
-
-=back
-
 =head1 HISTORY
 
 This module was forked from L<base> to remove the cruft
diff --git a/Master/tlpkg/tlperl/lib/perl5db.pl b/Master/tlpkg/tlperl/lib/perl5db.pl
index 7e7194ee95c..6dae6b0f5c3 100644
--- a/Master/tlpkg/tlperl/lib/perl5db.pl
+++ b/Master/tlpkg/tlperl/lib/perl5db.pl
@@ -189,7 +189,7 @@ Values are magical in numeric context: 1 if the line is breakable, 0 if not.
 The scalar C<${"_<$filename"}> simply contains the string C<$filename>.
 This is also the case for evaluated strings that contain subroutines, or
 which are currently being executed.  The $filename for C<eval>ed strings looks
-like C<(eval 34).
+like C<(eval 34)>.
 
 =head1 DEBUGGER STARTUP
 
@@ -528,7 +528,7 @@ BEGIN {
 # Debugger for Perl 5.00x; perl5db.pl patch level:
 use vars qw($VERSION $header);
 
-$VERSION = '1.49';
+$VERSION = '1.49_05';
 
 $header = "perl5db.pl version $VERSION";
 
@@ -1548,14 +1548,27 @@ We then determine what the console should be on various systems:
         $console = "con";
     }
 
+=item * AmigaOS - use C<CONSOLE:>.
+
+=cut
+
+    elsif ( $^O eq 'amigaos' ) {
+        $console = "CONSOLE:";
+    }
+
 =item * VMS - use C<sys$command>.
 
 =cut
 
-    else {
+    elsif ($^O eq 'VMS') {
+        $console = 'sys$command';
+    }
 
-        # everything else is ...
-        $console = "sys\$command";
+# Keep this last.
+
+    else {
+        _db_warn("Can't figure out your console, using stdin");
+        undef $console;
     }
 
 =pod
@@ -1938,7 +1951,10 @@ sub _DB__handle_y_command {
         = $obj->cmd_args =~ /\A(?:(\d*)\s*(.*))?\z/) {
 
         # See if we've got the necessary support.
-        if (!eval { require PadWalker; PadWalker->VERSION(0.08) }) {
+        if (!eval {
+            local @INC = @INC;
+            pop @INC if $INC[-1] eq '.';
+            require PadWalker; PadWalker->VERSION(0.08) }) {
             my $Err = $@;
             _db_warn(
                 $Err =~ /locate/
@@ -2490,7 +2506,11 @@ EOP
 # 'm' is method.
 # 'v' is the value (i.e: method name or subroutine ref).
 # 's' is subroutine.
-my %cmd_lookup =
+my %cmd_lookup;
+
+BEGIN
+{
+    %cmd_lookup =
 (
     '-' => { t => 'm', v => '_handle_dash_command', },
     '.' => { t => 's', v => \&_DB__handle_dot_command, },
@@ -2523,6 +2543,7 @@ my %cmd_lookup =
     (map { $_ => {t => 'm', v => '_handle_cmd_wrapper_commands' }, }
         qw(a A b B e E h i l L M o O v w W)),
 );
+};
 
 sub DB {
 
@@ -3319,6 +3340,9 @@ B<h q>, B<h R> or B<h o> to get additional info.
 EOP
 
         # Set the DB::eval context appropriately.
+        # At program termination disable any user actions.
+        $DB::action = undef;
+
         $DB::package     = 'main';
         $DB::usercontext = DB::_calc_usercontext($DB::package);
     } ## end elsif ($package eq 'DB::fake')
@@ -9420,7 +9444,10 @@ if PadWalker could be loaded.
 
 =cut
 
-        if (not $text =~ /::/ and eval { require PadWalker } ) {
+        if (not $text =~ /::/ and eval {
+            local @INC = @INC;
+            pop @INC if $INC[-1] eq '.';
+            require PadWalker } ) {
             my $level = 1;
             while (1) {
                 my @info = caller($level);
diff --git a/Master/tlpkg/tlperl/lib/perlfaq.pm b/Master/tlpkg/tlperl/lib/perlfaq.pm
index 8fc808aaf27..0be9c18d34d 100644
--- a/Master/tlpkg/tlperl/lib/perlfaq.pm
+++ b/Master/tlpkg/tlperl/lib/perlfaq.pm
@@ -1,5 +1,5 @@
 use strict;
 use warnings;
 package perlfaq;
-$perlfaq::VERSION = '5.021009';
+$perlfaq::VERSION = '5.021010';
 1;
diff --git a/Master/tlpkg/tlperl/lib/perllocal.pod b/Master/tlpkg/tlperl/lib/perllocal.pod
index 9d1cc66743c..67d5c91c465 100644
--- a/Master/tlpkg/tlperl/lib/perllocal.pod
+++ b/Master/tlpkg/tlperl/lib/perllocal.pod
@@ -1,4 +1,4 @@
-=head2 Sun Mar 13 20:28:26 2016: C<Module> L<Math::Int64|Math::Int64>

+=head2 Wed Apr 12 11:50:51 2017: C<Module> L<Math::Int64|Math::Int64>

 

 =over 4

 

@@ -20,7 +20,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:29:47 2016: C<Module> L<IO::String|IO::String>

+=head2 Wed Apr 12 11:51:30 2017: C<Module> L<IO::HTML|IO::HTML>

 

 =over 4

 

@@ -34,7 +34,7 @@ C<LINKTYPE: dynamic>
 

 =item *

 

-C<VERSION: 1.08>

+C<VERSION: 1.001>

 

 =item *

 

@@ -42,7 +42,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:30:50 2016: C<Module> L<Digest::SHA1|Digest::SHA1>

+=head2 Wed Apr 12 11:52:23 2017: C<Module> L<Digest::SHA1|Digest::SHA1>

 

 =over 4

 

@@ -64,7 +64,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:32:30 2016: C<Module> L<File::Which|File::Which>

+=head2 Wed Apr 12 11:55:22 2017: C<Module> L<File::Which|File::Which>

 

 =over 4

 

@@ -86,7 +86,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:33:25 2016: C<Module> L<Encode::compat|Encode::compat>

+=head2 Wed Apr 12 11:55:59 2017: C<Module> L<Encode::compat|Encode::compat>

 

 =over 4

 

@@ -108,7 +108,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:34:41 2016: C<Module> L<Encode::Locale|Encode::Locale>

+=head2 Wed Apr 12 11:58:07 2017: C<Module> L<Encode::Locale|Encode::Locale>

 

 =over 4

 

@@ -130,7 +130,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:36:38 2016: C<Module> L<Win32::API|Win32::API>

+=head2 Wed Apr 12 11:59:13 2017: C<Module> L<Win32::API|Win32::API>

 

 =over 4

 

@@ -152,7 +152,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:43:18 2016: C<Module> L<Win32API::Registry|Win32API::Registry>

+=head2 Wed Apr 12 12:02:04 2017: C<Module> L<Win32API::Registry|Win32API::Registry>

 

 =over 4

 

@@ -174,7 +174,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:44:15 2016: C<Module> L<Win32::Console|Win32::Console>

+=head2 Wed Apr 12 12:02:53 2017: C<Module> L<Win32::Console|Win32::Console>

 

 =over 4

 

@@ -196,7 +196,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:45:39 2016: C<Module> L<Win32::TieRegistry|Win32::TieRegistry>

+=head2 Wed Apr 12 12:03:57 2017: C<Module> L<Win32::TieRegistry|Win32::TieRegistry>

 

 =over 4

 

@@ -218,7 +218,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:46:37 2016: C<Module> L<Win32::Shortcut|Win32::Shortcut>

+=head2 Wed Apr 12 12:04:56 2017: C<Module> L<Win32::Shortcut|Win32::Shortcut>

 

 =over 4

 

@@ -240,7 +240,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:48:08 2016: C<Module> L<Win32::OLE|Win32::OLE>

+=head2 Wed Apr 12 12:07:22 2017: C<Module> L<Win32::OLE|Win32::OLE>

 

 =over 4

 

@@ -262,7 +262,29 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:51:13 2016: C<Module> L<Socket|Socket>

+=head2 Wed Apr 12 12:07:59 2017: C<Module> L<Win32::Process|Win32::Process>

+

+=over 4

+

+=item *

+

+C<installed into: c:\tlperl\site\lib>

+

+=item *

+

+C<LINKTYPE: dynamic>

+

+=item *

+

+C<VERSION: 0.16>

+

+=item *

+

+C<EXE_FILES: >

+

+=back

+

+=head2 Wed Apr 12 12:10:59 2017: C<Module> L<Socket|Socket>

 

 =over 4

 

@@ -276,7 +298,7 @@ C<LINKTYPE: dynamic>
 

 =item *

 

-C<VERSION: 2.021>

+C<VERSION: 2.024>

 

 =item *

 

@@ -284,7 +306,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:53:08 2016: C<Module> L<Date::Parse|Date::Parse>

+=head2 Wed Apr 12 12:11:50 2017: C<Module> L<Date::Parse|Date::Parse>

 

 =over 4

 

@@ -306,7 +328,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:54:11 2016: C<Module> L<HTTP::Date|HTTP::Date>

+=head2 Wed Apr 12 12:13:24 2017: C<Module> L<HTTP::Date|HTTP::Date>

 

 =over 4

 

@@ -328,7 +350,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:54:58 2016: C<Module> L<File::Listing|File::Listing>

+=head2 Wed Apr 12 12:13:53 2017: C<Module> L<File::Listing|File::Listing>

 

 =over 4

 

@@ -350,7 +372,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:55:38 2016: C<Module> L<IO::HTML|IO::HTML>

+=head2 Wed Apr 12 12:14:50 2017: C<Module> L<IO::String|IO::String>

 

 =over 4

 

@@ -364,7 +386,7 @@ C<LINKTYPE: dynamic>
 

 =item *

 

-C<VERSION: 1.001>

+C<VERSION: 1.08>

 

 =item *

 

@@ -372,7 +394,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:56:22 2016: C<Module> L<LWP::MediaTypes|LWP::MediaTypes>

+=head2 Wed Apr 12 12:15:39 2017: C<Module> L<LWP::MediaTypes|LWP::MediaTypes>

 

 =over 4

 

@@ -394,7 +416,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:57:04 2016: C<Module> L<URI|URI>

+=head2 Wed Apr 12 12:16:09 2017: C<Module> L<URI|URI>

 

 =over 4

 

@@ -416,7 +438,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:58:10 2016: C<Module> L<HTTP::Message|HTTP::Message>

+=head2 Wed Apr 12 12:16:56 2017: C<Module> L<HTTP::Message|HTTP::Message>

 

 =over 4

 

@@ -438,7 +460,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 20:59:00 2016: C<Module> L<HTML::Tagset|HTML::Tagset>

+=head2 Wed Apr 12 12:17:28 2017: C<Module> L<HTML::Tagset|HTML::Tagset>

 

 =over 4

 

@@ -460,7 +482,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 21:00:11 2016: C<Module> L<HTML::Parser|HTML::Parser>

+=head2 Wed Apr 12 12:18:29 2017: C<Module> L<HTML::Parser|HTML::Parser>

 

 =over 4

 

@@ -482,7 +504,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 21:00:50 2016: C<Module> L<WWW::RobotRules|WWW::RobotRules>

+=head2 Wed Apr 12 12:18:57 2017: C<Module> L<WWW::RobotRules|WWW::RobotRules>

 

 =over 4

 

@@ -504,7 +526,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 21:01:40 2016: C<Module> L<HTTP::Negotiate|HTTP::Negotiate>

+=head2 Wed Apr 12 12:19:43 2017: C<Module> L<HTTP::Negotiate|HTTP::Negotiate>

 

 =over 4

 

@@ -526,7 +548,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 21:02:17 2016: C<Module> L<Net::HTTP|Net::HTTP>

+=head2 Wed Apr 12 12:20:22 2017: C<Module> L<Net::HTTP|Net::HTTP>

 

 =over 4

 

@@ -540,7 +562,7 @@ C<LINKTYPE: dynamic>
 

 =item *

 

-C<VERSION: 6.09>

+C<VERSION: 6.13>

 

 =item *

 

@@ -548,7 +570,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 21:02:57 2016: C<Module> L<Mozilla::CA|Mozilla::CA>

+=head2 Wed Apr 12 12:20:58 2017: C<Module> L<Mozilla::CA|Mozilla::CA>

 

 =over 4

 

@@ -570,7 +592,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 21:04:07 2016: C<Module> L<HTTP::Daemon|HTTP::Daemon>

+=head2 Wed Apr 12 12:21:32 2017: C<Module> L<HTTP::Daemon|HTTP::Daemon>

 

 =over 4

 

@@ -592,7 +614,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 21:05:02 2016: C<Module> L<HTTP::Cookies|HTTP::Cookies>

+=head2 Wed Apr 12 12:22:18 2017: C<Module> L<HTTP::Cookies|HTTP::Cookies>

 

 =over 4

 

@@ -606,7 +628,7 @@ C<LINKTYPE: dynamic>
 

 =item *

 

-C<VERSION: 6.01>

+C<VERSION: 6.03>

 

 =item *

 

@@ -614,7 +636,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Sun Mar 13 21:06:10 2016: C<Module> L<LWP|LWP>

+=head2 Wed Apr 12 13:08:26 2017: C<Module> L<Try::Tiny|Try::Tiny>

 

 =over 4

 

@@ -628,15 +650,15 @@ C<LINKTYPE: dynamic>
 

 =item *

 

-C<VERSION: 6.15>

+C<VERSION: 0.28>

 

 =item *

 

-C<EXE_FILES: bin/lwp-request bin/lwp-mirror bin/lwp-download bin/lwp-dump>

+C<EXE_FILES: >

 

 =back

 

-=head2 Sun Mar 13 22:47:32 2016: C<Module> L<Tk|Tk>

+=head2 Wed Apr 12 13:08:52 2017: C<Module> L<Test::Fatal|Test::Fatal>

 

 =over 4

 

@@ -650,15 +672,15 @@ C<LINKTYPE: dynamic>
 

 =item *

 

-C<VERSION: 804.033>

+C<VERSION: 0.014>

 

 =item *

 

-C<EXE_FILES: ptksh ptked gedi>

+C<EXE_FILES: >

 

 =back

 

-=head2 Sun Mar 13 22:50:19 2016: C<Module> L<Tk::DirSelect|Tk::DirSelect>

+=head2 Wed Apr 12 13:09:53 2017: C<Module> L<Test::RequiresInternet|Test::RequiresInternet>

 

 =over 4

 

@@ -672,7 +694,7 @@ C<LINKTYPE: dynamic>
 

 =item *

 

-C<VERSION: 1.12>

+C<VERSION: 0.05>

 

 =item *

 

@@ -680,7 +702,7 @@ C<EXE_FILES: >
 

 =back

 

-=head2 Wed Mar 16 21:33:33 2016: C<Module> L<Win32::Process|Win32::Process>

+=head2 Wed Apr 12 13:11:47 2017: C<Module> L<libwww::perl|libwww::perl>

 

 =over 4

 

@@ -694,7 +716,51 @@ C<LINKTYPE: dynamic>
 

 =item *

 

-C<VERSION: 0.16>

+C<VERSION: 6.25>

+

+=item *

+

+C<EXE_FILES: bin/lwp-request bin/lwp-mirror bin/lwp-download bin/lwp-dump>

+

+=back

+

+=head2 Wed Apr 12 15:59:58 2017: C<Module> L<Tk|Tk>

+

+=over 4

+

+=item *

+

+C<installed into: c:\tlperl\site\lib>

+

+=item *

+

+C<LINKTYPE: dynamic>

+

+=item *

+

+C<VERSION: 804.033>

+

+=item *

+

+C<EXE_FILES: ptksh ptked gedi>

+

+=back

+

+=head2 Wed Apr 12 16:02:02 2017: C<Module> L<Tk::DirSelect|Tk::DirSelect>

+

+=over 4

+

+=item *

+

+C<installed into: c:\tlperl\site\lib>

+

+=item *

+

+C<LINKTYPE: dynamic>

+

+=item *

+

+C<VERSION: 1.12>

 

 =item *

 

diff --git a/Master/tlpkg/tlperl/lib/strict.pm b/Master/tlpkg/tlperl/lib/strict.pm
index 03ed21ca81f..923c921363d 100644
--- a/Master/tlpkg/tlperl/lib/strict.pm
+++ b/Master/tlpkg/tlperl/lib/strict.pm
@@ -1,17 +1,17 @@
 package strict;
 
-$strict::VERSION = "1.09";
-
-# Verify that we're called correctly so that strictures will work.
-unless ( __FILE__ =~ /(^|[\/\\])\Q${\__PACKAGE__}\E\.pmc?$/ ) {
-    # Can't use Carp, since Carp uses us!
-    my (undef, $f, $l) = caller;
-    die("Incorrect use of pragma '${\__PACKAGE__}' at $f line $l.\n");
-}
+$strict::VERSION = "1.11";
 
 my ( %bitmask, %explicit_bitmask );
 
 BEGIN {
+    # Verify that we're called correctly so that strictures will work.
+    # Can't use Carp, since Carp uses us!
+    # see also warnings.pm.
+    die sprintf "Incorrect use of pragma '%s' at %s line %d.\n", __PACKAGE__, +(caller)[1,2]
+        if __FILE__ !~ ( '(?x) \b     '.__PACKAGE__.'  \.pmc? \z' )
+        && __FILE__ =~ ( '(?x) \b (?i:'.__PACKAGE__.') \.pmc? \z' );
+
     %bitmask = (
         refs => 0x00000002,
         subs => 0x00000200,
@@ -94,6 +94,10 @@ strict - Perl pragma to restrict unsafe constructs
 
 =head1 DESCRIPTION
 
+The C<strict> pragma disables certain Perl expressions that could behave
+unexpectedly or are difficult to debug, turning them into errors. The
+effect of this pragma is limited to the current file or scope block.
+
 If no import list is supplied, all possible restrictions are assumed.
 (This is the safest mode to operate in, but is sometimes too strict for
 casual programming.)  Currently, there are three possible things to be
diff --git a/Master/tlpkg/tlperl/lib/threads.pm b/Master/tlpkg/tlperl/lib/threads.pm
index 7d7ea3db6d0..39761be3dd4 100644
--- a/Master/tlpkg/tlperl/lib/threads.pm
+++ b/Master/tlpkg/tlperl/lib/threads.pm
@@ -5,7 +5,7 @@ use 5.008;
 use strict;
 use warnings;
 
-our $VERSION = '2.01';
+our $VERSION = '2.07';
 my $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
@@ -134,7 +134,7 @@ threads - Perl interpreter-based threads
 
 =head1 VERSION
 
-This document describes threads version 2.01
+This document describes threads version 2.07
 
 =head1 WARNING
 
@@ -366,7 +366,7 @@ key) will cause its ID to be used as the value:
     use threads qw(stringify);
 
     my $thr = threads->create(...);
-    print("Thread $thr started...\n");  # Prints out: Thread 1 started...
+    print("Thread $thr started\n");  # Prints: Thread 1 started
 
 =item threads->object($tid)
 
@@ -691,7 +691,8 @@ threaded applications.
 To specify a particular stack size for any individual thread, call
 C<-E<gt>create()> with a hash reference as the first argument:
 
-    my $thr = threads->create({'stack_size' => 32*4096}, \&foo, @args);
+    my $thr = threads->create({'stack_size' => 32*4096},
+                              \&foo, @args);
 
 =item $thr2 = $thr1->create(FUNCTION, ARGS)
 
@@ -699,7 +700,8 @@ This creates a new thread (C<$thr2>) that inherits the stack size from an
 existing thread (C<$thr1>).  This is shorthand for the following:
 
     my $stack_size = $thr1->get_stack_size();
-    my $thr2 = threads->create({'stack_size' => $stack_size}, FUNCTION, ARGS);
+    my $thr2 = threads->create({'stack_size' => $stack_size},
+                               FUNCTION, ARGS);
 
 =back
 
diff --git a/Master/tlpkg/tlperl/lib/threads/shared.pm b/Master/tlpkg/tlperl/lib/threads/shared.pm
index cdb19902684..89a79a4864d 100644
--- a/Master/tlpkg/tlperl/lib/threads/shared.pm
+++ b/Master/tlpkg/tlperl/lib/threads/shared.pm
@@ -7,7 +7,7 @@ use warnings;
 
 use Scalar::Util qw(reftype refaddr blessed);
 
-our $VERSION = '1.48'; # Please update the pod, too.
+our $VERSION = '1.51'; # Please update the pod, too.
 my $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
@@ -195,7 +195,7 @@ threads::shared - Perl extension for sharing data structures between threads
 
 =head1 VERSION
 
-This document describes threads::shared version 1.48
+This document describes threads::shared version 1.51
 
 =head1 SYNOPSIS
 
@@ -558,6 +558,17 @@ they contain will be lost.
 Therefore, populate such variables B<after> declaring them as shared.  (Scalar
 and scalar refs are not affected by this problem.)
 
+Blessing a shared item after it has been nested in another shared item does
+not propagate the blessing to the shared reference:
+
+  my $foo = &share({});
+  my $bar = &share({});
+  $bar->{foo} = $foo;
+  bless($foo, 'baz');   # $foo is now of class 'baz',
+                        # but $bar->{foo} is unblessed.
+
+Therefore, you should bless objects before sharing them.
+
 It is often not wise to share an object unless the class itself has been
 written to support sharing.  For example, an object's destructor may get
 called multiple times, once for each thread's scope exit.  Another danger is
diff --git a/Master/tlpkg/tlperl/lib/unicore/Blocks.txt b/Master/tlpkg/tlperl/lib/unicore/Blocks.txt
index 3653af7a470..0a4a5807635 100644
--- a/Master/tlpkg/tlperl/lib/unicore/Blocks.txt
+++ b/Master/tlpkg/tlperl/lib/unicore/Blocks.txt
@@ -1,14 +1,11 @@
-# Blocks-7.0.0.txt
-# Date: 2014-04-03, 23:23:00 GMT [RP, KW]
+# Blocks-8.0.0.txt
+# Date: 2014-11-10, 23:04:00 GMT [KW]
 #
 # Unicode Character Database
 # Copyright (c) 1991-2014 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 # For documentation, see http://www.unicode.org/reports/tr44/
 #
-# Note:   The casing of block names is not normative.
-#         For example, "Basic Latin" and "BASIC LATIN" are equivalent.
-#
 # Format:
 # Start Code..End Code; Block Name
 
@@ -20,6 +17,14 @@
 #         For more information on the comparison of property values, 
 #            see UAX #44: http://www.unicode.org/reports/tr44/
 #
+#  All block ranges start with a value where (cp MOD 16) = 0,
+#  and end with a value where (cp MOD 16) = 15. In other words,
+#  the last hexadecimal digit of the start of range is ...0 
+#  and the last hexadecimal digit of the end of range is ...F.
+#  This constraint on block ranges guarantees that allocations
+#  are done in terms of whole columns, and that code chart display
+#  never involves splitting columns in the charts.
+#
 #  All code points not explicitly listed for Block
 #  have the value No_Block.
 
@@ -168,6 +173,7 @@ AA80..AADF; Tai Viet
 AAE0..AAFF; Meetei Mayek Extensions
 AB00..AB2F; Ethiopic Extended-A
 AB30..AB6F; Latin Extended-E
+AB70..ABBF; Cherokee Supplement
 ABC0..ABFF; Meetei Mayek
 AC00..D7AF; Hangul Syllables
 D7B0..D7FF; Hangul Jamo Extended-B
@@ -210,6 +216,7 @@ FFF0..FFFF; Specials
 10840..1085F; Imperial Aramaic
 10860..1087F; Palmyrene
 10880..108AF; Nabataean
+108E0..108FF; Hatran
 10900..1091F; Phoenician
 10920..1093F; Lydian
 10980..1099F; Meroitic Hieroglyphs
@@ -223,6 +230,7 @@ FFF0..FFFF; Specials
 10B60..10B7F; Inscriptional Pahlavi
 10B80..10BAF; Psalter Pahlavi
 10C00..10C4F; Old Turkic
+10C80..10CFF; Old Hungarian
 10E60..10E7F; Rumi Numeral Symbols
 11000..1107F; Brahmi
 11080..110CF; Kaithi
@@ -232,17 +240,21 @@ FFF0..FFFF; Specials
 11180..111DF; Sharada
 111E0..111FF; Sinhala Archaic Numbers
 11200..1124F; Khojki
+11280..112AF; Multani
 112B0..112FF; Khudawadi
 11300..1137F; Grantha
 11480..114DF; Tirhuta
 11580..115FF; Siddham
 11600..1165F; Modi
 11680..116CF; Takri
+11700..1173F; Ahom
 118A0..118FF; Warang Citi
 11AC0..11AFF; Pau Cin Hau
 12000..123FF; Cuneiform
 12400..1247F; Cuneiform Numbers and Punctuation
+12480..1254F; Early Dynastic Cuneiform
 13000..1342F; Egyptian Hieroglyphs
+14400..1467F; Anatolian Hieroglyphs
 16800..16A3F; Bamum Supplement
 16A40..16A6F; Mro
 16AD0..16AFF; Bassa Vah
@@ -257,6 +269,7 @@ FFF0..FFFF; Specials
 1D300..1D35F; Tai Xuan Jing Symbols
 1D360..1D37F; Counting Rod Numerals
 1D400..1D7FF; Mathematical Alphanumeric Symbols
+1D800..1DAAF; Sutton SignWriting
 1E800..1E8DF; Mende Kikakui
 1EE00..1EEFF; Arabic Mathematical Alphabetic Symbols
 1F000..1F02F; Mahjong Tiles
@@ -271,9 +284,11 @@ FFF0..FFFF; Specials
 1F700..1F77F; Alchemical Symbols
 1F780..1F7FF; Geometric Shapes Extended
 1F800..1F8FF; Supplemental Arrows-C
+1F900..1F9FF; Supplemental Symbols and Pictographs
 20000..2A6DF; CJK Unified Ideographs Extension B
 2A700..2B73F; CJK Unified Ideographs Extension C
 2B740..2B81F; CJK Unified Ideographs Extension D
+2B820..2CEAF; CJK Unified Ideographs Extension E
 2F800..2FA1F; CJK Compatibility Ideographs Supplement
 E0000..E007F; Tags
 E0100..E01EF; Variation Selectors Supplement
diff --git a/Master/tlpkg/tlperl/lib/unicore/CombiningClass.pl b/Master/tlpkg/tlperl/lib/unicore/CombiningClass.pl
index e77e4a45d87..2d4023e0af6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/CombiningClass.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/CombiningClass.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -136,6 +136,7 @@ return <<'END';
 825	827	230
 829	82D	230
 859	85B	220
+8E3		220
 8E4	8E5	230
 8E6		220
 8E7	8E8	230
@@ -267,7 +268,7 @@ FC6		220
 3099	309A	8
 A66F		230
 A674	A67D	230
-A69F		230
+A69E	A69F	230
 A6F0	A6F1	230
 A806		9
 A8C4		9
@@ -287,6 +288,7 @@ ABED		9
 FB1E		26
 FE20	FE26	230
 FE27	FE2D	220
+FE2E	FE2F	230
 101FD		220
 102E0		220
 10376	1037A	230
@@ -306,6 +308,7 @@ FE27	FE2D	220
 11133	11134	9
 11173		7
 111C0		9
+111CA		7
 11235		9
 11236		7
 112E9		7
@@ -321,6 +324,7 @@ FE27	FE2D	220
 1163F		9
 116B6		9
 116B7		7
+1172B		9
 16AF0	16AF4	1
 16B30	16B36	230
 1BC9E		1
diff --git a/Master/tlpkg/tlperl/lib/unicore/Decomposition.pl b/Master/tlpkg/tlperl/lib/unicore/Decomposition.pl
index 796c26b925c..cce0ca01982 100644
--- a/Master/tlpkg/tlperl/lib/unicore/Decomposition.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/Decomposition.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/Heavy.pl b/Master/tlpkg/tlperl/lib/unicore/Heavy.pl
index d78afc884c4..71c7d4c7192 100644
--- a/Master/tlpkg/tlperl/lib/unicore/Heavy.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/Heavy.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
@@ -89,6 +89,10 @@
 'idstart' => 'ids',
 'idstrinaryoperator' => 'idst',
 'in' => 'in',
+'indicpositionalcategory' => 'inpc',
+'indicsyllabiccategory' => 'insc',
+'inpc' => 'inpc',
+'insc' => 'insc',
 'jg' => 'jg',
 'joinc' => 'joinc',
 'joincontrol' => 'joinc',
@@ -152,6 +156,12 @@
 'xidstart' => 'xids',
 );
 
+# Same, but strict names
+%utf8::strict_property_name_of = (
+'_perlgcb' => 'gcb',
+'_perlsb' => 'sb',
+);
+
 # Gives the definitions (in the form of inversion lists) for those properties
 # whose definitions aren't kept in files
 @utf8::inline_definitions = (
@@ -212,6 +222,9 @@
 65
 91',
 'V2
+55296
+57344',
+'V2
 12334
 12336',
 'V2
@@ -415,6 +428,68 @@
 'V2
 12274
 12276',
+'V4
+6971
+6972
+43456
+43457',
+'V2
+6973
+6974',
+'V2
+8205
+8206',
+'V2
+8204
+8205',
+'V6
+6512
+6517
+43712
+43713
+43714
+43715',
+'V2
+69759
+69760',
+'V4
+2510
+2511
+3450
+3456',
+'V4
+2673
+2674
+70199
+70200',
+'V4
+3660
+3661
+6093
+6094',
+'V2
+2947
+2948',
+'V2
+6089
+6091',
+'V2
+70082
+70084',
+'V2
+69714
+69734',
+'V2
+3976
+3981',
+'V4
+3313
+3315
+69635
+69637',
+'V2
+3406
+3407',
 'V2
 8204
 8206',
@@ -525,6 +600,9 @@
 42240
 42560',
 'V2
+71424
+71488',
+'V2
 43520
 43616',
 'V2
@@ -624,6 +702,9 @@
 44032
 55216',
 'V2
+67808
+67840',
+'V2
 1424
 1536',
 'V2
@@ -690,6 +771,9 @@
 177984
 178208',
 'V2
+178208
+183984',
+'V2
 66560
 66640',
 'V2
@@ -720,6 +804,9 @@
 2112
 2144',
 'V2
+70272
+70320',
+'V2
 4096
 4256',
 'V2
@@ -987,6 +1074,9 @@
 12704
 12736',
 'V2
+43888
+43968',
+'V2
 119648
 119680',
 'V2
@@ -1071,6 +1161,9 @@
 124928
 125152',
 'V2
+68736
+68864',
+'V2
 127136
 127232',
 'V2
@@ -1203,6 +1296,9 @@
 8448
 8528',
 'V2
+120832
+121520',
+'V2
 66272
 66304',
 'V2
@@ -1233,6 +1329,9 @@
 42752
 42784',
 'V2
+82944
+83584',
+'V2
 68448
 68480',
 'V2
@@ -1248,11 +1347,17 @@
 8400
 8448',
 'V2
+74880
+75088',
+'V2
 127488
 127744',
 'V2
 113824
 113840',
+'V2
+129280
+129536',
 'V6
 188
 191
@@ -1287,9 +1392,6 @@
 1048576
 1114110',
 'V2
-55296
-57344',
-'V2
 8232
 8233',
 'V2
@@ -1310,13 +1412,6 @@
 'V2
 1607
 1608',
-'V6
-1603
-1604
-1708
-1711
-1919
-1920',
 'V2
 1825
 1826',
@@ -1563,13 +1658,6 @@
 'V2
 45
 46',
-'V6
-8228
-8231
-65049
-65050
-68342
-68343',
 'V2
 133
 134',
@@ -1674,9 +1762,11 @@
 'V2
 8533
 8534',
-'V4
+'V6
 8537
 8538
+68087
+68088
 74849
 74850',
 'V2
@@ -1688,13 +1778,6 @@
 'V2
 8534
 8535',
-'V6
-65818
-65819
-66292
-66293
-69235
-69236',
 'V2
 3883
 3884',
@@ -1707,51 +1790,25 @@
 'V2
 8536
 8537',
-'V6
-65820
-65821
-66294
-66295
-69237
-69238',
 'V2
 3884
 3885',
-'V4
+'V6
 8538
 8539
+68095
+68096
 74844
 74845',
 'V2
 8541
 8542',
-'V6
-65822
-65823
-66296
-66297
-69239
-69240',
 'V2
 3885
 3886',
 'V2
 8542
 8543',
-'V6
-65823
-65824
-66297
-66298
-69240
-69241',
-'V6
-65824
-65825
-66298
-66299
-69241
-69242',
 'V2
 3886
 3887',
@@ -1761,6 +1818,9 @@
 'V2
 8530
 8531',
+'V2
+68086
+68087',
 'V6
 2548
 2549
@@ -1780,9 +1840,11 @@
 'V2
 3890
 3891',
-'V2
+'V4
 65827
-65828',
+65828
+68060
+68061',
 'V6
 2550
 2551
@@ -1790,55 +1852,116 @@
 2936
 43061
 43062',
-'V2
+'V4
 65828
-65829',
-'V2
 65829
-65830',
+68061
+68062',
+'V4
+65829
+65830
+68062
+68063',
 'V2
+68090
+68091',
+'V4
 65831
-65832',
-'V2
 65832
-65833',
+68064
+68065',
 'V2
+68092
+68093',
+'V4
+65832
 65833
-65834',
-'V2
+68065
+68066',
+'V4
+65833
+65834
+68066
+68067',
+'V4
 65834
-65835',
+65835
+68067
+68068',
 'V2
+68028
+68029',
+'V4
 65836
-65837',
-'V2
 65837
-65838',
-'V2
+68069
+68070',
+'V4
+65837
 65838
-65839',
-'V2
+68070
+68071',
+'V4
+65838
+65839
+68071
+68072',
+'V4
 65840
-65841',
-'V2
 65841
-65842',
-'V2
+68073
+68074',
+'V4
+65841
+65842
+68074
+68075',
+'V4
 65842
-65843',
-'V2
 65843
-65844',
-'V2
+68075
+68076',
+'V4
+65843
+65844
+68076
+68077',
+'V4
 8584
-8585',
+8585
+68077
+68078',
+'V2
+68078
+68079',
 'V2
 74802
 74803',
 'V2
+68079
+68080',
+'V2
+68080
+68081',
+'V2
 74803
 74804',
 'V2
+68081
+68082',
+'V2
+68082
+68083',
+'V2
+68083
+68084',
+'V2
+68084
+68085',
+'V2
+68085
+68086',
+'V2
 93022
 93023',
 'V6
@@ -1879,6 +2002,13 @@
 66916
 66927
 66928',
+'V6
+71424
+71450
+71453
+71468
+71472
+71488',
 'V4
 67648
 67670
@@ -1944,9 +2074,13 @@
 'V2
 66208
 66257',
-'V2
+'V6
 5024
-5109',
+5110
+5112
+5118
+43888
+43968',
 'V6
 994
 1008
@@ -1971,6 +2105,23 @@
 'V2
 5920
 5941',
+'V6
+67808
+67827
+67828
+67830
+67835
+67840',
+'V2
+82944
+83527',
+'V6
+68736
+68787
+68800
+68851
+68858
+68864',
 'V2
 66304
 66340',
@@ -2034,11 +2185,13 @@
 125125
 125127
 125143',
-'V4
+'V6
 68000
 68024
-68030
-68032',
+68028
+68048
+68050
+68096',
 'V6
 93952
 94021
@@ -2133,17 +2286,22 @@
 43214
 43226',
 'V6
+120832
+121484
+121499
+121504
+121505
+121520',
+'V4
 70016
-70089
-70093
 70094
 70096
-70107',
+70112',
 'V4
 71040
 71094
 71096
-71114',
+71134',
 'V4
 70320
 70379
@@ -2232,13 +2390,6 @@
 66504
 66518',
 'V6
-73728
-74649
-74752
-74863
-74864
-74869',
-'V6
 6656
 6684
 6686
@@ -2302,6 +2453,11 @@
 71237
 71248
 71258',
+'V4
+1155
+1156
+66384
+66427',
 'V6
 6146
 6148
@@ -2346,13 +2502,16 @@
 '_perl_folds_to_multi_char' => 'Perl/_PerlFol',
 '_perl_idcont' => 'Perl/_PerlIDC',
 '_perl_idstart' => 'Perl/_PerlIDS',
+'_perl_nchar' => 'Perl/_PerlNch',
+'_perl_patws' => 'Perl/_PerlPat',
 '_perl_problematic_locale_foldeds_start' => 'Perl/_PerlPr2',
 '_perl_problematic_locale_folds' => 'Perl/_PerlPro',
 '_perl_quotemeta' => 'Perl/_PerlQuo',
+'_perl_surrogate' => '#/14',
 'age=1.1' => 'Age/V11',
 'age=2' => 'Age/V20',
 'age=2.0' => 'Age/V20',
-'age=2.1' => '#/75',
+'age=2.1' => '#/92',
 'age=3' => 'Age/V30',
 'age=3.0' => 'Age/V30',
 'age=3.1' => 'Age/V31',
@@ -2367,67 +2526,69 @@
 'age=6' => 'Age/V60',
 'age=6.0' => 'Age/V60',
 'age=6.1' => 'Age/V61',
-'age=6.2' => '#/76',
-'age=6.3' => '#/77',
+'age=6.2' => '#/93',
+'age=6.3' => '#/94',
 'age=7' => 'Age/V70',
 'age=7.0' => 'Age/V70',
+'age=8' => 'Age/V80',
+'age=8.0' => 'Age/V80',
 'ccc=0' => 'Ccc/NR',
 'ccc=1' => 'Ccc/OV',
-'ccc=10' => '#/23',
-'ccc=103' => '#/52',
-'ccc=107' => '#/53',
-'ccc=11' => '#/24',
-'ccc=118' => '#/54',
-'ccc=12' => '#/25',
-'ccc=122' => '#/55',
-'ccc=129' => '#/56',
-'ccc=13' => '#/26',
-'ccc=130' => '#/57',
-'ccc=132' => '#/58',
+'ccc=10' => '#/24',
+'ccc=103' => '#/53',
+'ccc=107' => '#/54',
+'ccc=11' => '#/25',
+'ccc=118' => '#/55',
+'ccc=12' => '#/26',
+'ccc=122' => '#/56',
+'ccc=129' => '#/57',
+'ccc=13' => '#/27',
+'ccc=130' => '#/58',
+'ccc=132' => '#/59',
 'ccc=133' => '#/0',
-'ccc=14' => '#/27',
-'ccc=15' => '#/28',
-'ccc=16' => '#/29',
-'ccc=17' => '#/30',
-'ccc=18' => '#/31',
-'ccc=19' => '#/32',
-'ccc=20' => '#/33',
+'ccc=14' => '#/28',
+'ccc=15' => '#/29',
+'ccc=16' => '#/30',
+'ccc=17' => '#/31',
+'ccc=18' => '#/32',
+'ccc=19' => '#/33',
+'ccc=20' => '#/34',
 'ccc=200' => '#/0',
-'ccc=202' => '#/22',
-'ccc=21' => '#/34',
-'ccc=214' => '#/21',
+'ccc=202' => '#/23',
+'ccc=21' => '#/35',
+'ccc=214' => '#/22',
 'ccc=216' => 'Ccc/ATAR',
-'ccc=218' => '#/17',
-'ccc=22' => '#/35',
+'ccc=218' => '#/18',
+'ccc=22' => '#/36',
 'ccc=220' => 'Ccc/B',
 'ccc=222' => 'Ccc/BR',
-'ccc=224' => '#/14',
-'ccc=226' => '#/15',
-'ccc=228' => '#/16',
-'ccc=23' => '#/36',
+'ccc=224' => '#/15',
+'ccc=226' => '#/16',
+'ccc=228' => '#/17',
+'ccc=23' => '#/37',
 'ccc=230' => 'Ccc/A',
 'ccc=232' => 'Ccc/AR',
 'ccc=233' => 'Ccc/DB',
-'ccc=234' => '#/18',
-'ccc=24' => '#/37',
-'ccc=240' => '#/19',
-'ccc=25' => '#/38',
-'ccc=26' => '#/39',
-'ccc=27' => '#/40',
-'ccc=28' => '#/41',
-'ccc=29' => '#/42',
-'ccc=30' => '#/43',
-'ccc=31' => '#/44',
-'ccc=32' => '#/45',
-'ccc=33' => '#/46',
-'ccc=34' => '#/47',
-'ccc=35' => '#/48',
-'ccc=36' => '#/49',
+'ccc=234' => '#/19',
+'ccc=24' => '#/38',
+'ccc=240' => '#/20',
+'ccc=25' => '#/39',
+'ccc=26' => '#/40',
+'ccc=27' => '#/41',
+'ccc=28' => '#/42',
+'ccc=29' => '#/43',
+'ccc=30' => '#/44',
+'ccc=31' => '#/45',
+'ccc=32' => '#/46',
+'ccc=33' => '#/47',
+'ccc=34' => '#/48',
+'ccc=35' => '#/49',
+'ccc=36' => '#/50',
 'ccc=7' => 'Ccc/NK',
-'ccc=8' => '#/20',
-'ccc=84' => '#/50',
+'ccc=8' => '#/21',
+'ccc=84' => '#/51',
 'ccc=9' => 'Ccc/VR',
-'ccc=91' => '#/51',
+'ccc=91' => '#/52',
 'in=1.1' => 'Age/V11',
 'in=2' => 'In/2_0',
 'in=2.0' => 'In/2_0',
@@ -2450,136 +2611,150 @@
 'in=6.3' => 'In/6_3',
 'in=7' => 'In/7_0',
 'in=7.0' => 'In/7_0',
-'nv=-1/2' => '#/478',
+'in=8' => 'In/8_0',
+'in=8.0' => 'In/8_0',
+'nv=-1/2' => '#/497',
 'nv=0' => 'Nv/0',
 'nv=1' => 'Nv/1',
-'nv=1/10' => '#/479',
-'nv=1/16' => '#/480',
+'nv=1/10' => '#/498',
+'nv=1/12' => '#/499',
+'nv=1/16' => '#/500',
 'nv=1/2' => 'Nv/1_2',
 'nv=1/3' => 'Nv/1_3',
 'nv=1/4' => 'Nv/1_4',
-'nv=1/5' => '#/458',
-'nv=1/6' => '#/459',
-'nv=1/7' => '#/460',
+'nv=1/5' => '#/482',
+'nv=1/6' => '#/483',
+'nv=1/7' => '#/484',
 'nv=1/8' => 'Nv/1_8',
-'nv=1/9' => '#/461',
+'nv=1/9' => '#/485',
 'nv=10' => 'Nv/10',
 'nv=100' => 'Nv/100',
 'nv=1000' => 'Nv/1000',
 'nv=10000' => 'Nv/10000',
-'nv=100000' => '#/500',
-'nv=1000000' => '#/503',
-'nv=100000000' => '#/504',
-'nv=10000000000' => '#/505',
-'nv=1000000000000' => '#/506',
+'nv=100000' => '#/523',
+'nv=1000000' => '#/534',
+'nv=100000000' => '#/535',
+'nv=10000000000' => '#/536',
+'nv=1000000000000' => '#/537',
 'nv=11' => 'Nv/11',
-'nv=11/2' => '#/481',
+'nv=11/12' => '#/515',
+'nv=11/2' => '#/501',
 'nv=12' => 'Nv/12',
 'nv=13' => 'Nv/13',
-'nv=13/2' => '#/482',
+'nv=13/2' => '#/502',
 'nv=14' => 'Nv/14',
 'nv=15' => 'Nv/15',
-'nv=15/2' => '#/483',
+'nv=15/2' => '#/503',
 'nv=16' => 'Nv/16',
 'nv=17' => 'Nv/17',
-'nv=17/2' => '#/484',
+'nv=17/2' => '#/504',
 'nv=18' => 'Nv/18',
 'nv=19' => 'Nv/19',
 'nv=2' => 'Nv/2',
 'nv=2/3' => 'Nv/2_3',
-'nv=2/5' => '#/462',
+'nv=2/5' => '#/486',
 'nv=20' => 'Nv/20',
-'nv=200' => '#/463',
-'nv=2000' => '#/485',
-'nv=20000' => '#/493',
-'nv=21' => '#/431',
-'nv=216000' => '#/501',
-'nv=22' => '#/432',
-'nv=23' => '#/433',
-'nv=24' => '#/434',
-'nv=25' => '#/435',
-'nv=26' => '#/436',
-'nv=27' => '#/437',
-'nv=28' => '#/438',
-'nv=29' => '#/439',
+'nv=200' => 'Nv/200',
+'nv=2000' => '#/505',
+'nv=20000' => '#/516',
+'nv=200000' => '#/524',
+'nv=21' => '#/455',
+'nv=216000' => '#/525',
+'nv=22' => '#/456',
+'nv=23' => '#/457',
+'nv=24' => '#/458',
+'nv=25' => '#/459',
+'nv=26' => '#/460',
+'nv=27' => '#/461',
+'nv=28' => '#/462',
+'nv=29' => '#/463',
 'nv=3' => 'Nv/3',
-'nv=3/16' => '#/486',
-'nv=3/2' => '#/464',
+'nv=3/16' => '#/506',
+'nv=3/2' => '#/487',
 'nv=3/4' => 'Nv/3_4',
-'nv=3/5' => '#/465',
-'nv=3/8' => '#/466',
+'nv=3/5' => '#/488',
+'nv=3/8' => '#/489',
 'nv=30' => 'Nv/30',
 'nv=300' => 'Nv/300',
-'nv=3000' => '#/487',
-'nv=30000' => '#/494',
-'nv=31' => '#/440',
-'nv=32' => '#/441',
-'nv=33' => '#/442',
-'nv=34' => '#/443',
-'nv=35' => '#/444',
-'nv=36' => '#/445',
-'nv=37' => '#/446',
-'nv=38' => '#/447',
-'nv=39' => '#/448',
+'nv=3000' => '#/507',
+'nv=30000' => '#/517',
+'nv=300000' => '#/526',
+'nv=31' => '#/464',
+'nv=32' => '#/465',
+'nv=33' => '#/466',
+'nv=34' => '#/467',
+'nv=35' => '#/468',
+'nv=36' => '#/469',
+'nv=37' => '#/470',
+'nv=38' => '#/471',
+'nv=39' => '#/472',
 'nv=4' => 'Nv/4',
-'nv=4/5' => '#/467',
+'nv=4/5' => '#/490',
 'nv=40' => 'Nv/40',
-'nv=400' => '#/468',
-'nv=4000' => '#/488',
-'nv=40000' => '#/495',
-'nv=41' => '#/449',
-'nv=42' => '#/450',
-'nv=43' => '#/451',
-'nv=432000' => '#/502',
-'nv=44' => '#/452',
-'nv=45' => '#/453',
-'nv=46' => '#/454',
-'nv=47' => '#/455',
-'nv=48' => '#/456',
-'nv=49' => '#/457',
+'nv=400' => 'Nv/400',
+'nv=4000' => '#/508',
+'nv=40000' => '#/518',
+'nv=400000' => '#/527',
+'nv=41' => '#/473',
+'nv=42' => '#/474',
+'nv=43' => '#/475',
+'nv=432000' => '#/528',
+'nv=44' => '#/476',
+'nv=45' => '#/477',
+'nv=46' => '#/478',
+'nv=47' => '#/479',
+'nv=48' => '#/480',
+'nv=49' => '#/481',
 'nv=5' => 'Nv/5',
-'nv=5/2' => '#/469',
-'nv=5/6' => '#/470',
-'nv=5/8' => '#/471',
+'nv=5/12' => '#/509',
+'nv=5/2' => '#/491',
+'nv=5/6' => '#/492',
+'nv=5/8' => '#/493',
 'nv=50' => 'Nv/50',
 'nv=500' => 'Nv/500',
 'nv=5000' => 'Nv/5000',
 'nv=50000' => 'Nv/50000',
+'nv=500000' => '#/529',
 'nv=6' => 'Nv/6',
 'nv=60' => 'Nv/60',
-'nv=600' => '#/472',
-'nv=6000' => '#/489',
-'nv=60000' => '#/496',
+'nv=600' => 'Nv/600',
+'nv=6000' => '#/510',
+'nv=60000' => '#/519',
+'nv=600000' => '#/530',
 'nv=7' => 'Nv/7',
-'nv=7/2' => '#/473',
-'nv=7/8' => '#/474',
+'nv=7/12' => '#/511',
+'nv=7/2' => '#/494',
+'nv=7/8' => '#/495',
 'nv=70' => 'Nv/70',
-'nv=700' => '#/475',
-'nv=7000' => '#/490',
-'nv=70000' => '#/497',
+'nv=700' => 'Nv/700',
+'nv=7000' => '#/512',
+'nv=70000' => '#/520',
+'nv=700000' => '#/531',
 'nv=8' => 'Nv/8',
 'nv=80' => 'Nv/80',
-'nv=800' => '#/476',
-'nv=8000' => '#/491',
-'nv=80000' => '#/498',
+'nv=800' => 'Nv/800',
+'nv=8000' => '#/513',
+'nv=80000' => '#/521',
+'nv=800000' => '#/532',
 'nv=9' => 'Nv/9',
-'nv=9/2' => '#/477',
+'nv=9/2' => '#/496',
 'nv=90' => 'Nv/90',
 'nv=900' => 'Nv/900',
-'nv=9000' => '#/492',
-'nv=90000' => '#/499',
+'nv=9000' => '#/514',
+'nv=90000' => '#/522',
+'nv=900000' => '#/533',
 );
 
 # Maps property, table to file for those using loose matching.  For paths
 # whose directory is '#', the file is in the form of a numeric index into
 # @inline_definitions
 %utf8::loose_to_file_of = (
-'aegeannumbers' => '#/281',
+'aegeannumbers' => '#/304',
 'age=na' => 'Age/NA',
 'age=unassigned' => 'Age/NA',
 'age=v11' => 'Age/V11',
 'age=v20' => 'Age/V20',
-'age=v21' => '#/75',
+'age=v21' => '#/92',
 'age=v30' => 'Age/V30',
 'age=v31' => 'Age/V31',
 'age=v32' => 'Age/V32',
@@ -2590,21 +2765,23 @@
 'age=v52' => 'Age/V52',
 'age=v60' => 'Age/V60',
 'age=v61' => 'Age/V61',
-'age=v62' => '#/76',
-'age=v63' => '#/77',
+'age=v62' => '#/93',
+'age=v63' => '#/94',
 'age=v70' => 'Age/V70',
-'aghb' => '#/511',
-'ahex' => '#/59',
-'ahex=f' => '#/!59',
-'ahex=false' => '#/!59',
-'ahex=n' => '#/!59',
-'ahex=no' => '#/!59',
-'ahex=t' => '#/59',
-'ahex=true' => '#/59',
-'ahex=y' => '#/59',
-'ahex=yes' => '#/59',
-'alchemical' => '#/229',
-'alchemicalsymbols' => '#/229',
+'age=v80' => 'Age/V80',
+'aghb' => '#/542',
+'ahex' => '#/60',
+'ahex=f' => '#/!60',
+'ahex=false' => '#/!60',
+'ahex=n' => '#/!60',
+'ahex=no' => '#/!60',
+'ahex=t' => '#/60',
+'ahex=true' => '#/60',
+'ahex=y' => '#/60',
+'ahex=yes' => '#/60',
+'ahom' => '#/543',
+'alchemical' => '#/250',
+'alchemicalsymbols' => '#/250',
 'all' => '#/1',
 'alnum' => 'Perl/Alnum',
 'alpha' => 'Alpha/Y',
@@ -2617,45 +2794,46 @@
 'alpha=y' => 'Alpha/Y',
 'alpha=yes' => 'Alpha/Y',
 'alphabetic' => 'Alpha/Y',
-'alphabeticpf' => '#/271',
-'alphabeticpresentationforms' => '#/271',
-'ancientgreekmusic' => '#/320',
-'ancientgreekmusicalnotation' => '#/320',
-'ancientgreeknumbers' => '#/327',
-'ancientsymbols' => '#/288',
+'alphabeticpf' => '#/293',
+'alphabeticpresentationforms' => '#/293',
+'anatolianhieroglyphs' => '#/565',
+'ancientgreekmusic' => '#/343',
+'ancientgreekmusicalnotation' => '#/343',
+'ancientgreeknumbers' => '#/351',
+'ancientsymbols' => '#/311',
 'any' => '#/2',
 'arab' => 'Sc/Arab',
 'arabic' => 'Sc/Arab',
-'arabicexta' => '#/230',
-'arabicextendeda' => '#/230',
-'arabicmath' => '#/231',
-'arabicmathematicalalphabeticsymbols' => '#/231',
-'arabicpfa' => '#/205',
-'arabicpfb' => '#/206',
-'arabicpresentationformsa' => '#/205',
-'arabicpresentationformsb' => '#/206',
-'arabicsup' => '#/207',
-'arabicsupplement' => '#/207',
+'arabicexta' => '#/251',
+'arabicextendeda' => '#/251',
+'arabicmath' => '#/252',
+'arabicmathematicalalphabeticsymbols' => '#/252',
+'arabicpfa' => '#/226',
+'arabicpfb' => '#/227',
+'arabicpresentationformsa' => '#/226',
+'arabicpresentationformsb' => '#/227',
+'arabicsup' => '#/228',
+'arabicsupplement' => '#/228',
 'armenian' => 'Sc/Armn',
-'armi' => '#/512',
+'armi' => '#/544',
 'armn' => 'Sc/Armn',
-'arrows' => '#/122',
-'ascii' => '#/106',
-'asciihexdigit' => '#/59',
+'arrows' => '#/140',
+'ascii' => '#/124',
+'asciihexdigit' => '#/60',
 'assigned' => 'Perl/Assigned',
-'avestan' => '#/513',
-'avst' => '#/513',
-'bali' => '#/514',
-'balinese' => '#/514',
-'bamu' => '#/515',
-'bamum' => '#/515',
-'bamumsup' => '#/180',
-'bamumsupplement' => '#/180',
-'basiclatin' => '#/106',
-'bass' => '#/516',
-'bassavah' => '#/516',
-'batak' => '#/517',
-'batk' => '#/517',
+'avestan' => '#/545',
+'avst' => '#/545',
+'bali' => '#/546',
+'balinese' => '#/546',
+'bamu' => '#/547',
+'bamum' => '#/547',
+'bamumsup' => '#/201',
+'bamumsupplement' => '#/201',
+'basiclatin' => '#/124',
+'bass' => '#/548',
+'bassavah' => '#/548',
+'batak' => '#/549',
+'batk' => '#/549',
 'bc=al' => 'Bc/AL',
 'bc=an' => 'Bc/AN',
 'bc=arabicletter' => 'Bc/AL',
@@ -2671,35 +2849,35 @@
 'bc=europeannumber' => 'Bc/EN',
 'bc=europeanseparator' => 'Bc/ES',
 'bc=europeanterminator' => 'Bc/ET',
-'bc=firststrongisolate' => '#/79',
-'bc=fsi' => '#/79',
+'bc=firststrongisolate' => '#/96',
+'bc=fsi' => '#/96',
 'bc=l' => 'Bc/L',
 'bc=lefttoright' => 'Bc/L',
-'bc=lefttorightembedding' => '#/80',
-'bc=lefttorightisolate' => '#/81',
-'bc=lefttorightoverride' => '#/82',
-'bc=lre' => '#/80',
-'bc=lri' => '#/81',
-'bc=lro' => '#/82',
+'bc=lefttorightembedding' => '#/97',
+'bc=lefttorightisolate' => '#/98',
+'bc=lefttorightoverride' => '#/99',
+'bc=lre' => '#/97',
+'bc=lri' => '#/98',
+'bc=lro' => '#/99',
 'bc=nonspacingmark' => 'Bc/NSM',
 'bc=nsm' => 'Bc/NSM',
 'bc=on' => 'Bc/ON',
 'bc=otherneutral' => 'Bc/ON',
 'bc=paragraphseparator' => 'Bc/B',
-'bc=pdf' => '#/83',
-'bc=pdi' => '#/84',
-'bc=popdirectionalformat' => '#/83',
-'bc=popdirectionalisolate' => '#/84',
+'bc=pdf' => '#/100',
+'bc=pdi' => '#/101',
+'bc=popdirectionalformat' => '#/100',
+'bc=popdirectionalisolate' => '#/101',
 'bc=r' => 'Bc/R',
 'bc=righttoleft' => 'Bc/R',
-'bc=righttoleftembedding' => '#/85',
-'bc=righttoleftisolate' => '#/86',
-'bc=righttoleftoverride' => '#/87',
-'bc=rle' => '#/85',
-'bc=rli' => '#/86',
-'bc=rlo' => '#/87',
-'bc=s' => '#/78',
-'bc=segmentseparator' => '#/78',
+'bc=righttoleftembedding' => '#/102',
+'bc=righttoleftisolate' => '#/103',
+'bc=righttoleftoverride' => '#/104',
+'bc=rle' => '#/102',
+'bc=rli' => '#/103',
+'bc=rlo' => '#/104',
+'bc=s' => '#/95',
+'bc=segmentseparator' => '#/95',
 'bc=whitespace' => 'Bc/WS',
 'bc=ws' => 'Bc/WS',
 'beng' => 'Sc/Beng',
@@ -2725,401 +2903,414 @@
 'bidim=yes' => 'BidiM/Y',
 'bidimirrored' => 'BidiM/Y',
 'blank' => 'Perl/Blank',
-'blk=aegeannumbers' => '#/281',
-'blk=alchemical' => '#/229',
-'blk=alchemicalsymbols' => '#/229',
-'blk=alphabeticpf' => '#/271',
-'blk=alphabeticpresentationforms' => '#/271',
-'blk=ancientgreekmusic' => '#/320',
-'blk=ancientgreekmusicalnotation' => '#/320',
-'blk=ancientgreeknumbers' => '#/327',
-'blk=ancientsymbols' => '#/288',
-'blk=arabic' => '#/121',
-'blk=arabicexta' => '#/230',
-'blk=arabicextendeda' => '#/230',
-'blk=arabicmath' => '#/231',
-'blk=arabicmathematicalalphabeticsymbols' => '#/231',
-'blk=arabicpfa' => '#/205',
-'blk=arabicpfb' => '#/206',
-'blk=arabicpresentationformsa' => '#/205',
-'blk=arabicpresentationformsb' => '#/206',
-'blk=arabicsup' => '#/207',
-'blk=arabicsupplement' => '#/207',
-'blk=armenian' => '#/178',
-'blk=arrows' => '#/122',
-'blk=ascii' => '#/106',
-'blk=avestan' => '#/145',
-'blk=balinese' => '#/179',
-'blk=bamum' => '#/107',
-'blk=bamumsup' => '#/180',
-'blk=bamumsupplement' => '#/180',
-'blk=basiclatin' => '#/106',
-'blk=bassavah' => '#/181',
-'blk=batak' => '#/108',
-'blk=bengali' => '#/146',
-'blk=blockelements' => '#/282',
-'blk=bopomofo' => '#/182',
-'blk=bopomofoext' => '#/250',
-'blk=bopomofoextended' => '#/250',
-'blk=boxdrawing' => '#/232',
-'blk=brahmi' => '#/123',
-'blk=braille' => '#/147',
-'blk=braillepatterns' => '#/147',
-'blk=buginese' => '#/183',
-'blk=buhid' => '#/109',
-'blk=byzantinemusic' => '#/289',
-'blk=byzantinemusicalsymbols' => '#/289',
-'blk=canadiansyllabics' => '#/105',
-'blk=carian' => '#/124',
-'blk=caucasianalbanian' => '#/321',
-'blk=chakma' => '#/125',
-'blk=cham' => '#/97',
-'blk=cherokee' => '#/184',
-'blk=cjk' => '#/89',
-'blk=cjkcompat' => '#/208',
-'blk=cjkcompatforms' => '#/290',
-'blk=cjkcompatibility' => '#/208',
-'blk=cjkcompatibilityforms' => '#/290',
-'blk=cjkcompatibilityideographs' => '#/328',
-'blk=cjkcompatibilityideographssupplement' => '#/336',
-'blk=cjkcompatideographs' => '#/328',
-'blk=cjkcompatideographssup' => '#/336',
-'blk=cjkexta' => '#/148',
-'blk=cjkextb' => '#/149',
-'blk=cjkextc' => '#/150',
-'blk=cjkextd' => '#/151',
-'blk=cjkradicalssup' => '#/291',
-'blk=cjkradicalssupplement' => '#/291',
-'blk=cjkstrokes' => '#/233',
-'blk=cjksymbols' => '#/234',
-'blk=cjksymbolsandpunctuation' => '#/234',
-'blk=cjkunifiedideographs' => '#/89',
-'blk=cjkunifiedideographsextensiona' => '#/148',
-'blk=cjkunifiedideographsextensionb' => '#/149',
-'blk=cjkunifiedideographsextensionc' => '#/150',
-'blk=cjkunifiedideographsextensiond' => '#/151',
-'blk=combiningdiacriticalmarks' => '#/274',
-'blk=combiningdiacriticalmarksextended' => '#/299',
-'blk=combiningdiacriticalmarksforsymbols' => '#/337',
-'blk=combiningdiacriticalmarkssupplement' => '#/300',
-'blk=combininghalfmarks' => '#/211',
-'blk=combiningmarksforsymbols' => '#/337',
-'blk=commonindicnumberforms' => '#/314',
-'blk=compatjamo' => '#/235',
-'blk=controlpictures' => '#/297',
-'blk=coptic' => '#/126',
-'blk=copticepactnumbers' => '#/323',
-'blk=countingrod' => '#/251',
-'blk=countingrodnumerals' => '#/251',
-'blk=cuneiform' => '#/209',
-'blk=cuneiformnumbers' => '#/309',
-'blk=cuneiformnumbersandpunctuation' => '#/309',
-'blk=currencysymbols' => '#/298',
-'blk=cypriotsyllabary' => '#/310',
-'blk=cyrillic' => '#/185',
-'blk=cyrillicexta' => '#/272',
-'blk=cyrillicextb' => '#/273',
-'blk=cyrillicextendeda' => '#/272',
-'blk=cyrillicextendedb' => '#/273',
-'blk=cyrillicsup' => '#/252',
-'blk=cyrillicsupplement' => '#/252',
-'blk=cyrillicsupplementary' => '#/252',
-'blk=deseret' => '#/152',
-'blk=devanagari' => '#/236',
-'blk=devanagariext' => '#/283',
-'blk=devanagariextended' => '#/283',
-'blk=diacriticals' => '#/274',
-'blk=diacriticalsext' => '#/299',
-'blk=diacriticalsforsymbols' => '#/337',
-'blk=diacriticalssup' => '#/300',
-'blk=dingbats' => '#/186',
-'blk=domino' => '#/127',
-'blk=dominotiles' => '#/127',
-'blk=duployan' => '#/187',
-'blk=egyptianhieroglyphs' => '#/329',
-'blk=elbasan' => '#/153',
-'blk=emoticons' => '#/210',
-'blk=enclosedalphanum' => '#/311',
-'blk=enclosedalphanumerics' => '#/311',
-'blk=enclosedalphanumericsupplement' => '#/330',
-'blk=enclosedalphanumsup' => '#/330',
-'blk=enclosedcjk' => '#/253',
-'blk=enclosedcjklettersandmonths' => '#/253',
-'blk=enclosedideographicsup' => '#/338',
-'blk=enclosedideographicsupplement' => '#/338',
-'blk=ethiopic' => '#/188',
-'blk=ethiopicext' => '#/254',
-'blk=ethiopicexta' => '#/275',
-'blk=ethiopicextended' => '#/254',
-'blk=ethiopicextendeda' => '#/275',
-'blk=ethiopicsup' => '#/255',
-'blk=ethiopicsupplement' => '#/255',
-'blk=generalpunctuation' => '#/265',
-'blk=geometricshapes' => '#/301',
-'blk=geometricshapesext' => '#/324',
-'blk=geometricshapesextended' => '#/324',
-'blk=georgian' => '#/189',
-'blk=georgiansup' => '#/256',
-'blk=georgiansupplement' => '#/256',
-'blk=glagolitic' => '#/237',
-'blk=gothic' => '#/128',
-'blk=grantha' => '#/154',
-'blk=greek' => '#/110',
-'blk=greekandcoptic' => '#/110',
-'blk=greekext' => '#/190',
-'blk=greekextended' => '#/190',
-'blk=gujarati' => '#/191',
-'blk=gurmukhi' => '#/192',
-'blk=halfandfullforms' => '#/312',
-'blk=halfmarks' => '#/211',
-'blk=halfwidthandfullwidthforms' => '#/312',
-'blk=hangul' => '#/129',
-'blk=hangulcompatibilityjamo' => '#/235',
-'blk=hanguljamo' => '#/98',
-'blk=hanguljamoextendeda' => '#/194',
-'blk=hanguljamoextendedb' => '#/195',
-'blk=hangulsyllables' => '#/129',
-'blk=hanunoo' => '#/155',
-'blk=hebrew' => '#/130',
-'blk=highprivateusesurrogates' => '#/313',
-'blk=highpusurrogates' => '#/313',
-'blk=highsurrogates' => '#/292',
-'blk=hiragana' => '#/193',
-'blk=idc' => '#/90',
-'blk=ideographicdescriptioncharacters' => '#/90',
-'blk=imperialaramaic' => '#/302',
-'blk=indicnumberforms' => '#/314',
-'blk=inscriptionalpahlavi' => '#/333',
-'blk=inscriptionalparthian' => '#/334',
-'blk=ipaext' => '#/131',
-'blk=ipaextensions' => '#/131',
-'blk=jamo' => '#/98',
-'blk=jamoexta' => '#/194',
-'blk=jamoextb' => '#/195',
-'blk=javanese' => '#/196',
-'blk=kaithi' => '#/132',
-'blk=kanasup' => '#/156',
-'blk=kanasupplement' => '#/156',
-'blk=kanbun' => '#/133',
-'blk=kangxi' => '#/134',
-'blk=kangxiradicals' => '#/134',
-'blk=kannada' => '#/157',
-'blk=katakana' => '#/197',
-'blk=katakanaext' => '#/257',
-'blk=katakanaphoneticextensions' => '#/257',
-'blk=kayahli' => '#/158',
-'blk=kharoshthi' => '#/238',
-'blk=khmer' => '#/111',
-'blk=khmersymbols' => '#/276',
-'blk=khojki' => '#/135',
-'blk=khudawadi' => '#/212',
-'blk=lao' => '#/91',
-'blk=latin1' => '#/136',
-'blk=latin1sup' => '#/136',
-'blk=latin1supplement' => '#/136',
-'blk=latinexta' => '#/213',
-'blk=latinextadditional' => '#/325',
-'blk=latinextb' => '#/214',
-'blk=latinextc' => '#/215',
-'blk=latinextd' => '#/216',
-'blk=latinexte' => '#/217',
-'blk=latinextendeda' => '#/213',
-'blk=latinextendedadditional' => '#/325',
-'blk=latinextendedb' => '#/214',
-'blk=latinextendedc' => '#/215',
-'blk=latinextendedd' => '#/216',
-'blk=latinextendede' => '#/217',
-'blk=lepcha' => '#/137',
-'blk=letterlikesymbols' => '#/322',
-'blk=limbu' => '#/112',
-'blk=lineara' => '#/159',
-'blk=linearbideograms' => '#/315',
-'blk=linearbsyllabary' => '#/316',
-'blk=lisu' => '#/99',
-'blk=lowsurrogates' => '#/284',
-'blk=lycian' => '#/138',
-'blk=lydian' => '#/139',
-'blk=mahajani' => '#/198',
-'blk=mahjong' => '#/160',
-'blk=mahjongtiles' => '#/160',
-'blk=malayalam' => '#/218',
-'blk=mandaic' => '#/161',
-'blk=manichaean' => '#/239',
-'blk=mathalphanum' => '#/277',
-'blk=mathematicalalphanumericsymbols' => '#/277',
-'blk=mathematicaloperators' => '#/285',
-'blk=mathoperators' => '#/285',
-'blk=meeteimayek' => '#/258',
-'blk=meeteimayekext' => '#/293',
-'blk=meeteimayekextensions' => '#/293',
-'blk=mendekikakui' => '#/278',
-'blk=meroiticcursive' => '#/303',
-'blk=meroitichieroglyphs' => '#/331',
-'blk=miao' => '#/100',
-'blk=miscarrows' => '#/240',
-'blk=miscellaneousmathematicalsymbolsa' => '#/317',
-'blk=miscellaneousmathematicalsymbolsb' => '#/318',
-'blk=miscellaneoussymbols' => '#/259',
-'blk=miscellaneoussymbolsandarrows' => '#/240',
-'blk=miscellaneoussymbolsandpictographs' => '#/304',
-'blk=miscellaneoustechnical' => '#/286',
-'blk=miscmathsymbolsa' => '#/317',
-'blk=miscmathsymbolsb' => '#/318',
-'blk=miscpictographs' => '#/304',
-'blk=miscsymbols' => '#/259',
-'blk=misctechnical' => '#/286',
-'blk=modi' => '#/101',
-'blk=modifierletters' => '#/305',
-'blk=modifiertoneletters' => '#/332',
-'blk=mongolian' => '#/219',
-'blk=mro' => '#/92',
-'blk=music' => '#/113',
-'blk=musicalsymbols' => '#/113',
-'blk=myanmar' => '#/162',
-'blk=myanmarexta' => '#/260',
-'blk=myanmarextb' => '#/261',
-'blk=myanmarextendeda' => '#/260',
-'blk=myanmarextendedb' => '#/261',
-'blk=nabataean' => '#/220',
+'blk=aegeannumbers' => '#/304',
+'blk=ahom' => '#/114',
+'blk=alchemical' => '#/250',
+'blk=alchemicalsymbols' => '#/250',
+'blk=alphabeticpf' => '#/293',
+'blk=alphabeticpresentationforms' => '#/293',
+'blk=anatolianhieroglyphs' => '#/357',
+'blk=ancientgreekmusic' => '#/343',
+'blk=ancientgreekmusicalnotation' => '#/343',
+'blk=ancientgreeknumbers' => '#/351',
+'blk=ancientsymbols' => '#/311',
+'blk=arabic' => '#/139',
+'blk=arabicexta' => '#/251',
+'blk=arabicextendeda' => '#/251',
+'blk=arabicmath' => '#/252',
+'blk=arabicmathematicalalphabeticsymbols' => '#/252',
+'blk=arabicpfa' => '#/226',
+'blk=arabicpfb' => '#/227',
+'blk=arabicpresentationformsa' => '#/226',
+'blk=arabicpresentationformsb' => '#/227',
+'blk=arabicsup' => '#/228',
+'blk=arabicsupplement' => '#/228',
+'blk=armenian' => '#/199',
+'blk=arrows' => '#/140',
+'blk=ascii' => '#/124',
+'blk=avestan' => '#/164',
+'blk=balinese' => '#/200',
+'blk=bamum' => '#/125',
+'blk=bamumsup' => '#/201',
+'blk=bamumsupplement' => '#/201',
+'blk=basiclatin' => '#/124',
+'blk=bassavah' => '#/202',
+'blk=batak' => '#/126',
+'blk=bengali' => '#/165',
+'blk=blockelements' => '#/305',
+'blk=bopomofo' => '#/203',
+'blk=bopomofoext' => '#/271',
+'blk=bopomofoextended' => '#/271',
+'blk=boxdrawing' => '#/253',
+'blk=brahmi' => '#/141',
+'blk=braille' => '#/166',
+'blk=braillepatterns' => '#/166',
+'blk=buginese' => '#/204',
+'blk=buhid' => '#/127',
+'blk=byzantinemusic' => '#/312',
+'blk=byzantinemusicalsymbols' => '#/312',
+'blk=canadiansyllabics' => '#/123',
+'blk=carian' => '#/142',
+'blk=caucasianalbanian' => '#/344',
+'blk=chakma' => '#/143',
+'blk=cham' => '#/115',
+'blk=cherokee' => '#/205',
+'blk=cherokeesup' => '#/272',
+'blk=cherokeesupplement' => '#/272',
+'blk=cjk' => '#/106',
+'blk=cjkcompat' => '#/229',
+'blk=cjkcompatforms' => '#/313',
+'blk=cjkcompatibility' => '#/229',
+'blk=cjkcompatibilityforms' => '#/313',
+'blk=cjkcompatibilityideographs' => '#/352',
+'blk=cjkcompatibilityideographssupplement' => '#/361',
+'blk=cjkcompatideographs' => '#/352',
+'blk=cjkcompatideographssup' => '#/361',
+'blk=cjkexta' => '#/167',
+'blk=cjkextb' => '#/168',
+'blk=cjkextc' => '#/169',
+'blk=cjkextd' => '#/170',
+'blk=cjkexte' => '#/171',
+'blk=cjkradicalssup' => '#/314',
+'blk=cjkradicalssupplement' => '#/314',
+'blk=cjkstrokes' => '#/254',
+'blk=cjksymbols' => '#/255',
+'blk=cjksymbolsandpunctuation' => '#/255',
+'blk=cjkunifiedideographs' => '#/106',
+'blk=cjkunifiedideographsextensiona' => '#/167',
+'blk=cjkunifiedideographsextensionb' => '#/168',
+'blk=cjkunifiedideographsextensionc' => '#/169',
+'blk=cjkunifiedideographsextensiond' => '#/170',
+'blk=cjkunifiedideographsextensione' => '#/171',
+'blk=combiningdiacriticalmarks' => '#/296',
+'blk=combiningdiacriticalmarksextended' => '#/322',
+'blk=combiningdiacriticalmarksforsymbols' => '#/362',
+'blk=combiningdiacriticalmarkssupplement' => '#/323',
+'blk=combininghalfmarks' => '#/232',
+'blk=combiningmarksforsymbols' => '#/362',
+'blk=commonindicnumberforms' => '#/337',
+'blk=compatjamo' => '#/256',
+'blk=controlpictures' => '#/320',
+'blk=coptic' => '#/144',
+'blk=copticepactnumbers' => '#/347',
+'blk=countingrod' => '#/273',
+'blk=countingrodnumerals' => '#/273',
+'blk=cuneiform' => '#/230',
+'blk=cuneiformnumbers' => '#/332',
+'blk=cuneiformnumbersandpunctuation' => '#/332',
+'blk=currencysymbols' => '#/321',
+'blk=cypriotsyllabary' => '#/333',
+'blk=cyrillic' => '#/206',
+'blk=cyrillicexta' => '#/294',
+'blk=cyrillicextb' => '#/295',
+'blk=cyrillicextendeda' => '#/294',
+'blk=cyrillicextendedb' => '#/295',
+'blk=cyrillicsup' => '#/274',
+'blk=cyrillicsupplement' => '#/274',
+'blk=cyrillicsupplementary' => '#/274',
+'blk=deseret' => '#/172',
+'blk=devanagari' => '#/257',
+'blk=devanagariext' => '#/306',
+'blk=devanagariextended' => '#/306',
+'blk=diacriticals' => '#/296',
+'blk=diacriticalsext' => '#/322',
+'blk=diacriticalsforsymbols' => '#/362',
+'blk=diacriticalssup' => '#/323',
+'blk=dingbats' => '#/207',
+'blk=domino' => '#/145',
+'blk=dominotiles' => '#/145',
+'blk=duployan' => '#/208',
+'blk=earlydynasticcuneiform' => '#/363',
+'blk=egyptianhieroglyphs' => '#/353',
+'blk=elbasan' => '#/173',
+'blk=emoticons' => '#/231',
+'blk=enclosedalphanum' => '#/334',
+'blk=enclosedalphanumerics' => '#/334',
+'blk=enclosedalphanumericsupplement' => '#/354',
+'blk=enclosedalphanumsup' => '#/354',
+'blk=enclosedcjk' => '#/275',
+'blk=enclosedcjklettersandmonths' => '#/275',
+'blk=enclosedideographicsup' => '#/364',
+'blk=enclosedideographicsupplement' => '#/364',
+'blk=ethiopic' => '#/209',
+'blk=ethiopicext' => '#/276',
+'blk=ethiopicexta' => '#/297',
+'blk=ethiopicextended' => '#/276',
+'blk=ethiopicextendeda' => '#/297',
+'blk=ethiopicsup' => '#/277',
+'blk=ethiopicsupplement' => '#/277',
+'blk=generalpunctuation' => '#/287',
+'blk=geometricshapes' => '#/324',
+'blk=geometricshapesext' => '#/348',
+'blk=geometricshapesextended' => '#/348',
+'blk=georgian' => '#/210',
+'blk=georgiansup' => '#/278',
+'blk=georgiansupplement' => '#/278',
+'blk=glagolitic' => '#/258',
+'blk=gothic' => '#/146',
+'blk=grantha' => '#/174',
+'blk=greek' => '#/128',
+'blk=greekandcoptic' => '#/128',
+'blk=greekext' => '#/211',
+'blk=greekextended' => '#/211',
+'blk=gujarati' => '#/212',
+'blk=gurmukhi' => '#/213',
+'blk=halfandfullforms' => '#/335',
+'blk=halfmarks' => '#/232',
+'blk=halfwidthandfullwidthforms' => '#/335',
+'blk=hangul' => '#/147',
+'blk=hangulcompatibilityjamo' => '#/256',
+'blk=hanguljamo' => '#/116',
+'blk=hanguljamoextendeda' => '#/215',
+'blk=hanguljamoextendedb' => '#/216',
+'blk=hangulsyllables' => '#/147',
+'blk=hanunoo' => '#/175',
+'blk=hatran' => '#/148',
+'blk=hebrew' => '#/149',
+'blk=highprivateusesurrogates' => '#/336',
+'blk=highpusurrogates' => '#/336',
+'blk=highsurrogates' => '#/315',
+'blk=hiragana' => '#/214',
+'blk=idc' => '#/107',
+'blk=ideographicdescriptioncharacters' => '#/107',
+'blk=imperialaramaic' => '#/325',
+'blk=indicnumberforms' => '#/337',
+'blk=inscriptionalpahlavi' => '#/358',
+'blk=inscriptionalparthian' => '#/359',
+'blk=ipaext' => '#/150',
+'blk=ipaextensions' => '#/150',
+'blk=jamo' => '#/116',
+'blk=jamoexta' => '#/215',
+'blk=jamoextb' => '#/216',
+'blk=javanese' => '#/217',
+'blk=kaithi' => '#/151',
+'blk=kanasup' => '#/176',
+'blk=kanasupplement' => '#/176',
+'blk=kanbun' => '#/152',
+'blk=kangxi' => '#/153',
+'blk=kangxiradicals' => '#/153',
+'blk=kannada' => '#/177',
+'blk=katakana' => '#/218',
+'blk=katakanaext' => '#/279',
+'blk=katakanaphoneticextensions' => '#/279',
+'blk=kayahli' => '#/178',
+'blk=kharoshthi' => '#/259',
+'blk=khmer' => '#/129',
+'blk=khmersymbols' => '#/298',
+'blk=khojki' => '#/154',
+'blk=khudawadi' => '#/233',
+'blk=lao' => '#/108',
+'blk=latin1' => '#/155',
+'blk=latin1sup' => '#/155',
+'blk=latin1supplement' => '#/155',
+'blk=latinexta' => '#/234',
+'blk=latinextadditional' => '#/349',
+'blk=latinextb' => '#/235',
+'blk=latinextc' => '#/236',
+'blk=latinextd' => '#/237',
+'blk=latinexte' => '#/238',
+'blk=latinextendeda' => '#/234',
+'blk=latinextendedadditional' => '#/349',
+'blk=latinextendedb' => '#/235',
+'blk=latinextendedc' => '#/236',
+'blk=latinextendedd' => '#/237',
+'blk=latinextendede' => '#/238',
+'blk=lepcha' => '#/156',
+'blk=letterlikesymbols' => '#/345',
+'blk=limbu' => '#/130',
+'blk=lineara' => '#/179',
+'blk=linearbideograms' => '#/338',
+'blk=linearbsyllabary' => '#/339',
+'blk=lisu' => '#/117',
+'blk=lowsurrogates' => '#/307',
+'blk=lycian' => '#/157',
+'blk=lydian' => '#/158',
+'blk=mahajani' => '#/219',
+'blk=mahjong' => '#/180',
+'blk=mahjongtiles' => '#/180',
+'blk=malayalam' => '#/239',
+'blk=mandaic' => '#/181',
+'blk=manichaean' => '#/260',
+'blk=mathalphanum' => '#/299',
+'blk=mathematicalalphanumericsymbols' => '#/299',
+'blk=mathematicaloperators' => '#/308',
+'blk=mathoperators' => '#/308',
+'blk=meeteimayek' => '#/280',
+'blk=meeteimayekext' => '#/316',
+'blk=meeteimayekextensions' => '#/316',
+'blk=mendekikakui' => '#/300',
+'blk=meroiticcursive' => '#/326',
+'blk=meroitichieroglyphs' => '#/355',
+'blk=miao' => '#/118',
+'blk=miscarrows' => '#/261',
+'blk=miscellaneousmathematicalsymbolsa' => '#/340',
+'blk=miscellaneousmathematicalsymbolsb' => '#/341',
+'blk=miscellaneoussymbols' => '#/281',
+'blk=miscellaneoussymbolsandarrows' => '#/261',
+'blk=miscellaneoussymbolsandpictographs' => '#/327',
+'blk=miscellaneoustechnical' => '#/309',
+'blk=miscmathsymbolsa' => '#/340',
+'blk=miscmathsymbolsb' => '#/341',
+'blk=miscpictographs' => '#/327',
+'blk=miscsymbols' => '#/281',
+'blk=misctechnical' => '#/309',
+'blk=modi' => '#/119',
+'blk=modifierletters' => '#/328',
+'blk=modifiertoneletters' => '#/356',
+'blk=mongolian' => '#/240',
+'blk=mro' => '#/109',
+'blk=multani' => '#/182',
+'blk=music' => '#/131',
+'blk=musicalsymbols' => '#/131',
+'blk=myanmar' => '#/183',
+'blk=myanmarexta' => '#/282',
+'blk=myanmarextb' => '#/283',
+'blk=myanmarextendeda' => '#/282',
+'blk=myanmarextendedb' => '#/283',
+'blk=nabataean' => '#/241',
 'blk=nb' => 'Blk/NB',
-'blk=newtailue' => '#/221',
-'blk=nko' => '#/93',
+'blk=newtailue' => '#/242',
+'blk=nko' => '#/110',
 'blk=noblock' => 'Blk/NB',
-'blk=numberforms' => '#/262',
-'blk=ocr' => '#/94',
-'blk=ogham' => '#/114',
-'blk=olchiki' => '#/163',
-'blk=olditalic' => '#/222',
-'blk=oldnortharabian' => '#/306',
-'blk=oldpermic' => '#/223',
-'blk=oldpersian' => '#/241',
-'blk=oldsoutharabian' => '#/307',
-'blk=oldturkic' => '#/224',
-'blk=opticalcharacterrecognition' => '#/94',
-'blk=oriya' => '#/115',
-'blk=ornamentaldingbats' => '#/326',
-'blk=osmanya' => '#/164',
-'blk=pahawhhmong' => '#/263',
-'blk=palmyrene' => '#/225',
-'blk=paucinhau' => '#/226',
-'blk=phagspa' => '#/165',
-'blk=phaistos' => '#/199',
-'blk=phaistosdisc' => '#/199',
-'blk=phoenician' => '#/242',
-'blk=phoneticext' => '#/264',
-'blk=phoneticextensions' => '#/264',
-'blk=phoneticextensionssupplement' => '#/294',
-'blk=phoneticextsup' => '#/294',
-'blk=playingcards' => '#/279',
-'blk=privateuse' => '#/95',
-'blk=privateusearea' => '#/95',
-'blk=psalterpahlavi' => '#/295',
-'blk=pua' => '#/95',
-'blk=punctuation' => '#/265',
-'blk=rejang' => '#/140',
-'blk=rumi' => '#/102',
-'blk=ruminumeralsymbols' => '#/102',
-'blk=runic' => '#/116',
-'blk=samaritan' => '#/227',
-'blk=saurashtra' => '#/243',
-'blk=sharada' => '#/166',
-'blk=shavian' => '#/167',
-'blk=shorthandformatcontrols' => '#/339',
-'blk=siddham' => '#/168',
-'blk=sinhala' => '#/169',
-'blk=sinhalaarchaicnumbers' => '#/335',
-'blk=smallforms' => '#/244',
-'blk=smallformvariants' => '#/244',
-'blk=sorasompeng' => '#/266',
-'blk=spacingmodifierletters' => '#/305',
-'blk=specials' => '#/200',
-'blk=sundanese' => '#/228',
-'blk=sundanesesup' => '#/280',
-'blk=sundanesesupplement' => '#/280',
-'blk=suparrowsa' => '#/245',
-'blk=suparrowsb' => '#/246',
-'blk=suparrowsc' => '#/247',
-'blk=superandsub' => '#/267',
-'blk=superscriptsandsubscripts' => '#/267',
-'blk=supmathoperators' => '#/319',
-'blk=supplementalarrowsa' => '#/245',
-'blk=supplementalarrowsb' => '#/246',
-'blk=supplementalarrowsc' => '#/247',
-'blk=supplementalmathematicaloperators' => '#/319',
-'blk=supplementalpunctuation' => '#/296',
-'blk=supplementaryprivateuseareaa' => '#/170',
-'blk=supplementaryprivateuseareab' => '#/171',
-'blk=suppuaa' => '#/170',
-'blk=suppuab' => '#/171',
-'blk=suppunctuation' => '#/296',
-'blk=sylotinagri' => '#/268',
-'blk=syriac' => '#/141',
-'blk=tagalog' => '#/172',
-'blk=tagbanwa' => '#/201',
-'blk=tags' => '#/103',
-'blk=taile' => '#/117',
-'blk=taitham' => '#/173',
-'blk=taiviet' => '#/174',
-'blk=taixuanjing' => '#/269',
-'blk=taixuanjingsymbols' => '#/269',
-'blk=takri' => '#/118',
-'blk=tamil' => '#/119',
-'blk=telugu' => '#/142',
-'blk=thaana' => '#/143',
-'blk=thai' => '#/104',
-'blk=tibetan' => '#/175',
-'blk=tifinagh' => '#/202',
-'blk=tirhuta' => '#/176',
-'blk=transportandmap' => '#/308',
-'blk=transportandmapsymbols' => '#/308',
-'blk=ucas' => '#/105',
-'blk=ucasext' => '#/177',
-'blk=ugaritic' => '#/203',
-'blk=unifiedcanadianaboriginalsyllabics' => '#/105',
-'blk=unifiedcanadianaboriginalsyllabicsextended' => '#/177',
-'blk=vai' => '#/96',
-'blk=variationselectors' => '#/88',
-'blk=variationselectorssupplement' => '#/120',
-'blk=vedicext' => '#/204',
-'blk=vedicextensions' => '#/204',
-'blk=verticalforms' => '#/287',
-'blk=vs' => '#/88',
-'blk=vssup' => '#/120',
-'blk=warangciti' => '#/248',
-'blk=yijing' => '#/144',
-'blk=yijinghexagramsymbols' => '#/144',
-'blk=yiradicals' => '#/249',
-'blk=yisyllables' => '#/270',
-'blockelements' => '#/282',
-'bopo' => '#/518',
-'bopomofo' => '#/518',
-'bopomofoext' => '#/250',
-'bopomofoextended' => '#/250',
-'boxdrawing' => '#/232',
+'blk=numberforms' => '#/284',
+'blk=ocr' => '#/111',
+'blk=ogham' => '#/132',
+'blk=olchiki' => '#/184',
+'blk=oldhungarian' => '#/301',
+'blk=olditalic' => '#/243',
+'blk=oldnortharabian' => '#/329',
+'blk=oldpermic' => '#/244',
+'blk=oldpersian' => '#/262',
+'blk=oldsoutharabian' => '#/330',
+'blk=oldturkic' => '#/245',
+'blk=opticalcharacterrecognition' => '#/111',
+'blk=oriya' => '#/133',
+'blk=ornamentaldingbats' => '#/350',
+'blk=osmanya' => '#/185',
+'blk=pahawhhmong' => '#/285',
+'blk=palmyrene' => '#/246',
+'blk=paucinhau' => '#/247',
+'blk=phagspa' => '#/186',
+'blk=phaistos' => '#/220',
+'blk=phaistosdisc' => '#/220',
+'blk=phoenician' => '#/263',
+'blk=phoneticext' => '#/286',
+'blk=phoneticextensions' => '#/286',
+'blk=phoneticextensionssupplement' => '#/317',
+'blk=phoneticextsup' => '#/317',
+'blk=playingcards' => '#/302',
+'blk=privateuse' => '#/112',
+'blk=privateusearea' => '#/112',
+'blk=psalterpahlavi' => '#/318',
+'blk=pua' => '#/112',
+'blk=punctuation' => '#/287',
+'blk=rejang' => '#/159',
+'blk=rumi' => '#/120',
+'blk=ruminumeralsymbols' => '#/120',
+'blk=runic' => '#/134',
+'blk=samaritan' => '#/248',
+'blk=saurashtra' => '#/264',
+'blk=sharada' => '#/187',
+'blk=shavian' => '#/188',
+'blk=shorthandformatcontrols' => '#/365',
+'blk=siddham' => '#/189',
+'blk=sinhala' => '#/190',
+'blk=sinhalaarchaicnumbers' => '#/360',
+'blk=smallforms' => '#/265',
+'blk=smallformvariants' => '#/265',
+'blk=sorasompeng' => '#/288',
+'blk=spacingmodifierletters' => '#/328',
+'blk=specials' => '#/221',
+'blk=sundanese' => '#/249',
+'blk=sundanesesup' => '#/303',
+'blk=sundanesesupplement' => '#/303',
+'blk=suparrowsa' => '#/266',
+'blk=suparrowsb' => '#/267',
+'blk=suparrowsc' => '#/268',
+'blk=superandsub' => '#/289',
+'blk=superscriptsandsubscripts' => '#/289',
+'blk=supmathoperators' => '#/342',
+'blk=supplementalarrowsa' => '#/266',
+'blk=supplementalarrowsb' => '#/267',
+'blk=supplementalarrowsc' => '#/268',
+'blk=supplementalmathematicaloperators' => '#/342',
+'blk=supplementalpunctuation' => '#/319',
+'blk=supplementalsymbolsandpictographs' => '#/366',
+'blk=supplementaryprivateuseareaa' => '#/191',
+'blk=supplementaryprivateuseareab' => '#/192',
+'blk=suppuaa' => '#/191',
+'blk=suppuab' => '#/192',
+'blk=suppunctuation' => '#/319',
+'blk=supsymbolsandpictographs' => '#/366',
+'blk=suttonsignwriting' => '#/346',
+'blk=sylotinagri' => '#/290',
+'blk=syriac' => '#/160',
+'blk=tagalog' => '#/193',
+'blk=tagbanwa' => '#/222',
+'blk=tags' => '#/121',
+'blk=taile' => '#/135',
+'blk=taitham' => '#/194',
+'blk=taiviet' => '#/195',
+'blk=taixuanjing' => '#/291',
+'blk=taixuanjingsymbols' => '#/291',
+'blk=takri' => '#/136',
+'blk=tamil' => '#/137',
+'blk=telugu' => '#/161',
+'blk=thaana' => '#/162',
+'blk=thai' => '#/122',
+'blk=tibetan' => '#/196',
+'blk=tifinagh' => '#/223',
+'blk=tirhuta' => '#/197',
+'blk=transportandmap' => '#/331',
+'blk=transportandmapsymbols' => '#/331',
+'blk=ucas' => '#/123',
+'blk=ucasext' => '#/198',
+'blk=ugaritic' => '#/224',
+'blk=unifiedcanadianaboriginalsyllabics' => '#/123',
+'blk=unifiedcanadianaboriginalsyllabicsextended' => '#/198',
+'blk=vai' => '#/113',
+'blk=variationselectors' => '#/105',
+'blk=variationselectorssupplement' => '#/138',
+'blk=vedicext' => '#/225',
+'blk=vedicextensions' => '#/225',
+'blk=verticalforms' => '#/310',
+'blk=vs' => '#/105',
+'blk=vssup' => '#/138',
+'blk=warangciti' => '#/269',
+'blk=yijing' => '#/163',
+'blk=yijinghexagramsymbols' => '#/163',
+'blk=yiradicals' => '#/270',
+'blk=yisyllables' => '#/292',
+'blockelements' => '#/305',
+'bopo' => '#/550',
+'bopomofo' => '#/550',
+'bopomofoext' => '#/271',
+'bopomofoextended' => '#/271',
+'boxdrawing' => '#/253',
 'bpt=c' => 'Bpt/C',
 'bpt=close' => 'Bpt/C',
 'bpt=n' => 'Bpt/N',
 'bpt=none' => 'Bpt/N',
 'bpt=o' => 'Bpt/O',
 'bpt=open' => 'Bpt/O',
-'brah' => '#/519',
-'brahmi' => '#/519',
-'brai' => '#/147',
-'braille' => '#/147',
-'braillepatterns' => '#/147',
-'bugi' => '#/520',
-'buginese' => '#/520',
-'buhd' => '#/521',
-'buhid' => '#/521',
-'byzantinemusic' => '#/289',
-'byzantinemusicalsymbols' => '#/289',
+'brah' => '#/551',
+'brahmi' => '#/551',
+'brai' => '#/166',
+'braille' => '#/166',
+'braillepatterns' => '#/166',
+'bugi' => '#/552',
+'buginese' => '#/552',
+'buhd' => '#/553',
+'buhid' => '#/553',
+'byzantinemusic' => '#/312',
+'byzantinemusicalsymbols' => '#/312',
 'c' => 'Gc/C',
-'cakm' => '#/522',
-'canadianaboriginal' => '#/523',
-'canadiansyllabics' => '#/105',
-'cans' => '#/523',
-'cari' => '#/524',
-'carian' => '#/524',
+'cakm' => '#/554',
+'canadianaboriginal' => '#/555',
+'canadiansyllabics' => '#/123',
+'cans' => '#/555',
+'cari' => '#/556',
+'carian' => '#/556',
 'cased' => 'Cased/Y',
 'cased=f' => '!Cased/Y',
 'cased=false' => '!Cased/Y',
@@ -3131,83 +3322,83 @@
 'cased=yes' => 'Cased/Y',
 'casedletter' => 'Gc/LC',
 'caseignorable' => 'CI/Y',
-'caucasianalbanian' => '#/511',
-'cc' => '#/343',
+'caucasianalbanian' => '#/542',
+'cc' => '#/370',
 'ccc=a' => 'Ccc/A',
 'ccc=above' => 'Ccc/A',
-'ccc=aboveleft' => '#/16',
+'ccc=aboveleft' => '#/17',
 'ccc=aboveright' => 'Ccc/AR',
-'ccc=al' => '#/16',
+'ccc=al' => '#/17',
 'ccc=ar' => 'Ccc/AR',
-'ccc=ata' => '#/21',
+'ccc=ata' => '#/22',
 'ccc=atar' => 'Ccc/ATAR',
-'ccc=atb' => '#/22',
+'ccc=atb' => '#/23',
 'ccc=atbl' => '#/0',
-'ccc=attachedabove' => '#/21',
+'ccc=attachedabove' => '#/22',
 'ccc=attachedaboveright' => 'Ccc/ATAR',
-'ccc=attachedbelow' => '#/22',
+'ccc=attachedbelow' => '#/23',
 'ccc=attachedbelowleft' => '#/0',
 'ccc=b' => 'Ccc/B',
 'ccc=below' => 'Ccc/B',
-'ccc=belowleft' => '#/17',
+'ccc=belowleft' => '#/18',
 'ccc=belowright' => 'Ccc/BR',
-'ccc=bl' => '#/17',
+'ccc=bl' => '#/18',
 'ccc=br' => 'Ccc/BR',
-'ccc=ccc10' => '#/23',
-'ccc=ccc103' => '#/52',
-'ccc=ccc107' => '#/53',
-'ccc=ccc11' => '#/24',
-'ccc=ccc118' => '#/54',
-'ccc=ccc12' => '#/25',
-'ccc=ccc122' => '#/55',
-'ccc=ccc129' => '#/56',
-'ccc=ccc13' => '#/26',
-'ccc=ccc130' => '#/57',
-'ccc=ccc132' => '#/58',
+'ccc=ccc10' => '#/24',
+'ccc=ccc103' => '#/53',
+'ccc=ccc107' => '#/54',
+'ccc=ccc11' => '#/25',
+'ccc=ccc118' => '#/55',
+'ccc=ccc12' => '#/26',
+'ccc=ccc122' => '#/56',
+'ccc=ccc129' => '#/57',
+'ccc=ccc13' => '#/27',
+'ccc=ccc130' => '#/58',
+'ccc=ccc132' => '#/59',
 'ccc=ccc133' => '#/0',
-'ccc=ccc14' => '#/27',
-'ccc=ccc15' => '#/28',
-'ccc=ccc16' => '#/29',
-'ccc=ccc17' => '#/30',
-'ccc=ccc18' => '#/31',
-'ccc=ccc19' => '#/32',
-'ccc=ccc20' => '#/33',
-'ccc=ccc21' => '#/34',
-'ccc=ccc22' => '#/35',
-'ccc=ccc23' => '#/36',
-'ccc=ccc24' => '#/37',
-'ccc=ccc25' => '#/38',
-'ccc=ccc26' => '#/39',
-'ccc=ccc27' => '#/40',
-'ccc=ccc28' => '#/41',
-'ccc=ccc29' => '#/42',
-'ccc=ccc30' => '#/43',
-'ccc=ccc31' => '#/44',
-'ccc=ccc32' => '#/45',
-'ccc=ccc33' => '#/46',
-'ccc=ccc34' => '#/47',
-'ccc=ccc35' => '#/48',
-'ccc=ccc36' => '#/49',
-'ccc=ccc84' => '#/50',
-'ccc=ccc91' => '#/51',
-'ccc=da' => '#/18',
+'ccc=ccc14' => '#/28',
+'ccc=ccc15' => '#/29',
+'ccc=ccc16' => '#/30',
+'ccc=ccc17' => '#/31',
+'ccc=ccc18' => '#/32',
+'ccc=ccc19' => '#/33',
+'ccc=ccc20' => '#/34',
+'ccc=ccc21' => '#/35',
+'ccc=ccc22' => '#/36',
+'ccc=ccc23' => '#/37',
+'ccc=ccc24' => '#/38',
+'ccc=ccc25' => '#/39',
+'ccc=ccc26' => '#/40',
+'ccc=ccc27' => '#/41',
+'ccc=ccc28' => '#/42',
+'ccc=ccc29' => '#/43',
+'ccc=ccc30' => '#/44',
+'ccc=ccc31' => '#/45',
+'ccc=ccc32' => '#/46',
+'ccc=ccc33' => '#/47',
+'ccc=ccc34' => '#/48',
+'ccc=ccc35' => '#/49',
+'ccc=ccc36' => '#/50',
+'ccc=ccc84' => '#/51',
+'ccc=ccc91' => '#/52',
+'ccc=da' => '#/19',
 'ccc=db' => 'Ccc/DB',
-'ccc=doubleabove' => '#/18',
+'ccc=doubleabove' => '#/19',
 'ccc=doublebelow' => 'Ccc/DB',
-'ccc=iotasubscript' => '#/19',
-'ccc=is' => '#/19',
-'ccc=kanavoicing' => '#/20',
-'ccc=kv' => '#/20',
-'ccc=l' => '#/14',
-'ccc=left' => '#/14',
+'ccc=iotasubscript' => '#/20',
+'ccc=is' => '#/20',
+'ccc=kanavoicing' => '#/21',
+'ccc=kv' => '#/21',
+'ccc=l' => '#/15',
+'ccc=left' => '#/15',
 'ccc=nk' => 'Ccc/NK',
 'ccc=notreordered' => 'Ccc/NR',
 'ccc=nr' => 'Ccc/NR',
 'ccc=nukta' => 'Ccc/NK',
 'ccc=ov' => 'Ccc/OV',
 'ccc=overlay' => 'Ccc/OV',
-'ccc=r' => '#/15',
-'ccc=right' => '#/15',
+'ccc=r' => '#/16',
+'ccc=right' => '#/16',
 'ccc=virama' => 'Ccc/VR',
 'ccc=vr' => 'Ccc/VR',
 'ce' => 'CE/Y',
@@ -3220,7 +3411,7 @@
 'ce=y' => 'CE/Y',
 'ce=yes' => 'CE/Y',
 'cf' => 'Gc/Cf',
-'chakma' => '#/522',
+'chakma' => '#/554',
 'cham' => 'Sc/Cham',
 'changeswhencasefolded' => 'CWCF/Y',
 'changeswhencasemapped' => 'CWCM/Y',
@@ -3228,8 +3419,10 @@
 'changeswhennfkccasefolded' => 'CWKCF/Y',
 'changeswhentitlecased' => 'CWT/Y',
 'changeswhenuppercased' => 'CWU/Y',
-'cher' => '#/525',
-'cherokee' => '#/525',
+'cher' => '#/557',
+'cherokee' => '#/557',
+'cherokeesup' => '#/272',
+'cherokeesupplement' => '#/272',
 'ci' => 'CI/Y',
 'ci=f' => '!CI/Y',
 'ci=false' => '!CI/Y',
@@ -3239,43 +3432,45 @@
 'ci=true' => 'CI/Y',
 'ci=y' => 'CI/Y',
 'ci=yes' => 'CI/Y',
-'cjk' => '#/89',
-'cjkcompat' => '#/208',
-'cjkcompatforms' => '#/290',
-'cjkcompatibility' => '#/208',
-'cjkcompatibilityforms' => '#/290',
-'cjkcompatibilityideographs' => '#/328',
-'cjkcompatibilityideographssupplement' => '#/336',
-'cjkcompatideographs' => '#/328',
-'cjkcompatideographssup' => '#/336',
-'cjkexta' => '#/148',
-'cjkextb' => '#/149',
-'cjkextc' => '#/150',
-'cjkextd' => '#/151',
-'cjkradicalssup' => '#/291',
-'cjkradicalssupplement' => '#/291',
-'cjkstrokes' => '#/233',
-'cjksymbols' => '#/234',
-'cjksymbolsandpunctuation' => '#/234',
-'cjkunifiedideographs' => '#/89',
-'cjkunifiedideographsextensiona' => '#/148',
-'cjkunifiedideographsextensionb' => '#/149',
-'cjkunifiedideographsextensionc' => '#/150',
-'cjkunifiedideographsextensiond' => '#/151',
+'cjk' => '#/106',
+'cjkcompat' => '#/229',
+'cjkcompatforms' => '#/313',
+'cjkcompatibility' => '#/229',
+'cjkcompatibilityforms' => '#/313',
+'cjkcompatibilityideographs' => '#/352',
+'cjkcompatibilityideographssupplement' => '#/361',
+'cjkcompatideographs' => '#/352',
+'cjkcompatideographssup' => '#/361',
+'cjkexta' => '#/167',
+'cjkextb' => '#/168',
+'cjkextc' => '#/169',
+'cjkextd' => '#/170',
+'cjkexte' => '#/171',
+'cjkradicalssup' => '#/314',
+'cjkradicalssupplement' => '#/314',
+'cjkstrokes' => '#/254',
+'cjksymbols' => '#/255',
+'cjksymbolsandpunctuation' => '#/255',
+'cjkunifiedideographs' => '#/106',
+'cjkunifiedideographsextensiona' => '#/167',
+'cjkunifiedideographsextensionb' => '#/168',
+'cjkunifiedideographsextensionc' => '#/169',
+'cjkunifiedideographsextensiond' => '#/170',
+'cjkunifiedideographsextensione' => '#/171',
 'closepunctuation' => 'Gc/Pe',
 'cn' => 'Gc/Cn',
-'cntrl' => '#/343',
-'co' => '#/344',
-'combiningdiacriticalmarks' => '#/274',
-'combiningdiacriticalmarksextended' => '#/299',
-'combiningdiacriticalmarksforsymbols' => '#/337',
-'combiningdiacriticalmarkssupplement' => '#/300',
-'combininghalfmarks' => '#/211',
+'cntrl' => '#/370',
+'co' => '#/371',
+'combiningdiacriticalmarks' => '#/296',
+'combiningdiacriticalmarksextended' => '#/322',
+'combiningdiacriticalmarksforsymbols' => '#/362',
+'combiningdiacriticalmarkssupplement' => '#/323',
+'combininghalfmarks' => '#/232',
 'combiningmark' => 'Gc/M',
-'combiningmarksforsymbols' => '#/337',
+'combiningmarksforsymbols' => '#/362',
 'common' => 'Sc/Zyyy',
-'commonindicnumberforms' => '#/314',
-'compatjamo' => '#/235',
+'commonindicnumberforms' => '#/337',
+'compatjamo' => '#/256',
 'compex' => 'CompEx/Y',
 'compex=f' => '!CompEx/Y',
 'compex=false' => '!CompEx/Y',
@@ -3287,20 +3482,20 @@
 'compex=yes' => 'CompEx/Y',
 'compositionexclusion' => 'CE/Y',
 'connectorpunctuation' => 'WB/EX',
-'control' => '#/343',
-'controlpictures' => '#/297',
-'copt' => '#/526',
-'coptic' => '#/526',
-'copticepactnumbers' => '#/323',
-'countingrod' => '#/251',
-'countingrodnumerals' => '#/251',
+'control' => '#/370',
+'controlpictures' => '#/320',
+'copt' => '#/558',
+'coptic' => '#/558',
+'copticepactnumbers' => '#/347',
+'countingrod' => '#/273',
+'countingrodnumerals' => '#/273',
 'cprt' => 'Sc/Cprt',
-'cs' => '#/345',
-'cuneiform' => '#/584',
-'cuneiformnumbers' => '#/309',
-'cuneiformnumbersandpunctuation' => '#/309',
+'cs' => '#/14',
+'cuneiform' => 'Sc/Xsux',
+'cuneiformnumbers' => '#/332',
+'cuneiformnumbersandpunctuation' => '#/332',
 'currencysymbol' => 'Gc/Sc',
-'currencysymbols' => '#/298',
+'currencysymbols' => '#/321',
 'cwcf' => 'CWCF/Y',
 'cwcf=f' => '!CWCF/Y',
 'cwcf=false' => '!CWCF/Y',
@@ -3356,15 +3551,15 @@
 'cwu=y' => 'CWU/Y',
 'cwu=yes' => 'CWU/Y',
 'cypriot' => 'Sc/Cprt',
-'cypriotsyllabary' => '#/310',
+'cypriotsyllabary' => '#/333',
 'cyrillic' => 'Sc/Cyrl',
-'cyrillicexta' => '#/272',
-'cyrillicextb' => '#/273',
-'cyrillicextendeda' => '#/272',
-'cyrillicextendedb' => '#/273',
-'cyrillicsup' => '#/252',
-'cyrillicsupplement' => '#/252',
-'cyrillicsupplementary' => '#/252',
+'cyrillicexta' => '#/294',
+'cyrillicextb' => '#/295',
+'cyrillicextendeda' => '#/294',
+'cyrillicextendedb' => '#/295',
+'cyrillicsup' => '#/274',
+'cyrillicsupplement' => '#/274',
+'cyrillicsupplementary' => '#/274',
 'cyrl' => 'Sc/Cyrl',
 'dash' => 'Dash/Y',
 'dash=f' => '!Dash/Y',
@@ -3388,11 +3583,11 @@
 'dep=y' => 'Dep/Y',
 'dep=yes' => 'Dep/Y',
 'deprecated' => 'Dep/Y',
-'deseret' => '#/152',
+'deseret' => '#/172',
 'deva' => 'Sc/Deva',
 'devanagari' => 'Sc/Deva',
-'devanagariext' => '#/283',
-'devanagariextended' => '#/283',
+'devanagariext' => '#/306',
+'devanagariextended' => '#/306',
 'di' => 'DI/Y',
 'di=f' => '!DI/Y',
 'di=false' => '!DI/Y',
@@ -3412,15 +3607,15 @@
 'dia=y' => 'Dia/Y',
 'dia=yes' => 'Dia/Y',
 'diacritic' => 'Dia/Y',
-'diacriticals' => '#/274',
-'diacriticalsext' => '#/299',
-'diacriticalsforsymbols' => '#/337',
-'diacriticalssup' => '#/300',
+'diacriticals' => '#/296',
+'diacriticalsext' => '#/322',
+'diacriticalsforsymbols' => '#/362',
+'diacriticalssup' => '#/323',
 'digit' => 'Gc/Nd',
-'dingbats' => '#/186',
-'domino' => '#/127',
-'dominotiles' => '#/127',
-'dsrt' => '#/152',
+'dingbats' => '#/207',
+'domino' => '#/145',
+'dominotiles' => '#/145',
+'dsrt' => '#/172',
 'dt=can' => 'NFDQC/N',
 'dt=canonical' => 'NFDQC/N',
 'dt=circle' => 'Dt/Enc',
@@ -3430,8 +3625,8 @@
 'dt=fin' => 'Dt/Fin',
 'dt=final' => 'Dt/Fin',
 'dt=font' => 'Dt/Font',
-'dt=fra' => '#/340',
-'dt=fraction' => '#/340',
+'dt=fra' => '#/367',
+'dt=fraction' => '#/367',
 'dt=init' => 'Dt/Init',
 'dt=initial' => 'Dt/Init',
 'dt=iso' => 'Dt/Iso',
@@ -3445,8 +3640,8 @@
 'dt=noncanon' => 'Dt/NonCanon',
 'dt=noncanonical' => 'Dt/NonCanon',
 'dt=none' => 'NFKDQC/Y',
-'dt=small' => '#/341',
-'dt=sml' => '#/341',
+'dt=small' => '#/368',
+'dt=sml' => '#/368',
 'dt=sqr' => 'Dt/Sqr',
 'dt=square' => 'Dt/Sqr',
 'dt=sub' => 'Dt/Sub',
@@ -3454,13 +3649,13 @@
 'dt=super' => 'Dt/Sup',
 'dt=vert' => 'Dt/Vert',
 'dt=vertical' => 'Dt/Vert',
-'dt=wide' => '#/342',
+'dt=wide' => '#/369',
 'dupl' => 'Sc/Dupl',
 'duployan' => 'Sc/Dupl',
 'ea=a' => 'Ea/A',
 'ea=ambiguous' => 'Ea/A',
-'ea=f' => '#/342',
-'ea=fullwidth' => '#/342',
+'ea=f' => '#/369',
+'ea=fullwidth' => '#/369',
 'ea=h' => 'Ea/H',
 'ea=halfwidth' => 'Ea/H',
 'ea=n' => 'Ea/N',
@@ -3469,28 +3664,29 @@
 'ea=neutral' => 'Ea/N',
 'ea=w' => 'Ea/W',
 'ea=wide' => 'Ea/W',
-'egyp' => '#/527',
-'egyptianhieroglyphs' => '#/527',
-'elba' => '#/528',
-'elbasan' => '#/528',
-'emoticons' => '#/210',
-'enclosedalphanum' => '#/311',
-'enclosedalphanumerics' => '#/311',
-'enclosedalphanumericsupplement' => '#/330',
-'enclosedalphanumsup' => '#/330',
-'enclosedcjk' => '#/253',
-'enclosedcjklettersandmonths' => '#/253',
-'enclosedideographicsup' => '#/338',
-'enclosedideographicsupplement' => '#/338',
+'earlydynasticcuneiform' => '#/363',
+'egyp' => '#/559',
+'egyptianhieroglyphs' => '#/559',
+'elba' => '#/560',
+'elbasan' => '#/560',
+'emoticons' => '#/231',
+'enclosedalphanum' => '#/334',
+'enclosedalphanumerics' => '#/334',
+'enclosedalphanumericsupplement' => '#/354',
+'enclosedalphanumsup' => '#/354',
+'enclosedcjk' => '#/275',
+'enclosedcjklettersandmonths' => '#/275',
+'enclosedideographicsup' => '#/364',
+'enclosedideographicsupplement' => '#/364',
 'enclosingmark' => 'Gc/Me',
 'ethi' => 'Sc/Ethi',
 'ethiopic' => 'Sc/Ethi',
-'ethiopicext' => '#/254',
-'ethiopicexta' => '#/275',
-'ethiopicextended' => '#/254',
-'ethiopicextendeda' => '#/275',
-'ethiopicsup' => '#/255',
-'ethiopicsupplement' => '#/255',
+'ethiopicext' => '#/276',
+'ethiopicexta' => '#/297',
+'ethiopicextended' => '#/276',
+'ethiopicextendeda' => '#/297',
+'ethiopicsup' => '#/277',
+'ethiopicsupplement' => '#/277',
 'ext' => 'Ext/Y',
 'ext=f' => '!Ext/Y',
 'ext=false' => '!Ext/Y',
@@ -3506,16 +3702,16 @@
 'fullcompositionexclusion' => 'CompEx/Y',
 'gc=c' => 'Gc/C',
 'gc=casedletter' => 'Gc/LC',
-'gc=cc' => '#/343',
+'gc=cc' => '#/370',
 'gc=cf' => 'Gc/Cf',
 'gc=closepunctuation' => 'Gc/Pe',
 'gc=cn' => 'Gc/Cn',
-'gc=cntrl' => '#/343',
-'gc=co' => '#/344',
+'gc=cntrl' => '#/370',
+'gc=co' => '#/371',
 'gc=combiningmark' => 'Gc/M',
 'gc=connectorpunctuation' => 'WB/EX',
-'gc=control' => '#/343',
-'gc=cs' => '#/345',
+'gc=control' => '#/370',
+'gc=cs' => '#/14',
 'gc=currencysymbol' => 'Gc/Sc',
 'gc=dashpunctuation' => 'Gc/Pd',
 'gc=decimalnumber' => 'Gc/Nd',
@@ -3530,7 +3726,7 @@
 'gc=lc' => 'Gc/LC',
 'gc=letter' => 'Gc/L',
 'gc=letternumber' => 'Gc/Nl',
-'gc=lineseparator' => '#/346',
+'gc=lineseparator' => '#/372',
 'gc=ll' => 'Gc/Ll',
 'gc=lm' => 'Gc/Lm',
 'gc=lo' => 'Gc/Lo',
@@ -3558,14 +3754,14 @@
 'gc=otherpunctuation' => 'Gc/Po',
 'gc=othersymbol' => 'Gc/So',
 'gc=p' => 'Gc/P',
-'gc=paragraphseparator' => '#/347',
+'gc=paragraphseparator' => '#/373',
 'gc=pc' => 'WB/EX',
 'gc=pd' => 'Gc/Pd',
 'gc=pe' => 'Gc/Pe',
 'gc=pf' => 'Gc/Pf',
 'gc=pi' => 'Gc/Pi',
 'gc=po' => 'Gc/Po',
-'gc=privateuse' => '#/344',
+'gc=privateuse' => '#/371',
 'gc=ps' => 'Gc/Ps',
 'gc=punct' => 'Gc/P',
 'gc=punctuation' => 'Gc/P',
@@ -3577,46 +3773,46 @@
 'gc=so' => 'Gc/So',
 'gc=spaceseparator' => 'Gc/Zs',
 'gc=spacingmark' => 'Gc/Mc',
-'gc=surrogate' => '#/345',
+'gc=surrogate' => '#/14',
 'gc=symbol' => 'Gc/S',
 'gc=titlecaseletter' => 'Perl/Title',
 'gc=unassigned' => 'Gc/Cn',
 'gc=uppercaseletter' => 'Gc/Lu',
 'gc=z' => 'Gc/Z',
-'gc=zl' => '#/346',
-'gc=zp' => '#/347',
+'gc=zl' => '#/372',
+'gc=zp' => '#/373',
 'gc=zs' => 'Gc/Zs',
 'gcb=cn' => 'GCB/CN',
 'gcb=control' => 'GCB/CN',
-'gcb=cr' => '#/63',
+'gcb=cr' => '#/64',
 'gcb=ex' => 'GCB/EX',
 'gcb=extend' => 'GCB/EX',
-'gcb=l' => '#/60',
-'gcb=lf' => '#/64',
+'gcb=l' => '#/61',
+'gcb=lf' => '#/65',
 'gcb=lv' => 'GCB/LV',
 'gcb=lvt' => 'GCB/LVT',
 'gcb=other' => 'GCB/XX',
 'gcb=pp' => '#/0',
 'gcb=prepend' => '#/0',
-'gcb=regionalindicator' => '#/65',
-'gcb=ri' => '#/65',
+'gcb=regionalindicator' => '#/66',
+'gcb=ri' => '#/66',
 'gcb=sm' => 'GCB/SM',
 'gcb=spacingmark' => 'GCB/SM',
-'gcb=t' => '#/61',
-'gcb=v' => '#/62',
+'gcb=t' => '#/62',
+'gcb=v' => '#/63',
 'gcb=xx' => 'GCB/XX',
-'generalpunctuation' => '#/265',
-'geometricshapes' => '#/301',
-'geometricshapesext' => '#/324',
-'geometricshapesextended' => '#/324',
+'generalpunctuation' => '#/287',
+'geometricshapes' => '#/324',
+'geometricshapesext' => '#/348',
+'geometricshapesextended' => '#/348',
 'geor' => 'Sc/Geor',
 'georgian' => 'Sc/Geor',
-'georgiansup' => '#/256',
-'georgiansupplement' => '#/256',
-'glag' => '#/529',
-'glagolitic' => '#/529',
-'goth' => '#/530',
-'gothic' => '#/530',
+'georgiansup' => '#/278',
+'georgiansupplement' => '#/278',
+'glag' => '#/561',
+'glagolitic' => '#/561',
+'goth' => '#/562',
+'gothic' => '#/562',
 'gran' => 'Sc/Gran',
 'grantha' => 'Sc/Gran',
 'graph' => 'Perl/Graph',
@@ -3632,9 +3828,9 @@
 'grbase=y' => 'GrBase/Y',
 'grbase=yes' => 'GrBase/Y',
 'greek' => 'Sc/Grek',
-'greekandcoptic' => '#/110',
-'greekext' => '#/190',
-'greekextended' => '#/190',
+'greekandcoptic' => '#/128',
+'greekext' => '#/211',
+'greekextended' => '#/211',
 'grek' => 'Sc/Grek',
 'grext' => 'GCB/EX',
 'grext=f' => '!GCB/EX',
@@ -3649,20 +3845,22 @@
 'gujr' => 'Sc/Gujr',
 'gurmukhi' => 'Sc/Guru',
 'guru' => 'Sc/Guru',
-'halfandfullforms' => '#/312',
-'halfmarks' => '#/211',
-'halfwidthandfullwidthforms' => '#/312',
+'halfandfullforms' => '#/335',
+'halfmarks' => '#/232',
+'halfwidthandfullwidthforms' => '#/335',
 'han' => 'Sc/Han',
 'hang' => 'Sc/Hang',
 'hangul' => 'Sc/Hang',
-'hangulcompatibilityjamo' => '#/235',
-'hanguljamo' => '#/98',
-'hanguljamoextendeda' => '#/194',
-'hanguljamoextendedb' => '#/195',
-'hangulsyllables' => '#/129',
+'hangulcompatibilityjamo' => '#/256',
+'hanguljamo' => '#/116',
+'hanguljamoextendeda' => '#/215',
+'hanguljamoextendedb' => '#/216',
+'hangulsyllables' => '#/147',
 'hani' => 'Sc/Han',
-'hano' => '#/531',
-'hanunoo' => '#/531',
+'hano' => '#/563',
+'hanunoo' => '#/563',
+'hatr' => '#/564',
+'hatran' => '#/564',
 'hebr' => 'Sc/Hebr',
 'hebrew' => 'Sc/Hebr',
 'hex' => 'Hex/Y',
@@ -3675,34 +3873,36 @@
 'hex=y' => 'Hex/Y',
 'hex=yes' => 'Hex/Y',
 'hexdigit' => 'Hex/Y',
-'highprivateusesurrogates' => '#/313',
-'highpusurrogates' => '#/313',
-'highsurrogates' => '#/292',
+'highprivateusesurrogates' => '#/336',
+'highpusurrogates' => '#/336',
+'highsurrogates' => '#/315',
 'hira' => 'Sc/Hira',
 'hiragana' => 'Sc/Hira',
+'hluw' => '#/565',
 'hmng' => 'Sc/Hmng',
 'horizspace' => 'Perl/Blank',
-'hst=l' => '#/60',
-'hst=leadingjamo' => '#/60',
+'hst=l' => '#/61',
+'hst=leadingjamo' => '#/61',
 'hst=lv' => 'GCB/LV',
 'hst=lvsyllable' => 'GCB/LV',
 'hst=lvt' => 'GCB/LVT',
 'hst=lvtsyllable' => 'GCB/LVT',
 'hst=na' => 'Hst/NA',
 'hst=notapplicable' => 'Hst/NA',
-'hst=t' => '#/61',
-'hst=trailingjamo' => '#/61',
-'hst=v' => '#/62',
-'hst=voweljamo' => '#/62',
-'hyphen' => 'Hyphen/Y',
-'hyphen=f' => '!Hyphen/Y',
-'hyphen=false' => '!Hyphen/Y',
-'hyphen=n' => '!Hyphen/Y',
-'hyphen=no' => '!Hyphen/Y',
-'hyphen=t' => 'Hyphen/Y',
-'hyphen=true' => 'Hyphen/Y',
-'hyphen=y' => 'Hyphen/Y',
-'hyphen=yes' => 'Hyphen/Y',
+'hst=t' => '#/62',
+'hst=trailingjamo' => '#/62',
+'hst=v' => '#/63',
+'hst=voweljamo' => '#/63',
+'hung' => '#/566',
+'hyphen' => 'Hyphen/T',
+'hyphen=f' => '!Hyphen/T',
+'hyphen=false' => '!Hyphen/T',
+'hyphen=n' => '!Hyphen/T',
+'hyphen=no' => '!Hyphen/T',
+'hyphen=t' => 'Hyphen/T',
+'hyphen=true' => 'Hyphen/T',
+'hyphen=y' => 'Hyphen/T',
+'hyphen=yes' => 'Hyphen/T',
 'idc' => 'IDC/Y',
 'idc=f' => '!IDC/Y',
 'idc=false' => '!IDC/Y',
@@ -3723,7 +3923,7 @@
 'ideo=y' => 'Ideo/Y',
 'ideo=yes' => 'Ideo/Y',
 'ideographic' => 'Ideo/Y',
-'ideographicdescriptioncharacters' => '#/90',
+'ideographicdescriptioncharacters' => '#/107',
 'ids' => 'IDS/Y',
 'ids=f' => '!IDS/Y',
 'ids=false' => '!IDS/Y',
@@ -3733,449 +3933,513 @@
 'ids=true' => 'IDS/Y',
 'ids=y' => 'IDS/Y',
 'ids=yes' => 'IDS/Y',
-'idsb' => '#/66',
-'idsb=f' => '#/!66',
-'idsb=false' => '#/!66',
-'idsb=n' => '#/!66',
-'idsb=no' => '#/!66',
-'idsb=t' => '#/66',
-'idsb=true' => '#/66',
-'idsb=y' => '#/66',
-'idsb=yes' => '#/66',
-'idsbinaryoperator' => '#/66',
-'idst' => '#/67',
-'idst=f' => '#/!67',
-'idst=false' => '#/!67',
-'idst=n' => '#/!67',
-'idst=no' => '#/!67',
-'idst=t' => '#/67',
-'idst=true' => '#/67',
-'idst=y' => '#/67',
-'idst=yes' => '#/67',
+'idsb' => '#/67',
+'idsb=f' => '#/!67',
+'idsb=false' => '#/!67',
+'idsb=n' => '#/!67',
+'idsb=no' => '#/!67',
+'idsb=t' => '#/67',
+'idsb=true' => '#/67',
+'idsb=y' => '#/67',
+'idsb=yes' => '#/67',
+'idsbinaryoperator' => '#/67',
+'idst' => '#/68',
+'idst=f' => '#/!68',
+'idst=false' => '#/!68',
+'idst=n' => '#/!68',
+'idst=no' => '#/!68',
+'idst=t' => '#/68',
+'idst=true' => '#/68',
+'idst=y' => '#/68',
+'idst=yes' => '#/68',
 'idstart' => 'IDS/Y',
-'idstrinaryoperator' => '#/67',
-'imperialaramaic' => '#/512',
+'idstrinaryoperator' => '#/68',
+'imperialaramaic' => '#/544',
 'in=unassigned' => 'Age/NA',
-'inaegeannumbers' => '#/281',
-'inalchemical' => '#/229',
-'inalchemicalsymbols' => '#/229',
-'inalphabeticpf' => '#/271',
-'inalphabeticpresentationforms' => '#/271',
-'inancientgreekmusic' => '#/320',
-'inancientgreekmusicalnotation' => '#/320',
-'inancientgreeknumbers' => '#/327',
-'inancientsymbols' => '#/288',
-'inarabic' => '#/121',
-'inarabicexta' => '#/230',
-'inarabicextendeda' => '#/230',
-'inarabicmath' => '#/231',
-'inarabicmathematicalalphabeticsymbols' => '#/231',
-'inarabicpfa' => '#/205',
-'inarabicpfb' => '#/206',
-'inarabicpresentationformsa' => '#/205',
-'inarabicpresentationformsb' => '#/206',
-'inarabicsup' => '#/207',
-'inarabicsupplement' => '#/207',
-'inarmenian' => '#/178',
-'inarrows' => '#/122',
-'inascii' => '#/106',
-'inavestan' => '#/145',
-'inbalinese' => '#/179',
-'inbamum' => '#/107',
-'inbamumsup' => '#/180',
-'inbamumsupplement' => '#/180',
-'inbasiclatin' => '#/106',
-'inbassavah' => '#/181',
-'inbatak' => '#/108',
-'inbengali' => '#/146',
-'inblockelements' => '#/282',
-'inbopomofo' => '#/182',
-'inbopomofoext' => '#/250',
-'inbopomofoextended' => '#/250',
-'inboxdrawing' => '#/232',
-'inbrahmi' => '#/123',
-'inbraille' => '#/147',
-'inbraillepatterns' => '#/147',
-'inbuginese' => '#/183',
-'inbuhid' => '#/109',
-'inbyzantinemusic' => '#/289',
-'inbyzantinemusicalsymbols' => '#/289',
-'incanadiansyllabics' => '#/105',
-'incarian' => '#/124',
-'incaucasianalbanian' => '#/321',
-'inchakma' => '#/125',
-'incham' => '#/97',
-'incherokee' => '#/184',
-'incjk' => '#/89',
-'incjkcompat' => '#/208',
-'incjkcompatforms' => '#/290',
-'incjkcompatibility' => '#/208',
-'incjkcompatibilityforms' => '#/290',
-'incjkcompatibilityideographs' => '#/328',
-'incjkcompatibilityideographssupplement' => '#/336',
-'incjkcompatideographs' => '#/328',
-'incjkcompatideographssup' => '#/336',
-'incjkexta' => '#/148',
-'incjkextb' => '#/149',
-'incjkextc' => '#/150',
-'incjkextd' => '#/151',
-'incjkradicalssup' => '#/291',
-'incjkradicalssupplement' => '#/291',
-'incjkstrokes' => '#/233',
-'incjksymbols' => '#/234',
-'incjksymbolsandpunctuation' => '#/234',
-'incjkunifiedideographs' => '#/89',
-'incjkunifiedideographsextensiona' => '#/148',
-'incjkunifiedideographsextensionb' => '#/149',
-'incjkunifiedideographsextensionc' => '#/150',
-'incjkunifiedideographsextensiond' => '#/151',
-'incombiningdiacriticalmarks' => '#/274',
-'incombiningdiacriticalmarksextended' => '#/299',
-'incombiningdiacriticalmarksforsymbols' => '#/337',
-'incombiningdiacriticalmarkssupplement' => '#/300',
-'incombininghalfmarks' => '#/211',
-'incombiningmarksforsymbols' => '#/337',
-'incommonindicnumberforms' => '#/314',
-'incompatjamo' => '#/235',
-'incontrolpictures' => '#/297',
-'incoptic' => '#/126',
-'incopticepactnumbers' => '#/323',
-'incountingrod' => '#/251',
-'incountingrodnumerals' => '#/251',
-'incuneiform' => '#/209',
-'incuneiformnumbers' => '#/309',
-'incuneiformnumbersandpunctuation' => '#/309',
-'incurrencysymbols' => '#/298',
-'incypriotsyllabary' => '#/310',
-'incyrillic' => '#/185',
-'incyrillicexta' => '#/272',
-'incyrillicextb' => '#/273',
-'incyrillicextendeda' => '#/272',
-'incyrillicextendedb' => '#/273',
-'incyrillicsup' => '#/252',
-'incyrillicsupplement' => '#/252',
-'incyrillicsupplementary' => '#/252',
-'indeseret' => '#/152',
-'indevanagari' => '#/236',
-'indevanagariext' => '#/283',
-'indevanagariextended' => '#/283',
-'indiacriticals' => '#/274',
-'indiacriticalsext' => '#/299',
-'indiacriticalsforsymbols' => '#/337',
-'indiacriticalssup' => '#/300',
-'indicnumberforms' => '#/314',
-'indingbats' => '#/186',
-'indomino' => '#/127',
-'indominotiles' => '#/127',
-'induployan' => '#/187',
-'inegyptianhieroglyphs' => '#/329',
-'inelbasan' => '#/153',
-'inemoticons' => '#/210',
-'inenclosedalphanum' => '#/311',
-'inenclosedalphanumerics' => '#/311',
-'inenclosedalphanumericsupplement' => '#/330',
-'inenclosedalphanumsup' => '#/330',
-'inenclosedcjk' => '#/253',
-'inenclosedcjklettersandmonths' => '#/253',
-'inenclosedideographicsup' => '#/338',
-'inenclosedideographicsupplement' => '#/338',
-'inethiopic' => '#/188',
-'inethiopicext' => '#/254',
-'inethiopicexta' => '#/275',
-'inethiopicextended' => '#/254',
-'inethiopicextendeda' => '#/275',
-'inethiopicsup' => '#/255',
-'inethiopicsupplement' => '#/255',
-'ingeneralpunctuation' => '#/265',
-'ingeometricshapes' => '#/301',
-'ingeometricshapesext' => '#/324',
-'ingeometricshapesextended' => '#/324',
-'ingeorgian' => '#/189',
-'ingeorgiansup' => '#/256',
-'ingeorgiansupplement' => '#/256',
-'inglagolitic' => '#/237',
-'ingothic' => '#/128',
-'ingrantha' => '#/154',
-'ingreek' => '#/110',
-'ingreekandcoptic' => '#/110',
-'ingreekext' => '#/190',
-'ingreekextended' => '#/190',
-'ingujarati' => '#/191',
-'ingurmukhi' => '#/192',
-'inhalfandfullforms' => '#/312',
-'inhalfmarks' => '#/211',
-'inhalfwidthandfullwidthforms' => '#/312',
-'inhangul' => '#/129',
-'inhangulcompatibilityjamo' => '#/235',
-'inhanguljamo' => '#/98',
-'inhanguljamoextendeda' => '#/194',
-'inhanguljamoextendedb' => '#/195',
-'inhangulsyllables' => '#/129',
-'inhanunoo' => '#/155',
-'inhebrew' => '#/130',
+'inaegeannumbers' => '#/304',
+'inahom' => '#/114',
+'inalchemical' => '#/250',
+'inalchemicalsymbols' => '#/250',
+'inalphabeticpf' => '#/293',
+'inalphabeticpresentationforms' => '#/293',
+'inanatolianhieroglyphs' => '#/357',
+'inancientgreekmusic' => '#/343',
+'inancientgreekmusicalnotation' => '#/343',
+'inancientgreeknumbers' => '#/351',
+'inancientsymbols' => '#/311',
+'inarabic' => '#/139',
+'inarabicexta' => '#/251',
+'inarabicextendeda' => '#/251',
+'inarabicmath' => '#/252',
+'inarabicmathematicalalphabeticsymbols' => '#/252',
+'inarabicpfa' => '#/226',
+'inarabicpfb' => '#/227',
+'inarabicpresentationformsa' => '#/226',
+'inarabicpresentationformsb' => '#/227',
+'inarabicsup' => '#/228',
+'inarabicsupplement' => '#/228',
+'inarmenian' => '#/199',
+'inarrows' => '#/140',
+'inascii' => '#/124',
+'inavestan' => '#/164',
+'inbalinese' => '#/200',
+'inbamum' => '#/125',
+'inbamumsup' => '#/201',
+'inbamumsupplement' => '#/201',
+'inbasiclatin' => '#/124',
+'inbassavah' => '#/202',
+'inbatak' => '#/126',
+'inbengali' => '#/165',
+'inblockelements' => '#/305',
+'inbopomofo' => '#/203',
+'inbopomofoext' => '#/271',
+'inbopomofoextended' => '#/271',
+'inboxdrawing' => '#/253',
+'inbrahmi' => '#/141',
+'inbraille' => '#/166',
+'inbraillepatterns' => '#/166',
+'inbuginese' => '#/204',
+'inbuhid' => '#/127',
+'inbyzantinemusic' => '#/312',
+'inbyzantinemusicalsymbols' => '#/312',
+'incanadiansyllabics' => '#/123',
+'incarian' => '#/142',
+'incaucasianalbanian' => '#/344',
+'inchakma' => '#/143',
+'incham' => '#/115',
+'incherokee' => '#/205',
+'incherokeesup' => '#/272',
+'incherokeesupplement' => '#/272',
+'incjk' => '#/106',
+'incjkcompat' => '#/229',
+'incjkcompatforms' => '#/313',
+'incjkcompatibility' => '#/229',
+'incjkcompatibilityforms' => '#/313',
+'incjkcompatibilityideographs' => '#/352',
+'incjkcompatibilityideographssupplement' => '#/361',
+'incjkcompatideographs' => '#/352',
+'incjkcompatideographssup' => '#/361',
+'incjkexta' => '#/167',
+'incjkextb' => '#/168',
+'incjkextc' => '#/169',
+'incjkextd' => '#/170',
+'incjkexte' => '#/171',
+'incjkradicalssup' => '#/314',
+'incjkradicalssupplement' => '#/314',
+'incjkstrokes' => '#/254',
+'incjksymbols' => '#/255',
+'incjksymbolsandpunctuation' => '#/255',
+'incjkunifiedideographs' => '#/106',
+'incjkunifiedideographsextensiona' => '#/167',
+'incjkunifiedideographsextensionb' => '#/168',
+'incjkunifiedideographsextensionc' => '#/169',
+'incjkunifiedideographsextensiond' => '#/170',
+'incjkunifiedideographsextensione' => '#/171',
+'incombiningdiacriticalmarks' => '#/296',
+'incombiningdiacriticalmarksextended' => '#/322',
+'incombiningdiacriticalmarksforsymbols' => '#/362',
+'incombiningdiacriticalmarkssupplement' => '#/323',
+'incombininghalfmarks' => '#/232',
+'incombiningmarksforsymbols' => '#/362',
+'incommonindicnumberforms' => '#/337',
+'incompatjamo' => '#/256',
+'incontrolpictures' => '#/320',
+'incoptic' => '#/144',
+'incopticepactnumbers' => '#/347',
+'incountingrod' => '#/273',
+'incountingrodnumerals' => '#/273',
+'incuneiform' => '#/230',
+'incuneiformnumbers' => '#/332',
+'incuneiformnumbersandpunctuation' => '#/332',
+'incurrencysymbols' => '#/321',
+'incypriotsyllabary' => '#/333',
+'incyrillic' => '#/206',
+'incyrillicexta' => '#/294',
+'incyrillicextb' => '#/295',
+'incyrillicextendeda' => '#/294',
+'incyrillicextendedb' => '#/295',
+'incyrillicsup' => '#/274',
+'incyrillicsupplement' => '#/274',
+'incyrillicsupplementary' => '#/274',
+'indeseret' => '#/172',
+'indevanagari' => '#/257',
+'indevanagariext' => '#/306',
+'indevanagariextended' => '#/306',
+'indiacriticals' => '#/296',
+'indiacriticalsext' => '#/322',
+'indiacriticalsforsymbols' => '#/362',
+'indiacriticalssup' => '#/323',
+'indicnumberforms' => '#/337',
+'indingbats' => '#/207',
+'indomino' => '#/145',
+'indominotiles' => '#/145',
+'induployan' => '#/208',
+'inearlydynasticcuneiform' => '#/363',
+'inegyptianhieroglyphs' => '#/353',
+'inelbasan' => '#/173',
+'inemoticons' => '#/231',
+'inenclosedalphanum' => '#/334',
+'inenclosedalphanumerics' => '#/334',
+'inenclosedalphanumericsupplement' => '#/354',
+'inenclosedalphanumsup' => '#/354',
+'inenclosedcjk' => '#/275',
+'inenclosedcjklettersandmonths' => '#/275',
+'inenclosedideographicsup' => '#/364',
+'inenclosedideographicsupplement' => '#/364',
+'inethiopic' => '#/209',
+'inethiopicext' => '#/276',
+'inethiopicexta' => '#/297',
+'inethiopicextended' => '#/276',
+'inethiopicextendeda' => '#/297',
+'inethiopicsup' => '#/277',
+'inethiopicsupplement' => '#/277',
+'ingeneralpunctuation' => '#/287',
+'ingeometricshapes' => '#/324',
+'ingeometricshapesext' => '#/348',
+'ingeometricshapesextended' => '#/348',
+'ingeorgian' => '#/210',
+'ingeorgiansup' => '#/278',
+'ingeorgiansupplement' => '#/278',
+'inglagolitic' => '#/258',
+'ingothic' => '#/146',
+'ingrantha' => '#/174',
+'ingreek' => '#/128',
+'ingreekandcoptic' => '#/128',
+'ingreekext' => '#/211',
+'ingreekextended' => '#/211',
+'ingujarati' => '#/212',
+'ingurmukhi' => '#/213',
+'inhalfandfullforms' => '#/335',
+'inhalfmarks' => '#/232',
+'inhalfwidthandfullwidthforms' => '#/335',
+'inhangul' => '#/147',
+'inhangulcompatibilityjamo' => '#/256',
+'inhanguljamo' => '#/116',
+'inhanguljamoextendeda' => '#/215',
+'inhanguljamoextendedb' => '#/216',
+'inhangulsyllables' => '#/147',
+'inhanunoo' => '#/175',
+'inhatran' => '#/148',
+'inhebrew' => '#/149',
 'inherited' => 'Sc/Zinh',
-'inhighprivateusesurrogates' => '#/313',
-'inhighpusurrogates' => '#/313',
-'inhighsurrogates' => '#/292',
-'inhiragana' => '#/193',
-'inidc' => '#/90',
-'inideographicdescriptioncharacters' => '#/90',
-'inimperialaramaic' => '#/302',
-'inindicnumberforms' => '#/314',
-'ininscriptionalpahlavi' => '#/333',
-'ininscriptionalparthian' => '#/334',
-'inipaext' => '#/131',
-'inipaextensions' => '#/131',
+'inhighprivateusesurrogates' => '#/336',
+'inhighpusurrogates' => '#/336',
+'inhighsurrogates' => '#/315',
+'inhiragana' => '#/214',
+'inidc' => '#/107',
+'inideographicdescriptioncharacters' => '#/107',
+'inimperialaramaic' => '#/325',
+'inindicnumberforms' => '#/337',
+'ininscriptionalpahlavi' => '#/358',
+'ininscriptionalparthian' => '#/359',
+'inipaext' => '#/150',
+'inipaextensions' => '#/150',
 'initialpunctuation' => 'Gc/Pi',
-'injamo' => '#/98',
-'injamoexta' => '#/194',
-'injamoextb' => '#/195',
-'injavanese' => '#/196',
-'inkaithi' => '#/132',
-'inkanasup' => '#/156',
-'inkanasupplement' => '#/156',
-'inkanbun' => '#/133',
-'inkangxi' => '#/134',
-'inkangxiradicals' => '#/134',
-'inkannada' => '#/157',
-'inkatakana' => '#/197',
-'inkatakanaext' => '#/257',
-'inkatakanaphoneticextensions' => '#/257',
-'inkayahli' => '#/158',
-'inkharoshthi' => '#/238',
-'inkhmer' => '#/111',
-'inkhmersymbols' => '#/276',
-'inkhojki' => '#/135',
-'inkhudawadi' => '#/212',
-'inlao' => '#/91',
-'inlatin1' => '#/136',
-'inlatin1sup' => '#/136',
-'inlatin1supplement' => '#/136',
-'inlatinexta' => '#/213',
-'inlatinextadditional' => '#/325',
-'inlatinextb' => '#/214',
-'inlatinextc' => '#/215',
-'inlatinextd' => '#/216',
-'inlatinexte' => '#/217',
-'inlatinextendeda' => '#/213',
-'inlatinextendedadditional' => '#/325',
-'inlatinextendedb' => '#/214',
-'inlatinextendedc' => '#/215',
-'inlatinextendedd' => '#/216',
-'inlatinextendede' => '#/217',
-'inlepcha' => '#/137',
-'inletterlikesymbols' => '#/322',
-'inlimbu' => '#/112',
-'inlineara' => '#/159',
-'inlinearbideograms' => '#/315',
-'inlinearbsyllabary' => '#/316',
-'inlisu' => '#/99',
-'inlowsurrogates' => '#/284',
-'inlycian' => '#/138',
-'inlydian' => '#/139',
-'inmahajani' => '#/198',
-'inmahjong' => '#/160',
-'inmahjongtiles' => '#/160',
-'inmalayalam' => '#/218',
-'inmandaic' => '#/161',
-'inmanichaean' => '#/239',
-'inmathalphanum' => '#/277',
-'inmathematicalalphanumericsymbols' => '#/277',
-'inmathematicaloperators' => '#/285',
-'inmathoperators' => '#/285',
-'inmeeteimayek' => '#/258',
-'inmeeteimayekext' => '#/293',
-'inmeeteimayekextensions' => '#/293',
-'inmendekikakui' => '#/278',
-'inmeroiticcursive' => '#/303',
-'inmeroitichieroglyphs' => '#/331',
-'inmiao' => '#/100',
-'inmiscarrows' => '#/240',
-'inmiscellaneousmathematicalsymbolsa' => '#/317',
-'inmiscellaneousmathematicalsymbolsb' => '#/318',
-'inmiscellaneoussymbols' => '#/259',
-'inmiscellaneoussymbolsandarrows' => '#/240',
-'inmiscellaneoussymbolsandpictographs' => '#/304',
-'inmiscellaneoustechnical' => '#/286',
-'inmiscmathsymbolsa' => '#/317',
-'inmiscmathsymbolsb' => '#/318',
-'inmiscpictographs' => '#/304',
-'inmiscsymbols' => '#/259',
-'inmisctechnical' => '#/286',
-'inmodi' => '#/101',
-'inmodifierletters' => '#/305',
-'inmodifiertoneletters' => '#/332',
-'inmongolian' => '#/219',
-'inmro' => '#/92',
-'inmusic' => '#/113',
-'inmusicalsymbols' => '#/113',
-'inmyanmar' => '#/162',
-'inmyanmarexta' => '#/260',
-'inmyanmarextb' => '#/261',
-'inmyanmarextendeda' => '#/260',
-'inmyanmarextendedb' => '#/261',
-'innabataean' => '#/220',
+'injamo' => '#/116',
+'injamoexta' => '#/215',
+'injamoextb' => '#/216',
+'injavanese' => '#/217',
+'inkaithi' => '#/151',
+'inkanasup' => '#/176',
+'inkanasupplement' => '#/176',
+'inkanbun' => '#/152',
+'inkangxi' => '#/153',
+'inkangxiradicals' => '#/153',
+'inkannada' => '#/177',
+'inkatakana' => '#/218',
+'inkatakanaext' => '#/279',
+'inkatakanaphoneticextensions' => '#/279',
+'inkayahli' => '#/178',
+'inkharoshthi' => '#/259',
+'inkhmer' => '#/129',
+'inkhmersymbols' => '#/298',
+'inkhojki' => '#/154',
+'inkhudawadi' => '#/233',
+'inlao' => '#/108',
+'inlatin1' => '#/155',
+'inlatin1sup' => '#/155',
+'inlatin1supplement' => '#/155',
+'inlatinexta' => '#/234',
+'inlatinextadditional' => '#/349',
+'inlatinextb' => '#/235',
+'inlatinextc' => '#/236',
+'inlatinextd' => '#/237',
+'inlatinexte' => '#/238',
+'inlatinextendeda' => '#/234',
+'inlatinextendedadditional' => '#/349',
+'inlatinextendedb' => '#/235',
+'inlatinextendedc' => '#/236',
+'inlatinextendedd' => '#/237',
+'inlatinextendede' => '#/238',
+'inlepcha' => '#/156',
+'inletterlikesymbols' => '#/345',
+'inlimbu' => '#/130',
+'inlineara' => '#/179',
+'inlinearbideograms' => '#/338',
+'inlinearbsyllabary' => '#/339',
+'inlisu' => '#/117',
+'inlowsurrogates' => '#/307',
+'inlycian' => '#/157',
+'inlydian' => '#/158',
+'inmahajani' => '#/219',
+'inmahjong' => '#/180',
+'inmahjongtiles' => '#/180',
+'inmalayalam' => '#/239',
+'inmandaic' => '#/181',
+'inmanichaean' => '#/260',
+'inmathalphanum' => '#/299',
+'inmathematicalalphanumericsymbols' => '#/299',
+'inmathematicaloperators' => '#/308',
+'inmathoperators' => '#/308',
+'inmeeteimayek' => '#/280',
+'inmeeteimayekext' => '#/316',
+'inmeeteimayekextensions' => '#/316',
+'inmendekikakui' => '#/300',
+'inmeroiticcursive' => '#/326',
+'inmeroitichieroglyphs' => '#/355',
+'inmiao' => '#/118',
+'inmiscarrows' => '#/261',
+'inmiscellaneousmathematicalsymbolsa' => '#/340',
+'inmiscellaneousmathematicalsymbolsb' => '#/341',
+'inmiscellaneoussymbols' => '#/281',
+'inmiscellaneoussymbolsandarrows' => '#/261',
+'inmiscellaneoussymbolsandpictographs' => '#/327',
+'inmiscellaneoustechnical' => '#/309',
+'inmiscmathsymbolsa' => '#/340',
+'inmiscmathsymbolsb' => '#/341',
+'inmiscpictographs' => '#/327',
+'inmiscsymbols' => '#/281',
+'inmisctechnical' => '#/309',
+'inmodi' => '#/119',
+'inmodifierletters' => '#/328',
+'inmodifiertoneletters' => '#/356',
+'inmongolian' => '#/240',
+'inmro' => '#/109',
+'inmultani' => '#/182',
+'inmusic' => '#/131',
+'inmusicalsymbols' => '#/131',
+'inmyanmar' => '#/183',
+'inmyanmarexta' => '#/282',
+'inmyanmarextb' => '#/283',
+'inmyanmarextendeda' => '#/282',
+'inmyanmarextendedb' => '#/283',
+'innabataean' => '#/241',
 'innb' => 'Blk/NB',
-'innewtailue' => '#/221',
-'innko' => '#/93',
+'innewtailue' => '#/242',
+'innko' => '#/110',
 'innoblock' => 'Blk/NB',
-'innumberforms' => '#/262',
-'inocr' => '#/94',
-'inogham' => '#/114',
-'inolchiki' => '#/163',
-'inolditalic' => '#/222',
-'inoldnortharabian' => '#/306',
-'inoldpermic' => '#/223',
-'inoldpersian' => '#/241',
-'inoldsoutharabian' => '#/307',
-'inoldturkic' => '#/224',
-'inopticalcharacterrecognition' => '#/94',
-'inoriya' => '#/115',
-'inornamentaldingbats' => '#/326',
-'inosmanya' => '#/164',
-'inpahawhhmong' => '#/263',
-'inpalmyrene' => '#/225',
-'inpaucinhau' => '#/226',
-'inphagspa' => '#/165',
-'inphaistos' => '#/199',
-'inphaistosdisc' => '#/199',
-'inphoenician' => '#/242',
-'inphoneticext' => '#/264',
-'inphoneticextensions' => '#/264',
-'inphoneticextensionssupplement' => '#/294',
-'inphoneticextsup' => '#/294',
-'inplayingcards' => '#/279',
-'inprivateuse' => '#/95',
-'inprivateusearea' => '#/95',
-'inpsalterpahlavi' => '#/295',
-'inpua' => '#/95',
-'inpunctuation' => '#/265',
-'inrejang' => '#/140',
-'inrumi' => '#/102',
-'inruminumeralsymbols' => '#/102',
-'inrunic' => '#/116',
-'insamaritan' => '#/227',
-'insaurashtra' => '#/243',
-'inscriptionalpahlavi' => '#/557',
-'inscriptionalparthian' => '#/560',
-'insharada' => '#/166',
-'inshavian' => '#/167',
-'inshorthandformatcontrols' => '#/339',
-'insiddham' => '#/168',
-'insinhala' => '#/169',
-'insinhalaarchaicnumbers' => '#/335',
-'insmallforms' => '#/244',
-'insmallformvariants' => '#/244',
-'insorasompeng' => '#/266',
-'inspacingmodifierletters' => '#/305',
-'inspecials' => '#/200',
-'insundanese' => '#/228',
-'insundanesesup' => '#/280',
-'insundanesesupplement' => '#/280',
-'insuparrowsa' => '#/245',
-'insuparrowsb' => '#/246',
-'insuparrowsc' => '#/247',
-'insuperandsub' => '#/267',
-'insuperscriptsandsubscripts' => '#/267',
-'insupmathoperators' => '#/319',
-'insupplementalarrowsa' => '#/245',
-'insupplementalarrowsb' => '#/246',
-'insupplementalarrowsc' => '#/247',
-'insupplementalmathematicaloperators' => '#/319',
-'insupplementalpunctuation' => '#/296',
-'insupplementaryprivateuseareaa' => '#/170',
-'insupplementaryprivateuseareab' => '#/171',
-'insuppuaa' => '#/170',
-'insuppuab' => '#/171',
-'insuppunctuation' => '#/296',
-'insylotinagri' => '#/268',
-'insyriac' => '#/141',
-'intagalog' => '#/172',
-'intagbanwa' => '#/201',
-'intags' => '#/103',
-'intaile' => '#/117',
-'intaitham' => '#/173',
-'intaiviet' => '#/174',
-'intaixuanjing' => '#/269',
-'intaixuanjingsymbols' => '#/269',
-'intakri' => '#/118',
-'intamil' => '#/119',
-'intelugu' => '#/142',
-'inthaana' => '#/143',
-'inthai' => '#/104',
-'intibetan' => '#/175',
-'intifinagh' => '#/202',
-'intirhuta' => '#/176',
-'intransportandmap' => '#/308',
-'intransportandmapsymbols' => '#/308',
-'inucas' => '#/105',
-'inucasext' => '#/177',
-'inugaritic' => '#/203',
-'inunifiedcanadianaboriginalsyllabics' => '#/105',
-'inunifiedcanadianaboriginalsyllabicsextended' => '#/177',
-'invai' => '#/96',
-'invariationselectors' => '#/88',
-'invariationselectorssupplement' => '#/120',
-'invedicext' => '#/204',
-'invedicextensions' => '#/204',
-'inverticalforms' => '#/287',
-'invs' => '#/88',
-'invssup' => '#/120',
-'inwarangciti' => '#/248',
-'inyijing' => '#/144',
-'inyijinghexagramsymbols' => '#/144',
-'inyiradicals' => '#/249',
-'inyisyllables' => '#/270',
-'ipaext' => '#/131',
-'ipaextensions' => '#/131',
-'isaegeannumbers' => '#/281',
-'isaghb' => '#/511',
-'isahex' => '#/59',
-'isalchemical' => '#/229',
-'isalchemicalsymbols' => '#/229',
+'innumberforms' => '#/284',
+'inocr' => '#/111',
+'inogham' => '#/132',
+'inolchiki' => '#/184',
+'inoldhungarian' => '#/301',
+'inolditalic' => '#/243',
+'inoldnortharabian' => '#/329',
+'inoldpermic' => '#/244',
+'inoldpersian' => '#/262',
+'inoldsoutharabian' => '#/330',
+'inoldturkic' => '#/245',
+'inopticalcharacterrecognition' => '#/111',
+'inoriya' => '#/133',
+'inornamentaldingbats' => '#/350',
+'inosmanya' => '#/185',
+'inpahawhhmong' => '#/285',
+'inpalmyrene' => '#/246',
+'inpaucinhau' => '#/247',
+'inpc=bottom' => 'InPC/Bottom',
+'inpc=bottomandright' => '#/69',
+'inpc=left' => 'InPC/Left',
+'inpc=leftandright' => 'InPC/LeftAndR',
+'inpc=na' => 'InPC/NA',
+'inpc=overstruck' => 'InPC/Overstru',
+'inpc=right' => 'InPC/Right',
+'inpc=top' => 'InPC/Top',
+'inpc=topandbottom' => 'InPC/TopAndBo',
+'inpc=topandbottomandright' => '#/70',
+'inpc=topandleft' => 'InPC/TopAndLe',
+'inpc=topandleftandright' => 'InPC/TopAndL2',
+'inpc=topandright' => 'InPC/TopAndRi',
+'inpc=visualorderleft' => 'InPC/VisualOr',
+'inphagspa' => '#/186',
+'inphaistos' => '#/220',
+'inphaistosdisc' => '#/220',
+'inphoenician' => '#/263',
+'inphoneticext' => '#/286',
+'inphoneticextensions' => '#/286',
+'inphoneticextensionssupplement' => '#/317',
+'inphoneticextsup' => '#/317',
+'inplayingcards' => '#/302',
+'inprivateuse' => '#/112',
+'inprivateusearea' => '#/112',
+'inpsalterpahlavi' => '#/318',
+'inpua' => '#/112',
+'inpunctuation' => '#/287',
+'inrejang' => '#/159',
+'inrumi' => '#/120',
+'inruminumeralsymbols' => '#/120',
+'inrunic' => '#/134',
+'insamaritan' => '#/248',
+'insaurashtra' => '#/264',
+'insc=avagraha' => 'InSC/Avagraha',
+'insc=bindu' => 'InSC/Bindu',
+'insc=brahmijoiningnumber' => '#/81',
+'insc=cantillationmark' => 'InSC/Cantilla',
+'insc=consonant' => 'InSC/Consonan',
+'insc=consonantdead' => '#/75',
+'insc=consonantfinal' => 'InSC/Consona2',
+'insc=consonantheadletter' => '#/82',
+'insc=consonantkiller' => '#/77',
+'insc=consonantmedial' => 'InSC/Consona3',
+'insc=consonantplaceholder' => 'InSC/Consona5',
+'insc=consonantprecedingrepha' => '#/84',
+'insc=consonantprefixed' => '#/80',
+'insc=consonantsubjoined' => 'InSC/Consona4',
+'insc=consonantsucceedingrepha' => 'InSC/Consona6',
+'insc=consonantwithstacker' => '#/83',
+'insc=geminationmark' => '#/76',
+'insc=invisiblestacker' => 'InSC/Invisibl',
+'insc=joiner' => '#/71',
+'insc=modifyingletter' => '#/78',
+'insc=nonjoiner' => '#/72',
+'insc=nukta' => 'InSC/Nukta',
+'insc=number' => 'InSC/Number',
+'insc=numberjoiner' => '#/74',
+'insc=other' => 'InSC/Other',
+'insc=purekiller' => 'InSC/PureKill',
+'insc=registershifter' => '#/79',
+'insc=syllablemodifier' => 'InSC/Syllable',
+'insc=toneletter' => '#/73',
+'insc=tonemark' => 'InSC/ToneMark',
+'insc=virama' => 'InSC/Virama',
+'insc=visarga' => 'InSC/Visarga',
+'insc=vowel' => 'InSC/Vowel',
+'insc=voweldependent' => 'InSC/VowelDep',
+'insc=vowelindependent' => 'InSC/VowelInd',
+'inscriptionalpahlavi' => '#/592',
+'inscriptionalparthian' => '#/595',
+'insharada' => '#/187',
+'inshavian' => '#/188',
+'inshorthandformatcontrols' => '#/365',
+'insiddham' => '#/189',
+'insinhala' => '#/190',
+'insinhalaarchaicnumbers' => '#/360',
+'insmallforms' => '#/265',
+'insmallformvariants' => '#/265',
+'insorasompeng' => '#/288',
+'inspacingmodifierletters' => '#/328',
+'inspecials' => '#/221',
+'insundanese' => '#/249',
+'insundanesesup' => '#/303',
+'insundanesesupplement' => '#/303',
+'insuparrowsa' => '#/266',
+'insuparrowsb' => '#/267',
+'insuparrowsc' => '#/268',
+'insuperandsub' => '#/289',
+'insuperscriptsandsubscripts' => '#/289',
+'insupmathoperators' => '#/342',
+'insupplementalarrowsa' => '#/266',
+'insupplementalarrowsb' => '#/267',
+'insupplementalarrowsc' => '#/268',
+'insupplementalmathematicaloperators' => '#/342',
+'insupplementalpunctuation' => '#/319',
+'insupplementalsymbolsandpictographs' => '#/366',
+'insupplementaryprivateuseareaa' => '#/191',
+'insupplementaryprivateuseareab' => '#/192',
+'insuppuaa' => '#/191',
+'insuppuab' => '#/192',
+'insuppunctuation' => '#/319',
+'insupsymbolsandpictographs' => '#/366',
+'insuttonsignwriting' => '#/346',
+'insylotinagri' => '#/290',
+'insyriac' => '#/160',
+'intagalog' => '#/193',
+'intagbanwa' => '#/222',
+'intags' => '#/121',
+'intaile' => '#/135',
+'intaitham' => '#/194',
+'intaiviet' => '#/195',
+'intaixuanjing' => '#/291',
+'intaixuanjingsymbols' => '#/291',
+'intakri' => '#/136',
+'intamil' => '#/137',
+'intelugu' => '#/161',
+'inthaana' => '#/162',
+'inthai' => '#/122',
+'intibetan' => '#/196',
+'intifinagh' => '#/223',
+'intirhuta' => '#/197',
+'intransportandmap' => '#/331',
+'intransportandmapsymbols' => '#/331',
+'inucas' => '#/123',
+'inucasext' => '#/198',
+'inugaritic' => '#/224',
+'inunifiedcanadianaboriginalsyllabics' => '#/123',
+'inunifiedcanadianaboriginalsyllabicsextended' => '#/198',
+'invai' => '#/113',
+'invariationselectors' => '#/105',
+'invariationselectorssupplement' => '#/138',
+'invedicext' => '#/225',
+'invedicextensions' => '#/225',
+'inverticalforms' => '#/310',
+'invs' => '#/105',
+'invssup' => '#/138',
+'inwarangciti' => '#/269',
+'inyijing' => '#/163',
+'inyijinghexagramsymbols' => '#/163',
+'inyiradicals' => '#/270',
+'inyisyllables' => '#/292',
+'ipaext' => '#/150',
+'ipaextensions' => '#/150',
+'isaegeannumbers' => '#/304',
+'isaghb' => '#/542',
+'isahex' => '#/60',
+'isahom' => '#/543',
+'isalchemical' => '#/250',
+'isalchemicalsymbols' => '#/250',
 'isall' => '#/1',
 'isalnum' => 'Perl/Alnum',
 'isalpha' => 'Alpha/Y',
 'isalphabetic' => 'Alpha/Y',
-'isalphabeticpf' => '#/271',
-'isalphabeticpresentationforms' => '#/271',
-'isancientgreekmusic' => '#/320',
-'isancientgreekmusicalnotation' => '#/320',
-'isancientgreeknumbers' => '#/327',
-'isancientsymbols' => '#/288',
+'isalphabeticpf' => '#/293',
+'isalphabeticpresentationforms' => '#/293',
+'isanatolianhieroglyphs' => '#/565',
+'isancientgreekmusic' => '#/343',
+'isancientgreekmusicalnotation' => '#/343',
+'isancientgreeknumbers' => '#/351',
+'isancientsymbols' => '#/311',
 'isany' => '#/2',
 'isarab' => 'Sc/Arab',
 'isarabic' => 'Sc/Arab',
-'isarabicexta' => '#/230',
-'isarabicextendeda' => '#/230',
-'isarabicmath' => '#/231',
-'isarabicmathematicalalphabeticsymbols' => '#/231',
-'isarabicpfa' => '#/205',
-'isarabicpfb' => '#/206',
-'isarabicpresentationformsa' => '#/205',
-'isarabicpresentationformsb' => '#/206',
-'isarabicsup' => '#/207',
-'isarabicsupplement' => '#/207',
+'isarabicexta' => '#/251',
+'isarabicextendeda' => '#/251',
+'isarabicmath' => '#/252',
+'isarabicmathematicalalphabeticsymbols' => '#/252',
+'isarabicpfa' => '#/226',
+'isarabicpfb' => '#/227',
+'isarabicpresentationformsa' => '#/226',
+'isarabicpresentationformsb' => '#/227',
+'isarabicsup' => '#/228',
+'isarabicsupplement' => '#/228',
 'isarmenian' => 'Sc/Armn',
-'isarmi' => '#/512',
+'isarmi' => '#/544',
 'isarmn' => 'Sc/Armn',
-'isarrows' => '#/122',
-'isascii' => '#/106',
-'isasciihexdigit' => '#/59',
+'isarrows' => '#/140',
+'isascii' => '#/124',
+'isasciihexdigit' => '#/60',
 'isassigned' => 'Perl/Assigned',
-'isavestan' => '#/513',
-'isavst' => '#/513',
-'isbali' => '#/514',
-'isbalinese' => '#/514',
-'isbamu' => '#/515',
-'isbamum' => '#/515',
-'isbamumsup' => '#/180',
-'isbamumsupplement' => '#/180',
-'isbasiclatin' => '#/106',
-'isbass' => '#/516',
-'isbassavah' => '#/516',
-'isbatak' => '#/517',
-'isbatk' => '#/517',
+'isavestan' => '#/545',
+'isavst' => '#/545',
+'isbali' => '#/546',
+'isbalinese' => '#/546',
+'isbamu' => '#/547',
+'isbamum' => '#/547',
+'isbamumsup' => '#/201',
+'isbamumsupplement' => '#/201',
+'isbasiclatin' => '#/124',
+'isbass' => '#/548',
+'isbassavah' => '#/548',
+'isbatak' => '#/549',
+'isbatk' => '#/549',
 'isbeng' => 'Sc/Beng',
 'isbengali' => 'Sc/Beng',
 'isbidic' => 'BidiC/Y',
@@ -4183,38 +4447,38 @@
 'isbidim' => 'BidiM/Y',
 'isbidimirrored' => 'BidiM/Y',
 'isblank' => 'Perl/Blank',
-'isblockelements' => '#/282',
-'isbopo' => '#/518',
-'isbopomofo' => '#/518',
-'isbopomofoext' => '#/250',
-'isbopomofoextended' => '#/250',
-'isboxdrawing' => '#/232',
-'isbrah' => '#/519',
-'isbrahmi' => '#/519',
-'isbrai' => '#/147',
-'isbraille' => '#/147',
-'isbraillepatterns' => '#/147',
-'isbugi' => '#/520',
-'isbuginese' => '#/520',
-'isbuhd' => '#/521',
-'isbuhid' => '#/521',
-'isbyzantinemusic' => '#/289',
-'isbyzantinemusicalsymbols' => '#/289',
+'isblockelements' => '#/305',
+'isbopo' => '#/550',
+'isbopomofo' => '#/550',
+'isbopomofoext' => '#/271',
+'isbopomofoextended' => '#/271',
+'isboxdrawing' => '#/253',
+'isbrah' => '#/551',
+'isbrahmi' => '#/551',
+'isbrai' => '#/166',
+'isbraille' => '#/166',
+'isbraillepatterns' => '#/166',
+'isbugi' => '#/552',
+'isbuginese' => '#/552',
+'isbuhd' => '#/553',
+'isbuhid' => '#/553',
+'isbyzantinemusic' => '#/312',
+'isbyzantinemusicalsymbols' => '#/312',
 'isc' => 'Gc/C',
-'iscakm' => '#/522',
-'iscanadianaboriginal' => '#/523',
-'iscanadiansyllabics' => '#/105',
-'iscans' => '#/523',
-'iscari' => '#/524',
-'iscarian' => '#/524',
+'iscakm' => '#/554',
+'iscanadianaboriginal' => '#/555',
+'iscanadiansyllabics' => '#/123',
+'iscans' => '#/555',
+'iscari' => '#/556',
+'iscarian' => '#/556',
 'iscased' => 'Cased/Y',
 'iscasedletter' => 'Gc/LC',
 'iscaseignorable' => 'CI/Y',
-'iscaucasianalbanian' => '#/511',
-'iscc' => '#/343',
+'iscaucasianalbanian' => '#/542',
+'iscc' => '#/370',
 'isce' => 'CE/Y',
 'iscf' => 'Gc/Cf',
-'ischakma' => '#/522',
+'ischakma' => '#/554',
 'ischam' => 'Sc/Cham',
 'ischangeswhencasefolded' => 'CWCF/Y',
 'ischangeswhencasemapped' => 'CWCM/Y',
@@ -4222,63 +4486,67 @@
 'ischangeswhennfkccasefolded' => 'CWKCF/Y',
 'ischangeswhentitlecased' => 'CWT/Y',
 'ischangeswhenuppercased' => 'CWU/Y',
-'ischer' => '#/525',
-'ischerokee' => '#/525',
+'ischer' => '#/557',
+'ischerokee' => '#/557',
+'ischerokeesup' => '#/272',
+'ischerokeesupplement' => '#/272',
 'isci' => 'CI/Y',
-'iscjk' => '#/89',
-'iscjkcompat' => '#/208',
-'iscjkcompatforms' => '#/290',
-'iscjkcompatibility' => '#/208',
-'iscjkcompatibilityforms' => '#/290',
-'iscjkcompatibilityideographs' => '#/328',
-'iscjkcompatibilityideographssupplement' => '#/336',
-'iscjkcompatideographs' => '#/328',
-'iscjkcompatideographssup' => '#/336',
-'iscjkexta' => '#/148',
-'iscjkextb' => '#/149',
-'iscjkextc' => '#/150',
-'iscjkextd' => '#/151',
-'iscjkradicalssup' => '#/291',
-'iscjkradicalssupplement' => '#/291',
-'iscjkstrokes' => '#/233',
-'iscjksymbols' => '#/234',
-'iscjksymbolsandpunctuation' => '#/234',
-'iscjkunifiedideographs' => '#/89',
-'iscjkunifiedideographsextensiona' => '#/148',
-'iscjkunifiedideographsextensionb' => '#/149',
-'iscjkunifiedideographsextensionc' => '#/150',
-'iscjkunifiedideographsextensiond' => '#/151',
+'iscjk' => '#/106',
+'iscjkcompat' => '#/229',
+'iscjkcompatforms' => '#/313',
+'iscjkcompatibility' => '#/229',
+'iscjkcompatibilityforms' => '#/313',
+'iscjkcompatibilityideographs' => '#/352',
+'iscjkcompatibilityideographssupplement' => '#/361',
+'iscjkcompatideographs' => '#/352',
+'iscjkcompatideographssup' => '#/361',
+'iscjkexta' => '#/167',
+'iscjkextb' => '#/168',
+'iscjkextc' => '#/169',
+'iscjkextd' => '#/170',
+'iscjkexte' => '#/171',
+'iscjkradicalssup' => '#/314',
+'iscjkradicalssupplement' => '#/314',
+'iscjkstrokes' => '#/254',
+'iscjksymbols' => '#/255',
+'iscjksymbolsandpunctuation' => '#/255',
+'iscjkunifiedideographs' => '#/106',
+'iscjkunifiedideographsextensiona' => '#/167',
+'iscjkunifiedideographsextensionb' => '#/168',
+'iscjkunifiedideographsextensionc' => '#/169',
+'iscjkunifiedideographsextensiond' => '#/170',
+'iscjkunifiedideographsextensione' => '#/171',
 'isclosepunctuation' => 'Gc/Pe',
 'iscn' => 'Gc/Cn',
-'iscntrl' => '#/343',
-'isco' => '#/344',
-'iscombiningdiacriticalmarks' => '#/274',
-'iscombiningdiacriticalmarksextended' => '#/299',
-'iscombiningdiacriticalmarksforsymbols' => '#/337',
-'iscombiningdiacriticalmarkssupplement' => '#/300',
-'iscombininghalfmarks' => '#/211',
+'iscntrl' => '#/370',
+'isco' => '#/371',
+'iscombiningdiacriticalmarks' => '#/296',
+'iscombiningdiacriticalmarksextended' => '#/322',
+'iscombiningdiacriticalmarksforsymbols' => '#/362',
+'iscombiningdiacriticalmarkssupplement' => '#/323',
+'iscombininghalfmarks' => '#/232',
 'iscombiningmark' => 'Gc/M',
-'iscombiningmarksforsymbols' => '#/337',
+'iscombiningmarksforsymbols' => '#/362',
 'iscommon' => 'Sc/Zyyy',
-'iscommonindicnumberforms' => '#/314',
-'iscompatjamo' => '#/235',
+'iscommonindicnumberforms' => '#/337',
+'iscompatjamo' => '#/256',
 'iscompex' => 'CompEx/Y',
 'iscompositionexclusion' => 'CE/Y',
 'isconnectorpunctuation' => 'WB/EX',
-'iscontrol' => '#/343',
-'iscontrolpictures' => '#/297',
-'iscopt' => '#/526',
-'iscoptic' => '#/526',
-'iscopticepactnumbers' => '#/323',
-'iscountingrod' => '#/251',
-'iscountingrodnumerals' => '#/251',
+'iscontrol' => '#/370',
+'iscontrolpictures' => '#/320',
+'iscopt' => '#/558',
+'iscoptic' => '#/558',
+'iscopticepactnumbers' => '#/347',
+'iscountingrod' => '#/273',
+'iscountingrodnumerals' => '#/273',
 'iscprt' => 'Sc/Cprt',
-'iscs' => '#/345',
-'iscuneiform' => '#/584',
-'iscuneiformnumbers' => '#/309',
-'iscuneiformnumbersandpunctuation' => '#/309',
+'iscs' => '#/14',
+'iscuneiform' => 'Sc/Xsux',
+'iscuneiformnumbers' => '#/332',
+'iscuneiformnumbersandpunctuation' => '#/332',
 'iscurrencysymbol' => 'Gc/Sc',
-'iscurrencysymbols' => '#/298',
+'iscurrencysymbols' => '#/321',
 'iscwcf' => 'CWCF/Y',
 'iscwcm' => 'CWCM/Y',
 'iscwkcf' => 'CWKCF/Y',
@@ -4286,15 +4554,15 @@
 'iscwt' => 'CWT/Y',
 'iscwu' => 'CWU/Y',
 'iscypriot' => 'Sc/Cprt',
-'iscypriotsyllabary' => '#/310',
+'iscypriotsyllabary' => '#/333',
 'iscyrillic' => 'Sc/Cyrl',
-'iscyrillicexta' => '#/272',
-'iscyrillicextb' => '#/273',
-'iscyrillicextendeda' => '#/272',
-'iscyrillicextendedb' => '#/273',
-'iscyrillicsup' => '#/252',
-'iscyrillicsupplement' => '#/252',
-'iscyrillicsupplementary' => '#/252',
+'iscyrillicexta' => '#/294',
+'iscyrillicextb' => '#/295',
+'iscyrillicextendeda' => '#/294',
+'iscyrillicextendedb' => '#/295',
+'iscyrillicsup' => '#/274',
+'iscyrillicsupplement' => '#/274',
+'iscyrillicsupplementary' => '#/274',
 'iscyrl' => 'Sc/Cyrl',
 'isdash' => 'Dash/Y',
 'isdashpunctuation' => 'Gc/Pd',
@@ -4302,64 +4570,65 @@
 'isdefaultignorablecodepoint' => 'DI/Y',
 'isdep' => 'Dep/Y',
 'isdeprecated' => 'Dep/Y',
-'isdeseret' => '#/152',
+'isdeseret' => '#/172',
 'isdeva' => 'Sc/Deva',
 'isdevanagari' => 'Sc/Deva',
-'isdevanagariext' => '#/283',
-'isdevanagariextended' => '#/283',
+'isdevanagariext' => '#/306',
+'isdevanagariextended' => '#/306',
 'isdi' => 'DI/Y',
 'isdia' => 'Dia/Y',
 'isdiacritic' => 'Dia/Y',
-'isdiacriticals' => '#/274',
-'isdiacriticalsext' => '#/299',
-'isdiacriticalsforsymbols' => '#/337',
-'isdiacriticalssup' => '#/300',
+'isdiacriticals' => '#/296',
+'isdiacriticalsext' => '#/322',
+'isdiacriticalsforsymbols' => '#/362',
+'isdiacriticalssup' => '#/323',
 'isdigit' => 'Gc/Nd',
-'isdingbats' => '#/186',
-'isdomino' => '#/127',
-'isdominotiles' => '#/127',
-'isdsrt' => '#/152',
+'isdingbats' => '#/207',
+'isdomino' => '#/145',
+'isdominotiles' => '#/145',
+'isdsrt' => '#/172',
 'isdupl' => 'Sc/Dupl',
 'isduployan' => 'Sc/Dupl',
-'isegyp' => '#/527',
-'isegyptianhieroglyphs' => '#/527',
-'iselba' => '#/528',
-'iselbasan' => '#/528',
-'isemoticons' => '#/210',
-'isenclosedalphanum' => '#/311',
-'isenclosedalphanumerics' => '#/311',
-'isenclosedalphanumericsupplement' => '#/330',
-'isenclosedalphanumsup' => '#/330',
-'isenclosedcjk' => '#/253',
-'isenclosedcjklettersandmonths' => '#/253',
-'isenclosedideographicsup' => '#/338',
-'isenclosedideographicsupplement' => '#/338',
+'isearlydynasticcuneiform' => '#/363',
+'isegyp' => '#/559',
+'isegyptianhieroglyphs' => '#/559',
+'iselba' => '#/560',
+'iselbasan' => '#/560',
+'isemoticons' => '#/231',
+'isenclosedalphanum' => '#/334',
+'isenclosedalphanumerics' => '#/334',
+'isenclosedalphanumericsupplement' => '#/354',
+'isenclosedalphanumsup' => '#/354',
+'isenclosedcjk' => '#/275',
+'isenclosedcjklettersandmonths' => '#/275',
+'isenclosedideographicsup' => '#/364',
+'isenclosedideographicsupplement' => '#/364',
 'isenclosingmark' => 'Gc/Me',
 'isethi' => 'Sc/Ethi',
 'isethiopic' => 'Sc/Ethi',
-'isethiopicext' => '#/254',
-'isethiopicexta' => '#/275',
-'isethiopicextended' => '#/254',
-'isethiopicextendeda' => '#/275',
-'isethiopicsup' => '#/255',
-'isethiopicsupplement' => '#/255',
+'isethiopicext' => '#/276',
+'isethiopicexta' => '#/297',
+'isethiopicextended' => '#/276',
+'isethiopicextendeda' => '#/297',
+'isethiopicsup' => '#/277',
+'isethiopicsupplement' => '#/277',
 'isext' => 'Ext/Y',
 'isextender' => 'Ext/Y',
 'isfinalpunctuation' => 'Gc/Pf',
 'isformat' => 'Gc/Cf',
 'isfullcompositionexclusion' => 'CompEx/Y',
-'isgeneralpunctuation' => '#/265',
-'isgeometricshapes' => '#/301',
-'isgeometricshapesext' => '#/324',
-'isgeometricshapesextended' => '#/324',
+'isgeneralpunctuation' => '#/287',
+'isgeometricshapes' => '#/324',
+'isgeometricshapesext' => '#/348',
+'isgeometricshapesextended' => '#/348',
 'isgeor' => 'Sc/Geor',
 'isgeorgian' => 'Sc/Geor',
-'isgeorgiansup' => '#/256',
-'isgeorgiansupplement' => '#/256',
-'isglag' => '#/529',
-'isglagolitic' => '#/529',
-'isgoth' => '#/530',
-'isgothic' => '#/530',
+'isgeorgiansup' => '#/278',
+'isgeorgiansupplement' => '#/278',
+'isglag' => '#/561',
+'isglagolitic' => '#/561',
+'isgoth' => '#/562',
+'isgothic' => '#/562',
 'isgran' => 'Sc/Gran',
 'isgrantha' => 'Sc/Gran',
 'isgraph' => 'Perl/Graph',
@@ -4367,91 +4636,95 @@
 'isgraphemeextend' => 'GCB/EX',
 'isgrbase' => 'GrBase/Y',
 'isgreek' => 'Sc/Grek',
-'isgreekandcoptic' => '#/110',
-'isgreekext' => '#/190',
-'isgreekextended' => '#/190',
+'isgreekandcoptic' => '#/128',
+'isgreekext' => '#/211',
+'isgreekextended' => '#/211',
 'isgrek' => 'Sc/Grek',
 'isgrext' => 'GCB/EX',
 'isgujarati' => 'Sc/Gujr',
 'isgujr' => 'Sc/Gujr',
 'isgurmukhi' => 'Sc/Guru',
 'isguru' => 'Sc/Guru',
-'ishalfandfullforms' => '#/312',
-'ishalfmarks' => '#/211',
-'ishalfwidthandfullwidthforms' => '#/312',
+'ishalfandfullforms' => '#/335',
+'ishalfmarks' => '#/232',
+'ishalfwidthandfullwidthforms' => '#/335',
 'ishan' => 'Sc/Han',
 'ishang' => 'Sc/Hang',
 'ishangul' => 'Sc/Hang',
-'ishangulcompatibilityjamo' => '#/235',
-'ishanguljamo' => '#/98',
-'ishanguljamoextendeda' => '#/194',
-'ishanguljamoextendedb' => '#/195',
-'ishangulsyllables' => '#/129',
+'ishangulcompatibilityjamo' => '#/256',
+'ishanguljamo' => '#/116',
+'ishanguljamoextendeda' => '#/215',
+'ishanguljamoextendedb' => '#/216',
+'ishangulsyllables' => '#/147',
 'ishani' => 'Sc/Han',
-'ishano' => '#/531',
-'ishanunoo' => '#/531',
+'ishano' => '#/563',
+'ishanunoo' => '#/563',
+'ishatr' => '#/564',
+'ishatran' => '#/564',
 'ishebr' => 'Sc/Hebr',
 'ishebrew' => 'Sc/Hebr',
 'ishex' => 'Hex/Y',
 'ishexdigit' => 'Hex/Y',
-'ishighprivateusesurrogates' => '#/313',
-'ishighpusurrogates' => '#/313',
-'ishighsurrogates' => '#/292',
+'ishighprivateusesurrogates' => '#/336',
+'ishighpusurrogates' => '#/336',
+'ishighsurrogates' => '#/315',
 'ishira' => 'Sc/Hira',
 'ishiragana' => 'Sc/Hira',
+'ishluw' => '#/565',
 'ishmng' => 'Sc/Hmng',
 'ishorizspace' => 'Perl/Blank',
-'ishyphen' => 'Hyphen/Y',
+'ishung' => '#/566',
+'ishyphen' => 'Hyphen/T',
 'isidc' => 'IDC/Y',
 'isidcontinue' => 'IDC/Y',
 'isideo' => 'Ideo/Y',
 'isideographic' => 'Ideo/Y',
-'isideographicdescriptioncharacters' => '#/90',
+'isideographicdescriptioncharacters' => '#/107',
 'isids' => 'IDS/Y',
-'isidsb' => '#/66',
-'isidsbinaryoperator' => '#/66',
-'isidst' => '#/67',
+'isidsb' => '#/67',
+'isidsbinaryoperator' => '#/67',
+'isidst' => '#/68',
 'isidstart' => 'IDS/Y',
-'isidstrinaryoperator' => '#/67',
-'isimperialaramaic' => '#/512',
-'isindicnumberforms' => '#/314',
+'isidstrinaryoperator' => '#/68',
+'isimperialaramaic' => '#/544',
+'isindicnumberforms' => '#/337',
 'isinherited' => 'Sc/Zinh',
 'isinitialpunctuation' => 'Gc/Pi',
-'isinscriptionalpahlavi' => '#/557',
-'isinscriptionalparthian' => '#/560',
-'isipaext' => '#/131',
-'isipaextensions' => '#/131',
-'isital' => '#/532',
-'isjamo' => '#/98',
-'isjamoexta' => '#/194',
-'isjamoextb' => '#/195',
-'isjava' => '#/533',
-'isjavanese' => '#/533',
-'isjoinc' => '#/68',
-'isjoincontrol' => '#/68',
-'iskaithi' => '#/536',
-'iskali' => '#/534',
+'isinscriptionalpahlavi' => '#/592',
+'isinscriptionalparthian' => '#/595',
+'isipaext' => '#/150',
+'isipaextensions' => '#/150',
+'isital' => '#/567',
+'isjamo' => '#/116',
+'isjamoexta' => '#/215',
+'isjamoextb' => '#/216',
+'isjava' => '#/568',
+'isjavanese' => '#/568',
+'isjoinc' => '#/85',
+'isjoincontrol' => '#/85',
+'iskaithi' => '#/571',
+'iskali' => '#/569',
 'iskana' => 'Sc/Kana',
-'iskanasup' => '#/156',
-'iskanasupplement' => '#/156',
-'iskanbun' => '#/133',
-'iskangxi' => '#/134',
-'iskangxiradicals' => '#/134',
+'iskanasup' => '#/176',
+'iskanasupplement' => '#/176',
+'iskanbun' => '#/152',
+'iskangxi' => '#/153',
+'iskangxiradicals' => '#/153',
 'iskannada' => 'Sc/Knda',
 'iskatakana' => 'Sc/Kana',
-'iskatakanaext' => '#/257',
-'iskatakanaphoneticextensions' => '#/257',
-'iskayahli' => '#/534',
+'iskatakanaext' => '#/279',
+'iskatakanaphoneticextensions' => '#/279',
+'iskayahli' => '#/569',
 'iskhar' => 'Sc/Khar',
 'iskharoshthi' => 'Sc/Khar',
 'iskhmer' => 'Sc/Khmr',
-'iskhmersymbols' => '#/276',
+'iskhmersymbols' => '#/298',
 'iskhmr' => 'Sc/Khmr',
-'iskhoj' => '#/535',
-'iskhojki' => '#/535',
-'iskhudawadi' => '#/567',
+'iskhoj' => '#/570',
+'iskhojki' => '#/570',
+'iskhudawadi' => '#/603',
 'isknda' => 'Sc/Knda',
-'iskthi' => '#/536',
+'iskthi' => '#/571',
 'isl' => 'Gc/L',
 'isl&' => 'Gc/LC',
 'isl_' => 'Gc/LC',
@@ -4459,150 +4732,153 @@
 'islao' => 'Sc/Lao',
 'islaoo' => 'Sc/Lao',
 'islatin' => 'Sc/Latn',
-'islatin1' => '#/136',
-'islatin1sup' => '#/136',
-'islatin1supplement' => '#/136',
-'islatinexta' => '#/213',
-'islatinextadditional' => '#/325',
-'islatinextb' => '#/214',
-'islatinextc' => '#/215',
-'islatinextd' => '#/216',
-'islatinexte' => '#/217',
-'islatinextendeda' => '#/213',
-'islatinextendedadditional' => '#/325',
-'islatinextendedb' => '#/214',
-'islatinextendedc' => '#/215',
-'islatinextendedd' => '#/216',
-'islatinextendede' => '#/217',
+'islatin1' => '#/155',
+'islatin1sup' => '#/155',
+'islatin1supplement' => '#/155',
+'islatinexta' => '#/234',
+'islatinextadditional' => '#/349',
+'islatinextb' => '#/235',
+'islatinextc' => '#/236',
+'islatinextd' => '#/237',
+'islatinexte' => '#/238',
+'islatinextendeda' => '#/234',
+'islatinextendedadditional' => '#/349',
+'islatinextendedb' => '#/235',
+'islatinextendedc' => '#/236',
+'islatinextendedd' => '#/237',
+'islatinextendede' => '#/238',
 'islatn' => 'Sc/Latn',
 'islc' => 'Gc/LC',
-'islepc' => '#/537',
-'islepcha' => '#/537',
+'islepc' => '#/572',
+'islepcha' => '#/572',
 'isletter' => 'Gc/L',
-'isletterlikesymbols' => '#/322',
+'isletterlikesymbols' => '#/345',
 'isletternumber' => 'Gc/Nl',
 'islimb' => 'Sc/Limb',
 'islimbu' => 'Sc/Limb',
-'islina' => '#/538',
+'islina' => '#/573',
 'islinb' => 'Sc/Linb',
-'islineara' => '#/538',
+'islineara' => '#/573',
 'islinearb' => 'Sc/Linb',
-'islinearbideograms' => '#/315',
-'islinearbsyllabary' => '#/316',
-'islineseparator' => '#/346',
-'islisu' => '#/99',
+'islinearbideograms' => '#/338',
+'islinearbsyllabary' => '#/339',
+'islineseparator' => '#/372',
+'islisu' => '#/117',
 'isll' => 'Gc/Ll',
 'islm' => 'Gc/Lm',
 'islo' => 'Gc/Lo',
-'isloe' => 'LOE/Y',
-'islogicalorderexception' => 'LOE/Y',
+'isloe' => 'InPC/VisualOr',
+'islogicalorderexception' => 'InPC/VisualOr',
 'islower' => 'Lower/Y',
 'islowercase' => 'Lower/Y',
 'islowercaseletter' => 'Gc/Ll',
-'islowsurrogates' => '#/284',
+'islowsurrogates' => '#/307',
 'islt' => 'Perl/Title',
 'islu' => 'Gc/Lu',
-'islyci' => '#/539',
-'islycian' => '#/539',
-'islydi' => '#/540',
-'islydian' => '#/540',
+'islyci' => '#/574',
+'islycian' => '#/574',
+'islydi' => '#/575',
+'islydian' => '#/575',
 'ism' => 'Gc/M',
-'ismahajani' => '#/541',
-'ismahj' => '#/541',
-'ismahjong' => '#/160',
-'ismahjongtiles' => '#/160',
+'ismahajani' => '#/576',
+'ismahj' => '#/576',
+'ismahjong' => '#/180',
+'ismahjongtiles' => '#/180',
 'ismalayalam' => 'Sc/Mlym',
-'ismand' => '#/542',
-'ismandaic' => '#/542',
-'ismani' => '#/543',
-'ismanichaean' => '#/543',
+'ismand' => '#/577',
+'ismandaic' => '#/577',
+'ismani' => '#/578',
+'ismanichaean' => '#/578',
 'ismark' => 'Gc/M',
 'ismath' => 'Math/Y',
-'ismathalphanum' => '#/277',
-'ismathematicalalphanumericsymbols' => '#/277',
-'ismathematicaloperators' => '#/285',
-'ismathoperators' => '#/285',
+'ismathalphanum' => '#/299',
+'ismathematicalalphanumericsymbols' => '#/299',
+'ismathematicaloperators' => '#/308',
+'ismathoperators' => '#/308',
 'ismathsymbol' => 'Gc/Sm',
 'ismc' => 'Gc/Mc',
 'isme' => 'Gc/Me',
-'ismeeteimayek' => '#/548',
-'ismeeteimayekext' => '#/293',
-'ismeeteimayekextensions' => '#/293',
-'ismend' => '#/544',
-'ismendekikakui' => '#/544',
-'ismerc' => '#/545',
-'ismero' => '#/331',
-'ismeroiticcursive' => '#/545',
-'ismeroitichieroglyphs' => '#/331',
-'ismiao' => '#/546',
-'ismiscarrows' => '#/240',
-'ismiscellaneousmathematicalsymbolsa' => '#/317',
-'ismiscellaneousmathematicalsymbolsb' => '#/318',
-'ismiscellaneoussymbols' => '#/259',
-'ismiscellaneoussymbolsandarrows' => '#/240',
-'ismiscellaneoussymbolsandpictographs' => '#/304',
-'ismiscellaneoustechnical' => '#/286',
-'ismiscmathsymbolsa' => '#/317',
-'ismiscmathsymbolsb' => '#/318',
-'ismiscpictographs' => '#/304',
-'ismiscsymbols' => '#/259',
-'ismisctechnical' => '#/286',
+'ismeeteimayek' => '#/583',
+'ismeeteimayekext' => '#/316',
+'ismeeteimayekextensions' => '#/316',
+'ismend' => '#/579',
+'ismendekikakui' => '#/579',
+'ismerc' => '#/580',
+'ismero' => '#/355',
+'ismeroiticcursive' => '#/580',
+'ismeroitichieroglyphs' => '#/355',
+'ismiao' => '#/581',
+'ismiscarrows' => '#/261',
+'ismiscellaneousmathematicalsymbolsa' => '#/340',
+'ismiscellaneousmathematicalsymbolsb' => '#/341',
+'ismiscellaneoussymbols' => '#/281',
+'ismiscellaneoussymbolsandarrows' => '#/261',
+'ismiscellaneoussymbolsandpictographs' => '#/327',
+'ismiscellaneoustechnical' => '#/309',
+'ismiscmathsymbolsa' => '#/340',
+'ismiscmathsymbolsb' => '#/341',
+'ismiscpictographs' => '#/327',
+'ismiscsymbols' => '#/281',
+'ismisctechnical' => '#/309',
 'ismlym' => 'Sc/Mlym',
 'ismn' => 'Gc/Mn',
-'ismodi' => '#/547',
+'ismodi' => '#/582',
 'ismodifierletter' => 'Gc/Lm',
-'ismodifierletters' => '#/305',
+'ismodifierletters' => '#/328',
 'ismodifiersymbol' => 'Gc/Sk',
-'ismodifiertoneletters' => '#/332',
+'ismodifiertoneletters' => '#/356',
 'ismong' => 'Sc/Mong',
 'ismongolian' => 'Sc/Mong',
-'ismro' => '#/508',
-'ismroo' => '#/508',
-'ismtei' => '#/548',
-'ismusic' => '#/113',
-'ismusicalsymbols' => '#/113',
-'ismyanmar' => '#/549',
-'ismyanmarexta' => '#/260',
-'ismyanmarextb' => '#/261',
-'ismyanmarextendeda' => '#/260',
-'ismyanmarextendedb' => '#/261',
-'ismymr' => '#/549',
+'ismro' => '#/539',
+'ismroo' => '#/539',
+'ismtei' => '#/583',
+'ismult' => 'Sc/Mult',
+'ismultani' => 'Sc/Mult',
+'ismusic' => '#/131',
+'ismusicalsymbols' => '#/131',
+'ismyanmar' => '#/584',
+'ismyanmarexta' => '#/282',
+'ismyanmarextb' => '#/283',
+'ismyanmarextendeda' => '#/282',
+'ismyanmarextendedb' => '#/283',
+'ismymr' => '#/584',
 'isn' => 'Gc/N',
-'isnabataean' => '#/550',
-'isnarb' => '#/306',
+'isnabataean' => '#/585',
+'isnarb' => '#/329',
 'isnb' => 'Blk/NB',
-'isnbat' => '#/550',
-'isnchar' => 'NChar/Y',
+'isnbat' => '#/585',
+'isnchar' => 'Perl/_PerlNch',
 'isnd' => 'Gc/Nd',
 'isnewtailue' => 'Sc/Talu',
-'isnko' => '#/509',
-'isnkoo' => '#/509',
+'isnko' => '#/540',
+'isnkoo' => '#/540',
 'isnl' => 'Gc/Nl',
 'isno' => 'Gc/No',
 'isnoblock' => 'Blk/NB',
-'isnoncharactercodepoint' => 'NChar/Y',
+'isnoncharactercodepoint' => 'Perl/_PerlNch',
 'isnonspacingmark' => 'Gc/Mn',
 'isnumber' => 'Gc/N',
-'isnumberforms' => '#/262',
-'isocr' => '#/94',
-'isogam' => '#/551',
-'isogham' => '#/551',
-'isolchiki' => '#/163',
-'isolck' => '#/163',
-'isolditalic' => '#/532',
-'isoldnortharabian' => '#/306',
-'isoldpermic' => '#/555',
-'isoldpersian' => '#/583',
-'isoldsoutharabian' => '#/307',
-'isoldturkic' => '#/552',
+'isnumberforms' => '#/284',
+'isocr' => '#/111',
+'isogam' => '#/586',
+'isogham' => '#/586',
+'isolchiki' => '#/184',
+'isolck' => '#/184',
+'isoldhungarian' => '#/566',
+'isolditalic' => '#/567',
+'isoldnortharabian' => '#/329',
+'isoldpermic' => '#/590',
+'isoldpersian' => '#/619',
+'isoldsoutharabian' => '#/330',
+'isoldturkic' => '#/587',
 'isopenpunctuation' => 'Gc/Ps',
-'isopticalcharacterrecognition' => '#/94',
+'isopticalcharacterrecognition' => '#/111',
 'isoriya' => 'Sc/Orya',
-'isorkh' => '#/552',
-'isornamentaldingbats' => '#/326',
+'isorkh' => '#/587',
+'isornamentaldingbats' => '#/350',
 'isorya' => 'Sc/Orya',
-'isosma' => '#/553',
-'isosmanya' => '#/553',
+'isosma' => '#/588',
+'isosmanya' => '#/588',
 'isother' => 'Gc/C',
 'isotherletter' => 'Gc/Lo',
 'isothernumber' => 'Gc/No',
@@ -4610,37 +4886,37 @@
 'isothersymbol' => 'Gc/So',
 'isp' => 'Gc/P',
 'ispahawhhmong' => 'Sc/Hmng',
-'ispalm' => '#/225',
-'ispalmyrene' => '#/225',
-'isparagraphseparator' => '#/347',
+'ispalm' => '#/246',
+'ispalmyrene' => '#/246',
+'isparagraphseparator' => '#/373',
 'ispatsyn' => 'PatSyn/Y',
 'ispatternsyntax' => 'PatSyn/Y',
-'ispatternwhitespace' => 'PatWS/Y',
-'ispatws' => 'PatWS/Y',
-'ispauc' => '#/554',
-'ispaucinhau' => '#/554',
+'ispatternwhitespace' => 'Perl/_PerlPat',
+'ispatws' => 'Perl/_PerlPat',
+'ispauc' => '#/589',
+'ispaucinhau' => '#/589',
 'ispc' => 'WB/EX',
 'ispd' => 'Gc/Pd',
 'ispe' => 'Gc/Pe',
 'isperlspace' => '#/3',
 'isperlword' => 'Perl/PerlWord',
-'isperm' => '#/555',
+'isperm' => '#/590',
 'ispf' => 'Gc/Pf',
-'isphag' => '#/556',
-'isphagspa' => '#/556',
-'isphaistos' => '#/199',
-'isphaistosdisc' => '#/199',
-'isphli' => '#/557',
-'isphlp' => '#/558',
-'isphnx' => '#/559',
-'isphoenician' => '#/559',
-'isphoneticext' => '#/264',
-'isphoneticextensions' => '#/264',
-'isphoneticextensionssupplement' => '#/294',
-'isphoneticextsup' => '#/294',
+'isphag' => '#/591',
+'isphagspa' => '#/591',
+'isphaistos' => '#/220',
+'isphaistosdisc' => '#/220',
+'isphli' => '#/592',
+'isphlp' => '#/593',
+'isphnx' => '#/594',
+'isphoenician' => '#/594',
+'isphoneticext' => '#/286',
+'isphoneticextensions' => '#/286',
+'isphoneticextensionssupplement' => '#/317',
+'isphoneticextsup' => '#/317',
 'ispi' => 'Gc/Pi',
-'isplayingcards' => '#/279',
-'isplrd' => '#/546',
+'isplayingcards' => '#/302',
+'isplrd' => '#/581',
 'ispo' => 'Gc/Po',
 'isposixalnum' => '#/5',
 'isposixalpha' => '#/6',
@@ -4654,150 +4930,155 @@
 'isposixspace' => '#/3',
 'isposixupper' => '#/13',
 'isposixword' => 'Perl/PerlWord',
-'isposixxdigit' => '#/59',
+'isposixxdigit' => '#/60',
 'isprint' => 'Perl/Print',
-'isprivateuse' => '#/344',
-'isprivateusearea' => '#/95',
-'isprti' => '#/560',
+'isprivateuse' => '#/371',
+'isprivateusearea' => '#/112',
+'isprti' => '#/595',
 'isps' => 'Gc/Ps',
-'ispsalterpahlavi' => '#/558',
-'ispua' => '#/95',
+'ispsalterpahlavi' => '#/593',
+'ispua' => '#/112',
 'ispunct' => 'Gc/P',
 'ispunctuation' => 'Gc/P',
-'isqaac' => '#/526',
+'isqaac' => '#/558',
 'isqaai' => 'Sc/Zinh',
 'isqmark' => 'QMark/Y',
 'isquotationmark' => 'QMark/Y',
-'isradical' => '#/69',
-'isrejang' => '#/561',
-'isrjng' => '#/561',
-'isrumi' => '#/102',
-'isruminumeralsymbols' => '#/102',
-'isrunic' => '#/562',
-'isrunr' => '#/562',
+'isradical' => '#/86',
+'isrejang' => '#/596',
+'isrjng' => '#/596',
+'isrumi' => '#/120',
+'isruminumeralsymbols' => '#/120',
+'isrunic' => '#/597',
+'isrunr' => '#/597',
 'iss' => 'Gc/S',
-'issamaritan' => '#/563',
-'issamr' => '#/563',
-'issarb' => '#/307',
-'issaur' => '#/564',
-'issaurashtra' => '#/564',
+'issamaritan' => '#/598',
+'issamr' => '#/598',
+'issarb' => '#/330',
+'issaur' => '#/599',
+'issaurashtra' => '#/599',
 'issc' => 'Gc/Sc',
 'issd' => 'SD/Y',
 'isseparator' => 'Gc/Z',
-'issharada' => '#/565',
-'isshavian' => '#/167',
-'isshaw' => '#/167',
-'isshorthandformatcontrols' => '#/339',
-'isshrd' => '#/565',
-'issidd' => '#/566',
-'issiddham' => '#/566',
-'issind' => '#/567',
+'issgnw' => '#/600',
+'issharada' => '#/601',
+'isshavian' => '#/188',
+'isshaw' => '#/188',
+'isshorthandformatcontrols' => '#/365',
+'isshrd' => '#/601',
+'issidd' => '#/602',
+'issiddham' => '#/602',
+'issignwriting' => '#/600',
+'issind' => '#/603',
 'issinh' => 'Sc/Sinh',
 'issinhala' => 'Sc/Sinh',
-'issinhalaarchaicnumbers' => '#/335',
+'issinhalaarchaicnumbers' => '#/360',
 'issk' => 'Gc/Sk',
 'issm' => 'Gc/Sm',
-'issmallforms' => '#/244',
-'issmallformvariants' => '#/244',
+'issmallforms' => '#/265',
+'issmallformvariants' => '#/265',
 'isso' => 'Gc/So',
 'issoftdotted' => 'SD/Y',
-'issora' => '#/568',
-'issorasompeng' => '#/568',
+'issora' => '#/604',
+'issorasompeng' => '#/604',
 'isspace' => 'Perl/SpacePer',
 'isspaceperl' => 'Perl/SpacePer',
 'isspaceseparator' => 'Gc/Zs',
 'isspacingmark' => 'Gc/Mc',
-'isspacingmodifierletters' => '#/305',
-'isspecials' => '#/200',
+'isspacingmodifierletters' => '#/328',
+'isspecials' => '#/221',
 'issterm' => 'STerm/Y',
-'issund' => '#/569',
-'issundanese' => '#/569',
-'issundanesesup' => '#/280',
-'issundanesesupplement' => '#/280',
-'issuparrowsa' => '#/245',
-'issuparrowsb' => '#/246',
-'issuparrowsc' => '#/247',
-'issuperandsub' => '#/267',
-'issuperscriptsandsubscripts' => '#/267',
-'issupmathoperators' => '#/319',
-'issupplementalarrowsa' => '#/245',
-'issupplementalarrowsb' => '#/246',
-'issupplementalarrowsc' => '#/247',
-'issupplementalmathematicaloperators' => '#/319',
-'issupplementalpunctuation' => '#/296',
-'issupplementaryprivateuseareaa' => '#/170',
-'issupplementaryprivateuseareab' => '#/171',
-'issuppuaa' => '#/170',
-'issuppuab' => '#/171',
-'issuppunctuation' => '#/296',
-'issurrogate' => '#/345',
-'issylo' => '#/570',
-'issylotinagri' => '#/570',
+'issund' => '#/605',
+'issundanese' => '#/605',
+'issundanesesup' => '#/303',
+'issundanesesupplement' => '#/303',
+'issuparrowsa' => '#/266',
+'issuparrowsb' => '#/267',
+'issuparrowsc' => '#/268',
+'issuperandsub' => '#/289',
+'issuperscriptsandsubscripts' => '#/289',
+'issupmathoperators' => '#/342',
+'issupplementalarrowsa' => '#/266',
+'issupplementalarrowsb' => '#/267',
+'issupplementalarrowsc' => '#/268',
+'issupplementalmathematicaloperators' => '#/342',
+'issupplementalpunctuation' => '#/319',
+'issupplementalsymbolsandpictographs' => '#/366',
+'issupplementaryprivateuseareaa' => '#/191',
+'issupplementaryprivateuseareab' => '#/192',
+'issuppuaa' => '#/191',
+'issuppuab' => '#/192',
+'issuppunctuation' => '#/319',
+'issupsymbolsandpictographs' => '#/366',
+'issurrogate' => '#/14',
+'issuttonsignwriting' => '#/346',
+'issylo' => '#/606',
+'issylotinagri' => '#/606',
 'issymbol' => 'Gc/S',
-'issyrc' => '#/571',
-'issyriac' => '#/571',
-'istagalog' => '#/577',
-'istagb' => '#/572',
-'istagbanwa' => '#/572',
-'istags' => '#/103',
-'istaile' => '#/574',
+'issyrc' => '#/607',
+'issyriac' => '#/607',
+'istagalog' => '#/613',
+'istagb' => '#/608',
+'istagbanwa' => '#/608',
+'istags' => '#/121',
+'istaile' => '#/610',
 'istaitham' => 'Sc/Lana',
-'istaiviet' => '#/575',
-'istaixuanjing' => '#/269',
-'istaixuanjingsymbols' => '#/269',
-'istakr' => '#/573',
-'istakri' => '#/573',
-'istale' => '#/574',
+'istaiviet' => '#/611',
+'istaixuanjing' => '#/291',
+'istaixuanjingsymbols' => '#/291',
+'istakr' => '#/609',
+'istakri' => '#/609',
+'istale' => '#/610',
 'istalu' => 'Sc/Talu',
 'istamil' => 'Sc/Taml',
 'istaml' => 'Sc/Taml',
-'istavt' => '#/575',
+'istavt' => '#/611',
 'istelu' => 'Sc/Telu',
 'istelugu' => 'Sc/Telu',
 'isterm' => 'Term/Y',
 'isterminalpunctuation' => 'Term/Y',
-'istfng' => '#/576',
-'istglg' => '#/577',
-'isthaa' => '#/578',
-'isthaana' => '#/578',
-'isthai' => '#/579',
+'istfng' => '#/612',
+'istglg' => '#/613',
+'isthaa' => '#/614',
+'isthaana' => '#/614',
+'isthai' => '#/615',
 'istibetan' => 'Sc/Tibt',
 'istibt' => 'Sc/Tibt',
-'istifinagh' => '#/576',
-'istirh' => '#/580',
-'istirhuta' => '#/580',
+'istifinagh' => '#/612',
+'istirh' => '#/616',
+'istirhuta' => '#/616',
 'istitle' => 'Perl/Title',
 'istitlecase' => 'Perl/Title',
 'istitlecaseletter' => 'Perl/Title',
-'istransportandmap' => '#/308',
-'istransportandmapsymbols' => '#/308',
-'isucas' => '#/105',
-'isucasext' => '#/177',
-'isugar' => '#/581',
-'isugaritic' => '#/581',
+'istransportandmap' => '#/331',
+'istransportandmapsymbols' => '#/331',
+'isucas' => '#/123',
+'isucasext' => '#/198',
+'isugar' => '#/617',
+'isugaritic' => '#/617',
 'isuideo' => 'UIdeo/Y',
 'isunassigned' => 'Gc/Cn',
 'isunicode' => '#/2',
-'isunifiedcanadianaboriginalsyllabics' => '#/105',
-'isunifiedcanadianaboriginalsyllabicsextended' => '#/177',
+'isunifiedcanadianaboriginalsyllabics' => '#/123',
+'isunifiedcanadianaboriginalsyllabicsextended' => '#/198',
 'isunifiedideograph' => 'UIdeo/Y',
 'isunknown' => 'Sc/Zzzz',
 'isupper' => 'Upper/Y',
 'isuppercase' => 'Upper/Y',
 'isuppercaseletter' => 'Gc/Lu',
-'isvai' => '#/510',
-'isvaii' => '#/510',
-'isvariationselector' => '#/71',
-'isvariationselectors' => '#/88',
-'isvariationselectorssupplement' => '#/120',
-'isvedicext' => '#/204',
-'isvedicextensions' => '#/204',
-'isverticalforms' => '#/287',
+'isvai' => '#/541',
+'isvaii' => '#/541',
+'isvariationselector' => '#/88',
+'isvariationselectors' => '#/105',
+'isvariationselectorssupplement' => '#/138',
+'isvedicext' => '#/225',
+'isvedicextensions' => '#/225',
+'isverticalforms' => '#/310',
 'isvertspace' => '#/4',
-'isvs' => '#/71',
-'isvssup' => '#/120',
-'iswara' => '#/582',
-'iswarangciti' => '#/582',
+'isvs' => '#/88',
+'isvssup' => '#/138',
+'iswara' => '#/618',
+'iswarangciti' => '#/618',
 'iswhitespace' => 'Perl/SpacePer',
 'isword' => 'Perl/Word',
 'iswspace' => 'Perl/SpacePer',
@@ -4806,12 +5087,12 @@
 'isxidcontinue' => 'XIDC/Y',
 'isxids' => 'XIDS/Y',
 'isxidstart' => 'XIDS/Y',
-'isxpeo' => '#/583',
+'isxpeo' => '#/619',
 'isxperlspace' => 'Perl/SpacePer',
 'isxposixalnum' => 'Perl/Alnum',
 'isxposixalpha' => 'Alpha/Y',
 'isxposixblank' => 'Perl/Blank',
-'isxposixcntrl' => '#/343',
+'isxposixcntrl' => '#/370',
 'isxposixdigit' => 'Gc/Nd',
 'isxposixgraph' => 'Perl/Graph',
 'isxposixlower' => 'Lower/Y',
@@ -4821,158 +5102,158 @@
 'isxposixupper' => 'Upper/Y',
 'isxposixword' => 'Perl/Word',
 'isxposixxdigit' => 'Hex/Y',
-'isxsux' => '#/584',
-'isyi' => '#/507',
-'isyiii' => '#/507',
-'isyijing' => '#/144',
-'isyijinghexagramsymbols' => '#/144',
-'isyiradicals' => '#/249',
-'isyisyllables' => '#/270',
+'isxsux' => 'Sc/Xsux',
+'isyi' => '#/538',
+'isyiii' => '#/538',
+'isyijing' => '#/163',
+'isyijinghexagramsymbols' => '#/163',
+'isyiradicals' => '#/270',
+'isyisyllables' => '#/292',
 'isz' => 'Gc/Z',
 'iszinh' => 'Sc/Zinh',
-'iszl' => '#/346',
-'iszp' => '#/347',
+'iszl' => '#/372',
+'iszp' => '#/373',
 'iszs' => 'Gc/Zs',
 'iszyyy' => 'Sc/Zyyy',
 'iszzzz' => 'Sc/Zzzz',
-'ital' => '#/532',
-'jamo' => '#/98',
-'jamoexta' => '#/194',
-'jamoextb' => '#/195',
-'java' => '#/533',
-'javanese' => '#/533',
+'ital' => '#/567',
+'jamo' => '#/116',
+'jamoexta' => '#/215',
+'jamoextb' => '#/216',
+'java' => '#/568',
+'javanese' => '#/568',
 'jg=ain' => 'Jg/Ain',
-'jg=alaph' => '#/369',
+'jg=alaph' => '#/394',
 'jg=alef' => 'Jg/Alef',
 'jg=beh' => 'Jg/Beh',
-'jg=beth' => '#/359',
-'jg=burushaskiyehbarree' => '#/417',
+'jg=beth' => '#/384',
+'jg=burushaskiyehbarree' => '#/442',
 'jg=dal' => 'Jg/Dal',
-'jg=dalathrish' => '#/381',
-'jg=e' => '#/348',
+'jg=dalathrish' => '#/406',
+'jg=e' => '#/374',
 'jg=farsiyeh' => 'Jg/FarsiYeh',
-'jg=fe' => '#/349',
+'jg=fe' => '#/375',
 'jg=feh' => 'Jg/Feh',
-'jg=finalsemkath' => '#/388',
+'jg=finalsemkath' => '#/413',
 'jg=gaf' => 'Jg/Gaf',
-'jg=gamal' => '#/370',
+'jg=gamal' => '#/395',
 'jg=hah' => 'Jg/Hah',
-'jg=hamzaonhehgoal' => '#/396',
-'jg=he' => '#/350',
-'jg=heh' => '#/352',
-'jg=hehgoal' => '#/376',
-'jg=heth' => '#/360',
-'jg=kaf' => '#/353',
-'jg=kaph' => '#/361',
-'jg=khaph' => '#/371',
-'jg=knottedheh' => '#/382',
+'jg=hamzaonhehgoal' => '#/421',
+'jg=he' => '#/376',
+'jg=heh' => '#/378',
+'jg=hehgoal' => '#/401',
+'jg=heth' => '#/385',
+'jg=kaf' => 'Jg/Kaf',
+'jg=kaph' => '#/386',
+'jg=khaph' => '#/396',
+'jg=knottedheh' => '#/407',
 'jg=lam' => 'Jg/Lam',
-'jg=lamadh' => '#/374',
-'jg=manichaeanaleph' => '#/406',
-'jg=manichaeanayin' => '#/397',
-'jg=manichaeanbeth' => '#/398',
-'jg=manichaeandaleth' => '#/410',
-'jg=manichaeandhamedh' => '#/414',
-'jg=manichaeanfive' => '#/399',
-'jg=manichaeangimel' => '#/407',
-'jg=manichaeanheth' => '#/400',
-'jg=manichaeanhundred' => '#/415',
-'jg=manichaeankaph' => '#/401',
-'jg=manichaeanlamedh' => '#/411',
-'jg=manichaeanmem' => '#/390',
-'jg=manichaeannun' => '#/391',
-'jg=manichaeanone' => '#/392',
-'jg=manichaeanpe' => '#/389',
-'jg=manichaeanqoph' => '#/402',
-'jg=manichaeanresh' => '#/403',
-'jg=manichaeansadhe' => '#/408',
-'jg=manichaeansamekh' => '#/412',
-'jg=manichaeantaw' => '#/393',
-'jg=manichaeanten' => '#/394',
-'jg=manichaeanteth' => '#/404',
-'jg=manichaeanthamedh' => '#/416',
-'jg=manichaeantwenty' => '#/413',
-'jg=manichaeanwaw' => '#/395',
-'jg=manichaeanyodh' => '#/405',
-'jg=manichaeanzayin' => '#/409',
-'jg=meem' => '#/362',
-'jg=mim' => '#/354',
+'jg=lamadh' => '#/399',
+'jg=manichaeanaleph' => '#/431',
+'jg=manichaeanayin' => '#/422',
+'jg=manichaeanbeth' => '#/423',
+'jg=manichaeandaleth' => '#/435',
+'jg=manichaeandhamedh' => '#/439',
+'jg=manichaeanfive' => '#/424',
+'jg=manichaeangimel' => '#/432',
+'jg=manichaeanheth' => '#/425',
+'jg=manichaeanhundred' => '#/440',
+'jg=manichaeankaph' => '#/426',
+'jg=manichaeanlamedh' => '#/436',
+'jg=manichaeanmem' => '#/415',
+'jg=manichaeannun' => '#/416',
+'jg=manichaeanone' => '#/417',
+'jg=manichaeanpe' => '#/414',
+'jg=manichaeanqoph' => '#/427',
+'jg=manichaeanresh' => '#/428',
+'jg=manichaeansadhe' => '#/433',
+'jg=manichaeansamekh' => '#/437',
+'jg=manichaeantaw' => '#/418',
+'jg=manichaeanten' => '#/419',
+'jg=manichaeanteth' => '#/429',
+'jg=manichaeanthamedh' => '#/441',
+'jg=manichaeantwenty' => '#/438',
+'jg=manichaeanwaw' => '#/420',
+'jg=manichaeanyodh' => '#/430',
+'jg=manichaeanzayin' => '#/434',
+'jg=meem' => '#/387',
+'jg=mim' => '#/379',
 'jg=nojoininggroup' => 'Jg/NoJoinin',
-'jg=noon' => '#/363',
-'jg=nun' => '#/355',
-'jg=nya' => '#/356',
-'jg=pe' => '#/351',
+'jg=noon' => '#/388',
+'jg=nun' => '#/380',
+'jg=nya' => '#/381',
+'jg=pe' => '#/377',
 'jg=qaf' => 'Jg/Qaf',
-'jg=qaph' => '#/364',
+'jg=qaph' => '#/389',
 'jg=reh' => 'Jg/Reh',
-'jg=reversedpe' => '#/383',
-'jg=rohingyayeh' => '#/385',
+'jg=reversedpe' => '#/408',
+'jg=rohingyayeh' => '#/410',
 'jg=sad' => 'Jg/Sad',
-'jg=sadhe' => '#/372',
+'jg=sadhe' => '#/397',
 'jg=seen' => 'Jg/Seen',
-'jg=semkath' => '#/377',
-'jg=shin' => '#/365',
-'jg=straightwaw' => '#/386',
-'jg=swashkaf' => '#/378',
-'jg=syriacwaw' => '#/379',
-'jg=tah' => '#/357',
-'jg=taw' => '#/358',
-'jg=tehmarbuta' => '#/384',
-'jg=tehmarbutagoal' => '#/396',
-'jg=teth' => '#/366',
+'jg=semkath' => '#/402',
+'jg=shin' => '#/390',
+'jg=straightwaw' => '#/411',
+'jg=swashkaf' => '#/403',
+'jg=syriacwaw' => '#/404',
+'jg=tah' => '#/382',
+'jg=taw' => '#/383',
+'jg=tehmarbuta' => '#/409',
+'jg=tehmarbutagoal' => '#/421',
+'jg=teth' => '#/391',
 'jg=waw' => 'Jg/Waw',
 'jg=yeh' => 'Jg/Yeh',
-'jg=yehbarree' => '#/380',
-'jg=yehwithtail' => '#/387',
-'jg=yudh' => '#/367',
-'jg=yudhhe' => '#/375',
-'jg=zain' => '#/368',
-'jg=zhain' => '#/373',
-'joinc' => '#/68',
-'joinc=f' => '#/!68',
-'joinc=false' => '#/!68',
-'joinc=n' => '#/!68',
-'joinc=no' => '#/!68',
-'joinc=t' => '#/68',
-'joinc=true' => '#/68',
-'joinc=y' => '#/68',
-'joinc=yes' => '#/68',
-'joincontrol' => '#/68',
+'jg=yehbarree' => '#/405',
+'jg=yehwithtail' => '#/412',
+'jg=yudh' => '#/392',
+'jg=yudhhe' => '#/400',
+'jg=zain' => '#/393',
+'jg=zhain' => '#/398',
+'joinc' => '#/85',
+'joinc=f' => '#/!85',
+'joinc=false' => '#/!85',
+'joinc=n' => '#/!85',
+'joinc=no' => '#/!85',
+'joinc=t' => '#/85',
+'joinc=true' => '#/85',
+'joinc=y' => '#/85',
+'joinc=yes' => '#/85',
+'joincontrol' => '#/85',
 'jt=c' => 'Jt/C',
 'jt=d' => 'Jt/D',
 'jt=dualjoining' => 'Jt/D',
 'jt=joincausing' => 'Jt/C',
-'jt=l' => '#/418',
-'jt=leftjoining' => '#/418',
+'jt=l' => '#/443',
+'jt=leftjoining' => '#/443',
 'jt=nonjoining' => 'Jt/U',
 'jt=r' => 'Jt/R',
 'jt=rightjoining' => 'Jt/R',
 'jt=t' => 'Jt/T',
 'jt=transparent' => 'Jt/T',
 'jt=u' => 'Jt/U',
-'kaithi' => '#/536',
-'kali' => '#/534',
+'kaithi' => '#/571',
+'kali' => '#/569',
 'kana' => 'Sc/Kana',
-'kanasup' => '#/156',
-'kanasupplement' => '#/156',
-'kanbun' => '#/133',
-'kangxi' => '#/134',
-'kangxiradicals' => '#/134',
+'kanasup' => '#/176',
+'kanasupplement' => '#/176',
+'kanbun' => '#/152',
+'kangxi' => '#/153',
+'kangxiradicals' => '#/153',
 'kannada' => 'Sc/Knda',
 'katakana' => 'Sc/Kana',
-'katakanaext' => '#/257',
-'katakanaphoneticextensions' => '#/257',
-'kayahli' => '#/534',
+'katakanaext' => '#/279',
+'katakanaphoneticextensions' => '#/279',
+'kayahli' => '#/569',
 'khar' => 'Sc/Khar',
 'kharoshthi' => 'Sc/Khar',
 'khmer' => 'Sc/Khmr',
-'khmersymbols' => '#/276',
+'khmersymbols' => '#/298',
 'khmr' => 'Sc/Khmr',
-'khoj' => '#/535',
-'khojki' => '#/535',
-'khudawadi' => '#/567',
+'khoj' => '#/570',
+'khojki' => '#/570',
+'khudawadi' => '#/603',
 'knda' => 'Sc/Knda',
-'kthi' => '#/536',
+'kthi' => '#/571',
 'l' => 'Gc/L',
 'l&' => 'Gc/LC',
 'l_' => 'Gc/LC',
@@ -4980,47 +5261,47 @@
 'lao' => 'Sc/Lao',
 'laoo' => 'Sc/Lao',
 'latin' => 'Sc/Latn',
-'latin1' => '#/136',
-'latin1sup' => '#/136',
-'latin1supplement' => '#/136',
-'latinexta' => '#/213',
-'latinextadditional' => '#/325',
-'latinextb' => '#/214',
-'latinextc' => '#/215',
-'latinextd' => '#/216',
-'latinexte' => '#/217',
-'latinextendeda' => '#/213',
-'latinextendedadditional' => '#/325',
-'latinextendedb' => '#/214',
-'latinextendedc' => '#/215',
-'latinextendedd' => '#/216',
-'latinextendede' => '#/217',
+'latin1' => '#/155',
+'latin1sup' => '#/155',
+'latin1supplement' => '#/155',
+'latinexta' => '#/234',
+'latinextadditional' => '#/349',
+'latinextb' => '#/235',
+'latinextc' => '#/236',
+'latinextd' => '#/237',
+'latinexte' => '#/238',
+'latinextendeda' => '#/234',
+'latinextendedadditional' => '#/349',
+'latinextendedb' => '#/235',
+'latinextendedc' => '#/236',
+'latinextendedd' => '#/237',
+'latinextendede' => '#/238',
 'latn' => 'Sc/Latn',
 'lb=ai' => 'Lb/AI',
 'lb=al' => 'Lb/AL',
 'lb=alphabetic' => 'Lb/AL',
 'lb=ambiguous' => 'Lb/AI',
-'lb=b2' => '#/419',
+'lb=b2' => '#/444',
 'lb=ba' => 'Lb/BA',
 'lb=bb' => 'Lb/BB',
-'lb=bk' => '#/420',
+'lb=bk' => '#/445',
 'lb=breakafter' => 'Lb/BA',
 'lb=breakbefore' => 'Lb/BB',
-'lb=breakboth' => '#/419',
-'lb=breaksymbols' => '#/428',
-'lb=carriagereturn' => '#/63',
-'lb=cb' => '#/421',
+'lb=breakboth' => '#/444',
+'lb=breaksymbols' => '#/452',
+'lb=carriagereturn' => '#/64',
+'lb=cb' => '#/446',
 'lb=cj' => 'Lb/CJ',
 'lb=cl' => 'Lb/CL',
-'lb=closeparenthesis' => '#/422',
+'lb=closeparenthesis' => '#/447',
 'lb=closepunctuation' => 'Lb/CL',
 'lb=cm' => 'Lb/CM',
 'lb=combiningmark' => 'Lb/CM',
 'lb=complexcontext' => 'Lb/SA',
 'lb=conditionaljapanesestarter' => 'Lb/CJ',
-'lb=contingentbreak' => '#/421',
-'lb=cp' => '#/422',
-'lb=cr' => '#/63',
+'lb=contingentbreak' => '#/446',
+'lb=cp' => '#/447',
+'lb=cr' => '#/64',
 'lb=ex' => 'Lb/EX',
 'lb=exclamation' => 'Lb/EX',
 'lb=gl' => 'Lb/GL',
@@ -5029,23 +5310,23 @@
 'lb=h3' => 'GCB/LVT',
 'lb=hebrewletter' => 'WB/HL',
 'lb=hl' => 'WB/HL',
-'lb=hy' => '#/423',
-'lb=hyphen' => '#/423',
+'lb=hy' => '#/448',
+'lb=hyphen' => '#/448',
 'lb=id' => 'Lb/ID',
 'lb=ideographic' => 'Lb/ID',
-'lb=in' => '#/424',
+'lb=in' => 'Lb/IN',
 'lb=infixnumeric' => 'Lb/IS',
-'lb=inseparable' => '#/424',
-'lb=inseperable' => '#/424',
+'lb=inseparable' => 'Lb/IN',
+'lb=inseperable' => 'Lb/IN',
 'lb=is' => 'Lb/IS',
-'lb=jl' => '#/60',
-'lb=jt' => '#/61',
-'lb=jv' => '#/62',
-'lb=lf' => '#/64',
-'lb=linefeed' => '#/64',
-'lb=mandatorybreak' => '#/420',
-'lb=nextline' => '#/425',
-'lb=nl' => '#/425',
+'lb=jl' => '#/61',
+'lb=jt' => '#/62',
+'lb=jv' => '#/63',
+'lb=lf' => '#/65',
+'lb=linefeed' => '#/65',
+'lb=mandatorybreak' => '#/445',
+'lb=nextline' => '#/449',
+'lb=nl' => '#/449',
 'lb=nonstarter' => 'Lb/NS',
 'lb=ns' => 'Lb/NS',
 'lb=nu' => 'SB/NU',
@@ -5058,49 +5339,49 @@
 'lb=prefixnumeric' => 'Lb/PR',
 'lb=qu' => 'Lb/QU',
 'lb=quotation' => 'Lb/QU',
-'lb=regionalindicator' => '#/65',
-'lb=ri' => '#/65',
+'lb=regionalindicator' => '#/66',
+'lb=ri' => '#/66',
 'lb=sa' => 'Lb/SA',
-'lb=sg' => '#/426',
-'lb=sp' => '#/427',
-'lb=space' => '#/427',
-'lb=surrogate' => '#/426',
-'lb=sy' => '#/428',
+'lb=sg' => '#/450',
+'lb=sp' => '#/451',
+'lb=space' => '#/451',
+'lb=surrogate' => '#/450',
+'lb=sy' => '#/452',
 'lb=unknown' => 'Lb/XX',
-'lb=wj' => '#/429',
-'lb=wordjoiner' => '#/429',
+'lb=wj' => '#/453',
+'lb=wordjoiner' => '#/453',
 'lb=xx' => 'Lb/XX',
-'lb=zw' => '#/430',
-'lb=zwspace' => '#/430',
+'lb=zw' => '#/454',
+'lb=zwspace' => '#/454',
 'lc' => 'Gc/LC',
-'lepc' => '#/537',
-'lepcha' => '#/537',
+'lepc' => '#/572',
+'lepcha' => '#/572',
 'letter' => 'Gc/L',
-'letterlikesymbols' => '#/322',
+'letterlikesymbols' => '#/345',
 'letternumber' => 'Gc/Nl',
 'limb' => 'Sc/Limb',
 'limbu' => 'Sc/Limb',
-'lina' => '#/538',
+'lina' => '#/573',
 'linb' => 'Sc/Linb',
-'lineara' => '#/538',
+'lineara' => '#/573',
 'linearb' => 'Sc/Linb',
-'linearbideograms' => '#/315',
-'linearbsyllabary' => '#/316',
-'lineseparator' => '#/346',
-'lisu' => '#/99',
+'linearbideograms' => '#/338',
+'linearbsyllabary' => '#/339',
+'lineseparator' => '#/372',
+'lisu' => '#/117',
 'll' => 'Gc/Ll',
 'lm' => 'Gc/Lm',
 'lo' => 'Gc/Lo',
-'loe' => 'LOE/Y',
-'loe=f' => '!LOE/Y',
-'loe=false' => '!LOE/Y',
-'loe=n' => '!LOE/Y',
-'loe=no' => '!LOE/Y',
-'loe=t' => 'LOE/Y',
-'loe=true' => 'LOE/Y',
-'loe=y' => 'LOE/Y',
-'loe=yes' => 'LOE/Y',
-'logicalorderexception' => 'LOE/Y',
+'loe' => 'InPC/VisualOr',
+'loe=f' => '!InPC/VisualOr',
+'loe=false' => '!InPC/VisualOr',
+'loe=n' => '!InPC/VisualOr',
+'loe=no' => '!InPC/VisualOr',
+'loe=t' => 'InPC/VisualOr',
+'loe=true' => 'InPC/VisualOr',
+'loe=y' => 'InPC/VisualOr',
+'loe=yes' => 'InPC/VisualOr',
+'logicalorderexception' => 'InPC/VisualOr',
 'lower' => 'Lower/Y',
 'lower=f' => '!Lower/Y',
 'lower=false' => '!Lower/Y',
@@ -5112,23 +5393,23 @@
 'lower=yes' => 'Lower/Y',
 'lowercase' => 'Lower/Y',
 'lowercaseletter' => 'Gc/Ll',
-'lowsurrogates' => '#/284',
+'lowsurrogates' => '#/307',
 'lt' => 'Perl/Title',
 'lu' => 'Gc/Lu',
-'lyci' => '#/539',
-'lycian' => '#/539',
-'lydi' => '#/540',
-'lydian' => '#/540',
+'lyci' => '#/574',
+'lycian' => '#/574',
+'lydi' => '#/575',
+'lydian' => '#/575',
 'm' => 'Gc/M',
-'mahajani' => '#/541',
-'mahj' => '#/541',
-'mahjong' => '#/160',
-'mahjongtiles' => '#/160',
+'mahajani' => '#/576',
+'mahj' => '#/576',
+'mahjong' => '#/180',
+'mahjongtiles' => '#/180',
 'malayalam' => 'Sc/Mlym',
-'mand' => '#/542',
-'mandaic' => '#/542',
-'mani' => '#/543',
-'manichaean' => '#/543',
+'mand' => '#/577',
+'mandaic' => '#/577',
+'mani' => '#/578',
+'manichaean' => '#/578',
 'mark' => 'Gc/M',
 'math' => 'Math/Y',
 'math=f' => '!Math/Y',
@@ -5139,69 +5420,71 @@
 'math=true' => 'Math/Y',
 'math=y' => 'Math/Y',
 'math=yes' => 'Math/Y',
-'mathalphanum' => '#/277',
-'mathematicalalphanumericsymbols' => '#/277',
-'mathematicaloperators' => '#/285',
-'mathoperators' => '#/285',
+'mathalphanum' => '#/299',
+'mathematicalalphanumericsymbols' => '#/299',
+'mathematicaloperators' => '#/308',
+'mathoperators' => '#/308',
 'mathsymbol' => 'Gc/Sm',
 'mc' => 'Gc/Mc',
 'me' => 'Gc/Me',
-'meeteimayek' => '#/548',
-'meeteimayekext' => '#/293',
-'meeteimayekextensions' => '#/293',
-'mend' => '#/544',
-'mendekikakui' => '#/544',
-'merc' => '#/545',
-'mero' => '#/331',
-'meroiticcursive' => '#/545',
-'meroitichieroglyphs' => '#/331',
-'miao' => '#/546',
-'miscarrows' => '#/240',
-'miscellaneousmathematicalsymbolsa' => '#/317',
-'miscellaneousmathematicalsymbolsb' => '#/318',
-'miscellaneoussymbols' => '#/259',
-'miscellaneoussymbolsandarrows' => '#/240',
-'miscellaneoussymbolsandpictographs' => '#/304',
-'miscellaneoustechnical' => '#/286',
-'miscmathsymbolsa' => '#/317',
-'miscmathsymbolsb' => '#/318',
-'miscpictographs' => '#/304',
-'miscsymbols' => '#/259',
-'misctechnical' => '#/286',
+'meeteimayek' => '#/583',
+'meeteimayekext' => '#/316',
+'meeteimayekextensions' => '#/316',
+'mend' => '#/579',
+'mendekikakui' => '#/579',
+'merc' => '#/580',
+'mero' => '#/355',
+'meroiticcursive' => '#/580',
+'meroitichieroglyphs' => '#/355',
+'miao' => '#/581',
+'miscarrows' => '#/261',
+'miscellaneousmathematicalsymbolsa' => '#/340',
+'miscellaneousmathematicalsymbolsb' => '#/341',
+'miscellaneoussymbols' => '#/281',
+'miscellaneoussymbolsandarrows' => '#/261',
+'miscellaneoussymbolsandpictographs' => '#/327',
+'miscellaneoustechnical' => '#/309',
+'miscmathsymbolsa' => '#/340',
+'miscmathsymbolsb' => '#/341',
+'miscpictographs' => '#/327',
+'miscsymbols' => '#/281',
+'misctechnical' => '#/309',
 'mlym' => 'Sc/Mlym',
 'mn' => 'Gc/Mn',
-'modi' => '#/547',
+'modi' => '#/582',
 'modifierletter' => 'Gc/Lm',
-'modifierletters' => '#/305',
+'modifierletters' => '#/328',
 'modifiersymbol' => 'Gc/Sk',
-'modifiertoneletters' => '#/332',
+'modifiertoneletters' => '#/356',
 'mong' => 'Sc/Mong',
 'mongolian' => 'Sc/Mong',
-'mro' => '#/508',
-'mroo' => '#/508',
-'mtei' => '#/548',
-'music' => '#/113',
-'musicalsymbols' => '#/113',
-'myanmar' => '#/549',
-'myanmarexta' => '#/260',
-'myanmarextb' => '#/261',
-'myanmarextendeda' => '#/260',
-'myanmarextendedb' => '#/261',
-'mymr' => '#/549',
+'mro' => '#/539',
+'mroo' => '#/539',
+'mtei' => '#/583',
+'mult' => 'Sc/Mult',
+'multani' => 'Sc/Mult',
+'music' => '#/131',
+'musicalsymbols' => '#/131',
+'myanmar' => '#/584',
+'myanmarexta' => '#/282',
+'myanmarextb' => '#/283',
+'myanmarextendeda' => '#/282',
+'myanmarextendedb' => '#/283',
+'mymr' => '#/584',
 'n' => 'Gc/N',
-'nabataean' => '#/550',
-'narb' => '#/306',
+'nabataean' => '#/585',
+'narb' => '#/329',
 'nb' => 'Blk/NB',
-'nbat' => '#/550',
-'nchar' => 'NChar/Y',
-'nchar=f' => '!NChar/Y',
-'nchar=false' => '!NChar/Y',
-'nchar=n' => '!NChar/Y',
-'nchar=no' => '!NChar/Y',
-'nchar=t' => 'NChar/Y',
-'nchar=true' => 'NChar/Y',
-'nchar=y' => 'NChar/Y',
-'nchar=yes' => 'NChar/Y',
+'nbat' => '#/585',
+'nchar' => 'Perl/_PerlNch',
+'nchar=f' => '!Perl/_PerlNch',
+'nchar=false' => '!Perl/_PerlNch',
+'nchar=n' => '!Perl/_PerlNch',
+'nchar=no' => '!Perl/_PerlNch',
+'nchar=t' => 'Perl/_PerlNch',
+'nchar=true' => 'Perl/_PerlNch',
+'nchar=y' => 'Perl/_PerlNch',
+'nchar=yes' => 'Perl/_PerlNch',
 'nd' => 'Gc/Nd',
 'newtailue' => 'Sc/Talu',
 'nfcqc=m' => 'NFCQC/M',
@@ -5224,12 +5507,12 @@
 'nfkdqc=no' => 'NFKDQC/N',
 'nfkdqc=y' => 'NFKDQC/Y',
 'nfkdqc=yes' => 'NFKDQC/Y',
-'nko' => '#/509',
-'nkoo' => '#/509',
+'nko' => '#/540',
+'nkoo' => '#/540',
 'nl' => 'Gc/Nl',
 'no' => 'Gc/No',
 'noblock' => 'Blk/NB',
-'noncharactercodepoint' => 'NChar/Y',
+'noncharactercodepoint' => 'Perl/_PerlNch',
 'nonspacingmark' => 'Gc/Mn',
 'nt=de' => 'Gc/Nd',
 'nt=decimal' => 'Gc/Nd',
@@ -5239,27 +5522,28 @@
 'nt=nu' => 'Nt/Nu',
 'nt=numeric' => 'Nt/Nu',
 'number' => 'Gc/N',
-'numberforms' => '#/262',
+'numberforms' => '#/284',
 'nv=nan' => 'Nt/None',
-'ocr' => '#/94',
-'ogam' => '#/551',
-'ogham' => '#/551',
-'olchiki' => '#/163',
-'olck' => '#/163',
-'olditalic' => '#/532',
-'oldnortharabian' => '#/306',
-'oldpermic' => '#/555',
-'oldpersian' => '#/583',
-'oldsoutharabian' => '#/307',
-'oldturkic' => '#/552',
+'ocr' => '#/111',
+'ogam' => '#/586',
+'ogham' => '#/586',
+'olchiki' => '#/184',
+'olck' => '#/184',
+'oldhungarian' => '#/566',
+'olditalic' => '#/567',
+'oldnortharabian' => '#/329',
+'oldpermic' => '#/590',
+'oldpersian' => '#/619',
+'oldsoutharabian' => '#/330',
+'oldturkic' => '#/587',
 'openpunctuation' => 'Gc/Ps',
-'opticalcharacterrecognition' => '#/94',
+'opticalcharacterrecognition' => '#/111',
 'oriya' => 'Sc/Orya',
-'orkh' => '#/552',
-'ornamentaldingbats' => '#/326',
+'orkh' => '#/587',
+'ornamentaldingbats' => '#/350',
 'orya' => 'Sc/Orya',
-'osma' => '#/553',
-'osmanya' => '#/553',
+'osma' => '#/588',
+'osmanya' => '#/588',
 'other' => 'Gc/C',
 'otherletter' => 'Gc/Lo',
 'othernumber' => 'Gc/No',
@@ -5267,9 +5551,9 @@
 'othersymbol' => 'Gc/So',
 'p' => 'Gc/P',
 'pahawhhmong' => 'Sc/Hmng',
-'palm' => '#/225',
-'palmyrene' => '#/225',
-'paragraphseparator' => '#/347',
+'palm' => '#/246',
+'palmyrene' => '#/246',
+'paragraphseparator' => '#/373',
 'patsyn' => 'PatSyn/Y',
 'patsyn=f' => '!PatSyn/Y',
 'patsyn=false' => '!PatSyn/Y',
@@ -5280,40 +5564,40 @@
 'patsyn=y' => 'PatSyn/Y',
 'patsyn=yes' => 'PatSyn/Y',
 'patternsyntax' => 'PatSyn/Y',
-'patternwhitespace' => 'PatWS/Y',
-'patws' => 'PatWS/Y',
-'patws=f' => '!PatWS/Y',
-'patws=false' => '!PatWS/Y',
-'patws=n' => '!PatWS/Y',
-'patws=no' => '!PatWS/Y',
-'patws=t' => 'PatWS/Y',
-'patws=true' => 'PatWS/Y',
-'patws=y' => 'PatWS/Y',
-'patws=yes' => 'PatWS/Y',
-'pauc' => '#/554',
-'paucinhau' => '#/554',
+'patternwhitespace' => 'Perl/_PerlPat',
+'patws' => 'Perl/_PerlPat',
+'patws=f' => '!Perl/_PerlPat',
+'patws=false' => '!Perl/_PerlPat',
+'patws=n' => '!Perl/_PerlPat',
+'patws=no' => '!Perl/_PerlPat',
+'patws=t' => 'Perl/_PerlPat',
+'patws=true' => 'Perl/_PerlPat',
+'patws=y' => 'Perl/_PerlPat',
+'patws=yes' => 'Perl/_PerlPat',
+'pauc' => '#/589',
+'paucinhau' => '#/589',
 'pc' => 'WB/EX',
 'pd' => 'Gc/Pd',
 'pe' => 'Gc/Pe',
 'perlspace' => '#/3',
 'perlword' => 'Perl/PerlWord',
-'perm' => '#/555',
+'perm' => '#/590',
 'pf' => 'Gc/Pf',
-'phag' => '#/556',
-'phagspa' => '#/556',
-'phaistos' => '#/199',
-'phaistosdisc' => '#/199',
-'phli' => '#/557',
-'phlp' => '#/558',
-'phnx' => '#/559',
-'phoenician' => '#/559',
-'phoneticext' => '#/264',
-'phoneticextensions' => '#/264',
-'phoneticextensionssupplement' => '#/294',
-'phoneticextsup' => '#/294',
+'phag' => '#/591',
+'phagspa' => '#/591',
+'phaistos' => '#/220',
+'phaistosdisc' => '#/220',
+'phli' => '#/592',
+'phlp' => '#/593',
+'phnx' => '#/594',
+'phoenician' => '#/594',
+'phoneticext' => '#/286',
+'phoneticextensions' => '#/286',
+'phoneticextensionssupplement' => '#/317',
+'phoneticextsup' => '#/317',
 'pi' => 'Gc/Pi',
-'playingcards' => '#/279',
-'plrd' => '#/546',
+'playingcards' => '#/302',
+'plrd' => '#/581',
 'po' => 'Gc/Po',
 'posixalnum' => '#/5',
 'posixalpha' => '#/6',
@@ -5327,17 +5611,17 @@
 'posixspace' => '#/3',
 'posixupper' => '#/13',
 'posixword' => 'Perl/PerlWord',
-'posixxdigit' => '#/59',
+'posixxdigit' => '#/60',
 'print' => 'Perl/Print',
-'privateuse' => '#/344',
-'privateusearea' => '#/95',
-'prti' => '#/560',
+'privateuse' => '#/371',
+'privateusearea' => '#/112',
+'prti' => '#/595',
 'ps' => 'Gc/Ps',
-'psalterpahlavi' => '#/558',
-'pua' => '#/95',
+'psalterpahlavi' => '#/593',
+'pua' => '#/112',
 'punct' => 'Gc/P',
 'punctuation' => 'Gc/P',
-'qaac' => '#/526',
+'qaac' => '#/558',
 'qaai' => 'Sc/Zinh',
 'qmark' => 'QMark/Y',
 'qmark=f' => '!QMark/Y',
@@ -5349,38 +5633,38 @@
 'qmark=y' => 'QMark/Y',
 'qmark=yes' => 'QMark/Y',
 'quotationmark' => 'QMark/Y',
-'radical' => '#/69',
-'radical=f' => '#/!69',
-'radical=false' => '#/!69',
-'radical=n' => '#/!69',
-'radical=no' => '#/!69',
-'radical=t' => '#/69',
-'radical=true' => '#/69',
-'radical=y' => '#/69',
-'radical=yes' => '#/69',
-'rejang' => '#/561',
-'rjng' => '#/561',
-'rumi' => '#/102',
-'ruminumeralsymbols' => '#/102',
-'runic' => '#/562',
-'runr' => '#/562',
+'radical' => '#/86',
+'radical=f' => '#/!86',
+'radical=false' => '#/!86',
+'radical=n' => '#/!86',
+'radical=no' => '#/!86',
+'radical=t' => '#/86',
+'radical=true' => '#/86',
+'radical=y' => '#/86',
+'radical=yes' => '#/86',
+'rejang' => '#/596',
+'rjng' => '#/596',
+'rumi' => '#/120',
+'ruminumeralsymbols' => '#/120',
+'runic' => '#/597',
+'runr' => '#/597',
 's' => 'Gc/S',
-'samaritan' => '#/563',
-'samr' => '#/563',
-'sarb' => '#/307',
-'saur' => '#/564',
-'saurashtra' => '#/564',
+'samaritan' => '#/598',
+'samr' => '#/598',
+'sarb' => '#/330',
+'saur' => '#/599',
+'saurashtra' => '#/599',
 'sb=at' => 'SB/AT',
 'sb=aterm' => 'SB/AT',
 'sb=cl' => 'SB/CL',
 'sb=close' => 'SB/CL',
-'sb=cr' => '#/63',
+'sb=cr' => '#/64',
 'sb=ex' => 'SB/EX',
 'sb=extend' => 'SB/EX',
 'sb=fo' => 'SB/FO',
 'sb=format' => 'SB/FO',
 'sb=le' => 'SB/LE',
-'sb=lf' => '#/64',
+'sb=lf' => '#/65',
 'sb=lo' => 'SB/LO',
 'sb=lower' => 'SB/LO',
 'sb=nu' => 'SB/NU',
@@ -5389,8 +5673,8 @@
 'sb=other' => 'SB/XX',
 'sb=sc' => 'SB/SC',
 'sb=scontinue' => 'SB/SC',
-'sb=se' => '#/70',
-'sb=sep' => '#/70',
+'sb=se' => '#/87',
+'sb=sep' => '#/87',
 'sb=sp' => 'SB/Sp',
 'sb=st' => 'SB/ST',
 'sb=sterm' => 'SB/ST',
@@ -5398,70 +5682,72 @@
 'sb=upper' => 'SB/UP',
 'sb=xx' => 'SB/XX',
 'sc' => 'Gc/Sc',
-'sc=aghb' => '#/511',
+'sc=aghb' => '#/542',
+'sc=ahom' => '#/543',
+'sc=anatolianhieroglyphs' => '#/565',
 'sc=arab' => 'Sc/Arab',
 'sc=arabic' => 'Sc/Arab',
 'sc=armenian' => 'Sc/Armn',
-'sc=armi' => '#/512',
+'sc=armi' => '#/544',
 'sc=armn' => 'Sc/Armn',
-'sc=avestan' => '#/513',
-'sc=avst' => '#/513',
-'sc=bali' => '#/514',
-'sc=balinese' => '#/514',
-'sc=bamu' => '#/515',
-'sc=bamum' => '#/515',
-'sc=bass' => '#/516',
-'sc=bassavah' => '#/516',
-'sc=batak' => '#/517',
-'sc=batk' => '#/517',
+'sc=avestan' => '#/545',
+'sc=avst' => '#/545',
+'sc=bali' => '#/546',
+'sc=balinese' => '#/546',
+'sc=bamu' => '#/547',
+'sc=bamum' => '#/547',
+'sc=bass' => '#/548',
+'sc=bassavah' => '#/548',
+'sc=batak' => '#/549',
+'sc=batk' => '#/549',
 'sc=beng' => 'Sc/Beng',
 'sc=bengali' => 'Sc/Beng',
-'sc=bopo' => '#/518',
-'sc=bopomofo' => '#/518',
-'sc=brah' => '#/519',
-'sc=brahmi' => '#/519',
-'sc=brai' => '#/147',
-'sc=braille' => '#/147',
-'sc=bugi' => '#/520',
-'sc=buginese' => '#/520',
-'sc=buhd' => '#/521',
-'sc=buhid' => '#/521',
-'sc=cakm' => '#/522',
-'sc=canadianaboriginal' => '#/523',
-'sc=cans' => '#/523',
-'sc=cari' => '#/524',
-'sc=carian' => '#/524',
-'sc=caucasianalbanian' => '#/511',
-'sc=chakma' => '#/522',
+'sc=bopo' => '#/550',
+'sc=bopomofo' => '#/550',
+'sc=brah' => '#/551',
+'sc=brahmi' => '#/551',
+'sc=brai' => '#/166',
+'sc=braille' => '#/166',
+'sc=bugi' => '#/552',
+'sc=buginese' => '#/552',
+'sc=buhd' => '#/553',
+'sc=buhid' => '#/553',
+'sc=cakm' => '#/554',
+'sc=canadianaboriginal' => '#/555',
+'sc=cans' => '#/555',
+'sc=cari' => '#/556',
+'sc=carian' => '#/556',
+'sc=caucasianalbanian' => '#/542',
+'sc=chakma' => '#/554',
 'sc=cham' => 'Sc/Cham',
-'sc=cher' => '#/525',
-'sc=cherokee' => '#/525',
+'sc=cher' => '#/557',
+'sc=cherokee' => '#/557',
 'sc=common' => 'Sc/Zyyy',
-'sc=copt' => '#/526',
-'sc=coptic' => '#/526',
+'sc=copt' => '#/558',
+'sc=coptic' => '#/558',
 'sc=cprt' => 'Sc/Cprt',
-'sc=cuneiform' => '#/584',
+'sc=cuneiform' => 'Sc/Xsux',
 'sc=cypriot' => 'Sc/Cprt',
 'sc=cyrillic' => 'Sc/Cyrl',
 'sc=cyrl' => 'Sc/Cyrl',
-'sc=deseret' => '#/152',
+'sc=deseret' => '#/172',
 'sc=deva' => 'Sc/Deva',
 'sc=devanagari' => 'Sc/Deva',
-'sc=dsrt' => '#/152',
+'sc=dsrt' => '#/172',
 'sc=dupl' => 'Sc/Dupl',
 'sc=duployan' => 'Sc/Dupl',
-'sc=egyp' => '#/527',
-'sc=egyptianhieroglyphs' => '#/527',
-'sc=elba' => '#/528',
-'sc=elbasan' => '#/528',
+'sc=egyp' => '#/559',
+'sc=egyptianhieroglyphs' => '#/559',
+'sc=elba' => '#/560',
+'sc=elbasan' => '#/560',
 'sc=ethi' => 'Sc/Ethi',
 'sc=ethiopic' => 'Sc/Ethi',
 'sc=geor' => 'Sc/Geor',
 'sc=georgian' => 'Sc/Geor',
-'sc=glag' => '#/529',
-'sc=glagolitic' => '#/529',
-'sc=goth' => '#/530',
-'sc=gothic' => '#/530',
+'sc=glag' => '#/561',
+'sc=glagolitic' => '#/561',
+'sc=goth' => '#/562',
+'sc=gothic' => '#/562',
 'sc=gran' => 'Sc/Gran',
 'sc=grantha' => 'Sc/Gran',
 'sc=greek' => 'Sc/Grek',
@@ -5474,244 +5760,255 @@
 'sc=hang' => 'Sc/Hang',
 'sc=hangul' => 'Sc/Hang',
 'sc=hani' => 'Sc/Han',
-'sc=hano' => '#/531',
-'sc=hanunoo' => '#/531',
+'sc=hano' => '#/563',
+'sc=hanunoo' => '#/563',
+'sc=hatr' => '#/564',
+'sc=hatran' => '#/564',
 'sc=hebr' => 'Sc/Hebr',
 'sc=hebrew' => 'Sc/Hebr',
 'sc=hira' => 'Sc/Hira',
 'sc=hiragana' => 'Sc/Hira',
+'sc=hluw' => '#/565',
 'sc=hmng' => 'Sc/Hmng',
-'sc=imperialaramaic' => '#/512',
+'sc=hung' => '#/566',
+'sc=imperialaramaic' => '#/544',
 'sc=inherited' => 'Sc/Zinh',
-'sc=inscriptionalpahlavi' => '#/557',
-'sc=inscriptionalparthian' => '#/560',
-'sc=ital' => '#/532',
-'sc=java' => '#/533',
-'sc=javanese' => '#/533',
-'sc=kaithi' => '#/536',
-'sc=kali' => '#/534',
+'sc=inscriptionalpahlavi' => '#/592',
+'sc=inscriptionalparthian' => '#/595',
+'sc=ital' => '#/567',
+'sc=java' => '#/568',
+'sc=javanese' => '#/568',
+'sc=kaithi' => '#/571',
+'sc=kali' => '#/569',
 'sc=kana' => 'Sc/Kana',
 'sc=kannada' => 'Sc/Knda',
 'sc=katakana' => 'Sc/Kana',
-'sc=kayahli' => '#/534',
+'sc=kayahli' => '#/569',
 'sc=khar' => 'Sc/Khar',
 'sc=kharoshthi' => 'Sc/Khar',
 'sc=khmer' => 'Sc/Khmr',
 'sc=khmr' => 'Sc/Khmr',
-'sc=khoj' => '#/535',
-'sc=khojki' => '#/535',
-'sc=khudawadi' => '#/567',
+'sc=khoj' => '#/570',
+'sc=khojki' => '#/570',
+'sc=khudawadi' => '#/603',
 'sc=knda' => 'Sc/Knda',
-'sc=kthi' => '#/536',
+'sc=kthi' => '#/571',
 'sc=lana' => 'Sc/Lana',
 'sc=lao' => 'Sc/Lao',
 'sc=laoo' => 'Sc/Lao',
 'sc=latin' => 'Sc/Latn',
 'sc=latn' => 'Sc/Latn',
-'sc=lepc' => '#/537',
-'sc=lepcha' => '#/537',
+'sc=lepc' => '#/572',
+'sc=lepcha' => '#/572',
 'sc=limb' => 'Sc/Limb',
 'sc=limbu' => 'Sc/Limb',
-'sc=lina' => '#/538',
+'sc=lina' => '#/573',
 'sc=linb' => 'Sc/Linb',
-'sc=lineara' => '#/538',
+'sc=lineara' => '#/573',
 'sc=linearb' => 'Sc/Linb',
-'sc=lisu' => '#/99',
-'sc=lyci' => '#/539',
-'sc=lycian' => '#/539',
-'sc=lydi' => '#/540',
-'sc=lydian' => '#/540',
-'sc=mahajani' => '#/541',
-'sc=mahj' => '#/541',
+'sc=lisu' => '#/117',
+'sc=lyci' => '#/574',
+'sc=lycian' => '#/574',
+'sc=lydi' => '#/575',
+'sc=lydian' => '#/575',
+'sc=mahajani' => '#/576',
+'sc=mahj' => '#/576',
 'sc=malayalam' => 'Sc/Mlym',
-'sc=mand' => '#/542',
-'sc=mandaic' => '#/542',
-'sc=mani' => '#/543',
-'sc=manichaean' => '#/543',
-'sc=meeteimayek' => '#/548',
-'sc=mend' => '#/544',
-'sc=mendekikakui' => '#/544',
-'sc=merc' => '#/545',
-'sc=mero' => '#/331',
-'sc=meroiticcursive' => '#/545',
-'sc=meroitichieroglyphs' => '#/331',
-'sc=miao' => '#/546',
+'sc=mand' => '#/577',
+'sc=mandaic' => '#/577',
+'sc=mani' => '#/578',
+'sc=manichaean' => '#/578',
+'sc=meeteimayek' => '#/583',
+'sc=mend' => '#/579',
+'sc=mendekikakui' => '#/579',
+'sc=merc' => '#/580',
+'sc=mero' => '#/355',
+'sc=meroiticcursive' => '#/580',
+'sc=meroitichieroglyphs' => '#/355',
+'sc=miao' => '#/581',
 'sc=mlym' => 'Sc/Mlym',
-'sc=modi' => '#/547',
+'sc=modi' => '#/582',
 'sc=mong' => 'Sc/Mong',
 'sc=mongolian' => 'Sc/Mong',
-'sc=mro' => '#/508',
-'sc=mroo' => '#/508',
-'sc=mtei' => '#/548',
-'sc=myanmar' => '#/549',
-'sc=mymr' => '#/549',
-'sc=nabataean' => '#/550',
-'sc=narb' => '#/306',
-'sc=nbat' => '#/550',
+'sc=mro' => '#/539',
+'sc=mroo' => '#/539',
+'sc=mtei' => '#/583',
+'sc=mult' => 'Sc/Mult',
+'sc=multani' => 'Sc/Mult',
+'sc=myanmar' => '#/584',
+'sc=mymr' => '#/584',
+'sc=nabataean' => '#/585',
+'sc=narb' => '#/329',
+'sc=nbat' => '#/585',
 'sc=newtailue' => 'Sc/Talu',
-'sc=nko' => '#/509',
-'sc=nkoo' => '#/509',
-'sc=ogam' => '#/551',
-'sc=ogham' => '#/551',
-'sc=olchiki' => '#/163',
-'sc=olck' => '#/163',
-'sc=olditalic' => '#/532',
-'sc=oldnortharabian' => '#/306',
-'sc=oldpermic' => '#/555',
-'sc=oldpersian' => '#/583',
-'sc=oldsoutharabian' => '#/307',
-'sc=oldturkic' => '#/552',
+'sc=nko' => '#/540',
+'sc=nkoo' => '#/540',
+'sc=ogam' => '#/586',
+'sc=ogham' => '#/586',
+'sc=olchiki' => '#/184',
+'sc=olck' => '#/184',
+'sc=oldhungarian' => '#/566',
+'sc=olditalic' => '#/567',
+'sc=oldnortharabian' => '#/329',
+'sc=oldpermic' => '#/590',
+'sc=oldpersian' => '#/619',
+'sc=oldsoutharabian' => '#/330',
+'sc=oldturkic' => '#/587',
 'sc=oriya' => 'Sc/Orya',
-'sc=orkh' => '#/552',
+'sc=orkh' => '#/587',
 'sc=orya' => 'Sc/Orya',
-'sc=osma' => '#/553',
-'sc=osmanya' => '#/553',
+'sc=osma' => '#/588',
+'sc=osmanya' => '#/588',
 'sc=pahawhhmong' => 'Sc/Hmng',
-'sc=palm' => '#/225',
-'sc=palmyrene' => '#/225',
-'sc=pauc' => '#/554',
-'sc=paucinhau' => '#/554',
-'sc=perm' => '#/555',
-'sc=phag' => '#/556',
-'sc=phagspa' => '#/556',
-'sc=phli' => '#/557',
-'sc=phlp' => '#/558',
-'sc=phnx' => '#/559',
-'sc=phoenician' => '#/559',
-'sc=plrd' => '#/546',
-'sc=prti' => '#/560',
-'sc=psalterpahlavi' => '#/558',
-'sc=qaac' => '#/526',
+'sc=palm' => '#/246',
+'sc=palmyrene' => '#/246',
+'sc=pauc' => '#/589',
+'sc=paucinhau' => '#/589',
+'sc=perm' => '#/590',
+'sc=phag' => '#/591',
+'sc=phagspa' => '#/591',
+'sc=phli' => '#/592',
+'sc=phlp' => '#/593',
+'sc=phnx' => '#/594',
+'sc=phoenician' => '#/594',
+'sc=plrd' => '#/581',
+'sc=prti' => '#/595',
+'sc=psalterpahlavi' => '#/593',
+'sc=qaac' => '#/558',
 'sc=qaai' => 'Sc/Zinh',
-'sc=rejang' => '#/561',
-'sc=rjng' => '#/561',
-'sc=runic' => '#/562',
-'sc=runr' => '#/562',
-'sc=samaritan' => '#/563',
-'sc=samr' => '#/563',
-'sc=sarb' => '#/307',
-'sc=saur' => '#/564',
-'sc=saurashtra' => '#/564',
-'sc=sharada' => '#/565',
-'sc=shavian' => '#/167',
-'sc=shaw' => '#/167',
-'sc=shrd' => '#/565',
-'sc=sidd' => '#/566',
-'sc=siddham' => '#/566',
-'sc=sind' => '#/567',
+'sc=rejang' => '#/596',
+'sc=rjng' => '#/596',
+'sc=runic' => '#/597',
+'sc=runr' => '#/597',
+'sc=samaritan' => '#/598',
+'sc=samr' => '#/598',
+'sc=sarb' => '#/330',
+'sc=saur' => '#/599',
+'sc=saurashtra' => '#/599',
+'sc=sgnw' => '#/600',
+'sc=sharada' => '#/601',
+'sc=shavian' => '#/188',
+'sc=shaw' => '#/188',
+'sc=shrd' => '#/601',
+'sc=sidd' => '#/602',
+'sc=siddham' => '#/602',
+'sc=signwriting' => '#/600',
+'sc=sind' => '#/603',
 'sc=sinh' => 'Sc/Sinh',
 'sc=sinhala' => 'Sc/Sinh',
-'sc=sora' => '#/568',
-'sc=sorasompeng' => '#/568',
-'sc=sund' => '#/569',
-'sc=sundanese' => '#/569',
-'sc=sylo' => '#/570',
-'sc=sylotinagri' => '#/570',
-'sc=syrc' => '#/571',
-'sc=syriac' => '#/571',
-'sc=tagalog' => '#/577',
-'sc=tagb' => '#/572',
-'sc=tagbanwa' => '#/572',
-'sc=taile' => '#/574',
+'sc=sora' => '#/604',
+'sc=sorasompeng' => '#/604',
+'sc=sund' => '#/605',
+'sc=sundanese' => '#/605',
+'sc=sylo' => '#/606',
+'sc=sylotinagri' => '#/606',
+'sc=syrc' => '#/607',
+'sc=syriac' => '#/607',
+'sc=tagalog' => '#/613',
+'sc=tagb' => '#/608',
+'sc=tagbanwa' => '#/608',
+'sc=taile' => '#/610',
 'sc=taitham' => 'Sc/Lana',
-'sc=taiviet' => '#/575',
-'sc=takr' => '#/573',
-'sc=takri' => '#/573',
-'sc=tale' => '#/574',
+'sc=taiviet' => '#/611',
+'sc=takr' => '#/609',
+'sc=takri' => '#/609',
+'sc=tale' => '#/610',
 'sc=talu' => 'Sc/Talu',
 'sc=tamil' => 'Sc/Taml',
 'sc=taml' => 'Sc/Taml',
-'sc=tavt' => '#/575',
+'sc=tavt' => '#/611',
 'sc=telu' => 'Sc/Telu',
 'sc=telugu' => 'Sc/Telu',
-'sc=tfng' => '#/576',
-'sc=tglg' => '#/577',
-'sc=thaa' => '#/578',
-'sc=thaana' => '#/578',
-'sc=thai' => '#/579',
+'sc=tfng' => '#/612',
+'sc=tglg' => '#/613',
+'sc=thaa' => '#/614',
+'sc=thaana' => '#/614',
+'sc=thai' => '#/615',
 'sc=tibetan' => 'Sc/Tibt',
 'sc=tibt' => 'Sc/Tibt',
-'sc=tifinagh' => '#/576',
-'sc=tirh' => '#/580',
-'sc=tirhuta' => '#/580',
-'sc=ugar' => '#/581',
-'sc=ugaritic' => '#/581',
+'sc=tifinagh' => '#/612',
+'sc=tirh' => '#/616',
+'sc=tirhuta' => '#/616',
+'sc=ugar' => '#/617',
+'sc=ugaritic' => '#/617',
 'sc=unknown' => 'Sc/Zzzz',
-'sc=vai' => '#/510',
-'sc=vaii' => '#/510',
-'sc=wara' => '#/582',
-'sc=warangciti' => '#/582',
-'sc=xpeo' => '#/583',
-'sc=xsux' => '#/584',
-'sc=yi' => '#/507',
-'sc=yiii' => '#/507',
+'sc=vai' => '#/541',
+'sc=vaii' => '#/541',
+'sc=wara' => '#/618',
+'sc=warangciti' => '#/618',
+'sc=xpeo' => '#/619',
+'sc=xsux' => 'Sc/Xsux',
+'sc=yi' => '#/538',
+'sc=yiii' => '#/538',
 'sc=zinh' => 'Sc/Zinh',
 'sc=zyyy' => 'Sc/Zyyy',
 'sc=zzzz' => 'Sc/Zzzz',
-'scx=aghb' => '#/511',
+'scx=aghb' => '#/542',
+'scx=ahom' => '#/543',
+'scx=anatolianhieroglyphs' => '#/565',
 'scx=arab' => 'Scx/Arab',
 'scx=arabic' => 'Scx/Arab',
 'scx=armenian' => 'Scx/Armn',
-'scx=armi' => '#/512',
+'scx=armi' => '#/544',
 'scx=armn' => 'Scx/Armn',
-'scx=avestan' => '#/513',
-'scx=avst' => '#/513',
-'scx=bali' => '#/514',
-'scx=balinese' => '#/514',
-'scx=bamu' => '#/515',
-'scx=bamum' => '#/515',
-'scx=bass' => '#/516',
-'scx=bassavah' => '#/516',
-'scx=batak' => '#/517',
-'scx=batk' => '#/517',
+'scx=avestan' => '#/545',
+'scx=avst' => '#/545',
+'scx=bali' => '#/546',
+'scx=balinese' => '#/546',
+'scx=bamu' => '#/547',
+'scx=bamum' => '#/547',
+'scx=bass' => '#/548',
+'scx=bassavah' => '#/548',
+'scx=batak' => '#/549',
+'scx=batk' => '#/549',
 'scx=beng' => 'Scx/Beng',
 'scx=bengali' => 'Scx/Beng',
 'scx=bopo' => 'Scx/Bopo',
 'scx=bopomofo' => 'Scx/Bopo',
-'scx=brah' => '#/519',
-'scx=brahmi' => '#/519',
-'scx=brai' => '#/147',
-'scx=braille' => '#/147',
-'scx=bugi' => '#/585',
-'scx=buginese' => '#/585',
-'scx=buhd' => '#/586',
-'scx=buhid' => '#/586',
+'scx=brah' => '#/551',
+'scx=brahmi' => '#/551',
+'scx=brai' => '#/166',
+'scx=braille' => '#/166',
+'scx=bugi' => '#/620',
+'scx=buginese' => '#/620',
+'scx=buhd' => '#/621',
+'scx=buhid' => '#/621',
 'scx=cakm' => 'Scx/Cakm',
-'scx=canadianaboriginal' => '#/523',
-'scx=cans' => '#/523',
-'scx=cari' => '#/524',
-'scx=carian' => '#/524',
-'scx=caucasianalbanian' => '#/511',
+'scx=canadianaboriginal' => '#/555',
+'scx=cans' => '#/555',
+'scx=cari' => '#/556',
+'scx=carian' => '#/556',
+'scx=caucasianalbanian' => '#/542',
 'scx=chakma' => 'Scx/Cakm',
 'scx=cham' => 'Sc/Cham',
-'scx=cher' => '#/525',
-'scx=cherokee' => '#/525',
+'scx=cher' => '#/557',
+'scx=cherokee' => '#/557',
 'scx=common' => 'Scx/Zyyy',
 'scx=copt' => 'Scx/Copt',
 'scx=coptic' => 'Scx/Copt',
 'scx=cprt' => 'Scx/Cprt',
-'scx=cuneiform' => '#/584',
+'scx=cuneiform' => 'Sc/Xsux',
 'scx=cypriot' => 'Scx/Cprt',
 'scx=cyrillic' => 'Scx/Cyrl',
 'scx=cyrl' => 'Scx/Cyrl',
-'scx=deseret' => '#/152',
+'scx=deseret' => '#/172',
 'scx=deva' => 'Scx/Deva',
 'scx=devanagari' => 'Scx/Deva',
-'scx=dsrt' => '#/152',
+'scx=dsrt' => '#/172',
 'scx=dupl' => 'Scx/Dupl',
 'scx=duployan' => 'Scx/Dupl',
-'scx=egyp' => '#/527',
-'scx=egyptianhieroglyphs' => '#/527',
-'scx=elba' => '#/528',
-'scx=elbasan' => '#/528',
+'scx=egyp' => '#/559',
+'scx=egyptianhieroglyphs' => '#/559',
+'scx=elba' => '#/560',
+'scx=elbasan' => '#/560',
 'scx=ethi' => 'Sc/Ethi',
 'scx=ethiopic' => 'Sc/Ethi',
 'scx=geor' => 'Scx/Geor',
 'scx=georgian' => 'Scx/Geor',
-'scx=glag' => '#/529',
-'scx=glagolitic' => '#/529',
-'scx=goth' => '#/530',
-'scx=gothic' => '#/530',
+'scx=glag' => 'Scx/Glag',
+'scx=glagolitic' => 'Scx/Glag',
+'scx=goth' => '#/562',
+'scx=gothic' => '#/562',
 'scx=gran' => 'Scx/Gran',
 'scx=grantha' => 'Scx/Gran',
 'scx=greek' => 'Scx/Grek',
@@ -5724,175 +6021,184 @@
 'scx=hang' => 'Scx/Hang',
 'scx=hangul' => 'Scx/Hang',
 'scx=hani' => 'Scx/Han',
-'scx=hano' => '#/587',
-'scx=hanunoo' => '#/587',
+'scx=hano' => '#/622',
+'scx=hanunoo' => '#/622',
+'scx=hatr' => '#/564',
+'scx=hatran' => '#/564',
 'scx=hebr' => 'Sc/Hebr',
 'scx=hebrew' => 'Sc/Hebr',
 'scx=hira' => 'Scx/Hira',
 'scx=hiragana' => 'Scx/Hira',
+'scx=hluw' => '#/565',
 'scx=hmng' => 'Sc/Hmng',
-'scx=imperialaramaic' => '#/512',
+'scx=hung' => '#/566',
+'scx=imperialaramaic' => '#/544',
 'scx=inherited' => 'Scx/Zinh',
-'scx=inscriptionalpahlavi' => '#/557',
-'scx=inscriptionalparthian' => '#/560',
-'scx=ital' => '#/532',
-'scx=java' => '#/588',
-'scx=javanese' => '#/588',
-'scx=kaithi' => '#/590',
-'scx=kali' => '#/158',
+'scx=inscriptionalpahlavi' => '#/592',
+'scx=inscriptionalparthian' => '#/595',
+'scx=ital' => '#/567',
+'scx=java' => '#/623',
+'scx=javanese' => '#/623',
+'scx=kaithi' => '#/625',
+'scx=kali' => '#/178',
 'scx=kana' => 'Scx/Kana',
 'scx=kannada' => 'Scx/Knda',
 'scx=katakana' => 'Scx/Kana',
-'scx=kayahli' => '#/158',
+'scx=kayahli' => '#/178',
 'scx=khar' => 'Sc/Khar',
 'scx=kharoshthi' => 'Sc/Khar',
 'scx=khmer' => 'Sc/Khmr',
 'scx=khmr' => 'Sc/Khmr',
-'scx=khoj' => '#/589',
-'scx=khojki' => '#/589',
+'scx=khoj' => '#/624',
+'scx=khojki' => '#/624',
 'scx=khudawadi' => 'Scx/Sind',
 'scx=knda' => 'Scx/Knda',
-'scx=kthi' => '#/590',
+'scx=kthi' => '#/625',
 'scx=lana' => 'Sc/Lana',
 'scx=lao' => 'Sc/Lao',
 'scx=laoo' => 'Sc/Lao',
 'scx=latin' => 'Scx/Latn',
 'scx=latn' => 'Scx/Latn',
-'scx=lepc' => '#/537',
-'scx=lepcha' => '#/537',
+'scx=lepc' => '#/572',
+'scx=lepcha' => '#/572',
 'scx=limb' => 'Scx/Limb',
 'scx=limbu' => 'Scx/Limb',
-'scx=lina' => '#/538',
+'scx=lina' => '#/573',
 'scx=linb' => 'Scx/Linb',
-'scx=lineara' => '#/538',
+'scx=lineara' => '#/573',
 'scx=linearb' => 'Scx/Linb',
-'scx=lisu' => '#/99',
-'scx=lyci' => '#/539',
-'scx=lycian' => '#/539',
-'scx=lydi' => '#/540',
-'scx=lydian' => '#/540',
-'scx=mahajani' => '#/591',
-'scx=mahj' => '#/591',
+'scx=lisu' => '#/117',
+'scx=lyci' => '#/574',
+'scx=lycian' => '#/574',
+'scx=lydi' => '#/575',
+'scx=lydian' => '#/575',
+'scx=mahajani' => '#/626',
+'scx=mahj' => '#/626',
 'scx=malayalam' => 'Scx/Mlym',
-'scx=mand' => '#/592',
-'scx=mandaic' => '#/592',
-'scx=mani' => '#/593',
-'scx=manichaean' => '#/593',
-'scx=meeteimayek' => '#/548',
-'scx=mend' => '#/544',
-'scx=mendekikakui' => '#/544',
-'scx=merc' => '#/545',
-'scx=mero' => '#/331',
-'scx=meroiticcursive' => '#/545',
-'scx=meroitichieroglyphs' => '#/331',
-'scx=miao' => '#/546',
+'scx=mand' => '#/627',
+'scx=mandaic' => '#/627',
+'scx=mani' => '#/628',
+'scx=manichaean' => '#/628',
+'scx=meeteimayek' => '#/583',
+'scx=mend' => '#/579',
+'scx=mendekikakui' => '#/579',
+'scx=merc' => '#/580',
+'scx=mero' => '#/355',
+'scx=meroiticcursive' => '#/580',
+'scx=meroitichieroglyphs' => '#/355',
+'scx=miao' => '#/581',
 'scx=mlym' => 'Scx/Mlym',
-'scx=modi' => '#/594',
+'scx=modi' => '#/629',
 'scx=mong' => 'Scx/Mong',
 'scx=mongolian' => 'Scx/Mong',
-'scx=mro' => '#/508',
-'scx=mroo' => '#/508',
-'scx=mtei' => '#/548',
+'scx=mro' => '#/539',
+'scx=mroo' => '#/539',
+'scx=mtei' => '#/583',
+'scx=mult' => 'Scx/Mult',
+'scx=multani' => 'Scx/Mult',
 'scx=myanmar' => 'Scx/Mymr',
 'scx=mymr' => 'Scx/Mymr',
-'scx=nabataean' => '#/550',
-'scx=narb' => '#/306',
-'scx=nbat' => '#/550',
+'scx=nabataean' => '#/585',
+'scx=narb' => '#/329',
+'scx=nbat' => '#/585',
 'scx=newtailue' => 'Sc/Talu',
-'scx=nko' => '#/509',
-'scx=nkoo' => '#/509',
-'scx=ogam' => '#/551',
-'scx=ogham' => '#/551',
-'scx=olchiki' => '#/163',
-'scx=olck' => '#/163',
-'scx=olditalic' => '#/532',
-'scx=oldnortharabian' => '#/306',
-'scx=oldpermic' => '#/555',
-'scx=oldpersian' => '#/583',
-'scx=oldsoutharabian' => '#/307',
-'scx=oldturkic' => '#/552',
+'scx=nko' => '#/540',
+'scx=nkoo' => '#/540',
+'scx=ogam' => '#/586',
+'scx=ogham' => '#/586',
+'scx=olchiki' => '#/184',
+'scx=olck' => '#/184',
+'scx=oldhungarian' => '#/566',
+'scx=olditalic' => '#/567',
+'scx=oldnortharabian' => '#/329',
+'scx=oldpermic' => '#/630',
+'scx=oldpersian' => '#/619',
+'scx=oldsoutharabian' => '#/330',
+'scx=oldturkic' => '#/587',
 'scx=oriya' => 'Scx/Orya',
-'scx=orkh' => '#/552',
+'scx=orkh' => '#/587',
 'scx=orya' => 'Scx/Orya',
-'scx=osma' => '#/553',
-'scx=osmanya' => '#/553',
+'scx=osma' => '#/588',
+'scx=osmanya' => '#/588',
 'scx=pahawhhmong' => 'Sc/Hmng',
-'scx=palm' => '#/225',
-'scx=palmyrene' => '#/225',
-'scx=pauc' => '#/554',
-'scx=paucinhau' => '#/554',
-'scx=perm' => '#/555',
-'scx=phag' => '#/595',
-'scx=phagspa' => '#/595',
-'scx=phli' => '#/557',
+'scx=palm' => '#/246',
+'scx=palmyrene' => '#/246',
+'scx=pauc' => '#/589',
+'scx=paucinhau' => '#/589',
+'scx=perm' => '#/630',
+'scx=phag' => '#/631',
+'scx=phagspa' => '#/631',
+'scx=phli' => '#/592',
 'scx=phlp' => 'Scx/Phlp',
-'scx=phnx' => '#/559',
-'scx=phoenician' => '#/559',
-'scx=plrd' => '#/546',
-'scx=prti' => '#/560',
+'scx=phnx' => '#/594',
+'scx=phoenician' => '#/594',
+'scx=plrd' => '#/581',
+'scx=prti' => '#/595',
 'scx=psalterpahlavi' => 'Scx/Phlp',
 'scx=qaac' => 'Scx/Copt',
 'scx=qaai' => 'Scx/Zinh',
-'scx=rejang' => '#/561',
-'scx=rjng' => '#/561',
-'scx=runic' => '#/562',
-'scx=runr' => '#/562',
-'scx=samaritan' => '#/563',
-'scx=samr' => '#/563',
-'scx=sarb' => '#/307',
-'scx=saur' => '#/564',
-'scx=saurashtra' => '#/564',
-'scx=sharada' => '#/565',
-'scx=shavian' => '#/167',
-'scx=shaw' => '#/167',
-'scx=shrd' => '#/565',
-'scx=sidd' => '#/566',
-'scx=siddham' => '#/566',
+'scx=rejang' => '#/596',
+'scx=rjng' => '#/596',
+'scx=runic' => '#/597',
+'scx=runr' => '#/597',
+'scx=samaritan' => '#/598',
+'scx=samr' => '#/598',
+'scx=sarb' => '#/330',
+'scx=saur' => '#/599',
+'scx=saurashtra' => '#/599',
+'scx=sgnw' => '#/600',
+'scx=sharada' => 'Scx/Shrd',
+'scx=shavian' => '#/188',
+'scx=shaw' => '#/188',
+'scx=shrd' => 'Scx/Shrd',
+'scx=sidd' => '#/602',
+'scx=siddham' => '#/602',
+'scx=signwriting' => '#/600',
 'scx=sind' => 'Scx/Sind',
 'scx=sinh' => 'Scx/Sinh',
 'scx=sinhala' => 'Scx/Sinh',
-'scx=sora' => '#/568',
-'scx=sorasompeng' => '#/568',
-'scx=sund' => '#/569',
-'scx=sundanese' => '#/569',
-'scx=sylo' => '#/596',
-'scx=sylotinagri' => '#/596',
+'scx=sora' => '#/604',
+'scx=sorasompeng' => '#/604',
+'scx=sund' => '#/605',
+'scx=sundanese' => '#/605',
+'scx=sylo' => '#/632',
+'scx=sylotinagri' => '#/632',
 'scx=syrc' => 'Scx/Syrc',
 'scx=syriac' => 'Scx/Syrc',
-'scx=tagalog' => '#/598',
+'scx=tagalog' => '#/634',
 'scx=tagb' => 'Scx/Tagb',
 'scx=tagbanwa' => 'Scx/Tagb',
-'scx=taile' => '#/597',
+'scx=taile' => '#/633',
 'scx=taitham' => 'Sc/Lana',
-'scx=taiviet' => '#/575',
+'scx=taiviet' => '#/611',
 'scx=takr' => 'Scx/Takr',
 'scx=takri' => 'Scx/Takr',
-'scx=tale' => '#/597',
+'scx=tale' => '#/633',
 'scx=talu' => 'Sc/Talu',
 'scx=tamil' => 'Scx/Taml',
 'scx=taml' => 'Scx/Taml',
-'scx=tavt' => '#/575',
+'scx=tavt' => '#/611',
 'scx=telu' => 'Scx/Telu',
 'scx=telugu' => 'Scx/Telu',
-'scx=tfng' => '#/576',
-'scx=tglg' => '#/598',
+'scx=tfng' => '#/612',
+'scx=tglg' => '#/634',
 'scx=thaa' => 'Scx/Thaa',
 'scx=thaana' => 'Scx/Thaa',
-'scx=thai' => '#/579',
+'scx=thai' => '#/615',
 'scx=tibetan' => 'Sc/Tibt',
 'scx=tibt' => 'Sc/Tibt',
-'scx=tifinagh' => '#/576',
+'scx=tifinagh' => '#/612',
 'scx=tirh' => 'Scx/Tirh',
 'scx=tirhuta' => 'Scx/Tirh',
-'scx=ugar' => '#/581',
-'scx=ugaritic' => '#/581',
+'scx=ugar' => '#/617',
+'scx=ugaritic' => '#/617',
 'scx=unknown' => 'Sc/Zzzz',
-'scx=vai' => '#/510',
-'scx=vaii' => '#/510',
-'scx=wara' => '#/582',
-'scx=warangciti' => '#/582',
-'scx=xpeo' => '#/583',
-'scx=xsux' => '#/584',
+'scx=vai' => '#/541',
+'scx=vaii' => '#/541',
+'scx=wara' => '#/618',
+'scx=warangciti' => '#/618',
+'scx=xpeo' => '#/619',
+'scx=xsux' => 'Sc/Xsux',
 'scx=yi' => 'Scx/Yi',
 'scx=yiii' => 'Scx/Yi',
 'scx=zinh' => 'Scx/Zinh',
@@ -5908,31 +6214,33 @@
 'sd=y' => 'SD/Y',
 'sd=yes' => 'SD/Y',
 'separator' => 'Gc/Z',
-'sharada' => '#/565',
-'shavian' => '#/167',
-'shaw' => '#/167',
-'shorthandformatcontrols' => '#/339',
-'shrd' => '#/565',
-'sidd' => '#/566',
-'siddham' => '#/566',
-'sind' => '#/567',
+'sgnw' => '#/600',
+'sharada' => '#/601',
+'shavian' => '#/188',
+'shaw' => '#/188',
+'shorthandformatcontrols' => '#/365',
+'shrd' => '#/601',
+'sidd' => '#/602',
+'siddham' => '#/602',
+'signwriting' => '#/600',
+'sind' => '#/603',
 'sinh' => 'Sc/Sinh',
 'sinhala' => 'Sc/Sinh',
-'sinhalaarchaicnumbers' => '#/335',
+'sinhalaarchaicnumbers' => '#/360',
 'sk' => 'Gc/Sk',
 'sm' => 'Gc/Sm',
-'smallforms' => '#/244',
-'smallformvariants' => '#/244',
+'smallforms' => '#/265',
+'smallformvariants' => '#/265',
 'so' => 'Gc/So',
 'softdotted' => 'SD/Y',
-'sora' => '#/568',
-'sorasompeng' => '#/568',
+'sora' => '#/604',
+'sorasompeng' => '#/604',
 'space' => 'Perl/SpacePer',
 'spaceperl' => 'Perl/SpacePer',
 'spaceseparator' => 'Gc/Zs',
 'spacingmark' => 'Gc/Mc',
-'spacingmodifierletters' => '#/305',
-'specials' => '#/200',
+'spacingmodifierletters' => '#/328',
+'specials' => '#/221',
 'sterm' => 'STerm/Y',
 'sterm=f' => '!STerm/Y',
 'sterm=false' => '!STerm/Y',
@@ -5942,48 +6250,51 @@
 'sterm=true' => 'STerm/Y',
 'sterm=y' => 'STerm/Y',
 'sterm=yes' => 'STerm/Y',
-'sund' => '#/569',
-'sundanese' => '#/569',
-'sundanesesup' => '#/280',
-'sundanesesupplement' => '#/280',
-'suparrowsa' => '#/245',
-'suparrowsb' => '#/246',
-'suparrowsc' => '#/247',
-'superandsub' => '#/267',
-'superscriptsandsubscripts' => '#/267',
-'supmathoperators' => '#/319',
-'supplementalarrowsa' => '#/245',
-'supplementalarrowsb' => '#/246',
-'supplementalarrowsc' => '#/247',
-'supplementalmathematicaloperators' => '#/319',
-'supplementalpunctuation' => '#/296',
-'supplementaryprivateuseareaa' => '#/170',
-'supplementaryprivateuseareab' => '#/171',
-'suppuaa' => '#/170',
-'suppuab' => '#/171',
-'suppunctuation' => '#/296',
-'surrogate' => '#/345',
-'sylo' => '#/570',
-'sylotinagri' => '#/570',
+'sund' => '#/605',
+'sundanese' => '#/605',
+'sundanesesup' => '#/303',
+'sundanesesupplement' => '#/303',
+'suparrowsa' => '#/266',
+'suparrowsb' => '#/267',
+'suparrowsc' => '#/268',
+'superandsub' => '#/289',
+'superscriptsandsubscripts' => '#/289',
+'supmathoperators' => '#/342',
+'supplementalarrowsa' => '#/266',
+'supplementalarrowsb' => '#/267',
+'supplementalarrowsc' => '#/268',
+'supplementalmathematicaloperators' => '#/342',
+'supplementalpunctuation' => '#/319',
+'supplementalsymbolsandpictographs' => '#/366',
+'supplementaryprivateuseareaa' => '#/191',
+'supplementaryprivateuseareab' => '#/192',
+'suppuaa' => '#/191',
+'suppuab' => '#/192',
+'suppunctuation' => '#/319',
+'supsymbolsandpictographs' => '#/366',
+'surrogate' => '#/14',
+'suttonsignwriting' => '#/346',
+'sylo' => '#/606',
+'sylotinagri' => '#/606',
 'symbol' => 'Gc/S',
-'syrc' => '#/571',
-'syriac' => '#/571',
-'tagalog' => '#/577',
-'tagb' => '#/572',
-'tagbanwa' => '#/572',
-'tags' => '#/103',
-'taile' => '#/574',
+'syrc' => '#/607',
+'syriac' => '#/607',
+'tagalog' => '#/613',
+'tagb' => '#/608',
+'tagbanwa' => '#/608',
+'tags' => '#/121',
+'taile' => '#/610',
 'taitham' => 'Sc/Lana',
-'taiviet' => '#/575',
-'taixuanjing' => '#/269',
-'taixuanjingsymbols' => '#/269',
-'takr' => '#/573',
-'takri' => '#/573',
-'tale' => '#/574',
+'taiviet' => '#/611',
+'taixuanjing' => '#/291',
+'taixuanjingsymbols' => '#/291',
+'takr' => '#/609',
+'takri' => '#/609',
+'tale' => '#/610',
 'talu' => 'Sc/Talu',
 'tamil' => 'Sc/Taml',
 'taml' => 'Sc/Taml',
-'tavt' => '#/575',
+'tavt' => '#/611',
 'telu' => 'Sc/Telu',
 'telugu' => 'Sc/Telu',
 'term' => 'Term/Y',
@@ -5996,25 +6307,25 @@
 'term=y' => 'Term/Y',
 'term=yes' => 'Term/Y',
 'terminalpunctuation' => 'Term/Y',
-'tfng' => '#/576',
-'tglg' => '#/577',
-'thaa' => '#/578',
-'thaana' => '#/578',
-'thai' => '#/579',
+'tfng' => '#/612',
+'tglg' => '#/613',
+'thaa' => '#/614',
+'thaana' => '#/614',
+'thai' => '#/615',
 'tibetan' => 'Sc/Tibt',
 'tibt' => 'Sc/Tibt',
-'tifinagh' => '#/576',
-'tirh' => '#/580',
-'tirhuta' => '#/580',
+'tifinagh' => '#/612',
+'tirh' => '#/616',
+'tirhuta' => '#/616',
 'title' => 'Perl/Title',
 'titlecase' => 'Perl/Title',
 'titlecaseletter' => 'Perl/Title',
-'transportandmap' => '#/308',
-'transportandmapsymbols' => '#/308',
-'ucas' => '#/105',
-'ucasext' => '#/177',
-'ugar' => '#/581',
-'ugaritic' => '#/581',
+'transportandmap' => '#/331',
+'transportandmapsymbols' => '#/331',
+'ucas' => '#/123',
+'ucasext' => '#/198',
+'ugar' => '#/617',
+'ugaritic' => '#/617',
 'uideo' => 'UIdeo/Y',
 'uideo=f' => '!UIdeo/Y',
 'uideo=false' => '!UIdeo/Y',
@@ -6026,8 +6337,8 @@
 'uideo=yes' => 'UIdeo/Y',
 'unassigned' => 'Gc/Cn',
 'unicode' => '#/2',
-'unifiedcanadianaboriginalsyllabics' => '#/105',
-'unifiedcanadianaboriginalsyllabicsextended' => '#/177',
+'unifiedcanadianaboriginalsyllabics' => '#/123',
+'unifiedcanadianaboriginalsyllabicsextended' => '#/198',
 'unifiedideograph' => 'UIdeo/Y',
 'unknown' => 'Sc/Zzzz',
 'upper' => 'Upper/Y',
@@ -6041,31 +6352,31 @@
 'upper=yes' => 'Upper/Y',
 'uppercase' => 'Upper/Y',
 'uppercaseletter' => 'Gc/Lu',
-'vai' => '#/510',
-'vaii' => '#/510',
-'variationselector' => '#/71',
-'variationselectors' => '#/88',
-'variationselectorssupplement' => '#/120',
-'vedicext' => '#/204',
-'vedicextensions' => '#/204',
-'verticalforms' => '#/287',
+'vai' => '#/541',
+'vaii' => '#/541',
+'variationselector' => '#/88',
+'variationselectors' => '#/105',
+'variationselectorssupplement' => '#/138',
+'vedicext' => '#/225',
+'vedicextensions' => '#/225',
+'verticalforms' => '#/310',
 'vertspace' => '#/4',
-'vs' => '#/71',
-'vs=f' => '#/!71',
-'vs=false' => '#/!71',
-'vs=n' => '#/!71',
-'vs=no' => '#/!71',
-'vs=t' => '#/71',
-'vs=true' => '#/71',
-'vs=y' => '#/71',
-'vs=yes' => '#/71',
-'vssup' => '#/120',
-'wara' => '#/582',
-'warangciti' => '#/582',
+'vs' => '#/88',
+'vs=f' => '#/!88',
+'vs=false' => '#/!88',
+'vs=n' => '#/!88',
+'vs=no' => '#/!88',
+'vs=t' => '#/88',
+'vs=true' => '#/88',
+'vs=y' => '#/88',
+'vs=yes' => '#/88',
+'vssup' => '#/138',
+'wara' => '#/618',
+'warangciti' => '#/618',
 'wb=aletter' => 'WB/LE',
-'wb=cr' => '#/63',
-'wb=doublequote' => '#/72',
-'wb=dq' => '#/72',
+'wb=cr' => '#/64',
+'wb=doublequote' => '#/89',
+'wb=dq' => '#/89',
 'wb=ex' => 'WB/EX',
 'wb=extend' => 'SB/EX',
 'wb=extendnumlet' => 'WB/EX',
@@ -6076,22 +6387,22 @@
 'wb=ka' => 'WB/KA',
 'wb=katakana' => 'WB/KA',
 'wb=le' => 'WB/LE',
-'wb=lf' => '#/64',
+'wb=lf' => '#/65',
 'wb=mb' => 'WB/MB',
 'wb=midletter' => 'WB/ML',
 'wb=midnum' => 'WB/MN',
 'wb=midnumlet' => 'WB/MB',
 'wb=ml' => 'WB/ML',
 'wb=mn' => 'WB/MN',
-'wb=newline' => '#/73',
-'wb=nl' => '#/73',
+'wb=newline' => '#/90',
+'wb=nl' => '#/90',
 'wb=nu' => 'WB/NU',
 'wb=numeric' => 'WB/NU',
 'wb=other' => 'WB/XX',
-'wb=regionalindicator' => '#/65',
-'wb=ri' => '#/65',
-'wb=singlequote' => '#/74',
-'wb=sq' => '#/74',
+'wb=regionalindicator' => '#/66',
+'wb=ri' => '#/66',
+'wb=singlequote' => '#/91',
+'wb=sq' => '#/91',
 'wb=xx' => 'WB/XX',
 'whitespace' => 'Perl/SpacePer',
 'word' => 'Perl/Word',
@@ -6125,12 +6436,12 @@
 'xids=y' => 'XIDS/Y',
 'xids=yes' => 'XIDS/Y',
 'xidstart' => 'XIDS/Y',
-'xpeo' => '#/583',
+'xpeo' => '#/619',
 'xperlspace' => 'Perl/SpacePer',
 'xposixalnum' => 'Perl/Alnum',
 'xposixalpha' => 'Alpha/Y',
 'xposixblank' => 'Perl/Blank',
-'xposixcntrl' => '#/343',
+'xposixcntrl' => '#/370',
 'xposixdigit' => 'Gc/Nd',
 'xposixgraph' => 'Perl/Graph',
 'xposixlower' => 'Lower/Y',
@@ -6140,17 +6451,17 @@
 'xposixupper' => 'Upper/Y',
 'xposixword' => 'Perl/Word',
 'xposixxdigit' => 'Hex/Y',
-'xsux' => '#/584',
-'yi' => '#/507',
-'yiii' => '#/507',
-'yijing' => '#/144',
-'yijinghexagramsymbols' => '#/144',
-'yiradicals' => '#/249',
-'yisyllables' => '#/270',
+'xsux' => 'Sc/Xsux',
+'yi' => '#/538',
+'yiii' => '#/538',
+'yijing' => '#/163',
+'yijinghexagramsymbols' => '#/163',
+'yiradicals' => '#/270',
+'yisyllables' => '#/292',
 'z' => 'Gc/Z',
 'zinh' => 'Sc/Zinh',
-'zl' => '#/346',
-'zp' => '#/347',
+'zl' => '#/372',
+'zp' => '#/373',
 'zs' => 'Gc/Zs',
 'zyyy' => 'Sc/Zyyy',
 'zzzz' => 'Sc/Zzzz',
@@ -6160,6 +6471,7 @@
 %utf8::nv_floating_to_rational = (
 '-0.5' => '-1/2',
 '0.0625' => '1/16',
+'0.0833333333333333' => '1/12',
 '0.1' => '1/10',
 '0.111111111111111' => '1/9',
 '0.125' => '1/8',
@@ -6171,7 +6483,9 @@
 '0.333333333333333' => '1/3',
 '0.375' => '3/8',
 '0.4' => '2/5',
+'0.416666666666667' => '5/12',
 '0.5' => '1/2',
+'0.583333333333333' => '7/12',
 '0.6' => '3/5',
 '0.625' => '5/8',
 '0.666666666666667' => '2/3',
@@ -6179,6 +6493,7 @@
 '0.8' => '4/5',
 '0.833333333333333' => '5/6',
 '0.875' => '7/8',
+'0.916666666666667' => '11/12',
 '1.5' => '3/2',
 '2.5' => '5/2',
 '3.5' => '7/2',
@@ -6198,8 +6513,8 @@ $utf8::max_floating_slop = 0.001;
 # the table, so as to avoid duplication, as many property names can map to the
 # file, but we only need one entry for all of them.
 %utf8::why_deprecated = (
-'#/426' => 'Deprecated by Unicode because surrogates should never appear in well-formed text, and therefore shouldn\'t be the basis for line breaking',
-'Hyphen/Y' => 'Supplanted by Line_Break property values; see www.unicode.org/reports/tr14',
+'#/450' => 'Deprecated by Unicode because surrogates should never appear in well-formed text, and therefore shouldn\'t be the basis for line breaking',
+'Hyphen/T' => 'Supplanted by Line_Break property values; see www.unicode.org/reports/tr14',
 );
 
 # A few properties have different behavior under /i matching.  This maps
@@ -6285,6 +6600,10 @@ $utf8::max_floating_slop = 0.001;
 'graphemeclusterbreak' => 'To/GCB',
 'hangulsyllabletype' => 'To/Hst',
 'hst' => 'To/Hst',
+'indicpositionalcategory' => 'To/InPC',
+'indicsyllabiccategory' => 'To/InSC',
+'inpc' => 'To/InPC',
+'insc' => 'To/InSC',
 'isc' => 'To/Isc',
 'isocomment' => 'To/Isc',
 'jg' => 'To/Jg',
@@ -6327,9 +6646,20 @@ $utf8::max_floating_slop = 0.001;
 'wordbreak' => 'To/WB',
 );
 
+# Property names to mapping files
+%utf8::strict_property_to_file_of = (
+'_perl_gcb' => 'To/GCB',
+'_perl_lb' => 'To/_PerlLB',
+'_perl_name_alias' => 'To/NameAlia',
+'_perl_sb' => 'To/SB',
+'_perl_wb' => 'To/_PerlWB',
+);
+
 # Files to the swash names within them.
 %utf8::file_to_swash_name = (
 'CombiningClass' => 'ToCombiningClass',
+'To/_PerlLB' => 'To_PerlLB',
+'To/_PerlWB' => 'To_PerlWB',
 'To/Age' => 'ToAge',
 'To/Bc' => 'ToBc',
 'To/Bmg' => 'ToBmg',
@@ -6340,6 +6670,8 @@ $utf8::max_floating_slop = 0.001;
 'To/Gc' => 'ToGc',
 'To/GCB' => 'ToGCB',
 'To/Hst' => 'ToHst',
+'To/InPC' => 'ToInPC',
+'To/InSC' => 'ToInSC',
 'To/Isc' => 'ToIsc',
 'To/Jg' => 'ToJg',
 'To/Jt' => 'ToJt',
diff --git a/Master/tlpkg/tlperl/lib/unicore/Name.pl b/Master/tlpkg/tlperl/lib/unicore/Name.pl
index ff33dfd3a78..458e6f0582c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/Name.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/Name.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -2205,6 +2205,9 @@ return <<'END';
 008B0	ARABIC LETTER GAF WITH INVERTED STROKE
 008B1	ARABIC LETTER STRAIGHT WAW
 008B2	ARABIC LETTER ZAIN WITH INVERTED V ABOVE
+008B3	ARABIC LETTER AIN WITH THREE DOTS BELOW
+008B4	ARABIC LETTER KAF WITH DOT BELOW
+008E3	ARABIC TURNED DAMMA BELOW
 008E4	ARABIC CURLY FATHA
 008E5	ARABIC CURLY DAMMA
 008E6	ARABIC CURLY KASRA
@@ -2617,6 +2620,7 @@ return <<'END';
 00AEF	GUJARATI DIGIT NINE
 00AF0	GUJARATI ABBREVIATION SIGN
 00AF1	GUJARATI RUPEE SIGN
+00AF9	GUJARATI LETTER ZHA
 00B01	ORIYA SIGN CANDRABINDU
 00B02	ORIYA SIGN ANUSVARA
 00B03	ORIYA SIGN VISARGA
@@ -2852,6 +2856,7 @@ return <<'END';
 00C56	TELUGU AI LENGTH MARK
 00C58	TELUGU LETTER TSA
 00C59	TELUGU LETTER DZA
+00C5A	TELUGU LETTER RRRA
 00C60	TELUGU LETTER VOCALIC RR
 00C61	TELUGU LETTER VOCALIC LL
 00C62	TELUGU VOWEL SIGN VOCALIC L
@@ -3034,6 +3039,7 @@ return <<'END';
 00D4D	MALAYALAM SIGN VIRAMA
 00D4E	MALAYALAM LETTER DOT REPH
 00D57	MALAYALAM AU LENGTH MARK
+00D5F	MALAYALAM LETTER ARCHAIC II
 00D60	MALAYALAM LETTER VOCALIC RR
 00D61	MALAYALAM LETTER VOCALIC LL
 00D62	MALAYALAM VOWEL SIGN VOCALIC L
@@ -4494,6 +4500,13 @@ return <<'END';
 013F2	CHEROKEE LETTER YO
 013F3	CHEROKEE LETTER YU
 013F4	CHEROKEE LETTER YV
+013F5	CHEROKEE LETTER MV
+013F8	CHEROKEE SMALL LETTER YE
+013F9	CHEROKEE SMALL LETTER YI
+013FA	CHEROKEE SMALL LETTER YO
+013FB	CHEROKEE SMALL LETTER YU
+013FC	CHEROKEE SMALL LETTER YV
+013FD	CHEROKEE SMALL LETTER MV
 01400	CANADIAN SYLLABICS HYPHEN
 01401	CANADIAN SYLLABICS E
 01402	CANADIAN SYLLABICS AAI
@@ -7418,6 +7431,7 @@ return <<'END';
 020BB	NORDIC MARK SIGN
 020BC	MANAT SIGN
 020BD	RUBLE SIGN
+020BE	LARI SIGN
 020D0	COMBINING LEFT HARPOON ABOVE
 020D1	COMBINING RIGHT HARPOON ABOVE
 020D2	COMBINING LONG VERTICAL LINE OVERLAY
@@ -7590,6 +7604,8 @@ return <<'END';
 02187	ROMAN NUMERAL FIFTY THOUSAND
 02188	ROMAN NUMERAL ONE HUNDRED THOUSAND
 02189	VULGAR FRACTION ZERO THIRDS
+0218A	TURNED DIGIT TWO
+0218B	TURNED DIGIT THREE
 02190	LEFTWARDS ARROW
 02191	UPWARDS ARROW
 02192	RIGHTWARDS ARROW
@@ -10077,8 +10093,10 @@ return <<'END';
 02B77	NORTH EAST TRIANGLE-HEADED ARROW TO BAR
 02B78	SOUTH EAST TRIANGLE-HEADED ARROW TO BAR
 02B79	SOUTH WEST TRIANGLE-HEADED ARROW TO BAR
+02B7A	LEFTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE VERTICAL STROKE
 02B7A	LEFTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE
 02B7B	UPWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE
+02B7C	RIGHTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE VERTICAL STROKE
 02B7C	RIGHTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE
 02B7D	DOWNWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE
 02B7E	HORIZONTAL TAB KEY
@@ -10159,6 +10177,10 @@ return <<'END';
 02BCF	ROTATED WHITE FOUR POINTED CUSP
 02BD0	SQUARE POSITION INDICATOR
 02BD1	UNCERTAINTY SIGN
+02BEC	LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS
+02BED	UPWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS
+02BEE	RIGHTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS
+02BEF	DOWNWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS
 02C00	GLAGOLITIC CAPITAL LETTER AZU
 02C01	GLAGOLITIC CAPITAL LETTER BUKY
 02C02	GLAGOLITIC CAPITAL LETTER VEDE
@@ -13746,6 +13768,7 @@ return <<'END';
 0A69B	CYRILLIC SMALL LETTER CROSSED O
 0A69C	MODIFIER LETTER CYRILLIC HARD SIGN
 0A69D	MODIFIER LETTER CYRILLIC SOFT SIGN
+0A69E	COMBINING CYRILLIC LETTER EF
 0A69F	COMBINING CYRILLIC LETTER IOTIFIED E
 0A6A0	BAMUM LETTER A
 0A6A1	BAMUM LETTER KA
@@ -13978,6 +14001,7 @@ return <<'END';
 0A78C	LATIN SMALL LETTER SALTILLO
 0A78D	LATIN CAPITAL LETTER TURNED H
 0A78E	LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
+0A78F	LATIN LETTER SINOLOGICAL DOT
 0A790	LATIN CAPITAL LETTER N WITH DESCENDER
 0A791	LATIN SMALL LETTER N WITH DESCENDER
 0A792	LATIN CAPITAL LETTER C WITH BAR
@@ -14010,6 +14034,12 @@ return <<'END';
 0A7AD	LATIN CAPITAL LETTER L WITH BELT
 0A7B0	LATIN CAPITAL LETTER TURNED K
 0A7B1	LATIN CAPITAL LETTER TURNED T
+0A7B2	LATIN CAPITAL LETTER J WITH CROSSED-TAIL
+0A7B3	LATIN CAPITAL LETTER CHI
+0A7B4	LATIN CAPITAL LETTER BETA
+0A7B5	LATIN SMALL LETTER BETA
+0A7B6	LATIN CAPITAL LETTER OMEGA
+0A7B7	LATIN SMALL LETTER OMEGA
 0A7F7	LATIN EPIGRAPHIC LETTER SIDEWAYS I
 0A7F8	MODIFIER LETTER CAPITAL H WITH STROKE
 0A7F9	MODIFIER LETTER SMALL LIGATURE OE
@@ -14238,6 +14268,8 @@ return <<'END';
 0A8F9	DEVANAGARI GAP FILLER
 0A8FA	DEVANAGARI CARET
 0A8FB	DEVANAGARI HEADSTROKE
+0A8FC	DEVANAGARI SIGN SIDDHAM
+0A8FD	DEVANAGARI JAIN OM
 0A900	KAYAH LI DIGIT ZERO
 0A901	KAYAH LI DIGIT ONE
 0A902	KAYAH LI DIGIT TWO
@@ -14764,8 +14796,92 @@ return <<'END';
 0AB5D	MODIFIER LETTER SMALL L WITH INVERTED LAZY S
 0AB5E	MODIFIER LETTER SMALL L WITH MIDDLE TILDE
 0AB5F	MODIFIER LETTER SMALL U WITH LEFT HOOK
+0AB60	LATIN SMALL LETTER SAKHA YAT
+0AB61	LATIN SMALL LETTER IOTIFIED E
+0AB62	LATIN SMALL LETTER OPEN OE
+0AB63	LATIN SMALL LETTER UO
 0AB64	LATIN SMALL LETTER INVERTED ALPHA
 0AB65	GREEK LETTER SMALL CAPITAL OMEGA
+0AB70	CHEROKEE SMALL LETTER A
+0AB71	CHEROKEE SMALL LETTER E
+0AB72	CHEROKEE SMALL LETTER I
+0AB73	CHEROKEE SMALL LETTER O
+0AB74	CHEROKEE SMALL LETTER U
+0AB75	CHEROKEE SMALL LETTER V
+0AB76	CHEROKEE SMALL LETTER GA
+0AB77	CHEROKEE SMALL LETTER KA
+0AB78	CHEROKEE SMALL LETTER GE
+0AB79	CHEROKEE SMALL LETTER GI
+0AB7A	CHEROKEE SMALL LETTER GO
+0AB7B	CHEROKEE SMALL LETTER GU
+0AB7C	CHEROKEE SMALL LETTER GV
+0AB7D	CHEROKEE SMALL LETTER HA
+0AB7E	CHEROKEE SMALL LETTER HE
+0AB7F	CHEROKEE SMALL LETTER HI
+0AB80	CHEROKEE SMALL LETTER HO
+0AB81	CHEROKEE SMALL LETTER HU
+0AB82	CHEROKEE SMALL LETTER HV
+0AB83	CHEROKEE SMALL LETTER LA
+0AB84	CHEROKEE SMALL LETTER LE
+0AB85	CHEROKEE SMALL LETTER LI
+0AB86	CHEROKEE SMALL LETTER LO
+0AB87	CHEROKEE SMALL LETTER LU
+0AB88	CHEROKEE SMALL LETTER LV
+0AB89	CHEROKEE SMALL LETTER MA
+0AB8A	CHEROKEE SMALL LETTER ME
+0AB8B	CHEROKEE SMALL LETTER MI
+0AB8C	CHEROKEE SMALL LETTER MO
+0AB8D	CHEROKEE SMALL LETTER MU
+0AB8E	CHEROKEE SMALL LETTER NA
+0AB8F	CHEROKEE SMALL LETTER HNA
+0AB90	CHEROKEE SMALL LETTER NAH
+0AB91	CHEROKEE SMALL LETTER NE
+0AB92	CHEROKEE SMALL LETTER NI
+0AB93	CHEROKEE SMALL LETTER NO
+0AB94	CHEROKEE SMALL LETTER NU
+0AB95	CHEROKEE SMALL LETTER NV
+0AB96	CHEROKEE SMALL LETTER QUA
+0AB97	CHEROKEE SMALL LETTER QUE
+0AB98	CHEROKEE SMALL LETTER QUI
+0AB99	CHEROKEE SMALL LETTER QUO
+0AB9A	CHEROKEE SMALL LETTER QUU
+0AB9B	CHEROKEE SMALL LETTER QUV
+0AB9C	CHEROKEE SMALL LETTER SA
+0AB9D	CHEROKEE SMALL LETTER S
+0AB9E	CHEROKEE SMALL LETTER SE
+0AB9F	CHEROKEE SMALL LETTER SI
+0ABA0	CHEROKEE SMALL LETTER SO
+0ABA1	CHEROKEE SMALL LETTER SU
+0ABA2	CHEROKEE SMALL LETTER SV
+0ABA3	CHEROKEE SMALL LETTER DA
+0ABA4	CHEROKEE SMALL LETTER TA
+0ABA5	CHEROKEE SMALL LETTER DE
+0ABA6	CHEROKEE SMALL LETTER TE
+0ABA7	CHEROKEE SMALL LETTER DI
+0ABA8	CHEROKEE SMALL LETTER TI
+0ABA9	CHEROKEE SMALL LETTER DO
+0ABAA	CHEROKEE SMALL LETTER DU
+0ABAB	CHEROKEE SMALL LETTER DV
+0ABAC	CHEROKEE SMALL LETTER DLA
+0ABAD	CHEROKEE SMALL LETTER TLA
+0ABAE	CHEROKEE SMALL LETTER TLE
+0ABAF	CHEROKEE SMALL LETTER TLI
+0ABB0	CHEROKEE SMALL LETTER TLO
+0ABB1	CHEROKEE SMALL LETTER TLU
+0ABB2	CHEROKEE SMALL LETTER TLV
+0ABB3	CHEROKEE SMALL LETTER TSA
+0ABB4	CHEROKEE SMALL LETTER TSE
+0ABB5	CHEROKEE SMALL LETTER TSI
+0ABB6	CHEROKEE SMALL LETTER TSO
+0ABB7	CHEROKEE SMALL LETTER TSU
+0ABB8	CHEROKEE SMALL LETTER TSV
+0ABB9	CHEROKEE SMALL LETTER WA
+0ABBA	CHEROKEE SMALL LETTER WE
+0ABBB	CHEROKEE SMALL LETTER WI
+0ABBC	CHEROKEE SMALL LETTER WO
+0ABBD	CHEROKEE SMALL LETTER WU
+0ABBE	CHEROKEE SMALL LETTER WV
+0ABBF	CHEROKEE SMALL LETTER YA
 0ABC0	MEETEI MAYEK LETTER KOK
 0ABC1	MEETEI MAYEK LETTER SAM
 0ABC2	MEETEI MAYEK LETTER LAI
@@ -15620,6 +15736,8 @@ return <<'END';
 0FE2B	COMBINING MACRON LEFT HALF BELOW
 0FE2C	COMBINING MACRON RIGHT HALF BELOW
 0FE2D	COMBINING CONJOINING MACRON BELOW
+0FE2E	COMBINING CYRILLIC TITLO LEFT HALF
+0FE2F	COMBINING CYRILLIC TITLO RIGHT HALF
 0FE30	PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
 0FE31	PRESENTATION FORM FOR VERTICAL EM DASH
 0FE32	PRESENTATION FORM FOR VERTICAL EN DASH
@@ -17509,6 +17627,32 @@ return <<'END';
 108AD	NABATAEAN NUMBER TEN
 108AE	NABATAEAN NUMBER TWENTY
 108AF	NABATAEAN NUMBER ONE HUNDRED
+108E0	HATRAN LETTER ALEPH
+108E1	HATRAN LETTER BETH
+108E2	HATRAN LETTER GIMEL
+108E3	HATRAN LETTER DALETH-RESH
+108E4	HATRAN LETTER HE
+108E5	HATRAN LETTER WAW
+108E6	HATRAN LETTER ZAYN
+108E7	HATRAN LETTER HETH
+108E8	HATRAN LETTER TETH
+108E9	HATRAN LETTER YODH
+108EA	HATRAN LETTER KAPH
+108EB	HATRAN LETTER LAMEDH
+108EC	HATRAN LETTER MEM
+108ED	HATRAN LETTER NUN
+108EE	HATRAN LETTER SAMEKH
+108EF	HATRAN LETTER AYN
+108F0	HATRAN LETTER PE
+108F1	HATRAN LETTER SADHE
+108F2	HATRAN LETTER QOPH
+108F4	HATRAN LETTER SHIN
+108F5	HATRAN LETTER TAW
+108FB	HATRAN NUMBER ONE
+108FC	HATRAN NUMBER FIVE
+108FD	HATRAN NUMBER TEN
+108FE	HATRAN NUMBER TWENTY
+108FF	HATRAN NUMBER ONE HUNDRED
 10900	PHOENICIAN LETTER ALF
 10901	PHOENICIAN LETTER BET
 10902	PHOENICIAN LETTER GAML
@@ -17621,8 +17765,72 @@ return <<'END';
 109B5	MEROITIC CURSIVE LETTER TE
 109B6	MEROITIC CURSIVE LETTER TO
 109B7	MEROITIC CURSIVE LETTER DA
+109BC	MEROITIC CURSIVE FRACTION ELEVEN TWELFTHS
+109BD	MEROITIC CURSIVE FRACTION ONE HALF
 109BE	MEROITIC CURSIVE LOGOGRAM RMT
 109BF	MEROITIC CURSIVE LOGOGRAM IMN
+109C0	MEROITIC CURSIVE NUMBER ONE
+109C1	MEROITIC CURSIVE NUMBER TWO
+109C2	MEROITIC CURSIVE NUMBER THREE
+109C3	MEROITIC CURSIVE NUMBER FOUR
+109C4	MEROITIC CURSIVE NUMBER FIVE
+109C5	MEROITIC CURSIVE NUMBER SIX
+109C6	MEROITIC CURSIVE NUMBER SEVEN
+109C7	MEROITIC CURSIVE NUMBER EIGHT
+109C8	MEROITIC CURSIVE NUMBER NINE
+109C9	MEROITIC CURSIVE NUMBER TEN
+109CA	MEROITIC CURSIVE NUMBER TWENTY
+109CB	MEROITIC CURSIVE NUMBER THIRTY
+109CC	MEROITIC CURSIVE NUMBER FORTY
+109CD	MEROITIC CURSIVE NUMBER FIFTY
+109CE	MEROITIC CURSIVE NUMBER SIXTY
+109CF	MEROITIC CURSIVE NUMBER SEVENTY
+109D2	MEROITIC CURSIVE NUMBER ONE HUNDRED
+109D3	MEROITIC CURSIVE NUMBER TWO HUNDRED
+109D4	MEROITIC CURSIVE NUMBER THREE HUNDRED
+109D5	MEROITIC CURSIVE NUMBER FOUR HUNDRED
+109D6	MEROITIC CURSIVE NUMBER FIVE HUNDRED
+109D7	MEROITIC CURSIVE NUMBER SIX HUNDRED
+109D8	MEROITIC CURSIVE NUMBER SEVEN HUNDRED
+109D9	MEROITIC CURSIVE NUMBER EIGHT HUNDRED
+109DA	MEROITIC CURSIVE NUMBER NINE HUNDRED
+109DB	MEROITIC CURSIVE NUMBER ONE THOUSAND
+109DC	MEROITIC CURSIVE NUMBER TWO THOUSAND
+109DD	MEROITIC CURSIVE NUMBER THREE THOUSAND
+109DE	MEROITIC CURSIVE NUMBER FOUR THOUSAND
+109DF	MEROITIC CURSIVE NUMBER FIVE THOUSAND
+109E0	MEROITIC CURSIVE NUMBER SIX THOUSAND
+109E1	MEROITIC CURSIVE NUMBER SEVEN THOUSAND
+109E2	MEROITIC CURSIVE NUMBER EIGHT THOUSAND
+109E3	MEROITIC CURSIVE NUMBER NINE THOUSAND
+109E4	MEROITIC CURSIVE NUMBER TEN THOUSAND
+109E5	MEROITIC CURSIVE NUMBER TWENTY THOUSAND
+109E6	MEROITIC CURSIVE NUMBER THIRTY THOUSAND
+109E7	MEROITIC CURSIVE NUMBER FORTY THOUSAND
+109E8	MEROITIC CURSIVE NUMBER FIFTY THOUSAND
+109E9	MEROITIC CURSIVE NUMBER SIXTY THOUSAND
+109EA	MEROITIC CURSIVE NUMBER SEVENTY THOUSAND
+109EB	MEROITIC CURSIVE NUMBER EIGHTY THOUSAND
+109EC	MEROITIC CURSIVE NUMBER NINETY THOUSAND
+109ED	MEROITIC CURSIVE NUMBER ONE HUNDRED THOUSAND
+109EE	MEROITIC CURSIVE NUMBER TWO HUNDRED THOUSAND
+109EF	MEROITIC CURSIVE NUMBER THREE HUNDRED THOUSAND
+109F0	MEROITIC CURSIVE NUMBER FOUR HUNDRED THOUSAND
+109F1	MEROITIC CURSIVE NUMBER FIVE HUNDRED THOUSAND
+109F2	MEROITIC CURSIVE NUMBER SIX HUNDRED THOUSAND
+109F3	MEROITIC CURSIVE NUMBER SEVEN HUNDRED THOUSAND
+109F4	MEROITIC CURSIVE NUMBER EIGHT HUNDRED THOUSAND
+109F5	MEROITIC CURSIVE NUMBER NINE HUNDRED THOUSAND
+109F6	MEROITIC CURSIVE FRACTION ONE TWELFTH
+109F7	MEROITIC CURSIVE FRACTION TWO TWELFTHS
+109F8	MEROITIC CURSIVE FRACTION THREE TWELFTHS
+109F9	MEROITIC CURSIVE FRACTION FOUR TWELFTHS
+109FA	MEROITIC CURSIVE FRACTION FIVE TWELFTHS
+109FB	MEROITIC CURSIVE FRACTION SIX TWELFTHS
+109FC	MEROITIC CURSIVE FRACTION SEVEN TWELFTHS
+109FD	MEROITIC CURSIVE FRACTION EIGHT TWELFTHS
+109FE	MEROITIC CURSIVE FRACTION NINE TWELFTHS
+109FF	MEROITIC CURSIVE FRACTION TEN TWELFTHS
 10A00	KHAROSHTHI LETTER A
 10A01	KHAROSHTHI VOWEL SIGN I
 10A02	KHAROSHTHI VOWEL SIGN U
@@ -18023,6 +18231,114 @@ return <<'END';
 10C46	OLD TURKIC LETTER YENISEI AET
 10C47	OLD TURKIC LETTER ORKHON OT
 10C48	OLD TURKIC LETTER ORKHON BASH
+10C80	OLD HUNGARIAN CAPITAL LETTER A
+10C81	OLD HUNGARIAN CAPITAL LETTER AA
+10C82	OLD HUNGARIAN CAPITAL LETTER EB
+10C83	OLD HUNGARIAN CAPITAL LETTER AMB
+10C84	OLD HUNGARIAN CAPITAL LETTER EC
+10C85	OLD HUNGARIAN CAPITAL LETTER ENC
+10C86	OLD HUNGARIAN CAPITAL LETTER ECS
+10C87	OLD HUNGARIAN CAPITAL LETTER ED
+10C88	OLD HUNGARIAN CAPITAL LETTER AND
+10C89	OLD HUNGARIAN CAPITAL LETTER E
+10C8A	OLD HUNGARIAN CAPITAL LETTER CLOSE E
+10C8B	OLD HUNGARIAN CAPITAL LETTER EE
+10C8C	OLD HUNGARIAN CAPITAL LETTER EF
+10C8D	OLD HUNGARIAN CAPITAL LETTER EG
+10C8E	OLD HUNGARIAN CAPITAL LETTER EGY
+10C8F	OLD HUNGARIAN CAPITAL LETTER EH
+10C90	OLD HUNGARIAN CAPITAL LETTER I
+10C91	OLD HUNGARIAN CAPITAL LETTER II
+10C92	OLD HUNGARIAN CAPITAL LETTER EJ
+10C93	OLD HUNGARIAN CAPITAL LETTER EK
+10C94	OLD HUNGARIAN CAPITAL LETTER AK
+10C95	OLD HUNGARIAN CAPITAL LETTER UNK
+10C96	OLD HUNGARIAN CAPITAL LETTER EL
+10C97	OLD HUNGARIAN CAPITAL LETTER ELY
+10C98	OLD HUNGARIAN CAPITAL LETTER EM
+10C99	OLD HUNGARIAN CAPITAL LETTER EN
+10C9A	OLD HUNGARIAN CAPITAL LETTER ENY
+10C9B	OLD HUNGARIAN CAPITAL LETTER O
+10C9C	OLD HUNGARIAN CAPITAL LETTER OO
+10C9D	OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG OE
+10C9E	OLD HUNGARIAN CAPITAL LETTER RUDIMENTA OE
+10C9F	OLD HUNGARIAN CAPITAL LETTER OEE
+10CA0	OLD HUNGARIAN CAPITAL LETTER EP
+10CA1	OLD HUNGARIAN CAPITAL LETTER EMP
+10CA2	OLD HUNGARIAN CAPITAL LETTER ER
+10CA3	OLD HUNGARIAN CAPITAL LETTER SHORT ER
+10CA4	OLD HUNGARIAN CAPITAL LETTER ES
+10CA5	OLD HUNGARIAN CAPITAL LETTER ESZ
+10CA6	OLD HUNGARIAN CAPITAL LETTER ET
+10CA7	OLD HUNGARIAN CAPITAL LETTER ENT
+10CA8	OLD HUNGARIAN CAPITAL LETTER ETY
+10CA9	OLD HUNGARIAN CAPITAL LETTER ECH
+10CAA	OLD HUNGARIAN CAPITAL LETTER U
+10CAB	OLD HUNGARIAN CAPITAL LETTER UU
+10CAC	OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG UE
+10CAD	OLD HUNGARIAN CAPITAL LETTER RUDIMENTA UE
+10CAE	OLD HUNGARIAN CAPITAL LETTER EV
+10CAF	OLD HUNGARIAN CAPITAL LETTER EZ
+10CB0	OLD HUNGARIAN CAPITAL LETTER EZS
+10CB1	OLD HUNGARIAN CAPITAL LETTER ENT-SHAPED SIGN
+10CB2	OLD HUNGARIAN CAPITAL LETTER US
+10CC0	OLD HUNGARIAN SMALL LETTER A
+10CC1	OLD HUNGARIAN SMALL LETTER AA
+10CC2	OLD HUNGARIAN SMALL LETTER EB
+10CC3	OLD HUNGARIAN SMALL LETTER AMB
+10CC4	OLD HUNGARIAN SMALL LETTER EC
+10CC5	OLD HUNGARIAN SMALL LETTER ENC
+10CC6	OLD HUNGARIAN SMALL LETTER ECS
+10CC7	OLD HUNGARIAN SMALL LETTER ED
+10CC8	OLD HUNGARIAN SMALL LETTER AND
+10CC9	OLD HUNGARIAN SMALL LETTER E
+10CCA	OLD HUNGARIAN SMALL LETTER CLOSE E
+10CCB	OLD HUNGARIAN SMALL LETTER EE
+10CCC	OLD HUNGARIAN SMALL LETTER EF
+10CCD	OLD HUNGARIAN SMALL LETTER EG
+10CCE	OLD HUNGARIAN SMALL LETTER EGY
+10CCF	OLD HUNGARIAN SMALL LETTER EH
+10CD0	OLD HUNGARIAN SMALL LETTER I
+10CD1	OLD HUNGARIAN SMALL LETTER II
+10CD2	OLD HUNGARIAN SMALL LETTER EJ
+10CD3	OLD HUNGARIAN SMALL LETTER EK
+10CD4	OLD HUNGARIAN SMALL LETTER AK
+10CD5	OLD HUNGARIAN SMALL LETTER UNK
+10CD6	OLD HUNGARIAN SMALL LETTER EL
+10CD7	OLD HUNGARIAN SMALL LETTER ELY
+10CD8	OLD HUNGARIAN SMALL LETTER EM
+10CD9	OLD HUNGARIAN SMALL LETTER EN
+10CDA	OLD HUNGARIAN SMALL LETTER ENY
+10CDB	OLD HUNGARIAN SMALL LETTER O
+10CDC	OLD HUNGARIAN SMALL LETTER OO
+10CDD	OLD HUNGARIAN SMALL LETTER NIKOLSBURG OE
+10CDE	OLD HUNGARIAN SMALL LETTER RUDIMENTA OE
+10CDF	OLD HUNGARIAN SMALL LETTER OEE
+10CE0	OLD HUNGARIAN SMALL LETTER EP
+10CE1	OLD HUNGARIAN SMALL LETTER EMP
+10CE2	OLD HUNGARIAN SMALL LETTER ER
+10CE3	OLD HUNGARIAN SMALL LETTER SHORT ER
+10CE4	OLD HUNGARIAN SMALL LETTER ES
+10CE5	OLD HUNGARIAN SMALL LETTER ESZ
+10CE6	OLD HUNGARIAN SMALL LETTER ET
+10CE7	OLD HUNGARIAN SMALL LETTER ENT
+10CE8	OLD HUNGARIAN SMALL LETTER ETY
+10CE9	OLD HUNGARIAN SMALL LETTER ECH
+10CEA	OLD HUNGARIAN SMALL LETTER U
+10CEB	OLD HUNGARIAN SMALL LETTER UU
+10CEC	OLD HUNGARIAN SMALL LETTER NIKOLSBURG UE
+10CED	OLD HUNGARIAN SMALL LETTER RUDIMENTA UE
+10CEE	OLD HUNGARIAN SMALL LETTER EV
+10CEF	OLD HUNGARIAN SMALL LETTER EZ
+10CF0	OLD HUNGARIAN SMALL LETTER EZS
+10CF1	OLD HUNGARIAN SMALL LETTER ENT-SHAPED SIGN
+10CF2	OLD HUNGARIAN SMALL LETTER US
+10CFA	OLD HUNGARIAN NUMBER ONE
+10CFB	OLD HUNGARIAN NUMBER FIVE
+10CFC	OLD HUNGARIAN NUMBER TEN
+10CFD	OLD HUNGARIAN NUMBER FIFTY
+10CFE	OLD HUNGARIAN NUMBER ONE HUNDRED
+10CFF	OLD HUNGARIAN NUMBER ONE THOUSAND
 10E60	RUMI DIGIT ONE
 10E61	RUMI DIGIT TWO
 10E62	RUMI DIGIT THREE
@@ -18443,6 +18759,10 @@ return <<'END';
 111C6	SHARADA DOUBLE DANDA
 111C7	SHARADA ABBREVIATION SIGN
 111C8	SHARADA SEPARATOR
+111C9	SHARADA SANDHI MARK
+111CA	SHARADA SIGN NUKTA
+111CB	SHARADA VOWEL MODIFIER MARK
+111CC	SHARADA EXTRA SHORT VOWEL MARK
 111CD	SHARADA SUTRA MARK
 111D0	SHARADA DIGIT ZERO
 111D1	SHARADA DIGIT ONE
@@ -18455,6 +18775,11 @@ return <<'END';
 111D8	SHARADA DIGIT EIGHT
 111D9	SHARADA DIGIT NINE
 111DA	SHARADA EKAM
+111DB	SHARADA SIGN SIDDHAM
+111DC	SHARADA HEADSTROKE
+111DD	SHARADA CONTINUATION SIGN
+111DE	SHARADA SECTION MARK-1
+111DF	SHARADA SECTION MARK-2
 111E1	SINHALA ARCHAIC DIGIT ONE
 111E2	SINHALA ARCHAIC DIGIT TWO
 111E3	SINHALA ARCHAIC DIGIT THREE
@@ -18536,6 +18861,44 @@ return <<'END';
 1123B	KHOJKI SECTION MARK
 1123C	KHOJKI DOUBLE SECTION MARK
 1123D	KHOJKI ABBREVIATION SIGN
+11280	MULTANI LETTER A
+11281	MULTANI LETTER I
+11282	MULTANI LETTER U
+11283	MULTANI LETTER E
+11284	MULTANI LETTER KA
+11285	MULTANI LETTER KHA
+11286	MULTANI LETTER GA
+11288	MULTANI LETTER GHA
+1128A	MULTANI LETTER CA
+1128B	MULTANI LETTER CHA
+1128C	MULTANI LETTER JA
+1128D	MULTANI LETTER JJA
+1128F	MULTANI LETTER NYA
+11290	MULTANI LETTER TTA
+11291	MULTANI LETTER TTHA
+11292	MULTANI LETTER DDA
+11293	MULTANI LETTER DDDA
+11294	MULTANI LETTER DDHA
+11295	MULTANI LETTER NNA
+11296	MULTANI LETTER TA
+11297	MULTANI LETTER THA
+11298	MULTANI LETTER DA
+11299	MULTANI LETTER DHA
+1129A	MULTANI LETTER NA
+1129B	MULTANI LETTER PA
+1129C	MULTANI LETTER PHA
+1129D	MULTANI LETTER BA
+1129F	MULTANI LETTER BHA
+112A0	MULTANI LETTER MA
+112A1	MULTANI LETTER YA
+112A2	MULTANI LETTER RA
+112A3	MULTANI LETTER LA
+112A4	MULTANI LETTER VA
+112A5	MULTANI LETTER SA
+112A6	MULTANI LETTER HA
+112A7	MULTANI LETTER RRA
+112A8	MULTANI LETTER RHA
+112A9	MULTANI SECTION MARK
 112B0	KHUDAWADI LETTER A
 112B1	KHUDAWADI LETTER AA
 112B2	KHUDAWADI LETTER I
@@ -18605,6 +18968,7 @@ return <<'END';
 112F7	KHUDAWADI DIGIT SEVEN
 112F8	KHUDAWADI DIGIT EIGHT
 112F9	KHUDAWADI DIGIT NINE
+11300	GRANTHA SIGN COMBINING ANUSVARA ABOVE
 11301	GRANTHA SIGN CANDRABINDU
 11302	GRANTHA SIGN ANUSVARA
 11303	GRANTHA SIGN VISARGA
@@ -18668,6 +19032,7 @@ return <<'END';
 1134B	GRANTHA VOWEL SIGN OO
 1134C	GRANTHA VOWEL SIGN AU
 1134D	GRANTHA SIGN VIRAMA
+11350	GRANTHA OM
 11357	GRANTHA AU LENGTH MARK
 1135D	GRANTHA SIGN PLUTA
 1135E	GRANTHA LETTER VEDIC ANUSVARA
@@ -18842,6 +19207,26 @@ return <<'END';
 115C7	SIDDHAM REPETITION MARK-2
 115C8	SIDDHAM REPETITION MARK-3
 115C9	SIDDHAM END OF TEXT MARK
+115CA	SIDDHAM SECTION MARK WITH TRIDENT AND U-SHAPED ORNAMENTS
+115CB	SIDDHAM SECTION MARK WITH TRIDENT AND DOTTED CRESCENTS
+115CC	SIDDHAM SECTION MARK WITH RAYS AND DOTTED CRESCENTS
+115CD	SIDDHAM SECTION MARK WITH RAYS AND DOTTED DOUBLE CRESCENTS
+115CE	SIDDHAM SECTION MARK WITH RAYS AND DOTTED TRIPLE CRESCENTS
+115CF	SIDDHAM SECTION MARK DOUBLE RING
+115D0	SIDDHAM SECTION MARK DOUBLE RING WITH RAYS
+115D1	SIDDHAM SECTION MARK WITH DOUBLE CRESCENTS
+115D2	SIDDHAM SECTION MARK WITH TRIPLE CRESCENTS
+115D3	SIDDHAM SECTION MARK WITH QUADRUPLE CRESCENTS
+115D4	SIDDHAM SECTION MARK WITH SEPTUPLE CRESCENTS
+115D5	SIDDHAM SECTION MARK WITH CIRCLES AND RAYS
+115D6	SIDDHAM SECTION MARK WITH CIRCLES AND TWO ENCLOSURES
+115D7	SIDDHAM SECTION MARK WITH CIRCLES AND FOUR ENCLOSURES
+115D8	SIDDHAM LETTER THREE-CIRCLE ALTERNATE I
+115D9	SIDDHAM LETTER TWO-CIRCLE ALTERNATE I
+115DA	SIDDHAM LETTER TWO-CIRCLE ALTERNATE II
+115DB	SIDDHAM LETTER ALTERNATE U
+115DC	SIDDHAM VOWEL SIGN ALTERNATE U
+115DD	SIDDHAM VOWEL SIGN ALTERNATE UU
 11600	MODI LETTER A
 11601	MODI LETTER AA
 11602	MODI LETTER I
@@ -18987,6 +19372,63 @@ return <<'END';
 116C7	TAKRI DIGIT SEVEN
 116C8	TAKRI DIGIT EIGHT
 116C9	TAKRI DIGIT NINE
+11700	AHOM LETTER KA
+11701	AHOM LETTER KHA
+11702	AHOM LETTER NGA
+11703	AHOM LETTER NA
+11704	AHOM LETTER TA
+11705	AHOM LETTER ALTERNATE TA
+11706	AHOM LETTER PA
+11707	AHOM LETTER PHA
+11708	AHOM LETTER BA
+11709	AHOM LETTER MA
+1170A	AHOM LETTER JA
+1170B	AHOM LETTER CHA
+1170C	AHOM LETTER THA
+1170D	AHOM LETTER RA
+1170E	AHOM LETTER LA
+1170F	AHOM LETTER SA
+11710	AHOM LETTER NYA
+11711	AHOM LETTER HA
+11712	AHOM LETTER A
+11713	AHOM LETTER DA
+11714	AHOM LETTER DHA
+11715	AHOM LETTER GA
+11716	AHOM LETTER ALTERNATE GA
+11717	AHOM LETTER GHA
+11718	AHOM LETTER BHA
+11719	AHOM LETTER JHA
+1171D	AHOM CONSONANT SIGN MEDIAL LA
+1171E	AHOM CONSONANT SIGN MEDIAL RA
+1171F	AHOM CONSONANT SIGN MEDIAL LIGATING RA
+11720	AHOM VOWEL SIGN A
+11721	AHOM VOWEL SIGN AA
+11722	AHOM VOWEL SIGN I
+11723	AHOM VOWEL SIGN II
+11724	AHOM VOWEL SIGN U
+11725	AHOM VOWEL SIGN UU
+11726	AHOM VOWEL SIGN E
+11727	AHOM VOWEL SIGN AW
+11728	AHOM VOWEL SIGN O
+11729	AHOM VOWEL SIGN AI
+1172A	AHOM VOWEL SIGN AM
+1172B	AHOM SIGN KILLER
+11730	AHOM DIGIT ZERO
+11731	AHOM DIGIT ONE
+11732	AHOM DIGIT TWO
+11733	AHOM DIGIT THREE
+11734	AHOM DIGIT FOUR
+11735	AHOM DIGIT FIVE
+11736	AHOM DIGIT SIX
+11737	AHOM DIGIT SEVEN
+11738	AHOM DIGIT EIGHT
+11739	AHOM DIGIT NINE
+1173A	AHOM NUMBER TEN
+1173B	AHOM NUMBER TWENTY
+1173C	AHOM SIGN SMALL SECTION
+1173D	AHOM SIGN SECTION
+1173E	AHOM SIGN RULAI
+1173F	AHOM SYMBOL VI
 118A0	WARANG CITI CAPITAL LETTER NGAA
 118A1	WARANG CITI CAPITAL LETTER A
 118A2	WARANG CITI CAPITAL LETTER WI
@@ -20051,6 +20493,7 @@ return <<'END';
 12396	CUNEIFORM SIGN SAG TIMES IGI GUNU
 12397	CUNEIFORM SIGN TI2
 12398	CUNEIFORM SIGN UM TIMES ME
+12399	CUNEIFORM SIGN U U
 12400	CUNEIFORM NUMERIC SIGN TWO ASH
 12401	CUNEIFORM NUMERIC SIGN THREE ASH
 12402	CUNEIFORM NUMERIC SIGN FOUR ASH
@@ -20167,6 +20610,202 @@ return <<'END';
 12472	CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON
 12473	CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON
 12474	CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON
+12480	CUNEIFORM SIGN AB TIMES NUN TENU
+12481	CUNEIFORM SIGN AB TIMES SHU2
+12482	CUNEIFORM SIGN AD TIMES ESH2
+12483	CUNEIFORM SIGN BAD TIMES DISH TENU
+12484	CUNEIFORM SIGN BAHAR2 TIMES AB2
+12485	CUNEIFORM SIGN BAHAR2 TIMES NI
+12486	CUNEIFORM SIGN BAHAR2 TIMES ZA
+12487	CUNEIFORM SIGN BU OVER BU TIMES NA2
+12488	CUNEIFORM SIGN DA TIMES TAK4
+12489	CUNEIFORM SIGN DAG TIMES KUR
+1248A	CUNEIFORM SIGN DIM TIMES IGI
+1248B	CUNEIFORM SIGN DIM TIMES U U U
+1248C	CUNEIFORM SIGN DIM2 TIMES UD
+1248D	CUNEIFORM SIGN DUG TIMES ANSHE
+1248E	CUNEIFORM SIGN DUG TIMES ASH
+1248F	CUNEIFORM SIGN DUG TIMES ASH AT LEFT
+12490	CUNEIFORM SIGN DUG TIMES DIN
+12491	CUNEIFORM SIGN DUG TIMES DUN
+12492	CUNEIFORM SIGN DUG TIMES ERIN2
+12493	CUNEIFORM SIGN DUG TIMES GA
+12494	CUNEIFORM SIGN DUG TIMES GI
+12495	CUNEIFORM SIGN DUG TIMES GIR2 GUNU
+12496	CUNEIFORM SIGN DUG TIMES GISH
+12497	CUNEIFORM SIGN DUG TIMES HA
+12498	CUNEIFORM SIGN DUG TIMES HI
+12499	CUNEIFORM SIGN DUG TIMES IGI GUNU
+1249A	CUNEIFORM SIGN DUG TIMES KASKAL
+1249B	CUNEIFORM SIGN DUG TIMES KUR
+1249C	CUNEIFORM SIGN DUG TIMES KUSHU2
+1249D	CUNEIFORM SIGN DUG TIMES KUSHU2 PLUS KASKAL
+1249E	CUNEIFORM SIGN DUG TIMES LAK-020
+1249F	CUNEIFORM SIGN DUG TIMES LAM
+124A0	CUNEIFORM SIGN DUG TIMES LAM TIMES KUR
+124A1	CUNEIFORM SIGN DUG TIMES LUH PLUS GISH
+124A2	CUNEIFORM SIGN DUG TIMES MASH
+124A3	CUNEIFORM SIGN DUG TIMES MES
+124A4	CUNEIFORM SIGN DUG TIMES MI
+124A5	CUNEIFORM SIGN DUG TIMES NI
+124A6	CUNEIFORM SIGN DUG TIMES PI
+124A7	CUNEIFORM SIGN DUG TIMES SHE
+124A8	CUNEIFORM SIGN DUG TIMES SI GUNU
+124A9	CUNEIFORM SIGN E2 TIMES KUR
+124AA	CUNEIFORM SIGN E2 TIMES PAP
+124AB	CUNEIFORM SIGN ERIN2 X
+124AC	CUNEIFORM SIGN ESH2 CROSSING ESH2
+124AD	CUNEIFORM SIGN EZEN SHESHIG TIMES ASH
+124AE	CUNEIFORM SIGN EZEN SHESHIG TIMES HI
+124AF	CUNEIFORM SIGN EZEN SHESHIG TIMES IGI GUNU
+124B0	CUNEIFORM SIGN EZEN SHESHIG TIMES LA
+124B1	CUNEIFORM SIGN EZEN SHESHIG TIMES LAL
+124B2	CUNEIFORM SIGN EZEN SHESHIG TIMES ME
+124B3	CUNEIFORM SIGN EZEN SHESHIG TIMES MES
+124B4	CUNEIFORM SIGN EZEN SHESHIG TIMES SU
+124B5	CUNEIFORM SIGN EZEN TIMES SU
+124B6	CUNEIFORM SIGN GA2 TIMES BAHAR2
+124B7	CUNEIFORM SIGN GA2 TIMES DIM GUNU
+124B8	CUNEIFORM SIGN GA2 TIMES DUG TIMES IGI GUNU
+124B9	CUNEIFORM SIGN GA2 TIMES DUG TIMES KASKAL
+124BA	CUNEIFORM SIGN GA2 TIMES EREN
+124BB	CUNEIFORM SIGN GA2 TIMES GA
+124BC	CUNEIFORM SIGN GA2 TIMES GAR PLUS DI
+124BD	CUNEIFORM SIGN GA2 TIMES GAR PLUS NE
+124BE	CUNEIFORM SIGN GA2 TIMES HA PLUS A
+124BF	CUNEIFORM SIGN GA2 TIMES KUSHU2 PLUS KASKAL
+124C0	CUNEIFORM SIGN GA2 TIMES LAM
+124C1	CUNEIFORM SIGN GA2 TIMES LAM TIMES KUR
+124C2	CUNEIFORM SIGN GA2 TIMES LUH
+124C3	CUNEIFORM SIGN GA2 TIMES MUSH
+124C4	CUNEIFORM SIGN GA2 TIMES NE
+124C5	CUNEIFORM SIGN GA2 TIMES NE PLUS E2
+124C6	CUNEIFORM SIGN GA2 TIMES NE PLUS GI
+124C7	CUNEIFORM SIGN GA2 TIMES SHIM
+124C8	CUNEIFORM SIGN GA2 TIMES ZIZ2
+124C9	CUNEIFORM SIGN GABA ROTATED NINETY DEGREES
+124CA	CUNEIFORM SIGN GESHTIN TIMES U
+124CB	CUNEIFORM SIGN GISH TIMES GISH CROSSING GISH
+124CC	CUNEIFORM SIGN GU2 TIMES IGI GUNU
+124CD	CUNEIFORM SIGN GUD PLUS GISH TIMES TAK4
+124CE	CUNEIFORM SIGN HA TENU GUNU
+124CF	CUNEIFORM SIGN HI TIMES ASH OVER HI TIMES ASH
+124D0	CUNEIFORM SIGN KA TIMES BU
+124D1	CUNEIFORM SIGN KA TIMES KA
+124D2	CUNEIFORM SIGN KA TIMES U U U
+124D3	CUNEIFORM SIGN KA TIMES UR
+124D4	CUNEIFORM SIGN LAGAB TIMES ZU OVER ZU
+124D5	CUNEIFORM SIGN LAK-003
+124D6	CUNEIFORM SIGN LAK-021
+124D7	CUNEIFORM SIGN LAK-025
+124D8	CUNEIFORM SIGN LAK-030
+124D9	CUNEIFORM SIGN LAK-050
+124DA	CUNEIFORM SIGN LAK-051
+124DB	CUNEIFORM SIGN LAK-062
+124DC	CUNEIFORM SIGN LAK-079 OVER LAK-079 GUNU
+124DD	CUNEIFORM SIGN LAK-080
+124DE	CUNEIFORM SIGN LAK-081 OVER LAK-081
+124DF	CUNEIFORM SIGN LAK-092
+124E0	CUNEIFORM SIGN LAK-130
+124E1	CUNEIFORM SIGN LAK-142
+124E2	CUNEIFORM SIGN LAK-210
+124E3	CUNEIFORM SIGN LAK-219
+124E4	CUNEIFORM SIGN LAK-220
+124E5	CUNEIFORM SIGN LAK-225
+124E6	CUNEIFORM SIGN LAK-228
+124E7	CUNEIFORM SIGN LAK-238
+124E8	CUNEIFORM SIGN LAK-265
+124E9	CUNEIFORM SIGN LAK-266
+124EA	CUNEIFORM SIGN LAK-343
+124EB	CUNEIFORM SIGN LAK-347
+124EC	CUNEIFORM SIGN LAK-348
+124ED	CUNEIFORM SIGN LAK-383
+124EE	CUNEIFORM SIGN LAK-384
+124EF	CUNEIFORM SIGN LAK-390
+124F0	CUNEIFORM SIGN LAK-441
+124F1	CUNEIFORM SIGN LAK-449
+124F2	CUNEIFORM SIGN LAK-449 TIMES GU
+124F3	CUNEIFORM SIGN LAK-449 TIMES IGI
+124F4	CUNEIFORM SIGN LAK-449 TIMES PAP PLUS LU3
+124F5	CUNEIFORM SIGN LAK-449 TIMES PAP PLUS PAP PLUS LU3
+124F6	CUNEIFORM SIGN LAK-449 TIMES U2 PLUS BA
+124F7	CUNEIFORM SIGN LAK-450
+124F8	CUNEIFORM SIGN LAK-457
+124F9	CUNEIFORM SIGN LAK-470
+124FA	CUNEIFORM SIGN LAK-483
+124FB	CUNEIFORM SIGN LAK-490
+124FC	CUNEIFORM SIGN LAK-492
+124FD	CUNEIFORM SIGN LAK-493
+124FE	CUNEIFORM SIGN LAK-495
+124FF	CUNEIFORM SIGN LAK-550
+12500	CUNEIFORM SIGN LAK-608
+12501	CUNEIFORM SIGN LAK-617
+12502	CUNEIFORM SIGN LAK-617 TIMES ASH
+12503	CUNEIFORM SIGN LAK-617 TIMES BAD
+12504	CUNEIFORM SIGN LAK-617 TIMES DUN3 GUNU GUNU
+12505	CUNEIFORM SIGN LAK-617 TIMES KU3
+12506	CUNEIFORM SIGN LAK-617 TIMES LA
+12507	CUNEIFORM SIGN LAK-617 TIMES TAR
+12508	CUNEIFORM SIGN LAK-617 TIMES TE
+12509	CUNEIFORM SIGN LAK-617 TIMES U2
+1250A	CUNEIFORM SIGN LAK-617 TIMES UD
+1250B	CUNEIFORM SIGN LAK-617 TIMES URUDA
+1250C	CUNEIFORM SIGN LAK-636
+1250D	CUNEIFORM SIGN LAK-648
+1250E	CUNEIFORM SIGN LAK-648 TIMES DUB
+1250F	CUNEIFORM SIGN LAK-648 TIMES GA
+12510	CUNEIFORM SIGN LAK-648 TIMES IGI
+12511	CUNEIFORM SIGN LAK-648 TIMES IGI GUNU
+12512	CUNEIFORM SIGN LAK-648 TIMES NI
+12513	CUNEIFORM SIGN LAK-648 TIMES PAP PLUS PAP PLUS LU3
+12514	CUNEIFORM SIGN LAK-648 TIMES SHESH PLUS KI
+12515	CUNEIFORM SIGN LAK-648 TIMES UD
+12516	CUNEIFORM SIGN LAK-648 TIMES URUDA
+12517	CUNEIFORM SIGN LAK-724
+12518	CUNEIFORM SIGN LAK-749
+12519	CUNEIFORM SIGN LU2 GUNU TIMES ASH
+1251A	CUNEIFORM SIGN LU2 TIMES DISH
+1251B	CUNEIFORM SIGN LU2 TIMES HAL
+1251C	CUNEIFORM SIGN LU2 TIMES PAP
+1251D	CUNEIFORM SIGN LU2 TIMES PAP PLUS PAP PLUS LU3
+1251E	CUNEIFORM SIGN LU2 TIMES TAK4
+1251F	CUNEIFORM SIGN MI PLUS ZA7
+12520	CUNEIFORM SIGN MUSH OVER MUSH TIMES GA
+12521	CUNEIFORM SIGN MUSH OVER MUSH TIMES KAK
+12522	CUNEIFORM SIGN NINDA2 TIMES DIM GUNU
+12523	CUNEIFORM SIGN NINDA2 TIMES GISH
+12524	CUNEIFORM SIGN NINDA2 TIMES GUL
+12525	CUNEIFORM SIGN NINDA2 TIMES HI
+12526	CUNEIFORM SIGN NINDA2 TIMES KESH2
+12527	CUNEIFORM SIGN NINDA2 TIMES LAK-050
+12528	CUNEIFORM SIGN NINDA2 TIMES MASH
+12529	CUNEIFORM SIGN NINDA2 TIMES PAP PLUS PAP
+1252A	CUNEIFORM SIGN NINDA2 TIMES U
+1252B	CUNEIFORM SIGN NINDA2 TIMES U PLUS U
+1252C	CUNEIFORM SIGN NINDA2 TIMES URUDA
+1252D	CUNEIFORM SIGN SAG GUNU TIMES HA
+1252E	CUNEIFORM SIGN SAG TIMES EN
+1252F	CUNEIFORM SIGN SAG TIMES SHE AT LEFT
+12530	CUNEIFORM SIGN SAG TIMES TAK4
+12531	CUNEIFORM SIGN SHA6 TENU
+12532	CUNEIFORM SIGN SHE OVER SHE
+12533	CUNEIFORM SIGN SHE PLUS HUB2
+12534	CUNEIFORM SIGN SHE PLUS NAM2
+12535	CUNEIFORM SIGN SHE PLUS SAR
+12536	CUNEIFORM SIGN SHU2 PLUS DUG TIMES NI
+12537	CUNEIFORM SIGN SHU2 PLUS E2 TIMES AN
+12538	CUNEIFORM SIGN SI TIMES TAK4
+12539	CUNEIFORM SIGN TAK4 PLUS SAG
+1253A	CUNEIFORM SIGN TUM TIMES GAN2 TENU
+1253B	CUNEIFORM SIGN TUM TIMES THREE DISH
+1253C	CUNEIFORM SIGN UR2 INVERTED
+1253D	CUNEIFORM SIGN UR2 TIMES UD
+1253E	CUNEIFORM SIGN URU TIMES DARA3
+1253F	CUNEIFORM SIGN URU TIMES LAK-668
+12540	CUNEIFORM SIGN URU TIMES LU3
+12541	CUNEIFORM SIGN ZA7
+12542	CUNEIFORM SIGN ZU OVER ZU PLUS SAR
+12543	CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU
 13000	EGYPTIAN HIEROGLYPH A001
 13001	EGYPTIAN HIEROGLYPH A002
 13002	EGYPTIAN HIEROGLYPH A003
@@ -21238,6 +21877,589 @@ return <<'END';
 1342C	EGYPTIAN HIEROGLYPH AA030
 1342D	EGYPTIAN HIEROGLYPH AA031
 1342E	EGYPTIAN HIEROGLYPH AA032
+14400	ANATOLIAN HIEROGLYPH A001
+14401	ANATOLIAN HIEROGLYPH A002
+14402	ANATOLIAN HIEROGLYPH A003
+14403	ANATOLIAN HIEROGLYPH A004
+14404	ANATOLIAN HIEROGLYPH A005
+14405	ANATOLIAN HIEROGLYPH A006
+14406	ANATOLIAN HIEROGLYPH A007
+14407	ANATOLIAN HIEROGLYPH A008
+14408	ANATOLIAN HIEROGLYPH A009
+14409	ANATOLIAN HIEROGLYPH A010
+1440A	ANATOLIAN HIEROGLYPH A010A
+1440B	ANATOLIAN HIEROGLYPH A011
+1440C	ANATOLIAN HIEROGLYPH A012
+1440D	ANATOLIAN HIEROGLYPH A013
+1440E	ANATOLIAN HIEROGLYPH A014
+1440F	ANATOLIAN HIEROGLYPH A015
+14410	ANATOLIAN HIEROGLYPH A016
+14411	ANATOLIAN HIEROGLYPH A017
+14412	ANATOLIAN HIEROGLYPH A018
+14413	ANATOLIAN HIEROGLYPH A019
+14414	ANATOLIAN HIEROGLYPH A020
+14415	ANATOLIAN HIEROGLYPH A021
+14416	ANATOLIAN HIEROGLYPH A022
+14417	ANATOLIAN HIEROGLYPH A023
+14418	ANATOLIAN HIEROGLYPH A024
+14419	ANATOLIAN HIEROGLYPH A025
+1441A	ANATOLIAN HIEROGLYPH A026
+1441B	ANATOLIAN HIEROGLYPH A026A
+1441C	ANATOLIAN HIEROGLYPH A027
+1441D	ANATOLIAN HIEROGLYPH A028
+1441E	ANATOLIAN HIEROGLYPH A029
+1441F	ANATOLIAN HIEROGLYPH A030
+14420	ANATOLIAN HIEROGLYPH A031
+14421	ANATOLIAN HIEROGLYPH A032
+14422	ANATOLIAN HIEROGLYPH A033
+14423	ANATOLIAN HIEROGLYPH A034
+14424	ANATOLIAN HIEROGLYPH A035
+14425	ANATOLIAN HIEROGLYPH A036
+14426	ANATOLIAN HIEROGLYPH A037
+14427	ANATOLIAN HIEROGLYPH A038
+14428	ANATOLIAN HIEROGLYPH A039
+14429	ANATOLIAN HIEROGLYPH A039A
+1442A	ANATOLIAN HIEROGLYPH A040
+1442B	ANATOLIAN HIEROGLYPH A041
+1442C	ANATOLIAN HIEROGLYPH A041A
+1442D	ANATOLIAN HIEROGLYPH A042
+1442E	ANATOLIAN HIEROGLYPH A043
+1442F	ANATOLIAN HIEROGLYPH A044
+14430	ANATOLIAN HIEROGLYPH A045
+14431	ANATOLIAN HIEROGLYPH A045A
+14432	ANATOLIAN HIEROGLYPH A046
+14433	ANATOLIAN HIEROGLYPH A046A
+14434	ANATOLIAN HIEROGLYPH A046B
+14435	ANATOLIAN HIEROGLYPH A047
+14436	ANATOLIAN HIEROGLYPH A048
+14437	ANATOLIAN HIEROGLYPH A049
+14438	ANATOLIAN HIEROGLYPH A050
+14439	ANATOLIAN HIEROGLYPH A051
+1443A	ANATOLIAN HIEROGLYPH A052
+1443B	ANATOLIAN HIEROGLYPH A053
+1443C	ANATOLIAN HIEROGLYPH A054
+1443D	ANATOLIAN HIEROGLYPH A055
+1443E	ANATOLIAN HIEROGLYPH A056
+1443F	ANATOLIAN HIEROGLYPH A057
+14440	ANATOLIAN HIEROGLYPH A058
+14441	ANATOLIAN HIEROGLYPH A059
+14442	ANATOLIAN HIEROGLYPH A060
+14443	ANATOLIAN HIEROGLYPH A061
+14444	ANATOLIAN HIEROGLYPH A062
+14445	ANATOLIAN HIEROGLYPH A063
+14446	ANATOLIAN HIEROGLYPH A064
+14447	ANATOLIAN HIEROGLYPH A065
+14448	ANATOLIAN HIEROGLYPH A066
+14449	ANATOLIAN HIEROGLYPH A066A
+1444A	ANATOLIAN HIEROGLYPH A066B
+1444B	ANATOLIAN HIEROGLYPH A066C
+1444C	ANATOLIAN HIEROGLYPH A067
+1444D	ANATOLIAN HIEROGLYPH A068
+1444E	ANATOLIAN HIEROGLYPH A069
+1444F	ANATOLIAN HIEROGLYPH A070
+14450	ANATOLIAN HIEROGLYPH A071
+14451	ANATOLIAN HIEROGLYPH A072
+14452	ANATOLIAN HIEROGLYPH A073
+14453	ANATOLIAN HIEROGLYPH A074
+14454	ANATOLIAN HIEROGLYPH A075
+14455	ANATOLIAN HIEROGLYPH A076
+14456	ANATOLIAN HIEROGLYPH A077
+14457	ANATOLIAN HIEROGLYPH A078
+14458	ANATOLIAN HIEROGLYPH A079
+14459	ANATOLIAN HIEROGLYPH A080
+1445A	ANATOLIAN HIEROGLYPH A081
+1445B	ANATOLIAN HIEROGLYPH A082
+1445C	ANATOLIAN HIEROGLYPH A083
+1445D	ANATOLIAN HIEROGLYPH A084
+1445E	ANATOLIAN HIEROGLYPH A085
+1445F	ANATOLIAN HIEROGLYPH A086
+14460	ANATOLIAN HIEROGLYPH A087
+14461	ANATOLIAN HIEROGLYPH A088
+14462	ANATOLIAN HIEROGLYPH A089
+14463	ANATOLIAN HIEROGLYPH A090
+14464	ANATOLIAN HIEROGLYPH A091
+14465	ANATOLIAN HIEROGLYPH A092
+14466	ANATOLIAN HIEROGLYPH A093
+14467	ANATOLIAN HIEROGLYPH A094
+14468	ANATOLIAN HIEROGLYPH A095
+14469	ANATOLIAN HIEROGLYPH A096
+1446A	ANATOLIAN HIEROGLYPH A097
+1446B	ANATOLIAN HIEROGLYPH A097A
+1446C	ANATOLIAN HIEROGLYPH A098
+1446D	ANATOLIAN HIEROGLYPH A098A
+1446E	ANATOLIAN HIEROGLYPH A099
+1446F	ANATOLIAN HIEROGLYPH A100
+14470	ANATOLIAN HIEROGLYPH A100A
+14471	ANATOLIAN HIEROGLYPH A101
+14472	ANATOLIAN HIEROGLYPH A101A
+14473	ANATOLIAN HIEROGLYPH A102
+14474	ANATOLIAN HIEROGLYPH A102A
+14475	ANATOLIAN HIEROGLYPH A103
+14476	ANATOLIAN HIEROGLYPH A104
+14477	ANATOLIAN HIEROGLYPH A104A
+14478	ANATOLIAN HIEROGLYPH A104B
+14479	ANATOLIAN HIEROGLYPH A104C
+1447A	ANATOLIAN HIEROGLYPH A105
+1447B	ANATOLIAN HIEROGLYPH A105A
+1447C	ANATOLIAN HIEROGLYPH A105B
+1447D	ANATOLIAN HIEROGLYPH A106
+1447E	ANATOLIAN HIEROGLYPH A107
+1447F	ANATOLIAN HIEROGLYPH A107A
+14480	ANATOLIAN HIEROGLYPH A107B
+14481	ANATOLIAN HIEROGLYPH A107C
+14482	ANATOLIAN HIEROGLYPH A108
+14483	ANATOLIAN HIEROGLYPH A109
+14484	ANATOLIAN HIEROGLYPH A110
+14485	ANATOLIAN HIEROGLYPH A110A
+14486	ANATOLIAN HIEROGLYPH A110B
+14487	ANATOLIAN HIEROGLYPH A111
+14488	ANATOLIAN HIEROGLYPH A112
+14489	ANATOLIAN HIEROGLYPH A113
+1448A	ANATOLIAN HIEROGLYPH A114
+1448B	ANATOLIAN HIEROGLYPH A115
+1448C	ANATOLIAN HIEROGLYPH A115A
+1448D	ANATOLIAN HIEROGLYPH A116
+1448E	ANATOLIAN HIEROGLYPH A117
+1448F	ANATOLIAN HIEROGLYPH A118
+14490	ANATOLIAN HIEROGLYPH A119
+14491	ANATOLIAN HIEROGLYPH A120
+14492	ANATOLIAN HIEROGLYPH A121
+14493	ANATOLIAN HIEROGLYPH A122
+14494	ANATOLIAN HIEROGLYPH A123
+14495	ANATOLIAN HIEROGLYPH A124
+14496	ANATOLIAN HIEROGLYPH A125
+14497	ANATOLIAN HIEROGLYPH A125A
+14498	ANATOLIAN HIEROGLYPH A126
+14499	ANATOLIAN HIEROGLYPH A127
+1449A	ANATOLIAN HIEROGLYPH A128
+1449B	ANATOLIAN HIEROGLYPH A129
+1449C	ANATOLIAN HIEROGLYPH A130
+1449D	ANATOLIAN HIEROGLYPH A131
+1449E	ANATOLIAN HIEROGLYPH A132
+1449F	ANATOLIAN HIEROGLYPH A133
+144A0	ANATOLIAN HIEROGLYPH A134
+144A1	ANATOLIAN HIEROGLYPH A135
+144A2	ANATOLIAN HIEROGLYPH A135A
+144A3	ANATOLIAN HIEROGLYPH A136
+144A4	ANATOLIAN HIEROGLYPH A137
+144A5	ANATOLIAN HIEROGLYPH A138
+144A6	ANATOLIAN HIEROGLYPH A139
+144A7	ANATOLIAN HIEROGLYPH A140
+144A8	ANATOLIAN HIEROGLYPH A141
+144A9	ANATOLIAN HIEROGLYPH A142
+144AA	ANATOLIAN HIEROGLYPH A143
+144AB	ANATOLIAN HIEROGLYPH A144
+144AC	ANATOLIAN HIEROGLYPH A145
+144AD	ANATOLIAN HIEROGLYPH A146
+144AE	ANATOLIAN HIEROGLYPH A147
+144AF	ANATOLIAN HIEROGLYPH A148
+144B0	ANATOLIAN HIEROGLYPH A149
+144B1	ANATOLIAN HIEROGLYPH A150
+144B2	ANATOLIAN HIEROGLYPH A151
+144B3	ANATOLIAN HIEROGLYPH A152
+144B4	ANATOLIAN HIEROGLYPH A153
+144B5	ANATOLIAN HIEROGLYPH A154
+144B6	ANATOLIAN HIEROGLYPH A155
+144B7	ANATOLIAN HIEROGLYPH A156
+144B8	ANATOLIAN HIEROGLYPH A157
+144B9	ANATOLIAN HIEROGLYPH A158
+144BA	ANATOLIAN HIEROGLYPH A159
+144BB	ANATOLIAN HIEROGLYPH A160
+144BC	ANATOLIAN HIEROGLYPH A161
+144BD	ANATOLIAN HIEROGLYPH A162
+144BE	ANATOLIAN HIEROGLYPH A163
+144BF	ANATOLIAN HIEROGLYPH A164
+144C0	ANATOLIAN HIEROGLYPH A165
+144C1	ANATOLIAN HIEROGLYPH A166
+144C2	ANATOLIAN HIEROGLYPH A167
+144C3	ANATOLIAN HIEROGLYPH A168
+144C4	ANATOLIAN HIEROGLYPH A169
+144C5	ANATOLIAN HIEROGLYPH A170
+144C6	ANATOLIAN HIEROGLYPH A171
+144C7	ANATOLIAN HIEROGLYPH A172
+144C8	ANATOLIAN HIEROGLYPH A173
+144C9	ANATOLIAN HIEROGLYPH A174
+144CA	ANATOLIAN HIEROGLYPH A175
+144CB	ANATOLIAN HIEROGLYPH A176
+144CC	ANATOLIAN HIEROGLYPH A177
+144CD	ANATOLIAN HIEROGLYPH A178
+144CE	ANATOLIAN HIEROGLYPH A179
+144CF	ANATOLIAN HIEROGLYPH A180
+144D0	ANATOLIAN HIEROGLYPH A181
+144D1	ANATOLIAN HIEROGLYPH A182
+144D2	ANATOLIAN HIEROGLYPH A183
+144D3	ANATOLIAN HIEROGLYPH A184
+144D4	ANATOLIAN HIEROGLYPH A185
+144D5	ANATOLIAN HIEROGLYPH A186
+144D6	ANATOLIAN HIEROGLYPH A187
+144D7	ANATOLIAN HIEROGLYPH A188
+144D8	ANATOLIAN HIEROGLYPH A189
+144D9	ANATOLIAN HIEROGLYPH A190
+144DA	ANATOLIAN HIEROGLYPH A191
+144DB	ANATOLIAN HIEROGLYPH A192
+144DC	ANATOLIAN HIEROGLYPH A193
+144DD	ANATOLIAN HIEROGLYPH A194
+144DE	ANATOLIAN HIEROGLYPH A195
+144DF	ANATOLIAN HIEROGLYPH A196
+144E0	ANATOLIAN HIEROGLYPH A197
+144E1	ANATOLIAN HIEROGLYPH A198
+144E2	ANATOLIAN HIEROGLYPH A199
+144E3	ANATOLIAN HIEROGLYPH A200
+144E4	ANATOLIAN HIEROGLYPH A201
+144E5	ANATOLIAN HIEROGLYPH A202
+144E6	ANATOLIAN HIEROGLYPH A202A
+144E7	ANATOLIAN HIEROGLYPH A202B
+144E8	ANATOLIAN HIEROGLYPH A203
+144E9	ANATOLIAN HIEROGLYPH A204
+144EA	ANATOLIAN HIEROGLYPH A205
+144EB	ANATOLIAN HIEROGLYPH A206
+144EC	ANATOLIAN HIEROGLYPH A207
+144ED	ANATOLIAN HIEROGLYPH A207A
+144EE	ANATOLIAN HIEROGLYPH A208
+144EF	ANATOLIAN HIEROGLYPH A209
+144F0	ANATOLIAN HIEROGLYPH A209A
+144F1	ANATOLIAN HIEROGLYPH A210
+144F2	ANATOLIAN HIEROGLYPH A211
+144F3	ANATOLIAN HIEROGLYPH A212
+144F4	ANATOLIAN HIEROGLYPH A213
+144F5	ANATOLIAN HIEROGLYPH A214
+144F6	ANATOLIAN HIEROGLYPH A215
+144F7	ANATOLIAN HIEROGLYPH A215A
+144F8	ANATOLIAN HIEROGLYPH A216
+144F9	ANATOLIAN HIEROGLYPH A216A
+144FA	ANATOLIAN HIEROGLYPH A217
+144FB	ANATOLIAN HIEROGLYPH A218
+144FC	ANATOLIAN HIEROGLYPH A219
+144FD	ANATOLIAN HIEROGLYPH A220
+144FE	ANATOLIAN HIEROGLYPH A221
+144FF	ANATOLIAN HIEROGLYPH A222
+14500	ANATOLIAN HIEROGLYPH A223
+14501	ANATOLIAN HIEROGLYPH A224
+14502	ANATOLIAN HIEROGLYPH A225
+14503	ANATOLIAN HIEROGLYPH A226
+14504	ANATOLIAN HIEROGLYPH A227
+14505	ANATOLIAN HIEROGLYPH A227A
+14506	ANATOLIAN HIEROGLYPH A228
+14507	ANATOLIAN HIEROGLYPH A229
+14508	ANATOLIAN HIEROGLYPH A230
+14509	ANATOLIAN HIEROGLYPH A231
+1450A	ANATOLIAN HIEROGLYPH A232
+1450B	ANATOLIAN HIEROGLYPH A233
+1450C	ANATOLIAN HIEROGLYPH A234
+1450D	ANATOLIAN HIEROGLYPH A235
+1450E	ANATOLIAN HIEROGLYPH A236
+1450F	ANATOLIAN HIEROGLYPH A237
+14510	ANATOLIAN HIEROGLYPH A238
+14511	ANATOLIAN HIEROGLYPH A239
+14512	ANATOLIAN HIEROGLYPH A240
+14513	ANATOLIAN HIEROGLYPH A241
+14514	ANATOLIAN HIEROGLYPH A242
+14515	ANATOLIAN HIEROGLYPH A243
+14516	ANATOLIAN HIEROGLYPH A244
+14517	ANATOLIAN HIEROGLYPH A245
+14518	ANATOLIAN HIEROGLYPH A246
+14519	ANATOLIAN HIEROGLYPH A247
+1451A	ANATOLIAN HIEROGLYPH A248
+1451B	ANATOLIAN HIEROGLYPH A249
+1451C	ANATOLIAN HIEROGLYPH A250
+1451D	ANATOLIAN HIEROGLYPH A251
+1451E	ANATOLIAN HIEROGLYPH A252
+1451F	ANATOLIAN HIEROGLYPH A253
+14520	ANATOLIAN HIEROGLYPH A254
+14521	ANATOLIAN HIEROGLYPH A255
+14522	ANATOLIAN HIEROGLYPH A256
+14523	ANATOLIAN HIEROGLYPH A257
+14524	ANATOLIAN HIEROGLYPH A258
+14525	ANATOLIAN HIEROGLYPH A259
+14526	ANATOLIAN HIEROGLYPH A260
+14527	ANATOLIAN HIEROGLYPH A261
+14528	ANATOLIAN HIEROGLYPH A262
+14529	ANATOLIAN HIEROGLYPH A263
+1452A	ANATOLIAN HIEROGLYPH A264
+1452B	ANATOLIAN HIEROGLYPH A265
+1452C	ANATOLIAN HIEROGLYPH A266
+1452D	ANATOLIAN HIEROGLYPH A267
+1452E	ANATOLIAN HIEROGLYPH A267A
+1452F	ANATOLIAN HIEROGLYPH A268
+14530	ANATOLIAN HIEROGLYPH A269
+14531	ANATOLIAN HIEROGLYPH A270
+14532	ANATOLIAN HIEROGLYPH A271
+14533	ANATOLIAN HIEROGLYPH A272
+14534	ANATOLIAN HIEROGLYPH A273
+14535	ANATOLIAN HIEROGLYPH A274
+14536	ANATOLIAN HIEROGLYPH A275
+14537	ANATOLIAN HIEROGLYPH A276
+14538	ANATOLIAN HIEROGLYPH A277
+14539	ANATOLIAN HIEROGLYPH A278
+1453A	ANATOLIAN HIEROGLYPH A279
+1453B	ANATOLIAN HIEROGLYPH A280
+1453C	ANATOLIAN HIEROGLYPH A281
+1453D	ANATOLIAN HIEROGLYPH A282
+1453E	ANATOLIAN HIEROGLYPH A283
+1453F	ANATOLIAN HIEROGLYPH A284
+14540	ANATOLIAN HIEROGLYPH A285
+14541	ANATOLIAN HIEROGLYPH A286
+14542	ANATOLIAN HIEROGLYPH A287
+14543	ANATOLIAN HIEROGLYPH A288
+14544	ANATOLIAN HIEROGLYPH A289
+14545	ANATOLIAN HIEROGLYPH A289A
+14546	ANATOLIAN HIEROGLYPH A290
+14547	ANATOLIAN HIEROGLYPH A291
+14548	ANATOLIAN HIEROGLYPH A292
+14549	ANATOLIAN HIEROGLYPH A293
+1454A	ANATOLIAN HIEROGLYPH A294
+1454B	ANATOLIAN HIEROGLYPH A294A
+1454C	ANATOLIAN HIEROGLYPH A295
+1454D	ANATOLIAN HIEROGLYPH A296
+1454E	ANATOLIAN HIEROGLYPH A297
+1454F	ANATOLIAN HIEROGLYPH A298
+14550	ANATOLIAN HIEROGLYPH A299
+14551	ANATOLIAN HIEROGLYPH A299A
+14552	ANATOLIAN HIEROGLYPH A300
+14553	ANATOLIAN HIEROGLYPH A301
+14554	ANATOLIAN HIEROGLYPH A302
+14555	ANATOLIAN HIEROGLYPH A303
+14556	ANATOLIAN HIEROGLYPH A304
+14557	ANATOLIAN HIEROGLYPH A305
+14558	ANATOLIAN HIEROGLYPH A306
+14559	ANATOLIAN HIEROGLYPH A307
+1455A	ANATOLIAN HIEROGLYPH A308
+1455B	ANATOLIAN HIEROGLYPH A309
+1455C	ANATOLIAN HIEROGLYPH A309A
+1455D	ANATOLIAN HIEROGLYPH A310
+1455E	ANATOLIAN HIEROGLYPH A311
+1455F	ANATOLIAN HIEROGLYPH A312
+14560	ANATOLIAN HIEROGLYPH A313
+14561	ANATOLIAN HIEROGLYPH A314
+14562	ANATOLIAN HIEROGLYPH A315
+14563	ANATOLIAN HIEROGLYPH A316
+14564	ANATOLIAN HIEROGLYPH A317
+14565	ANATOLIAN HIEROGLYPH A318
+14566	ANATOLIAN HIEROGLYPH A319
+14567	ANATOLIAN HIEROGLYPH A320
+14568	ANATOLIAN HIEROGLYPH A321
+14569	ANATOLIAN HIEROGLYPH A322
+1456A	ANATOLIAN HIEROGLYPH A323
+1456B	ANATOLIAN HIEROGLYPH A324
+1456C	ANATOLIAN HIEROGLYPH A325
+1456D	ANATOLIAN HIEROGLYPH A326
+1456E	ANATOLIAN HIEROGLYPH A327
+1456F	ANATOLIAN HIEROGLYPH A328
+14570	ANATOLIAN HIEROGLYPH A329
+14571	ANATOLIAN HIEROGLYPH A329A
+14572	ANATOLIAN HIEROGLYPH A330
+14573	ANATOLIAN HIEROGLYPH A331
+14574	ANATOLIAN HIEROGLYPH A332A
+14575	ANATOLIAN HIEROGLYPH A332B
+14576	ANATOLIAN HIEROGLYPH A332C
+14577	ANATOLIAN HIEROGLYPH A333
+14578	ANATOLIAN HIEROGLYPH A334
+14579	ANATOLIAN HIEROGLYPH A335
+1457A	ANATOLIAN HIEROGLYPH A336
+1457B	ANATOLIAN HIEROGLYPH A336A
+1457C	ANATOLIAN HIEROGLYPH A336B
+1457D	ANATOLIAN HIEROGLYPH A336C
+1457E	ANATOLIAN HIEROGLYPH A337
+1457F	ANATOLIAN HIEROGLYPH A338
+14580	ANATOLIAN HIEROGLYPH A339
+14581	ANATOLIAN HIEROGLYPH A340
+14582	ANATOLIAN HIEROGLYPH A341
+14583	ANATOLIAN HIEROGLYPH A342
+14584	ANATOLIAN HIEROGLYPH A343
+14585	ANATOLIAN HIEROGLYPH A344
+14586	ANATOLIAN HIEROGLYPH A345
+14587	ANATOLIAN HIEROGLYPH A346
+14588	ANATOLIAN HIEROGLYPH A347
+14589	ANATOLIAN HIEROGLYPH A348
+1458A	ANATOLIAN HIEROGLYPH A349
+1458B	ANATOLIAN HIEROGLYPH A350
+1458C	ANATOLIAN HIEROGLYPH A351
+1458D	ANATOLIAN HIEROGLYPH A352
+1458E	ANATOLIAN HIEROGLYPH A353
+1458F	ANATOLIAN HIEROGLYPH A354
+14590	ANATOLIAN HIEROGLYPH A355
+14591	ANATOLIAN HIEROGLYPH A356
+14592	ANATOLIAN HIEROGLYPH A357
+14593	ANATOLIAN HIEROGLYPH A358
+14594	ANATOLIAN HIEROGLYPH A359
+14595	ANATOLIAN HIEROGLYPH A359A
+14596	ANATOLIAN HIEROGLYPH A360
+14597	ANATOLIAN HIEROGLYPH A361
+14598	ANATOLIAN HIEROGLYPH A362
+14599	ANATOLIAN HIEROGLYPH A363
+1459A	ANATOLIAN HIEROGLYPH A364
+1459B	ANATOLIAN HIEROGLYPH A364A
+1459C	ANATOLIAN HIEROGLYPH A365
+1459D	ANATOLIAN HIEROGLYPH A366
+1459E	ANATOLIAN HIEROGLYPH A367
+1459F	ANATOLIAN HIEROGLYPH A368
+145A0	ANATOLIAN HIEROGLYPH A368A
+145A1	ANATOLIAN HIEROGLYPH A369
+145A2	ANATOLIAN HIEROGLYPH A370
+145A3	ANATOLIAN HIEROGLYPH A371
+145A4	ANATOLIAN HIEROGLYPH A371A
+145A5	ANATOLIAN HIEROGLYPH A372
+145A6	ANATOLIAN HIEROGLYPH A373
+145A7	ANATOLIAN HIEROGLYPH A374
+145A8	ANATOLIAN HIEROGLYPH A375
+145A9	ANATOLIAN HIEROGLYPH A376
+145AA	ANATOLIAN HIEROGLYPH A377
+145AB	ANATOLIAN HIEROGLYPH A378
+145AC	ANATOLIAN HIEROGLYPH A379
+145AD	ANATOLIAN HIEROGLYPH A380
+145AE	ANATOLIAN HIEROGLYPH A381
+145AF	ANATOLIAN HIEROGLYPH A381A
+145B0	ANATOLIAN HIEROGLYPH A382
+145B1	ANATOLIAN HIEROGLYPH A383 RA OR RI
+145B2	ANATOLIAN HIEROGLYPH A383A
+145B3	ANATOLIAN HIEROGLYPH A384
+145B4	ANATOLIAN HIEROGLYPH A385
+145B5	ANATOLIAN HIEROGLYPH A386
+145B6	ANATOLIAN HIEROGLYPH A386A
+145B7	ANATOLIAN HIEROGLYPH A387
+145B8	ANATOLIAN HIEROGLYPH A388
+145B9	ANATOLIAN HIEROGLYPH A389
+145BA	ANATOLIAN HIEROGLYPH A390
+145BB	ANATOLIAN HIEROGLYPH A391
+145BC	ANATOLIAN HIEROGLYPH A392
+145BD	ANATOLIAN HIEROGLYPH A393 EIGHT
+145BE	ANATOLIAN HIEROGLYPH A394
+145BF	ANATOLIAN HIEROGLYPH A395
+145C0	ANATOLIAN HIEROGLYPH A396
+145C1	ANATOLIAN HIEROGLYPH A397
+145C2	ANATOLIAN HIEROGLYPH A398
+145C3	ANATOLIAN HIEROGLYPH A399
+145C4	ANATOLIAN HIEROGLYPH A400
+145C5	ANATOLIAN HIEROGLYPH A401
+145C6	ANATOLIAN HIEROGLYPH A402
+145C7	ANATOLIAN HIEROGLYPH A403
+145C8	ANATOLIAN HIEROGLYPH A404
+145C9	ANATOLIAN HIEROGLYPH A405
+145CA	ANATOLIAN HIEROGLYPH A406
+145CB	ANATOLIAN HIEROGLYPH A407
+145CC	ANATOLIAN HIEROGLYPH A408
+145CD	ANATOLIAN HIEROGLYPH A409
+145CE	ANATOLIAN HIEROGLYPH A410 BEGIN LOGOGRAM MARK
+145CF	ANATOLIAN HIEROGLYPH A410A END LOGOGRAM MARK
+145D0	ANATOLIAN HIEROGLYPH A411
+145D1	ANATOLIAN HIEROGLYPH A412
+145D2	ANATOLIAN HIEROGLYPH A413
+145D3	ANATOLIAN HIEROGLYPH A414
+145D4	ANATOLIAN HIEROGLYPH A415
+145D5	ANATOLIAN HIEROGLYPH A416
+145D6	ANATOLIAN HIEROGLYPH A417
+145D7	ANATOLIAN HIEROGLYPH A418
+145D8	ANATOLIAN HIEROGLYPH A419
+145D9	ANATOLIAN HIEROGLYPH A420
+145DA	ANATOLIAN HIEROGLYPH A421
+145DB	ANATOLIAN HIEROGLYPH A422
+145DC	ANATOLIAN HIEROGLYPH A423
+145DD	ANATOLIAN HIEROGLYPH A424
+145DE	ANATOLIAN HIEROGLYPH A425
+145DF	ANATOLIAN HIEROGLYPH A426
+145E0	ANATOLIAN HIEROGLYPH A427
+145E1	ANATOLIAN HIEROGLYPH A428
+145E2	ANATOLIAN HIEROGLYPH A429
+145E3	ANATOLIAN HIEROGLYPH A430
+145E4	ANATOLIAN HIEROGLYPH A431
+145E5	ANATOLIAN HIEROGLYPH A432
+145E6	ANATOLIAN HIEROGLYPH A433
+145E7	ANATOLIAN HIEROGLYPH A434
+145E8	ANATOLIAN HIEROGLYPH A435
+145E9	ANATOLIAN HIEROGLYPH A436
+145EA	ANATOLIAN HIEROGLYPH A437
+145EB	ANATOLIAN HIEROGLYPH A438
+145EC	ANATOLIAN HIEROGLYPH A439
+145ED	ANATOLIAN HIEROGLYPH A440
+145EE	ANATOLIAN HIEROGLYPH A441
+145EF	ANATOLIAN HIEROGLYPH A442
+145F0	ANATOLIAN HIEROGLYPH A443
+145F1	ANATOLIAN HIEROGLYPH A444
+145F2	ANATOLIAN HIEROGLYPH A445
+145F3	ANATOLIAN HIEROGLYPH A446
+145F4	ANATOLIAN HIEROGLYPH A447
+145F5	ANATOLIAN HIEROGLYPH A448
+145F6	ANATOLIAN HIEROGLYPH A449
+145F7	ANATOLIAN HIEROGLYPH A450
+145F8	ANATOLIAN HIEROGLYPH A450A
+145F9	ANATOLIAN HIEROGLYPH A451
+145FA	ANATOLIAN HIEROGLYPH A452
+145FB	ANATOLIAN HIEROGLYPH A453
+145FC	ANATOLIAN HIEROGLYPH A454
+145FD	ANATOLIAN HIEROGLYPH A455
+145FE	ANATOLIAN HIEROGLYPH A456
+145FF	ANATOLIAN HIEROGLYPH A457
+14600	ANATOLIAN HIEROGLYPH A457A
+14601	ANATOLIAN HIEROGLYPH A458
+14602	ANATOLIAN HIEROGLYPH A459
+14603	ANATOLIAN HIEROGLYPH A460
+14604	ANATOLIAN HIEROGLYPH A461
+14605	ANATOLIAN HIEROGLYPH A462
+14606	ANATOLIAN HIEROGLYPH A463
+14607	ANATOLIAN HIEROGLYPH A464
+14608	ANATOLIAN HIEROGLYPH A465
+14609	ANATOLIAN HIEROGLYPH A466
+1460A	ANATOLIAN HIEROGLYPH A467
+1460B	ANATOLIAN HIEROGLYPH A468
+1460C	ANATOLIAN HIEROGLYPH A469
+1460D	ANATOLIAN HIEROGLYPH A470
+1460E	ANATOLIAN HIEROGLYPH A471
+1460F	ANATOLIAN HIEROGLYPH A472
+14610	ANATOLIAN HIEROGLYPH A473
+14611	ANATOLIAN HIEROGLYPH A474
+14612	ANATOLIAN HIEROGLYPH A475
+14613	ANATOLIAN HIEROGLYPH A476
+14614	ANATOLIAN HIEROGLYPH A477
+14615	ANATOLIAN HIEROGLYPH A478
+14616	ANATOLIAN HIEROGLYPH A479
+14617	ANATOLIAN HIEROGLYPH A480
+14618	ANATOLIAN HIEROGLYPH A481
+14619	ANATOLIAN HIEROGLYPH A482
+1461A	ANATOLIAN HIEROGLYPH A483
+1461B	ANATOLIAN HIEROGLYPH A484
+1461C	ANATOLIAN HIEROGLYPH A485
+1461D	ANATOLIAN HIEROGLYPH A486
+1461E	ANATOLIAN HIEROGLYPH A487
+1461F	ANATOLIAN HIEROGLYPH A488
+14620	ANATOLIAN HIEROGLYPH A489
+14621	ANATOLIAN HIEROGLYPH A490
+14622	ANATOLIAN HIEROGLYPH A491
+14623	ANATOLIAN HIEROGLYPH A492
+14624	ANATOLIAN HIEROGLYPH A493
+14625	ANATOLIAN HIEROGLYPH A494
+14626	ANATOLIAN HIEROGLYPH A495
+14627	ANATOLIAN HIEROGLYPH A496
+14628	ANATOLIAN HIEROGLYPH A497
+14629	ANATOLIAN HIEROGLYPH A501
+1462A	ANATOLIAN HIEROGLYPH A502
+1462B	ANATOLIAN HIEROGLYPH A503
+1462C	ANATOLIAN HIEROGLYPH A504
+1462D	ANATOLIAN HIEROGLYPH A505
+1462E	ANATOLIAN HIEROGLYPH A506
+1462F	ANATOLIAN HIEROGLYPH A507
+14630	ANATOLIAN HIEROGLYPH A508
+14631	ANATOLIAN HIEROGLYPH A509
+14632	ANATOLIAN HIEROGLYPH A510
+14633	ANATOLIAN HIEROGLYPH A511
+14634	ANATOLIAN HIEROGLYPH A512
+14635	ANATOLIAN HIEROGLYPH A513
+14636	ANATOLIAN HIEROGLYPH A514
+14637	ANATOLIAN HIEROGLYPH A515
+14638	ANATOLIAN HIEROGLYPH A516
+14639	ANATOLIAN HIEROGLYPH A517
+1463A	ANATOLIAN HIEROGLYPH A518
+1463B	ANATOLIAN HIEROGLYPH A519
+1463C	ANATOLIAN HIEROGLYPH A520
+1463D	ANATOLIAN HIEROGLYPH A521
+1463E	ANATOLIAN HIEROGLYPH A522
+1463F	ANATOLIAN HIEROGLYPH A523
+14640	ANATOLIAN HIEROGLYPH A524
+14641	ANATOLIAN HIEROGLYPH A525
+14642	ANATOLIAN HIEROGLYPH A526
+14643	ANATOLIAN HIEROGLYPH A527
+14644	ANATOLIAN HIEROGLYPH A528
+14645	ANATOLIAN HIEROGLYPH A529
+14646	ANATOLIAN HIEROGLYPH A530
 16800	BAMUM LETTER PHASE-A NGKUE MFON
 16801	BAMUM LETTER PHASE-A GBIEE FON
 16802	BAMUM LETTER PHASE-A PON MFON PIPAEMGBIEE
@@ -22762,6 +23984,17 @@ return <<'END';
 1D1DB	MUSICAL SYMBOL SCANDICUS FLEXUS
 1D1DC	MUSICAL SYMBOL TORCULUS RESUPINUS
 1D1DD	MUSICAL SYMBOL PES SUBPUNCTIS
+1D1DE	MUSICAL SYMBOL KIEVAN C CLEF
+1D1DF	MUSICAL SYMBOL KIEVAN END OF PIECE
+1D1E0	MUSICAL SYMBOL KIEVAN FINAL NOTE
+1D1E1	MUSICAL SYMBOL KIEVAN RECITATIVE MARK
+1D1E2	MUSICAL SYMBOL KIEVAN WHOLE NOTE
+1D1E3	MUSICAL SYMBOL KIEVAN HALF NOTE
+1D1E4	MUSICAL SYMBOL KIEVAN QUARTER NOTE STEM DOWN
+1D1E5	MUSICAL SYMBOL KIEVAN QUARTER NOTE STEM UP
+1D1E6	MUSICAL SYMBOL KIEVAN EIGHTH NOTE STEM DOWN
+1D1E7	MUSICAL SYMBOL KIEVAN EIGHTH NOTE STEM UP
+1D1E8	MUSICAL SYMBOL KIEVAN FLAT SIGN
 1D200	GREEK VOCAL NOTATION SYMBOL-1
 1D201	GREEK VOCAL NOTATION SYMBOL-2
 1D202	GREEK VOCAL NOTATION SYMBOL-3
@@ -23933,6 +25166,678 @@ return <<'END';
 1D7FD	MATHEMATICAL MONOSPACE DIGIT SEVEN
 1D7FE	MATHEMATICAL MONOSPACE DIGIT EIGHT
 1D7FF	MATHEMATICAL MONOSPACE DIGIT NINE
+1D800	SIGNWRITING HAND-FIST INDEX
+1D801	SIGNWRITING HAND-CIRCLE INDEX
+1D802	SIGNWRITING HAND-CUP INDEX
+1D803	SIGNWRITING HAND-OVAL INDEX
+1D804	SIGNWRITING HAND-HINGE INDEX
+1D805	SIGNWRITING HAND-ANGLE INDEX
+1D806	SIGNWRITING HAND-FIST INDEX BENT
+1D807	SIGNWRITING HAND-CIRCLE INDEX BENT
+1D808	SIGNWRITING HAND-FIST THUMB UNDER INDEX BENT
+1D809	SIGNWRITING HAND-FIST INDEX RAISED KNUCKLE
+1D80A	SIGNWRITING HAND-FIST INDEX CUPPED
+1D80B	SIGNWRITING HAND-FIST INDEX HINGED
+1D80C	SIGNWRITING HAND-FIST INDEX HINGED LOW
+1D80D	SIGNWRITING HAND-CIRCLE INDEX HINGE
+1D80E	SIGNWRITING HAND-FIST INDEX MIDDLE
+1D80F	SIGNWRITING HAND-CIRCLE INDEX MIDDLE
+1D810	SIGNWRITING HAND-FIST INDEX MIDDLE BENT
+1D811	SIGNWRITING HAND-FIST INDEX MIDDLE RAISED KNUCKLES
+1D812	SIGNWRITING HAND-FIST INDEX MIDDLE HINGED
+1D813	SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED
+1D814	SIGNWRITING HAND-FIST INDEX HINGED MIDDLE UP
+1D815	SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED
+1D816	SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED INDEX BENT
+1D817	SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED MIDDLE BENT
+1D818	SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED CUPPED
+1D819	SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED HINGED
+1D81A	SIGNWRITING HAND-FIST INDEX MIDDLE CROSSED
+1D81B	SIGNWRITING HAND-CIRCLE INDEX MIDDLE CROSSED
+1D81C	SIGNWRITING HAND-FIST MIDDLE BENT OVER INDEX
+1D81D	SIGNWRITING HAND-FIST INDEX BENT OVER MIDDLE
+1D81E	SIGNWRITING HAND-FIST INDEX MIDDLE THUMB
+1D81F	SIGNWRITING HAND-CIRCLE INDEX MIDDLE THUMB
+1D820	SIGNWRITING HAND-FIST INDEX MIDDLE STRAIGHT THUMB BENT
+1D821	SIGNWRITING HAND-FIST INDEX MIDDLE BENT THUMB STRAIGHT
+1D822	SIGNWRITING HAND-FIST INDEX MIDDLE THUMB BENT
+1D823	SIGNWRITING HAND-FIST INDEX MIDDLE HINGED SPREAD THUMB SIDE
+1D824	SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED THUMB SIDE
+1D825	SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED THUMB CONJOINED
+1D826	SIGNWRITING HAND-FIST INDEX HINGED MIDDLE UP THUMB SIDE
+1D827	SIGNWRITING HAND-FIST INDEX MIDDLE UP SPREAD THUMB FORWARD
+1D828	SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CUPPED
+1D829	SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CIRCLED
+1D82A	SIGNWRITING HAND-FIST INDEX MIDDLE THUMB HOOKED
+1D82B	SIGNWRITING HAND-FIST INDEX MIDDLE THUMB HINGED
+1D82C	SIGNWRITING HAND-FIST THUMB BETWEEN INDEX MIDDLE STRAIGHT
+1D82D	SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE
+1D82E	SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE CONJOINED
+1D82F	SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE BENT
+1D830	SIGNWRITING HAND-FIST MIDDLE THUMB HOOKED INDEX UP
+1D831	SIGNWRITING HAND-FIST INDEX THUMB HOOKED MIDDLE UP
+1D832	SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED HINGED THUMB SIDE
+1D833	SIGNWRITING HAND-FIST INDEX MIDDLE CROSSED THUMB SIDE
+1D834	SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB FORWARD
+1D835	SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED CUPPED THUMB FORWARD
+1D836	SIGNWRITING HAND-FIST MIDDLE THUMB CUPPED INDEX UP
+1D837	SIGNWRITING HAND-FIST INDEX THUMB CUPPED MIDDLE UP
+1D838	SIGNWRITING HAND-FIST MIDDLE THUMB CIRCLED INDEX UP
+1D839	SIGNWRITING HAND-FIST MIDDLE THUMB CIRCLED INDEX HINGED
+1D83A	SIGNWRITING HAND-FIST INDEX THUMB ANGLED OUT MIDDLE UP
+1D83B	SIGNWRITING HAND-FIST INDEX THUMB ANGLED IN MIDDLE UP
+1D83C	SIGNWRITING HAND-FIST INDEX THUMB CIRCLED MIDDLE UP
+1D83D	SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CONJOINED HINGED
+1D83E	SIGNWRITING HAND-FIST INDEX MIDDLE THUMB ANGLED OUT
+1D83F	SIGNWRITING HAND-FIST INDEX MIDDLE THUMB ANGLED
+1D840	SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED OUT INDEX UP
+1D841	SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED OUT INDEX CROSSED
+1D842	SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED INDEX UP
+1D843	SIGNWRITING HAND-FIST INDEX THUMB HOOKED MIDDLE HINGED
+1D844	SIGNWRITING HAND-FLAT FOUR FINGERS
+1D845	SIGNWRITING HAND-FLAT FOUR FINGERS BENT
+1D846	SIGNWRITING HAND-FLAT FOUR FINGERS HINGED
+1D847	SIGNWRITING HAND-FLAT FOUR FINGERS CONJOINED
+1D848	SIGNWRITING HAND-FLAT FOUR FINGERS CONJOINED SPLIT
+1D849	SIGNWRITING HAND-CLAW FOUR FINGERS CONJOINED
+1D84A	SIGNWRITING HAND-FIST FOUR FINGERS CONJOINED BENT
+1D84B	SIGNWRITING HAND-HINGE FOUR FINGERS CONJOINED
+1D84C	SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD
+1D84D	SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD
+1D84E	SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD FOUR BENT
+1D84F	SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD FOUR BENT
+1D850	SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD BENT
+1D851	SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD BENT
+1D852	SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD THUMB FORWARD
+1D853	SIGNWRITING HAND-CUP FIVE FINGERS SPREAD
+1D854	SIGNWRITING HAND-CUP FIVE FINGERS SPREAD OPEN
+1D855	SIGNWRITING HAND-HINGE FIVE FINGERS SPREAD OPEN
+1D856	SIGNWRITING HAND-OVAL FIVE FINGERS SPREAD
+1D857	SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED
+1D858	SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED THUMB SIDE
+1D859	SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED NO THUMB
+1D85A	SIGNWRITING HAND-FLAT
+1D85B	SIGNWRITING HAND-FLAT BETWEEN PALM FACINGS
+1D85C	SIGNWRITING HAND-FLAT HEEL
+1D85D	SIGNWRITING HAND-FLAT THUMB SIDE
+1D85E	SIGNWRITING HAND-FLAT HEEL THUMB SIDE
+1D85F	SIGNWRITING HAND-FLAT THUMB BENT
+1D860	SIGNWRITING HAND-FLAT THUMB FORWARD
+1D861	SIGNWRITING HAND-FLAT SPLIT INDEX THUMB SIDE
+1D862	SIGNWRITING HAND-FLAT SPLIT CENTRE
+1D863	SIGNWRITING HAND-FLAT SPLIT CENTRE THUMB SIDE
+1D864	SIGNWRITING HAND-FLAT SPLIT CENTRE THUMB SIDE BENT
+1D865	SIGNWRITING HAND-FLAT SPLIT LITTLE
+1D866	SIGNWRITING HAND-CLAW
+1D867	SIGNWRITING HAND-CLAW THUMB SIDE
+1D868	SIGNWRITING HAND-CLAW NO THUMB
+1D869	SIGNWRITING HAND-CLAW THUMB FORWARD
+1D86A	SIGNWRITING HAND-HOOK CURLICUE
+1D86B	SIGNWRITING HAND-HOOK
+1D86C	SIGNWRITING HAND-CUP OPEN
+1D86D	SIGNWRITING HAND-CUP
+1D86E	SIGNWRITING HAND-CUP OPEN THUMB SIDE
+1D86F	SIGNWRITING HAND-CUP THUMB SIDE
+1D870	SIGNWRITING HAND-CUP OPEN NO THUMB
+1D871	SIGNWRITING HAND-CUP NO THUMB
+1D872	SIGNWRITING HAND-CUP OPEN THUMB FORWARD
+1D873	SIGNWRITING HAND-CUP THUMB FORWARD
+1D874	SIGNWRITING HAND-CURLICUE OPEN
+1D875	SIGNWRITING HAND-CURLICUE
+1D876	SIGNWRITING HAND-CIRCLE
+1D877	SIGNWRITING HAND-OVAL
+1D878	SIGNWRITING HAND-OVAL THUMB SIDE
+1D879	SIGNWRITING HAND-OVAL NO THUMB
+1D87A	SIGNWRITING HAND-OVAL THUMB FORWARD
+1D87B	SIGNWRITING HAND-HINGE OPEN
+1D87C	SIGNWRITING HAND-HINGE OPEN THUMB FORWARD
+1D87D	SIGNWRITING HAND-HINGE
+1D87E	SIGNWRITING HAND-HINGE SMALL
+1D87F	SIGNWRITING HAND-HINGE OPEN THUMB SIDE
+1D880	SIGNWRITING HAND-HINGE THUMB SIDE
+1D881	SIGNWRITING HAND-HINGE OPEN NO THUMB
+1D882	SIGNWRITING HAND-HINGE NO THUMB
+1D883	SIGNWRITING HAND-HINGE THUMB SIDE TOUCHING INDEX
+1D884	SIGNWRITING HAND-HINGE THUMB BETWEEN MIDDLE RING
+1D885	SIGNWRITING HAND-ANGLE
+1D886	SIGNWRITING HAND-FIST INDEX MIDDLE RING
+1D887	SIGNWRITING HAND-CIRCLE INDEX MIDDLE RING
+1D888	SIGNWRITING HAND-HINGE INDEX MIDDLE RING
+1D889	SIGNWRITING HAND-ANGLE INDEX MIDDLE RING
+1D88A	SIGNWRITING HAND-HINGE LITTLE
+1D88B	SIGNWRITING HAND-FIST INDEX MIDDLE RING BENT
+1D88C	SIGNWRITING HAND-FIST INDEX MIDDLE RING CONJOINED
+1D88D	SIGNWRITING HAND-HINGE INDEX MIDDLE RING CONJOINED
+1D88E	SIGNWRITING HAND-FIST LITTLE DOWN
+1D88F	SIGNWRITING HAND-FIST LITTLE DOWN RIPPLE STRAIGHT
+1D890	SIGNWRITING HAND-FIST LITTLE DOWN RIPPLE CURVED
+1D891	SIGNWRITING HAND-FIST LITTLE DOWN OTHERS CIRCLED
+1D892	SIGNWRITING HAND-FIST LITTLE UP
+1D893	SIGNWRITING HAND-FIST THUMB UNDER LITTLE UP
+1D894	SIGNWRITING HAND-CIRCLE LITTLE UP
+1D895	SIGNWRITING HAND-OVAL LITTLE UP
+1D896	SIGNWRITING HAND-ANGLE LITTLE UP
+1D897	SIGNWRITING HAND-FIST LITTLE RAISED KNUCKLE
+1D898	SIGNWRITING HAND-FIST LITTLE BENT
+1D899	SIGNWRITING HAND-FIST LITTLE TOUCHES THUMB
+1D89A	SIGNWRITING HAND-FIST LITTLE THUMB
+1D89B	SIGNWRITING HAND-HINGE LITTLE THUMB
+1D89C	SIGNWRITING HAND-FIST LITTLE INDEX THUMB
+1D89D	SIGNWRITING HAND-HINGE LITTLE INDEX THUMB
+1D89E	SIGNWRITING HAND-ANGLE LITTLE INDEX THUMB INDEX THUMB OUT
+1D89F	SIGNWRITING HAND-ANGLE LITTLE INDEX THUMB INDEX THUMB
+1D8A0	SIGNWRITING HAND-FIST LITTLE INDEX
+1D8A1	SIGNWRITING HAND-CIRCLE LITTLE INDEX
+1D8A2	SIGNWRITING HAND-HINGE LITTLE INDEX
+1D8A3	SIGNWRITING HAND-ANGLE LITTLE INDEX
+1D8A4	SIGNWRITING HAND-FIST INDEX MIDDLE LITTLE
+1D8A5	SIGNWRITING HAND-CIRCLE INDEX MIDDLE LITTLE
+1D8A6	SIGNWRITING HAND-HINGE INDEX MIDDLE LITTLE
+1D8A7	SIGNWRITING HAND-HINGE RING
+1D8A8	SIGNWRITING HAND-ANGLE INDEX MIDDLE LITTLE
+1D8A9	SIGNWRITING HAND-FIST INDEX MIDDLE CROSS LITTLE
+1D8AA	SIGNWRITING HAND-CIRCLE INDEX MIDDLE CROSS LITTLE
+1D8AB	SIGNWRITING HAND-FIST RING DOWN
+1D8AC	SIGNWRITING HAND-HINGE RING DOWN INDEX THUMB HOOK MIDDLE
+1D8AD	SIGNWRITING HAND-ANGLE RING DOWN MIDDLE THUMB INDEX CROSS
+1D8AE	SIGNWRITING HAND-FIST RING UP
+1D8AF	SIGNWRITING HAND-FIST RING RAISED KNUCKLE
+1D8B0	SIGNWRITING HAND-FIST RING LITTLE
+1D8B1	SIGNWRITING HAND-CIRCLE RING LITTLE
+1D8B2	SIGNWRITING HAND-OVAL RING LITTLE
+1D8B3	SIGNWRITING HAND-ANGLE RING LITTLE
+1D8B4	SIGNWRITING HAND-FIST RING MIDDLE
+1D8B5	SIGNWRITING HAND-FIST RING MIDDLE CONJOINED
+1D8B6	SIGNWRITING HAND-FIST RING MIDDLE RAISED KNUCKLES
+1D8B7	SIGNWRITING HAND-FIST RING INDEX
+1D8B8	SIGNWRITING HAND-FIST RING THUMB
+1D8B9	SIGNWRITING HAND-HOOK RING THUMB
+1D8BA	SIGNWRITING HAND-FIST INDEX RING LITTLE
+1D8BB	SIGNWRITING HAND-CIRCLE INDEX RING LITTLE
+1D8BC	SIGNWRITING HAND-CURLICUE INDEX RING LITTLE ON
+1D8BD	SIGNWRITING HAND-HOOK INDEX RING LITTLE OUT
+1D8BE	SIGNWRITING HAND-HOOK INDEX RING LITTLE IN
+1D8BF	SIGNWRITING HAND-HOOK INDEX RING LITTLE UNDER
+1D8C0	SIGNWRITING HAND-CUP INDEX RING LITTLE
+1D8C1	SIGNWRITING HAND-HINGE INDEX RING LITTLE
+1D8C2	SIGNWRITING HAND-ANGLE INDEX RING LITTLE OUT
+1D8C3	SIGNWRITING HAND-ANGLE INDEX RING LITTLE
+1D8C4	SIGNWRITING HAND-FIST MIDDLE DOWN
+1D8C5	SIGNWRITING HAND-HINGE MIDDLE
+1D8C6	SIGNWRITING HAND-FIST MIDDLE UP
+1D8C7	SIGNWRITING HAND-CIRCLE MIDDLE UP
+1D8C8	SIGNWRITING HAND-FIST MIDDLE RAISED KNUCKLE
+1D8C9	SIGNWRITING HAND-FIST MIDDLE UP THUMB SIDE
+1D8CA	SIGNWRITING HAND-HOOK MIDDLE THUMB
+1D8CB	SIGNWRITING HAND-FIST MIDDLE THUMB LITTLE
+1D8CC	SIGNWRITING HAND-FIST MIDDLE LITTLE
+1D8CD	SIGNWRITING HAND-FIST MIDDLE RING LITTLE
+1D8CE	SIGNWRITING HAND-CIRCLE MIDDLE RING LITTLE
+1D8CF	SIGNWRITING HAND-CURLICUE MIDDLE RING LITTLE ON
+1D8D0	SIGNWRITING HAND-CUP MIDDLE RING LITTLE
+1D8D1	SIGNWRITING HAND-HINGE MIDDLE RING LITTLE
+1D8D2	SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE OUT
+1D8D3	SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE IN
+1D8D4	SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE
+1D8D5	SIGNWRITING HAND-CIRCLE MIDDLE RING LITTLE BENT
+1D8D6	SIGNWRITING HAND-CLAW MIDDLE RING LITTLE CONJOINED
+1D8D7	SIGNWRITING HAND-CLAW MIDDLE RING LITTLE CONJOINED SIDE
+1D8D8	SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED OUT
+1D8D9	SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED IN
+1D8DA	SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED
+1D8DB	SIGNWRITING HAND-HINGE INDEX HINGED
+1D8DC	SIGNWRITING HAND-FIST INDEX THUMB SIDE
+1D8DD	SIGNWRITING HAND-HINGE INDEX THUMB SIDE
+1D8DE	SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB DIAGONAL
+1D8DF	SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB CONJOINED
+1D8E0	SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB BENT
+1D8E1	SIGNWRITING HAND-FIST INDEX THUMB SIDE INDEX BENT
+1D8E2	SIGNWRITING HAND-FIST INDEX THUMB SIDE BOTH BENT
+1D8E3	SIGNWRITING HAND-FIST INDEX THUMB SIDE INDEX HINGE
+1D8E4	SIGNWRITING HAND-FIST INDEX THUMB FORWARD INDEX STRAIGHT
+1D8E5	SIGNWRITING HAND-FIST INDEX THUMB FORWARD INDEX BENT
+1D8E6	SIGNWRITING HAND-FIST INDEX THUMB HOOK
+1D8E7	SIGNWRITING HAND-FIST INDEX THUMB CURLICUE
+1D8E8	SIGNWRITING HAND-FIST INDEX THUMB CURVE THUMB INSIDE
+1D8E9	SIGNWRITING HAND-CLAW INDEX THUMB CURVE THUMB INSIDE
+1D8EA	SIGNWRITING HAND-FIST INDEX THUMB CURVE THUMB UNDER
+1D8EB	SIGNWRITING HAND-FIST INDEX THUMB CIRCLE
+1D8EC	SIGNWRITING HAND-CUP INDEX THUMB
+1D8ED	SIGNWRITING HAND-CUP INDEX THUMB OPEN
+1D8EE	SIGNWRITING HAND-HINGE INDEX THUMB OPEN
+1D8EF	SIGNWRITING HAND-HINGE INDEX THUMB LARGE
+1D8F0	SIGNWRITING HAND-HINGE INDEX THUMB
+1D8F1	SIGNWRITING HAND-HINGE INDEX THUMB SMALL
+1D8F2	SIGNWRITING HAND-ANGLE INDEX THUMB OUT
+1D8F3	SIGNWRITING HAND-ANGLE INDEX THUMB IN
+1D8F4	SIGNWRITING HAND-ANGLE INDEX THUMB
+1D8F5	SIGNWRITING HAND-FIST THUMB
+1D8F6	SIGNWRITING HAND-FIST THUMB HEEL
+1D8F7	SIGNWRITING HAND-FIST THUMB SIDE DIAGONAL
+1D8F8	SIGNWRITING HAND-FIST THUMB SIDE CONJOINED
+1D8F9	SIGNWRITING HAND-FIST THUMB SIDE BENT
+1D8FA	SIGNWRITING HAND-FIST THUMB FORWARD
+1D8FB	SIGNWRITING HAND-FIST THUMB BETWEEN INDEX MIDDLE
+1D8FC	SIGNWRITING HAND-FIST THUMB BETWEEN MIDDLE RING
+1D8FD	SIGNWRITING HAND-FIST THUMB BETWEEN RING LITTLE
+1D8FE	SIGNWRITING HAND-FIST THUMB UNDER TWO FINGERS
+1D8FF	SIGNWRITING HAND-FIST THUMB OVER TWO FINGERS
+1D900	SIGNWRITING HAND-FIST THUMB UNDER THREE FINGERS
+1D901	SIGNWRITING HAND-FIST THUMB UNDER FOUR FINGERS
+1D902	SIGNWRITING HAND-FIST THUMB OVER FOUR RAISED KNUCKLES
+1D903	SIGNWRITING HAND-FIST
+1D904	SIGNWRITING HAND-FIST HEEL
+1D905	SIGNWRITING TOUCH SINGLE
+1D906	SIGNWRITING TOUCH MULTIPLE
+1D907	SIGNWRITING TOUCH BETWEEN
+1D908	SIGNWRITING GRASP SINGLE
+1D909	SIGNWRITING GRASP MULTIPLE
+1D90A	SIGNWRITING GRASP BETWEEN
+1D90B	SIGNWRITING STRIKE SINGLE
+1D90C	SIGNWRITING STRIKE MULTIPLE
+1D90D	SIGNWRITING STRIKE BETWEEN
+1D90E	SIGNWRITING BRUSH SINGLE
+1D90F	SIGNWRITING BRUSH MULTIPLE
+1D910	SIGNWRITING BRUSH BETWEEN
+1D911	SIGNWRITING RUB SINGLE
+1D912	SIGNWRITING RUB MULTIPLE
+1D913	SIGNWRITING RUB BETWEEN
+1D914	SIGNWRITING SURFACE SYMBOLS
+1D915	SIGNWRITING SURFACE BETWEEN
+1D916	SIGNWRITING SQUEEZE LARGE SINGLE
+1D917	SIGNWRITING SQUEEZE SMALL SINGLE
+1D918	SIGNWRITING SQUEEZE LARGE MULTIPLE
+1D919	SIGNWRITING SQUEEZE SMALL MULTIPLE
+1D91A	SIGNWRITING SQUEEZE SEQUENTIAL
+1D91B	SIGNWRITING FLICK LARGE SINGLE
+1D91C	SIGNWRITING FLICK SMALL SINGLE
+1D91D	SIGNWRITING FLICK LARGE MULTIPLE
+1D91E	SIGNWRITING FLICK SMALL MULTIPLE
+1D91F	SIGNWRITING FLICK SEQUENTIAL
+1D920	SIGNWRITING SQUEEZE FLICK ALTERNATING
+1D921	SIGNWRITING MOVEMENT-HINGE UP DOWN LARGE
+1D922	SIGNWRITING MOVEMENT-HINGE UP DOWN SMALL
+1D923	SIGNWRITING MOVEMENT-HINGE UP SEQUENTIAL
+1D924	SIGNWRITING MOVEMENT-HINGE DOWN SEQUENTIAL
+1D925	SIGNWRITING MOVEMENT-HINGE UP DOWN ALTERNATING LARGE
+1D926	SIGNWRITING MOVEMENT-HINGE UP DOWN ALTERNATING SMALL
+1D927	SIGNWRITING MOVEMENT-HINGE SIDE TO SIDE SCISSORS
+1D928	SIGNWRITING MOVEMENT-WALLPLANE FINGER CONTACT
+1D929	SIGNWRITING MOVEMENT-FLOORPLANE FINGER CONTACT
+1D92A	SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT SMALL
+1D92B	SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT MEDIUM
+1D92C	SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT LARGE
+1D92D	SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT LARGEST
+1D92E	SIGNWRITING MOVEMENT-WALLPLANE SINGLE WRIST FLEX
+1D92F	SIGNWRITING MOVEMENT-WALLPLANE DOUBLE STRAIGHT
+1D930	SIGNWRITING MOVEMENT-WALLPLANE DOUBLE WRIST FLEX
+1D931	SIGNWRITING MOVEMENT-WALLPLANE DOUBLE ALTERNATING
+1D932	SIGNWRITING MOVEMENT-WALLPLANE DOUBLE ALTERNATING WRIST FLEX
+1D933	SIGNWRITING MOVEMENT-WALLPLANE CROSS
+1D934	SIGNWRITING MOVEMENT-WALLPLANE TRIPLE STRAIGHT MOVEMENT
+1D935	SIGNWRITING MOVEMENT-WALLPLANE TRIPLE WRIST FLEX
+1D936	SIGNWRITING MOVEMENT-WALLPLANE TRIPLE ALTERNATING
+1D937	SIGNWRITING MOVEMENT-WALLPLANE TRIPLE ALTERNATING WRIST FLEX
+1D938	SIGNWRITING MOVEMENT-WALLPLANE BEND SMALL
+1D939	SIGNWRITING MOVEMENT-WALLPLANE BEND MEDIUM
+1D93A	SIGNWRITING MOVEMENT-WALLPLANE BEND LARGE
+1D93B	SIGNWRITING MOVEMENT-WALLPLANE CORNER SMALL
+1D93C	SIGNWRITING MOVEMENT-WALLPLANE CORNER MEDIUM
+1D93D	SIGNWRITING MOVEMENT-WALLPLANE CORNER LARGE
+1D93E	SIGNWRITING MOVEMENT-WALLPLANE CORNER ROTATION
+1D93F	SIGNWRITING MOVEMENT-WALLPLANE CHECK SMALL
+1D940	SIGNWRITING MOVEMENT-WALLPLANE CHECK MEDIUM
+1D941	SIGNWRITING MOVEMENT-WALLPLANE CHECK LARGE
+1D942	SIGNWRITING MOVEMENT-WALLPLANE BOX SMALL
+1D943	SIGNWRITING MOVEMENT-WALLPLANE BOX MEDIUM
+1D944	SIGNWRITING MOVEMENT-WALLPLANE BOX LARGE
+1D945	SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG SMALL
+1D946	SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG MEDIUM
+1D947	SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG LARGE
+1D948	SIGNWRITING MOVEMENT-WALLPLANE PEAKS SMALL
+1D949	SIGNWRITING MOVEMENT-WALLPLANE PEAKS MEDIUM
+1D94A	SIGNWRITING MOVEMENT-WALLPLANE PEAKS LARGE
+1D94B	SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE SINGLE
+1D94C	SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE DOUBLE
+1D94D	SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE ALTERNATING
+1D94E	SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE SINGLE
+1D94F	SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE DOUBLE
+1D950	SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE ALTERNATING
+1D951	SIGNWRITING TRAVEL-WALLPLANE SHAKING
+1D952	SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL SINGLE
+1D953	SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL DOUBLE
+1D954	SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL TRIPLE
+1D955	SIGNWRITING MOVEMENT-DIAGONAL AWAY SMALL
+1D956	SIGNWRITING MOVEMENT-DIAGONAL AWAY MEDIUM
+1D957	SIGNWRITING MOVEMENT-DIAGONAL AWAY LARGE
+1D958	SIGNWRITING MOVEMENT-DIAGONAL AWAY LARGEST
+1D959	SIGNWRITING MOVEMENT-DIAGONAL TOWARDS SMALL
+1D95A	SIGNWRITING MOVEMENT-DIAGONAL TOWARDS MEDIUM
+1D95B	SIGNWRITING MOVEMENT-DIAGONAL TOWARDS LARGE
+1D95C	SIGNWRITING MOVEMENT-DIAGONAL TOWARDS LARGEST
+1D95D	SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY SMALL
+1D95E	SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY MEDIUM
+1D95F	SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY LARGE
+1D960	SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY LARGEST
+1D961	SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS SMALL
+1D962	SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS MEDIUM
+1D963	SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS LARGE
+1D964	SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS LARGEST
+1D965	SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT SMALL
+1D966	SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT MEDIUM
+1D967	SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT LARGE
+1D968	SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT LARGEST
+1D969	SIGNWRITING MOVEMENT-FLOORPLANE SINGLE WRIST FLEX
+1D96A	SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE STRAIGHT
+1D96B	SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE WRIST FLEX
+1D96C	SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE ALTERNATING
+1D96D	SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE ALTERNATING WRIST FLEX
+1D96E	SIGNWRITING MOVEMENT-FLOORPLANE CROSS
+1D96F	SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE STRAIGHT MOVEMENT
+1D970	SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE WRIST FLEX
+1D971	SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE ALTERNATING MOVEMENT
+1D972	SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE ALTERNATING WRIST FLEX
+1D973	SIGNWRITING MOVEMENT-FLOORPLANE BEND
+1D974	SIGNWRITING MOVEMENT-FLOORPLANE CORNER SMALL
+1D975	SIGNWRITING MOVEMENT-FLOORPLANE CORNER MEDIUM
+1D976	SIGNWRITING MOVEMENT-FLOORPLANE CORNER LARGE
+1D977	SIGNWRITING MOVEMENT-FLOORPLANE CHECK
+1D978	SIGNWRITING MOVEMENT-FLOORPLANE BOX SMALL
+1D979	SIGNWRITING MOVEMENT-FLOORPLANE BOX MEDIUM
+1D97A	SIGNWRITING MOVEMENT-FLOORPLANE BOX LARGE
+1D97B	SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG SMALL
+1D97C	SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG MEDIUM
+1D97D	SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG LARGE
+1D97E	SIGNWRITING MOVEMENT-FLOORPLANE PEAKS SMALL
+1D97F	SIGNWRITING MOVEMENT-FLOORPLANE PEAKS MEDIUM
+1D980	SIGNWRITING MOVEMENT-FLOORPLANE PEAKS LARGE
+1D981	SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE SINGLE
+1D982	SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE DOUBLE
+1D983	SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE ALTERNATING
+1D984	SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE SINGLE
+1D985	SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE DOUBLE
+1D986	SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE ALTERNATING
+1D987	SIGNWRITING TRAVEL-FLOORPLANE SHAKING
+1D988	SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER SMALL
+1D989	SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER MEDIUM
+1D98A	SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER LARGE
+1D98B	SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER LARGEST
+1D98C	SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE SMALL
+1D98D	SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE MEDIUM
+1D98E	SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE LARGE
+1D98F	SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE LARGEST
+1D990	SIGNWRITING MOVEMENT-WALLPLANE CURVE THREE-QUARTER CIRCLE SMALL
+1D991	SIGNWRITING MOVEMENT-WALLPLANE CURVE THREE-QUARTER CIRCLE MEDIUM
+1D992	SIGNWRITING MOVEMENT-WALLPLANE HUMP SMALL
+1D993	SIGNWRITING MOVEMENT-WALLPLANE HUMP MEDIUM
+1D994	SIGNWRITING MOVEMENT-WALLPLANE HUMP LARGE
+1D995	SIGNWRITING MOVEMENT-WALLPLANE LOOP SMALL
+1D996	SIGNWRITING MOVEMENT-WALLPLANE LOOP MEDIUM
+1D997	SIGNWRITING MOVEMENT-WALLPLANE LOOP LARGE
+1D998	SIGNWRITING MOVEMENT-WALLPLANE LOOP SMALL DOUBLE
+1D999	SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE SMALL
+1D99A	SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE MEDIUM
+1D99B	SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE LARGE
+1D99C	SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE SMALL
+1D99D	SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE MEDIUM
+1D99E	SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE LARGE
+1D99F	SIGNWRITING MOVEMENT-WALLPLANE CURVE THEN STRAIGHT
+1D9A0	SIGNWRITING MOVEMENT-WALLPLANE CURVED CROSS SMALL
+1D9A1	SIGNWRITING MOVEMENT-WALLPLANE CURVED CROSS MEDIUM
+1D9A2	SIGNWRITING ROTATION-WALLPLANE SINGLE
+1D9A3	SIGNWRITING ROTATION-WALLPLANE DOUBLE
+1D9A4	SIGNWRITING ROTATION-WALLPLANE ALTERNATE
+1D9A5	SIGNWRITING MOVEMENT-WALLPLANE SHAKING
+1D9A6	SIGNWRITING MOVEMENT-WALLPLANE CURVE HITTING FRONT WALL
+1D9A7	SIGNWRITING MOVEMENT-WALLPLANE HUMP HITTING FRONT WALL
+1D9A8	SIGNWRITING MOVEMENT-WALLPLANE LOOP HITTING FRONT WALL
+1D9A9	SIGNWRITING MOVEMENT-WALLPLANE WAVE HITTING FRONT WALL
+1D9AA	SIGNWRITING ROTATION-WALLPLANE SINGLE HITTING FRONT WALL
+1D9AB	SIGNWRITING ROTATION-WALLPLANE DOUBLE HITTING FRONT WALL
+1D9AC	SIGNWRITING ROTATION-WALLPLANE ALTERNATING HITTING FRONT WALL
+1D9AD	SIGNWRITING MOVEMENT-WALLPLANE CURVE HITTING CHEST
+1D9AE	SIGNWRITING MOVEMENT-WALLPLANE HUMP HITTING CHEST
+1D9AF	SIGNWRITING MOVEMENT-WALLPLANE LOOP HITTING CHEST
+1D9B0	SIGNWRITING MOVEMENT-WALLPLANE WAVE HITTING CHEST
+1D9B1	SIGNWRITING ROTATION-WALLPLANE SINGLE HITTING CHEST
+1D9B2	SIGNWRITING ROTATION-WALLPLANE DOUBLE HITTING CHEST
+1D9B3	SIGNWRITING ROTATION-WALLPLANE ALTERNATING HITTING CHEST
+1D9B4	SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH SMALL
+1D9B5	SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH MEDIUM
+1D9B6	SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH LARGE
+1D9B7	SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING CEILING SMALL
+1D9B8	SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING CEILING LARGE
+1D9B9	SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING SMALL DOUBLE
+1D9BA	SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING LARGE DOUBLE
+1D9BB	SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING SMALL TRIPLE
+1D9BC	SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING LARGE TRIPLE
+1D9BD	SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING SMALL SINGLE
+1D9BE	SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING LARGE SINGLE
+1D9BF	SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING SMALL DOUBLE
+1D9C0	SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING LARGE DOUBLE
+1D9C1	SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING CEILING SMALL
+1D9C2	SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING CEILING LARGE
+1D9C3	SIGNWRITING ROTATION-FLOORPLANE SINGLE HITTING CEILING
+1D9C4	SIGNWRITING ROTATION-FLOORPLANE DOUBLE HITTING CEILING
+1D9C5	SIGNWRITING ROTATION-FLOORPLANE ALTERNATING HITTING CEILING
+1D9C6	SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING FLOOR SMALL
+1D9C7	SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING FLOOR LARGE
+1D9C8	SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR SMALL DOUBLE
+1D9C9	SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR LARGE DOUBLE
+1D9CA	SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR TRIPLE SMALL TRIPLE
+1D9CB	SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR TRIPLE LARGE TRIPLE
+1D9CC	SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR SMALL SINGLE
+1D9CD	SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR LARGE SINGLE
+1D9CE	SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR SMALL DOUBLE
+1D9CF	SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR LARGE DOUBLE
+1D9D0	SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING FLOOR SMALL
+1D9D1	SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING FLOOR LARGE
+1D9D2	SIGNWRITING ROTATION-FLOORPLANE SINGLE HITTING FLOOR
+1D9D3	SIGNWRITING ROTATION-FLOORPLANE DOUBLE HITTING FLOOR
+1D9D4	SIGNWRITING ROTATION-FLOORPLANE ALTERNATING HITTING FLOOR
+1D9D5	SIGNWRITING MOVEMENT-FLOORPLANE CURVE SMALL
+1D9D6	SIGNWRITING MOVEMENT-FLOORPLANE CURVE MEDIUM
+1D9D7	SIGNWRITING MOVEMENT-FLOORPLANE CURVE LARGE
+1D9D8	SIGNWRITING MOVEMENT-FLOORPLANE CURVE LARGEST
+1D9D9	SIGNWRITING MOVEMENT-FLOORPLANE CURVE COMBINED
+1D9DA	SIGNWRITING MOVEMENT-FLOORPLANE HUMP SMALL
+1D9DB	SIGNWRITING MOVEMENT-FLOORPLANE LOOP SMALL
+1D9DC	SIGNWRITING MOVEMENT-FLOORPLANE WAVE SNAKE
+1D9DD	SIGNWRITING MOVEMENT-FLOORPLANE WAVE SMALL
+1D9DE	SIGNWRITING MOVEMENT-FLOORPLANE WAVE LARGE
+1D9DF	SIGNWRITING ROTATION-FLOORPLANE SINGLE
+1D9E0	SIGNWRITING ROTATION-FLOORPLANE DOUBLE
+1D9E1	SIGNWRITING ROTATION-FLOORPLANE ALTERNATING
+1D9E2	SIGNWRITING MOVEMENT-FLOORPLANE SHAKING PARALLEL
+1D9E3	SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE SMALL SINGLE
+1D9E4	SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE MEDIUM SINGLE
+1D9E5	SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE SMALL DOUBLE
+1D9E6	SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE MEDIUM DOUBLE
+1D9E7	SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL SMALL SINGLE
+1D9E8	SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL MEDIUM SINGLE
+1D9E9	SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL LARGE SINGLE
+1D9EA	SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL SMALL DOUBLE
+1D9EB	SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL MEDIUM DOUBLE
+1D9EC	SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL LARGE DOUBLE
+1D9ED	SIGNWRITING MOVEMENT-WALLPLANE WRIST CIRCLE FRONT SINGLE
+1D9EE	SIGNWRITING MOVEMENT-WALLPLANE WRIST CIRCLE FRONT DOUBLE
+1D9EF	SIGNWRITING MOVEMENT-FLOORPLANE WRIST CIRCLE HITTING WALL SINGLE
+1D9F0	SIGNWRITING MOVEMENT-FLOORPLANE WRIST CIRCLE HITTING WALL DOUBLE
+1D9F1	SIGNWRITING MOVEMENT-WALLPLANE FINGER CIRCLES SINGLE
+1D9F2	SIGNWRITING MOVEMENT-WALLPLANE FINGER CIRCLES DOUBLE
+1D9F3	SIGNWRITING MOVEMENT-FLOORPLANE FINGER CIRCLES HITTING WALL SINGLE
+1D9F4	SIGNWRITING MOVEMENT-FLOORPLANE FINGER CIRCLES HITTING WALL DOUBLE
+1D9F5	SIGNWRITING DYNAMIC ARROWHEAD SMALL
+1D9F6	SIGNWRITING DYNAMIC ARROWHEAD LARGE
+1D9F7	SIGNWRITING DYNAMIC FAST
+1D9F8	SIGNWRITING DYNAMIC SLOW
+1D9F9	SIGNWRITING DYNAMIC TENSE
+1D9FA	SIGNWRITING DYNAMIC RELAXED
+1D9FB	SIGNWRITING DYNAMIC SIMULTANEOUS
+1D9FC	SIGNWRITING DYNAMIC SIMULTANEOUS ALTERNATING
+1D9FD	SIGNWRITING DYNAMIC EVERY OTHER TIME
+1D9FE	SIGNWRITING DYNAMIC GRADUAL
+1D9FF	SIGNWRITING HEAD
+1DA00	SIGNWRITING HEAD RIM
+1DA01	SIGNWRITING HEAD MOVEMENT-WALLPLANE STRAIGHT
+1DA02	SIGNWRITING HEAD MOVEMENT-WALLPLANE TILT
+1DA03	SIGNWRITING HEAD MOVEMENT-FLOORPLANE STRAIGHT
+1DA04	SIGNWRITING HEAD MOVEMENT-WALLPLANE CURVE
+1DA05	SIGNWRITING HEAD MOVEMENT-FLOORPLANE CURVE
+1DA06	SIGNWRITING HEAD MOVEMENT CIRCLE
+1DA07	SIGNWRITING FACE DIRECTION POSITION NOSE FORWARD TILTING
+1DA08	SIGNWRITING FACE DIRECTION POSITION NOSE UP OR DOWN
+1DA09	SIGNWRITING FACE DIRECTION POSITION NOSE UP OR DOWN TILTING
+1DA0A	SIGNWRITING EYEBROWS STRAIGHT UP
+1DA0B	SIGNWRITING EYEBROWS STRAIGHT NEUTRAL
+1DA0C	SIGNWRITING EYEBROWS STRAIGHT DOWN
+1DA0D	SIGNWRITING DREAMY EYEBROWS NEUTRAL DOWN
+1DA0E	SIGNWRITING DREAMY EYEBROWS DOWN NEUTRAL
+1DA0F	SIGNWRITING DREAMY EYEBROWS UP NEUTRAL
+1DA10	SIGNWRITING DREAMY EYEBROWS NEUTRAL UP
+1DA11	SIGNWRITING FOREHEAD NEUTRAL
+1DA12	SIGNWRITING FOREHEAD CONTACT
+1DA13	SIGNWRITING FOREHEAD WRINKLED
+1DA14	SIGNWRITING EYES OPEN
+1DA15	SIGNWRITING EYES SQUEEZED
+1DA16	SIGNWRITING EYES CLOSED
+1DA17	SIGNWRITING EYE BLINK SINGLE
+1DA18	SIGNWRITING EYE BLINK MULTIPLE
+1DA19	SIGNWRITING EYES HALF OPEN
+1DA1A	SIGNWRITING EYES WIDE OPEN
+1DA1B	SIGNWRITING EYES HALF CLOSED
+1DA1C	SIGNWRITING EYES WIDENING MOVEMENT
+1DA1D	SIGNWRITING EYE WINK
+1DA1E	SIGNWRITING EYELASHES UP
+1DA1F	SIGNWRITING EYELASHES DOWN
+1DA20	SIGNWRITING EYELASHES FLUTTERING
+1DA21	SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT
+1DA22	SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT DOUBLE
+1DA23	SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT ALTERNATING
+1DA24	SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT
+1DA25	SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT DOUBLE
+1DA26	SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT ALTERNATING
+1DA27	SIGNWRITING EYEGAZE-WALLPLANE CURVED
+1DA28	SIGNWRITING EYEGAZE-FLOORPLANE CURVED
+1DA29	SIGNWRITING EYEGAZE-WALLPLANE CIRCLING
+1DA2A	SIGNWRITING CHEEKS PUFFED
+1DA2B	SIGNWRITING CHEEKS NEUTRAL
+1DA2C	SIGNWRITING CHEEKS SUCKED
+1DA2D	SIGNWRITING TENSE CHEEKS HIGH
+1DA2E	SIGNWRITING TENSE CHEEKS MIDDLE
+1DA2F	SIGNWRITING TENSE CHEEKS LOW
+1DA30	SIGNWRITING EARS
+1DA31	SIGNWRITING NOSE NEUTRAL
+1DA32	SIGNWRITING NOSE CONTACT
+1DA33	SIGNWRITING NOSE WRINKLES
+1DA34	SIGNWRITING NOSE WIGGLES
+1DA35	SIGNWRITING AIR BLOWING OUT
+1DA36	SIGNWRITING AIR SUCKING IN
+1DA37	SIGNWRITING AIR BLOW SMALL ROTATIONS
+1DA38	SIGNWRITING AIR SUCK SMALL ROTATIONS
+1DA39	SIGNWRITING BREATH INHALE
+1DA3A	SIGNWRITING BREATH EXHALE
+1DA3B	SIGNWRITING MOUTH CLOSED NEUTRAL
+1DA3C	SIGNWRITING MOUTH CLOSED FORWARD
+1DA3D	SIGNWRITING MOUTH CLOSED CONTACT
+1DA3E	SIGNWRITING MOUTH SMILE
+1DA3F	SIGNWRITING MOUTH SMILE WRINKLED
+1DA40	SIGNWRITING MOUTH SMILE OPEN
+1DA41	SIGNWRITING MOUTH FROWN
+1DA42	SIGNWRITING MOUTH FROWN WRINKLED
+1DA43	SIGNWRITING MOUTH FROWN OPEN
+1DA44	SIGNWRITING MOUTH OPEN CIRCLE
+1DA45	SIGNWRITING MOUTH OPEN FORWARD
+1DA46	SIGNWRITING MOUTH OPEN WRINKLED
+1DA47	SIGNWRITING MOUTH OPEN OVAL
+1DA48	SIGNWRITING MOUTH OPEN OVAL WRINKLED
+1DA49	SIGNWRITING MOUTH OPEN OVAL YAWN
+1DA4A	SIGNWRITING MOUTH OPEN RECTANGLE
+1DA4B	SIGNWRITING MOUTH OPEN RECTANGLE WRINKLED
+1DA4C	SIGNWRITING MOUTH OPEN RECTANGLE YAWN
+1DA4D	SIGNWRITING MOUTH KISS
+1DA4E	SIGNWRITING MOUTH KISS FORWARD
+1DA4F	SIGNWRITING MOUTH KISS WRINKLED
+1DA50	SIGNWRITING MOUTH TENSE
+1DA51	SIGNWRITING MOUTH TENSE FORWARD
+1DA52	SIGNWRITING MOUTH TENSE SUCKED
+1DA53	SIGNWRITING LIPS PRESSED TOGETHER
+1DA54	SIGNWRITING LIP LOWER OVER UPPER
+1DA55	SIGNWRITING LIP UPPER OVER LOWER
+1DA56	SIGNWRITING MOUTH CORNERS
+1DA57	SIGNWRITING MOUTH WRINKLES SINGLE
+1DA58	SIGNWRITING MOUTH WRINKLES DOUBLE
+1DA59	SIGNWRITING TONGUE STICKING OUT FAR
+1DA5A	SIGNWRITING TONGUE LICKING LIPS
+1DA5B	SIGNWRITING TONGUE TIP BETWEEN LIPS
+1DA5C	SIGNWRITING TONGUE TIP TOUCHING INSIDE MOUTH
+1DA5D	SIGNWRITING TONGUE INSIDE MOUTH RELAXED
+1DA5E	SIGNWRITING TONGUE MOVES AGAINST CHEEK
+1DA5F	SIGNWRITING TONGUE CENTRE STICKING OUT
+1DA60	SIGNWRITING TONGUE CENTRE INSIDE MOUTH
+1DA61	SIGNWRITING TEETH
+1DA62	SIGNWRITING TEETH MOVEMENT
+1DA63	SIGNWRITING TEETH ON TONGUE
+1DA64	SIGNWRITING TEETH ON TONGUE MOVEMENT
+1DA65	SIGNWRITING TEETH ON LIPS
+1DA66	SIGNWRITING TEETH ON LIPS MOVEMENT
+1DA67	SIGNWRITING TEETH BITE LIPS
+1DA68	SIGNWRITING MOVEMENT-WALLPLANE JAW
+1DA69	SIGNWRITING MOVEMENT-FLOORPLANE JAW
+1DA6A	SIGNWRITING NECK
+1DA6B	SIGNWRITING HAIR
+1DA6C	SIGNWRITING EXCITEMENT
+1DA6D	SIGNWRITING SHOULDER HIP SPINE
+1DA6E	SIGNWRITING SHOULDER HIP POSITIONS
+1DA6F	SIGNWRITING WALLPLANE SHOULDER HIP MOVE
+1DA70	SIGNWRITING FLOORPLANE SHOULDER HIP MOVE
+1DA71	SIGNWRITING SHOULDER TILTING FROM WAIST
+1DA72	SIGNWRITING TORSO-WALLPLANE STRAIGHT STRETCH
+1DA73	SIGNWRITING TORSO-WALLPLANE CURVED BEND
+1DA74	SIGNWRITING TORSO-FLOORPLANE TWISTING
+1DA75	SIGNWRITING UPPER BODY TILTING FROM HIP JOINTS
+1DA76	SIGNWRITING LIMB COMBINATION
+1DA77	SIGNWRITING LIMB LENGTH-1
+1DA78	SIGNWRITING LIMB LENGTH-2
+1DA79	SIGNWRITING LIMB LENGTH-3
+1DA7A	SIGNWRITING LIMB LENGTH-4
+1DA7B	SIGNWRITING LIMB LENGTH-5
+1DA7C	SIGNWRITING LIMB LENGTH-6
+1DA7D	SIGNWRITING LIMB LENGTH-7
+1DA7E	SIGNWRITING FINGER
+1DA7F	SIGNWRITING LOCATION-WALLPLANE SPACE
+1DA80	SIGNWRITING LOCATION-FLOORPLANE SPACE
+1DA81	SIGNWRITING LOCATION HEIGHT
+1DA82	SIGNWRITING LOCATION WIDTH
+1DA83	SIGNWRITING LOCATION DEPTH
+1DA84	SIGNWRITING LOCATION HEAD NECK
+1DA85	SIGNWRITING LOCATION TORSO
+1DA86	SIGNWRITING LOCATION LIMBS DIGITS
+1DA87	SIGNWRITING COMMA
+1DA88	SIGNWRITING FULL STOP
+1DA89	SIGNWRITING SEMICOLON
+1DA8A	SIGNWRITING COLON
+1DA8B	SIGNWRITING PARENTHESIS
+1DA9B	SIGNWRITING FILL MODIFIER-2
+1DA9C	SIGNWRITING FILL MODIFIER-3
+1DA9D	SIGNWRITING FILL MODIFIER-4
+1DA9E	SIGNWRITING FILL MODIFIER-5
+1DA9F	SIGNWRITING FILL MODIFIER-6
+1DAA1	SIGNWRITING ROTATION MODIFIER-2
+1DAA2	SIGNWRITING ROTATION MODIFIER-3
+1DAA3	SIGNWRITING ROTATION MODIFIER-4
+1DAA4	SIGNWRITING ROTATION MODIFIER-5
+1DAA5	SIGNWRITING ROTATION MODIFIER-6
+1DAA6	SIGNWRITING ROTATION MODIFIER-7
+1DAA7	SIGNWRITING ROTATION MODIFIER-8
+1DAA8	SIGNWRITING ROTATION MODIFIER-9
+1DAA9	SIGNWRITING ROTATION MODIFIER-10
+1DAAA	SIGNWRITING ROTATION MODIFIER-11
+1DAAB	SIGNWRITING ROTATION MODIFIER-12
+1DAAC	SIGNWRITING ROTATION MODIFIER-13
+1DAAD	SIGNWRITING ROTATION MODIFIER-14
+1DAAE	SIGNWRITING ROTATION MODIFIER-15
+1DAAF	SIGNWRITING ROTATION MODIFIER-16
 1E800	MENDE KIKAKUI SYLLABLE M001 KI
 1E801	MENDE KIKAKUI SYLLABLE M002 KA
 1E802	MENDE KIKAKUI SYLLABLE M003 KU
@@ -24790,6 +26695,9 @@ return <<'END';
 1F32A	CLOUD WITH TORNADO
 1F32B	FOG
 1F32C	WIND BLOWING FACE
+1F32D	HOT DOG
+1F32E	TACO
+1F32F	BURRITO
 1F330	CHESTNUT
 1F331	SEEDLING
 1F332	EVERGREEN TREE
@@ -24868,6 +26776,8 @@ return <<'END';
 1F37B	CLINKING BEER MUGS
 1F37C	BABY BOTTLE
 1F37D	FORK AND KNIFE WITH PLATE
+1F37E	BOTTLE WITH POPPING CORK
+1F37F	POPCORN
 1F380	RIBBON
 1F381	WRAPPED PRESENT
 1F382	BIRTHDAY CAKE
@@ -24947,6 +26857,11 @@ return <<'END';
 1F3CC	GOLFER
 1F3CD	RACING MOTORCYCLE
 1F3CE	RACING CAR
+1F3CF	CRICKET BAT AND BALL
+1F3D0	VOLLEYBALL
+1F3D1	FIELD HOCKEY STICK AND BALL
+1F3D2	ICE HOCKEY STICK AND PUCK
+1F3D3	TABLE TENNIS PADDLE AND BALL
 1F3D4	SNOW CAPPED MOUNTAIN
 1F3D5	CAMPING
 1F3D6	BEACH WITH UMBRELLA
@@ -24983,6 +26898,14 @@ return <<'END';
 1F3F5	ROSETTE
 1F3F6	BLACK ROSETTE
 1F3F7	LABEL
+1F3F8	BADMINTON RACQUET AND SHUTTLECOCK
+1F3F9	BOW AND ARROW
+1F3FA	AMPHORA
+1F3FB	EMOJI MODIFIER FITZPATRICK TYPE-1-2
+1F3FC	EMOJI MODIFIER FITZPATRICK TYPE-3
+1F3FD	EMOJI MODIFIER FITZPATRICK TYPE-4
+1F3FE	EMOJI MODIFIER FITZPATRICK TYPE-5
+1F3FF	EMOJI MODIFIER FITZPATRICK TYPE-6
 1F400	RAT
 1F401	MOUSE
 1F402	OX
@@ -25238,6 +27161,7 @@ return <<'END';
 1F4FC	VIDEOCASSETTE
 1F4FD	FILM PROJECTOR
 1F4FE	PORTABLE STEREO
+1F4FF	PRAYER BEADS
 1F500	TWISTED RIGHTWARDS ARROWS
 1F501	CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS
 1F502	CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY
@@ -25313,6 +27237,11 @@ return <<'END';
 1F548	CELTIC CROSS
 1F549	OM SYMBOL
 1F54A	DOVE OF PEACE
+1F54B	KAABA
+1F54C	MOSQUE
+1F54D	SYNAGOGUE
+1F54E	MENORAH WITH NINE BRANCHES
+1F54F	BOWL OF HYGIEIA
 1F550	CLOCK FACE ONE OCLOCK
 1F551	CLOCK FACE TWO OCLOCK
 1F552	CLOCK FACE THREE OCLOCK
@@ -25554,6 +27483,8 @@ return <<'END';
 1F640	WEARY CAT FACE
 1F641	SLIGHTLY FROWNING FACE
 1F642	SLIGHTLY SMILING FACE
+1F643	UPSIDE-DOWN FACE
+1F644	FACE WITH ROLLING EYES
 1F645	FACE WITH NO GOOD GESTURE
 1F646	FACE WITH OK GESTURE
 1F647	PERSON BOWING DEEPLY
@@ -25693,6 +27624,7 @@ return <<'END';
 1F6CD	SHOPPING BAGS
 1F6CE	BELLHOP BELL
 1F6CF	BED
+1F6D0	PLACE OF WORSHIP
 1F6E0	HAMMER AND WRENCH
 1F6E1	SHIELD
 1F6E2	OIL DRUM
@@ -26059,6 +27991,21 @@ return <<'END';
 1F8AB	RIGHTWARDS FRONT-TILTED SHADOWED WHITE ARROW
 1F8AC	WHITE ARROW SHAFT WIDTH ONE
 1F8AD	WHITE ARROW SHAFT WIDTH TWO THIRDS
+1F910	ZIPPER-MOUTH FACE
+1F911	MONEY-MOUTH FACE
+1F912	FACE WITH THERMOMETER
+1F913	NERD FACE
+1F914	THINKING FACE
+1F915	FACE WITH HEAD-BANDAGE
+1F916	ROBOT FACE
+1F917	HUGGING FACE
+1F918	SIGN OF THE HORNS
+1F980	CRAB
+1F981	LION FACE
+1F982	SCORPION
+1F983	TURKEY
+1F984	UNICORN FACE
+1F9C0	CHEESE WEDGE
 E0001	LANGUAGE TAG
 E0020	TAG SPACE
 E0021	TAG EXCLAMATION MARK
diff --git a/Master/tlpkg/tlperl/lib/unicore/Name.pm b/Master/tlpkg/tlperl/lib/unicore/Name.pm
index 6ffd8c9510f..bf7856805e6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/Name.pm
+++ b/Master/tlpkg/tlperl/lib/unicore/Name.pm
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
@@ -52,10 +52,11 @@ package charnames;
 'high' => 
 [
 19893,
-40908,
+40917,
 173782,
 177972,
 178205,
+183969,
 ],
 'low' => 
 [
@@ -64,6 +65,7 @@ package charnames;
 131072,
 173824,
 177984,
+178208,
 ],
 },
 
@@ -92,10 +94,11 @@ package charnames;
 'high' => 
 [
 19893,
-40908,
+40917,
 173782,
 177972,
 178205,
+183969,
 ],
 'low' => 
 [
@@ -104,6 +107,7 @@ package charnames;
 131072,
 173824,
 177984,
+178208,
 ],
 },
 
@@ -119,7 +123,7 @@ package charnames;
 'name' => 'CJK UNIFIED IDEOGRAPH',
 },
 {
-'high' => 40908,
+'high' => 40917,
 'low' => 19968,
 'name' => 'CJK UNIFIED IDEOGRAPH',
 },
@@ -149,6 +153,11 @@ package charnames;
 'name' => 'CJK UNIFIED IDEOGRAPH',
 },
 {
+'high' => 183969,
+'low' => 178208,
+'name' => 'CJK UNIFIED IDEOGRAPH',
+},
+{
 'high' => 195101,
 'low' => 194560,
 'name' => 'CJK COMPATIBILITY IDEOGRAPH',
diff --git a/Master/tlpkg/tlperl/lib/unicore/NamedSequences.txt b/Master/tlpkg/tlperl/lib/unicore/NamedSequences.txt
index 87b25cfa154..b1bfc2f0a31 100644
--- a/Master/tlpkg/tlperl/lib/unicore/NamedSequences.txt
+++ b/Master/tlpkg/tlperl/lib/unicore/NamedSequences.txt
@@ -1,12 +1,12 @@
-# NamedSequences-7.0.0.txt
-# Date: 2014-01-24, 15:00:00 GMT [KW, LI]
+# NamedSequences-8.0.0.txt
+# Date: 2015-02-19, 00:30:00 GMT [KW, LI]
 #
 # Unicode Named Character Sequences
 #
 # This file is a normative contributory data file in the Unicode
 # Character Database.
 #
-# Copyright (c) 1991-2014 Unicode, Inc.
+# Copyright (c) 1991-2015 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Format:
diff --git a/Master/tlpkg/tlperl/lib/unicore/SpecialCasing.txt b/Master/tlpkg/tlperl/lib/unicore/SpecialCasing.txt
index 43645bd2d10..8de6462f18c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/SpecialCasing.txt
+++ b/Master/tlpkg/tlperl/lib/unicore/SpecialCasing.txt
@@ -1,5 +1,5 @@
-# SpecialCasing-7.0.0.txt
-# Date: 2014-03-18, 07:18:02 GMT [MD]
+# SpecialCasing-8.0.0.txt
+# Date: 2014-12-16, 23:08:04 GMT [MD]
 #
 # Unicode Character Database
 # Copyright (c) 1991-2014 Unicode, Inc.
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Age.pl b/Master/tlpkg/tlperl/lib/unicore/To/Age.pl
index 137016f839c..a4b80209b5d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Age.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Age.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -171,6 +171,8 @@ return <<'END';
 8A1		7.0
 8A2	8AC	6.1
 8AD	8B2	7.0
+8B3	8B4	8.0
+8E3		8.0
 8E4	8FE	6.1
 8FF		7.0
 900		5.2
@@ -248,6 +250,7 @@ AE1	AE3	4.0
 AE6	AEF	1.1
 AF0		6.1
 AF1		4.0
+AF9		8.0
 B01	B03	1.1
 B05	B0C	1.1
 B0F	B10	1.1
@@ -301,6 +304,7 @@ C46	C48	1.1
 C4A	C4D	1.1
 C55	C56	1.1
 C58	C59	5.1
+C5A		8.0
 C60	C61	1.1
 C62	C63	5.1
 C66	C6F	1.1
@@ -337,6 +341,7 @@ D46	D48	1.1
 D4A	D4D	1.1
 D4E		6.0
 D57		1.1
+D5F		8.0
 D60	D61	1.1
 D62	D63	5.1
 D66	D6F	1.1
@@ -465,6 +470,8 @@ FD9	FDA	6.0
 1361	137C	3.0
 1380	1399	4.1
 13A0	13F4	3.0
+13F5		8.0
+13F8	13FD	8.0
 1400		5.2
 1401	1676	3.0
 1677	167F	5.2
@@ -582,6 +589,7 @@ FD9	FDA	6.0
 20B9		6.0
 20BA		6.2
 20BB	20BD	7.0
+20BE		8.0
 20D0	20E1	1.1
 20E2	20E3	3.0
 20E4	20EA	3.2
@@ -602,6 +610,7 @@ FD9	FDA	6.0
 2184		5.0
 2185	2188	5.1
 2189		5.2
+218A	218B	8.0
 2190	21EA	1.1
 21EB	21F3	3.0
 21F4	21FF	3.2
@@ -708,6 +717,7 @@ FD9	FDA	6.0
 2B98	2BB9	7.0
 2BBD	2BC8	7.0
 2BCA	2BD1	7.0
+2BEC	2BEF	8.0
 2C00	2C2E	4.1
 2C30	2C5E	4.1
 2C60	2C6C	5.0
@@ -796,6 +806,7 @@ FD9	FDA	6.0
 9FBC	9FC3	5.1
 9FC4	9FCB	5.2
 9FCC		6.1
+9FCD	9FD5	8.0
 A000	A48C	3.0
 A490	A4A1	3.0
 A4A2	A4A3	3.2
@@ -814,6 +825,7 @@ A662	A673	5.1
 A674	A67B	6.1
 A67C	A697	5.1
 A698	A69D	7.0
+A69E		8.0
 A69F		6.1
 A6A0	A6F7	5.2
 A700	A716	4.1
@@ -822,6 +834,7 @@ A71B	A71F	5.1
 A720	A721	5.0
 A722	A78C	5.1
 A78D	A78E	6.0
+A78F		8.0
 A790	A791	6.0
 A792	A793	6.1
 A794	A79F	7.0
@@ -829,6 +842,7 @@ A7A0	A7A9	6.0
 A7AA		6.1
 A7AB	A7AD	7.0
 A7B0	A7B1	7.0
+A7B2	A7B7	8.0
 A7F7		7.0
 A7F8	A7F9	6.1
 A7FA		6.0
@@ -839,6 +853,7 @@ A840	A877	5.0
 A880	A8C4	5.1
 A8CE	A8D9	5.1
 A8E0	A8FB	5.2
+A8FC	A8FD	8.0
 A900	A953	5.1
 A95F		5.1
 A960	A97C	5.2
@@ -861,7 +876,9 @@ AB11	AB16	6.0
 AB20	AB26	6.0
 AB28	AB2E	6.0
 AB30	AB5F	7.0
+AB60	AB63	8.0
 AB64	AB65	7.0
+AB70	ABBF	8.0
 ABC0	ABED	5.2
 ABF0	ABF9	5.2
 AC00	D7A3	2.0
@@ -895,6 +912,7 @@ FE10	FE19	4.1
 FE20	FE23	1.1
 FE24	FE26	5.1
 FE27	FE2D	7.0
+FE2E	FE2F	8.0
 FE30	FE44	1.1
 FE45	FE46	3.2
 FE47	FE48	4.0
@@ -966,13 +984,19 @@ FFFD	FFFF	1.1
 10857	1085F	5.2
 10860	1089E	7.0
 108A7	108AF	7.0
+108E0	108F2	8.0
+108F4	108F5	8.0
+108FB	108FF	8.0
 10900	10919	5.0
 1091A	1091B	5.2
 1091F		5.0
 10920	10939	5.1
 1093F		5.1
 10980	109B7	6.1
+109BC	109BD	8.0
 109BE	109BF	6.1
+109C0	109CF	8.0
+109D2	109FF	8.0
 10A00	10A03	4.1
 10A05	10A06	4.1
 10A0C	10A13	4.1
@@ -993,6 +1017,9 @@ FFFD	FFFF	1.1
 10B99	10B9C	7.0
 10BA9	10BAF	7.0
 10C00	10C48	5.2
+10C80	10CB2	8.0
+10CC0	10CF2	8.0
+10CFA	10CFF	8.0
 10E60	10E7E	5.2
 11000	1104D	6.0
 11052	1106F	6.0
@@ -1004,14 +1031,22 @@ FFFD	FFFF	1.1
 11136	11143	6.1
 11150	11176	7.0
 11180	111C8	6.1
+111C9	111CC	8.0
 111CD		7.0
 111D0	111D9	6.1
 111DA		7.0
+111DB	111DF	8.0
 111E1	111F4	7.0
 11200	11211	7.0
 11213	1123D	7.0
+11280	11286	8.0
+11288		8.0
+1128A	1128D	8.0
+1128F	1129D	8.0
+1129F	112A9	8.0
 112B0	112EA	7.0
 112F0	112F9	7.0
+11300		8.0
 11301	11303	7.0
 11305	1130C	7.0
 1130F	11310	7.0
@@ -1022,6 +1057,7 @@ FFFD	FFFF	1.1
 1133C	11344	7.0
 11347	11348	7.0
 1134B	1134D	7.0
+11350		8.0
 11357		7.0
 1135D	11363	7.0
 11366	1136C	7.0
@@ -1030,20 +1066,27 @@ FFFD	FFFF	1.1
 114D0	114D9	7.0
 11580	115B5	7.0
 115B8	115C9	7.0
+115CA	115DD	8.0
 11600	11644	7.0
 11650	11659	7.0
 11680	116B7	6.1
 116C0	116C9	6.1
+11700	11719	8.0
+1171D	1172B	8.0
+11730	1173F	8.0
 118A0	118F2	7.0
 118FF		7.0
 11AC0	11AF8	7.0
 12000	1236E	5.0
 1236F	12398	7.0
+12399		8.0
 12400	12462	5.0
 12463	1246E	7.0
 12470	12473	5.0
 12474		7.0
+12480	12543	8.0
 13000	1342E	5.2
+14400	14646	8.0
 16800	16A38	6.0
 16A40	16A5E	7.0
 16A60	16A69	7.0
@@ -1068,6 +1111,7 @@ FFFD	FFFF	1.1
 1D100	1D126	3.1
 1D129		5.1
 1D12A	1D1DD	3.1
+1D1DE	1D1E8	8.0
 1D200	1D245	4.1
 1D300	1D356	4.0
 1D360	1D371	5.0
@@ -1096,6 +1140,9 @@ FFFD	FFFF	1.1
 1D6A8	1D7C9	3.1
 1D7CA	1D7CB	5.0
 1D7CE	1D7FF	3.1
+1D800	1DA8B	8.0
+1DA9B	1DA9F	8.0
+1DAA1	1DAAF	8.0
 1E800	1E8C4	7.0
 1E8C7	1E8D6	7.0
 1EE00	1EE03	6.1
@@ -1181,19 +1228,23 @@ FFFD	FFFF	1.1
 1F250	1F251	6.0
 1F300	1F320	6.0
 1F321	1F32C	7.0
+1F32D	1F32F	8.0
 1F330	1F335	6.0
 1F336		7.0
 1F337	1F37C	6.0
 1F37D		7.0
+1F37E	1F37F	8.0
 1F380	1F393	6.0
 1F394	1F39F	7.0
 1F3A0	1F3C4	6.0
 1F3C5		7.0
 1F3C6	1F3CA	6.0
 1F3CB	1F3CE	7.0
+1F3CF	1F3D3	8.0
 1F3D4	1F3DF	7.0
 1F3E0	1F3F0	6.0
 1F3F1	1F3F7	7.0
+1F3F8	1F3FF	8.0
 1F400	1F43E	6.0
 1F43F		7.0
 1F440		6.0
@@ -1202,10 +1253,12 @@ FFFD	FFFF	1.1
 1F4F8		7.0
 1F4F9	1F4FC	6.0
 1F4FD	1F4FE	7.0
+1F4FF		8.0
 1F500	1F53D	6.0
 1F53E	1F53F	7.0
 1F540	1F543	6.1
 1F544	1F54A	7.0
+1F54B	1F54F	8.0
 1F550	1F567	6.0
 1F568	1F579	7.0
 1F57B	1F5A3	7.0
@@ -1234,10 +1287,12 @@ FFFD	FFFF	1.1
 1F634		6.1
 1F635	1F640	6.0
 1F641	1F642	7.0
+1F643	1F644	8.0
 1F645	1F64F	6.0
 1F650	1F67F	7.0
 1F680	1F6C5	6.0
 1F6C6	1F6CF	7.0
+1F6D0		8.0
 1F6E0	1F6EC	7.0
 1F6F0	1F6F3	7.0
 1F700	1F773	6.0
@@ -1247,10 +1302,14 @@ FFFD	FFFF	1.1
 1F850	1F859	7.0
 1F860	1F887	7.0
 1F890	1F8AD	7.0
+1F910	1F918	8.0
+1F980	1F984	8.0
+1F9C0		8.0
 1FFFE	1FFFF	2.0
 20000	2A6D6	3.1
 2A700	2B734	5.2
 2B740	2B81D	6.0
+2B820	2CEA1	8.0
 2F800	2FA1D	3.1
 2FFFE	2FFFF	2.0
 3FFFE	3FFFF	2.0
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Bc.pl b/Master/tlpkg/tlperl/lib/unicore/To/Bc.pl
index a550b85cb4e..c976eb1182d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Bc.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Bc.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -132,8 +132,8 @@ F7		ON
 82E	858	R
 859	85B	NSM
 85C	89F	R
-8A0	8E3	AL
-8E4	902	NSM
+8A0	8E2	AL
+8E3	902	NSM
 93A		NSM
 93C		NSM
 941	948	NSM
@@ -336,7 +336,7 @@ FC6		NSM
 2140	2144	ON
 214A	214D	ON
 2150	215F	ON
-2189		ON
+2189	218B	ON
 2190	2211	ON
 2212		ES
 2213		ET
@@ -354,6 +354,7 @@ FC6		NSM
 2B98	2BB9	ON
 2BBD	2BC8	ON
 2BCA	2BD1	ON
+2BEC	2BEF	ON
 2CE5	2CEA	ON
 2CEF	2CF1	NSM
 2CF9	2CFF	ON
@@ -391,7 +392,7 @@ A66F	A672	NSM
 A673		ON
 A674	A67D	NSM
 A67E	A67F	ON
-A69F		NSM
+A69E	A69F	NSM
 A6F0	A6F1	NSM
 A700	A721	ON
 A788		ON
@@ -441,7 +442,7 @@ FDFD		ON
 FDFE	FDFF	AL
 FE00	FE0F	NSM
 FE10	FE19	ON
-FE20	FE2D	NSM
+FE20	FE2F	NSM
 FE30	FE4F	ON
 FE50		CS
 FE51		ON
@@ -516,12 +517,13 @@ FFFE	FFFF	BN
 11173		NSM
 11180	11181	NSM
 111B6	111BE	NSM
+111CA	111CC	NSM
 1122F	11231	NSM
 11234		NSM
 11236	11237	NSM
 112DF		NSM
 112E3	112EA	NSM
-11301		NSM
+11300	11301	NSM
 1133C		NSM
 11340		NSM
 11366	1136C	NSM
@@ -533,6 +535,7 @@ FFFE	FFFF	BN
 115B2	115B5	NSM
 115BC	115BD	NSM
 115BF	115C0	NSM
+115DC	115DD	NSM
 11633	1163A	NSM
 1163D		NSM
 1163F	11640	NSM
@@ -540,6 +543,9 @@ FFFE	FFFF	BN
 116AD		NSM
 116B0	116B5	NSM
 116B7		NSM
+1171D	1171F	NSM
+11722	11725	NSM
+11727	1172B	NSM
 16AF0	16AF4	NSM
 16B30	16B36	NSM
 16F8F	16F92	NSM
@@ -560,6 +566,12 @@ FFFE	FFFF	BN
 1D789		ON
 1D7C3		ON
 1D7CE	1D7FF	EN
+1DA00	1DA36	NSM
+1DA3B	1DA6C	NSM
+1DA75		NSM
+1DA84		NSM
+1DA9B	1DA9F	NSM
+1DAA1	1DAAF	NSM
 1E800	1E8CF	R
 1E8D0	1E8D6	NSM
 1E8D7	1EDFF	R
@@ -576,16 +588,9 @@ FFFE	FFFF	BN
 1F100	1F10A	EN
 1F10B	1F10C	ON
 1F16A	1F16B	ON
-1F300	1F32C	ON
-1F330	1F37D	ON
-1F380	1F3CE	ON
-1F3D4	1F3F7	ON
-1F400	1F4FE	ON
-1F500	1F54A	ON
-1F550	1F579	ON
+1F300	1F579	ON
 1F57B	1F5A3	ON
-1F5A5	1F642	ON
-1F645	1F6CF	ON
+1F5A5	1F6D0	ON
 1F6E0	1F6EC	ON
 1F6F0	1F6F3	ON
 1F700	1F773	ON
@@ -595,6 +600,9 @@ FFFE	FFFF	BN
 1F850	1F859	ON
 1F860	1F887	ON
 1F890	1F8AD	ON
+1F910	1F918	ON
+1F980	1F984	ON
+1F9C0		ON
 1FFFE	1FFFF	BN
 2FFFE	2FFFF	BN
 3FFFE	3FFFF	BN
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Bmg.pl b/Master/tlpkg/tlperl/lib/unicore/To/Bmg.pl
index edded13892d..86f148a157c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Bmg.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Bmg.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   IT IS DEPRECATED TO USE THIS FILE   !!!!!!!
 
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Bpb.pl b/Master/tlpkg/tlperl/lib/unicore/To/Bpb.pl
index 0ed344d7554..d13e97d8423 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Bpb.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Bpb.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Bpt.pl b/Master/tlpkg/tlperl/lib/unicore/To/Bpt.pl
index 9bd67e1a2fc..c32005b12ff 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Bpt.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Bpt.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Cf.pl b/Master/tlpkg/tlperl/lib/unicore/To/Cf.pl
index 92aae0c85dd..70456d50fc8 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Cf.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Cf.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -450,6 +450,7 @@ D8	DE	F8
 10A0	10C5	2D00
 10C7		2D27
 10CD		2D2D
+13F8	13FD	13F0
 1E00		1E01
 1E02		1E03
 1E04		1E05
@@ -780,7 +781,13 @@ A7AC		261
 A7AD		26C
 A7B0		29E
 A7B1		287
+A7B2		29D
+A7B3		AB53
+A7B4		A7B5
+A7B6		A7B7
+AB70	ABBF	13A0
 FF21	FF3A	FF41
 10400	10427	10428
+10C80	10CB2	10CC0
 118A0	118BF	118C0
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Digit.pl b/Master/tlpkg/tlperl/lib/unicore/To/Digit.pl
index a2a6cdca125..ecd94224284 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Digit.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Digit.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   IT IS DEPRECATED TO USE THIS FILE   !!!!!!!
 
@@ -481,6 +481,16 @@ FF19		9
 116C7		7
 116C8		8
 116C9		9
+11730		0
+11731		1
+11732		2
+11733		3
+11734		4
+11735		5
+11736		6
+11737		7
+11738		8
+11739		9
 118E0		0
 118E1		1
 118E2		2
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Ea.pl b/Master/tlpkg/tlperl/lib/unicore/To/Ea.pl
index f1225d653e1..355ccb3e478 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Ea.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Ea.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Fold.pl b/Master/tlpkg/tlperl/lib/unicore/To/Fold.pl
index 461349f06be..71165326d00 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Fold.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Fold.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   IT IS DEPRECATED TO USE THIS FILE   !!!!!!!
 
@@ -655,6 +655,12 @@ return <<'END';
 10C5		2D25
 10C7		2D27
 10CD		2D2D
+13F8		13F0
+13F9		13F1
+13FA		13F2
+13FB		13F3
+13FC		13F4
+13FD		13F5
 1E00		1E01
 1E02		1E03
 1E04		1E05
@@ -1142,6 +1148,90 @@ A7AC		0261
 A7AD		026C
 A7B0		029E
 A7B1		0287
+A7B2		029D
+A7B3		AB53
+A7B4		A7B5
+A7B6		A7B7
+AB70		13A0
+AB71		13A1
+AB72		13A2
+AB73		13A3
+AB74		13A4
+AB75		13A5
+AB76		13A6
+AB77		13A7
+AB78		13A8
+AB79		13A9
+AB7A		13AA
+AB7B		13AB
+AB7C		13AC
+AB7D		13AD
+AB7E		13AE
+AB7F		13AF
+AB80		13B0
+AB81		13B1
+AB82		13B2
+AB83		13B3
+AB84		13B4
+AB85		13B5
+AB86		13B6
+AB87		13B7
+AB88		13B8
+AB89		13B9
+AB8A		13BA
+AB8B		13BB
+AB8C		13BC
+AB8D		13BD
+AB8E		13BE
+AB8F		13BF
+AB90		13C0
+AB91		13C1
+AB92		13C2
+AB93		13C3
+AB94		13C4
+AB95		13C5
+AB96		13C6
+AB97		13C7
+AB98		13C8
+AB99		13C9
+AB9A		13CA
+AB9B		13CB
+AB9C		13CC
+AB9D		13CD
+AB9E		13CE
+AB9F		13CF
+ABA0		13D0
+ABA1		13D1
+ABA2		13D2
+ABA3		13D3
+ABA4		13D4
+ABA5		13D5
+ABA6		13D6
+ABA7		13D7
+ABA8		13D8
+ABA9		13D9
+ABAA		13DA
+ABAB		13DB
+ABAC		13DC
+ABAD		13DD
+ABAE		13DE
+ABAF		13DF
+ABB0		13E0
+ABB1		13E1
+ABB2		13E2
+ABB3		13E3
+ABB4		13E4
+ABB5		13E5
+ABB6		13E6
+ABB7		13E7
+ABB8		13E8
+ABB9		13E9
+ABBA		13EA
+ABBB		13EB
+ABBC		13EC
+ABBD		13ED
+ABBE		13EE
+ABBF		13EF
 FF21		FF41
 FF22		FF42
 FF23		FF43
@@ -1208,6 +1298,57 @@ FF3A		FF5A
 10425		1044D
 10426		1044E
 10427		1044F
+10C80		10CC0
+10C81		10CC1
+10C82		10CC2
+10C83		10CC3
+10C84		10CC4
+10C85		10CC5
+10C86		10CC6
+10C87		10CC7
+10C88		10CC8
+10C89		10CC9
+10C8A		10CCA
+10C8B		10CCB
+10C8C		10CCC
+10C8D		10CCD
+10C8E		10CCE
+10C8F		10CCF
+10C90		10CD0
+10C91		10CD1
+10C92		10CD2
+10C93		10CD3
+10C94		10CD4
+10C95		10CD5
+10C96		10CD6
+10C97		10CD7
+10C98		10CD8
+10C99		10CD9
+10C9A		10CDA
+10C9B		10CDB
+10C9C		10CDC
+10C9D		10CDD
+10C9E		10CDE
+10C9F		10CDF
+10CA0		10CE0
+10CA1		10CE1
+10CA2		10CE2
+10CA3		10CE3
+10CA4		10CE4
+10CA5		10CE5
+10CA6		10CE6
+10CA7		10CE7
+10CA8		10CE8
+10CA9		10CE9
+10CAA		10CEA
+10CAB		10CEB
+10CAC		10CEC
+10CAD		10CED
+10CAE		10CEE
+10CAF		10CEF
+10CB0		10CF0
+10CB1		10CF1
+10CB2		10CF2
 118A0		118C0
 118A1		118C1
 118A2		118C2
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/GCB.pl b/Master/tlpkg/tlperl/lib/unicore/To/GCB.pl
index abb690ed499..cd736e70284 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/GCB.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/GCB.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -51,7 +51,7 @@ AD		Control
 825	827	Extend
 829	82D	Extend
 859	85B	Extend
-8E4	902	Extend
+8E3	902	Extend
 903		SpacingMark
 93A		Extend
 93B		SpacingMark
@@ -218,8 +218,6 @@ FC6		Extend
 1932		Extend
 1933	1938	SpacingMark
 1939	193B	Extend
-19B5	19B7	SpacingMark
-19BA		SpacingMark
 1A17	1A18	Extend
 1A19	1A1A	SpacingMark
 1A1B		Extend
@@ -288,7 +286,7 @@ FC6		Extend
 3099	309A	Extend
 A66F	A672	Extend
 A674	A67D	Extend
-A69F		Extend
+A69E	A69F	Extend
 A6F0	A6F1	Extend
 A802		Extend
 A806		Extend
@@ -1142,7 +1140,7 @@ D7CB	D7FB	T
 D800	DFFF	Control
 FB1E		Extend
 FE00	FE0F	Extend
-FE20	FE2D	Extend
+FE20	FE2F	Extend
 FEFF		Control
 FF9E	FF9F	Extend
 FFF0	FFFB	Control
@@ -1176,6 +1174,7 @@ FFF0	FFFB	Control
 111B3	111B5	SpacingMark
 111B6	111BE	Extend
 111BF	111C0	SpacingMark
+111CA	111CC	Extend
 1122C	1122E	SpacingMark
 1122F	11231	Extend
 11232	11233	SpacingMark
@@ -1185,7 +1184,7 @@ FFF0	FFFB	Control
 112DF		Extend
 112E0	112E2	SpacingMark
 112E3	112EA	Extend
-11301		Extend
+11300	11301	Extend
 11302	11303	SpacingMark
 1133C		Extend
 1133E		Extend
@@ -1216,6 +1215,7 @@ FFF0	FFFB	Control
 115BC	115BD	Extend
 115BE		SpacingMark
 115BF	115C0	Extend
+115DC	115DD	Extend
 11630	11632	SpacingMark
 11633	1163A	Extend
 1163B	1163C	SpacingMark
@@ -1229,6 +1229,11 @@ FFF0	FFFB	Control
 116B0	116B5	Extend
 116B6		SpacingMark
 116B7		Extend
+1171D	1171F	Extend
+11720	11721	SpacingMark
+11722	11725	Extend
+11726		SpacingMark
+11727	1172B	Extend
 16AF0	16AF4	Extend
 16B30	16B36	Extend
 16F51	16F7E	SpacingMark
@@ -1245,6 +1250,12 @@ FFF0	FFFB	Control
 1D185	1D18B	Extend
 1D1AA	1D1AD	Extend
 1D242	1D244	Extend
+1DA00	1DA36	Extend
+1DA3B	1DA6C	Extend
+1DA75		Extend
+1DA84		Extend
+1DA9B	1DA9F	Extend
+1DAA1	1DAAF	Extend
 1E8D0	1E8D6	Extend
 1F1E6	1F1FF	Regional_Indicator
 E0000	E00FF	Control
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Gc.pl b/Master/tlpkg/tlperl/lib/unicore/To/Gc.pl
index 173607104d3..02079072afa 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Gc.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Gc.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -14,7 +14,7 @@
 # the main body of the table, and what all code points missing from this file
 # map to.
 $utf8::SwashInfo{'ToGc'}{'format'} = 's'; # string
-$utf8::SwashInfo{'ToGc'}{'missing'} = 'Unassigned';
+$utf8::SwashInfo{'ToGc'}{'missing'} = 'Cn';
 
 return <<'END';
 0	1F	Cc
@@ -720,8 +720,8 @@ F8	FF	Ll
 840	858	Lo
 859	85B	Mn
 85E		Po
-8A0	8B2	Lo
-8E4	902	Mn
+8A0	8B4	Lo
+8E3	902	Mn
 903		Mc
 904	939	Lo
 93A		Mn
@@ -811,6 +811,7 @@ AE2	AE3	Mn
 AE6	AEF	Nd
 AF0		Po
 AF1		Sc
+AF9		Lo
 B01		Mn
 B02	B03	Mc
 B05	B0C	Lo
@@ -873,7 +874,7 @@ C41	C44	Mc
 C46	C48	Mn
 C4A	C4D	Mn
 C55	C56	Mn
-C58	C59	Lo
+C58	C5A	Lo
 C60	C61	Lo
 C62	C63	Mn
 C66	C6F	Nd
@@ -914,7 +915,7 @@ D4A	D4C	Mc
 D4D		Mn
 D4E		Lo
 D57		Mc
-D60	D61	Lo
+D5F	D61	Lo
 D62	D63	Mn
 D66	D6F	Nd
 D70	D75	No
@@ -1067,7 +1068,8 @@ FD9	FDA	Po
 1369	137C	No
 1380	138F	Lo
 1390	1399	So
-13A0	13F4	Lo
+13A0	13F5	Lu
+13F8	13FD	Ll
 1400		Pd
 1401	166C	Lo
 166D	166E	Po
@@ -1135,9 +1137,7 @@ FD9	FDA	Po
 1950	196D	Lo
 1970	1974	Lo
 1980	19AB	Lo
-19B0	19C0	Mc
-19C1	19C7	Lo
-19C8	19C9	Mc
+19B0	19C9	Lo
 19D0	19D9	Nd
 19DA		No
 19DE	19FF	So
@@ -1577,7 +1577,7 @@ FD9	FDA	Po
 208D		Ps
 208E		Pe
 2090	209C	Lm
-20A0	20BD	Sc
+20A0	20BE	Sc
 20D0	20DC	Mn
 20DD	20E0	Me
 20E1		Mn
@@ -1629,6 +1629,7 @@ FD9	FDA	Po
 2184		Ll
 2185	2188	Nl
 2189		No
+218A	218B	So
 2190	2194	Sm
 2195	2199	So
 219A	219B	Sm
@@ -1752,6 +1753,7 @@ FD9	FDA	Po
 2B98	2BB9	So
 2BBD	2BC8	So
 2BCA	2BD1	So
+2BEC	2BEF	So
 2C00	2C2E	Lu
 2C30	2C5E	Ll
 2C60		Lu
@@ -2012,7 +2014,7 @@ FD9	FDA	Po
 3300	33FF	So
 3400	4DB5	Lo
 4DC0	4DFF	So
-4E00	9FCC	Lo
+4E00	9FD5	Lo
 A000	A014	Lo
 A015		Lm
 A016	A48C	Lo
@@ -2108,7 +2110,7 @@ A699		Ll
 A69A		Lu
 A69B		Ll
 A69C	A69D	Lm
-A69F		Mn
+A69E	A69F	Mn
 A6A0	A6E5	Lo
 A6E6	A6EF	Nl
 A6F0	A6F1	Mn
@@ -2214,6 +2216,7 @@ A78B		Lu
 A78C		Ll
 A78D		Lu
 A78E		Ll
+A78F		Lo
 A790		Lu
 A791		Ll
 A792		Lu
@@ -2239,7 +2242,10 @@ A7A7		Ll
 A7A8		Lu
 A7A9		Ll
 A7AA	A7AD	Lu
-A7B0	A7B1	Lu
+A7B0	A7B4	Lu
+A7B5		Ll
+A7B6		Lu
+A7B7		Ll
 A7F7		Lo
 A7F8	A7F9	Lm
 A7FA		Ll
@@ -2270,6 +2276,8 @@ A8E0	A8F1	Mn
 A8F2	A8F7	Lo
 A8F8	A8FA	Po
 A8FB		Lo
+A8FC		Po
+A8FD		Lo
 A900	A909	Nd
 A90A	A925	Lo
 A926	A92D	Mn
@@ -2350,7 +2358,8 @@ AB28	AB2E	Lo
 AB30	AB5A	Ll
 AB5B		Sk
 AB5C	AB5F	Lm
-AB64	AB65	Ll
+AB60	AB65	Ll
+AB70	ABBF	Ll
 ABC0	ABE2	Lo
 ABE3	ABE4	Mc
 ABE5		Mn
@@ -2394,7 +2403,7 @@ FE10	FE16	Po
 FE17		Ps
 FE18		Pe
 FE19		Po
-FE20	FE2D	Mn
+FE20	FE2F	Mn
 FE30		Po
 FE31	FE32	Pd
 FE33	FE34	Pc
@@ -2549,13 +2558,19 @@ FFFC	FFFD	So
 10879	1087F	No
 10880	1089E	Lo
 108A7	108AF	No
+108E0	108F2	Lo
+108F4	108F5	Lo
+108FB	108FF	No
 10900	10915	Lo
 10916	1091B	No
 1091F		Po
 10920	10939	Lo
 1093F		Po
 10980	109B7	Lo
+109BC	109BD	No
 109BE	109BF	Lo
+109C0	109CF	No
+109D2	109FF	No
 10A00		Lo
 10A01	10A03	Mn
 10A05	10A06	Mn
@@ -2588,6 +2603,9 @@ FFFC	FFFD	So
 10B99	10B9C	Po
 10BA9	10BAF	No
 10C00	10C48	Lo
+10C80	10CB2	Lu
+10CC0	10CF2	Ll
+10CFA	10CFF	No
 10E60	10E7E	No
 11000		Mc
 11001		Mn
@@ -2627,10 +2645,14 @@ FFFC	FFFD	So
 111B6	111BE	Mn
 111BF	111C0	Mc
 111C1	111C4	Lo
-111C5	111C8	Po
+111C5	111C9	Po
+111CA	111CC	Mn
 111CD		Po
 111D0	111D9	Nd
 111DA		Lo
+111DB		Po
+111DC		Lo
+111DD	111DF	Po
 111E1	111F4	No
 11200	11211	Lo
 11213	1122B	Lo
@@ -2641,12 +2663,18 @@ FFFC	FFFD	So
 11235		Mc
 11236	11237	Mn
 11238	1123D	Po
+11280	11286	Lo
+11288		Lo
+1128A	1128D	Lo
+1128F	1129D	Lo
+1129F	112A8	Lo
+112A9		Po
 112B0	112DE	Lo
 112DF		Mn
 112E0	112E2	Mc
 112E3	112EA	Mn
 112F0	112F9	Nd
-11301		Mn
+11300	11301	Mn
 11302	11303	Mc
 11305	1130C	Lo
 1130F	11310	Lo
@@ -2661,6 +2689,7 @@ FFFC	FFFD	So
 11341	11344	Mc
 11347	11348	Mc
 1134B	1134D	Mc
+11350		Lo
 11357		Mc
 1135D	11361	Lo
 11362	11363	Mc
@@ -2686,7 +2715,9 @@ FFFC	FFFD	So
 115BC	115BD	Mn
 115BE		Mc
 115BF	115C0	Mn
-115C1	115C9	Po
+115C1	115D7	Po
+115D8	115DB	Lo
+115DC	115DD	Mn
 11600	1162F	Lo
 11630	11632	Mc
 11633	1163A	Mn
@@ -2706,16 +2737,28 @@ FFFC	FFFD	So
 116B6		Mc
 116B7		Mn
 116C0	116C9	Nd
+11700	11719	Lo
+1171D	1171F	Mn
+11720	11721	Mc
+11722	11725	Mn
+11726		Mc
+11727	1172B	Mn
+11730	11739	Nd
+1173A	1173B	No
+1173C	1173E	Po
+1173F		So
 118A0	118BF	Lu
 118C0	118DF	Ll
 118E0	118E9	Nd
 118EA	118F2	No
 118FF		Lo
 11AC0	11AF8	Lo
-12000	12398	Lo
+12000	12399	Lo
 12400	1246E	Nl
 12470	12474	Po
+12480	12543	Lo
 13000	1342E	Lo
+14400	14646	Lo
 16800	16A38	Lo
 16A40	16A5E	Lo
 16A60	16A69	Nd
@@ -2761,7 +2804,7 @@ FFFC	FFFD	So
 1D185	1D18B	Mn
 1D18C	1D1A9	So
 1D1AA	1D1AD	Mn
-1D1AE	1D1DD	So
+1D1AE	1D1E8	So
 1D200	1D241	So
 1D242	1D244	Mn
 1D245		So
@@ -2837,6 +2880,18 @@ FFFC	FFFD	So
 1D7CA		Lu
 1D7CB		Ll
 1D7CE	1D7FF	Nd
+1D800	1D9FF	So
+1DA00	1DA36	Mn
+1DA37	1DA3A	So
+1DA3B	1DA6C	Mn
+1DA6D	1DA74	So
+1DA75		Mn
+1DA76	1DA83	So
+1DA84		Mn
+1DA85	1DA86	So
+1DA87	1DA8B	Po
+1DA9B	1DA9F	Mn
+1DAA1	1DAAF	Mn
 1E800	1E8C4	Lo
 1E8C7	1E8CF	No
 1E8D0	1E8D6	Mn
@@ -2888,16 +2943,11 @@ FFFC	FFFD	So
 1F210	1F23A	So
 1F240	1F248	So
 1F250	1F251	So
-1F300	1F32C	So
-1F330	1F37D	So
-1F380	1F3CE	So
-1F3D4	1F3F7	So
-1F400	1F4FE	So
-1F500	1F54A	So
-1F550	1F579	So
+1F300	1F3FA	So
+1F3FB	1F3FF	Sk
+1F400	1F579	So
 1F57B	1F5A3	So
-1F5A5	1F642	So
-1F645	1F6CF	So
+1F5A5	1F6D0	So
 1F6E0	1F6EC	So
 1F6F0	1F6F3	So
 1F700	1F773	So
@@ -2907,9 +2957,13 @@ FFFC	FFFD	So
 1F850	1F859	So
 1F860	1F887	So
 1F890	1F8AD	So
+1F910	1F918	So
+1F980	1F984	So
+1F9C0		So
 20000	2A6D6	Lo
 2A700	2B734	Lo
 2B740	2B81D	Lo
+2B820	2CEA1	Lo
 2F800	2FA1D	Lo
 E0001		Cf
 E0020	E007F	Cf
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Hst.pl b/Master/tlpkg/tlperl/lib/unicore/To/Hst.pl
index d368bb464c7..85cc3f3fa60 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Hst.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Hst.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/InPC.pl b/Master/tlpkg/tlperl/lib/unicore/To/InPC.pl
new file mode 100644
index 00000000000..3b3c3c85715
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/To/InPC.pl
@@ -0,0 +1,512 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+

+# The name this swash is to be known by, with the format of the mappings in

+# the main body of the table, and what all code points missing from this file

+# map to.

+$utf8::SwashInfo{'ToInPC'}{'format'} = 's'; # string

+$utf8::SwashInfo{'ToInPC'}{'missing'} = 'NA';

+

+return <<'END';

+900	902	Top

+903		Right

+93A		Top

+93B		Right

+93C		Bottom

+93E		Right

+93F		Left

+940		Right

+941	944	Bottom

+945	948	Top

+949	94C	Right

+94D		Bottom

+94E		Left

+94F		Right

+951		Top

+952		Bottom

+953	955	Top

+956	957	Bottom

+962	963	Bottom

+981		Top

+982	983	Right

+9BC		Bottom

+9BE		Right

+9BF		Left

+9C0		Right

+9C1	9C4	Bottom

+9C7	9C8	Left

+9CB	9CC	Left_And_Right

+9CD		Bottom

+9D7		Right

+9E2	9E3	Bottom

+A01	A02	Top

+A03		Right

+A3C		Bottom

+A3E		Right

+A3F		Left

+A40		Right

+A41	A42	Bottom

+A47	A48	Top

+A4B	A4C	Top

+A4D		Bottom

+A70	A71	Top

+A75		Bottom

+A81	A82	Top

+A83		Right

+ABC		Bottom

+ABE		Right

+ABF		Left

+AC0		Right

+AC1	AC4	Bottom

+AC5		Top

+AC7	AC8	Top

+AC9		Top_And_Right

+ACB	ACC	Right

+ACD		Bottom

+AE2	AE3	Bottom

+B01		Top

+B02	B03	Right

+B3C		Bottom

+B3E		Right

+B3F		Top

+B40		Right

+B41	B44	Bottom

+B47		Left

+B48		Top_And_Left

+B4B		Left_And_Right

+B4C		Top_And_Left_And_Right

+B4D		Bottom

+B56		Top

+B57		Top_And_Right

+B62	B63	Bottom

+B82		Top

+BBE	BBF	Right

+BC0		Top

+BC1	BC2	Right

+BC6	BC8	Left

+BCA	BCC	Left_And_Right

+BCD		Top

+BD7		Right

+C00		Top

+C01	C03	Right

+C3E	C40	Top

+C41	C44	Right

+C46	C47	Top

+C48		Top_And_Bottom

+C4A	C4D	Top

+C55		Top

+C56		Bottom

+C62	C63	Bottom

+C81		Top

+C82	C83	Right

+CBC		Bottom

+CBE		Right

+CBF		Top

+CC0		Top_And_Right

+CC1	CC4	Right

+CC6		Top

+CC7	CC8	Top_And_Right

+CCA	CCB	Top_And_Right

+CCC	CCD	Top

+CD5	CD6	Right

+CE2	CE3	Bottom

+D01		Top

+D02	D03	Right

+D3E	D42	Right

+D43	D44	Bottom

+D46	D48	Left

+D4A	D4C	Left_And_Right

+D4D		Top

+D57		Right

+D62	D63	Bottom

+D82	D83	Right

+DCA		Top

+DCF	DD1	Right

+DD2	DD3	Top

+DD4		Bottom

+DD6		Bottom

+DD8		Right

+DD9		Left

+DDA		Top_And_Left

+DDB		Left

+DDC		Left_And_Right

+DDD		Top_And_Left_And_Right

+DDE		Left_And_Right

+DDF		Right

+DF2	DF3	Right

+E30		Right

+E31		Top

+E32	E33	Right

+E34	E37	Top

+E38	E3A	Bottom

+E40	E44	Visual_Order_Left

+E45		Right

+E47	E4E	Top

+EB0		Right

+EB1		Top

+EB2	EB3	Right

+EB4	EB7	Top

+EB8	EB9	Bottom

+EBB		Top

+EBC		Bottom

+EC0	EC4	Visual_Order_Left

+EC8	ECD	Top

+F18	F19	Bottom

+F35		Bottom

+F37		Bottom

+F39		Top

+F3E		Right

+F3F		Left

+F71		Bottom

+F72		Top

+F73		Top_And_Bottom

+F74	F75	Bottom

+F76	F79	Top_And_Bottom

+F7A	F7E	Top

+F7F		Right

+F80		Top

+F81		Top_And_Bottom

+F82	F83	Top

+F84		Bottom

+F86	F87	Top

+F8D	F97	Bottom

+F99	FBC	Bottom

+FC6		Bottom

+102B	102C	Right

+102D	102E	Top

+102F	1030	Bottom

+1031		Left

+1032	1036	Top

+1037		Bottom

+1038		Right

+103A		Top

+103B		Right

+103D	103E	Bottom

+1056	1057	Right

+1058	1059	Bottom

+105E	1060	Bottom

+1062	1064	Right

+1067	106D	Right

+1071	1074	Top

+1082		Bottom

+1083		Right

+1084		Left

+1085	1086	Top

+1087	108C	Right

+108D		Bottom

+108F		Right

+109A	109C	Right

+109D		Top

+1712		Top

+1713	1714	Bottom

+1732		Top

+1733	1734	Bottom

+1752		Top

+1753		Bottom

+1772		Top

+1773		Bottom

+17B6		Right

+17B7	17BA	Top

+17BB	17BD	Bottom

+17BE		Top_And_Left

+17BF		Top_And_Left_And_Right

+17C0		Left_And_Right

+17C1	17C3	Left

+17C4	17C5	Left_And_Right

+17C6		Top

+17C7	17C8	Right

+17C9	17D1	Top

+17D3		Top

+17DD		Top

+1920	1921	Top

+1922		Bottom

+1923	1924	Right

+1925	1926	Top_And_Right

+1927	1928	Top

+1929	192B	Right

+1930	1931	Right

+1932		Bottom

+1933	1938	Right

+1939		Bottom

+193A		Top

+193B		Bottom

+19B0	19B4	Right

+19B5	19B7	Visual_Order_Left

+19B8	19B9	Right

+19BA		Visual_Order_Left

+19BB	19C0	Right

+19C8	19C9	Right

+1A17		Top

+1A18		Bottom

+1A19		Left

+1A1A		Right

+1A1B		Top

+1A55		Left

+1A56		Bottom

+1A57		Right

+1A58	1A5A	Top

+1A5B	1A5E	Bottom

+1A61		Right

+1A62		Top

+1A63	1A64	Right

+1A65	1A68	Top

+1A69	1A6A	Bottom

+1A6B		Top

+1A6C		Bottom

+1A6D		Right

+1A6E	1A72	Left

+1A73	1A7C	Top

+1A7F		Bottom

+1B00	1B03	Top

+1B04		Right

+1B34		Top

+1B35		Right

+1B36	1B37	Top

+1B38	1B3A	Bottom

+1B3B		Bottom_And_Right

+1B3C		Top_And_Bottom

+1B3D		Top_And_Bottom_And_Right

+1B3E	1B3F	Left

+1B40	1B41	Left_And_Right

+1B42		Top

+1B43		Top_And_Right

+1B44		Right

+1B6B		Top

+1B6C		Bottom

+1B6D	1B73	Top

+1B80	1B81	Top

+1B82		Right

+1BA1		Right

+1BA2	1BA3	Bottom

+1BA4		Top

+1BA5		Bottom

+1BA6		Left

+1BA7		Right

+1BA8	1BA9	Top

+1BAA		Right

+1BAC	1BAD	Bottom

+1BE6		Top

+1BE7		Right

+1BE8	1BE9	Top

+1BEA	1BEC	Right

+1BED		Top

+1BEE		Right

+1BEF	1BF1	Top

+1BF2	1BF3	Right

+1C24	1C26	Right

+1C27	1C28	Left

+1C29		Top_And_Left

+1C2A	1C2B	Right

+1C2C		Bottom

+1C2D	1C33	Top

+1C34	1C35	Left

+1C36		Top

+1C37		Bottom

+1CD0	1CD2	Top

+1CD4		Overstruck

+1CD5	1CD9	Bottom

+1CDA	1CDB	Top

+1CDC	1CDF	Bottom

+1CE0		Top

+1CE1		Right

+1CE2	1CE8	Overstruck

+1CED		Bottom

+1CF4		Top

+A806		Top

+A80B		Top

+A823	A824	Right

+A825		Bottom

+A826		Top

+A827		Right

+A880	A881	Right

+A8B4	A8C3	Right

+A8C4		Bottom

+A8E0	A8F1	Top

+A92B	A92D	Bottom

+A947	A949	Bottom

+A94A		Top

+A94B	A94E	Bottom

+A94F	A951	Top

+A952	A953	Right

+A980	A982	Top

+A983		Right

+A9B3		Top

+A9B4	A9B5	Right

+A9B6	A9B7	Top

+A9B8	A9B9	Bottom

+A9BA	A9BB	Left

+A9BC		Top

+A9BD	A9BF	Right

+A9C0		Bottom_And_Right

+A9E5		Top

+AA29	AA2C	Top

+AA2D		Bottom

+AA2E		Top

+AA2F	AA30	Left

+AA31		Top

+AA32		Bottom

+AA33		Right

+AA34		Left

+AA35	AA36	Bottom

+AA43		Top

+AA4C		Top

+AA4D		Right

+AA7B		Right

+AA7C		Top

+AA7D		Right

+AAB0		Top

+AAB1		Right

+AAB2	AAB3	Top

+AAB4		Bottom

+AAB5	AAB6	Visual_Order_Left

+AAB7	AAB8	Top

+AAB9		Visual_Order_Left

+AABA		Right

+AABB	AABC	Visual_Order_Left

+AABD		Right

+AABE	AABF	Top

+AAC1		Top

+AAEB		Left

+AAEC		Bottom

+AAED		Top

+AAEE		Left

+AAEF		Right

+AAF5		Right

+ABE3	ABE4	Right

+ABE5		Top

+ABE6	ABE7	Right

+ABE8		Bottom

+ABE9	ABEA	Right

+ABEC		Right

+ABED		Bottom

+10A01		Overstruck

+10A02	10A03	Bottom

+10A05		Top

+10A06		Overstruck

+10A0C	10A0E	Bottom

+10A0F		Top

+10A38		Top

+10A39	10A3A	Bottom

+11000		Right

+11001		Top

+11002		Right

+11038	1103B	Top

+1103C	11041	Bottom

+11042	11046	Top

+11080	11081	Top

+11082		Right

+110B0		Right

+110B1		Left

+110B2		Right

+110B3	110B4	Bottom

+110B5	110B6	Top

+110B7	110B8	Right

+110B9	110BA	Bottom

+11100	11102	Top

+11127	11129	Top

+1112A	1112B	Bottom

+1112C		Left

+1112D		Top

+1112E	1112F	Top_And_Bottom

+11130		Top

+11131	11132	Bottom

+11134		Top

+11173		Bottom

+11180	11181	Top

+11182		Right

+111B3		Right

+111B4		Left

+111B5		Right

+111B6	111BB	Bottom

+111BC	111BE	Top

+111BF		Top_And_Right

+111C0		Right

+111CB		Top

+111CC		Bottom

+1122C	1122E	Right

+1122F		Bottom

+11230	11231	Top

+11232	11233	Top_And_Right

+11234		Top

+11235		Right

+11236	11237	Top

+112DF		Top

+112E0		Right

+112E1		Left

+112E2		Right

+112E3	112E4	Bottom

+112E5	112E8	Top

+112E9	112EA	Bottom

+11301		Top

+11302	11303	Right

+1133E	1133F	Right

+11340		Top

+11341	11344	Right

+11347	11348	Left

+1134B	1134C	Left_And_Right

+1134D		Right

+11357		Right

+11362	11363	Right

+11366	1136C	Top

+11370	11374	Top

+114B0		Right

+114B1		Left

+114B2		Right

+114B3	114B8	Bottom

+114B9		Left

+114BA		Top

+114BB		Top_And_Left

+114BC		Left_And_Right

+114BD		Right

+114BE		Left_And_Right

+114BF	114C0	Top

+114C1		Right

+114C2	114C3	Bottom

+115AF		Right

+115B0		Left

+115B1		Right

+115B2	115B5	Bottom

+115B8		Left

+115B9		Top_And_Left

+115BA		Left_And_Right

+115BB		Top_And_Left_And_Right

+115BC	115BD	Top

+115BE		Right

+115BF	115C0	Bottom

+115DC	115DD	Bottom

+11630	11632	Right

+11633	11638	Bottom

+11639	1163A	Top

+1163B	1163C	Right

+1163D		Top

+1163E		Right

+1163F		Bottom

+11640		Top

+116AB		Top

+116AC		Right

+116AD		Top

+116AE		Left

+116AF		Right

+116B0	116B1	Bottom

+116B2	116B5	Top

+116B6		Right

+116B7		Bottom

+1171D		Bottom

+1171F		Top

+11720	11721	Right

+11722	11723	Top

+11724	11725	Bottom

+11726		Left

+11727		Top

+11728		Bottom

+11729	1172B	Top

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/To/InSC.pl b/Master/tlpkg/tlperl/lib/unicore/To/InSC.pl
new file mode 100644
index 00000000000..f3bea2fdc65
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/To/InSC.pl
@@ -0,0 +1,625 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+

+# The name this swash is to be known by, with the format of the mappings in

+# the main body of the table, and what all code points missing from this file

+# map to.

+$utf8::SwashInfo{'ToInSC'}{'format'} = 's'; # string

+$utf8::SwashInfo{'ToInSC'}{'missing'} = 'Other';

+

+return <<'END';

+2D		Consonant_Placeholder

+30	39	Number

+A0		Consonant_Placeholder

+B2	B3	Syllable_Modifier

+D7		Consonant_Placeholder

+900	902	Bindu

+903		Visarga

+904	914	Vowel_Independent

+915	939	Consonant

+93A	93B	Vowel_Dependent

+93C		Nukta

+93D		Avagraha

+93E	94C	Vowel_Dependent

+94D		Virama

+94E	94F	Vowel_Dependent

+951	952	Cantillation_Mark

+955	957	Vowel_Dependent

+958	95F	Consonant

+960	961	Vowel_Independent

+962	963	Vowel_Dependent

+966	96F	Number

+972	977	Vowel_Independent

+978	97F	Consonant

+981	982	Bindu

+983		Visarga

+985	98C	Vowel_Independent

+98F	990	Vowel_Independent

+993	994	Vowel_Independent

+995	9A8	Consonant

+9AA	9B0	Consonant

+9B2		Consonant

+9B6	9B9	Consonant

+9BC		Nukta

+9BD		Avagraha

+9BE	9C4	Vowel_Dependent

+9C7	9C8	Vowel_Dependent

+9CB	9CC	Vowel_Dependent

+9CD		Virama

+9CE		Consonant_Dead

+9D7		Vowel_Dependent

+9DC	9DD	Consonant

+9DF		Consonant

+9E0	9E1	Vowel_Independent

+9E2	9E3	Vowel_Dependent

+9E6	9EF	Number

+9F0	9F1	Consonant

+A01	A02	Bindu

+A03		Visarga

+A05	A0A	Vowel_Independent

+A0F	A10	Vowel_Independent

+A13	A14	Vowel_Independent

+A15	A28	Consonant

+A2A	A30	Consonant

+A32	A33	Consonant

+A35	A36	Consonant

+A38	A39	Consonant

+A3C		Nukta

+A3E	A42	Vowel_Dependent

+A47	A48	Vowel_Dependent

+A4B	A4C	Vowel_Dependent

+A4D		Virama

+A59	A5C	Consonant

+A5E		Consonant

+A66	A6F	Number

+A70		Bindu

+A71		Gemination_Mark

+A72	A73	Consonant_Placeholder

+A75		Consonant_Medial

+A81	A82	Bindu

+A83		Visarga

+A85	A8D	Vowel_Independent

+A8F	A91	Vowel_Independent

+A93	A94	Vowel_Independent

+A95	AA8	Consonant

+AAA	AB0	Consonant

+AB2	AB3	Consonant

+AB5	AB9	Consonant

+ABC		Nukta

+ABD		Avagraha

+ABE	AC5	Vowel_Dependent

+AC7	AC9	Vowel_Dependent

+ACB	ACC	Vowel_Dependent

+ACD		Virama

+AE0	AE1	Vowel_Independent

+AE2	AE3	Vowel_Dependent

+AE6	AEF	Number

+AF9		Consonant

+B01	B02	Bindu

+B03		Visarga

+B05	B0C	Vowel_Independent

+B0F	B10	Vowel_Independent

+B13	B14	Vowel_Independent

+B15	B28	Consonant

+B2A	B30	Consonant

+B32	B33	Consonant

+B35	B39	Consonant

+B3C		Nukta

+B3D		Avagraha

+B3E	B44	Vowel_Dependent

+B47	B48	Vowel_Dependent

+B4B	B4C	Vowel_Dependent

+B4D		Virama

+B56	B57	Vowel_Dependent

+B5C	B5D	Consonant

+B5F		Consonant

+B60	B61	Vowel_Independent

+B62	B63	Vowel_Dependent

+B66	B6F	Number

+B71		Consonant

+B82		Bindu

+B83		Modifying_Letter

+B85	B8A	Vowel_Independent

+B8E	B90	Vowel_Independent

+B92	B94	Vowel_Independent

+B95		Consonant

+B99	B9A	Consonant

+B9C		Consonant

+B9E	B9F	Consonant

+BA3	BA4	Consonant

+BA8	BAA	Consonant

+BAE	BB9	Consonant

+BBE	BC2	Vowel_Dependent

+BC6	BC8	Vowel_Dependent

+BCA	BCC	Vowel_Dependent

+BCD		Virama

+BD7		Vowel_Dependent

+BE6	BEF	Number

+C00	C02	Bindu

+C03		Visarga

+C05	C0C	Vowel_Independent

+C0E	C10	Vowel_Independent

+C12	C14	Vowel_Independent

+C15	C28	Consonant

+C2A	C39	Consonant

+C3D		Avagraha

+C3E	C44	Vowel_Dependent

+C46	C48	Vowel_Dependent

+C4A	C4C	Vowel_Dependent

+C4D		Virama

+C55	C56	Vowel_Dependent

+C58	C5A	Consonant

+C60	C61	Vowel_Independent

+C62	C63	Vowel_Dependent

+C66	C6F	Number

+C81	C82	Bindu

+C83		Visarga

+C85	C8C	Vowel_Independent

+C8E	C90	Vowel_Independent

+C92	C94	Vowel_Independent

+C95	CA8	Consonant

+CAA	CB3	Consonant

+CB5	CB9	Consonant

+CBC		Nukta

+CBD		Avagraha

+CBE	CC4	Vowel_Dependent

+CC6	CC8	Vowel_Dependent

+CCA	CCC	Vowel_Dependent

+CCD		Virama

+CD5	CD6	Vowel_Dependent

+CDE		Consonant

+CE0	CE1	Vowel_Independent

+CE2	CE3	Vowel_Dependent

+CE6	CEF	Number

+CF1	CF2	Consonant_With_Stacker

+D01	D02	Bindu

+D03		Visarga

+D05	D0C	Vowel_Independent

+D0E	D10	Vowel_Independent

+D12	D14	Vowel_Independent

+D15	D3A	Consonant

+D3D		Avagraha

+D3E	D44	Vowel_Dependent

+D46	D48	Vowel_Dependent

+D4A	D4C	Vowel_Dependent

+D4D		Virama

+D4E		Consonant_Preceding_Repha

+D57		Vowel_Dependent

+D5F	D61	Vowel_Independent

+D62	D63	Vowel_Dependent

+D66	D6F	Number

+D7A	D7F	Consonant_Dead

+D82		Bindu

+D83		Visarga

+D85	D96	Vowel_Independent

+D9A	DB1	Consonant

+DB3	DBB	Consonant

+DBD		Consonant

+DC0	DC6	Consonant

+DCA		Virama

+DCF	DD4	Vowel_Dependent

+DD6		Vowel_Dependent

+DD8	DDF	Vowel_Dependent

+DE6	DEF	Number

+DF2	DF3	Vowel_Dependent

+E01	E2E	Consonant

+E30	E39	Vowel_Dependent

+E3A		Pure_Killer

+E40	E45	Vowel_Dependent

+E47		Vowel_Dependent

+E48	E4B	Tone_Mark

+E4C		Consonant_Killer

+E4D		Bindu

+E4E		Pure_Killer

+E50	E59	Number

+E81	E82	Consonant

+E84		Consonant

+E87	E88	Consonant

+E8A		Consonant

+E8D		Consonant

+E94	E97	Consonant

+E99	E9F	Consonant

+EA1	EA3	Consonant

+EA5		Consonant

+EA7		Consonant

+EAA	EAB	Consonant

+EAD	EAE	Consonant

+EB0	EB9	Vowel_Dependent

+EBB		Vowel_Dependent

+EBC	EBD	Consonant_Medial

+EC0	EC4	Vowel_Dependent

+EC8	ECB	Tone_Mark

+ECD		Bindu

+ED0	ED9	Number

+EDC	EDF	Consonant

+F20	F33	Number

+F35		Syllable_Modifier

+F37		Syllable_Modifier

+F39		Nukta

+F40	F47	Consonant

+F49	F6C	Consonant

+F71	F7D	Vowel_Dependent

+F7E		Bindu

+F7F		Visarga

+F80	F81	Vowel_Dependent

+F82	F83	Bindu

+F84		Pure_Killer

+F85		Avagraha

+F88	F8C	Consonant_Head_Letter

+F8D	F97	Consonant_Subjoined

+F99	FBC	Consonant_Subjoined

+FC6		Syllable_Modifier

+1000	1020	Consonant

+1021	102A	Vowel_Independent

+102B	1035	Vowel_Dependent

+1036		Bindu

+1037		Tone_Mark

+1038		Visarga

+1039		Invisible_Stacker

+103A		Pure_Killer

+103B	103E	Consonant_Medial

+103F		Consonant

+1040	1049	Number

+104E		Consonant_Placeholder

+1050	1051	Consonant

+1052	1055	Vowel_Independent

+1056	1059	Vowel_Dependent

+105A	105D	Consonant

+105E	1060	Consonant_Medial

+1061		Consonant

+1062		Vowel_Dependent

+1063	1064	Tone_Mark

+1065	1066	Consonant

+1067	1068	Vowel_Dependent

+1069	106D	Tone_Mark

+106E	1070	Consonant

+1071	1074	Vowel_Dependent

+1075	1081	Consonant

+1082		Consonant_Medial

+1083	1086	Vowel_Dependent

+1087	108D	Tone_Mark

+108E		Consonant

+108F		Tone_Mark

+1090	1099	Number

+109A	109B	Tone_Mark

+109C	109D	Vowel_Dependent

+1700	1702	Vowel_Independent

+1703	170C	Consonant

+170E	1711	Consonant

+1712	1713	Vowel_Dependent

+1714		Pure_Killer

+1720	1722	Vowel_Independent

+1723	1731	Consonant

+1732	1733	Vowel_Dependent

+1734		Pure_Killer

+1740	1742	Vowel_Independent

+1743	1751	Consonant

+1752	1753	Vowel_Dependent

+1760	1762	Vowel_Independent

+1763	176C	Consonant

+176E	1770	Consonant

+1772	1773	Vowel_Dependent

+1780	17A2	Consonant

+17A3	17B3	Vowel_Independent

+17B6	17C5	Vowel_Dependent

+17C6		Bindu

+17C7		Visarga

+17C8		Vowel_Dependent

+17C9	17CA	Register_Shifter

+17CB		Syllable_Modifier

+17CC		Consonant_Succeeding_Repha

+17CD		Consonant_Killer

+17CE	17D0	Syllable_Modifier

+17D1		Pure_Killer

+17D2		Invisible_Stacker

+17D3		Syllable_Modifier

+17DC		Avagraha

+17E0	17E9	Number

+1900		Consonant_Placeholder

+1901	191E	Consonant

+1920	1928	Vowel_Dependent

+1929	192B	Consonant_Subjoined

+1930	1931	Consonant_Final

+1932		Bindu

+1933	1939	Consonant_Final

+193A		Vowel_Dependent

+193B		Syllable_Modifier

+1946	194F	Number

+1950	1962	Consonant

+1963	196D	Vowel

+1970	1974	Tone_Letter

+1980	19AB	Consonant

+19B0	19C0	Vowel_Dependent

+19C1	19C7	Consonant_Final

+19C8	19C9	Tone_Mark

+19D0	19D9	Number

+1A00	1A16	Consonant

+1A17	1A1B	Vowel_Dependent

+1A20	1A4C	Consonant

+1A4D	1A52	Vowel_Independent

+1A53	1A54	Consonant

+1A55	1A56	Consonant_Medial

+1A57	1A5E	Consonant_Final

+1A60		Invisible_Stacker

+1A61	1A74	Vowel_Dependent

+1A75	1A79	Tone_Mark

+1A7A	1A7C	Syllable_Modifier

+1A7F		Syllable_Modifier

+1A80	1A89	Number

+1A90	1A99	Number

+1B00	1B02	Bindu

+1B03		Consonant_Succeeding_Repha

+1B04		Visarga

+1B05	1B12	Vowel_Independent

+1B13	1B33	Consonant

+1B34		Nukta

+1B35	1B43	Vowel_Dependent

+1B44		Virama

+1B45	1B4B	Consonant

+1B50	1B59	Number

+1B80		Bindu

+1B81		Consonant_Succeeding_Repha

+1B82		Visarga

+1B83	1B89	Vowel_Independent

+1B8A	1BA0	Consonant

+1BA1	1BA3	Consonant_Subjoined

+1BA4	1BA9	Vowel_Dependent

+1BAA		Pure_Killer

+1BAB		Invisible_Stacker

+1BAC	1BAD	Consonant_Subjoined

+1BAE	1BAF	Consonant

+1BB0	1BB9	Number

+1BBA		Avagraha

+1BBB	1BBD	Consonant

+1BBE	1BBF	Consonant_Final

+1BC0	1BE3	Consonant

+1BE4	1BE5	Vowel_Independent

+1BE6		Nukta

+1BE7	1BEF	Vowel_Dependent

+1BF0	1BF1	Consonant_Final

+1BF2	1BF3	Pure_Killer

+1C00	1C23	Consonant

+1C24	1C25	Consonant_Subjoined

+1C26	1C2C	Vowel_Dependent

+1C2D	1C33	Consonant_Final

+1C34	1C35	Bindu

+1C36		Syllable_Modifier

+1C37		Nukta

+1C40	1C49	Number

+1C4D	1C4F	Consonant

+1CD0	1CD2	Cantillation_Mark

+1CD4	1CE1	Cantillation_Mark

+1CF2	1CF3	Visarga

+1CF4		Cantillation_Mark

+1CF8	1CF9	Cantillation_Mark

+200C		Non_Joiner

+200D		Joiner

+2010	2014	Consonant_Placeholder

+2074		Syllable_Modifier

+2082	2084	Syllable_Modifier

+25CC		Consonant_Placeholder

+A800	A801	Vowel_Independent

+A803	A805	Vowel_Independent

+A806		Pure_Killer

+A807	A80A	Consonant

+A80B		Bindu

+A80C	A822	Consonant

+A823	A827	Vowel_Dependent

+A840	A85D	Consonant

+A85E	A861	Vowel

+A862	A865	Consonant

+A866		Vowel

+A867	A868	Consonant_Subjoined

+A869	A870	Consonant

+A871		Consonant_Subjoined

+A872		Consonant

+A873		Bindu

+A880		Bindu

+A881		Visarga

+A882	A891	Vowel_Independent

+A892	A8B3	Consonant

+A8B4		Consonant_Final

+A8B5	A8C3	Vowel_Dependent

+A8C4		Virama

+A8D0	A8D9	Number

+A8E0	A8F1	Cantillation_Mark

+A900	A909	Number

+A90A	A921	Consonant

+A922	A92A	Vowel

+A92B	A92D	Tone_Mark

+A930	A946	Consonant

+A947	A94E	Vowel_Dependent

+A94F	A952	Consonant_Final

+A953		Pure_Killer

+A980	A981	Bindu

+A982		Consonant_Succeeding_Repha

+A983		Visarga

+A984	A988	Vowel_Independent

+A989	A98B	Consonant

+A98C	A98E	Vowel_Independent

+A98F	A9B2	Consonant

+A9B3		Nukta

+A9B4	A9BC	Vowel_Dependent

+A9BD		Consonant_Subjoined

+A9BE	A9BF	Consonant_Medial

+A9C0		Virama

+A9D0	A9D9	Number

+A9E0	A9E4	Consonant

+A9E5		Vowel_Dependent

+A9E7	A9EF	Consonant

+A9F0	A9F9	Number

+A9FA	A9FE	Consonant

+AA00	AA05	Vowel_Independent

+AA06	AA28	Consonant

+AA29	AA32	Vowel_Dependent

+AA33	AA36	Consonant_Medial

+AA40	AA4D	Consonant_Final

+AA50	AA59	Number

+AA60	AA6F	Consonant

+AA71	AA73	Consonant

+AA7A		Consonant

+AA7B	AA7D	Tone_Mark

+AA7E	AAAF	Consonant

+AAB0	AABE	Vowel_Dependent

+AABF		Tone_Mark

+AAC0		Tone_Letter

+AAC1		Tone_Mark

+AAC2		Tone_Letter

+AAE0	AAE1	Vowel_Independent

+AAE2	AAEA	Consonant

+AAEB	AAEF	Vowel_Dependent

+AAF5		Visarga

+AAF6		Invisible_Stacker

+ABC0	ABCD	Consonant

+ABCE	ABCF	Vowel_Independent

+ABD0		Consonant

+ABD1		Vowel_Independent

+ABD2	ABDA	Consonant

+ABDB	ABE2	Consonant_Final

+ABE3	ABEA	Vowel_Dependent

+ABEC		Tone_Mark

+ABED		Pure_Killer

+ABF0	ABF9	Number

+10A00		Consonant

+10A01	10A03	Vowel_Dependent

+10A05	10A06	Vowel_Dependent

+10A0C	10A0D	Vowel_Dependent

+10A0E		Bindu

+10A0F		Visarga

+10A10	10A13	Consonant

+10A15	10A17	Consonant

+10A19	10A33	Consonant

+10A38	10A3A	Nukta

+10A3F		Invisible_Stacker

+10A40	10A47	Number

+11000	11001	Bindu

+11002		Visarga

+11003	11004	Consonant_With_Stacker

+11005	11012	Vowel_Independent

+11013	11037	Consonant

+11038	11045	Vowel_Dependent

+11046		Virama

+11052	11065	Brahmi_Joining_Number

+11066	1106F	Number

+1107F		Number_Joiner

+11080	11081	Bindu

+11082		Visarga

+11083	1108C	Vowel_Independent

+1108D	110AF	Consonant

+110B0	110B8	Vowel_Dependent

+110B9		Virama

+110BA		Nukta

+11100	11101	Bindu

+11102		Visarga

+11103	11106	Vowel_Independent

+11107	11126	Consonant

+11127	11132	Vowel_Dependent

+11133		Invisible_Stacker

+11134		Pure_Killer

+11136	1113F	Number

+11150	11154	Vowel

+11155	11172	Consonant

+11173		Nukta

+11180	11181	Bindu

+11182		Visarga

+11183	11190	Vowel_Independent

+11191	111B2	Consonant

+111B3	111BF	Vowel_Dependent

+111C0		Virama

+111C1		Avagraha

+111C2	111C3	Consonant_Prefixed

+111CA		Nukta

+111CB	111CC	Vowel_Dependent

+111D0	111D9	Number

+111E1	111F4	Number

+11200	11207	Vowel_Independent

+11208	11211	Consonant

+11213	1122B	Consonant

+1122C	11233	Vowel_Dependent

+11234		Bindu

+11235		Virama

+11236		Nukta

+11237		Gemination_Mark

+11280	11283	Vowel_Independent

+11284	11286	Consonant

+11288		Consonant

+1128A	1128D	Consonant

+1128F	1129D	Consonant

+1129F	112A8	Consonant

+112B0	112B9	Vowel_Independent

+112BA	112DE	Consonant

+112DF		Bindu

+112E0	112E8	Vowel_Dependent

+112E9		Nukta

+112EA		Pure_Killer

+112F0	112F9	Number

+11300	11302	Bindu

+11303		Visarga

+11305	1130C	Vowel_Independent

+1130F	11310	Vowel_Independent

+11313	11314	Vowel_Independent

+11315	11328	Consonant

+1132A	11330	Consonant

+11332	11333	Consonant

+11335	11339	Consonant

+1133C		Nukta

+1133D		Avagraha

+1133E	11344	Vowel_Dependent

+11347	11348	Vowel_Dependent

+1134B	1134C	Vowel_Dependent

+1134D		Virama

+11357		Vowel_Dependent

+11360	11361	Vowel_Independent

+11362	11363	Vowel_Dependent

+11366	1136C	Cantillation_Mark

+11370	11374	Cantillation_Mark

+11481	1148E	Vowel_Independent

+1148F	114AF	Consonant

+114B0	114BE	Vowel_Dependent

+114BF	114C0	Bindu

+114C1		Visarga

+114C2		Virama

+114C3		Nukta

+114C4		Avagraha

+114D0	114D9	Number

+11580	1158D	Vowel_Independent

+1158E	115AE	Consonant

+115AF	115B5	Vowel_Dependent

+115B8	115BB	Vowel_Dependent

+115BC	115BD	Bindu

+115BE		Visarga

+115BF		Virama

+115C0		Nukta

+115D8	115DB	Vowel_Independent

+115DC	115DD	Vowel_Dependent

+11600	1160D	Vowel_Independent

+1160E	1162F	Consonant

+11630	1163C	Vowel_Dependent

+1163D		Bindu

+1163E		Visarga

+1163F		Virama

+11640		Vowel_Dependent

+11650	11659	Number

+11680	11689	Vowel_Independent

+1168A	116AA	Consonant

+116AB		Bindu

+116AC		Visarga

+116AD	116B5	Vowel_Dependent

+116B6		Virama

+116B7		Nukta

+116C0	116C9	Number

+11700	11719	Consonant

+1171D	1171F	Consonant_Medial

+11720	1172A	Vowel_Dependent

+1172B		Pure_Killer

+11730	1173B	Number

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Isc.pl b/Master/tlpkg/tlperl/lib/unicore/To/Isc.pl
index e08a2481d61..48d2657a611 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Isc.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Isc.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Jg.pl b/Master/tlpkg/tlperl/lib/unicore/To/Jg.pl
index 121ee572539..20920aa5ca0 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Jg.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Jg.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -159,6 +159,8 @@ return <<'END';
 8B0		Gaf
 8B1		Straight_Waw
 8B2		Reh
+8B3		Ain
+8B4		Kaf
 10AC0		Manichaean_Aleph
 10AC1	10AC2	Manichaean_Beth
 10AC3	10AC4	Manichaean_Gimel
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Jt.pl b/Master/tlpkg/tlperl/lib/unicore/To/Jt.pl
index f07b5de0ec8..a2fb0748dc7 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Jt.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Jt.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -115,7 +115,8 @@ AD		T
 8AE		R
 8AF	8B0	D
 8B1	8B2	R
-8E4	902	T
+8B3	8B4	D
+8E3	902	T
 93A		T
 93C		T
 941	948	T
@@ -267,7 +268,7 @@ FC6		T
 3099	309A	T
 A66F	A672	T
 A674	A67D	T
-A69F		T
+A69E	A69F	T
 A6F0	A6F1	T
 A802		T
 A806		T
@@ -302,7 +303,7 @@ ABE8		T
 ABED		T
 FB1E		T
 FE00	FE0F	T
-FE20	FE2D	T
+FE20	FE2F	T
 FEFF		T
 FFF9	FFFB	T
 101FD		T
@@ -355,12 +356,13 @@ FFF9	FFFB	T
 11173		T
 11180	11181	T
 111B6	111BE	T
+111CA	111CC	T
 1122F	11231	T
 11234		T
 11236	11237	T
 112DF		T
 112E3	112EA	T
-11301		T
+11300	11301	T
 1133C		T
 11340		T
 11366	1136C	T
@@ -372,6 +374,7 @@ FFF9	FFFB	T
 115B2	115B5	T
 115BC	115BD	T
 115BF	115C0	T
+115DC	115DD	T
 11633	1163A	T
 1163D		T
 1163F	11640	T
@@ -379,6 +382,9 @@ FFF9	FFFB	T
 116AD		T
 116B0	116B5	T
 116B7		T
+1171D	1171F	T
+11722	11725	T
+11727	1172B	T
 16AF0	16AF4	T
 16B30	16B36	T
 16F8F	16F92	T
@@ -389,6 +395,12 @@ FFF9	FFFB	T
 1D185	1D18B	T
 1D1AA	1D1AD	T
 1D242	1D244	T
+1DA00	1DA36	T
+1DA3B	1DA6C	T
+1DA75		T
+1DA84		T
+1DA9B	1DA9F	T
+1DAA1	1DAAF	T
 1E8D0	1E8D6	T
 E0001		T
 E0020	E007F	T
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Lb.pl b/Master/tlpkg/tlperl/lib/unicore/To/Lb.pl
index eda8f8ba17f..3e759824066 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Lb.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Lb.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -183,8 +183,8 @@ F8	2C6	AL
 840	858	AL
 859	85B	CM
 85E		AL
-8A0	8B2	AL
-8E4	903	CM
+8A0	8B4	AL
+8E3	903	CM
 904	939	AL
 93A	93C	CM
 93D		AL
@@ -257,6 +257,7 @@ AE2	AE3	CM
 AE6	AEF	NU
 AF0		AL
 AF1		PR
+AF9		AL
 B01	B03	CM
 B05	B0C	AL
 B0F	B10	AL
@@ -305,7 +306,7 @@ C3E	C44	CM
 C46	C48	CM
 C4A	C4D	CM
 C55	C56	CM
-C58	C59	AL
+C58	C5A	AL
 C60	C61	AL
 C62	C63	CM
 C66	C6F	NU
@@ -337,7 +338,7 @@ D46	D48	CM
 D4A	D4D	CM
 D4E		AL
 D57		CM
-D60	D61	AL
+D5F	D61	AL
 D62	D63	CM
 D66	D6F	NU
 D70	D75	AL
@@ -463,7 +464,8 @@ FD9	FDA	GL
 1361		BA
 1362	137C	AL
 1380	1399	AL
-13A0	13F4	AL
+13A0	13F5	AL
+13F8	13FD	AL
 1400		BA
 1401	167F	AL
 1680		BA
@@ -650,7 +652,9 @@ FD9	FDA	GL
 20B6		PO
 20B7	20BA	PR
 20BB		PO
-20BC	20CF	PR
+20BC	20BD	PR
+20BE		PO
+20BF	20CF	PR
 20D0	20F0	CM
 2100	2102	AL
 2103		PO
@@ -678,6 +682,7 @@ FD9	FDA	GL
 2170	2179	AI
 217A	2188	AL
 2189		AI
+218A	218B	AL
 2190	2199	AI
 219A	21D1	AL
 21D2		AI
@@ -740,7 +745,9 @@ FD9	FDA	GL
 22A5		AI
 22A6	22BE	AL
 22BF		AI
-22C0	2307	AL
+22C0	22EE	AL
+22EF		IN
+22F0	2307	AL
 2308		OP
 2309		CL
 230A		OP
@@ -925,6 +932,7 @@ FD9	FDA	GL
 2B98	2BB9	AL
 2BBD	2BC8	AL
 2BCA	2BD1	AL
+2BEC	2BEF	AL
 2C00	2C2E	AL
 2C30	2C5E	AL
 2C60	2CEE	AL
@@ -1100,14 +1108,13 @@ A66F	A672	CM
 A673		AL
 A674	A67D	CM
 A67E	A69D	AL
-A69F		CM
+A69E	A69F	CM
 A6A0	A6EF	AL
 A6F0	A6F1	CM
 A6F2		AL
 A6F3	A6F7	BA
-A700	A78E	AL
-A790	A7AD	AL
-A7B0	A7B1	AL
+A700	A7AD	AL
+A7B0	A7B7	AL
 A7F7	A801	AL
 A802		CM
 A803	A805	AL
@@ -1130,6 +1137,8 @@ A8CE	A8CF	BA
 A8D0	A8D9	NU
 A8E0	A8F1	CM
 A8F2	A8FB	AL
+A8FC		BB
+A8FD		AL
 A900	A909	NU
 A90A	A925	AL
 A926	A92D	CM
@@ -1171,9 +1180,8 @@ AB09	AB0E	AL
 AB11	AB16	AL
 AB20	AB26	AL
 AB28	AB2E	AL
-AB30	AB5F	AL
-AB64	AB65	AL
-ABC0	ABE2	AL
+AB30	AB65	AL
+AB70	ABE2	AL
 ABE3	ABEA	CM
 ABEB		BA
 ABEC	ABED	CM
@@ -2009,7 +2017,7 @@ FE15	FE16	EX
 FE17		OP
 FE18		CL
 FE19		IN
-FE20	FE2D	CM
+FE20	FE2F	CM
 FE30	FE34	ID
 FE35		OP
 FE36		CL
@@ -2142,13 +2150,15 @@ FFFD		AI
 10857		BA
 10858	1089E	AL
 108A7	108AF	AL
-10900	1091B	AL
+108E0	108F2	AL
+108F4	108F5	AL
+108FB	1091B	AL
 1091F		BA
 10920	10939	AL
 1093F		AL
 10980	109B7	AL
-109BE	109BF	AL
-10A00		AL
+109BC	109CF	AL
+109D2	10A00	AL
 10A01	10A03	CM
 10A05	10A06	CM
 10A0C	10A0F	CM
@@ -2174,6 +2184,9 @@ FFFD		AI
 10B99	10B9C	AL
 10BA9	10BAF	AL
 10C00	10C48	AL
+10C80	10CB2	AL
+10CC0	10CF2	AL
+10CFA	10CFF	AL
 10E60	10E7E	AL
 11000	11002	CM
 11003	11037	AL
@@ -2206,9 +2219,14 @@ FFFD		AI
 111C5	111C6	BA
 111C7		AL
 111C8		BA
+111C9		AL
+111CA	111CC	CM
 111CD		AL
 111D0	111D9	NU
 111DA		AL
+111DB		BB
+111DC		AL
+111DD	111DF	BA
 111E1	111F4	AL
 11200	11211	AL
 11213	1122B	AL
@@ -2217,10 +2235,16 @@ FFFD		AI
 1123A		AL
 1123B	1123C	BA
 1123D		AL
+11280	11286	AL
+11288		AL
+1128A	1128D	AL
+1128F	1129D	AL
+1129F	112A8	AL
+112A9		BA
 112B0	112DE	AL
 112DF	112EA	CM
 112F0	112F9	NU
-11301	11303	CM
+11300	11303	CM
 11305	1130C	AL
 1130F	11310	AL
 11313	11328	AL
@@ -2232,6 +2256,7 @@ FFFD		AI
 1133E	11344	CM
 11347	11348	CM
 1134B	1134D	CM
+11350		AL
 11357		CM
 1135D	11361	AL
 11362	11363	CM
@@ -2248,7 +2273,9 @@ FFFD		AI
 115C2	115C3	BA
 115C4	115C5	EX
 115C6	115C8	AL
-115C9		BA
+115C9	115D7	BA
+115D8	115DB	AL
+115DC	115DD	CM
 11600	1162F	AL
 11630	11640	CM
 11641	11642	BA
@@ -2257,14 +2284,21 @@ FFFD		AI
 11680	116AA	AL
 116AB	116B7	CM
 116C0	116C9	NU
+11700	11719	SA
+1171D	1172B	SA
+11730	11739	NU
+1173A	1173B	SA
+1173C	1173E	BA
+1173F		SA
 118A0	118DF	AL
 118E0	118E9	NU
 118EA	118F2	AL
 118FF		AL
 11AC0	11AF8	AL
-12000	12398	AL
+12000	12399	AL
 12400	1246E	AL
 12470	12474	BA
+12480	12543	AL
 13000	13257	AL
 13258	1325A	OP
 1325B	1325D	CL
@@ -2279,6 +2313,10 @@ FFFD		AI
 13379		OP
 1337A	1337B	CL
 1337C	1342E	AL
+14400	145CD	AL
+145CE		OP
+145CF		CL
+145D0	14646	AL
 16800	16A38	AL
 16A40	16A5E	AL
 16A60	16A69	NU
@@ -2320,7 +2358,7 @@ FFFD		AI
 1D185	1D18B	CM
 1D18C	1D1A9	AL
 1D1AA	1D1AD	CM
-1D1AE	1D1DD	AL
+1D1AE	1D1E8	AL
 1D200	1D241	AL
 1D242	1D244	CM
 1D245		AL
@@ -2347,6 +2385,19 @@ FFFD		AI
 1D552	1D6A5	AL
 1D6A8	1D7CB	AL
 1D7CE	1D7FF	NU
+1D800	1D9FF	AL
+1DA00	1DA36	CM
+1DA37	1DA3A	AL
+1DA3B	1DA6C	CM
+1DA6D	1DA74	AL
+1DA75		CM
+1DA76	1DA83	AL
+1DA84		CM
+1DA85	1DA86	AL
+1DA87	1DA8A	BA
+1DA8B		AL
+1DA9B	1DA9F	CM
+1DAA1	1DAAF	CM
 1E800	1E8C4	AL
 1E8C7	1E8CF	AL
 1E8D0	1E8D6	CM
@@ -2401,16 +2452,14 @@ FFFD		AI
 1F210	1F23A	ID
 1F240	1F248	ID
 1F250	1F251	ID
-1F300	1F32C	ID
-1F330	1F37D	ID
-1F380	1F39B	ID
+1F300	1F39B	ID
 1F39C	1F39D	AL
 1F39E	1F3B4	ID
 1F3B5	1F3B6	AL
 1F3B7	1F3BB	ID
 1F3BC		AL
-1F3BD	1F3CE	ID
-1F3D4	1F3F7	ID
+1F3BD	1F3FA	ID
+1F3FB	1F3FF	AL
 1F400	1F49F	ID
 1F4A0		AL
 1F4A1		ID
@@ -2421,26 +2470,24 @@ FFFD		AI
 1F4AF		AL
 1F4B0		ID
 1F4B1	1F4B2	AL
-1F4B3	1F4FE	ID
+1F4B3	1F4FF	ID
 1F500	1F506	AL
 1F507	1F516	ID
 1F517	1F524	AL
 1F525	1F531	ID
 1F532	1F549	AL
-1F54A		ID
-1F550	1F579	ID
+1F54A	1F579	ID
 1F57B	1F5A3	ID
 1F5A5	1F5D3	ID
 1F5D4	1F5DB	AL
 1F5DC	1F5F3	ID
 1F5F4	1F5F9	AL
-1F5FA	1F642	ID
-1F645	1F64F	ID
+1F5FA	1F64F	ID
 1F650	1F675	AL
 1F676	1F678	QU
 1F679	1F67B	NS
 1F67C	1F67F	AL
-1F680	1F6CF	ID
+1F680	1F6D0	ID
 1F6E0	1F6EC	ID
 1F6F0	1F6F3	ID
 1F700	1F773	AL
@@ -2450,6 +2497,9 @@ FFFD		AI
 1F850	1F859	AL
 1F860	1F887	AL
 1F890	1F8AD	AL
+1F910	1F918	ID
+1F980	1F984	ID
+1F9C0		ID
 20000	2FFFD	ID
 30000	3FFFD	ID
 E0001		CM
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Lc.pl b/Master/tlpkg/tlperl/lib/unicore/To/Lc.pl
index 966002bd214..64fbc05e47d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Lc.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Lc.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -337,6 +337,8 @@ D8	DE	F8
 10A0	10C5	2D00
 10C7		2D27
 10CD		2D2D
+13A0	13EF	AB70
+13F0	13F5	13F8
 1E00		1E01
 1E02		1E03
 1E04		1E05
@@ -665,7 +667,12 @@ A7AC		261
 A7AD		26C
 A7B0		29E
 A7B1		287
+A7B2		29D
+A7B3		AB53
+A7B4		A7B5
+A7B6		A7B7
 FF21	FF3A	FF41
 10400	10427	10428
+10C80	10CB2	10CC0
 118A0	118BF	118C0
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Lower.pl b/Master/tlpkg/tlperl/lib/unicore/To/Lower.pl
index 58f28a481df..bb3b75caf4e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Lower.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Lower.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   IT IS DEPRECATED TO USE THIS FILE   !!!!!!!
 
@@ -541,6 +541,92 @@ return <<'END';
 10C5		2D25
 10C7		2D27
 10CD		2D2D
+13A0		AB70
+13A1		AB71
+13A2		AB72
+13A3		AB73
+13A4		AB74
+13A5		AB75
+13A6		AB76
+13A7		AB77
+13A8		AB78
+13A9		AB79
+13AA		AB7A
+13AB		AB7B
+13AC		AB7C
+13AD		AB7D
+13AE		AB7E
+13AF		AB7F
+13B0		AB80
+13B1		AB81
+13B2		AB82
+13B3		AB83
+13B4		AB84
+13B5		AB85
+13B6		AB86
+13B7		AB87
+13B8		AB88
+13B9		AB89
+13BA		AB8A
+13BB		AB8B
+13BC		AB8C
+13BD		AB8D
+13BE		AB8E
+13BF		AB8F
+13C0		AB90
+13C1		AB91
+13C2		AB92
+13C3		AB93
+13C4		AB94
+13C5		AB95
+13C6		AB96
+13C7		AB97
+13C8		AB98
+13C9		AB99
+13CA		AB9A
+13CB		AB9B
+13CC		AB9C
+13CD		AB9D
+13CE		AB9E
+13CF		AB9F
+13D0		ABA0
+13D1		ABA1
+13D2		ABA2
+13D3		ABA3
+13D4		ABA4
+13D5		ABA5
+13D6		ABA6
+13D7		ABA7
+13D8		ABA8
+13D9		ABA9
+13DA		ABAA
+13DB		ABAB
+13DC		ABAC
+13DD		ABAD
+13DE		ABAE
+13DF		ABAF
+13E0		ABB0
+13E1		ABB1
+13E2		ABB2
+13E3		ABB3
+13E4		ABB4
+13E5		ABB5
+13E6		ABB6
+13E7		ABB7
+13E8		ABB8
+13E9		ABB9
+13EA		ABBA
+13EB		ABBB
+13EC		ABBC
+13ED		ABBD
+13EE		ABBE
+13EF		ABBF
+13F0		13F8
+13F1		13F9
+13F2		13FA
+13F3		13FB
+13F4		13FC
+13F5		13FD
 1E00		1E01
 1E02		1E03
 1E04		1E05
@@ -1026,6 +1112,10 @@ A7AC		0261
 A7AD		026C
 A7B0		029E
 A7B1		0287
+A7B2		029D
+A7B3		AB53
+A7B4		A7B5
+A7B6		A7B7
 FF21		FF41
 FF22		FF42
 FF23		FF43
@@ -1092,6 +1182,57 @@ FF3A		FF5A
 10425		1044D
 10426		1044E
 10427		1044F
+10C80		10CC0
+10C81		10CC1
+10C82		10CC2
+10C83		10CC3
+10C84		10CC4
+10C85		10CC5
+10C86		10CC6
+10C87		10CC7
+10C88		10CC8
+10C89		10CC9
+10C8A		10CCA
+10C8B		10CCB
+10C8C		10CCC
+10C8D		10CCD
+10C8E		10CCE
+10C8F		10CCF
+10C90		10CD0
+10C91		10CD1
+10C92		10CD2
+10C93		10CD3
+10C94		10CD4
+10C95		10CD5
+10C96		10CD6
+10C97		10CD7
+10C98		10CD8
+10C99		10CD9
+10C9A		10CDA
+10C9B		10CDB
+10C9C		10CDC
+10C9D		10CDD
+10C9E		10CDE
+10C9F		10CDF
+10CA0		10CE0
+10CA1		10CE1
+10CA2		10CE2
+10CA3		10CE3
+10CA4		10CE4
+10CA5		10CE5
+10CA6		10CE6
+10CA7		10CE7
+10CA8		10CE8
+10CA9		10CE9
+10CAA		10CEA
+10CAB		10CEB
+10CAC		10CEC
+10CAD		10CED
+10CAE		10CEE
+10CAF		10CEF
+10CB0		10CF0
+10CB1		10CF1
+10CB2		10CF2
 118A0		118C0
 118A1		118C1
 118A2		118C2
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/NFCQC.pl b/Master/tlpkg/tlperl/lib/unicore/To/NFCQC.pl
index 9d254bba0c9..ff735e59b97 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/NFCQC.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/NFCQC.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/NFDQC.pl b/Master/tlpkg/tlperl/lib/unicore/To/NFDQC.pl
index 6acf2ca3004..2cc7791d3bd 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/NFDQC.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/NFDQC.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/NFKCCF.pl b/Master/tlpkg/tlperl/lib/unicore/To/NFKCCF.pl
index 5d2c2e64e71..4a565d200a4 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/NFKCCF.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/NFKCCF.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   IT IS DEPRECATED TO USE THIS FILE   !!!!!!!
 
@@ -6047,6 +6047,12 @@ return <<'END';
 10C7		2D27
 10CD		2D2D
 10FC		10DC
+13F8		13F0
+13F9		13F1
+13FA		13F2
+13FB		13F3
+13FC		13F4
+13FD		13F5
 1D2C		0061
 1D2D		00E6
 1D2E		0062
@@ -7212,12 +7218,96 @@ A7AC		0261
 A7AD		026C
 A7B0		029E
 A7B1		0287
+A7B2		029D
+A7B3		AB53
+A7B4		A7B5
+A7B6		A7B7
 A7F8		0127
 A7F9		0153
 AB5C		A727
 AB5D		AB37
 AB5E		026B
 AB5F		AB52
+AB70		13A0
+AB71		13A1
+AB72		13A2
+AB73		13A3
+AB74		13A4
+AB75		13A5
+AB76		13A6
+AB77		13A7
+AB78		13A8
+AB79		13A9
+AB7A		13AA
+AB7B		13AB
+AB7C		13AC
+AB7D		13AD
+AB7E		13AE
+AB7F		13AF
+AB80		13B0
+AB81		13B1
+AB82		13B2
+AB83		13B3
+AB84		13B4
+AB85		13B5
+AB86		13B6
+AB87		13B7
+AB88		13B8
+AB89		13B9
+AB8A		13BA
+AB8B		13BB
+AB8C		13BC
+AB8D		13BD
+AB8E		13BE
+AB8F		13BF
+AB90		13C0
+AB91		13C1
+AB92		13C2
+AB93		13C3
+AB94		13C4
+AB95		13C5
+AB96		13C6
+AB97		13C7
+AB98		13C8
+AB99		13C9
+AB9A		13CA
+AB9B		13CB
+AB9C		13CC
+AB9D		13CD
+AB9E		13CE
+AB9F		13CF
+ABA0		13D0
+ABA1		13D1
+ABA2		13D2
+ABA3		13D3
+ABA4		13D4
+ABA5		13D5
+ABA6		13D6
+ABA7		13D7
+ABA8		13D8
+ABA9		13D9
+ABAA		13DA
+ABAB		13DB
+ABAC		13DC
+ABAD		13DD
+ABAE		13DE
+ABAF		13DF
+ABB0		13E0
+ABB1		13E1
+ABB2		13E2
+ABB3		13E3
+ABB4		13E4
+ABB5		13E5
+ABB6		13E6
+ABB7		13E7
+ABB8		13E8
+ABB9		13E9
+ABBA		13EA
+ABBB		13EB
+ABBC		13EC
+ABBD		13ED
+ABBE		13EE
+ABBF		13EF
 F900		8C48
 F901		66F4
 F902		8ECA
@@ -8252,6 +8342,57 @@ FFEE		25CB
 10425		1044D
 10426		1044E
 10427		1044F
+10C80		10CC0
+10C81		10CC1
+10C82		10CC2
+10C83		10CC3
+10C84		10CC4
+10C85		10CC5
+10C86		10CC6
+10C87		10CC7
+10C88		10CC8
+10C89		10CC9
+10C8A		10CCA
+10C8B		10CCB
+10C8C		10CCC
+10C8D		10CCD
+10C8E		10CCE
+10C8F		10CCF
+10C90		10CD0
+10C91		10CD1
+10C92		10CD2
+10C93		10CD3
+10C94		10CD4
+10C95		10CD5
+10C96		10CD6
+10C97		10CD7
+10C98		10CD8
+10C99		10CD9
+10C9A		10CDA
+10C9B		10CDB
+10C9C		10CDC
+10C9D		10CDD
+10C9E		10CDE
+10C9F		10CDF
+10CA0		10CE0
+10CA1		10CE1
+10CA2		10CE2
+10CA3		10CE3
+10CA4		10CE4
+10CA5		10CE5
+10CA6		10CE6
+10CA7		10CE7
+10CA8		10CE8
+10CA9		10CE9
+10CAA		10CEA
+10CAB		10CEB
+10CAC		10CEC
+10CAD		10CED
+10CAE		10CEE
+10CAF		10CEF
+10CB0		10CF0
+10CB1		10CF1
+10CB2		10CF2
 118A0		118C0
 118A1		118C1
 118A2		118C2
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/NFKCQC.pl b/Master/tlpkg/tlperl/lib/unicore/To/NFKCQC.pl
index c2c913fe0e8..c5fcf8af190 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/NFKCQC.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/NFKCQC.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/NFKDQC.pl b/Master/tlpkg/tlperl/lib/unicore/To/NFKDQC.pl
index 085e72644ba..0ed1c642005 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/NFKDQC.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/NFKDQC.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Na1.pl b/Master/tlpkg/tlperl/lib/unicore/To/Na1.pl
index c82dfd1471e..6ff34ed2ee5 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Na1.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Na1.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/NameAlia.pl b/Master/tlpkg/tlperl/lib/unicore/To/NameAlia.pl
index b2406d19f59..86b359183a9 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/NameAlia.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/NameAlia.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -210,6 +210,8 @@ FD0		TIBETAN MARK BKA- SHOG GI MGO RGYAN: correction
 2118		WEIERSTRASS ELLIPTIC FUNCTION: correction
 2448		MICR ON US SYMBOL: correction
 2449		MICR DASH SYMBOL: correction
+2B7A		LEFTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE VERTICAL STROKE: correction
+2B7C		RIGHTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE VERTICAL STROKE: correction
 A015		YI SYLLABLE ITERATION MARK: correction
 FE00		VS1: abbreviation
 FE01		VS2: abbreviation
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Nt.pl b/Master/tlpkg/tlperl/lib/unicore/To/Nt.pl
index 69b5cd7a0c4..b54152242b9 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Nt.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Nt.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -170,7 +170,11 @@ FF10	FF19	Decimal
 10858	1085F	Numeric
 10879	1087F	Numeric
 108A7	108AF	Numeric
+108FB	108FF	Numeric
 10916	1091B	Numeric
+109BC	109BD	Numeric
+109C0	109CF	Numeric
+109D2	109FF	Numeric
 10A40	10A43	Digit
 10A44	10A47	Numeric
 10A7D	10A7E	Numeric
@@ -179,6 +183,7 @@ FF10	FF19	Decimal
 10B58	10B5F	Numeric
 10B78	10B7F	Numeric
 10BA9	10BAF	Numeric
+10CFA	10CFF	Numeric
 10E60	10E68	Digit
 10E69	10E7E	Numeric
 11052	1105A	Digit
@@ -192,6 +197,8 @@ FF10	FF19	Decimal
 114D0	114D9	Decimal
 11650	11659	Decimal
 116C0	116C9	Decimal
+11730	11739	Decimal
+1173A	1173B	Numeric
 118E0	118E9	Decimal
 118EA	118F2	Numeric
 12400	1246E	Numeric
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Nv.pl b/Master/tlpkg/tlperl/lib/unicore/To/Nv.pl
index c3a4eaf1d6a..aac4a89d8ea 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Nv.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Nv.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -380,11 +380,71 @@ FF10	FF19	0
 108AD		10
 108AE		20
 108AF		100
+108FB		1
+108FC		5
+108FD		10
+108FE		20
+108FF		100
 10916		1
 10917		10
 10918		20
 10919		100
 1091A	1091B	2
+109BC		11/12
+109BD		1/2
+109C0	109C9	1
+109CA		20
+109CB		30
+109CC		40
+109CD		50
+109CE		60
+109CF		70
+109D2		100
+109D3		200
+109D4		300
+109D5		400
+109D6		500
+109D7		600
+109D8		700
+109D9		800
+109DA		900
+109DB		1000
+109DC		2000
+109DD		3000
+109DE		4000
+109DF		5000
+109E0		6000
+109E1		7000
+109E2		8000
+109E3		9000
+109E4		10000
+109E5		20000
+109E6		30000
+109E7		40000
+109E8		50000
+109E9		60000
+109EA		70000
+109EB		80000
+109EC		90000
+109ED		100000
+109EE		200000
+109EF		300000
+109F0		400000
+109F1		500000
+109F2		600000
+109F3		700000
+109F4		800000
+109F5		900000
+109F6		1/12
+109F7		1/6
+109F8		1/4
+109F9		1/3
+109FA		5/12
+109FB		1/2
+109FC		7/12
+109FD		2/3
+109FE		3/4
+109FF		5/6
 10A40	10A43	1
 10A44		10
 10A45		20
@@ -414,6 +474,12 @@ FF10	FF19	0
 10BAD		10
 10BAE		20
 10BAF		100
+10CFA		1
+10CFB		5
+10CFC		10
+10CFD		50
+10CFE		100
+10CFF		1000
 10E60	10E69	1
 10E6A		20
 10E6B		30
@@ -466,6 +532,8 @@ FF10	FF19	0
 114D0	114D9	0
 11650	11659	0
 116C0	116C9	0
+11730	1173A	0
+1173B		20
 118E0	118EA	0
 118EB		20
 118EC		30
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/PerlDeci.pl b/Master/tlpkg/tlperl/lib/unicore/To/PerlDeci.pl
index 43d461912bc..4ed1489f0fe 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/PerlDeci.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/PerlDeci.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -65,6 +65,7 @@ FF10	FF19	0
 114D0	114D9	0
 11650	11659	0
 116C0	116C9	0
+11730	11739	0
 118E0	118E9	0
 16A60	16A69	0
 16B50	16B59	0
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/SB.pl b/Master/tlpkg/tlperl/lib/unicore/To/SB.pl
index ab512df6893..7879c4d6a1f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/SB.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/SB.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -655,8 +655,8 @@ F8	FF	Lower
 829	82D	Extend
 840	858	OLetter
 859	85B	Extend
-8A0	8B2	OLetter
-8E4	903	Extend
+8A0	8B4	OLetter
+8E3	903	Extend
 904	939	OLetter
 93A	93C	Extend
 93D		OLetter
@@ -722,6 +722,7 @@ AD0		OLetter
 AE0	AE1	OLetter
 AE2	AE3	Extend
 AE6	AEF	Numeric
+AF9		OLetter
 B01	B03	Extend
 B05	B0C	OLetter
 B0F	B10	OLetter
@@ -767,7 +768,7 @@ C3E	C44	Extend
 C46	C48	Extend
 C4A	C4D	Extend
 C55	C56	Extend
-C58	C59	OLetter
+C58	C5A	OLetter
 C60	C61	OLetter
 C62	C63	Extend
 C66	C6F	Numeric
@@ -798,7 +799,7 @@ D46	D48	Extend
 D4A	D4D	Extend
 D4E		OLetter
 D57		Extend
-D60	D61	OLetter
+D5F	D61	OLetter
 D62	D63	Extend
 D66	D6F	Numeric
 D7A	D7F	OLetter
@@ -904,7 +905,8 @@ FC6		Extend
 1362		STerm
 1367	1368	STerm
 1380	138F	OLetter
-13A0	13F4	OLetter
+13A0	13F5	Upper
+13F8	13FD	Lower
 1401	166C	OLetter
 166E		STerm
 166F	167F	OLetter
@@ -950,9 +952,7 @@ FC6		Extend
 1950	196D	OLetter
 1970	1974	OLetter
 1980	19AB	OLetter
-19B0	19C0	Extend
-19C1	19C7	OLetter
-19C8	19C9	Extend
+19B0	19C9	OLetter
 19D0	19D9	Numeric
 1A00	1A16	OLetter
 1A17	1A1B	Extend
@@ -1517,7 +1517,7 @@ FC6		Extend
 31A0	31BA	OLetter
 31F0	31FF	OLetter
 3400	4DB5	OLetter
-4E00	9FCC	OLetter
+4E00	9FD5	OLetter
 A000	A48C	OLetter
 A4D0	A4FD	OLetter
 A4FF		STerm
@@ -1604,7 +1604,7 @@ A698		Upper
 A699		Lower
 A69A		Upper
 A69B	A69D	Lower
-A69F		Extend
+A69E	A69F	Extend
 A6A0	A6EF	OLetter
 A6F0	A6F1	Extend
 A6F3		STerm
@@ -1705,6 +1705,7 @@ A78B		Upper
 A78C		Lower
 A78D		Upper
 A78E		Lower
+A78F		OLetter
 A790		Upper
 A791		Lower
 A792		Upper
@@ -1730,7 +1731,10 @@ A7A7		Lower
 A7A8		Upper
 A7A9		Lower
 A7AA	A7AD	Upper
-A7B0	A7B1	Upper
+A7B0	A7B4	Upper
+A7B5		Lower
+A7B6		Upper
+A7B7		Lower
 A7F7		OLetter
 A7F8	A7FA	Lower
 A7FB	A801	OLetter
@@ -1751,6 +1755,7 @@ A8D0	A8D9	Numeric
 A8E0	A8F1	Extend
 A8F2	A8F7	OLetter
 A8FB		OLetter
+A8FD		OLetter
 A900	A909	Numeric
 A90A	A925	OLetter
 A926	A92D	Extend
@@ -1803,8 +1808,8 @@ AB11	AB16	OLetter
 AB20	AB26	OLetter
 AB28	AB2E	OLetter
 AB30	AB5A	Lower
-AB5C	AB5F	Lower
-AB64	AB65	Lower
+AB5C	AB65	Lower
+AB70	ABBF	Lower
 ABC0	ABE2	OLetter
 ABE3	ABEA	Extend
 ABEB		STerm
@@ -1835,7 +1840,7 @@ FE00	FE0F	Extend
 FE10	FE11	SContinue
 FE13		SContinue
 FE17	FE18	Close
-FE20	FE2D	Extend
+FE20	FE2F	Extend
 FE31	FE32	SContinue
 FE35	FE44	Close
 FE47	FE48	Close
@@ -1910,6 +1915,8 @@ FFF9	FFFB	Format
 1083F	10855	OLetter
 10860	10876	OLetter
 10880	1089E	OLetter
+108E0	108F2	OLetter
+108F4	108F5	OLetter
 10900	10915	OLetter
 10920	10939	OLetter
 10980	109B7	OLetter
@@ -1934,6 +1941,8 @@ FFF9	FFFB	Format
 10B60	10B72	OLetter
 10B80	10B91	OLetter
 10C00	10C48	OLetter
+10C80	10CB2	Upper
+10CC0	10CF2	Lower
 11000	11002	Extend
 11003	11037	OLetter
 11038	11046	Extend
@@ -1959,18 +1968,27 @@ FFF9	FFFB	Format
 111B3	111C0	Extend
 111C1	111C4	OLetter
 111C5	111C6	STerm
+111CA	111CC	Extend
 111CD		STerm
 111D0	111D9	Numeric
 111DA		OLetter
+111DC		OLetter
+111DE	111DF	STerm
 11200	11211	OLetter
 11213	1122B	OLetter
 1122C	11237	Extend
 11238	11239	STerm
 1123B	1123C	STerm
+11280	11286	OLetter
+11288		OLetter
+1128A	1128D	OLetter
+1128F	1129D	OLetter
+1129F	112A8	OLetter
+112A9		STerm
 112B0	112DE	OLetter
 112DF	112EA	Extend
 112F0	112F9	Numeric
-11301	11303	Extend
+11300	11303	Extend
 11305	1130C	OLetter
 1130F	11310	OLetter
 11313	11328	OLetter
@@ -1982,6 +2000,7 @@ FFF9	FFFB	Format
 1133E	11344	Extend
 11347	11348	Extend
 1134B	1134D	Extend
+11350		OLetter
 11357		Extend
 1135D	11361	OLetter
 11362	11363	Extend
@@ -1996,7 +2015,9 @@ FFF9	FFFB	Format
 115AF	115B5	Extend
 115B8	115C0	Extend
 115C2	115C3	STerm
-115C9		STerm
+115C9	115D7	STerm
+115D8	115DB	OLetter
+115DC	115DD	Extend
 11600	1162F	OLetter
 11630	11640	Extend
 11641	11642	STerm
@@ -2005,14 +2026,20 @@ FFF9	FFFB	Format
 11680	116AA	OLetter
 116AB	116B7	Extend
 116C0	116C9	Numeric
+11700	11719	OLetter
+1171D	1172B	Extend
+11730	11739	Numeric
+1173C	1173E	STerm
 118A0	118BF	Upper
 118C0	118DF	Lower
 118E0	118E9	Numeric
 118FF		OLetter
 11AC0	11AF8	OLetter
-12000	12398	OLetter
+12000	12399	OLetter
 12400	1246E	OLetter
+12480	12543	OLetter
 13000	1342E	OLetter
+14400	14646	OLetter
 16800	16A38	OLetter
 16A40	16A5E	OLetter
 16A60	16A69	Numeric
@@ -2108,6 +2135,13 @@ FFF9	FFFB	Format
 1D7CA		Upper
 1D7CB		Lower
 1D7CE	1D7FF	Numeric
+1DA00	1DA36	Extend
+1DA3B	1DA6C	Extend
+1DA75		Extend
+1DA84		Extend
+1DA88		STerm
+1DA9B	1DA9F	Extend
+1DAA1	1DAAF	Extend
 1E800	1E8C4	OLetter
 1E8D0	1E8D6	Extend
 1EE00	1EE03	OLetter
@@ -2150,6 +2184,7 @@ FFF9	FFFB	Format
 20000	2A6D6	OLetter
 2A700	2B734	OLetter
 2B740	2B81D	OLetter
+2B820	2CEA1	OLetter
 2F800	2FA1D	OLetter
 E0001		Format
 E0020	E007F	Format
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Sc.pl b/Master/tlpkg/tlperl/lib/unicore/To/Sc.pl
index 74d85f299ee..592faeb009d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Sc.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Sc.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -77,9 +77,7 @@ F8	2B8	Latin
 640		Common
 641	64A	Arabic
 64B	655	Inherited
-656	65F	Arabic
-660	669	Common
-66A	66F	Arabic
+656	66F	Arabic
 670		Inherited
 671	6DC	Arabic
 6DD		Common
@@ -94,8 +92,8 @@ F8	2B8	Latin
 830	83E	Samaritan
 840	85B	Mandaic
 85E		Mandaic
-8A0	8B2	Arabic
-8E4	8FF	Arabic
+8A0	8B4	Arabic
+8E3	8FF	Arabic
 900	950	Devanagari
 951	952	Inherited
 953	963	Devanagari
@@ -144,6 +142,7 @@ ACB	ACD	Gujarati
 AD0		Gujarati
 AE0	AE3	Gujarati
 AE6	AF1	Gujarati
+AF9		Gujarati
 B01	B03	Oriya
 B05	B0C	Oriya
 B0F	B10	Oriya
@@ -183,7 +182,7 @@ C3D	C44	Telugu
 C46	C48	Telugu
 C4A	C4D	Telugu
 C55	C56	Telugu
-C58	C59	Telugu
+C58	C5A	Telugu
 C60	C63	Telugu
 C66	C6F	Telugu
 C78	C7F	Telugu
@@ -209,7 +208,7 @@ D3D	D44	Malayalam
 D46	D48	Malayalam
 D4A	D4E	Malayalam
 D57		Malayalam
-D60	D63	Malayalam
+D5F	D63	Malayalam
 D66	D75	Malayalam
 D79	D7F	Malayalam
 D82	D83	Sinhala
@@ -279,7 +278,8 @@ FD9	FDA	Tibetan
 1318	135A	Ethiopic
 135D	137C	Ethiopic
 1380	1399	Ethiopic
-13A0	13F4	Cherokee
+13A0	13F5	Cherokee
+13F8	13FD	Cherokee
 1400	167F	Canadian_Aboriginal
 1680	169C	Ogham
 16A0	16EA	Runic
@@ -385,7 +385,7 @@ FD9	FDA	Tibetan
 207F		Latin
 2080	208E	Common
 2090	209C	Latin
-20A0	20BD	Common
+20A0	20BE	Common
 20D0	20F0	Inherited
 2100	2125	Common
 2126		Greek
@@ -397,7 +397,7 @@ FD9	FDA	Tibetan
 214E		Latin
 214F	215F	Common
 2160	2188	Latin
-2189		Common
+2189	218B	Common
 2190	23FA	Common
 2400	2426	Common
 2440	244A	Common
@@ -408,6 +408,7 @@ FD9	FDA	Tibetan
 2B98	2BB9	Common
 2BBD	2BC8	Common
 2BCA	2BD1	Common
+2BEC	2BEF	Common
 2C00	2C2E	Glagolitic
 2C30	2C5E	Glagolitic
 2C60	2C7F	Latin
@@ -468,27 +469,25 @@ FD9	FDA	Tibetan
 3358	33FF	Common
 3400	4DB5	Han
 4DC0	4DFF	Common
-4E00	9FCC	Han
+4E00	9FD5	Han
 A000	A48C	Yi
 A490	A4C6	Yi
 A4D0	A4FF	Lisu
 A500	A62B	Vai
-A640	A69D	Cyrillic
-A69F		Cyrillic
+A640	A69F	Cyrillic
 A6A0	A6F7	Bamum
 A700	A721	Common
 A722	A787	Latin
 A788	A78A	Common
-A78B	A78E	Latin
-A790	A7AD	Latin
-A7B0	A7B1	Latin
+A78B	A7AD	Latin
+A7B0	A7B7	Latin
 A7F7	A7FF	Latin
 A800	A82B	Syloti_Nagri
 A830	A839	Common
 A840	A877	Phags_Pa
 A880	A8C4	Saurashtra
 A8CE	A8D9	Saurashtra
-A8E0	A8FB	Devanagari
+A8E0	A8FD	Devanagari
 A900	A92D	Kayah_Li
 A92E		Common
 A92F		Kayah_Li
@@ -515,9 +514,9 @@ AB20	AB26	Ethiopic
 AB28	AB2E	Ethiopic
 AB30	AB5A	Latin
 AB5B		Common
-AB5C	AB5F	Latin
-AB64		Latin
+AB5C	AB64	Latin
 AB65		Greek
+AB70	ABBF	Cherokee
 ABC0	ABED	Meetei_Mayek
 ABF0	ABF9	Meetei_Mayek
 AC00	D7A3	Hangul
@@ -542,6 +541,7 @@ FDF0	FDFD	Arabic
 FE00	FE0F	Inherited
 FE10	FE19	Common
 FE20	FE2D	Inherited
+FE2E	FE2F	Cyrillic
 FE30	FE52	Common
 FE54	FE66	Common
 FE68	FE6B	Common
@@ -612,13 +612,17 @@ FFF9	FFFD	Common
 10860	1087F	Palmyrene
 10880	1089E	Nabataean
 108A7	108AF	Nabataean
+108E0	108F2	Hatran
+108F4	108F5	Hatran
+108FB	108FF	Hatran
 10900	1091B	Phoenician
 1091F		Phoenician
 10920	10939	Lydian
 1093F		Lydian
 10980	1099F	Meroitic_Hieroglyphs
 109A0	109B7	Meroitic_Cursive
-109BE	109BF	Meroitic_Cursive
+109BC	109CF	Meroitic_Cursive
+109D2	109FF	Meroitic_Cursive
 10A00	10A03	Kharoshthi
 10A05	10A06	Kharoshthi
 10A0C	10A13	Kharoshthi
@@ -641,6 +645,9 @@ FFF9	FFFD	Common
 10B99	10B9C	Psalter_Pahlavi
 10BA9	10BAF	Psalter_Pahlavi
 10C00	10C48	Old_Turkic
+10C80	10CB2	Old_Hungarian
+10CC0	10CF2	Old_Hungarian
+10CFA	10CFF	Old_Hungarian
 10E60	10E7E	Arabic
 11000	1104D	Brahmi
 11052	1106F	Brahmi
@@ -651,15 +658,19 @@ FFF9	FFFD	Common
 11100	11134	Chakma
 11136	11143	Chakma
 11150	11176	Mahajani
-11180	111C8	Sharada
-111CD		Sharada
-111D0	111DA	Sharada
+11180	111CD	Sharada
+111D0	111DF	Sharada
 111E1	111F4	Sinhala
 11200	11211	Khojki
 11213	1123D	Khojki
+11280	11286	Multani
+11288		Multani
+1128A	1128D	Multani
+1128F	1129D	Multani
+1129F	112A9	Multani
 112B0	112EA	Khudawadi
 112F0	112F9	Khudawadi
-11301	11303	Grantha
+11300	11303	Grantha
 11305	1130C	Grantha
 1130F	11310	Grantha
 11313	11328	Grantha
@@ -669,6 +680,7 @@ FFF9	FFFD	Common
 1133C	11344	Grantha
 11347	11348	Grantha
 1134B	1134D	Grantha
+11350		Grantha
 11357		Grantha
 1135D	11363	Grantha
 11366	1136C	Grantha
@@ -676,18 +688,23 @@ FFF9	FFFD	Common
 11480	114C7	Tirhuta
 114D0	114D9	Tirhuta
 11580	115B5	Siddham
-115B8	115C9	Siddham
+115B8	115DD	Siddham
 11600	11644	Modi
 11650	11659	Modi
 11680	116B7	Takri
 116C0	116C9	Takri
+11700	11719	Ahom
+1171D	1172B	Ahom
+11730	1173F	Ahom
 118A0	118F2	Warang_Citi
 118FF		Warang_Citi
 11AC0	11AF8	Pau_Cin_Hau
-12000	12398	Cuneiform
+12000	12399	Cuneiform
 12400	1246E	Cuneiform
 12470	12474	Cuneiform
+12480	12543	Cuneiform
 13000	1342E	Egyptian_Hieroglyphs
+14400	14646	Anatolian_Hieroglyphs
 16800	16A38	Bamum
 16A40	16A5E	Mro
 16A60	16A69	Mro
@@ -720,7 +737,7 @@ FFF9	FFFD	Common
 1D185	1D18B	Inherited
 1D18C	1D1A9	Common
 1D1AA	1D1AD	Inherited
-1D1AE	1D1DD	Common
+1D1AE	1D1E8	Common
 1D200	1D245	Greek
 1D300	1D356	Common
 1D360	1D371	Common
@@ -745,6 +762,9 @@ FFF9	FFFD	Common
 1D552	1D6A5	Common
 1D6A8	1D7CB	Common
 1D7CE	1D7FF	Common
+1D800	1DA8B	SignWriting
+1DA9B	1DA9F	SignWriting
+1DAA1	1DAAF	SignWriting
 1E800	1E8C4	Mende_Kikakui
 1E8C7	1E8D6	Mende_Kikakui
 1EE00	1EE03	Arabic
@@ -797,16 +817,9 @@ FFF9	FFFD	Common
 1F210	1F23A	Common
 1F240	1F248	Common
 1F250	1F251	Common
-1F300	1F32C	Common
-1F330	1F37D	Common
-1F380	1F3CE	Common
-1F3D4	1F3F7	Common
-1F400	1F4FE	Common
-1F500	1F54A	Common
-1F550	1F579	Common
+1F300	1F579	Common
 1F57B	1F5A3	Common
-1F5A5	1F642	Common
-1F645	1F6CF	Common
+1F5A5	1F6D0	Common
 1F6E0	1F6EC	Common
 1F6F0	1F6F3	Common
 1F700	1F773	Common
@@ -816,9 +829,13 @@ FFF9	FFFD	Common
 1F850	1F859	Common
 1F860	1F887	Common
 1F890	1F8AD	Common
+1F910	1F918	Common
+1F980	1F984	Common
+1F9C0		Common
 20000	2A6D6	Han
 2A700	2B734	Han
 2B740	2B81D	Han
+2B820	2CEA1	Han
 2F800	2FA1D	Han
 E0001		Common
 E0020	E007F	Common
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Scx.pl b/Master/tlpkg/tlperl/lib/unicore/To/Scx.pl
index dc349a58154..7c6589a4855 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Scx.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Scx.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -58,9 +58,12 @@ F8	2B8	Latin
 3A3	3E1	Greek
 3E2	3EF	Coptic
 3F0	3FF	Greek
-400	484	Cyrillic
+400	482	Cyrillic
+483		Cyrillic Old_Permic
+484		Cyrillic
 485	486	Cyrillic Latin
-487	52F	Cyrillic
+487		Cyrillic Glagolitic
+488	52F	Cyrillic
 531	556	Armenian
 559	55F	Armenian
 561	587	Armenian
@@ -100,10 +103,11 @@ F8	2B8	Latin
 830	83E	Samaritan
 840	85B	Mandaic
 85E		Mandaic
-8A0	8B2	Arabic
-8E4	8FF	Arabic
+8A0	8B4	Arabic
+8E3	8FF	Arabic
 900	950	Devanagari
-951	952	Devanagari Latin
+951		Bengali Devanagari Grantha Gujarati Gurmukhi Kannada Latin Malayalam Oriya Sharada Tamil Telugu
+952		Bengali Devanagari Grantha Gujarati Gurmukhi Kannada Latin Malayalam Oriya Tamil Telugu
 953	963	Devanagari
 964		Bengali Devanagari Grantha Gujarati Gurmukhi Kannada Mahajani Malayalam Oriya Khudawadi Sinhala Syloti_Nagri Takri Tamil Telugu Tirhuta
 965		Bengali Devanagari Grantha Gujarati Gurmukhi Kannada Limbu Mahajani Malayalam Oriya Khudawadi Sinhala Syloti_Nagri Takri Tamil Telugu Tirhuta
@@ -139,7 +143,8 @@ A4B	A4D	Gurmukhi
 A51		Gurmukhi
 A59	A5C	Gurmukhi
 A5E		Gurmukhi
-A66	A75	Gurmukhi
+A66	A6F	Gurmukhi Multani
+A70	A75	Gurmukhi
 A81	A83	Gujarati
 A85	A8D	Gujarati
 A8F	A91	Gujarati
@@ -154,6 +159,7 @@ AD0		Gujarati
 AE0	AE3	Gujarati
 AE6	AEF	Gujarati Khojki
 AF0	AF1	Gujarati
+AF9		Gujarati
 B01	B03	Oriya
 B05	B0C	Oriya
 B0F	B10	Oriya
@@ -176,14 +182,18 @@ B99	B9A	Tamil
 B9C		Tamil
 B9E	B9F	Tamil
 BA3	BA4	Tamil
-BA8	BAA	Tamil
-BAE	BB9	Tamil
+BA8	BA9	Tamil
+BAA		Grantha Tamil
+BAE	BB4	Tamil
+BB5		Grantha Tamil
+BB6	BB9	Tamil
 BBE	BC2	Tamil
 BC6	BC8	Tamil
 BCA	BCD	Tamil
 BD0		Tamil
 BD7		Tamil
-BE6	BFA	Tamil
+BE6	BF2	Grantha Tamil
+BF3	BFA	Tamil
 C00	C03	Telugu
 C05	C0C	Telugu
 C0E	C10	Telugu
@@ -193,7 +203,7 @@ C3D	C44	Telugu
 C46	C48	Telugu
 C4A	C4D	Telugu
 C55	C56	Telugu
-C58	C59	Telugu
+C58	C5A	Telugu
 C60	C63	Telugu
 C66	C6F	Telugu
 C78	C7F	Telugu
@@ -219,7 +229,7 @@ D3D	D44	Malayalam
 D46	D48	Malayalam
 D4A	D4E	Malayalam
 D57		Malayalam
-D60	D63	Malayalam
+D5F	D63	Malayalam
 D66	D75	Malayalam
 D79	D7F	Malayalam
 D82	D83	Sinhala
@@ -291,7 +301,8 @@ FD9	FDA	Tibetan
 1318	135A	Ethiopic
 135D	137C	Ethiopic
 1380	1399	Ethiopic
-13A0	13F4	Cherokee
+13A0	13F5	Cherokee
+13F8	13FD	Cherokee
 1400	167F	Canadian_Aboriginal
 1680	169C	Ogham
 16A0	16EA	Runic
@@ -347,15 +358,23 @@ FD9	FDA	Tibetan
 1C4D	1C4F	Lepcha
 1C50	1C7F	Ol_Chiki
 1CC0	1CC7	Sundanese
-1CD0	1CD2	Devanagari
-1CD3		Common
-1CD4	1CE8	Devanagari
-1CE9	1CEC	Common
-1CED		Devanagari
-1CEE	1CF1	Common
-1CF2	1CF4	Devanagari
-1CF5	1CF6	Common
-1CF8	1CF9	Devanagari
+1CD0		Devanagari Grantha
+1CD1		Devanagari
+1CD2	1CD3	Devanagari Grantha
+1CD4	1CD6	Devanagari
+1CD7		Devanagari Sharada
+1CD8		Devanagari
+1CD9		Devanagari Sharada
+1CDA		Devanagari Kannada Malayalam Tamil Telugu
+1CDB		Devanagari
+1CDC	1CDD	Devanagari Sharada
+1CDE	1CDF	Devanagari
+1CE0		Devanagari Sharada
+1CE1	1CF1	Devanagari
+1CF2	1CF4	Devanagari Grantha
+1CF5		Devanagari Kannada
+1CF6		Devanagari
+1CF8	1CF9	Devanagari Grantha
 1D00	1D25	Latin
 1D26	1D2A	Greek
 1D2B		Cyrillic
@@ -395,8 +414,9 @@ FD9	FDA	Tibetan
 207F		Latin
 2080	208E	Common
 2090	209C	Latin
-20A0	20BD	Common
-20D0	20F0	Inherited
+20A0	20BE	Common
+20D0	20EF	Inherited
+20F0		Devanagari Grantha Latin
 2100	2125	Common
 2126		Greek
 2127	2129	Common
@@ -407,7 +427,7 @@ FD9	FDA	Tibetan
 214E		Latin
 214F	215F	Common
 2160	2188	Latin
-2189		Common
+2189	218B	Common
 2190	23FA	Common
 2400	2426	Common
 2440	244A	Common
@@ -418,6 +438,7 @@ FD9	FDA	Tibetan
 2B98	2BB9	Common
 2BBD	2BC8	Common
 2BCA	2BD1	Common
+2BEC	2BEF	Common
 2C00	2C2E	Glagolitic
 2C30	2C5E	Glagolitic
 2C60	2C7F	Latin
@@ -500,27 +521,29 @@ FD9	FDA	Tibetan
 33FF		Common
 3400	4DB5	Han
 4DC0	4DFF	Common
-4E00	9FCC	Han
+4E00	9FD5	Han
 A000	A48C	Yi
 A490	A4C6	Yi
 A4D0	A4FF	Lisu
 A500	A62B	Vai
-A640	A69D	Cyrillic
-A69F		Cyrillic
+A640	A66E	Cyrillic
+A66F		Cyrillic Glagolitic
+A670	A69F	Cyrillic
 A6A0	A6F7	Bamum
 A700	A721	Common
 A722	A787	Latin
 A788	A78A	Common
-A78B	A78E	Latin
-A790	A7AD	Latin
-A7B0	A7B1	Latin
+A78B	A7AD	Latin
+A7B0	A7B7	Latin
 A7F7	A7FF	Latin
 A800	A82B	Syloti_Nagri
 A830	A839	Devanagari Gujarati Gurmukhi Kaithi Mahajani Modi Khudawadi Takri Tirhuta
 A840	A877	Phags_Pa
 A880	A8C4	Saurashtra
 A8CE	A8D9	Saurashtra
-A8E0	A8FB	Devanagari
+A8E0	A8F2	Devanagari
+A8F3		Devanagari Tamil
+A8F4	A8FD	Devanagari
 A900	A92D	Kayah_Li
 A92E		Kayah_Li Latin Myanmar
 A92F		Kayah_Li
@@ -547,9 +570,9 @@ AB20	AB26	Ethiopic
 AB28	AB2E	Ethiopic
 AB30	AB5A	Latin
 AB5B		Common
-AB5C	AB5F	Latin
-AB64		Latin
+AB5C	AB64	Latin
 AB65		Greek
+AB70	ABBF	Cherokee
 ABC0	ABED	Meetei_Mayek
 ABF0	ABF9	Meetei_Mayek
 AC00	D7A3	Hangul
@@ -577,6 +600,7 @@ FDFD		Arabic Thaana
 FE00	FE0F	Inherited
 FE10	FE19	Common
 FE20	FE2D	Inherited
+FE2E	FE2F	Cyrillic
 FE30	FE44	Common
 FE45	FE46	Bopomofo Hangul Han Hiragana Katakana
 FE47	FE52	Common
@@ -649,13 +673,17 @@ FFF9	FFFD	Common
 10860	1087F	Palmyrene
 10880	1089E	Nabataean
 108A7	108AF	Nabataean
+108E0	108F2	Hatran
+108F4	108F5	Hatran
+108FB	108FF	Hatran
 10900	1091B	Phoenician
 1091F		Phoenician
 10920	10939	Lydian
 1093F		Lydian
 10980	1099F	Meroitic_Hieroglyphs
 109A0	109B7	Meroitic_Cursive
-109BE	109BF	Meroitic_Cursive
+109BC	109CF	Meroitic_Cursive
+109D2	109FF	Meroitic_Cursive
 10A00	10A03	Kharoshthi
 10A05	10A06	Kharoshthi
 10A0C	10A13	Kharoshthi
@@ -678,6 +706,9 @@ FFF9	FFFD	Common
 10B99	10B9C	Psalter_Pahlavi
 10BA9	10BAF	Psalter_Pahlavi
 10C00	10C48	Old_Turkic
+10C80	10CB2	Old_Hungarian
+10CC0	10CF2	Old_Hungarian
+10CFA	10CFF	Old_Hungarian
 10E60	10E7E	Arabic
 11000	1104D	Brahmi
 11052	1106F	Brahmi
@@ -688,15 +719,19 @@ FFF9	FFFD	Common
 11100	11134	Chakma
 11136	11143	Chakma
 11150	11176	Mahajani
-11180	111C8	Sharada
-111CD		Sharada
-111D0	111DA	Sharada
+11180	111CD	Sharada
+111D0	111DF	Sharada
 111E1	111F4	Sinhala
 11200	11211	Khojki
 11213	1123D	Khojki
+11280	11286	Multani
+11288		Multani
+1128A	1128D	Multani
+1128F	1129D	Multani
+1129F	112A9	Multani
 112B0	112EA	Khudawadi
 112F0	112F9	Khudawadi
-11301	11303	Grantha
+11300	11303	Grantha
 11305	1130C	Grantha
 1130F	11310	Grantha
 11313	11328	Grantha
@@ -706,6 +741,7 @@ FFF9	FFFD	Common
 1133C	11344	Grantha
 11347	11348	Grantha
 1134B	1134D	Grantha
+11350		Grantha
 11357		Grantha
 1135D	11363	Grantha
 11366	1136C	Grantha
@@ -713,18 +749,23 @@ FFF9	FFFD	Common
 11480	114C7	Tirhuta
 114D0	114D9	Tirhuta
 11580	115B5	Siddham
-115B8	115C9	Siddham
+115B8	115DD	Siddham
 11600	11644	Modi
 11650	11659	Modi
 11680	116B7	Takri
 116C0	116C9	Takri
+11700	11719	Ahom
+1171D	1172B	Ahom
+11730	1173F	Ahom
 118A0	118F2	Warang_Citi
 118FF		Warang_Citi
 11AC0	11AF8	Pau_Cin_Hau
-12000	12398	Cuneiform
+12000	12399	Cuneiform
 12400	1246E	Cuneiform
 12470	12474	Cuneiform
+12480	12543	Cuneiform
 13000	1342E	Egyptian_Hieroglyphs
+14400	14646	Anatolian_Hieroglyphs
 16800	16A38	Bamum
 16A40	16A5E	Mro
 16A60	16A69	Mro
@@ -756,10 +797,10 @@ FFF9	FFFD	Common
 1D185	1D18B	Inherited
 1D18C	1D1A9	Common
 1D1AA	1D1AD	Inherited
-1D1AE	1D1DD	Common
+1D1AE	1D1E8	Common
 1D200	1D245	Greek
 1D300	1D356	Common
-1D360	1D371	Common
+1D360	1D371	Han
 1D400	1D454	Common
 1D456	1D49C	Common
 1D49E	1D49F	Common
@@ -781,6 +822,9 @@ FFF9	FFFD	Common
 1D552	1D6A5	Common
 1D6A8	1D7CB	Common
 1D7CE	1D7FF	Common
+1D800	1DA8B	SignWriting
+1DA9B	1DA9F	SignWriting
+1DAA1	1DAAF	SignWriting
 1E800	1E8C4	Mende_Kikakui
 1E8C7	1E8D6	Mende_Kikakui
 1EE00	1EE03	Arabic
@@ -833,16 +877,9 @@ FFF9	FFFD	Common
 1F210	1F23A	Common
 1F240	1F248	Common
 1F250	1F251	Common
-1F300	1F32C	Common
-1F330	1F37D	Common
-1F380	1F3CE	Common
-1F3D4	1F3F7	Common
-1F400	1F4FE	Common
-1F500	1F54A	Common
-1F550	1F579	Common
+1F300	1F579	Common
 1F57B	1F5A3	Common
-1F5A5	1F642	Common
-1F645	1F6CF	Common
+1F5A5	1F6D0	Common
 1F6E0	1F6EC	Common
 1F6F0	1F6F3	Common
 1F700	1F773	Common
@@ -852,9 +889,13 @@ FFF9	FFFD	Common
 1F850	1F859	Common
 1F860	1F887	Common
 1F890	1F8AD	Common
+1F910	1F918	Common
+1F980	1F984	Common
+1F9C0		Common
 20000	2A6D6	Han
 2A700	2B734	Han
 2B740	2B81D	Han
+2B820	2CEA1	Han
 2F800	2FA1D	Han
 E0001		Common
 E0020	E007F	Common
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Tc.pl b/Master/tlpkg/tlperl/lib/unicore/To/Tc.pl
index 434c713952f..7771e190493 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Tc.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Tc.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -263,6 +263,7 @@ FF		178
 28A	28B	1B1
 28C		245
 292		1B7
+29D		A7B2
 29E		A7B0
 345		399
 371		370
@@ -403,6 +404,7 @@ FF		178
 52D		52C
 52F		52E
 561	586	531
+13F8	13FD	13F0
 1D79		A77D
 1D7D		2C63
 1E01		1E00
@@ -720,7 +722,12 @@ A7A3		A7A2
 A7A5		A7A4
 A7A7		A7A6
 A7A9		A7A8
+A7B5		A7B4
+A7B7		A7B6
+AB53		A7B3
+AB70	ABBF	13A0
 FF41	FF5A	FF21
 10428	1044F	10400
+10CC0	10CF2	10C80
 118C0	118DF	118A0
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Title.pl b/Master/tlpkg/tlperl/lib/unicore/To/Title.pl
index f8ffd5c265c..c8cd3e324f6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Title.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Title.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   IT IS DEPRECATED TO USE THIS FILE   !!!!!!!
 
@@ -320,6 +320,7 @@ return <<'END';
 028B		01B2
 028C		0245
 0292		01B7
+029D		A7B2
 029E		A7B0
 0345		0399
 0371		0370
@@ -572,6 +573,12 @@ return <<'END';
 0584		0554
 0585		0555
 0586		0556
+13F8		13F0
+13F9		13F1
+13FA		13F2
+13FB		13F3
+13FC		13F4
+13FD		13F5
 1D79		A77D
 1D7D		2C63
 1E01		1E00
@@ -1082,6 +1089,89 @@ A7A3		A7A2
 A7A5		A7A4
 A7A7		A7A6
 A7A9		A7A8
+A7B5		A7B4
+A7B7		A7B6
+AB53		A7B3
+AB70		13A0
+AB71		13A1
+AB72		13A2
+AB73		13A3
+AB74		13A4
+AB75		13A5
+AB76		13A6
+AB77		13A7
+AB78		13A8
+AB79		13A9
+AB7A		13AA
+AB7B		13AB
+AB7C		13AC
+AB7D		13AD
+AB7E		13AE
+AB7F		13AF
+AB80		13B0
+AB81		13B1
+AB82		13B2
+AB83		13B3
+AB84		13B4
+AB85		13B5
+AB86		13B6
+AB87		13B7
+AB88		13B8
+AB89		13B9
+AB8A		13BA
+AB8B		13BB
+AB8C		13BC
+AB8D		13BD
+AB8E		13BE
+AB8F		13BF
+AB90		13C0
+AB91		13C1
+AB92		13C2
+AB93		13C3
+AB94		13C4
+AB95		13C5
+AB96		13C6
+AB97		13C7
+AB98		13C8
+AB99		13C9
+AB9A		13CA
+AB9B		13CB
+AB9C		13CC
+AB9D		13CD
+AB9E		13CE
+AB9F		13CF
+ABA0		13D0
+ABA1		13D1
+ABA2		13D2
+ABA3		13D3
+ABA4		13D4
+ABA5		13D5
+ABA6		13D6
+ABA7		13D7
+ABA8		13D8
+ABA9		13D9
+ABAA		13DA
+ABAB		13DB
+ABAC		13DC
+ABAD		13DD
+ABAE		13DE
+ABAF		13DF
+ABB0		13E0
+ABB1		13E1
+ABB2		13E2
+ABB3		13E3
+ABB4		13E4
+ABB5		13E5
+ABB6		13E6
+ABB7		13E7
+ABB8		13E8
+ABB9		13E9
+ABBA		13EA
+ABBB		13EB
+ABBC		13EC
+ABBD		13ED
+ABBE		13EE
+ABBF		13EF
 FF41		FF21
 FF42		FF22
 FF43		FF23
@@ -1148,6 +1238,57 @@ FF5A		FF3A
 1044D		10425
 1044E		10426
 1044F		10427
+10CC0		10C80
+10CC1		10C81
+10CC2		10C82
+10CC3		10C83
+10CC4		10C84
+10CC5		10C85
+10CC6		10C86
+10CC7		10C87
+10CC8		10C88
+10CC9		10C89
+10CCA		10C8A
+10CCB		10C8B
+10CCC		10C8C
+10CCD		10C8D
+10CCE		10C8E
+10CCF		10C8F
+10CD0		10C90
+10CD1		10C91
+10CD2		10C92
+10CD3		10C93
+10CD4		10C94
+10CD5		10C95
+10CD6		10C96
+10CD7		10C97
+10CD8		10C98
+10CD9		10C99
+10CDA		10C9A
+10CDB		10C9B
+10CDC		10C9C
+10CDD		10C9D
+10CDE		10C9E
+10CDF		10C9F
+10CE0		10CA0
+10CE1		10CA1
+10CE2		10CA2
+10CE3		10CA3
+10CE4		10CA4
+10CE5		10CA5
+10CE6		10CA6
+10CE7		10CA7
+10CE8		10CA8
+10CE9		10CA9
+10CEA		10CAA
+10CEB		10CAB
+10CEC		10CAC
+10CED		10CAD
+10CEE		10CAE
+10CEF		10CAF
+10CF0		10CB0
+10CF1		10CB1
+10CF2		10CB2
 118C0		118A0
 118C1		118A1
 118C2		118A2
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Uc.pl b/Master/tlpkg/tlperl/lib/unicore/To/Uc.pl
index b0cce4038d1..08fdd33e588 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Uc.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Uc.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -317,6 +317,7 @@ FF		178
 28A	28B	1B1
 28C		245
 292		1B7
+29D		A7B2
 29E		A7B0
 345		399
 371		370
@@ -457,6 +458,7 @@ FF		178
 52D		52C
 52F		52E
 561	586	531
+13F8	13FD	13F0
 1D79		A77D
 1D7D		2C63
 1E01		1E00
@@ -774,7 +776,12 @@ A7A3		A7A2
 A7A5		A7A4
 A7A7		A7A6
 A7A9		A7A8
+A7B5		A7B4
+A7B7		A7B6
+AB53		A7B3
+AB70	ABBF	13A0
 FF41	FF5A	FF21
 10428	1044F	10400
+10CC0	10CF2	10C80
 118C0	118DF	118A0
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/Upper.pl b/Master/tlpkg/tlperl/lib/unicore/To/Upper.pl
index c04a52ffee0..b4adcf7366e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/Upper.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/Upper.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   IT IS DEPRECATED TO USE THIS FILE   !!!!!!!
 
@@ -374,6 +374,7 @@ return <<'END';
 028B		01B2
 028C		0245
 0292		01B7
+029D		A7B2
 029E		A7B0
 0345		0399
 0371		0370
@@ -626,6 +627,12 @@ return <<'END';
 0584		0554
 0585		0555
 0586		0556
+13F8		13F0
+13F9		13F1
+13FA		13F2
+13FB		13F3
+13FC		13F4
+13FD		13F5
 1D79		A77D
 1D7D		2C63
 1E01		1E00
@@ -1109,6 +1116,89 @@ A7A3		A7A2
 A7A5		A7A4
 A7A7		A7A6
 A7A9		A7A8
+A7B5		A7B4
+A7B7		A7B6
+AB53		A7B3
+AB70		13A0
+AB71		13A1
+AB72		13A2
+AB73		13A3
+AB74		13A4
+AB75		13A5
+AB76		13A6
+AB77		13A7
+AB78		13A8
+AB79		13A9
+AB7A		13AA
+AB7B		13AB
+AB7C		13AC
+AB7D		13AD
+AB7E		13AE
+AB7F		13AF
+AB80		13B0
+AB81		13B1
+AB82		13B2
+AB83		13B3
+AB84		13B4
+AB85		13B5
+AB86		13B6
+AB87		13B7
+AB88		13B8
+AB89		13B9
+AB8A		13BA
+AB8B		13BB
+AB8C		13BC
+AB8D		13BD
+AB8E		13BE
+AB8F		13BF
+AB90		13C0
+AB91		13C1
+AB92		13C2
+AB93		13C3
+AB94		13C4
+AB95		13C5
+AB96		13C6
+AB97		13C7
+AB98		13C8
+AB99		13C9
+AB9A		13CA
+AB9B		13CB
+AB9C		13CC
+AB9D		13CD
+AB9E		13CE
+AB9F		13CF
+ABA0		13D0
+ABA1		13D1
+ABA2		13D2
+ABA3		13D3
+ABA4		13D4
+ABA5		13D5
+ABA6		13D6
+ABA7		13D7
+ABA8		13D8
+ABA9		13D9
+ABAA		13DA
+ABAB		13DB
+ABAC		13DC
+ABAD		13DD
+ABAE		13DE
+ABAF		13DF
+ABB0		13E0
+ABB1		13E1
+ABB2		13E2
+ABB3		13E3
+ABB4		13E4
+ABB5		13E5
+ABB6		13E6
+ABB7		13E7
+ABB8		13E8
+ABB9		13E9
+ABBA		13EA
+ABBB		13EB
+ABBC		13EC
+ABBD		13ED
+ABBE		13EE
+ABBF		13EF
 FF41		FF21
 FF42		FF22
 FF43		FF23
@@ -1175,6 +1265,57 @@ FF5A		FF3A
 1044D		10425
 1044E		10426
 1044F		10427
+10CC0		10C80
+10CC1		10C81
+10CC2		10C82
+10CC3		10C83
+10CC4		10C84
+10CC5		10C85
+10CC6		10C86
+10CC7		10C87
+10CC8		10C88
+10CC9		10C89
+10CCA		10C8A
+10CCB		10C8B
+10CCC		10C8C
+10CCD		10C8D
+10CCE		10C8E
+10CCF		10C8F
+10CD0		10C90
+10CD1		10C91
+10CD2		10C92
+10CD3		10C93
+10CD4		10C94
+10CD5		10C95
+10CD6		10C96
+10CD7		10C97
+10CD8		10C98
+10CD9		10C99
+10CDA		10C9A
+10CDB		10C9B
+10CDC		10C9C
+10CDD		10C9D
+10CDE		10C9E
+10CDF		10C9F
+10CE0		10CA0
+10CE1		10CA1
+10CE2		10CA2
+10CE3		10CA3
+10CE4		10CA4
+10CE5		10CA5
+10CE6		10CA6
+10CE7		10CA7
+10CE8		10CA8
+10CE9		10CA9
+10CEA		10CAA
+10CEB		10CAB
+10CEC		10CAC
+10CED		10CAD
+10CEE		10CAE
+10CEF		10CAF
+10CF0		10CB0
+10CF1		10CB1
+10CF2		10CB2
 118C0		118A0
 118C1		118A1
 118C2		118A2
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/WB.pl b/Master/tlpkg/tlperl/lib/unicore/To/WB.pl
index 0e1f2a30ec2..5fa837e9f41 100644
--- a/Master/tlpkg/tlperl/lib/unicore/To/WB.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/To/WB.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -119,8 +119,8 @@ F8	2C1	ALetter
 829	82D	Extend
 840	858	ALetter
 859	85B	Extend
-8A0	8B2	ALetter
-8E4	903	Extend
+8A0	8B4	ALetter
+8E3	903	Extend
 904	939	ALetter
 93A	93C	Extend
 93D		ALetter
@@ -185,6 +185,7 @@ AD0		ALetter
 AE0	AE1	ALetter
 AE2	AE3	Extend
 AE6	AEF	Numeric
+AF9		ALetter
 B01	B03	Extend
 B05	B0C	ALetter
 B0F	B10	ALetter
@@ -230,7 +231,7 @@ C3E	C44	Extend
 C46	C48	Extend
 C4A	C4D	Extend
 C55	C56	Extend
-C58	C59	ALetter
+C58	C5A	ALetter
 C60	C61	ALetter
 C62	C63	Extend
 C66	C6F	Numeric
@@ -261,7 +262,7 @@ D46	D48	Extend
 D4A	D4D	Extend
 D4E		ALetter
 D57		Extend
-D60	D61	ALetter
+D5F	D61	ALetter
 D62	D63	Extend
 D66	D6F	Numeric
 D7A	D7F	ALetter
@@ -334,7 +335,8 @@ FC6		Extend
 1318	135A	ALetter
 135D	135F	Extend
 1380	138F	ALetter
-13A0	13F4	ALetter
+13A0	13F5	ALetter
+13F8	13FD	ALetter
 1401	166C	ALetter
 166F	167F	ALetter
 1681	169A	ALetter
@@ -365,8 +367,6 @@ FC6		Extend
 1920	192B	Extend
 1930	193B	Extend
 1946	194F	Numeric
-19B0	19C0	Extend
-19C8	19C9	Extend
 19D0	19D9	Numeric
 1A00	1A16	ALetter
 1A17	1A1B	Extend
@@ -503,14 +503,13 @@ A640	A66E	ALetter
 A66F	A672	Extend
 A674	A67D	Extend
 A67F	A69D	ALetter
-A69F		Extend
+A69E	A69F	Extend
 A6A0	A6EF	ALetter
 A6F0	A6F1	Extend
 A717	A71F	ALetter
 A722	A788	ALetter
-A78B	A78E	ALetter
-A790	A7AD	ALetter
-A7B0	A7B1	ALetter
+A78B	A7AD	ALetter
+A7B0	A7B7	ALetter
 A7F7	A801	ALetter
 A802		Extend
 A803	A805	ALetter
@@ -527,6 +526,7 @@ A8D0	A8D9	Numeric
 A8E0	A8F1	Extend
 A8F2	A8F7	ALetter
 A8FB		ALetter
+A8FD		ALetter
 A900	A909	Numeric
 A90A	A925	ALetter
 A926	A92D	Extend
@@ -563,9 +563,8 @@ AB11	AB16	ALetter
 AB20	AB26	ALetter
 AB28	AB2E	ALetter
 AB30	AB5A	ALetter
-AB5C	AB5F	ALetter
-AB64	AB65	ALetter
-ABC0	ABE2	ALetter
+AB5C	AB65	ALetter
+AB70	ABE2	ALetter
 ABE3	ABEA	Extend
 ABEC	ABED	Extend
 ABF0	ABF9	Numeric
@@ -592,7 +591,7 @@ FE00	FE0F	Extend
 FE10		MidNum
 FE13		MidLetter
 FE14		MidNum
-FE20	FE2D	Extend
+FE20	FE2F	Extend
 FE33	FE34	ExtendNumLet
 FE4D	FE4F	ExtendNumLet
 FE50		MidNum
@@ -653,6 +652,8 @@ FFF9	FFFB	Format
 1083F	10855	ALetter
 10860	10876	ALetter
 10880	1089E	ALetter
+108E0	108F2	ALetter
+108F4	108F5	ALetter
 10900	10915	ALetter
 10920	10939	ALetter
 10980	109B7	ALetter
@@ -676,6 +677,8 @@ FFF9	FFFB	Format
 10B60	10B72	ALetter
 10B80	10B91	ALetter
 10C00	10C48	ALetter
+10C80	10CB2	ALetter
+10CC0	10CF2	ALetter
 11000	11002	Extend
 11003	11037	ALetter
 11038	11046	Extend
@@ -697,15 +700,22 @@ FFF9	FFFB	Format
 11183	111B2	ALetter
 111B3	111C0	Extend
 111C1	111C4	ALetter
+111CA	111CC	Extend
 111D0	111D9	Numeric
 111DA		ALetter
+111DC		ALetter
 11200	11211	ALetter
 11213	1122B	ALetter
 1122C	11237	Extend
+11280	11286	ALetter
+11288		ALetter
+1128A	1128D	ALetter
+1128F	1129D	ALetter
+1129F	112A8	ALetter
 112B0	112DE	ALetter
 112DF	112EA	Extend
 112F0	112F9	Numeric
-11301	11303	Extend
+11300	11303	Extend
 11305	1130C	ALetter
 1130F	11310	ALetter
 11313	11328	ALetter
@@ -717,6 +727,7 @@ FFF9	FFFB	Format
 1133E	11344	Extend
 11347	11348	Extend
 1134B	1134D	Extend
+11350		ALetter
 11357		Extend
 1135D	11361	ALetter
 11362	11363	Extend
@@ -730,6 +741,8 @@ FFF9	FFFB	Format
 11580	115AE	ALetter
 115AF	115B5	Extend
 115B8	115C0	Extend
+115D8	115DB	ALetter
+115DC	115DD	Extend
 11600	1162F	ALetter
 11630	11640	Extend
 11644		ALetter
@@ -737,13 +750,17 @@ FFF9	FFFB	Format
 11680	116AA	ALetter
 116AB	116B7	Extend
 116C0	116C9	Numeric
+1171D	1172B	Extend
+11730	11739	Numeric
 118A0	118DF	ALetter
 118E0	118E9	Numeric
 118FF		ALetter
 11AC0	11AF8	ALetter
-12000	12398	ALetter
+12000	12399	ALetter
 12400	1246E	ALetter
+12480	12543	ALetter
 13000	1342E	ALetter
+14400	14646	ALetter
 16800	16A38	ALetter
 16A40	16A5E	ALetter
 16A60	16A69	Numeric
@@ -805,6 +822,12 @@ FFF9	FFFB	Format
 1D7AA	1D7C2	ALetter
 1D7C4	1D7CB	ALetter
 1D7CE	1D7FF	Numeric
+1DA00	1DA36	Extend
+1DA3B	1DA6C	Extend
+1DA75		Extend
+1DA84		Extend
+1DA9B	1DA9F	Extend
+1DAA1	1DAAF	Extend
 1E800	1E8C4	ALetter
 1E8D0	1E8D6	Extend
 1EE00	1EE03	ALetter
diff --git a/Master/tlpkg/tlperl/lib/unicore/To/_PerlLB.pl b/Master/tlpkg/tlperl/lib/unicore/To/_PerlLB.pl
new file mode 100644
index 00000000000..834f740bf74
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/To/_PerlLB.pl
@@ -0,0 +1,1683 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+

+# The name this swash is to be known by, with the format of the mappings in

+# the main body of the table, and what all code points missing from this file

+# map to.

+$utf8::SwashInfo{'To_PerlLB'}{'format'} = 's'; # string

+$utf8::SwashInfo{'To_PerlLB'}{'missing'} = 'Alphabetic';

+

+return <<'END';

+0	8	Combining_Mark

+9		Break_After

+A		Line_Feed

+B	C	Mandatory_Break

+D		Carriage_Return

+E	1F	Combining_Mark

+20		Space

+21		Exclamation

+22		Quotation

+24		Prefix_Numeric

+25		Postfix_Numeric

+27		Quotation

+28		Open_Punctuation

+29		Close_Parenthesis

+2B		Prefix_Numeric

+2C		Infix_Numeric

+2D		Hyphen

+2E		Infix_Numeric

+2F		Break_Symbols

+30	39	Numeric

+3A	3B	Infix_Numeric

+3F		Exclamation

+5B		Open_Punctuation

+5C		Prefix_Numeric

+5D		Close_Parenthesis

+7B		Open_Punctuation

+7C		Break_After

+7D		Close_Punctuation

+7F	84	Combining_Mark

+85		Next_Line

+86	9F	Combining_Mark

+A0		Glue

+A1		Open_Punctuation

+A2		Postfix_Numeric

+A3	A5	Prefix_Numeric

+AB		Quotation

+AD		Break_After

+B0		Postfix_Numeric

+B1		Prefix_Numeric

+B4		Break_Before

+BB		Quotation

+BF		Open_Punctuation

+2C8		Break_Before

+2CC		Break_Before

+2DF		Break_Before

+300	34E	Combining_Mark

+34F		Glue

+350	35B	Combining_Mark

+35C	362	Glue

+363	36F	Combining_Mark

+37E		Infix_Numeric

+483	489	Combining_Mark

+589		Infix_Numeric

+58A		Break_After

+58F		Prefix_Numeric

+591	5BD	Combining_Mark

+5BE		Break_After

+5BF		Combining_Mark

+5C1	5C2	Combining_Mark

+5C4	5C5	Combining_Mark

+5C6		Exclamation

+5C7		Combining_Mark

+5D0	5EA	Hebrew_Letter

+5F0	5F2	Hebrew_Letter

+609	60B	Postfix_Numeric

+60C	60D	Infix_Numeric

+610	61A	Combining_Mark

+61B		Exclamation

+61C		Combining_Mark

+61E	61F	Exclamation

+64B	65F	Combining_Mark

+660	669	Numeric

+66A		Postfix_Numeric

+66B	66C	Numeric

+670		Combining_Mark

+6D4		Exclamation

+6D6	6DC	Combining_Mark

+6DF	6E4	Combining_Mark

+6E7	6E8	Combining_Mark

+6EA	6ED	Combining_Mark

+6F0	6F9	Numeric

+711		Combining_Mark

+730	74A	Combining_Mark

+7A6	7B0	Combining_Mark

+7C0	7C9	Numeric

+7EB	7F3	Combining_Mark

+7F8		Infix_Numeric

+7F9		Exclamation

+816	819	Combining_Mark

+81B	823	Combining_Mark

+825	827	Combining_Mark

+829	82D	Combining_Mark

+859	85B	Combining_Mark

+8E3	903	Combining_Mark

+93A	93C	Combining_Mark

+93E	94F	Combining_Mark

+951	957	Combining_Mark

+962	963	Combining_Mark

+964	965	Break_After

+966	96F	Numeric

+981	983	Combining_Mark

+9BC		Combining_Mark

+9BE	9C4	Combining_Mark

+9C7	9C8	Combining_Mark

+9CB	9CD	Combining_Mark

+9D7		Combining_Mark

+9E2	9E3	Combining_Mark

+9E6	9EF	Numeric

+9F2	9F3	Postfix_Numeric

+9F9		Postfix_Numeric

+9FB		Prefix_Numeric

+A01	A03	Combining_Mark

+A3C		Combining_Mark

+A3E	A42	Combining_Mark

+A47	A48	Combining_Mark

+A4B	A4D	Combining_Mark

+A51		Combining_Mark

+A66	A6F	Numeric

+A70	A71	Combining_Mark

+A75		Combining_Mark

+A81	A83	Combining_Mark

+ABC		Combining_Mark

+ABE	AC5	Combining_Mark

+AC7	AC9	Combining_Mark

+ACB	ACD	Combining_Mark

+AE2	AE3	Combining_Mark

+AE6	AEF	Numeric

+AF1		Prefix_Numeric

+B01	B03	Combining_Mark

+B3C		Combining_Mark

+B3E	B44	Combining_Mark

+B47	B48	Combining_Mark

+B4B	B4D	Combining_Mark

+B56	B57	Combining_Mark

+B62	B63	Combining_Mark

+B66	B6F	Numeric

+B82		Combining_Mark

+BBE	BC2	Combining_Mark

+BC6	BC8	Combining_Mark

+BCA	BCD	Combining_Mark

+BD7		Combining_Mark

+BE6	BEF	Numeric

+BF9		Prefix_Numeric

+C00	C03	Combining_Mark

+C3E	C44	Combining_Mark

+C46	C48	Combining_Mark

+C4A	C4D	Combining_Mark

+C55	C56	Combining_Mark

+C62	C63	Combining_Mark

+C66	C6F	Numeric

+C81	C83	Combining_Mark

+CBC		Combining_Mark

+CBE	CC4	Combining_Mark

+CC6	CC8	Combining_Mark

+CCA	CCD	Combining_Mark

+CD5	CD6	Combining_Mark

+CE2	CE3	Combining_Mark

+CE6	CEF	Numeric

+D01	D03	Combining_Mark

+D3E	D44	Combining_Mark

+D46	D48	Combining_Mark

+D4A	D4D	Combining_Mark

+D57		Combining_Mark

+D62	D63	Combining_Mark

+D66	D6F	Numeric

+D79		Postfix_Numeric

+D82	D83	Combining_Mark

+DCA		Combining_Mark

+DCF	DD4	Combining_Mark

+DD6		Combining_Mark

+DD8	DDF	Combining_Mark

+DE6	DEF	Numeric

+DF2	DF3	Combining_Mark

+E31		Combining_Mark

+E34	E3A	Combining_Mark

+E3F		Prefix_Numeric

+E47	E4E	Combining_Mark

+E50	E59	Numeric

+E5A	E5B	Break_After

+EB1		Combining_Mark

+EB4	EB9	Combining_Mark

+EBB	EBC	Combining_Mark

+EC8	ECD	Combining_Mark

+ED0	ED9	Numeric

+F01	F04	Break_Before

+F06	F07	Break_Before

+F08		Glue

+F09	F0A	Break_Before

+F0B		Break_After

+F0C		Glue

+F0D	F11	Exclamation

+F12		Glue

+F14		Exclamation

+F18	F19	Combining_Mark

+F20	F29	Numeric

+F34		Break_After

+F35		Combining_Mark

+F37		Combining_Mark

+F39		Combining_Mark

+F3A		Open_Punctuation

+F3B		Close_Punctuation

+F3C		Open_Punctuation

+F3D		Close_Punctuation

+F3E	F3F	Combining_Mark

+F71	F7E	Combining_Mark

+F7F		Break_After

+F80	F84	Combining_Mark

+F85		Break_After

+F86	F87	Combining_Mark

+F8D	F97	Combining_Mark

+F99	FBC	Combining_Mark

+FBE	FBF	Break_After

+FC6		Combining_Mark

+FD0	FD1	Break_Before

+FD2		Break_After

+FD3		Break_Before

+FD9	FDA	Glue

+102B	103E	Combining_Mark

+1040	1049	Numeric

+104A	104B	Break_After

+1056	1059	Combining_Mark

+105E	1060	Combining_Mark

+1062	1064	Combining_Mark

+1067	106D	Combining_Mark

+1071	1074	Combining_Mark

+1082	108D	Combining_Mark

+108F		Combining_Mark

+1090	1099	Numeric

+109A	109D	Combining_Mark

+1100	115F	JL

+1160	11A7	JV

+11A8	11FF	JT

+135D	135F	Combining_Mark

+1361		Break_After

+1400		Break_After

+1680		Break_After

+169B		Open_Punctuation

+169C		Close_Punctuation

+16EB	16ED	Break_After

+1712	1714	Combining_Mark

+1732	1734	Combining_Mark

+1735	1736	Break_After

+1752	1753	Combining_Mark

+1772	1773	Combining_Mark

+17B4	17D3	Combining_Mark

+17D4	17D5	Break_After

+17D6		Nonstarter

+17D8		Break_After

+17DA		Break_After

+17DB		Prefix_Numeric

+17DD		Combining_Mark

+17E0	17E9	Numeric

+1802	1803	Exclamation

+1804	1805	Break_After

+1806		Break_Before

+1808	1809	Exclamation

+180B	180D	Combining_Mark

+180E		Glue

+1810	1819	Numeric

+18A9		Combining_Mark

+1920	192B	Combining_Mark

+1930	193B	Combining_Mark

+1944	1945	Exclamation

+1946	194F	Numeric

+19D0	19D9	Numeric

+1A17	1A1B	Combining_Mark

+1A55	1A5E	Combining_Mark

+1A60	1A7C	Combining_Mark

+1A7F		Combining_Mark

+1A80	1A89	Numeric

+1A90	1A99	Numeric

+1AB0	1ABE	Combining_Mark

+1B00	1B04	Combining_Mark

+1B34	1B44	Combining_Mark

+1B50	1B59	Numeric

+1B5A	1B5B	Break_After

+1B5D	1B60	Break_After

+1B6B	1B73	Combining_Mark

+1B80	1B82	Combining_Mark

+1BA1	1BAD	Combining_Mark

+1BB0	1BB9	Numeric

+1BE6	1BF3	Combining_Mark

+1C24	1C37	Combining_Mark

+1C3B	1C3F	Break_After

+1C40	1C49	Numeric

+1C50	1C59	Numeric

+1C7E	1C7F	Break_After

+1CD0	1CD2	Combining_Mark

+1CD4	1CE8	Combining_Mark

+1CED		Combining_Mark

+1CF2	1CF4	Combining_Mark

+1CF8	1CF9	Combining_Mark

+1DC0	1DF5	Combining_Mark

+1DFC	1DFF	Combining_Mark

+1FFD		Break_Before

+2000	2006	Break_After

+2007		Glue

+2008	200A	Break_After

+200B		ZWSpace

+200C	200F	Combining_Mark

+2010		Break_After

+2011		Glue

+2012	2013	Break_After

+2014		Break_Both

+2018	2019	Quotation

+201A		Open_Punctuation

+201B	201D	Quotation

+201E		Open_Punctuation

+201F		Quotation

+2024	2026	Inseparable

+2027		Break_After

+2028	2029	Mandatory_Break

+202A	202E	Combining_Mark

+202F		Glue

+2030	2037	Postfix_Numeric

+2039	203A	Quotation

+203C	203D	Nonstarter

+2044		Infix_Numeric

+2045		Open_Punctuation

+2046		Close_Punctuation

+2047	2049	Nonstarter

+2056		Break_After

+2058	205B	Break_After

+205D	205F	Break_After

+2060		Word_Joiner

+2066	206F	Combining_Mark

+207D		Open_Punctuation

+207E		Close_Punctuation

+208D		Open_Punctuation

+208E		Close_Punctuation

+20A0	20A6	Prefix_Numeric

+20A7		Postfix_Numeric

+20A8	20B5	Prefix_Numeric

+20B6		Postfix_Numeric

+20B7	20BA	Prefix_Numeric

+20BB		Postfix_Numeric

+20BC	20BD	Prefix_Numeric

+20BE		Postfix_Numeric

+20BF	20CF	Prefix_Numeric

+20D0	20F0	Combining_Mark

+2103		Postfix_Numeric

+2109		Postfix_Numeric

+2116		Prefix_Numeric

+2212	2213	Prefix_Numeric

+22EF		Inseparable

+2308		Open_Punctuation

+2309		Close_Punctuation

+230A		Open_Punctuation

+230B		Close_Punctuation

+231A	231B	Ideographic

+2329		Open_Punctuation

+232A		Close_Punctuation

+23F0	23F3	Ideographic

+2600	2603	Ideographic

+2614	2615	Ideographic

+2618		Ideographic

+261A	261F	Ideographic

+2639	263B	Ideographic

+2668		Ideographic

+267F		Ideographic

+26BD	26C8	Ideographic

+26CD		Ideographic

+26CF	26D1	Ideographic

+26D3	26D4	Ideographic

+26D8	26D9	Ideographic

+26DC		Ideographic

+26DF	26E1	Ideographic

+26EA		Ideographic

+26F1	26F5	Ideographic

+26F7	26FA	Ideographic

+26FD	2704	Ideographic

+2708	270D	Ideographic

+275B	2760	Quotation

+2762	2763	Exclamation

+2768		Open_Punctuation

+2769		Close_Punctuation

+276A		Open_Punctuation

+276B		Close_Punctuation

+276C		Open_Punctuation

+276D		Close_Punctuation

+276E		Open_Punctuation

+276F		Close_Punctuation

+2770		Open_Punctuation

+2771		Close_Punctuation

+2772		Open_Punctuation

+2773		Close_Punctuation

+2774		Open_Punctuation

+2775		Close_Punctuation

+27C5		Open_Punctuation

+27C6		Close_Punctuation

+27E6		Open_Punctuation

+27E7		Close_Punctuation

+27E8		Open_Punctuation

+27E9		Close_Punctuation

+27EA		Open_Punctuation

+27EB		Close_Punctuation

+27EC		Open_Punctuation

+27ED		Close_Punctuation

+27EE		Open_Punctuation

+27EF		Close_Punctuation

+2983		Open_Punctuation

+2984		Close_Punctuation

+2985		Open_Punctuation

+2986		Close_Punctuation

+2987		Open_Punctuation

+2988		Close_Punctuation

+2989		Open_Punctuation

+298A		Close_Punctuation

+298B		Open_Punctuation

+298C		Close_Punctuation

+298D		Open_Punctuation

+298E		Close_Punctuation

+298F		Open_Punctuation

+2990		Close_Punctuation

+2991		Open_Punctuation

+2992		Close_Punctuation

+2993		Open_Punctuation

+2994		Close_Punctuation

+2995		Open_Punctuation

+2996		Close_Punctuation

+2997		Open_Punctuation

+2998		Close_Punctuation

+29D8		Open_Punctuation

+29D9		Close_Punctuation

+29DA		Open_Punctuation

+29DB		Close_Punctuation

+29FC		Open_Punctuation

+29FD		Close_Punctuation

+2CEF	2CF1	Combining_Mark

+2CF9		Exclamation

+2CFA	2CFC	Break_After

+2CFE		Exclamation

+2CFF		Break_After

+2D70		Break_After

+2D7F		Combining_Mark

+2DE0	2DFF	Combining_Mark

+2E00	2E0D	Quotation

+2E0E	2E15	Break_After

+2E17		Break_After

+2E18		Open_Punctuation

+2E19		Break_After

+2E1C	2E1D	Quotation

+2E20	2E21	Quotation

+2E22		Open_Punctuation

+2E23		Close_Punctuation

+2E24		Open_Punctuation

+2E25		Close_Punctuation

+2E26		Open_Punctuation

+2E27		Close_Punctuation

+2E28		Open_Punctuation

+2E29		Close_Punctuation

+2E2A	2E2D	Break_After

+2E2E		Exclamation

+2E30	2E31	Break_After

+2E33	2E34	Break_After

+2E3A	2E3B	Break_Both

+2E3C	2E3E	Break_After

+2E40	2E41	Break_After

+2E42		Open_Punctuation

+2E80	2E99	Ideographic

+2E9B	2EF3	Ideographic

+2F00	2FD5	Ideographic

+2FF0	2FFB	Ideographic

+3000		Break_After

+3001	3002	Close_Punctuation

+3003	3004	Ideographic

+3005		Nonstarter

+3006	3007	Ideographic

+3008		Open_Punctuation

+3009		Close_Punctuation

+300A		Open_Punctuation

+300B		Close_Punctuation

+300C		Open_Punctuation

+300D		Close_Punctuation

+300E		Open_Punctuation

+300F		Close_Punctuation

+3010		Open_Punctuation

+3011		Close_Punctuation

+3012	3013	Ideographic

+3014		Open_Punctuation

+3015		Close_Punctuation

+3016		Open_Punctuation

+3017		Close_Punctuation

+3018		Open_Punctuation

+3019		Close_Punctuation

+301A		Open_Punctuation

+301B		Close_Punctuation

+301C		Nonstarter

+301D		Open_Punctuation

+301E	301F	Close_Punctuation

+3020	3029	Ideographic

+302A	302F	Combining_Mark

+3030	3034	Ideographic

+3035		Combining_Mark

+3036	303A	Ideographic

+303B	303C	Nonstarter

+303D	303F	Ideographic

+3041		Nonstarter

+3042		Ideographic

+3043		Nonstarter

+3044		Ideographic

+3045		Nonstarter

+3046		Ideographic

+3047		Nonstarter

+3048		Ideographic

+3049		Nonstarter

+304A	3062	Ideographic

+3063		Nonstarter

+3064	3082	Ideographic

+3083		Nonstarter

+3084		Ideographic

+3085		Nonstarter

+3086		Ideographic

+3087		Nonstarter

+3088	308D	Ideographic

+308E		Nonstarter

+308F	3094	Ideographic

+3095	3096	Nonstarter

+3099	309A	Combining_Mark

+309B	309E	Nonstarter

+309F		Ideographic

+30A0	30A1	Nonstarter

+30A2		Ideographic

+30A3		Nonstarter

+30A4		Ideographic

+30A5		Nonstarter

+30A6		Ideographic

+30A7		Nonstarter

+30A8		Ideographic

+30A9		Nonstarter

+30AA	30C2	Ideographic

+30C3		Nonstarter

+30C4	30E2	Ideographic

+30E3		Nonstarter

+30E4		Ideographic

+30E5		Nonstarter

+30E6		Ideographic

+30E7		Nonstarter

+30E8	30ED	Ideographic

+30EE		Nonstarter

+30EF	30F4	Ideographic

+30F5	30F6	Nonstarter

+30F7	30FA	Ideographic

+30FB	30FE	Nonstarter

+30FF		Ideographic

+3105	312D	Ideographic

+3131	318E	Ideographic

+3190	31BA	Ideographic

+31C0	31E3	Ideographic

+31F0	31FF	Nonstarter

+3200	321E	Ideographic

+3220	3247	Ideographic

+3250	32FE	Ideographic

+3300	4DBF	Ideographic

+4E00	A014	Ideographic

+A015		Nonstarter

+A016	A48C	Ideographic

+A490	A4C6	Ideographic

+A4FE	A4FF	Break_After

+A60D		Break_After

+A60E		Exclamation

+A60F		Break_After

+A620	A629	Numeric

+A66F	A672	Combining_Mark

+A674	A67D	Combining_Mark

+A69E	A69F	Combining_Mark

+A6F0	A6F1	Combining_Mark

+A6F3	A6F7	Break_After

+A802		Combining_Mark

+A806		Combining_Mark

+A80B		Combining_Mark

+A823	A827	Combining_Mark

+A838		Postfix_Numeric

+A874	A875	Break_Before

+A876	A877	Exclamation

+A880	A881	Combining_Mark

+A8B4	A8C4	Combining_Mark

+A8CE	A8CF	Break_After

+A8D0	A8D9	Numeric

+A8E0	A8F1	Combining_Mark

+A8FC		Break_Before

+A900	A909	Numeric

+A926	A92D	Combining_Mark

+A92E	A92F	Break_After

+A947	A953	Combining_Mark

+A960	A97C	JL

+A980	A983	Combining_Mark

+A9B3	A9C0	Combining_Mark

+A9C7	A9C9	Break_After

+A9D0	A9D9	Numeric

+A9E5		Combining_Mark

+A9F0	A9F9	Numeric

+AA29	AA36	Combining_Mark

+AA43		Combining_Mark

+AA4C	AA4D	Combining_Mark

+AA50	AA59	Numeric

+AA5D	AA5F	Break_After

+AA7B	AA7D	Combining_Mark

+AAB0		Combining_Mark

+AAB2	AAB4	Combining_Mark

+AAB7	AAB8	Combining_Mark

+AABE	AABF	Combining_Mark

+AAC1		Combining_Mark

+AAEB	AAEF	Combining_Mark

+AAF0	AAF1	Break_After

+AAF5	AAF6	Combining_Mark

+ABE3	ABEA	Combining_Mark

+ABEB		Break_After

+ABEC	ABED	Combining_Mark

+ABF0	ABF9	Numeric

+AC00		H2

+AC01	AC1B	H3

+AC1C		H2

+AC1D	AC37	H3

+AC38		H2

+AC39	AC53	H3

+AC54		H2

+AC55	AC6F	H3

+AC70		H2

+AC71	AC8B	H3

+AC8C		H2

+AC8D	ACA7	H3

+ACA8		H2

+ACA9	ACC3	H3

+ACC4		H2

+ACC5	ACDF	H3

+ACE0		H2

+ACE1	ACFB	H3

+ACFC		H2

+ACFD	AD17	H3

+AD18		H2

+AD19	AD33	H3

+AD34		H2

+AD35	AD4F	H3

+AD50		H2

+AD51	AD6B	H3

+AD6C		H2

+AD6D	AD87	H3

+AD88		H2

+AD89	ADA3	H3

+ADA4		H2

+ADA5	ADBF	H3

+ADC0		H2

+ADC1	ADDB	H3

+ADDC		H2

+ADDD	ADF7	H3

+ADF8		H2

+ADF9	AE13	H3

+AE14		H2

+AE15	AE2F	H3

+AE30		H2

+AE31	AE4B	H3

+AE4C		H2

+AE4D	AE67	H3

+AE68		H2

+AE69	AE83	H3

+AE84		H2

+AE85	AE9F	H3

+AEA0		H2

+AEA1	AEBB	H3

+AEBC		H2

+AEBD	AED7	H3

+AED8		H2

+AED9	AEF3	H3

+AEF4		H2

+AEF5	AF0F	H3

+AF10		H2

+AF11	AF2B	H3

+AF2C		H2

+AF2D	AF47	H3

+AF48		H2

+AF49	AF63	H3

+AF64		H2

+AF65	AF7F	H3

+AF80		H2

+AF81	AF9B	H3

+AF9C		H2

+AF9D	AFB7	H3

+AFB8		H2

+AFB9	AFD3	H3

+AFD4		H2

+AFD5	AFEF	H3

+AFF0		H2

+AFF1	B00B	H3

+B00C		H2

+B00D	B027	H3

+B028		H2

+B029	B043	H3

+B044		H2

+B045	B05F	H3

+B060		H2

+B061	B07B	H3

+B07C		H2

+B07D	B097	H3

+B098		H2

+B099	B0B3	H3

+B0B4		H2

+B0B5	B0CF	H3

+B0D0		H2

+B0D1	B0EB	H3

+B0EC		H2

+B0ED	B107	H3

+B108		H2

+B109	B123	H3

+B124		H2

+B125	B13F	H3

+B140		H2

+B141	B15B	H3

+B15C		H2

+B15D	B177	H3

+B178		H2

+B179	B193	H3

+B194		H2

+B195	B1AF	H3

+B1B0		H2

+B1B1	B1CB	H3

+B1CC		H2

+B1CD	B1E7	H3

+B1E8		H2

+B1E9	B203	H3

+B204		H2

+B205	B21F	H3

+B220		H2

+B221	B23B	H3

+B23C		H2

+B23D	B257	H3

+B258		H2

+B259	B273	H3

+B274		H2

+B275	B28F	H3

+B290		H2

+B291	B2AB	H3

+B2AC		H2

+B2AD	B2C7	H3

+B2C8		H2

+B2C9	B2E3	H3

+B2E4		H2

+B2E5	B2FF	H3

+B300		H2

+B301	B31B	H3

+B31C		H2

+B31D	B337	H3

+B338		H2

+B339	B353	H3

+B354		H2

+B355	B36F	H3

+B370		H2

+B371	B38B	H3

+B38C		H2

+B38D	B3A7	H3

+B3A8		H2

+B3A9	B3C3	H3

+B3C4		H2

+B3C5	B3DF	H3

+B3E0		H2

+B3E1	B3FB	H3

+B3FC		H2

+B3FD	B417	H3

+B418		H2

+B419	B433	H3

+B434		H2

+B435	B44F	H3

+B450		H2

+B451	B46B	H3

+B46C		H2

+B46D	B487	H3

+B488		H2

+B489	B4A3	H3

+B4A4		H2

+B4A5	B4BF	H3

+B4C0		H2

+B4C1	B4DB	H3

+B4DC		H2

+B4DD	B4F7	H3

+B4F8		H2

+B4F9	B513	H3

+B514		H2

+B515	B52F	H3

+B530		H2

+B531	B54B	H3

+B54C		H2

+B54D	B567	H3

+B568		H2

+B569	B583	H3

+B584		H2

+B585	B59F	H3

+B5A0		H2

+B5A1	B5BB	H3

+B5BC		H2

+B5BD	B5D7	H3

+B5D8		H2

+B5D9	B5F3	H3

+B5F4		H2

+B5F5	B60F	H3

+B610		H2

+B611	B62B	H3

+B62C		H2

+B62D	B647	H3

+B648		H2

+B649	B663	H3

+B664		H2

+B665	B67F	H3

+B680		H2

+B681	B69B	H3

+B69C		H2

+B69D	B6B7	H3

+B6B8		H2

+B6B9	B6D3	H3

+B6D4		H2

+B6D5	B6EF	H3

+B6F0		H2

+B6F1	B70B	H3

+B70C		H2

+B70D	B727	H3

+B728		H2

+B729	B743	H3

+B744		H2

+B745	B75F	H3

+B760		H2

+B761	B77B	H3

+B77C		H2

+B77D	B797	H3

+B798		H2

+B799	B7B3	H3

+B7B4		H2

+B7B5	B7CF	H3

+B7D0		H2

+B7D1	B7EB	H3

+B7EC		H2

+B7ED	B807	H3

+B808		H2

+B809	B823	H3

+B824		H2

+B825	B83F	H3

+B840		H2

+B841	B85B	H3

+B85C		H2

+B85D	B877	H3

+B878		H2

+B879	B893	H3

+B894		H2

+B895	B8AF	H3

+B8B0		H2

+B8B1	B8CB	H3

+B8CC		H2

+B8CD	B8E7	H3

+B8E8		H2

+B8E9	B903	H3

+B904		H2

+B905	B91F	H3

+B920		H2

+B921	B93B	H3

+B93C		H2

+B93D	B957	H3

+B958		H2

+B959	B973	H3

+B974		H2

+B975	B98F	H3

+B990		H2

+B991	B9AB	H3

+B9AC		H2

+B9AD	B9C7	H3

+B9C8		H2

+B9C9	B9E3	H3

+B9E4		H2

+B9E5	B9FF	H3

+BA00		H2

+BA01	BA1B	H3

+BA1C		H2

+BA1D	BA37	H3

+BA38		H2

+BA39	BA53	H3

+BA54		H2

+BA55	BA6F	H3

+BA70		H2

+BA71	BA8B	H3

+BA8C		H2

+BA8D	BAA7	H3

+BAA8		H2

+BAA9	BAC3	H3

+BAC4		H2

+BAC5	BADF	H3

+BAE0		H2

+BAE1	BAFB	H3

+BAFC		H2

+BAFD	BB17	H3

+BB18		H2

+BB19	BB33	H3

+BB34		H2

+BB35	BB4F	H3

+BB50		H2

+BB51	BB6B	H3

+BB6C		H2

+BB6D	BB87	H3

+BB88		H2

+BB89	BBA3	H3

+BBA4		H2

+BBA5	BBBF	H3

+BBC0		H2

+BBC1	BBDB	H3

+BBDC		H2

+BBDD	BBF7	H3

+BBF8		H2

+BBF9	BC13	H3

+BC14		H2

+BC15	BC2F	H3

+BC30		H2

+BC31	BC4B	H3

+BC4C		H2

+BC4D	BC67	H3

+BC68		H2

+BC69	BC83	H3

+BC84		H2

+BC85	BC9F	H3

+BCA0		H2

+BCA1	BCBB	H3

+BCBC		H2

+BCBD	BCD7	H3

+BCD8		H2

+BCD9	BCF3	H3

+BCF4		H2

+BCF5	BD0F	H3

+BD10		H2

+BD11	BD2B	H3

+BD2C		H2

+BD2D	BD47	H3

+BD48		H2

+BD49	BD63	H3

+BD64		H2

+BD65	BD7F	H3

+BD80		H2

+BD81	BD9B	H3

+BD9C		H2

+BD9D	BDB7	H3

+BDB8		H2

+BDB9	BDD3	H3

+BDD4		H2

+BDD5	BDEF	H3

+BDF0		H2

+BDF1	BE0B	H3

+BE0C		H2

+BE0D	BE27	H3

+BE28		H2

+BE29	BE43	H3

+BE44		H2

+BE45	BE5F	H3

+BE60		H2

+BE61	BE7B	H3

+BE7C		H2

+BE7D	BE97	H3

+BE98		H2

+BE99	BEB3	H3

+BEB4		H2

+BEB5	BECF	H3

+BED0		H2

+BED1	BEEB	H3

+BEEC		H2

+BEED	BF07	H3

+BF08		H2

+BF09	BF23	H3

+BF24		H2

+BF25	BF3F	H3

+BF40		H2

+BF41	BF5B	H3

+BF5C		H2

+BF5D	BF77	H3

+BF78		H2

+BF79	BF93	H3

+BF94		H2

+BF95	BFAF	H3

+BFB0		H2

+BFB1	BFCB	H3

+BFCC		H2

+BFCD	BFE7	H3

+BFE8		H2

+BFE9	C003	H3

+C004		H2

+C005	C01F	H3

+C020		H2

+C021	C03B	H3

+C03C		H2

+C03D	C057	H3

+C058		H2

+C059	C073	H3

+C074		H2

+C075	C08F	H3

+C090		H2

+C091	C0AB	H3

+C0AC		H2

+C0AD	C0C7	H3

+C0C8		H2

+C0C9	C0E3	H3

+C0E4		H2

+C0E5	C0FF	H3

+C100		H2

+C101	C11B	H3

+C11C		H2

+C11D	C137	H3

+C138		H2

+C139	C153	H3

+C154		H2

+C155	C16F	H3

+C170		H2

+C171	C18B	H3

+C18C		H2

+C18D	C1A7	H3

+C1A8		H2

+C1A9	C1C3	H3

+C1C4		H2

+C1C5	C1DF	H3

+C1E0		H2

+C1E1	C1FB	H3

+C1FC		H2

+C1FD	C217	H3

+C218		H2

+C219	C233	H3

+C234		H2

+C235	C24F	H3

+C250		H2

+C251	C26B	H3

+C26C		H2

+C26D	C287	H3

+C288		H2

+C289	C2A3	H3

+C2A4		H2

+C2A5	C2BF	H3

+C2C0		H2

+C2C1	C2DB	H3

+C2DC		H2

+C2DD	C2F7	H3

+C2F8		H2

+C2F9	C313	H3

+C314		H2

+C315	C32F	H3

+C330		H2

+C331	C34B	H3

+C34C		H2

+C34D	C367	H3

+C368		H2

+C369	C383	H3

+C384		H2

+C385	C39F	H3

+C3A0		H2

+C3A1	C3BB	H3

+C3BC		H2

+C3BD	C3D7	H3

+C3D8		H2

+C3D9	C3F3	H3

+C3F4		H2

+C3F5	C40F	H3

+C410		H2

+C411	C42B	H3

+C42C		H2

+C42D	C447	H3

+C448		H2

+C449	C463	H3

+C464		H2

+C465	C47F	H3

+C480		H2

+C481	C49B	H3

+C49C		H2

+C49D	C4B7	H3

+C4B8		H2

+C4B9	C4D3	H3

+C4D4		H2

+C4D5	C4EF	H3

+C4F0		H2

+C4F1	C50B	H3

+C50C		H2

+C50D	C527	H3

+C528		H2

+C529	C543	H3

+C544		H2

+C545	C55F	H3

+C560		H2

+C561	C57B	H3

+C57C		H2

+C57D	C597	H3

+C598		H2

+C599	C5B3	H3

+C5B4		H2

+C5B5	C5CF	H3

+C5D0		H2

+C5D1	C5EB	H3

+C5EC		H2

+C5ED	C607	H3

+C608		H2

+C609	C623	H3

+C624		H2

+C625	C63F	H3

+C640		H2

+C641	C65B	H3

+C65C		H2

+C65D	C677	H3

+C678		H2

+C679	C693	H3

+C694		H2

+C695	C6AF	H3

+C6B0		H2

+C6B1	C6CB	H3

+C6CC		H2

+C6CD	C6E7	H3

+C6E8		H2

+C6E9	C703	H3

+C704		H2

+C705	C71F	H3

+C720		H2

+C721	C73B	H3

+C73C		H2

+C73D	C757	H3

+C758		H2

+C759	C773	H3

+C774		H2

+C775	C78F	H3

+C790		H2

+C791	C7AB	H3

+C7AC		H2

+C7AD	C7C7	H3

+C7C8		H2

+C7C9	C7E3	H3

+C7E4		H2

+C7E5	C7FF	H3

+C800		H2

+C801	C81B	H3

+C81C		H2

+C81D	C837	H3

+C838		H2

+C839	C853	H3

+C854		H2

+C855	C86F	H3

+C870		H2

+C871	C88B	H3

+C88C		H2

+C88D	C8A7	H3

+C8A8		H2

+C8A9	C8C3	H3

+C8C4		H2

+C8C5	C8DF	H3

+C8E0		H2

+C8E1	C8FB	H3

+C8FC		H2

+C8FD	C917	H3

+C918		H2

+C919	C933	H3

+C934		H2

+C935	C94F	H3

+C950		H2

+C951	C96B	H3

+C96C		H2

+C96D	C987	H3

+C988		H2

+C989	C9A3	H3

+C9A4		H2

+C9A5	C9BF	H3

+C9C0		H2

+C9C1	C9DB	H3

+C9DC		H2

+C9DD	C9F7	H3

+C9F8		H2

+C9F9	CA13	H3

+CA14		H2

+CA15	CA2F	H3

+CA30		H2

+CA31	CA4B	H3

+CA4C		H2

+CA4D	CA67	H3

+CA68		H2

+CA69	CA83	H3

+CA84		H2

+CA85	CA9F	H3

+CAA0		H2

+CAA1	CABB	H3

+CABC		H2

+CABD	CAD7	H3

+CAD8		H2

+CAD9	CAF3	H3

+CAF4		H2

+CAF5	CB0F	H3

+CB10		H2

+CB11	CB2B	H3

+CB2C		H2

+CB2D	CB47	H3

+CB48		H2

+CB49	CB63	H3

+CB64		H2

+CB65	CB7F	H3

+CB80		H2

+CB81	CB9B	H3

+CB9C		H2

+CB9D	CBB7	H3

+CBB8		H2

+CBB9	CBD3	H3

+CBD4		H2

+CBD5	CBEF	H3

+CBF0		H2

+CBF1	CC0B	H3

+CC0C		H2

+CC0D	CC27	H3

+CC28		H2

+CC29	CC43	H3

+CC44		H2

+CC45	CC5F	H3

+CC60		H2

+CC61	CC7B	H3

+CC7C		H2

+CC7D	CC97	H3

+CC98		H2

+CC99	CCB3	H3

+CCB4		H2

+CCB5	CCCF	H3

+CCD0		H2

+CCD1	CCEB	H3

+CCEC		H2

+CCED	CD07	H3

+CD08		H2

+CD09	CD23	H3

+CD24		H2

+CD25	CD3F	H3

+CD40		H2

+CD41	CD5B	H3

+CD5C		H2

+CD5D	CD77	H3

+CD78		H2

+CD79	CD93	H3

+CD94		H2

+CD95	CDAF	H3

+CDB0		H2

+CDB1	CDCB	H3

+CDCC		H2

+CDCD	CDE7	H3

+CDE8		H2

+CDE9	CE03	H3

+CE04		H2

+CE05	CE1F	H3

+CE20		H2

+CE21	CE3B	H3

+CE3C		H2

+CE3D	CE57	H3

+CE58		H2

+CE59	CE73	H3

+CE74		H2

+CE75	CE8F	H3

+CE90		H2

+CE91	CEAB	H3

+CEAC		H2

+CEAD	CEC7	H3

+CEC8		H2

+CEC9	CEE3	H3

+CEE4		H2

+CEE5	CEFF	H3

+CF00		H2

+CF01	CF1B	H3

+CF1C		H2

+CF1D	CF37	H3

+CF38		H2

+CF39	CF53	H3

+CF54		H2

+CF55	CF6F	H3

+CF70		H2

+CF71	CF8B	H3

+CF8C		H2

+CF8D	CFA7	H3

+CFA8		H2

+CFA9	CFC3	H3

+CFC4		H2

+CFC5	CFDF	H3

+CFE0		H2

+CFE1	CFFB	H3

+CFFC		H2

+CFFD	D017	H3

+D018		H2

+D019	D033	H3

+D034		H2

+D035	D04F	H3

+D050		H2

+D051	D06B	H3

+D06C		H2

+D06D	D087	H3

+D088		H2

+D089	D0A3	H3

+D0A4		H2

+D0A5	D0BF	H3

+D0C0		H2

+D0C1	D0DB	H3

+D0DC		H2

+D0DD	D0F7	H3

+D0F8		H2

+D0F9	D113	H3

+D114		H2

+D115	D12F	H3

+D130		H2

+D131	D14B	H3

+D14C		H2

+D14D	D167	H3

+D168		H2

+D169	D183	H3

+D184		H2

+D185	D19F	H3

+D1A0		H2

+D1A1	D1BB	H3

+D1BC		H2

+D1BD	D1D7	H3

+D1D8		H2

+D1D9	D1F3	H3

+D1F4		H2

+D1F5	D20F	H3

+D210		H2

+D211	D22B	H3

+D22C		H2

+D22D	D247	H3

+D248		H2

+D249	D263	H3

+D264		H2

+D265	D27F	H3

+D280		H2

+D281	D29B	H3

+D29C		H2

+D29D	D2B7	H3

+D2B8		H2

+D2B9	D2D3	H3

+D2D4		H2

+D2D5	D2EF	H3

+D2F0		H2

+D2F1	D30B	H3

+D30C		H2

+D30D	D327	H3

+D328		H2

+D329	D343	H3

+D344		H2

+D345	D35F	H3

+D360		H2

+D361	D37B	H3

+D37C		H2

+D37D	D397	H3

+D398		H2

+D399	D3B3	H3

+D3B4		H2

+D3B5	D3CF	H3

+D3D0		H2

+D3D1	D3EB	H3

+D3EC		H2

+D3ED	D407	H3

+D408		H2

+D409	D423	H3

+D424		H2

+D425	D43F	H3

+D440		H2

+D441	D45B	H3

+D45C		H2

+D45D	D477	H3

+D478		H2

+D479	D493	H3

+D494		H2

+D495	D4AF	H3

+D4B0		H2

+D4B1	D4CB	H3

+D4CC		H2

+D4CD	D4E7	H3

+D4E8		H2

+D4E9	D503	H3

+D504		H2

+D505	D51F	H3

+D520		H2

+D521	D53B	H3

+D53C		H2

+D53D	D557	H3

+D558		H2

+D559	D573	H3

+D574		H2

+D575	D58F	H3

+D590		H2

+D591	D5AB	H3

+D5AC		H2

+D5AD	D5C7	H3

+D5C8		H2

+D5C9	D5E3	H3

+D5E4		H2

+D5E5	D5FF	H3

+D600		H2

+D601	D61B	H3

+D61C		H2

+D61D	D637	H3

+D638		H2

+D639	D653	H3

+D654		H2

+D655	D66F	H3

+D670		H2

+D671	D68B	H3

+D68C		H2

+D68D	D6A7	H3

+D6A8		H2

+D6A9	D6C3	H3

+D6C4		H2

+D6C5	D6DF	H3

+D6E0		H2

+D6E1	D6FB	H3

+D6FC		H2

+D6FD	D717	H3

+D718		H2

+D719	D733	H3

+D734		H2

+D735	D74F	H3

+D750		H2

+D751	D76B	H3

+D76C		H2

+D76D	D787	H3

+D788		H2

+D789	D7A3	H3

+D7B0	D7C6	JV

+D7CB	D7FB	JT

+F900	FAFF	Ideographic

+FB1D		Hebrew_Letter

+FB1E		Combining_Mark

+FB1F	FB28	Hebrew_Letter

+FB2A	FB36	Hebrew_Letter

+FB38	FB3C	Hebrew_Letter

+FB3E		Hebrew_Letter

+FB40	FB41	Hebrew_Letter

+FB43	FB44	Hebrew_Letter

+FB46	FB4F	Hebrew_Letter

+FD3E		Close_Punctuation

+FD3F		Open_Punctuation

+FDFC		Postfix_Numeric

+FE00	FE0F	Combining_Mark

+FE10		Infix_Numeric

+FE11	FE12	Close_Punctuation

+FE13	FE14	Infix_Numeric

+FE15	FE16	Exclamation

+FE17		Open_Punctuation

+FE18		Close_Punctuation

+FE19		Inseparable

+FE20	FE2F	Combining_Mark

+FE30	FE34	Ideographic

+FE35		Open_Punctuation

+FE36		Close_Punctuation

+FE37		Open_Punctuation

+FE38		Close_Punctuation

+FE39		Open_Punctuation

+FE3A		Close_Punctuation

+FE3B		Open_Punctuation

+FE3C		Close_Punctuation

+FE3D		Open_Punctuation

+FE3E		Close_Punctuation

+FE3F		Open_Punctuation

+FE40		Close_Punctuation

+FE41		Open_Punctuation

+FE42		Close_Punctuation

+FE43		Open_Punctuation

+FE44		Close_Punctuation

+FE45	FE46	Ideographic

+FE47		Open_Punctuation

+FE48		Close_Punctuation

+FE49	FE4F	Ideographic

+FE50		Close_Punctuation

+FE51		Ideographic

+FE52		Close_Punctuation

+FE54	FE55	Nonstarter

+FE56	FE57	Exclamation

+FE58		Ideographic

+FE59		Open_Punctuation

+FE5A		Close_Punctuation

+FE5B		Open_Punctuation

+FE5C		Close_Punctuation

+FE5D		Open_Punctuation

+FE5E		Close_Punctuation

+FE5F	FE66	Ideographic

+FE68		Ideographic

+FE69		Prefix_Numeric

+FE6A		Postfix_Numeric

+FE6B		Ideographic

+FEFF		Word_Joiner

+FF01		Exclamation

+FF02	FF03	Ideographic

+FF04		Prefix_Numeric

+FF05		Postfix_Numeric

+FF06	FF07	Ideographic

+FF08		Open_Punctuation

+FF09		Close_Punctuation

+FF0A	FF0B	Ideographic

+FF0C		Close_Punctuation

+FF0D		Ideographic

+FF0E		Close_Punctuation

+FF0F	FF19	Ideographic

+FF1A	FF1B	Nonstarter

+FF1C	FF1E	Ideographic

+FF1F		Exclamation

+FF20	FF3A	Ideographic

+FF3B		Open_Punctuation

+FF3C		Ideographic

+FF3D		Close_Punctuation

+FF3E	FF5A	Ideographic

+FF5B		Open_Punctuation

+FF5C		Ideographic

+FF5D		Close_Punctuation

+FF5E		Ideographic

+FF5F		Open_Punctuation

+FF60	FF61	Close_Punctuation

+FF62		Open_Punctuation

+FF63	FF64	Close_Punctuation

+FF65		Nonstarter

+FF67	FF70	Nonstarter

+FF9E	FF9F	Nonstarter

+FFE0		Postfix_Numeric

+FFE1		Prefix_Numeric

+FFE2	FFE4	Ideographic

+FFE5	FFE6	Prefix_Numeric

+FFF9	FFFB	Combining_Mark

+FFFC		Contingent_Break

+10100	10102	Break_After

+101FD		Combining_Mark

+102E0		Combining_Mark

+10376	1037A	Combining_Mark

+1039F		Break_After

+103D0		Break_After

+104A0	104A9	Numeric

+10857		Break_After

+1091F		Break_After

+10A01	10A03	Combining_Mark

+10A05	10A06	Combining_Mark

+10A0C	10A0F	Combining_Mark

+10A38	10A3A	Combining_Mark

+10A3F		Combining_Mark

+10A50	10A57	Break_After

+10AE5	10AE6	Combining_Mark

+10AF0	10AF5	Break_After

+10AF6		Inseparable

+10B39	10B3F	Break_After

+11000	11002	Combining_Mark

+11038	11046	Combining_Mark

+11047	11048	Break_After

+11066	1106F	Numeric

+1107F	11082	Combining_Mark

+110B0	110BA	Combining_Mark

+110BE	110C1	Break_After

+110F0	110F9	Numeric

+11100	11102	Combining_Mark

+11127	11134	Combining_Mark

+11136	1113F	Numeric

+11140	11143	Break_After

+11173		Combining_Mark

+11175		Break_Before

+11180	11182	Combining_Mark

+111B3	111C0	Combining_Mark

+111C5	111C6	Break_After

+111C8		Break_After

+111CA	111CC	Combining_Mark

+111D0	111D9	Numeric

+111DB		Break_Before

+111DD	111DF	Break_After

+1122C	11237	Combining_Mark

+11238	11239	Break_After

+1123B	1123C	Break_After

+112A9		Break_After

+112DF	112EA	Combining_Mark

+112F0	112F9	Numeric

+11300	11303	Combining_Mark

+1133C		Combining_Mark

+1133E	11344	Combining_Mark

+11347	11348	Combining_Mark

+1134B	1134D	Combining_Mark

+11357		Combining_Mark

+11362	11363	Combining_Mark

+11366	1136C	Combining_Mark

+11370	11374	Combining_Mark

+114B0	114C3	Combining_Mark

+114D0	114D9	Numeric

+115AF	115B5	Combining_Mark

+115B8	115C0	Combining_Mark

+115C1		Break_Before

+115C2	115C3	Break_After

+115C4	115C5	Exclamation

+115C9	115D7	Break_After

+115DC	115DD	Combining_Mark

+11630	11640	Combining_Mark

+11641	11642	Break_After

+11650	11659	Numeric

+116AB	116B7	Combining_Mark

+116C0	116C9	Numeric

+1171D	1172B	Combining_Mark

+11730	11739	Numeric

+1173C	1173E	Break_After

+118E0	118E9	Numeric

+12470	12474	Break_After

+13258	1325A	Open_Punctuation

+1325B	1325D	Close_Punctuation

+13282		Close_Punctuation

+13286		Open_Punctuation

+13287		Close_Punctuation

+13288		Open_Punctuation

+13289		Close_Punctuation

+13379		Open_Punctuation

+1337A	1337B	Close_Punctuation

+145CE		Open_Punctuation

+145CF		Close_Punctuation

+16A60	16A69	Numeric

+16A6E	16A6F	Break_After

+16AF0	16AF4	Combining_Mark

+16AF5		Break_After

+16B30	16B36	Combining_Mark

+16B37	16B39	Break_After

+16B44		Break_After

+16B50	16B59	Numeric

+16F51	16F7E	Combining_Mark

+16F8F	16F92	Combining_Mark

+1B000	1B001	Ideographic

+1BC9D	1BC9E	Combining_Mark

+1BC9F		Break_After

+1BCA0	1BCA3	Combining_Mark

+1D165	1D169	Combining_Mark

+1D16D	1D182	Combining_Mark

+1D185	1D18B	Combining_Mark

+1D1AA	1D1AD	Combining_Mark

+1D242	1D244	Combining_Mark

+1D7CE	1D7FF	Numeric

+1DA00	1DA36	Combining_Mark

+1DA3B	1DA6C	Combining_Mark

+1DA75		Combining_Mark

+1DA84		Combining_Mark

+1DA87	1DA8A	Break_After

+1DA9B	1DA9F	Combining_Mark

+1DAA1	1DAAF	Combining_Mark

+1E8D0	1E8D6	Combining_Mark

+1F000	1F02B	Ideographic

+1F030	1F093	Ideographic

+1F0A0	1F0AE	Ideographic

+1F0B1	1F0BF	Ideographic

+1F0C1	1F0CF	Ideographic

+1F0D1	1F0F5	Ideographic

+1F1E6	1F1FF	Regional_Indicator

+1F200	1F202	Ideographic

+1F210	1F23A	Ideographic

+1F240	1F248	Ideographic

+1F250	1F251	Ideographic

+1F300	1F39B	Ideographic

+1F39E	1F3B4	Ideographic

+1F3B7	1F3BB	Ideographic

+1F3BD	1F3FA	Ideographic

+1F400	1F49F	Ideographic

+1F4A1		Ideographic

+1F4A3		Ideographic

+1F4A5	1F4AE	Ideographic

+1F4B0		Ideographic

+1F4B3	1F4FF	Ideographic

+1F507	1F516	Ideographic

+1F525	1F531	Ideographic

+1F54A	1F579	Ideographic

+1F57B	1F5A3	Ideographic

+1F5A5	1F5D3	Ideographic

+1F5DC	1F5F3	Ideographic

+1F5FA	1F64F	Ideographic

+1F676	1F678	Quotation

+1F679	1F67B	Nonstarter

+1F680	1F6D0	Ideographic

+1F6E0	1F6EC	Ideographic

+1F6F0	1F6F3	Ideographic

+1F910	1F918	Ideographic

+1F980	1F984	Ideographic

+1F9C0		Ideographic

+20000	2FFFD	Ideographic

+30000	3FFFD	Ideographic

+E0001		Combining_Mark

+E0020	E007F	Combining_Mark

+E0100	E01EF	Combining_Mark

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/To/_PerlWB.pl b/Master/tlpkg/tlperl/lib/unicore/To/_PerlWB.pl
new file mode 100644
index 00000000000..013bafc1d07
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/To/_PerlWB.pl
@@ -0,0 +1,881 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+

+# The name this swash is to be known by, with the format of the mappings in

+# the main body of the table, and what all code points missing from this file

+# map to.

+$utf8::SwashInfo{'To_PerlWB'}{'format'} = 's'; # string

+$utf8::SwashInfo{'To_PerlWB'}{'missing'} = 'Other';

+

+return <<'END';

+9		Perl_Tailored_HSpace

+A		LF

+B	C	Newline

+D		CR

+20		Perl_Tailored_HSpace

+22		Double_Quote

+27		Single_Quote

+2C		MidNum

+2E		MidNumLet

+30	39	Numeric

+3A		MidLetter

+3B		MidNum

+41	5A	ALetter

+5F		ExtendNumLet

+61	7A	ALetter

+85		Newline

+A0		Perl_Tailored_HSpace

+AA		ALetter

+AD		Format

+B5		ALetter

+B7		MidLetter

+BA		ALetter

+C0	D6	ALetter

+D8	F6	ALetter

+F8	2C1	ALetter

+2C6	2D1	ALetter

+2D7		MidLetter

+2E0	2E4	ALetter

+2EC		ALetter

+2EE		ALetter

+300	36F	Extend

+370	374	ALetter

+376	377	ALetter

+37A	37D	ALetter

+37E		MidNum

+37F		ALetter

+386		ALetter

+387		MidLetter

+388	38A	ALetter

+38C		ALetter

+38E	3A1	ALetter

+3A3	3F5	ALetter

+3F7	481	ALetter

+483	489	Extend

+48A	52F	ALetter

+531	556	ALetter

+559		ALetter

+561	587	ALetter

+589		MidNum

+591	5BD	Extend

+5BF		Extend

+5C1	5C2	Extend

+5C4	5C5	Extend

+5C7		Extend

+5D0	5EA	Hebrew_Letter

+5F0	5F2	Hebrew_Letter

+5F3		ALetter

+5F4		MidLetter

+600	605	Format

+60C	60D	MidNum

+610	61A	Extend

+61C		Format

+620	64A	ALetter

+64B	65F	Extend

+660	669	Numeric

+66B		Numeric

+66C		MidNum

+66E	66F	ALetter

+670		Extend

+671	6D3	ALetter

+6D5		ALetter

+6D6	6DC	Extend

+6DD		Format

+6DF	6E4	Extend

+6E5	6E6	ALetter

+6E7	6E8	Extend

+6EA	6ED	Extend

+6EE	6EF	ALetter

+6F0	6F9	Numeric

+6FA	6FC	ALetter

+6FF		ALetter

+70F		Format

+710		ALetter

+711		Extend

+712	72F	ALetter

+730	74A	Extend

+74D	7A5	ALetter

+7A6	7B0	Extend

+7B1		ALetter

+7C0	7C9	Numeric

+7CA	7EA	ALetter

+7EB	7F3	Extend

+7F4	7F5	ALetter

+7F8		MidNum

+7FA		ALetter

+800	815	ALetter

+816	819	Extend

+81A		ALetter

+81B	823	Extend

+824		ALetter

+825	827	Extend

+828		ALetter

+829	82D	Extend

+840	858	ALetter

+859	85B	Extend

+8A0	8B4	ALetter

+8E3	903	Extend

+904	939	ALetter

+93A	93C	Extend

+93D		ALetter

+93E	94F	Extend

+950		ALetter

+951	957	Extend

+958	961	ALetter

+962	963	Extend

+966	96F	Numeric

+971	980	ALetter

+981	983	Extend

+985	98C	ALetter

+98F	990	ALetter

+993	9A8	ALetter

+9AA	9B0	ALetter

+9B2		ALetter

+9B6	9B9	ALetter

+9BC		Extend

+9BD		ALetter

+9BE	9C4	Extend

+9C7	9C8	Extend

+9CB	9CD	Extend

+9CE		ALetter

+9D7		Extend

+9DC	9DD	ALetter

+9DF	9E1	ALetter

+9E2	9E3	Extend

+9E6	9EF	Numeric

+9F0	9F1	ALetter

+A01	A03	Extend

+A05	A0A	ALetter

+A0F	A10	ALetter

+A13	A28	ALetter

+A2A	A30	ALetter

+A32	A33	ALetter

+A35	A36	ALetter

+A38	A39	ALetter

+A3C		Extend

+A3E	A42	Extend

+A47	A48	Extend

+A4B	A4D	Extend

+A51		Extend

+A59	A5C	ALetter

+A5E		ALetter

+A66	A6F	Numeric

+A70	A71	Extend

+A72	A74	ALetter

+A75		Extend

+A81	A83	Extend

+A85	A8D	ALetter

+A8F	A91	ALetter

+A93	AA8	ALetter

+AAA	AB0	ALetter

+AB2	AB3	ALetter

+AB5	AB9	ALetter

+ABC		Extend

+ABD		ALetter

+ABE	AC5	Extend

+AC7	AC9	Extend

+ACB	ACD	Extend

+AD0		ALetter

+AE0	AE1	ALetter

+AE2	AE3	Extend

+AE6	AEF	Numeric

+AF9		ALetter

+B01	B03	Extend

+B05	B0C	ALetter

+B0F	B10	ALetter

+B13	B28	ALetter

+B2A	B30	ALetter

+B32	B33	ALetter

+B35	B39	ALetter

+B3C		Extend

+B3D		ALetter

+B3E	B44	Extend

+B47	B48	Extend

+B4B	B4D	Extend

+B56	B57	Extend

+B5C	B5D	ALetter

+B5F	B61	ALetter

+B62	B63	Extend

+B66	B6F	Numeric

+B71		ALetter

+B82		Extend

+B83		ALetter

+B85	B8A	ALetter

+B8E	B90	ALetter

+B92	B95	ALetter

+B99	B9A	ALetter

+B9C		ALetter

+B9E	B9F	ALetter

+BA3	BA4	ALetter

+BA8	BAA	ALetter

+BAE	BB9	ALetter

+BBE	BC2	Extend

+BC6	BC8	Extend

+BCA	BCD	Extend

+BD0		ALetter

+BD7		Extend

+BE6	BEF	Numeric

+C00	C03	Extend

+C05	C0C	ALetter

+C0E	C10	ALetter

+C12	C28	ALetter

+C2A	C39	ALetter

+C3D		ALetter

+C3E	C44	Extend

+C46	C48	Extend

+C4A	C4D	Extend

+C55	C56	Extend

+C58	C5A	ALetter

+C60	C61	ALetter

+C62	C63	Extend

+C66	C6F	Numeric

+C81	C83	Extend

+C85	C8C	ALetter

+C8E	C90	ALetter

+C92	CA8	ALetter

+CAA	CB3	ALetter

+CB5	CB9	ALetter

+CBC		Extend

+CBD		ALetter

+CBE	CC4	Extend

+CC6	CC8	Extend

+CCA	CCD	Extend

+CD5	CD6	Extend

+CDE		ALetter

+CE0	CE1	ALetter

+CE2	CE3	Extend

+CE6	CEF	Numeric

+CF1	CF2	ALetter

+D01	D03	Extend

+D05	D0C	ALetter

+D0E	D10	ALetter

+D12	D3A	ALetter

+D3D		ALetter

+D3E	D44	Extend

+D46	D48	Extend

+D4A	D4D	Extend

+D4E		ALetter

+D57		Extend

+D5F	D61	ALetter

+D62	D63	Extend

+D66	D6F	Numeric

+D7A	D7F	ALetter

+D82	D83	Extend

+D85	D96	ALetter

+D9A	DB1	ALetter

+DB3	DBB	ALetter

+DBD		ALetter

+DC0	DC6	ALetter

+DCA		Extend

+DCF	DD4	Extend

+DD6		Extend

+DD8	DDF	Extend

+DE6	DEF	Numeric

+DF2	DF3	Extend

+E31		Extend

+E34	E3A	Extend

+E47	E4E	Extend

+E50	E59	Numeric

+EB1		Extend

+EB4	EB9	Extend

+EBB	EBC	Extend

+EC8	ECD	Extend

+ED0	ED9	Numeric

+F00		ALetter

+F18	F19	Extend

+F20	F29	Numeric

+F35		Extend

+F37		Extend

+F39		Extend

+F3E	F3F	Extend

+F40	F47	ALetter

+F49	F6C	ALetter

+F71	F84	Extend

+F86	F87	Extend

+F88	F8C	ALetter

+F8D	F97	Extend

+F99	FBC	Extend

+FC6		Extend

+102B	103E	Extend

+1040	1049	Numeric

+1056	1059	Extend

+105E	1060	Extend

+1062	1064	Extend

+1067	106D	Extend

+1071	1074	Extend

+1082	108D	Extend

+108F		Extend

+1090	1099	Numeric

+109A	109D	Extend

+10A0	10C5	ALetter

+10C7		ALetter

+10CD		ALetter

+10D0	10FA	ALetter

+10FC	1248	ALetter

+124A	124D	ALetter

+1250	1256	ALetter

+1258		ALetter

+125A	125D	ALetter

+1260	1288	ALetter

+128A	128D	ALetter

+1290	12B0	ALetter

+12B2	12B5	ALetter

+12B8	12BE	ALetter

+12C0		ALetter

+12C2	12C5	ALetter

+12C8	12D6	ALetter

+12D8	1310	ALetter

+1312	1315	ALetter

+1318	135A	ALetter

+135D	135F	Extend

+1380	138F	ALetter

+13A0	13F5	ALetter

+13F8	13FD	ALetter

+1401	166C	ALetter

+166F	167F	ALetter

+1680		Perl_Tailored_HSpace

+1681	169A	ALetter

+16A0	16EA	ALetter

+16EE	16F8	ALetter

+1700	170C	ALetter

+170E	1711	ALetter

+1712	1714	Extend

+1720	1731	ALetter

+1732	1734	Extend

+1740	1751	ALetter

+1752	1753	Extend

+1760	176C	ALetter

+176E	1770	ALetter

+1772	1773	Extend

+17B4	17D3	Extend

+17DD		Extend

+17E0	17E9	Numeric

+180B	180D	Extend

+180E		Format

+1810	1819	Numeric

+1820	1877	ALetter

+1880	18A8	ALetter

+18A9		Extend

+18AA		ALetter

+18B0	18F5	ALetter

+1900	191E	ALetter

+1920	192B	Extend

+1930	193B	Extend

+1946	194F	Numeric

+19D0	19D9	Numeric

+1A00	1A16	ALetter

+1A17	1A1B	Extend

+1A55	1A5E	Extend

+1A60	1A7C	Extend

+1A7F		Extend

+1A80	1A89	Numeric

+1A90	1A99	Numeric

+1AB0	1ABE	Extend

+1B00	1B04	Extend

+1B05	1B33	ALetter

+1B34	1B44	Extend

+1B45	1B4B	ALetter

+1B50	1B59	Numeric

+1B6B	1B73	Extend

+1B80	1B82	Extend

+1B83	1BA0	ALetter

+1BA1	1BAD	Extend

+1BAE	1BAF	ALetter

+1BB0	1BB9	Numeric

+1BBA	1BE5	ALetter

+1BE6	1BF3	Extend

+1C00	1C23	ALetter

+1C24	1C37	Extend

+1C40	1C49	Numeric

+1C4D	1C4F	ALetter

+1C50	1C59	Numeric

+1C5A	1C7D	ALetter

+1CD0	1CD2	Extend

+1CD4	1CE8	Extend

+1CE9	1CEC	ALetter

+1CED		Extend

+1CEE	1CF1	ALetter

+1CF2	1CF4	Extend

+1CF5	1CF6	ALetter

+1CF8	1CF9	Extend

+1D00	1DBF	ALetter

+1DC0	1DF5	Extend

+1DFC	1DFF	Extend

+1E00	1F15	ALetter

+1F18	1F1D	ALetter

+1F20	1F45	ALetter

+1F48	1F4D	ALetter

+1F50	1F57	ALetter

+1F59		ALetter

+1F5B		ALetter

+1F5D		ALetter

+1F5F	1F7D	ALetter

+1F80	1FB4	ALetter

+1FB6	1FBC	ALetter

+1FBE		ALetter

+1FC2	1FC4	ALetter

+1FC6	1FCC	ALetter

+1FD0	1FD3	ALetter

+1FD6	1FDB	ALetter

+1FE0	1FEC	ALetter

+1FF2	1FF4	ALetter

+1FF6	1FFC	ALetter

+2000	200A	Perl_Tailored_HSpace

+200C	200D	Extend

+200E	200F	Format

+2018	2019	MidNumLet

+2024		MidNumLet

+2027		MidLetter

+2028	2029	Newline

+202A	202E	Format

+202F		Perl_Tailored_HSpace

+203F	2040	ExtendNumLet

+2044		MidNum

+2054		ExtendNumLet

+205F		Perl_Tailored_HSpace

+2060	2064	Format

+2066	206F	Format

+2071		ALetter

+207F		ALetter

+2090	209C	ALetter

+20D0	20F0	Extend

+2102		ALetter

+2107		ALetter

+210A	2113	ALetter

+2115		ALetter

+2119	211D	ALetter

+2124		ALetter

+2126		ALetter

+2128		ALetter

+212A	212D	ALetter

+212F	2139	ALetter

+213C	213F	ALetter

+2145	2149	ALetter

+214E		ALetter

+2160	2188	ALetter

+24B6	24E9	ALetter

+2C00	2C2E	ALetter

+2C30	2C5E	ALetter

+2C60	2CE4	ALetter

+2CEB	2CEE	ALetter

+2CEF	2CF1	Extend

+2CF2	2CF3	ALetter

+2D00	2D25	ALetter

+2D27		ALetter

+2D2D		ALetter

+2D30	2D67	ALetter

+2D6F		ALetter

+2D7F		Extend

+2D80	2D96	ALetter

+2DA0	2DA6	ALetter

+2DA8	2DAE	ALetter

+2DB0	2DB6	ALetter

+2DB8	2DBE	ALetter

+2DC0	2DC6	ALetter

+2DC8	2DCE	ALetter

+2DD0	2DD6	ALetter

+2DD8	2DDE	ALetter

+2DE0	2DFF	Extend

+2E2F		ALetter

+3000		Perl_Tailored_HSpace

+3005		ALetter

+302A	302F	Extend

+3031	3035	Katakana

+303B	303C	ALetter

+3099	309A	Extend

+309B	309C	Katakana

+30A0	30FA	Katakana

+30FC	30FF	Katakana

+3105	312D	ALetter

+3131	318E	ALetter

+31A0	31BA	ALetter

+31F0	31FF	Katakana

+32D0	32FE	Katakana

+3300	3357	Katakana

+A000	A48C	ALetter

+A4D0	A4FD	ALetter

+A500	A60C	ALetter

+A610	A61F	ALetter

+A620	A629	Numeric

+A62A	A62B	ALetter

+A640	A66E	ALetter

+A66F	A672	Extend

+A674	A67D	Extend

+A67F	A69D	ALetter

+A69E	A69F	Extend

+A6A0	A6EF	ALetter

+A6F0	A6F1	Extend

+A717	A71F	ALetter

+A722	A788	ALetter

+A78B	A7AD	ALetter

+A7B0	A7B7	ALetter

+A7F7	A801	ALetter

+A802		Extend

+A803	A805	ALetter

+A806		Extend

+A807	A80A	ALetter

+A80B		Extend

+A80C	A822	ALetter

+A823	A827	Extend

+A840	A873	ALetter

+A880	A881	Extend

+A882	A8B3	ALetter

+A8B4	A8C4	Extend

+A8D0	A8D9	Numeric

+A8E0	A8F1	Extend

+A8F2	A8F7	ALetter

+A8FB		ALetter

+A8FD		ALetter

+A900	A909	Numeric

+A90A	A925	ALetter

+A926	A92D	Extend

+A930	A946	ALetter

+A947	A953	Extend

+A960	A97C	ALetter

+A980	A983	Extend

+A984	A9B2	ALetter

+A9B3	A9C0	Extend

+A9CF		ALetter

+A9D0	A9D9	Numeric

+A9E5		Extend

+A9F0	A9F9	Numeric

+AA00	AA28	ALetter

+AA29	AA36	Extend

+AA40	AA42	ALetter

+AA43		Extend

+AA44	AA4B	ALetter

+AA4C	AA4D	Extend

+AA50	AA59	Numeric

+AA7B	AA7D	Extend

+AAB0		Extend

+AAB2	AAB4	Extend

+AAB7	AAB8	Extend

+AABE	AABF	Extend

+AAC1		Extend

+AAE0	AAEA	ALetter

+AAEB	AAEF	Extend

+AAF2	AAF4	ALetter

+AAF5	AAF6	Extend

+AB01	AB06	ALetter

+AB09	AB0E	ALetter

+AB11	AB16	ALetter

+AB20	AB26	ALetter

+AB28	AB2E	ALetter

+AB30	AB5A	ALetter

+AB5C	AB65	ALetter

+AB70	ABE2	ALetter

+ABE3	ABEA	Extend

+ABEC	ABED	Extend

+ABF0	ABF9	Numeric

+AC00	D7A3	ALetter

+D7B0	D7C6	ALetter

+D7CB	D7FB	ALetter

+FB00	FB06	ALetter

+FB13	FB17	ALetter

+FB1D		Hebrew_Letter

+FB1E		Extend

+FB1F	FB28	Hebrew_Letter

+FB2A	FB36	Hebrew_Letter

+FB38	FB3C	Hebrew_Letter

+FB3E		Hebrew_Letter

+FB40	FB41	Hebrew_Letter

+FB43	FB44	Hebrew_Letter

+FB46	FB4F	Hebrew_Letter

+FB50	FBB1	ALetter

+FBD3	FD3D	ALetter

+FD50	FD8F	ALetter

+FD92	FDC7	ALetter

+FDF0	FDFB	ALetter

+FE00	FE0F	Extend

+FE10		MidNum

+FE13		MidLetter

+FE14		MidNum

+FE20	FE2F	Extend

+FE33	FE34	ExtendNumLet

+FE4D	FE4F	ExtendNumLet

+FE50		MidNum

+FE52		MidNumLet

+FE54		MidNum

+FE55		MidLetter

+FE70	FE74	ALetter

+FE76	FEFC	ALetter

+FEFF		Format

+FF07		MidNumLet

+FF0C		MidNum

+FF0E		MidNumLet

+FF1A		MidLetter

+FF1B		MidNum

+FF21	FF3A	ALetter

+FF3F		ExtendNumLet

+FF41	FF5A	ALetter

+FF66	FF9D	Katakana

+FF9E	FF9F	Extend

+FFA0	FFBE	ALetter

+FFC2	FFC7	ALetter

+FFCA	FFCF	ALetter

+FFD2	FFD7	ALetter

+FFDA	FFDC	ALetter

+FFF9	FFFB	Format

+10000	1000B	ALetter

+1000D	10026	ALetter

+10028	1003A	ALetter

+1003C	1003D	ALetter

+1003F	1004D	ALetter

+10050	1005D	ALetter

+10080	100FA	ALetter

+10140	10174	ALetter

+101FD		Extend

+10280	1029C	ALetter

+102A0	102D0	ALetter

+102E0		Extend

+10300	1031F	ALetter

+10330	1034A	ALetter

+10350	10375	ALetter

+10376	1037A	Extend

+10380	1039D	ALetter

+103A0	103C3	ALetter

+103C8	103CF	ALetter

+103D1	103D5	ALetter

+10400	1049D	ALetter

+104A0	104A9	Numeric

+10500	10527	ALetter

+10530	10563	ALetter

+10600	10736	ALetter

+10740	10755	ALetter

+10760	10767	ALetter

+10800	10805	ALetter

+10808		ALetter

+1080A	10835	ALetter

+10837	10838	ALetter

+1083C		ALetter

+1083F	10855	ALetter

+10860	10876	ALetter

+10880	1089E	ALetter

+108E0	108F2	ALetter

+108F4	108F5	ALetter

+10900	10915	ALetter

+10920	10939	ALetter

+10980	109B7	ALetter

+109BE	109BF	ALetter

+10A00		ALetter

+10A01	10A03	Extend

+10A05	10A06	Extend

+10A0C	10A0F	Extend

+10A10	10A13	ALetter

+10A15	10A17	ALetter

+10A19	10A33	ALetter

+10A38	10A3A	Extend

+10A3F		Extend

+10A60	10A7C	ALetter

+10A80	10A9C	ALetter

+10AC0	10AC7	ALetter

+10AC9	10AE4	ALetter

+10AE5	10AE6	Extend

+10B00	10B35	ALetter

+10B40	10B55	ALetter

+10B60	10B72	ALetter

+10B80	10B91	ALetter

+10C00	10C48	ALetter

+10C80	10CB2	ALetter

+10CC0	10CF2	ALetter

+11000	11002	Extend

+11003	11037	ALetter

+11038	11046	Extend

+11066	1106F	Numeric

+1107F	11082	Extend

+11083	110AF	ALetter

+110B0	110BA	Extend

+110BD		Format

+110D0	110E8	ALetter

+110F0	110F9	Numeric

+11100	11102	Extend

+11103	11126	ALetter

+11127	11134	Extend

+11136	1113F	Numeric

+11150	11172	ALetter

+11173		Extend

+11176		ALetter

+11180	11182	Extend

+11183	111B2	ALetter

+111B3	111C0	Extend

+111C1	111C4	ALetter

+111CA	111CC	Extend

+111D0	111D9	Numeric

+111DA		ALetter

+111DC		ALetter

+11200	11211	ALetter

+11213	1122B	ALetter

+1122C	11237	Extend

+11280	11286	ALetter

+11288		ALetter

+1128A	1128D	ALetter

+1128F	1129D	ALetter

+1129F	112A8	ALetter

+112B0	112DE	ALetter

+112DF	112EA	Extend

+112F0	112F9	Numeric

+11300	11303	Extend

+11305	1130C	ALetter

+1130F	11310	ALetter

+11313	11328	ALetter

+1132A	11330	ALetter

+11332	11333	ALetter

+11335	11339	ALetter

+1133C		Extend

+1133D		ALetter

+1133E	11344	Extend

+11347	11348	Extend

+1134B	1134D	Extend

+11350		ALetter

+11357		Extend

+1135D	11361	ALetter

+11362	11363	Extend

+11366	1136C	Extend

+11370	11374	Extend

+11480	114AF	ALetter

+114B0	114C3	Extend

+114C4	114C5	ALetter

+114C7		ALetter

+114D0	114D9	Numeric

+11580	115AE	ALetter

+115AF	115B5	Extend

+115B8	115C0	Extend

+115D8	115DB	ALetter

+115DC	115DD	Extend

+11600	1162F	ALetter

+11630	11640	Extend

+11644		ALetter

+11650	11659	Numeric

+11680	116AA	ALetter

+116AB	116B7	Extend

+116C0	116C9	Numeric

+1171D	1172B	Extend

+11730	11739	Numeric

+118A0	118DF	ALetter

+118E0	118E9	Numeric

+118FF		ALetter

+11AC0	11AF8	ALetter

+12000	12399	ALetter

+12400	1246E	ALetter

+12480	12543	ALetter

+13000	1342E	ALetter

+14400	14646	ALetter

+16800	16A38	ALetter

+16A40	16A5E	ALetter

+16A60	16A69	Numeric

+16AD0	16AED	ALetter

+16AF0	16AF4	Extend

+16B00	16B2F	ALetter

+16B30	16B36	Extend

+16B40	16B43	ALetter

+16B50	16B59	Numeric

+16B63	16B77	ALetter

+16B7D	16B8F	ALetter

+16F00	16F44	ALetter

+16F50		ALetter

+16F51	16F7E	Extend

+16F8F	16F92	Extend

+16F93	16F9F	ALetter

+1B000		Katakana

+1BC00	1BC6A	ALetter

+1BC70	1BC7C	ALetter

+1BC80	1BC88	ALetter

+1BC90	1BC99	ALetter

+1BC9D	1BC9E	Extend

+1BCA0	1BCA3	Format

+1D165	1D169	Extend

+1D16D	1D172	Extend

+1D173	1D17A	Format

+1D17B	1D182	Extend

+1D185	1D18B	Extend

+1D1AA	1D1AD	Extend

+1D242	1D244	Extend

+1D400	1D454	ALetter

+1D456	1D49C	ALetter

+1D49E	1D49F	ALetter

+1D4A2		ALetter

+1D4A5	1D4A6	ALetter

+1D4A9	1D4AC	ALetter

+1D4AE	1D4B9	ALetter

+1D4BB		ALetter

+1D4BD	1D4C3	ALetter

+1D4C5	1D505	ALetter

+1D507	1D50A	ALetter

+1D50D	1D514	ALetter

+1D516	1D51C	ALetter

+1D51E	1D539	ALetter

+1D53B	1D53E	ALetter

+1D540	1D544	ALetter

+1D546		ALetter

+1D54A	1D550	ALetter

+1D552	1D6A5	ALetter

+1D6A8	1D6C0	ALetter

+1D6C2	1D6DA	ALetter

+1D6DC	1D6FA	ALetter

+1D6FC	1D714	ALetter

+1D716	1D734	ALetter

+1D736	1D74E	ALetter

+1D750	1D76E	ALetter

+1D770	1D788	ALetter

+1D78A	1D7A8	ALetter

+1D7AA	1D7C2	ALetter

+1D7C4	1D7CB	ALetter

+1D7CE	1D7FF	Numeric

+1DA00	1DA36	Extend

+1DA3B	1DA6C	Extend

+1DA75		Extend

+1DA84		Extend

+1DA9B	1DA9F	Extend

+1DAA1	1DAAF	Extend

+1E800	1E8C4	ALetter

+1E8D0	1E8D6	Extend

+1EE00	1EE03	ALetter

+1EE05	1EE1F	ALetter

+1EE21	1EE22	ALetter

+1EE24		ALetter

+1EE27		ALetter

+1EE29	1EE32	ALetter

+1EE34	1EE37	ALetter

+1EE39		ALetter

+1EE3B		ALetter

+1EE42		ALetter

+1EE47		ALetter

+1EE49		ALetter

+1EE4B		ALetter

+1EE4D	1EE4F	ALetter

+1EE51	1EE52	ALetter

+1EE54		ALetter

+1EE57		ALetter

+1EE59		ALetter

+1EE5B		ALetter

+1EE5D		ALetter

+1EE5F		ALetter

+1EE61	1EE62	ALetter

+1EE64		ALetter

+1EE67	1EE6A	ALetter

+1EE6C	1EE72	ALetter

+1EE74	1EE77	ALetter

+1EE79	1EE7C	ALetter

+1EE7E		ALetter

+1EE80	1EE89	ALetter

+1EE8B	1EE9B	ALetter

+1EEA1	1EEA3	ALetter

+1EEA5	1EEA9	ALetter

+1EEAB	1EEBB	ALetter

+1F130	1F149	ALetter

+1F150	1F169	ALetter

+1F170	1F189	ALetter

+1F1E6	1F1FF	Regional_Indicator

+E0001		Format

+E0020	E007F	Format

+E0100	E01EF	Extend

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/UCD.pl b/Master/tlpkg/tlperl/lib/unicore/UCD.pl
index e21995fb1a1..703d320d1d8 100644
--- a/Master/tlpkg/tlperl/lib/unicore/UCD.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/UCD.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
@@ -38,6 +38,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'age=6.2' => '6.2',
 'age=6.3' => '6.3',
 'age=7.0' => '7.0',
+'age=8.0' => '8.0',
 'age=na' => 'na',
 'age=unassigned' => 'na',
 'age=v11' => '1.1',
@@ -56,6 +57,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'age=v62' => '6.2',
 'age=v63' => '6.3',
 'age=v70' => '7.0',
+'age=v80' => '8.0',
 'ahex=f' => 'n',
 'ahex=false' => 'n',
 'ahex=n' => 'n',
@@ -135,10 +137,12 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'bidim=y' => 'y',
 'bidim=yes' => 'y',
 'blk=aegeannumbers' => 'aegeannumbers',
+'blk=ahom' => 'ahom',
 'blk=alchemical' => 'alchemical',
 'blk=alchemicalsymbols' => 'alchemical',
 'blk=alphabeticpf' => 'alphabeticpf',
 'blk=alphabeticpresentationforms' => 'alphabeticpf',
+'blk=anatolianhieroglyphs' => 'anatolianhieroglyphs',
 'blk=ancientgreekmusic' => 'ancientgreekmusic',
 'blk=ancientgreekmusicalnotation' => 'ancientgreekmusic',
 'blk=ancientgreeknumbers' => 'ancientgreeknumbers',
@@ -184,6 +188,8 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'blk=chakma' => 'chakma',
 'blk=cham' => 'cham',
 'blk=cherokee' => 'cherokee',
+'blk=cherokeesup' => 'cherokeesup',
+'blk=cherokeesupplement' => 'cherokeesup',
 'blk=cjk' => 'cjk',
 'blk=cjkcompat' => 'cjkcompat',
 'blk=cjkcompatforms' => 'cjkcompatforms',
@@ -197,6 +203,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'blk=cjkextb' => 'cjkextb',
 'blk=cjkextc' => 'cjkextc',
 'blk=cjkextd' => 'cjkextd',
+'blk=cjkexte' => 'cjkexte',
 'blk=cjkradicalssup' => 'cjkradicalssup',
 'blk=cjkradicalssupplement' => 'cjkradicalssup',
 'blk=cjkstrokes' => 'cjkstrokes',
@@ -207,6 +214,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'blk=cjkunifiedideographsextensionb' => 'cjkextb',
 'blk=cjkunifiedideographsextensionc' => 'cjkextc',
 'blk=cjkunifiedideographsextensiond' => 'cjkextd',
+'blk=cjkunifiedideographsextensione' => 'cjkexte',
 'blk=combiningdiacriticalmarks' => 'diacriticals',
 'blk=combiningdiacriticalmarksextended' => 'diacriticalsext',
 'blk=combiningdiacriticalmarksforsymbols' => 'diacriticalsforsymbols',
@@ -245,6 +253,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'blk=domino' => 'domino',
 'blk=dominotiles' => 'domino',
 'blk=duployan' => 'duployan',
+'blk=earlydynasticcuneiform' => 'earlydynasticcuneiform',
 'blk=egyptianhieroglyphs' => 'egyptianhieroglyphs',
 'blk=elbasan' => 'elbasan',
 'blk=emoticons' => 'emoticons',
@@ -289,6 +298,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'blk=hanguljamoextendedb' => 'jamoextb',
 'blk=hangulsyllables' => 'hangul',
 'blk=hanunoo' => 'hanunoo',
+'blk=hatran' => 'hatran',
 'blk=hebrew' => 'hebrew',
 'blk=highprivateusesurrogates' => 'highpusurrogates',
 'blk=highpusurrogates' => 'highpusurrogates',
@@ -382,6 +392,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'blk=modifiertoneletters' => 'modifiertoneletters',
 'blk=mongolian' => 'mongolian',
 'blk=mro' => 'mro',
+'blk=multani' => 'multani',
 'blk=music' => 'music',
 'blk=musicalsymbols' => 'music',
 'blk=myanmar' => 'myanmar',
@@ -398,6 +409,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'blk=ocr' => 'ocr',
 'blk=ogham' => 'ogham',
 'blk=olchiki' => 'olchiki',
+'blk=oldhungarian' => 'oldhungarian',
 'blk=olditalic' => 'olditalic',
 'blk=oldnortharabian' => 'oldnortharabian',
 'blk=oldpermic' => 'oldpermic',
@@ -456,11 +468,14 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'blk=supplementalarrowsc' => 'suparrowsc',
 'blk=supplementalmathematicaloperators' => 'supmathoperators',
 'blk=supplementalpunctuation' => 'suppunctuation',
+'blk=supplementalsymbolsandpictographs' => 'supsymbolsandpictographs',
 'blk=supplementaryprivateuseareaa' => 'suppuaa',
 'blk=supplementaryprivateuseareab' => 'suppuab',
 'blk=suppuaa' => 'suppuaa',
 'blk=suppuab' => 'suppuab',
 'blk=suppunctuation' => 'suppunctuation',
+'blk=supsymbolsandpictographs' => 'supsymbolsandpictographs',
+'blk=suttonsignwriting' => 'suttonsignwriting',
 'blk=sylotinagri' => 'sylotinagri',
 'blk=syriac' => 'syriac',
 'blk=tagalog' => 'tagalog',
@@ -1006,7 +1021,57 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'in=6.2' => '6.2',
 'in=6.3' => '6.3',
 'in=7.0' => '7.0',
+'in=8.0' => '8.0',
 'in=unassigned' => 'unassigned',
+'inpc=bottom' => 'bottom',
+'inpc=bottomandright' => 'bottomandright',
+'inpc=left' => 'left',
+'inpc=leftandright' => 'leftandright',
+'inpc=na' => 'na',
+'inpc=overstruck' => 'overstruck',
+'inpc=right' => 'right',
+'inpc=top' => 'top',
+'inpc=topandbottom' => 'topandbottom',
+'inpc=topandbottomandright' => 'topandbottomandright',
+'inpc=topandleft' => 'topandleft',
+'inpc=topandleftandright' => 'topandleftandright',
+'inpc=topandright' => 'topandright',
+'inpc=visualorderleft' => 'visualorderleft',
+'insc=avagraha' => 'avagraha',
+'insc=bindu' => 'bindu',
+'insc=brahmijoiningnumber' => 'brahmijoiningnumber',
+'insc=cantillationmark' => 'cantillationmark',
+'insc=consonant' => 'consonant',
+'insc=consonantdead' => 'consonantdead',
+'insc=consonantfinal' => 'consonantfinal',
+'insc=consonantheadletter' => 'consonantheadletter',
+'insc=consonantkiller' => 'consonantkiller',
+'insc=consonantmedial' => 'consonantmedial',
+'insc=consonantplaceholder' => 'consonantplaceholder',
+'insc=consonantprecedingrepha' => 'consonantprecedingrepha',
+'insc=consonantprefixed' => 'consonantprefixed',
+'insc=consonantsubjoined' => 'consonantsubjoined',
+'insc=consonantsucceedingrepha' => 'consonantsucceedingrepha',
+'insc=consonantwithstacker' => 'consonantwithstacker',
+'insc=geminationmark' => 'geminationmark',
+'insc=invisiblestacker' => 'invisiblestacker',
+'insc=joiner' => 'joiner',
+'insc=modifyingletter' => 'modifyingletter',
+'insc=nonjoiner' => 'nonjoiner',
+'insc=nukta' => 'nukta',
+'insc=number' => 'number',
+'insc=numberjoiner' => 'numberjoiner',
+'insc=other' => 'other',
+'insc=purekiller' => 'purekiller',
+'insc=registershifter' => 'registershifter',
+'insc=syllablemodifier' => 'syllablemodifier',
+'insc=toneletter' => 'toneletter',
+'insc=tonemark' => 'tonemark',
+'insc=virama' => 'virama',
+'insc=visarga' => 'visarga',
+'insc=vowel' => 'vowel',
+'insc=voweldependent' => 'voweldependent',
+'insc=vowelindependent' => 'vowelindependent',
 'jg=ain' => 'ain',
 'jg=alaph' => 'alaph',
 'jg=alef' => 'alef',
@@ -1253,6 +1318,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'nv=0' => 0,
 'nv=1' => 1,
 'nv=1/10' => '1/10',
+'nv=1/12' => '1/12',
 'nv=1/16' => '1/16',
 'nv=1/2' => '1/2',
 'nv=1/3' => '1/3',
@@ -1272,6 +1338,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'nv=10000000000' => 10000000000,
 'nv=1000000000000' => 1000000000000,
 'nv=11' => 11,
+'nv=11/12' => '11/12',
 'nv=11/2' => '11/2',
 'nv=12' => 12,
 'nv=13' => 13,
@@ -1291,6 +1358,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'nv=200' => 200,
 'nv=2000' => 2000,
 'nv=20000' => 20000,
+'nv=200000' => 200000,
 'nv=21' => 21,
 'nv=216000' => 216000,
 'nv=22' => 22,
@@ -1311,6 +1379,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'nv=300' => 300,
 'nv=3000' => 3000,
 'nv=30000' => 30000,
+'nv=300000' => 300000,
 'nv=31' => 31,
 'nv=32' => 32,
 'nv=33' => 33,
@@ -1326,6 +1395,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'nv=400' => 400,
 'nv=4000' => 4000,
 'nv=40000' => 40000,
+'nv=400000' => 400000,
 'nv=41' => 41,
 'nv=42' => 42,
 'nv=43' => 43,
@@ -1337,6 +1407,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'nv=48' => 48,
 'nv=49' => 49,
 'nv=5' => 5,
+'nv=5/12' => '5/12',
 'nv=5/2' => '5/2',
 'nv=5/6' => '5/6',
 'nv=5/8' => '5/8',
@@ -1344,29 +1415,35 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'nv=500' => 500,
 'nv=5000' => 5000,
 'nv=50000' => 50000,
+'nv=500000' => 500000,
 'nv=6' => 6,
 'nv=60' => 60,
 'nv=600' => 600,
 'nv=6000' => 6000,
 'nv=60000' => 60000,
+'nv=600000' => 600000,
 'nv=7' => 7,
+'nv=7/12' => '7/12',
 'nv=7/2' => '7/2',
 'nv=7/8' => '7/8',
 'nv=70' => 70,
 'nv=700' => 700,
 'nv=7000' => 7000,
 'nv=70000' => 70000,
+'nv=700000' => 700000,
 'nv=8' => 8,
 'nv=80' => 80,
 'nv=800' => 800,
 'nv=8000' => 8000,
 'nv=80000' => 80000,
+'nv=800000' => 800000,
 'nv=9' => 9,
 'nv=9/2' => '9/2',
 'nv=90' => 90,
 'nv=900' => 900,
 'nv=9000' => 9000,
 'nv=90000' => 90000,
+'nv=900000' => 900000,
 'nv=nan' => 'nan',
 'patsyn=f' => 'n',
 'patsyn=false' => 'n',
@@ -1428,6 +1505,8 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'sb=upper' => 'up',
 'sb=xx' => 'xx',
 'sc=aghb' => 'aghb',
+'sc=ahom' => 'ahom',
+'sc=anatolianhieroglyphs' => 'hluw',
 'sc=arab' => 'arab',
 'sc=arabic' => 'arab',
 'sc=armenian' => 'armn',
@@ -1505,11 +1584,15 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'sc=hani' => 'hani',
 'sc=hano' => 'hano',
 'sc=hanunoo' => 'hano',
+'sc=hatr' => 'hatr',
+'sc=hatran' => 'hatr',
 'sc=hebr' => 'hebr',
 'sc=hebrew' => 'hebr',
 'sc=hira' => 'hira',
 'sc=hiragana' => 'hira',
+'sc=hluw' => 'hluw',
 'sc=hmng' => 'hmng',
+'sc=hung' => 'hung',
 'sc=imperialaramaic' => 'armi',
 'sc=inherited' => 'zinh',
 'sc=inscriptionalpahlavi' => 'phli',
@@ -1572,6 +1655,8 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'sc=mro' => 'mroo',
 'sc=mroo' => 'mroo',
 'sc=mtei' => 'mtei',
+'sc=mult' => 'mult',
+'sc=multani' => 'mult',
 'sc=myanmar' => 'mymr',
 'sc=mymr' => 'mymr',
 'sc=nabataean' => 'nbat',
@@ -1584,6 +1669,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'sc=ogham' => 'ogam',
 'sc=olchiki' => 'olck',
 'sc=olck' => 'olck',
+'sc=oldhungarian' => 'hung',
 'sc=olditalic' => 'ital',
 'sc=oldnortharabian' => 'narb',
 'sc=oldpermic' => 'perm',
@@ -1621,12 +1707,14 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'sc=sarb' => 'sarb',
 'sc=saur' => 'saur',
 'sc=saurashtra' => 'saur',
+'sc=sgnw' => 'sgnw',
 'sc=sharada' => 'shrd',
 'sc=shavian' => 'shaw',
 'sc=shaw' => 'shaw',
 'sc=shrd' => 'shrd',
 'sc=sidd' => 'sidd',
 'sc=siddham' => 'sidd',
+'sc=signwriting' => 'sgnw',
 'sc=sind' => 'sind',
 'sc=sinh' => 'sinh',
 'sc=sinhala' => 'sinh',
@@ -1678,6 +1766,8 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'sc=zyyy' => 'zyyy',
 'sc=zzzz' => 'zzzz',
 'scx=aghb' => 'aghb',
+'scx=ahom' => 'ahom',
+'scx=anatolianhieroglyphs' => 'hluw',
 'scx=arab' => 'arab',
 'scx=arabic' => 'arab',
 'scx=armenian' => 'armn',
@@ -1755,11 +1845,15 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'scx=hani' => 'hani',
 'scx=hano' => 'hano',
 'scx=hanunoo' => 'hano',
+'scx=hatr' => 'hatr',
+'scx=hatran' => 'hatr',
 'scx=hebr' => 'hebr',
 'scx=hebrew' => 'hebr',
 'scx=hira' => 'hira',
 'scx=hiragana' => 'hira',
+'scx=hluw' => 'hluw',
 'scx=hmng' => 'hmng',
+'scx=hung' => 'hung',
 'scx=imperialaramaic' => 'armi',
 'scx=inherited' => 'zinh',
 'scx=inscriptionalpahlavi' => 'phli',
@@ -1822,6 +1916,8 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'scx=mro' => 'mroo',
 'scx=mroo' => 'mroo',
 'scx=mtei' => 'mtei',
+'scx=mult' => 'mult',
+'scx=multani' => 'mult',
 'scx=myanmar' => 'mymr',
 'scx=mymr' => 'mymr',
 'scx=nabataean' => 'nbat',
@@ -1834,6 +1930,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'scx=ogham' => 'ogam',
 'scx=olchiki' => 'olck',
 'scx=olck' => 'olck',
+'scx=oldhungarian' => 'hung',
 'scx=olditalic' => 'ital',
 'scx=oldnortharabian' => 'narb',
 'scx=oldpermic' => 'perm',
@@ -1871,12 +1968,14 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'scx=sarb' => 'sarb',
 'scx=saur' => 'saur',
 'scx=saurashtra' => 'saur',
+'scx=sgnw' => 'sgnw',
 'scx=sharada' => 'shrd',
 'scx=shavian' => 'shaw',
 'scx=shaw' => 'shaw',
 'scx=shrd' => 'shrd',
 'scx=sidd' => 'sidd',
 'scx=siddham' => 'sidd',
+'scx=signwriting' => 'sgnw',
 'scx=sind' => 'sind',
 'scx=sinh' => 'sinh',
 'scx=sinhala' => 'sinh',
@@ -2034,6 +2133,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 
 # String property loose names to standard loose name
 %Unicode::UCD::string_property_loose_to_name = (
+'_perlnamealias' => 'namealias',
 'bidimirroringglyph' => 'bmg',
 'bidipairedbracket' => 'bpb',
 'bmg' => 'bmg',
@@ -2471,6 +2571,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 'GCB',
 'Grapheme_Cluster_Break',
+'_Perl_GCB',
 ],
 'grbase' => 
 [
@@ -2527,6 +2628,16 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'In',
 'Present_In',
 ],
+'inpc' => 
+[
+'InPC',
+'Indic_Positional_Category',
+],
+'insc' => 
+[
+'InSC',
+'Indic_Syllabic_Category',
+],
 'isc' => 
 [
 'isc',
@@ -2586,6 +2697,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 'Name_Alias',
 'Name_Alias',
+'_Perl_Name_Alias',
 ],
 'nchar' => 
 [
@@ -2656,6 +2768,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 'SB',
 'Sentence_Break',
+'_Perl_SB',
 ],
 'sc' => 
 [
@@ -2838,6 +2951,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 '7.0',
 'V7_0',
 ],
+'8.0' => 
+[
+'8.0',
+'V8_0',
+],
 'na' => 
 [
 'NA',
@@ -3036,6 +3154,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 'Aegean_Numbers',
 ],
+'ahom' => 
+[
+'Ahom',
+],
 'alchemical' => 
 [
 'Alchemical',
@@ -3046,6 +3168,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Alphabetic_PF',
 'Alphabetic_Presentation_Forms',
 ],
+'anatolianhieroglyphs' => 
+[
+'Anatolian_Hieroglyphs',
+],
 'ancientgreekmusic' => 
 [
 'Ancient_Greek_Music',
@@ -3189,6 +3315,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 'Cherokee',
 ],
+'cherokeesup' => 
+[
+'Cherokee_Sup',
+'Cherokee_Supplement',
+],
 'cjk' => 
 [
 'CJK',
@@ -3234,6 +3365,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'CJK_Ext_D',
 'CJK_Unified_Ideographs_Extension_D',
 ],
+'cjkexte' => 
+[
+'CJK_Ext_E',
+'CJK_Unified_Ideographs_Extension_E',
+],
 'cjkradicalssup' => 
 [
 'CJK_Radicals_Sup',
@@ -3354,6 +3490,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 'Duployan',
 ],
+'earlydynasticcuneiform' => 
+[
+'Early_Dynastic_Cuneiform',
+],
 'egyptianhieroglyphs' => 
 [
 'Egyptian_Hieroglyphs',
@@ -3472,6 +3612,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 'Hanunoo',
 ],
+'hatran' => 
+[
+'Hatran',
+],
 'hebrew' => 
 [
 'Hebrew',
@@ -3777,6 +3921,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 'Mro',
 ],
+'multani' => 
+[
+'Multani',
+],
 'music' => 
 [
 'Music',
@@ -3830,6 +3978,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 'Ol_Chiki',
 ],
+'oldhungarian' => 
+[
+'Old_Hungarian',
+],
 'olditalic' => 
 [
 'Old_Italic',
@@ -4027,6 +4179,15 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Sup_Punctuation',
 'Supplemental_Punctuation',
 ],
+'supsymbolsandpictographs' => 
+[
+'Sup_Symbols_And_Pictographs',
+'Supplemental_Symbols_And_Pictographs',
+],
+'suttonsignwriting' => 
+[
+'Sutton_SignWriting',
+],
 'sylotinagri' => 
 [
 'Syloti_Nagri',
@@ -5412,11 +5573,217 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 '7.0',
 ],
+'8.0' => 
+[
+'8.0',
+],
 'unassigned' => 
 [
 'Unassigned',
 ],
 },
+'inpc' => 
+{
+'bottom' => 
+[
+'Bottom',
+],
+'bottomandright' => 
+[
+'Bottom_And_Right',
+],
+'left' => 
+[
+'Left',
+],
+'leftandright' => 
+[
+'Left_And_Right',
+],
+'na' => 
+[
+'NA',
+],
+'overstruck' => 
+[
+'Overstruck',
+],
+'right' => 
+[
+'Right',
+],
+'top' => 
+[
+'Top',
+],
+'topandbottom' => 
+[
+'Top_And_Bottom',
+],
+'topandbottomandright' => 
+[
+'Top_And_Bottom_And_Right',
+],
+'topandleft' => 
+[
+'Top_And_Left',
+],
+'topandleftandright' => 
+[
+'Top_And_Left_And_Right',
+],
+'topandright' => 
+[
+'Top_And_Right',
+],
+'visualorderleft' => 
+[
+'Visual_Order_Left',
+],
+},
+'insc' => 
+{
+'avagraha' => 
+[
+'Avagraha',
+],
+'bindu' => 
+[
+'Bindu',
+],
+'brahmijoiningnumber' => 
+[
+'Brahmi_Joining_Number',
+],
+'cantillationmark' => 
+[
+'Cantillation_Mark',
+],
+'consonant' => 
+[
+'Consonant',
+],
+'consonantdead' => 
+[
+'Consonant_Dead',
+],
+'consonantfinal' => 
+[
+'Consonant_Final',
+],
+'consonantheadletter' => 
+[
+'Consonant_Head_Letter',
+],
+'consonantkiller' => 
+[
+'Consonant_Killer',
+],
+'consonantmedial' => 
+[
+'Consonant_Medial',
+],
+'consonantplaceholder' => 
+[
+'Consonant_Placeholder',
+],
+'consonantprecedingrepha' => 
+[
+'Consonant_Preceding_Repha',
+],
+'consonantprefixed' => 
+[
+'Consonant_Prefixed',
+],
+'consonantsubjoined' => 
+[
+'Consonant_Subjoined',
+],
+'consonantsucceedingrepha' => 
+[
+'Consonant_Succeeding_Repha',
+],
+'consonantwithstacker' => 
+[
+'Consonant_With_Stacker',
+],
+'geminationmark' => 
+[
+'Gemination_Mark',
+],
+'invisiblestacker' => 
+[
+'Invisible_Stacker',
+],
+'joiner' => 
+[
+'Joiner',
+],
+'modifyingletter' => 
+[
+'Modifying_Letter',
+],
+'nonjoiner' => 
+[
+'Non_Joiner',
+],
+'nukta' => 
+[
+'Nukta',
+],
+'number' => 
+[
+'Number',
+],
+'numberjoiner' => 
+[
+'Number_Joiner',
+],
+'other' => 
+[
+'Other',
+],
+'purekiller' => 
+[
+'Pure_Killer',
+],
+'registershifter' => 
+[
+'Register_Shifter',
+],
+'syllablemodifier' => 
+[
+'Syllable_Modifier',
+],
+'toneletter' => 
+[
+'Tone_Letter',
+],
+'tonemark' => 
+[
+'Tone_Mark',
+],
+'virama' => 
+[
+'Virama',
+],
+'visarga' => 
+[
+'Visarga',
+],
+'vowel' => 
+[
+'Vowel',
+],
+'voweldependent' => 
+[
+'Vowel_Dependent',
+],
+'vowelindependent' => 
+[
+'Vowel_Independent',
+],
+},
 'jg' => 
 {
 'ain' => 
@@ -6184,6 +6551,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 '1/10',
 ],
+'1/12' => 
+[
+'1/12',
+],
 '1/16' => 
 [
 '1/16',
@@ -6260,6 +6631,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 11,
 ],
+'11/12' => 
+[
+'11/12',
+],
 '11/2' => 
 [
 '11/2',
@@ -6336,6 +6711,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 20000,
 ],
+200000 => 
+[
+200000,
+],
 21 => 
 [
 21,
@@ -6416,6 +6795,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 30000,
 ],
+300000 => 
+[
+300000,
+],
 31 => 
 [
 31,
@@ -6476,6 +6859,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 40000,
 ],
+400000 => 
+[
+400000,
+],
 41 => 
 [
 41,
@@ -6520,6 +6907,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 5,
 ],
+'5/12' => 
+[
+'5/12',
+],
 '5/2' => 
 [
 '5/2',
@@ -6548,6 +6939,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 50000,
 ],
+500000 => 
+[
+500000,
+],
 6 => 
 [
 6,
@@ -6568,10 +6963,18 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 60000,
 ],
+600000 => 
+[
+600000,
+],
 7 => 
 [
 7,
 ],
+'7/12' => 
+[
+'7/12',
+],
 '7/2' => 
 [
 '7/2',
@@ -6596,6 +6999,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 70000,
 ],
+700000 => 
+[
+700000,
+],
 8 => 
 [
 8,
@@ -6616,6 +7023,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 80000,
 ],
+800000 => 
+[
+800000,
+],
 9 => 
 [
 9,
@@ -6640,6 +7051,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 [
 90000,
 ],
+900000 => 
+[
+900000,
+],
 'nan' => 
 [
 'NaN',
@@ -6796,6 +7211,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Aghb',
 'Caucasian_Albanian',
 ],
+'ahom' => 
+[
+'Ahom',
+],
 'arab' => 
 [
 'Arab',
@@ -6986,6 +7405,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Hano',
 'Hanunoo',
 ],
+'hatr' => 
+[
+'Hatr',
+'Hatran',
+],
 'hebr' => 
 [
 'Hebr',
@@ -6996,6 +7420,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Hira',
 'Hiragana',
 ],
+'hluw' => 
+[
+'Hluw',
+'Anatolian_Hieroglyphs',
+],
 'hmng' => 
 [
 'Hmng',
@@ -7006,6 +7435,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Hrkt',
 'Katakana_Or_Hiragana',
 ],
+'hung' => 
+[
+'Hung',
+'Old_Hungarian',
+],
 'ital' => 
 [
 'Ital',
@@ -7154,6 +7588,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Mtei',
 'Meetei_Mayek',
 ],
+'mult' => 
+[
+'Mult',
+'Multani',
+],
 'mymr' => 
 [
 'Mymr',
@@ -7269,6 +7708,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Saur',
 'Saurashtra',
 ],
+'sgnw' => 
+[
+'Sgnw',
+'SignWriting',
+],
 'shaw' => 
 [
 'Shaw',
@@ -7432,6 +7876,10 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Aghb',
 'Caucasian_Albanian',
 ],
+'ahom' => 
+[
+'Ahom',
+],
 'arab' => 
 [
 'Arab',
@@ -7622,6 +8070,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Hano',
 'Hanunoo',
 ],
+'hatr' => 
+[
+'Hatr',
+'Hatran',
+],
 'hebr' => 
 [
 'Hebr',
@@ -7632,6 +8085,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Hira',
 'Hiragana',
 ],
+'hluw' => 
+[
+'Hluw',
+'Anatolian_Hieroglyphs',
+],
 'hmng' => 
 [
 'Hmng',
@@ -7642,6 +8100,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Hrkt',
 'Katakana_Or_Hiragana',
 ],
+'hung' => 
+[
+'Hung',
+'Old_Hungarian',
+],
 'ital' => 
 [
 'Ital',
@@ -7790,6 +8253,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Mtei',
 'Meetei_Mayek',
 ],
+'mult' => 
+[
+'Mult',
+'Multani',
+],
 'mymr' => 
 [
 'Mymr',
@@ -7905,6 +8373,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'Saur',
 'Saurashtra',
 ],
+'sgnw' => 
+[
+'Sgnw',
+'SignWriting',
+],
 'shaw' => 
 [
 'Shaw',
@@ -8312,7 +8785,7 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'name' => 'CJK UNIFIED IDEOGRAPH-<code point>',
 },
 {
-'high' => 40908,
+'high' => 40917,
 'low' => 19968,
 'name' => 'CJK UNIFIED IDEOGRAPH-<code point>',
 },
@@ -8347,6 +8820,11 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'name' => 'CJK UNIFIED IDEOGRAPH-<code point>',
 },
 {
+'high' => 183969,
+'low' => 178208,
+'name' => 'CJK UNIFIED IDEOGRAPH-<code point>',
+},
+{
 'high' => 195101,
 'low' => 194560,
 'name' => 'CJK COMPATIBILITY IDEOGRAPH-<code point>',
@@ -8501,6 +8979,8 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'in=unassigned' => 1,
 'innb' => 1,
 'innoblock' => 1,
+'inpc=na' => 1,
+'insc=other' => 1,
 'iscn' => 1,
 'isnb' => 1,
 'isnoblock' => 1,
@@ -8609,6 +9089,13 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'zzzz' => 1,
 );
 
+# The properties that are combinations, in that they have both a map table and
+# a match table.  This is actually for UCD.t, so it knows how to test for
+# these.
+%Unicode::UCD::combination_property = (
+
+);
+
 # All combinations of names that are suppressed.
 # This is actually for UCD.t, so it knows which properties shouldn't have
 # entries.  If it got any bigger, would probably want to put it in its own
@@ -8638,10 +9125,6 @@ $Unicode::UCD::HANGUL_COUNT = 11172;
 'fcnfkcclosure',
 'graphemelink',
 'grlink',
-'indicmatracategory',
-'indicsyllabiccategory',
-'inmc',
-'insc',
 'jamoshortname',
 'jsn',
 'kaccountingnumeric',
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/NA.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/NA.pl
index 653d92ae5ff..41542fb1223 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/NA.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/NA.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1219
+V1245
 888
 890
 896
@@ -57,8 +57,8 @@ V1219
 2142
 2143
 2208
-2227
-2276
+2229
+2275
 2436
 2437
 2445
@@ -144,6 +144,8 @@ V1219
 2788
 2790
 2802
+2809
+2810
 2817
 2820
 2821
@@ -223,7 +225,7 @@ V1219
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -274,7 +276,7 @@ V1219
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3446
@@ -399,7 +401,9 @@ V1219
 4992
 5018
 5024
-5109
+5110
+5112
+5118
 5120
 5789
 5792
@@ -527,11 +531,11 @@ V1219
 8336
 8349
 8352
-8382
+8383
 8400
 8433
 8448
-8586
+8588
 8592
 9211
 9216
@@ -548,6 +552,8 @@ V1219
 11209
 11210
 11218
+11244
+11248
 11264
 11311
 11312
@@ -613,7 +619,7 @@ V1219
 13056
 19894
 19904
-40909
+40918
 40960
 42125
 42128
@@ -621,15 +627,11 @@ V1219
 42192
 42540
 42560
-42654
-42655
 42744
 42752
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43052
 43056
@@ -641,7 +643,7 @@ V1219
 43214
 43226
 43232
-43260
+43262
 43264
 43348
 43359
@@ -673,10 +675,8 @@ V1219
 43816
 43823
 43824
-43872
-43876
 43878
-43968
+43888
 44014
 44016
 44026
@@ -717,8 +717,6 @@ V1219
 65024
 65050
 65056
-65070
-65072
 65107
 65108
 65127
@@ -820,7 +818,11 @@ V1219
 67743
 67751
 67760
-67840
+67808
+67827
+67828
+67830
+67835
 67868
 67871
 67898
@@ -828,9 +830,9 @@ V1219
 67904
 67968
 68024
-68030
-68032
-68096
+68028
+68048
+68050
 68100
 68101
 68103
@@ -866,6 +868,12 @@ V1219
 68528
 68608
 68681
+68736
+68787
+68800
+68851
+68858
+68864
 69216
 69247
 69632
@@ -885,22 +893,30 @@ V1219
 69968
 70007
 70016
-70089
-70093
 70094
 70096
-70107
+70112
 70113
 70133
 70144
 70162
 70163
 70206
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70314
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -920,6 +936,8 @@ V1219
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -935,7 +953,7 @@ V1219
 71040
 71094
 71096
-71114
+71134
 71168
 71237
 71248
@@ -944,6 +962,12 @@ V1219
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71488
 71840
 71923
 71935
@@ -951,13 +975,17 @@ V1219
 72384
 72441
 73728
-74649
+74650
 74752
 74863
 74864
 74869
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1003,7 +1031,7 @@ V1219
 119040
 119079
 119081
-119262
+119273
 119296
 119366
 119552
@@ -1051,7 +1079,11 @@ V1219
 120488
 120780
 120782
-120832
+121484
+121499
+121504
+121505
+121520
 124928
 125125
 125127
@@ -1153,25 +1185,11 @@ V1219
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -1190,12 +1208,20 @@ V1219
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 131070
 173783
 173824
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 196606
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V11.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V11.pl
index 63342c88717..f7ed4f89c71 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V11.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V11.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V20.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V20.pl
index b5d961c604a..7a43aec46c8 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V20.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V20.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V30.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V30.pl
index 6d5d591dc4f..7d2f103af3d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V30.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V30.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V31.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V31.pl
index 9159680289a..3442b1e3558 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V31.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V31.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V32.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V32.pl
index ecdf4216407..679b7fcf5ae 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V32.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V32.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V40.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V40.pl
index f749401cc05..a1636b051c4 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V40.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V40.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V41.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V41.pl
index 99ff6d66b96..3f9e342b5e9 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V41.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V41.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V50.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V50.pl
index 9be8c477d8b..0eba7422ad2 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V50.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V50.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V51.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V51.pl
index 3ee850f6fde..c2717d40c93 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V51.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V51.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V52.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V52.pl
index 217476ee28e..f003b210d33 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V52.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V52.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V60.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V60.pl
index bd9a2d3eac9..ecee292563a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V60.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V60.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V61.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V61.pl
index 27b016de170..ae079be0736 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V61.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V61.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V70.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V70.pl
index 68c3a9ba45c..1fdafb79f77 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V70.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V70.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Age/V80.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V80.pl
new file mode 100644
index 00000000000..8046d40cf9f
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Age/V80.pl
@@ -0,0 +1,132 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V118

+2227

+2229

+2275

+2276

+2809

+2810

+3162

+3163

+3423

+3424

+5109

+5110

+5112

+5118

+8382

+8383

+8586

+8588

+11244

+11248

+40909

+40918

+42654

+42655

+42895

+42896

+42930

+42936

+43260

+43262

+43872

+43876

+43888

+43968

+65070

+65072

+67808

+67827

+67828

+67830

+67835

+67840

+68028

+68030

+68032

+68048

+68050

+68096

+68736

+68787

+68800

+68851

+68858

+68864

+70089

+70093

+70107

+70112

+70272

+70279

+70280

+70281

+70282

+70286

+70287

+70302

+70303

+70314

+70400

+70401

+70480

+70481

+71114

+71134

+71424

+71450

+71453

+71468

+71472

+71488

+74649

+74650

+74880

+75076

+82944

+83527

+119262

+119273

+120832

+121484

+121499

+121504

+121505

+121520

+127789

+127792

+127870

+127872

+127951

+127956

+127992

+128000

+128255

+128256

+128331

+128336

+128579

+128581

+128720

+128721

+129296

+129305

+129408

+129413

+129472

+129473

+178208

+183970

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Alpha/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Alpha/Y.pl
index fdf80899f56..cc2163e127e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Alpha/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Alpha/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1200
+V1234
 65
 91
 97
@@ -114,8 +114,8 @@ V1200
 2112
 2137
 2208
-2227
-2276
+2229
+2275
 2282
 2288
 2364
@@ -209,6 +209,8 @@ V1200
 2769
 2784
 2788
+2809
+2810
 2817
 2820
 2821
@@ -286,7 +288,7 @@ V1200
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3201
@@ -333,7 +335,7 @@ V1200
 3407
 3415
 3416
-3424
+3423
 3428
 3450
 3456
@@ -470,7 +472,9 @@ V1200
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -704,7 +708,7 @@ V1200
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -720,19 +724,15 @@ V1200
 42612
 42620
 42623
-42654
-42655
 42736
 42775
 42784
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43010
 43011
@@ -749,6 +749,8 @@ V1200
 43256
 43259
 43260
+43261
+43262
 43274
 43307
 43312
@@ -800,10 +802,8 @@ V1200
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44011
 44032
 55204
@@ -921,6 +921,10 @@ V1200
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -957,6 +961,10 @@ V1200
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69632
 69702
 69762
@@ -975,15 +983,27 @@ V1200
 70085
 70106
 70107
+70108
+70109
 70144
 70162
 70163
 70197
 70199
 70200
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70377
-70401
+70400
 70404
 70405
 70413
@@ -1003,6 +1023,8 @@ V1200
 70473
 70475
 70477
+70480
+70481
 70487
 70488
 70493
@@ -1017,6 +1039,8 @@ V1200
 71094
 71096
 71103
+71128
+71134
 71168
 71231
 71232
@@ -1025,6 +1049,10 @@ V1200
 71237
 71296
 71350
+71424
+71450
+71453
+71467
 71840
 71904
 71935
@@ -1032,11 +1060,15 @@ V1200
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1209,6 +1241,8 @@ V1200
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/AL.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/AL.pl
index ba659a4ef4c..881a45525e7 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/AL.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/AL.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -36,7 +36,7 @@ V40
 1969
 1984
 2208
-2276
+2275
 64336
 64830
 64832
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/AN.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/AN.pl
index 32e01c35252..f301492140a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/AN.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/AN.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/B.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/B.pl
index 92d2c097e43..5a6799e68f0 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/B.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/B.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/BN.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/BN.pl
index aa184da0c7e..6135cb9a2dc 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/BN.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/BN.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/CS.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/CS.pl
index 46531ab82a4..24652c876db 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/CS.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/CS.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/EN.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/EN.pl
index 0969c9d02eb..9f800ec4071 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/EN.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/EN.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ES.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ES.pl
index 6d8b38fc9c0..0576bf5fcf6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ES.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ES.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ET.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ET.pl
index d13644abf1e..025de4f2443 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ET.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ET.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/L.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/L.pl
index f323316c093..045aea84331 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/L.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/L.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V775
+V789
 65
 91
 97
@@ -393,7 +393,7 @@ V775
 8528
 8544
 8585
-8586
+8588
 8592
 9014
 9083
@@ -420,6 +420,8 @@ V775
 11209
 11210
 11218
+11244
+11248
 11493
 11499
 11503
@@ -482,7 +484,7 @@ V775
 42512
 42607
 42624
-42655
+42654
 42656
 42736
 42738
@@ -557,8 +559,6 @@ V775
 64285
 65050
 65056
-65070
-65072
 65107
 65108
 65127
@@ -618,6 +618,8 @@ V775
 70018
 70070
 70079
+70090
+70093
 70191
 70194
 70196
@@ -628,7 +630,7 @@ V775
 70368
 70371
 70379
-70401
+70400
 70402
 70460
 70461
@@ -652,6 +654,8 @@ V775
 71102
 71103
 71105
+71132
+71134
 71219
 71227
 71229
@@ -666,6 +670,12 @@ V775
 71350
 71351
 71352
+71453
+71456
+71458
+71462
+71463
+71468
 92912
 92917
 92976
@@ -700,6 +710,18 @@ V775
 120772
 120782
 120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 124928
 127020
 127024
@@ -717,25 +739,11 @@ V775
 127338
 127340
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -754,6 +762,12 @@ V775
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 131070
 131072
 196606
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/NSM.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/NSM.pl
index 1cd559eaec0..53f13cd660a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/NSM.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/NSM.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V502
+V524
 768
 880
 1155
@@ -57,7 +57,7 @@ V502
 2094
 2137
 2140
-2276
+2275
 2307
 2362
 2363
@@ -335,7 +335,7 @@ V502
 42611
 42612
 42622
-42655
+42654
 42656
 42736
 42738
@@ -402,7 +402,7 @@ V502
 65024
 65040
 65056
-65070
+65072
 66045
 66046
 66272
@@ -443,6 +443,8 @@ V502
 70018
 70070
 70079
+70090
+70093
 70191
 70194
 70196
@@ -453,7 +455,7 @@ V502
 70368
 70371
 70379
-70401
+70400
 70402
 70460
 70461
@@ -477,6 +479,8 @@ V502
 71102
 71103
 71105
+71132
+71134
 71219
 71227
 71229
@@ -491,6 +495,12 @@ V502
 71350
 71351
 71352
+71453
+71456
+71458
+71462
+71463
+71468
 92912
 92917
 92976
@@ -509,6 +519,18 @@ V502
 119214
 119362
 119365
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 125136
 125143
 917760
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ON.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ON.pl
index 66e6f2898c5..81e2b3feee0 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ON.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/ON.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V354
+V348
 33
 35
 38
@@ -146,7 +146,7 @@ V354
 8528
 8544
 8585
-8586
+8588
 8592
 8722
 8724
@@ -175,6 +175,8 @@ V354
 11209
 11210
 11218
+11244
+11248
 11493
 11499
 11513
@@ -328,25 +330,11 @@ V354
 127338
 127340
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -365,4 +353,10 @@ V354
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/R.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/R.pl
index 83d39033fe7..0e8da077fac 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/R.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/R.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/WS.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/WS.pl
index 75e7f84e929..c1755697b75 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bc/WS.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bc/WS.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/BidiC/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/BidiC/Y.pl
index 2d57e35e3e2..44005c8ed72 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/BidiC/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/BidiC/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/BidiM/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/BidiM/Y.pl
index f63a1fea32a..58d17da92b0 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/BidiM/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/BidiM/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Blk/NB.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Blk/NB.pl
index 9caa439e9df..4a6ea052627 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Blk/NB.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Blk/NB.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,15 +10,13 @@
 
 
 return <<'END';
-V81
+V85
 2144
 2208
 7296
 7360
 12256
 12272
-43888
-43968
 66048
 66176
 66528
@@ -30,7 +28,7 @@ V81
 67456
 67584
 67760
-67840
+67808
 67904
 67968
 68256
@@ -38,11 +36,13 @@ V81
 68528
 68608
 68688
+68736
+68864
 69216
 69248
 69632
 70224
-70320
+70272
 70528
 70784
 70880
@@ -50,14 +50,18 @@ V81
 71264
 71296
 71376
+71424
+71488
 71840
 71936
 72384
 72448
 73728
-74880
+75088
 77824
 78896
+82944
+83584
 92160
 92784
 92880
@@ -73,17 +77,17 @@ V81
 119552
 119680
 119808
-120832
+121520
 124928
 125152
 126464
 126720
 126976
-129280
+129536
 131072
 173792
 173824
-178208
+183984
 194560
 195104
 917504
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/C.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/C.pl
index 2323b1efb1d..46d2bf38831 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/C.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/C.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/N.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/N.pl
index 66c1c143be1..7cb249cb020 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/N.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/N.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/O.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/O.pl
index db5b9babe04..62a1e548f37 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/O.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Bpt/O.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/CE/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/CE/Y.pl
index 2a0baac8cda..5c77a421c87 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/CE/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/CE/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/CI/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/CI/Y.pl
index 4a05c9fc455..0844d7e41e5 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/CI/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/CI/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V670
+V692
 39
 40
 46
@@ -91,7 +91,7 @@ V670
 2094
 2137
 2140
-2276
+2275
 2307
 2362
 2363
@@ -446,8 +446,6 @@ V670
 42623
 42624
 42652
-42654
-42655
 42656
 42736
 42738
@@ -536,7 +534,7 @@ V670
 65043
 65044
 65056
-65070
+65072
 65106
 65107
 65109
@@ -603,6 +601,8 @@ V670
 70018
 70070
 70079
+70090
+70093
 70191
 70194
 70196
@@ -613,7 +613,7 @@ V670
 70368
 70371
 70379
-70401
+70400
 70402
 70460
 70461
@@ -637,6 +637,8 @@ V670
 71102
 71103
 71105
+71132
+71134
 71219
 71227
 71229
@@ -651,6 +653,12 @@ V670
 71350
 71351
 71352
+71453
+71456
+71458
+71462
+71463
+71468
 92912
 92917
 92976
@@ -673,8 +681,22 @@ V670
 119214
 119362
 119365
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 125136
 125143
+127995
+128000
 917505
 917506
 917536
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/CWCF/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/CWCF/Y.pl
index 4a22ce1cc19..4a6d668749c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/CWCF/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/CWCF/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1192
+V1200
 65
 91
 181
@@ -573,6 +573,8 @@ V1192
 4296
 4301
 4302
+5112
+5118
 7680
 7681
 7682
@@ -1192,7 +1194,11 @@ V1192
 42922
 42926
 42928
-42930
+42933
+42934
+42935
+43888
+43968
 64256
 64263
 64275
@@ -1201,6 +1207,8 @@ V1192
 65339
 66560
 66600
+68736
+68787
 71840
 71872
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/CWCM/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/CWCM/Y.pl
index 31667a60e21..7155ee662b5 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/CWCM/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/CWCM/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V214
+V226
 65
 91
 97
@@ -73,7 +73,7 @@ V214
 653
 658
 659
-670
+669
 671
 837
 838
@@ -113,6 +113,10 @@ V214
 4296
 4301
 4302
+5024
+5110
+5112
+5118
 7545
 7546
 7549
@@ -212,7 +216,11 @@ V214
 42902
 42926
 42928
-42930
+42936
+43859
+43860
+43888
+43968
 64256
 64263
 64275
@@ -223,6 +231,10 @@ V214
 65371
 66560
 66640
+68736
+68787
+68800
+68851
 71840
 71904
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/CWKCF/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/CWKCF/Y.pl
index 22b6952db0a..0fe1fcb50ba 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/CWKCF/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/CWKCF/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1616
+V1624
 65
 91
 160
@@ -647,6 +647,8 @@ V1616
 4349
 4447
 4449
+5112
+5118
 6068
 6070
 6155
@@ -1402,11 +1404,15 @@ V1616
 42922
 42926
 42928
-42930
+42933
+42934
+42935
 43000
 43002
 43868
 43872
+43888
+43968
 63744
 64014
 64016
@@ -1487,6 +1493,8 @@ V1616
 65529
 66560
 66600
+68736
+68787
 71840
 71872
 113824
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/CWL/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/CWL/Y.pl
index b019cbcd4ed..4314de81232 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/CWL/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/CWL/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1170
+V1176
 65
 91
 192
@@ -559,6 +559,8 @@ V1170
 4296
 4301
 4302
+5024
+5110
 7680
 7681
 7682
@@ -1174,11 +1176,15 @@ V1170
 42922
 42926
 42928
-42930
+42933
+42934
+42935
 65313
 65339
 66560
 66600
+68736
+68787
 71840
 71872
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/CWT/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/CWT/Y.pl
index 0a7903742ae..fa40f60eeab 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/CWT/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/CWT/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1200
+V1212
 97
 123
 181
@@ -333,7 +333,7 @@ V1200
 653
 658
 659
-670
+669
 671
 837
 838
@@ -585,6 +585,8 @@ V1200
 1328
 1377
 1416
+5112
+5118
 7545
 7546
 7549
@@ -1201,6 +1203,14 @@ V1200
 42920
 42921
 42922
+42933
+42934
+42935
+42936
+43859
+43860
+43888
+43968
 64256
 64263
 64275
@@ -1209,6 +1219,8 @@ V1200
 65371
 66600
 66640
+68800
+68851
 71872
 71904
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/CWU/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/CWU/Y.pl
index 51fd6eb1de6..7f5c76ec507 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/CWU/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/CWU/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1198
+V1210
 97
 123
 181
@@ -331,7 +331,7 @@ V1198
 653
 658
 659
-670
+669
 671
 837
 838
@@ -583,6 +583,8 @@ V1198
 1328
 1377
 1416
+5112
+5118
 7545
 7546
 7549
@@ -1199,6 +1201,14 @@ V1198
 42920
 42921
 42922
+42933
+42934
+42935
+42936
+43859
+43860
+43888
+43968
 64256
 64263
 64275
@@ -1207,6 +1217,8 @@ V1198
 65371
 66600
 66640
+68800
+68851
 71872
 71904
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Cased/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Cased/Y.pl
index a596149ab42..4fd60bec06b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Cased/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Cased/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V254
+V262
 65
 91
 97
@@ -71,6 +71,10 @@ V254
 4296
 4301
 4302
+5024
+5110
+5112
+5118
 7424
 7616
 7680
@@ -178,15 +182,15 @@ V254
 42896
 42926
 42928
-42930
+42936
 43000
 43003
 43824
 43867
 43868
-43872
-43876
 43878
+43888
+43968
 64256
 64263
 64275
@@ -197,6 +201,10 @@ V254
 65371
 66560
 66640
+68736
+68787
+68800
+68851
 71840
 71904
 119808
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/A.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/A.pl
index 5783596d825..87cce7ce682 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/A.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/A.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V202
+V204
 768
 789
 829
@@ -173,7 +173,7 @@ V202
 42608
 42612
 42622
-42655
+42654
 42656
 42736
 42738
@@ -191,6 +191,8 @@ V202
 43714
 65056
 65063
+65070
+65072
 66422
 66427
 68111
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/AR.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/AR.pl
index 4b84628574e..0017ee44de1 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/AR.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/AR.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/ATAR.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/ATAR.pl
index 127ffcff391..cf2c75349ac 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/ATAR.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/ATAR.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/B.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/B.pl
index 03570a51e17..44d3a4fabad 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/B.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/B.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V140
+V142
 790
 794
 796
@@ -75,6 +75,8 @@ V140
 2035
 2137
 2140
+2275
+2276
 2278
 2279
 2281
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/BR.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/BR.pl
index a242353e7a7..866771006b6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/BR.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/BR.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/DB.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/DB.pl
index 1c6ed66007e..b87ed1c7b50 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/DB.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/DB.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/NK.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/NK.pl
index 89940d2d095..1d8b7363466 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/NK.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/NK.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V38
+V40
 2364
 2365
 2492
@@ -37,6 +37,8 @@ V38
 69819
 70003
 70004
+70090
+70091
 70198
 70199
 70377
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/NR.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/NR.pl
index 78c9f2415d7..e4223145aa1 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/NR.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/NR.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V301
+V305
 0
 768
 847
@@ -58,7 +58,7 @@ V301
 2094
 2137
 2140
-2276
+2275
 2304
 2364
 2365
@@ -206,7 +206,7 @@ V301
 42608
 42612
 42622
-42655
+42654
 42656
 42736
 42738
@@ -241,7 +241,7 @@ V301
 64286
 64287
 65056
-65070
+65072
 66045
 66046
 66272
@@ -272,6 +272,8 @@ V301
 70004
 70080
 70081
+70090
+70091
 70197
 70199
 70377
@@ -292,6 +294,8 @@ V301
 71232
 71350
 71352
+71467
+71468
 92912
 92917
 92976
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/OV.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/OV.pl
index ced4096eb92..c245442b81b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/OV.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/OV.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/VR.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/VR.pl
index f75a90ca3b7..06b94966880 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/VR.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ccc/VR.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V80
+V82
 2381
 2382
 2509
@@ -91,4 +91,6 @@ V80
 71232
 71350
 71351
+71467
+71468
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/CompEx/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/CompEx/Y.pl
index 8a62f9b9b84..89353314f09 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/CompEx/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/CompEx/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/DI/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/DI/Y.pl
index 6eef7b1dce2..0f88b8a8e64 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/DI/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/DI/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dash/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dash/Y.pl
index 3de00de2df9..8a5cbad8429 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dash/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dash/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dep/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dep/Y.pl
index 991bb0e462d..8dc559c6d8f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dep/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dep/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -27,6 +27,6 @@ V18
 9003
 917505
 917506
-917536
+917631
 917632
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dia/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dia/Y.pl
index c569b7b1dae..882ec8173ec 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dia/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dia/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V290
+V294
 94
 95
 96
@@ -67,7 +67,7 @@ V290
 2038
 2072
 2074
-2276
+2275
 2303
 2364
 2365
@@ -242,7 +242,7 @@ V290
 64286
 64287
 65056
-65070
+65072
 65342
 65343
 65344
@@ -265,6 +265,8 @@ V290
 70004
 70080
 70081
+70090
+70093
 70197
 70199
 70377
@@ -285,6 +287,8 @@ V290
 71232
 71350
 71352
+71467
+71468
 92912
 92917
 94095
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Com.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Com.pl
index 351f7e60671..dc551362c38 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Com.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Com.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Enc.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Enc.pl
index 6676e2c9efe..21f701ae634 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Enc.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Enc.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Fin.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Fin.pl
index 6f672556c96..5ae60bca659 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Fin.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Fin.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Font.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Font.pl
index 39767319964..b49962aefc6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Font.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Font.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Init.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Init.pl
index 63e19796c9a..78ec26cf273 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Init.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Init.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Iso.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Iso.pl
index 1c178f6b396..b92afeae230 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Iso.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Iso.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Med.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Med.pl
index d13b736a1b9..9e82b6f8003 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Med.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Med.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Nar.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Nar.pl
index d4b78f838b6..05d0d5bdaf3 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Nar.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Nar.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Nb.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Nb.pl
index 6f2bc327f0e..d5844adb436 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Nb.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Nb.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/NonCanon.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/NonCanon.pl
index d8d00178b4a..3b4759e2f24 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/NonCanon.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/NonCanon.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sqr.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sqr.pl
index dd3e1ce45ca..0a9cc454fe3 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sqr.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sqr.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sub.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sub.pl
index 5c783d763c9..ed5e4939697 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sub.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sub.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sup.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sup.pl
index 7bef014f16e..1c973edc37c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sup.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Sup.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Vert.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Vert.pl
index d42f3d611af..aa696a2e1ea 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Vert.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Dt/Vert.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ea/A.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ea/A.pl
index fcd57afd1d1..9783835248c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ea/A.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ea/A.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ea/H.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ea/H.pl
index e6f1ab941e5..b0927662cf1 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ea/H.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ea/H.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ea/N.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ea/N.pl
index 4161ad03229..99ebb926e3f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ea/N.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ea/N.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ea/Na.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ea/Na.pl
index b347319aacc..84d95f49799 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ea/Na.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ea/Na.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ea/W.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ea/W.pl
index f244cb3921c..950e078af2f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ea/W.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ea/W.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ext/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ext/Y.pl
index 3c9dc1ac49b..8f70602341d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ext/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ext/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/CN.pl b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/CN.pl
index 341d49d1aa8..2182b03ca17 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/CN.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/CN.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/EX.pl b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/EX.pl
index 469ca36e270..8cc42d24249 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/EX.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/EX.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V544
+V566
 768
 880
 1155
@@ -57,7 +57,7 @@ V544
 2094
 2137
 2140
-2276
+2275
 2307
 2362
 2363
@@ -361,7 +361,7 @@ V544
 42611
 42612
 42622
-42655
+42654
 42656
 42736
 42738
@@ -428,7 +428,7 @@ V544
 65024
 65040
 65056
-65070
+65072
 65438
 65440
 66045
@@ -471,6 +471,8 @@ V544
 70018
 70070
 70079
+70090
+70093
 70191
 70194
 70196
@@ -481,7 +483,7 @@ V544
 70368
 70371
 70379
-70401
+70400
 70402
 70460
 70461
@@ -515,6 +517,8 @@ V544
 71102
 71103
 71105
+71132
+71134
 71219
 71227
 71229
@@ -529,6 +533,12 @@ V544
 71350
 71351
 71352
+71453
+71456
+71458
+71462
+71463
+71468
 92912
 92917
 92976
@@ -551,6 +561,18 @@ V544
 119214
 119362
 119365
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 125136
 125143
 917760
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/LV.pl b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/LV.pl
index 857f524e6d4..dd70b706f17 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/LV.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/LV.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/LVT.pl b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/LVT.pl
index 9783553591d..b752d89b78f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/LVT.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/LVT.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/SM.pl b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/SM.pl
index 67d681f9ae8..6c9392ea5ed 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/SM.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/SM.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -119,10 +119,6 @@ V264
 6450
 6451
 6457
-6581
-6584
-6586
-6587
 6681
 6683
 6741
@@ -269,6 +265,10 @@ V264
 71344
 71350
 71351
+71456
+71458
+71462
+71463
 94033
 94079
 119142
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/XX.pl b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/XX.pl
index 3f62de5b0d9..d80e1db7fd3 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/GCB/XX.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/GCB/XX.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V501
+V515
 32
 127
 160
@@ -68,7 +68,7 @@ V501
 2094
 2137
 2140
-2276
+2275
 2308
 2362
 2365
@@ -270,10 +270,6 @@ V501
 6444
 6448
 6460
-6581
-6584
-6586
-6587
 6679
 6684
 6741
@@ -338,7 +334,7 @@ V501
 42611
 42612
 42622
-42655
+42654
 42656
 42736
 42738
@@ -407,7 +403,7 @@ V501
 65024
 65040
 65056
-65070
+65072
 65279
 65280
 65438
@@ -452,11 +448,13 @@ V501
 70019
 70067
 70081
+70090
+70093
 70188
 70200
 70367
 70379
-70401
+70400
 70404
 70460
 70461
@@ -480,10 +478,14 @@ V501
 71094
 71096
 71105
+71132
+71134
 71216
 71233
 71339
 71352
+71453
+71468
 92912
 92917
 92976
@@ -506,6 +508,18 @@ V501
 119214
 119362
 119365
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 125136
 125143
 127462
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/C.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/C.pl
index cfa5b5e982d..01a072083a7 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/C.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/C.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1205
+V1231
 0
 32
 127
@@ -65,8 +65,8 @@ V1205
 2142
 2143
 2208
-2227
-2276
+2229
+2275
 2436
 2437
 2445
@@ -152,6 +152,8 @@ V1205
 2788
 2790
 2802
+2809
+2810
 2817
 2820
 2821
@@ -231,7 +233,7 @@ V1205
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -282,7 +284,7 @@ V1205
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3446
@@ -407,7 +409,9 @@ V1205
 4992
 5018
 5024
-5109
+5110
+5112
+5118
 5120
 5789
 5792
@@ -539,11 +543,11 @@ V1205
 8336
 8349
 8352
-8382
+8383
 8400
 8433
 8448
-8586
+8588
 8592
 9211
 9216
@@ -560,6 +564,8 @@ V1205
 11209
 11210
 11218
+11244
+11248
 11264
 11311
 11312
@@ -625,7 +631,7 @@ V1205
 13056
 19894
 19904
-40909
+40918
 40960
 42125
 42128
@@ -633,15 +639,11 @@ V1205
 42192
 42540
 42560
-42654
-42655
 42744
 42752
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43052
 43056
@@ -653,7 +655,7 @@ V1205
 43214
 43226
 43232
-43260
+43262
 43264
 43348
 43359
@@ -685,10 +687,8 @@ V1205
 43816
 43823
 43824
-43872
-43876
 43878
-43968
+43888
 44014
 44016
 44026
@@ -729,8 +729,6 @@ V1205
 65024
 65050
 65056
-65070
-65072
 65107
 65108
 65127
@@ -832,7 +830,11 @@ V1205
 67743
 67751
 67760
-67840
+67808
+67827
+67828
+67830
+67835
 67868
 67871
 67898
@@ -840,9 +842,9 @@ V1205
 67904
 67968
 68024
-68030
-68032
-68096
+68028
+68048
+68050
 68100
 68101
 68103
@@ -878,6 +880,12 @@ V1205
 68528
 68608
 68681
+68736
+68787
+68800
+68851
+68858
+68864
 69216
 69247
 69632
@@ -899,22 +907,30 @@ V1205
 69968
 70007
 70016
-70089
-70093
 70094
 70096
-70107
+70112
 70113
 70133
 70144
 70162
 70163
 70206
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70314
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -934,6 +950,8 @@ V1205
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -949,7 +967,7 @@ V1205
 71040
 71094
 71096
-71114
+71134
 71168
 71237
 71248
@@ -958,6 +976,12 @@ V1205
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71488
 71840
 71923
 71935
@@ -965,13 +989,17 @@ V1205
 72384
 72441
 73728
-74649
+74650
 74752
 74863
 74864
 74869
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1019,7 +1047,7 @@ V1205
 119081
 119155
 119163
-119262
+119273
 119296
 119366
 119552
@@ -1067,7 +1095,11 @@ V1205
 120488
 120780
 120782
-120832
+121484
+121499
+121504
+121505
+121520
 124928
 125125
 125127
@@ -1169,25 +1201,11 @@ V1205
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -1206,12 +1224,20 @@ V1205
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 131072
 173783
 173824
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917760
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Cf.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Cf.pl
index aa2b1a740e4..deeef704683 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Cf.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Cf.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Cn.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Cn.pl
index d3d5272a56e..61be71322ee 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Cn.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Cn.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1199
+V1225
 888
 890
 896
@@ -57,8 +57,8 @@ V1199
 2142
 2143
 2208
-2227
-2276
+2229
+2275
 2436
 2437
 2445
@@ -144,6 +144,8 @@ V1199
 2788
 2790
 2802
+2809
+2810
 2817
 2820
 2821
@@ -223,7 +225,7 @@ V1199
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -274,7 +276,7 @@ V1199
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3446
@@ -399,7 +401,9 @@ V1199
 4992
 5018
 5024
-5109
+5110
+5112
+5118
 5120
 5789
 5792
@@ -527,11 +531,11 @@ V1199
 8336
 8349
 8352
-8382
+8383
 8400
 8433
 8448
-8586
+8588
 8592
 9211
 9216
@@ -548,6 +552,8 @@ V1199
 11209
 11210
 11218
+11244
+11248
 11264
 11311
 11312
@@ -613,7 +619,7 @@ V1199
 13056
 19894
 19904
-40909
+40918
 40960
 42125
 42128
@@ -621,15 +627,11 @@ V1199
 42192
 42540
 42560
-42654
-42655
 42744
 42752
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43052
 43056
@@ -641,7 +643,7 @@ V1199
 43214
 43226
 43232
-43260
+43262
 43264
 43348
 43359
@@ -673,10 +675,8 @@ V1199
 43816
 43823
 43824
-43872
-43876
 43878
-43968
+43888
 44014
 44016
 44026
@@ -717,8 +717,6 @@ V1199
 65024
 65050
 65056
-65070
-65072
 65107
 65108
 65127
@@ -822,7 +820,11 @@ V1199
 67743
 67751
 67760
-67840
+67808
+67827
+67828
+67830
+67835
 67868
 67871
 67898
@@ -830,9 +832,9 @@ V1199
 67904
 67968
 68024
-68030
-68032
-68096
+68028
+68048
+68050
 68100
 68101
 68103
@@ -868,6 +870,12 @@ V1199
 68528
 68608
 68681
+68736
+68787
+68800
+68851
+68858
+68864
 69216
 69247
 69632
@@ -887,22 +895,30 @@ V1199
 69968
 70007
 70016
-70089
-70093
 70094
 70096
-70107
+70112
 70113
 70133
 70144
 70162
 70163
 70206
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70314
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -922,6 +938,8 @@ V1199
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -937,7 +955,7 @@ V1199
 71040
 71094
 71096
-71114
+71134
 71168
 71237
 71248
@@ -946,6 +964,12 @@ V1199
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71488
 71840
 71923
 71935
@@ -953,13 +977,17 @@ V1199
 72384
 72441
 73728
-74649
+74650
 74752
 74863
 74864
 74869
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1005,7 +1033,7 @@ V1199
 119040
 119079
 119081
-119262
+119273
 119296
 119366
 119552
@@ -1053,7 +1081,11 @@ V1199
 120488
 120780
 120782
-120832
+121484
+121499
+121504
+121505
+121520
 124928
 125125
 125127
@@ -1155,25 +1187,11 @@ V1199
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -1192,12 +1210,20 @@ V1199
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 131072
 173783
 173824
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917505
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/L.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/L.pl
index 11bbbff056c..875b19560f3 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/L.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/L.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1074
+V1108
 65
 91
 97
@@ -108,7 +108,7 @@ V1074
 2112
 2137
 2208
-2227
+2229
 2308
 2362
 2365
@@ -179,6 +179,8 @@ V1074
 2769
 2784
 2786
+2809
+2810
 2821
 2829
 2831
@@ -232,7 +234,7 @@ V1074
 3133
 3134
 3160
-3162
+3163
 3168
 3170
 3205
@@ -263,7 +265,7 @@ V1074
 3390
 3406
 3407
-3424
+3423
 3426
 3450
 3456
@@ -386,7 +388,9 @@ V1074
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -431,8 +435,8 @@ V1074
 6517
 6528
 6572
-6593
-6600
+6576
+6602
 6656
 6679
 6688
@@ -600,7 +604,7 @@ V1074
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -622,11 +626,9 @@ V1074
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43010
 43011
@@ -643,6 +645,8 @@ V1074
 43256
 43259
 43260
+43261
+43262
 43274
 43302
 43312
@@ -700,10 +704,8 @@ V1074
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44003
 44032
 55204
@@ -821,6 +823,10 @@ V1074
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -855,6 +861,10 @@ V1074
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69635
 69688
 69763
@@ -873,10 +883,22 @@ V1074
 70085
 70106
 70107
+70108
+70109
 70144
 70162
 70163
 70188
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70367
 70405
@@ -893,6 +915,8 @@ V1074
 70458
 70461
 70462
+70480
+70481
 70493
 70498
 70784
@@ -903,12 +927,16 @@ V1074
 70856
 71040
 71087
+71128
+71132
 71168
 71216
 71236
 71237
 71296
 71339
+71424
+71450
 71840
 71904
 71935
@@ -916,9 +944,13 @@ V1074
 72384
 72441
 73728
-74649
+74650
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1083,6 +1115,8 @@ V1074
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/LC.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/LC.pl
index c78062b7cb6..4b49dab7e3c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/LC.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/LC.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V234
+V244
 65
 91
 97
@@ -61,6 +61,10 @@ V234
 4296
 4301
 4302
+5024
+5110
+5112
+5118
 7424
 7468
 7531
@@ -166,13 +170,15 @@ V234
 42896
 42926
 42928
-42930
+42936
 43002
 43003
 43824
 43867
-43876
+43872
 43878
+43888
+43968
 64256
 64263
 64275
@@ -183,6 +189,10 @@ V234
 65371
 66560
 66640
+68736
+68787
+68800
+68851
 71840
 71904
 119808
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Ll.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Ll.pl
index 7043f6f98ce..4079fc95406 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Ll.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Ll.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1250
+V1260
 97
 123
 181
@@ -551,6 +551,8 @@ V1250
 1328
 1377
 1416
+5112
+5118
 7424
 7468
 7531
@@ -1189,12 +1191,18 @@ V1250
 42920
 42921
 42922
+42933
+42934
+42935
+42936
 43002
 43003
 43824
 43867
-43876
+43872
 43878
+43888
+43968
 64256
 64263
 64275
@@ -1203,6 +1211,8 @@ V1250
 65371
 66600
 66640
+68800
+68851
 71872
 71904
 119834
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lm.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lm.pl
index 3b550bba1ca..d65d16b2b72 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lm.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lm.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lo.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lo.pl
index a17106119b0..a108f1c3a6c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lo.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lo.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V834
+V866
 170
 171
 186
@@ -56,7 +56,7 @@ V834
 2112
 2137
 2208
-2227
+2229
 2308
 2362
 2365
@@ -127,6 +127,8 @@ V834
 2769
 2784
 2786
+2809
+2810
 2821
 2829
 2831
@@ -180,7 +182,7 @@ V834
 3133
 3134
 3160
-3162
+3163
 3168
 3170
 3205
@@ -211,7 +213,7 @@ V834
 3390
 3406
 3407
-3424
+3423
 3426
 3450
 3456
@@ -325,8 +327,6 @@ V834
 4955
 4992
 5008
-5024
-5109
 5121
 5741
 5743
@@ -371,8 +371,8 @@ V834
 6517
 6528
 6572
-6593
-6600
+6576
+6602
 6656
 6679
 6688
@@ -444,7 +444,7 @@ V834
 13312
 19894
 19968
-40909
+40918
 40960
 40981
 40982
@@ -461,6 +461,8 @@ V834
 42607
 42656
 42726
+42895
+42896
 42999
 43000
 43003
@@ -479,6 +481,8 @@ V834
 43256
 43259
 43260
+43261
+43262
 43274
 43302
 43312
@@ -647,6 +651,10 @@ V834
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -699,10 +707,22 @@ V834
 70085
 70106
 70107
+70108
+70109
 70144
 70162
 70163
 70188
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70367
 70405
@@ -719,6 +739,8 @@ V834
 70458
 70461
 70462
+70480
+70481
 70493
 70498
 70784
@@ -729,20 +751,28 @@ V834
 70856
 71040
 71087
+71128
+71132
 71168
 71216
 71236
 71237
 71296
 71339
+71424
+71450
 71935
 71936
 72384
 72441
 73728
-74649
+74650
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -843,6 +873,8 @@ V834
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lu.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lu.pl
index 3793371b31a..da6535f7c20 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lu.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Lu.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1244
+V1250
 65
 91
 192
@@ -561,6 +561,8 @@ V1244
 4296
 4301
 4302
+5024
+5110
 7680
 7681
 7682
@@ -1186,11 +1188,15 @@ V1244
 42922
 42926
 42928
-42930
+42933
+42934
+42935
 65313
 65339
 66560
 66600
+68736
+68787
 71840
 71872
 119808
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/M.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/M.pl
index feff29dab98..f56f2792710 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/M.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/M.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V458
+V472
 768
 880
 1155
@@ -57,7 +57,7 @@ V458
 2094
 2137
 2140
-2276
+2275
 2308
 2362
 2365
@@ -257,10 +257,6 @@ V458
 6444
 6448
 6460
-6576
-6593
-6600
-6602
 6679
 6684
 6741
@@ -315,7 +311,7 @@ V458
 42611
 42612
 42622
-42655
+42654
 42656
 42736
 42738
@@ -374,7 +370,7 @@ V458
 65024
 65040
 65056
-65070
+65072
 66045
 66046
 66272
@@ -411,11 +407,13 @@ V458
 70019
 70067
 70081
+70090
+70093
 70188
 70200
 70367
 70379
-70401
+70400
 70404
 70460
 70461
@@ -439,10 +437,14 @@ V458
 71094
 71096
 71105
+71132
+71134
 71216
 71233
 71339
 71352
+71453
+71468
 92912
 92917
 92976
@@ -465,6 +467,18 @@ V458
 119214
 119362
 119365
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 125136
 125143
 917760
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Mc.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Mc.pl
index e88b406d9cf..3795d91d465 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Mc.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Mc.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -139,10 +139,6 @@ V294
 6450
 6451
 6457
-6576
-6593
-6600
-6602
 6681
 6683
 6741
@@ -299,6 +295,10 @@ V294
 71344
 71350
 71351
+71456
+71458
+71462
+71463
 94033
 94079
 119141
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Me.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Me.pl
index c3d14d28a2c..883b5758ea2 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Me.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Me.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Mn.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Mn.pl
index 8543f532d15..55d48d88c39 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Mn.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Mn.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V510
+V532
 768
 880
 1155
@@ -57,7 +57,7 @@ V510
 2094
 2137
 2140
-2276
+2275
 2307
 2362
 2363
@@ -343,7 +343,7 @@ V510
 42608
 42612
 42622
-42655
+42654
 42656
 42736
 42738
@@ -410,7 +410,7 @@ V510
 65024
 65040
 65056
-65070
+65072
 66045
 66046
 66272
@@ -451,6 +451,8 @@ V510
 70018
 70070
 70079
+70090
+70093
 70191
 70194
 70196
@@ -461,7 +463,7 @@ V510
 70368
 70371
 70379
-70401
+70400
 70402
 70460
 70461
@@ -485,6 +487,8 @@ V510
 71102
 71103
 71105
+71132
+71134
 71219
 71227
 71229
@@ -499,6 +503,12 @@ V510
 71350
 71351
 71352
+71453
+71456
+71458
+71462
+71463
+71468
 92912
 92917
 92976
@@ -517,6 +527,18 @@ V510
 119214
 119362
 119365
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 125136
 125143
 917760
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/N.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/N.pl
index d4c471c319f..825e5ac6822 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/N.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/N.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V210
+V222
 48
 58
 178
@@ -167,8 +167,16 @@ V210
 67712
 67751
 67760
+67835
+67840
 67862
 67868
+68028
+68030
+68032
+68048
+68050
+68096
 68160
 68168
 68221
@@ -183,6 +191,8 @@ V210
 68480
 68521
 68528
+68858
+68864
 69216
 69247
 69714
@@ -203,6 +213,8 @@ V210
 71258
 71360
 71370
+71472
+71484
 71904
 71923
 74752
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Nd.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Nd.pl
index 271e04b05fb..cfeb13875fc 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Nd.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Nd.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V100
+V102
 48
 58
 1632
@@ -103,6 +103,8 @@ V100
 71258
 71360
 71370
+71472
+71482
 71904
 71914
 92768
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Nl.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Nl.pl
index 942e8e34e1d..255469d4d89 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Nl.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Nl.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/No.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/No.pl
index 61413a24afd..dcde387569a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/No.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/No.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V104
+V116
 178
 180
 185
@@ -83,8 +83,16 @@ V104
 67712
 67751
 67760
+67835
+67840
 67862
 67868
+68028
+68030
+68032
+68048
+68050
+68096
 68160
 68168
 68221
@@ -99,12 +107,16 @@ V104
 68480
 68521
 68528
+68858
+68864
 69216
 69247
 69714
 69734
 70113
 70133
+71482
+71484
 71914
 71923
 93019
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/P.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/P.pl
index feae88ec69f..537c91e66d9 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/P.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/P.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V310
+V322
 33
 36
 37
@@ -213,6 +213,8 @@ V310
 43216
 43256
 43259
+43260
+43261
 43310
 43312
 43359
@@ -298,17 +300,25 @@ V310
 70004
 70006
 70085
-70089
+70090
 70093
 70094
+70107
+70108
+70109
+70112
 70200
 70206
+70313
+70314
 70854
 70855
 71105
-71114
+71128
 71233
 71236
+71484
+71487
 74864
 74869
 92782
@@ -321,4 +331,6 @@ V310
 92997
 113823
 113824
+121479
+121484
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pd.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pd.pl
index 36739dcb26e..7a9ea360861 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pd.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pd.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pe.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pe.pl
index 9355779c117..1721eb06f7a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pe.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pe.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pf.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pf.pl
index 25521d301c4..ca94366236b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pf.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pf.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pi.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pi.pl
index 1d7f82077b7..3fee6ad5262 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pi.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Pi.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Po.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Po.pl
index 911fbb3cfb0..e53adb06e1f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Po.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Po.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V302
+V314
 33
 36
 37
@@ -199,6 +199,8 @@ V302
 43216
 43256
 43259
+43260
+43261
 43310
 43312
 43359
@@ -290,17 +292,25 @@ V302
 70004
 70006
 70085
-70089
+70090
 70093
 70094
+70107
+70108
+70109
+70112
 70200
 70206
+70313
+70314
 70854
 70855
 71105
-71114
+71128
 71233
 71236
+71484
+71487
 74864
 74869
 92782
@@ -313,4 +323,6 @@ V302
 92997
 113823
 113824
+121479
+121484
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Ps.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Ps.pl
index 6d291fe9417..0022562248d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Ps.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Ps.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/S.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/S.pl
index 1d617d3341e..3c06afeadfc 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/S.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/S.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V420
+V428
 36
 37
 43
@@ -148,7 +148,7 @@ V420
 8330
 8333
 8352
-8382
+8383
 8448
 8450
 8451
@@ -177,6 +177,8 @@ V420
 8526
 8527
 8528
+8586
+8588
 8592
 8968
 8972
@@ -211,6 +213,8 @@ V420
 11209
 11210
 11218
+11244
+11248
 11493
 11499
 11904
@@ -319,6 +323,8 @@ V420
 67705
 68296
 68297
+71487
+71488
 92988
 92992
 92997
@@ -338,7 +344,7 @@ V420
 119180
 119210
 119214
-119262
+119273
 119296
 119362
 119365
@@ -365,6 +371,16 @@ V420
 120746
 120771
 120772
+120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121479
 126704
 126706
 126976
@@ -394,25 +410,11 @@ V420
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -431,4 +433,10 @@ V420
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sc.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sc.pl
index 66b0e7c01dc..abb3454cada 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sc.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sc.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -32,7 +32,7 @@ V34
 6107
 6108
 8352
-8382
+8383
 43064
 43065
 65020
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sk.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sk.pl
index 35060a1a7b6..4f05f10629b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sk.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sk.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V56
+V58
 94
 95
 96
@@ -67,4 +67,6 @@ V56
 65345
 65507
 65508
+127995
+128000
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sm.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sm.pl
index 0b7d350ff38..7e16d42da81 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sm.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Sm.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/So.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/So.pl
index 420fbb54d24..53ebf048f36 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/So.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/So.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V330
+V340
 166
 167
 169
@@ -107,6 +107,8 @@ V330
 8526
 8527
 8528
+8586
+8588
 8597
 8602
 8604
@@ -173,6 +175,8 @@ V330
 11209
 11210
 11218
+11244
+11248
 11493
 11499
 11904
@@ -251,6 +255,8 @@ V330
 67705
 68296
 68297
+71487
+71488
 92988
 92992
 92997
@@ -270,13 +276,23 @@ V330
 119180
 119210
 119214
-119262
+119273
 119296
 119362
 119365
 119366
 119552
 119639
+120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121479
 126976
 127020
 127024
@@ -304,25 +320,13 @@ V330
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
+127995
 128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -341,4 +345,10 @@ V330
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Z.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Z.pl
index 21a4ff09346..95e3874fea9 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Z.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Z.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Zs.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Zs.pl
index 42a79f848ee..e9c4cfc71de 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Zs.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Gc/Zs.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/GrBase/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/GrBase/Y.pl
index 4fba3fe6378..0938fd95c90 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/GrBase/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/GrBase/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1448
+V1486
 32
 127
 160
@@ -98,7 +98,7 @@ V1448
 2142
 2143
 2208
-2227
+2229
 2307
 2362
 2363
@@ -195,6 +195,8 @@ V1448
 2786
 2790
 2802
+2809
+2810
 2818
 2820
 2821
@@ -270,7 +272,7 @@ V1448
 3137
 3141
 3160
-3162
+3163
 3168
 3170
 3174
@@ -325,7 +327,7 @@ V1448
 3405
 3406
 3407
-3424
+3423
 3426
 3430
 3446
@@ -484,7 +486,9 @@ V1448
 4992
 5018
 5024
-5109
+5110
+5112
+5118
 5120
 5789
 5792
@@ -668,9 +672,9 @@ V1448
 8336
 8349
 8352
-8382
+8383
 8448
-8586
+8588
 8592
 9211
 9216
@@ -687,6 +691,8 @@ V1448
 11209
 11210
 11218
+11244
+11248
 11264
 11311
 11312
@@ -756,7 +762,7 @@ V1448
 13056
 19894
 19904
-40909
+40918
 40960
 42125
 42128
@@ -774,11 +780,9 @@ V1448
 42738
 42744
 42752
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43010
 43011
@@ -798,7 +802,7 @@ V1448
 43214
 43226
 43250
-43260
+43262
 43264
 43302
 43310
@@ -864,10 +868,8 @@ V1448
 43816
 43823
 43824
-43872
-43876
 43878
-43968
+43888
 44005
 44006
 44008
@@ -1017,7 +1019,11 @@ V1448
 67743
 67751
 67760
-67840
+67808
+67827
+67828
+67830
+67835
 67868
 67871
 67898
@@ -1025,9 +1031,9 @@ V1448
 67904
 67968
 68024
-68030
-68032
-68096
+68028
+68048
+68050
 68097
 68112
 68116
@@ -1059,6 +1065,12 @@ V1448
 68528
 68608
 68681
+68736
+68787
+68800
+68851
+68858
+68864
 69216
 69247
 69632
@@ -1094,11 +1106,11 @@ V1448
 70018
 70070
 70079
-70089
+70090
 70093
 70094
 70096
-70107
+70112
 70113
 70133
 70144
@@ -1111,6 +1123,16 @@ V1448
 70198
 70200
 70206
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70314
 70320
 70367
 70368
@@ -1141,6 +1163,8 @@ V1448
 70473
 70475
 70478
+70480
+70481
 70493
 70500
 70784
@@ -1168,7 +1192,7 @@ V1448
 71102
 71103
 71105
-71114
+71132
 71168
 71219
 71227
@@ -1189,6 +1213,14 @@ V1448
 71351
 71360
 71370
+71424
+71450
+71456
+71458
+71462
+71463
+71472
+71488
 71840
 71923
 71935
@@ -1196,13 +1228,17 @@ V1448
 72384
 72441
 73728
-74649
+74650
 74752
 74863
 74864
 74869
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1262,7 +1298,7 @@ V1448
 119180
 119210
 119214
-119262
+119273
 119296
 119362
 119365
@@ -1312,7 +1348,15 @@ V1448
 120488
 120780
 120782
-120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121484
 124928
 125125
 125127
@@ -1414,25 +1458,11 @@ V1448
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -1451,12 +1481,20 @@ V1448
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 131072
 173783
 173824
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Hex/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Hex/Y.pl
index e6859e4aea8..712f488cb96 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Hex/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Hex/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Hst/NA.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Hst/NA.pl
index eb43dc59b68..1f3d8127e05 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Hst/NA.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Hst/NA.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Hyphen/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Hyphen/T.pl
index 01676139437..82eaf74a853 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Hyphen/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Hyphen/T.pl
@@ -1,34 +1,34 @@
-# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
-
-# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
-# This file is for internal use by core Perl only.  The format and even the
-# name or existence of this file are subject to change without notice.  Don't
-# use it directly.  Use Unicode::UCD to access the Unicode character data
-# base.
-
-
-return <<'END';
-V20
-45
-46
-173
-174
-1418
-1419
-6150
-6151
-8208
-8210
-11799
-11800
-12539
-12540
-65123
-65124
-65293
-65294
-65381
-65382
-END
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V20

+45

+46

+173

+174

+1418

+1419

+6150

+6151

+8208

+8210

+11799

+11800

+12539

+12540

+65123

+65124

+65293

+65294

+65381

+65382

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/IDC/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/IDC/Y.pl
index 88fe58d730a..1a4f1b1bcf9 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/IDC/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/IDC/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1252
+V1302
 48
 58
 65
@@ -110,8 +110,8 @@ V1252
 2112
 2140
 2208
-2227
-2276
+2229
+2275
 2404
 2406
 2416
@@ -201,6 +201,8 @@ V1252
 2788
 2790
 2800
+2809
+2810
 2817
 2820
 2821
@@ -282,7 +284,7 @@ V1252
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -331,7 +333,7 @@ V1252
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3440
@@ -478,7 +480,9 @@ V1252
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -718,7 +722,7 @@ V1252
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -732,19 +736,15 @@ V1252
 42612
 42622
 42623
-42654
-42655
 42738
 42775
 42784
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43048
 43072
@@ -757,6 +757,8 @@ V1252
 43256
 43259
 43260
+43261
+43262
 43264
 43310
 43312
@@ -798,10 +800,8 @@ V1252
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44011
 44012
 44014
@@ -846,7 +846,7 @@ V1252
 65024
 65040
 65056
-65070
+65072
 65075
 65077
 65101
@@ -941,6 +941,10 @@ V1252
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -981,6 +985,10 @@ V1252
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69632
 69703
 69734
@@ -1001,17 +1009,31 @@ V1252
 70007
 70016
 70085
+70090
+70093
 70096
 70107
+70108
+70109
 70144
 70162
 70163
 70200
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -1031,6 +1053,8 @@ V1252
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -1049,6 +1073,8 @@ V1252
 71094
 71096
 71105
+71128
+71134
 71168
 71233
 71236
@@ -1059,6 +1085,12 @@ V1252
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71482
 71840
 71914
 71935
@@ -1066,11 +1098,15 @@ V1252
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1183,6 +1219,18 @@ V1252
 120780
 120782
 120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 124928
 125125
 125136
@@ -1259,6 +1307,8 @@ V1252
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917760
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/IDS/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/IDS/Y.pl
index 25c1f53adb1..bbbc17b5b32 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/IDS/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/IDS/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1076
+V1110
 65
 91
 97
@@ -108,7 +108,7 @@ V1076
 2112
 2137
 2208
-2227
+2229
 2308
 2362
 2365
@@ -179,6 +179,8 @@ V1076
 2769
 2784
 2786
+2809
+2810
 2821
 2829
 2831
@@ -232,7 +234,7 @@ V1076
 3133
 3134
 3160
-3162
+3163
 3168
 3170
 3205
@@ -263,7 +265,7 @@ V1076
 3390
 3406
 3407
-3424
+3423
 3426
 3450
 3456
@@ -386,7 +388,9 @@ V1076
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -431,8 +435,8 @@ V1076
 6517
 6528
 6572
-6593
-6600
+6576
+6602
 6656
 6679
 6688
@@ -598,7 +602,7 @@ V1076
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -620,11 +624,9 @@ V1076
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43010
 43011
@@ -641,6 +643,8 @@ V1076
 43256
 43259
 43260
+43261
+43262
 43274
 43302
 43312
@@ -698,10 +702,8 @@ V1076
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44003
 44032
 55204
@@ -821,6 +823,10 @@ V1076
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -855,6 +861,10 @@ V1076
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69635
 69688
 69763
@@ -873,10 +883,22 @@ V1076
 70085
 70106
 70107
+70108
+70109
 70144
 70162
 70163
 70188
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70367
 70405
@@ -893,6 +915,8 @@ V1076
 70458
 70461
 70462
+70480
+70481
 70493
 70498
 70784
@@ -903,12 +927,16 @@ V1076
 70856
 71040
 71087
+71128
+71132
 71168
 71216
 71236
 71237
 71296
 71339
+71424
+71450
 71840
 71904
 71935
@@ -916,11 +944,15 @@ V1076
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1085,6 +1117,8 @@ V1076
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Ideo/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Ideo/Y.pl
index f7567ff8d0b..d08a2eb1422 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Ideo/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Ideo/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V22
+V24
 12294
 12296
 12321
@@ -20,7 +20,7 @@ V22
 13312
 19894
 19968
-40909
+40918
 63744
 64110
 64112
@@ -31,6 +31,8 @@ V22
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/2_0.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/2_0.pl
index 21139f9919c..1c386e60362 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/2_0.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/2_0.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/2_1.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/2_1.pl
index b61e5883e9c..d7ffc327d8c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/2_1.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/2_1.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/3_0.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/3_0.pl
index 66eaf772eb7..5723531437a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/3_0.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/3_0.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/3_1.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/3_1.pl
index faca25594b0..194753cf657 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/3_1.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/3_1.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/3_2.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/3_2.pl
index 7dea68844e0..fc76fa50055 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/3_2.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/3_2.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/4_0.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/4_0.pl
index 43bddab48aa..caa0363f85e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/4_0.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/4_0.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/4_1.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/4_1.pl
index fba0c46fda1..2ce3802977c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/4_1.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/4_1.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/5_0.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/5_0.pl
index 0fa6e8fe0c0..9973173ce76 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/5_0.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/5_0.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/5_1.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/5_1.pl
index c5f5e47ffc4..82e8aaa076a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/5_1.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/5_1.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/5_2.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/5_2.pl
index f62e04d9b5d..98231c58c18 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/5_2.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/5_2.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/6_0.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/6_0.pl
index ae6e311ec98..2544879c823 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/6_0.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/6_0.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/6_1.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/6_1.pl
index 38fa78a4822..b6a378f70f1 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/6_1.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/6_1.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/6_2.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/6_2.pl
index e29207008c2..279008f6f77 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/6_2.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/6_2.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/6_3.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/6_3.pl
index b004d4c108f..083ea65d6d7 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/6_3.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/6_3.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/7_0.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/7_0.pl
index 18a3d537e36..28635ce63ae 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/In/7_0.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/7_0.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/In/8_0.pl b/Master/tlpkg/tlperl/lib/unicore/lib/In/8_0.pl
new file mode 100644
index 00000000000..4b571be9095
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/In/8_0.pl
@@ -0,0 +1,1260 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V1246

+0

+888

+890

+896

+900

+907

+908

+909

+910

+930

+931

+1328

+1329

+1367

+1369

+1376

+1377

+1416

+1417

+1419

+1421

+1424

+1425

+1480

+1488

+1515

+1520

+1525

+1536

+1565

+1566

+1806

+1807

+1867

+1869

+1970

+1984

+2043

+2048

+2094

+2096

+2111

+2112

+2140

+2142

+2143

+2208

+2229

+2275

+2436

+2437

+2445

+2447

+2449

+2451

+2473

+2474

+2481

+2482

+2483

+2486

+2490

+2492

+2501

+2503

+2505

+2507

+2511

+2519

+2520

+2524

+2526

+2527

+2532

+2534

+2556

+2561

+2564

+2565

+2571

+2575

+2577

+2579

+2601

+2602

+2609

+2610

+2612

+2613

+2615

+2616

+2618

+2620

+2621

+2622

+2627

+2631

+2633

+2635

+2638

+2641

+2642

+2649

+2653

+2654

+2655

+2662

+2678

+2689

+2692

+2693

+2702

+2703

+2706

+2707

+2729

+2730

+2737

+2738

+2740

+2741

+2746

+2748

+2758

+2759

+2762

+2763

+2766

+2768

+2769

+2784

+2788

+2790

+2802

+2809

+2810

+2817

+2820

+2821

+2829

+2831

+2833

+2835

+2857

+2858

+2865

+2866

+2868

+2869

+2874

+2876

+2885

+2887

+2889

+2891

+2894

+2902

+2904

+2908

+2910

+2911

+2916

+2918

+2936

+2946

+2948

+2949

+2955

+2958

+2961

+2962

+2966

+2969

+2971

+2972

+2973

+2974

+2976

+2979

+2981

+2984

+2987

+2990

+3002

+3006

+3011

+3014

+3017

+3018

+3022

+3024

+3025

+3031

+3032

+3046

+3067

+3072

+3076

+3077

+3085

+3086

+3089

+3090

+3113

+3114

+3130

+3133

+3141

+3142

+3145

+3146

+3150

+3157

+3159

+3160

+3163

+3168

+3172

+3174

+3184

+3192

+3200

+3201

+3204

+3205

+3213

+3214

+3217

+3218

+3241

+3242

+3252

+3253

+3258

+3260

+3269

+3270

+3273

+3274

+3278

+3285

+3287

+3294

+3295

+3296

+3300

+3302

+3312

+3313

+3315

+3329

+3332

+3333

+3341

+3342

+3345

+3346

+3387

+3389

+3397

+3398

+3401

+3402

+3407

+3415

+3416

+3423

+3428

+3430

+3446

+3449

+3456

+3458

+3460

+3461

+3479

+3482

+3506

+3507

+3516

+3517

+3518

+3520

+3527

+3530

+3531

+3535

+3541

+3542

+3543

+3544

+3552

+3558

+3568

+3570

+3573

+3585

+3643

+3647

+3676

+3713

+3715

+3716

+3717

+3719

+3721

+3722

+3723

+3725

+3726

+3732

+3736

+3737

+3744

+3745

+3748

+3749

+3750

+3751

+3752

+3754

+3756

+3757

+3770

+3771

+3774

+3776

+3781

+3782

+3783

+3784

+3790

+3792

+3802

+3804

+3808

+3840

+3912

+3913

+3949

+3953

+3992

+3993

+4029

+4030

+4045

+4046

+4059

+4096

+4294

+4295

+4296

+4301

+4302

+4304

+4681

+4682

+4686

+4688

+4695

+4696

+4697

+4698

+4702

+4704

+4745

+4746

+4750

+4752

+4785

+4786

+4790

+4792

+4799

+4800

+4801

+4802

+4806

+4808

+4823

+4824

+4881

+4882

+4886

+4888

+4955

+4957

+4989

+4992

+5018

+5024

+5110

+5112

+5118

+5120

+5789

+5792

+5881

+5888

+5901

+5902

+5909

+5920

+5943

+5952

+5972

+5984

+5997

+5998

+6001

+6002

+6004

+6016

+6110

+6112

+6122

+6128

+6138

+6144

+6159

+6160

+6170

+6176

+6264

+6272

+6315

+6320

+6390

+6400

+6431

+6432

+6444

+6448

+6460

+6464

+6465

+6468

+6510

+6512

+6517

+6528

+6572

+6576

+6602

+6608

+6619

+6622

+6684

+6686

+6751

+6752

+6781

+6783

+6794

+6800

+6810

+6816

+6830

+6832

+6847

+6912

+6988

+6992

+7037

+7040

+7156

+7164

+7224

+7227

+7242

+7245

+7296

+7360

+7368

+7376

+7415

+7416

+7418

+7424

+7670

+7676

+7958

+7960

+7966

+7968

+8006

+8008

+8014

+8016

+8024

+8025

+8026

+8027

+8028

+8029

+8030

+8031

+8062

+8064

+8117

+8118

+8133

+8134

+8148

+8150

+8156

+8157

+8176

+8178

+8181

+8182

+8191

+8192

+8293

+8294

+8306

+8308

+8335

+8336

+8349

+8352

+8383

+8400

+8433

+8448

+8588

+8592

+9211

+9216

+9255

+9280

+9291

+9312

+11124

+11126

+11158

+11160

+11194

+11197

+11209

+11210

+11218

+11244

+11248

+11264

+11311

+11312

+11359

+11360

+11508

+11513

+11558

+11559

+11560

+11565

+11566

+11568

+11624

+11631

+11633

+11647

+11671

+11680

+11687

+11688

+11695

+11696

+11703

+11704

+11711

+11712

+11719

+11720

+11727

+11728

+11735

+11736

+11743

+11744

+11843

+11904

+11930

+11931

+12020

+12032

+12246

+12272

+12284

+12288

+12352

+12353

+12439

+12441

+12544

+12549

+12590

+12593

+12687

+12688

+12731

+12736

+12772

+12784

+12831

+12832

+13055

+13056

+19894

+19904

+40918

+40960

+42125

+42128

+42183

+42192

+42540

+42560

+42744

+42752

+42926

+42928

+42936

+42999

+43052

+43056

+43066

+43072

+43128

+43136

+43205

+43214

+43226

+43232

+43262

+43264

+43348

+43359

+43389

+43392

+43470

+43471

+43482

+43486

+43519

+43520

+43575

+43584

+43598

+43600

+43610

+43612

+43715

+43739

+43767

+43777

+43783

+43785

+43791

+43793

+43799

+43808

+43815

+43816

+43823

+43824

+43878

+43888

+44014

+44016

+44026

+44032

+55204

+55216

+55239

+55243

+55292

+55296

+64110

+64112

+64218

+64256

+64263

+64275

+64280

+64285

+64311

+64312

+64317

+64318

+64319

+64320

+64322

+64323

+64325

+64326

+64450

+64467

+64832

+64848

+64912

+64914

+64968

+64976

+65022

+65024

+65050

+65056

+65107

+65108

+65127

+65128

+65132

+65136

+65141

+65142

+65277

+65279

+65280

+65281

+65471

+65474

+65480

+65482

+65488

+65490

+65496

+65498

+65501

+65504

+65511

+65512

+65519

+65529

+65548

+65549

+65575

+65576

+65595

+65596

+65598

+65599

+65614

+65616

+65630

+65664

+65787

+65792

+65795

+65799

+65844

+65847

+65933

+65936

+65948

+65952

+65953

+66000

+66046

+66176

+66205

+66208

+66257

+66272

+66300

+66304

+66340

+66352

+66379

+66384

+66427

+66432

+66462

+66463

+66500

+66504

+66518

+66560

+66718

+66720

+66730

+66816

+66856

+66864

+66916

+66927

+66928

+67072

+67383

+67392

+67414

+67424

+67432

+67584

+67590

+67592

+67593

+67594

+67638

+67639

+67641

+67644

+67645

+67647

+67670

+67671

+67743

+67751

+67760

+67808

+67827

+67828

+67830

+67835

+67868

+67871

+67898

+67903

+67904

+67968

+68024

+68028

+68048

+68050

+68100

+68101

+68103

+68108

+68116

+68117

+68120

+68121

+68148

+68152

+68155

+68159

+68168

+68176

+68185

+68192

+68256

+68288

+68327

+68331

+68343

+68352

+68406

+68409

+68438

+68440

+68467

+68472

+68498

+68505

+68509

+68521

+68528

+68608

+68681

+68736

+68787

+68800

+68851

+68858

+68864

+69216

+69247

+69632

+69710

+69714

+69744

+69759

+69826

+69840

+69865

+69872

+69882

+69888

+69941

+69942

+69956

+69968

+70007

+70016

+70094

+70096

+70112

+70113

+70133

+70144

+70162

+70163

+70206

+70272

+70279

+70280

+70281

+70282

+70286

+70287

+70302

+70303

+70314

+70320

+70379

+70384

+70394

+70400

+70404

+70405

+70413

+70415

+70417

+70419

+70441

+70442

+70449

+70450

+70452

+70453

+70458

+70460

+70469

+70471

+70473

+70475

+70478

+70480

+70481

+70487

+70488

+70493

+70500

+70502

+70509

+70512

+70517

+70784

+70856

+70864

+70874

+71040

+71094

+71096

+71134

+71168

+71237

+71248

+71258

+71296

+71352

+71360

+71370

+71424

+71450

+71453

+71468

+71472

+71488

+71840

+71923

+71935

+71936

+72384

+72441

+73728

+74650

+74752

+74863

+74864

+74869

+74880

+75076

+77824

+78895

+82944

+83527

+92160

+92729

+92736

+92767

+92768

+92778

+92782

+92784

+92880

+92910

+92912

+92918

+92928

+92998

+93008

+93018

+93019

+93026

+93027

+93048

+93053

+93072

+93952

+94021

+94032

+94079

+94095

+94112

+110592

+110594

+113664

+113771

+113776

+113789

+113792

+113801

+113808

+113818

+113820

+113828

+118784

+119030

+119040

+119079

+119081

+119273

+119296

+119366

+119552

+119639

+119648

+119666

+119808

+119893

+119894

+119965

+119966

+119968

+119970

+119971

+119973

+119975

+119977

+119981

+119982

+119994

+119995

+119996

+119997

+120004

+120005

+120070

+120071

+120075

+120077

+120085

+120086

+120093

+120094

+120122

+120123

+120127

+120128

+120133

+120134

+120135

+120138

+120145

+120146

+120486

+120488

+120780

+120782

+121484

+121499

+121504

+121505

+121520

+124928

+125125

+125127

+125143

+126464

+126468

+126469

+126496

+126497

+126499

+126500

+126501

+126503

+126504

+126505

+126515

+126516

+126520

+126521

+126522

+126523

+126524

+126530

+126531

+126535

+126536

+126537

+126538

+126539

+126540

+126541

+126544

+126545

+126547

+126548

+126549

+126551

+126552

+126553

+126554

+126555

+126556

+126557

+126558

+126559

+126560

+126561

+126563

+126564

+126565

+126567

+126571

+126572

+126579

+126580

+126584

+126585

+126589

+126590

+126591

+126592

+126602

+126603

+126620

+126625

+126628

+126629

+126634

+126635

+126652

+126704

+126706

+126976

+127020

+127024

+127124

+127136

+127151

+127153

+127168

+127169

+127184

+127185

+127222

+127232

+127245

+127248

+127279

+127280

+127340

+127344

+127387

+127462

+127491

+127504

+127547

+127552

+127561

+127568

+127570

+127744

+128378

+128379

+128420

+128421

+128721

+128736

+128749

+128752

+128756

+128768

+128884

+128896

+128981

+129024

+129036

+129040

+129096

+129104

+129114

+129120

+129160

+129168

+129198

+129296

+129305

+129408

+129413

+129472

+129473

+131070

+173783

+173824

+177973

+177984

+178206

+178208

+183970

+194560

+195102

+196606

+196608

+262142

+262144

+327678

+327680

+393214

+393216

+458750

+458752

+524286

+524288

+589822

+589824

+655358

+655360

+720894

+720896

+786430

+786432

+851966

+851968

+917502

+917504

+917505

+917506

+917536

+917632

+917760

+918000

+983038

+1114112

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Bottom.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Bottom.pl
new file mode 100644
index 00000000000..e2c2c14cdd8
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Bottom.pl
@@ -0,0 +1,240 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V226

+2364

+2365

+2369

+2373

+2381

+2382

+2386

+2387

+2390

+2392

+2402

+2404

+2492

+2493

+2497

+2501

+2509

+2510

+2530

+2532

+2620

+2621

+2625

+2627

+2637

+2638

+2677

+2678

+2748

+2749

+2753

+2757

+2765

+2766

+2786

+2788

+2876

+2877

+2881

+2885

+2893

+2894

+2914

+2916

+3158

+3159

+3170

+3172

+3260

+3261

+3298

+3300

+3395

+3397

+3426

+3428

+3540

+3541

+3542

+3543

+3640

+3643

+3768

+3770

+3772

+3773

+3864

+3866

+3893

+3894

+3895

+3896

+3953

+3954

+3956

+3958

+3972

+3973

+3981

+3992

+3993

+4029

+4038

+4039

+4143

+4145

+4151

+4152

+4157

+4159

+4184

+4186

+4190

+4193

+4226

+4227

+4237

+4238

+5907

+5909

+5939

+5941

+5971

+5972

+6003

+6004

+6075

+6078

+6434

+6435

+6450

+6451

+6457

+6458

+6459

+6460

+6680

+6681

+6742

+6743

+6747

+6751

+6761

+6763

+6764

+6765

+6783

+6784

+6968

+6971

+7020

+7021

+7074

+7076

+7077

+7078

+7084

+7086

+7212

+7213

+7223

+7224

+7381

+7386

+7388

+7392

+7405

+7406

+43045

+43046

+43204

+43205

+43307

+43310

+43335

+43338

+43339

+43343

+43448

+43450

+43565

+43566

+43570

+43571

+43573

+43575

+43700

+43701

+43756

+43757

+44008

+44009

+44013

+44014

+68098

+68100

+68108

+68111

+68153

+68155

+69692

+69698

+69811

+69813

+69817

+69819

+69930

+69932

+69937

+69939

+70003

+70004

+70070

+70076

+70092

+70093

+70191

+70192

+70371

+70373

+70377

+70379

+70835

+70841

+70850

+70852

+71090

+71094

+71103

+71105

+71132

+71134

+71219

+71225

+71231

+71232

+71344

+71346

+71351

+71352

+71453

+71454

+71460

+71462

+71464

+71465

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Left.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Left.pl
new file mode 100644
index 00000000000..0b40762761d
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Left.pl
@@ -0,0 +1,90 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V76

+2367

+2368

+2382

+2383

+2495

+2496

+2503

+2505

+2623

+2624

+2751

+2752

+2887

+2888

+3014

+3017

+3398

+3401

+3545

+3546

+3547

+3548

+3903

+3904

+4145

+4146

+4228

+4229

+6081

+6084

+6681

+6682

+6741

+6742

+6766

+6771

+6974

+6976

+7078

+7079

+7207

+7209

+7220

+7222

+43450

+43452

+43567

+43569

+43572

+43573

+43755

+43756

+43758

+43759

+69809

+69810

+69932

+69933

+70068

+70069

+70369

+70370

+70471

+70473

+70833

+70834

+70841

+70842

+71088

+71089

+71096

+71097

+71342

+71343

+71462

+71463

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InPC/LeftAndR.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/LeftAndR.pl
new file mode 100644
index 00000000000..55e7b6bfc6d
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/LeftAndR.pl
@@ -0,0 +1,40 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V26

+2507

+2509

+2891

+2892

+3018

+3021

+3402

+3405

+3548

+3549

+3550

+3551

+6080

+6081

+6084

+6086

+6976

+6978

+70475

+70477

+70844

+70845

+70846

+70847

+71098

+71099

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InPC/NA.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/NA.pl
new file mode 100644
index 00000000000..eb3cfce02ec
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/NA.pl
@@ -0,0 +1,357 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V343

+0

+2304

+2308

+2362

+2365

+2366

+2384

+2385

+2392

+2402

+2404

+2433

+2436

+2492

+2493

+2494

+2501

+2503

+2505

+2507

+2510

+2519

+2520

+2530

+2532

+2561

+2564

+2620

+2621

+2622

+2627

+2631

+2633

+2635

+2638

+2672

+2674

+2677

+2678

+2689

+2692

+2748

+2749

+2750

+2758

+2759

+2762

+2763

+2766

+2786

+2788

+2817

+2820

+2876

+2877

+2878

+2885

+2887

+2889

+2891

+2894

+2902

+2904

+2914

+2916

+2946

+2947

+3006

+3011

+3014

+3017

+3018

+3022

+3031

+3032

+3072

+3076

+3134

+3141

+3142

+3145

+3146

+3150

+3157

+3159

+3170

+3172

+3201

+3204

+3260

+3261

+3262

+3269

+3270

+3273

+3274

+3278

+3285

+3287

+3298

+3300

+3329

+3332

+3390

+3397

+3398

+3401

+3402

+3406

+3415

+3416

+3426

+3428

+3458

+3460

+3530

+3531

+3535

+3541

+3542

+3543

+3544

+3552

+3570

+3572

+3632

+3643

+3648

+3654

+3655

+3663

+3760

+3770

+3771

+3773

+3776

+3781

+3784

+3790

+3864

+3866

+3893

+3894

+3895

+3896

+3897

+3898

+3902

+3904

+3953

+3973

+3974

+3976

+3981

+3992

+3993

+4029

+4038

+4039

+4139

+4153

+4154

+4156

+4157

+4159

+4182

+4186

+4190

+4193

+4194

+4197

+4199

+4206

+4209

+4213

+4226

+4238

+4239

+4240

+4250

+4254

+5906

+5909

+5938

+5941

+5970

+5972

+6002

+6004

+6070

+6098

+6099

+6100

+6109

+6110

+6432

+6444

+6448

+6460

+6576

+6593

+6600

+6602

+6679

+6684

+6741

+6751

+6753

+6781

+6783

+6784

+6912

+6917

+6964

+6981

+7019

+7028

+7040

+7043

+7073

+7083

+7084

+7086

+7142

+7156

+7204

+7224

+7376

+7379

+7380

+7401

+7405

+7406

+7412

+7413

+43014

+43015

+43019

+43020

+43043

+43048

+43136

+43138

+43188

+43205

+43232

+43250

+43307

+43310

+43335

+43348

+43392

+43396

+43443

+43457

+43493

+43494

+43561

+43575

+43587

+43588

+43596

+43598

+43643

+43646

+43696

+43712

+43713

+43714

+43755

+43760

+43765

+43766

+44003

+44011

+44012

+44014

+68097

+68100

+68101

+68103

+68108

+68112

+68152

+68155

+69632

+69635

+69688

+69703

+69760

+69763

+69808

+69819

+69888

+69891

+69927

+69939

+69940

+69941

+70003

+70004

+70016

+70019

+70067

+70081

+70091

+70093

+70188

+70200

+70367

+70379

+70401

+70404

+70462

+70469

+70471

+70473

+70475

+70478

+70487

+70488

+70498

+70500

+70502

+70509

+70512

+70517

+70832

+70852

+71087

+71094

+71096

+71105

+71132

+71134

+71216

+71233

+71339

+71352

+71453

+71454

+71455

+71468

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Overstru.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Overstru.pl
new file mode 100644
index 00000000000..c793e561d83
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Overstru.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+7380

+7381

+7394

+7401

+68097

+68098

+68102

+68103

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Right.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Right.pl
new file mode 100644
index 00000000000..f66d1de68a1
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Right.pl
@@ -0,0 +1,290 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V276

+2307

+2308

+2363

+2364

+2366

+2367

+2368

+2369

+2377

+2381

+2383

+2384

+2434

+2436

+2494

+2495

+2496

+2497

+2519

+2520

+2563

+2564

+2622

+2623

+2624

+2625

+2691

+2692

+2750

+2751

+2752

+2753

+2763

+2765

+2818

+2820

+2878

+2879

+2880

+2881

+3006

+3008

+3009

+3011

+3031

+3032

+3073

+3076

+3137

+3141

+3202

+3204

+3262

+3263

+3265

+3269

+3285

+3287

+3330

+3332

+3390

+3395

+3415

+3416

+3458

+3460

+3535

+3538

+3544

+3545

+3551

+3552

+3570

+3572

+3632

+3633

+3634

+3636

+3653

+3654

+3760

+3761

+3762

+3764

+3902

+3903

+3967

+3968

+4139

+4141

+4152

+4153

+4155

+4156

+4182

+4184

+4194

+4197

+4199

+4206

+4227

+4228

+4231

+4237

+4239

+4240

+4250

+4253

+6070

+6071

+6087

+6089

+6435

+6437

+6441

+6444

+6448

+6450

+6451

+6457

+6576

+6581

+6584

+6586

+6587

+6593

+6600

+6602

+6682

+6683

+6743

+6744

+6753

+6754

+6755

+6757

+6765

+6766

+6916

+6917

+6965

+6966

+6980

+6981

+7042

+7043

+7073

+7074

+7079

+7080

+7082

+7083

+7143

+7144

+7146

+7149

+7150

+7151

+7154

+7156

+7204

+7207

+7210

+7212

+7393

+7394

+43043

+43045

+43047

+43048

+43136

+43138

+43188

+43204

+43346

+43348

+43395

+43396

+43444

+43446

+43453

+43456

+43571

+43572

+43597

+43598

+43643

+43644

+43645

+43646

+43697

+43698

+43706

+43707

+43709

+43710

+43759

+43760

+43765

+43766

+44003

+44005

+44006

+44008

+44009

+44011

+44012

+44013

+69632

+69633

+69634

+69635

+69762

+69763

+69808

+69809

+69810

+69811

+69815

+69817

+70018

+70019

+70067

+70068

+70069

+70070

+70080

+70081

+70188

+70191

+70197

+70198

+70368

+70369

+70370

+70371

+70402

+70404

+70462

+70464

+70465

+70469

+70477

+70478

+70487

+70488

+70498

+70500

+70832

+70833

+70834

+70835

+70845

+70846

+70849

+70850

+71087

+71088

+71089

+71090

+71102

+71103

+71216

+71219

+71227

+71229

+71230

+71231

+71340

+71341

+71343

+71344

+71350

+71351

+71456

+71458

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Top.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Top.pl
new file mode 100644
index 00000000000..9807ef65310
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/Top.pl
@@ -0,0 +1,316 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V302

+2304

+2307

+2362

+2363

+2373

+2377

+2385

+2386

+2387

+2390

+2433

+2434

+2561

+2563

+2631

+2633

+2635

+2637

+2672

+2674

+2689

+2691

+2757

+2758

+2759

+2761

+2817

+2818

+2879

+2880

+2902

+2903

+2946

+2947

+3008

+3009

+3021

+3022

+3072

+3073

+3134

+3137

+3142

+3144

+3146

+3150

+3157

+3158

+3201

+3202

+3263

+3264

+3270

+3271

+3276

+3278

+3329

+3330

+3405

+3406

+3530

+3531

+3538

+3540

+3633

+3634

+3636

+3640

+3655

+3663

+3761

+3762

+3764

+3768

+3771

+3772

+3784

+3790

+3897

+3898

+3954

+3955

+3962

+3967

+3968

+3969

+3970

+3972

+3974

+3976

+4141

+4143

+4146

+4151

+4154

+4155

+4209

+4213

+4229

+4231

+4253

+4254

+5906

+5907

+5938

+5939

+5970

+5971

+6002

+6003

+6071

+6075

+6086

+6087

+6089

+6098

+6099

+6100

+6109

+6110

+6432

+6434

+6439

+6441

+6458

+6459

+6679

+6680

+6683

+6684

+6744

+6747

+6754

+6755

+6757

+6761

+6763

+6764

+6771

+6781

+6912

+6916

+6964

+6965

+6966

+6968

+6978

+6979

+7019

+7020

+7021

+7028

+7040

+7042

+7076

+7077

+7080

+7082

+7142

+7143

+7144

+7146

+7149

+7150

+7151

+7154

+7213

+7220

+7222

+7223

+7376

+7379

+7386

+7388

+7392

+7393

+7412

+7413

+43014

+43015

+43019

+43020

+43046

+43047

+43232

+43250

+43338

+43339

+43343

+43346

+43392

+43395

+43443

+43444

+43446

+43448

+43452

+43453

+43493

+43494

+43561

+43565

+43566

+43567

+43569

+43570

+43587

+43588

+43596

+43597

+43644

+43645

+43696

+43697

+43698

+43700

+43703

+43705

+43710

+43712

+43713

+43714

+43757

+43758

+44005

+44006

+68101

+68102

+68111

+68112

+68152

+68153

+69633

+69634

+69688

+69692

+69698

+69703

+69760

+69762

+69813

+69815

+69888

+69891

+69927

+69930

+69933

+69934

+69936

+69937

+69940

+69941

+70016

+70018

+70076

+70079

+70091

+70092

+70192

+70194

+70196

+70197

+70198

+70200

+70367

+70368

+70373

+70377

+70401

+70402

+70464

+70465

+70502

+70509

+70512

+70517

+70842

+70843

+70847

+70849

+71100

+71102

+71225

+71227

+71229

+71230

+71232

+71233

+71339

+71340

+71341

+71342

+71346

+71350

+71455

+71456

+71458

+71460

+71463

+71464

+71465

+71468

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndBo.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndBo.pl
new file mode 100644
index 00000000000..e7bd8723901
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndBo.pl
@@ -0,0 +1,26 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V12

+3144

+3145

+3955

+3956

+3958

+3962

+3969

+3970

+6972

+6973

+69934

+69936

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndL2.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndL2.pl
new file mode 100644
index 00000000000..58d81aa16af
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndL2.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+2892

+2893

+3549

+3550

+6079

+6080

+71099

+71100

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndLe.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndLe.pl
new file mode 100644
index 00000000000..09fae26e75b
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndLe.pl
@@ -0,0 +1,26 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V12

+2888

+2889

+3546

+3547

+6078

+6079

+7209

+7210

+70843

+70844

+71097

+71098

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndRi.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndRi.pl
new file mode 100644
index 00000000000..b45c5363299
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/TopAndRi.pl
@@ -0,0 +1,32 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V18

+2761

+2762

+2903

+2904

+3264

+3265

+3271

+3273

+3274

+3276

+6437

+6439

+6979

+6980

+70079

+70080

+70194

+70196

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/LOE/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/VisualOr.pl
index d917b9fe3d8..e64466e3ae2 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/LOE/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InPC/VisualOr.pl
@@ -1,24 +1,28 @@
-# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
-
-# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
-# This file is for internal use by core Perl only.  The format and even the
-# name or existence of this file are subject to change without notice.  Don't
-# use it directly.  Use Unicode::UCD to access the Unicode character data
-# base.
-
-
-return <<'END';
-V10
-3648
-3653
-3776
-3781
-43701
-43703
-43705
-43706
-43707
-43709
-END
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V14

+3648

+3653

+3776

+3781

+6581

+6584

+6586

+6587

+43701

+43703

+43705

+43706

+43707

+43709

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Avagraha.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Avagraha.pl
new file mode 100644
index 00000000000..aebd78a34a6
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Avagraha.pl
@@ -0,0 +1,40 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V26

+2365

+2366

+2493

+2494

+2749

+2750

+2877

+2878

+3133

+3134

+3261

+3262

+3389

+3390

+3973

+3974

+6108

+6109

+7098

+7099

+70081

+70082

+70461

+70462

+70852

+70853

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Bindu.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Bindu.pl
new file mode 100644
index 00000000000..560766859d0
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Bindu.pl
@@ -0,0 +1,88 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V74

+2304

+2307

+2433

+2435

+2561

+2563

+2672

+2673

+2689

+2691

+2817

+2819

+2946

+2947

+3072

+3075

+3201

+3203

+3329

+3331

+3458

+3459

+3661

+3662

+3789

+3790

+3966

+3967

+3970

+3972

+4150

+4151

+6086

+6087

+6450

+6451

+6912

+6915

+7040

+7041

+7220

+7222

+43019

+43020

+43123

+43124

+43136

+43137

+43392

+43394

+68110

+68111

+69632

+69634

+69760

+69762

+69888

+69890

+70016

+70018

+70196

+70197

+70367

+70368

+70400

+70403

+70847

+70849

+71100

+71102

+71229

+71230

+71339

+71340

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Cantilla.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Cantilla.pl
new file mode 100644
index 00000000000..bd8909fcc54
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Cantilla.pl
@@ -0,0 +1,30 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V16

+2385

+2387

+7376

+7379

+7380

+7394

+7412

+7413

+7416

+7418

+43232

+43250

+70502

+70509

+70512

+70517

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona2.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona2.pl
new file mode 100644
index 00000000000..ce2217f0e3f
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona2.pl
@@ -0,0 +1,36 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V22

+6448

+6450

+6451

+6458

+6593

+6600

+6743

+6751

+7102

+7104

+7152

+7154

+7213

+7220

+43188

+43189

+43343

+43347

+43584

+43598

+43995

+44003

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona3.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona3.pl
new file mode 100644
index 00000000000..27205d851c7
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona3.pl
@@ -0,0 +1,32 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V18

+2677

+2678

+3772

+3774

+4155

+4159

+4190

+4193

+4226

+4227

+6741

+6743

+43454

+43456

+43571

+43575

+71453

+71456

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona4.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona4.pl
new file mode 100644
index 00000000000..0e4d02d870a
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona4.pl
@@ -0,0 +1,32 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V18

+3981

+3992

+3993

+4029

+6441

+6444

+7073

+7076

+7084

+7086

+7204

+7206

+43111

+43113

+43121

+43122

+43453

+43454

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona5.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona5.pl
new file mode 100644
index 00000000000..62e771780d9
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona5.pl
@@ -0,0 +1,30 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V16

+45

+46

+160

+161

+215

+216

+2674

+2676

+4174

+4175

+6400

+6401

+8208

+8213

+9676

+9677

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona6.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona6.pl
new file mode 100644
index 00000000000..b10906b4611
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consona6.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+6092

+6093

+6915

+6916

+7041

+7042

+43394

+43395

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consonan.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consonan.pl
new file mode 100644
index 00000000000..e95e490ce33
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Consonan.pl
@@ -0,0 +1,300 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V286

+2325

+2362

+2392

+2400

+2424

+2432

+2453

+2473

+2474

+2481

+2482

+2483

+2486

+2490

+2524

+2526

+2527

+2528

+2544

+2546

+2581

+2601

+2602

+2609

+2610

+2612

+2613

+2615

+2616

+2618

+2649

+2653

+2654

+2655

+2709

+2729

+2730

+2737

+2738

+2740

+2741

+2746

+2809

+2810

+2837

+2857

+2858

+2865

+2866

+2868

+2869

+2874

+2908

+2910

+2911

+2912

+2929

+2930

+2965

+2966

+2969

+2971

+2972

+2973

+2974

+2976

+2979

+2981

+2984

+2987

+2990

+3002

+3093

+3113

+3114

+3130

+3160

+3163

+3221

+3241

+3242

+3252

+3253

+3258

+3294

+3295

+3349

+3387

+3482

+3506

+3507

+3516

+3517

+3518

+3520

+3527

+3585

+3631

+3713

+3715

+3716

+3717

+3719

+3721

+3722

+3723

+3725

+3726

+3732

+3736

+3737

+3744

+3745

+3748

+3749

+3750

+3751

+3752

+3754

+3756

+3757

+3759

+3804

+3808

+3904

+3912

+3913

+3949

+4096

+4129

+4159

+4160

+4176

+4178

+4186

+4190

+4193

+4194

+4197

+4199

+4206

+4209

+4213

+4226

+4238

+4239

+5891

+5901

+5902

+5906

+5923

+5938

+5955

+5970

+5987

+5997

+5998

+6001

+6016

+6051

+6401

+6431

+6480

+6499

+6528

+6572

+6656

+6679

+6688

+6733

+6739

+6741

+6931

+6964

+6981

+6988

+7050

+7073

+7086

+7088

+7099

+7102

+7104

+7140

+7168

+7204

+7245

+7248

+43015

+43019

+43020

+43043

+43072

+43102

+43106

+43110

+43113

+43121

+43122

+43123

+43154

+43188

+43274

+43298

+43312

+43335

+43401

+43404

+43407

+43443

+43488

+43493

+43495

+43504

+43514

+43519

+43526

+43561

+43616

+43632

+43633

+43636

+43642

+43643

+43646

+43696

+43746

+43755

+43968

+43982

+43984

+43985

+43986

+43995

+68096

+68097

+68112

+68116

+68117

+68120

+68121

+68148

+69651

+69688

+69773

+69808

+69895

+69927

+69973

+70003

+70033

+70067

+70152

+70162

+70163

+70188

+70276

+70279

+70280

+70281

+70282

+70286

+70287

+70302

+70303

+70313

+70330

+70367

+70421

+70441

+70442

+70449

+70450

+70452

+70453

+70458

+70799

+70832

+71054

+71087

+71182

+71216

+71306

+71339

+71424

+71450

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Invisibl.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Invisibl.pl
new file mode 100644
index 00000000000..a4230249992
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Invisibl.pl
@@ -0,0 +1,28 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V14

+4153

+4154

+6098

+6099

+6752

+6753

+7083

+7084

+43766

+43767

+68159

+68160

+69939

+69940

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Nukta.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Nukta.pl
new file mode 100644
index 00000000000..e7ffb6eb2e0
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Nukta.pl
@@ -0,0 +1,56 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V42

+2364

+2365

+2492

+2493

+2620

+2621

+2748

+2749

+2876

+2877

+3260

+3261

+3897

+3898

+6964

+6965

+7142

+7143

+7223

+7224

+43443

+43444

+68152

+68155

+69818

+69819

+70003

+70004

+70090

+70091

+70198

+70199

+70377

+70378

+70460

+70461

+70851

+70852

+71104

+71105

+71351

+71352

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Number.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Number.pl
new file mode 100644
index 00000000000..a0a07f500c2
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Number.pl
@@ -0,0 +1,94 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V80

+48

+58

+2406

+2416

+2534

+2544

+2662

+2672

+2790

+2800

+2918

+2928

+3046

+3056

+3174

+3184

+3302

+3312

+3430

+3440

+3558

+3568

+3664

+3674

+3792

+3802

+3872

+3892

+4160

+4170

+4240

+4250

+6112

+6122

+6470

+6480

+6608

+6618

+6784

+6794

+6800

+6810

+6992

+7002

+7088

+7098

+7232

+7242

+43216

+43226

+43264

+43274

+43472

+43482

+43504

+43514

+43600

+43610

+44016

+44026

+68160

+68168

+69734

+69744

+69942

+69952

+70096

+70106

+70113

+70133

+70384

+70394

+70864

+70874

+71248

+71258

+71360

+71370

+71472

+71484

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Other.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Other.pl
new file mode 100644
index 00000000000..279487cd6c8
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Other.pl
@@ -0,0 +1,581 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V567

+0

+45

+46

+48

+58

+160

+161

+178

+180

+215

+216

+2304

+2384

+2385

+2387

+2389

+2404

+2406

+2416

+2418

+2432

+2433

+2436

+2437

+2445

+2447

+2449

+2451

+2473

+2474

+2481

+2482

+2483

+2486

+2490

+2492

+2501

+2503

+2505

+2507

+2511

+2519

+2520

+2524

+2526

+2527

+2532

+2534

+2546

+2561

+2564

+2565

+2571

+2575

+2577

+2579

+2601

+2602

+2609

+2610

+2612

+2613

+2615

+2616

+2618

+2620

+2621

+2622

+2627

+2631

+2633

+2635

+2638

+2649

+2653

+2654

+2655

+2662

+2676

+2677

+2678

+2689

+2692

+2693

+2702

+2703

+2706

+2707

+2729

+2730

+2737

+2738

+2740

+2741

+2746

+2748

+2758

+2759

+2762

+2763

+2766

+2784

+2788

+2790

+2800

+2809

+2810

+2817

+2820

+2821

+2829

+2831

+2833

+2835

+2857

+2858

+2865

+2866

+2868

+2869

+2874

+2876

+2885

+2887

+2889

+2891

+2894

+2902

+2904

+2908

+2910

+2911

+2916

+2918

+2928

+2929

+2930

+2946

+2948

+2949

+2955

+2958

+2961

+2962

+2966

+2969

+2971

+2972

+2973

+2974

+2976

+2979

+2981

+2984

+2987

+2990

+3002

+3006

+3011

+3014

+3017

+3018

+3022

+3031

+3032

+3046

+3056

+3072

+3076

+3077

+3085

+3086

+3089

+3090

+3113

+3114

+3130

+3133

+3141

+3142

+3145

+3146

+3150

+3157

+3159

+3160

+3163

+3168

+3172

+3174

+3184

+3201

+3204

+3205

+3213

+3214

+3217

+3218

+3241

+3242

+3252

+3253

+3258

+3260

+3269

+3270

+3273

+3274

+3278

+3285

+3287

+3294

+3295

+3296

+3300

+3302

+3312

+3313

+3315

+3329

+3332

+3333

+3341

+3342

+3345

+3346

+3387

+3389

+3397

+3398

+3401

+3402

+3407

+3415

+3416

+3423

+3428

+3430

+3440

+3450

+3456

+3458

+3460

+3461

+3479

+3482

+3506

+3507

+3516

+3517

+3518

+3520

+3527

+3530

+3531

+3535

+3541

+3542

+3543

+3544

+3552

+3558

+3568

+3570

+3572

+3585

+3631

+3632

+3643

+3648

+3654

+3655

+3663

+3664

+3674

+3713

+3715

+3716

+3717

+3719

+3721

+3722

+3723

+3725

+3726

+3732

+3736

+3737

+3744

+3745

+3748

+3749

+3750

+3751

+3752

+3754

+3756

+3757

+3759

+3760

+3770

+3771

+3774

+3776

+3781

+3784

+3788

+3789

+3790

+3792

+3802

+3804

+3808

+3872

+3892

+3893

+3894

+3895

+3896

+3897

+3898

+3904

+3912

+3913

+3949

+3953

+3974

+3976

+3992

+3993

+4029

+4038

+4039

+4096

+4170

+4174

+4175

+4176

+4254

+5888

+5901

+5902

+5909

+5920

+5941

+5952

+5972

+5984

+5997

+5998

+6001

+6002

+6004

+6016

+6068

+6070

+6100

+6108

+6109

+6112

+6122

+6400

+6431

+6432

+6444

+6448

+6460

+6470

+6510

+6512

+6517

+6528

+6572

+6576

+6602

+6608

+6618

+6656

+6684

+6688

+6751

+6752

+6781

+6783

+6794

+6800

+6810

+6912

+6988

+6992

+7002

+7040

+7156

+7168

+7224

+7232

+7242

+7245

+7248

+7376

+7379

+7380

+7394

+7410

+7413

+7416

+7418

+8204

+8206

+8208

+8213

+8308

+8309

+8322

+8325

+9676

+9677

+43008

+43010

+43011

+43048

+43072

+43124

+43136

+43205

+43216

+43226

+43232

+43250

+43264

+43310

+43312

+43348

+43392

+43457

+43472

+43482

+43488

+43494

+43495

+43519

+43520

+43575

+43584

+43598

+43600

+43610

+43616

+43632

+43633

+43636

+43642

+43715

+43744

+43760

+43765

+43767

+43968

+44011

+44012

+44014

+44016

+44026

+68096

+68100

+68101

+68103

+68108

+68116

+68117

+68120

+68121

+68148

+68152

+68155

+68159

+68168

+69632

+69703

+69714

+69744

+69759

+69819

+69888

+69941

+69942

+69952

+69968

+70004

+70016

+70084

+70090

+70093

+70096

+70106

+70113

+70133

+70144

+70162

+70163

+70200

+70272

+70279

+70280

+70281

+70282

+70286

+70287

+70302

+70303

+70313

+70320

+70379

+70384

+70394

+70400

+70404

+70405

+70413

+70415

+70417

+70419

+70441

+70442

+70449

+70450

+70452

+70453

+70458

+70460

+70469

+70471

+70473

+70475

+70478

+70487

+70488

+70496

+70500

+70502

+70509

+70512

+70517

+70785

+70853

+70864

+70874

+71040

+71094

+71096

+71105

+71128

+71134

+71168

+71233

+71248

+71258

+71296

+71352

+71360

+71370

+71424

+71450

+71453

+71468

+71472

+71484

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/PureKill.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/PureKill.pl
new file mode 100644
index 00000000000..15d17cafe19
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/PureKill.pl
@@ -0,0 +1,44 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V30

+3642

+3643

+3662

+3663

+3972

+3973

+4154

+4155

+5908

+5909

+5940

+5941

+6097

+6098

+7082

+7083

+7154

+7156

+43014

+43015

+43347

+43348

+44013

+44014

+69940

+69941

+70378

+70379

+71467

+71468

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Syllable.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Syllable.pl
new file mode 100644
index 00000000000..339b8303675
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Syllable.pl
@@ -0,0 +1,40 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V26

+178

+180

+3893

+3894

+3895

+3896

+4038

+4039

+6091

+6092

+6094

+6097

+6099

+6100

+6459

+6460

+6778

+6781

+6783

+6784

+7222

+7223

+8308

+8309

+8322

+8325

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/ToneMark.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/ToneMark.pl
new file mode 100644
index 00000000000..fae75edf4ca
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/ToneMark.pl
@@ -0,0 +1,44 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V30

+3656

+3660

+3784

+3788

+4151

+4152

+4195

+4197

+4201

+4206

+4231

+4238

+4239

+4240

+4250

+4252

+6600

+6602

+6773

+6778

+43307

+43310

+43643

+43646

+43711

+43712

+43713

+43714

+44012

+44013

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Virama.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Virama.pl
new file mode 100644
index 00000000000..b6daaa8ad5a
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Virama.pl
@@ -0,0 +1,58 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V44

+2381

+2382

+2509

+2510

+2637

+2638

+2765

+2766

+2893

+2894

+3021

+3022

+3149

+3150

+3277

+3278

+3405

+3406

+3530

+3531

+6980

+6981

+43204

+43205

+43456

+43457

+69702

+69703

+69817

+69818

+70080

+70081

+70197

+70198

+70477

+70478

+70850

+70851

+71103

+71104

+71231

+71232

+71350

+71351

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Visarga.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Visarga.pl
new file mode 100644
index 00000000000..ab4daf1c84a
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Visarga.pl
@@ -0,0 +1,70 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V56

+2307

+2308

+2435

+2436

+2563

+2564

+2691

+2692

+2819

+2820

+3075

+3076

+3203

+3204

+3331

+3332

+3459

+3460

+3967

+3968

+4152

+4153

+6087

+6088

+6916

+6917

+7042

+7043

+7410

+7412

+43137

+43138

+43395

+43396

+43765

+43766

+68111

+68112

+69634

+69635

+69762

+69763

+69890

+69891

+70018

+70019

+70403

+70404

+70849

+70850

+71102

+71103

+71230

+71231

+71340

+71341

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Vowel.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Vowel.pl
new file mode 100644
index 00000000000..d2e3137721d
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/Vowel.pl
@@ -0,0 +1,24 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V10

+6499

+6510

+43102

+43106

+43110

+43111

+43298

+43307

+69968

+69973

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/VowelDep.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/VowelDep.pl
new file mode 100644
index 00000000000..ace82a8e1b4
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/VowelDep.pl
@@ -0,0 +1,228 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V214

+2362

+2364

+2366

+2381

+2382

+2384

+2389

+2392

+2402

+2404

+2494

+2501

+2503

+2505

+2507

+2509

+2519

+2520

+2530

+2532

+2622

+2627

+2631

+2633

+2635

+2637

+2750

+2758

+2759

+2762

+2763

+2765

+2786

+2788

+2878

+2885

+2887

+2889

+2891

+2893

+2902

+2904

+2914

+2916

+3006

+3011

+3014

+3017

+3018

+3021

+3031

+3032

+3134

+3141

+3142

+3145

+3146

+3149

+3157

+3159

+3170

+3172

+3262

+3269

+3270

+3273

+3274

+3277

+3285

+3287

+3298

+3300

+3390

+3397

+3398

+3401

+3402

+3405

+3415

+3416

+3426

+3428

+3535

+3541

+3542

+3543

+3544

+3552

+3570

+3572

+3632

+3642

+3648

+3654

+3655

+3656

+3760

+3770

+3771

+3772

+3776

+3781

+3953

+3966

+3968

+3970

+4139

+4150

+4182

+4186

+4194

+4195

+4199

+4201

+4209

+4213

+4227

+4231

+4252

+4254

+5906

+5908

+5938

+5940

+5970

+5972

+6002

+6004

+6070

+6086

+6088

+6089

+6432

+6441

+6458

+6459

+6576

+6593

+6679

+6684

+6753

+6773

+6965

+6980

+7076

+7082

+7143

+7152

+7206

+7213

+43043

+43048

+43189

+43204

+43335

+43343

+43444

+43453

+43493

+43494

+43561

+43571

+43696

+43711

+43755

+43760

+44003

+44011

+68097

+68100

+68101

+68103

+68108

+68110

+69688

+69702

+69808

+69817

+69927

+69939

+70067

+70080

+70091

+70093

+70188

+70196

+70368

+70377

+70462

+70469

+70471

+70473

+70475

+70477

+70487

+70488

+70498

+70500

+70832

+70847

+71087

+71094

+71096

+71100

+71132

+71134

+71216

+71229

+71232

+71233

+71341

+71350

+71456

+71467

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/InSC/VowelInd.pl b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/VowelInd.pl
new file mode 100644
index 00000000000..1f455bd608a
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/InSC/VowelInd.pl
@@ -0,0 +1,154 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V140

+2308

+2325

+2400

+2402

+2418

+2424

+2437

+2445

+2447

+2449

+2451

+2453

+2528

+2530

+2565

+2571

+2575

+2577

+2579

+2581

+2693

+2702

+2703

+2706

+2707

+2709

+2784

+2786

+2821

+2829

+2831

+2833

+2835

+2837

+2912

+2914

+2949

+2955

+2958

+2961

+2962

+2965

+3077

+3085

+3086

+3089

+3090

+3093

+3168

+3170

+3205

+3213

+3214

+3217

+3218

+3221

+3296

+3298

+3333

+3341

+3342

+3345

+3346

+3349

+3423

+3426

+3461

+3479

+4129

+4139

+4178

+4182

+5888

+5891

+5920

+5923

+5952

+5955

+5984

+5987

+6051

+6068

+6733

+6739

+6917

+6931

+7043

+7050

+7140

+7142

+43008

+43010

+43011

+43014

+43138

+43154

+43396

+43401

+43404

+43407

+43520

+43526

+43744

+43746

+43982

+43984

+43985

+43986

+69637

+69651

+69763

+69773

+69891

+69895

+70019

+70033

+70144

+70152

+70272

+70276

+70320

+70330

+70405

+70413

+70415

+70417

+70419

+70421

+70496

+70498

+70785

+70799

+71040

+71054

+71128

+71132

+71168

+71182

+71296

+71306

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Ain.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Ain.pl
index 45d8f4a1b36..2afc8355f08 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Ain.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Ain.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V8
+V10
 1593
 1595
 1696
@@ -19,4 +19,6 @@ V8
 1789
 1885
 1888
+2227
+2228
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Alef.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Alef.pl
index 6f14dfed48d..3e85bde37e9 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Alef.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Alef.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Beh.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Beh.pl
index 0d9647717b6..2a1b547fadb 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Beh.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Beh.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Dal.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Dal.pl
index 6f70b5c9578..a45096e0fcd 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Dal.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Dal.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/FarsiYeh.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/FarsiYeh.pl
index 91e67b9875c..9c628bd8578 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/FarsiYeh.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/FarsiYeh.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Feh.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Feh.pl
index 963281ebe1e..7a830deb885 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Feh.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Feh.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Gaf.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Gaf.pl
index 6527b7804bc..bca46e18c9b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Gaf.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Gaf.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Hah.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Hah.pl
index 2c008f2dd85..65bb9282ca8 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Hah.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Hah.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Kaf.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Kaf.pl
new file mode 100644
index 00000000000..cbf7aca94a3
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Kaf.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+1603

+1604

+1708

+1711

+1919

+1920

+2228

+2229

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Lam.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Lam.pl
index ec1d4a8441e..e20181bdf8d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Lam.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Lam.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/NoJoinin.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/NoJoinin.pl
index 3d732965ded..97b23e9785a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/NoJoinin.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/NoJoinin.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -41,7 +41,7 @@ V43
 2208
 2221
 2222
-2227
+2229
 68288
 68294
 68295
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Qaf.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Qaf.pl
index e2999b54bd2..41c2610458e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Qaf.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Qaf.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Reh.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Reh.pl
index 88048353c4e..ad8f2720505 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Reh.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Reh.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Sad.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Sad.pl
index 9bd0ea6dc24..47dca873e8a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Sad.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Sad.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Seen.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Seen.pl
index 7748ea32223..929d77b2170 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Seen.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Seen.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Waw.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Waw.pl
index 0d667c6876b..ef3dc16e653 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Waw.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Waw.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Yeh.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Yeh.pl
index 937e43efeb3..4a3d0850805 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Yeh.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jg/Yeh.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jt/C.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jt/C.pl
index 8d1ddb5d14d..36916bbf82b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jt/C.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jt/C.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jt/D.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jt/D.pl
index 6de2ac3c876..1a2f2363754 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jt/D.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jt/D.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V104
+V106
 1568
 1569
 1574
@@ -81,6 +81,8 @@ V104
 2218
 2223
 2225
+2227
+2229
 6151
 6152
 6176
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jt/R.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jt/R.pl
index ec42c1cae02..d3c91b5c377 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jt/R.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jt/R.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jt/T.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jt/T.pl
index 31d89c90d13..56ea2b1d450 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jt/T.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jt/T.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V534
+V556
 173
 174
 768
@@ -63,7 +63,7 @@ V534
 2094
 2137
 2140
-2276
+2275
 2307
 2362
 2363
@@ -355,7 +355,7 @@ V534
 42611
 42612
 42622
-42655
+42654
 42656
 42736
 42738
@@ -422,7 +422,7 @@ V534
 65024
 65040
 65056
-65070
+65072
 65279
 65280
 65529
@@ -469,6 +469,8 @@ V534
 70018
 70070
 70079
+70090
+70093
 70191
 70194
 70196
@@ -479,7 +481,7 @@ V534
 70368
 70371
 70379
-70401
+70400
 70402
 70460
 70461
@@ -503,6 +505,8 @@ V534
 71102
 71103
 71105
+71132
+71134
 71219
 71227
 71229
@@ -517,6 +521,12 @@ V534
 71350
 71351
 71352
+71453
+71456
+71458
+71462
+71463
+71468
 92912
 92917
 92976
@@ -537,6 +547,18 @@ V534
 119214
 119362
 119365
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 125136
 125143
 917505
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Jt/U.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Jt/U.pl
index bb59a0f654f..095095b24cf 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Jt/U.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Jt/U.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V569
+V591
 0
 173
 174
@@ -77,8 +77,8 @@ V569
 2208
 2221
 2222
-2227
-2276
+2229
+2275
 2307
 2362
 2363
@@ -374,7 +374,7 @@ V569
 42611
 42612
 42622
-42655
+42654
 42656
 42736
 42738
@@ -443,7 +443,7 @@ V569
 65024
 65040
 65056
-65070
+65072
 65279
 65280
 65529
@@ -504,6 +504,8 @@ V569
 70018
 70070
 70079
+70090
+70093
 70191
 70194
 70196
@@ -514,7 +516,7 @@ V569
 70368
 70371
 70379
-70401
+70400
 70402
 70460
 70461
@@ -538,6 +540,8 @@ V569
 71102
 71103
 71105
+71132
+71134
 71219
 71227
 71229
@@ -552,6 +556,12 @@ V569
 71350
 71351
 71352
+71453
+71456
+71458
+71462
+71463
+71468
 92912
 92917
 92976
@@ -572,6 +582,18 @@ V569
 119214
 119362
 119365
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 125136
 125143
 917505
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/AI.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/AI.pl
index 7eacddb4afa..5ee8766ac2e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/AI.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/AI.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/AL.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/AL.pl
index f2056ff08b6..ed6b34a05db 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/AL.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/AL.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1340
+V1396
 35
 36
 38
@@ -132,7 +132,7 @@ V1340
 2142
 2143
 2208
-2227
+2229
 2308
 2362
 2365
@@ -209,6 +209,8 @@ V1340
 2786
 2800
 2801
+2809
+2810
 2821
 2829
 2831
@@ -266,7 +268,7 @@ V1340
 3133
 3134
 3160
-3162
+3163
 3168
 3170
 3192
@@ -299,7 +301,7 @@ V1340
 3390
 3406
 3407
-3424
+3423
 3426
 3440
 3446
@@ -398,7 +400,9 @@ V1340
 4992
 5018
 5024
-5109
+5110
+5112
+5118
 5121
 5760
 5761
@@ -565,6 +569,8 @@ V1340
 8560
 8570
 8585
+8586
+8588
 8602
 8658
 8659
@@ -626,6 +632,8 @@ V1340
 8870
 8895
 8896
+8943
+8944
 8968
 8972
 8978
@@ -743,6 +751,8 @@ V1340
 11209
 11210
 11218
+11244
+11248
 11264
 11311
 11312
@@ -816,11 +826,9 @@ V1340
 42738
 42739
 42752
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43010
 43011
@@ -841,6 +849,8 @@ V1340
 43188
 43250
 43260
+43261
+43262
 43274
 43302
 43312
@@ -880,10 +890,8 @@ V1340
 43816
 43823
 43824
-43872
-43876
 43878
-43968
+43888
 44003
 64256
 64263
@@ -997,7 +1005,11 @@ V1340
 67743
 67751
 67760
-67840
+67808
+67827
+67828
+67830
+67835
 67868
 67872
 67898
@@ -1005,9 +1017,9 @@ V1340
 67904
 67968
 68024
-68030
-68032
-68096
+68028
+68048
+68050
 68097
 68112
 68116
@@ -1039,6 +1051,12 @@ V1340
 68528
 68608
 68681
+68736
+68787
+68800
+68851
+68858
+68864
 69216
 69247
 69635
@@ -1067,10 +1085,14 @@ V1340
 70085
 70087
 70088
+70089
+70090
 70093
 70094
 70106
 70107
+70108
+70109
 70113
 70133
 70144
@@ -1081,6 +1103,16 @@ V1340
 70203
 70205
 70206
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70367
 70405
@@ -1097,6 +1129,8 @@ V1340
 70458
 70461
 70462
+70480
+70481
 70493
 70498
 70784
@@ -1107,6 +1141,8 @@ V1340
 71087
 71110
 71113
+71128
+71132
 71168
 71216
 71235
@@ -1122,9 +1158,11 @@ V1340
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78424
 78430
@@ -1135,6 +1173,10 @@ V1340
 78713
 78716
 78895
+82944
+83406
+83408
+83527
 92160
 92729
 92736
@@ -1182,7 +1224,7 @@ V1340
 119180
 119210
 119214
-119262
+119273
 119296
 119362
 119365
@@ -1231,6 +1273,18 @@ V1340
 120486
 120488
 120780
+120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121479
+121483
+121484
 124928
 125125
 125127
@@ -1313,6 +1367,8 @@ V1340
 127927
 127932
 127933
+127995
+128000
 128160
 128161
 128162
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/BA.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/BA.pl
index bc068cadea9..4dea3f4ee88 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/BA.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/BA.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V162
+V170
 9
 10
 124
@@ -151,16 +151,22 @@ V162
 70087
 70088
 70089
+70109
+70112
 70200
 70202
 70203
 70205
+70313
+70314
 71106
 71108
 71113
-71114
+71128
 71233
 71235
+71484
+71487
 74864
 74869
 92782
@@ -173,4 +179,6 @@ V162
 92997
 113823
 113824
+121479
+121483
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/BB.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/BB.pl
index 86861e5f8a9..c8f5be323e5 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/BB.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/BB.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V28
+V32
 180
 181
 712
@@ -35,8 +35,12 @@ V28
 8190
 43124
 43126
+43260
+43261
 70005
 70006
+70107
+70108
 71105
 71106
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CJ.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CJ.pl
index ec1c7311a4c..2b3736d2508 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CJ.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CJ.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CL.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CL.pl
index e568b8d472a..6ae8afbcb24 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CL.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CL.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V162
+V164
 125
 126
 3899
@@ -173,4 +173,6 @@ V162
 78474
 78714
 78716
+83407
+83408
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CM.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CM.pl
index a934d872b4a..027322678fd 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CM.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/CM.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V430
+V446
 0
 9
 14
@@ -71,7 +71,7 @@ V430
 2094
 2137
 2140
-2276
+2275
 2308
 2362
 2365
@@ -295,7 +295,7 @@ V430
 42611
 42612
 42622
-42655
+42654
 42656
 42736
 42738
@@ -340,7 +340,7 @@ V430
 65024
 65040
 65056
-65070
+65072
 65529
 65532
 66045
@@ -379,11 +379,13 @@ V430
 70019
 70067
 70081
+70090
+70093
 70188
 70200
 70367
 70379
-70401
+70400
 70404
 70460
 70461
@@ -407,6 +409,8 @@ V430
 71094
 71096
 71105
+71132
+71134
 71216
 71233
 71339
@@ -433,6 +437,18 @@ V430
 119214
 119362
 119365
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 125136
 125143
 917505
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/EX.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/EX.pl
index d7af7e1e06c..0907df93b8e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/EX.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/EX.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/GL.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/GL.pl
index aee2b5f0637..635cb29fdc9 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/GL.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/GL.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/ID.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/ID.pl
index 6b4f1537405..cde57ff240b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/ID.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/ID.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V250
+V246
 8986
 8988
 9200
@@ -208,19 +208,13 @@ V250
 127568
 127570
 127744
-127789
-127792
-127870
-127872
 127900
 127902
 127925
 127927
 127932
 127933
-127951
-127956
-127992
+127995
 128000
 128160
 128161
@@ -232,14 +226,12 @@ V250
 128176
 128177
 128179
-128255
+128256
 128263
 128279
 128293
 128306
 128330
-128331
-128336
 128378
 128379
 128420
@@ -248,15 +240,19 @@ V250
 128476
 128500
 128506
-128579
-128581
 128592
 128640
-128720
+128721
 128736
 128749
 128752
 128756
+129296
+129305
+129408
+129413
+129472
+129473
 131072
 196606
 196608
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/IN.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/IN.pl
new file mode 100644
index 00000000000..ab2a75c3af6
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/IN.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+8228

+8231

+8943

+8944

+65049

+65050

+68342

+68343

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/IS.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/IS.pl
index 3164e71711d..0d2d814690a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/IS.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/IS.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/NS.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/NS.pl
index fc7d691023f..0b74210da2a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/NS.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/NS.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/OP.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/OP.pl
index 18e8788c9e9..e2c29e4aef4 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/OP.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/OP.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V164
+V166
 40
 41
 91
@@ -175,4 +175,6 @@ V164
 78473
 78713
 78714
+83406
+83407
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/PO.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/PO.pl
index d0ebb84a65f..5010b89465b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/PO.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/PO.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V38
+V40
 37
 38
 162
@@ -35,6 +35,8 @@ V38
 8375
 8379
 8380
+8382
+8383
 8451
 8452
 8457
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/PR.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/PR.pl
index cb1910a3b9c..6274c29dd06 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/PR.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/PR.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V42
+V44
 36
 37
 43
@@ -40,6 +40,8 @@ V42
 8375
 8379
 8380
+8382
+8383
 8400
 8470
 8471
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/QU.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/QU.pl
index 17298827655..5275cdb304b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/QU.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/QU.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/SA.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/SA.pl
index 38a81679082..3ecd2dc5dde 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/SA.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/SA.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V76
+V84
 3585
 3643
 3648
@@ -87,4 +87,12 @@ V76
 43715
 43739
 43744
+71424
+71450
+71453
+71468
+71482
+71484
+71487
+71488
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/XX.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/XX.pl
index 550e8320f85..2992afbcfdf 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lb/XX.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lb/XX.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1183
+V1207
 888
 890
 896
@@ -57,8 +57,8 @@ V1183
 2142
 2143
 2208
-2227
-2276
+2229
+2275
 2436
 2437
 2445
@@ -144,6 +144,8 @@ V1183
 2788
 2790
 2802
+2809
+2810
 2817
 2820
 2821
@@ -223,7 +225,7 @@ V1183
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -274,7 +276,7 @@ V1183
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3446
@@ -399,7 +401,9 @@ V1183
 4992
 5018
 5024
-5109
+5110
+5112
+5118
 5120
 5789
 5792
@@ -529,7 +533,7 @@ V1183
 8352
 8433
 8448
-8586
+8588
 8592
 9211
 9216
@@ -546,6 +550,8 @@ V1183
 11209
 11210
 11218
+11244
+11248
 11264
 11311
 11312
@@ -615,15 +621,11 @@ V1183
 42192
 42540
 42560
-42654
-42655
 42744
 42752
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43052
 43056
@@ -635,7 +637,7 @@ V1183
 43214
 43226
 43232
-43260
+43262
 43264
 43348
 43359
@@ -667,10 +669,8 @@ V1183
 43816
 43823
 43824
-43872
-43876
 43878
-43968
+43888
 44014
 44016
 44026
@@ -709,8 +709,6 @@ V1183
 65024
 65050
 65056
-65070
-65072
 65107
 65108
 65127
@@ -814,7 +812,11 @@ V1183
 67743
 67751
 67760
-67840
+67808
+67827
+67828
+67830
+67835
 67868
 67871
 67898
@@ -822,9 +824,9 @@ V1183
 67904
 67968
 68024
-68030
-68032
-68096
+68028
+68048
+68050
 68100
 68101
 68103
@@ -860,6 +862,12 @@ V1183
 68528
 68608
 68681
+68736
+68787
+68800
+68851
+68858
+68864
 69216
 69247
 69632
@@ -879,22 +887,30 @@ V1183
 69968
 70007
 70016
-70089
-70093
 70094
 70096
-70107
+70112
 70113
 70133
 70144
 70162
 70163
 70206
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70314
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -914,6 +930,8 @@ V1183
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -929,7 +947,7 @@ V1183
 71040
 71094
 71096
-71114
+71134
 71168
 71237
 71248
@@ -938,6 +956,12 @@ V1183
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71488
 71840
 71923
 71935
@@ -945,13 +969,17 @@ V1183
 72384
 72441
 73728
-74649
+74650
 74752
 74863
 74864
 74869
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -997,7 +1025,7 @@ V1183
 119040
 119079
 119081
-119262
+119273
 119296
 119366
 119552
@@ -1045,7 +1073,11 @@ V1183
 120488
 120780
 120782
-120832
+121484
+121499
+121504
+121505
+121520
 124928
 125125
 125127
@@ -1147,25 +1179,11 @@ V1183
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -1184,6 +1202,12 @@ V1183
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 131072
 196606
 196608
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Lower/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Lower/Y.pl
index c21abbc4c88..67da06ea1bd 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Lower/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Lower/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1266
+V1274
 97
 123
 170
@@ -561,6 +561,8 @@ V1266
 1328
 1377
 1416
+5112
+5118
 7424
 7616
 7681
@@ -1203,14 +1205,18 @@ V1266
 42920
 42921
 42922
+42933
+42934
+42935
+42936
 43000
 43003
 43824
 43867
 43868
-43872
-43876
 43878
+43888
+43968
 64256
 64263
 64275
@@ -1219,6 +1225,8 @@ V1266
 65371
 66600
 66640
+68800
+68851
 71872
 71904
 119834
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Math/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Math/Y.pl
index b40bda35846..be6ce0475f6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Math/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Math/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/NFCQC/M.pl b/Master/tlpkg/tlperl/lib/unicore/lib/NFCQC/M.pl
index a63db7eb11e..19ce97345ab 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/NFCQC/M.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/NFCQC/M.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/NFCQC/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/NFCQC/Y.pl
index b9078c0d486..959047f7d36 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/NFCQC/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/NFCQC/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/NFDQC/N.pl b/Master/tlpkg/tlperl/lib/unicore/lib/NFDQC/N.pl
index af1b26bb63a..9b69425ccf7 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/NFDQC/N.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/NFDQC/N.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/NFDQC/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/NFDQC/Y.pl
index c68ffb131c1..d580b79757d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/NFDQC/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/NFDQC/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/NFKCQC/N.pl b/Master/tlpkg/tlperl/lib/unicore/lib/NFKCQC/N.pl
index 65ca2700a8d..a2c4a9d1cb0 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/NFKCQC/N.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/NFKCQC/N.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/NFKCQC/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/NFKCQC/Y.pl
index d277b6c801e..140ceea8472 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/NFKCQC/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/NFKCQC/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/NFKDQC/N.pl b/Master/tlpkg/tlperl/lib/unicore/lib/NFKDQC/N.pl
index afe424ee616..f0206e206c3 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/NFKDQC/N.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/NFKDQC/N.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/NFKDQC/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/NFKDQC/Y.pl
index c6f71914103..d60568411c6 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/NFKDQC/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/NFKDQC/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nt/Di.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nt/Di.pl
index a8f2b18c9cf..43e1001323b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nt/Di.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nt/Di.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nt/None.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nt/None.pl
index cc233cb6bf4..7c584279751 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nt/None.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nt/None.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V355
+V367
 0
 48
 58
@@ -280,8 +280,16 @@ V355
 67712
 67751
 67760
+67835
+67840
 67862
 67868
+68028
+68030
+68032
+68048
+68050
+68096
 68160
 68168
 68221
@@ -296,6 +304,8 @@ V355
 68480
 68521
 68528
+68858
+68864
 69216
 69247
 69714
@@ -316,6 +326,8 @@ V355
 71258
 71360
 71370
+71472
+71484
 71904
 71923
 74752
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nt/Nu.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nt/Nu.pl
index 5261f367086..ba7eb611a7a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nt/Nu.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nt/Nu.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V264
+V276
 188
 191
 2548
@@ -209,8 +209,16 @@ V264
 67712
 67751
 67760
+67835
+67840
 67862
 67868
+68028
+68030
+68032
+68048
+68050
+68096
 68164
 68168
 68221
@@ -225,12 +233,16 @@ V264
 68480
 68521
 68528
+68858
+68864
 69225
 69247
 69723
 69734
 70113
 70133
+71482
+71484
 71914
 71923
 74752
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/0.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/0.pl
index 8accf564fa8..215abac03b1 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/0.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/0.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V136
+V138
 48
 49
 1632
@@ -127,6 +127,8 @@ V136
 71249
 71360
 71361
+71472
+71473
 71904
 71905
 92768
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1.pl
index 9e4dd5bc624..7951e19fb49 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V220
+V228
 49
 50
 185
@@ -157,8 +157,12 @@ V220
 67706
 67751
 67752
+67835
+67836
 67862
 67863
+68032
+68033
 68160
 68161
 68221
@@ -173,6 +177,8 @@ V220
 68473
 68521
 68522
+68858
+68859
 69216
 69217
 69714
@@ -195,6 +201,8 @@ V220
 71250
 71361
 71362
+71473
+71474
 71905
 71906
 74773
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/10.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/10.pl
index 442836f7e18..f8975296f8f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/10.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/10.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V90
+V98
 3056
 3057
 3440
@@ -75,8 +75,12 @@ V90
 67711
 67757
 67758
+67837
+67838
 67863
 67864
+68041
+68042
 68164
 68165
 68254
@@ -89,12 +93,16 @@ V90
 68477
 68525
 68526
+68860
+68861
 69225
 69226
 69723
 69724
 70122
 70123
+71482
+71483
 71914
 71915
 93019
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/100.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/100.pl
index 57035a2fb1a..229d76623d4 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/100.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/100.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V52
+V58
 3057
 3058
 3441
@@ -43,8 +43,12 @@ V52
 67678
 67759
 67760
+67839
+67840
 67865
 67866
+68050
+68051
 68166
 68167
 68335
@@ -55,6 +59,8 @@ V52
 68479
 68527
 68528
+68862
+68863
 69234
 69235
 69732
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1000.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1000.pl
index fbfa4937469..9ed4df4b8b8 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1000.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1000.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V34
+V38
 3058
 3059
 3442
@@ -35,12 +35,16 @@ V34
 65906
 67678
 67679
+68059
+68060
 68167
 68168
 68447
 68448
 68479
 68480
+68863
+68864
 69733
 69734
 70132
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/10000.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/10000.pl
index c697dae869f..68fe3b5e840 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/10000.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/10000.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V16
+V18
 4988
 4989
 8578
@@ -25,6 +25,8 @@ V16
 65878
 67679
 67680
+68068
+68069
 93021
 93022
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/11.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/11.pl
index daf58b85dab..9209616c471 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/11.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/11.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/12.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/12.pl
index ac7d8844ad1..e3d497f484a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/12.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/12.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/13.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/13.pl
index cf321d6437c..f7860bc0c0d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/13.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/13.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/14.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/14.pl
index 16287b652ed..19fcf2af74e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/14.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/14.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/15.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/15.pl
index e5a3dc88e63..85b3930ac96 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/15.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/15.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/16.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/16.pl
index d9725788cfa..f6be7958c02 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/16.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/16.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/17.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/17.pl
index fe4be02a9e3..868aa4cc3e2 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/17.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/17.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/18.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/18.pl
index c36fb2eeea6..61bf3629520 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/18.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/18.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/19.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/19.pl
index 74f6d4c374f..0ff1ff17f94 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/19.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/19.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_2.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_2.pl
index b2e1eaad741..cef6a093cad 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_2.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_2.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V20
+V24
 189
 190
 2931
@@ -27,6 +27,10 @@ V20
 65858
 65909
 65911
+68029
+68030
+68091
+68092
 69243
 69244
 74852
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_3.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_3.pl
index 25cfbb0494a..96c4e8488e3 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_3.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_3.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,9 +10,11 @@
 
 
 return <<'END';
-V10
+V12
 8531
 8532
+68089
+68090
 69245
 69246
 74842
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_4.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_4.pl
index 4bb36216c06..dd079fd58a4 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_4.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_4.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V20
+V22
 188
 189
 2551
@@ -25,6 +25,8 @@ V20
 65857
 65931
 65932
+68088
+68089
 69244
 69245
 74848
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_8.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_8.pl
index 91a0b184681..1710e044b22 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_8.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/1_8.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/2.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/2.pl
index 6a4ad8f7720..d713106840a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/2.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/2.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V224
+V228
 50
 51
 178
@@ -161,6 +161,8 @@ V224
 67753
 67866
 67867
+68033
+68034
 68161
 68162
 68441
@@ -191,6 +193,8 @@ V224
 71251
 71362
 71363
+71474
+71475
 71906
 71907
 74752
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/20.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/20.pl
index b85850c6caa..11d20cf6696 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/20.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/20.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V54
+V60
 4979
 4980
 9331
@@ -41,8 +41,12 @@ V54
 67712
 67758
 67759
+67838
+67839
 67864
 67865
+68042
+68043
 68165
 68166
 68255
@@ -61,6 +65,8 @@ V54
 69725
 70123
 70124
+71483
+71484
 71915
 71916
 119658
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/200.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/200.pl
new file mode 100644
index 00000000000..3d7817f1001
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/200.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+65818

+65819

+66292

+66293

+68051

+68052

+69235

+69236

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/2_3.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/2_3.pl
index c092733780d..70e3d0d15b5 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/2_3.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/2_3.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,11 +10,13 @@
 
 
 return <<'END';
-V12
+V14
 8532
 8533
 65911
 65912
+68093
+68094
 69246
 69247
 74843
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/3.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/3.pl
index f4821292656..3d2924dd54e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/3.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/3.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V220
+V224
 51
 52
 179
@@ -149,6 +149,8 @@ V220
 67754
 67867
 67868
+68034
+68035
 68162
 68163
 68442
@@ -179,6 +181,8 @@ V220
 71252
 71363
 71364
+71475
+71476
 71907
 71908
 74753
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/30.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/30.pl
index 51fed239092..571ee5078a5 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/30.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/30.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V28
+V30
 4980
 4981
 12346
@@ -27,6 +27,8 @@ V28
 65894
 66284
 66285
+68043
+68044
 69227
 69228
 69725
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/300.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/300.pl
index 83c59d0c244..73dde0270ed 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/300.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/300.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

@@ -10,13 +10,15 @@
 

 

 return <<'END';

-V8

+V10

 65819

 65820

 65899

 65900

 66293

 66294

+68052

+68053

 69236

 69237

 END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/3_4.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/3_4.pl
index d25f3f10c01..784f6148ff0 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/3_4.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/3_4.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V12
+V14
 190
 191
 2552
@@ -23,4 +23,6 @@ V12
 43059
 65912
 65913
+68094
+68095
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/4.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/4.pl
index ab8a721e5ed..7f44b872159 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/4.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/4.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V208
+V212
 52
 53
 1636
@@ -137,6 +137,8 @@ V208
 67709
 67754
 67756
+68035
+68036
 68163
 68164
 68443
@@ -167,6 +169,8 @@ V208
 71253
 71364
 71365
+71476
+71477
 71908
 71909
 74754
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/40.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/40.pl
index c318a9d2c89..3c48dce9006 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/40.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/40.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V28
+V30
 4981
 4982
 12875
@@ -23,6 +23,8 @@ V28
 65812
 66285
 66286
+68044
+68045
 69228
 69229
 69726
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/400.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/400.pl
new file mode 100644
index 00000000000..b94662a29c0
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/400.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+65820

+65821

+66294

+66295

+68053

+68054

+69237

+69238

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/5.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/5.pl
index 77ba8156caa..166694b0efc 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/5.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/5.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V208
+V216
 53
 54
 1637
@@ -149,8 +149,14 @@ V208
 67710
 67756
 67757
+67836
+67837
+68036
+68037
 68332
 68333
+68859
+68860
 69220
 69221
 69718
@@ -173,6 +179,8 @@ V208
 71254
 71365
 71366
+71477
+71478
 71909
 71910
 74755
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/50.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/50.pl
index a711564e724..b6d3fc20ee6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/50.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/50.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V42
+V46
 4982
 4983
 8556
@@ -39,8 +39,12 @@ V42
 66287
 66339
 66340
+68045
+68046
 68222
 68223
+68861
+68862
 69229
 69230
 69727
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/500.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/500.pl
index ed5ce1237fd..ca024139a3e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/500.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/500.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V18
+V20
 8558
 8559
 8574
@@ -27,6 +27,8 @@ V18
 65905
 66295
 66296
+68054
+68055
 69238
 69239
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/5000.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/5000.pl
index 035fcdad047..35fcf554e42 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/5000.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/5000.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V10
+V12
 8577
 8578
 65830
@@ -21,4 +21,6 @@ V10
 65871
 65906
 65907
+68063
+68064
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/50000.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/50000.pl
index 951c475f9a0..42641f6065b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/50000.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/50000.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V8
+V10
 8583
 8584
 65839
@@ -19,4 +19,6 @@ V8
 65864
 65878
 65879
+68072
+68073
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/6.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/6.pl
index c324f6c11f0..03e63b9af05 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/6.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/6.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V188
+V192
 54
 55
 1638
@@ -137,6 +137,8 @@ V188
 66279
 66726
 66727
+68037
+68038
 69221
 69222
 69719
@@ -159,6 +161,8 @@ V188
 71255
 71366
 71367
+71478
+71479
 71910
 71911
 74756
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/60.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/60.pl
index ed8ce77444d..64f74d70f52 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/60.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/60.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V18
+V20
 4983
 4984
 12877
@@ -19,6 +19,8 @@ V18
 65814
 66287
 66288
+68046
+68047
 69230
 69231
 69728
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/600.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/600.pl
new file mode 100644
index 00000000000..af608c4cf25
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/600.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+65822

+65823

+66296

+66297

+68055

+68056

+69239

+69240

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/7.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/7.pl
index 9ce1a116f18..17669fe33a4 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/7.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/7.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V182
+V186
 55
 56
 1639
@@ -133,6 +133,8 @@ V182
 66280
 66727
 66728
+68038
+68039
 69222
 69223
 69720
@@ -155,6 +157,8 @@ V182
 71256
 71367
 71368
+71479
+71480
 71911
 71912
 74757
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/70.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/70.pl
index 06fbe2f301e..012f927d3fc 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/70.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/70.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V18
+V20
 4984
 4985
 12878
@@ -19,6 +19,8 @@ V18
 65815
 66288
 66289
+68047
+68048
 69231
 69232
 69729
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/700.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/700.pl
new file mode 100644
index 00000000000..e629778eb82
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/700.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+65823

+65824

+66297

+66298

+68056

+68057

+69240

+69241

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/8.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/8.pl
index 48a23808f70..fae3d7d8518 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/8.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/8.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V176
+V180
 56
 57
 1640
@@ -129,6 +129,8 @@ V176
 66281
 66728
 66729
+68039
+68040
 69223
 69224
 69721
@@ -151,6 +153,8 @@ V176
 71257
 71368
 71369
+71480
+71481
 71912
 71913
 74758
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/80.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/80.pl
index 8fb59a8a041..0f05d4214b4 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/80.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/80.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/800.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/800.pl
new file mode 100644
index 00000000000..aa1d84c7b13
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/800.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+65824

+65825

+66298

+66299

+68057

+68058

+69241

+69242

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/9.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/9.pl
index 040b0a9d5c7..edee4c87bf8 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/9.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/9.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V180
+V184
 57
 58
 1641
@@ -131,6 +131,8 @@ V180
 66282
 66729
 66730
+68040
+68041
 69224
 69225
 69722
@@ -153,6 +155,8 @@ V180
 71258
 71369
 71370
+71481
+71482
 71913
 71914
 74759
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/90.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/90.pl
index c207010d8b2..e464b22a3d3 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/90.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/90.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/900.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/900.pl
index f21e5513b4d..1fd42542bbd 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Nv/900.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Nv/900.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

@@ -10,13 +10,15 @@
 

 

 return <<'END';

-V8

+V10

 65825

 65826

 66299

 66300

 66378

 66379

+68058

+68059

 69242

 69243

 END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/PatSyn/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/PatSyn/Y.pl
index a237411eee6..21954b25ce8 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/PatSyn/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/PatSyn/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Alnum.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Alnum.pl
index 21f268b2e33..35ee7caeb03 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Alnum.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Alnum.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1260
+V1296
 48
 58
 65
@@ -114,8 +114,8 @@ V1260
 2112
 2137
 2208
-2227
-2276
+2229
+2275
 2282
 2288
 2364
@@ -213,6 +213,8 @@ V1260
 2788
 2790
 2800
+2809
+2810
 2817
 2820
 2821
@@ -294,7 +296,7 @@ V1260
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -345,7 +347,7 @@ V1260
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3440
@@ -494,7 +496,9 @@ V1260
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -738,7 +742,7 @@ V1260
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -752,19 +756,15 @@ V1260
 42612
 42620
 42623
-42654
-42655
 42736
 42775
 42784
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43010
 43011
@@ -783,6 +783,8 @@ V1260
 43256
 43259
 43260
+43261
+43262
 43264
 43307
 43312
@@ -834,10 +836,8 @@ V1260
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44011
 44016
 44026
@@ -961,6 +961,10 @@ V1260
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -997,6 +1001,10 @@ V1260
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69632
 69702
 69734
@@ -1021,17 +1029,29 @@ V1260
 70085
 70096
 70107
+70108
+70109
 70144
 70162
 70163
 70197
 70199
 70200
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70377
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -1051,6 +1071,8 @@ V1260
 70473
 70475
 70477
+70480
+70481
 70487
 70488
 70493
@@ -1067,6 +1089,8 @@ V1260
 71094
 71096
 71103
+71128
+71134
 71168
 71231
 71232
@@ -1079,6 +1103,12 @@ V1260
 71350
 71360
 71370
+71424
+71450
+71453
+71467
+71472
+71482
 71840
 71914
 71935
@@ -1086,11 +1116,15 @@ V1260
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1269,6 +1303,8 @@ V1260
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Assigned.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Assigned.pl
index eabd7189f01..825de3e26b6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Assigned.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Assigned.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1200
+V1226
 0
 888
 890
@@ -58,8 +58,8 @@ V1200
 2142
 2143
 2208
-2227
-2276
+2229
+2275
 2436
 2437
 2445
@@ -145,6 +145,8 @@ V1200
 2788
 2790
 2802
+2809
+2810
 2817
 2820
 2821
@@ -224,7 +226,7 @@ V1200
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -275,7 +277,7 @@ V1200
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3446
@@ -400,7 +402,9 @@ V1200
 4992
 5018
 5024
-5109
+5110
+5112
+5118
 5120
 5789
 5792
@@ -528,11 +532,11 @@ V1200
 8336
 8349
 8352
-8382
+8383
 8400
 8433
 8448
-8586
+8588
 8592
 9211
 9216
@@ -549,6 +553,8 @@ V1200
 11209
 11210
 11218
+11244
+11248
 11264
 11311
 11312
@@ -614,7 +620,7 @@ V1200
 13056
 19894
 19904
-40909
+40918
 40960
 42125
 42128
@@ -622,15 +628,11 @@ V1200
 42192
 42540
 42560
-42654
-42655
 42744
 42752
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43052
 43056
@@ -642,7 +644,7 @@ V1200
 43214
 43226
 43232
-43260
+43262
 43264
 43348
 43359
@@ -674,10 +676,8 @@ V1200
 43816
 43823
 43824
-43872
-43876
 43878
-43968
+43888
 44014
 44016
 44026
@@ -718,8 +718,6 @@ V1200
 65024
 65050
 65056
-65070
-65072
 65107
 65108
 65127
@@ -823,7 +821,11 @@ V1200
 67743
 67751
 67760
-67840
+67808
+67827
+67828
+67830
+67835
 67868
 67871
 67898
@@ -831,9 +833,9 @@ V1200
 67904
 67968
 68024
-68030
-68032
-68096
+68028
+68048
+68050
 68100
 68101
 68103
@@ -869,6 +871,12 @@ V1200
 68528
 68608
 68681
+68736
+68787
+68800
+68851
+68858
+68864
 69216
 69247
 69632
@@ -888,22 +896,30 @@ V1200
 69968
 70007
 70016
-70089
-70093
 70094
 70096
-70107
+70112
 70113
 70133
 70144
 70162
 70163
 70206
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70314
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -923,6 +939,8 @@ V1200
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -938,7 +956,7 @@ V1200
 71040
 71094
 71096
-71114
+71134
 71168
 71237
 71248
@@ -947,6 +965,12 @@ V1200
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71488
 71840
 71923
 71935
@@ -954,13 +978,17 @@ V1200
 72384
 72441
 73728
-74649
+74650
 74752
 74863
 74864
 74869
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1006,7 +1034,7 @@ V1200
 119040
 119079
 119081
-119262
+119273
 119296
 119366
 119552
@@ -1054,7 +1082,11 @@ V1200
 120488
 120780
 120782
-120832
+121484
+121499
+121504
+121505
+121520
 124928
 125125
 125127
@@ -1156,25 +1188,11 @@ V1200
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -1193,12 +1211,20 @@ V1200
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 131072
 173783
 173824
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917505
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Blank.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Blank.pl
index 1094a12b3a4..bc0a182ca51 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Blank.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Blank.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Graph.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Graph.pl
index 2c1dabb0781..3fc2f8b22b1 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Graph.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Graph.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1210
+V1236
 33
 127
 161
@@ -60,8 +60,8 @@ V1210
 2142
 2143
 2208
-2227
-2276
+2229
+2275
 2436
 2437
 2445
@@ -147,6 +147,8 @@ V1210
 2788
 2790
 2802
+2809
+2810
 2817
 2820
 2821
@@ -226,7 +228,7 @@ V1210
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -277,7 +279,7 @@ V1210
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3446
@@ -402,7 +404,9 @@ V1210
 4992
 5018
 5024
-5109
+5110
+5112
+5118
 5120
 5760
 5761
@@ -538,11 +542,11 @@ V1210
 8336
 8349
 8352
-8382
+8383
 8400
 8433
 8448
-8586
+8588
 8592
 9211
 9216
@@ -559,6 +563,8 @@ V1210
 11209
 11210
 11218
+11244
+11248
 11264
 11311
 11312
@@ -624,7 +630,7 @@ V1210
 13056
 19894
 19904
-40909
+40918
 40960
 42125
 42128
@@ -632,15 +638,11 @@ V1210
 42192
 42540
 42560
-42654
-42655
 42744
 42752
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43052
 43056
@@ -652,7 +654,7 @@ V1210
 43214
 43226
 43232
-43260
+43262
 43264
 43348
 43359
@@ -684,10 +686,8 @@ V1210
 43816
 43823
 43824
-43872
-43876
 43878
-43968
+43888
 44014
 44016
 44026
@@ -728,8 +728,6 @@ V1210
 65024
 65050
 65056
-65070
-65072
 65107
 65108
 65127
@@ -833,7 +831,11 @@ V1210
 67743
 67751
 67760
-67840
+67808
+67827
+67828
+67830
+67835
 67868
 67871
 67898
@@ -841,9 +843,9 @@ V1210
 67904
 67968
 68024
-68030
-68032
-68096
+68028
+68048
+68050
 68100
 68101
 68103
@@ -879,6 +881,12 @@ V1210
 68528
 68608
 68681
+68736
+68787
+68800
+68851
+68858
+68864
 69216
 69247
 69632
@@ -898,22 +906,30 @@ V1210
 69968
 70007
 70016
-70089
-70093
 70094
 70096
-70107
+70112
 70113
 70133
 70144
 70162
 70163
 70206
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70314
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -933,6 +949,8 @@ V1210
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -948,7 +966,7 @@ V1210
 71040
 71094
 71096
-71114
+71134
 71168
 71237
 71248
@@ -957,6 +975,12 @@ V1210
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71488
 71840
 71923
 71935
@@ -964,13 +988,17 @@ V1210
 72384
 72441
 73728
-74649
+74650
 74752
 74863
 74864
 74869
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1016,7 +1044,7 @@ V1210
 119040
 119079
 119081
-119262
+119273
 119296
 119366
 119552
@@ -1064,7 +1092,11 @@ V1210
 120488
 120780
 120782
-120832
+121484
+121499
+121504
+121505
+121520
 124928
 125125
 125127
@@ -1166,25 +1198,11 @@ V1210
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -1203,12 +1221,20 @@ V1210
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 131072
 173783
 173824
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917505
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/PerlWord.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/PerlWord.pl
index 28529637bef..5a7ffbdbee2 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/PerlWord.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/PerlWord.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/PosixPun.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/PosixPun.pl
index 77e4c9545d9..7171fddc8e1 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/PosixPun.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/PosixPun.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Print.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Print.pl
index afafb1e9f8b..c7b44553777 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Print.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Print.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1204
+V1230
 32
 127
 160
@@ -60,8 +60,8 @@ V1204
 2142
 2143
 2208
-2227
-2276
+2229
+2275
 2436
 2437
 2445
@@ -147,6 +147,8 @@ V1204
 2788
 2790
 2802
+2809
+2810
 2817
 2820
 2821
@@ -226,7 +228,7 @@ V1204
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -277,7 +279,7 @@ V1204
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3446
@@ -402,7 +404,9 @@ V1204
 4992
 5018
 5024
-5109
+5110
+5112
+5118
 5120
 5789
 5792
@@ -532,11 +536,11 @@ V1204
 8336
 8349
 8352
-8382
+8383
 8400
 8433
 8448
-8586
+8588
 8592
 9211
 9216
@@ -553,6 +557,8 @@ V1204
 11209
 11210
 11218
+11244
+11248
 11264
 11311
 11312
@@ -618,7 +624,7 @@ V1204
 13056
 19894
 19904
-40909
+40918
 40960
 42125
 42128
@@ -626,15 +632,11 @@ V1204
 42192
 42540
 42560
-42654
-42655
 42744
 42752
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43052
 43056
@@ -646,7 +648,7 @@ V1204
 43214
 43226
 43232
-43260
+43262
 43264
 43348
 43359
@@ -678,10 +680,8 @@ V1204
 43816
 43823
 43824
-43872
-43876
 43878
-43968
+43888
 44014
 44016
 44026
@@ -722,8 +722,6 @@ V1204
 65024
 65050
 65056
-65070
-65072
 65107
 65108
 65127
@@ -827,7 +825,11 @@ V1204
 67743
 67751
 67760
-67840
+67808
+67827
+67828
+67830
+67835
 67868
 67871
 67898
@@ -835,9 +837,9 @@ V1204
 67904
 67968
 68024
-68030
-68032
-68096
+68028
+68048
+68050
 68100
 68101
 68103
@@ -873,6 +875,12 @@ V1204
 68528
 68608
 68681
+68736
+68787
+68800
+68851
+68858
+68864
 69216
 69247
 69632
@@ -892,22 +900,30 @@ V1204
 69968
 70007
 70016
-70089
-70093
 70094
 70096
-70107
+70112
 70113
 70133
 70144
 70162
 70163
 70206
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70314
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -927,6 +943,8 @@ V1204
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -942,7 +960,7 @@ V1204
 71040
 71094
 71096
-71114
+71134
 71168
 71237
 71248
@@ -951,6 +969,12 @@ V1204
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71488
 71840
 71923
 71935
@@ -958,13 +982,17 @@ V1204
 72384
 72441
 73728
-74649
+74650
 74752
 74863
 74864
 74869
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1010,7 +1038,7 @@ V1204
 119040
 119079
 119081
-119262
+119273
 119296
 119366
 119552
@@ -1058,7 +1086,11 @@ V1204
 120488
 120780
 120782
-120832
+121484
+121499
+121504
+121505
+121520
 124928
 125125
 125127
@@ -1160,25 +1192,11 @@ V1204
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -1197,12 +1215,20 @@ V1204
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 131072
 173783
 173824
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917505
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/SpacePer.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/SpacePer.pl
index 17f797e348a..46bc11180eb 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/SpacePer.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/SpacePer.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Title.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Title.pl
index 30e09d580dc..d40fb5551a3 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Title.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Title.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Word.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Word.pl
index 334870c01ec..16f4c783076 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Word.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/Word.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1260
+V1310
 48
 58
 65
@@ -108,8 +108,8 @@ V1260
 2112
 2140
 2208
-2227
-2276
+2229
+2275
 2404
 2406
 2416
@@ -199,6 +199,8 @@ V1260
 2788
 2790
 2800
+2809
+2810
 2817
 2820
 2821
@@ -280,7 +282,7 @@ V1260
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -329,7 +331,7 @@ V1260
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3440
@@ -474,7 +476,9 @@ V1260
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -720,7 +724,7 @@ V1260
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -734,19 +738,15 @@ V1260
 42612
 42622
 42623
-42654
-42655
 42738
 42775
 42784
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43048
 43072
@@ -759,6 +759,8 @@ V1260
 43256
 43259
 43260
+43261
+43262
 43264
 43310
 43312
@@ -800,10 +802,8 @@ V1260
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44011
 44012
 44014
@@ -848,7 +848,7 @@ V1260
 65024
 65040
 65056
-65070
+65072
 65075
 65077
 65101
@@ -943,6 +943,10 @@ V1260
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -983,6 +987,10 @@ V1260
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69632
 69703
 69734
@@ -1003,17 +1011,31 @@ V1260
 70007
 70016
 70085
+70090
+70093
 70096
 70107
+70108
+70109
 70144
 70162
 70163
 70200
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -1033,6 +1055,8 @@ V1260
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -1051,6 +1075,8 @@ V1260
 71094
 71096
 71105
+71128
+71134
 71168
 71233
 71236
@@ -1061,6 +1087,12 @@ V1260
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71482
 71840
 71914
 71935
@@ -1068,11 +1100,15 @@ V1260
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1185,6 +1221,18 @@ V1260
 120780
 120782
 120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 124928
 125125
 125136
@@ -1267,6 +1315,8 @@ V1260
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917760
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/XPosixPu.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/XPosixPu.pl
index fec0255ae62..4cd0b45d197 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/XPosixPu.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/XPosixPu.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V300
+V312
 33
 48
 58
@@ -203,6 +203,8 @@ V300
 43216
 43256
 43259
+43260
+43261
 43310
 43312
 43359
@@ -288,17 +290,25 @@ V300
 70004
 70006
 70085
-70089
+70090
 70093
 70094
+70107
+70108
+70109
+70112
 70200
 70206
+70313
+70314
 70854
 70855
 71105
-71114
+71128
 71233
 71236
+71484
+71487
 74864
 74869
 92782
@@ -311,4 +321,6 @@ V300
 92997
 113823
 113824
+121479
+121484
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlAny.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlAny.pl
index 7c148096cb5..5cc6f9b62b7 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlAny.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlAny.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V234
+V246
 65
 91
 97
@@ -75,7 +75,7 @@ V234
 653
 658
 659
-670
+669
 671
 700
 701
@@ -133,6 +133,10 @@ V234
 4296
 4301
 4302
+5024
+5110
+5112
+5118
 7545
 7546
 7549
@@ -232,7 +236,11 @@ V234
 42902
 42926
 42928
-42930
+42936
+43859
+43860
+43888
+43968
 64256
 64263
 64275
@@ -243,6 +251,10 @@ V234
 65371
 66560
 66640
+68736
+68787
+68800
+68851
 71840
 71904
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlCh2.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlCh2.pl
index 33939d24ef5..83b2bca4de8 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlCh2.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlCh2.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1274
+V1324
 32
 33
 40
@@ -118,8 +118,8 @@ V1274
 2112
 2140
 2208
-2227
-2276
+2229
+2275
 2404
 2406
 2416
@@ -209,6 +209,8 @@ V1274
 2788
 2790
 2800
+2809
+2810
 2817
 2820
 2821
@@ -290,7 +292,7 @@ V1274
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -339,7 +341,7 @@ V1274
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3440
@@ -484,7 +486,9 @@ V1274
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -728,7 +732,7 @@ V1274
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -742,19 +746,15 @@ V1274
 42612
 42622
 42623
-42654
-42655
 42738
 42775
 42784
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43048
 43072
@@ -767,6 +767,8 @@ V1274
 43256
 43259
 43260
+43261
+43262
 43264
 43310
 43312
@@ -808,10 +810,8 @@ V1274
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44011
 44012
 44014
@@ -858,7 +858,7 @@ V1274
 65024
 65040
 65056
-65070
+65072
 65075
 65077
 65101
@@ -963,6 +963,10 @@ V1274
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -1003,6 +1007,10 @@ V1274
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69632
 69703
 69734
@@ -1023,17 +1031,31 @@ V1274
 70007
 70016
 70085
+70090
+70093
 70096
 70107
+70108
+70109
 70144
 70162
 70163
 70200
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -1053,6 +1075,8 @@ V1274
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -1071,6 +1095,8 @@ V1274
 71094
 71096
 71105
+71128
+71134
 71168
 71233
 71236
@@ -1081,6 +1107,12 @@ V1274
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71482
 71840
 71914
 71935
@@ -1088,11 +1120,15 @@ V1274
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1205,6 +1241,18 @@ V1274
 120780
 120782
 120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 124928
 125125
 125136
@@ -1281,6 +1329,8 @@ V1274
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917760
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlCha.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlCha.pl
index 4d76bc14a76..3fa65860033 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlCha.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlCha.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1086
+V1120
 65
 91
 97
@@ -108,7 +108,7 @@ V1086
 2112
 2137
 2208
-2227
+2229
 2308
 2362
 2365
@@ -179,6 +179,8 @@ V1086
 2769
 2784
 2786
+2809
+2810
 2821
 2829
 2831
@@ -232,7 +234,7 @@ V1086
 3133
 3134
 3160
-3162
+3163
 3168
 3170
 3205
@@ -263,7 +265,7 @@ V1086
 3390
 3406
 3407
-3424
+3423
 3426
 3450
 3456
@@ -386,7 +388,9 @@ V1086
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -431,8 +435,8 @@ V1086
 6517
 6528
 6572
-6593
-6600
+6576
+6602
 6656
 6679
 6688
@@ -598,7 +602,7 @@ V1086
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -620,11 +624,9 @@ V1086
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43010
 43011
@@ -641,6 +643,8 @@ V1086
 43256
 43259
 43260
+43261
+43262
 43274
 43302
 43312
@@ -698,10 +702,8 @@ V1086
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44003
 44032
 55204
@@ -833,6 +835,10 @@ V1086
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -867,6 +873,10 @@ V1086
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69635
 69688
 69763
@@ -885,10 +895,22 @@ V1086
 70085
 70106
 70107
+70108
+70109
 70144
 70162
 70163
 70188
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70367
 70405
@@ -905,6 +927,8 @@ V1086
 70458
 70461
 70462
+70480
+70481
 70493
 70498
 70784
@@ -915,12 +939,16 @@ V1086
 70856
 71040
 71087
+71128
+71132
 71168
 71216
 71236
 71237
 71296
 71339
+71424
+71450
 71840
 71904
 71935
@@ -928,9 +956,13 @@ V1086
 72384
 72441
 73728
-74649
+74650
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1095,6 +1127,8 @@ V1086
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlFol.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlFol.pl
index df488083da8..e43d835a77f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlFol.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlFol.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlIDC.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlIDC.pl
index 699f6055790..12fa15e3f22 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlIDC.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlIDC.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1266
+V1316
 48
 58
 65
@@ -110,8 +110,8 @@ V1266
 2112
 2140
 2208
-2227
-2276
+2229
+2275
 2404
 2406
 2416
@@ -201,6 +201,8 @@ V1266
 2788
 2790
 2800
+2809
+2810
 2817
 2820
 2821
@@ -282,7 +284,7 @@ V1266
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -331,7 +333,7 @@ V1266
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3440
@@ -476,7 +478,9 @@ V1266
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -720,7 +724,7 @@ V1266
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -734,19 +738,15 @@ V1266
 42612
 42622
 42623
-42654
-42655
 42738
 42775
 42784
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43048
 43072
@@ -759,6 +759,8 @@ V1266
 43256
 43259
 43260
+43261
+43262
 43264
 43310
 43312
@@ -800,10 +802,8 @@ V1266
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44011
 44012
 44014
@@ -850,7 +850,7 @@ V1266
 65024
 65040
 65056
-65070
+65072
 65075
 65077
 65101
@@ -955,6 +955,10 @@ V1266
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -995,6 +999,10 @@ V1266
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69632
 69703
 69734
@@ -1015,17 +1023,31 @@ V1266
 70007
 70016
 70085
+70090
+70093
 70096
 70107
+70108
+70109
 70144
 70162
 70163
 70200
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -1045,6 +1067,8 @@ V1266
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -1063,6 +1087,8 @@ V1266
 71094
 71096
 71105
+71128
+71134
 71168
 71233
 71236
@@ -1073,6 +1099,12 @@ V1266
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71482
 71840
 71914
 71935
@@ -1080,11 +1112,15 @@ V1266
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1197,6 +1233,18 @@ V1266
 120780
 120782
 120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 124928
 125125
 125136
@@ -1273,6 +1321,8 @@ V1266
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917760
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlIDS.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlIDS.pl
index cea5bc43f99..8bfb6e3d91f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlIDS.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlIDS.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1094
+V1128
 65
 91
 95
@@ -110,7 +110,7 @@ V1094
 2112
 2137
 2208
-2227
+2229
 2308
 2362
 2365
@@ -181,6 +181,8 @@ V1094
 2769
 2784
 2786
+2809
+2810
 2821
 2829
 2831
@@ -234,7 +236,7 @@ V1094
 3133
 3134
 3160
-3162
+3163
 3168
 3170
 3205
@@ -265,7 +267,7 @@ V1094
 3390
 3406
 3407
-3424
+3423
 3426
 3450
 3456
@@ -388,7 +390,9 @@ V1094
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -433,8 +437,8 @@ V1094
 6517
 6528
 6572
-6593
-6600
+6576
+6602
 6656
 6679
 6688
@@ -602,7 +606,7 @@ V1094
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -624,11 +628,9 @@ V1094
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43010
 43011
@@ -645,6 +647,8 @@ V1094
 43256
 43259
 43260
+43261
+43262
 43274
 43302
 43312
@@ -702,10 +706,8 @@ V1094
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44003
 44032
 55204
@@ -839,6 +841,10 @@ V1094
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -873,6 +879,10 @@ V1094
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69635
 69688
 69763
@@ -891,10 +901,22 @@ V1094
 70085
 70106
 70107
+70108
+70109
 70144
 70162
 70163
 70188
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70367
 70405
@@ -911,6 +933,8 @@ V1094
 70458
 70461
 70462
+70480
+70481
 70493
 70498
 70784
@@ -921,12 +945,16 @@ V1094
 70856
 71040
 71087
+71128
+71132
 71168
 71216
 71236
 71237
 71296
 71339
+71424
+71450
 71840
 71904
 71935
@@ -934,11 +962,15 @@ V1094
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1103,6 +1135,8 @@ V1094
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/NChar/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlNch.pl
index aa0ad07c8bc..59894b1b3d4 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/NChar/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlNch.pl
@@ -1,50 +1,50 @@
-# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
-
-# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
-# This file is for internal use by core Perl only.  The format and even the
-# name or existence of this file are subject to change without notice.  Don't
-# use it directly.  Use Unicode::UCD to access the Unicode character data
-# base.
-
-
-return <<'END';
-V36
-64976
-65008
-65534
-65536
-131070
-131072
-196606
-196608
-262142
-262144
-327678
-327680
-393214
-393216
-458750
-458752
-524286
-524288
-589822
-589824
-655358
-655360
-720894
-720896
-786430
-786432
-851966
-851968
-917502
-917504
-983038
-983040
-1048574
-1048576
-1114110
-1114112
-END
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V36

+64976

+65008

+65534

+65536

+131070

+131072

+196606

+196608

+262142

+262144

+327678

+327680

+393214

+393216

+458750

+458752

+524286

+524288

+589822

+589824

+655358

+655360

+720894

+720896

+786430

+786432

+851966

+851968

+917502

+917504

+983038

+983040

+1048574

+1048576

+1114110

+1114112

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/PatWS/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlPat.pl
index 23a048fc3af..7316e86b073 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/PatWS/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlPat.pl
@@ -1,24 +1,24 @@
-# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
-
-# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
-# This file is for internal use by core Perl only.  The format and even the
-# name or existence of this file are subject to change without notice.  Don't
-# use it directly.  Use Unicode::UCD to access the Unicode character data
-# base.
-
-
-return <<'END';
-V10
-9
-14
-32
-33
-133
-134
-8206
-8208
-8232
-8234
-END
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V10

+9

+14

+32

+33

+133

+134

+8206

+8208

+8232

+8234

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlPr2.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlPr2.pl
index 2f85c0c28ed..5ea11902802 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlPr2.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlPr2.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlPro.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlPro.pl
index 0252ccbe2d7..10dfa312519 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlPro.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlPro.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlQuo.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlQuo.pl
index aa28fd8ee1a..fe9fd0d81a6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlQuo.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Perl/_PerlQuo.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/QMark/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/QMark/Y.pl
index 4815639a0d8..d78a3e6f63e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/QMark/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/QMark/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/AT.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/AT.pl
index bbc64aef05e..9e1f0f65982 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/AT.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/AT.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/CL.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/CL.pl
index e2f1b006d8f..99c06eb073a 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/CL.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/CL.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/EX.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/EX.pl
index 1875b5ad390..8132f398256 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/EX.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/EX.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V462
+V476
 768
 880
 1155
@@ -57,7 +57,7 @@ V462
 2094
 2137
 2140
-2276
+2275
 2308
 2362
 2365
@@ -257,10 +257,6 @@ V462
 6444
 6448
 6460
-6576
-6593
-6600
-6602
 6679
 6684
 6741
@@ -317,7 +313,7 @@ V462
 42611
 42612
 42622
-42655
+42654
 42656
 42736
 42738
@@ -376,7 +372,7 @@ V462
 65024
 65040
 65056
-65070
+65072
 65438
 65440
 66045
@@ -415,11 +411,13 @@ V462
 70019
 70067
 70081
+70090
+70093
 70188
 70200
 70367
 70379
-70401
+70400
 70404
 70460
 70461
@@ -443,10 +441,14 @@ V462
 71094
 71096
 71105
+71132
+71134
 71216
 71233
 71339
 71352
+71453
+71468
 92912
 92917
 92976
@@ -469,6 +471,18 @@ V462
 119214
 119362
 119365
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 125136
 125143
 917760
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/FO.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/FO.pl
index b0ee057f85c..b52b9fe0d93 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/FO.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/FO.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/LE.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/LE.pl
index 0176645e840..68c2cb75cd0 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/LE.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/LE.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V878
+V910
 443
 444
 448
@@ -74,7 +74,7 @@ V878
 2112
 2137
 2208
-2227
+2229
 2308
 2362
 2365
@@ -145,6 +145,8 @@ V878
 2769
 2784
 2786
+2809
+2810
 2821
 2829
 2831
@@ -198,7 +200,7 @@ V878
 3133
 3134
 3160
-3162
+3163
 3168
 3170
 3205
@@ -229,7 +231,7 @@ V878
 3390
 3406
 3407
-3424
+3423
 3426
 3450
 3456
@@ -345,8 +347,6 @@ V878
 4955
 4992
 5008
-5024
-5109
 5121
 5741
 5743
@@ -391,8 +391,8 @@ V878
 6517
 6528
 6572
-6593
-6600
+6576
+6602
 6656
 6679
 6688
@@ -478,7 +478,7 @@ V878
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -499,6 +499,8 @@ V878
 42784
 42888
 42889
+42895
+42896
 42999
 43000
 43003
@@ -517,6 +519,8 @@ V878
 43256
 43259
 43260
+43261
+43262
 43274
 43302
 43312
@@ -685,6 +689,10 @@ V878
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -737,10 +745,22 @@ V878
 70085
 70106
 70107
+70108
+70109
 70144
 70162
 70163
 70188
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70367
 70405
@@ -757,6 +777,8 @@ V878
 70458
 70461
 70462
+70480
+70481
 70493
 70498
 70784
@@ -767,22 +789,30 @@ V878
 70856
 71040
 71087
+71128
+71132
 71168
 71216
 71236
 71237
 71296
 71339
+71424
+71450
 71935
 71936
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -887,6 +917,8 @@ V878
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/LO.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/LO.pl
index cb65b6a20de..1ddbdc472fd 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/LO.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/LO.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1264
+V1272
 97
 123
 170
@@ -559,6 +559,8 @@ V1264
 1328
 1377
 1416
+5112
+5118
 7424
 7616
 7681
@@ -1201,14 +1203,18 @@ V1264
 42920
 42921
 42922
+42933
+42934
+42935
+42936
 43000
 43003
 43824
 43867
 43868
-43872
-43876
 43878
+43888
+43968
 64256
 64263
 64275
@@ -1217,6 +1223,8 @@ V1264
 65371
 66600
 66640
+68800
+68851
 71872
 71904
 119834
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/NU.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/NU.pl
index c1e9cefc8c0..d9842e8ec48 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/NU.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/NU.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V100
+V102
 48
 58
 1632
@@ -103,6 +103,8 @@ V100
 71258
 71360
 71370
+71472
+71482
 71904
 71914
 92768
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/SC.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/SC.pl
index d08ca6cec10..96234999974 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/SC.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/SC.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/ST.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/ST.pl
index 354481be454..de0e1668e6f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/ST.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/ST.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V114
+V122
 33
 34
 63
@@ -105,16 +105,22 @@ V114
 70087
 70093
 70094
+70110
+70112
 70200
 70202
 70203
 70205
+70313
+70314
 71106
 71108
 71113
-71114
+71128
 71233
 71235
+71484
+71487
 92782
 92784
 92917
@@ -125,4 +131,6 @@ V114
 92997
 113823
 113824
+121480
+121481
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/Sp.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/Sp.pl
index 0c28119034b..6ee5c398ba3 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/Sp.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/Sp.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/UP.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/UP.pl
index d3b7e351176..3a70e66977b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/UP.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/UP.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1260
+V1266
 65
 91
 192
@@ -561,6 +561,8 @@ V1260
 4296
 4301
 4302
+5024
+5110
 7680
 7681
 7682
@@ -1196,11 +1198,15 @@ V1260
 42922
 42926
 42928
-42930
+42933
+42934
+42935
 65313
 65339
 66560
 66600
+68736
+68787
 71840
 71872
 119808
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SB/XX.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SB/XX.pl
index 42b4edc4bfe..c3489b75f2b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SB/XX.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SB/XX.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1395
+V1447
 0
 9
 14
@@ -137,8 +137,8 @@ V1395
 2112
 2140
 2208
-2227
-2276
+2229
+2275
 2416
 2417
 2436
@@ -226,6 +226,8 @@ V1395
 2788
 2790
 2800
+2809
+2810
 2817
 2820
 2821
@@ -307,7 +309,7 @@ V1395
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -356,7 +358,7 @@ V1395
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3440
@@ -503,7 +505,9 @@ V1395
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5742
@@ -803,7 +807,7 @@ V1395
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -817,8 +821,6 @@ V1395
 42612
 42622
 42623
-42654
-42655
 42738
 42739
 42740
@@ -829,11 +831,9 @@ V1395
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43048
 43072
@@ -848,6 +848,8 @@ V1395
 43256
 43259
 43260
+43261
+43262
 43264
 43310
 43311
@@ -889,10 +891,8 @@ V1395
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44014
 44016
 44026
@@ -939,7 +939,7 @@ V1395
 65047
 65049
 65056
-65070
+65072
 65073
 65075
 65077
@@ -1058,6 +1058,10 @@ V1395
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -1100,6 +1104,10 @@ V1395
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69632
 69705
 69734
@@ -1124,21 +1132,35 @@ V1395
 70007
 70016
 70087
-70093
+70090
 70094
 70096
 70107
+70108
+70109
+70110
+70112
 70144
 70162
 70163
 70202
 70203
 70205
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70314
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -1158,6 +1180,8 @@ V1395
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -1179,7 +1203,7 @@ V1395
 71106
 71108
 71113
-71114
+71134
 71168
 71235
 71236
@@ -1190,6 +1214,14 @@ V1395
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71482
+71484
+71487
 71840
 71914
 71935
@@ -1197,11 +1229,15 @@ V1395
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1314,6 +1350,20 @@ V1395
 120780
 120782
 120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121480
+121481
+121499
+121504
+121505
+121520
 124928
 125125
 125136
@@ -1398,6 +1448,8 @@ V1395
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917505
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/SD/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/SD/Y.pl
index c9f18e79132..42337b7c982 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/SD/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/SD/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/STerm/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/STerm/Y.pl
index 9806c5baab1..b6ff0239a14 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/STerm/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/STerm/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V120
+V128
 33
 34
 46
@@ -111,16 +111,22 @@ V120
 70087
 70093
 70094
+70110
+70112
 70200
 70202
 70203
 70205
+70313
+70314
 71106
 71108
 71113
-71114
+71128
 71233
 71235
+71484
+71487
 92782
 92784
 92917
@@ -131,4 +137,6 @@ V120
 92997
 113823
 113824
+121480
+121481
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Arab.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Arab.pl
index 58ed81afc8c..7fd74ca15a1 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Arab.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Arab.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V110
+V108
 1536
 1541
 1542
@@ -24,8 +24,6 @@ V110
 1601
 1611
 1622
-1632
-1642
 1648
 1649
 1757
@@ -34,8 +32,8 @@ V110
 1872
 1920
 2208
-2227
-2276
+2229
+2275
 2304
 64336
 64450
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Armn.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Armn.pl
index ae361ce0eea..f5ddbf7c0ee 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Armn.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Armn.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Beng.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Beng.pl
index 6b3bc083b9e..0a9c1113ab2 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Beng.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Beng.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cham.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cham.pl
index c96298a4a61..e7518b6a952 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cham.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cham.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cprt.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cprt.pl
index 4935f29f6a4..fe1b430f2d9 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cprt.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cprt.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cyrl.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cyrl.pl
index b78fdf7a31c..79b9dea2785 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cyrl.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Cyrl.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -22,7 +22,7 @@ V14
 11744
 11776
 42560
-42654
-42655
 42656
+65070
+65072
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Deva.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Deva.pl
index e521c22de47..39a21528edd 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Deva.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Deva.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -18,5 +18,5 @@ V8
 2406
 2432
 43232
-43260
+43262
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Dupl.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Dupl.pl
index 5145472d20e..2f406552f58 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Dupl.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Dupl.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Ethi.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Ethi.pl
index 297a64aa732..f5ebba96699 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Ethi.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Ethi.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Geor.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Geor.pl
index e3bdda51f0f..357bbc2ece9 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Geor.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Geor.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Gran.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Gran.pl
index 9b2b436771b..530372a36b0 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Gran.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Gran.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

@@ -10,8 +10,8 @@
 

 

 return <<'END';

-V28

-70401

+V30

+70400

 70404

 70405

 70413

@@ -31,6 +31,8 @@ V28
 70473

 70475

 70478

+70480

+70481

 70487

 70488

 70493

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Grek.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Grek.pl
index 64a9c91945d..9df5a45abcd 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Grek.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Grek.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Gujr.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Gujr.pl
index 763a0aed93a..17e7df4c451 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Gujr.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Gujr.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V26
+V28
 2689
 2692
 2693
@@ -37,4 +37,6 @@ V26
 2788
 2790
 2802
+2809
+2810
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Guru.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Guru.pl
index e222e33c6a1..1679f631944 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Guru.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Guru.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Han.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Han.pl
index a63f6ae0741..07d02b47270 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Han.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Han.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V30
+V32
 11904
 11930
 11931
@@ -28,7 +28,7 @@ V30
 13312
 19894
 19968
-40909
+40918
 63744
 64110
 64112
@@ -39,6 +39,8 @@ V30
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hang.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hang.pl
index 38e6bc4ed39..b036201cf2e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hang.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hang.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hebr.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hebr.pl
index 48d1f15dd19..28ff666ac60 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hebr.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hebr.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hira.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hira.pl
index ff8a4ed9fa9..8e8c1f7e95b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hira.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hira.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hmng.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hmng.pl
index cda56e326f1..f99eeee86d9 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hmng.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Hmng.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Kana.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Kana.pl
index 691c5369d47..50577164343 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Kana.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Kana.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Khar.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Khar.pl
index c317579ad89..4e67b5c3f1d 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Khar.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Khar.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Khmr.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Khmr.pl
index 2574a234c95..ed8f1d6e7f2 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Khmr.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Khmr.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Knda.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Knda.pl
index 100af360564..a190a1f908e 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Knda.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Knda.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Lana.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Lana.pl
index 2845e59c3fc..7fb3582e93c 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Lana.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Lana.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Lao.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Lao.pl
index 134e6cc2dd5..34629efcdcd 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Lao.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Lao.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Latn.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Latn.pl
index d4f7fa5b2f2..f181635c21e 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Latn.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Latn.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V66
+V62
 65
 91
 97
@@ -58,18 +58,14 @@ V66
 42786
 42888
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43008
 43824
 43867
 43868
-43872
-43876
 43877
 64256
 64263
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Limb.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Limb.pl
index 361bcfa70b4..ce965b1631e 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Limb.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Limb.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Linb.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Linb.pl
index 59fc63a4ab0..fa904e789f4 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Linb.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Linb.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Mlym.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Mlym.pl
index b325b80c413..ae0de9ec14c 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Mlym.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Mlym.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -27,7 +27,7 @@ V22
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3446
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Mong.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Mong.pl
index bf23434294c..83f48f712fb 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Mong.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Mong.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Mult.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Mult.pl
new file mode 100644
index 00000000000..0a34803d5c1
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Mult.pl
@@ -0,0 +1,24 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V10

+70272

+70279

+70280

+70281

+70282

+70286

+70287

+70302

+70303

+70314

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Orya.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Orya.pl
index b80976a53b3..3d93608b2b7 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Orya.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Orya.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Sinh.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Sinh.pl
index 6a5b7b4a983..29ca114f91e 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Sinh.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Sinh.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Talu.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Talu.pl
index 53b66bb2aef..fc263725280 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Talu.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Talu.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Taml.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Taml.pl
index 962ff155a16..36309ad0827 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Taml.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Taml.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Telu.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Telu.pl
index 9fb2001bd1a..23831b1830b 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Telu.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Telu.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -30,7 +30,7 @@ V26
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Tibt.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Tibt.pl
index f1bd95e2ab3..30cfa8b9fab 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Tibt.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Tibt.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Xsux.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Xsux.pl
new file mode 100644
index 00000000000..3148b29eba8
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Xsux.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+73728

+74650

+74752

+74863

+74864

+74869

+74880

+75076

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zinh.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zinh.pl
index f1d33f70cf6..5dc0d74ea64 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zinh.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zinh.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zyyy.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zyyy.pl
index 6f250f4030b..a32626b2747 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zyyy.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zyyy.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V330
+V322
 0
 65
 91
@@ -51,8 +51,6 @@ V330
 1568
 1600
 1601
-1632
-1642
 1757
 1758
 2404
@@ -92,7 +90,7 @@ V330
 8320
 8335
 8352
-8382
+8383
 8448
 8486
 8487
@@ -104,7 +102,7 @@ V330
 8527
 8544
 8585
-8586
+8588
 8592
 9211
 9216
@@ -123,6 +121,8 @@ V330
 11209
 11210
 11218
+11244
+11248
 11776
 11843
 12272
@@ -222,7 +222,7 @@ V330
 119180
 119210
 119214
-119262
+119273
 119552
 119639
 119648
@@ -300,25 +300,11 @@ V330
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -337,6 +323,12 @@ V330
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 917505
 917506
 917536
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zzzz.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zzzz.pl
index e66f7919ad2..f9d0e54c1f7 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zzzz.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Sc/Zzzz.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1195
+V1221
 888
 890
 896
@@ -57,8 +57,8 @@ V1195
 2142
 2143
 2208
-2227
-2276
+2229
+2275
 2436
 2437
 2445
@@ -144,6 +144,8 @@ V1195
 2788
 2790
 2802
+2809
+2810
 2817
 2820
 2821
@@ -223,7 +225,7 @@ V1195
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -274,7 +276,7 @@ V1195
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3446
@@ -399,7 +401,9 @@ V1195
 4992
 5018
 5024
-5109
+5110
+5112
+5118
 5120
 5789
 5792
@@ -527,11 +531,11 @@ V1195
 8336
 8349
 8352
-8382
+8383
 8400
 8433
 8448
-8586
+8588
 8592
 9211
 9216
@@ -548,6 +552,8 @@ V1195
 11209
 11210
 11218
+11244
+11248
 11264
 11311
 11312
@@ -613,7 +619,7 @@ V1195
 13056
 19894
 19904
-40909
+40918
 40960
 42125
 42128
@@ -621,15 +627,11 @@ V1195
 42192
 42540
 42560
-42654
-42655
 42744
 42752
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43052
 43056
@@ -641,7 +643,7 @@ V1195
 43214
 43226
 43232
-43260
+43262
 43264
 43348
 43359
@@ -673,10 +675,8 @@ V1195
 43816
 43823
 43824
-43872
-43876
 43878
-43968
+43888
 44014
 44016
 44026
@@ -717,8 +717,6 @@ V1195
 65024
 65050
 65056
-65070
-65072
 65107
 65108
 65127
@@ -822,7 +820,11 @@ V1195
 67743
 67751
 67760
-67840
+67808
+67827
+67828
+67830
+67835
 67868
 67871
 67898
@@ -830,9 +832,9 @@ V1195
 67904
 67968
 68024
-68030
-68032
-68096
+68028
+68048
+68050
 68100
 68101
 68103
@@ -868,6 +870,12 @@ V1195
 68528
 68608
 68681
+68736
+68787
+68800
+68851
+68858
+68864
 69216
 69247
 69632
@@ -887,22 +895,30 @@ V1195
 69968
 70007
 70016
-70089
-70093
 70094
 70096
-70107
+70112
 70113
 70133
 70144
 70162
 70163
 70206
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70314
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -922,6 +938,8 @@ V1195
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -937,7 +955,7 @@ V1195
 71040
 71094
 71096
-71114
+71134
 71168
 71237
 71248
@@ -946,6 +964,12 @@ V1195
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71488
 71840
 71923
 71935
@@ -953,13 +977,17 @@ V1195
 72384
 72441
 73728
-74649
+74650
 74752
 74863
 74864
 74869
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1005,7 +1033,7 @@ V1195
 119040
 119079
 119081
-119262
+119273
 119296
 119366
 119552
@@ -1053,7 +1081,11 @@ V1195
 120488
 120780
 120782
-120832
+121484
+121499
+121504
+121505
+121520
 124928
 125125
 125127
@@ -1155,25 +1187,11 @@ V1195
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -1192,12 +1210,20 @@ V1195
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 131072
 173783
 173824
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917505
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Arab.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Arab.pl
index ea9000ae897..3f3fb5eb89f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Arab.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Arab.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -22,8 +22,8 @@ V100
 1872
 1920
 2208
-2227
-2276
+2229
+2275
 2304
 64336
 64450
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Armn.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Armn.pl
index 2491f3282bf..2c9c409c4c5 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Armn.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Armn.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Beng.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Beng.pl
index 556b58e9872..1e0a2158b3e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Beng.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Beng.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,9 @@
 
 
 return <<'END';
-V30
+V32
+2385
+2387
 2404
 2406
 2432
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Bopo.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Bopo.pl
index 9717f214b59..acf36efb558 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Bopo.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Bopo.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cakm.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cakm.pl
index c334146961b..91f9df9c740 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cakm.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cakm.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Copt.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Copt.pl
index 9a37b0ad221..ffb1abc1c20 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Copt.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Copt.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cprt.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cprt.pl
index 13495d1217f..b59ec01d39d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cprt.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cprt.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cyrl.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cyrl.pl
index d224d71ff10..365f2424c34 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cyrl.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Cyrl.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -20,7 +20,7 @@ V12
 11744
 11776
 42560
-42654
-42655
 42656
+65070
+65072
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Deva.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Deva.pl
index 8cd756950c3..9ac6c332d11 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Deva.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Deva.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,21 +10,17 @@
 
 
 return <<'END';
-V16
+V12
 2304
 2432
 7376
-7379
-7380
-7401
-7405
-7406
-7410
-7413
+7415
 7416
 7418
+8432
+8433
 43056
 43066
 43232
-43260
+43262
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Dupl.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Dupl.pl
index 9c39559ee94..1c3476484b4 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Dupl.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Dupl.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Geor.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Geor.pl
index 32c002e7229..3d75f151f59 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Geor.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Geor.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Glag.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Glag.pl
new file mode 100644
index 00000000000..33dbaf2b4db
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Glag.pl
@@ -0,0 +1,22 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V8

+1159

+1160

+11264

+11311

+11312

+11359

+42607

+42608

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Gran.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Gran.pl
index 6c14f33e763..71711460f45 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Gran.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Gran.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

@@ -10,10 +10,28 @@
 

 

 return <<'END';

-V30

+V50

+2385

+2387

 2404

 2406

-70401

+2986

+2987

+2997

+2998

+3046

+3059

+7376

+7377

+7378

+7380

+7410

+7413

+7416

+7418

+8432

+8433

+70400

 70404

 70405

 70413

@@ -33,6 +51,8 @@ V30
 70473

 70475

 70478

+70480

+70481

 70487

 70488

 70493

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Grek.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Grek.pl
index 4f6300f43d1..cadd89684fa 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Grek.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Grek.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Gujr.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Gujr.pl
index ce4c82ffd0b..a6c70f2b8ea 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Gujr.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Gujr.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,9 @@
 
 
 return <<'END';
-V30
+V34
+2385
+2387
 2404
 2406
 2689
@@ -39,6 +41,8 @@ V30
 2788
 2790
 2802
+2809
+2810
 43056
 43066
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Guru.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Guru.pl
index fa34594ed9e..57e8cd1bacb 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Guru.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Guru.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,9 @@
 
 
 return <<'END';
-V36
+V38
+2385
+2387
 2404
 2406
 2561
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Han.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Han.pl
index faa91ab70c9..1ce7b3eca6b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Han.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Han.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V56
+V60
 11904
 11930
 11931
@@ -50,7 +50,7 @@ V56
 13312
 19894
 19968
-40909
+40918
 63744
 64110
 64112
@@ -59,12 +59,16 @@ V56
 65095
 65377
 65382
+119648
+119666
 131072
 173783
 173824
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Hang.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Hang.pl
index 1f3f7e1c77e..2c802b91c38 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Hang.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Hang.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Hira.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Hira.pl
index 119d68637cb..c3b59df0ffa 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Hira.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Hira.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Kana.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Kana.pl
index 34e019c41bd..928249685b1 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Kana.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Kana.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Knda.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Knda.pl
index e4e942adde8..d9f825ebe39 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Knda.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Knda.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

@@ -10,7 +10,9 @@
 

 

 return <<'END';

-V30

+V36

+2385

+2387

 2404

 2406

 3201

@@ -41,4 +43,8 @@ V30
 3312

 3313

 3315

+7386

+7387

+7413

+7414

 END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Latn.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Latn.pl
index 0c96d567c18..983c23dc4b7 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Latn.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Latn.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V74
+V72
 65
 91
 97
@@ -51,6 +51,8 @@ V74
 8320
 8336
 8349
+8432
+8433
 8490
 8492
 8498
@@ -64,11 +66,9 @@ V74
 42786
 42888
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43008
 43310
@@ -76,8 +76,6 @@ V74
 43824
 43867
 43868
-43872
-43876
 43877
 64256
 64263
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Limb.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Limb.pl
index 1157faaa405..2e0b2d6f36f 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Limb.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Limb.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Linb.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Linb.pl
index 18eb2eeaad5..50e1b1eb390 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Linb.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Linb.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mlym.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mlym.pl
index 51b43ff4d41..f0d04883b7c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mlym.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mlym.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

@@ -10,7 +10,9 @@
 

 

 return <<'END';

-V24

+V28

+2385

+2387

 2404

 2406

 3329

@@ -29,10 +31,12 @@ V24
 3407

 3415

 3416

-3424

+3423

 3428

 3430

 3446

 3449

 3456

+7386

+7387

 END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mong.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mong.pl
index 814c10f3f7e..59d142da766 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mong.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mong.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mult.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mult.pl
new file mode 100644
index 00000000000..5badb9447b5
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mult.pl
@@ -0,0 +1,26 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V12

+2662

+2672

+70272

+70279

+70280

+70281

+70282

+70286

+70287

+70302

+70303

+70314

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mymr.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mymr.pl
index ae06b65890f..7e001c2b2cb 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mymr.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Mymr.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Orya.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Orya.pl
index d3946dad7b9..84b6be2f8fe 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Orya.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Orya.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,9 @@
 
 
 return <<'END';
-V30
+V32
+2385
+2387
 2404
 2406
 2817
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Phlp.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Phlp.pl
index f26090b4bd0..0597ba70ff6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Phlp.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Phlp.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Shrd.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Shrd.pl
new file mode 100644
index 00000000000..b5ce60f008a
--- /dev/null
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Shrd.pl
@@ -0,0 +1,28 @@
+# !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

+

+# !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

+# This file is for internal use by core Perl only.  The format and even the

+# name or existence of this file are subject to change without notice.  Don't

+# use it directly.  Use Unicode::UCD to access the Unicode character data

+# base.

+

+

+return <<'END';

+V14

+2385

+2386

+7383

+7384

+7385

+7386

+7388

+7390

+7392

+7393

+70016

+70094

+70096

+70112

+END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Sind.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Sind.pl
index 6bdb3727343..6f6aa2da698 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Sind.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Sind.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Sinh.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Sinh.pl
index bf0a6e32bbd..a4236f5ec54 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Sinh.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Sinh.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Syrc.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Syrc.pl
index 070fa39a7ed..38e46d7427d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Syrc.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Syrc.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Tagb.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Tagb.pl
index 94d7b5d69c9..f6ac8a2700c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Tagb.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Tagb.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Takr.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Takr.pl
index 8c9e91e28af..8d1cb87d209 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Takr.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Takr.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Taml.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Taml.pl
index 3a88f7449e5..be1db023caa 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Taml.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Taml.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

@@ -10,7 +10,9 @@
 

 

 return <<'END';

-V34

+V40

+2385

+2387

 2404

 2406

 2946

@@ -45,4 +47,8 @@ V34
 3032

 3046

 3067

+7386

+7387

+43251

+43252

 END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Telu.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Telu.pl
index 2befa92b214..65aabdaab7c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Telu.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Telu.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

@@ -10,7 +10,9 @@
 

 

 return <<'END';

-V28

+V32

+2385

+2387

 2404

 2406

 3072

@@ -32,11 +34,13 @@ V28
 3157

 3159

 3160

-3162

+3163

 3168

 3172

 3174

 3184

 3192

 3200

+7386

+7387

 END

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Thaa.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Thaa.pl
index 1be24fbd678..b52587f102c 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Thaa.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Thaa.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Tirh.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Tirh.pl
index 4022a9bb987..31344c4fd22 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Tirh.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Tirh.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Yi.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Yi.pl
index d71b8843965..de3ca5df84b 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Yi.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Yi.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Zinh.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Zinh.pl
index 5beb71521d1..aa7a27a3a6d 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Zinh.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Zinh.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -26,7 +26,7 @@ V32
 8204
 8206
 8400
-8433
+8432
 65024
 65040
 65056
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Zyyy.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Zyyy.pl
index 252c1447482..898780b793e 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Zyyy.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Scx/Zyyy.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V290
+V274
 0
 65
 91
@@ -53,14 +53,6 @@ V290
 4348
 5867
 5870
-7379
-7380
-7401
-7405
-7406
-7410
-7413
-7415
 8192
 8204
 8206
@@ -72,7 +64,7 @@ V290
 8320
 8335
 8352
-8382
+8383
 8448
 8486
 8487
@@ -84,7 +76,7 @@ V290
 8527
 8544
 8585
-8586
+8588
 8592
 9211
 9216
@@ -103,6 +95,8 @@ V290
 11209
 11210
 11218
+11244
+11248
 11776
 11843
 12272
@@ -182,11 +176,9 @@ V290
 119180
 119210
 119214
-119262
+119273
 119552
 119639
-119648
-119666
 119808
 119893
 119894
@@ -260,25 +252,11 @@ V290
 127568
 127570
 127744
-127789
-127792
-127870
-127872
-127951
-127956
-127992
-128000
-128255
-128256
-128331
-128336
 128378
 128379
 128420
 128421
-128579
-128581
-128720
+128721
 128736
 128749
 128752
@@ -297,6 +275,12 @@ V290
 129160
 129168
 129198
+129296
+129305
+129408
+129413
+129472
+129473
 917505
 917506
 917536
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Term/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Term/Y.pl
index d15d7cd36ae..b646b5a69c8 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Term/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Term/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V172
+V180
 33
 34
 44
@@ -163,14 +163,20 @@ V172
 70087
 70093
 70094
+70110
+70112
 70200
 70205
+70313
+70314
 71106
 71110
 71113
-71114
+71128
 71233
 71235
+71484
+71487
 74864
 74869
 92782
@@ -183,4 +189,6 @@ V172
 92997
 113823
 113824
+121479
+121483
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/UIdeo/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/UIdeo/Y.pl
index 27374e9d28b..a55acbd1dd3 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/UIdeo/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/UIdeo/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,11 +10,11 @@
 
 
 return <<'END';
-V24
+V26
 13312
 19894
 19968
-40909
+40918
 64014
 64016
 64017
@@ -35,4 +35,6 @@ V24
 177973
 177984
 178206
+178208
+183970
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/Upper/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/Upper/Y.pl
index 387e4bba837..c3f79df7a01 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/Upper/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/Upper/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1254
+V1260
 65
 91
 192
@@ -561,6 +561,8 @@ V1254
 4296
 4301
 4302
+5024
+5110
 7680
 7681
 7682
@@ -1190,11 +1192,15 @@ V1254
 42922
 42926
 42928
-42930
+42933
+42934
+42935
 65313
 65339
 66560
 66600
+68736
+68787
 71840
 71872
 119808
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/WB/EX.pl b/Master/tlpkg/tlperl/lib/unicore/lib/WB/EX.pl
index 637d2bdce64..dffa6f19481 100755
--- a/Master/tlpkg/tlperl/lib/unicore/lib/WB/EX.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/WB/EX.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/WB/FO.pl b/Master/tlpkg/tlperl/lib/unicore/lib/WB/FO.pl
index 2a5d13f91cc..3b2153caef6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/WB/FO.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/WB/FO.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/WB/HL.pl b/Master/tlpkg/tlperl/lib/unicore/lib/WB/HL.pl
index fcce9879f66..d3daf3d1f43 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/WB/HL.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/WB/HL.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!

-# This file is machine-generated by mktables from the Unicode

-# database, Version 7.0.0.  Any changes made here will be lost!

+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode

+# database, Version 8.0.0.  Any changes made here will be lost!

 

 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!

 # This file is for internal use by core Perl only.  The format and even the

diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/WB/KA.pl b/Master/tlpkg/tlperl/lib/unicore/lib/WB/KA.pl
index 8a42963f504..2fbea634f23 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/WB/KA.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/WB/KA.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/WB/LE.pl b/Master/tlpkg/tlperl/lib/unicore/lib/WB/LE.pl
index bf9805dd9d3..a03304cdfa6 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/WB/LE.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/WB/LE.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V940
+V970
 65
 91
 97
@@ -106,7 +106,7 @@ V940
 2112
 2137
 2208
-2227
+2229
 2308
 2362
 2365
@@ -177,6 +177,8 @@ V940
 2769
 2784
 2786
+2809
+2810
 2821
 2829
 2831
@@ -230,7 +232,7 @@ V940
 3133
 3134
 3160
-3162
+3163
 3168
 3170
 3205
@@ -261,7 +263,7 @@ V940
 3390
 3406
 3407
-3424
+3423
 3426
 3450
 3456
@@ -326,7 +328,9 @@ V940
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -530,11 +534,9 @@ V940
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43010
 43011
@@ -551,6 +553,8 @@ V940
 43256
 43259
 43260
+43261
+43262
 43274
 43302
 43312
@@ -584,10 +588,8 @@ V940
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44003
 44032
 55204
@@ -689,6 +691,10 @@ V940
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -723,6 +729,10 @@ V940
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69635
 69688
 69763
@@ -741,10 +751,22 @@ V940
 70085
 70106
 70107
+70108
+70109
 70144
 70162
 70163
 70188
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70367
 70405
@@ -761,6 +783,8 @@ V940
 70458
 70461
 70462
+70480
+70481
 70493
 70498
 70784
@@ -771,6 +795,8 @@ V940
 70856
 71040
 71087
+71128
+71132
 71168
 71216
 71236
@@ -784,11 +810,15 @@ V940
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/WB/MB.pl b/Master/tlpkg/tlperl/lib/unicore/lib/WB/MB.pl
index 3620075e7cc..8c2278e65ee 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/WB/MB.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/WB/MB.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/WB/ML.pl b/Master/tlpkg/tlperl/lib/unicore/lib/WB/ML.pl
index 5494270e98b..1adedf54916 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/WB/ML.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/WB/ML.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/WB/MN.pl b/Master/tlpkg/tlperl/lib/unicore/lib/WB/MN.pl
index dac75fd5a85..99ad4b50d04 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/WB/MN.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/WB/MN.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/WB/NU.pl b/Master/tlpkg/tlperl/lib/unicore/lib/WB/NU.pl
index 352c5a9bb0c..f340f4006ab 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/WB/NU.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/WB/NU.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V100
+V102
 48
 58
 1632
@@ -103,6 +103,8 @@ V100
 71258
 71360
 71370
+71472
+71482
 71904
 71914
 92768
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/WB/XX.pl b/Master/tlpkg/tlperl/lib/unicore/lib/WB/XX.pl
index 0884cc6e42c..a484a770128 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/WB/XX.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/WB/XX.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1299
+V1341
 0
 10
 14
@@ -135,8 +135,8 @@ V1299
 2112
 2140
 2208
-2227
-2276
+2229
+2275
 2404
 2406
 2416
@@ -226,6 +226,8 @@ V1299
 2788
 2790
 2800
+2809
+2810
 2817
 2820
 2821
@@ -307,7 +309,7 @@ V1299
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -356,7 +358,7 @@ V1299
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3440
@@ -491,7 +493,9 @@ V1299
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -540,10 +544,6 @@ V1299
 6460
 6470
 6480
-6576
-6593
-6600
-6602
 6608
 6618
 6656
@@ -753,19 +753,15 @@ V1299
 42612
 42622
 42623
-42654
-42655
 42738
 42775
 42784
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43048
 43072
@@ -778,6 +774,8 @@ V1299
 43256
 43259
 43260
+43261
+43262
 43264
 43310
 43312
@@ -827,10 +825,8 @@ V1299
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44011
 44012
 44014
@@ -873,7 +869,7 @@ V1299
 65043
 65045
 65056
-65070
+65072
 65075
 65077
 65101
@@ -982,6 +978,10 @@ V1299
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -1022,6 +1022,10 @@ V1299
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69632
 69703
 69734
@@ -1044,17 +1048,31 @@ V1299
 70007
 70016
 70085
+70090
+70093
 70096
 70107
+70108
+70109
 70144
 70162
 70163
 70200
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -1074,6 +1092,8 @@ V1299
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -1092,6 +1112,8 @@ V1299
 71094
 71096
 71105
+71128
+71134
 71168
 71233
 71236
@@ -1102,6 +1124,10 @@ V1299
 71352
 71360
 71370
+71453
+71468
+71472
+71482
 71840
 71914
 71935
@@ -1109,11 +1135,15 @@ V1299
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1226,6 +1256,18 @@ V1299
 120780
 120782
 120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 124928
 125125
 125136
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/XIDC/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/XIDC/Y.pl
index 43a9dce9781..43c15c8fd10 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/XIDC/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/XIDC/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1266
+V1316
 48
 58
 65
@@ -110,8 +110,8 @@ V1266
 2112
 2140
 2208
-2227
-2276
+2229
+2275
 2404
 2406
 2416
@@ -201,6 +201,8 @@ V1266
 2788
 2790
 2800
+2809
+2810
 2817
 2820
 2821
@@ -282,7 +284,7 @@ V1266
 3157
 3159
 3160
-3162
+3163
 3168
 3172
 3174
@@ -331,7 +333,7 @@ V1266
 3407
 3415
 3416
-3424
+3423
 3428
 3430
 3440
@@ -478,7 +480,9 @@ V1266
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -720,7 +724,7 @@ V1266
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -734,19 +738,15 @@ V1266
 42612
 42622
 42623
-42654
-42655
 42738
 42775
 42784
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43048
 43072
@@ -759,6 +759,8 @@ V1266
 43256
 43259
 43260
+43261
+43262
 43264
 43310
 43312
@@ -800,10 +802,8 @@ V1266
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44011
 44012
 44014
@@ -850,7 +850,7 @@ V1266
 65024
 65040
 65056
-65070
+65072
 65075
 65077
 65101
@@ -955,6 +955,10 @@ V1266
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -995,6 +999,10 @@ V1266
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69632
 69703
 69734
@@ -1015,17 +1023,31 @@ V1266
 70007
 70016
 70085
+70090
+70093
 70096
 70107
+70108
+70109
 70144
 70162
 70163
 70200
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70379
 70384
 70394
-70401
+70400
 70404
 70405
 70413
@@ -1045,6 +1067,8 @@ V1266
 70473
 70475
 70478
+70480
+70481
 70487
 70488
 70493
@@ -1063,6 +1087,8 @@ V1266
 71094
 71096
 71105
+71128
+71134
 71168
 71233
 71236
@@ -1073,6 +1099,12 @@ V1266
 71352
 71360
 71370
+71424
+71450
+71453
+71468
+71472
+71482
 71840
 71914
 71935
@@ -1080,11 +1112,15 @@ V1266
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1197,6 +1233,18 @@ V1266
 120780
 120782
 120832
+121344
+121399
+121403
+121453
+121461
+121462
+121476
+121477
+121499
+121504
+121505
+121520
 124928
 125125
 125136
@@ -1273,6 +1321,8 @@ V1266
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 917760
diff --git a/Master/tlpkg/tlperl/lib/unicore/lib/XIDS/Y.pl b/Master/tlpkg/tlperl/lib/unicore/lib/XIDS/Y.pl
index 580bfaecc41..46c5a473afb 100644
--- a/Master/tlpkg/tlperl/lib/unicore/lib/XIDS/Y.pl
+++ b/Master/tlpkg/tlperl/lib/unicore/lib/XIDS/Y.pl
@@ -1,6 +1,6 @@
 # !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
-# This file is machine-generated by mktables from the Unicode
-# database, Version 7.0.0.  Any changes made here will be lost!
+# This file is machine-generated by ..\lib\unicore\mktables from the Unicode
+# database, Version 8.0.0.  Any changes made here will be lost!
 
 # !!!!!!!   INTERNAL PERL USE ONLY   !!!!!!!
 # This file is for internal use by core Perl only.  The format and even the
@@ -10,7 +10,7 @@
 
 
 return <<'END';
-V1090
+V1124
 65
 91
 97
@@ -108,7 +108,7 @@ V1090
 2112
 2137
 2208
-2227
+2229
 2308
 2362
 2365
@@ -179,6 +179,8 @@ V1090
 2769
 2784
 2786
+2809
+2810
 2821
 2829
 2831
@@ -232,7 +234,7 @@ V1090
 3133
 3134
 3160
-3162
+3163
 3168
 3170
 3205
@@ -263,7 +265,7 @@ V1090
 3390
 3406
 3407
-3424
+3423
 3426
 3450
 3456
@@ -386,7 +388,9 @@ V1090
 4992
 5008
 5024
-5109
+5110
+5112
+5118
 5121
 5741
 5743
@@ -431,8 +435,8 @@ V1090
 6517
 6528
 6572
-6593
-6600
+6576
+6602
 6656
 6679
 6688
@@ -598,7 +602,7 @@ V1090
 13312
 19894
 19968
-40909
+40918
 40960
 42125
 42192
@@ -620,11 +624,9 @@ V1090
 42786
 42889
 42891
-42895
-42896
 42926
 42928
-42930
+42936
 42999
 43010
 43011
@@ -641,6 +643,8 @@ V1090
 43256
 43259
 43260
+43261
+43262
 43274
 43302
 43312
@@ -698,10 +702,8 @@ V1090
 43824
 43867
 43868
-43872
-43876
 43878
-43968
+43888
 44003
 44032
 55204
@@ -835,6 +837,10 @@ V1090
 67703
 67712
 67743
+67808
+67827
+67828
+67830
 67840
 67862
 67872
@@ -869,6 +875,10 @@ V1090
 68498
 68608
 68681
+68736
+68787
+68800
+68851
 69635
 69688
 69763
@@ -887,10 +897,22 @@ V1090
 70085
 70106
 70107
+70108
+70109
 70144
 70162
 70163
 70188
+70272
+70279
+70280
+70281
+70282
+70286
+70287
+70302
+70303
+70313
 70320
 70367
 70405
@@ -907,6 +929,8 @@ V1090
 70458
 70461
 70462
+70480
+70481
 70493
 70498
 70784
@@ -917,12 +941,16 @@ V1090
 70856
 71040
 71087
+71128
+71132
 71168
 71216
 71236
 71237
 71296
 71339
+71424
+71450
 71840
 71904
 71935
@@ -930,11 +958,15 @@ V1090
 72384
 72441
 73728
-74649
+74650
 74752
 74863
+74880
+75076
 77824
 78895
+82944
+83527
 92160
 92729
 92736
@@ -1099,6 +1131,8 @@ V1090
 177973
 177984
 178206
+178208
+183970
 194560
 195102
 END
diff --git a/Master/tlpkg/tlperl/lib/unicore/version b/Master/tlpkg/tlperl/lib/unicore/version
index 66ce77b7ead..ae9a76b9249 100644
--- a/Master/tlpkg/tlperl/lib/unicore/version
+++ b/Master/tlpkg/tlperl/lib/unicore/version
@@ -1 +1 @@
-7.0.0
+8.0.0
diff --git a/Master/tlpkg/tlperl/lib/utf8.pm b/Master/tlpkg/tlperl/lib/utf8.pm
index 23fbfac4a24..324cb87c869 100644
--- a/Master/tlpkg/tlperl/lib/utf8.pm
+++ b/Master/tlpkg/tlperl/lib/utf8.pm
@@ -2,7 +2,7 @@ package utf8;
 
 $utf8::hint_bits = 0x00800000;
 
-our $VERSION = '1.17';
+our $VERSION = '1.19';
 
 sub import {
     $^H |= $utf8::hint_bits;
@@ -47,8 +47,9 @@ utf8 - Perl pragma to enable/disable UTF-8 (or UTF-EBCDIC) in source code
  $unicode = utf8::native_to_unicode(ord('A')); # returns 65 on both
                                                # ASCII and EBCDIC
                                                # platforms
- $native = utf8::unicode_to_native(65);       # returns 65 on ASCII
-                                              # platforms; 193 on EBCDIC
+ $native = utf8::unicode_to_native(65);        # returns 65 on ASCII
+                                               # platforms; 193 on
+                                               # EBCDIC
 
  $flag = utf8::is_utf8($string); # since Perl 5.8.1
  $flag = utf8::valid($string);
@@ -56,9 +57,11 @@ utf8 - Perl pragma to enable/disable UTF-8 (or UTF-EBCDIC) in source code
 =head1 DESCRIPTION
 
 The C<use utf8> pragma tells the Perl parser to allow UTF-8 in the
-program text in the current lexical scope (allow UTF-EBCDIC on EBCDIC based
-platforms).  The C<no utf8> pragma tells Perl to switch back to treating
-the source text as literal bytes in the current lexical scope.
+program text in the current lexical scope.  The C<no utf8> pragma tells Perl
+to switch back to treating the source text as literal bytes in the current
+lexical scope.  (On EBCDIC platforms, technically it is allowing UTF-EBCDIC,
+and not UTF-8, but this distinction is academic, so in this document the term
+UTF-8 is used to mean both).
 
 B<Do not use this pragma for anything else than telling Perl that your
 script is written in UTF-8.> The utility functions described below are
@@ -69,9 +72,7 @@ encodings, you need either a Byte Order Mark at the beginning of your
 source code, or C<use utf8;>, to instruct perl.
 
 When UTF-8 becomes the standard source format, this pragma will
-effectively become a no-op.  For convenience in what follows the term
-I<UTF-X> is used to refer to UTF-8 on ASCII and ISO Latin based
-platforms and UTF-EBCDIC on EBCDIC based platforms.
+effectively become a no-op.
 
 See also the effects of the C<-C> switch and its cousin, the
 C<PERL_UNICODE> environment variable, in L<perlrun>.
@@ -82,22 +83,17 @@ Enabling the C<utf8> pragma has the following effect:
 
 =item *
 
-Bytes in the source text that have their high-bit set will be treated
-as being part of a literal UTF-X sequence.  This includes most
+Bytes in the source text that are not in the ASCII character set will be
+treated as being part of a literal UTF-8 sequence.  This includes most
 literals such as identifier names, string constants, and constant
 regular expression patterns.
 
-On EBCDIC platforms characters in the Latin 1 character set are
-treated as being part of a literal UTF-EBCDIC character.
-
 =back
 
-Note that if you have bytes with the eighth bit on in your script
-(for example embedded Latin-1 in your string literals), C<use utf8>
-will be unhappy since the bytes are most probably not well-formed
-UTF-X.  If you want to have such bytes under C<use utf8>, you can disable
-this pragma until the end the block (or file, if at top level) by
-C<no utf8;>.
+Note that if you have non-ASCII, non-UTF-8 bytes in your script (for example
+embedded Latin-1 in your string literals), C<use utf8> will be unhappy.  If
+you want to have such bytes under C<use utf8>, you can disable this pragma
+until the end the block (or file, if at top level) by C<no utf8;>.
 
 =head2 Utility functions
 
@@ -109,23 +105,24 @@ you should not say that unless you really want to have UTF-8 source code.
 
 =item * C<$num_octets = utf8::upgrade($string)>
 
+(Since Perl v5.8.0)
 Converts in-place the internal representation of the string from an octet
-sequence in the native encoding (Latin-1 or EBCDIC) to I<UTF-X>. The
+sequence in the native encoding (Latin-1 or EBCDIC) to UTF-8. The
 logical character sequence itself is unchanged.  If I<$string> is already
-stored as I<UTF-X>, then this is a no-op. Returns the
-number of octets necessary to represent the string as I<UTF-X>.  Can be
+stored as UTF-8, then this is a no-op. Returns the
+number of octets necessary to represent the string as UTF-8.  Can be
 used to make sure that the UTF-8 flag is on, so that C<\w> or C<lc()>
-work as Unicode on strings containing characters in the range 0x80-0xFF
-(on ASCII and derivatives).
+work as Unicode on strings containing non-ASCII characters whose code points
+are below 256.
 
-B<Note that this function does not handle arbitrary encodings.>
-Therefore Encode is recommended for the general purposes; see also
-L<Encode>.
+B<Note that this function does not handle arbitrary encodings>;
+use L<Encode> instead.
 
 =item * C<$success = utf8::downgrade($string[, $fail_ok])>
 
+(Since Perl v5.8.0)
 Converts in-place the internal representation of the string from
-I<UTF-X> to the equivalent octet sequence in the native encoding (Latin-1
+UTF-8 to the equivalent octet sequence in the native encoding (Latin-1
 or EBCDIC). The logical character sequence itself is unchanged. If
 I<$string> is already stored as native 8 bit, then this is a no-op.  Can
 be used to
@@ -133,56 +130,52 @@ make sure that the UTF-8 flag is off, e.g. when you want to make sure
 that the substr() or length() function works with the usually faster
 byte algorithm.
 
-Fails if the original I<UTF-X> sequence cannot be represented in the
+Fails if the original UTF-8 sequence cannot be represented in the
 native 8 bit encoding. On failure dies or, if the value of I<$fail_ok> is
 true, returns false. 
 
 Returns true on success.
 
-B<Note that this function does not handle arbitrary encodings.>
-Therefore Encode is recommended for the general purposes; see also
-L<Encode>.
+B<Note that this function does not handle arbitrary encodings>;
+use L<Encode> instead.
 
 =item * C<utf8::encode($string)>
 
+(Since Perl v5.8.0)
 Converts in-place the character sequence to the corresponding octet
-sequence in I<UTF-X>. That is, every (possibly wide) character gets
+sequence in UTF-8. That is, every (possibly wide) character gets
 replaced with a sequence of one or more characters that represent the
-individual I<UTF-X> bytes of the character.  The UTF8 flag is turned off.
+individual UTF-8 bytes of the character.  The UTF8 flag is turned off.
 Returns nothing.
 
  my $a = "\x{100}"; # $a contains one character, with ord 0x100
  utf8::encode($a);  # $a contains two characters, with ords (on
-                    # ASCII platforms) 0xc4 and 0x80
+                    # ASCII platforms) 0xc4 and 0x80.  On EBCDIC
+                    # 1047, this would instead be 0x8C and 0x41.
 
-B<Note that this function does not handle arbitrary encodings.>
-Therefore Encode is recommended for the general purposes; see also
-L<Encode>.
+B<Note that this function does not handle arbitrary encodings>;
+use L<Encode> instead.
 
 =item * C<$success = utf8::decode($string)>
 
-Attempts to convert in-place the octet sequence encoded as I<UTF-X> to the
+(Since Perl v5.8.0)
+Attempts to convert in-place the octet sequence encoded as UTF-8 to the
 corresponding character sequence. That is, it replaces each sequence of
-characters in the string whose ords represent a valid UTF-X byte
+characters in the string whose ords represent a valid UTF-8 byte
 sequence, with the corresponding single character.  The UTF-8 flag is
-turned on only if the source string contains multiple-byte I<UTF-X>
-characters.  If I<$string> is invalid as I<UTF-X>, returns false;
+turned on only if the source string contains multiple-byte UTF-8
+characters.  If I<$string> is invalid as UTF-8, returns false;
 otherwise returns true.
 
  my $a = "\xc4\x80"; # $a contains two characters, with ords
                      # 0xc4 and 0x80
  utf8::decode($a);   # On ASCII platforms, $a contains one char,
-                     # with ord 0x100.   On EBCDIC platforms, $a
-                     # is unchanged and the function returns FALSE.
-
-(C<"\xc4\x80"> is not a valid sequence of bytes in any UTF-8-encoded
-character(s) in the EBCDIC code pages that Perl supports, which is why the
-above example returns failure on them.  What does decode into C<\x{100}>
-depends on the platform.  It is C<"\x8C\x41"> in IBM-1047.)
+                     # with ord 0x100.   Since these bytes aren't
+                     # legal UTF-EBCDIC, on EBCDIC platforms, $a is
+                     # unchanged and the function returns FALSE.
 
-B<Note that this function does not handle arbitrary encodings.>
-Therefore Encode is recommended for the general purposes; see also
-L<Encode>.
+B<Note that this function does not handle arbitrary encodings>;
+use L<Encode> instead.
 
 =item * C<$unicode = utf8::native_to_unicode($code_point)>
 
@@ -215,7 +208,7 @@ platforms, so there is no performance hit in using it there.
 =item * C<$flag = utf8::is_utf8($string)>
 
 (Since Perl 5.8.1)  Test whether I<$string> is marked internally as encoded in
-UTF-8.  Functionally the same as Encode::is_utf8().
+UTF-8.  Functionally the same as C<Encode::is_utf8()>.
 
 =item * C<$flag = utf8::valid($string)>
 
@@ -224,32 +217,26 @@ UTF-8.  Will return true if it is well-formed UTF-8 and has the UTF-8 flag
 on B<or> if I<$string> is held as bytes (both these states are 'consistent').
 Main reason for this routine is to allow Perl's test suite to check
 that operations have left strings in a consistent state.  You most
-probably want to use utf8::is_utf8() instead.
+probably want to use C<utf8::is_utf8()> instead.
 
 =back
 
 C<utf8::encode> is like C<utf8::upgrade>, but the UTF8 flag is
-cleared.  See L<perlunicode> for more on the UTF8 flag and the C API
-functions C<sv_utf8_upgrade>, C<sv_utf8_downgrade>, C<sv_utf8_encode>,
-and C<sv_utf8_decode>, which are wrapped by the Perl functions
+cleared.  See L<perlunicode>, and the C API
+functions C<L<sv_utf8_upgrade|perlapi/sv_utf8_upgrade>>,
+C<L<perlapi/sv_utf8_downgrade>>, C<L<perlapi/sv_utf8_encode>>,
+and C<L<perlapi/sv_utf8_decode>>, which are wrapped by the Perl functions
 C<utf8::upgrade>, C<utf8::downgrade>, C<utf8::encode> and
-C<utf8::decode>.  Also, the functions utf8::is_utf8, utf8::valid,
-utf8::encode, utf8::decode, utf8::upgrade, and utf8::downgrade are
+C<utf8::decode>.  Also, the functions C<utf8::is_utf8>, C<utf8::valid>,
+C<utf8::encode>, C<utf8::decode>, C<utf8::upgrade>, and C<utf8::downgrade> are
 actually internal, and thus always available, without a C<require utf8>
 statement.
 
 =head1 BUGS
 
-One can have Unicode in identifier names, but not in package/class or
-subroutine names.  While some limited functionality towards this does
-exist as of Perl 5.8.0, that is more accidental than designed; use of
-Unicode for the said purposes is unsupported.
-
-One reason of this unfinishedness is its (currently) inherent
-unportability: since both package names and subroutine names may need
-to be mapped to file and directory names, the Unicode capability of
-the filesystem becomes important-- and there unfortunately aren't
-portable answers.
+Some filesystems may not support UTF-8 file names, or they may be supported
+incompatibly with Perl.  Therefore UTF-8 names that are visible to the
+filesystem, such as module names may not work.
 
 =head1 SEE ALSO
 
diff --git a/Master/tlpkg/tlperl/lib/utf8_heavy.pl b/Master/tlpkg/tlperl/lib/utf8_heavy.pl
index e0c3d5ed636..66c968aa504 100644
--- a/Master/tlpkg/tlperl/lib/utf8_heavy.pl
+++ b/Master/tlpkg/tlperl/lib/utf8_heavy.pl
@@ -20,7 +20,7 @@ sub _loose_name ($) {
     # out blanks, underscores and dashes.  The complication stems from the
     # grandfathered-in 'L_', which retains a single trailing underscore.
 
-    my $loose = $_[0] =~ s/[-\s_]//rg;
+    (my $loose = $_[0]) =~ s/[-_ \t]//g;
 
     return $loose if $loose !~ / ^ (?: is | to )? l $/x;
     return 'l_' if $_[0] =~ / l .* _ /x;    # If original had a trailing '_'
@@ -62,7 +62,7 @@ sub _loose_name ($) {
         ##     op.c:pmtrans             -- for tr/// and y///
         ##     regexec.c:regclass_swash -- for /[]/, \p, and \P
         ##     utf8.c:is_utf8_common    -- for common Unicode properties
-        ##     utf8.c:to_utf8_case      -- for lc, uc, ucfirst, etc. and //i
+        ##     utf8.c:S__to_utf8_case   -- for lc, uc, ucfirst, etc. and //i
         ##     Unicode::UCD::prop_invlist
         ##     Unicode::UCD::prop_invmap
         ##
@@ -226,7 +226,7 @@ sub _loose_name ($) {
 
                     # If the rhs looks like it is a number...
                     print STDERR __LINE__, ": table=$table\n" if DEBUG;
-                    if ($table =~ qr{ ^ [ \s 0-9 _  + / . -]+ $ }x) {
+                    if ($table =~ m{ ^ [ \s 0-9 _  + / . -]+ $ }x) {
                         print STDERR __LINE__, ": table=$table\n" if DEBUG;
 
                         # Don't allow leading nor trailing slashes 
@@ -236,7 +236,7 @@ sub _loose_name ($) {
                         }
 
                         # Split on slash, in case it is a rational, like \p{1/5}
-                        my @parts = split qr{ \s* / \s* }x, $table, -1;
+                        my @parts = split m{ \s* / \s* }x, $table, -1;
                         print __LINE__, ": $type\n" if @parts > 2 && DEBUG;
 
                         # Can have maximum of one slash
@@ -289,8 +289,8 @@ sub _loose_name ($) {
                             if ($parts[1] =~ s/^-//) {
 
                                 # If numerator is also negative, convert the
-                                # whole thing to positive, or move the minus to
-                                # the numerator
+                                # whole thing to positive, else move the minus
+                                # to the numerator
                                 if ($parts[0] !~ s/^-//) {
                                     $parts[0] = '-' . $parts[0];
                                 }
@@ -404,7 +404,11 @@ sub _loose_name ($) {
                 # If didn't find it, try again with looser matching by editing
                 # out the applicable characters on the rhs and looking up
                 # again.
+                my $strict_property_and_table;
                 if (! defined $file) {
+
+                    # This isn't used unless the name begins with 'to'
+                    $strict_property_and_table = $property_and_table =~  s/^to//r;
                     $table = _loose_name($table);
                     $property_and_table = "$prefix$table";
                     print STDERR __LINE__, ": $property_and_table\n" if DEBUG;
@@ -443,61 +447,51 @@ sub _loose_name ($) {
                 ## is to use Unicode::UCD.
                 ##
                 # Only check if caller wants non-binary
-                my $retried = 0;
-                if ($minbits != 1 && $property_and_table =~ s/^to//) {{
+                if ($minbits != 1) {
+                    if ($property_and_table =~ s/^to//) {
                     # Look input up in list of properties for which we have
-                    # mapping files.
-                    if (defined ($file =
+                    # mapping files.  First do it with the strict approach
+                        if (defined ($file = $utf8::strict_property_to_file_of{
+                                                    $strict_property_and_table}))
+                        {
+                            $type = $utf8::file_to_swash_name{$file};
+                            print STDERR __LINE__, ": type set to $type\n"
+                                                                        if DEBUG;
+                            $file = "$unicore_dir/$file.pl";
+                            last GETFILE;
+                        }
+                        elsif (defined ($file =
                           $utf8::loose_property_to_file_of{$property_and_table}))
-                    {
-                        $type = $utf8::file_to_swash_name{$file};
-                        print STDERR __LINE__, ": type set to $type\n" if DEBUG;
-                        $file = "$unicore_dir/$file.pl";
-                        last GETFILE;
-                    }   # If that fails see if there is a corresponding binary
-                        # property file
-                    elsif (defined ($file =
-                                   $utf8::loose_to_file_of{$property_and_table}))
-                    {
+                        {
+                            $type = $utf8::file_to_swash_name{$file};
+                            print STDERR __LINE__, ": type set to $type\n"
+                                                                        if DEBUG;
+                            $file = "$unicore_dir/$file.pl";
+                            last GETFILE;
+                        }   # If that fails see if there is a corresponding binary
+                            # property file
+                        elsif (defined ($file =
+                                    $utf8::loose_to_file_of{$property_and_table}))
+                        {
 
-                        # Here, there is no map file for the property we are
-                        # trying to get the map of, but this is a binary
-                        # property, and there is a file for it that can easily
-                        # be translated to a mapping.
-
-                        # In the case of properties that are forced to binary,
-                        # they are a combination.  We return the actual
-                        # mapping instead of the binary.  If the input is
-                        # something like 'Tocjkkiicore', it will be found in
-                        # %loose_property_to_file_of above as => 'To/kIICore'.
-                        # But the form like ToIskiicore won't be.  To fix
-                        # this, it was easiest to do it here.  These
-                        # properties are the complements of the default
-                        # property, so there is an entry in %loose_to_file_of
-                        # that is 'iskiicore' => '!kIICore/N', If we find such
-                        # an entry, strip off things and try again, which
-                        # should find the entry in %loose_property_to_file_of.
-                        # Actual binary properties that are of this form, such
-                        # as this entry: 'ishrkt' => '!Perl/Any' will also be
-                        # retried, but won't be in %loose_property_to_file_of,
-                        # and instead the next time through, it will find
-                        # 'hrkt' => '!Perl/Any' and proceed.
-                        redo if ! $retried
-                                && $file =~ /^!/
-                                && $property_and_table =~ s/^is//;
-
-                        # This is a binary property.  Setting this here causes
-                        # it to be stored as such in the cache, so if someone
-                        # comes along later looking for just a binary, they
-                        # get it.
-                        $minbits = 1;
-
-                        # The 0+ makes sure is numeric
-                        $invert_it = 0 + $file =~ s/!//;
-                        $file = "$unicore_dir/lib/$file.pl" unless $file =~ m!^#/!;
-                        last GETFILE;
+                            # Here, there is no map file for the property we
+                            # are trying to get the map of, but this is a
+                            # binary property, and there is a file for it that
+                            # can easily be translated to a mapping, so use
+                            # that, treating this as a binary property.
+                            # Setting 'minbits' here causes it to be stored as
+                            # such in the cache, so if someone comes along
+                            # later looking for just a binary, they get it.
+                            $minbits = 1;
+
+                            # The 0+ makes sure is numeric
+                            $invert_it = 0 + $file =~ s/!//;
+                            $file = "$unicore_dir/lib/$file.pl"
+                                                         unless $file =~ m!^#/!;
+                            last GETFILE;
+                        }
                     }
-                } }
+                }
 
                 ##
                 ## If we reach this line, it's because we couldn't figure
diff --git a/Master/tlpkg/tlperl/lib/version.pm b/Master/tlpkg/tlperl/lib/version.pm
index f8afd8435b0..201561877e6 100644
--- a/Master/tlpkg/tlperl/lib/version.pm
+++ b/Master/tlpkg/tlperl/lib/version.pm
@@ -3,10 +3,14 @@ package version;
 
 use 5.006002;
 use strict;
+use warnings::register;
+if ($] >= 5.015) {
+    warnings::register_categories(qw/version/);
+}
 
 use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv);
 
-$VERSION = 0.9909;
+$VERSION = 0.9916;
 $CLASS = 'version';
 
 # avoid using Exporter
diff --git a/Master/tlpkg/tlperl/lib/version.pod b/Master/tlpkg/tlperl/lib/version.pod
index 40ceee2063a..42691b1e0c1 100644
--- a/Master/tlpkg/tlperl/lib/version.pod
+++ b/Master/tlpkg/tlperl/lib/version.pod
@@ -12,8 +12,8 @@ version - Perl extension for Version Objects
   # Declaring a dotted-decimal $VERSION (keep on one line!)
 
   use version; our $VERSION = version->declare("v1.2.3"); # formal
-  use version; our $VERSION = qv("v1.2.3");               # shorthand
-  use version; our $VERSION = qv("v1.2_3");               # alpha
+  use version; our $VERSION = qv("v1.2.3");               # deprecated
+  use version; our $VERSION = qv("v1.2_3");               # deprecated
 
   # Declaring an old-style decimal $VERSION (use quotes!)
 
@@ -270,7 +270,7 @@ Returns a value representing the object in a pure decimal form without
 trailing zeroes.
 
  version->declare('v1.2')->numify;  # 1.002
- version->parse('1.2')->numify;     # 1.2
+ version->parse('1.2')->numify;     # 1.200
 
 =head2 stringify()
 
diff --git a/Master/tlpkg/tlperl/lib/version/Internals.pod b/Master/tlpkg/tlperl/lib/version/Internals.pod
index 95be8448811..dd784fe4c85 100644
--- a/Master/tlpkg/tlperl/lib/version/Internals.pod
+++ b/Master/tlpkg/tlperl/lib/version/Internals.pod
@@ -21,14 +21,14 @@ There are actually two distinct kinds of version objects:
 
 =over 4
 
-=item Decimal Versions
+=item Decimal versions
 
 Any version which "looks like a number", see L<Decimal Versions>.  This
 also includes versions with a single decimal point and a single embedded
 underscore, see L<Alpha Versions>, even though these must be quoted
 to preserve the underscore formatting.
 
-=item Dotted-Decimal Versions
+=item Dotted-Decimal versions
 
 Also referred to as "Dotted-Integer", these contains more than one decimal
 point and may have an optional embedded underscore, see L<Dotted-Decimal
diff --git a/Master/tlpkg/tlperl/lib/version/regex.pm b/Master/tlpkg/tlperl/lib/version/regex.pm
index f73296383a5..62c1f227d29 100644
--- a/Master/tlpkg/tlperl/lib/version/regex.pm
+++ b/Master/tlpkg/tlperl/lib/version/regex.pm
@@ -4,7 +4,7 @@ use strict;
 
 use vars qw($VERSION $CLASS $STRICT $LAX);
 
-$VERSION = 0.9909;
+$VERSION = 0.9916;
 
 #--------------------------------------------------------------------------#
 # Version regexp components
diff --git a/Master/tlpkg/tlperl/lib/version/vpp.pm b/Master/tlpkg/tlperl/lib/version/vpp.pm
deleted file mode 100644
index b821f92497a..00000000000
--- a/Master/tlpkg/tlperl/lib/version/vpp.pm
+++ /dev/null
@@ -1,1023 +0,0 @@
-package charstar;
-# a little helper class to emulate C char* semantics in Perl
-# so that prescan_version can use the same code as in C
-
-use overload (
-    '""'	=> \&thischar,
-    '0+'	=> \&thischar,
-    '++'	=> \&increment,
-    '--'	=> \&decrement,
-    '+'		=> \&plus,
-    '-'		=> \&minus,
-    '*'		=> \&multiply,
-    'cmp'	=> \&cmp,
-    '<=>'	=> \&spaceship,
-    'bool'	=> \&thischar,
-    '='		=> \&clone,
-);
-
-sub new {
-    my ($self, $string) = @_;
-    my $class = ref($self) || $self;
-
-    my $obj = {
-	string  => [split(//,$string)],
-	current => 0,
-    };
-    return bless $obj, $class;
-}
-
-sub thischar {
-    my ($self) = @_;
-    my $last = $#{$self->{string}};
-    my $curr = $self->{current};
-    if ($curr >= 0 && $curr <= $last) {
-	return $self->{string}->[$curr];
-    }
-    else {
-	return '';
-    }
-}
-
-sub increment {
-    my ($self) = @_;
-    $self->{current}++;
-}
-
-sub decrement {
-    my ($self) = @_;
-    $self->{current}--;
-}
-
-sub plus {
-    my ($self, $offset) = @_;
-    my $rself = $self->clone;
-    $rself->{current} += $offset;
-    return $rself;
-}
-
-sub minus {
-    my ($self, $offset) = @_;
-    my $rself = $self->clone;
-    $rself->{current} -= $offset;
-    return $rself;
-}
-
-sub multiply {
-    my ($left, $right, $swapped) = @_;
-    my $char = $left->thischar();
-    return $char * $right;
-}
-
-sub spaceship {
-    my ($left, $right, $swapped) = @_;
-    unless (ref($right)) { # not an object already
-	$right = $left->new($right);
-    }
-    return $left->{current} <=> $right->{current};
-}
-
-sub cmp {
-    my ($left, $right, $swapped) = @_;
-    unless (ref($right)) { # not an object already
-	if (length($right) == 1) { # comparing single character only
-	    return $left->thischar cmp $right;
-	}
-	$right = $left->new($right);
-    }
-    return $left->currstr cmp $right->currstr;
-}
-
-sub bool {
-    my ($self) = @_;
-    my $char = $self->thischar;
-    return ($char ne '');
-}
-
-sub clone {
-    my ($left, $right, $swapped) = @_;
-    $right = {
-	string  => [@{$left->{string}}],
-	current => $left->{current},
-    };
-    return bless $right, ref($left);
-}
-
-sub currstr {
-    my ($self, $s) = @_;
-    my $curr = $self->{current};
-    my $last = $#{$self->{string}};
-    if (defined($s) && $s->{current} < $last) {
-	$last = $s->{current};
-    }
-
-    my $string = join('', @{$self->{string}}[$curr..$last]);
-    return $string;
-}
-
-package version::vpp;
-
-use 5.006002;
-use strict;
-
-use Config;
-use vars qw($VERSION $CLASS @ISA $LAX $STRICT);
-$VERSION = 0.9909;
-$CLASS = 'version::vpp';
-
-require version::regex;
-*version::vpp::is_strict = \&version::regex::is_strict;
-*version::vpp::is_lax = \&version::regex::is_lax;
-*LAX = \$version::regex::LAX;
-*STRICT = \$version::regex::STRICT;
-
-use overload (
-    '""'       => \&stringify,
-    '0+'       => \&numify,
-    'cmp'      => \&vcmp,
-    '<=>'      => \&vcmp,
-    'bool'     => \&vbool,
-    '+'        => \&vnoop,
-    '-'        => \&vnoop,
-    '*'        => \&vnoop,
-    '/'        => \&vnoop,
-    '+='        => \&vnoop,
-    '-='        => \&vnoop,
-    '*='        => \&vnoop,
-    '/='        => \&vnoop,
-    'abs'      => \&vnoop,
-);
-
-eval "use warnings";
-if ($@) {
-    eval '
-	package
-	warnings;
-	sub enabled {return $^W;}
-	1;
-    ';
-}
-
-sub import {
-    no strict 'refs';
-    my ($class) = shift;
-
-    # Set up any derived class
-    unless ($class eq $CLASS) {
-	local $^W;
-	*{$class.'::declare'} =  \&{$CLASS.'::declare'};
-	*{$class.'::qv'} = \&{$CLASS.'::qv'};
-    }
-
-    my %args;
-    if (@_) { # any remaining terms are arguments
-	map { $args{$_} = 1 } @_
-    }
-    else { # no parameters at all on use line
-	%args =
-	(
-	    qv => 1,
-	    'UNIVERSAL::VERSION' => 1,
-	);
-    }
-
-    my $callpkg = caller();
-
-    if (exists($args{declare})) {
-	*{$callpkg.'::declare'} =
-	    sub {return $class->declare(shift) }
-	  unless defined(&{$callpkg.'::declare'});
-    }
-
-    if (exists($args{qv})) {
-	*{$callpkg.'::qv'} =
-	    sub {return $class->qv(shift) }
-	  unless defined(&{$callpkg.'::qv'});
-    }
-
-    if (exists($args{'UNIVERSAL::VERSION'})) {
-	local $^W;
-	*UNIVERSAL::VERSION
-		= \&{$CLASS.'::_VERSION'};
-    }
-
-    if (exists($args{'VERSION'})) {
-	*{$callpkg.'::VERSION'} = \&{$CLASS.'::_VERSION'};
-    }
-
-    if (exists($args{'is_strict'})) {
-	*{$callpkg.'::is_strict'} = \&{$CLASS.'::is_strict'}
-	  unless defined(&{$callpkg.'::is_strict'});
-    }
-
-    if (exists($args{'is_lax'})) {
-	*{$callpkg.'::is_lax'} = \&{$CLASS.'::is_lax'}
-	  unless defined(&{$callpkg.'::is_lax'});
-    }
-}
-
-my $VERSION_MAX = 0x7FFFFFFF;
-
-# implement prescan_version as closely to the C version as possible
-use constant TRUE  => 1;
-use constant FALSE => 0;
-
-sub isDIGIT {
-    my ($char) = shift->thischar();
-    return ($char =~ /\d/);
-}
-
-sub isALPHA {
-    my ($char) = shift->thischar();
-    return ($char =~ /[a-zA-Z]/);
-}
-
-sub isSPACE {
-    my ($char) = shift->thischar();
-    return ($char =~ /\s/);
-}
-
-sub BADVERSION {
-    my ($s, $errstr, $error) = @_;
-    if ($errstr) {
-	$$errstr = $error;
-    }
-    return $s;
-}
-
-sub prescan_version {
-    my ($s, $strict, $errstr, $sqv, $ssaw_decimal, $swidth, $salpha) = @_;
-    my $qv          = defined $sqv          ? $$sqv          : FALSE;
-    my $saw_decimal = defined $ssaw_decimal ? $$ssaw_decimal : 0;
-    my $width       = defined $swidth       ? $$swidth       : 3;
-    my $alpha       = defined $salpha       ? $$salpha       : FALSE;
-
-    my $d = $s;
-
-    if ($qv && isDIGIT($d)) {
-	goto dotted_decimal_version;
-    }
-
-    if ($d eq 'v') { # explicit v-string
-	$d++;
-	if (isDIGIT($d)) {
-	    $qv = TRUE;
-	}
-	else { # degenerate v-string
-	    # requires v1.2.3
-	    return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)");
-	}
-
-dotted_decimal_version:
-	if ($strict && $d eq '0' && isDIGIT($d+1)) {
-	    # no leading zeros allowed
-	    return BADVERSION($s,$errstr,"Invalid version format (no leading zeros)");
-	}
-
-	while (isDIGIT($d)) { 	# integer part
-	    $d++;
-	}
-
-	if ($d eq '.')
-	{
-	    $saw_decimal++;
-	    $d++; 		# decimal point
-	}
-	else
-	{
-	    if ($strict) {
-		# require v1.2.3
-		return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)");
-	    }
-	    else {
-		goto version_prescan_finish;
-	    }
-	}
-
-	{
-	    my $i = 0;
-	    my $j = 0;
-	    while (isDIGIT($d)) {	# just keep reading
-		$i++;
-		while (isDIGIT($d)) {
-		    $d++; $j++;
-		    # maximum 3 digits between decimal
-		    if ($strict && $j > 3) {
-			return BADVERSION($s,$errstr,"Invalid version format (maximum 3 digits between decimals)");
-		    }
-		}
-		if ($d eq '_') {
-		    if ($strict) {
-			return BADVERSION($s,$errstr,"Invalid version format (no underscores)");
-		    }
-		    if ( $alpha ) {
-			return BADVERSION($s,$errstr,"Invalid version format (multiple underscores)");
-		    }
-		    $d++;
-		    $alpha = TRUE;
-		}
-		elsif ($d eq '.') {
-		    if ($alpha) {
-			return BADVERSION($s,$errstr,"Invalid version format (underscores before decimal)");
-		    }
-		    $saw_decimal++;
-		    $d++;
-		}
-		elsif (!isDIGIT($d)) {
-		    last;
-		}
-		$j = 0;
-	    }
-
-	    if ($strict && $i < 2) {
-		# requires v1.2.3
-		return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)");
-	    }
-	}
-    } 					# end if dotted-decimal
-    else
-    {					# decimal versions
-	my $j = 0;
-	# special $strict case for leading '.' or '0'
-	if ($strict) {
-	    if ($d eq '.') {
-		return BADVERSION($s,$errstr,"Invalid version format (0 before decimal required)");
-	    }
-	    if ($d eq '0' && isDIGIT($d+1)) {
-		return BADVERSION($s,$errstr,"Invalid version format (no leading zeros)");
-	    }
-	}
-
-	# and we never support negative version numbers
-	if ($d eq '-') {
-	    return BADVERSION($s,$errstr,"Invalid version format (negative version number)");
-	}
-
-	# consume all of the integer part
-	while (isDIGIT($d)) {
-	    $d++;
-	}
-
-	# look for a fractional part
-	if ($d eq '.') {
-	    # we found it, so consume it
-	    $saw_decimal++;
-	    $d++;
-	}
-	elsif (!$d || $d eq ';' || isSPACE($d) || $d eq '}') {
-	    if ( $d == $s ) {
-		# found nothing
-		return BADVERSION($s,$errstr,"Invalid version format (version required)");
-	    }
-	    # found just an integer
-	    goto version_prescan_finish;
-	}
-	elsif ( $d == $s ) {
-	    # didn't find either integer or period
-	    return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)");
-	}
-	elsif ($d eq '_') {
-	    # underscore can't come after integer part
-	    if ($strict) {
-		return BADVERSION($s,$errstr,"Invalid version format (no underscores)");
-	    }
-	    elsif (isDIGIT($d+1)) {
-		return BADVERSION($s,$errstr,"Invalid version format (alpha without decimal)");
-	    }
-	    else {
-		return BADVERSION($s,$errstr,"Invalid version format (misplaced underscore)");
-	    }
-	}
-	elsif ($d) {
-	    # anything else after integer part is just invalid data
-	    return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)");
-	}
-
-	# scan the fractional part after the decimal point
-	if ($d && !isDIGIT($d) && ($strict || ! ($d eq ';' || isSPACE($d) || $d eq '}') )) {
-		# $strict or lax-but-not-the-end
-		return BADVERSION($s,$errstr,"Invalid version format (fractional part required)");
-	}
-
-	while (isDIGIT($d)) {
-	    $d++; $j++;
-	    if ($d eq '.' && isDIGIT($d-1)) {
-		if ($alpha) {
-		    return BADVERSION($s,$errstr,"Invalid version format (underscores before decimal)");
-		}
-		if ($strict) {
-		    return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions must begin with 'v')");
-		}
-		$d = $s; # start all over again
-		$qv = TRUE;
-		goto dotted_decimal_version;
-	    }
-	    if ($d eq '_') {
-		if ($strict) {
-		    return BADVERSION($s,$errstr,"Invalid version format (no underscores)");
-		}
-		if ( $alpha ) {
-		    return BADVERSION($s,$errstr,"Invalid version format (multiple underscores)");
-		}
-		if ( ! isDIGIT($d+1) ) {
-		    return BADVERSION($s,$errstr,"Invalid version format (misplaced underscore)");
-		}
-		$width = $j;
-		$d++;
-		$alpha = TRUE;
-	    }
-	}
-    }
-
-version_prescan_finish:
-    while (isSPACE($d)) {
-	$d++;
-    }
-
-    if ($d && !isDIGIT($d) && (! ($d eq ';' || $d eq '}') )) {
-	# trailing non-numeric data
-	return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)");
-    }
-
-    if (defined $sqv) {
-	$$sqv = $qv;
-    }
-    if (defined $swidth) {
-	$$swidth = $width;
-    }
-    if (defined $ssaw_decimal) {
-	$$ssaw_decimal = $saw_decimal;
-    }
-    if (defined $salpha) {
-	$$salpha = $alpha;
-    }
-    return $d;
-}
-
-sub scan_version {
-    my ($s, $rv, $qv) = @_;
-    my $start;
-    my $pos;
-    my $last;
-    my $errstr;
-    my $saw_decimal = 0;
-    my $width = 3;
-    my $alpha = FALSE;
-    my $vinf = FALSE;
-    my @av;
-
-    $s = new charstar $s;
-
-    while (isSPACE($s)) { # leading whitespace is OK
-	$s++;
-    }
-
-    $last = prescan_version($s, FALSE, \$errstr, \$qv, \$saw_decimal,
-	\$width, \$alpha);
-
-    if ($errstr) {
-	# 'undef' is a special case and not an error
-	if ( $s ne 'undef') {
-	    require Carp;
-	    Carp::croak($errstr);
-	}
-    }
-
-    $start = $s;
-    if ($s eq 'v') {
-	$s++;
-    }
-    $pos = $s;
-
-    if ( $qv ) {
-	$$rv->{qv} = $qv;
-    }
-    if ( $alpha ) {
-	$$rv->{alpha} = $alpha;
-    }
-    if ( !$qv && $width < 3 ) {
-	$$rv->{width} = $width;
-    }
-
-    while (isDIGIT($pos)) {
-	$pos++;
-    }
-    if (!isALPHA($pos)) {
-	my $rev;
-
-	for (;;) {
-	    $rev = 0;
-	    {
-  		# this is atoi() that delimits on underscores
-  		my $end = $pos;
-  		my $mult = 1;
-		my $orev;
-
-		#  the following if() will only be true after the decimal
-		#  point of a version originally created with a bare
-		#  floating point number, i.e. not quoted in any way
-		#
- 		if ( !$qv && $s > $start && $saw_decimal == 1 ) {
-		    $mult *= 100;
- 		    while ( $s < $end ) {
-			$orev = $rev;
- 			$rev += $s * $mult;
- 			$mult /= 10;
-			if (   (abs($orev) > abs($rev))
-			    || (abs($rev) > $VERSION_MAX )) {
-			    warn("Integer overflow in version %d",
-					   $VERSION_MAX);
-			    $s = $end - 1;
-			    $rev = $VERSION_MAX;
-			    $vinf = 1;
-			}
- 			$s++;
-			if ( $s eq '_' ) {
-			    $s++;
-			}
- 		    }
-  		}
- 		else {
- 		    while (--$end >= $s) {
-			$orev = $rev;
- 			$rev += $end * $mult;
- 			$mult *= 10;
-			if (   (abs($orev) > abs($rev))
-			    || (abs($rev) > $VERSION_MAX )) {
-			    warn("Integer overflow in version");
-			    $end = $s - 1;
-			    $rev = $VERSION_MAX;
-			    $vinf = 1;
-			}
- 		    }
- 		}
-  	    }
-
-  	    # Append revision
-	    push @av, $rev;
-	    if ( $vinf ) {
-		$s = $last;
-		last;
-	    }
-	    elsif ( $pos eq '.' ) {
-		$s = ++$pos;
-	    }
-	    elsif ( $pos eq '_' && isDIGIT($pos+1) ) {
-		$s = ++$pos;
-	    }
-	    elsif ( $pos eq ',' && isDIGIT($pos+1) ) {
-		$s = ++$pos;
-	    }
-	    elsif ( isDIGIT($pos) ) {
-		$s = $pos;
-	    }
-	    else {
-		$s = $pos;
-		last;
-	    }
-	    if ( $qv ) {
-		while ( isDIGIT($pos) ) {
-		    $pos++;
-		}
-	    }
-	    else {
-		my $digits = 0;
-		while ( ( isDIGIT($pos) || $pos eq '_' ) && $digits < 3 ) {
-		    if ( $pos ne '_' ) {
-			$digits++;
-		    }
-		    $pos++;
-		}
-	    }
-	}
-    }
-    if ( $qv ) { # quoted versions always get at least three terms
-	my $len = $#av;
-	#  This for loop appears to trigger a compiler bug on OS X, as it
-	#  loops infinitely. Yes, len is negative. No, it makes no sense.
-	#  Compiler in question is:
-	#  gcc version 3.3 20030304 (Apple Computer, Inc. build 1640)
-	#  for ( len = 2 - len; len > 0; len-- )
-	#  av_push(MUTABLE_AV(sv), newSViv(0));
-	#
-	$len = 2 - $len;
-	while ($len-- > 0) {
-	    push @av, 0;
-	}
-    }
-
-    # need to save off the current version string for later
-    if ( $vinf ) {
-	$$rv->{original} = "v.Inf";
-	$$rv->{vinf} = 1;
-    }
-    elsif ( $s > $start ) {
-	$$rv->{original} = $start->currstr($s);
-	if ( $qv && $saw_decimal == 1 && $start ne 'v' ) {
-	    # need to insert a v to be consistent
-	    $$rv->{original} = 'v' . $$rv->{original};
-	}
-    }
-    else {
-	$$rv->{original} = '0';
-	push(@av, 0);
-    }
-
-    # And finally, store the AV in the hash
-    $$rv->{version} = \@av;
-
-    # fix RT#19517 - special case 'undef' as string
-    if ($s eq 'undef') {
-	$s += 5;
-    }
-
-    return $s;
-}
-
-sub new {
-    my $class = shift;
-    unless (defined $class or $#_ > 1) {
-	require Carp;
-	Carp::croak('Usage: version::new(class, version)');
-    }
-
-    my $self = bless ({}, ref ($class) || $class);
-    my $qv = FALSE;
-
-    if ( $#_ == 1 ) { # must be CVS-style
-	$qv = TRUE;
-    }
-    my $value = pop; # always going to be the last element
-
-    if ( ref($value) && eval('$value->isa("version")') ) {
-	# Can copy the elements directly
-	$self->{version} = [ @{$value->{version} } ];
-	$self->{qv} = 1 if $value->{qv};
-	$self->{alpha} = 1 if $value->{alpha};
-	$self->{original} = ''.$value->{original};
-	return $self;
-    }
-
-    if ( not defined $value or $value =~ /^undef$/ ) {
-	# RT #19517 - special case for undef comparison
-	# or someone forgot to pass a value
-	push @{$self->{version}}, 0;
-	$self->{original} = "0";
-	return ($self);
-    }
-
-
-    if (ref($value) =~ m/ARRAY|HASH/) {
-	require Carp;
-	Carp::croak("Invalid version format (non-numeric data)");
-    }
-
-    $value = _un_vstring($value);
-
-    if ($Config{d_setlocale}) {
-	use POSIX qw/locale_h/;
-	use if $Config{d_setlocale}, 'locale';
-	my $currlocale = setlocale(LC_ALL);
-
-	# if the current locale uses commas for decimal points, we
-	# just replace commas with decimal places, rather than changing
-	# locales
-	if ( localeconv()->{decimal_point} eq ',' ) {
-	    $value =~ tr/,/./;
-	}
-    }
-
-    # exponential notation
-    if ( $value =~ /\d+.?\d*e[-+]?\d+/ ) {
-	$value = sprintf("%.9f",$value);
-	$value =~ s/(0+)$//; # trim trailing zeros
-    }
-
-    my $s = scan_version($value, \$self, $qv);
-
-    if ($s) { # must be something left over
-	warn("Version string '%s' contains invalid data; "
-		   ."ignoring: '%s'", $value, $s);
-    }
-
-    return ($self);
-}
-
-*parse = \&new;
-
-sub numify {
-    my ($self) = @_;
-    unless (_verify($self)) {
-	require Carp;
-	Carp::croak("Invalid version object");
-    }
-    my $width = $self->{width} || 3;
-    my $alpha = $self->{alpha} || "";
-    my $len = $#{$self->{version}};
-    my $digit = $self->{version}[0];
-    my $string = sprintf("%d.", $digit );
-
-    for ( my $i = 1 ; $i < $len ; $i++ ) {
-	$digit = $self->{version}[$i];
-	if ( $width < 3 ) {
-	    my $denom = 10**(3-$width);
-	    my $quot = int($digit/$denom);
-	    my $rem = $digit - ($quot * $denom);
-	    $string .= sprintf("%0".$width."d_%d", $quot, $rem);
-	}
-	else {
-	    $string .= sprintf("%03d", $digit);
-	}
-    }
-
-    if ( $len > 0 ) {
-	$digit = $self->{version}[$len];
-	if ( $alpha && $width == 3 ) {
-	    $string .= "_";
-	}
-	$string .= sprintf("%0".$width."d", $digit);
-    }
-    else # $len = 0
-    {
-	$string .= sprintf("000");
-    }
-
-    return $string;
-}
-
-sub normal {
-    my ($self) = @_;
-    unless (_verify($self)) {
-	require Carp;
-	Carp::croak("Invalid version object");
-    }
-    my $alpha = $self->{alpha} || "";
-    my $len = $#{$self->{version}};
-    my $digit = $self->{version}[0];
-    my $string = sprintf("v%d", $digit );
-
-    for ( my $i = 1 ; $i < $len ; $i++ ) {
-	$digit = $self->{version}[$i];
-	$string .= sprintf(".%d", $digit);
-    }
-
-    if ( $len > 0 ) {
-	$digit = $self->{version}[$len];
-	if ( $alpha ) {
-	    $string .= sprintf("_%0d", $digit);
-	}
-	else {
-	    $string .= sprintf(".%0d", $digit);
-	}
-    }
-
-    if ( $len <= 2 ) {
-	for ( $len = 2 - $len; $len != 0; $len-- ) {
-	    $string .= sprintf(".%0d", 0);
-	}
-    }
-
-    return $string;
-}
-
-sub stringify {
-    my ($self) = @_;
-    unless (_verify($self)) {
-	require Carp;
-	Carp::croak("Invalid version object");
-    }
-    return exists $self->{original}
-    	? $self->{original}
-	: exists $self->{qv}
-	    ? $self->normal
-	    : $self->numify;
-}
-
-sub vcmp {
-    require UNIVERSAL;
-    my ($left,$right,$swap) = @_;
-    my $class = ref($left);
-    unless ( UNIVERSAL::isa($right, $class) ) {
-	$right = $class->new($right);
-    }
-
-    if ( $swap ) {
-	($left, $right) = ($right, $left);
-    }
-    unless (_verify($left)) {
-	require Carp;
-	Carp::croak("Invalid version object");
-    }
-    unless (_verify($right)) {
-	require Carp;
-	Carp::croak("Invalid version format");
-    }
-    my $l = $#{$left->{version}};
-    my $r = $#{$right->{version}};
-    my $m = $l < $r ? $l : $r;
-    my $lalpha = $left->is_alpha;
-    my $ralpha = $right->is_alpha;
-    my $retval = 0;
-    my $i = 0;
-    while ( $i <= $m && $retval == 0 ) {
-	$retval = $left->{version}[$i] <=> $right->{version}[$i];
-	$i++;
-    }
-
-    # tiebreaker for alpha with identical terms
-    if ( $retval == 0
-	&& $l == $r
-	&& $left->{version}[$m] == $right->{version}[$m]
-	&& ( $lalpha || $ralpha ) ) {
-
-	if ( $lalpha && !$ralpha ) {
-	    $retval = -1;
-	}
-	elsif ( $ralpha && !$lalpha) {
-	    $retval = +1;
-	}
-    }
-
-    # possible match except for trailing 0's
-    if ( $retval == 0 && $l != $r ) {
-	if ( $l < $r ) {
-	    while ( $i <= $r && $retval == 0 ) {
-		if ( $right->{version}[$i] != 0 ) {
-		    $retval = -1; # not a match after all
-		}
-		$i++;
-	    }
-	}
-	else {
-	    while ( $i <= $l && $retval == 0 ) {
-		if ( $left->{version}[$i] != 0 ) {
-		    $retval = +1; # not a match after all
-		}
-		$i++;
-	    }
-	}
-    }
-
-    return $retval;
-}
-
-sub vbool {
-    my ($self) = @_;
-    return vcmp($self,$self->new("0"),1);
-}
-
-sub vnoop {
-    require Carp;
-    Carp::croak("operation not supported with version object");
-}
-
-sub is_alpha {
-    my ($self) = @_;
-    return (exists $self->{alpha});
-}
-
-sub qv {
-    my $value = shift;
-    my $class = $CLASS;
-    if (@_) {
-	$class = ref($value) || $value;
-	$value = shift;
-    }
-
-    $value = _un_vstring($value);
-    $value = 'v'.$value unless $value =~ /(^v|\d+\.\d+\.\d)/;
-    my $obj = $CLASS->new($value);
-    return bless $obj, $class;
-}
-
-*declare = \&qv;
-
-sub is_qv {
-    my ($self) = @_;
-    return (exists $self->{qv});
-}
-
-
-sub _verify {
-    my ($self) = @_;
-    if ( ref($self)
-	&& eval { exists $self->{version} }
-	&& ref($self->{version}) eq 'ARRAY'
-	) {
-	return 1;
-    }
-    else {
-	return 0;
-    }
-}
-
-sub _is_non_alphanumeric {
-    my $s = shift;
-    $s = new charstar $s;
-    while ($s) {
-	return 0 if isSPACE($s); # early out
-	return 1 unless (isALPHA($s) || isDIGIT($s) || $s =~ /[.-]/);
-	$s++;
-    }
-    return 0;
-}
-
-sub _un_vstring {
-    my $value = shift;
-    # may be a v-string
-    if ( length($value) >= 3 && $value !~ /[._]/
-	&& _is_non_alphanumeric($value)) {
-	my $tvalue;
-	if ( $] ge 5.008_001 ) {
-	    $tvalue = _find_magic_vstring($value);
-	    $value = $tvalue if length $tvalue;
-	}
-	elsif ( $] ge 5.006_000 ) {
-	    $tvalue = sprintf("v%vd",$value);
-	    if ( $tvalue =~ /^v\d+(\.\d+){2,}$/ ) {
-		# must be a v-string
-		$value = $tvalue;
-	    }
-	}
-    }
-    return $value;
-}
-
-sub _find_magic_vstring {
-    my $value = shift;
-    my $tvalue = '';
-    require B;
-    my $sv = B::svref_2object(\$value);
-    my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef;
-    while ( $magic ) {
-	if ( $magic->TYPE eq 'V' ) {
-	    $tvalue = $magic->PTR;
-	    $tvalue =~ s/^v?(.+)$/v$1/;
-	    last;
-	}
-	else {
-	    $magic = $magic->MOREMAGIC;
-	}
-    }
-    return $tvalue;
-}
-
-sub _VERSION {
-    my ($obj, $req) = @_;
-    my $class = ref($obj) || $obj;
-
-    no strict 'refs';
-    if ( exists $INC{"$class.pm"} and not %{"$class\::"} and $] >= 5.008) {
-	 # file but no package
-	require Carp;
-	Carp::croak( "$class defines neither package nor VERSION"
-	    ."--version check failed");
-    }
-
-    my $version = eval "\$$class\::VERSION";
-    if ( defined $version ) {
-	local $^W if $] <= 5.008;
-	$version = version::vpp->new($version);
-    }
-
-    if ( defined $req ) {
-	unless ( defined $version ) {
-	    require Carp;
-	    my $msg =  $] < 5.006
-	    ? "$class version $req required--this is only version "
-	    : "$class does not define \$$class\::VERSION"
-	      ."--version check failed";
-
-	    if ( $ENV{VERSION_DEBUG} ) {
-		Carp::confess($msg);
-	    }
-	    else {
-		Carp::croak($msg);
-	    }
-	}
-
-	$req = version::vpp->new($req);
-
-	if ( $req > $version ) {
-	    require Carp;
-	    if ( $req->is_qv ) {
-		Carp::croak(
-		    sprintf ("%s version %s required--".
-			"this is only version %s", $class,
-			$req->normal, $version->normal)
-		);
-	    }
-	    else {
-		Carp::croak(
-		    sprintf ("%s version %s required--".
-			"this is only version %s", $class,
-			$req->stringify, $version->stringify)
-		);
-	    }
-	}
-    }
-
-    return defined $version ? $version->stringify : undef;
-}
-
-1; #this line is important and will help the module return a true value
diff --git a/Master/tlpkg/tlperl/lib/warnings.pm b/Master/tlpkg/tlperl/lib/warnings.pm
index 796b4150f98..ddb0c35e8dc 100644
--- a/Master/tlpkg/tlperl/lib/warnings.pm
+++ b/Master/tlpkg/tlperl/lib/warnings.pm
@@ -5,14 +5,15 @@
 
 package warnings;
 
-our $VERSION = "1.34";
+our $VERSION = "1.36";
 
 # Verify that we're called correctly so that warnings will work.
+# Can't use Carp, since Carp uses us!
+# String regexps because constant folding = smaller optree = less memory vs regexp literal
 # see also strict.pm.
-unless ( __FILE__ =~ /(^|[\/\\])\Q${\__PACKAGE__}\E\.pmc?$/ ) {
-    my (undef, $f, $l) = caller;
-    die("Incorrect use of pragma '${\__PACKAGE__}' at $f line $l.\n");
-}
+die sprintf "Incorrect use of pragma '%s' at %s line %d.\n", __PACKAGE__, +(caller)[1,2]
+    if __FILE__ !~ ( '(?x) \b     '.__PACKAGE__.'  \.pmc? \z' )
+    && __FILE__ =~ ( '(?x) \b (?i:'.__PACKAGE__.') \.pmc? \z' );
 
 our %Offsets = (
     # Warnings Categories added in Perl 5.008
@@ -75,29 +76,27 @@ our %Offsets = (
     # Warnings Categories added in Perl 5.017
     'experimental'			=> 102,
     'experimental::lexical_subs'	=> 104,
-    'experimental::lexical_topic'	=> 106,
-    'experimental::regex_sets'		=> 108,
-    'experimental::smartmatch'		=> 110,
+    'experimental::regex_sets'		=> 106,
+    'experimental::smartmatch'		=> 108,
 
     # Warnings Categories added in Perl 5.019
-    'experimental::autoderef'		=> 112,
-    'experimental::postderef'		=> 114,
-    'experimental::signatures'		=> 116,
-    'syscalls'				=> 118,
+    'experimental::postderef'		=> 110,
+    'experimental::signatures'		=> 112,
+    'syscalls'				=> 114,
 
     # Warnings Categories added in Perl 5.021
-    'experimental::bitwise'		=> 120,
-    'experimental::const_attr'		=> 122,
-    'experimental::re_strict'		=> 124,
-    'experimental::refaliasing'		=> 126,
-    'experimental::win32_perlio'	=> 128,
-    'locale'				=> 130,
-    'missing'				=> 132,
-    'redundant'				=> 134,
+    'experimental::bitwise'		=> 116,
+    'experimental::const_attr'		=> 118,
+    'experimental::re_strict'		=> 120,
+    'experimental::refaliasing'		=> 122,
+    'experimental::win32_perlio'	=> 124,
+    'locale'				=> 126,
+    'missing'				=> 128,
+    'redundant'				=> 130,
 );
 
 our %Bits = (
-    'all'				=> "\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55", # [0..67]
+    'all'				=> "\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x55\x05", # [0..65]
     'ambiguous'				=> "\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [29]
     'bareword'				=> "\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [30]
     'closed'				=> "\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [6]
@@ -107,30 +106,28 @@ our %Bits = (
     'digit'				=> "\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [31]
     'exec'				=> "\x00\x40\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [7]
     'exiting'				=> "\x40\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [3]
-    'experimental'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40\x55\x15\x55\x01", # [51..58,60..64]
-    'experimental::autoderef'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00", # [56]
-    'experimental::bitwise'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00", # [60]
-    'experimental::const_attr'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00", # [61]
+    'experimental'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40\x55\x51\x15\x00", # [51..56,58..62]
+    'experimental::bitwise'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00", # [58]
+    'experimental::const_attr'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00", # [59]
     'experimental::lexical_subs'	=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00", # [52]
-    'experimental::lexical_topic'	=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00", # [53]
-    'experimental::postderef'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00", # [57]
-    'experimental::re_strict'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00", # [62]
-    'experimental::refaliasing'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40\x00", # [63]
-    'experimental::regex_sets'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00", # [54]
-    'experimental::signatures'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00", # [58]
-    'experimental::smartmatch'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00", # [55]
-    'experimental::win32_perlio'	=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", # [64]
+    'experimental::postderef'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00", # [55]
+    'experimental::re_strict'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00", # [60]
+    'experimental::refaliasing'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00", # [61]
+    'experimental::regex_sets'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00", # [53]
+    'experimental::signatures'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00", # [56]
+    'experimental::smartmatch'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00", # [54]
+    'experimental::win32_perlio'	=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00", # [62]
     'glob'				=> "\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [4]
     'illegalproto'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00", # [47]
     'imprecision'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00", # [46]
     'inplace'				=> "\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [23]
     'internal'				=> "\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [24]
-    'io'				=> "\x00\x54\x55\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00", # [5..11,59]
+    'io'				=> "\x00\x54\x55\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00", # [5..11,57]
     'layer'				=> "\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [8]
-    'locale'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04", # [65]
+    'locale'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40\x00", # [63]
     'malloc'				=> "\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [25]
     'misc'				=> "\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [12]
-    'missing'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10", # [66]
+    'missing'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", # [64]
     'newline'				=> "\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [9]
     'non_unicode'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00", # [48]
     'nonchar'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00", # [49]
@@ -147,7 +144,7 @@ our %Bits = (
     'qw'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00", # [36]
     'recursion'				=> "\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [18]
     'redefine'				=> "\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [19]
-    'redundant'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40", # [67]
+    'redundant'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04", # [65]
     'regexp'				=> "\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [20]
     'reserved'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00", # [37]
     'semicolon'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00", # [38]
@@ -156,7 +153,7 @@ our %Bits = (
     'substr'				=> "\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [27]
     'surrogate'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00", # [50]
     'syntax'				=> "\x00\x00\x00\x00\x00\x00\x00\x55\x55\x15\x00\x40\x00\x00\x00\x00\x00", # [28..38,47]
-    'syscalls'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00", # [59]
+    'syscalls'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00", # [57]
     'taint'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x40\x00\x00\x00\x00\x00\x00\x00", # [39]
     'threads'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00", # [40]
     'uninitialized'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00", # [41]
@@ -168,7 +165,7 @@ our %Bits = (
 );
 
 our %DeadBits = (
-    'all'				=> "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa", # [0..67]
+    'all'				=> "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\x0a", # [0..65]
     'ambiguous'				=> "\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [29]
     'bareword'				=> "\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [30]
     'closed'				=> "\x00\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [6]
@@ -178,30 +175,28 @@ our %DeadBits = (
     'digit'				=> "\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [31]
     'exec'				=> "\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [7]
     'exiting'				=> "\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [3]
-    'experimental'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\xaa\x2a\xaa\x02", # [51..58,60..64]
-    'experimental::autoderef'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00", # [56]
-    'experimental::bitwise'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00", # [60]
-    'experimental::const_attr'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00", # [61]
+    'experimental'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\xaa\xa2\x2a\x00", # [51..56,58..62]
+    'experimental::bitwise'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00", # [58]
+    'experimental::const_attr'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00", # [59]
     'experimental::lexical_subs'	=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00", # [52]
-    'experimental::lexical_topic'	=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00", # [53]
-    'experimental::postderef'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00", # [57]
-    'experimental::re_strict'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00", # [62]
-    'experimental::refaliasing'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x00", # [63]
-    'experimental::regex_sets'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00", # [54]
-    'experimental::signatures'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00", # [58]
-    'experimental::smartmatch'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00", # [55]
-    'experimental::win32_perlio'	=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02", # [64]
+    'experimental::postderef'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00", # [55]
+    'experimental::re_strict'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00", # [60]
+    'experimental::refaliasing'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00", # [61]
+    'experimental::regex_sets'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00", # [53]
+    'experimental::signatures'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00", # [56]
+    'experimental::smartmatch'		=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00", # [54]
+    'experimental::win32_perlio'	=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00", # [62]
     'glob'				=> "\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [4]
     'illegalproto'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00", # [47]
     'imprecision'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00", # [46]
     'inplace'				=> "\x00\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [23]
     'internal'				=> "\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [24]
-    'io'				=> "\x00\xa8\xaa\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00", # [5..11,59]
+    'io'				=> "\x00\xa8\xaa\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00", # [5..11,57]
     'layer'				=> "\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [8]
-    'locale'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08", # [65]
+    'locale'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x00", # [63]
     'malloc'				=> "\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [25]
     'misc'				=> "\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [12]
-    'missing'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20", # [66]
+    'missing'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02", # [64]
     'newline'				=> "\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [9]
     'non_unicode'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00", # [48]
     'nonchar'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00", # [49]
@@ -218,7 +213,7 @@ our %DeadBits = (
     'qw'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00", # [36]
     'recursion'				=> "\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [18]
     'redefine'				=> "\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [19]
-    'redundant'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80", # [67]
+    'redundant'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08", # [65]
     'regexp'				=> "\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [20]
     'reserved'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00", # [37]
     'semicolon'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00\x00\x00\x00", # [38]
@@ -227,7 +222,7 @@ our %DeadBits = (
     'substr'				=> "\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # [27]
     'surrogate'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x00", # [50]
     'syntax'				=> "\x00\x00\x00\x00\x00\x00\x00\xaa\xaa\x2a\x00\x80\x00\x00\x00\x00\x00", # [28..38,47]
-    'syscalls'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00", # [59]
+    'syscalls'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00", # [57]
     'taint'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00", # [39]
     'threads'				=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00", # [40]
     'uninitialized'			=> "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00", # [41]
@@ -240,8 +235,8 @@ our %DeadBits = (
 
 # These are used by various things, including our own tests
 our $NONE				=  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-our $DEFAULT				=  "\x10\x01\x00\x00\x00\x50\x04\x00\x00\x00\x00\x00\x00\x55\x15\x55\x05", # [2,56,60,61,52,53,57,62,63,54,58,55,64,4,65,22,23,25]
-our $LAST_BIT				=  136 ;
+our $DEFAULT				=  "\x10\x01\x00\x00\x00\x50\x04\x00\x00\x00\x00\x00\x00\x55\x51\x55\x00", # [2,58,59,52,55,60,61,53,56,54,62,4,63,22,23,25]
+our $LAST_BIT				=  132 ;
 our $BYTES				=  17 ;
 
 our $All = "" ; vec($All, $Offsets{'all'}, 2) = 3 ;
@@ -726,16 +721,12 @@ The current hierarchy is:
          |
          +- experimental --+
          |                 |
-         |                 +- experimental::autoderef
-         |                 |
          |                 +- experimental::bitwise
          |                 |
          |                 +- experimental::const_attr
          |                 |
          |                 +- experimental::lexical_subs
          |                 |
-         |                 +- experimental::lexical_topic
-         |                 |
          |                 +- experimental::postderef
          |                 |
          |                 +- experimental::re_strict
diff --git a/Master/tlpkg/tlperl/site/lib/HTTP/Cookies.pm b/Master/tlpkg/tlperl/site/lib/HTTP/Cookies.pm
index 79ac4f27f84..98bd7421012 100644
--- a/Master/tlpkg/tlperl/site/lib/HTTP/Cookies.pm
+++ b/Master/tlpkg/tlperl/site/lib/HTTP/Cookies.pm
@@ -1,5 +1,5 @@
 package HTTP::Cookies;
-
+$HTTP::Cookies::VERSION = '6.03';
 use strict;
 use HTTP::Date qw(str2time parse_date time2str);
 use HTTP::Headers::Util qw(_split_header_words join_header_words);
@@ -165,12 +165,32 @@ sub add_cookie_header
 	    unshift(@cval, $old);
 	}
 	$request->header(Cookie => join("; ", @cval));
+	if (my $hash = $request->{_http_cookies}) {
+	    %$hash = (map split(/=/, $_, 2), @cval);
+	}
     }
 
     $request;
 }
 
 
+sub get_cookies
+{
+    my $self = shift;
+    my $url = shift;
+    $url = "https://$url" unless $url =~ m,^[a-zA-Z][a-zA-Z0-9.+\-]*:,;
+    require HTTP::Request;
+    my $req = HTTP::Request->new(GET => $url);
+    my $cookies = $req->{_http_cookies} = {};
+    $self->add_cookie_header($req);
+    if (@_) {
+	return map $cookies->{$_}, @_ if wantarray;
+	return $cookies->{$_[0]};
+    }
+    return $cookies;
+}
+
+
 sub extract_cookies
 {
     my $self = shift;
@@ -411,11 +431,9 @@ sub save
 {
     my $self = shift;
     my $file = shift || $self->{'file'} || return;
-    local(*FILE);
-    open(FILE, ">$file") or die "Can't open $file: $!";
-    print FILE "#LWP-Cookies-1.0\n";
-    print FILE $self->as_string(!$self->{ignore_discard});
-    close(FILE);
+    open(my $fh, '>', $file) or die "Can't open $file: $!";
+    print {$fh} "#LWP-Cookies-1.0\n";
+    print {$fh} $self->as_string(!$self->{ignore_discard});
     1;
 }
 
@@ -424,43 +442,47 @@ sub load
 {
     my $self = shift;
     my $file = shift || $self->{'file'} || return;
-    local(*FILE, $_);
+
     local $/ = "\n";  # make sure we got standard record separator
-    open(FILE, $file) or return;
-    my $magic = <FILE>;
-    unless ($magic =~ /^\#LWP-Cookies-(\d+\.\d+)/) {
-	warn "$file does not seem to contain cookies";
-	return;
+    open(my $fh, '<', $file) or return;
+
+    # check that we have the proper header
+    my $magic = <$fh>;
+    chomp $magic;
+    unless ($magic =~ /^#LWP-Cookies-\d+\.\d+/) {
+        warn "$file does not seem to contain cookies";
+        return;
     }
-    while (<FILE>) {
-	next unless s/^Set-Cookie3:\s*//;
-	chomp;
-	my $cookie;
-	for $cookie (_split_header_words($_)) {
-	    my($key,$val) = splice(@$cookie, 0, 2);
-	    my %hash;
-	    while (@$cookie) {
-		my $k = shift @$cookie;
-		my $v = shift @$cookie;
-		$hash{$k} = $v;
-	    }
-	    my $version   = delete $hash{version};
-	    my $path      = delete $hash{path};
-	    my $domain    = delete $hash{domain};
-	    my $port      = delete $hash{port};
-	    my $expires   = str2time(delete $hash{expires});
-
-	    my $path_spec = exists $hash{path_spec}; delete $hash{path_spec};
-	    my $secure    = exists $hash{secure};    delete $hash{secure};
-	    my $discard   = exists $hash{discard};   delete $hash{discard};
-
-	    my @array =	($version,$val,$port,
-			 $path_spec,$secure,$expires,$discard);
-	    push(@array, \%hash) if %hash;
-	    $self->{COOKIES}{$domain}{$path}{$key} = \@array;
-	}
+
+    # go through the file
+    while (my $line = <$fh>) {
+        chomp $line;
+        next unless $line =~ s/^Set-Cookie3:\s*//;
+        my $cookie;
+        for $cookie (_split_header_words($line)) {
+            my($key,$val) = splice(@$cookie, 0, 2);
+            my %hash;
+            while (@$cookie) {
+                my $k = shift @$cookie;
+                my $v = shift @$cookie;
+                $hash{$k} = $v;
+            }
+            my $version   = delete $hash{version};
+            my $path      = delete $hash{path};
+            my $domain    = delete $hash{domain};
+            my $port      = delete $hash{port};
+            my $expires   = str2time(delete $hash{expires});
+
+            my $path_spec = exists $hash{path_spec}; delete $hash{path_spec};
+            my $secure    = exists $hash{secure};    delete $hash{secure};
+            my $discard   = exists $hash{discard};   delete $hash{discard};
+
+            my @array = ($version, $val, $port, $path_spec, $secure, $expires,
+                $discard);
+            push(@array, \%hash) if %hash;
+            $self->{COOKIES}{$domain}{$path}{$key} = \@array;
+        }
     }
-    close(FILE);
     1;
 }
 
@@ -600,12 +622,18 @@ sub _normalize_path  # so that plain string compare can be used
 
 1;
 
-__END__
+=pod
+
+=encoding UTF-8
 
 =head1 NAME
 
 HTTP::Cookies - HTTP cookie jars
 
+=head1 VERSION
+
+version 6.03
+
 =head1 SYNOPSIS
 
   use HTTP::Cookies;
@@ -635,7 +663,7 @@ to both store and retrieve information on the client side of the
 connection.  For more information about cookies refer to
 <URL:http://curl.haxx.se/rfc/cookie_spec.html> and
 <URL:http://www.cookiecentral.com/>.  This module also implements the
-new style cookies described in I<RFC 2965>.
+new style cookies described in L<RFC 2965|https://tools.ietf.org/html/rfc2965>.
 The two variants of cookies are supposed to be able to coexist happily.
 
 Instances of the class I<HTTP::Cookies> are able to store a collection
@@ -644,6 +672,22 @@ information to initialize Cookie-headers in I<HTTP::Request> objects.
 The state of a I<HTTP::Cookies> object can be saved in and restored from
 files.
 
+=head1 LIMITATIONS
+
+This module does not support L<< Public Suffix|https://publicsuffix.org/
+>> encouraged by a more recent standard, L<< RFC
+6265|https://tools.ietf.org/html/rfc6265 >>.
+
+This module's shortcomings mean that a malicious Web site can set
+cookies to track your user agent across all sites under a top level
+domain.  See F<< t/publicsuffix.t >> in this module's distribution for
+details.
+
+L<< HTTP::CookieJar::LWP >> supports Public Suffix, but only provides a
+limited subset of this module's functionality and L<< does not
+support|HTTP::CookieJar/LIMITATIONS-AND-CAVEATS >> standards older than
+I<RFC 6265>.
+
 =head1 METHODS
 
 The following methods are provided:
@@ -668,6 +712,16 @@ Future parameters might include (not yet implemented):
 
   no_cookies   list of domain names that we never return cookies to
 
+=item $cookie_jar->get_cookies( $url_or_domain )
+
+=item $cookie_jar->get_cookies( $url_or_domain, $cookie_key,... )
+
+Returns a hash of the cookies that applies to the given URL. If a
+domainname is given as argument, then a prefix of "https://" is assumed.
+
+If one or more $cookie_key parameters are provided return the given values,
+or C<undef> if the cookie isn't available.
+
 =item $cookie_jar->add_cookie_header( $request )
 
 The add_cookie_header() method will set the appropriate Cookie:-header
@@ -687,7 +741,7 @@ The set_cookie() method updates the state of the $cookie_jar.  The
 $key, $val, $domain, $port and $path arguments are strings.  The
 $path_spec, $secure, $discard arguments are boolean values. The $maxage
 value is a number indicating number of seconds that this cookie will
-live.  A value <= 0 will delete this cookie.  %rest defines
+live.  A value of $maxage <= 0 will delete this cookie.  %rest defines
 various other attributes like "Comment" and "CommentURL".
 
 =item $cookie_jar->save
@@ -772,10 +826,19 @@ cookies with the I<Discard> attribute.
 
 L<HTTP::Cookies::Netscape>, L<HTTP::Cookies::Microsoft>
 
-=head1 COPYRIGHT
+=head1 AUTHOR
+
+Gisle Aas <gisle@activestate.com>
 
-Copyright 1997-2002 Gisle Aas
+=head1 COPYRIGHT AND LICENSE
 
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
+This software is copyright (c) 2002-2017 by Gisle Aas.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
+
+__END__
+#ABSTRACT: HTTP cookie jars
 
diff --git a/Master/tlpkg/tlperl/site/lib/HTTP/Cookies/Microsoft.pm b/Master/tlpkg/tlperl/site/lib/HTTP/Cookies/Microsoft.pm
index 9c69fa364cf..bffa587adf9 100644
--- a/Master/tlpkg/tlperl/site/lib/HTTP/Cookies/Microsoft.pm
+++ b/Master/tlpkg/tlperl/site/lib/HTTP/Cookies/Microsoft.pm
@@ -1,56 +1,56 @@
 package HTTP::Cookies::Microsoft;
-
+$HTTP::Cookies::Microsoft::VERSION = '6.03';
 use strict;
 
 use vars qw(@ISA $VERSION);
 
-$VERSION = "6.00";
+$VERSION = "6.01";
 
 require HTTP::Cookies;
 @ISA=qw(HTTP::Cookies);
 
 sub load_cookies_from_file
 {
-	my ($file) = @_;
-	my @cookies;
-	my ($key, $value, $domain_path, $flags, $lo_expire, $hi_expire);
-	my ($lo_create, $hi_create, $sep);
-
-	open(COOKIES, $file) || return;
-
-	while ($key = <COOKIES>)
-	{
-		chomp($key);
-		chomp($value     = <COOKIES>);
-		chomp($domain_path= <COOKIES>);
-		chomp($flags     = <COOKIES>);		# 0x0001 bit is for secure
-		chomp($lo_expire = <COOKIES>);
-		chomp($hi_expire = <COOKIES>);
-		chomp($lo_create = <COOKIES>);
-		chomp($hi_create = <COOKIES>);
-		chomp($sep       = <COOKIES>);
-
-		if (!defined($key) || !defined($value) || !defined($domain_path) ||
-			!defined($flags) || !defined($hi_expire) || !defined($lo_expire) ||
-			!defined($hi_create) || !defined($lo_create) || !defined($sep) ||
-			($sep ne '*'))
-		{
-			last;
-		}
-
-		if ($domain_path =~ /^([^\/]+)(\/.*)$/)
-		{
-			my $domain = $1;
-			my $path = $2;
-
-			push(@cookies, {KEY => $key, VALUE => $value, DOMAIN => $domain,
-					PATH => $path, FLAGS =>$flags, HIXP =>$hi_expire,
-					LOXP => $lo_expire, HICREATE => $hi_create,
-					LOCREATE => $lo_create});
-		}
-	}
-
-	return \@cookies;
+    my ($file) = @_;
+    my @cookies;
+
+    open (my $fh, '<', $file) || return;
+
+    while (my $key = <$fh>) {
+        chomp $key;
+        my ($value, $domain_path, $flags, $lo_expire, $hi_expire);
+        my ($lo_create, $hi_create, $sep);
+        chomp($value     = <$fh>);
+        chomp($domain_path= <$fh>);
+        chomp($flags     = <$fh>); # 0x0001 bit is for secure
+        chomp($lo_expire = <$fh>);
+        chomp($hi_expire = <$fh>);
+        chomp($lo_create = <$fh>);
+        chomp($hi_create = <$fh>);
+        chomp($sep       = <$fh>);
+
+        if (!defined($key) || !defined($value) || !defined($domain_path) ||
+            !defined($flags) || !defined($hi_expire) || !defined($lo_expire) ||
+            !defined($hi_create) || !defined($lo_create) || !defined($sep) ||
+            ($sep ne '*'))
+        {
+            last;
+        }
+
+        if ($domain_path =~ /^([^\/]+)(\/.*)$/) {
+            my $domain = $1;
+            my $path = $2;
+
+            push @cookies, {
+                KEY => $key, VALUE => $value, DOMAIN => $domain,
+                PATH => $path, FLAGS =>$flags, HIXP =>$hi_expire,
+                LOXP => $lo_expire, HICREATE => $hi_create,
+                LOCREATE => $lo_create
+            };
+        }
+    }
+
+    return \@cookies;
 }
 
 sub get_user_name
@@ -78,7 +78,7 @@ sub epoch_time_offset_from_win32_filetime
 	# 0x019db1de 0xd53e8000 is 1970 Jan 01 00:00:00 in Win32 FILETIME
 	#
 	# 100 nanosecond intervals == 0.1 microsecond intervals
-	
+
 	my $filetime_low32_1970 = 0xd53e8000;
 	my $filetime_high32_1970 = 0x019db1de;
 
@@ -135,7 +135,7 @@ sub load_cookie
 			my $secure = ($cookie->{FLAGS} & 1) != 0;
 			my $expires = epoch_time_offset_from_win32_filetime($cookie->{HIXP}, $cookie->{LOXP});
 
-			$self->set_cookie(undef, $cookie->{KEY}, $cookie->{VALUE}, 
+			$self->set_cookie(undef, $cookie->{KEY}, $cookie->{VALUE},
 					  $cookie->{PATH}, $cookie->{DOMAIN}, undef,
 					  0, $secure, $expires-$now, 0);
 		}
@@ -144,127 +144,109 @@ sub load_cookie
 
 sub load
 {
-	my($self, $cookie_index) = @_;
-	my $now = time() - $HTTP::Cookies::EPOCH_OFFSET;
-	my $cookie_dir = '';
-	my $delay_load = (defined($self->{'delayload'}) && $self->{'delayload'});
-	my $user_name = get_user_name();
-	my $data;
-
-	$cookie_index ||= $self->{'file'} || return;
-	if ($cookie_index =~ /[\\\/][^\\\/]+$/)
-	{
-		$cookie_dir = $` . "\\";
-	}
-
-	local(*INDEX, $_);
-
-	open(INDEX, $cookie_index) || return;
-	binmode(INDEX);
-	if (256 != read(INDEX, $data, 256))
-	{
-		warn "$cookie_index file is not large enough";
-		close(INDEX);
-		return;
-	}
-
-	# Cookies' index.dat file starts with 32 bytes of signature
-	# followed by an offset to the first record, stored as a little-endian DWORD
-	my ($sig, $size) = unpack('a32 V', $data);
-	
-	if (($sig !~ /^Client UrlCache MMF Ver 5\.2/) || # check that sig is valid (only tested in IE6.0)
-		(0x4000 != $size))
-	{
-		warn "$cookie_index ['$sig' $size] does not seem to contain cookies";
-		close(INDEX);
-		return;
-	}
-
-	if (0 == seek(INDEX, $size, 0)) # move the file ptr to start of the first record
-	{
-		close(INDEX);
-		return;
-	}
-
-	# Cookies are usually stored in 'URL ' records in two contiguous 0x80 byte sectors (256 bytes)
-	# so read in two 0x80 byte sectors and adjust if not a Cookie.
-	while (256 == read(INDEX, $data, 256))
-	{
-		# each record starts with a 4-byte signature
-		# and a count (little-endian DWORD) of 0x80 byte sectors for the record
-		($sig, $size) = unpack('a4 V', $data);
-
-		# Cookies are found in 'URL ' records
-		if ('URL ' ne $sig)
-		{
-			# skip over uninteresting record: I've seen 'HASH' and 'LEAK' records
-			if (($sig eq 'HASH') || ($sig eq 'LEAK'))
-			{
-				# '-2' takes into account the two 0x80 byte sectors we've just read in
-				if (($size > 0) && ($size != 2))
-				{
-				    if (0 == seek(INDEX, ($size-2)*0x80, 1))
-				    {
-					    # Seek failed. Something's wrong. Gonna stop.
-					    last;
-				    }
-				}
-			}
-			next;
-		}
-
-		#$REMOVE Need to check if URL records in Cookies' index.dat will
-		#        ever use more than two 0x80 byte sectors
-		if ($size > 2)
-		{
-			my $more_data = ($size-2)*0x80;
-
-			if ($more_data != read(INDEX, $data, $more_data, 256))
-			{
-				last;
-			}
-		}
-
-                (my $user_name2 = $user_name) =~ s/ /_/g;
-		if ($data =~ /Cookie\:\Q$user_name\E\@([\x21-\xFF]+).*?((?:\Q$user_name\E|\Q$user_name2\E)\@[\x21-\xFF]+\.txt)/)
-		{
-			my $cookie_file = $cookie_dir . $2; # form full pathname
-
-			if (!$delay_load)
-			{
-				$self->load_cookie($cookie_file);
-			}
-			else
-			{
-				my $domain = $1;
-
-				# grab only the domain name, drop everything from the first dir sep on
-				if ($domain =~ m{[\\/]})
-				{
-					$domain = $`;
-				}
-
-				# set the delayload cookie for this domain with 
-				# the cookie_file as cookie for later-loading info
-				$self->set_cookie(undef, 'cookie', $cookie_file,
-						      '//+delayload', $domain, undef,
-						      0, 0, $now+86400, 0);
-			}
-		}
-	}
-
-	close(INDEX);
-
-	1;
+    my($self, $cookie_index) = @_;
+    my $now = time() - $HTTP::Cookies::EPOCH_OFFSET;
+    my $cookie_dir = '';
+    my $delay_load = (defined($self->{'delayload'}) && $self->{'delayload'});
+    my $user_name = get_user_name();
+    my $data;
+
+    $cookie_index ||= $self->{'file'} || return;
+    if ($cookie_index =~ /[\\\/][^\\\/]+$/) {
+        $cookie_dir = $` . "\\";
+    }
+
+    open (my $fh, '<:raw', $cookie_index) || return;
+    if (256 != read($fh, $data, 256)) {
+        warn "$cookie_index file is not large enough";
+        return;
+    }
+
+    # Cookies' index.dat file starts with 32 bytes of signature
+    # followed by an offset to the first record, stored as a little-endian DWORD
+    my ($sig, $size) = unpack('a32 V', $data);
+
+    # check that sig is valid (only tested in IE6.0)
+    if (($sig !~ /^Client UrlCache MMF Ver 5\.2/) || (0x4000 != $size)) {
+        warn "$cookie_index ['$sig' $size] does not seem to contain cookies";
+        return;
+    }
+
+    # move the file ptr to start of the first record
+    if (0 == seek($fh, $size, 0)) {
+        return;
+    }
+
+    # Cookies are usually stored in 'URL ' records in two contiguous 0x80 byte sectors (256 bytes)
+    # so read in two 0x80 byte sectors and adjust if not a Cookie.
+    while (256 == read($fh, $data, 256)) {
+        # each record starts with a 4-byte signature
+        # and a count (little-endian DWORD) of 0x80 byte sectors for the record
+        ($sig, $size) = unpack('a4 V', $data);
+
+        # Cookies are found in 'URL ' records
+        if ('URL ' ne $sig) {
+            # skip over uninteresting record: I've seen 'HASH' and 'LEAK' records
+            if (($sig eq 'HASH') || ($sig eq 'LEAK')) {
+                # '-2' takes into account the two 0x80 byte sectors we've just read in
+                if (($size > 0) && ($size != 2)) {
+                    if (0 == seek($fh, ($size-2)*0x80, 1)) {
+                        # Seek failed. Something's wrong. Gonna stop.
+                        last;
+                    }
+                }
+            }
+            next;
+        }
+
+        #$REMOVE Need to check if URL records in Cookies' index.dat will
+        #        ever use more than two 0x80 byte sectors
+        if ($size > 2) {
+            my $more_data = ($size-2)*0x80;
+
+            if ($more_data != read($fh, $data, $more_data, 256)) {
+                last;
+            }
+        }
+
+        (my $user_name2 = $user_name) =~ s/ /_/g;
+        if ($data =~ /Cookie:\Q$user_name\E@([\x21-\xFF]+).*?((?:\Q$user_name\E|\Q$user_name2\E)@[\x21-\xFF]+\.txt)/) {
+            my $cookie_file = $cookie_dir . $2; # form full pathname
+
+            if (!$delay_load) {
+                $self->load_cookie($cookie_file);
+            }
+            else {
+                my $domain = $1;
+
+                # grab only the domain name, drop everything from the first dir sep on
+                if ($domain =~ m{[\\/]}) {
+                    $domain = $`;
+                }
+
+                # set the delayload cookie for this domain with
+                # the cookie_file as cookie for later-loading info
+                $self->set_cookie(undef, 'cookie', $cookie_file, '//+delayload', $domain, undef, 0, 0, $now+86400, 0);
+            }
+        }
+    }
+
+    1;
 }
 
 1;
 
-__END__
+=pod
+
+=encoding UTF-8
 
 =head1 NAME
 
-HTTP::Cookies::Microsoft - access to Microsoft cookies files
+HTTP::Cookies::Microsoft - Access to Microsoft cookies files
+
+=head1 VERSION
+
+version 6.03
 
 =head1 SYNOPSIS
 
@@ -325,5 +307,20 @@ Copyright 2002 Johnny Lee
 This library is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
+=head1 AUTHOR
+
+Gisle Aas <gisle@activestate.com>
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2002-2017 by Gisle Aas.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
 =cut
 
+__END__
+
+#ABSTRACT: Access to Microsoft cookies files
+
diff --git a/Master/tlpkg/tlperl/site/lib/HTTP/Cookies/Netscape.pm b/Master/tlpkg/tlperl/site/lib/HTTP/Cookies/Netscape.pm
index 5972029e558..180d5ff8116 100644
--- a/Master/tlpkg/tlperl/site/lib/HTTP/Cookies/Netscape.pm
+++ b/Master/tlpkg/tlperl/site/lib/HTTP/Cookies/Netscape.pm
@@ -1,38 +1,37 @@
 package HTTP::Cookies::Netscape;
-
+$HTTP::Cookies::Netscape::VERSION = '6.03';
 use strict;
 use vars qw(@ISA $VERSION);
 
-$VERSION = "6.00";
+$VERSION = "6.01";
 
 require HTTP::Cookies;
 @ISA=qw(HTTP::Cookies);
 
 sub load
 {
-    my($self, $file) = @_;
+    my ($self, $file) = @_;
     $file ||= $self->{'file'} || return;
-    local(*FILE, $_);
+
     local $/ = "\n";  # make sure we got standard record separator
-    my @cookies;
-    open(FILE, $file) || return;
-    my $magic = <FILE>;
-    unless ($magic =~ /^\#(?: Netscape)? HTTP Cookie File/) {
-	warn "$file does not look like a netscape cookies file" if $^W;
-	close(FILE);
-	return;
+    open (my $fh, '<', $file) || return;
+    my $magic = <$fh>;
+    chomp $magic;
+    unless ($magic =~ /^#(?: Netscape)? HTTP Cookie File/) {
+        warn "$file does not look like a netscape cookies file";
+        return;
     }
+
     my $now = time() - $HTTP::Cookies::EPOCH_OFFSET;
-    while (<FILE>) {
-	next if /^\s*\#/;
-	next if /^\s*$/;
-	tr/\n\r//d;
-	my($domain,$bool1,$path,$secure, $expires,$key,$val) = split(/\t/, $_);
-	$secure = ($secure eq "TRUE");
-	$self->set_cookie(undef,$key,$val,$path,$domain,undef,
-			  0,$secure,$expires-$now, 0);
+    while (my $line = <$fh>) {
+        chomp($line);
+        next if $line =~ /^\s*\#/;
+        next if $line =~ /^\s*$/;
+        $line =~ tr/\n\r//d;
+        my($domain,$bool1,$path,$secure, $expires,$key,$val) = split(/\t/, $line);
+        $secure = ($secure eq "TRUE");
+        $self->set_cookie(undef, $key, $val, $path, $domain, undef, 0, $secure, $expires-$now, 0);
     }
-    close(FILE);
     1;
 }
 
@@ -40,12 +39,12 @@ sub save
 {
     my($self, $file) = @_;
     $file ||= $self->{'file'} || return;
-    local(*FILE, $_);
-    open(FILE, ">$file") || return;
+
+    open(my $fh, '>', $file) || return;
 
     # Use old, now broken link to the old cookie spec just in case something
     # else (not us!) requires the comment block exactly this way.
-    print FILE <<EOT;
+    print {$fh} <<EOT;
 # Netscape HTTP Cookie File
 # http://www.netscape.com/newsref/std/cookie_spec.html
 # This is a generated file!  Do not edit.
@@ -54,25 +53,30 @@ EOT
 
     my $now = time - $HTTP::Cookies::EPOCH_OFFSET;
     $self->scan(sub {
-	my($version,$key,$val,$path,$domain,$port,
-	   $path_spec,$secure,$expires,$discard,$rest) = @_;
-	return if $discard && !$self->{ignore_discard};
-	$expires = $expires ? $expires - $HTTP::Cookies::EPOCH_OFFSET : 0;
-	return if $now > $expires;
-	$secure = $secure ? "TRUE" : "FALSE";
-	my $bool = $domain =~ /^\./ ? "TRUE" : "FALSE";
-	print FILE join("\t", $domain, $bool, $path, $secure, $expires, $key, $val), "\n";
+        my ($version, $key, $val, $path, $domain, $port, $path_spec, $secure, $expires, $discard, $rest) = @_;
+        return if $discard && !$self->{ignore_discard};
+        $expires = $expires ? $expires - $HTTP::Cookies::EPOCH_OFFSET : 0;
+        return if $now > $expires;
+        $secure = $secure ? "TRUE" : "FALSE";
+        my $bool = $domain =~ /^\./ ? "TRUE" : "FALSE";
+        print {$fh} join("\t", $domain, $bool, $path, $secure, $expires, $key, $val), "\n";
     });
-    close(FILE);
     1;
 }
 
 1;
-__END__
+
+=pod
+
+=encoding UTF-8
 
 =head1 NAME
 
-HTTP::Cookies::Netscape - access to Netscape cookies files
+HTTP::Cookies::Netscape - Access to Netscape cookies files
+
+=head1 VERSION
+
+version 6.03
 
 =head1 SYNOPSIS
 
@@ -97,18 +101,27 @@ Please note that the Netscape/Mozilla cookie file format can't store
 all the information available in the Set-Cookie2 headers, so you will
 probably lose some information if you save in this format.
 
-At time of writing, this module seems to work fine with Mozilla      
+At time of writing, this module seems to work fine with Mozilla
 Phoenix/Firebird.
 
 =head1 SEE ALSO
 
 L<HTTP::Cookies::Microsoft>
 
-=head1 COPYRIGHT
+=head1 AUTHOR
+
+Gisle Aas <gisle@activestate.com>
+
+=head1 COPYRIGHT AND LICENSE
 
-Copyright 2002-2003 Gisle Aas
+This software is copyright (c) 2002-2017 by Gisle Aas.
 
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
 
 =cut
+
+__END__
+
+#ABSTRACT: Access to Netscape cookies files
+
diff --git a/Master/tlpkg/tlperl/site/lib/LWP.pm b/Master/tlpkg/tlperl/site/lib/LWP.pm
index 6210d5911c8..b3a174af3ad 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP.pm
@@ -1,15 +1,17 @@
 package LWP;
 
-$VERSION = "6.15";
-sub Version { $VERSION; }
+our $VERSION = '6.25';
 
-require 5.008;
 require LWP::UserAgent;  # this should load everything you need
 
+sub Version { $VERSION; }
+
 1;
 
 __END__
 
+=pod
+
 =encoding utf-8
 
 =head1 NAME
@@ -49,8 +51,8 @@ used separately or together.
 =item *
 
 Provides an object oriented model of HTTP-style communication.  Within
-this framework we currently support access to http, https, gopher, ftp, news,
-file, and mailto resources.
+this framework we currently support access to C<http>, C<https>, C<gopher>,
+C<ftp>, C<news>, C<file>, and C<mailto> resources.
 
 =item *
 
@@ -141,11 +143,11 @@ It is as simple as that!
 
 =head2 The Request Object
 
-The libwww-perl request object has the class name C<HTTP::Request>.
+The libwww-perl request object has the class name L<HTTP::Request>.
 The fact that the class name uses C<HTTP::> as a
 prefix only implies that we use the HTTP model of communication.  It
 does not limit the kind of services we can try to pass this I<request>
-to.  For instance, we will send C<HTTP::Request>s both to ftp and
+to.  For instance, we will send L<HTTP::Request>s both to ftp and
 gopher servers, as well as to the local file system.
 
 The main attributes of the request objects are:
@@ -178,7 +180,7 @@ B<content> is an arbitrary amount of data.
 
 =head2 The Response Object
 
-The libwww-perl response object has the class name C<HTTP::Response>.
+The libwww-perl response object has the class name L<HTTP::Response>.
 The main attributes of objects of this class are:
 
 =over 3
@@ -239,11 +241,11 @@ The user agent is an interface layer between
 your application code and the network.  Through this interface you are
 able to access the various servers on the network.
 
-The class name for the user agent is C<LWP::UserAgent>.  Every
+The class name for the user agent is L<LWP::UserAgent>.  Every
 libwww-perl application that wants to communicate should create at
 least one object of this class. The main method provided by this
-object is request(). This method takes an C<HTTP::Request> object as
-argument and (eventually) returns a C<HTTP::Response> object.
+object is request(). This method takes an L<HTTP::Request> object as
+argument and (eventually) returns a L<HTTP::Response> object.
 
 The user agent has many other attributes that let you
 configure how it will interact with the network and with your
@@ -287,8 +289,8 @@ passwords needed to access certain services.
 
 Many applications want even more control over how they interact
 with the network and they get this by sub-classing
-C<LWP::UserAgent>.  The library includes a
-sub-class, C<LWP::RobotUA>, for robot applications.
+L<LWP::UserAgent>.  The library includes a
+sub-class, L<LWP::RobotUA>, for robot applications.
 
 =head2 An Example
 
@@ -405,7 +407,7 @@ using the "Range" header.
 
 Directory listings are by default returned unprocessed (as returned
 from the ftp server) with the content media type reported to be
-"text/ftp-dir-listing". The C<File::Listing> module provides methods
+"text/ftp-dir-listing". The L<File::Listing> module provides methods
 for parsing of these directory listing.
 
 The ftp module is also able to convert directory listings to HTML and
@@ -417,7 +419,7 @@ For normal file retrievals, the "Content-Type" is guessed based on the
 file name suffix. See L<LWP::MediaTypes>.
 
 The "If-Modified-Since" request header works for servers that implement
-the MDTM command.  It will probably not work for directory listings though.
+the C<MDTM> command.  It will probably not work for directory listings though.
 
 Example:
 
@@ -497,7 +499,7 @@ Example:
 
 =head2 CPAN Requests
 
-URLs with scheme C<cpan:> are redirected to the a suitable CPAN
+URLs with scheme C<cpan:> are redirected to a suitable CPAN
 mirror.  If you have your own local mirror of CPAN you might tell LWP
 to use it for C<cpan:> URLs by an assignment like this:
 
@@ -569,7 +571,7 @@ The following environment variables are used by LWP:
 
 =item HOME
 
-The C<LWP::MediaTypes> functions will look for the F<.media.types> and
+The L<LWP::MediaTypes> functions will look for the F<.media.types> and
 F<.mime.types> files relative to you home directory.
 
 =item http_proxy
@@ -586,13 +588,13 @@ L<LWP::UserAgent>.
 
 =item PERL_LWP_ENV_PROXY
 
-If set to a TRUE value, then the C<LWP::UserAgent> will by default call
+If set to a TRUE value, then the L<LWP::UserAgent> will by default call
 C<env_proxy> during initialization.  This makes LWP honor the proxy variables
 described above.
 
 =item PERL_LWP_SSL_VERIFY_HOSTNAME
 
-The default C<verify_hostname> setting for C<LWP::UserAgent>.  If
+The default C<verify_hostname> setting for L<LWP::UserAgent>.  If
 not set the default will be 1.  Set it as 0 to disable hostname
 verification (the default prior to libwww-perl 5.840.
 
@@ -606,8 +608,8 @@ is located.  See L<LWP::UserAgent> for details.
 
 =item PERL_HTTP_URI_CLASS
 
-Used to decide what URI objects to instantiate.  The default is C<URI>.
-You might want to set it to C<URI::URL> for compatibility with old times.
+Used to decide what URI objects to instantiate.  The default is L<URI>.
+You might want to set it to L<URI::URL> for compatibility with old times.
 
 =back
 
@@ -632,7 +634,7 @@ Markus B Krüger, Markus Laker, Martijn Koster, Martin Thurn, Matthew
 Eldridge, Matthew.van.Eerde, Matt Sergeant, Michael A. Chase, Michael
 Quaranta, Michael Thompson, Mike Schilli, Moshe Kaminsky, Nathan
 Torkington, Nicolai Langfeldt, Norton Allen, Olly Betts, Paul
-J. Schinder, peterm, Philip GuentherDaniel Buenzli, Pon Hwa Lin,
+J. Schinder, peterm, Philip Guenther, Daniel Buenzli, Pon Hwa Lin,
 Radoslaw Zielinski, Radu Greab, Randal L. Schwartz, Richard Chen,
 Robin Barker, Roy Fielding, Sander van Zoest, Sean M. Burke,
 shildreth, Slaven Rezic, Steve A Fink, Steve Hay, Steven Butler,
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Authen/Basic.pm b/Master/tlpkg/tlperl/site/lib/LWP/Authen/Basic.pm
index e7815bd247f..18fe8cd5f1c 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Authen/Basic.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Authen/Basic.pm
@@ -1,4 +1,5 @@
 package LWP::Authen::Basic;
+$LWP::Authen::Basic::VERSION = '6.25';
 use strict;
 
 require MIME::Base64;
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Authen/Digest.pm b/Master/tlpkg/tlperl/site/lib/LWP/Authen/Digest.pm
index 6fe542e29b3..2e80af49729 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Authen/Digest.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Authen/Digest.pm
@@ -1,5 +1,5 @@
 package LWP::Authen::Digest;
-
+$LWP::Authen::Digest::VERSION = '6.25';
 use strict;
 use base 'LWP::Authen::Basic';
 
@@ -59,7 +59,7 @@ sub auth_header {
     for (@order) {
 	next unless defined $resp{$_};
 
-	# RFC2617 sais that qop-value and nc-value should be unquoted.
+	# RFC2617 says that qop-value and nc-value should be unquoted.
 	if ( $_ eq 'qop' || $_ eq 'nc' ) {
 		push(@pairs, "$_=" . $resp{$_});
 	}
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Authen/Ntlm.pm b/Master/tlpkg/tlperl/site/lib/LWP/Authen/Ntlm.pm
index 7cdbf34ef57..7fd0a827f3d 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Authen/Ntlm.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Authen/Ntlm.pm
@@ -1,9 +1,8 @@
 package LWP::Authen::Ntlm;
 
 use strict;
-use vars qw/$VERSION/;
 
-$VERSION = "6.15";
+our $VERSION = '6.25';
 
 use Authen::NTLM "1.02";
 use MIME::Base64 "2.12";
@@ -32,9 +31,9 @@ sub authenticate {
 
     my $auth_header = $proxy ? "Proxy-Authorization" : "Authorization";
 
-	# my ($challenge) = $response->header('WWW-Authenticate'); 
+	# my ($challenge) = $response->header('WWW-Authenticate');
 	my $challenge;
-	foreach ($response->header('WWW-Authenticate')) { 
+	foreach ($response->header('WWW-Authenticate')) {
 		last if /^NTLM/ && ($challenge=$_);
 	}
 
@@ -62,7 +61,7 @@ sub authenticate {
 	    $referral->header($auth_header => $auth_value);
 	    return $ua->request($referral, $arg, $size, $response);
 	}
-	
+
 	else {
 		# Second phase, use the response challenge (unless non-401 code
 		#  was returned, in which case, we just send back the response
@@ -73,7 +72,7 @@ sub authenticate {
 		}
 		else {
 			my $challenge;
-			foreach ($response->header('WWW-Authenticate')) { 
+			foreach ($response->header('WWW-Authenticate')) {
 				last if /^NTLM/ && ($challenge=$_);
 			}
 			$challenge =~ s/^NTLM //;
@@ -90,7 +89,9 @@ sub authenticate {
 }
 
 1;
+__END__
 
+=pod
 
 =head1 NAME
 
@@ -116,26 +117,26 @@ LWP::Authen::Ntlm - Library for enabling NTLM authentication (Microsoft) in LWP
 
 =head1 DESCRIPTION
 
-C<LWP::Authen::Ntlm> allows LWP to authenticate against servers that are using the 
-NTLM authentication scheme popularized by Microsoft.  This type of authentication is 
+L<LWP::Authen::Ntlm> allows LWP to authenticate against servers that are using the
+NTLM authentication scheme popularized by Microsoft.  This type of authentication is
 common on intranets of Microsoft-centric organizations.
 
-The module takes advantage of the Authen::NTLM module by Mark Bush.  Since there 
-is also another Authen::NTLM module available from CPAN by Yee Man Chan with an 
-entirely different interface, it is necessary to ensure that you have the correct 
+The module takes advantage of the Authen::NTLM module by Mark Bush.  Since there
+is also another Authen::NTLM module available from CPAN by Yee Man Chan with an
+entirely different interface, it is necessary to ensure that you have the correct
 NTLM module.
 
-In addition, there have been problems with incompatibilities between different 
-versions of Mime::Base64, which Bush's Authen::NTLM makes use of.  Therefore, it is 
-necessary to ensure that your Mime::Base64 module supports exporting of the 
+In addition, there have been problems with incompatibilities between different
+versions of Mime::Base64, which Bush's Authen::NTLM makes use of.  Therefore, it is
+necessary to ensure that your Mime::Base64 module supports exporting of the
 encode_base64 and decode_base64 functions.
 
 =head1 USAGE
 
-The module is used indirectly through LWP, rather than including it directly in your 
-code.  The LWP system will invoke the NTLM authentication when it encounters the 
-authentication scheme while attempting to retrieve a URL from a server.  In order 
-for the NTLM authentication to work, you must have a few things set up in your 
+The module is used indirectly through LWP, rather than including it directly in your
+code.  The LWP system will invoke the NTLM authentication when it encounters the
+authentication scheme while attempting to retrieve a URL from a server.  In order
+for the NTLM authentication to work, you must have a few things set up in your
 code prior to attempting to retrieve the URL:
 
 =over 4
@@ -156,9 +157,9 @@ The credentials must be set like this:
 
    $ua->credentials('www.company.com:80', '', "MyDomain\\MyUserCode", 'MyPassword');
 
-Note that you cannot use the HTTP::Request object's authorization_basic() method to set 
-the credentials.  Note, too, that the 'www.company.com:80' portion only sets credentials 
-on the specified port AND it is case-sensitive (this is due to the way LWP is coded, and 
+Note that you cannot use the HTTP::Request object's authorization_basic() method to set
+the credentials.  Note, too, that the 'www.company.com:80' portion only sets credentials
+on the specified port AND it is case-sensitive (this is due to the way LWP is coded, and
 has nothing to do with LWP::Authen::Ntlm)
 
 =back
@@ -178,3 +179,5 @@ under the same terms as Perl itself.
 =head1 SEE ALSO
 
 L<LWP>, L<LWP::UserAgent>, L<lwpcook>.
+
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/ConnCache.pm b/Master/tlpkg/tlperl/site/lib/LWP/ConnCache.pm
index 9c7753db8de..172e2f49a5b 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/ConnCache.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/ConnCache.pm
@@ -1,10 +1,9 @@
 package LWP::ConnCache;
 
 use strict;
-use vars qw($VERSION $DEBUG);
-
-$VERSION = "6.15";
 
+our $VERSION = '6.25';
+our $DEBUG;
 
 sub new {
     my($class, %cnf) = @_;
@@ -169,6 +168,8 @@ sub _looks_like_number {
 
 __END__
 
+=pod
+
 =head1 NAME
 
 LWP::ConnCache - Connection cache manager
@@ -188,32 +189,58 @@ change in the future.
 =head1 DESCRIPTION
 
 The C<LWP::ConnCache> class is the standard connection cache manager
-for LWP::UserAgent.
+for L<LWP::UserAgent>.
+
+=head1 METHODS
 
 The following basic methods are provided:
 
-=over
+=head2 new
+
+    my $cache = LWP::ConnCache->new( %options )
 
-=item $cache = LWP::ConnCache->new( %options )
+This method constructs a new L<LWP::ConnCache> object.  The only
+option currently accepted is C<total_capacity>.  If specified it
+initialize the L<LWP::ConnCache/total_capacity> option. It defaults to C<1>.
 
-This method constructs a new C<LWP::ConnCache> object.  The only
-option currently accepted is 'total_capacity'.  If specified it
-initialize the total_capacity option.  It defaults to the value 1.
+=head2 total_capacity
 
-=item $cache->total_capacity( [$num_connections] )
+    my $cap = $cache->total_capacity;
+    $cache->total_capacity(0); # drop all immediately
+    $cache->total_capacity(undef); # no limit
+    $cache->total_capacity($number);
 
 Get/sets the number of connection that will be cached.  Connections
 will start to be dropped when this limit is reached.  If set to C<0>,
 then all connections are immediately dropped.  If set to C<undef>,
 then there is no limit.
 
-=item $cache->capacity($type, [$num_connections] )
+=head2 capacity
+
+    my $http_capacity = $cache->capacity('http');
+    $cache->capacity('http', 2 );
 
 Get/set a limit for the number of connections of the specified type
-that can be cached.  The $type will typically be a short string like
+that can be cached.  The first parameter is a short string like
 "http" or "ftp".
 
-=item $cache->drop( [$checker, [$reason]] )
+=head2 drop
+
+    $cache->drop(); # Drop ALL connections
+    # which is just a synonym for:
+    $cache->drop(sub{1}); # Drop ALL connections
+    # drop all connections older than 22 seconds and add a reason for it!
+    $cache->drop(22, "Older than 22 secs dropped");
+    # which is just a synonym for:
+    $cache->drop(sub {
+        my ($conn, $type, $key, $deposit_time) = @_;
+        if ($deposit_time < 22) {
+            # true values drop the connection
+            return 1;
+        }
+        # false values don't drop the connection
+        return 0;
+    }, "Older than 22 secs dropped" );
 
 Drop connections by some criteria.  The $checker argument is a
 subroutine that is called for each connection.  If the routine returns
@@ -226,41 +253,49 @@ connections untouched that the given number of seconds or more are
 dropped.  If $checker is a string then all connections of the given
 type are dropped.
 
-The $reason argument is passed on to the dropped() method.
+The C<reason> is passed on to the L<LWP::ConnCache/dropped> method.
+
+=head2 prune
 
-=item $cache->prune
+    $cache->prune();
 
 Calling this method will drop all connections that are dead.  This is
-tested by calling the ping() method on the connections.  If the ping()
-method exists and returns a FALSE value, then the connection is
-dropped.
+tested by calling the L<LWP::ConnCache/ping> method on the connections. If
+the L<LWP::ConnCache/ping> method exists and returns a false value, then the
+connection is dropped.
+
+=head2 get_types
 
-=item $cache->get_types
+    my @types = $cache->get_types();
 
-This returns all the 'type' fields used for the currently cached
+This returns all the C<type> fields used for the currently cached
 connections.
 
-=item $cache->get_connections( [$type] )
+=head2 get_connections
+
+    my @conns = $cache->get_connections(); # all connections
+    my @conns = $cache->get_connections('http'); # connections for http
 
 This returns all connection objects of the specified type.  If no type
 is specified then all connections are returned.  In scalar context the
 number of cached connections of the specified type is returned.
 
-=back
-
+=head1 PROTOCOL METHODS
 
 The following methods are called by low-level protocol modules to
 try to save away connections and to get them back.
 
-=over
+=head2 deposit
 
-=item $cache->deposit($type, $key, $conn)
+    $cache->deposit($type, $key, $conn);
 
-This method adds a new connection to the cache.  As a result other
+This method adds a new connection to the cache.  As a result, other
 already cached connections might be dropped.  Multiple connections with
-the same $type/$key might added.
+the same type/key might be added.
+
+=head2 withdraw
 
-=item $conn = $cache->withdraw($type, $key)
+    my $conn = $cache->withdraw($type, $key);
 
 This method tries to fetch back a connection that was previously
 deposited.  If no cached connection with the specified $type/$key is
@@ -268,35 +303,35 @@ found, then C<undef> is returned.  There is not guarantee that a
 deposited connection can be withdrawn, as the cache manger is free to
 drop connections at any time.
 
-=back
+=head1 INTERNAL METHODS
 
 The following methods are called internally.  Subclasses might want to
 override them.
 
-=over
+=head2 enforce_limits
 
-=item $conn->enforce_limits([$type])
+    $conn->enforce_limits([$type])
 
 This method is called with after a new connection is added (deposited)
 in the cache or capacity limits are adjusted.  The default
 implementation drops connections until the specified capacity limits
 are not exceeded.
 
-=item $conn->dropping($conn_record, $reason)
+=head2 dropping
+
+    $conn->dropping($conn_record, $reason)
 
 This method is called when a connection is dropped.  The record
 belonging to the dropped connection is passed as the first argument
 and a string describing the reason for the drop is passed as the
 second argument.  The default implementation makes some noise if the
-$LWP::ConnCache::DEBUG variable is set and nothing more.
-
-=back
+C<$LWP::ConnCache::DEBUG> variable is set and nothing more.
 
 =head1 SUBCLASSING
 
 For specialized cache policy it makes sense to subclass
-C<LWP::ConnCache> and perhaps override the deposit(), enforce_limits()
-and dropping() methods.
+C<LWP::ConnCache> and perhaps override the L<LWP::ConnCache/deposit>,
+L<LWP::ConnCache/enforce_limits>, and L<LWP::ConnCache/dropping> methods.
 
 The object itself is a hash.  Keys prefixed with C<cc_> are reserved
 for the base class.
@@ -311,3 +346,5 @@ Copyright 2001 Gisle Aas.
 
 This library is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
+
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Debug.pm b/Master/tlpkg/tlperl/site/lib/LWP/Debug.pm
index 99011d57ab7..f7334c425df 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Debug.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Debug.pm
@@ -1,65 +1,58 @@
-package LWP::Debug;  # legacy
-
+package LWP::Debug;    # legacy
+$LWP::Debug::VERSION = '6.25';
 require Exporter;
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(level trace debug conns);
+our @ISA       = qw(Exporter);
+our @EXPORT_OK = qw(level trace debug conns);
 
 use Carp ();
 
 my @levels = qw(trace debug conns);
-%current_level = ();
-
+our %current_level = ();
 
-sub import
-{
-    my $pack = shift;
+sub import {
+    my $pack    = shift;
     my $callpkg = caller(0);
     my @symbols = ();
-    my @levels = ();
+    my @levels  = ();
     for (@_) {
-	if (/^[-+]/) {
-	    push(@levels, $_);
-	}
-	else {
-	    push(@symbols, $_);
-	}
+        if (/^[-+]/) {
+            push(@levels, $_);
+        }
+        else {
+            push(@symbols, $_);
+        }
     }
     Exporter::export($pack, $callpkg, @symbols);
     level(@levels);
 }
 
-
-sub level
-{
+sub level {
     for (@_) {
-	if ($_ eq '+') {              # all on
-	    # switch on all levels
-	    %current_level = map { $_ => 1 } @levels;
-	}
-	elsif ($_ eq '-') {           # all off
-	    %current_level = ();
-	}
-	elsif (/^([-+])(\w+)$/) {
-	    $current_level{$2} = $1 eq '+';
-	}
-	else {
-	    Carp::croak("Illegal level format $_");
-	}
+        if ($_ eq '+') {    # all on
+                            # switch on all levels
+            %current_level = map { $_ => 1 } @levels;
+        }
+        elsif ($_ eq '-') {    # all off
+            %current_level = ();
+        }
+        elsif (/^([-+])(\w+)$/) {
+            $current_level{$2} = $1 eq '+';
+        }
+        else {
+            Carp::croak("Illegal level format $_");
+        }
     }
 }
 
+sub trace { _log(@_) if $current_level{'trace'}; }
+sub debug { _log(@_) if $current_level{'debug'}; }
+sub conns { _log(@_) if $current_level{'conns'}; }
 
-sub trace  { _log(@_) if $current_level{'trace'}; }
-sub debug  { _log(@_) if $current_level{'debug'}; }
-sub conns  { _log(@_) if $current_level{'conns'}; }
-
-
-sub _log
-{
+sub _log {
     my $msg = shift;
-    $msg .= "\n" unless $msg =~ /\n$/;  # ensure trailing "\n"
+    $msg .= "\n" unless $msg =~ /\n$/;    # ensure trailing "\n"
 
-    my($package,$filename,$line,$sub) = caller(2);
+    my ($package, $filename, $line, $sub) = caller(2);
     print STDERR "$sub: $msg";
 }
 
@@ -67,6 +60,8 @@ sub _log
 
 __END__
 
+=pod
+
 =head1 NAME
 
 LWP::Debug - deprecated
@@ -85,8 +80,8 @@ section provides some hints about recommended replacements.
 =head2 Network traffic monitoring
 
 The best way to monitor the network traffic that LWP generates is to
-use an external TCP monitoring program.  The Wireshark program
-(L<http://www.wireshark.org/>) is highly recommended for this.
+use an external TCP monitoring program.  The
+L<WireShark|http://www.wireshark.org/> program is highly recommended for this.
 
 Another approach it to use a debugging HTTP proxy server and make
 LWP direct all its traffic via this one.  Call C<< $ua->proxy >> to
@@ -108,3 +103,5 @@ request and response objects that pass through LWP:
 =head1 SEE ALSO
 
 L<LWP::UserAgent>
+
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Debug/TraceHTTP.pm b/Master/tlpkg/tlperl/site/lib/LWP/Debug/TraceHTTP.pm
new file mode 100644
index 00000000000..4dc70a096f7
--- /dev/null
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Debug/TraceHTTP.pm
@@ -0,0 +1,26 @@
+package LWP::Debug::TraceHTTP;
+$LWP::Debug::TraceHTTP::VERSION = '6.25';
+# Just call:
+#
+#   require LWP::Debug::TraceHTTP;
+#   LWP::Protocol::implementor('http', 'LWP::Debug::TraceHTTP');
+#
+# to use this module to trace all calls to the HTTP socket object in
+# programs that use LWP.
+
+use strict;
+use base 'LWP::Protocol::http';
+
+package LWP::Debug::TraceHTTP::Socket;
+$LWP::Debug::TraceHTTP::Socket::VERSION = '6.25';
+use Data::Dump 1.13;
+use Data::Dump::Trace qw(autowrap mcall);
+
+autowrap("LWP::Protocol::http::Socket" => "sock");
+
+sub new {
+    my $class = shift;
+    return mcall("LWP::Protocol::http::Socket" => "new", undef, @_);
+}
+
+1;
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/DebugFile.pm b/Master/tlpkg/tlperl/site/lib/LWP/DebugFile.pm
index aacdfca0fe5..681415f4ccd 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/DebugFile.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/DebugFile.pm
@@ -1,5 +1,5 @@
 package LWP::DebugFile;
-
+$LWP::DebugFile::VERSION = '6.25';
 # legacy stub
 
 1;
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/MemberMixin.pm b/Master/tlpkg/tlperl/site/lib/LWP/MemberMixin.pm
index e5ee6f6382e..d56a2e8abad 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/MemberMixin.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/MemberMixin.pm
@@ -1,10 +1,9 @@
 package LWP::MemberMixin;
-
-sub _elem
-{
+$LWP::MemberMixin::VERSION = '6.25';
+sub _elem {
     my $self = shift;
     my $elem = shift;
-    my $old = $self->{$elem};
+    my $old  = $self->{$elem};
     $self->{$elem} = shift if @_;
     return $old;
 }
@@ -13,6 +12,8 @@ sub _elem
 
 __END__
 
+=pod
+
 =head1 NAME
 
 LWP::MemberMixin - Member access mixin class
@@ -20,20 +21,21 @@ LWP::MemberMixin - Member access mixin class
 =head1 SYNOPSIS
 
  package Foo;
- require LWP::MemberMixin;
- @ISA=qw(LWP::MemberMixin);
+ use base qw(LWP::MemberMixin);
 
 =head1 DESCRIPTION
 
 A mixin class to get methods that provide easy access to member
-variables in the %$self.
+variables in the C<%$self>.
 Ideally there should be better Perl language support for this.
 
+=head1 METHODS
+
 There is only one method provided:
 
-=over 4
+=head2 _elem
 
-=item _elem($elem [, $val])
+    _elem($elem [, $val])
 
 Internal method to get/set the value of member variable
 C<$elem>. If C<$val> is present it is used as the new value
@@ -41,4 +43,4 @@ for the member variable.  If it is not present the current
 value is not touched. In both cases the previous value of
 the member variable is returned.
 
-=back
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol.pm
index 626bb005c83..3adbaf3de49 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Protocol.pm
@@ -1,18 +1,17 @@
 package LWP::Protocol;
 
-require LWP::MemberMixin;
-@ISA = qw(LWP::MemberMixin);
-$VERSION = "6.15";
+use base 'LWP::MemberMixin';
+
+our $VERSION = '6.25';
 
 use strict;
 use Carp ();
 use HTTP::Status ();
-use HTTP::Response;
+use HTTP::Response ();
+use Try::Tiny qw(try catch);
 
 my %ImplementedBy = (); # scheme => classname
 
-
-
 sub new
 {
     my($class, $scheme, $ua) = @_;
@@ -62,16 +61,21 @@ sub implementor
     no strict 'refs';
     # check we actually have one for the scheme:
     unless (@{"${ic}::ISA"}) {
-	# try to autoload it
-	eval "require $ic";
-	if ($@) {
-	    if ($@ =~ /Can't locate/) { #' #emacs get confused by '
-		$ic = '';
-	    }
-	    else {
-		die "$@\n";
-	    }
-	}
+        # try to autoload it
+        try {
+            (my $class = $ic) =~ s{::}{/}g;
+            $class .= '.pm' unless $class =~ /\.pm$/;
+            require $class;
+        }
+        catch {
+            my $error = $_;
+            if ($error =~ /Can't locate/) {
+                $ic = '';
+            }
+            else {
+                die "$error\n";
+            }
+        };
     }
     $ImplementedBy{$scheme} = $ic if $ic;
     $ic;
@@ -96,8 +100,8 @@ sub collect
     my $content;
     my($ua, $max_size) = @{$self}{qw(ua max_size)};
 
-    eval {
-	local $\; # protect the print below from surprises
+    try {
+        local $\; # protect the print below from surprises
         if (!defined($arg) || !$response->is_success) {
             $response->{default_add_content} = 1;
         }
@@ -160,17 +164,15 @@ sub collect
                 last;
             }
         }
+    }
+    catch {
+        my $error = $_;
+        chomp($error);
+        $response->push_header('X-Died' => $error);
+        $response->push_header("Client-Aborted", "die");
     };
-    my $err = $@;
     delete $response->{handlers}{response_data};
     delete $response->{handlers} unless %{$response->{handlers}};
-    if ($err) {
-        chomp($err);
-        $response->push_header('X-Died' => $err);
-        $response->push_header("Client-Aborted", "die");
-        return $response;
-    }
-
     return $response;
 }
 
@@ -191,6 +193,8 @@ sub collect_once
 
 __END__
 
+=pod
+
 =head1 NAME
 
 LWP::Protocol - Base class for LWP protocols
@@ -198,85 +202,93 @@ LWP::Protocol - Base class for LWP protocols
 =head1 SYNOPSIS
 
  package LWP::Protocol::foo;
- require LWP::Protocol;
- @ISA=qw(LWP::Protocol);
+ use base qw(LWP::Protocol);
 
 =head1 DESCRIPTION
 
-This class is used a the base class for all protocol implementations
+This class is used as the base class for all protocol implementations
 supported by the LWP library.
 
 When creating an instance of this class using
 C<LWP::Protocol::create($url)>, and you get an initialized subclass
 appropriate for that access method. In other words, the
-LWP::Protocol::create() function calls the constructor for one of its
+L<LWP::Protocol/create> function calls the constructor for one of its
 subclasses.
 
-All derived LWP::Protocol classes need to override the request()
+All derived C<LWP::Protocol> classes need to override the request()
 method which is used to service a request. The overridden method can
 make use of the collect() function to collect together chunks of data
 as it is received.
 
+=head1 METHODS
+
 The following methods and functions are provided:
 
-=over 4
+=head2 new
 
-=item $prot = LWP::Protocol->new()
+    my $prot = LWP::Protocol->new();
 
 The LWP::Protocol constructor is inherited by subclasses. As this is a
 virtual base class this method should B<not> be called directly.
 
-=item $prot = LWP::Protocol::create($scheme)
+=head2 create
+
+    my $prot = LWP::Protocol::create($scheme)
 
 Create an object of the class implementing the protocol to handle the
 given scheme. This is a function, not a method. It is more an object
 factory than a constructor. This is the function user agents should
 use to access protocols.
 
-=item $class = LWP::Protocol::implementor($scheme, [$class])
+=head2 implementor
+
+    my $class = LWP::Protocol::implementor($scheme, [$class])
 
-Get and/or set implementor class for a scheme.  Returns '' if the
+Get and/or set implementor class for a scheme.  Returns C<''> if the
 specified scheme is not supported.
 
-=item $prot->request(...)
+=head2 request
 
- $response = $protocol->request($request, $proxy, undef);
- $response = $protocol->request($request, $proxy, '/tmp/sss');
- $response = $protocol->request($request, $proxy, \&callback, 1024);
+    $response = $protocol->request($request, $proxy, undef);
+    $response = $protocol->request($request, $proxy, '/tmp/sss');
+    $response = $protocol->request($request, $proxy, \&callback, 1024);
 
 Dispatches a request over the protocol, and returns a response
 object. This method needs to be overridden in subclasses.  Refer to
 L<LWP::UserAgent> for description of the arguments.
 
-=item $prot->collect($arg, $response, $collector)
+=head2 collect
 
-Called to collect the content of a request, and process it
-appropriately into a scalar, file, or by calling a callback.  If $arg
-is undefined, then the content is stored within the $response.  If
-$arg is a simple scalar, then $arg is interpreted as a file name and
-the content is written to this file.  If $arg is a reference to a
-routine, then content is passed to this routine.
+    my $res = $prot->collect(undef, $response, $collector); # stored in $response
+    my $res = $prot->collect($filename, $response, $collector);
+    my $res = $prot->collect(sub { ... }, $response, $collector);
 
-The $collector is a routine that will be called and which is
+Collect the content of a request, and process it appropriately into a scalar,
+file, or by calling a callback. If the first parameter is undefined, then the
+content is stored within the C<$response>. If it's a simple scalar, then it's
+interpreted as a file name and the content is written to this file.  If it's a
+code reference, then content is passed to this routine.
+
+The collector is a routine that will be called and which is
 responsible for returning pieces (as ref to scalar) of the content to
-process.  The $collector signals EOF by returning a reference to an
+process.  The C<$collector> signals C<EOF> by returning a reference to an
 empty string.
 
-The return value from collect() is the $response object reference.
+The return value is the L<HTTP::Response> object reference.
 
 B<Note:> We will only use the callback or file argument if
-$response->is_success().  This avoids sending content data for
+C<< $response->is_success() >>.  This avoids sending content data for
 redirects and authentication responses to the callback which would be
 confusing.
 
-=item $prot->collect_once($arg, $response, $content)
+=head2 collect_once
 
-Can be called when the whole response content is available as
-$content.  This will invoke collect() with a collector callback that
-returns a reference to $content the first time and an empty string the
-next.
+    $prot->collect_once($arg, $response, $content)
 
-=back
+Can be called when the whole response content is available as content. This
+will invoke L<LWP::Protocol/collect> with a collector callback that
+returns a reference to C<$content> the first time and an empty string the
+next.
 
 =head1 SEE ALSO
 
@@ -289,3 +301,5 @@ Copyright 1995-2001 Gisle Aas.
 
 This library is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
+
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/GHTTP.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/GHTTP.pm
deleted file mode 100644
index 2a356b5fcb1..00000000000
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/GHTTP.pm
+++ /dev/null
@@ -1,73 +0,0 @@
-package LWP::Protocol::GHTTP;
-
-# You can tell LWP to use this module for 'http' requests by running
-# code like this before you make requests:
-#
-#    require LWP::Protocol::GHTTP;
-#    LWP::Protocol::implementor('http', 'LWP::Protocol::GHTTP');
-#
-
-use strict;
-use vars qw(@ISA);
-
-require LWP::Protocol;
-@ISA=qw(LWP::Protocol);
-
-require HTTP::Response;
-require HTTP::Status;
-
-use HTTP::GHTTP qw(METHOD_GET METHOD_HEAD METHOD_POST);
-
-my %METHOD =
-(
- GET  => METHOD_GET,
- HEAD => METHOD_HEAD,
- POST => METHOD_POST,
-);
-
-sub request
-{
-    my($self, $request, $proxy, $arg, $size, $timeout) = @_;
-
-    my $method = $request->method;
-    unless (exists $METHOD{$method}) {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   "Bad method '$method'");
-    }
-
-    my $r = HTTP::GHTTP->new($request->uri);
-
-    # XXX what headers for repeated headers here?
-    $request->headers->scan(sub { $r->set_header(@_)});
-
-    $r->set_type($METHOD{$method});
-
-    # XXX should also deal with subroutine content.
-    my $cref = $request->content_ref;
-    $r->set_body($$cref) if length($$cref);
-
-    # XXX is this right
-    $r->set_proxy($proxy->as_string) if $proxy;
-
-    $r->process_request;
-
-    my $response = HTTP::Response->new($r->get_status);
-
-    # XXX How can get the headers out of $r??  This way is too stupid.
-    my @headers;
-    eval {
-	# Wrapped in eval because this method is not always available
-	@headers = $r->get_headers;
-    };
-    @headers = qw(Date Connection Server Content-type
-                  Accept-Ranges Server
-                  Content-Length Last-Modified ETag) if $@;
-    for (@headers) {
-	my $v = $r->get_header($_);
-	$response->header($_ => $v) if defined $v;
-    }
-
-    return $self->collect_once($arg, $response, $r->get_body);
-}
-
-1;
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/cpan.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/cpan.pm
index 66d8f213b98..3288abdbc12 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/cpan.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/cpan.pm
@@ -1,10 +1,8 @@
 package LWP::Protocol::cpan;
-
+$LWP::Protocol::cpan::VERSION = '6.25';
 use strict;
-use vars qw(@ISA);
 
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
+use base qw(LWP::Protocol);
 
 require URI;
 require HTTP::Status;
@@ -49,14 +47,14 @@ sub request {
     # check proxy
     if (defined $proxy)
     {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
+	return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
 				   'You can not proxy with cpan');
     }
 
     # check method
     my $method = $request->method;
     unless ($method eq 'GET' || $method eq 'HEAD') {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
+	return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
 				   'Library does not allow method ' .
 				   "$method for 'cpan:' URLs");
     }
@@ -64,7 +62,7 @@ sub request {
     my $path = $request->uri->path;
     $path =~ s,^/,,;
 
-    my $response = HTTP::Response->new(&HTTP::Status::RC_FOUND);
+    my $response = HTTP::Response->new(HTTP::Status::RC_FOUND);
     $response->header("Location" => URI->new_abs($path, $CPAN));
     $response;
 }
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/data.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/data.pm
index c29c3b4f919..3b256528a4f 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/data.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/data.pm
@@ -1,15 +1,13 @@
 package LWP::Protocol::data;
-
+$LWP::Protocol::data::VERSION = '6.25';
 # Implements access to data:-URLs as specified in RFC 2397
 
 use strict;
-use vars qw(@ISA);
 
 require HTTP::Response;
 require HTTP::Status;
 
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
+use base qw(LWP::Protocol);
 
 use HTTP::Date qw(time2str);
 require LWP;  # needs version number
@@ -21,20 +19,20 @@ sub request
     # check proxy
     if (defined $proxy)
     {
-	return HTTP::Response->new( &HTTP::Status::RC_BAD_REQUEST,
+	return HTTP::Response->new( HTTP::Status::RC_BAD_REQUEST,
 				  'You can not proxy with data');
     }
 
     # check method
     my $method = $request->method;
     unless ($method eq 'GET' || $method eq 'HEAD') {
-	return HTTP::Response->new( &HTTP::Status::RC_BAD_REQUEST,
+	return HTTP::Response->new( HTTP::Status::RC_BAD_REQUEST,
 				  'Library does not allow method ' .
 				  "$method for 'data:' URLs");
     }
 
     my $url = $request->uri;
-    my $response = HTTP::Response->new( &HTTP::Status::RC_OK, "Document follows");
+    my $response = HTTP::Response->new( HTTP::Status::RC_OK, "Document follows");
 
     my $media_type = $url->media_type;
 
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/file.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/file.pm
index f2887f4b2f3..e83149dbd90 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/file.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/file.pm
@@ -1,7 +1,6 @@
 package LWP::Protocol::file;
-
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
+$LWP::Protocol::file::VERSION = '6.25';
+use base qw(LWP::Protocol);
 
 use strict;
 
@@ -21,14 +20,14 @@ sub request
     # check proxy
     if (defined $proxy)
     {
-	return HTTP::Response->new( &HTTP::Status::RC_BAD_REQUEST,
+	return HTTP::Response->new( HTTP::Status::RC_BAD_REQUEST,
 				  'You can not proxy through the filesystem');
     }
 
     # check method
     my $method = $request->method;
     unless ($method eq 'GET' || $method eq 'HEAD') {
-	return HTTP::Response->new( &HTTP::Status::RC_BAD_REQUEST,
+	return HTTP::Response->new( HTTP::Status::RC_BAD_REQUEST,
 				  'Library does not allow method ' .
 				  "$method for 'file:' URLs");
     }
@@ -38,7 +37,7 @@ sub request
 
     my $scheme = $url->scheme;
     if ($scheme ne 'file') {
-	return HTTP::Response->new( &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+	return HTTP::Response->new( HTTP::Status::RC_INTERNAL_SERVER_ERROR,
 			   "LWP::Protocol::file::request called for '$scheme'");
     }
 
@@ -47,11 +46,11 @@ sub request
 
     # test file exists and is readable
     unless (-e $path) {
-	return HTTP::Response->new( &HTTP::Status::RC_NOT_FOUND,
+	return HTTP::Response->new( HTTP::Status::RC_NOT_FOUND,
 				  "File `$path' does not exist");
     }
     unless (-r _) {
-	return HTTP::Response->new( &HTTP::Status::RC_FORBIDDEN,
+	return HTTP::Response->new( HTTP::Status::RC_FORBIDDEN,
 				  'User does not have read permission');
     }
 
@@ -67,13 +66,13 @@ sub request
     if (defined $ims) {
 	my $time = HTTP::Date::str2time($ims);
 	if (defined $time and $time >= $mtime) {
-	    return HTTP::Response->new( &HTTP::Status::RC_NOT_MODIFIED,
+	    return HTTP::Response->new( HTTP::Status::RC_NOT_MODIFIED,
 				      "$method $path");
 	}
     }
 
     # Ok, should be an OK response by now...
-    my $response = HTTP::Response->new( &HTTP::Status::RC_OK );
+    my $response = HTTP::Response->new( HTTP::Status::RC_OK );
 
     # fill in response headers
     $response->header('Last-Modified', HTTP::Date::time2str($mtime));
@@ -81,7 +80,7 @@ sub request
     if (-d _) {         # If the path is a directory, process it
 	# generate the HTML for directory
 	opendir(D, $path) or
-	   return HTTP::Response->new( &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+	   return HTTP::Response->new( HTTP::Status::RC_INTERNAL_SERVER_ERROR,
 				     "Cannot read directory '$path': $!");
 	my(@files) = sort readdir(D);
 	closedir(D);
@@ -128,7 +127,7 @@ sub request
     # read the file
     if ($method ne "HEAD") {
 	open(F, $path) or return new
-	    HTTP::Response(&HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+	    HTTP::Response(HTTP::Status::RC_INTERNAL_SERVER_ERROR,
 			   "Cannot read file '$path': $!");
 	binmode(F);
 	$response =  $self->collect($arg, $response, sub {
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/ftp.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/ftp.pm
index f478c6ee732..2a96c1b7c55 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/ftp.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/ftp.pm
@@ -1,115 +1,114 @@
 package LWP::Protocol::ftp;
-
+$LWP::Protocol::ftp::VERSION = '6.25';
 # Implementation of the ftp protocol (RFC 959). We let the Net::FTP
 # package do all the dirty work.
+use base qw(LWP::Protocol);
+use strict;
 
-use Carp ();
-
-use HTTP::Status ();
+use Carp            ();
+use HTTP::Status    ();
 use HTTP::Negotiate ();
-use HTTP::Response ();
+use HTTP::Response  ();
 use LWP::MediaTypes ();
-use File::Listing ();
+use File::Listing   ();
 
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
 
-use strict;
-eval {
+{
+
     package LWP::Protocol::MyFTP;
+$LWP::Protocol::MyFTP::VERSION = '6.25';
+use strict;
+    use base qw(Net::FTP);
 
-    require Net::FTP;
-    Net::FTP->require_version(2.00);
+    sub new {
+        my $class = shift;
 
-    use vars qw(@ISA);
-    @ISA=qw(Net::FTP);
+        my $self = $class->SUPER::new(@_) || return undef;
 
-    sub new {
-	my $class = shift;
+        my $mess = $self->message;    # welcome message
+        $mess =~ s|\n.*||s;           # only first line left
+        $mess =~ s|\s*ready\.?$||;
 
-	my $self = $class->SUPER::new(@_) || return undef;
+        # Make the version number more HTTP like
+        $mess =~ s|\s*\(Version\s*|/| and $mess =~ s|\)$||;
+        ${*$self}{myftp_server} = $mess;
 
-	my $mess = $self->message;  # welcome message
-	$mess =~ s|\n.*||s; # only first line left
-	$mess =~ s|\s*ready\.?$||;
-	# Make the version number more HTTP like
-	$mess =~ s|\s*\(Version\s*|/| and $mess =~ s|\)$||;
-	${*$self}{myftp_server} = $mess;
-	#$response->header("Server", $mess);
+        #$response->header("Server", $mess);
 
-	$self;
+        $self;
     }
 
     sub http_server {
-	my $self = shift;
-	${*$self}{myftp_server};
+        my $self = shift;
+        ${*$self}{myftp_server};
     }
 
     sub home {
-	my $self = shift;
-	my $old = ${*$self}{myftp_home};
-	if (@_) {
-	    ${*$self}{myftp_home} = shift;
-	}
-	$old;
+        my $self = shift;
+        my $old  = ${*$self}{myftp_home};
+        if (@_) {
+            ${*$self}{myftp_home} = shift;
+        }
+        $old;
     }
 
     sub go_home {
-	my $self = shift;
-	$self->cwd(${*$self}{myftp_home});
+        my $self = shift;
+        $self->cwd(${*$self}{myftp_home});
     }
 
     sub request_count {
-	my $self = shift;
-	++${*$self}{myftp_reqcount};
+        my $self = shift;
+        ++${*$self}{myftp_reqcount};
     }
 
     sub ping {
-	my $self = shift;
-	return $self->go_home;
+        my $self = shift;
+        return $self->go_home;
     }
-
-};
-my $init_failed = $@;
-
+}
 
 sub _connect {
-    my($self, $host, $port, $user, $account, $password, $timeout) = @_;
+    my ($self, $host, $port, $user, $account, $password, $timeout) = @_;
 
     my $key;
     my $conn_cache = $self->{ua}{conn_cache};
     if ($conn_cache) {
-	$key = "$host:$port:$user";
-	$key .= ":$account" if defined($account);
-	if (my $ftp = $conn_cache->withdraw("ftp", $key)) {
-	    if ($ftp->ping) {
-		# save it again
-		$conn_cache->deposit("ftp", $key, $ftp);
-		return $ftp;
-	    }
-	}
+        $key = "$host:$port:$user";
+        $key .= ":$account" if defined($account);
+        if (my $ftp = $conn_cache->withdraw("ftp", $key)) {
+            if ($ftp->ping) {
+
+                # save it again
+                $conn_cache->deposit("ftp", $key, $ftp);
+                return $ftp;
+            }
+        }
     }
 
     # try to make a connection
-    my $ftp = LWP::Protocol::MyFTP->new($host,
-					Port => $port,
-					Timeout => $timeout,
-					LocalAddr => $self->{ua}{local_address},
-				       );
+    my $ftp = LWP::Protocol::MyFTP->new(
+        $host,
+        Port      => $port,
+        Timeout   => $timeout,
+        LocalAddr => $self->{ua}{local_address},
+    );
+
     # XXX Should be some what to pass on 'Passive' (header??)
     unless ($ftp) {
-	$@ =~ s/^Net::FTP: //;
-	return HTTP::Response->new(&HTTP::Status::RC_INTERNAL_SERVER_ERROR, $@);
+        $@ =~ s/^Net::FTP: //;
+        return HTTP::Response->new(HTTP::Status::RC_INTERNAL_SERVER_ERROR, $@);
     }
 
     unless ($ftp->login($user, $password, $account)) {
-	# Unauthorized.  Let's fake a RC_UNAUTHORIZED response
-	my $mess = scalar($ftp->message);
-	$mess =~ s/\n$//;
-	my $res =  HTTP::Response->new(&HTTP::Status::RC_UNAUTHORIZED, $mess);
-	$res->header("Server", $ftp->http_server);
-	$res->header("WWW-Authenticate", qq(Basic Realm="FTP login"));
-	return $res;
+
+        # Unauthorized.  Let's fake a RC_UNAUTHORIZED response
+        my $mess = scalar($ftp->message);
+        $mess =~ s/\n$//;
+        my $res = HTTP::Response->new(HTTP::Status::RC_UNAUTHORIZED, $mess);
+        $res->header("Server",           $ftp->http_server);
+        $res->header("WWW-Authenticate", qq(Basic Realm="FTP login"));
+        return $res;
     }
 
     my $home = $ftp->pwd;
@@ -121,38 +120,30 @@ sub _connect {
 }
 
 
-sub request
-{
-    my($self, $request, $proxy, $arg, $size, $timeout) = @_;
+sub request {
+    my ($self, $request, $proxy, $arg, $size, $timeout) = @_;
 
     $size = 4096 unless $size;
 
     # check proxy
-    if (defined $proxy)
-    {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   'You can not proxy through the ftp');
+    if (defined $proxy) {
+        return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
+            'You can not proxy through the ftp');
     }
 
     my $url = $request->uri;
     if ($url->scheme ne 'ftp') {
-	my $scheme = $url->scheme;
-	return HTTP::Response->new(&HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-		       "LWP::Protocol::ftp::request called for '$scheme'");
+        my $scheme = $url->scheme;
+        return HTTP::Response->new(HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+            "LWP::Protocol::ftp::request called for '$scheme'");
     }
 
     # check method
     my $method = $request->method;
 
     unless ($method eq 'GET' || $method eq 'HEAD' || $method eq 'PUT') {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   'Library does not allow method ' .
-				   "$method for 'ftp:' URLs");
-    }
-
-    if ($init_failed) {
-	return HTTP::Response->new(&HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-				   $init_failed);
+        return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
+            'Library does not allow method ' . "$method for 'ftp:' URLs");
     }
 
     my $host     = $url->host;
@@ -163,272 +154,290 @@ sub request
     # If a basic authorization header is present than we prefer these over
     # the username/password specified in the URL.
     {
-	my($u,$p) = $request->authorization_basic;
-	if (defined $u) {
-	    $user = $u;
-	    $password = $p;
-	}
+        my ($u, $p) = $request->authorization_basic;
+        if (defined $u) {
+            $user     = $u;
+            $password = $p;
+        }
     }
 
     # We allow the account to be specified in the "Account" header
     my $account = $request->header('Account');
 
-    my $ftp = $self->_connect($host, $port, $user, $account, $password, $timeout);
-    return $ftp if ref($ftp) eq "HTTP::Response"; # ugh!
+    my $ftp
+        = $self->_connect($host, $port, $user, $account, $password, $timeout);
+    return $ftp if ref($ftp) eq "HTTP::Response";    # ugh!
 
     # Create an initial response object
-    my $response = HTTP::Response->new(&HTTP::Status::RC_OK, "OK");
-    $response->header(Server => $ftp->http_server);
+    my $response = HTTP::Response->new(HTTP::Status::RC_OK, "OK");
+    $response->header(Server               => $ftp->http_server);
     $response->header('Client-Request-Num' => $ftp->request_count);
     $response->request($request);
 
     # Get & fix the path
-    my @path =  grep { length } $url->path_segments;
+    my @path = grep {length} $url->path_segments;
     my $remote_file = pop(@path);
     $remote_file = '' unless defined $remote_file;
 
     my $type;
     if (ref $remote_file) {
-	my @params;
-	($remote_file, @params) = @$remote_file;
-	for (@params) {
-	    $type = $_ if s/^type=//;
-	}
+        my @params;
+        ($remote_file, @params) = @$remote_file;
+        for (@params) {
+            $type = $_ if s/^type=//;
+        }
     }
 
     if ($type && $type eq 'a') {
-	$ftp->ascii;
+        $ftp->ascii;
     }
     else {
-	$ftp->binary;
+        $ftp->binary;
     }
 
     for (@path) {
-	unless ($ftp->cwd($_)) {
-	    return HTTP::Response->new(&HTTP::Status::RC_NOT_FOUND,
-				       "Can't chdir to $_");
-	}
+        unless ($ftp->cwd($_)) {
+            return HTTP::Response->new(HTTP::Status::RC_NOT_FOUND,
+                "Can't chdir to $_");
+        }
     }
 
     if ($method eq 'GET' || $method eq 'HEAD') {
-	if (my $mod_time = $ftp->mdtm($remote_file)) {
-	    $response->last_modified($mod_time);
-	    if (my $ims = $request->if_modified_since) {
-		if ($mod_time <= $ims) {
-		    $response->code(&HTTP::Status::RC_NOT_MODIFIED);
-		    $response->message("Not modified");
-		    return $response;
-		}
-	    }
-	}
-
-	# We'll use this later to abort the transfer if necessary. 
-	# if $max_size is defined, we need to abort early. Otherwise, it's
-      # a normal transfer
-	my $max_size = undef;
-
-	# Set resume location, if the client requested it
-	if ($request->header('Range') && $ftp->supported('REST'))
-	{
-		my $range_info = $request->header('Range');
-
-		# Change bytes=2772992-6781209 to just 2772992
-		my ($start_byte,$end_byte) = $range_info =~ /.*=\s*(\d+)-(\d+)?/;
-		if ( defined $start_byte && !defined $end_byte ) {
-
-		  # open range -- only the start is specified
-
-		  $ftp->restart( $start_byte );
-		  # don't define $max_size, we don't want to abort early
-		}
-		elsif ( defined $start_byte && defined $end_byte &&
-			$start_byte >= 0 && $end_byte >= $start_byte ) {
-
-		  $ftp->restart( $start_byte );
-		  $max_size = $end_byte - $start_byte;
-		}
-		else {
-
-		  return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-		     'Incorrect syntax for Range request');
-		}
-	}
-	elsif ($request->header('Range') && !$ftp->supported('REST'))
-	{
-		return HTTP::Response->new(&HTTP::Status::RC_NOT_IMPLEMENTED,
-	         "Server does not support resume.");
-	}
-
-	my $data;  # the data handle
-	if (length($remote_file) and $data = $ftp->retr($remote_file)) {
-	    my($type, @enc) = LWP::MediaTypes::guess_media_type($remote_file);
-	    $response->header('Content-Type',   $type) if $type;
-	    for (@enc) {
-		$response->push_header('Content-Encoding', $_);
-	    }
-	    my $mess = $ftp->message;
-	    if ($mess =~ /\((\d+)\s+bytes\)/) {
-		$response->header('Content-Length', "$1");
-	    }
-
-	    if ($method ne 'HEAD') {
-		# Read data from server
-		$response = $self->collect($arg, $response, sub {
-		    my $content = '';
-		    my $result = $data->read($content, $size);
-
-                    # Stop early if we need to.
-                    if (defined $max_size)
-                    {
-                      # We need an interface to Net::FTP::dataconn for getting
-                      # the number of bytes already read
-                      my $bytes_received = $data->bytes_read();
-
-                      # We were already over the limit. (Should only happen
-                      # once at the end.)
-                      if ($bytes_received - length($content) > $max_size)
-                      {
-                        $content = '';
-                      }
-                      # We just went over the limit
-                      elsif ($bytes_received  > $max_size)
-                      {
-                        # Trim content
-                        $content = substr($content, 0,
-                          $max_size - ($bytes_received - length($content)) );
-                      }
-                      # We're under the limit
-                      else
-                      {
-                      }
+        if (my $mod_time = $ftp->mdtm($remote_file)) {
+            $response->last_modified($mod_time);
+            if (my $ims = $request->if_modified_since) {
+                if ($mod_time <= $ims) {
+                    $response->code(HTTP::Status::RC_NOT_MODIFIED);
+                    $response->message("Not modified");
+                    return $response;
+                }
+            }
+        }
+
+        # We'll use this later to abort the transfer if necessary.
+        # if $max_size is defined, we need to abort early. Otherwise, it's
+        # a normal transfer
+        my $max_size = undef;
+
+        # Set resume location, if the client requested it
+        if ($request->header('Range') && $ftp->supported('REST')) {
+            my $range_info = $request->header('Range');
+
+            # Change bytes=2772992-6781209 to just 2772992
+            my ($start_byte, $end_byte) = $range_info =~ /.*=\s*(\d+)-(\d+)?/;
+            if (defined $start_byte && !defined $end_byte) {
+
+                # open range -- only the start is specified
+
+                $ftp->restart($start_byte);
+
+                # don't define $max_size, we don't want to abort early
+            }
+            elsif (defined $start_byte
+                && defined $end_byte
+                && $start_byte >= 0
+                && $end_byte >= $start_byte)
+            {
+
+                $ftp->restart($start_byte);
+                $max_size = $end_byte - $start_byte;
+            }
+            else {
+
+                return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
+                    'Incorrect syntax for Range request');
+            }
+        }
+        elsif ($request->header('Range') && !$ftp->supported('REST')) {
+            return HTTP::Response->new(HTTP::Status::RC_NOT_IMPLEMENTED,
+                "Server does not support resume."
+            );
+        }
+
+        my $data;    # the data handle
+        if (length($remote_file) and $data = $ftp->retr($remote_file)) {
+            my ($type, @enc) = LWP::MediaTypes::guess_media_type($remote_file);
+            $response->header('Content-Type', $type) if $type;
+            for (@enc) {
+                $response->push_header('Content-Encoding', $_);
+            }
+            my $mess = $ftp->message;
+            if ($mess =~ /\((\d+)\s+bytes\)/) {
+                $response->header('Content-Length', "$1");
+            }
+
+            if ($method ne 'HEAD') {
+
+                # Read data from server
+                $response = $self->collect(
+                    $arg,
+                    $response,
+                    sub {
+                        my $content = '';
+                        my $result = $data->read($content, $size);
+
+                        # Stop early if we need to.
+                        if (defined $max_size) {
+
+                        # We need an interface to Net::FTP::dataconn for getting
+                        # the number of bytes already read
+                            my $bytes_received = $data->bytes_read();
+
+                           # We were already over the limit. (Should only happen
+                           # once at the end.)
+                            if ($bytes_received - length($content) > $max_size)
+                            {
+                                $content = '';
+                            }
+
+                            # We just went over the limit
+                            elsif ($bytes_received > $max_size) {
+
+                                # Trim content
+                                $content = substr($content, 0,
+                                    $max_size
+                                        - ($bytes_received - length($content)));
+                            }
+
+                            # We're under the limit
+                            else {
+                            }
+                        }
+
+                        return \$content;
                     }
-
-		    return \$content;
-		} );
-	    }
-	    # abort is needed for HEAD, it's == close if the transfer has
-	    # already completed.
-	    unless ($data->abort) {
-		# Something did not work too well.  Note that we treat
-		# responses to abort() with code 0 in case of HEAD as ok
-		# (at least wu-ftpd 2.6.1(1) does that).
-		if ($method ne 'HEAD' || $ftp->code != 0) {
-		    $response->code(&HTTP::Status::RC_INTERNAL_SERVER_ERROR);
-		    $response->message("FTP close response: " . $ftp->code .
-				       " " . $ftp->message);
-		}
-	    }
-	}
-	elsif (!length($remote_file) || ( $ftp->code >= 400 && $ftp->code < 600 )) {
-	    # not a plain file, try to list instead
-	    if (length($remote_file) && !$ftp->cwd($remote_file)) {
-		return HTTP::Response->new(&HTTP::Status::RC_NOT_FOUND,
-					   "File '$remote_file' not found");
-	    }
-
-	    # It should now be safe to try to list the directory
-	    my @lsl = $ftp->dir;
-
-	    # Try to figure out if the user want us to convert the
-	    # directory listing to HTML.
-	    my @variants =
-	      (
-	       ['html',  0.60, 'text/html'            ],
-	       ['dir',   1.00, 'text/ftp-dir-listing' ]
-	      );
-	    #$HTTP::Negotiate::DEBUG=1;
-	    my $prefer = HTTP::Negotiate::choose(\@variants, $request);
-
-	    my $content = '';
-
-	    if (!defined($prefer)) {
-		return HTTP::Response->new(&HTTP::Status::RC_NOT_ACCEPTABLE,
-			       "Neither HTML nor directory listing wanted");
-	    }
-	    elsif ($prefer eq 'html') {
-		$response->header('Content-Type' => 'text/html');
-		$content = "<HEAD><TITLE>File Listing</TITLE>\n";
-		my $base = $request->uri->clone;
-		my $path = $base->path;
-		$base->path("$path/") unless $path =~ m|/$|;
-		$content .= qq(<BASE HREF="$base">\n</HEAD>\n);
-		$content .= "<BODY>\n<UL>\n";
-		for (File::Listing::parse_dir(\@lsl, 'GMT')) {
-		    my($name, $type, $size, $mtime, $mode) = @$_;
-		    $content .= qq(  <LI> <a href="$name">$name</a>);
-		    $content .= " $size bytes" if $type eq 'f';
-		    $content .= "\n";
-		}
-		$content .= "</UL></body>\n";
-	    }
-	    else {
-		$response->header('Content-Type', 'text/ftp-dir-listing');
-		$content = join("\n", @lsl, '');
-	    }
-
-	    $response->header('Content-Length', length($content));
-
-	    if ($method ne 'HEAD') {
-		$response = $self->collect_once($arg, $response, $content);
-	    }
-	}
-	else {
-	    my $res = HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-			  "FTP return code " . $ftp->code);
-	    $res->content_type("text/plain");
-	    $res->content($ftp->message);
-	    return $res;
-	}
+                );
+            }
+
+            # abort is needed for HEAD, it's == close if the transfer has
+            # already completed.
+            unless ($data->abort) {
+
+                # Something did not work too well.  Note that we treat
+                # responses to abort() with code 0 in case of HEAD as ok
+                # (at least wu-ftpd 2.6.1(1) does that).
+                if ($method ne 'HEAD' || $ftp->code != 0) {
+                    $response->code(HTTP::Status::RC_INTERNAL_SERVER_ERROR);
+                    $response->message("FTP close response: "
+                            . $ftp->code . " "
+                            . $ftp->message);
+                }
+            }
+        }
+        elsif (!length($remote_file) || ($ftp->code >= 400 && $ftp->code < 600))
+        {
+            # not a plain file, try to list instead
+            if (length($remote_file) && !$ftp->cwd($remote_file)) {
+                return HTTP::Response->new(HTTP::Status::RC_NOT_FOUND,
+                    "File '$remote_file' not found"
+                );
+            }
+
+            # It should now be safe to try to list the directory
+            my @lsl = $ftp->dir;
+
+            # Try to figure out if the user want us to convert the
+            # directory listing to HTML.
+            my @variants = (
+                ['html', 0.60, 'text/html'],
+                ['dir',  1.00, 'text/ftp-dir-listing']
+            );
+
+            #$HTTP::Negotiate::DEBUG=1;
+            my $prefer = HTTP::Negotiate::choose(\@variants, $request);
+
+            my $content = '';
+
+            if (!defined($prefer)) {
+                return HTTP::Response->new(HTTP::Status::RC_NOT_ACCEPTABLE,
+                    "Neither HTML nor directory listing wanted");
+            }
+            elsif ($prefer eq 'html') {
+                $response->header('Content-Type' => 'text/html');
+                $content = "<HEAD><TITLE>File Listing</TITLE>\n";
+                my $base = $request->uri->clone;
+                my $path = $base->path;
+                $base->path("$path/") unless $path =~ m|/$|;
+                $content .= qq(<BASE HREF="$base">\n</HEAD>\n);
+                $content .= "<BODY>\n<UL>\n";
+                for (File::Listing::parse_dir(\@lsl, 'GMT')) {
+                    my ($name, $type, $size, $mtime, $mode) = @$_;
+                    $content .= qq(  <LI> <a href="$name">$name</a>);
+                    $content .= " $size bytes" if $type eq 'f';
+                    $content .= "\n";
+                }
+                $content .= "</UL></body>\n";
+            }
+            else {
+                $response->header('Content-Type', 'text/ftp-dir-listing');
+                $content = join("\n", @lsl, '');
+            }
+
+            $response->header('Content-Length', length($content));
+
+            if ($method ne 'HEAD') {
+                $response = $self->collect_once($arg, $response, $content);
+            }
+        }
+        else {
+            my $res = HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
+                "FTP return code " . $ftp->code);
+            $res->content_type("text/plain");
+            $res->content($ftp->message);
+            return $res;
+        }
     }
     elsif ($method eq 'PUT') {
-	# method must be PUT
-	unless (length($remote_file)) {
-	    return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				       "Must have a file name to PUT to");
-	}
-	my $data;
-	if ($data = $ftp->stor($remote_file)) {
-	    my $content = $request->content;
-	    my $bytes = 0;
-	    if (defined $content) {
-		if (ref($content) eq 'SCALAR') {
-		    $bytes = $data->write($$content, length($$content));
-		}
-		elsif (ref($content) eq 'CODE') {
-		    my($buf, $n);
-		    while (length($buf = &$content)) {
-			$n = $data->write($buf, length($buf));
-			last unless $n;
-			$bytes += $n;
-		    }
-		}
-		elsif (!ref($content)) {
-		    if (defined $content && length($content)) {
-			$bytes = $data->write($content, length($content));
-		    }
-		}
-		else {
-		    die "Bad content";
-		}
-	    }
-	    $data->close;
-
-	    $response->code(&HTTP::Status::RC_CREATED);
-	    $response->header('Content-Type', 'text/plain');
-	    $response->content("$bytes bytes stored as $remote_file on $host\n")
-
-	}
-	else {
-	    my $res = HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-					  "FTP return code " . $ftp->code);
-	    $res->content_type("text/plain");
-	    $res->content($ftp->message);
-	    return $res;
-	}
+
+        # method must be PUT
+        unless (length($remote_file)) {
+            return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
+                "Must have a file name to PUT to"
+            );
+        }
+        my $data;
+        if ($data = $ftp->stor($remote_file)) {
+            my $content = $request->content;
+            my $bytes   = 0;
+            if (defined $content) {
+                if (ref($content) eq 'SCALAR') {
+                    $bytes = $data->write($$content, length($$content));
+                }
+                elsif (ref($content) eq 'CODE') {
+                    my ($buf, $n);
+                    while (length($buf = &$content)) {
+                        $n = $data->write($buf, length($buf));
+                        last unless $n;
+                        $bytes += $n;
+                    }
+                }
+                elsif (!ref($content)) {
+                    if (defined $content && length($content)) {
+                        $bytes = $data->write($content, length($content));
+                    }
+                }
+                else {
+                    die "Bad content";
+                }
+            }
+            $data->close;
+
+            $response->code(HTTP::Status::RC_CREATED);
+            $response->header('Content-Type', 'text/plain');
+            $response->content("$bytes bytes stored as $remote_file on $host\n")
+
+        }
+        else {
+            my $res = HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
+                "FTP return code " . $ftp->code);
+            $res->content_type("text/plain");
+            $res->content($ftp->message);
+            return $res;
+        }
     }
     else {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   "Illegal method $method");
+        return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
+            "Illegal method $method");
     }
 
     $response;
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/gopher.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/gopher.pm
index db6c0bfba9d..e6fe5ce8473 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/gopher.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/gopher.pm
@@ -1,5 +1,5 @@
 package LWP::Protocol::gopher;
-
+$LWP::Protocol::gopher::VERSION = '6.25';
 # Implementation of the gopher protocol (RFC 1436)
 #
 # This code is based on 'wwwgopher.pl,v 0.10 1994/10/17 18:12:34 shelden'
@@ -8,15 +8,13 @@ package LWP::Protocol::gopher;
 # including contributions from Marc van Heyningen and Martijn Koster.
 
 use strict;
-use vars qw(@ISA);
 
 require HTTP::Response;
 require HTTP::Status;
 require IO::Socket;
 require IO::Select;
 
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
+use base qw(LWP::Protocol);
 
 
 my %gopher2mimetype = (
@@ -47,7 +45,7 @@ sub request
 
     # check proxy
     if (defined $proxy) {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
+	return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
 				   'You can not proxy through the gopher');
     }
 
@@ -57,19 +55,19 @@ sub request
 
     my $method = $request->method;
     unless ($method eq 'GET' || $method eq 'HEAD') {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
+	return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
 				   'Library does not allow method ' .
 				   "$method for 'gopher:' URLs");
     }
 
     my $gophertype = $url->gopher_type;
     unless (exists $gopher2mimetype{$gophertype}) {
-	return HTTP::Response->new(&HTTP::Status::RC_NOT_IMPLEMENTED,
+	return HTTP::Response->new(HTTP::Status::RC_NOT_IMPLEMENTED,
 				   'Library does not support gophertype ' .
 				   $gophertype);
     }
 
-    my $response = HTTP::Response->new(&HTTP::Status::RC_OK, "OK");
+    my $response = HTTP::Response->new(HTTP::Status::RC_OK, "OK");
     $response->header('Content-type' => $gopher2mimetype{$gophertype}
 					|| 'text/plain');
     $response->header('Content-Encoding' => $gopher2encoding{$gophertype})
@@ -80,7 +78,7 @@ sub request
 	$response->header('Client-Warning' => 'Client answer only');
 	return $response;
     }
-    
+
     if ($gophertype eq '7' && ! $url->search) {
       # the url is the prompt for a gopher search; supply boiler-plate
       return $self->collect_once($arg, $response, <<"EOT");
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/http.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/http.pm
index 23c361f7055..2266b1e9ea6 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/http.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/http.pm
@@ -1,16 +1,14 @@
 package LWP::Protocol::http;
-
+$LWP::Protocol::http::VERSION = '6.25';
 use strict;
 
 require HTTP::Response;
 require HTTP::Status;
 require Net::HTTP;
 
-use vars qw(@ISA @EXTRA_SOCK_OPTS);
-
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
+use base qw(LWP::Protocol);
 
+our @EXTRA_SOCK_OPTS;
 my $CRLF = "\015\012";
 
 sub _new_socket
@@ -39,6 +37,7 @@ sub _new_socket
 	my $status = "Can't connect to $host:$port";
 	if ($@ =~ /\bconnect: (.*)/ ||
 	    $@ =~ /\b(Bad hostname)\b/ ||
+	    $@ =~ /\b(nodename nor servname provided, or not known)\b/ ||
 	    $@ =~ /\b(certificate verify failed)\b/ ||
 	    $@ =~ /\b(Crypt-SSLeay can't verify hostnames)\b/
 	) {
@@ -131,7 +130,7 @@ sub request
     # check method
     my $method = $request->method;
     unless ($method =~ /^[A-Za-z0-9_!\#\$%&\'*+\-.^\`|~]+$/) {  # HTTP token
-	return HTTP::Response->new( &HTTP::Status::RC_BAD_REQUEST,
+	return HTTP::Response->new( HTTP::Status::RC_BAD_REQUEST,
 				  'Library does not allow method ' .
 				  "$method for 'http:' URLs");
     }
@@ -168,7 +167,7 @@ sub request
     my $cache_key;
     if ( $conn_cache ) {
 	$cache_key = "$host:$port";
-	# For https we reuse the socket immediatly only if it has an established
+	# For https we reuse the socket immediately only if it has an established
 	# tunnel to the target. Otherwise a CONNECT request followed by an SSL
 	# upgrade need to be done first. The request itself might reuse an
 	# existing non-ssl connection to the proxy
@@ -181,6 +180,9 @@ sub request
 		$socket->close;
 		$socket = undef;
 	    } # else use $socket
+	    else {
+		$socket->timeout($timeout);
+	    }
 	}
     }
 
@@ -496,7 +498,7 @@ sub request
 
 #-----------------------------------------------------------
 package LWP::Protocol::http::SocketMethods;
-
+$LWP::Protocol::http::SocketMethods::VERSION = '6.25';
 sub ping {
     my $self = shift;
     !$self->can_read(0);
@@ -509,7 +511,7 @@ sub increment_response_count {
 
 #-----------------------------------------------------------
 package LWP::Protocol::http::Socket;
-use vars qw(@ISA);
-@ISA = qw(LWP::Protocol::http::SocketMethods Net::HTTP);
+$LWP::Protocol::http::Socket::VERSION = '6.25';
+use base qw(LWP::Protocol::http::SocketMethods Net::HTTP);
 
 1;
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/loopback.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/loopback.pm
index 2cd67ae3608..f1e4c9f918e 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/loopback.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/loopback.pm
@@ -1,11 +1,9 @@
 package LWP::Protocol::loopback;
-
+$LWP::Protocol::loopback::VERSION = '6.25';
 use strict;
-use vars qw(@ISA);
 require HTTP::Response;
 
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
+use base qw(LWP::Protocol);
 
 sub request {
     my($self, $request, $proxy, $arg, $size, $timeout) = @_;
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/mailto.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/mailto.pm
index 46db7162e44..9358695d57d 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/mailto.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/mailto.pm
@@ -1,19 +1,18 @@
 package LWP::Protocol::mailto;
-
+$LWP::Protocol::mailto::VERSION = '6.25';
 # This module implements the mailto protocol.  It is just a simple
 # frontend to the Unix sendmail program except on MacOS, where it uses
 # Mail::Internet.
 
-require LWP::Protocol;
 require HTTP::Request;
 require HTTP::Response;
 require HTTP::Status;
 
 use Carp;
 use strict;
-use vars qw(@ISA $SENDMAIL);
 
-@ISA = qw(LWP::Protocol);
+use base qw(LWP::Protocol);
+our $SENDMAIL;
 
 unless ($SENDMAIL = $ENV{SENDMAIL}) {
     for my $sm (qw(/usr/sbin/sendmail
@@ -39,7 +38,7 @@ sub request
     # check proxy
     if (defined $proxy)
     {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
+	return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
 				  'You can not proxy with mail');
     }
 
@@ -47,7 +46,7 @@ sub request
     my $method = $request->method;
 
     if ($method ne 'POST') {
-	return HTTP::Response->new( &HTTP::Status::RC_BAD_REQUEST,
+	return HTTP::Response->new( HTTP::Status::RC_BAD_REQUEST,
 				  'Library does not allow method ' .
 				  "$method for 'mailto:' URLs");
     }
@@ -57,7 +56,7 @@ sub request
 
     my $scheme = $url->scheme;
     if ($scheme ne 'mailto') {
-	return HTTP::Response->new( &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+	return HTTP::Response->new( HTTP::Status::RC_INTERNAL_SERVER_ERROR,
 			 "LWP::Protocol::mailto::request called for '$scheme'");
     }
     if ($^O eq "MacOS") {
@@ -65,28 +64,28 @@ sub request
 	    require Mail::Internet;
 	};
 	if($@) {
-	    return HTTP::Response->new( &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+	    return HTTP::Response->new( HTTP::Status::RC_INTERNAL_SERVER_ERROR,
 	               "You don't have MailTools installed");
 	}
 	unless ($ENV{SMTPHOSTS}) {
-	    return HTTP::Response->new( &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+	    return HTTP::Response->new( HTTP::Status::RC_INTERNAL_SERVER_ERROR,
 	               "You don't have SMTPHOSTS defined");
 	}
     }
     else {
 	unless (-x $SENDMAIL) {
-	    return HTTP::Response->new( &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+	    return HTTP::Response->new( HTTP::Status::RC_INTERNAL_SERVER_ERROR,
 	               "You don't have $SENDMAIL");
     }
     }
     if ($^O eq "MacOS") {
 	    $mail = Mail::Internet->new or
-	    return HTTP::Response->new( &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+	    return HTTP::Response->new( HTTP::Status::RC_INTERNAL_SERVER_ERROR,
 	    "Can't get a Mail::Internet object");
     }
     else {
 	open(SENDMAIL, "| $SENDMAIL -oi -t") or
-	    return HTTP::Response->new( &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+	    return HTTP::Response->new( HTTP::Status::RC_INTERNAL_SERVER_ERROR,
 	               "Can't run $SENDMAIL: $!");
     }
     if ($^O eq "MacOS") {
@@ -151,20 +150,20 @@ sub request
     if ($^O eq "MacOS") {
 	$mail->body(\@text);
 	unless ($mail->smtpsend) {
-	    return HTTP::Response->new(&HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+	    return HTTP::Response->new(HTTP::Status::RC_INTERNAL_SERVER_ERROR,
 				       "Mail::Internet->smtpsend unable to send message to <$addr>");
 	}
     }
     else {
 	unless (close(SENDMAIL)) {
 	    my $err = $! ? "$!" : "Exit status $?";
-	    return HTTP::Response->new(&HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+	    return HTTP::Response->new(HTTP::Status::RC_INTERNAL_SERVER_ERROR,
 				       "$SENDMAIL: $err");
 	}
     }
 
 
-    my $response = HTTP::Response->new(&HTTP::Status::RC_ACCEPTED,
+    my $response = HTTP::Response->new(HTTP::Status::RC_ACCEPTED,
 				       "Mail accepted");
     $response->header('Content-Type', 'text/plain');
     if ($^O eq "MacOS") {
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/nntp.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/nntp.pm
index 788477d488a..9727a247a51 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/nntp.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/nntp.pm
@@ -1,9 +1,8 @@
 package LWP::Protocol::nntp;
-
+$LWP::Protocol::nntp::VERSION = '6.25';
 # Implementation of the Network News Transfer Protocol (RFC 977)
 
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
+use base qw(LWP::Protocol);
 
 require HTTP::Response;
 require HTTP::Status;
@@ -12,56 +11,57 @@ require Net::NNTP;
 use strict;
 
 
-sub request
-{
-    my($self, $request, $proxy, $arg, $size, $timeout) = @_;
+sub request {
+    my ($self, $request, $proxy, $arg, $size, $timeout) = @_;
 
     $size = 4096 unless $size;
 
     # Check for proxy
     if (defined $proxy) {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   'You can not proxy through NNTP');
+        return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
+            'You can not proxy through NNTP');
     }
 
     # Check that the scheme is as expected
-    my $url = $request->uri;
+    my $url    = $request->uri;
     my $scheme = $url->scheme;
     unless ($scheme eq 'news' || $scheme eq 'nntp') {
-	return HTTP::Response->new(&HTTP::Status::RC_INTERNAL_SERVER_ERROR,
-				   "LWP::Protocol::nntp::request called for '$scheme'");
+        return HTTP::Response->new(HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+            "LWP::Protocol::nntp::request called for '$scheme'");
     }
 
     # check for a valid method
     my $method = $request->method;
     unless ($method eq 'GET' || $method eq 'HEAD' || $method eq 'POST') {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   'Library does not allow method ' .
-				   "$method for '$scheme:' URLs");
+        return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
+            'Library does not allow method ' . "$method for '$scheme:' URLs");
     }
 
     # extract the identifier and check against posting to an article
     my $groupart = $url->_group;
-    my $is_art = $groupart =~ /@/;
+    my $is_art   = $groupart =~ /@/;
 
     if ($is_art && $method eq 'POST') {
-	return HTTP::Response->new(&HTTP::Status::RC_BAD_REQUEST,
-				   "Can't post to an article <$groupart>");
+        return HTTP::Response->new(HTTP::Status::RC_BAD_REQUEST,
+            "Can't post to an article <$groupart>");
     }
 
-    my $nntp = Net::NNTP->new($url->host,
-			      #Port    => 18574,
-			      Timeout => $timeout,
-			      #Debug   => 1,
-			     );
+    my $nntp = Net::NNTP->new(
+        $url->host,
+
+        #Port    => 18574,
+        Timeout => $timeout,
+
+        #Debug   => 1,
+    );
     die "Can't connect to nntp server" unless $nntp;
 
     # Check the initial welcome message from the NNTP server
     if ($nntp->status != 2) {
-	return HTTP::Response->new(&HTTP::Status::RC_SERVICE_UNAVAILABLE,
-				   $nntp->message);
+        return HTTP::Response->new(HTTP::Status::RC_SERVICE_UNAVAILABLE,
+            $nntp->message);
     }
-    my $response = HTTP::Response->new(&HTTP::Status::RC_OK, "OK");
+    my $response = HTTP::Response->new(HTTP::Status::RC_OK, "OK");
 
     my $mess = $nntp->message;
 
@@ -74,66 +74,69 @@ sub request
 
     # First we handle posting of articles
     if ($method eq 'POST') {
-	$nntp->quit; $nntp = undef;
-	$response->code(&HTTP::Status::RC_NOT_IMPLEMENTED);
-	$response->message("POST not implemented yet");
-	return $response;
+        $nntp->quit;
+        $nntp = undef;
+        $response->code(HTTP::Status::RC_NOT_IMPLEMENTED);
+        $response->message("POST not implemented yet");
+        return $response;
     }
 
     # The method must be "GET" or "HEAD" by now
     if (!$is_art) {
-	if (!$nntp->group($groupart)) {
-	    $response->code(&HTTP::Status::RC_NOT_FOUND);
-	    $response->message($nntp->message);
-	}
-	$nntp->quit; $nntp = undef;
-	# HEAD: just check if the group exists
-	if ($method eq 'GET' && $response->is_success) {
-	    $response->code(&HTTP::Status::RC_NOT_IMPLEMENTED);
-	    $response->message("GET newsgroup not implemented yet");
-	}
-	return $response;
+        if (!$nntp->group($groupart)) {
+            $response->code(HTTP::Status::RC_NOT_FOUND);
+            $response->message($nntp->message);
+        }
+        $nntp->quit;
+        $nntp = undef;
+
+        # HEAD: just check if the group exists
+        if ($method eq 'GET' && $response->is_success) {
+            $response->code(HTTP::Status::RC_NOT_IMPLEMENTED);
+            $response->message("GET newsgroup not implemented yet");
+        }
+        return $response;
     }
 
     # Send command to server to retrieve an article (or just the headers)
     my $get = $method eq 'HEAD' ? "head" : "article";
     my $art = $nntp->$get("<$groupart>");
     unless ($art) {
-	$nntp->quit; $nntp = undef;
-	$response->code(&HTTP::Status::RC_NOT_FOUND);
-	$response->message($nntp->message);
-	return $response;
+        $nntp->quit;
+        $response->code(HTTP::Status::RC_NOT_FOUND);
+        $response->message($nntp->message);
+        $nntp = undef;
+        return $response;
     }
 
     # Parse headers
-    my($key, $val);
+    my ($key, $val);
     local $_;
     while ($_ = shift @$art) {
-	if (/^\s+$/) {
-	    last;  # end of headers
-	}
-	elsif (/^(\S+):\s*(.*)/) {
-	    $response->push_header($key, $val) if $key;
-	    ($key, $val) = ($1, $2);
-	}
-	elsif (/^\s+(.*)/) {
-	    next unless $key;
-	    $val .= $1;
-	}
-	else {
-	    unshift(@$art, $_);
-	    last;
-	}
+        if (/^\s+$/) {
+            last;    # end of headers
+        }
+        elsif (/^(\S+):\s*(.*)/) {
+            $response->push_header($key, $val) if $key;
+            ($key, $val) = ($1, $2);
+        }
+        elsif (/^\s+(.*)/) {
+            next unless $key;
+            $val .= $1;
+        }
+        else {
+            unshift(@$art, $_);
+            last;
+        }
     }
     $response->push_header($key, $val) if $key;
 
     # Ensure that there is a Content-Type header
     $response->header("Content-Type", "text/plain")
-	unless $response->header("Content-Type");
+        unless $response->header("Content-Type");
 
     # Collect the body
-    $response = $self->collect_once($arg, $response, join("", @$art))
-      if @$art;
+    $response = $self->collect_once($arg, $response, join("", @$art)) if @$art;
 
     # Say goodbye to the server
     $nntp->quit;
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/nogo.pm b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/nogo.pm
index 68150a722d5..a9b0e411ee7 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Protocol/nogo.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Protocol/nogo.pm
@@ -4,20 +4,19 @@ package LWP::Protocol::nogo;
 #   LWP::Protocol::implementor(that_scheme, 'LWP::Protocol::nogo');
 # For then on, attempts to access URLs with that scheme will generate
 # a 500 error.
-
+$LWP::Protocol::nogo::VERSION = '6.25';
 use strict;
-use vars qw(@ISA);
+
 require HTTP::Response;
 require HTTP::Status;
-require LWP::Protocol;
-@ISA = qw(LWP::Protocol);
+use base qw(LWP::Protocol);
 
 sub request {
     my($self, $request) = @_;
     my $scheme = $request->uri->scheme;
-    
+
     return HTTP::Response->new(
-      &HTTP::Status::RC_INTERNAL_SERVER_ERROR,
+      HTTP::Status::RC_INTERNAL_SERVER_ERROR,
       "Access to \'$scheme\' URIs has been disabled"
     );
 }
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/RobotUA.pm b/Master/tlpkg/tlperl/site/lib/LWP/RobotUA.pm
index 9e0bf5f0dbb..0e96856329a 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/RobotUA.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/RobotUA.pm
@@ -1,8 +1,8 @@
 package LWP::RobotUA;
 
-require LWP::UserAgent;
-@ISA = qw(LWP::UserAgent);
-$VERSION = "6.15";
+use base qw(LWP::UserAgent);
+
+our $VERSION = '6.25';
 
 require WWW::RobotRules;
 require HTTP::Request;
@@ -72,7 +72,7 @@ sub agent
     my $old = $self->SUPER::agent(@_);
     if (@_) {
 	# Changing our name means to start fresh
-	$self->{'rules'}->agent($self->{'agent'}); 
+	$self->{'rules'}->agent($self->{'agent'});
     }
     $old;
 }
@@ -123,7 +123,7 @@ sub simple_request
 	$robot_url->query(undef);
 
 	# make access to robot.txt legal since this will be a recursive call
-	$self->{'rules'}->parse($robot_url, ""); 
+	$self->{'rules'}->parse($robot_url, "");
 
 	my $robot_req = HTTP::Request->new('GET', $robot_url);
 	my $parse_head = $self->parse_head(0);
@@ -144,7 +144,7 @@ sub simple_request
     # Check rules
     unless ($allowed) {
 	my $res = HTTP::Response->new(
-	  &HTTP::Status::RC_FORBIDDEN, 'Forbidden by robots.txt');
+	  HTTP::Status::RC_FORBIDDEN, 'Forbidden by robots.txt');
 	$res->request( $request ); # bind it to that request
 	return $res;
     }
@@ -158,7 +158,7 @@ sub simple_request
 	}
 	else {
 	    my $res = HTTP::Response->new(
-	      &HTTP::Status::RC_SERVICE_UNAVAILABLE, 'Please, slow down');
+	      HTTP::Status::RC_SERVICE_UNAVAILABLE, 'Please, slow down');
 	    $res->header('Retry-After', time2str(time + $wait));
 	    $res->request( $request ); # bind it to that request
 	    return $res;
@@ -190,6 +190,8 @@ sub as_string
 
 __END__
 
+=pod
+
 =head1 NAME
 
 LWP::RobotUA - a class for well-behaved Web robots
@@ -213,7 +215,7 @@ should consult the F</robots.txt> file to ensure that they are welcomed
 and they should not make requests too frequently.
 
 But before you consider writing a robot, take a look at
-<URL:http://www.robotstxt.org/>.
+L<URL:http://www.robotstxt.org/>.
 
 When you use an I<LWP::RobotUA> object as your user agent, then you do not
 really have to think about these things yourself; C<robots.txt> files
@@ -226,16 +228,14 @@ special agent will make sure you are nice.
 
 =head1 METHODS
 
-The LWP::RobotUA is a sub-class of LWP::UserAgent and implements the
+The LWP::RobotUA is a sub-class of L<LWP::UserAgent> and implements the
 same methods. In addition the following methods are provided:
 
-=over 4
-
-=item $ua = LWP::RobotUA->new( %options )
+=head2 new
 
-=item $ua = LWP::RobotUA->new( $agent, $from )
-
-=item $ua = LWP::RobotUA->new( $agent, $from, $rules )
+    my $ua = LWP::RobotUA->new( %options )
+    my $ua = LWP::RobotUA->new( $agent, $from )
+    my $ua = LWP::RobotUA->new( $agent, $from, $rules )
 
 The LWP::UserAgent options C<agent> and C<from> are mandatory.  The
 options C<delay>, C<use_sleep> and C<rules> initialize attributes
@@ -246,51 +246,58 @@ F<robots.txt>.
 It is also possible to just pass the value of C<agent>, C<from> and
 optionally C<rules> as plain positional arguments.
 
-=item $ua->delay
+=head2 delay
 
-=item $ua->delay( $minutes )
+    my $delay = $ua->delay;
+    $ua->delay( $minutes );
 
 Get/set the minimum delay between requests to the same server, in
-I<minutes>.  The default is 1 minute.  Note that this number doesn't
-have to be an integer; for example, this sets the delay to 10 seconds:
+I<minutes>.  The default is C<1> minute.  Note that this number doesn't
+have to be an integer; for example, this sets the delay to C<10> seconds:
 
     $ua->delay(10/60);
 
-=item $ua->use_sleep
+=head2 use_sleep
 
-=item $ua->use_sleep( $boolean )
+    my $bool = $ua->use_sleep;
+    $ua->use_sleep( $boolean );
 
-Get/set a value indicating whether the UA should sleep() if requests
-arrive too fast, defined as $ua->delay minutes not passed since
-last request to the given server.  The default is TRUE.  If this value is
-FALSE then an internal SERVICE_UNAVAILABLE response will be generated.
-It will have a Retry-After header that indicates when it is OK to
+Get/set a value indicating whether the UA should L<LWP::RobotUA/sleep> if
+requests arrive too fast, defined as C<< $ua->delay >> minutes not passed since
+last request to the given server.  The default is true.  If this value is
+false then an internal C<SERVICE_UNAVAILABLE> response will be generated.
+It will have a C<Retry-After> header that indicates when it is OK to
 send another request to this server.
 
-=item $ua->rules
+=head2 rules
 
-=item $ua->rules( $rules )
+    my $rules = $ua->rules;
+    $ua->rules( $rules );
 
 Set/get which I<WWW::RobotRules> object to use.
 
-=item $ua->no_visits( $netloc )
+=head2 no_visits
+
+    my $num = $ua->no_visits( $netloc )
 
 Returns the number of documents fetched from this server host. Yeah I
-know, this method should probably have been named num_visits() or
+know, this method should probably have been named C<num_visits> or
 something like that. :-(
 
-=item $ua->host_wait( $netloc )
+=head2 host_wait
+
+    my $num = $ua->host_wait( $netloc )
 
 Returns the number of I<seconds> (from now) you must wait before you can
 make a new request to this host.
 
-=item $ua->as_string
+=head2 as_string
+
+    my $string = $ua->as_string;
 
 Returns a string that describes the state of the UA.
 Mainly useful for debugging.
 
-=back
-
 =head1 SEE ALSO
 
 L<LWP::UserAgent>, L<WWW::RobotRules>
@@ -301,3 +308,5 @@ Copyright 1996-2004 Gisle Aas.
 
 This library is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
+
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/Simple.pm b/Master/tlpkg/tlperl/site/lib/LWP/Simple.pm
index e522a1d19c2..321f9641c48 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/Simple.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/Simple.pm
@@ -1,21 +1,20 @@
 package LWP::Simple;
 
 use strict;
-use vars qw($ua %loop_check $FULL_LWP @EXPORT @EXPORT_OK $VERSION);
+
+our $VERSION = '6.25';
 
 require Exporter;
 
-@EXPORT = qw(get head getprint getstore mirror);
-@EXPORT_OK = qw($ua);
+our @EXPORT = qw(get head getprint getstore mirror);
+our @EXPORT_OK = qw($ua);
 
-# I really hate this.  I was a bad idea to do it in the first place.
+# I really hate this.  It was a bad idea to do it in the first place.
 # Wonder how to get rid of it???  (It even makes LWP::Simple 7% slower
 # for trivial tests)
 use HTTP::Status;
 push(@EXPORT, @HTTP::Status::EXPORT);
 
-$VERSION = "6.15";
-
 sub import
 {
     my $pkg = shift;
@@ -24,13 +23,12 @@ sub import
 }
 
 use LWP::UserAgent ();
-use HTTP::Status ();
 use HTTP::Date ();
-$ua = LWP::UserAgent->new;  # we create a global UserAgent object
+
+our $ua = LWP::UserAgent->new;  # we create a global UserAgent object
 $ua->agent("LWP::Simple/$VERSION ");
 $ua->env_proxy;
 
-
 sub get ($)
 {
     my $response = $ua->get(shift);
@@ -97,6 +95,8 @@ sub mirror ($$)
 
 __END__
 
+=pod
+
 =head1 NAME
 
 LWP::Simple - simple procedural interface to LWP
@@ -123,24 +123,36 @@ This module is meant for people who want a simplified view of the
 libwww-perl library.  It should also be suitable for one-liners.  If
 you need more control or access to the header fields in the requests
 sent and responses received, then you should use the full object-oriented
-interface provided by the C<LWP::UserAgent> module.
+interface provided by the L<LWP::UserAgent> module.
+
+The module will also export the L<LWP::UserAgent> object as C<$ua> if you
+ask for it explicitly.
+
+The user agent created by this module will identify itself as
+C<LWP::Simple/#.##>
+and will initialize its proxy defaults from the environment (by
+calling C<< $ua->env_proxy >>).
+
+=head1 FUNCTIONS
 
 The following functions are provided (and exported) by this module:
 
-=over 3
+=head2 get
 
-=item get($url)
+    my $res = get($url);
 
 The get() function will fetch the document identified by the given URL
-and return it.  It returns C<undef> if it fails.  The $url argument can
-be either a string or a reference to a URI object.
+and return it.  It returns C<undef> if it fails.  The C<$url> argument can
+be either a string or a reference to a L<URI> object.
 
 You will not be able to examine the response code or response headers
-(like 'Content-Type') when you are accessing the web using this
+(like C<Content-Type>) when you are accessing the web using this
 function.  If you need that information you should use the full OO
 interface (see L<LWP::UserAgent>).
 
-=item head($url)
+=head2 head
+
+    my $res = head($url);
 
 Get document headers. Returns the following 5 values if successful:
 ($content_type, $document_length, $modified_time, $expires, $server)
@@ -148,7 +160,9 @@ Get document headers. Returns the following 5 values if successful:
 Returns an empty list if it fails.  In scalar context returns TRUE if
 successful.
 
-=item getprint($url)
+=head2 getprint
+
+    my $code = getprint($url);
 
 Get and print a document identified by a URL. The document is printed
 to the selected default filehandle for output (normally STDOUT) as
@@ -156,22 +170,26 @@ data is received from the network.  If the request fails, then the
 status code and message are printed on STDERR.  The return value is
 the HTTP response code.
 
-=item getstore($url, $file)
+=head2 getstore
+
+    my $code = getstore($url, $file)
 
 Gets a document identified by a URL and stores it in the file. The
 return value is the HTTP response code.
 
-=item mirror($url, $file)
+=head2 mirror
+
+    my $code = mirror($url, $file);
 
 Get and store a document identified by a URL, using
 I<If-modified-since>, and checking the I<Content-Length>.  Returns
 the HTTP response code.
 
-=back
+=head1 STATUS CONSTANTS
 
-This module also exports the HTTP::Status constants and procedures.
-You can use them when you check the response code from getprint(),
-getstore() or mirror().  The constants are:
+This module also exports the L<HTTP::Status> constants and procedures.
+You can use them when you check the response code from L<LWP::Simple/getprint>,
+L<LWP::Simple/getstore> or L<LWP::Simple/mirror>.  The constants are:
 
    RC_CONTINUE
    RC_SWITCHING_PROTOCOLS
@@ -211,34 +229,28 @@ getstore() or mirror().  The constants are:
    RC_GATEWAY_TIMEOUT
    RC_HTTP_VERSION_NOT_SUPPORTED
 
-The HTTP::Status classification functions are:
+=head1 CLASSIFICATION FUNCTIONS
 
-=over 3
+The L<HTTP::Status> classification functions are:
 
-=item is_success($rc)
+=head2 is_success
 
-True if response code indicated a successful request.
-
-=item is_error($rc)
+    my $bool = is_success($rc);
 
-True if response code indicated that an error occurred.
+True if response code indicated a successful request.
 
-=back
+=head2 is_error
 
-The module will also export the LWP::UserAgent object as C<$ua> if you
-ask for it explicitly.
+    my $bool = is_error($rc)
 
-The user agent created by this module will identify itself as
-"LWP::Simple/#.##"
-and will initialize its proxy defaults from the environment (by
-calling $ua->env_proxy).
+True if response code indicated that an error occurred.
 
 =head1 CAVEAT
 
-Note that if you are using both LWP::Simple and the very popular CGI.pm
+Note that if you are using both LWP::Simple and the very popular L<CGI>
 module, you may be importing a C<head> function from each module,
-producing a warning like "Prototype mismatch: sub main::head ($) vs
-none". Get around this problem by just not importing LWP::Simple's
+producing a warning like C<Prototype mismatch: sub main::head ($) vs none>.
+Get around this problem by just not importing LWP::Simple's
 C<head> function, like so:
 
         use LWP::Simple qw(!head);
@@ -251,3 +263,5 @@ it as C<LWP::Simple::head($url)>.
 
 L<LWP>, L<lwpcook>, L<LWP::UserAgent>, L<HTTP::Status>, L<lwp-request>,
 L<lwp-mirror>
+
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/LWP/UserAgent.pm b/Master/tlpkg/tlperl/site/lib/LWP/UserAgent.pm
index b9a32839dd0..07c391605e3 100644
--- a/Master/tlpkg/tlperl/site/lib/LWP/UserAgent.pm
+++ b/Master/tlpkg/tlperl/site/lib/LWP/UserAgent.pm
@@ -1,12 +1,10 @@
 package LWP::UserAgent;
 
 use strict;
-use vars qw(@ISA $VERSION);
 
-require LWP::MemberMixin;
-@ISA = qw(LWP::MemberMixin);
-$VERSION = "6.15";
+use base qw(LWP::MemberMixin);
 
+use Carp ();
 use HTTP::Request ();
 use HTTP::Response ();
 use HTTP::Date ();
@@ -14,14 +12,16 @@ use HTTP::Date ();
 use LWP ();
 use LWP::Protocol ();
 
-use Carp ();
+use Scalar::Util qw(blessed);
+use Try::Tiny qw(try catch);
 
+our $VERSION = '6.25';
 
 sub new
 {
     # Check for common user mistake
-    Carp::croak("Options to LWP::UserAgent should be key/value pairs, not hash reference") 
-        if ref($_[1]) eq 'HASH'; 
+    Carp::croak("Options to LWP::UserAgent should be key/value pairs, not hash reference")
+        if ref($_[1]) eq 'HASH';
 
     my($class, %cnf) = @_;
 
@@ -65,17 +65,19 @@ sub new
     my $max_redirect = delete $cnf{max_redirect};
     $max_redirect = 7 unless defined $max_redirect;
     my $env_proxy = exists $cnf{env_proxy} ? delete $cnf{env_proxy} : $ENV{PERL_LWP_ENV_PROXY};
+    my $no_proxy = exists $cnf{no_proxy} ? delete $cnf{no_proxy} : [];
+    Carp::croak(qq{no_proxy must be an arrayref, not $no_proxy!}) if ref $no_proxy ne 'ARRAY';
 
     my $cookie_jar = delete $cnf{cookie_jar};
     my $conn_cache = delete $cnf{conn_cache};
     my $keep_alive = delete $cnf{keep_alive};
-    
+
     Carp::croak("Can't mix conn_cache and keep_alive")
 	  if $conn_cache && $keep_alive;
 
     my $protocols_allowed   = delete $cnf{protocols_allowed};
     my $protocols_forbidden = delete $cnf{protocols_forbidden};
-    
+
     my $requests_redirectable = delete $cnf{requests_redirectable};
     $requests_redirectable = ['GET', 'HEAD']
       unless defined $requests_redirectable;
@@ -88,34 +90,40 @@ sub new
     Carp::croak("requests_redirectable has to be an arrayref or 0, not \"$requests_redirectable\"!")
       if $requests_redirectable and ref($requests_redirectable) ne 'ARRAY';
 
-
     if (%cnf && $^W) {
 	Carp::carp("Unrecognized LWP::UserAgent options: @{[sort keys %cnf]}");
     }
 
     my $self = bless {
-		      def_headers  => $def_headers,
-		      timeout      => $timeout,
-		      local_address => $local_address,
-		      ssl_opts     => $ssl_opts,
-		      use_eval     => $use_eval,
-                      show_progress=> $show_progress,
-		      max_size     => $max_size,
-		      max_redirect => $max_redirect,
-                      proxy        => {},
-		      no_proxy     => [],
-                      protocols_allowed     => $protocols_allowed,
-                      protocols_forbidden   => $protocols_forbidden,
-                      requests_redirectable => $requests_redirectable,
-		     }, $class;
+        def_headers           => $def_headers,
+        timeout               => $timeout,
+        local_address         => $local_address,
+        ssl_opts              => $ssl_opts,
+        use_eval              => $use_eval,
+        show_progress         => $show_progress,
+        max_size              => $max_size,
+        max_redirect          => $max_redirect,
+        # We set proxy later as we do validation on the values
+        proxy                 => {},
+        no_proxy              => [ @{ $no_proxy } ],
+        protocols_allowed     => $protocols_allowed,
+        protocols_forbidden   => $protocols_forbidden,
+        requests_redirectable => $requests_redirectable,
+    }, $class;
 
     $self->agent(defined($agent) ? $agent : $class->_agent)
-	if defined($agent) || !$def_headers || !$def_headers->header("User-Agent");
+        if defined($agent) || !$def_headers || !$def_headers->header("User-Agent");
     $self->from($from) if $from;
     $self->cookie_jar($cookie_jar) if $cookie_jar;
     $self->parse_head($parse_head);
     $self->env_proxy if $env_proxy;
 
+    if (exists $cnf{proxy}) {
+        Carp::croak(qq{proxy must be an arrayref, not $cnf{proxy}!})
+            if ref $cnf{proxy} ne 'ARRAY';
+        $self->proxy($cnf{proxy});
+    }
+
     $self->protocols_allowed(  $protocols_allowed  ) if $protocols_allowed;
     $self->protocols_forbidden($protocols_forbidden) if $protocols_forbidden;
 
@@ -171,10 +179,13 @@ sub send_request
         }
 
         unless ($protocol) {
-            $protocol = eval { LWP::Protocol::create($scheme, $self) };
-            if ($@) {
-                $@ =~ s/ at .* line \d+.*//s;  # remove file/line number
-                $response =  _new_response($request, &HTTP::Status::RC_NOT_IMPLEMENTED, $@);
+            try {
+                $protocol = LWP::Protocol::create($scheme, $self);
+            }
+            catch {
+                my $error = $_;
+                $error =~ s/ at .* line \d+.*//s;  # remove file/line number
+                $response =  _new_response($request, HTTP::Status::RC_NOT_IMPLEMENTED, $error);
                 if ($scheme eq "https") {
                     $response->message($response->message . " (LWP::Protocol::https not installed)");
                     $response->content_type("text/plain");
@@ -183,28 +194,28 @@ LWP will support https URLs if the LWP::Protocol::https module
 is installed.
 EOT
                 }
-            }
+            };
         }
 
         if (!$response && $self->{use_eval}) {
             # we eval, and turn dies into responses below
-            eval {
-                $response = $protocol->request($request, $proxy, $arg, $size, $self->{timeout}) ||
-		    die "No response returned by $protocol";
-            };
-            if ($@) {
-                if (UNIVERSAL::isa($@, "HTTP::Response")) {
-                    $response = $@;
+            try {
+                $response = $protocol->request($request, $proxy, $arg, $size, $self->{timeout}) || die "No response returned by $protocol";
+            }
+            catch {
+                my $error = $_;
+                if (blessed($error) && $error->isa("HTTP::Response")) {
+                    $response = $error;
                     $response->request($request);
                 }
                 else {
-                    my $full = $@;
-                    (my $status = $@) =~ s/\n.*//s;
+                    my $full = $error;
+                    (my $status = $error) =~ s/\n.*//s;
                     $status =~ s/ at .* line \d+.*//s;  # remove file/line number
-                    my $code = ($status =~ s/^(\d\d\d)\s+//) ? $1 : &HTTP::Status::RC_INTERNAL_SERVER_ERROR;
+                    my $code = ($status =~ s/^(\d\d\d)\s+//) ? $1 : HTTP::Status::RC_INTERNAL_SERVER_ERROR;
                     $response = _new_response($request, $code, $status, $full);
                 }
-            }
+            };
         }
         elsif (!$response) {
             $response = $protocol->request($request, $proxy,
@@ -264,27 +275,32 @@ sub simple_request
         Carp::croak("No request object passed in");
     }
 
-    eval {
-	$request = $self->prepare_request($request);
+    my $error;
+    try {
+        $request = $self->prepare_request($request);
+    }
+    catch {
+        $error = $_;
+        $error =~ s/ at .* line \d+.*//s;  # remove file/line number
     };
-    if ($@) {
-	$@ =~ s/ at .* line \d+.*//s;  # remove file/line number
-	return _new_response($request, &HTTP::Status::RC_BAD_REQUEST, $@);
+
+    if ($error) {
+        return _new_response($request, HTTP::Status::RC_BAD_REQUEST, $error);
     }
     return $self->send_request($request, $arg, $size);
 }
 
 
-sub request
-{
-    my($self, $request, $arg, $size, $previous) = @_;
+sub request {
+    my ($self, $request, $arg, $size, $previous) = @_;
 
     my $response = $self->simple_request($request, $arg, $size);
     $response->previous($previous) if $previous;
 
     if ($response->redirects >= $self->{max_redirect}) {
         $response->header("Client-Warning" =>
-                          "Redirect loop detected (max_redirect = $self->{max_redirect})");
+                "Redirect loop detected (max_redirect = $self->{max_redirect})"
+        );
         return $response;
     }
 
@@ -294,113 +310,121 @@ sub request
 
     my $code = $response->code;
 
-    if ($code == &HTTP::Status::RC_MOVED_PERMANENTLY or
-	$code == &HTTP::Status::RC_FOUND or
-	$code == &HTTP::Status::RC_SEE_OTHER or
-	$code == &HTTP::Status::RC_TEMPORARY_REDIRECT)
+    if (   $code == HTTP::Status::RC_MOVED_PERMANENTLY
+        or $code == HTTP::Status::RC_FOUND
+        or $code == HTTP::Status::RC_SEE_OTHER
+        or $code == HTTP::Status::RC_TEMPORARY_REDIRECT)
     {
-	my $referral = $request->clone;
-
-	# These headers should never be forwarded
-	$referral->remove_header('Host', 'Cookie');
-	
-	if ($referral->header('Referer') &&
-	    $request->uri->scheme eq 'https' &&
-	    $referral->uri->scheme eq 'http')
-	{
-	    # RFC 2616, section 15.1.3.
-	    # https -> http redirect, suppressing Referer
-	    $referral->remove_header('Referer');
-	}
+        my $referral = $request->clone;
 
-	if ($code == &HTTP::Status::RC_SEE_OTHER ||
-	    $code == &HTTP::Status::RC_FOUND) 
+        # These headers should never be forwarded
+        $referral->remove_header('Host', 'Cookie');
+
+        if (   $referral->header('Referer')
+            && $request->uri->scheme eq 'https'
+            && $referral->uri->scheme eq 'http')
         {
-	    my $method = uc($referral->method);
-	    unless ($method eq "GET" || $method eq "HEAD") {
-		$referral->method("GET");
-		$referral->content("");
-		$referral->remove_content_headers;
-	    }
-	}
+            # RFC 2616, section 15.1.3.
+            # https -> http redirect, suppressing Referer
+            $referral->remove_header('Referer');
+        }
 
-	# And then we update the URL based on the Location:-header.
-	my $referral_uri = $response->header('Location');
-	{
-	    # Some servers erroneously return a relative URL for redirects,
-	    # so make it absolute if it not already is.
-	    local $URI::ABS_ALLOW_RELATIVE_SCHEME = 1;
-	    my $base = $response->base;
-	    $referral_uri = "" unless defined $referral_uri;
-	    $referral_uri = $HTTP::URI_CLASS->new($referral_uri, $base)
-		            ->abs($base);
-	}
-	$referral->uri($referral_uri);
+        if (   $code == HTTP::Status::RC_SEE_OTHER
+            || $code == HTTP::Status::RC_FOUND)
+        {
+            my $method = uc($referral->method);
+            unless ($method eq "GET" || $method eq "HEAD") {
+                $referral->method("GET");
+                $referral->content("");
+                $referral->remove_content_headers;
+            }
+        }
 
-	return $response unless $self->redirect_ok($referral, $response);
-	return $self->request($referral, $arg, $size, $response);
+        # And then we update the URL based on the Location:-header.
+        my $referral_uri = $response->header('Location');
+        {
+            # Some servers erroneously return a relative URL for redirects,
+            # so make it absolute if it not already is.
+            local $URI::ABS_ALLOW_RELATIVE_SCHEME = 1;
+            my $base = $response->base;
+            $referral_uri = "" unless defined $referral_uri;
+            $referral_uri
+                = $HTTP::URI_CLASS->new($referral_uri, $base)->abs($base);
+        }
+        $referral->uri($referral_uri);
+
+        return $response unless $self->redirect_ok($referral, $response);
+        return $self->request($referral, $arg, $size, $response);
 
     }
-    elsif ($code == &HTTP::Status::RC_UNAUTHORIZED ||
-	     $code == &HTTP::Status::RC_PROXY_AUTHENTICATION_REQUIRED
-	    )
+    elsif ($code == HTTP::Status::RC_UNAUTHORIZED
+        || $code == HTTP::Status::RC_PROXY_AUTHENTICATION_REQUIRED)
     {
-	my $proxy = ($code == &HTTP::Status::RC_PROXY_AUTHENTICATION_REQUIRED);
-	my $ch_header = $proxy || $request->method eq 'CONNECT'
-	    ?  "Proxy-Authenticate" : "WWW-Authenticate";
-	my @challenge = $response->header($ch_header);
-	unless (@challenge) {
-	    $response->header("Client-Warning" => 
-			      "Missing Authenticate header");
-	    return $response;
-	}
+        my $proxy = ($code == HTTP::Status::RC_PROXY_AUTHENTICATION_REQUIRED);
+        my $ch_header
+            = $proxy || $request->method eq 'CONNECT'
+            ? "Proxy-Authenticate"
+            : "WWW-Authenticate";
+        my @challenges = $response->header($ch_header);
+        unless (@challenges) {
+            $response->header(
+                "Client-Warning" => "Missing Authenticate header");
+            return $response;
+        }
 
-	require HTTP::Headers::Util;
-	CHALLENGE: for my $challenge (@challenge) {
-	    $challenge =~ tr/,/;/;  # "," is used to separate auth-params!!
-	    ($challenge) = HTTP::Headers::Util::split_header_words($challenge);
-	    my $scheme = shift(@$challenge);
-	    shift(@$challenge); # no value
-	    $challenge = { @$challenge };  # make rest into a hash
-
-	    unless ($scheme =~ /^([a-z]+(?:-[a-z]+)*)$/) {
-		$response->header("Client-Warning" => 
-				  "Bad authentication scheme '$scheme'");
-		return $response;
-	    }
-	    $scheme = $1;  # untainted now
-	    my $class = "LWP::Authen::\u$scheme";
-	    $class =~ s/-/_/g;
-
-	    no strict 'refs';
-	    unless (%{"$class\::"}) {
-		# try to load it
-		eval "require $class";
-		if ($@) {
-		    if ($@ =~ /^Can\'t locate/) {
-			$response->header("Client-Warning" =>
-					  "Unsupported authentication scheme '$scheme'");
-		    }
-		    else {
-			$response->header("Client-Warning" => $@);
-		    }
-		    next CHALLENGE;
-		}
-	    }
-	    unless ($class->can("authenticate")) {
-		$response->header("Client-Warning" =>
-				  "Unsupported authentication scheme '$scheme'");
-		next CHALLENGE;
-	    }
-	    return $class->authenticate($self, $proxy, $challenge, $response,
-					$request, $arg, $size);
-	}
-	return $response;
+        require HTTP::Headers::Util;
+        CHALLENGE: for my $challenge (@challenges) {
+            $challenge =~ tr/,/;/;    # "," is used to separate auth-params!!
+            ($challenge) = HTTP::Headers::Util::split_header_words($challenge);
+            my $scheme = shift(@$challenge);
+            shift(@$challenge);       # no value
+            $challenge = {@$challenge};    # make rest into a hash
+
+            unless ($scheme =~ /^([a-z]+(?:-[a-z]+)*)$/) {
+                $response->header(
+                    "Client-Warning" => "Bad authentication scheme '$scheme'");
+                return $response;
+            }
+            $scheme = $1;                  # untainted now
+            my $class = "LWP::Authen::\u$scheme";
+            $class =~ s/-/_/g;
+
+            no strict 'refs';
+            unless (%{"$class\::"}) {
+                # try to load it
+                my $error;
+                try {
+                    (my $req = $class) =~ s{::}{/}g;
+                    $req .= '.pm' unless $req =~ /\.pm$/;
+                    require $req;
+                }
+                catch {
+                    $error = $_;
+                };
+                if ($error) {
+                    if ($error =~ /^Can\'t locate/) {
+                        $response->header("Client-Warning" =>
+                                "Unsupported authentication scheme '$scheme'");
+                    }
+                    else {
+                        $response->header("Client-Warning" => $error);
+                    }
+                    next CHALLENGE;
+                }
+            }
+            unless ($class->can("authenticate")) {
+                $response->header("Client-Warning" =>
+                        "Unsupported authentication scheme '$scheme'");
+                next CHALLENGE;
+            }
+            return $class->authenticate($self, $proxy, $challenge, $response,
+                $request, $arg, $size);
+        }
+        return $response;
     }
     return $response;
 }
 
-
 #
 # Now the shortcuts...
 #
@@ -411,12 +435,47 @@ sub get {
     return $self->request( HTTP::Request::Common::GET( @parameters ), @suff );
 }
 
+sub _has_raw_content {
+    my $self = shift;
+    shift; # drop url
+
+    # taken from HTTP::Request::Common::request_type_with_data
+    my $content;
+    $content = shift if @_ and ref $_[0];
+    my($k, $v);
+    while (($k,$v) = splice(@_, 0, 2)) {
+        if (lc($k) eq 'content') {
+            $content = $v;
+        }
+    }
+
+    # We were given Content => 'string' ...
+    if (defined $content && ! ref ($content)) {
+        return 1;
+    }
+
+    return;
+}
+
+sub _maybe_copy_default_content_type {
+    my ($self, $req, @parameters) = @_;
+
+    # If we have a default Content-Type and someone passes in a POST/PUT
+    # with Content => 'some-string-value', use that Content-Type instead
+    # of x-www-form-urlencoded
+    my $ct = $self->default_header('Content-Type');
+    return unless defined $ct && $self->_has_raw_content(@parameters);
+
+    $req->header('Content-Type' => $ct);
+}
 
 sub post {
     require HTTP::Request::Common;
     my($self, @parameters) = @_;
     my @suff = $self->_process_colonic_headers(\@parameters, (ref($parameters[1]) ? 2 : 1));
-    return $self->request( HTTP::Request::Common::POST( @parameters ), @suff );
+    my $req = HTTP::Request::Common::POST(@parameters);
+    $self->_maybe_copy_default_content_type($req, @parameters);
+    return $self->request($req, @suff);
 }
 
 
@@ -432,7 +491,9 @@ sub put {
     require HTTP::Request::Common;
     my($self, @parameters) = @_;
     my @suff = $self->_process_colonic_headers(\@parameters, (ref($parameters[1]) ? 2 : 1));
-    return $self->request( HTTP::Request::Common::PUT( @parameters ), @suff );
+    my $req = HTTP::Request::Common::PUT(@parameters);
+    $self->_maybe_copy_default_content_type($req, @parameters);
+    return $self->request($req, @suff);
 }
 
 
@@ -460,7 +521,7 @@ sub _process_colonic_headers {
 	    Carp::croak("A :content_cb value can't be undef") unless defined $arg;
 	    Carp::croak("A :content_cb value must be a coderef")
 		unless ref $arg and UNIVERSAL::isa($arg, 'CODE');
-	    
+
 	}
 	elsif ($args->[$i] eq ':content_file') {
 	    $arg = $args->[$i + 1];
@@ -588,13 +649,13 @@ sub redirect_ok
     my $method = $response->request->method;
     return 0 unless grep $_ eq $method,
       @{ $self->requests_redirectable || [] };
-    
+
     if ($new_request->uri->scheme eq 'file') {
       $response->header("Client-Warning" =>
 			"Can't redirect to a file:// URL!");
       return 0;
     }
-    
+
     # Otherwise it's apparently okay...
     return 1;
 }
@@ -726,7 +787,7 @@ sub default_header {
     return $self->default_headers->header(@_);
 }
 
-sub _agent       { "libwww-perl/$LWP::VERSION" }
+sub _agent { "libwww-perl/$VERSION" }
 
 sub agent {
     my $self = shift;
@@ -917,7 +978,7 @@ sub mirror
     }
 
     # Only fetching a fresh copy of the would be considered success.
-    # If the file was not modified, "304" would returned, which 
+    # If the file was not modified, "304" would returned, which
     # is considered by HTTP::Status to be a "redirect", /not/ "success"
     if ( $response->is_success ) {
         my @stat        = stat($tmpfile) or die "Could not stat tmpfile '$tmpfile': $!";
@@ -932,7 +993,7 @@ sub mirror
             unlink($tmpfile);
             die "Content-length mismatch: " . "expected $content_length bytes, got $file_length\n";
         }
-        # The file was the expected length. 
+        # The file was the expected length.
         else {
             # Replace the stale file with a fresh copy
             if ( -e $file ) {
@@ -949,7 +1010,7 @@ sub mirror
             }
         }
     }
-    # The local copy is fresh enough, so just delete the temp file  
+    # The local copy is fresh enough, so just delete the temp file
     else {
 	unlink($tmpfile);
     }
@@ -974,11 +1035,18 @@ sub _need_proxy {
 }
 
 
-sub proxy
-{
+sub proxy {
     my $self = shift;
     my $key  = shift;
-    return map $self->proxy($_, @_), @$key if ref $key;
+    if (!@_ && ref $key eq 'ARRAY') {
+        die 'odd number of items in proxy arrayref!' unless @{$key} % 2 == 0;
+
+        # This map reads the elements of $key 2 at a time
+        return
+            map { $self->proxy($key->[2 * $_], $key->[2 * $_ + 1]) }
+            (0 .. @{$key} / 2 - 1);
+    }
+    return map { $self->proxy($_, @_) } @$key if ref $key;
 
     Carp::croak("'$key' is not a valid URI scheme") unless $key =~ /^$URI::scheme_re\z/;
     my $old = $self->{'proxy'}{$key};
@@ -1052,20 +1120,24 @@ sub _new_response {
 
 __END__
 
+=pod
+
 =head1 NAME
 
 LWP::UserAgent - Web user agent class
 
 =head1 SYNOPSIS
 
- require LWP::UserAgent;
- 
+ use strict;
+ use warnings;
+ use LWP::UserAgent ();
+
  my $ua = LWP::UserAgent->new;
  $ua->timeout(10);
  $ua->env_proxy;
- 
+
  my $response = $ua->get('http://search.cpan.org/');
- 
+
  if ($response->is_success) {
      print $response->decoded_content;  # or whatever
  }
@@ -1075,35 +1147,48 @@ LWP::UserAgent - Web user agent class
 
 =head1 DESCRIPTION
 
-The C<LWP::UserAgent> is a class implementing a web user agent.
-C<LWP::UserAgent> objects can be used to dispatch web requests.
+The L<LWP::UserAgent> is a class implementing a web user agent.
+L<LWP::UserAgent> objects can be used to dispatch web requests.
 
-In normal use the application creates an C<LWP::UserAgent> object, and
+In normal use the application creates an L<LWP::UserAgent> object, and
 then configures it with values for timeouts, proxies, name, etc. It
-then creates an instance of C<HTTP::Request> for the request that
+then creates an instance of L<HTTP::Request> for the request that
 needs to be performed. This request is then passed to one of the
 request method the UserAgent, which dispatches it using the relevant
-protocol, and returns a C<HTTP::Response> object.  There are
-convenience methods for sending the most common request types: get(),
-head(), post(), put() and delete().  When using these methods then the
-creation of the request object is hidden as shown in the synopsis above.
-
-The basic approach of the library is to use HTTP style communication
+protocol, and returns a L<HTTP::Response> object.  There are
+convenience methods for sending the most common request types:
+L<LWP::UserAgent/get>, L<LWP::UserAgent/head>, L<LWP::UserAgent/post>,
+L<LWP::UserAgent/put> and L<LWP::UserAgent/delete>.  When using these
+methods, the creation of the request object is hidden as shown in the
+synopsis above.
+
+The basic approach of the library is to use HTTP-style communication
 for all protocol schemes.  This means that you will construct
-C<HTTP::Request> objects and receive C<HTTP::Response> objects even
+L<HTTP::Request> objects and receive L<HTTP::Response> objects even
 for non-HTTP resources like I<gopher> and I<ftp>.  In order to achieve
-even more similarity to HTTP style communications, gopher menus and
+even more similarity to HTTP-style communications, I<gopher> menus and
 file directories are converted to HTML documents.
 
 =head1 CONSTRUCTOR METHODS
 
 The following constructor methods are available:
 
-=over 4
+=head2 clone
 
-=item $ua = LWP::UserAgent->new( %options )
+    my $ua2 = $ua->clone;
 
-This method constructs a new C<LWP::UserAgent> object and returns it.
+Returns a copy of the L<LWP::UserAgent> object.
+
+B<CAVEAT>: Please be aware that the clone method does not copy or clone your
+C<cookie_jar> attribute. Due to the limited restrictions on what can be used
+for your cookie jar, there is no way to clone the attribute. The C<cookie_jar>
+attribute will be C<undef> in the new object instance.
+
+=head2 new
+
+    my $ua = LWP::UserAgent->new( %options )
+
+This method constructs a new L<LWP::UserAgent> object and returns it.
 Key/value pair arguments may be provided to set up the initial state.
 The following options correspond to attribute methods described below:
 
@@ -1115,7 +1200,7 @@ The following options correspond to attribute methods described below:
    cookie_jar              undef
    default_headers         HTTP::Headers->new
    local_address           undef
-   ssl_opts		   { verify_hostname => 1 }
+   ssl_opts                { verify_hostname => 1 }
    max_size                undef
    max_redirect            7
    parse_head              1
@@ -1123,92 +1208,77 @@ The following options correspond to attribute methods described below:
    protocols_forbidden     undef
    requests_redirectable   ['GET', 'HEAD']
    timeout                 180
+   proxy                   undef
+   no_proxy                []
 
 The following additional options are also accepted: If the C<env_proxy> option
-is passed in with a TRUE value, then proxy settings are read from environment
-variables (see env_proxy() method below).  If C<env_proxy> isn't provided the
-C<PERL_LWP_ENV_PROXY> environment variable controls if env_proxy() is called
-during initialization.  If the C<keep_alive> option is passed in, then a
-C<LWP::ConnCache> is set up (see conn_cache() method below).  The C<keep_alive>
-value is passed on as the C<total_capacity> for the connection cache.
-
-=item $ua->clone
+is passed in with a true value, then proxy settings are read from environment
+variables (see L<LWP::UserAgent/env_proxy>). If C<env_proxy> isn't provided, the
+C<PERL_LWP_ENV_PROXY> environment variable controls if
+L<LWP::UserAgent/env_proxy> is called during initialization.  If the
+C<keep_alive> option is passed in, then a C<LWP::ConnCache> is set up (see
+L<LWP::UserAgent/conn_cache>).  The C<keep_alive> value is passed on as the
+C<total_capacity> for the connection cache.
 
-Returns a copy of the LWP::UserAgent object.
-
-=back
+C<proxy> must be set as an arrayref of key/value pairs. C<no_proxy> takes an
+arrayref of domains.
 
 =head1 ATTRIBUTES
 
 The settings of the configuration attributes modify the behaviour of the
-C<LWP::UserAgent> when it dispatches requests.  Most of these can also
+L<LWP::UserAgent> when it dispatches requests.  Most of these can also
 be initialized by options passed to the constructor method.
 
 The following attribute methods are provided.  The attribute value is
 left unchanged if no argument is given.  The return value from each
 method is the old attribute value.
 
-=over
-
-=item $ua->agent
+=head2 agent
 
-=item $ua->agent( $product_id )
+    my $agent = $ua->agent;
+    $ua->agent('Checkbot/0.4 ');    # append the defaul to the end
+    $ua->agent('Mozilla/5.0');
+    $ua->agent("");                 # don't identify
 
 Get/set the product token that is used to identify the user agent on
-the network.  The agent value is sent as the "User-Agent" header in
-the requests.  The default is the string returned by the _agent()
-method (see below).
+the network. The agent value is sent as the C<User-Agent> header in
+the requests.
 
-If the $product_id ends with space then the _agent() string is
-appended to it.
+The default is a string of the form C<libwww-perl/#.###>, where C<#.###> is
+substituted with the version number of this library.
 
-The user agent string should be one or more simple product identifiers
-with an optional version number separated by the "/" character.
-Examples are:
-
-  $ua->agent('Checkbot/0.4 ' . $ua->_agent);
-  $ua->agent('Checkbot/0.4 ');    # same as above
-  $ua->agent('Mozilla/5.0');
-  $ua->agent("");                 # don't identify
-
-=item $ua->_agent
-
-Returns the default agent identifier.  This is a string of the form
-"libwww-perl/#.###", where "#.###" is substituted with the version number
-of this library.
-
-=item $ua->from
+If the provided string ends with space, the default C<libwww-perl/#.###>
+string is appended to it.
 
-=item $ua->from( $email_address )
+The user agent string should be one or more simple product identifiers
+with an optional version number separated by the C</> character.
 
-Get/set the e-mail address for the human user who controls
-the requesting user agent.  The address should be machine-usable, as
-defined in RFC 822.  The C<from> value is send as the "From" header in
-the requests.  Example:
+=head2 conn_cache
 
-  $ua->from('gaas@cpan.org');
+    my $cache_obj = $ua->conn_cache;
+    $ua->conn_cache( $cache_obj );
 
-The default is to not send a "From" header.  See the default_headers()
-method for the more general interface that allow any header to be defaulted.
+Get/set the L<LWP::ConnCache> object to use.  See L<LWP::ConnCache>
+for details.
 
-=item $ua->cookie_jar
+=head2 cookie_jar
 
-=item $ua->cookie_jar( $cookie_jar_obj )
+    my $jar = $ua->cookie_jar;
+    $ua->cookie_jar( $cookie_jar_obj );
 
 Get/set the cookie jar object to use.  The only requirement is that
-the cookie jar object must implement the extract_cookies($response) and
-add_cookie_header($request) methods.  These methods will then be
+the cookie jar object must implement the C<extract_cookies($response)> and
+C<add_cookie_header($request)> methods.  These methods will then be
 invoked by the user agent as requests are sent and responses are
-received.  Normally this will be a C<HTTP::Cookies> object or some
+received.  Normally this will be a L<HTTP::Cookies> object or some
 subclass.
 
-The default is to have no cookie_jar, i.e. never automatically add
-"Cookie" headers to the requests.
+The default is to have no cookie jar, i.e. never automatically add
+C<Cookie> headers to the requests.
 
-Shortcut: If a reference to a plain hash is passed in as the
-$cookie_jar_object, then it is replaced with an instance of
-C<HTTP::Cookies> that is initialized based on the hash.  This form also
-automatically loads the C<HTTP::Cookies> module.  It means that:
+Shortcut: If a reference to a plain hash is passed in, it is replaced with an
+instance of L<HTTP::Cookies> that is initialized based on the hash. This form
+also automatically loads the L<HTTP::Cookies> module.  It means that:
 
   $ua->cookie_jar({ file => "$ENV{HOME}/.cookies.txt" });
 
@@ -1217,154 +1287,161 @@ is really just a shortcut for:
   require HTTP::Cookies;
   $ua->cookie_jar(HTTP::Cookies->new(file => "$ENV{HOME}/.cookies.txt"));
 
-=item $ua->default_headers
+=head2 credentials
 
-=item $ua->default_headers( $headers_obj )
+    my $creds = $ua->credentials();
+    $ua->credentials( $netloc, $realm );
+    $ua->credentials( $netloc, $realm, $uname, $pass );
+    $ua->credentials("www.example.com:80", "Some Realm", "foo", "secret");
 
-Get/set the headers object that will provide default header values for
-any requests sent.  By default this will be an empty C<HTTP::Headers>
-object.
+Get/set the user name and password to be used for a realm.
 
-=item $ua->default_header( $field )
+The C<$netloc> is a string of the form C<< <host>:<port> >>.  The username and
+password will only be passed to this server.
 
-=item $ua->default_header( $field => $value )
+=head2 default_header
 
-This is just a short-cut for $ua->default_headers->header( $field =>
-$value ). Example:
+    $ua->default_header( $field );
+    $ua->default_header( $field => $value );
+    $ua->default_header('Accept-Encoding' => scalar HTTP::Message::decodable());
+    $ua->default_header('Accept-Language' => "no, en");
 
-  $ua->default_header('Accept-Encoding' => scalar HTTP::Message::decodable());
-  $ua->default_header('Accept-Language' => "no, en");
+This is just a shortcut for
+C<< $ua->default_headers->header( $field => $value ) >>.
 
-=item $ua->conn_cache
+=head2 default_headers
 
-=item $ua->conn_cache( $cache_obj )
+    my $headers = $ua->default_headers;
+    $ua->default_headers( $headers_obj );
 
-Get/set the C<LWP::ConnCache> object to use.  See L<LWP::ConnCache>
-for details.
+Get/set the headers object that will provide default header values for
+any requests sent.  By default this will be an empty L<HTTP::Headers>
+object.
 
-=item $ua->credentials( $netloc, $realm )
+=head2 from
 
-=item $ua->credentials( $netloc, $realm, $uname, $pass )
+    my $from = $ua->from;
+    $ua->from('foo@bar.com');
 
-Get/set the user name and password to be used for a realm.
+Get/set the email address for the human user who controls
+the requesting user agent.  The address should be machine-usable, as
+defined in L<RFC2822|https://tools.ietf.org/html/rfc2822>. The C<from> value
+is sent as the C<From> header in the requests.
 
-The $netloc is a string of the form "<host>:<port>".  The username and
-password will only be passed to this server.  Example:
+The default is to not send a C<From> header.  See
+L<LWP::UserAgent/default_headers> for the more general interface that allow
+any header to be defaulted.
 
-  $ua->credentials("www.example.com:80", "Some Realm", "foo", "secret");
 
-=item $ua->local_address
+=head2 local_address
 
-=item $ua->local_address( $address )
+    my $address = $ua->local_address;
+    $ua->local_address( $address );
 
 Get/set the local interface to bind to for network connections.  The interface
 can be specified as a hostname or an IP address.  This value is passed as the
 C<LocalAddr> argument to L<IO::Socket::INET>.
 
-=item $ua->max_size
+=head2 max_redirect
+
+    my $max = $ua->max_redirect;
+    $ua->max_redirect( $n );
+
+This reads or sets the object's limit of how many times it will obey
+redirection responses in a given request cycle.
+
+By default, the value is C<7>. This means that if you call L<LWP::UserAgent/request>
+and the response is a redirect elsewhere which is in turn a
+redirect, and so on seven times, then LWP gives up after that seventh
+request.
+
+=head2 max_size
 
-=item $ua->max_size( $bytes )
+    my $size = $ua->max_size;
+    $ua->max_size( $bytes );
 
 Get/set the size limit for response content.  The default is C<undef>,
 which means that there is no limit.  If the returned response content
 is only partial, because the size limit was exceeded, then a
-"Client-Aborted" header will be added to the response.  The content
+C<Client-Aborted> header will be added to the response.  The content
 might end up longer than C<max_size> as we abort once appending a
-chunk of data makes the length exceed the limit.  The "Content-Length"
+chunk of data makes the length exceed the limit.  The C<Content-Length>
 header, if present, will indicate the length of the full content and
 will normally not be the same as C<< length($res->content) >>.
 
-=item $ua->max_redirect
+=head2 parse_head
 
-=item $ua->max_redirect( $n )
-
-This reads or sets the object's limit of how many times it will obey
-redirection responses in a given request cycle.
-
-By default, the value is 7. This means that if you call request()
-method and the response is a redirect elsewhere which is in turn a
-redirect, and so on seven times, then LWP gives up after that seventh
-request.
-
-=item $ua->parse_head
-
-=item $ua->parse_head( $boolean )
+    my $bool = $ua->parse_head;
+    $ua->parse_head( $boolean );
 
 Get/set a value indicating whether we should initialize response
 headers from the E<lt>head> section of HTML documents. The default is
-TRUE.  Do not turn this off, unless you know what you are doing.
+true. I<Do not turn this off> unless you know what you are doing.
 
-=item $ua->protocols_allowed
+=head2 protocols_allowed
 
-=item $ua->protocols_allowed( \@protocols )
+    my $aref = $ua->protocols_allowed;      # get allowed protocols
+    $ua->protocols_allowed( \@protocols );  # allow ONLY these
+    $ua->protocols_allowed(undef);          # delete the list
+    $ua->protocols_allowed(['http',]);      # ONLY allow http
+
+By default, an object has neither a C<protocols_allowed> list, nor a
+L<LWP::UserAgent/protocols_forbidden> list.
 
 This reads (or sets) this user agent's list of protocols that the
 request methods will exclusively allow.  The protocol names are case
 insensitive.
 
-For example: C<$ua-E<gt>protocols_allowed( [ 'http', 'https'] );>
+For example: C<< $ua->protocols_allowed( [ 'http', 'https'] ); >>
 means that this user agent will I<allow only> those protocols,
 and attempts to use this user agent to access URLs with any other
-schemes (like "ftp://...") will result in a 500 error.
-
-To delete the list, call: C<$ua-E<gt>protocols_allowed(undef)>
-
-By default, an object has neither a C<protocols_allowed> list, nor a
-C<protocols_forbidden> list.
+schemes (like C<ftp://...>) will result in a 500 error.
 
 Note that having a C<protocols_allowed> list causes any
-C<protocols_forbidden> list to be ignored.
+L<LWP::UserAgent/protocols_forbidden> list to be ignored.
 
-=item $ua->protocols_forbidden
+=head2 protocols_forbidden
 
-=item $ua->protocols_forbidden( \@protocols )
+    my $aref = $ua->protocols_forbidden;    # get the forbidden list
+    $ua->protocols_forbidden(\@protocols);  # do not allow these
+    $ua->protocols_forbidden(['http',]);    # All http reqs get a 500
+    $ua->protocols_forbidden(undef);        # delete the list
 
 This reads (or sets) this user agent's list of protocols that the
 request method will I<not> allow. The protocol names are case
 insensitive.
 
-For example: C<$ua-E<gt>protocols_forbidden( [ 'file', 'mailto'] );>
+For example: C<< $ua->protocols_forbidden( [ 'file', 'mailto'] ); >>
 means that this user agent will I<not> allow those protocols, and
 attempts to use this user agent to access URLs with those schemes
 will result in a 500 error.
 
-To delete the list, call: C<$ua-E<gt>protocols_forbidden(undef)>
-
-=item $ua->requests_redirectable
+=head2 requests_redirectable
 
-=item $ua->requests_redirectable( \@requests )
+    my $aref = $ua->requests_redirectable;
+    $ua->requests_redirectable( \@requests );
+    $ua->requests_redirectable(['GET', 'HEAD',]); # the default
 
 This reads or sets the object's list of request names that
-C<$ua-E<gt>redirect_ok(...)> will allow redirection for.  By
-default, this is C<['GET', 'HEAD']>, as per RFC 2616.  To
-change to include 'POST', consider:
+L<LWP::UserAgent/redirect_ok> will allow redirection for. By default, this
+is C<['GET', 'HEAD']>, as per L<RFC 2616|https://tools.ietf.org/html/rfc2616>.
+To change to include C<POST>, consider:
 
    push @{ $ua->requests_redirectable }, 'POST';
 
-=item $ua->show_progress
+=head2 show_progress
 
-=item $ua->show_progress( $boolean )
+    my $bool = $ua->show_progress;
+    $ua->show_progress( $boolean );
 
 Get/set a value indicating whether a progress bar should be displayed
-on the terminal as requests are processed. The default is FALSE.
+on the terminal as requests are processed. The default is false.
 
-=item $ua->timeout
+=head2 ssl_opts
 
-=item $ua->timeout( $secs )
-
-Get/set the timeout value in seconds. The default timeout() value is
-180 seconds, i.e. 3 minutes.
-
-The requests is aborted if no activity on the connection to the server
-is observed for C<timeout> seconds.  This means that the time it takes
-for the complete transaction and the request() method to actually
-return might be longer.
-
-=item $ua->ssl_opts
-
-=item $ua->ssl_opts( $key )
-
-=item $ua->ssl_opts( $key => $value )
+    my @keys = $ua->ssl_opts;
+    my $val = $ua->ssl_opts( $key );
+    $ua->ssl_opts( $key => $value );
 
 Get/set the options for SSL connections.  Without argument return the list
 of options keys currently set.  With a single argument return the current
@@ -1408,41 +1485,29 @@ The libwww-perl core no longer bundles protocol plugins for SSL.  You will need
 to install L<LWP::Protocol::https> separately to enable support for processing
 https-URLs.
 
-=back
+=head2 timeout
 
-=head2 Proxy attributes
+    my $secs = $ua->timeout;
+    $ua->timeout( $secs );
 
-The following methods set up when requests should be passed via a
-proxy server.
-
-=over
-
-=item $ua->proxy(\@schemes, $proxy_url)
-
-=item $ua->proxy($scheme, $proxy_url)
-
-Set/retrieve proxy URL for a scheme:
-
- $ua->proxy(['http', 'ftp'], 'http://proxy.sn.no:8001/');
- $ua->proxy('gopher', 'http://proxy.sn.no:8001/');
-
-The first form specifies that the URL is to be used for proxying of
-access methods listed in the list in the first method argument,
-i.e. 'http' and 'ftp'.
+Get/set the timeout value in seconds. The default value is
+180 seconds, i.e. 3 minutes.
 
-The second form shows a shorthand form for specifying
-proxy URL for a single access scheme.
+The requests is aborted if no activity on the connection to the server
+is observed for C<timeout> seconds.  This means that the time it takes
+for the complete transaction and the L<LWP::UserAgent/request> method to
+actually return might be longer.
 
-=item $ua->no_proxy( $domain, ... )
+=head1 PROXY ATTRIBUTES
 
-Do not proxy requests to the given domains.  Calling no_proxy without
-any domains clears the list of domains. Eg:
+The following methods set up when requests should be passed via a
+proxy server.
 
- $ua->no_proxy('localhost', 'example.com');
+=head2 env_proxy
 
-=item $ua->env_proxy
+    $ua->env_proxy;
 
-Load proxy settings from *_proxy environment variables.  You might
+Load proxy settings from C<*_proxy> environment variables.  You might
 specify proxies like this (sh-syntax):
 
   gopher_proxy=http://proxy.my.place/
@@ -1455,36 +1520,87 @@ environment variables.
 
 On systems with case insensitive environment variables there exists a
 name clash between the CGI environment variables and the C<HTTP_PROXY>
-environment variable normally picked up by env_proxy().  Because of
+environment variable normally picked up by C<env_proxy>.  Because of
 this C<HTTP_PROXY> is not honored for CGI scripts.  The
 C<CGI_HTTP_PROXY> environment variable can be used instead.
 
-=back
+=head2 no_proxy
+
+    $ua->no_proxy( @domains );
+    $ua->no_proxy('localhost', 'example.com');
+    $ua->no_proxy(); # clear the list
+
+Do not proxy requests to the given domains.  Calling C<no_proxy> without
+any domains clears the list of domains.
+
+=head2 proxy
+
+    $ua->proxy(\@schemes, $proxy_url)
+    $ua->proxy(['http', 'ftp'], 'http://proxy.sn.no:8001/');
+
+    # For a single scheme:
+    $ua->proxy($scheme, $proxy_url)
+    $ua->proxy('gopher', 'http://proxy.sn.no:8001/');
+
+    # To set multiple proxies at once:
+    $ua->proxy([
+        ftp => 'http://ftp.example.com:8001/',
+        [ 'http', 'https' ] => 'http://http.example.com:8001/',
+    ]);
+
+Set/retrieve proxy URL for a scheme.
+
+The first form specifies that the URL is to be used as a proxy for
+access methods listed in the list in the first method argument,
+i.e. C<http> and C<ftp>.
+
+The second form shows a shorthand form for specifying
+proxy URL for a single access scheme.
+
+The third form demonstrates setting multiple proxies at once. This is also
+the only form accepted by the constructor.
 
-=head2 Handlers
+=head1 HANDLERS
 
 Handlers are code that injected at various phases during the
 processing of requests.  The following methods are provided to manage
 the active handlers:
 
-=over
+=head2 add_handler
 
-=item $ua->add_handler( $phase => \&cb, %matchspec )
+    $ua->add_handler( $phase => \&cb, %matchspec )
 
 Add handler to be invoked in the given processing phase.  For how to
-specify %matchspec see L<HTTP::Config/"Matching">.
+specify C<%matchspec> see L<HTTP::Config/"Matching">.
 
-The possible values $phase and the corresponding callback signatures are:
+The possible values C<$phase> and the corresponding callback signatures are:
 
 =over
 
-=item request_preprepare => sub { my($request, $ua, $h) = @_; ... }
+=item response_data => sub { my($response, $ua, $h, $data) = @_; ... }
 
-The handler is called before the C<request_prepare> and other standard
-initialization of the request.  This can be used to set up headers
-and attributes that the C<request_prepare> handler depends on.  Proxy
-initialization should take place here; but in general don't register
-handlers for this phase.
+This handler is called for each chunk of data received for the
+response.  The handler might croak to abort the request.
+
+This handler needs to return a TRUE value to be called again for
+subsequent chunks for the same request.
+
+=item response_done => sub { my($response, $ua, $h) = @_; ... }
+
+The handler is called after the response has been fully received, but
+before any redirect handling is attempted.  The handler can be used to
+extract information or modify the response.
+
+=item response_header => sub { my($response, $ua, $h) = @_; ... }
+
+This handler is called right after the response headers have been
+received, but before any content data.  The handler might set up
+handlers for data and might croak to abort the request.
+
+The handler might set the $response->{default_add_content} value to
+control if any received data should be added to the response object
+directly.  This will initially be false if the $ua->request() method
+was called with a $content_file or $content_cb argument; otherwise true.
 
 =item request_prepare => sub { my($request, $ua, $h) = @_; ... }
 
@@ -1499,6 +1615,14 @@ The return value from the callback is ignored.  If an exception is
 raised it will abort the request and make the request method return a
 "400 Bad request" response.
 
+=item request_preprepare => sub { my($request, $ua, $h) = @_; ... }
+
+The handler is called before the C<request_prepare> and other standard
+initialization of the request.  This can be used to set up headers
+and attributes that the C<request_prepare> handler depends on.  Proxy
+initialization should take place here; but in general don't register
+handlers for this phase.
+
 =item request_send => sub { my($request, $ua, $h) = @_; ... }
 
 This handler gets a chance of handling requests before they're sent to the
@@ -1508,31 +1632,6 @@ wishes to terminate the processing; otherwise it should return nothing.
 The C<response_header> and C<response_data> handlers will not be
 invoked for this response, but the C<response_done> will be.
 
-=item response_header => sub { my($response, $ua, $h) = @_; ... }
-
-This handler is called right after the response headers have been
-received, but before any content data.  The handler might set up
-handlers for data and might croak to abort the request.
-
-The handler might set the $response->{default_add_content} value to
-control if any received data should be added to the response object
-directly.  This will initially be false if the $ua->request() method
-was called with a $content_file or $content_cb argument; otherwise true.
-
-=item response_data => sub { my($response, $ua, $h, $data) = @_; ... }
-
-This handler is called for each chunk of data received for the
-response.  The handler might croak to abort the request.
-
-This handler needs to return a TRUE value to be called again for
-subsequent chunks for the same request.
-
-=item response_done => sub { my($response, $ua, $h) = @_; ... }
-
-The handler is called after the response has been fully received, but
-before any redirect handling is attempted.  The handler can be used to
-extract information or modify the response.
-
 =item response_redirect => sub { my($response, $ua, $h) = @_; ... }
 
 The handler is called in $ua->request after C<response_done>.  If the
@@ -1541,60 +1640,77 @@ this request instead.
 
 =back
 
-=item $ua->remove_handler( undef, %matchspec )
+=head2 get_my_handler
 
-=item $ua->remove_handler( $phase, %matchspec )
+    $ua->get_my_handler( $phase, %matchspec );
+    $ua->get_my_handler( $phase, %matchspec, $init );
 
-Remove handlers that match the given %matchspec.  If $phase is not
-provided remove handlers from all phases.
+Will retrieve the matching handler as hash ref.
 
-Be careful as calling this function with %matchspec that is not
-specific enough can remove handlers not owned by you.  It's probably
-better to use the set_my_handler() method instead.
+If C<$init> is passed as a true value, create and add the
+handler if it's not found.  If C<$init> is a subroutine reference, then
+it's called with the created handler hash as argument.  This sub might
+populate the hash with extra fields; especially the callback.  If
+C<$init> is a hash reference, merge the hashes.
 
-The removed handlers are returned.
+=head2 handlers
 
-=item $ua->set_my_handler( $phase, $cb, %matchspec )
+    $ua->handlers( $phase, $request )
+    $ua->handlers( $phase, $response )
 
-Set handlers private to the executing subroutine.  Works by defaulting
-an C<owner> field to the %matchspec that holds the name of the called
-subroutine.  You might pass an explicit C<owner> to override this.
+Returns the handlers that apply to the given request or response at
+the given processing phase.
 
-If $cb is passed as C<undef>, remove the handler.
+=head2 remove_handler
 
-=item $ua->get_my_handler( $phase, %matchspec )
+    $ua->remove_handler( undef, %matchspec );
+    $ua->remove_handler( $phase, %matchspec );
+    $ua->remove_handlers(); # REMOVE ALL HANDLERS IN ALL PHASES
 
-=item $ua->get_my_handler( $phase, %matchspec, $init )
+Remove handlers that match the given C<%matchspec>.  If C<$phase> is not
+provided, remove handlers from all phases.
 
-Will retrieve the matching handler as hash ref.
+Be careful as calling this function with C<%matchspec> that is not
+specific enough can remove handlers not owned by you.  It's probably
+better to use the L<LWP::UserAgent/set_my_handler> method instead.
 
-If C<$init> is passed as a TRUE value, create and add the
-handler if it's not found.  If $init is a subroutine reference, then
-it's called with the created handler hash as argument.  This sub might
-populate the hash with extra fields; especially the callback.  If
-$init is a hash reference, merge the hashes.
+The removed handlers are returned.
 
-=item $ua->handlers( $phase, $request )
+=head2 set_my_handler
 
-=item $ua->handlers( $phase, $response )
+    $ua->set_my_handler( $phase, $cb, %matchspec );
+    $ua->set_my_handler($phase, undef); # remove handler for phase
 
-Returns the handlers that apply to the given request or response at
-the given processing phase.
+Set handlers private to the executing subroutine.  Works by defaulting
+an C<owner> field to the C<%matchspec> that holds the name of the called
+subroutine.  You might pass an explicit C<owner> to override this.
 
-=back
+If $cb is passed as C<undef>, remove the handler.
 
 =head1 REQUEST METHODS
 
 The methods described in this section are used to dispatch requests
 via the user agent.  The following request methods are provided:
 
-=over
+=head2 delete
 
-=item $ua->get( $url )
+    my $res = $ua->delete( $url );
+    my $res = $ua->delete( $url, $field_name => $value, ... );
 
-=item $ua->get( $url , $field_name => $value, ... )
+This method will dispatch a C<DELETE> request on the given URL.  Additional
+headers and content options are the same as for the L<LWP::UserAgent/get>
+method.
 
-This method will dispatch a C<GET> request on the given $url.  Further
+This method will use the DELETE() function from L<HTTP::Request::Common>
+to build the request.  See L<HTTP::Request::Common> for a details on
+how to pass form content and other advanced features.
+
+=head2 get
+
+    my $res = $ua->get( $url );
+    my $res = $ua->get( $url , $field_name => $value, ... );
+
+This method will dispatch a C<GET> request on the given URL.  Further
 arguments can be given to initialize the headers of the request. These
 are given as separate name/value pairs.  The return value is a
 response object.  See L<HTTP::Response> for a description of the
@@ -1627,7 +1743,10 @@ object itself.  This might not be suitable for very large response
 bodies.  Only one of C<:content_file> or C<:content_cb> can be
 specified.  The content of unsuccessful responses will always
 accumulate in the response object itself, regardless of the
-C<:content_file> or C<:content_cb> options passed in.
+C<:content_file> or C<:content_cb> options passed in.  Note that errors
+writing to the content file (for example due to permission denied
+or the filesystem being full) will be reported via the C<Client-Aborted>
+or C<X-Died> response headers, and not the C<is_success> method.
 
 The C<:read_size_hint> option is passed to the protocol module which
 will try to read data from the server in chunks of this size.  A
@@ -1640,103 +1759,123 @@ object.  The callback can abort the request by invoking die().  The
 exception message will show up as the "X-Died" header field in the
 response returned by the get() function.
 
-=item $ua->head( $url )
+=head2 head
 
-=item $ua->head( $url , $field_name => $value, ... )
+    my $res = $ua->head( $url );
+    my $res = $ua->head( $url , $field_name => $value, ... );
 
-This method will dispatch a C<HEAD> request on the given $url.
-Otherwise it works like the get() method described above.
+This method will dispatch a C<HEAD> request on the given URL.
+Otherwise it works like the L<LWP::UserAgent/get> method described above.
 
-=item $ua->post( $url, \%form )
+=head2 is_protocol_supported
 
-=item $ua->post( $url, \@form )
+    my $bool = $ua->is_protocol_supported( $scheme );
 
-=item $ua->post( $url, \%form, $field_name => $value, ... )
+You can use this method to test whether this user agent object supports the
+specified C<scheme>.  (The C<scheme> might be a string (like C<http> or
+C<ftp>) or it might be an L<URI> object reference.)
 
-=item $ua->post( $url, $field_name => $value,... Content => \%form )
+Whether a scheme is supported is determined by the user agent's
+C<protocols_allowed> or C<protocols_forbidden> lists (if any), and by
+the capabilities of LWP.  I.e., this will return true only if LWP
+supports this protocol I<and> it's permitted for this particular
+object.
 
-=item $ua->post( $url, $field_name => $value,... Content => \@form )
+=head2 is_online
 
-=item $ua->post( $url, $field_name => $value,... Content => $content )
+    my $bool = $ua->is_online;
 
-This method will dispatch a C<POST> request on the given $url, with
-%form or @form providing the key/value pairs for the fill-in form
-content. Additional headers and content options are the same as for
-the get() method.
+Tries to determine if you have access to the Internet. Returns C<1> (true)
+if the built-in heuristics determine that the user agent is
+able to access the Internet (over HTTP) or C<0> (false).
 
-This method will use the POST() function from C<HTTP::Request::Common>
-to build the request.  See L<HTTP::Request::Common> for a details on
-how to pass form content and other advanced features.
+See also L<LWP::Online>.
 
-=item $ua->put( $url, \%form )
+=head2 mirror
 
-=item $ua->put( $url, \@form )
+    my $res = $ua->mirror( $url, $filename );
 
-=item $ua->put( $url, \%form, $field_name => $value, ... )
+This method will get the document identified by URL and store it in
+file called C<$filename>.  If the file already exists, then the request
+will contain an C<If-Modified-Since> header matching the modification
+time of the file.  If the document on the server has not changed since
+this time, then nothing happens.  If the document has been updated, it
+will be downloaded again.  The modification time of the file will be
+forced to match that of the server.
 
-=item $ua->put( $url, $field_name => $value,... Content => \%form )
+The return value is an L<HTTP::Response> object.
 
-=item $ua->put( $url, $field_name => $value,... Content => \@form )
+=head2 post
 
-=item $ua->put( $url, $field_name => $value,... Content => $content )
+    my $res = $ua->post( $url, \%form );
+    my $res = $ua->post( $url, \@form );
+    my $res = $ua->post( $url, \%form, $field_name => $value, ... );
+    my $res = $ua->post( $url, $field_name => $value, Content => \%form );
+    my $res = $ua->post( $url, $field_name => $value, Content => \@form );
+    my $res = $ua->post( $url, $field_name => $value, Content => $content );
 
-This method will dispatch a C<PUT> request on the given $url, with
-%form or @form providing the key/value pairs for the fill-in form
+This method will dispatch a C<POST> request on the given URL, with
+C<%form> or C<@form> providing the key/value pairs for the fill-in form
 content. Additional headers and content options are the same as for
-the get() method.
+the L<LWP::UserAgent/get> method.
 
-This method will use the PUT() function from C<HTTP::Request::Common>
+This method will use the C<POST> function from L<HTTP::Request::Common>
 to build the request.  See L<HTTP::Request::Common> for a details on
 how to pass form content and other advanced features.
 
-=item $ua->delete( $url )
+=head2 put
 
-=item $ua->delete( $url, $field_name => $value, ... )
+    # Any version of HTTP::Message works with this form:
+    my $res = $ua->put( $url, $field_name => $value, Content => $content );
 
-This method will dispatch a C<DELETE> request on the given $url.  Additional
-headers and content options are the same as for the get() method.
+    # Using hash or array references requires HTTP::Message >= 6.07
+    use HTTP::Request 6.07;
+    my $res = $ua->put( $url, \%form );
+    my $res = $ua->put( $url, \@form );
+    my $res = $ua->put( $url, \%form, $field_name => $value, ... );
+    my $res = $ua->put( $url, $field_name => $value, Content => \%form );
+    my $res = $ua->put( $url, $field_name => $value, Content => \@form );
 
-This method will use the DELETE() function from C<HTTP::Request::Common>
-to build the request.  See L<HTTP::Request::Common> for a details on
-how to pass form content and other advanced features.
-
-=item $ua->mirror( $url, $filename )
-
-This method will get the document identified by $url and store it in
-file called $filename.  If the file already exists, then the request
-will contain an "If-Modified-Since" header matching the modification
-time of the file.  If the document on the server has not changed since
-this time, then nothing happens.  If the document has been updated, it
-will be downloaded again.  The modification time of the file will be
-forced to match that of the server.
+This method will dispatch a C<PUT> request on the given URL, with
+C<%form> or C<@form> providing the key/value pairs for the fill-in form
+content. Additional headers and content options are the same as for
+the L<LWP::UserAgent/get> method.
 
-The return value is the response object.
+CAVEAT:
 
-=item $ua->request( $request )
+This method can only accept content that is in key-value pairs when using
+L<HTTP::Request::Common> prior to version C<6.07>. Any use of hash or array
+references will result in an error prior to version C<6.07>.
 
-=item $ua->request( $request, $content_file )
+This method will use the C<PUT> function from L<HTTP::Request::Common>
+to build the request.  See L<HTTP::Request::Common> for a details on
+how to pass form content and other advanced features.
 
-=item $ua->request( $request, $content_cb )
+=head2 request
 
-=item $ua->request( $request, $content_cb, $read_size_hint )
+    my $res = $ua->request( $request );
+    my $res = $ua->request( $request, $content_file );
+    my $res = $ua->request( $request, $content_cb );
+    my $res = $ua->request( $request, $content_cb, $read_size_hint );
 
-This method will dispatch the given $request object.  Normally this
-will be an instance of the C<HTTP::Request> class, but any object with
-a similar interface will do.  The return value is a response object.
-See L<HTTP::Request> and L<HTTP::Response> for a description of the
-interface provided by these classes.
+This method will dispatch the given C<$request> object. Normally this
+will be an instance of the L<HTTP::Request> class, but any object with
+a similar interface will do. The return value is an L<HTTP::Response> object.
 
-The request() method will process redirects and authentication
-responses transparently.  This means that it may actually send several
-simple requests via the simple_request() method described below.
+The C<request> method will process redirects and authentication
+responses transparently. This means that it may actually send several
+simple requests via the L<LWP::UserAgent/simple_request> method described below.
 
-The request methods described above; get(), head(), post() and
-mirror(), will all dispatch the request they build via this method.
-They are convenience methods that simply hides the creation of the
-request object for you.
+The request methods described above; L<LWP::UserAgent/get>, L<LWP::UserAgent/head>,
+L<LWP::UserAgent/post> and L<LWP::UserAgent/mirror> will all dispatch the request
+they build via this method. They are convenience methods that simply hide the
+creation of the request object for you.
 
-The $content_file, $content_cb and $read_size_hint all correspond to
-options described with the get() method above.
+The C<$content_file>, C<$content_cb> and C<$read_size_hint> all correspond to
+options described with the L<LWP::UserAgent/get> method above. Note that errors
+writing to the content file (for example due to permission denied
+or the filesystem being full) will be reported via the C<Client-Aborted>
+or C<X-Died> response headers, and not the C<is_success> method.
 
 You are allowed to use a CODE reference as C<content> in the request
 object passed in.  The C<content> function should return the content
@@ -1744,78 +1883,38 @@ when called.  The content can be returned in chunks.  The content
 function will be invoked repeatedly until it return an empty string to
 signal that there is no more content.
 
-=item $ua->simple_request( $request )
-
-=item $ua->simple_request( $request, $content_file )
-
-=item $ua->simple_request( $request, $content_cb )
+=head2 simple_request
 
-=item $ua->simple_request( $request, $content_cb, $read_size_hint )
+    my $request = HTTP::Request->new( ... );
+    my $res = $ua->simple_request( $request );
+    my $res = $ua->simple_request( $request, $content_file );
+    my $res = $ua->simple_request( $request, $content_cb );
+    my $res = $ua->simple_request( $request, $content_cb, $read_size_hint );
 
 This method dispatches a single request and returns the response
-received.  Arguments are the same as for request() described above.
+received.  Arguments are the same as for the L<LWP::UserAgent/request> described above.
 
-The difference from request() is that simple_request() will not try to
-handle redirects or authentication responses.  The request() method
-will in fact invoke this method for each simple request it sends.
+The difference from L<LWP::UserAgent/request> is that C<simple_request> will not try to
+handle redirects or authentication responses.  The L<LWP::UserAgent/request> method
+will, in fact, invoke this method for each simple request it sends.
 
-=item $ua->is_online
-
-Tries to determine if you have access to the Internet.  Returns
-TRUE if the built-in heuristics determine that the user agent is
-able to access the Internet (over HTTP).  See also L<LWP::Online>.
-
-=item $ua->is_protocol_supported( $scheme )
-
-You can use this method to test whether this user agent object supports the
-specified C<scheme>.  (The C<scheme> might be a string (like 'http' or
-'ftp') or it might be an URI object reference.)
-
-Whether a scheme is supported, is determined by the user agent's
-C<protocols_allowed> or C<protocols_forbidden> lists (if any), and by
-the capabilities of LWP.  I.e., this will return TRUE only if LWP
-supports this protocol I<and> it's permitted for this particular
-object.
-
-=back
-
-=head2 Callback methods
+=head1 CALLBACK METHODS
 
 The following methods will be invoked as requests are processed. These
-methods are documented here because subclasses of C<LWP::UserAgent>
+methods are documented here because subclasses of L<LWP::UserAgent>
 might want to override their behaviour.
 
-=over
-
-=item $ua->prepare_request( $request )
+=head2 get_basic_credentials
 
-This method is invoked by simple_request().  Its task is to modify the
-given $request object by setting up various headers based on the
-attributes of the user agent. The return value should normally be the
-$request object passed in.  If a different request object is returned
-it will be the one actually processed.
+    # This checks wantarray and can either return an array:
+    my ($user, $pass) = $ua->get_basic_credentials( $realm, $uri, $isproxy );
+    # or a string that looks like "user:pass"
+    my $creds = $ua->get_basic_credentials($realm, $uri, $isproxy);
 
-The headers affected by the base implementation are; "User-Agent",
-"From", "Range" and "Cookie".
-
-=item $ua->redirect_ok( $prospective_request, $response )
-
-This method is called by request() before it tries to follow a
-redirection to the request in $response.  This should return a TRUE
-value if this redirection is permissible.  The $prospective_request
-will be the request to be sent if this method returns TRUE.
-
-The base implementation will return FALSE unless the method
-is in the object's C<requests_redirectable> list,
-FALSE if the proposed redirection is to a "file://..."
-URL, and TRUE otherwise.
-
-=item $ua->get_basic_credentials( $realm, $uri, $isproxy )
-
-This is called by request() to retrieve credentials for documents
+This is called by L<LWP::UserAgent/request> to retrieve credentials for documents
 protected by Basic or Digest Authentication.  The arguments passed in
-is the $realm provided by the server, the $uri requested and a boolean
-flag to indicate if this is authentication against a proxy server.
+is the C<$realm> provided by the server, the C<$uri> requested and a
+C<boolean flag> to indicate if this is authentication against a proxy server.
 
 The method should return a username and password.  It should return an
 empty list to abort the authentication resolution attempt.  Subclasses
@@ -1824,21 +1923,48 @@ example of this can be found in C<lwp-request> program distributed
 with this library.
 
 The base implementation simply checks a set of pre-stored member
-variables, set up with the credentials() method.
+variables, set up with the L<LWP::UserAgent/credentials> method.
+
+=head2 prepare_request
+
+    $request = $ua->prepare_request( $request );
+
+This method is invoked by L<LWP::UserAgent/simple_request>. Its task is
+to modify the given C<$request> object by setting up various headers based
+on the attributes of the user agent. The return value should normally be the
+C<$request> object passed in.  If a different request object is returned
+it will be the one actually processed.
+
+The headers affected by the base implementation are; C<User-Agent>,
+C<From>, C<Range> and C<Cookie>.
+
+=head2 progress
 
-=item $ua->progress( $status, $request_or_response )
+    my $prog = $ua->progress( $status, $request_or_response );
 
 This is called frequently as the response is received regardless of
-how the content is processed.  The method is called with $status
-"begin" at the start of processing the request and with $state "end"
-before the request method returns.  In between these $status will be
+how the content is processed.  The method is called with C<$status>
+"begin" at the start of processing the request and with C<$state> "end"
+before the request method returns.  In between these C<$status> will be
 the fraction of the response currently received or the string "tick"
 if the fraction can't be calculated.
 
-When $status is "begin" the second argument is the request object,
-otherwise it is the response object.
+When C<$status> is "begin" the second argument is the L<HTTP::Request> object,
+otherwise it is the L<HTTP::Response> object.
 
-=back
+=head2 redirect_ok
+
+    my $bool = $ua->redirect_ok( $prospective_request, $response );
+
+This method is called by L<LWP::UserAgent/request> before it tries to follow a
+redirection to the request in C<$response>.  This should return a true
+value if this redirection is permissible.  The C<$prospective_request>
+will be the request to be sent if this method returns true.
+
+The base implementation will return false unless the method
+is in the object's C<requests_redirectable> list,
+false if the proposed redirection is to a C<file://...>
+URL, and true otherwise.
 
 =head1 SEE ALSO
 
@@ -1851,11 +1977,13 @@ message objects dispatched and received.  See L<HTTP::Request::Common>
 and L<HTML::Form> for other ways to build request objects.
 
 See L<WWW::Mechanize> and L<WWW::Search> for examples of more
-specialized user agents based on C<LWP::UserAgent>.
+specialized user agents based on L<LWP::UserAgent>.
 
-=head1 COPYRIGHT
+=head1 COPYRIGHT AND LICENSE
 
 Copyright 1995-2009 Gisle Aas.
 
 This library is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
+
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/Net/HTTP.pm b/Master/tlpkg/tlperl/site/lib/Net/HTTP.pm
index 0c923eddbec..1f2c9fbf2d0 100644
--- a/Master/tlpkg/tlperl/site/lib/Net/HTTP.pm
+++ b/Master/tlpkg/tlperl/site/lib/Net/HTTP.pm
@@ -1,11 +1,9 @@
 package Net::HTTP;
-
+$Net::HTTP::VERSION = '6.13';
 use strict;
-use vars qw($VERSION @ISA $SOCKET_CLASS);
-
-$VERSION = "6.09";
-$VERSION = eval $VERSION;
+use warnings;
 
+use vars qw($SOCKET_CLASS);
 unless ($SOCKET_CLASS) {
     # Try several, in order of capability and preference
     if (eval { require IO::Socket::IP }) {
@@ -22,7 +20,7 @@ unless ($SOCKET_CLASS) {
 require Net::HTTP::Methods;
 require Carp;
 
-@ISA = ($SOCKET_CLASS, 'Net::HTTP::Methods');
+our @ISA = ($SOCKET_CLASS, 'Net::HTTP::Methods');
 
 sub new {
     my $class = shift;
@@ -42,12 +40,18 @@ sub http_connect {
 
 1;
 
-__END__
+=pod
+
+=encoding UTF-8
 
 =head1 NAME
 
 Net::HTTP - Low-level HTTP connection (client)
 
+=head1 VERSION
+
+version 6.13
+
 =head1 SYNOPSIS
 
  use Net::HTTP;
@@ -284,11 +288,20 @@ names prefixed with C<http_> and C<io_>.
 
 L<LWP>, L<IO::Socket::INET>, L<Net::HTTP::NB>
 
-=head1 COPYRIGHT
+=head1 AUTHOR
 
-Copyright 2001-2003 Gisle Aas.
+Gisle Aas <gisle@activestate.com>
 
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2001-2017 by Gisle Aas.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
 
 =cut
+
+__END__
+
+# ABSTRACT: Low-level HTTP connection (client)
+
diff --git a/Master/tlpkg/tlperl/site/lib/Net/HTTP/Methods.pm b/Master/tlpkg/tlperl/site/lib/Net/HTTP/Methods.pm
index 3c3c5ca6558..148028444f5 100644
--- a/Master/tlpkg/tlperl/site/lib/Net/HTTP/Methods.pm
+++ b/Master/tlpkg/tlperl/site/lib/Net/HTTP/Methods.pm
@@ -1,14 +1,9 @@
 package Net::HTTP::Methods;
-
-require 5.005;  # 4-arg substr
-
+$Net::HTTP::Methods::VERSION = '6.13';
 use strict;
-use vars qw($VERSION);
+use warnings;
 use URI;
 
-$VERSION = "6.09";
-$VERSION = eval $VERSION;
-
 my $CRLF = "\015\012";   # "\r\n" is not portable
 
 *_bytes = defined(&utf8::downgrade) ?
@@ -279,6 +274,8 @@ sub my_readline {
                     if(defined $bytes_read) {
                         $new_bytes += $bytes_read;
                         last if $bytes_read < 1024;
+                        # We got exactly 1024 bytes, so we need to select() to know if there is more data
+                        last unless $self->can_read(0);
                     }
                     elsif($!{EINTR} || $!{EAGAIN} || $!{EWOULDBLOCK}) {
                         redo READ;
@@ -310,6 +307,7 @@ sub can_read {
     my $self = shift;
     return 1 unless defined(fileno($self));
     return 1 if $self->isa('IO::Socket::SSL') && $self->pending;
+    return 1 if $self->isa('Net::SSL') && $self->can('pending') && $self->pending;
 
     # With no timeout, wait forever.  An explicit timeout of 0 can be
     # used to just check if the socket is readable without waiting.
@@ -323,8 +321,8 @@ sub can_read {
         $before = time if $timeout;
         my $nfound = select($fbits, undef, undef, $timeout);
         if ($nfound < 0) {
-            if ($!{EINTR} || $!{EAGAIN}) {
-                # don't really think EAGAIN can happen here
+            if ($!{EINTR} || $!{EAGAIN} || $!{EWOULDBLOCK}) {
+                # don't really think EAGAIN/EWOULDBLOCK can happen here
                 if ($timeout) {
                     $timeout -= time - $before;
                     $timeout = 0 if $timeout < 0;
@@ -646,3 +644,30 @@ sub inflate_ok {
 } # BEGIN
 
 1;
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+Net::HTTP::Methods
+
+=head1 VERSION
+
+version 6.13
+
+=head1 AUTHOR
+
+Gisle Aas <gisle@activestate.com>
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2001-2017 by Gisle Aas.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/Net/HTTP/NB.pm b/Master/tlpkg/tlperl/site/lib/Net/HTTP/NB.pm
index d908cf8f180..0d5ce9a96c8 100644
--- a/Master/tlpkg/tlperl/site/lib/Net/HTTP/NB.pm
+++ b/Master/tlpkg/tlperl/site/lib/Net/HTTP/NB.pm
@@ -1,13 +1,9 @@
 package Net::HTTP::NB;
-
+$Net::HTTP::NB::VERSION = '6.13';
 use strict;
-use vars qw($VERSION @ISA);
-
-$VERSION = "6.09";
-$VERSION = eval $VERSION;
+use warnings;
 
-require Net::HTTP;
-@ISA=qw(Net::HTTP);
+use base 'Net::HTTP';
 
 sub can_read {
     return 1;
@@ -54,12 +50,18 @@ sub read_entity_body {
 
 1;
 
-__END__
+=pod
+
+=encoding UTF-8
 
 =head1 NAME
 
 Net::HTTP::NB - Non-blocking HTTP client
 
+=head1 VERSION
+
+version 6.13
+
 =head1 SYNOPSIS
 
  use Net::HTTP::NB;
@@ -100,11 +102,20 @@ the value -1 is returned.
 
 L<Net::HTTP>
 
-=head1 COPYRIGHT
+=head1 AUTHOR
 
-Copyright 2001 Gisle Aas.
+Gisle Aas <gisle@activestate.com>
 
-This library is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2001-2017 by Gisle Aas.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
 
 =cut
+
+__END__
+
+#ABSTRACT: Non-blocking HTTP client
+
diff --git a/Master/tlpkg/tlperl/site/lib/Net/HTTPS.pm b/Master/tlpkg/tlperl/site/lib/Net/HTTPS.pm
index 10c5c8a950a..f8131c1f1c5 100644
--- a/Master/tlpkg/tlperl/site/lib/Net/HTTPS.pm
+++ b/Master/tlpkg/tlperl/site/lib/Net/HTTPS.pm
@@ -1,12 +1,10 @@
 package Net::HTTPS;
-
+$Net::HTTPS::VERSION = '6.13';
 use strict;
-use vars qw($VERSION $SSL_SOCKET_CLASS @ISA);
-
-$VERSION = "6.09";
-$VERSION = eval $VERSION;
+use warnings;
 
 # Figure out which SSL implementation to use
+use vars qw($SSL_SOCKET_CLASS);
 if ($SSL_SOCKET_CLASS) {
     # somebody already set it
 }
@@ -43,7 +41,7 @@ else {
 
 require Net::HTTP::Methods;
 
-@ISA=($SSL_SOCKET_CLASS, 'Net::HTTP::Methods');
+our @ISA=($SSL_SOCKET_CLASS, 'Net::HTTP::Methods');
 
 sub configure {
     my($self, $cnf) = @_;
@@ -82,16 +80,24 @@ if ($SSL_SOCKET_CLASS eq "Net::SSL") {
 
 1;
 
+=pod
+
+=encoding UTF-8
+
 =head1 NAME
 
 Net::HTTPS - Low-level HTTP over SSL/TLS connection (client)
 
+=head1 VERSION
+
+version 6.13
+
 =head1 DESCRIPTION
 
 The C<Net::HTTPS> is a low-level HTTP over SSL/TLS client.  The interface is the same
-as the interface for C<Net::HTTP>, but the constructor method take additional parameters
-as accepted by L<IO::Socket::SSL>.  The C<Net::HTTPS> object isa C<IO::Socket::SSL>
-too, which make it inherit additional methods from that base class.
+as the interface for C<Net::HTTP>, but the constructor takes additional parameters
+as accepted by L<IO::Socket::SSL>.  The C<Net::HTTPS> object is an C<IO::Socket::SSL>
+too, which makes it inherit additional methods from that base class.
 
 For historical reasons this module also supports using C<Net::SSL> (from the
 Crypt-SSLeay distribution) as its SSL driver and base class.  This base is
@@ -109,3 +115,21 @@ is C<IO::Socket::SSL>.  Currently the only other supported value is C<Net::SSL>.
 =head1 SEE ALSO
 
 L<Net::HTTP>, L<IO::Socket::SSL>
+
+=head1 AUTHOR
+
+Gisle Aas <gisle@activestate.com>
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2001-2017 by Gisle Aas.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
+
+__END__
+
+#ABSTRACT: Low-level HTTP over SSL/TLS connection (client)
+
diff --git a/Master/tlpkg/tlperl/site/lib/Socket.pm b/Master/tlpkg/tlperl/site/lib/Socket.pm
index 591791e80ec..64e18ad25e3 100644
--- a/Master/tlpkg/tlperl/site/lib/Socket.pm
+++ b/Master/tlpkg/tlperl/site/lib/Socket.pm
@@ -3,7 +3,7 @@ package Socket;
 use strict;
 { use 5.006001; }
 
-our $VERSION = '2.021';
+our $VERSION = '2.024';
 
 =head1 NAME
 
@@ -108,6 +108,10 @@ C<SOL_SOCKET> level.
 Socket option name constants for IPv4 socket options at the C<IPPROTO_IP>
 level.
 
+=head2 IP_PMTUDISC_WANT, IP_PMTUDISC_DONT, ...
+
+Socket option value contants for C<IP_MTU_DISCOVER> socket option.
+
 =head2 IPTOS_LOWDELAY, IPTOS_THROUGHPUT, IPTOS_RELIABILITY, ...
 
 Socket option value constants for C<IP_TOS> socket option.
@@ -180,6 +184,9 @@ arguments packed in and C<AF_INET> filled in. For Internet domain sockets,
 this structure is normally what you need for the arguments in bind(),
 connect(), and send().
 
+An undefined $port argument is taken as zero; an undefined $ip_address is
+considered a fatal error.
+
 =head2 ($port, $ip_address) = unpack_sockaddr_in $sockaddr
 
 Takes a C<sockaddr_in> structure (as returned by pack_sockaddr_in(),
@@ -209,6 +216,9 @@ inet_pton()), optionally a scope ID number, and optionally a flow label
 number. Returns the C<sockaddr_in6> structure with those arguments packed in
 and C<AF_INET6> filled in. IPv6 equivalent of pack_sockaddr_in().
 
+An undefined $port argument is taken as zero; an undefined $ip6_address is
+considered a fatal error.
+
 =head2 ($port, $ip6_address, $scope_id, $flowinfo) = unpack_sockaddr_in6 $sockaddr
 
 Takes a C<sockaddr_in6> structure. Returns a list of four elements: the port
@@ -722,8 +732,8 @@ our @EXPORT = qw(
 	SO_SECURITY_ENCRYPTION_TRANSPORT SO_SNDBUF SO_SNDLOWAT SO_SNDTIMEO
 	SO_STATE SO_TYPE SO_USELOOPBACK SO_XOPEN SO_XSE
 
-	IP_OPTIONS IP_HDRINCL IP_TOS IP_TTL IP_RECVOPTS IP_RECVRETOPTS
-	IP_RETOPTS
+	IP_HDRINCL IP_OPTIONS IP_RECVOPTS IP_RECVRETOPTS IP_RETOPTS IP_TOS
+	IP_TTL
 
 	MSG_BCAST MSG_BTAG MSG_CTLFLAGS MSG_CTLIGNORE MSG_CTRUNC MSG_DONTROUTE
 	MSG_DONTWAIT MSG_EOF MSG_EOR MSG_ERRQUEUE MSG_ETAG MSG_FASTOPEN MSG_FIN
@@ -756,14 +766,17 @@ our @EXPORT_OK = qw(
 
 	SOCK_NONBLOCK SOCK_CLOEXEC
 
-	IP_ADD_MEMBERSHIP IP_ADD_SOURCE_MEMBERSHIP IP_DROP_MEMBERSHIP
-	IP_DROP_SOURCE_MEMBERSHIP IP_MULTICAST_IF IP_MULTICAST_LOOP
-	IP_MULTICAST_TTL
+	IP_ADD_MEMBERSHIP IP_ADD_SOURCE_MEMBERSHIP IP_BIND_ADDRESS_NO_PORT
+	IP_DROP_MEMBERSHIP IP_DROP_SOURCE_MEMBERSHIP IP_FREEBIND
+	IP_MULTICAST_ALL IP_MULTICAST_IF IP_MULTICAST_LOOP IP_MULTICAST_TTL
+	IP_MTU IP_MTU_DISCOVER IP_NODEFRAG IP_RECVERR IP_TRANSPARENT
 
 	IPPROTO_IP IPPROTO_IPV6 IPPROTO_RAW IPPROTO_ICMP IPPROTO_IGMP
 	IPPROTO_TCP IPPROTO_UDP IPPROTO_GRE IPPROTO_ESP IPPROTO_AH
 	IPPROTO_SCTP
 
+	IP_PMTUDISC_DO IP_PMTUDISC_DONT IP_PMTUDISC_PROBE IP_PMTUDISC_WANT
+
 	IPTOS_LOWDELAY IPTOS_THROUGHPUT IPTOS_RELIABILITY IPTOS_MINCOST
 
 	TCP_CONGESTION TCP_CONNECTIONTIMEOUT TCP_CORK TCP_DEFER_ACCEPT
@@ -774,9 +787,12 @@ our @EXPORT_OK = qw(
 
 	IN6ADDR_ANY IN6ADDR_LOOPBACK
 
-	IPV6_ADD_MEMBERSHIP IPV6_DROP_MEMBERSHIP IPV6_JOIN_GROUP
+	IPV6_ADDRFROM IPV6_ADD_MEMBERSHIP IPV6_DROP_MEMBERSHIP IPV6_JOIN_GROUP
 	IPV6_LEAVE_GROUP IPV6_MTU IPV6_MTU_DISCOVER IPV6_MULTICAST_HOPS
-	IPV6_MULTICAST_IF IPV6_MULTICAST_LOOP IPV6_UNICAST_HOPS IPV6_V6ONLY
+	IPV6_MULTICAST_IF IPV6_MULTICAST_LOOP IPV6_RECVERR IPV6_ROUTER_ALERT
+	IPV6_UNICAST_HOPS IPV6_V6ONLY
+
+	SO_LOCK_FILTER SO_RCVBUFFORCE SO_SNDBUFFORCE
 
 	pack_ip_mreq unpack_ip_mreq pack_ip_mreq_source unpack_ip_mreq_source
 
diff --git a/Master/tlpkg/tlperl/site/lib/Test/Fatal.pm b/Master/tlpkg/tlperl/site/lib/Test/Fatal.pm
new file mode 100644
index 00000000000..29aa6629fb3
--- /dev/null
+++ b/Master/tlpkg/tlperl/site/lib/Test/Fatal.pm
@@ -0,0 +1,364 @@
+use strict;
+use warnings;
+package Test::Fatal;
+# ABSTRACT: incredibly simple helpers for testing code with exceptions
+$Test::Fatal::VERSION = '0.014';
+#pod =head1 SYNOPSIS
+#pod
+#pod   use Test::More;
+#pod   use Test::Fatal;
+#pod
+#pod   use System::Under::Test qw(might_die);
+#pod
+#pod   is(
+#pod     exception { might_die; },
+#pod     undef,
+#pod     "the code lived",
+#pod   );
+#pod
+#pod   like(
+#pod     exception { might_die; },
+#pod     qr/turns out it died/,
+#pod     "the code died as expected",
+#pod   );
+#pod
+#pod   isa_ok(
+#pod     exception { might_die; },
+#pod     'Exception::Whatever',
+#pod     'the thrown exception',
+#pod   );
+#pod
+#pod =head1 DESCRIPTION
+#pod
+#pod Test::Fatal is an alternative to the popular L<Test::Exception>.  It does much
+#pod less, but should allow greater flexibility in testing exception-throwing code
+#pod with about the same amount of typing.
+#pod
+#pod It exports one routine by default: C<exception>.
+#pod
+#pod =cut
+
+use Carp ();
+use Try::Tiny 0.07;
+
+use Exporter 5.57 'import';
+
+our @EXPORT    = qw(exception);
+our @EXPORT_OK = qw(exception success dies_ok lives_ok);
+
+#pod =func exception
+#pod
+#pod   my $exception = exception { ... };
+#pod
+#pod C<exception> takes a bare block of code and returns the exception thrown by
+#pod that block.  If no exception was thrown, it returns undef.
+#pod
+#pod B<Achtung!>  If the block results in a I<false> exception, such as 0 or the
+#pod empty string, Test::Fatal itself will die.  Since either of these cases
+#pod indicates a serious problem with the system under testing, this behavior is
+#pod considered a I<feature>.  If you must test for these conditions, you should use
+#pod L<Try::Tiny>'s try/catch mechanism.  (Try::Tiny is the underlying exception
+#pod handling system of Test::Fatal.)
+#pod
+#pod Note that there is no TAP assert being performed.  In other words, no "ok" or
+#pod "not ok" line is emitted.  It's up to you to use the rest of C<exception> in an
+#pod existing test like C<ok>, C<isa_ok>, C<is>, et cetera.  Or you may wish to use
+#pod the C<dies_ok> and C<lives_ok> wrappers, which do provide TAP output.
+#pod
+#pod C<exception> does I<not> alter the stack presented to the called block, meaning
+#pod that if the exception returned has a stack trace, it will include some frames
+#pod between the code calling C<exception> and the thing throwing the exception.
+#pod This is considered a I<feature> because it avoids the occasionally twitchy
+#pod C<Sub::Uplevel> mechanism.
+#pod
+#pod B<Achtung!>  This is not a great idea:
+#pod
+#pod   sub exception_like(&$;$) {
+#pod       my ($code, $pattern, $name) = @_;
+#pod       like( &exception($code), $pattern, $name );
+#pod   }
+#pod
+#pod   exception_like(sub { }, qr/foo/, 'foo appears in the exception');
+#pod
+#pod If the code in the C<...> is going to throw a stack trace with the arguments to
+#pod each subroutine in its call stack (for example via C<Carp::confess>,
+#pod the test name, "foo appears in the exception" will itself be matched by the
+#pod regex.  Instead, write this:
+#pod
+#pod   like( exception { ... }, qr/foo/, 'foo appears in the exception' );
+#pod
+#pod B<Achtung>: One final bad idea:
+#pod
+#pod   isnt( exception { ... }, undef, "my code died!");
+#pod
+#pod It's true that this tests that your code died, but you should really test that
+#pod it died I<for the right reason>.  For example, if you make an unrelated mistake
+#pod in the block, like using the wrong dereference, your test will pass even though
+#pod the code to be tested isn't really run at all.  If you're expecting an
+#pod inspectable exception with an identifier or class, test that.  If you're
+#pod expecting a string exception, consider using C<like>.
+#pod
+#pod =cut
+
+our ($REAL_TBL, $REAL_CALCULATED_TBL) = (1, 1);
+
+sub exception (&) {
+  my $code = shift;
+
+  return try {
+    my $incremented = $Test::Builder::Level - $REAL_CALCULATED_TBL;
+    local $Test::Builder::Level = $REAL_CALCULATED_TBL;
+    if ($incremented) {
+        # each call to exception adds 5 stack frames
+        $Test::Builder::Level += 5;
+        for my $i (1..$incremented) {
+            # -2 because we want to see it from the perspective of the call to
+            # is() within the call to $code->()
+            my $caller = caller($Test::Builder::Level - 2);
+            if ($caller eq __PACKAGE__) {
+                # each call to exception adds 5 stack frames
+                $Test::Builder::Level = $Test::Builder::Level + 5;
+            }
+            else {
+                $Test::Builder::Level = $Test::Builder::Level + 1;
+            }
+        }
+    }
+
+    local $REAL_CALCULATED_TBL = $Test::Builder::Level;
+    $code->();
+    return undef;
+  } catch {
+    return $_ if $_;
+
+    my $problem = defined $_ ? 'false' : 'undef';
+    Carp::confess("$problem exception caught by Test::Fatal::exception");
+  };
+}
+
+#pod =func success
+#pod
+#pod   try {
+#pod     should_live;
+#pod   } catch {
+#pod     fail("boo, we died");
+#pod   } success {
+#pod     pass("hooray, we lived");
+#pod   };
+#pod
+#pod C<success>, exported only by request, is a L<Try::Tiny> helper with semantics
+#pod identical to L<C<finally>|Try::Tiny/finally>, but the body of the block will
+#pod only be run if the C<try> block ran without error.
+#pod
+#pod Although almost any needed exception tests can be performed with C<exception>,
+#pod success blocks may sometimes help organize complex testing.
+#pod
+#pod =cut
+
+sub success (&;@) {
+  my $code = shift;
+  return finally( sub {
+    return if @_; # <-- only run on success
+    $code->();
+  }, @_ );
+}
+
+#pod =func dies_ok
+#pod
+#pod =func lives_ok
+#pod
+#pod Exported only by request, these two functions run a given block of code, and
+#pod provide TAP output indicating if it did, or did not throw an exception. 
+#pod These provide an easy upgrade path for replacing existing unit tests based on
+#pod C<Test::Exception>.
+#pod
+#pod RJBS does not suggest using this except as a convenience while porting tests to
+#pod use Test::Fatal's C<exception> routine.
+#pod
+#pod   use Test::More tests => 2;
+#pod   use Test::Fatal qw(dies_ok lives_ok);
+#pod
+#pod   dies_ok { die "I failed" } 'code that fails';
+#pod
+#pod   lives_ok { return "I'm still alive" } 'code that does not fail';
+#pod
+#pod =cut
+
+my $Tester;
+
+# Signature should match that of Test::Exception
+sub dies_ok (&;$) {
+  my $code = shift;
+  my $name = shift;
+
+  require Test::Builder;
+  $Tester ||= Test::Builder->new;
+
+  my $ok = $Tester->ok( exception( \&$code ), $name );
+  $ok or $Tester->diag( "expected an exception but none was raised" );
+  return $ok;
+}
+
+sub lives_ok (&;$) {
+  my $code = shift;
+  my $name = shift;
+
+  require Test::Builder;
+  $Tester ||= Test::Builder->new;
+
+  my $ok = $Tester->ok( !exception( \&$code ), $name );
+  $ok or $Tester->diag( "expected return but an exception was raised" );
+  return $ok;
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+Test::Fatal - incredibly simple helpers for testing code with exceptions
+
+=head1 VERSION
+
+version 0.014
+
+=head1 SYNOPSIS
+
+  use Test::More;
+  use Test::Fatal;
+
+  use System::Under::Test qw(might_die);
+
+  is(
+    exception { might_die; },
+    undef,
+    "the code lived",
+  );
+
+  like(
+    exception { might_die; },
+    qr/turns out it died/,
+    "the code died as expected",
+  );
+
+  isa_ok(
+    exception { might_die; },
+    'Exception::Whatever',
+    'the thrown exception',
+  );
+
+=head1 DESCRIPTION
+
+Test::Fatal is an alternative to the popular L<Test::Exception>.  It does much
+less, but should allow greater flexibility in testing exception-throwing code
+with about the same amount of typing.
+
+It exports one routine by default: C<exception>.
+
+=head1 FUNCTIONS
+
+=head2 exception
+
+  my $exception = exception { ... };
+
+C<exception> takes a bare block of code and returns the exception thrown by
+that block.  If no exception was thrown, it returns undef.
+
+B<Achtung!>  If the block results in a I<false> exception, such as 0 or the
+empty string, Test::Fatal itself will die.  Since either of these cases
+indicates a serious problem with the system under testing, this behavior is
+considered a I<feature>.  If you must test for these conditions, you should use
+L<Try::Tiny>'s try/catch mechanism.  (Try::Tiny is the underlying exception
+handling system of Test::Fatal.)
+
+Note that there is no TAP assert being performed.  In other words, no "ok" or
+"not ok" line is emitted.  It's up to you to use the rest of C<exception> in an
+existing test like C<ok>, C<isa_ok>, C<is>, et cetera.  Or you may wish to use
+the C<dies_ok> and C<lives_ok> wrappers, which do provide TAP output.
+
+C<exception> does I<not> alter the stack presented to the called block, meaning
+that if the exception returned has a stack trace, it will include some frames
+between the code calling C<exception> and the thing throwing the exception.
+This is considered a I<feature> because it avoids the occasionally twitchy
+C<Sub::Uplevel> mechanism.
+
+B<Achtung!>  This is not a great idea:
+
+  sub exception_like(&$;$) {
+      my ($code, $pattern, $name) = @_;
+      like( &exception($code), $pattern, $name );
+  }
+
+  exception_like(sub { }, qr/foo/, 'foo appears in the exception');
+
+If the code in the C<...> is going to throw a stack trace with the arguments to
+each subroutine in its call stack (for example via C<Carp::confess>,
+the test name, "foo appears in the exception" will itself be matched by the
+regex.  Instead, write this:
+
+  like( exception { ... }, qr/foo/, 'foo appears in the exception' );
+
+B<Achtung>: One final bad idea:
+
+  isnt( exception { ... }, undef, "my code died!");
+
+It's true that this tests that your code died, but you should really test that
+it died I<for the right reason>.  For example, if you make an unrelated mistake
+in the block, like using the wrong dereference, your test will pass even though
+the code to be tested isn't really run at all.  If you're expecting an
+inspectable exception with an identifier or class, test that.  If you're
+expecting a string exception, consider using C<like>.
+
+=head2 success
+
+  try {
+    should_live;
+  } catch {
+    fail("boo, we died");
+  } success {
+    pass("hooray, we lived");
+  };
+
+C<success>, exported only by request, is a L<Try::Tiny> helper with semantics
+identical to L<C<finally>|Try::Tiny/finally>, but the body of the block will
+only be run if the C<try> block ran without error.
+
+Although almost any needed exception tests can be performed with C<exception>,
+success blocks may sometimes help organize complex testing.
+
+=head2 dies_ok
+
+=head2 lives_ok
+
+Exported only by request, these two functions run a given block of code, and
+provide TAP output indicating if it did, or did not throw an exception. 
+These provide an easy upgrade path for replacing existing unit tests based on
+C<Test::Exception>.
+
+RJBS does not suggest using this except as a convenience while porting tests to
+use Test::Fatal's C<exception> routine.
+
+  use Test::More tests => 2;
+  use Test::Fatal qw(dies_ok lives_ok);
+
+  dies_ok { die "I failed" } 'code that fails';
+
+  lives_ok { return "I'm still alive" } 'code that does not fail';
+
+=head1 AUTHOR
+
+Ricardo Signes <rjbs@cpan.org>
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2010 by Ricardo Signes.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/Test/RequiresInternet.pm b/Master/tlpkg/tlperl/site/lib/Test/RequiresInternet.pm
new file mode 100644
index 00000000000..e78ca0bc6dc
--- /dev/null
+++ b/Master/tlpkg/tlperl/site/lib/Test/RequiresInternet.pm
@@ -0,0 +1,131 @@
+use strict;
+use warnings;
+package Test::RequiresInternet;
+$Test::RequiresInternet::VERSION = '0.05';
+# ABSTRACT: Easily test network connectivity
+
+
+use Socket;
+
+sub import {
+    skip_all("NO_NETWORK_TESTING") if env("NO_NETWORK_TESTING");
+
+    my $namespace = shift;
+
+    my $argc = scalar @_;
+    if ( $argc == 0 ) {
+        push @_, 'www.google.com', 80;
+    }
+    elsif ( $argc % 2 != 0 ) {
+        die "Must supply server and a port pairs. You supplied " . (join ", ", @_) . "\n";
+    }
+
+    while ( @_ ) {
+        my $host = shift;
+        my $port = shift;
+
+        local $@;
+
+        eval {make_socket($host, $port)};
+
+        if ( $@ ) {
+            skip_all("$@");
+        }
+    }
+}
+
+sub make_socket {
+    my ($host, $port) = @_;
+
+    my $portnum;
+    if ($port =~ /\D/) { 
+        $portnum = getservbyname($port, "tcp");
+    }
+    else {
+        $portnum = $port;
+    }
+
+    die "Could not find a port number for $port\n" if not $portnum;
+
+    my $iaddr = inet_aton($host) or die "no host: $host\n";
+
+    my $paddr = sockaddr_in($portnum, $iaddr);
+    my $proto = getprotobyname("tcp");
+
+    socket(my $sock, PF_INET, SOCK_STREAM, $proto) or die "socket: $!\n";
+    connect($sock, $paddr) or die "connect: $!\n";
+    close ($sock) or die "close: $!\n";
+
+    1;
+}
+
+sub env {
+    exists $ENV{$_[0]} && $ENV{$_[0]} eq '1'
+}
+
+sub skip_all {
+    my $reason = shift;
+    print "1..0 # Skipped: $reason";
+    exit 0;
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+Test::RequiresInternet - Easily test network connectivity
+
+=head1 VERSION
+
+version 0.05
+
+=head1 SYNOPSIS
+
+  use Test::More;
+  use Test::RequiresInternet ('www.example.com' => 80, 'foobar.io' => 25);
+
+  # if you reach here, sockets successfully connected to hosts/ports above
+  plan tests => 1;
+
+  ok(do_that_internet_thing());
+
+=head1 OVERVIEW
+
+This module is intended to easily test network connectivity before functional 
+tests begin to non-local Internet resources.  It does not require any modules
+beyond those supplied in core Perl.
+
+If you do not specify a host/port pair, then the module defaults to using
+C<www.google.com> on port C<80>.  
+
+You may optionally specify the port by its name, as in C<http> or C<ldap>.
+If you do this, the test module will attempt to look up the port number
+using C<getservbyname>.
+
+If you do specify a host and port, they must be specified in B<pairs>. It is a
+fatal error to omit one or the other.
+
+If the environment variable C<NO_NETWORK_TESTING> is set, then the tests
+will be skipped without attempting any socket connections.
+
+If the sockets cannot connect to the specified hosts and ports, the exception
+is caught, reported and the tests skipped.
+
+=head1 AUTHOR
+
+Mark Allen <mrallen1@yahoo.com>
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2014 by Mark Allen.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/Try/Tiny.pm b/Master/tlpkg/tlperl/site/lib/Try/Tiny.pm
new file mode 100644
index 00000000000..476a215fe39
--- /dev/null
+++ b/Master/tlpkg/tlperl/site/lib/Try/Tiny.pm
@@ -0,0 +1,804 @@
+package Try::Tiny; # git description: v0.27-8-g8dc27c7
+use 5.006;
+# ABSTRACT: Minimal try/catch with proper preservation of $@
+
+our $VERSION = '0.28';
+
+use strict;
+use warnings;
+
+use Exporter 5.57 'import';
+our @EXPORT = our @EXPORT_OK = qw(try catch finally);
+
+use Carp;
+$Carp::Internal{+__PACKAGE__}++;
+
+BEGIN {
+  my $su = $INC{'Sub/Util.pm'} && defined &Sub::Util::set_subname;
+  my $sn = $INC{'Sub/Name.pm'} && eval { Sub::Name->VERSION(0.08) };
+  unless ($su || $sn) {
+    $su = eval { require Sub::Util; } && defined &Sub::Util::set_subname;
+    unless ($su) {
+      $sn = eval { require Sub::Name; Sub::Name->VERSION(0.08) };
+    }
+  }
+
+  *_subname = $su ? \&Sub::Util::set_subname
+            : $sn ? \&Sub::Name::subname
+            : sub { $_[1] };
+  *_HAS_SUBNAME = ($su || $sn) ? sub(){1} : sub(){0};
+}
+
+my %_finally_guards;
+
+# Need to prototype as @ not $$ because of the way Perl evaluates the prototype.
+# Keeping it at $$ means you only ever get 1 sub because we need to eval in a list
+# context & not a scalar one
+
+sub try (&;@) {
+  my ( $try, @code_refs ) = @_;
+
+  # we need to save this here, the eval block will be in scalar context due
+  # to $failed
+  my $wantarray = wantarray;
+
+  # work around perl bug by explicitly initializing these, due to the likelyhood
+  # this will be used in global destruction (perl rt#119311)
+  my ( $catch, @finally ) = ();
+
+  # find labeled blocks in the argument list.
+  # catch and finally tag the blocks by blessing a scalar reference to them.
+  foreach my $code_ref (@code_refs) {
+
+    if ( ref($code_ref) eq 'Try::Tiny::Catch' ) {
+      croak 'A try() may not be followed by multiple catch() blocks'
+        if $catch;
+      $catch = ${$code_ref};
+    } elsif ( ref($code_ref) eq 'Try::Tiny::Finally' ) {
+      push @finally, ${$code_ref};
+    } else {
+      croak(
+        'try() encountered an unexpected argument ('
+      . ( defined $code_ref ? $code_ref : 'undef' )
+      . ') - perhaps a missing semi-colon before or'
+      );
+    }
+  }
+
+  # FIXME consider using local $SIG{__DIE__} to accumulate all errors. It's
+  # not perfect, but we could provide a list of additional errors for
+  # $catch->();
+
+  # name the blocks if we have Sub::Name installed
+  my $caller = caller;
+  _subname("${caller}::try {...} " => $try)
+    if _HAS_SUBNAME;
+
+  # set up scope guards to invoke the finally blocks at the end.
+  # this should really be a function scope lexical variable instead of
+  # file scope + local but that causes issues with perls < 5.20 due to
+  # perl rt#119311
+  local $_finally_guards{guards} = [
+    map { Try::Tiny::ScopeGuard->_new($_) }
+    @finally
+  ];
+
+  # save the value of $@ so we can set $@ back to it in the beginning of the eval
+  # and restore $@ after the eval finishes
+  my $prev_error = $@;
+
+  my ( @ret, $error );
+
+  # failed will be true if the eval dies, because 1 will not be returned
+  # from the eval body
+  my $failed = not eval {
+    $@ = $prev_error;
+
+    # evaluate the try block in the correct context
+    if ( $wantarray ) {
+      @ret = $try->();
+    } elsif ( defined $wantarray ) {
+      $ret[0] = $try->();
+    } else {
+      $try->();
+    };
+
+    return 1; # properly set $failed to false
+  };
+
+  # preserve the current error and reset the original value of $@
+  $error = $@;
+  $@ = $prev_error;
+
+  # at this point $failed contains a true value if the eval died, even if some
+  # destructor overwrote $@ as the eval was unwinding.
+  if ( $failed ) {
+    # pass $error to the finally blocks
+    push @$_, $error for @{$_finally_guards{guards}};
+
+    # if we got an error, invoke the catch block.
+    if ( $catch ) {
+      # This works like given($error), but is backwards compatible and
+      # sets $_ in the dynamic scope for the body of C<$catch>
+      for ($error) {
+        return $catch->($error);
+      }
+
+      # in case when() was used without an explicit return, the C<for>
+      # loop will be aborted and there's no useful return value
+    }
+
+    return;
+  } else {
+    # no failure, $@ is back to what it was, everything is fine
+    return $wantarray ? @ret : $ret[0];
+  }
+}
+
+sub catch (&;@) {
+  my ( $block, @rest ) = @_;
+
+  croak 'Useless bare catch()' unless wantarray;
+
+  my $caller = caller;
+  _subname("${caller}::catch {...} " => $block)
+    if _HAS_SUBNAME;
+  return (
+    bless(\$block, 'Try::Tiny::Catch'),
+    @rest,
+  );
+}
+
+sub finally (&;@) {
+  my ( $block, @rest ) = @_;
+
+  croak 'Useless bare finally()' unless wantarray;
+
+  my $caller = caller;
+  _subname("${caller}::finally {...} " => $block)
+    if _HAS_SUBNAME;
+  return (
+    bless(\$block, 'Try::Tiny::Finally'),
+    @rest,
+  );
+}
+
+{
+  package # hide from PAUSE
+    Try::Tiny::ScopeGuard;
+
+  use constant UNSTABLE_DOLLARAT => ("$]" < '5.013002') ? 1 : 0;
+
+  sub _new {
+    shift;
+    bless [ @_ ];
+  }
+
+  sub DESTROY {
+    my ($code, @args) = @{ $_[0] };
+
+    local $@ if UNSTABLE_DOLLARAT;
+    eval {
+      $code->(@args);
+      1;
+    } or do {
+      warn
+        "Execution of finally() block $code resulted in an exception, which "
+      . '*CAN NOT BE PROPAGATED* due to fundamental limitations of Perl. '
+      . 'Your program will continue as if this event never took place. '
+      . "Original exception text follows:\n\n"
+      . (defined $@ ? $@ : '$@ left undefined...')
+      . "\n"
+      ;
+    }
+  }
+}
+
+__PACKAGE__
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+Try::Tiny - Minimal try/catch with proper preservation of $@
+
+=head1 VERSION
+
+version 0.28
+
+=head1 SYNOPSIS
+
+You can use Try::Tiny's C<try> and C<catch> to expect and handle exceptional
+conditions, avoiding quirks in Perl and common mistakes:
+
+  # handle errors with a catch handler
+  try {
+    die "foo";
+  } catch {
+    warn "caught error: $_"; # not $@
+  };
+
+You can also use it like a standalone C<eval> to catch and ignore any error
+conditions.  Obviously, this is an extreme measure not to be undertaken
+lightly:
+
+  # just silence errors
+  try {
+    die "foo";
+  };
+
+=head1 DESCRIPTION
+
+This module provides bare bones C<try>/C<catch>/C<finally> statements that are designed to
+minimize common mistakes with eval blocks, and NOTHING else.
+
+This is unlike L<TryCatch> which provides a nice syntax and avoids adding
+another call stack layer, and supports calling C<return> from the C<try> block to
+return from the parent subroutine. These extra features come at a cost of a few
+dependencies, namely L<Devel::Declare> and L<Scope::Upper> which are
+occasionally problematic, and the additional catch filtering uses L<Moose>
+type constraints which may not be desirable either.
+
+The main focus of this module is to provide simple and reliable error handling
+for those having a hard time installing L<TryCatch>, but who still want to
+write correct C<eval> blocks without 5 lines of boilerplate each time.
+
+It's designed to work as correctly as possible in light of the various
+pathological edge cases (see L</BACKGROUND>) and to be compatible with any style
+of error values (simple strings, references, objects, overloaded objects, etc).
+
+If the C<try> block dies, it returns the value of the last statement executed in
+the C<catch> block, if there is one. Otherwise, it returns C<undef> in scalar
+context or the empty list in list context. The following examples all
+assign C<"bar"> to C<$x>:
+
+  my $x = try { die "foo" } catch { "bar" };
+  my $x = try { die "foo" } || "bar";
+  my $x = (try { die "foo" }) // "bar";
+
+  my $x = eval { die "foo" } || "bar";
+
+You can add C<finally> blocks, yielding the following:
+
+  my $x;
+  try { die 'foo' } finally { $x = 'bar' };
+  try { die 'foo' } catch { warn "Got a die: $_" } finally { $x = 'bar' };
+
+C<finally> blocks are always executed making them suitable for cleanup code
+which cannot be handled using local.  You can add as many C<finally> blocks to a
+given C<try> block as you like.
+
+Note that adding a C<finally> block without a preceding C<catch> block
+suppresses any errors. This behaviour is consistent with using a standalone
+C<eval>, but it is not consistent with C<try>/C<finally> patterns found in
+other programming languages, such as Java, Python, Javascript or C#. If you
+learnt the C<try>/C<finally> pattern from one of these languages, watch out for
+this.
+
+=head1 EXPORTS
+
+All functions are exported by default using L<Exporter>.
+
+If you need to rename the C<try>, C<catch> or C<finally> keyword consider using
+L<Sub::Import> to get L<Sub::Exporter>'s flexibility.
+
+=over 4
+
+=item try (&;@)
+
+Takes one mandatory C<try> subroutine, an optional C<catch> subroutine and C<finally>
+subroutine.
+
+The mandatory subroutine is evaluated in the context of an C<eval> block.
+
+If no error occurred the value from the first block is returned, preserving
+list/scalar context.
+
+If there was an error and the second subroutine was given it will be invoked
+with the error in C<$_> (localized) and as that block's first and only
+argument.
+
+C<$@> does B<not> contain the error. Inside the C<catch> block it has the same
+value it had before the C<try> block was executed.
+
+Note that the error may be false, but if that happens the C<catch> block will
+still be invoked.
+
+Once all execution is finished then the C<finally> block, if given, will execute.
+
+=item catch (&;@)
+
+Intended to be used in the second argument position of C<try>.
+
+Returns a reference to the subroutine it was given but blessed as
+C<Try::Tiny::Catch> which allows try to decode correctly what to do
+with this code reference.
+
+  catch { ... }
+
+Inside the C<catch> block the caught error is stored in C<$_>, while previous
+value of C<$@> is still available for use.  This value may or may not be
+meaningful depending on what happened before the C<try>, but it might be a good
+idea to preserve it in an error stack.
+
+For code that captures C<$@> when throwing new errors (i.e.
+L<Class::Throwable>), you'll need to do:
+
+  local $@ = $_;
+
+=item finally (&;@)
+
+  try     { ... }
+  catch   { ... }
+  finally { ... };
+
+Or
+
+  try     { ... }
+  finally { ... };
+
+Or even
+
+  try     { ... }
+  finally { ... }
+  catch   { ... };
+
+Intended to be the second or third element of C<try>. C<finally> blocks are always
+executed in the event of a successful C<try> or if C<catch> is run. This allows
+you to locate cleanup code which cannot be done via C<local()> e.g. closing a file
+handle.
+
+When invoked, the C<finally> block is passed the error that was caught.  If no
+error was caught, it is passed nothing.  (Note that the C<finally> block does not
+localize C<$_> with the error, since unlike in a C<catch> block, there is no way
+to know if C<$_ == undef> implies that there were no errors.) In other words,
+the following code does just what you would expect:
+
+  try {
+    die_sometimes();
+  } catch {
+    # ...code run in case of error
+  } finally {
+    if (@_) {
+      print "The try block died with: @_\n";
+    } else {
+      print "The try block ran without error.\n";
+    }
+  };
+
+B<You must always do your own error handling in the C<finally> block>. C<Try::Tiny> will
+not do anything about handling possible errors coming from code located in these
+blocks.
+
+Furthermore B<exceptions in C<finally> blocks are not trappable and are unable
+to influence the execution of your program>. This is due to limitation of
+C<DESTROY>-based scope guards, which C<finally> is implemented on top of. This
+may change in a future version of Try::Tiny.
+
+In the same way C<catch()> blesses the code reference this subroutine does the same
+except it bless them as C<Try::Tiny::Finally>.
+
+=back
+
+=head1 BACKGROUND
+
+There are a number of issues with C<eval>.
+
+=head2 Clobbering $@
+
+When you run an C<eval> block and it succeeds, C<$@> will be cleared, potentially
+clobbering an error that is currently being caught.
+
+This causes action at a distance, clearing previous errors your caller may have
+not yet handled.
+
+C<$@> must be properly localized before invoking C<eval> in order to avoid this
+issue.
+
+More specifically, C<$@> is clobbered at the beginning of the C<eval>, which
+also makes it impossible to capture the previous error before you die (for
+instance when making exception objects with error stacks).
+
+For this reason C<try> will actually set C<$@> to its previous value (the one
+available before entering the C<try> block) in the beginning of the C<eval>
+block.
+
+=head2 Localizing $@ silently masks errors
+
+Inside an C<eval> block, C<die> behaves sort of like:
+
+  sub die {
+    $@ = $_[0];
+    return_undef_from_eval();
+  }
+
+This means that if you were polite and localized C<$@> you can't die in that
+scope, or your error will be discarded (printing "Something's wrong" instead).
+
+The workaround is very ugly:
+
+  my $error = do {
+    local $@;
+    eval { ... };
+    $@;
+  };
+
+  ...
+  die $error;
+
+=head2 $@ might not be a true value
+
+This code is wrong:
+
+  if ( $@ ) {
+    ...
+  }
+
+because due to the previous caveats it may have been unset.
+
+C<$@> could also be an overloaded error object that evaluates to false, but
+that's asking for trouble anyway.
+
+The classic failure mode is:
+
+  sub Object::DESTROY {
+    eval { ... }
+  }
+
+  eval {
+    my $obj = Object->new;
+
+    die "foo";
+  };
+
+  if ( $@ ) {
+
+  }
+
+In this case since C<Object::DESTROY> is not localizing C<$@> but still uses
+C<eval>, it will set C<$@> to C<"">.
+
+The destructor is called when the stack is unwound, after C<die> sets C<$@> to
+C<"foo at Foo.pm line 42\n">, so by the time C<if ( $@ )> is evaluated it has
+been cleared by C<eval> in the destructor.
+
+The workaround for this is even uglier than the previous ones. Even though we
+can't save the value of C<$@> from code that doesn't localize, we can at least
+be sure the C<eval> was aborted due to an error:
+
+  my $failed = not eval {
+    ...
+
+    return 1;
+  };
+
+This is because an C<eval> that caught a C<die> will always return a false
+value.
+
+=head1 SHINY SYNTAX
+
+Using Perl 5.10 you can use L<perlsyn/"Switch statements">.
+
+=for stopwords topicalizer
+
+The C<catch> block is invoked in a topicalizer context (like a C<given> block),
+but note that you can't return a useful value from C<catch> using the C<when>
+blocks without an explicit C<return>.
+
+This is somewhat similar to Perl 6's C<CATCH> blocks. You can use it to
+concisely match errors:
+
+  try {
+    require Foo;
+  } catch {
+    when (/^Can't locate .*?\.pm in \@INC/) { } # ignore
+    default { die $_ }
+  };
+
+=head1 CAVEATS
+
+=over 4
+
+=item *
+
+C<@_> is not available within the C<try> block, so you need to copy your
+argument list. In case you want to work with argument values directly via C<@_>
+aliasing (i.e. allow C<$_[1] = "foo">), you need to pass C<@_> by reference:
+
+  sub foo {
+    my ( $self, @args ) = @_;
+    try { $self->bar(@args) }
+  }
+
+or
+
+  sub bar_in_place {
+    my $self = shift;
+    my $args = \@_;
+    try { $_ = $self->bar($_) for @$args }
+  }
+
+=item *
+
+C<return> returns from the C<try> block, not from the parent sub (note that
+this is also how C<eval> works, but not how L<TryCatch> works):
+
+  sub parent_sub {
+    try {
+      die;
+    }
+    catch {
+      return;
+    };
+
+    say "this text WILL be displayed, even though an exception is thrown";
+  }
+
+Instead, you should capture the return value:
+
+  sub parent_sub {
+    my $success = try {
+      die;
+      1;
+    };
+    return unless $success;
+
+    say "This text WILL NEVER appear!";
+  }
+  # OR
+  sub parent_sub_with_catch {
+    my $success = try {
+      die;
+      1;
+    }
+    catch {
+      # do something with $_
+      return undef; #see note
+    };
+    return unless $success;
+
+    say "This text WILL NEVER appear!";
+  }
+
+Note that if you have a C<catch> block, it must return C<undef> for this to work,
+since if a C<catch> block exists, its return value is returned in place of C<undef>
+when an exception is thrown.
+
+=item *
+
+C<try> introduces another caller stack frame. L<Sub::Uplevel> is not used. L<Carp>
+will not report this when using full stack traces, though, because
+C<%Carp::Internal> is used. This lack of magic is considered a feature.
+
+=for stopwords unhygienically
+
+=item *
+
+The value of C<$_> in the C<catch> block is not guaranteed to be the value of
+the exception thrown (C<$@>) in the C<try> block.  There is no safe way to
+ensure this, since C<eval> may be used unhygienically in destructors.  The only
+guarantee is that the C<catch> will be called if an exception is thrown.
+
+=item *
+
+The return value of the C<catch> block is not ignored, so if testing the result
+of the expression for truth on success, be sure to return a false value from
+the C<catch> block:
+
+  my $obj = try {
+    MightFail->new;
+  } catch {
+    ...
+
+    return; # avoid returning a true value;
+  };
+
+  return unless $obj;
+
+=item *
+
+C<$SIG{__DIE__}> is still in effect.
+
+Though it can be argued that C<$SIG{__DIE__}> should be disabled inside of
+C<eval> blocks, since it isn't people have grown to rely on it. Therefore in
+the interests of compatibility, C<try> does not disable C<$SIG{__DIE__}> for
+the scope of the error throwing code.
+
+=item *
+
+Lexical C<$_> may override the one set by C<catch>.
+
+For example Perl 5.10's C<given> form uses a lexical C<$_>, creating some
+confusing behavior:
+
+  given ($foo) {
+    when (...) {
+      try {
+        ...
+      } catch {
+        warn $_; # will print $foo, not the error
+        warn $_[0]; # instead, get the error like this
+      }
+    }
+  }
+
+Note that this behavior was changed once again in L<Perl5 version 18
+|https://metacpan.org/module/perldelta#given-now-aliases-the-global-_>.
+However, since the entirety of lexical C<$_> is now L<considered experimental
+|https://metacpan.org/module/perldelta#Lexical-_-is-now-experimental>, it
+is unclear whether the new version 18 behavior is final.
+
+=back
+
+=head1 SEE ALSO
+
+=over 4
+
+=item L<TryCatch>
+
+Much more feature complete, more convenient semantics, but at the cost of
+implementation complexity.
+
+=item L<autodie>
+
+Automatic error throwing for builtin functions and more. Also designed to
+work well with C<given>/C<when>.
+
+=item L<Throwable>
+
+A lightweight role for rolling your own exception classes.
+
+=item L<Error>
+
+Exception object implementation with a C<try> statement. Does not localize
+C<$@>.
+
+=item L<Exception::Class::TryCatch>
+
+Provides a C<catch> statement, but properly calling C<eval> is your
+responsibility.
+
+The C<try> keyword pushes C<$@> onto an error stack, avoiding some of the
+issues with C<$@>, but you still need to localize to prevent clobbering.
+
+=back
+
+=head1 LIGHTNING TALK
+
+I gave a lightning talk about this module, you can see the slides (Firefox
+only):
+
+L<http://web.archive.org/web/20100628040134/http://nothingmuch.woobling.org/talks/takahashi.xul>
+
+Or read the source:
+
+L<http://web.archive.org/web/20100305133605/http://nothingmuch.woobling.org/talks/yapc_asia_2009/try_tiny.yml>
+
+=head1 SUPPORT
+
+Bugs may be submitted through L<the RT bug tracker|https://rt.cpan.org/Public/Dist/Display.html?Name=Try-Tiny>
+(or L<bug-Try-Tiny@rt.cpan.org|mailto:bug-Try-Tiny@rt.cpan.org>).
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+יובל קוג'מן (Yuval Kogman) <nothingmuch@woobling.org>
+
+=item *
+
+Jesse Luehrs <doy@tozt.net>
+
+=back
+
+=head1 CONTRIBUTORS
+
+=for stopwords Karen Etheridge Peter Rabbitson Ricardo Signes Mark Fowler Graham Knop Lukas Mai Dagfinn Ilmari Mannsåker Paul Howarth Rudolf Leermakers anaxagoras awalker chromatic Alex cm-perl Andrew Yates David Lowe Glenn Hans Dieter Pearcey Jonathan Yu Marc Mims Stosberg Pali
+
+=over 4
+
+=item *
+
+Karen Etheridge <ether@cpan.org>
+
+=item *
+
+Peter Rabbitson <ribasushi@cpan.org>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=item *
+
+Mark Fowler <mark@twoshortplanks.com>
+
+=item *
+
+Graham Knop <haarg@haarg.org>
+
+=item *
+
+Lukas Mai <l.mai@web.de>
+
+=item *
+
+Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
+
+=item *
+
+Paul Howarth <paul@city-fan.org>
+
+=item *
+
+Rudolf Leermakers <rudolf@hatsuseno.org>
+
+=item *
+
+anaxagoras <walkeraj@gmail.com>
+
+=item *
+
+awalker <awalker@sourcefire.com>
+
+=item *
+
+chromatic <chromatic@wgz.org>
+
+=item *
+
+Alex <alex@koban.(none)>
+
+=item *
+
+cm-perl <cm-perl@users.noreply.github.com>
+
+=item *
+
+Andrew Yates <ayates@haddock.local>
+
+=item *
+
+David Lowe <davidl@lokku.com>
+
+=item *
+
+Glenn Fowler <cebjyre@cpan.org>
+
+=item *
+
+Hans Dieter Pearcey <hdp@weftsoar.net>
+
+=item *
+
+Jonathan Yu <JAWNSY@cpan.org>
+
+=item *
+
+Marc Mims <marc@questright.com>
+
+=item *
+
+Mark Stosberg <mark@stosberg.com>
+
+=item *
+
+Pali <pali@cpan.org>
+
+=back
+
+=head1 COPYRIGHT AND LICENCE
+
+This software is Copyright (c) 2009 by יובל קוג'מן (Yuval Kogman).
+
+This is free software, licensed under:
+
+  The MIT (X11) License
+
+=cut
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Digest/SHA1/SHA1.dll b/Master/tlpkg/tlperl/site/lib/auto/Digest/SHA1/SHA1.dll
index e184096ca87..86090539524 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Digest/SHA1/SHA1.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Digest/SHA1/SHA1.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/HTML/Parser/Parser.dll b/Master/tlpkg/tlperl/site/lib/auto/HTML/Parser/Parser.dll
index 5e04188df29..4cc97f0777f 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/HTML/Parser/Parser.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/HTML/Parser/Parser.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Math/Int64/Int64.dll b/Master/tlpkg/tlperl/site/lib/auto/Math/Int64/Int64.dll
index 48cb12c173a..ac97081b198 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Math/Int64/Int64.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Math/Int64/Int64.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Socket/Socket.dll b/Master/tlpkg/tlperl/site/lib/auto/Socket/Socket.dll
index 1a1a11cbb69..960de7a1969 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Socket/Socket.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Socket/Socket.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Test/Fatal/.packlist b/Master/tlpkg/tlperl/site/lib/auto/Test/Fatal/.packlist
new file mode 100644
index 00000000000..f8b34dfe0f7
--- /dev/null
+++ b/Master/tlpkg/tlperl/site/lib/auto/Test/Fatal/.packlist
@@ -0,0 +1 @@
+C:\tlperl\site\lib\Test\Fatal.pm

diff --git a/Master/tlpkg/tlperl/site/lib/auto/Test/RequiresInternet/.packlist b/Master/tlpkg/tlperl/site/lib/auto/Test/RequiresInternet/.packlist
new file mode 100644
index 00000000000..2236c52f855
--- /dev/null
+++ b/Master/tlpkg/tlperl/site/lib/auto/Test/RequiresInternet/.packlist
@@ -0,0 +1 @@
+C:\tlperl\site\lib\Test\RequiresInternet.pm

diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Canvas/Canvas.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Canvas/Canvas.dll
index 6446afced36..aaea038696e 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Canvas/Canvas.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Canvas/Canvas.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Compound/Compound.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Compound/Compound.dll
index c64b368860a..a6999af8459 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Compound/Compound.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Compound/Compound.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/DragDrop/Win32Site/Win32Site.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/DragDrop/Win32Site/Win32Site.dll
index 31ee1df07e6..525b9ca16ad 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/DragDrop/Win32Site/Win32Site.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/DragDrop/Win32Site/Win32Site.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Entry/Entry.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Entry/Entry.dll
index 9b7b7f412b7..a0a92119300 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Entry/Entry.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Entry/Entry.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Event/Event.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Event/Event.dll
index 7d0927e62e5..61b4c43543d 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Event/Event.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Event/Event.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/HList/HList.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/HList/HList.dll
index 6bd49586ac3..3887b0688f7 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/HList/HList.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/HList/HList.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/IO/IO.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/IO/IO.dll
index b0e171a0ceb..c99e35fa409 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/IO/IO.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/IO/IO.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/JPEG/JPEG.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/JPEG/JPEG.dll
index f6e70059bc5..47462a79290 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/JPEG/JPEG.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/JPEG/JPEG.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Listbox/Listbox.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Listbox/Listbox.dll
index 00235e724d0..a8650b82e74 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Listbox/Listbox.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Listbox/Listbox.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Menubutton/Menubutton.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Menubutton/Menubutton.dll
index 04febc64ef0..859bcf7837d 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Menubutton/Menubutton.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Menubutton/Menubutton.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/NBFrame/NBFrame.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/NBFrame/NBFrame.dll
index 2e1270e7126..826dc1c5ee9 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/NBFrame/NBFrame.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/NBFrame/NBFrame.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/PNG/PNG.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/PNG/PNG.dll
index 9c9d0d4cfc1..d3e627056bc 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/PNG/PNG.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/PNG/PNG.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Pixmap/Pixmap.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Pixmap/Pixmap.dll
index 89f6d56a0b1..ca6e720a39b 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Pixmap/Pixmap.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Pixmap/Pixmap.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Scale/Scale.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Scale/Scale.dll
index 06d39386842..dceb08656e9 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Scale/Scale.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Scale/Scale.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Scrollbar/Scrollbar.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Scrollbar/Scrollbar.dll
index ace8473c081..6581166a0d2 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Scrollbar/Scrollbar.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Scrollbar/Scrollbar.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/TList/TList.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/TList/TList.dll
index c53136072bf..74a7db0aec0 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/TList/TList.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/TList/TList.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Text/Text.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Text/Text.dll
index 272aa40da1e..db74843f80d 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Text/Text.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Text/Text.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/TixGrid/TixGrid.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/TixGrid/TixGrid.dll
index 16f6b45250d..68783a2bc86 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/TixGrid/TixGrid.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/TixGrid/TixGrid.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Tk.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Tk.dll
index 9471c2cb7fa..c1fc88120c5 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Tk.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Tk.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/X/X.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/X/X.dll
index cb3865194c8..5efc1ed7168 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/X/X.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/X/X.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Tk/Xlib/Xlib.dll b/Master/tlpkg/tlperl/site/lib/auto/Tk/Xlib/Xlib.dll
index 5326436a0ea..f6753ab9b41 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Tk/Xlib/Xlib.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Tk/Xlib/Xlib.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Try/Tiny/.packlist b/Master/tlpkg/tlperl/site/lib/auto/Try/Tiny/.packlist
new file mode 100644
index 00000000000..44c33603fa6
--- /dev/null
+++ b/Master/tlpkg/tlperl/site/lib/auto/Try/Tiny/.packlist
@@ -0,0 +1 @@
+C:\tlperl\site\lib\Try\Tiny.pm

diff --git a/Master/tlpkg/tlperl/site/lib/auto/Win32/API/API.dll b/Master/tlpkg/tlperl/site/lib/auto/Win32/API/API.dll
index d1033369f81..1da8a27ac20 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Win32/API/API.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Win32/API/API.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Win32/API/Callback/Callback.dll b/Master/tlpkg/tlperl/site/lib/auto/Win32/API/Callback/Callback.dll
index 404cd0308eb..2d50bfa9573 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Win32/API/Callback/Callback.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Win32/API/Callback/Callback.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Win32/Console/Console.dll b/Master/tlpkg/tlperl/site/lib/auto/Win32/Console/Console.dll
index 1493cffda23..1eb79855d63 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Win32/Console/Console.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Win32/Console/Console.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Win32/OLE/OLE.dll b/Master/tlpkg/tlperl/site/lib/auto/Win32/OLE/OLE.dll
index ee0afd77bed..9f4ee98c466 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Win32/OLE/OLE.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Win32/OLE/OLE.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Win32/Process/Process.dll b/Master/tlpkg/tlperl/site/lib/auto/Win32/Process/Process.dll
index 68dfd660838..7c4e92a6725 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Win32/Process/Process.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Win32/Process/Process.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Win32/Shortcut/Shortcut.dll b/Master/tlpkg/tlperl/site/lib/auto/Win32/Shortcut/Shortcut.dll
index 817aea2599a..5bb6d509e87 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Win32/Shortcut/Shortcut.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Win32/Shortcut/Shortcut.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/Win32API/Registry/Registry.dll b/Master/tlpkg/tlperl/site/lib/auto/Win32API/Registry/Registry.dll
index a5de61dcfae..a460a26c22f 100755
--- a/Master/tlpkg/tlperl/site/lib/auto/Win32API/Registry/Registry.dll
+++ b/Master/tlpkg/tlperl/site/lib/auto/Win32API/Registry/Registry.dll
diff --git a/Master/tlpkg/tlperl/site/lib/auto/LWP/.packlist b/Master/tlpkg/tlperl/site/lib/auto/libwww/perl/.packlist
index 5e930937248..156f09f720f 100644
--- a/Master/tlpkg/tlperl/site/lib/auto/LWP/.packlist
+++ b/Master/tlpkg/tlperl/site/lib/auto/libwww/perl/.packlist
@@ -13,9 +13,9 @@ C:\tlperl\site\lib\LWP\Authen\Ntlm.pm
 C:\tlperl\site\lib\LWP\ConnCache.pm

 C:\tlperl\site\lib\LWP\Debug.pm

 C:\tlperl\site\lib\LWP\DebugFile.pm

+C:\tlperl\site\lib\LWP\Debug\TraceHTTP.pm

 C:\tlperl\site\lib\LWP\MemberMixin.pm

 C:\tlperl\site\lib\LWP\Protocol.pm

-C:\tlperl\site\lib\LWP\Protocol\GHTTP.pm

 C:\tlperl\site\lib\LWP\Protocol\cpan.pm

 C:\tlperl\site\lib\LWP\Protocol\data.pm

 C:\tlperl\site\lib\LWP\Protocol\file.pm

@@ -29,5 +29,5 @@ C:\tlperl\site\lib\LWP\Protocol\nogo.pm
 C:\tlperl\site\lib\LWP\RobotUA.pm

 C:\tlperl\site\lib\LWP\Simple.pm

 C:\tlperl\site\lib\LWP\UserAgent.pm

-C:\tlperl\site\lib\lwpcook.pod

-C:\tlperl\site\lib\lwptut.pod

+C:\tlperl\site\lib\libwww\lwpcook.pod

+C:\tlperl\site\lib\libwww\lwptut.pod

diff --git a/Master/tlpkg/tlperl/site/lib/lwpcook.pod b/Master/tlpkg/tlperl/site/lib/libwww/lwpcook.pod
index 2002b79925e..43af716db06 100644
--- a/Master/tlpkg/tlperl/site/lib/lwpcook.pod
+++ b/Master/tlpkg/tlperl/site/lib/libwww/lwpcook.pod
@@ -188,19 +188,16 @@ cookies provided by the servers it visits.  LWP will collect cookies
 and respond to cookie requests if you set up a cookie jar.
 
   use LWP::UserAgent;
-  use HTTP::Cookies;
+  use HTTP::CookieJar::LWP;
 
-  $ua = LWP::UserAgent->new;
-  $ua->cookie_jar(HTTP::Cookies->new(file => "lwpcookies.txt",
-				     autosave => 1));
+  $ua = LWP::UserAgent->new(
+      cookie_jar => HTTP::CookieJar::LWP->new,
+  );
 
   # and then send requests just as you used to do
   $res = $ua->request(HTTP::Request->new(GET => "http://no.yahoo.com/"));
   print $res->status_line, "\n";
 
-As you visit sites that send you cookies to keep, then the file
-F<lwpcookies.txt"> will grow.
-
 =head1 HTTPS
 
 URLs with https scheme are accessed in exactly the same way as with
diff --git a/Master/tlpkg/tlperl/site/lib/lwptut.pod b/Master/tlpkg/tlperl/site/lib/libwww/lwptut.pod
index 3ab5e61eae4..f9f98a0f159 100644
--- a/Master/tlpkg/tlperl/site/lib/lwptut.pod
+++ b/Master/tlpkg/tlperl/site/lib/libwww/lwptut.pod
@@ -176,7 +176,7 @@ like so:
 
   $response = $browser->get( $url, $key1, $value1, $key2, $value2, ... );
 
-For example, here's how to send some more Netscape-like headers, in case
+For example, here's how to send some commonly used headers, in case
 you're dealing with a site that would otherwise reject your request:
 
 
@@ -219,45 +219,20 @@ A default LWP::UserAgent object acts like a browser with its cookies
 support turned off. There are various ways of turning it on, by setting
 its C<cookie_jar> attribute. A "cookie jar" is an object representing
 a little database of all
-the HTTP cookies that a browser can know about. It can correspond to a
-file on disk (the way Netscape uses its F<cookies.txt> file), or it can
-be just an in-memory object that starts out empty, and whose collection of
+the HTTP cookies that a browser knows about. It can correspond to a
+file on disk or 
+an in-memory object that starts out empty, and whose collection of
 cookies will disappear once the program is finished running.
 
 To give a browser an in-memory empty cookie jar, you set its C<cookie_jar>
 attribute like so:
 
-  $browser->cookie_jar({});
-
-To give it a copy that will be read from a file on disk, and will be saved
-to it when the program is finished running, set the C<cookie_jar> attribute
-like this:
-
-  use HTTP::Cookies;
-  $browser->cookie_jar( HTTP::Cookies->new(
-    'file' => '/some/where/cookies.lwp',
-        # where to read/write cookies
-    'autosave' => 1,
-        # save it to disk when done
-  ));
-
-That file will be in LWP-specific format. If you want to access the
-cookies in your Netscape cookies file, you can use the
-HTTP::Cookies::Netscape class:
-
-  use HTTP::Cookies;
-    # yes, loads HTTP::Cookies::Netscape too
-  
-  $browser->cookie_jar( HTTP::Cookies::Netscape->new(
-    'file' => 'c:/Program Files/Netscape/Users/DIR-NAME-HERE/cookies.txt',
-        # where to read cookies
-  ));
-
-You could add an C<< 'autosave' => 1 >> line as further above, but at
-time of writing, it's uncertain whether Netscape might discard some of
-the cookies you could be writing back to disk.
-
+  use HTTP::CookieJar::LWP;
+  $browser->cookie_jar( HTTP::CookieJar::LWP->new );
 
+To save a cookie jar to disk, see L<< HTTP::CookieJar/dump_cookies >>.
+To load cookies from disk into a jar, see L<<
+HTTP::CookieJar/load_cookies >>.
 
 =for comment
  ##########################################################################
@@ -742,7 +717,13 @@ For example,
 
 When you use this C<:content_file> option, the C<$response> will have
 all the normal header lines, but C<< $response->content >> will be
-empty.
+empty.  Errors writing to the content file (for example due to
+permission denied or the filesystem being full) will be reported via
+the C<Client-Aborted> or C<X-Died> response headers, and not the
+C<is_success> method:
+
+  if ($response->header('Client-Aborted') eq 'die') {
+    # handle error ...
 
 Note that this ":content_file" option isn't supported under older
 versions of LWP, so you should consider adding C<use LWP 5.66;> to check