Moriyoshi Koizumi
moriy****@sourc*****
2004年 7月 5日 (月) 03:11:15 JST
moriyoshi 04/07/05 03:11:15
Modified: mbfl Tag: LIBMBFL_1_0 mbfilter.c
Log:
- MFH(r-1.29): Changed mbfl_strimwidth() to honour Unicode property also.
Revision Changes Path
No revision
No revision
1.8.2.11 +2 -7 libmbfl/mbfl/mbfilter.c
Index: mbfilter.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfilter.c,v
retrieving revision 1.8.2.10
retrieving revision 1.8.2.11
diff -u -r1.8.2.10 -r1.8.2.11
--- mbfilter.c 29 Jun 2004 12:13:37 -0000 1.8.2.10
+++ mbfilter.c 4 Jul 2004 18:11:15 -0000 1.8.2.11
@@ -1433,13 +1433,8 @@
break;
default:
if (pc->outchar >= pc->from) {
- if (c >= 0x20) {
- if (c < 0x2000 || (c > 0xff60 && c < 0xffa0)) {
- pc->outwidth++;
- } else {
- pc->outwidth += 2;
- }
- }
+ pc->outwidth += (is_fullwidth(c) ? 2: 1);
+
if (pc->outwidth > pc->width) {
if (pc->status == 0) {
pc->endpos = pc->device.pos;