diff options
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/libmbfl/LICENSE | 2 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/NEWS | 6 | ||||
| -rwxr-xr-x | ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl | 68 | ||||
| -rwxr-xr-x | ext/mbstring/libmbfl/filters/mk_sb_tbl.awk | 2 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk | 2 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp | 2 | ||||
| -rw-r--r-- | ext/mbstring/ucgendat/ucgendat.php | 2 |
7 files changed, 42 insertions, 42 deletions
diff --git a/ext/mbstring/libmbfl/LICENSE b/ext/mbstring/libmbfl/LICENSE index 3b204400cf..9a749e6855 100644 --- a/ext/mbstring/libmbfl/LICENSE +++ b/ext/mbstring/libmbfl/LICENSE @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an diff --git a/ext/mbstring/libmbfl/NEWS b/ext/mbstring/libmbfl/NEWS index 8217e4158f..82a763b695 100644 --- a/ext/mbstring/libmbfl/NEWS +++ b/ext/mbstring/libmbfl/NEWS @@ -10,12 +10,12 @@ version 1.3.2 August 20, 2011 version 1.3.1 August 5, 2011 - added check for invalid/obsolete utf-8 encoding (rui). - + version 1.3.0 August 1, 2011 -- added encoding conversion between Shift_JIS and Unicode (6.0 or PUA) +- added encoding conversion between Shift_JIS and Unicode (6.0 or PUA) for pictogram characters defined by mobile phone carrier in Japan (rui). - + Detailed info:https://github.com/hirokawa/libmbfl/wiki/Introduction-to-libmbflhttps:--github.com-hirokawa-libmbfl-wiki-Introduction-to-libmbfl-_edit%23 - fixed encoding conversion of cp5022x for user defined area (rui). diff --git a/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl b/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl index 5b5c3d63ff..5bab0c602e 100755 --- a/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl +++ b/ext/mbstring/libmbfl/filters/mk_emoji_tbl.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# script to generate Shift_JIS encoded Emoji to/from Unicode conversion table. +# script to generate Shift_JIS encoded Emoji to/from Unicode conversion table. # Rui Hirokawa <hirokawa@php.net> # # usage: mktbl.pl EmojiSources.txt @@ -22,7 +22,7 @@ sub sjis2code { # Shift_JIS -> JIS $c[0] = (($c[0]-($c[0]<160?112:176))<<1)-($c[1]<159?1:0); - $c[1] -= ($c[1]<159?($c[1]>127?32:31):126); + $c[1] -= ($c[1]<159?($c[1]>127?32:31):126); $s = ($c[0] - 0x21)*94 + $c[1]-0x21; @@ -131,19 +131,19 @@ push(@r_docomo2_val, 0x00); push(@r_docomo3_key, 0x00); push(@r_docomo3_val, 0x00); -print OUT "int mb_tbl_code2uni_docomo_min = $docomo_min;\n"; -print OUT "int mb_tbl_code2uni_docomo_max = $docomo_max;\n\n"; +print OUT "int mb_tbl_code2uni_docomo_min = $docomo_min;\n"; +print OUT "int mb_tbl_code2uni_docomo_max = $docomo_max;\n\n"; print OUT "int mb_tbl_code2uni_docomo[] = {\n"; print OUT &show_code(@docomo_v); print OUT "};\n\n"; -print OUT "int mb_tbl_uni_docomo2code_min1 = $to_docomo_min1;\n"; -print OUT "int mb_tbl_uni_docomo2code_max1 = $to_docomo_max1;\n"; -print OUT "int mb_tbl_uni_docomo2code_min2 = $to_docomo_min2;\n"; -print OUT "int mb_tbl_uni_docomo2code_max2 = $to_docomo_max2;\n"; -print OUT "int mb_tbl_uni_docomo2code_min3 = $to_docomo_min3;\n"; -print OUT "int mb_tbl_uni_docomo2code_max3 = $to_docomo_max3;\n\n"; +print OUT "int mb_tbl_uni_docomo2code_min1 = $to_docomo_min1;\n"; +print OUT "int mb_tbl_uni_docomo2code_max1 = $to_docomo_max1;\n"; +print OUT "int mb_tbl_uni_docomo2code_min2 = $to_docomo_min2;\n"; +print OUT "int mb_tbl_uni_docomo2code_max2 = $to_docomo_max2;\n"; +print OUT "int mb_tbl_uni_docomo2code_min3 = $to_docomo_min3;\n"; +print OUT "int mb_tbl_uni_docomo2code_max3 = $to_docomo_max3;\n\n"; #print "DOCOMO reverse 1\n"; @@ -238,10 +238,10 @@ push(@r_kddi2_val, 0x00); push(@r_kddi3_key, 0x00); push(@r_kddi3_val, 0x00); -print OUT "int mb_tbl_code2uni_kddi1_min = $kddi_min1;\n"; -print OUT "int mb_tbl_code2uni_kddi1_max = $kddi_max1;\n"; -print OUT "int mb_tbl_code2uni_kddi2_min = $kddi_min2;\n"; -print OUT "int mb_tbl_code2uni_kddi2_max = $kddi_max2;\n\n"; +print OUT "int mb_tbl_code2uni_kddi1_min = $kddi_min1;\n"; +print OUT "int mb_tbl_code2uni_kddi1_max = $kddi_max1;\n"; +print OUT "int mb_tbl_code2uni_kddi2_min = $kddi_min2;\n"; +print OUT "int mb_tbl_code2uni_kddi2_max = $kddi_max2;\n\n"; #print "KDDI 1\n"; @@ -255,12 +255,12 @@ print OUT "int mb_tbl_code2uni_kddi2[] = {\n"; print OUT &show_code(@kddi_v2); print OUT "};\n\n"; -print OUT "int mb_tbl_uni_kddi2code_min1 = $to_kddi_min1;\n"; -print OUT "int mb_tbl_uni_kddi2code_max1 = $to_kddi_max1;\n"; -print OUT "int mb_tbl_uni_kddi2code_min2 = $to_kddi_min2;\n"; -print OUT "int mb_tbl_uni_kddi2code_max2 = $to_kddi_max2;\n"; -print OUT "int mb_tbl_uni_kddi2code_min3 = $to_kddi_min3;\n"; -print OUT "int mb_tbl_uni_kddi2code_max3 = $to_kddi_max3;\n\n"; +print OUT "int mb_tbl_uni_kddi2code_min1 = $to_kddi_min1;\n"; +print OUT "int mb_tbl_uni_kddi2code_max1 = $to_kddi_max1;\n"; +print OUT "int mb_tbl_uni_kddi2code_min2 = $to_kddi_min2;\n"; +print OUT "int mb_tbl_uni_kddi2code_max2 = $to_kddi_max2;\n"; +print OUT "int mb_tbl_uni_kddi2code_min3 = $to_kddi_min3;\n"; +print OUT "int mb_tbl_uni_kddi2code_max3 = $to_kddi_max3;\n\n"; #print "KDDI reverse 1\n"; @@ -303,7 +303,7 @@ $sb_max3 = 10153+901; if (1) { print "SoftBank\n"; - + foreach $key (sort {hex($a) <=> hex($b)} keys(%softbank)) { $s = $key; $pos = $s % 94; @@ -319,7 +319,7 @@ if (1) { $sb_v3[$key-$sb_min3] = $softbank{$key}; } } - + } $to_sb_min = 10263; @@ -362,12 +362,12 @@ push(@r_sb3_key, 0x00); push(@r_sb3_val, 0x00); -print OUT "int mb_tbl_code2uni_sb1_min = $sb_min1;\n"; -print OUT "int mb_tbl_code2uni_sb1_max = $sb_max1;\n"; -print OUT "int mb_tbl_code2uni_sb2_min = $sb_min2;\n"; -print OUT "int mb_tbl_code2uni_sb2_max = $sb_max2;\n"; -print OUT "int mb_tbl_code2uni_sb3_min = $sb_min3;\n"; -print OUT "int mb_tbl_code2uni_sb3_max = $sb_max3;\n\n"; +print OUT "int mb_tbl_code2uni_sb1_min = $sb_min1;\n"; +print OUT "int mb_tbl_code2uni_sb1_max = $sb_max1;\n"; +print OUT "int mb_tbl_code2uni_sb2_min = $sb_min2;\n"; +print OUT "int mb_tbl_code2uni_sb2_max = $sb_max2;\n"; +print OUT "int mb_tbl_code2uni_sb3_min = $sb_min3;\n"; +print OUT "int mb_tbl_code2uni_sb3_max = $sb_max3;\n\n"; #print "SoftBank 1\n"; @@ -387,12 +387,12 @@ print OUT "int mb_tbl_code2uni_sb3[] = {\n"; print OUT &show_code(@sb_v3); print OUT "};\n\n"; -print OUT "int mb_tbl_uni_sb2code_min1 = $to_sb_min1;\n"; -print OUT "int mb_tbl_uni_sb2code_max1 = $to_sb_max1;\n"; -print OUT "int mb_tbl_uni_sb2code_min2 = $to_sb_min2;\n"; -print OUT "int mb_tbl_uni_sb2code_max2 = $to_sb_max2;\n"; -print OUT "int mb_tbl_uni_sb2code_min3 = $to_sb_min3;\n"; -print OUT "int mb_tbl_uni_sb2code_max3 = $to_sb_max3;\n\n"; +print OUT "int mb_tbl_uni_sb2code_min1 = $to_sb_min1;\n"; +print OUT "int mb_tbl_uni_sb2code_max1 = $to_sb_max1;\n"; +print OUT "int mb_tbl_uni_sb2code_min2 = $to_sb_min2;\n"; +print OUT "int mb_tbl_uni_sb2code_max2 = $to_sb_max2;\n"; +print OUT "int mb_tbl_uni_sb2code_min3 = $to_sb_min3;\n"; +print OUT "int mb_tbl_uni_sb2code_max3 = $to_sb_max3;\n\n"; #print "SB reverse 1\n"; diff --git a/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk b/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk index b496e6f1d1..31c5449d96 100755 --- a/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk +++ b/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk @@ -54,7 +54,7 @@ END { print "" break; } - } + } print "};" if (IFNDEF_NAME) { diff --git a/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk b/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk index 5813fbd7e7..e5223a432a 100644 --- a/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk +++ b/ext/mbstring/libmbfl/mbfl/mk_eaw_tbl.awk @@ -76,4 +76,4 @@ END { printf("{ 0x%04x, 0x%04x }", first, prev) } print "\n};\n" -} +} diff --git a/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp b/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp index a6459fe5ac..c9b87ea961 100644 --- a/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp +++ b/ext/mbstring/libmbfl/tests/conv_kana.tests/conv_kana.exp @@ -867,7 +867,7 @@ expect { } close -set test "full-width katakanas to full-width hiragana" +set test "full-width katakanas to full-width hiragana" spawn tests/conv_kana EUC-JP "c" expect_after { "\[^\r\n\]*\r\n" { fail $test } diff --git a/ext/mbstring/ucgendat/ucgendat.php b/ext/mbstring/ucgendat/ucgendat.php index 556a8cf98f..4bb5b9b698 100644 --- a/ext/mbstring/ucgendat/ucgendat.php +++ b/ext/mbstring/ucgendat/ucgendat.php @@ -505,7 +505,7 @@ function generateData(UnicodeData $data) { /* This file was generated from a modified version UCData's ucgendat. * * DO NOT EDIT THIS FILE! - * + * * Instead, compile ucgendat.c (bundled with PHP in ext/mbstring), download * the appropriate UnicodeData-x.x.x.txt and CompositionExclusions-x.x.x.txt * files from http://www.unicode.org/Public/ and run this program. |