summaryrefslogtreecommitdiff
path: root/nls/en_US.UTF-8
diff options
context:
space:
mode:
authorJames Cloos <cloos@jhcloos.com>2012-03-14 17:25:46 -0400
committerJames Cloos <cloos@jhcloos.com>2012-03-14 17:25:46 -0400
commit62d42953893f93a98db0504eaf06d650ceaf5811 (patch)
treebad00e7df7faf77367dfd9a55871f27e1f2640e9 /nls/en_US.UTF-8
parent91bcce48d94792f78333d2aea73961cc2e739d2e (diff)
downloadxorg-lib-libX11-62d42953893f93a98db0504eaf06d650ceaf5811.tar.gz
Fix the gtk+ additions
(Some of) the Dstroke and dstroke entries already were present as U011[01], even though XK_Dstroke and XK_dstroke are part of the latin2 set in keysymdef.h. The addition of <Multi_key> <o> <apostrophe> as a postfix version of <Multi_key> <apostrophe> <o> blocks the existing entries for ǻ and Ǻ. That prevents its and <Multi_key> <O> <apostrophe>’s addition. Signed-off-by: James Cloos <cloos@jhcloos.com>
Diffstat (limited to 'nls/en_US.UTF-8')
-rw-r--r--nls/en_US.UTF-8/Compose.pre8
1 files changed, 0 insertions, 8 deletions
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 1f72ae29..2eae9123 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -647,7 +647,6 @@ XCOMM Part 3
<Multi_key> <acute> <O> : "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
<Multi_key> <O> <acute> : "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
<Multi_key> <apostrophe> <O> : "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
-<Multi_key> <O> <apostrophe> : "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
<dead_circumflex> <O> : "Ô" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
<Multi_key> <asciicircum> <O> : "Ô" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
<Multi_key> <O> <asciicircum> : "Ô" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
@@ -773,7 +772,6 @@ XCOMM Part 3
<Multi_key> <acute> <o> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
<Multi_key> <o> <acute> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
<Multi_key> <apostrophe> <o> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
-<Multi_key> <o> <apostrophe> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
<dead_circumflex> <o> : "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX
<Multi_key> <asciicircum> <o> : "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX
<Multi_key> <o> <asciicircum> : "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX
@@ -878,12 +876,6 @@ XCOMM Part 3
<Multi_key> <D> <less> : "Ď" U010E # LATIN CAPITAL LETTER D WITH CARON
<dead_caron> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
<Multi_key> <c> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
-<dead_stroke> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
-<Multi_key> <slash> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
-<Multi_key> <KP_Divide> <D> : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
-<dead_stroke> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
-<Multi_key> <slash> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
-<Multi_key> <KP_Divide> <d> : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
<Multi_key> <less> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
<Multi_key> <d> <less> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
<dead_stroke> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE