hirokawa Mon Jan 29 22:53:47 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/mbstring/libmbfl/filters mbfilter_iso2022_jp_ms.c
mbfilter_iso2022_jp_ms.h
Modified files:
/php-src/ext/mbstring config.m4
/php-src/ext/mbstring/libmbfl/filters Makefile.am
mbfilter_euc_jp_win.c
mbfilter_jis.c mbfilter_jis.h
unicode_table_jis.h
/php-src/ext/mbstring/libmbfl/mbfl mbfl_convert.c mbfl_encoding.c
mbfl_ident.c
Log:
fixed incompatibility with PHP 5.2.0 for encoding conversion between
ShiftJIS(CP932), eucJP, ISO-2022-JP.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.7&r2=1.58.2.4.2.8&diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.7
php-src/ext/mbstring/config.m4:1.58.2.4.2.8
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.7 Fri Nov 3 01:11:35 2006
+++ php-src/ext/mbstring/config.m4 Mon Jan 29 22:53:47 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.58.2.4.2.7 2006/11/03 01:11:35 hirokawa Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.8 2007/01/29 22:53:47 hirokawa Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -210,6 +210,7 @@
libmbfl/filters/mbfilter_iso8859_8.c
libmbfl/filters/mbfilter_iso8859_9.c
libmbfl/filters/mbfilter_jis.c
+ libmbfl/filters/mbfilter_iso2022_jp_ms.c
libmbfl/filters/mbfilter_koi8r.c
libmbfl/filters/mbfilter_armscii8.c
libmbfl/filters/mbfilter_qprint.c
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/Makefile.am?r1=1.4.4.1&r2=1.4.4.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/Makefile.am
diff -u php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.1
php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.2
--- php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.1 Fri Nov 3
01:11:35 2006
+++ php-src/ext/mbstring/libmbfl/filters/Makefile.am Mon Jan 29 22:53:47 2007
@@ -2,7 +2,7 @@
noinst_LTLIBRARIES=libmbfl_filters.la
INCLUDES=-I../mbfl
libmbfl_filters_la_LDFLAGS=-version-info $(SHLIB_VERSION)
-libmbfl_filters_la_SOURCES=mbfilter_cp936.c mbfilter_hz.c mbfilter_euc_tw.c
mbfilter_big5.c mbfilter_euc_jp.c mbfilter_jis.c mbfilter_iso8859_1.c
mbfilter_iso8859_2.c mbfilter_cp1252.c mbfilter_cp1251.c mbfilter_ascii.c
mbfilter_iso8859_3.c mbfilter_iso8859_4.c mbfilter_iso8859_5.c
mbfilter_iso8859_6.c mbfilter_iso8859_7.c mbfilter_iso8859_8.c
mbfilter_iso8859_9.c mbfilter_iso8859_10.c mbfilter_iso8859_13.c
mbfilter_iso8859_14.c mbfilter_iso8859_15.c mbfilter_iso8859_16.c
mbfilter_htmlent.c mbfilter_byte2.c mbfilter_byte4.c mbfilter_uuencode.c
mbfilter_base64.c mbfilter_sjis.c mbfilter_7bit.c mbfilter_qprint.c
mbfilter_ucs4.c mbfilter_ucs2.c mbfilter_utf32.c mbfilter_utf16.c
mbfilter_utf8.c mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_euc_jp_win.c
mbfilter_cp932.c mbfilter_cp51932.c mbfilter_euc_cn.c mbfilter_euc_kr.c
mbfilter_uhc.c mbfilter_iso2022_kr.c mbfilter_cp866.c mbfilter_koi8r.c
mbfilter_armscii8.c html_entities.c cp932_table.h html_entities.h
mbfilter_7bit.h mbfil!
ter_ascii.h mbfilter_base64.h mbfilter_big5.h mbfilter_byte2.h
mbfilter_byte4.h mbfilter_cp1251.h mbfilter_cp1252.h mbfilter_cp866.h
mbfilter_cp932.h mbfilter_cp51932.h mbfilter_cp936.h mbfilter_euc_cn.h
mbfilter_euc_jp.h mbfilter_euc_jp_win.h mbfilter_euc_kr.h mbfilter_euc_tw.h
mbfilter_htmlent.h mbfilter_hz.h mbfilter_iso2022_kr.h mbfilter_iso8859_1.h
mbfilter_iso8859_10.h mbfilter_iso8859_13.h mbfilter_iso8859_14.h
mbfilter_iso8859_15.h mbfilter_iso8859_16.h mbfilter_iso8859_2.h
mbfilter_iso8859_3.h mbfilter_iso8859_4.h mbfilter_iso8859_5.h
mbfilter_iso8859_6.h mbfilter_iso8859_7.h mbfilter_iso8859_8.h
mbfilter_iso8859_9.h mbfilter_jis.h mbfilter_koi8r.h mbfilter_armscii8.h
mbfilter_qprint.h mbfilter_sjis.h mbfilter_ucs2.h mbfilter_ucs4.h
mbfilter_uhc.h mbfilter_utf16.h mbfilter_utf32.h mbfilter_utf7.h
mbfilter_utf7imap.h mbfilter_utf8.h mbfilter_uuencode.h unicode_prop.h
unicode_table_big5.h unicode_table_cns11643.h unicode_table_cp1251.h
unicode_table_cp1252.h unicode_!
table_cp866.h unicode_table_cp932_ext.h unicode_table_cp936.h unicode_
table_iso8859_10.h unicode_table_iso8859_13.h unicode_table_iso8859_14.h
unicode_table_iso8859_15.h unicode_table_iso8859_16.h unicode_table_iso8859_2.h
unicode_table_iso8859_3.h unicode_table_iso8859_4.h unicode_table_iso8859_5.h
unicode_table_iso8859_6.h unicode_table_iso8859_7.h unicode_table_iso8859_8.h
unicode_table_iso8859_9.h unicode_table_jis.h unicode_table_koi8r.h
unicode_table_armscii8.h unicode_table_uhc.h
+libmbfl_filters_la_SOURCES=mbfilter_cp936.c mbfilter_hz.c mbfilter_euc_tw.c
mbfilter_big5.c mbfilter_euc_jp.c mbfilter_jis.c mbfilter_iso8859_1.c
mbfilter_iso8859_2.c mbfilter_cp1252.c mbfilter_cp1251.c mbfilter_ascii.c
mbfilter_iso8859_3.c mbfilter_iso8859_4.c mbfilter_iso8859_5.c
mbfilter_iso8859_6.c mbfilter_iso8859_7.c mbfilter_iso8859_8.c
mbfilter_iso8859_9.c mbfilter_iso8859_10.c mbfilter_iso8859_13.c
mbfilter_iso8859_14.c mbfilter_iso8859_15.c mbfilter_iso8859_16.c
mbfilter_htmlent.c mbfilter_byte2.c mbfilter_byte4.c mbfilter_uuencode.c
mbfilter_base64.c mbfilter_sjis.c mbfilter_7bit.c mbfilter_qprint.c
mbfilter_ucs4.c mbfilter_ucs2.c mbfilter_utf32.c mbfilter_utf16.c
mbfilter_utf8.c mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_euc_jp_win.c
mbfilter_cp932.c mbfilter_cp51932.c mbfilter_iso2022_jp_ms.c mbfilter_euc_cn.c
mbfilter_euc_kr.c mbfilter_uhc.c mbfilter_iso2022_kr.c mbfilter_cp866.c
mbfilter_koi8r.c mbfilter_armscii8.c html_entities.c cp932_table.h html_entitie!
s.h mbfilter_7bit.h mbfilter_ascii.h mbfilter_base64.h mbfilter_big5.h
mbfilter_byte2.h mbfilter_byte4.h mbfilter_cp1251.h mbfilter_cp1252.h
mbfilter_cp866.h mbfilter_cp932.h mbfilter_cp51932.h mbfilter_iso2022_jp_ms.h
mbfilter_cp936.h mbfilter_euc_cn.h mbfilter_euc_jp.h mbfilter_euc_jp_win.h
mbfilter_euc_kr.h mbfilter_euc_tw.h mbfilter_htmlent.h mbfilter_hz.h
mbfilter_iso2022_kr.h mbfilter_iso8859_1.h mbfilter_iso8859_10.h
mbfilter_iso8859_13.h mbfilter_iso8859_14.h mbfilter_iso8859_15.h
mbfilter_iso8859_16.h mbfilter_iso8859_2.h mbfilter_iso8859_3.h
mbfilter_iso8859_4.h mbfilter_iso8859_5.h mbfilter_iso8859_6.h
mbfilter_iso8859_7.h mbfilter_iso8859_8.h mbfilter_iso8859_9.h mbfilter_jis.h
mbfilter_koi8r.h mbfilter_armscii8.h mbfilter_qprint.h mbfilter_sjis.h
mbfilter_ucs2.h mbfilter_ucs4.h mbfilter_uhc.h mbfilter_utf16.h
mbfilter_utf32.h mbfilter_utf7.h mbfilter_utf7imap.h mbfilter_utf8.h
mbfilter_uuencode.h unicode_prop.h unicode_table_big5.h
unicode_table_cns11643.h unic!
ode_table_cp1251.h unicode_table_cp1252.h unicode_table_cp866.h unicod
e_table_cp932_ext.h unicode_table_cp936.h unicode_table_iso8859_10.h
unicode_table_iso8859_13.h unicode_table_iso8859_14.h
unicode_table_iso8859_15.h unicode_table_iso8859_16.h unicode_table_iso8859_2.h
unicode_table_iso8859_3.h unicode_table_iso8859_4.h unicode_table_iso8859_5.h
unicode_table_iso8859_6.h unicode_table_iso8859_7.h unicode_table_iso8859_8.h
unicode_table_iso8859_9.h unicode_table_jis.h unicode_table_koi8r.h
unicode_table_armscii8.h unicode_table_uhc.h
mbfilter_iso8859_2.c: unicode_table_iso8859_2.h
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c?r1=1.1.8.1&r2=1.1.8.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c:1.1.8.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c:1.1.8.2
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c:1.1.8.1 Fri Nov
3 01:11:35 2006
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c Mon Jan 29
22:53:47 2007
@@ -204,6 +204,9 @@
s = (c1 - 0xa1)*94 + c - 0xa1;
if (s >= 0 && s < jisx0212_ucs_table_size) {
w = jisx0212_ucs_table[s];
+ if (w == 0x007e) {
+ w = 0xff5e; /* FULLWIDTH
TILDE */
+ }
} else if (s >= (82*94) && s < (84*94)) { /*
vender ext3 (83ku - 84ku) <-> CP932 (115ku -120ku) */
s = (c1<< 8) | c;
w = 0;
@@ -222,6 +225,9 @@
} else {
w = 0;
}
+ if (w == 0x00A6) {
+ w = 0xFFE4; /* FULLWIDTH BROKEN BAR
*/
+ }
if (w <= 0) {
w = ((c1 & 0x7f) << 8) | (c & 0x7f);
w &= MBFL_WCSPLANE_MASK;
@@ -274,6 +280,9 @@
c2 = s1%94 + 0xa1;
s1 = (c1 << 8) | c2;
}
+ if (s1 == 0xa2f1) {
+ s1 = 0x2d62; /* NUMERO SIGN */
+ }
if (s1 <= 0) {
c1 = c & ~MBFL_WCSPLANE_MASK;
if (c1 == MBFL_WCSPLANE_WINCP932) {
@@ -311,6 +320,8 @@
s1 = 0x2172;
} else if (c == 0xffe2) { /* FULLWIDTH NOT SIGN */
s1 = 0x224c;
+ } else if (c == 0xff5e) { /* FULLWIDTH TILDE */
+ s1 = 0x2141;
} else {
s1 = -1;
c1 = 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.c?r1=1.1.8.1&r2=1.1.8.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.c:1.1.8.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.c:1.1.8.2
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.c:1.1.8.1 Fri Nov 3
01:11:35 2006
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.c Mon Jan 29 22:53:47 2007
@@ -58,15 +58,6 @@
MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE
};
-const mbfl_encoding mbfl_encoding_2022jpms = {
- mbfl_no_encoding_2022jpms,
- "ISO-2022-JP-MS",
- "ISO-2022-JP-MS",
- NULL,
- NULL,
- MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE
-};
-
const struct mbfl_identify_vtbl vtbl_identify_jis = {
mbfl_no_encoding_jis,
mbfl_filt_ident_common_ctor,
@@ -81,13 +72,6 @@
mbfl_filt_ident_2022jp
};
-const struct mbfl_identify_vtbl vtbl_identify_2022jpms = {
- mbfl_no_encoding_2022jpms,
- mbfl_filt_ident_common_ctor,
- mbfl_filt_ident_common_dtor,
- mbfl_filt_ident_2022jp
-};
-
const struct mbfl_convert_vtbl vtbl_jis_wchar = {
mbfl_no_encoding_jis,
mbfl_no_encoding_wchar,
@@ -124,24 +108,6 @@
mbfl_filt_conv_any_jis_flush
};
-const struct mbfl_convert_vtbl vtbl_2022jpms_wchar = {
- mbfl_no_encoding_2022jpms,
- mbfl_no_encoding_wchar,
- mbfl_filt_conv_common_ctor,
- mbfl_filt_conv_common_dtor,
- mbfl_filt_conv_jis_wchar,
- mbfl_filt_conv_common_flush
-};
-
-const struct mbfl_convert_vtbl vtbl_wchar_2022jpms = {
- mbfl_no_encoding_wchar,
- mbfl_no_encoding_2022jpms,
- mbfl_filt_conv_common_ctor,
- mbfl_filt_conv_common_dtor,
- mbfl_filt_conv_wchar_jis,
- mbfl_filt_conv_any_jis_flush
-};
-
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)
/*
@@ -164,10 +130,12 @@
filter->status += 2;
} else if (c == 0x0e) { /* "kana in" */
filter->status = 0x20;
- CK((*filter->output_function)(c, filter->data));
} else if (c == 0x0f) { /* "kana out" */
filter->status = 0;
- CK((*filter->output_function)(c, filter->data));
+ } else if (filter->status == 0x10 && c == 0x5c) { /* YEN
SIGN */
+ CK((*filter->output_function)(0xa5, filter->data));
+ } else if (filter->status == 0x10 && c == 0x7e) { /* OVER
LINE */
+ CK((*filter->output_function)(0x203e, filter->data));
} else if (filter->status == 0x20 && c > 0x20 && c < 0x60) {
/* kana */
CK((*filter->output_function)(0xff40 + c,
filter->data));
} else if ((filter->status == 0x80 || filter->status == 0x90)
&& c > 0x20 && c < 0x7f) { /* kanji first char */
@@ -193,34 +161,9 @@
s = (c1 - 0x21)*94 + c - 0x21;
if (filter->status == 0x80) {
if (s >= 0 && s < jisx0208_ucs_table_size) {
- if ((filter->from)->no_encoding !=
- mbfl_no_encoding_2022jpms) {
w = jisx0208_ucs_table[s];
- }
- else {
- if ((c1 - 0x21) == 12) {
- w = cp932ext1_ucs_table[s-12*94];
- }
- else {
- if (c1 >= 0x79 && c1 <= 0x7c) {
- w =
cp932ext2_ucs_table[s-(0x79-0x21)*94];
- }
- else {
- w = jisx0208_ucs_table[s];
- }
- }
- }
} else {
- if ((filter->from)->no_encoding !=
- mbfl_no_encoding_2022jpms) {
- w = 0;
- } else {
- if (c1 >= 0x79 && c1 <= 0x7c) {
- w =
cp932ext2_ucs_table[s-(0x79-0x21)*94];
- } else {
w = 0;
- }
- }
}
if (w <= 0) {
w = (c1 << 8) | c;
@@ -344,7 +287,7 @@
int
mbfl_filt_conv_wchar_jis(int c, mbfl_convert_filter *filter)
{
- int c1, c2, s;
+ int c1, s;
s = 0;
if (c >= ucs_a1_jis_table_min && c < ucs_a1_jis_table_max) {
@@ -356,18 +299,6 @@
} else if (c >= ucs_r_jis_table_min && c < ucs_r_jis_table_max) {
s = ucs_r_jis_table[c - ucs_r_jis_table_min];
}
- if (s > 0x8080 && s < 0x10000 &&
- ((filter->to)->no_encoding == mbfl_no_encoding_2022jpms)) {
- c1 = 0;
- c2 = cp932ext2_ucs_table_max - cp932ext2_ucs_table_min;
- while (c1 < c2) { /* CP932 vendor ext3 (115ku - 119ku) */
- if (c == cp932ext2_ucs_table[c1]) {
- s = ((c1/94 + 0x79) << 8) +(c1%94 + 0x21);
- break;
- }
- c1++;
- }
- }
if (s <= 0) {
c1 = c & ~MBFL_WCSPLANE_MASK;
if (c1 == MBFL_WCSPLANE_JIS0208) {
@@ -396,30 +327,8 @@
}
if (c == 0) {
s = 0;
- } else if (s <= 0 && ((filter->to)->no_encoding ==
- mbfl_no_encoding_2022jpms)) {
+ } else if (s <= 0) {
s = -1;
- c1 = 0;
- c2 = cp932ext1_ucs_table_max - cp932ext1_ucs_table_min;
- while (c1 < c2) { /* CP932 vendor ext1
(13ku) */
- if (c == cp932ext1_ucs_table[c1]) {
- s = ((c1/94 + 0x2d) << 8) + (c1%94 +
0x21);
- break;
- }
- c1++;
- }
- if (s < 0 && ((filter->to)->no_encoding ==
- mbfl_no_encoding_2022jpms)) {
- c1 = 0;
- c2 = cp932ext2_ucs_table_max -
cp932ext2_ucs_table_min;
- while (c1 < c2) { /* CP932 vendor
ext3 (115ku - 119ku) */
- if (c == cp932ext2_ucs_table[c1]) {
- s = ((c1/94 + 0x79) << 8) +(c1%94 +
0x21);
- break;
- }
- c1++;
- }
- }
}
}
if (s >= 0) {
@@ -483,7 +392,7 @@
int
mbfl_filt_conv_wchar_2022jp(int c, mbfl_convert_filter *filter)
{
- int c1, c2, s;
+ int s;
s = 0;
if (c >= ucs_a1_jis_table_min && c < ucs_a1_jis_table_max) {
@@ -519,47 +428,9 @@
s = 0;
} else if (s <= 0) {
s = -1;
- if ( (filter->to)->no_encoding ==
- mbfl_no_encoding_2022jpms) {
- c1 = 0;
- c2 = cp932ext1_ucs_table_max -
cp932ext1_ucs_table_min;
- while (c1 < c2) { /* CP932 vendor ext1
(13ku) */
- if (c == cp932ext1_ucs_table[c1]) {
- s = ((c1/94 + 0x2d) << 8) + (c1%94 + 0x21);
- break;
- }
- c1++;
- }
- if ((filter->to)->no_encoding ==
- mbfl_no_encoding_2022jpms) {
- c1 = 0;
- c2 = cp932ext2_ucs_table_max -
cp932ext2_ucs_table_min;
- while (c1 < c2) { /* CP932 vendor ext3
(115ku - 119ku) */
- if (c == cp932ext2_ucs_table[c1]) {
- s = ((c1/94 + 0x79) << 8) +(c1%94 + 0x21);
- break;
- }
- c1++;
- }
- }
- }
}
- } else if (((s >= 0x80 && s < 0x2121) &&
- (filter->to)->no_encoding != mbfl_no_encoding_2022jpms) ||
- (s > 0x8080)) {
+ } else if ((s >= 0x80 && s < 0x2121) || (s > 0x8080)) {
s = -1;
- if ((filter->to)->no_encoding ==
- mbfl_no_encoding_2022jpms) {
- c1 = 0;
- c2 = cp932ext2_ucs_table_max - cp932ext2_ucs_table_min;
- while (c1 < c2) { /* CP932 vendor ext3 (115ku - 119ku) */
- if (c == cp932ext2_ucs_table[c1]) {
- s = ((c1/94 + 0x79) << 8) +(c1%94 + 0x21);
- break;
- }
- c1++;
- }
- }
}
if (s >= 0) {
if (s < 0x80) { /* ASCII */
@@ -570,15 +441,6 @@
}
filter->status = 0;
CK((*filter->output_function)(s, filter->data));
- } else if (s < 0x100 && ((filter->to)->no_encoding ==
- mbfl_no_encoding_2022jpms)) { /* kana */
- if ((filter->status & 0xff00) != 0x100) {
- CK((*filter->output_function)(0x1b,
filter->data)); /* ESC */
- CK((*filter->output_function)(0x28,
filter->data)); /* '(' */
- CK((*filter->output_function)(0x49,
filter->data)); /* 'I' */
- }
- filter->status = 0x100;
- CK((*filter->output_function)(s & 0x7f, filter->data));
} else if (s < 0x10000) { /* X 0208 */
if ((filter->status & 0xff00) != 0x200) {
CK((*filter->output_function)(0x1b,
filter->data)); /* ESC */
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.h?r1=1.1.8.1&r2=1.1.8.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.h
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.h:1.1.8.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.h:1.1.8.2
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.h:1.1.8.1 Fri Nov 3
01:11:35 2006
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_jis.h Mon Jan 29 22:53:47 2007
@@ -34,16 +34,12 @@
extern const mbfl_encoding mbfl_encoding_jis;
extern const mbfl_encoding mbfl_encoding_2022jp;
-extern const mbfl_encoding mbfl_encoding_2022jpms;
extern const struct mbfl_identify_vtbl vtbl_identify_2022jp;
-extern const struct mbfl_identify_vtbl vtbl_identify_2022jpms;
extern const struct mbfl_identify_vtbl vtbl_identify_jis;
extern const struct mbfl_convert_vtbl vtbl_jis_wchar;
extern const struct mbfl_convert_vtbl vtbl_wchar_jis;
extern const struct mbfl_convert_vtbl vtbl_2022jp_wchar;
extern const struct mbfl_convert_vtbl vtbl_wchar_2022jp;
-extern const struct mbfl_convert_vtbl vtbl_2022jpms_wchar;
-extern const struct mbfl_convert_vtbl vtbl_wchar_2022jpms;
int mbfl_filt_conv_jis_wchar(int c, mbfl_convert_filter *filter);
int mbfl_filt_conv_wchar_jis(int c, mbfl_convert_filter *filter);
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/unicode_table_jis.h?r1=1.1.8.1&r2=1.1.8.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/unicode_table_jis.h
diff -u php-src/ext/mbstring/libmbfl/filters/unicode_table_jis.h:1.1.8.1
php-src/ext/mbstring/libmbfl/filters/unicode_table_jis.h:1.1.8.2
--- php-src/ext/mbstring/libmbfl/filters/unicode_table_jis.h:1.1.8.1 Fri Nov
3 01:11:35 2006
+++ php-src/ext/mbstring/libmbfl/filters/unicode_table_jis.h Mon Jan 29
22:53:47 2007
@@ -36,13 +36,13 @@
0xFF1F,0xFF01,0x309B,0x309C,0x00B4,0xFF40,0x00A8,0xFF3E,
0xFFE3,0xFF3F,0x30FD,0x30FE,0x309D,0x309E,0x3003,0x4EDD,
0x3005,0x3006,0x3007,0x30FC,0x2015,0x2010,0xFF0F,0xFF3C,
- 0xFF5E,0x2225,0xFF5C,0x2026,0x2025,0x2018,0x2019,0x201C,
+ 0x301C,0x2016,0xFF5C,0x2026,0x2025,0x2018,0x2019,0x201C,
0x201D,0xFF08,0xFF09,0x3014,0x3015,0xFF3B,0xFF3D,0xFF5B,
0xFF5D,0x3008,0x3009,0x300A,0x300B,0x300C,0x300D,0x300E,
- 0x300F,0x3010,0x3011,0xFF0B,0xFF0D,0x00B1,0x00D7,0x00F7,
+ 0x300F,0x3010,0x3011,0xFF0B,0x2212,0x00B1,0x00D7,0x00F7,
0xFF1D,0x2260,0xFF1C,0xFF1E,0x2266,0x2267,0x221E,0x2234,
0x2642,0x2640,0x00B0,0x2032,0x2033,0x2103,0xFFE5,0xFF04,
- 0xFFE0,0xFFE1,0xFF05,0xFF03,0xFF06,0xFF0A,0xFF20,0x00A7,
+ 0x00A2,0x00A3,0xFF05,0xFF03,0xFF06,0xFF0A,0xFF20,0x00A7,
0x2606,0x2605,0x25CB,0x25CF,0x25CE,0x25C7,
/* ku 2 */
@@ -51,7 +51,7 @@
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x2208,0x220B,0x2286,0x2287,0x2282,0x2283,0x222A,
0x2229,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x2227,0x2228,0xFFE2,0x21D2,0x21D4,0x2200,0x2203,
+ 0x0000,0x2227,0x2228,0x00AC,0x21D2,0x21D4,0x2200,0x2203,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x2220,0x22A5,0x2312,0x2202,0x2207,
0x2261,0x2252,0x226A,0x226B,0x221A,0x223D,0x221D,0x2235,
@@ -1217,9 +1217,9 @@
/* ku 2 */
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x02D8,0x02C7,
- 0x00B8,0x02D9,0x02DD,0x00AF,0x02DB,0x02DA,0xFF5E,0x0384,
+ 0x00B8,0x02D9,0x02DD,0x00AF,0x02DB,0x02DA,0x007E,0x0384,
0x0385,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x00A1,0xFFE4,0x00BF,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x00A1,0x00A6,0x00BF,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
@@ -2471,7 +2471,7 @@
/* 2100h */
0x0000,0x0000,0x0000,0x216E,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x2d62,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xA2F1,0x0000,
0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0xA2EF,0x0000,0x0000,0x0000,0x0000,0x0000,
0x0000,0x0000,0x0000,0x2272,0x0000,0x0000,0x0000,0x0000,
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c?r1=1.5.2.1.2.1&r2=1.5.2.1.2.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c:1.5.2.1.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c:1.5.2.1.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c:1.5.2.1.2.1 Fri Nov
3 01:11:35 2006
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.c Mon Jan 29 22:53:47 2007
@@ -53,6 +53,7 @@
#include "filters/mbfilter_sjis.h"
#include "filters/mbfilter_cp51932.h"
#include "filters/mbfilter_jis.h"
+#include "filters/mbfilter_iso2022_jp_ms.h"
#include "filters/mbfilter_euc_jp.h"
#include "filters/mbfilter_euc_jp_win.h"
#include "filters/mbfilter_ascii.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c?r1=1.8.4.1&r2=1.8.4.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.8.4.1
php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.8.4.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c:1.8.4.1 Fri Nov 3
01:11:35 2006
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c Mon Jan 29 22:53:47 2007
@@ -59,6 +59,7 @@
#include "filters/mbfilter_sjis.h"
#include "filters/mbfilter_cp51932.h"
#include "filters/mbfilter_jis.h"
+#include "filters/mbfilter_iso2022_jp_ms.h"
#include "filters/mbfilter_euc_jp.h"
#include "filters/mbfilter_euc_jp_win.h"
#include "filters/mbfilter_ascii.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c?r1=1.3.4.1&r2=1.3.4.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c:1.3.4.1
php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c:1.3.4.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c:1.3.4.1 Fri Nov 3
01:11:35 2006
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_ident.c Mon Jan 29 22:53:47 2007
@@ -51,6 +51,7 @@
#include "filters/mbfilter_iso2022_kr.h"
#include "filters/mbfilter_sjis.h"
#include "filters/mbfilter_jis.h"
+#include "filters/mbfilter_iso2022_jp_ms.h"
#include "filters/mbfilter_euc_jp.h"
#include "filters/mbfilter_euc_jp_win.h"
#include "filters/mbfilter_ascii.h"
@@ -60,6 +61,7 @@
#include "filters/mbfilter_cp936.h"
#include "filters/mbfilter_cp1251.h"
#include "filters/mbfilter_cp1252.h"
+#include "filters/mbfilter_cp51932.h"
#include "filters/mbfilter_iso8859_1.h"
#include "filters/mbfilter_iso8859_2.h"
#include "filters/mbfilter_iso8859_3.h"
@@ -107,6 +109,7 @@
&vtbl_identify_jis,
&vtbl_identify_2022jp,
&vtbl_identify_2022jpms,
+ &vtbl_identify_cp51932,
&vtbl_identify_euccn,
&vtbl_identify_cp936,
&vtbl_identify_hz,
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c?view=markup&rev=1.1
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.h?view=markup&rev=1.1
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.h
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
