diff options
| -rw-r--r-- | charclass_invlists.h | 2 | ||||
| -rw-r--r-- | lib/unicore/mktables | 34 | ||||
| -rw-r--r-- | lib/unicore/uni_keywords.pl | 2 | ||||
| -rw-r--r-- | regcharclass.h | 2 | ||||
| -rw-r--r-- | uni_keywords.h | 2 |
5 files changed, 26 insertions, 16 deletions
diff --git a/charclass_invlists.h b/charclass_invlists.h index 38799d0e28..cc8c797278 100644 --- a/charclass_invlists.h +++ b/charclass_invlists.h @@ -430752,7 +430752,7 @@ static const U8 WB_table[23][23] = { * 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt * a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt * 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt - * 3f7a81c6f40611d1e68f5e42699368ce95d36ca8a852ca5a252b41cee055391a lib/unicore/mktables + * a6c2dcc098ee1ecae3bef321ebf9a66013ddf5a3660ecb4277b5097f3605e83a lib/unicore/mktables * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl diff --git a/lib/unicore/mktables b/lib/unicore/mktables index af4ed02869..dc18dbb5e5 100644 --- a/lib/unicore/mktables +++ b/lib/unicore/mktables @@ -2801,20 +2801,30 @@ END utf8::encode($BOM); my $BOM_re = qr/ ^ (?:$BOM)? /x; - while ($_ =~ s/$BOM_re//) { # BOM; seems to be on - # many lines in some files!! - $_ = <$file_handle>; - goto no_version unless defined $_; + do { chomp; - if ($_ =~ /^# Version: (.*)/) { - $this_version = $1; - goto valid_version - if $this_version eq $string_version; - goto valid_version - if "$this_version.0" eq $string_version; - goto wrong_version; + + # BOM; seems to be on many lines in some + # files!! + $_ =~ s/$BOM_re//; + + if (/./) { + + # Only look for the version if in the + # first comment block. + goto no_version unless $_ =~ /^#/; + + if ($_ =~ /Version:? (\S*)/) { + $this_version = $1; + goto valid_version + if $this_version eq $string_version; + goto valid_version + if "$this_version.0" + eq $string_version; + } } - } + } while (<$file_handle>); + goto no_version; } } diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl index 8c82cccf1c..991cbe2267 100644 --- a/lib/unicore/uni_keywords.pl +++ b/lib/unicore/uni_keywords.pl @@ -1320,7 +1320,7 @@ # 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt # a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt # 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt -# 3f7a81c6f40611d1e68f5e42699368ce95d36ca8a852ca5a252b41cee055391a lib/unicore/mktables +# a6c2dcc098ee1ecae3bef321ebf9a66013ddf5a3660ecb4277b5097f3605e83a lib/unicore/mktables # c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version # 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl # c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl diff --git a/regcharclass.h b/regcharclass.h index 685427e32e..f22cc1b153 100644 --- a/regcharclass.h +++ b/regcharclass.h @@ -3850,7 +3850,7 @@ * 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt * a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt * 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt - * 3f7a81c6f40611d1e68f5e42699368ce95d36ca8a852ca5a252b41cee055391a lib/unicore/mktables + * a6c2dcc098ee1ecae3bef321ebf9a66013ddf5a3660ecb4277b5097f3605e83a lib/unicore/mktables * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * acc94e4afc339fe2cf2ae74d6e1cbcf2c396328d78e56236ad314eadbfc84125 regen/regcharclass.pl diff --git a/uni_keywords.h b/uni_keywords.h index 8baec415bb..e69f7680e3 100644 --- a/uni_keywords.h +++ b/uni_keywords.h @@ -7677,7 +7677,7 @@ match_uniprop( const unsigned char * const key, const U16 key_len ) { * 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt * a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt * 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt - * 3f7a81c6f40611d1e68f5e42699368ce95d36ca8a852ca5a252b41cee055391a lib/unicore/mktables + * a6c2dcc098ee1ecae3bef321ebf9a66013ddf5a3660ecb4277b5097f3605e83a lib/unicore/mktables * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl |