libx11: Changes to 'debian-unstable'
.gitignore | 18 +++++++++++++
configure.ac | 2 -
debian/changelog | 8 ++++--
nls/am_ET.UTF-8/Compose.pre | 19 ++++++++++++++
nls/el_GR.UTF-8/Compose.pre | 14 ++++++++++
nls/en_US.UTF-8/Compose.pre | 58 ++++++++++++++++++++++++++++++++++++++++++++
nls/iso8859-1/Compose.pre | 4 +++
nls/iso8859-13/Compose.pre | 20 +++++++++++++++
nls/iso8859-14/Compose.pre | 4 +++
nls/iso8859-15/Compose.pre | 4 +++
nls/iso8859-3/Compose.pre | 4 +++
nls/iso8859-4/Compose.pre | 20 +++++++++++++++
nls/iso8859-9/Compose.pre | 4 +++
nls/iso8859-9e/Compose.pre | 4 +++
nls/pt_BR.UTF-8/Compose.pre | 55 +++++++++++++++++++++++++++++++++++++++++
15 files changed, 235 insertions(+), 3 deletions(-)
New commits:
commit b2e604da80e7c208806a012db0857b534d88ec90
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Sep 12 15:50:02 2008 +0300
Update the changelog, new upstream release 1.1.5.
diff --git a/debian/changelog b/debian/changelog
index cbae9e3..9560dae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-libx11 (2:1.1.4-3) UNRELEASED; urgency=low
+libx11 (2:1.1.5-1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Add upstream URL to debian/copyright.
* Add a link to www.X.org and a reference to the upstream module
in the long description.
- -- Brice Goglin <bgoglin@debian.org> Fri, 13 Jun 2008 11:14:46 +0200
+ [ Timo Aaltonen ]
+ * New upstream release.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Fri, 12 Sep 2008 15:49:40 +0300
libx11 (2:1.1.4-2) unstable; urgency=low
commit 5b7f3b98079ab730b037b33893521dbaa61f5234
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 5 00:39:01 2008 +0300
Update to 1.1.5
Small bugfix and i18n-improvement release.
diff --git a/configure.ac b/configure.ac
index 3719f02..15d6614 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libX11],
- 1.1.4,
+ 1.1.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
commit 8c1dfc976a29f981f601503b9768d3414a70ba50
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Jul 17 21:01:42 2008 -0400
Add more <Multi_key> <cedilla> Compose tuples
The last commit missed the el_GR UTF-8 Compose.pre as well as
the various ISO 8859 locales which have compose sequences
generating ‘WITH CEDILLA’ characters.
(Interestingly, some of the 8859 locales already supported
<Multi_key> <cedilla> for some CEDILLA characters, but not
for Ç or ç.)
This is further work on bug 10397.
(cherry picked from commit 55248e5c84c3fd8c349a3bb4cb15a1ec86989d74)
diff --git a/nls/el_GR.UTF-8/Compose.pre b/nls/el_GR.UTF-8/Compose.pre
index 5a04aed..870f1d5 100644
--- a/nls/el_GR.UTF-8/Compose.pre
+++ b/nls/el_GR.UTF-8/Compose.pre
@@ -249,9 +249,13 @@ XCOMM Accented Alphabet
<Multi_key> <acute> <C> : "Ç" Ccedilla
<Multi_key> <acute> <c> : "ç" ccedilla
<Multi_key> <C> <comma> : "Ç" Ccedilla
+<Multi_key> <C> <cedilla> : "Ç" Ccedilla
<Multi_key> <comma> <C> : "Ç" Ccedilla
+<Multi_key> <cedilla> <C> : "Ç" Ccedilla
<Multi_key> <c> <comma> : "ç" ccedilla
+<Multi_key> <c> <cedilla> : "ç" ccedilla
<Multi_key> <comma> <c> : "ç" ccedilla
+<Multi_key> <cedilla> <c> : "ç" ccedilla
<Multi_key> <minus> <D> : "Ð" ETH
<Multi_key> <D> <minus> : "Ð" ETH
<Multi_key> <minus> <d> : "ð" eth
diff --git a/nls/iso8859-1/Compose.pre b/nls/iso8859-1/Compose.pre
index ced68ad..cbdf9cc 100644
--- a/nls/iso8859-1/Compose.pre
+++ b/nls/iso8859-1/Compose.pre
@@ -224,9 +224,13 @@ XCOMM Accented Alphabet
<Multi_key> <acute> <C> : "\307" Ccedilla
<Multi_key> <acute> <c> : "\347" ccedilla
<Multi_key> <C> <comma> : "\307" Ccedilla
+<Multi_key> <C> <cedilla> : "\307" Ccedilla
<Multi_key> <comma> <C> : "\307" Ccedilla
+<Multi_key> <cedilla> <C> : "\307" Ccedilla
<Multi_key> <c> <comma> : "\347" ccedilla
+<Multi_key> <c> <cedilla> : "\347" ccedilla
<Multi_key> <comma> <c> : "\347" ccedilla
+<Multi_key> <cedilla> <c> : "\347" ccedilla
<Multi_key> <minus> <D> : "\320" ETH
<Multi_key> <D> <minus> : "\320" ETH
<Multi_key> <minus> <d> : "\360" eth
diff --git a/nls/iso8859-13/Compose.pre b/nls/iso8859-13/Compose.pre
index 9dba6e4..66b0a10 100644
--- a/nls/iso8859-13/Compose.pre
+++ b/nls/iso8859-13/Compose.pre
@@ -160,9 +160,13 @@ XCOMM Accented Alphabet
<Multi_key> <A> <comma> : "\300" Aogonek
<Multi_key> <comma> <A> : "\300" Aogonek
<Multi_key> <R> <comma> : "\252" Rcedilla
+<Multi_key> <R> <cedilla> : "\252" Rcedilla
<Multi_key> <comma> <R> : "\252" Rcedilla
+<Multi_key> <cedilla> <R> : "\252" Rcedilla
<Multi_key> <L> <comma> : "\317" Lcedilla
+<Multi_key> <L> <cedilla> : "\317" Lcedilla
<Multi_key> <comma> <L> : "\317" Lcedilla
+<Multi_key> <cedilla> <L> : "\317" Lcedilla
<Multi_key> <S> <less> : "\320" Scaron
<Multi_key> <less> <S> : "\320" Scaron
<Multi_key> <E> <minus> : "\307" Emacron
@@ -170,7 +174,9 @@ XCOMM Accented Alphabet
<Multi_key> <E> <underscore> : "\307" Emacron
<Multi_key> <underscore> <E> : "\307" Emacron
<Multi_key> <G> <comma> : "\314" Gcedilla
+<Multi_key> <G> <cedilla> : "\314" Gcedilla
<Multi_key> <comma> <G> : "\314" Gcedilla
+<Multi_key> <cedilla> <G> : "\314" Gcedilla
<Multi_key> <Z> <less> : "\336" Zcaron
<Multi_key> <less> <Z> : "\336" Zcaron
<Multi_key> <a> <semicolon> : "\340" aogonek
@@ -178,9 +184,13 @@ XCOMM Accented Alphabet
<Multi_key> <a> <comma> : "\340" aogonek
<Multi_key> <comma> <a> : "\340" aogonek
<Multi_key> <r> <comma> : "\272" rcedilla
+<Multi_key> <r> <cedilla> : "\272" rcedilla
<Multi_key> <comma> <r> : "\272" rcedilla
+<Multi_key> <cedilla> <r> : "\272" rcedilla
<Multi_key> <l> <comma> : "\357" lcedilla
+<Multi_key> <l> <cedilla> : "\357" lcedilla
<Multi_key> <comma> <l> : "\357" lcedilla
+<Multi_key> <cedilla> <l> : "\357" lcedilla
<Multi_key> <s> <less> : "\360" scaron
<Multi_key> <less> <s> : "\360" scaron
<Multi_key> <e> <minus> : "\347" emacron
@@ -188,7 +198,9 @@ XCOMM Accented Alphabet
<Multi_key> <e> <underscore> : "\347" emacron
<Multi_key> <underscore> <e> : "\347" emacron
<Multi_key> <g> <comma> : "\354" gcedilla
+<Multi_key> <g> <cedilla> : "\354" gcedilla
<Multi_key> <comma> <g> : "\354" gcedilla
+<Multi_key> <cedilla> <g> : "\354" gcedilla
<Multi_key> <z> <less> : "\376" zcaron
<Multi_key> <less> <z> : "\376" zcaron
<Multi_key> <A> <underscore> : "\302" Amacron
@@ -223,13 +235,17 @@ XCOMM Accented Alphabet
<Multi_key> <I> <underscore> : "\316" Imacron
<Multi_key> <underscore> <I> : "\316" Imacron
<Multi_key> <N> <comma> : "\322" Ncedilla
+<Multi_key> <N> <cedilla> : "\322" Ncedilla
<Multi_key> <comma> <N> : "\322" Ncedilla
+<Multi_key> <cedilla> <N> : "\322" Ncedilla
<Multi_key> <O> <underscore> : "\324" Omacron
<Multi_key> <underscore> <O> : "\324" Omacron
<Multi_key> <O> <minus> : "\324" Omacron
<Multi_key> <minus> <O> : "\324" Omacron
<Multi_key> <K> <comma> : "\315" Kcedilla
+<Multi_key> <K> <cedilla> : "\315" Kcedilla
<Multi_key> <comma> <K> : "\315" Kcedilla
+<Multi_key> <cedilla> <K> : "\315" Kcedilla
<Multi_key> <O> <asciitilde> : "\325" Otilde
<Multi_key> <asciitilde> <O> : "\325" Otilde
<Multi_key> <O> <quotedbl> : "\326" Odiaeresis
@@ -279,13 +295,17 @@ XCOMM Accented Alphabet
<Multi_key> <i> <underscore> : "\356" imacron
<Multi_key> <underscore> <i> : "\356" imacron
<Multi_key> <n> <comma> : "\362" ncedilla
+<Multi_key> <n> <cedilla> : "\362" ncedilla
<Multi_key> <comma> <n> : "\362" ncedilla
+<Multi_key> <cedilla> <n> : "\362" ncedilla
<Multi_key> <o> <underscore> : "\364" omacron
<Multi_key> <underscore> <o> : "\364" omacron
<Multi_key> <o> <minus> : "\364" omacron
<Multi_key> <minus> <o> : "\364" omacron
<Multi_key> <k> <comma> : "\355" kcedilla
+<Multi_key> <k> <cedilla> : "\355" kcedilla
<Multi_key> <comma> <k> : "\355" kcedilla
+<Multi_key> <cedilla> <k> : "\355" kcedilla
<Multi_key> <o> <asciitilde> : "\365" otilde
<Multi_key> <asciitilde> <o> : "\365" otilde
<Multi_key> <o> <quotedbl> : "\366" odiaeresis
diff --git a/nls/iso8859-14/Compose.pre b/nls/iso8859-14/Compose.pre
index 8acf9ca..ef13922 100644
--- a/nls/iso8859-14/Compose.pre
+++ b/nls/iso8859-14/Compose.pre
@@ -130,9 +130,13 @@ XCOMM Accented Alphabet
<Multi_key> <asterisk> <a> : "\345" aring
<Multi_key> <a> <e> : "\346" ae
<Multi_key> <C> <comma> : "\307" Ccedilla
+<Multi_key> <C> <cedilla> : "\307" Ccedilla
<Multi_key> <comma> <C> : "\307" Ccedilla
+<Multi_key> <cedilla> <C> : "\307" Ccedilla
<Multi_key> <c> <comma> : "\347" ccedilla
+<Multi_key> <c> <cedilla> : "\347" ccedilla
<Multi_key> <comma> <c> : "\347" ccedilla
+<Multi_key> <cedilla> <c> : "\347" ccedilla
<Multi_key> <E> <grave> : "\310" Egrave
<Multi_key> <grave> <E> : "\310" Egrave
<Multi_key> <E> <acute> : "\311" Eacute
diff --git a/nls/iso8859-15/Compose.pre b/nls/iso8859-15/Compose.pre
index d9264cd..9f80d88 100644
--- a/nls/iso8859-15/Compose.pre
+++ b/nls/iso8859-15/Compose.pre
@@ -210,9 +210,13 @@ XCOMM Accented Alphabet
<Multi_key> <acute> <C> : "\307" Ccedilla
<Multi_key> <acute> <c> : "\347" ccedilla
<Multi_key> <C> <comma> : "\307" Ccedilla
+<Multi_key> <C> <cedilla> : "\307" Ccedilla
<Multi_key> <comma> <C> : "\307" Ccedilla
+<Multi_key> <cedilla> <C> : "\307" Ccedilla
<Multi_key> <c> <comma> : "\347" ccedilla
+<Multi_key> <c> <cedilla> : "\347" ccedilla
<Multi_key> <comma> <c> : "\347" ccedilla
+<Multi_key> <cedilla> <c> : "\347" ccedilla
<Multi_key> <minus> <D> : "\320" ETH
<Multi_key> <D> <minus> : "\320" ETH
<Multi_key> <minus> <d> : "\360" eth
diff --git a/nls/iso8859-3/Compose.pre b/nls/iso8859-3/Compose.pre
index fe52a59..ec3b32b 100644
--- a/nls/iso8859-3/Compose.pre
+++ b/nls/iso8859-3/Compose.pre
@@ -151,7 +151,9 @@ XCOMM Accented Alphabet
<Multi_key> <C> <greater> : "\306" Ccircumflex
<Multi_key> <greater> <C> : "\306" Ccircumflex
<Multi_key> <C> <comma> : "\307" Ccedilla
+<Multi_key> <C> <cedilla> : "\307" Ccedilla
<Multi_key> <comma> <C> : "\307" Ccedilla
+<Multi_key> <cedilla> <C> : "\307" Ccedilla
<Multi_key> <c> <period> : "\345" cabovedot
<Multi_key> <period> <c> : "\345" cabovedot
<Multi_key> <c> <asciicircum> : "\346" ccircumflex
@@ -159,7 +161,9 @@ XCOMM Accented Alphabet
<Multi_key> <c> <greater> : "\346" ccircumflex
<Multi_key> <greater> <c> : "\346" ccircumflex
<Multi_key> <c> <comma> : "\347" ccedilla
+<Multi_key> <c> <cedilla> : "\347" ccedilla
<Multi_key> <comma> <c> : "\347" ccedilla
+<Multi_key> <cedilla> <c> : "\347" ccedilla
<Multi_key> <minus> <D> : "\320" ETH
<Multi_key> <D> <minus> : "\320" ETH
<Multi_key> <minus> <d> : "\360" eth
diff --git a/nls/iso8859-4/Compose.pre b/nls/iso8859-4/Compose.pre
index f34e092..3f6603b 100644
--- a/nls/iso8859-4/Compose.pre
+++ b/nls/iso8859-4/Compose.pre
@@ -14,7 +14,9 @@ XCOMM are for compose sequences.
<Multi_key> <comma> <A> : "\241" Aogonek
<Multi_key> <k> <k> : "\242" kra
<Multi_key> <R> <comma> : "\243" Rcedilla
+<Multi_key> <R> <cedilla> : "\243" Rcedilla
<Multi_key> <comma> <R> : "\243" Rcedilla
+<Multi_key> <cedilla> <R> : "\243" Rcedilla
<Multi_key> <x> <o> : "\244" currency
<Multi_key> <o> <x> : "\244" currency
<Multi_key> <X> <O> : "\244" currency
@@ -30,7 +32,9 @@ XCOMM are for compose sequences.
<Multi_key> <I> <asciitilde> : "\245" Itilde
<Multi_key> <asciitilde> <I> : "\245" Itilde
<Multi_key> <L> <comma> : "\246" Lcedilla
+<Multi_key> <L> <cedilla> : "\246" Lcedilla
<Multi_key> <comma> <L> : "\246" Lcedilla
+<Multi_key> <cedilla> <L> : "\246" Lcedilla
<Multi_key> <s> <o> : "\247" section
<Multi_key> <o> <s> : "\247" section
<Multi_key> <S> <O> : "\247" section
@@ -51,7 +55,9 @@ XCOMM are for compose sequences.
<Multi_key> <E> <underscore> : "\252" Emacron
<Multi_key> <underscore> <E> : "\252" Emacron
<Multi_key> <G> <comma> : "\253" Gcedilla
+<Multi_key> <G> <cedilla> : "\253" Gcedilla
<Multi_key> <comma> <G> : "\253" Gcedilla
+<Multi_key> <cedilla> <G> : "\253" Gcedilla
<Multi_key> <T> <minus> : "\254" Tstroke
<Multi_key> <T> <slash> : "\254" Tstroke
<Multi_key> <slash> <T> : "\254" Tstroke
@@ -68,12 +74,16 @@ XCOMM are for compose sequences.
<Multi_key> <a> <comma> : "\261" aogonek
<Multi_key> <comma> <a> : "\261" aogonek
<Multi_key> <r> <comma> : "\263" rcedilla
+<Multi_key> <r> <cedilla> : "\263" rcedilla
<Multi_key> <comma> <r> : "\263" rcedilla
+<Multi_key> <cedilla> <r> : "\263" rcedilla
<Multi_key> <apostrophe> <apostrophe> : "\264" acute
<Multi_key> <i> <asciitilde> : "\265" itilde
<Multi_key> <asciitilde> <i> : "\265" itilde
<Multi_key> <l> <comma> : "\266" lcedilla
+<Multi_key> <l> <cedilla> : "\266" lcedilla
<Multi_key> <comma> <l> : "\266" lcedilla
+<Multi_key> <cedilla> <l> : "\266" lcedilla
<Multi_key> <less> <less> : "\267" caron
<Multi_key> <comma> <comma> : "\270" cedilla
<Multi_key> <s> <less> : "\271" scaron
@@ -83,7 +93,9 @@ XCOMM are for compose sequences.
<Multi_key> <e> <underscore> : "\272" emacron
<Multi_key> <underscore> <e> : "\272" emacron
<Multi_key> <g> <comma> : "\273" gcedilla
+<Multi_key> <g> <cedilla> : "\273" gcedilla
<Multi_key> <comma> <g> : "\273" gcedilla
+<Multi_key> <cedilla> <g> : "\273" gcedilla
<Multi_key> <t> <minus> : "\274" tstroke
<Multi_key> <t> <slash> : "\274" tstroke
<Multi_key> <slash> <t> : "\274" tstroke
@@ -139,13 +151,17 @@ XCOMM are for compose sequences.
<Multi_key> <D> <minus> : "\320" Dstroke
<Multi_key> <minus> <D> : "\320" Dstroke
<Multi_key> <N> <comma> : "\321" Ncedilla
+<Multi_key> <N> <cedilla> : "\321" Ncedilla
<Multi_key> <comma> <N> : "\321" Ncedilla
+<Multi_key> <cedilla> <N> : "\321" Ncedilla
<Multi_key> <O> <underscore> : "\322" Omacron
<Multi_key> <underscore> <O> : "\322" Omacron
<Multi_key> <O> <minus> : "\322" Omacron
<Multi_key> <minus> <O> : "\322" Omacron
<Multi_key> <K> <comma> : "\323" Kcedilla
+<Multi_key> <K> <cedilla> : "\323" Kcedilla
<Multi_key> <comma> <K> : "\323" Kcedilla
+<Multi_key> <cedilla> <K> : "\323" Kcedilla
<Multi_key> <O> <asciicircum> : "\324" Ocircumflex
<Multi_key> <asciicircum> <O> : "\324" Ocircumflex
<Multi_key> <O> <greater> : "\324" Ocircumflex
@@ -224,13 +240,17 @@ XCOMM are for compose sequences.
<Multi_key> <d> <minus> : "\360" dstroke
<Multi_key> <minus> <d> : "\360" dstroke
<Multi_key> <n> <comma> : "\361" ncedilla
+<Multi_key> <n> <cedilla> : "\361" ncedilla
<Multi_key> <comma> <n> : "\361" ncedilla
+<Multi_key> <cedilla> <n> : "\361" ncedilla
<Multi_key> <o> <underscore> : "\362" omacron
<Multi_key> <underscore> <o> : "\362" omacron
<Multi_key> <o> <minus> : "\362" omacron
<Multi_key> <minus> <o> : "\362" omacron
<Multi_key> <k> <comma> : "\363" kcedilla
+<Multi_key> <k> <cedilla> : "\363" kcedilla
<Multi_key> <comma> <k> : "\363" kcedilla
+<Multi_key> <cedilla> <k> : "\363" kcedilla
<Multi_key> <o> <asciicircum> : "\364" ocircumflex
<Multi_key> <asciicircum> <o> : "\364" ocircumflex
<Multi_key> <o> <greater> : "\364" ocircumflex
diff --git a/nls/iso8859-9/Compose.pre b/nls/iso8859-9/Compose.pre
index 748e8ac..f5d67d0 100644
--- a/nls/iso8859-9/Compose.pre
+++ b/nls/iso8859-9/Compose.pre
@@ -204,9 +204,13 @@ XCOMM Accented Alphabet
<Multi_key> <a> <a> : "\345" aring
<Multi_key> <a> <e> : "\346" ae
<Multi_key> <C> <comma> : "\307" Ccedilla
+<Multi_key> <C> <cedilla> : "\307" Ccedilla
<Multi_key> <comma> <C> : "\307" Ccedilla
+<Multi_key> <cedilla> <C> : "\307" Ccedilla
<Multi_key> <c> <comma> : "\347" ccedilla
+<Multi_key> <c> <cedilla> : "\347" ccedilla
<Multi_key> <comma> <c> : "\347" ccedilla
+<Multi_key> <cedilla> <c> : "\347" ccedilla
<Multi_key> <minus> <D> : "\320" ETH
<Multi_key> <D> <minus> : "\320" ETH
<Multi_key> <minus> <d> : "\360" eth
diff --git a/nls/iso8859-9e/Compose.pre b/nls/iso8859-9e/Compose.pre
index f8c08f6..2bbb2bd 100644
--- a/nls/iso8859-9e/Compose.pre
+++ b/nls/iso8859-9e/Compose.pre
@@ -203,9 +203,13 @@ XCOMM Accented Alphabet
<Multi_key> <a> <a> : "\345" aring
<Multi_key> <e> <e> : "\346" schwa
<Multi_key> <C> <comma> : "\307" Ccedilla
+<Multi_key> <C> <cedilla> : "\307" Ccedilla
<Multi_key> <comma> <C> : "\307" Ccedilla
+<Multi_key> <cedilla> <C> : "\307" Ccedilla
<Multi_key> <c> <comma> : "\347" ccedilla
+<Multi_key> <c> <cedilla> : "\347" ccedilla
<Multi_key> <comma> <c> : "\347" ccedilla
+<Multi_key> <cedilla> <c> : "\347" ccedilla
<Multi_key> <minus> <D> : "\320" ETH
<Multi_key> <D> <minus> : "\320" ETH
<Multi_key> <minus> <d> : "\360" eth
commit b11ea7ab3a436745e5244599048516600e47ab5d
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Jul 17 17:16:50 2008 -0400
Work on making the en_US and pt_BR UTF-8 Compose as similar as possible.
The eventual goal here is to have a single primary UTF-8 Compose
file which the locale-specific UTF-8 Compose.pre files can #include.
(cherry picked from commit 4ba091255bb953d53078ba5619d6751052c739f7)
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index db6053a..12806fb 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -1734,6 +1734,8 @@ 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
<combining_acute> <Multi_key> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
@@ -1748,6 +1750,8 @@ 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
<combining_acute> <Multi_key> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
commit 04828f15866aa7cf43a03b399ac12a393f14f4f7
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Jul 17 17:13:36 2008 -0400
Add <Multi_key> <cedilla> Compose tuples
The en_US and pt_BR UTF-8 Compose tables had support for using <comma>
with <Multi_key> to enter CEDILLA characters. Bug 10397 requests
support for using <cedilla> instead of <comma> in said sequences.
This commit makes both styles work.
(cherry picked from commit 254522d3c24e0590732fc03cdd61ff4564819d94)
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 774faf2..db6053a 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -504,6 +504,7 @@ XCOMM Part 3
<Multi_key> <o> <A> : "Å" Aring # LATIN CAPITAL LETTER A WITH RING ABOVE
<dead_cedilla> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
<Multi_key> <comma> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
+<Multi_key> <cedilla> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
<dead_grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
<Multi_key> <grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
<combining_grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
@@ -582,6 +583,7 @@ XCOMM Part 3
<Multi_key> <o> <a> : "å" aring # LATIN SMALL LETTER A WITH RING ABOVE
<dead_cedilla> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
<Multi_key> <comma> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
+<Multi_key> <cedilla> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
<dead_grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
<Multi_key> <grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
<combining_grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
@@ -731,8 +733,10 @@ XCOMM Part 3
<Multi_key> <period> <g> : "ġ" U0121 # LATIN SMALL LETTER G WITH DOT ABOVE
<dead_cedilla> <G> : "Ģ" U0122 # LATIN CAPITAL LETTER G WITH CEDILLA
<Multi_key> <comma> <G> : "Ģ" U0122 # LATIN CAPITAL LETTER G WITH CEDILLA
+<Multi_key> <cedilla> <G> : "Ģ" U0122 # LATIN CAPITAL LETTER G WITH CEDILLA
<dead_cedilla> <g> : "ģ" U0123 # LATIN SMALL LETTER G WITH CEDILLA
<Multi_key> <comma> <g> : "ģ" U0123 # LATIN SMALL LETTER G WITH CEDILLA
+<Multi_key> <cedilla> <g> : "ģ" U0123 # LATIN SMALL LETTER G WITH CEDILLA
<dead_circumflex> <H> : "Ĥ" U0124 # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
<Multi_key> <asciicircum> <H> : "Ĥ" U0124 # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
<dead_circumflex> <h> : "ĥ" U0125 # LATIN SMALL LETTER H WITH CIRCUMFLEX
@@ -775,8 +779,10 @@ XCOMM Part 3
<Multi_key> <asciicircum> <j> : "ĵ" U0135 # LATIN SMALL LETTER J WITH CIRCUMFLEX
<dead_cedilla> <K> : "Ķ" U0136 # LATIN CAPITAL LETTER K WITH CEDILLA
<Multi_key> <comma> <K> : "Ķ" U0136 # LATIN CAPITAL LETTER K WITH CEDILLA
+<Multi_key> <cedilla> <K> : "Ķ" U0136 # LATIN CAPITAL LETTER K WITH CEDILLA
<dead_cedilla> <k> : "ķ" U0137 # LATIN SMALL LETTER K WITH CEDILLA
<Multi_key> <comma> <k> : "ķ" U0137 # LATIN SMALL LETTER K WITH CEDILLA
+<Multi_key> <cedilla> <k> : "ķ" U0137 # LATIN SMALL LETTER K WITH CEDILLA
<Multi_key> <k> <k> : "ĸ" U0138 # LATIN SMALL LETTER KRA
<dead_acute> <L> : "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
<Multi_key> <acute> <L> : "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
@@ -788,8 +794,10 @@ XCOMM Part 3
<combining_acute> <l> : "ĺ" U013A # LATIN SMALL LETTER L WITH ACUTE
<dead_cedilla> <L> : "Ļ" U013B # LATIN CAPITAL LETTER L WITH CEDILLA
<Multi_key> <comma> <L> : "Ļ" U013B # LATIN CAPITAL LETTER L WITH CEDILLA
+<Multi_key> <cedilla> <L> : "Ļ" U013B # LATIN CAPITAL LETTER L WITH CEDILLA
<dead_cedilla> <l> : "ļ" U013C # LATIN SMALL LETTER L WITH CEDILLA
<Multi_key> <comma> <l> : "ļ" U013C # LATIN SMALL LETTER L WITH CEDILLA
+<Multi_key> <cedilla> <l> : "ļ" U013C # LATIN SMALL LETTER L WITH CEDILLA
<dead_caron> <L> : "Ľ" U013D # LATIN CAPITAL LETTER L WITH CARON
<Multi_key> <c> <L> : "Ľ" U013D # LATIN CAPITAL LETTER L WITH CARON
<dead_caron> <l> : "ľ" U013E # LATIN SMALL LETTER L WITH CARON
@@ -810,8 +818,10 @@ XCOMM Part 3
<combining_acute> <n> : "ń" U0144 # LATIN SMALL LETTER N WITH ACUTE
<dead_cedilla> <N> : "Ņ" U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
<Multi_key> <comma> <N> : "Ņ" U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
+<Multi_key> <cedilla> <N> : "Ņ" U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
<dead_cedilla> <n> : "ņ" U0146 # LATIN SMALL LETTER N WITH CEDILLA
<Multi_key> <comma> <n> : "ņ" U0146 # LATIN SMALL LETTER N WITH CEDILLA
+<Multi_key> <cedilla> <n> : "ņ" U0146 # LATIN SMALL LETTER N WITH CEDILLA
<dead_caron> <N> : "Ň" U0147 # LATIN CAPITAL LETTER N WITH CARON
<Multi_key> <c> <N> : "Ň" U0147 # LATIN CAPITAL LETTER N WITH CARON
<dead_caron> <n> : "ň" U0148 # LATIN SMALL LETTER N WITH CARON
@@ -844,8 +854,10 @@ XCOMM Part 3
<combining_acute> <r> : "ŕ" U0155 # LATIN SMALL LETTER R WITH ACUTE
<dead_cedilla> <R> : "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
<Multi_key> <comma> <R> : "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
+<Multi_key> <cedilla> <R> : "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
<dead_cedilla> <r> : "ŗ" U0157 # LATIN SMALL LETTER R WITH CEDILLA
<Multi_key> <comma> <r> : "ŗ" U0157 # LATIN SMALL LETTER R WITH CEDILLA
+<Multi_key> <cedilla> <r> : "ŗ" U0157 # LATIN SMALL LETTER R WITH CEDILLA
<dead_caron> <R> : "Ř" U0158 # LATIN CAPITAL LETTER R WITH CARON
<Multi_key> <c> <R> : "Ř" U0158 # LATIN CAPITAL LETTER R WITH CARON
<dead_caron> <r> : "ř" U0159 # LATIN SMALL LETTER R WITH CARON
@@ -864,16 +876,20 @@ XCOMM Part 3
<Multi_key> <asciicircum> <s> : "ŝ" U015D # LATIN SMALL LETTER S WITH CIRCUMFLEX
<dead_cedilla> <S> : "Ş" U015E # LATIN CAPITAL LETTER S WITH CEDILLA
<Multi_key> <comma> <S> : "Ş" U015E # LATIN CAPITAL LETTER S WITH CEDILLA
+<Multi_key> <cedilla> <S> : "Ş" U015E # LATIN CAPITAL LETTER S WITH CEDILLA
<dead_cedilla> <s> : "ş" U015F # LATIN SMALL LETTER S WITH CEDILLA
<Multi_key> <comma> <s> : "ş" U015F # LATIN SMALL LETTER S WITH CEDILLA
+<Multi_key> <cedilla> <s> : "ş" U015F # LATIN SMALL LETTER S WITH CEDILLA
<dead_caron> <S> : "Š" U0160 # LATIN CAPITAL LETTER S WITH CARON
<Multi_key> <c> <S> : "Š" U0160 # LATIN CAPITAL LETTER S WITH CARON
<dead_caron> <s> : "š" U0161 # LATIN SMALL LETTER S WITH CARON
<Multi_key> <c> <s> : "š" U0161 # LATIN SMALL LETTER S WITH CARON
<dead_cedilla> <T> : "Ţ" U0162 # LATIN CAPITAL LETTER T WITH CEDILLA
<Multi_key> <comma> <T> : "Ţ" U0162 # LATIN CAPITAL LETTER T WITH CEDILLA
+<Multi_key> <cedilla> <T> : "Ţ" U0162 # LATIN CAPITAL LETTER T WITH CEDILLA
<dead_cedilla> <t> : "ţ" U0163 # LATIN SMALL LETTER T WITH CEDILLA
<Multi_key> <comma> <t> : "ţ" U0163 # LATIN SMALL LETTER T WITH CEDILLA
+<Multi_key> <cedilla> <t> : "ţ" U0163 # LATIN SMALL LETTER T WITH CEDILLA
<dead_caron> <T> : "Ť" U0164 # LATIN CAPITAL LETTER T WITH CARON
<Multi_key> <c> <T> : "Ť" U0164 # LATIN CAPITAL LETTER T WITH CARON
<dead_caron> <t> : "ť" U0165 # LATIN SMALL LETTER T WITH CARON
@@ -1243,8 +1259,10 @@ XCOMM Part 3
<Multi_key> <period> <a> : "ȧ" U0227 # LATIN SMALL LETTER A WITH DOT ABOVE
<dead_cedilla> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
<Multi_key> <comma> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
+<Multi_key> <cedilla> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
<dead_cedilla> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
<Multi_key> <comma> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
+<Multi_key> <cedilla> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
<dead_macron> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
<Multi_key> <macron> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
<Multi_key> <underscore> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
@@ -1711,23 +1729,29 @@ XCOMM Part 3
<Multi_key> <apostrophe> <Ccedilla> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<dead_acute> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<dead_acute> <Multi_key> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
+<dead_acute> <Multi_key> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<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
<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
<combining_acute> <Multi_key> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
+<combining_acute> <Multi_key> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<dead_acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <apostrophe> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<dead_acute> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<dead_acute> <Multi_key> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
+<dead_acute> <Multi_key> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<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
<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
<combining_acute> <Multi_key> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
+<combining_acute> <Multi_key> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<dead_abovedot> <D> : "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE
<Multi_key> <period> <D> : "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE
<dead_abovedot> <d> : "ḋ" U1E0B # LATIN SMALL LETTER D WITH DOT ABOVE
@@ -1744,8 +1768,10 @@ XCOMM Part 3
<dead_belowmacron> <d> : "ḏ" U1E0F # LATIN SMALL LETTER D WITH LINE BELOW
<dead_cedilla> <D> : "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
<Multi_key> <comma> <D> : "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
+<Multi_key> <cedilla> <D> : "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
<dead_cedilla> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
<Multi_key> <comma> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
+<Multi_key> <cedilla> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
<U032D> <D> : "Ḓ" U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
<dead_belowcircumflex> <D> : "Ḓ" U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
<U032D> <d> : "ḓ" U1E13 # LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
@@ -1819,19 +1845,25 @@ XCOMM Part 3
<Multi_key> <b> <U0228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <dead_cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <Multi_key> <comma> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+<dead_breve> <Multi_key> <cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <U> <dead_cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <U> <comma> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+<Multi_key> <U> <cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <dead_cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <comma> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+<Multi_key> <b> <cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <U> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <dead_cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <Multi_key> <comma> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
+<dead_breve> <Multi_key> <cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <U> <dead_cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <U> <comma> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
+<Multi_key> <U> <cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <dead_cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <comma> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
+<Multi_key> <b> <cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<dead_abovedot> <F> : "Ḟ" U1E1E # LATIN CAPITAL LETTER F WITH DOT ABOVE
<Multi_key> <period> <F> : "Ḟ" U1E1E # LATIN CAPITAL LETTER F WITH DOT ABOVE
<dead_abovedot> <f> : "ḟ" U1E1F # LATIN SMALL LETTER F WITH DOT ABOVE
@@ -1858,8 +1890,10 @@ XCOMM Part 3
<Multi_key> <quotedbl> <h> : "ḧ" U1E27 # LATIN SMALL LETTER H WITH DIAERESIS
<dead_cedilla> <H> : "Ḩ" U1E28 # LATIN CAPITAL LETTER H WITH CEDILLA
<Multi_key> <comma> <H> : "Ḩ" U1E28 # LATIN CAPITAL LETTER H WITH CEDILLA
+<Multi_key> <cedilla> <H> : "Ḩ" U1E28 # LATIN CAPITAL LETTER H WITH CEDILLA
<dead_cedilla> <h> : "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
<Multi_key> <comma> <h> : "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
+<Multi_key> <cedilla> <h> : "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
<U032E> <H> : "Ḫ" U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW
<dead_belowbreve> <H> : "Ḫ" U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW
<U032E> <h> : "ḫ" U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW
diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre
index 5f1887d..ae78542 100644
--- a/nls/pt_BR.UTF-8/Compose.pre
+++ b/nls/pt_BR.UTF-8/Compose.pre
@@ -469,6 +469,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <o> <A> : "Å" Aring # LATIN CAPITAL LETTER A WITH RING ABOVE
<dead_cedilla> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
<Multi_key> <comma> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
+<Multi_key> <cedilla> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
<dead_grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
<Multi_key> <grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
<combining_grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
@@ -543,6 +544,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <o> <a> : "å" aring # LATIN SMALL LETTER A WITH RING ABOVE
<dead_cedilla> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
<Multi_key> <comma> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
+<Multi_key> <cedilla> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
<dead_grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
<Multi_key> <grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
<combining_grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
@@ -685,8 +687,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <period> <g> : "ġ" U0121 # LATIN SMALL LETTER G WITH DOT ABOVE
<dead_cedilla> <G> : "Ģ" U0122 # LATIN CAPITAL LETTER G WITH CEDILLA
<Multi_key> <comma> <G> : "Ģ" U0122 # LATIN CAPITAL LETTER G WITH CEDILLA
+<Multi_key> <cedilla> <G> : "Ģ" U0122 # LATIN CAPITAL LETTER G WITH CEDILLA
<dead_cedilla> <g> : "ģ" U0123 # LATIN SMALL LETTER G WITH CEDILLA
<Multi_key> <comma> <g> : "ģ" U0123 # LATIN SMALL LETTER G WITH CEDILLA
+<Multi_key> <cedilla> <g> : "ģ" U0123 # LATIN SMALL LETTER G WITH CEDILLA
<dead_circumflex> <H> : "Ĥ" U0124 # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
<Multi_key> <asciicircum> <H> : "Ĥ" U0124 # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
<dead_circumflex> <h> : "ĥ" U0125 # LATIN SMALL LETTER H WITH CIRCUMFLEX
@@ -725,8 +729,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <asciicircum> <j> : "ĵ" U0135 # LATIN SMALL LETTER J WITH CIRCUMFLEX
<dead_cedilla> <K> : "Ķ" U0136 # LATIN CAPITAL LETTER K WITH CEDILLA
<Multi_key> <comma> <K> : "Ķ" U0136 # LATIN CAPITAL LETTER K WITH CEDILLA
+<Multi_key> <cedilla> <K> : "Ķ" U0136 # LATIN CAPITAL LETTER K WITH CEDILLA
<dead_cedilla> <k> : "ķ" U0137 # LATIN SMALL LETTER K WITH CEDILLA
<Multi_key> <comma> <k> : "ķ" U0137 # LATIN SMALL LETTER K WITH CEDILLA
+<Multi_key> <cedilla> <k> : "ķ" U0137 # LATIN SMALL LETTER K WITH CEDILLA
<dead_acute> <L> : "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
<Multi_key> <acute> <L> : "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
<Multi_key> <apostrophe> <L> : "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
@@ -737,8 +743,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <l> : "ĺ" U013A # LATIN SMALL LETTER L WITH ACUTE
<dead_cedilla> <L> : "Ļ" U013B # LATIN CAPITAL LETTER L WITH CEDILLA
<Multi_key> <comma> <L> : "Ļ" U013B # LATIN CAPITAL LETTER L WITH CEDILLA
+<Multi_key> <cedilla> <L> : "Ļ" U013B # LATIN CAPITAL LETTER L WITH CEDILLA
<dead_cedilla> <l> : "ļ" U013C # LATIN SMALL LETTER L WITH CEDILLA
<Multi_key> <comma> <l> : "ļ" U013C # LATIN SMALL LETTER L WITH CEDILLA
+<Multi_key> <cedilla> <l> : "ļ" U013C # LATIN SMALL LETTER L WITH CEDILLA
<dead_caron> <L> : "Ľ" U013D # LATIN CAPITAL LETTER L WITH CARON
<Multi_key> <c> <L> : "Ľ" U013D # LATIN CAPITAL LETTER L WITH CARON
<dead_caron> <l> : "ľ" U013E # LATIN SMALL LETTER L WITH CARON
@@ -757,8 +765,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <n> : "ń" U0144 # LATIN SMALL LETTER N WITH ACUTE
<dead_cedilla> <N> : "Ņ" U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
<Multi_key> <comma> <N> : "Ņ" U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
+<Multi_key> <cedilla> <N> : "Ņ" U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
<dead_cedilla> <n> : "ņ" U0146 # LATIN SMALL LETTER N WITH CEDILLA
<Multi_key> <comma> <n> : "ņ" U0146 # LATIN SMALL LETTER N WITH CEDILLA
+<Multi_key> <cedilla> <n> : "ņ" U0146 # LATIN SMALL LETTER N WITH CEDILLA
<dead_caron> <N> : "Ň" U0147 # LATIN CAPITAL LETTER N WITH CARON
<Multi_key> <c> <N> : "Ň" U0147 # LATIN CAPITAL LETTER N WITH CARON
<dead_caron> <n> : "ň" U0148 # LATIN SMALL LETTER N WITH CARON
@@ -789,8 +799,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<combining_acute> <r> : "ŕ" U0155 # LATIN SMALL LETTER R WITH ACUTE
<dead_cedilla> <R> : "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
<Multi_key> <comma> <R> : "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
+<Multi_key> <cedilla> <R> : "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
<dead_cedilla> <r> : "ŗ" U0157 # LATIN SMALL LETTER R WITH CEDILLA
<Multi_key> <comma> <r> : "ŗ" U0157 # LATIN SMALL LETTER R WITH CEDILLA
+<Multi_key> <cedilla> <r> : "ŗ" U0157 # LATIN SMALL LETTER R WITH CEDILLA
<dead_caron> <R> : "Ř" U0158 # LATIN CAPITAL LETTER R WITH CARON
<Multi_key> <c> <R> : "Ř" U0158 # LATIN CAPITAL LETTER R WITH CARON
<dead_caron> <r> : "ř" U0159 # LATIN SMALL LETTER R WITH CARON
@@ -809,16 +821,20 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <asciicircum> <s> : "ŝ" U015D # LATIN SMALL LETTER S WITH CIRCUMFLEX
<dead_cedilla> <S> : "Ş" U015E # LATIN CAPITAL LETTER S WITH CEDILLA
<Multi_key> <comma> <S> : "Ş" U015E # LATIN CAPITAL LETTER S WITH CEDILLA
+<Multi_key> <cedilla> <S> : "Ş" U015E # LATIN CAPITAL LETTER S WITH CEDILLA
<dead_cedilla> <s> : "ş" U015F # LATIN SMALL LETTER S WITH CEDILLA
<Multi_key> <comma> <s> : "ş" U015F # LATIN SMALL LETTER S WITH CEDILLA
+<Multi_key> <cedilla> <s> : "ş" U015F # LATIN SMALL LETTER S WITH CEDILLA
<dead_caron> <S> : "Š" U0160 # LATIN CAPITAL LETTER S WITH CARON
<Multi_key> <c> <S> : "Š" U0160 # LATIN CAPITAL LETTER S WITH CARON
<dead_caron> <s> : "š" U0161 # LATIN SMALL LETTER S WITH CARON
<Multi_key> <c> <s> : "š" U0161 # LATIN SMALL LETTER S WITH CARON
<dead_cedilla> <T> : "Ţ" U0162 # LATIN CAPITAL LETTER T WITH CEDILLA
<Multi_key> <comma> <T> : "Ţ" U0162 # LATIN CAPITAL LETTER T WITH CEDILLA
+<Multi_key> <cedilla> <T> : "Ţ" U0162 # LATIN CAPITAL LETTER T WITH CEDILLA
<dead_cedilla> <t> : "ţ" U0163 # LATIN SMALL LETTER T WITH CEDILLA
<Multi_key> <comma> <t> : "ţ" U0163 # LATIN SMALL LETTER T WITH CEDILLA
+<Multi_key> <cedilla> <t> : "ţ" U0163 # LATIN SMALL LETTER T WITH CEDILLA
<dead_caron> <T> : "Ť" U0164 # LATIN CAPITAL LETTER T WITH CARON
<Multi_key> <c> <T> : "Ť" U0164 # LATIN CAPITAL LETTER T WITH CARON
<dead_caron> <t> : "ť" U0165 # LATIN SMALL LETTER T WITH CARON
@@ -1177,8 +1193,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <period> <a> : "ȧ" U0227 # LATIN SMALL LETTER A WITH DOT ABOVE
<dead_cedilla> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
<Multi_key> <comma> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
+<Multi_key> <cedilla> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
<dead_cedilla> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
<Multi_key> <comma> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
+<Multi_key> <cedilla> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
<dead_macron> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
<Multi_key> <macron> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
<Multi_key> <underscore> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
@@ -1641,25 +1659,33 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <apostrophe> <Ccedilla> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<dead_acute> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<dead_acute> <Multi_key> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
+<dead_acute> <Multi_key> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<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
<combining_acute> <Multi_key> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
+<combining_acute> <Multi_key> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<dead_acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <apostrophe> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<dead_acute> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<dead_acute> <Multi_key> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
+<dead_acute> <Multi_key> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<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
<combining_acute> <Multi_key> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
+<combining_acute> <Multi_key> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<dead_abovedot> <D> : "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE
<Multi_key> <period> <D> : "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE
<dead_abovedot> <d> : "ḋ" U1E0B # LATIN SMALL LETTER D WITH DOT ABOVE
@@ -1674,8 +1700,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<U0331> <d> : "ḏ" U1E0F # LATIN SMALL LETTER D WITH LINE BELOW
<dead_cedilla> <D> : "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
<Multi_key> <comma> <D> : "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
+<Multi_key> <cedilla> <D> : "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
<dead_cedilla> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
<Multi_key> <comma> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
+<Multi_key> <cedilla> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
<U032d> <D> : "Ḓ" U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
<U032d> <d> : "ḓ" U1E13 # LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
<dead_grave> <Emacron> : "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
@@ -1743,19 +1771,25 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <b> <U0228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <dead_cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <Multi_key> <comma> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+<dead_breve> <Multi_key> <cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <U> <dead_cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <U> <comma> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+<Multi_key> <U> <cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <dead_cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <comma> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+<Multi_key> <b> <cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <U> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <dead_cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<dead_breve> <Multi_key> <comma> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
+<dead_breve> <Multi_key> <cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <U> <dead_cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <U> <comma> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
+<Multi_key> <U> <cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <dead_cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<Multi_key> <b> <comma> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
+<Multi_key> <b> <cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<dead_abovedot> <F> : "Ḟ" U1E1E # LATIN CAPITAL LETTER F WITH DOT ABOVE
<Multi_key> <period> <F> : "Ḟ" U1E1E # LATIN CAPITAL LETTER F WITH DOT ABOVE
<dead_abovedot> <f> : "ḟ" U1E1F # LATIN SMALL LETTER F WITH DOT ABOVE
@@ -1782,8 +1816,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <quotedbl> <h> : "ḧ" U1E27 # LATIN SMALL LETTER H WITH DIAERESIS
<dead_cedilla> <H> : "Ḩ" U1E28 # LATIN CAPITAL LETTER H WITH CEDILLA
<Multi_key> <comma> <H> : "Ḩ" U1E28 # LATIN CAPITAL LETTER H WITH CEDILLA
+<Multi_key> <cedilla> <H> : "Ḩ" U1E28 # LATIN CAPITAL LETTER H WITH CEDILLA
<dead_cedilla> <h> : "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
<Multi_key> <comma> <h> : "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
+<Multi_key> <cedilla> <h> : "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
<U032e> <H> : "Ḫ" U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW
<U032e> <h> : "ḫ" U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW
<U0330> <I> : "Ḭ" U1E2C # LATIN CAPITAL LETTER I WITH TILDE BELOW
commit 685933616eb0d80644d26f092fd0a82339fe23da
Author: James Cloos <cloos@jhcloos.com>
Date: Sat Jun 28 15:25:23 2008 -0400
Fix commit 21e464ec682ab23ba20ddf6bd72c6db214cfbe01
The new block was added twice to the en_US.UTF-8 Compose.pre;
delete the duplicate.
(cherry picked from commit 7dc907f6032e1d5cbe4da0e414bdf2c569c04b44)
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index eaf8922..774faf2 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -6248,11 +6248,3 @@ XCOMM
<UFEF9> : "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
<UFEF5> : "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
-XCOMM
-XCOMM Arabic Lam-Alef ligatures
-XCOMM
-
-<UFEFB> : "لا" # ARABIC LIGATURE LAM WITH ALEF
-<UFEF7> : "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
-<UFEF9> : "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
-<UFEF5> : "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
commit 692f6ecc691e83c2601b90e32b1dc395e9dbe8c6
Author: Khaled Hosny <khaledhosny@eglug.org>
Date: Thu Jun 19 18:26:11 2008 -0400
NLS: Add Arabic Lam-Alef ligature compose sequences (bug #16426)
Add some Arabic digraphs to utf-8 locales with a Compose.pre
Signed-off-by: James Cloos <cloos@jhcloos.com>
(cherry picked from commit 21e464ec682ab23ba20ddf6bd72c6db214cfbe01)
diff --git a/nls/am_ET.UTF-8/Compose.pre b/nls/am_ET.UTF-8/Compose.pre
index 08f3d42..e797db1 100644
--- a/nls/am_ET.UTF-8/Compose.pre
+++ b/nls/am_ET.UTF-8/Compose.pre
@@ -349,3 +349,12 @@ XCOMM
<U17fd> : "េះ"
<U17fc> : "ុំ"
<U17fb> : "ុះ"
+
+XCOMM
+XCOMM Arabic Lam-Alef ligatures
+XCOMM
+
+<UFEFB> : "لا" # ARABIC LIGATURE LAM WITH ALEF
+<UFEF7> : "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
+<UFEF9> : "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
+<UFEF5> : "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 3e4da44..eaf8922 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -6238,3 +6238,21 @@ XCOMM
<U17fd> : "េះ"
<U17fc> : "ុំ"
<U17fb> : "ុះ"
+
+XCOMM
+XCOMM Arabic Lam-Alef ligatures
+XCOMM
+
+<UFEFB> : "لا" # ARABIC LIGATURE LAM WITH ALEF
+<UFEF7> : "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
+<UFEF9> : "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
+<UFEF5> : "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
+
+XCOMM
+XCOMM Arabic Lam-Alef ligatures
+XCOMM
+
+<UFEFB> : "لا" # ARABIC LIGATURE LAM WITH ALEF
+<UFEF7> : "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
+<UFEF9> : "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
+<UFEF5> : "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre
index 63121e6..5f1887d 100644
--- a/nls/pt_BR.UTF-8/Compose.pre
+++ b/nls/pt_BR.UTF-8/Compose.pre
@@ -5558,3 +5558,12 @@ XCOMM
<U17fd> : "េះ"
<U17fc> : "ុំ"
<U17fb> : "ុះ"
+
+XCOMM
+XCOMM Arabic Lam-Alef ligatures
+XCOMM
+
+<UFEFB> : "لا" # ARABIC LIGATURE LAM WITH ALEF
+<UFEF7> : "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
+<UFEF9> : "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
+<UFEF5> : "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
commit 9b2ab1130e273f6e25cb58d5a2aa7a87e909759e
Author: Jens Herden <jens@khmeros.info>
Date: Tue Jun 10 20:07:30 2008 +0300
NLS: Add Khmer compose sequences (bug #5706)
Add some Khmer digraphs to all locales with a Compose.pre.
(cherry picked from commit fca0b0ba3f72b7284601d4690bba99fc80a92614)
diff --git a/nls/am_ET.UTF-8/Compose.pre b/nls/am_ET.UTF-8/Compose.pre
index cb12e5c..08f3d42 100644
--- a/nls/am_ET.UTF-8/Compose.pre
+++ b/nls/am_ET.UTF-8/Compose.pre
@@ -339,3 +339,13 @@ XCOMM
<backslash> <minus> : "|" <U007C> # key -
<backslash> <underscore> : "¥" <U00A5> # key _
<backslash> <question> : "፧" <U1367> # key ?
+
+XCOMM
+XCOMM Khmer digraphs
+XCOMM
+
+<U17ff> : "ាំ"
+<U17fe> : "ោះ"
+<U17fd> : "េះ"
+<U17fc> : "ុំ"
+<U17fb> : "ុះ"
diff --git a/nls/el_GR.UTF-8/Compose.pre b/nls/el_GR.UTF-8/Compose.pre
index a97c2ae..5a04aed 100644
--- a/nls/el_GR.UTF-8/Compose.pre
+++ b/nls/el_GR.UTF-8/Compose.pre
@@ -2385,4 +2385,14 @@ XCOMM Miscellaneous extensions.
<Multi_key> <question> <exclam> : "‽" U203D # INTERROBANG
<Multi_key> <exclam> <question> : "‽" U203D # INTERROBANG
+XCOMM
+XCOMM Khmer digraphs
+XCOMM
+
+<U17ff> : "ាំ"
+<U17fe> : "ោះ"
+<U17fd> : "េះ"
+<U17fc> : "ុំ"
+<U17fb> : "ុះ"
+
XCOMM End
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 0d93969..3e4da44 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -6228,3 +6228,13 @@ XCOMM Part 3
##<Multi_key> <U1D1B9> <U1D165> <U1D16F> : "𝆹𝅥𝅯" U1D1BF # MUSICAL SYMBOL FUSA WHITE
<Multi_key> <U1D1BC> <U1D16F> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
##<Multi_key> <U1D1BA> <U1D165> <U1D16F> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+
+XCOMM
+XCOMM Khmer digraphs
+XCOMM
+
+<U17ff> : "ាំ"
+<U17fe> : "ោះ"
+<U17fd> : "េះ"
+<U17fc> : "ុំ"
+<U17fb> : "ុះ"
diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre
index f403b18..63121e6 100644
--- a/nls/pt_BR.UTF-8/Compose.pre
+++ b/nls/pt_BR.UTF-8/Compose.pre
@@ -5548,3 +5548,13 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <U1d1b9> <U1d165> <U1d16f> : "𝆹𝅥𝅯" U1D1BF # MUSICAL SYMBOL FUSA WHITE
<Multi_key> <U1d1bc> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
<Multi_key> <U1d1ba> <U1d165> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+
+XCOMM
+XCOMM Khmer digraphs
+XCOMM
+
Reply to: