libX11: Changes to 'master'

[Pander]

On 2012-03-31 13:05, Julien Cristau wrote:
> On Thu, Mar 22, 2012 at 16:36:27 +0100, Pander wrote:
> 
>> James, Julien, did you receive enough compelling arguments to resolve
>> this conflict so that <o> <apostrophe> results in ó. Then we can finally
>> close the book on gtk+/GNOME conflicts.
>>
> OK.  Can you send a patch?

Sure, see attachtment. Now the apostrophe series is consistent and no
more gtk+/GNOME conflicts exist, see:

libX11/nls/en_US.UTF-8$ grep 'key> <.> <apostrophe>' Compose.pre
<Multi_key> <A> <apostrophe> 		: "Á"   Aacute # LATIN CAPITAL LETTER A
WITH ACUTE
<Multi_key> <E> <apostrophe> 		: "É"   Eacute # LATIN CAPITAL LETTER E
WITH ACUTE
<Multi_key> <I> <apostrophe> 		: "Í"   Iacute # LATIN CAPITAL LETTER I
WITH ACUTE
<Multi_key> <O> <apostrophe>     	: "Ó"   Oacute # LATIN CAPITAL LETTER
O WITH ACUTE
<Multi_key> <U> <apostrophe> 		: "Ú"   Uacute # LATIN CAPITAL LETTER U
WITH ACUTE
<Multi_key> <Y> <apostrophe> 		: "Ý"   Yacute # LATIN CAPITAL LETTER Y
WITH ACUTE
<Multi_key> <a> <apostrophe> 		: "á"   aacute # LATIN SMALL LETTER A
WITH ACUTE
<Multi_key> <e> <apostrophe> 		: "é"   eacute # LATIN SMALL LETTER E
WITH ACUTE
<Multi_key> <i> <apostrophe> 		: "í"   iacute # LATIN SMALL LETTER I
WITH ACUTE
<Multi_key> <o> <apostrophe>     	: "ó"   oacute # LATIN SMALL LETTER O
WITH ACUTE
<Multi_key> <u> <apostrophe> 		: "ú"   uacute # LATIN SMALL LETTER U
WITH ACUTE
<Multi_key> <y> <apostrophe> 		: "ý"   yacute # LATIN SMALL LETTER Y
WITH ACUTE
<Multi_key> <C> <apostrophe> 		: "Ć"   U0106 # LATIN CAPITAL LETTER C
WITH ACUTE
<Multi_key> <c> <apostrophe> 		: "ć"   U0107 # LATIN SMALL LETTER C WITH
ACUTE
<Multi_key> <L> <apostrophe> 		: "Ĺ"   U0139 # LATIN CAPITAL LETTER L
WITH ACUTE
<Multi_key> <l> <apostrophe> 		: "ĺ"   U013A # LATIN SMALL LETTER L WITH
ACUTE
<Multi_key> <N> <apostrophe> 		: "Ń"   U0143 # LATIN CAPITAL LETTER N
WITH ACUTE
<Multi_key> <n> <apostrophe> 		: "ń"   U0144 # LATIN SMALL LETTER N WITH
ACUTE
<Multi_key> <R> <apostrophe> 		: "Ŕ"   U0154 # LATIN CAPITAL LETTER R
WITH ACUTE
<Multi_key> <r> <apostrophe> 		: "ŕ"   U0155 # LATIN SMALL LETTER R WITH
ACUTE
<Multi_key> <S> <apostrophe> 		: "Ś"   U015A # LATIN CAPITAL LETTER S
WITH ACUTE
<Multi_key> <s> <apostrophe> 		: "ś"   U015B # LATIN SMALL LETTER S WITH
ACUTE
<Multi_key> <Z> <apostrophe>		: "Ź"   U0179 # LATIN CAPITAL LETTER Z
WITH ACUTE
<Multi_key> <z> <apostrophe>		: "ź"   U017A # LATIN SMALL LETTER Z WITH
ACUTE

> Cheers,
> Julien
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: compose-o-apostrophe.patch
Type: text/x-diff
Size: 2977 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20120404/5f50ffa0/attachment-0001.patch>