For review: These two commits fix the two bugs the easiest way:
>From f7682533fa6de77d8bd6fa6480a0f5188e0e56d7 Mon Sep 17 00:00:00 2001 From: James Cloos <[email protected]> Date: Tue, 24 Apr 2012 15:55:35 -0400 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20ISO-8859-6=20=E2=86=92=20ISO-10646=20ma?= =?UTF-8?q?pping.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ISO-8859-6 code point 0xC0 is unassigned. ISO-10646 code point U+0620, to which 0xC0 was mapping, has since been assigned an unrelated character. Reported by Norm Pierce. Signed-off-by: James Cloos <[email protected]> --- src/fontenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fontenc.c b/src/fontenc.c index fb56ff1..bb8ff12 100644 --- a/src/fontenc.c +++ b/src/fontenc.c @@ -250,7 +250,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; -- 1.7.10
>From 7de846ed190b2564b0642de79918dd3804083b4e Mon Sep 17 00:00:00 2001 From: James Cloos <[email protected]> Date: Tue, 24 Apr 2012 16:01:11 -0400 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20ISO-8859-7=20=E2=86=92=20ISO-10646=20ma?= =?UTF-8?q?pping.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ISO-8859-7 code point 0xD2 is unassigned. ISO-10646 code point U+03A2, to which 0xD2 was mapping, also is unassigned. Reported by Norm Pierce. Signed-off-by: James Cloos <[email protected]> --- src/fontenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/fontenc.c b/src/fontenc.c index bb8ff12..4cfa1e5 100644 --- a/src/fontenc.c +++ b/src/fontenc.c @@ -279,6 +279,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 -- 1.7.10
-JimC -- James Cloos <[email protected]> OpenPGP: 1024D/ED7DAEA6
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
