libX11: Changes to 'master'

[Pander]

On 2012-03-14 22:25, James Cloos wrote:
> Nuts.  I thought all of those were sorted already.
> 
> The dstroke and Dstroke lines are arguably better than the U0110 and
> U0111 lines.
> 
> Since <Multi_key> <o> <apostrophe> <a> and <A> were already there,
> the <Multi_key> <o> <apostrophe> entry for ó will have to go.

Double nuts about the apostrophe. The <o> <apostrophe> for ó is used
much much more then the sequences starting with <o> <apostrophe> for Ǻ
and ǻ, for which alternative exist.

Please remove:
  <Multi_key> <o> <apostrophe> <A> 	: "Ǻ"   U01FA # LATIN CAPITAL LETTER
A WITH RING ABOVE AND ACUTE
and remove:
  <Multi_key> <o> <apostrophe> <a> 	: "ǻ"   U01FB # LATIN SMALL LETTER A
WITH RING ABOVE AND ACUTE

because these are also available as:
  <Multi_key> <asterisk> <apostrophe> <A> 	: "Ǻ"   U01FA # LATIN CAPITAL
LETTER A WITH RING ABOVE AND ACUTE
and as:
  <Multi_key> <asterisk> <apostrophe> <a> 	: "ǻ"   U01FB # LATIN SMALL
LETTER A WITH RING ABOVE AND ACUTE

And at the same time, restore:
  <Multi_key> <O> <apostrophe>           : "Ó"   Oacute # LATIN CAPITAL
LETTER O WITH ACUTE
and restore:
  <Multi_key> <o> <apostrophe>           : "ó"   oacute # LATIN SMALL
LETTER O WITH ACUTE

There has been many requests about mirrored availability of compose key
sequences for often used diacritics with vowels in the past. This is
because, depending on their your native language, people use
diacritic+vowel or the reverse, vowel+diacritic.

Sorry for the late reply but this will prevent many irritations.
Implementing the above mentioned change will make the overall patch from
downstream gtk+ a success.

> So I'll push this:
> 
> diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
> index 1f72ae2..2eae912 100644
> --- a/nls/en_US.UTF-8/Compose.pre
> +++ b/nls/en_US.UTF-8/Compose.pre
> @@ -650 +649,0 @@ XCOMM Part 3
> -<Multi_key> <O> <apostrophe>           : "Ó"   Oacute # LATIN CAPITAL LETTER O WITH ACUTE
> @@ -776 +774,0 @@ XCOMM Part 3
> -<Multi_key> <o> <apostrophe>           : "ó"   oacute # LATIN SMALL LETTER O WITH ACUTE
> @@ -881,6 +878,0 @@ XCOMM Part 3
> -<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
> 
> -JimC