libX11: Changes to 'master'

[Julien Cristau]

On Wed, Mar 14, 2012 at 11:55:53 -0700, James Cloos wrote:

>  nls/en_US.UTF-8/Compose.pre |  378 +++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 373 insertions(+), 5 deletions(-)
> 
> New commits:
> commit 91bcce48d94792f78333d2aea73961cc2e739d2e
> Author: Pander <pander at users.sourceforge.net>
> Date:   Wed Mar 14 12:54:53 2012 -0400
> 
>     Complete compose key sequences for musical symbols
>     
>     Signed-off-by: Pander <pander at users.sourceforge.net>
>     Signed-off-by: James Cloos <cloos at jhcloos.com>
> 
This breaks make check, please fix or revert.

Clash with existing sequence in en_US.UTF-8/Compose on line 862: <dead_stroke> <D>
  line #862: <dead_stroke> <D>                  : "Đ"   Dstroke # LATIN CAPITAL LETTER D WITH STROKE
  line #854: <dead_stroke> <D>                  : "Đ"   U0110 # LATIN CAPITAL LETTER D WITH STROKE
Clash with existing sequence in en_US.UTF-8/Compose on line 863: <Multi_key> <slash> <D>
  line #863: <Multi_key> <slash> <D>            : "Đ"   Dstroke # LATIN CAPITAL LETTER D WITH STROKE
  line #855: <Multi_key> <slash> <D>            : "Đ"   U0110 # LATIN CAPITAL LETTER D WITH STROKE
Clash with existing sequence in en_US.UTF-8/Compose on line 864: <Multi_key> <KP_Divide> <D>
  line #864: <Multi_key> <KP_Divide> <D>        : "Đ"   Dstroke # LATIN CAPITAL LETTER D WITH STROKE
  line #856: <Multi_key> <KP_Divide> <D>        : "Đ"   U0110 # LATIN CAPITAL LETTER D WITH STROKE
Clash with existing sequence in en_US.UTF-8/Compose on line 866: <dead_stroke> <d>
  line #866: <dead_stroke> <d>                  : "đ"   dstroke # LATIN SMALL LETTER D WITH STROKE
  line #857: <dead_stroke> <d>                  : "đ"   U0111 # LATIN SMALL LETTER D WITH STROKE
Clash with existing sequence in en_US.UTF-8/Compose on line 867: <Multi_key> <slash> <d>
  line #867: <Multi_key> <slash> <d>            : "đ"   dstroke # LATIN SMALL LETTER D WITH STROKE
  line #858: <Multi_key> <slash> <d>            : "đ"   U0111 # LATIN SMALL LETTER D WITH STROKE
Clash with existing sequence in en_US.UTF-8/Compose on line 869: <Multi_key> <KP_Divide> <d>
  line #869: <Multi_key> <KP_Divide> <d>        : "đ"   dstroke # LATIN SMALL LETTER D WITH STROKE
  line #859: <Multi_key> <KP_Divide> <d>        : "đ"   U0111 # LATIN SMALL LETTER D WITH STROKE
Clash with existing sequence in en_US.UTF-8/Compose on line 1442: <Multi_key> <o> <apostrophe> <A>
  line #1442: <Multi_key> <o> <apostrophe> <A>  : "Ǻ"   U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
  line #749: <Multi_key> <o> <apostrophe>               : "ó"   oacute # LATIN SMALL LETTER O WITH ACUTE
Clash with existing sequence in en_US.UTF-8/Compose on line 1451: <Multi_key> <o> <apostrophe> <a>
  line #1451: <Multi_key> <o> <apostrophe> <a>  : "ǻ"   U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
  line #749: <Multi_key> <o> <apostrophe>               : "ó"   oacute # LATIN SMALL LETTER O WITH ACUTE
FAIL: ../../nls/compose-check.pl

Cheers,
Julien