diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
| commit | 0f0386d4e90cb0769eddc04b18742d5a9a72ea05 (patch) | |
| tree | a8a5fb11e78c4afe6637c5adfa0d2224208f7314 /libfontenc | |
| parent | cd27f58626705bcb561115b8e5b0d1430df83fa6 (diff) | |
| parent | 762b7fde3d57d3a151f98535fd31516b7e823bc0 (diff) | |
| download | vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.gz vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.bz2 vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
xorg-server/glx/glapi_gentable.c
Diffstat (limited to 'libfontenc')
| -rw-r--r-- | libfontenc/src/fontenc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libfontenc/src/fontenc.c b/libfontenc/src/fontenc.c index bcfa3ac23..7d0ddc589 100644 --- a/libfontenc/src/fontenc.c +++ b/libfontenc/src/fontenc.c @@ -251,7 +251,8 @@ iso8859_6_to_unicode(unsigned isocode, void *client_data) if(isocode<=0xA0 || isocode==0xA4 || isocode==0xAD) return isocode; else if(isocode==0xAC || isocode==0xBB || - (isocode>=0xBF && isocode<=0xDA) || + isocode==0xBF || + (isocode>=0xC1 && isocode<=0xDA) || (isocode>=0xE0 && isocode<=0xEF) || (isocode>=0xF0 && isocode<=0xF2)) return isocode-0xA0+0x0600; @@ -279,6 +280,8 @@ iso8859_7_to_unicode(unsigned isocode, void *client_data) return 0x02BC; else if(isocode==0xAF) return 0x2015; + else if(isocode==0xD2) /* unassigned */ + return 0; else if(isocode>=0xB4) return isocode-0xA0+0x0370; else |