From 2b88189863579eb377bca617465bb76b05fbdebd Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sun, 5 Jun 2011 03:03:47 +0200 Subject: xkb: Fix case checks for Latin 1. That one was missing _XkbKSLower: XK_ssharp: U+00DF LATIN SMALL LETTER SHARP S That one was getting _XkbKSLower for no reasons: XK_division: U+00F7 DIVISION SIGN For reference, XK_multiply was already excluded from the _XkbKSUpper check, it's no big surprise XK_division has to be excluded from the _XkbKSLower check. Reviewed-by: Daniel Stone Signed-off-by: Cyril Brulebois --- xkb/xkbfmisc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index 1ac9d8262..c36cc7bec 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -62,7 +62,7 @@ unsigned set,rtrn; rtrn|= _XkbKSUpper; } if (((ks>=XK_a)&&(ks<=XK_z))|| - ((ks>=XK_agrave)&&(ks<=XK_ydiaeresis))) { + ((ks>=XK_ssharp)&&(ks<=XK_ydiaeresis)&&(ks!=XK_division))) { rtrn|= _XkbKSLower; } break; -- cgit v1.2.3 From 9eb6e34c2dd09af714400ce6a1063477d7a64776 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sun, 5 Jun 2011 03:12:44 +0200 Subject: xkb: Fix case checks for Latin 2. Those ones were getting _XkbKSLower for no reasons: XK_ogonek: U+02DB OGONEK XK_doubleacute: U+02DD DOUBLE ACUTE ACCENT Reviewed-by: Daniel Stone Signed-off-by: Cyril Brulebois --- xkb/xkbfmisc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index c36cc7bec..e0426718f 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -71,7 +71,7 @@ unsigned set,rtrn; ((ks>=XK_Racute)&&(ks<=XK_Tcedilla))) { rtrn|= _XkbKSUpper; } - if (((ks>=XK_aogonek)&&(ks<=XK_zabovedot)&&(ks!=XK_caron))|| + if (((ks>=XK_aogonek)&&(ks<=XK_zabovedot)&&(ks!=XK_ogonek)&&(ks!=XK_caron)&&(ks!=XK_doubleacute))|| ((ks>=XK_racute)&&(ks<=XK_tcedilla))) { rtrn|= _XkbKSLower; } -- cgit v1.2.3 From ab0df72cd33f011cc48736cfbfce9bbe9c359a80 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sun, 5 Jun 2011 03:21:18 +0200 Subject: xkb: Fix case checks for Latin 4. That one was missing _XkbKSLower: XK_kra: U+0138 LATIN SMALL LETTER KRA Reviewed-by: Daniel Stone Signed-off-by: Cyril Brulebois --- xkb/xkbfmisc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index e0426718f..d8202b496 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -92,7 +92,8 @@ unsigned set,rtrn; ((ks>=XK_Amacron)&&(ks<=XK_Umacron))) { rtrn|= _XkbKSUpper; } - if (((ks>=XK_rcedilla)&&(ks<=XK_tslash))|| + if ((ks==XK_kra)|| + ((ks>=XK_rcedilla)&&(ks<=XK_tslash))|| (ks==XK_eng)|| ((ks>=XK_amacron)&&(ks<=XK_umacron))) { rtrn|= _XkbKSLower; -- cgit v1.2.3