aboutsummaryrefslogtreecommitdiff
path: root/libX11/nls/en_US.UTF-8
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-05-23 19:36:09 +0200
committermarha <marha@users.sourceforge.net>2014-05-23 19:38:24 +0200
commit63bfcd0be46413dda8c22b914d12f66ea5d5c66d (patch)
tree252bfea78ff3ccfabedc3b84c8a7331c74e902cd /libX11/nls/en_US.UTF-8
parent55cf29d7f748b814a2b8eb016fbf15635d56aa53 (diff)
downloadvcxsrv-63bfcd0be46413dda8c22b914d12f66ea5d5c66d.tar.gz
vcxsrv-63bfcd0be46413dda8c22b914d12f66ea5d5c66d.tar.bz2
vcxsrv-63bfcd0be46413dda8c22b914d12f66ea5d5c66d.zip
libX11 mesa xserver pixman git update 23 May 2014
xserver commit db2e708f31a162c6c66643d3559dd5f3e21ee06b libX11 commit e3dc0d17339e61eaf0b51b8907510984e3bf23cb pixman commit 9cd283b2eb8279824406bfd47b020d21fc00cf82 mesa commit 404387ecd72a4a9ace8c1fa6895823aabfd759ad
Diffstat (limited to 'libX11/nls/en_US.UTF-8')
-rw-r--r--libX11/nls/en_US.UTF-8/Compose.pre42
1 files changed, 33 insertions, 9 deletions
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre
index 498093ffa..068a3d305 100644
--- a/libX11/nls/en_US.UTF-8/Compose.pre
+++ b/libX11/nls/en_US.UTF-8/Compose.pre
@@ -527,24 +527,24 @@ XCOMM Part 3
<Multi_key> <asciicircum> <underbar> <a> : "ª" ordfeminine # FEMININE ORDINAL INDICATOR
<dead_circumflex> <2> : "²" twosuperior # SUPERSCRIPT TWO
<Multi_key> <asciicircum> <2> : "²" twosuperior # SUPERSCRIPT TWO
+<Multi_key> <2> <asciicircum> : "²" twosuperior # SUPERSCRIPT TWO
<dead_circumflex> <KP_Space> : "²" twosuperior # SUPERSCRIPT TWO
<Multi_key> <asciicircum> <KP_Space> : "²" twosuperior # SUPERSCRIPT TWO
<dead_circumflex> <KP_2> : "²" twosuperior # SUPERSCRIPT TWO
<Multi_key> <asciicircum> <KP_2> : "²" twosuperior # SUPERSCRIPT TWO
-<Multi_key> <2> <asciicircum> : "²" twosuperior # SUPERSCRIPT TWO
<dead_circumflex> <3> : "³" threesuperior # SUPERSCRIPT THREE
<Multi_key> <asciicircum> <3> : "³" threesuperior # SUPERSCRIPT THREE
+<Multi_key> <3> <asciicircum> : "³" 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> <m> <u> : "µ" mu # MICRO SIGN
<Multi_key> <slash> <u> : "µ" mu # MICRO SIGN
<Multi_key> <u> <slash> : "µ" mu # MICRO SIGN
<dead_circumflex> <1> : "¹" onesuperior # SUPERSCRIPT ONE
<Multi_key> <asciicircum> <1> : "¹" onesuperior # SUPERSCRIPT ONE
+<Multi_key> <1> <asciicircum> : "¹" onesuperior # SUPERSCRIPT ONE
<dead_circumflex> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
<Multi_key> <asciicircum> <KP_1> : "¹" onesuperior # SUPERSCRIPT ONE
-<Multi_key> <1> <asciicircum> : "¹" 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
@@ -557,22 +557,22 @@ XCOMM Part 3
<Multi_key> <A> <grave> : "À" Agrave # LATIN CAPITAL LETTER A WITH GRAVE
<dead_acute> <A> : "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
<Multi_key> <acute> <A> : "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
+<Multi_key> <A> <acute> : "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
<Multi_key> <apostrophe> <A> : "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
<Multi_key> <A> <apostrophe> : "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
-<Multi_key> <A> <acute> : "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
<dead_circumflex> <A> : "Â" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
<Multi_key> <asciicircum> <A> : "Â" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+<Multi_key> <A> <asciicircum> : "Â" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
<Multi_key> <greater> <A> : "Â" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
<Multi_key> <A> <greater> : "Â" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-<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> <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
<Multi_key> <A> <quotedbl> : "Ä" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
-<Multi_key> <A> <diaeresis> : "Ä" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
<Multi_key> <diaeresis> <A> : "Ä" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
+<Multi_key> <A> <diaeresis> : "Ä" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
<dead_abovering> <A> : "Å" Aring # LATIN CAPITAL LETTER A WITH RING ABOVE
<Multi_key> <o> <A> : "Å" Aring # LATIN CAPITAL LETTER A WITH RING ABOVE
<Multi_key> <asterisk> <A> : "Å" Aring # LATIN CAPITAL LETTER A WITH RING ABOVE
@@ -587,19 +587,19 @@ XCOMM Part 3
<Multi_key> <E> <grave> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
<dead_acute> <E> : "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
<Multi_key> <acute> <E> : "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
+<Multi_key> <E> <acute> : "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
<Multi_key> <apostrophe> <E> : "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
<Multi_key> <E> <apostrophe> : "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
-<Multi_key> <E> <acute> : "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
<dead_circumflex> <E> : "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
<Multi_key> <asciicircum> <E> : "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+<Multi_key> <E> <asciicircum> : "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
<Multi_key> <greater> <E> : "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
<Multi_key> <E> <greater> : "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-<Multi_key> <E> <asciicircum> : "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
<dead_diaeresis> <E> : "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
<Multi_key> <quotedbl> <E> : "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
<Multi_key> <E> <quotedbl> : "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
-<Multi_key> <E> <diaeresis> : "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
<Multi_key> <diaeresis> <E> : "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
+<Multi_key> <E> <diaeresis> : "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
<dead_grave> <I> : "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
<Multi_key> <grave> <I> : "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
<Multi_key> <I> <grave> : "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
@@ -822,18 +822,22 @@ XCOMM Part 3
<Multi_key> <a> <minus> : "ā" U0101 # LATIN SMALL 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> <u> <A> : "Ă" U0102 # LATIN CAPITAL LETTER A WITH BREVE
<Multi_key> <b> <A> : "Ă" U0102 # LATIN CAPITAL LETTER A WITH BREVE
<Multi_key> <A> <parenleft> : "Ă" U0102 # LATIN CAPITAL LETTER A WITH BREVE
<dead_breve> <a> : "ă" U0103 # LATIN SMALL LETTER A WITH BREVE
<Multi_key> <U> <a> : "ă" U0103 # LATIN SMALL LETTER A WITH BREVE
+<Multi_key> <u> <a> : "ă" U0103 # LATIN SMALL LETTER A WITH BREVE
<Multi_key> <b> <a> : "ă" U0103 # LATIN SMALL LETTER A WITH BREVE
<Multi_key> <a> <parenleft> : "ă" U0103 # LATIN SMALL LETTER A WITH BREVE
<dead_ogonek> <A> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
<Multi_key> <semicolon> <A> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
+<Multi_key> <A> <semicolon> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
<Multi_key> <comma> <A> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
<Multi_key> <A> <comma> : "Ą" U0104 # LATIN CAPITAL LETTER A WITH OGONEK
<dead_ogonek> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
<Multi_key> <semicolon> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
+<Multi_key> <a> <semicolon> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
<Multi_key> <comma> <a> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
<Multi_key> <a> <comma> : "ą" U0105 # LATIN SMALL LETTER A WITH OGONEK
<dead_acute> <C> : "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
@@ -904,10 +908,12 @@ XCOMM Part 3
<Multi_key> <e> <period> : "ė" U0117 # LATIN SMALL LETTER E WITH DOT ABOVE
<dead_ogonek> <E> : "Ę" U0118 # LATIN CAPITAL LETTER E WITH OGONEK
<Multi_key> <semicolon> <E> : "Ę" U0118 # LATIN CAPITAL LETTER E WITH OGONEK
+<Multi_key> <E> <semicolon> : "Ę" U0118 # LATIN CAPITAL LETTER E WITH OGONEK
<Multi_key> <comma> <E> : "Ę" U0118 # LATIN CAPITAL LETTER E WITH OGONEK
<Multi_key> <E> <comma> : "Ę" U0118 # LATIN CAPITAL LETTER E WITH OGONEK
<dead_ogonek> <e> : "ę" U0119 # LATIN SMALL LETTER E WITH OGONEK
<Multi_key> <semicolon> <e> : "ę" U0119 # LATIN SMALL LETTER E WITH OGONEK
+<Multi_key> <e> <semicolon> : "ę" U0119 # LATIN SMALL LETTER E WITH OGONEK
<Multi_key> <comma> <e> : "ę" U0119 # LATIN SMALL LETTER E WITH OGONEK
<Multi_key> <e> <comma> : "ę" U0119 # LATIN SMALL LETTER E WITH OGONEK
<dead_caron> <E> : "Ě" U011A # LATIN CAPITAL LETTER E WITH CARON
@@ -986,6 +992,7 @@ XCOMM Part 3
<Multi_key> <b> <i> : "ĭ" U012D # LATIN SMALL LETTER I WITH BREVE
<dead_ogonek> <I> : "Į" U012E # LATIN CAPITAL LETTER I WITH OGONEK
<Multi_key> <semicolon> <I> : "Į" U012E # LATIN CAPITAL LETTER I WITH OGONEK
+<Multi_key> <I> <semicolon> : "Į" U012E # LATIN CAPITAL LETTER I WITH OGONEK
<Multi_key> <comma> <I> : "Į" U012E # LATIN CAPITAL LETTER I WITH OGONEK
<Multi_key> <I> <comma> : "Į" U012E # LATIN CAPITAL LETTER I WITH OGONEK
<dead_ogonek> <i> : "į" U012F # LATIN SMALL LETTER I WITH OGONEK
@@ -1191,6 +1198,7 @@ XCOMM Part 3
<Multi_key> <u> <minus> : "ū" U016B # LATIN SMALL LETTER U WITH MACRON
<dead_breve> <U> : "Ŭ" U016C # LATIN CAPITAL LETTER U WITH BREVE
<Multi_key> <U> <U> : "Ŭ" U016C # LATIN CAPITAL LETTER U WITH BREVE
+<Multi_key> <u> <U> : "Ŭ" U016C # LATIN CAPITAL LETTER U WITH BREVE
<Multi_key> <b> <U> : "Ŭ" U016C # LATIN CAPITAL LETTER U WITH BREVE
<dead_breve> <u> : "ŭ" U016D # LATIN SMALL LETTER U WITH BREVE
<Multi_key> <U> <u> : "ŭ" U016D # LATIN SMALL LETTER U WITH BREVE
@@ -1210,10 +1218,12 @@ XCOMM Part 3
<Multi_key> <equal> <u> : "ű" U0171 # LATIN SMALL LETTER U WITH DOUBLE ACUTE
<dead_ogonek> <U> : "Ų" U0172 # LATIN CAPITAL LETTER U WITH OGONEK
<Multi_key> <semicolon> <U> : "Ų" U0172 # LATIN CAPITAL LETTER U WITH OGONEK
+<Multi_key> <U> <semicolon> : "Ų" U0172 # LATIN CAPITAL LETTER U WITH OGONEK
<Multi_key> <comma> <U> : "Ų" U0172 # LATIN CAPITAL LETTER U WITH OGONEK
<Multi_key> <U> <comma> : "Ų" U0172 # LATIN CAPITAL LETTER U WITH OGONEK
<dead_ogonek> <u> : "ų" U0173 # LATIN SMALL LETTER U WITH OGONEK
<Multi_key> <semicolon> <u> : "ų" U0173 # LATIN SMALL LETTER U WITH OGONEK
+<Multi_key> <u> <semicolon> : "ų" U0173 # LATIN SMALL LETTER U WITH OGONEK
<Multi_key> <comma> <u> : "ų" U0173 # LATIN SMALL LETTER U WITH OGONEK
<Multi_key> <u> <comma> : "ų" U0173 # LATIN SMALL LETTER U WITH OGONEK
<dead_circumflex> <W> : "Ŵ" U0174 # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
@@ -1411,8 +1421,14 @@ XCOMM Part 3
<Multi_key> <c> <k> : "ǩ" U01E9 # LATIN SMALL LETTER K WITH CARON
<dead_ogonek> <O> : "Ǫ" U01EA # LATIN CAPITAL LETTER O WITH OGONEK
<Multi_key> <semicolon> <O> : "Ǫ" U01EA # LATIN CAPITAL LETTER O WITH OGONEK
+<Multi_key> <O> <semicolon> : "Ǫ" U01EA # LATIN CAPITAL LETTER O WITH OGONEK
+<Multi_key> <comma> <O> : "Ǫ" U01EA # LATIN CAPITAL LETTER O WITH OGONEK
+<Multi_key> <O> <comma> : "Ǫ" U01EA # LATIN CAPITAL LETTER O WITH OGONEK
<dead_ogonek> <o> : "ǫ" U01EB # LATIN SMALL LETTER O WITH OGONEK
<Multi_key> <semicolon> <o> : "ǫ" U01EB # LATIN SMALL LETTER O WITH OGONEK
+<Multi_key> <o> <semicolon> : "ǫ" U01EB # LATIN SMALL LETTER O WITH OGONEK
+<Multi_key> <comma> <o> : "ǫ" U01EB # LATIN SMALL LETTER O WITH OGONEK
+<Multi_key> <o> <comma> : "ǫ" U01EB # LATIN SMALL LETTER O WITH OGONEK
<dead_macron> <U01EA> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
<Multi_key> <macron> <U01EA> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
<Multi_key> <underscore> <U01EA> : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
@@ -5223,9 +5239,17 @@ XCOMM
<dead_circumflex> <otilde> : "ỗ" ocircumflextilde # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
<dead_circumflex> <nobreakspace> : "̂" U0302 # COMBINING CIRCUMFLEX ACCENT
<dead_belowcomma> <S> : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
+<Multi_key> <semicolon> <S> : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
+<Multi_key> <S> <semicolon> : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
<dead_belowcomma> <s> : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
+<Multi_key> <semicolon> <s> : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
+<Multi_key> <s> <semicolon> : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
<dead_belowcomma> <T> : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
+<Multi_key> <semicolon> <T> : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
+<Multi_key> <T> <semicolon> : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
<dead_belowcomma> <t> : "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW
+<Multi_key> <semicolon> <t> : "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW
+<Multi_key> <t> <semicolon> : "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW
<dead_belowcomma> <dead_belowcomma> : "," comma # COMMA
<dead_belowcomma> <nobreakspace> : "̦" U0326 # COMBINING COMMA BELOW
<dead_belowcomma> <space> : "," comma # COMMA