On 2012-05-05 05:23, Alan Coopersmith wrote: > On 04/19/12 11:35 AM, Julien Cristau wrote: >> On Tue, Apr 10, 2012 at 17:56:47 +0200, Pander wrote: >> >>> Could you please apply that one already so it is of the list and we >>> discuss the rest below? THanks. >>> >> Please send it properly (such as with git send-email) with a commit >> message, and I'll do that. > > Are we any closer to resolving this? If we're going to be removing > sequences that just got added, I'd rather do that before the release, > instead of waiting for people to get used to using them and breaking > them later. (Adding new stuff can easily wait of course.) >
Hi all, As discussed and as promised, see attachments for incremental patches. Please review and if OK, please commit to master. Regards, Pander
commit d015b387153308561ff28e664db212242eaeda48 Author: Pander <[email protected]> Date: Sat May 5 16:28:01 2012 +0200 Reassigned <o> <apostrophe> to oacute, also for upper case. diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre index 2eae912..c9ff587 100644 --- a/nls/en_US.UTF-8/Compose.pre +++ b/nls/en_US.UTF-8/Compose.pre @@ -647,6 +647,7 @@ XCOMM Part 3 <Multi_key> <acute> <O> : "Ã" Oacute # LATIN CAPITAL LETTER O WITH ACUTE <Multi_key> <O> <acute> : "Ã" Oacute # LATIN CAPITAL LETTER O WITH ACUTE <Multi_key> <apostrophe> <O> : "Ã" Oacute # LATIN CAPITAL LETTER O WITH ACUTE +<Multi_key> <O> <apostrophe> : "Ã" Oacute # LATIN CAPITAL LETTER O WITH ACUTE <dead_circumflex> <O> : "Ã" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX <Multi_key> <asciicircum> <O> : "Ã" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX <Multi_key> <O> <asciicircum> : "Ã" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX @@ -772,6 +773,7 @@ XCOMM Part 3 <Multi_key> <acute> <o> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE <Multi_key> <o> <acute> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE <Multi_key> <apostrophe> <o> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE +<Multi_key> <o> <apostrophe> : "ó" oacute # LATIN SMALL LETTER O WITH ACUTE <dead_circumflex> <o> : "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX <Multi_key> <asciicircum> <o> : "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX <Multi_key> <o> <asciicircum> : "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX @@ -1458,7 +1460,6 @@ XCOMM Part 3 <dead_acute> <Multi_key> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE <Multi_key> <acute> <dead_abovering> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE <Multi_key> <apostrophe> <dead_abovering> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE -<Multi_key> <o> <apostrophe> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE <Multi_key> <asterisk> <apostrophe> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE <dead_acute> <aring> : "Ç»" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE <Multi_key> <acute> <aring> : "Ç»" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE @@ -1467,7 +1468,6 @@ XCOMM Part 3 <dead_acute> <Multi_key> <o> <a> : "Ç»" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE <Multi_key> <acute> <dead_abovering> <a> : "Ç»" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE <Multi_key> <apostrophe> <dead_abovering> <a> : "Ç»" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE -<Multi_key> <o> <apostrophe> <a> : "Ç»" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE <Multi_key> <asterisk> <apostrophe> <a> : "Ç»" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE <dead_acute> <AE> : "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE <Multi_key> <acute> <AE> : "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
commit 7eb2732b8635b7c9766f993075b24475a4a9d226 Author: Pander <[email protected]> Date: Sat May 5 16:40:20 2012 +0200 Removed <S> in combination with a numeral for superscript. diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre index c9ff587..3890053 100644 --- a/nls/en_US.UTF-8/Compose.pre +++ b/nls/en_US.UTF-8/Compose.pre @@ -532,19 +532,11 @@ XCOMM Part 3 <dead_circumflex> <KP_2> : "²" twosuperior # SUPERSCRIPT TWO <Multi_key> <asciicircum> <KP_2> : "²" twosuperior # SUPERSCRIPT TWO <Multi_key> <2> <asciicircum> : "²" twosuperior # SUPERSCRIPT TWO -<Multi_key> <2> <S> : "²" twosuperior # SUPERSCRIPT TWO -<Multi_key> <S> <2> : "²" twosuperior # SUPERSCRIPT TWO -<Multi_key> <2> <s> : "²" twosuperior # SUPERSCRIPT TWO -<Multi_key> <s> <2> : "²" twosuperior # SUPERSCRIPT TWO <dead_circumflex> <3> : "³" threesuperior # SUPERSCRIPT THREE <Multi_key> <asciicircum> <3> : "³" threesuperior # SUPERSCRIPT THREE <dead_circumflex> <KP_3> : "³" threesuperior # SUPERSCRIPT THREE <Multi_key> <asciicircum> <KP_3> : "³" threesuperior # SUPERSCRIPT THREE <Multi_key> <3> <asciicircum> : "³" threesuperior # SUPERSCRIPT THREE -<Multi_key> <3> <S> : "³" threesuperior # SUPERSCRIPT THREE -<Multi_key> <S> <3> : "³" threesuperior # SUPERSCRIPT THREE -<Multi_key> <3> <s> : "³" threesuperior # SUPERSCRIPT THREE -<Multi_key> <s> <3> : "³" threesuperior # SUPERSCRIPT THREE <Multi_key> <m> <u> : "µ" mu # MICRO SIGN <Multi_key> <slash> <U> : "µ" mu # MICRO SIGN <Multi_key> <U> <slash> : "µ" mu # MICRO SIGN @@ -555,10 +547,6 @@ XCOMM Part 3 <dead_circumflex> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE <Multi_key> <asciicircum> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE <Multi_key> <1> <asciicircum> : "¹" onesuperior # SUPERSCRIPT ONE -<Multi_key> <1> <S> : "¹" onesuperior # SUPERSCRIPT ONE -<Multi_key> <S> <1> : "¹" onesuperior # SUPERSCRIPT ONE -<Multi_key> <1> <s> : "¹" onesuperior # SUPERSCRIPT ONE -<Multi_key> <s> <1> : "¹" onesuperior # SUPERSCRIPT ONE <dead_circumflex> <Multi_key> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR <Multi_key> <asciicircum> <underscore> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR <dead_circumflex> <Multi_key> <underbar> <o> : "º" masculine # MASCULINE ORDINAL INDICATOR
commit a26011fae9f24b5720f4b9ffab2b93b3b671a48b Author: Pander <[email protected]> Date: Sat May 5 16:44:31 2012 +0200 Removed <n> <minus> for n with tilde, also vice versa and for upper case. diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre index 3890053..d8c1269 100644 --- a/nls/en_US.UTF-8/Compose.pre +++ b/nls/en_US.UTF-8/Compose.pre @@ -626,8 +626,6 @@ XCOMM Part 3 <dead_tilde> <N> : "Ã" Ntilde # LATIN CAPITAL LETTER N WITH TILDE <Multi_key> <asciitilde> <N> : "Ã" Ntilde # LATIN CAPITAL LETTER N WITH TILDE <Multi_key> <N> <asciitilde> : "Ã" Ntilde # LATIN CAPITAL LETTER N WITH TILDE -<Multi_key> <minus> <N> : "Ã" Ntilde # LATIN CAPITAL LETTER N WITH TILDE -<Multi_key> <N> <minus> : "Ã" Ntilde # LATIN CAPITAL LETTER N WITH TILDE <dead_grave> <O> : "Ã" Ograve # LATIN CAPITAL LETTER O WITH GRAVE <Multi_key> <grave> <O> : "Ã" Ograve # LATIN CAPITAL LETTER O WITH GRAVE <Multi_key> <O> <grave> : "Ã" Ograve # LATIN CAPITAL LETTER O WITH GRAVE @@ -752,8 +750,6 @@ XCOMM Part 3 <dead_tilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE <Multi_key> <asciitilde> <n> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE <Multi_key> <n> <asciitilde> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE -<Multi_key> <minus> <n> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE -<Multi_key> <n> <minus> : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE <dead_grave> <o> : "ò" ograve # LATIN SMALL LETTER O WITH GRAVE <Multi_key> <grave> <o> : "ò" ograve # LATIN SMALL LETTER O WITH GRAVE <Multi_key> <o> <grave> : "ò" ograve # LATIN SMALL LETTER O WITH GRAVE
commit d2809e037b625f2543f915aca2737e143968f478 Author: Pander <[email protected]> Date: Sat May 5 16:56:05 2012 +0200 Removed <slash> <U> and vice versa, combination with lower case u suffices. diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre index d8c1269..1861a5c 100644 --- a/nls/en_US.UTF-8/Compose.pre +++ b/nls/en_US.UTF-8/Compose.pre @@ -538,8 +538,6 @@ XCOMM Part 3 <Multi_key> <asciicircum> <KP_3> : "³" threesuperior # SUPERSCRIPT THREE <Multi_key> <3> <asciicircum> : "³" threesuperior # SUPERSCRIPT THREE <Multi_key> <m> <u> : "µ" mu # MICRO SIGN -<Multi_key> <slash> <U> : "µ" mu # MICRO SIGN -<Multi_key> <U> <slash> : "µ" mu # MICRO SIGN <Multi_key> <slash> <u> : "µ" mu # MICRO SIGN <Multi_key> <u> <slash> : "µ" mu # MICRO SIGN <dead_circumflex> <1> : "¹" onesuperior # SUPERSCRIPT ONE
commit 6371c488d495cb7f832f844c6ee46883bc75fa99 Author: Pander <[email protected]> Date: Sat May 5 19:02:10 2012 +0200 Reassigned squences with minus and a or o (vice versa and lower and upper case) to conform existing series and not resulting in tilde. Also added noe missing underscore sequence. diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre index 1861a5c..631d81d 100644 --- a/nls/en_US.UTF-8/Compose.pre +++ b/nls/en_US.UTF-8/Compose.pre @@ -567,8 +567,6 @@ XCOMM Part 3 <Multi_key> <A> <asciicircum> : "Ã" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX <dead_tilde> <A> : "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE <Multi_key> <asciitilde> <A> : "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE -<Multi_key> <minus> <A> : "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE -<Multi_key> <A> <minus> : "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE <Multi_key> <A> <asciitilde> : "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE <dead_diaeresis> <A> : "Ã" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS <Multi_key> <quotedbl> <A> : "Ã" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS @@ -640,8 +638,6 @@ XCOMM Part 3 <dead_tilde> <O> : "Ã" Otilde # LATIN CAPITAL LETTER O WITH TILDE <Multi_key> <asciitilde> <O> : "Ã" Otilde # LATIN CAPITAL LETTER O WITH TILDE <Multi_key> <O> <asciitilde> : "Ã" Otilde # LATIN CAPITAL LETTER O WITH TILDE -<Multi_key> <minus> <O> : "Ã" Otilde # LATIN CAPITAL LETTER O WITH TILDE -<Multi_key> <O> <minus> : "Ã" Otilde # LATIN CAPITAL LETTER O WITH TILDE <dead_diaeresis> <O> : "Ã" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS <Multi_key> <quotedbl> <O> : "Ã" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS <Multi_key> <O> <quotedbl> : "Ã" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS @@ -692,8 +688,6 @@ XCOMM Part 3 <dead_tilde> <a> : "ã" atilde # LATIN SMALL LETTER A WITH TILDE <Multi_key> <asciitilde> <a> : "ã" atilde # LATIN SMALL LETTER A WITH TILDE <Multi_key> <a> <asciitilde> : "ã" atilde # LATIN SMALL LETTER A WITH TILDE -<Multi_key> <minus> <a> : "ã" atilde # LATIN SMALL LETTER A WITH TILDE -<Multi_key> <a> <minus> : "ã" atilde # LATIN SMALL LETTER A WITH TILDE <dead_diaeresis> <a> : "ä" adiaeresis # LATIN SMALL LETTER A WITH DIAERESIS <Multi_key> <quotedbl> <a> : "ä" adiaeresis # LATIN SMALL LETTER A WITH DIAERESIS <Multi_key> <a> <quotedbl> : "ä" adiaeresis # LATIN SMALL LETTER A WITH DIAERESIS @@ -764,8 +758,6 @@ XCOMM Part 3 <dead_tilde> <o> : "õ" otilde # LATIN SMALL LETTER O WITH TILDE <Multi_key> <asciitilde> <o> : "õ" otilde # LATIN SMALL LETTER O WITH TILDE <Multi_key> <o> <asciitilde> : "õ" otilde # LATIN SMALL LETTER O WITH TILDE -<Multi_key> <minus> <o> : "õ" otilde # LATIN SMALL LETTER O WITH TILDE -<Multi_key> <o> <minus> : "õ" otilde # LATIN SMALL LETTER O WITH TILDE <dead_diaeresis> <o> : "ö" odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS <Multi_key> <o> <diaeresis> : "ö" odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS <Multi_key> <diaeresis> <o> : "ö" odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS @@ -809,9 +801,15 @@ XCOMM Part 3 <dead_macron> <A> : "Ä" U0100 # LATIN CAPITAL LETTER A WITH MACRON <Multi_key> <macron> <A> : "Ä" U0100 # LATIN CAPITAL LETTER A WITH MACRON <Multi_key> <underscore> <A> : "Ä" U0100 # LATIN CAPITAL LETTER A WITH MACRON +<Multi_key> <A> <underscore> : "Ä" U0100 # LATIN CAPITAL LETTER A WITH MACRON +<Multi_key> <minus> <A> : "Ä" U0100 # LATIN CAPITAL LETTER A WITH MACRON +<Multi_key> <A> <minus> : "Ä" U0100 # LATIN CAPITAL LETTER A WITH MACRON <dead_macron> <a> : "Ä" U0101 # LATIN SMALL LETTER A WITH MACRON <Multi_key> <macron> <a> : "Ä" U0101 # LATIN SMALL LETTER A WITH MACRON <Multi_key> <underscore> <a> : "Ä" U0101 # LATIN SMALL LETTER A WITH MACRON +<Multi_key> <a> <underscore> : "Ä" U0101 # LATIN SMALL LETTER A WITH MACRON +<Multi_key> <minus> <a> : "Ä" U0100 # LATIN CAPITAL LETTER A WITH MACRON +<Multi_key> <a> <minus> : "Ä" U0100 # LATIN CAPITAL LETTER A WITH MACRON <dead_breve> <A> : "Ä" U0102 # LATIN CAPITAL LETTER A WITH BREVE <Multi_key> <U> <A> : "Ä" U0102 # LATIN CAPITAL LETTER A WITH BREVE <Multi_key> <b> <A> : "Ä" U0102 # LATIN CAPITAL LETTER A WITH BREVE @@ -1066,10 +1064,14 @@ XCOMM Part 3 <Multi_key> <macron> <O> : "Å" U014C # LATIN CAPITAL LETTER O WITH MACRON <Multi_key> <underscore> <O> : "Å" U014C # LATIN CAPITAL LETTER O WITH MACRON <Multi_key> <O> <underscore> : "Å" U014C # LATIN CAPITAL LETTER O WITH MACRON +<Multi_key> <minus> <O> : "Å" U014C # LATIN CAPITAL LETTER O WITH MACRON +<Multi_key> <O> <minus> : "Å" U014C # LATIN CAPITAL LETTER O WITH MACRON <dead_macron> <o> : "Å" U014D # LATIN SMALL LETTER O WITH MACRON <Multi_key> <macron> <o> : "Å" U014D # LATIN SMALL LETTER O WITH MACRON <Multi_key> <underscore> <o> : "Å" U014D # LATIN SMALL LETTER O WITH MACRON <Multi_key> <o> <underscore> : "Å" U014D # LATIN SMALL LETTER O WITH MACRON +<Multi_key> <minus> <o> : "Å" U014D # LATIN SMALL LETTER O WITH MACRON +<Multi_key> <o> <minus> : "Å" U014D # LATIN SMALL LETTER O WITH MACRON <dead_breve> <O> : "Å" U014E # LATIN CAPITAL LETTER O WITH BREVE <Multi_key> <U> <O> : "Å" U014E # LATIN CAPITAL LETTER O WITH BREVE <Multi_key> <b> <O> : "Å" U014E # LATIN CAPITAL LETTER O WITH BREVE
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
