From 8502e2567e9550b0800ee83d36ef2f248800ebc1 Mon Sep 17 00:00:00 2001
From: James Cloos <cloos@jhcloos.com>
Date: Wed, 20 Aug 2008 15:28:07 -0400
Subject: [PATCH] nls (en_US) Re-remove long compositions that override shorter
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
As reported in <https://bugs.freedesktop.org/show_bug.cgi?id=17228>:
Commit a6f4bbf7
nls (en_US): remove long compositions that override shorter [...]
removed some longer compose sequences because there are shorter
ones which take preference over the longer. For example the
sequences:
<Multi_key> <apostrophe> <comma> <c> : U1E09 # ḉ
<Multi_key> <apostrophe> <comma> <C> : U1E08 # Ḉ
were removed becase there already was:
<Multi_key> <apostrophe> <comma> : U201A # ‚
Then commit 4ba09125
Work on making the en_US and pt_BR UTF-8 Compose as similar as
possible added exactly the same key sequences again. Obviusly
they won't work.
(cherry picked from commit a788792e9de95f8db0639557859722a35087481d)
---
nls/en_US.UTF-8/Compose.pre | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 12806fb..b7df9b6 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -1734,7 +1734,6 @@ XCOMM Part 3
<Multi_key> <acute> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <apostrophe> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <apostrophe> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<combining_acute> <Ccedilla> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<combining_acute> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
@@ -1750,7 +1749,6 @@ XCOMM Part 3
<Multi_key> <acute> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <apostrophe> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <apostrophe> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<combining_acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<combining_acute> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
--
1.6.0.6